diff --git a/certmanager/conf/kleopatra_config_appear.desktop b/certmanager/conf/kleopatra_config_appear.desktop
index d778cc17..14071f16 100644
--- a/certmanager/conf/kleopatra_config_appear.desktop
+++ b/certmanager/conf/kleopatra_config_appear.desktop
@@ -122,7 +122,7 @@ Comment[tr]=Renkler ve Yazı Tipleri Yapılandırması
 Comment[uk]=Налаштування кольорів і шрифтів
 Comment[zh_CN]=颜色和字体配置
 Comment[zh_TW]=設定顏色與字型
-Keywords=color;font; configuration
+Keywords=color;font; configuration;
 Keywords[af]=kleur;skrif tipe;opstelling;color;font
 Keywords[ar]=لون;حرف; إعدادات;محرف;ألوان
 Keywords[be]=колер; шрыфт; канфігурацыя; color; font; configuration
diff --git a/certmanager/conf/kleopatra_config_dirserv.desktop b/certmanager/conf/kleopatra_config_dirserv.desktop
index 9232d2d7..63a3e396 100644
--- a/certmanager/conf/kleopatra_config_dirserv.desktop
+++ b/certmanager/conf/kleopatra_config_dirserv.desktop
@@ -114,7 +114,7 @@ Comment[tr]=LDAP dizin servislerinin yapılandırması
 Comment[uk]=Налаштування служб каталогів LDAP
 Comment[zh_CN]=LDAP 目录服务配置
 Comment[zh_TW]=設定 LDAP 目錄服務
-Keywords=ldap;directory;services
+Keywords=ldap;directory;services;
 Keywords[af]=ldap;directory;services;gids
 Keywords[be]=каталёг;сэрвісы;ldap;directory;services
 Keywords[bg]=директорийни; услуги; ldap; directory; services
diff --git a/certmanager/conf/kleopatra_config_dnorder.desktop b/certmanager/conf/kleopatra_config_dnorder.desktop
index e70b8c0b..09f5bded 100644
--- a/certmanager/conf/kleopatra_config_dnorder.desktop
+++ b/certmanager/conf/kleopatra_config_dnorder.desktop
@@ -110,7 +110,7 @@ Comment[tr]=DN özniteliklerinin hangi sıralama ile gösterileceğini yapıland
 Comment[uk]=Налаштування порядку показу атрибутів DN
 Comment[zh_CN]=配置 DN 属性显示的顺序
 Comment[zh_TW]=設定 DN 屬性顯示順序
-Keywords=DN;order;RDN;attribute
+Keywords=DN;order;RDN;attribute;
 Keywords[af]=DN;order;RDN;attribute;volgorde;eienskap
 Keywords[be]=парадак;атрыбут;DN;order;RDN;attribute
 Keywords[bg]=индекс; ред; подредба; атрибут DN; order; RDN; attribute
diff --git a/kaddressbook/kcmconfigs/kabconfig.desktop b/kaddressbook/kcmconfigs/kabconfig.desktop
index ef962bfd..98b16511 100644
--- a/kaddressbook/kcmconfigs/kabconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabconfig.desktop
@@ -120,7 +120,7 @@ Comment[uk]=Налаштування адресної книги
 Comment[uz]=Манзиллар дафтарини мослаш
 Comment[zh_CN]=配置地址簿
 Comment[zh_TW]=設定通訊錄
-Keywords=kaddressbook; configure; settings
+Keywords=kaddressbook; configure; settings;
 Keywords[af]=kaddressbook; configure;settings;adres
 Keywords[be]=K Адрасная кніга; настроіць; настаўленні; kaddressbook; configure; settings
 Keywords[bg]=адресни;адресна;книга;визитник;визитка;картичка;kaddressbook; configure; settings
diff --git a/kaddressbook/kcmconfigs/kabcustomfields.desktop b/kaddressbook/kcmconfigs/kabcustomfields.desktop
index bb03d818..03446980 100644
--- a/kaddressbook/kcmconfigs/kabcustomfields.desktop
+++ b/kaddressbook/kcmconfigs/kabcustomfields.desktop
@@ -114,7 +114,7 @@ Comment[tr]=Özel Sayfaları Yapılandır
 Comment[uk]=Налаштування нетипових сторінок
 Comment[zh_CN]=配置定制页
 Comment[zh_TW]=設定 Custom Pages
