diff --git a/kcms/autostart/advanceddialog.cpp b/kcms/autostart/advanceddialog.cpp --- a/kcms/autostart/advanceddialog.cpp +++ b/kcms/autostart/advanceddialog.cpp @@ -29,7 +29,7 @@ : QDialog( parent ) { QVBoxLayout *lay= new QVBoxLayout(this); - m_onlyInKde = new QCheckBox( i18n( "Autostart only in KDE" ), this ); + m_onlyInKde = new QCheckBox( i18n( "Autostart only in Plasma" ), this ); m_onlyInKde->setChecked( status ); lay->addWidget( m_onlyInKde ); diff --git a/kcms/autostart/autostart.cpp b/kcms/autostart/autostart.cpp --- a/kcms/autostart/autostart.cpp +++ b/kcms/autostart/autostart.cpp @@ -53,7 +53,7 @@ lstHeader << i18n( "Name" ) << i18n( "Command" ) << i18n( "Status" ) - << i18nc("@title:column The name of the column that decides if the program is run on kde startup, on kde shutdown, etc", "Run On" ); + << i18nc("@title:column The name of the column that decides if the program is run on session startup, on session shutdown, etc", "Run On" ); widget->listCMD->setHeaderLabels(lstHeader); widget->listCMD->setFocus(); @@ -72,9 +72,9 @@ KAboutData* about = new KAboutData(QStringLiteral("Autostart"), - i18n("KDE Autostart Manager"), + i18n("Session Autostart Manager"), QStringLiteral("1.0"), - i18n("KDE Autostart Manager Control Panel Module"), + i18n("Session Autostart Manager Control Panel Module"), KAboutLicense::GPL, i18n("Copyright © 2006–2010 Autostart Manager team")); about->addAuthor(i18n("Stephen Leaf"), QString(), QStringLiteral("smileaf@gmail.com")); @@ -136,7 +136,7 @@ // FDO user autostart directories are // .config/autostart which has .desktop files executed by klaunch - //Then we have KDE specific locations which run scripts + //Then we have Plasma-specific locations which run scripts // .config/autostart-scripts which has scripts executed by ksmserver // .config/plasma-workspace/shutdown which has scripts executed by startkde // .config/plasma-workspace/env which has scripts executed by startkde diff --git a/kcms/autostart/autostart.desktop b/kcms/autostart/autostart.desktop --- a/kcms/autostart/autostart.desktop +++ b/kcms/autostart/autostart.desktop @@ -147,7 +147,7 @@ Comment[zh_CN]=自动启动的应用程序 Comment[zh_TW]=自動啟動應用程式 -X-KDE-Keywords=Autostart Manager,autostart,startup,system startup,kde start,cron +X-KDE-Keywords=Autostart Manager,autostart,startup,system startup,plasma start,cron X-KDE-Keywords[bs]=Automatsko pokretanje upravitelja,automatsko pokretanje,pokretanje,sustav za pokretanje,početak kde,kompjuter izvodi zadatak za određeno vrijeme. X-KDE-Keywords[ca]=Gestor de l'inici automàtic,inici automàtic,inici,inici del sistema,inici del kde,cron X-KDE-Keywords[ca@valencia]=Gestor de l'inici automàtic,inici automàtic,inici,inici del sistema,inici del kde,cron diff --git a/kcms/componentchooser/emailclientconfig_ui.ui b/kcms/componentchooser/emailclientconfig_ui.ui --- a/kcms/componentchooser/emailclientconfig_ui.ui +++ b/kcms/componentchooser/emailclientconfig_ui.ui @@ -9,7 +9,7 @@ - Kmail is the standard Mail program for the KDE desktop. + Kmail is the standard Mail program for the Plasma desktop. &Use KMail as preferred email client diff --git a/kcms/desktoppaths/globalpaths.cpp b/kcms/desktoppaths/globalpaths.cpp --- a/kcms/desktoppaths/globalpaths.cpp +++ b/kcms/desktoppaths/globalpaths.cpp @@ -124,7 +124,7 @@ urAutostart = addRow(lay, i18n("Autostart path:"), i18n("This folder contains applications or" " links to applications (shortcuts) that you want to have started" - " automatically whenever KDE starts. You can change the location of this" + " automatically whenever the session starts. You can change the location of this" " folder if you want to, and the contents will move automatically" " to the new location as well.")); diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp --- a/kcms/fonts/fonts.cpp +++ b/kcms/fonts/fonts.cpp @@ -653,7 +653,7 @@ cbAA->insertItem(AAEnabled, i18nc("Use anti-aliasing", "Enabled")); // change AASetting type if order changes cbAA->insertItem(AASystem, i18nc("Use anti-aliasing", "System Settings")); cbAA->insertItem(AADisabled, i18nc("Use anti-aliasing", "Disabled")); - cbAA->setWhatsThis(i18n("If this option is selected, KDE will smooth the edges of curves in fonts.")); + cbAA->setWhatsThis(i18n("Select this option to smooth the edges of curves in fonts.")); aaSettingsButton = new QPushButton(i18n("Configure..."), this); connect(aaSettingsButton, &QAbstractButton::clicked, this, &KFonts::slotCfgAa); label->setBuddy(cbAA); @@ -677,8 +677,7 @@ " look well with DPI values other than 96 or 120 DPI.

" "

The use of this option is generally discouraged. For selecting proper DPI" " value a better option is explicitly configuring it for the whole X server if" - " possible (e.g. DisplaySize in xorg.conf or adding -dpi value to" - " ServerLocalArgs= in $KDEDIR/share/config/kdm/kdmrc). When fonts do not render" + " possible (e.g. DisplaySize in xorg.conf). When fonts do not render" " properly with real DPI value better fonts should be used or configuration" " of font hinting should be checked.

"); spinboxDpi->setWhatsThis(whatsthis); diff --git a/kcms/keyboard/kcm_keyboard.ui b/kcms/keyboard/kcm_keyboard.ui --- a/kcms/keyboard/kcm_keyboard.ui +++ b/kcms/keyboard/kcm_keyboard.ui @@ -277,7 +277,7 @@ - This is a shortcut for switching layouts which is handled by KDE. It does not support modifier-only shortcuts and also may not work in some situations (e.g. if popup is active or from screensaver). + This is a shortcut for switching layouts. It does not support modifier-only shortcuts and also may not work in some situations (e.g. if popup is active or from screensaver). false diff --git a/kcms/keyboard/kcmmisc.cpp b/kcms/keyboard/kcmmisc.cpp --- a/kcms/keyboard/kcmmisc.cpp +++ b/kcms/keyboard/kcmmisc.cpp @@ -183,7 +183,7 @@ /* "

Keyboard

This module allows you to choose options" " for the way in which your keyboard works. The actual effect of" " setting these options depends upon the features provided by your" - " keyboard hardware and the X server on which KDE is running.

" + " keyboard hardware and the X server on which Plasma is running.

" " For example, you may find that changing the key click volume" " has no effect because this feature is not available on your system." */ } diff --git a/kcms/knotify/knotify.cpp b/kcms/knotify/knotify.cpp --- a/kcms/knotify/knotify.cpp +++ b/kcms/knotify/knotify.cpp @@ -55,7 +55,7 @@ setButtons( Help | Default | Apply ); setQuickHelp( i18n("

System Notifications

" - "KDE allows for a great deal of control over how you " + "Plasma allows for a great deal of control over how you " "will be notified when certain events occur. There are " "several choices as to how you are notified:" "
  • As the application was originally designed.
    • "