From 016fea783cf5c53de6dda7a6e56a1620f97eb4eb Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 18 Aug 2023 00:36:52 +0300 Subject: [PATCH] generic: adjust to KLocalizedString changes Signed-off-by: Ivailo Monev --- kioslave/trash/kcmtrash.cpp | 20 ++++++++++---------- konsole/src/ViewContainerTabBar.cpp | 2 +- kurifilter-plugins/ikws/ikwsopts.cpp | 20 +++++++++++--------- kwin/killer/killer.cpp | 8 ++++---- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/kioslave/trash/kcmtrash.cpp b/kioslave/trash/kcmtrash.cpp index f6d3979f..0b1703b6 100644 --- a/kioslave/trash/kcmtrash.cpp +++ b/kioslave/trash/kcmtrash.cpp @@ -247,8 +247,8 @@ void TrashConfigModule::setupGui() mUseTimeLimit = new QCheckBox( i18n( "Delete files older than:" ), this ); mUseTimeLimit->setWhatsThis( i18nc( "@info:whatsthis", - "Check this box to allow automatic deletion of files that are older than the value specified. " - "Leave this disabled to not automatically delete any items after a certain timespan" ) ); + "

Check this box to allow automatic deletion of files that are older than the value specified. " + "Leave this disabled to not automatically delete any items after a certain timespan

" ) ); daysLayout->addWidget( mUseTimeLimit ); mDays = new KIntSpinBox( this ); @@ -256,8 +256,8 @@ void TrashConfigModule::setupGui() mDays->setSingleStep( 1 ); mDays->setSuffix( i18np(" day", " days", mDays->value()) ); mDays->setWhatsThis( i18nc( "@info:whatsthis", - "Set the number of days that files can remain in the trash. " - "Any files older than this will be automatically deleted." ) ); + "

Set the number of days that files can remain in the trash. " + "Any files older than this will be automatically deleted.

" ) ); daysLayout->addWidget( mDays ); daysLayout->addStretch(); @@ -266,8 +266,8 @@ void TrashConfigModule::setupGui() mUseSizeLimit = new QCheckBox( i18n( "Limit to maximum size" ), this ); mUseSizeLimit->setWhatsThis( i18nc( "@info:whatsthis", - "Check this box to limit the trash to the maximum amount of disk space that you specify below. " - "Otherwise, it will be unlimited." ) ); + "

Check this box to limit the trash to the maximum amount of disk space that you specify below. " + "Otherwise, it will be unlimited.

" ) ); sizeLayout->addRow( mUseSizeLimit ); mSizeWidget = new QWidget( this ); @@ -284,12 +284,12 @@ void TrashConfigModule::setupGui() mPercent->setSingleStep( 1 ); mPercent->setSuffix( " %" ); mPercent->setWhatsThis( i18nc( "@info:whatsthis", - "This is the maximum percent of disk space that will be used for the trash." ) ); + "

This is the maximum percent of disk space that will be used for the trash.

" ) ); maximumSizeLayout->addWidget( mPercent ); mSizeLabel = new QLabel( mSizeWidget ); mSizeLabel->setWhatsThis( i18nc( "@info:whatsthis", - "This is the calculated amount of disk space that will be allowed for the trash, the maximum." ) ); + "

This is the calculated amount of disk space that will be allowed for the trash, the maximum.

" ) ); maximumSizeLayout->addWidget( mSizeLabel ); sizeWidgetLayout->addRow( i18n( "Maximum size:" ), maximumSizeLayout ); @@ -302,8 +302,8 @@ void TrashConfigModule::setupGui() mLimitReachedAction->addItem( i18n( "Delete Oldest Files From Trash" ) ); mLimitReachedAction->addItem( i18n( "Delete Biggest Files From Trash" ) ); mLimitReachedAction->setWhatsThis( i18nc( "@info:whatsthis", - "When the size limit is reached, it will prefer to delete the type of files that you specify, first. " - "If this is set to warn you, it will do so instead of automatically deleting files." ) ); + "