-Keywords=kaddressbook; configure; settings; custom fields
+Keywords=kaddressbook; configure; settings; custom fields;
 Keywords[bg]=адресник; потребителски; полета; настройки; настройване; kaddressbook; configure; settings; custom fields
 Keywords[bs]=kaddressbook; configure; settings; custom fields; podesite; postavke; vlastite; vlastito
 Keywords[ca]=llibreta d'adreces; configura; opcions; camps a mida
diff --git a/kaddressbook/kcmconfigs/kabldapconfig.desktop b/kaddressbook/kcmconfigs/kabldapconfig.desktop
index 0af721a2..78f4b28e 100644
--- a/kaddressbook/kcmconfigs/kabldapconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabldapconfig.desktop
@@ -114,7 +114,7 @@ Comment[uk]=Налаштування параметрів LDAP для адрес
 Comment[uz]=LDAP манзиллар дафтарини мослаш
 Comment[zh_CN]=配置地址簿 LDAP 设置
 Comment[zh_TW]=設定通訊錄 LDAP 設定
-Keywords=kaddressbook; configure; settings; LDAP
+Keywords=kaddressbook; configure; settings; LDAP;
 Keywords[be]=K Адрасная кніга; настроіць; настраўленні; kaddressbook; configure; settings; LDAP
 Keywords[bg]=адресник;адрес;адресна;книга;сървър;всички;kaddressbook; configure; settings; LDAP
 Keywords[br]=kaddressbook; kefluniañ; dibarzhoù; LDAP
diff --git a/kmail/kmail_config_accounts.desktop b/kmail/kmail_config_accounts.desktop
index e3c3031a..ad45ed23 100644
--- a/kmail/kmail_config_accounts.desktop
+++ b/kmail/kmail_config_accounts.desktop
@@ -115,7 +115,7 @@ Comment[tr]=Gönderilen ve Gelen Mesajlar için Yapılandırma
 Comment[uk]=Налаштування для надсилання і отримання повідомлень
 Comment[zh_CN]=收发邮件设置
 Comment[zh_TW]=發送與接收信件設定
-Keywords=kmail;accounts
+Keywords=kmail;accounts;
 Keywords[bg]=пощенски; клиент; е-поща; kmail; accounts
 Keywords[br]=kmail;kontoù
 Keywords[ca]=kmail;comptes
diff --git a/kmail/kmail_config_appearance.desktop b/kmail/kmail_config_appearance.desktop
index 73944baa..66b1da2c 100644
--- a/kmail/kmail_config_appearance.desktop
+++ b/kmail/kmail_config_appearance.desktop
@@ -117,7 +117,7 @@ Comment[tr]=Görsel Görünümü Özelleştir
 Comment[uk]=Налаштування зовнішнього вигляду
 Comment[zh_CN]=自定义视觉外观
 Comment[zh_TW]=調整視覺顯示
-Keywords=kmail;appearance
+Keywords=kmail;appearance;
 Keywords[bg]=пощенски; клиент; е-поща; външен; вид; външност; появяване kmail; appearance
 Keywords[br]=kmail;neuziadur
 Keywords[bs]=kmail;appearance;izgled
diff --git a/kmail/kmail_config_composer.desktop b/kmail/kmail_config_composer.desktop
index 9c1caf70..f6af9d58 100644
--- a/kmail/kmail_config_composer.desktop
+++ b/kmail/kmail_config_composer.desktop
@@ -102,7 +102,7 @@ Comment[tr]=Şablonlar & Genel Davranış
 Comment[uk]=Шаблони та загальна поведінка
 Comment[zh_CN]=模板和常规行为
 Comment[zh_TW]=樣本與一般行為
-Keywords=kmail;composer
+Keywords=kmail;composer;
 Keywords[bg]=пощенски; клиент; е-поща; редактор; съставител; форматиране; текст; kmail; komposer
 Keywords[bs]=kmail;composer;sastavljač
 Keywords[ca]=kmail;editor
