diff --git a/applets/taskmanager/package/contents/config/main.xml b/applets/taskmanager/package/contents/config/main.xml
--- a/applets/taskmanager/package/contents/config/main.xml
+++ b/applets/taskmanager/package/contents/config/main.xml
@@ -12,7 +12,7 @@
- false
+ true
diff --git a/containments/desktop/plugins/folder/foldermodel.h b/containments/desktop/plugins/folder/foldermodel.h
--- a/containments/desktop/plugins/folder/foldermodel.h
+++ b/containments/desktop/plugins/folder/foldermodel.h
@@ -317,7 +317,7 @@
KDirModel *m_dirModel;
KDirWatch *m_dirWatch;
QString m_url;
- QHash m_isDirCache;
+ mutable QHash m_isDirCache;
mutable QHash m_isDirJobs;
QItemSelectionModel *m_selectionModel;
QItemSelection m_pinnedSelection;
diff --git a/containments/desktop/plugins/folder/foldermodel.cpp b/containments/desktop/plugins/folder/foldermodel.cpp
--- a/containments/desktop/plugins/folder/foldermodel.cpp
+++ b/containments/desktop/plugins/folder/foldermodel.cpp
@@ -1386,6 +1386,13 @@
return false;
}
+ // Assume the root folder of a protocol is always a folder.
+ // This avoids spinning up e.g. trash KIO slave just to check whether trash:/ is a folder.
+ if (url.path() == QLatin1String("/")) {
+ m_isDirCache.insert(item.url(), true);
+ return true;
+ }
+
if (KProtocolInfo::protocolClass(url.scheme()) != QStringLiteral(":local")) {
return false;
}
diff --git a/kcms/colors/kcm_colors.desktop b/kcms/colors/kcm_colors.desktop
--- a/kcms/colors/kcm_colors.desktop
+++ b/kcms/colors/kcm_colors.desktop
@@ -107,6 +107,7 @@
Comment[ca]=Trieu l'esquema de colors
Comment[ca@valencia]=Trieu l'esquema de colors
Comment[es]=Escoger el esquema de color
+Comment[fi]=Valitse väriteema
Comment[gl]=Escoller o esquema de cores
Comment[it]=Scegli lo schema di colori
Comment[nl]=Kies het kleurenschema
diff --git a/kcms/colors/package/metadata.desktop b/kcms/colors/package/metadata.desktop
--- a/kcms/colors/package/metadata.desktop
+++ b/kcms/colors/package/metadata.desktop
@@ -94,6 +94,7 @@
Comment[ca]=Trieu l'esquema de colors
Comment[ca@valencia]=Trieu l'esquema de colors
Comment[es]=Escoger el esquema de color
+Comment[fi]=Valitse väriteema
Comment[gl]=Escoller o esquema de cores
Comment[it]=Scegli lo schema di colori
Comment[nl]=Kies het kleurenschema
diff --git a/kcms/emoticons/emoticons.desktop b/kcms/emoticons/emoticons.desktop
--- a/kcms/emoticons/emoticons.desktop
+++ b/kcms/emoticons/emoticons.desktop
@@ -93,7 +93,7 @@
Name[x-test]=xxEmoticonsxx
Name[zh_CN]=表情符号
Name[zh_TW]=表情圖示
-Comment=Emoticon Theme
+Comment=Choose the emoticon theme
Comment[ar]=سمة الوجوه التّعبيرية
Comment[bs]=Tema emotikona
Comment[ca]=Tema d'emoticones
diff --git a/kcms/emoticons/emoticonslist.cpp b/kcms/emoticons/emoticonslist.cpp
--- a/kcms/emoticons/emoticonslist.cpp
+++ b/kcms/emoticons/emoticonslist.cpp
@@ -107,7 +107,7 @@
EmoticonList::EmoticonList(QWidget *parent, const QVariantList &args)
: KCModule(parent, args)
{
- KAboutData *about = new KAboutData(QStringLiteral("kcm_emoticons"), i18n("Emoticons"), QStringLiteral("1.0"), QString(), KAboutLicense::GPL);
+ KAboutData *about = new KAboutData(QStringLiteral("kcm_emoticons"), i18n("Choose the emoticon theme"), QStringLiteral("1.0"), QString(), KAboutLicense::GPL);
setAboutData(about);
// setButtons(Apply | Help);
setupUi(this);
diff --git a/kcms/fonts/kcm_fonts.desktop b/kcms/fonts/kcm_fonts.desktop
--- a/kcms/fonts/kcm_fonts.desktop
+++ b/kcms/fonts/kcm_fonts.desktop
@@ -104,52 +104,14 @@
Name[zh_TW]=字型
Comment=Configure the system fonts
-Comment[ar]=الخطوط
-Comment[bs]=Fontovi
-Comment[ca]=Tipus de lletra
-Comment[ca@valencia]=Tipus de lletra
-Comment[cs]=Písma
-Comment[da]=Skrifttyper
-Comment[de]=Schriftarten
-Comment[el]=Γραμματοσειρές
-Comment[en_GB]=Fonts
-Comment[eo]=Tiparoj
-Comment[es]=Tipos de letra
-Comment[et]=Fondid
-Comment[eu]=Letra-tipoak
-Comment[fi]=Fontit
-Comment[fr]=Polices de caractères
-Comment[gl]=Tipos de letra
-Comment[he]=גופנים
-Comment[hu]=Betűtípusok
-Comment[id]=Font
-Comment[is]=Letur
-Comment[it]=Caratteri
-Comment[ja]=フォント
-Comment[ko]=글꼴
-Comment[lt]=Šriftai
-Comment[mr]=फॉन्ट
-Comment[nb]=Skrifttype
-Comment[nds]=Schriftoorden
-Comment[nl]=Lettertypen
-Comment[nn]=Skrifter
-Comment[pa]=ਫੋਂਟ
-Comment[pl]=Czcionki
-Comment[pt]=Tipos de Letra
-Comment[pt_BR]=Fontes
-Comment[ru]=Шрифты
-Comment[sk]=Písma
-Comment[sl]=Pisave
-Comment[sr]=Фонтови
-Comment[sr@ijekavian]=Фонтови
-Comment[sr@ijekavianlatin]=Fontovi
-Comment[sr@latin]=Fontovi
-Comment[sv]=Teckensnitt
-Comment[tr]=Yazı Tipleri
-Comment[uk]=Шрифти
-Comment[x-test]=xxFontsxx
-Comment[zh_CN]=字体
-Comment[zh_TW]=字型
+Comment[ca]=Configura els tipus de lletra del sistema
+Comment[gl]=Configurar os tipos de letra do sistema
+Comment[nl]=De systeemlettertypen configureren
+Comment[pt]=Configurar os tipos de letra do sistema
+Comment[sv]=Anpassa systemteckensnitt
+Comment[uk]=Налаштовування загальносистемних шрифтів
+Comment[x-test]=xxConfigure the system fontsxx
+Comment[zh_TW]=設定系統字型
X-KDE-Keywords=fonts,font size,styles,charsets,character sets,panel,control panel,desktops,FileManager,Toolbars,Menu,Window Title,Title,DPI,anti-aliasing,desktop fonts,toolbar fonts,character,general fonts
X-KDE-Keywords[ar]=خطوط,حجم الخط,أنماط,طقم محارف,طقوم محارف,لوحة,لوحة تحكّم,أسطح المكتب,مدير ملفات,أشرطة أدوات,قائمة,عنوان نافذة,عنوان,نقطة/بوصة,DPI,إزالة التسنّن,خطوط سطح المكتب,خطوط شريط الأدوات,محرف,خطوط عامة
diff --git a/kcms/fonts/package/metadata.desktop b/kcms/fonts/package/metadata.desktop
--- a/kcms/fonts/package/metadata.desktop
+++ b/kcms/fonts/package/metadata.desktop
@@ -92,52 +92,14 @@
Name[zh_TW]=字型
Comment=Configure the system fonts
-Comment[ar]=الخطوط
-Comment[bs]=Fontovi
-Comment[ca]=Tipus de lletra
-Comment[ca@valencia]=Tipus de lletra
-Comment[cs]=Písma
-Comment[da]=Skrifttyper
-Comment[de]=Schriftarten
-Comment[el]=Γραμματοσειρές
-Comment[en_GB]=Fonts
-Comment[eo]=Tiparoj
-Comment[es]=Tipos de letra
-Comment[et]=Fondid
-Comment[eu]=Letra-tipoak
-Comment[fi]=Fontit
-Comment[fr]=Polices de caractères
-Comment[gl]=Tipos de letra
-Comment[he]=גופנים
-Comment[hu]=Betűtípusok
-Comment[id]=Font
-Comment[is]=Letur
-Comment[it]=Caratteri
-Comment[ja]=フォント
-Comment[ko]=글꼴
-Comment[lt]=Šriftai
-Comment[mr]=फॉन्ट
-Comment[nb]=Skrifttype
-Comment[nds]=Schriftoorden
-Comment[nl]=Lettertypen
-Comment[nn]=Skrifter
-Comment[pa]=ਫੋਂਟ
-Comment[pl]=Czcionki
-Comment[pt]=Tipos de Letra
-Comment[pt_BR]=Fontes
-Comment[ru]=Шрифты
-Comment[sk]=Písma
-Comment[sl]=Pisave
-Comment[sr]=Фонтови
-Comment[sr@ijekavian]=Фонтови
-Comment[sr@ijekavianlatin]=Fontovi
-Comment[sr@latin]=Fontovi
-Comment[sv]=Teckensnitt
-Comment[tr]=Yazı Tipleri
-Comment[uk]=Шрифти
-Comment[x-test]=xxFontsxx
-Comment[zh_CN]=字体
-Comment[zh_TW]=字型
+Comment[ca]=Configura els tipus de lletra del sistema
+Comment[gl]=Configurar os tipos de letra do sistema
+Comment[nl]=De systeemlettertypen configureren
+Comment[pt]=Configurar os tipos de letra do sistema
+Comment[sv]=Anpassa systemteckensnitt
+Comment[uk]=Налаштовування загальносистемних шрифтів
+Comment[x-test]=xxConfigure the system fontsxx
+Comment[zh_TW]=設定系統字型
Icon=preferences-desktop-font
Keywords=
diff --git a/kcms/icons/kcm_icons.desktop b/kcms/icons/kcm_icons.desktop
--- a/kcms/icons/kcm_icons.desktop
+++ b/kcms/icons/kcm_icons.desktop
@@ -103,7 +103,7 @@
Name[zh_CN]=图标
Name[zh_TW]=圖示
-Comment=Icon Theme
+Comment=Choose the icon theme
Comment[ar]=سمة الأيقونات
Comment[bs]=Tema ikone
Comment[ca]=Tema d'icones
diff --git a/kcms/icons/main.cpp b/kcms/icons/main.cpp
--- a/kcms/icons/main.cpp
+++ b/kcms/icons/main.cpp
@@ -82,7 +82,7 @@
// to be able to access its enums
qmlRegisterUncreatableType("org.kde.private.kcms.icons", 1, 0, "KIconLoader", QString());
- KAboutData* about = new KAboutData(QStringLiteral("kcm5_icons"), i18n("Icons"), QStringLiteral("1.0"),
+ KAboutData* about = new KAboutData(QStringLiteral("kcm5_icons"), i18n("Choose the icon theme"), QStringLiteral("1.0"),
i18n("Icons Control Panel Module"), KAboutLicense::GPL,
i18n("(c) 2000-2003 Geert Jansen"));
about->addAuthor(i18n("Geert Jansen"), QString(), QStringLiteral("jansen@kde.org"));
diff --git a/kcms/icons/package/metadata.desktop b/kcms/icons/package/metadata.desktop
--- a/kcms/icons/package/metadata.desktop
+++ b/kcms/icons/package/metadata.desktop
@@ -90,7 +90,7 @@
Name[x-test]=xxIconsxx
Name[zh_CN]=图标
Name[zh_TW]=圖示
-Comment=Icon Theme
+Comment=Choose the icon theme
Comment[ar]=سمة الأيقونات
Comment[bs]=Tema ikone
Comment[ca]=Tema d'icones
diff --git a/kcms/kfontinst/kcmfontinst/FontFilter.cpp b/kcms/kfontinst/kcmfontinst/FontFilter.cpp
--- a/kcms/kfontinst/kcmfontinst/FontFilter.cpp
+++ b/kcms/kfontinst/kcmfontinst/FontFilter.cpp
@@ -280,7 +280,7 @@
itsCurrentFileTypes.clear();
setCriteria(crit);
- setPlaceholderText(i18n("Filter by %1...", act->text().toLower()));
+ setPlaceholderText(i18n("Filter by %1...", act->text()));
setReadOnly(false);
}
}
@@ -342,7 +342,7 @@
itsActions[crit]->setData((int)crit);
itsActions[crit]->setChecked(on);
if(on)
- setPlaceholderText(i18n("Type here to filter on %1", text.toLower()));
+ setPlaceholderText(i18n("Filter by %1", text));
connect(itsActions[crit], SIGNAL(toggled(bool)), SLOT(filterChanged()));
}
diff --git a/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
--- a/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -185,7 +185,7 @@
KIconLoader::global()->addAppDir(KFI_NAME);
- KAboutData *about = new KAboutData(QStringLiteral("fontinst"), i18n("KDE Font Manager"), QStringLiteral("1.0"), QString(),
+ KAboutData *about = new KAboutData(QStringLiteral("fontinst"), i18n("Install, preview and remove fonts"), QStringLiteral("1.0"), QString(),
KAboutLicense::GPL, i18n("(C) Craig Drummond, 2000 - 2009"));
about->addAuthor(i18n("Craig Drummond"), i18n("Developer and maintainer"), QStringLiteral("craig@kde.org"));
setAboutData(about);
diff --git a/kcms/kfontinst/kcmfontinst/fontinst.desktop b/kcms/kfontinst/kcmfontinst/fontinst.desktop
--- a/kcms/kfontinst/kcmfontinst/fontinst.desktop
+++ b/kcms/kfontinst/kcmfontinst/fontinst.desktop
@@ -68,7 +68,7 @@
Name[zh_CN]=字体管理
Name[zh_TW]=字型管理
-Comment=Font Installation, Preview and Removal
+Comment=Install, preview and remove fonts
Comment[ar]=ثبّت الخطوط، وعاينها وأزلها
Comment[bs]=Instalacija fonta, pregled i uklanjanje
Comment[ca]=Instal·lació, vista prèvia i eliminació dels tipus de lletra
diff --git a/kcms/style/kcmstyle.cpp b/kcms/style/kcmstyle.cpp
--- a/kcms/style/kcmstyle.cpp
+++ b/kcms/style/kcmstyle.cpp
@@ -170,7 +170,7 @@
KGlobal::dirs()->addResourceType("themes", "data", "kstyle/themes");
KAboutData *about =
- new KAboutData( QStringLiteral("kcmstyle"), i18n("KDE Style Module"), QStringLiteral("1.0"),
+ new KAboutData( QStringLiteral("kcmstyle"), i18n("Configure widget style and behavior"), QStringLiteral("1.0"),
QString(), KAboutLicense::GPL,
i18n("(c) 2002 Karol Szwed, Daniel Molkentin"));
diff --git a/kcms/style/style.desktop b/kcms/style/style.desktop
--- a/kcms/style/style.desktop
+++ b/kcms/style/style.desktop
@@ -58,7 +58,7 @@
Name[x-test]=xxWidget Stylexx
Name[zh_CN]=部件风格
Name[zh_TW]=元件樣式
-Comment=Widget Style and Behavior
+Comment=Configure widget style and behavior
Comment[ar]=نمط الودجات وسلوكها
Comment[bs]=Stil i ponašanje grafičke kontrole
Comment[ca]=Estil i comportament dels estris