When the size limit is reached, it will prefer to delete the type of files that you specify, first. " + "If this is set to warn you, it will do so instead of automatically deleting files.

" ) ); sizeWidgetLayout->addRow( 0, mLimitReachedAction ); layout->addStretch(); diff --git a/konsole/src/ViewContainerTabBar.cpp b/konsole/src/ViewContainerTabBar.cpp index 0d43636b..34c9bbeb 100644 --- a/konsole/src/ViewContainerTabBar.cpp +++ b/konsole/src/ViewContainerTabBar.cpp @@ -52,7 +52,7 @@ ViewContainerTabBar::ViewContainerTabBar(QWidget* parent, TabbedViewContainer* c setWhatsThis(i18nc("@info:whatsthis", "Tab Bar" - "The tab bar allows you to switch and move tabs. You can double-click a tab to change its name.")); + "

The tab bar allows you to switch and move tabs. You can double-click a tab to change its name.

")); } void ViewContainerTabBar::dragEnterEvent(QDragEnterEvent* event) diff --git a/kurifilter-plugins/ikws/ikwsopts.cpp b/kurifilter-plugins/ikws/ikwsopts.cpp index 31e3d838..fec854b1 100644 --- a/kurifilter-plugins/ikws/ikwsopts.cpp +++ b/kurifilter-plugins/ikws/ikwsopts.cpp @@ -259,15 +259,17 @@ FilterOptions::FilterOptions(const KComponentData &componentData, QWidget *paren QString FilterOptions::quickHelp() const { - return i18nc("@info:whatsthis", "In this module you can configure the web shortcuts feature. " - "Web shortcuts allow you to quickly search or lookup words on " - "the Internet. For example, to search for information about the " - "KDE project using the Google engine, you simply type gg:KDE " - "or google:KDE." - "If you select a default search engine, then you can search for " - "normal words or phrases by simply typing them into the input widget " - "of applications that have built-in support for such a feature, e.g " - "Konqueror."); + return i18nc( + "@info:whatsthis", "

In this module you can configure the web shortcuts feature. " + "Web shortcuts allow you to quickly search or lookup words on " + "the Internet. For example, to search for information about the " + "KDE project using the Google engine, you simply type gg:KDE " + "or google:KDE.

" + "

If you select a default search engine, then you can search for " + "normal words or phrases by simply typing them into the input widget " + "of applications that have built-in support for such a feature, e.g " + "Konqueror.

" + ); } void FilterOptions::setDefaultEngine(int index) diff --git a/kwin/killer/killer.cpp b/kwin/killer/killer.cpp index 29bd108f..bfdf3395 100644 --- a/kwin/killer/killer.cpp +++ b/kwin/killer/killer.cpp @@ -76,13 +76,13 @@ int main(int argc, char* argv[]) QString question = i18nc("@info", "Application \"%1\" is not responding", appname); question += isLocal - ? i18nc("@info", "You tried to close window \"%1\" from application \"%2\" (Process ID: %3) but the application is not responding.", + ? i18nc("@info", "

You tried to close window \"%1\" from application \"%2\" (Process ID: %3) but the application is not responding.

", caption, appname, pidString) - : i18nc("@info", "You tried to close window \"%1\" from application \"%2\" (Process ID: %3), running on host \"%4\", but the application is not responding.", + : i18nc("@info", "

You tried to close window \"%1\" from application \"%2\" (Process ID: %3), running on host \"%4\", but the application is not responding.

", caption, appname, pidString, hostname); question += i18nc("@info", - "Do you want to terminate this application?" - "Terminating the application will close all of its child windows. Any unsaved data will be lost." + "

Do you want to terminate this application?

" + "

Terminating the application will close all of its child windows. Any unsaved data will be lost.

" ); KGuiItem continueButton = KGuiItem(i18n("&Terminate Application %1", appname), "edit-bomb");