diff --git a/kmail/kmail_config_identity.desktop b/kmail/kmail_config_identity.desktop
index e5dc960d..b0e282ca 100644
--- a/kmail/kmail_config_identity.desktop
+++ b/kmail/kmail_config_identity.desktop
@@ -116,7 +116,7 @@ Comment[tr]=Kimlikleri Düzenle
 Comment[uk]=Керування профілями
 Comment[zh_CN]=管理身份
 Comment[zh_TW]=管理身份
-Keywords=kmail;identity
+Keywords=kmail;identity;
 Keywords[be]=K Пошта;увасабленне;kmail;identity
 Keywords[bg]=пощенски; клиент; е-поща; самоличност; информация; kmail; identity
 Keywords[br]=kmail;anvelezh
diff --git a/kmail/kmail_config_misc.desktop b/kmail/kmail_config_misc.desktop
index 142dcd9f..ca7666ec 100644
--- a/kmail/kmail_config_misc.desktop
+++ b/kmail/kmail_config_misc.desktop
@@ -113,7 +113,7 @@ Comment[tr]=Diğer bölümlere uymayan yapılandırma seçenekleri
 Comment[uk]=Інші параметри
 Comment[zh_CN]=其它设置
 Comment[zh_TW]=不屬於任何其他地方的設定
-Keywords=kmail;misc
+Keywords=kmail;misc;
 Keywords[be]=K Пошта;рознае;kmail;misc
 Keywords[bg]=пощенски; клиент; е-поща; разни; настройки; kmail; misc
 Keywords[br]=kmail;a bep seurt
diff --git a/kmail/kmail_config_security.desktop b/kmail/kmail_config_security.desktop
index 43ef3ca3..de68e595 100644
--- a/kmail/kmail_config_security.desktop
+++ b/kmail/kmail_config_security.desktop
@@ -117,7 +117,7 @@ Comment[tr]=Güvenlik ve Gizlilik Ayarlar
 Comment[uk]=Параметри безпеки і конфіденційності
 Comment[zh_CN]=安全和隐私设置
 Comment[zh_TW]=安全性與隱私設定
-Keywords=kmail;security
+Keywords=kmail;security;
 Keywords[be]=K Пошта;бясьпека;kmail;security
 Keywords[bg]=пощенски; клиент; е-поща; сигурност; поверителност; kmail; security
 Keywords[br]=kmail;surentez
diff --git a/kontact/plugins/kmail/kcmkmailsummary.desktop b/kontact/plugins/kmail/kcmkmailsummary.desktop
index eb3a8867..78e99b62 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.desktop
+++ b/kontact/plugins/kmail/kcmkmailsummary.desktop
@@ -44,7 +44,7 @@ Comment[sr@Latn]=Podešavanje sažetka e-pošte
 Comment[sv]=Inställning av e-postöversikt
 Comment[zh_CN]=邮件摘要设置
 Comment[zh_TW]=郵件摘要設定
-Keywords=email; summary; configure; settings
+Keywords=email; summary; configure; settings;
 Keywords[af]=email;summary;configure;settings
 Keywords[bg]=резюме; общо; обобщение; пощенски; клиент; е-поща; email; summary; configure; settings
 Keywords[bs]=email; summary; configure; settings; sažetak; postavke
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.desktop b/kontact/plugins/korganizer/kcmkorgsummary.desktop
index e920dbdc..1cf68f84 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.desktop
+++ b/kontact/plugins/korganizer/kcmkorgsummary.desktop
@@ -69,7 +69,7 @@ Comment[tr]=Özel Günler ve Yapılacaklar Listesi Yapılandırması
 Comment[uk]=Налаштування зведення зустрічей і завдань
 Comment[zh_CN]=约会和待办摘要设置
 Comment[zh_TW]=約會與待辦事項摘要設定
-Keywords=calendar; todos; configure; settings
+Keywords=calendar; todos; configure; settings;
 Keywords[af]=calendar;todos;configure;settings
 Keywords[be]=каляндар; заданні; настроіць; настаўленні; calendar; todos; configure; settings
 Keywords[bg]=календар; задачи; организатор; calendar; todos; configure; settings
diff --git a/kontact/plugins/newsticker/kcmkontactknt.desktop b/kontact/plugins/newsticker/kcmkontactknt.desktop
index 75b4de14..9a022062 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.desktop
+++ b/kontact/plugins/newsticker/kcmkontactknt.desktop
@@ -108,7 +108,7 @@ Comment[tr]=Haber Yakalayıcı Özet Ayarları
 Comment[uk]=Налаштування зведення стрічки новин
 Comment[zh_CN]=新闻点点通摘要设置
 Comment[zh_TW]=新聞顯示器摘要設定
-Keywords=news ticker; configure; settings
+Keywords=news ticker; configure; settings;
 Keywords[bg]=новини; източник; настройки; news ticker; configure; settings
 Keywords[bs]=news ticker; configure; settings; vijesti; newsticker; podešavanje
 Keywords[ca]=teletip; configura; opcions
diff --git a/kontact/plugins/specialdates/kcmsdsummary.desktop b/kontact/plugins/specialdates/kcmsdsummary.desktop
index f1ea21c8..350c0242 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.desktop
+++ b/kontact/plugins/specialdates/kcmsdsummary.desktop
@@ -73,7 +73,7 @@ Comment[tr]=Özel Tarih Özeti Yapılandırması
 Comment[uk]=Налаштування підсумку особливих дат
 Comment[zh_CN]=特殊日期摘要设置
 Comment[zh_TW]=特殊日期摘要設定
-Keywords=birthday; anniversary; holiday; configure; settings
+Keywords=birthday; anniversary; holiday; configure; settings;
 Keywords[af]=birtday;anniversary; holiday; conifugre; settings; verjaarsdag; herdenking; vakansie
 Keywords[bg]=рождени; рожден; дни; ден; годишнина; годишнини; обобщение; birthday; anniversary; configure; settings
 Keywords[ca]=data de naixement; aniversari; vacances; configuració; arranjament
diff --git a/kontact/src/kontactconfig.desktop b/kontact/src/kontactconfig.desktop
index d35e3d7f..8c9ff639 100644
--- a/kontact/src/kontactconfig.desktop
+++ b/kontact/src/kontactconfig.desktop
@@ -36,7 +36,7 @@ Comment[pt]=Kontact do TDE
 Comment[pt_BR]=Kontact do TDE
 Comment[ro]=Contact TDE
 Comment[ta]=கேடிஇ தொடர்புகொள்
-Keywords=kontact
+Keywords=kontact;
 Keywords[be]=кантакт;kontact
 Keywords[bg]=контакти; връзка; информация; личен; поща; бизнес; планиране; kontact
 Keywords[de]=Kontact
diff --git a/korganizer/korganizer_configcolors.desktop b/korganizer/korganizer_configcolors.desktop
index d0343637..f6bf599f 100644
--- a/korganizer/korganizer_configcolors.desktop
+++ b/korganizer/korganizer_configcolors.desktop
@@ -134,7 +134,7 @@ Comment[tr]=KOrganizer Renk Yapılandırması
 Comment[uk]=Налаштування кольорів у KOrganizer
 Comment[zh_CN]=KOrganizer 颜色配置
 Comment[zh_TW]=KOrganizer 顏色設定
-Keywords=korganizer;colors
+Keywords=korganizer;colors;
 Keywords[be]=K Арганізатар;колеры;korganizer;colors
 Keywords[bg]=организатор; цветове; настройки; korganizer; colors
 Keywords[br]=korganizer;livioù
diff --git a/korganizer/korganizer_configdesignerfields.desktop b/korganizer/korganizer_configdesignerfields.desktop
index f89e08ad..7248658a 100644
--- a/korganizer/korganizer_configdesignerfields.desktop
+++ b/korganizer/korganizer_configdesignerfields.desktop
@@ -114,7 +114,7 @@ Comment[tr]=Özel Sayfaları Yapılandır
 Comment[uk]=Налаштування нетипових сторінок
 Comment[zh_CN]=配置定制页
 Comment[zh_TW]=設定 Custom Pages
-Keywords=korganizer; configure; settings; custom fields
+Keywords=korganizer; configure; settings; custom fields;
 Keywords[bg]=организатор; настройки; korganizer; configure; settings; custom fields
 Keywords[ca]=korganizer; configura; opcions; camps a mida
 Keywords[cs]=korganizer;nastavení;vlastní pole
diff --git a/korganizer/korganizer_configfonts.desktop b/korganizer/korganizer_configfonts.desktop
index d2cc03b9..ce891b78 100644
--- a/korganizer/korganizer_configfonts.desktop
+++ b/korganizer/korganizer_configfonts.desktop
@@ -130,7 +130,7 @@ Comment[tr]=KOrganizer Yazıtipi Yapılandırması
 Comment[uk]=Налаштування шрифтів у KOrganizer
 Comment[zh_CN]=KOrganizer 字体配置
 Comment[zh_TW]=KOrganizer 字型設定
-Keywords=korganizer;fonts
+Keywords=korganizer;fonts;
 Keywords[af]=korganizer; fonts
 Keywords[be]=K Арганізатар;шрыфты;korganizer;fonts
 Keywords[bg]=организатор; шрифтове; настройки; korganizer; fonts
diff --git a/korganizer/korganizer_configfreebusy.desktop b/korganizer/korganizer_configfreebusy.desktop
index f66de67b..0ae5f6cf 100644
--- a/korganizer/korganizer_configfreebusy.desktop
+++ b/korganizer/korganizer_configfreebusy.desktop
@@ -110,7 +110,7 @@ Comment[tr]=KOrganizer Boş/Meşgul Yapılandırması
 Comment[uk]=Налаштування вільного/зайнятого часу в KOrganizer
 Comment[zh_CN]=KOrganizer 空闲/忙碌配置
 Comment[zh_TW]=KOrganizer 行程資訊設定
-Keywords=korganizer;freebusy;scheduling
+Keywords=korganizer;freebusy;scheduling;
 Keywords[af]=korganizer; freebusy; scheduling
 Keywords[bg]=организатор; свободно; заето; настройки; korganizer; freebusy; scheduling
 Keywords[bs]=korganizer;freebusy;scheduling;raspored
diff --git a/korganizer/korganizer_configgroupautomation.desktop b/korganizer/korganizer_configgroupautomation.desktop
index 89f46af0..6afe605a 100644
--- a/korganizer/korganizer_configgroupautomation.desktop
+++ b/korganizer/korganizer_configgroupautomation.desktop
@@ -111,7 +111,7 @@ Comment[tr]=KOrganizer Grup Otomasyon Yapılandırması
 Comment[uk]=Налаштування автоматизації груп у KOrganizer
 Comment[zh_CN]=KOrganizer 组自动化配置
 Comment[zh_TW]=KOrganizer 群組自動化設定
-Keywords=korganizer;group;automation
+Keywords=korganizer;group;automation;
 Keywords[af]=korganizer; group; automation
 Keywords[bg]=организатор; организация; настройки; korganizer; group; automation
 Keywords[bs]=korganizer;group;automation;automatizacija;grupa;grupe
diff --git a/korganizer/korganizer_configgroupscheduling.desktop b/korganizer/korganizer_configgroupscheduling.desktop
index ff36d05b..136cf45f 100644
--- a/korganizer/korganizer_configgroupscheduling.desktop
+++ b/korganizer/korganizer_configgroupscheduling.desktop
@@ -112,7 +112,7 @@ Comment[tr]=KOrganizer Grup Zamanlama Yapılandırması
 Comment[uk]=Налаштування групового розкладу в KOrganizer
 Comment[zh_CN]=Korganizer 组日程安排配置
 Comment[zh_TW]=KOrganizer 群組排程設定
-Keywords=korganizer;group;scheduling
+Keywords=korganizer;group;scheduling;
 Keywords[bg]=организатор; разписание; настройки; korganizer; group; scheduling
 Keywords[bs]=korganizer;group;scheduling;raspoređivanje;grupa;grupe
 Keywords[ca]=korganizer;grup;planificació
diff --git a/korganizer/korganizer_configmain.desktop b/korganizer/korganizer_configmain.desktop
index a1ca721d..1944ac24 100644
--- a/korganizer/korganizer_configmain.desktop
+++ b/korganizer/korganizer_configmain.desktop
@@ -118,7 +118,7 @@ Comment[tr]=KOrganizer Temel Yapılandırması
 Comment[uk]=Налаштування особистих даних у KOrganizer
 Comment[zh_CN]=KOrganizer 主要配置
 Comment[zh_TW]=KOrganizer 主設定
-Keywords=korganizer;main;personal
+Keywords=korganizer;main;personal;
 Keywords[bg]=организатор; главни; персонални; настройки; korganizer; main; personal
 Keywords[bs]=korganizer;main;personal;lično
 Keywords[ca]=korganizer;principal;personal
diff --git a/korganizer/korganizer_configplugins.desktop b/korganizer/korganizer_configplugins.desktop
index 6257de92..a3b67e9f 100644
--- a/korganizer/korganizer_configplugins.desktop
+++ b/korganizer/korganizer_configplugins.desktop
@@ -109,7 +109,7 @@ Comment[tr]=KOrganizer Eklenti Yapılandırması
 Comment[uk]=Втулок налаштування KOrganizer
 Comment[zh_CN]=KOrganizer 插件配置
 Comment[zh_TW]=KOrganizer外掛程式設定
-Keywords=korganizer;plugin;module
+Keywords=korganizer;plugin;module;
 Keywords[be]=K Арганізатар;дапаўненне;модуль;korganizer;plugin;module
 Keywords[bg]=организатор; модул; приставка; korganizer; plugin; module
 Keywords[ca]=korganizer;endollable;mòdul
diff --git a/korganizer/korganizer_configtime.desktop b/korganizer/korganizer_configtime.desktop
index 020276c3..fba06b15 100644
--- a/korganizer/korganizer_configtime.desktop
+++ b/korganizer/korganizer_configtime.desktop
@@ -121,7 +121,7 @@ Comment[tr]=KOrganizer Zaman Yapılandırması
 Comment[uk]=Налаштування часу та дати в KOrganizer
 Comment[zh_CN]=KOrganizer 时间配置
 Comment[zh_TW]=KOrganizer 時間設定
-Keywords=korganizer;time
+Keywords=korganizer;time;
 Keywords[be]=K Арганізатар;час;korganizer;time
 Keywords[bg]=организатор; дата; час; настройки; korganizer; time
 Keywords[br]=korganizer;amzer
diff --git a/korganizer/korganizer_configviews.desktop b/korganizer/korganizer_configviews.desktop
index 9310130c..62d2529b 100644
--- a/korganizer/korganizer_configviews.desktop
+++ b/korganizer/korganizer_configviews.desktop
@@ -118,7 +118,7 @@ Comment[tr]=KOrganizer Görünüm Yapılandırması
 Comment[uk]=Налаштування переглядів у KOrganizer
 Comment[zh_CN]=KOrganizer 视图配置
 Comment[zh_TW]=KOrganizer 檢視設定
-Keywords=korganizer;view
+Keywords=korganizer;view;
 Keywords[be]=K Арганізатар;выгляд;korganizer;view
 Keywords[bg]=организатор; изглед; изгледи; настройки; korganizer; view
 Keywords[br]=korganizer;gwell
diff --git a/libtdepim/komposer/core/komposerconfig.desktop b/libtdepim/komposer/core/komposerconfig.desktop
index 5ccbb8b6..3929c7e9 100644
--- a/libtdepim/komposer/core/komposerconfig.desktop
+++ b/libtdepim/komposer/core/komposerconfig.desktop
@@ -37,7 +37,7 @@ Comment[pt_BR]=Konposer do TDE
 Comment[ru]=Композитор TDE
 Comment[ta]=கேடிஇ கம்போசர்
 Comment[tg]=Композитори TDE
-Keywords=komposer
+Keywords=komposer;
 Keywords[bg]=редактор; съставител; форматиране; текст; komposer
 Keywords[ca]=compositor
 Keywords[cy]=komposer;kyfansoddydd