diff --git a/app/systemsettings.desktop b/app/systemsettings.desktop
index ef13be91..e9a467c8 100755
--- a/app/systemsettings.desktop
+++ b/app/systemsettings.desktop
@@ -1,213 +1,213 @@
 [Desktop Entry]
 Exec=systemsettings5
 Icon=preferences-system
 Type=Application
 X-DocPath=systemsettings/index.html
 X-KDE-StartupNotify=true
 OnlyShowIn=KDE;
 
 GenericName=System Settings
 GenericName[ar]=إعدادات النّظام
 GenericName[be@latin]=Systemnyja nałady
 GenericName[bg]=Системни настройки
 GenericName[bn]=সিস্টেম সেটিংস
 GenericName[bn_IN]=সিস্টেম সংক্রান্ত বৈশিষ্ট্য
 GenericName[bs]=Sistemske postavke
 GenericName[ca]=Arranjament del sistema
 GenericName[ca@valencia]=Arranjament del sistema
 GenericName[cs]=Nastavení systému
 GenericName[csb]=Systemòwé ùstôwë
 GenericName[da]=Systemindstillinger
 GenericName[de]=Systemeinstellungen
 GenericName[el]=Ρυθμίσεις συστήματος
 GenericName[en_GB]=System Settings
 GenericName[eo]=Sistema agordo
 GenericName[es]=Preferencias del sistema
 GenericName[et]=Süsteemi seadistused
 GenericName[eu]=Sistema-ezarpenak
 GenericName[fi]=Järjestelmäasetukset
 GenericName[fr]=Configuration du système
 GenericName[fy]=Systeemynstellings
 GenericName[ga]=Socruithe an Chórais
 GenericName[gl]=Configuración do sistema
 GenericName[gu]=સિસ્ટમ ગોઠવણીઓ
 GenericName[he]=הגדרות מערכת
 GenericName[hi]=तंत्र विन्यास
 GenericName[hne]=तंत्र सेटिंग
 GenericName[hr]=Postavke sustava
 GenericName[hu]=Rendszerbeállítások
 GenericName[ia]=Preferentias de systema
 GenericName[id]=System Settings
 GenericName[is]=Kerfisstillingar
 GenericName[it]=Impostazioni di sistema
 GenericName[ja]=システム設定
 GenericName[kk]=Жүйе параметрлері
 GenericName[km]=ការ​កំណត់​ប្រព័ន្ធ​
 GenericName[kn]=ವ್ಯವಸ್ಥೆಯ ಸಂಯೋಜನೆಗಳು
 GenericName[ko]=시스템 설정
 GenericName[ku]=Mîhengên Pergalê
 GenericName[lt]=Sistemos nuostatos
 GenericName[lv]=Sistēmas iestatījumi
 GenericName[mai]=तंत्र बिन्यास
 GenericName[mk]=Системски поставувања
 GenericName[ml]=സിസ്റ്റം സജ്ജീകരണങ്ങള്‍
 GenericName[mr]=प्रणाली संयोजना
 GenericName[nb]=Systeminnstillinger
 GenericName[nds]=Systeeminstellen
 GenericName[nl]=Systeeminstellingen
 GenericName[nn]=Systemoppsett
 GenericName[oc]=Configuracion del sistèma
 GenericName[or]=ତନ୍ତ୍ର ବିନ୍ୟାସ
 GenericName[pa]=ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ
 GenericName[pl]=Ustawienia systemowe
 GenericName[pt]=Configuração do Sistema
 GenericName[pt_BR]=Configurações do sistema
 GenericName[ro]=Configurări de sistem
 GenericName[ru]=Параметры системы
 GenericName[se]=Vuogádatheivehusat
 GenericName[si]=පද්ධති සැකසුම්
 GenericName[sk]=Systémové nastavenia
 GenericName[sl]=Sistemske nastavitve
 GenericName[sr]=Системске поставке
 GenericName[sr@ijekavian]=Системске поставке
 GenericName[sr@ijekavianlatin]=Sistemske postavke
 GenericName[sr@latin]=Sistemske postavke
 GenericName[sv]=Systeminställningar
 GenericName[ta]=System Settings
 GenericName[te]=సిస్టమ్ అమర్పులు
 GenericName[tg]=Танзимотҳои система
 GenericName[th]=ตั้งค่าระบบ
 GenericName[tr]=Sistem Ayarları
 GenericName[ug]=سىستېما تەڭشەكلىرى
 GenericName[uk]=Системні параметри
 GenericName[uz]=Tizim moslamalari
 GenericName[uz@cyrillic]=Тизим мосламалари
 GenericName[wa]=Apontiaedjes do sistinme
 GenericName[x-test]=xxSystem Settingsxx
-GenericName[zh_CN]=System Settings,系统设置
+GenericName[zh_CN]=系统设置
 GenericName[zh_TW]=系統設定
 
 Name=System Settings
 Name[ar]=إعدادات النّظام
 Name[be]=Сістэмныя настаўленні
 Name[be@latin]=Systemnyja nałady
 Name[bg]=Системни настройки
 Name[bn]=সিস্টেম সেটিংস
 Name[bn_IN]=সিস্টেম সংক্রান্ত বৈশিষ্ট্য
 Name[br]=Dibarzhoù ar reizhiad
 Name[bs]=Sistemske postavke
 Name[ca]=Arranjament del sistema
 Name[ca@valencia]=Arranjament del sistema
 Name[cs]=Nastavení systému
 Name[csb]=Systemòwé ùstôwë
 Name[da]=Systemindstillinger
 Name[de]=Systemeinstellungen
 Name[el]=Ρυθμίσεις συστήματος
 Name[en_GB]=System Settings
 Name[eo]=Sistema agordo
 Name[es]=Preferencias del sistema
 Name[et]=Süsteemi seadistused
 Name[eu]=Sistema-ezarpenak
 Name[fa]=تنظیمات سیستم
 Name[fi]=Järjestelmäasetukset
 Name[fr]=Configuration du système
 Name[fy]=Systeemynstellings
 Name[ga]=Socruithe an Chórais
 Name[gl]=Configuración do sistema
 Name[gu]=સિસ્ટમ ગોઠવણીઓ
 Name[he]=הגדרות מערכת
 Name[hi]=तंत्र विन्यास
 Name[hne]=तंत्र सेटिंग
 Name[hr]=Postavke sustava
 Name[hu]=Rendszerbeállítások
 Name[ia]=Preferentias de systema
 Name[id]=System Settings
 Name[is]=Kerfisstillingar
 Name[it]=Impostazioni di sistema
 Name[ja]=KDE システム設定
 Name[kk]=Жүйе параметрлері
 Name[km]=ការ​កំណត់​ប្រព័ន្ធ​
 Name[kn]=ವ್ಯವಸ್ಥೆಯ ಸಂಯೋಜನೆಗಳು
 Name[ko]=시스템 설정
 Name[ku]=Mîhengên Pergalê
 Name[lt]=Sistemos nuostatos
 Name[lv]=Sistēmas iestatījumi
 Name[mai]=तंत्र बिन्यास
 Name[mk]=Системски поставувања
 Name[ml]=സിസ്റ്റം സജ്ജീകരണങ്ങള്‍
 Name[mr]=प्रणाली संयोजना
 Name[nb]=Systemoppsett
 Name[nds]=Systeeminstellen
 Name[ne]=प्रणाली सेटिङ
 Name[nl]=Systeeminstellingen
 Name[nn]=Systemoppsett
 Name[oc]=Configuracion del sistèma
 Name[or]=ତନ୍ତ୍ର ବିନ୍ୟାସ
 Name[pa]=ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ
 Name[pl]=Ustawienia systemowe
 Name[pt]=Configuração do Sistema
 Name[pt_BR]=Configurações do sistema
 Name[ro]=Configurări de sistem
 Name[ru]=Параметры системы
 Name[se]=Vuogádatheivehusat
 Name[si]=පද්ධති සැකසුම්
 Name[sk]=Systémové nastavenia
 Name[sl]=Sistemske nastavitve
 Name[sr]=Системске поставке
 Name[sr@ijekavian]=Системске поставке
 Name[sr@ijekavianlatin]=Sistemske postavke
 Name[sr@latin]=Sistemske postavke
 Name[sv]=Systeminställningar
 Name[ta]=System Settings
 Name[te]=సిస్టమ్ అమర్పులు
 Name[tg]=Танзимотҳои система
 Name[th]=ตั้งค่าระบบ
 Name[tr]=Sistem Ayarları
 Name[ug]=سىستېما تەڭشەكلىرى
 Name[uk]=Системні параметри
 Name[uz]=Tizim moslamalari
 Name[uz@cyrillic]=Тизим мосламалари
 Name[wa]=Apontiaedjes do sistinme
 Name[x-test]=xxSystem Settingsxx
-Name[zh_CN]=System Settings,系统设置
+Name[zh_CN]=系统设置
 Name[zh_TW]=系統設定
 
 Comment=Configuration tools for your computer
 Comment[ca]=Eines de configuració per a l'ordinador
 Comment[ca@valencia]=Eines de configuració per a l'ordinador
 Comment[cs]=Konfigurační nástroje pro váš počítač
 Comment[da]=Konfigurationsværktøjer til din computer
 Comment[de]=Einstellungen für Ihren Rechner
 Comment[el]=Εργαλεία διαμόρφωσης για τον υπολογιστή σας
 Comment[en_GB]=Configuration tools for your computer
 Comment[es]=Herramientas de configuración para su equipo
 Comment[eu]=Zure ordenagailurako konfiguratzeko tresnak
 Comment[fi]=Tietokoneesi asetustyökaluja
 Comment[fr]=Outils de configuration pour votre ordinateur
 Comment[gl]=Ferramentas de configuración para o computador.
 Comment[hu]=Beállítóeszközök számítógépéhez
 Comment[id]=Alat konfigurasi untuk komputermu
 Comment[it]=Strumenti di configurazione per il tuo computer
 Comment[ko]=컴퓨터 설정 도구
 Comment[nl]=Hulpmiddelen voor configuratie voor uw computer
 Comment[nn]=Oppsettverktøy for datamaskina
 Comment[pa]=ਆਪਣੇ ਕੰਪਿਊਟਰ ਲਈ ਸੰਰਚਨਾ ਟੂਲ
 Comment[pl]=Narzędzia ustawień dla twojego komputera
 Comment[pt]=Ferramentas de configuração para o seu computador
 Comment[pt_BR]=Ferramentas de configuração para seu computador
 Comment[ru]=Инструменты для настройки компьютера
 Comment[sk]=Koniguračné nástroje pre váš počítač
 Comment[sl]=Nastavitvena orodja za vaš računalnik
 Comment[sr]=Алатке за подешавање рачунара
 Comment[sr@ijekavian]=Алатке за подешавање рачунара
 Comment[sr@ijekavianlatin]=Alatke za podešavanje računara
 Comment[sr@latin]=Alatke za podešavanje računara
 Comment[sv]=Inställningsverktyg för datorn
 Comment[tr]=Bilgisayarınız için yapılandırma araçları
 Comment[uk]=Інструменти для налаштовування вашого комп'ютера
 Comment[x-test]=xxConfiguration tools for your computerxx
 Comment[zh_CN]=您的计算机的配置工具
 Comment[zh_TW]=提供給您電腦的配置工具
 X-DBUS-StartupType=Unique
 X-DBUS-ServiceName=org.kde.systemsettings
 Categories=Qt;KDE;Settings;
diff --git a/categories/old/settings-locale.desktop b/categories/old/settings-locale.desktop
index 3ada1e4b..e5f68adc 100644
--- a/categories/old/settings-locale.desktop
+++ b/categories/old/settings-locale.desktop
@@ -1,71 +1,71 @@
 [Desktop Entry]
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=locale
 X-KDE-System-Settings-Parent-Category=application-appearance-and-behavior
 Icon=preferences-desktop-locale
 
 Name=Locale
 Name[ar]=المحليّة
 Name[bn]=লোকেল
 Name[bs]=Lokalitet
 Name[ca]=Configuració regional
 Name[ca@valencia]=Configuració regional
 Name[cs]=Lokalizace
 Name[da]=Lokalitet
 Name[de]=Regionales
 Name[el]=Τοπικότητα
 Name[en_GB]=Locale
 Name[es]=Local
 Name[et]=Keeleseadistused
 Name[eu]=Eskualde-ezarpenak
 Name[fi]=Alue ja kieli
 Name[fr]=Localisation
 Name[ga]=Logchaighdeán
 Name[gl]=Configuración rexional
 Name[gu]=સ્થાનિય
 Name[he]=מיקום
 Name[hi]=लोकेल
 Name[hr]=Lokalne postavke
 Name[hu]=Nyelvi beállítások
 Name[ia]=Local
 Name[id]=Lokal
 Name[is]=Staðfærsla
 Name[it]=Localizzazione
 Name[ja]=ロケール
 Name[ka]=ენა
 Name[kk]=Жергілікті стандарттар
 Name[km]=មូលដ្ឋាន
 Name[kn]=ಪ್ರಾದೇಶಿಕ
 Name[ko]=로캘
 Name[lt]=Lokalė
 Name[lv]=Lokāle
 Name[mr]=स्थानिक
 Name[nb]=Lokale
 Name[nds]=Spraakinstellen
 Name[nl]=Taalregio
 Name[nn]=Land og språk
 Name[pa]=ਲੋਕੇਲ
 Name[pl]=Ustawienia regionalne
 Name[pt]=Localização
 Name[pt_BR]=Localização
 Name[ro]=Localizare
 Name[ru]=Локаль
 Name[si]=ස්ථානය
 Name[sk]=Lokalizácia
 Name[sl]=Krajevne nastavitve
 Name[sr]=Локалитет
 Name[sr@ijekavian]=Локалитет
 Name[sr@ijekavianlatin]=Lokalitet
 Name[sr@latin]=Lokalitet
 Name[sv]=Plats
 Name[tg]=Маҳаллӣ
 Name[th]=ภาษาระบบ
 Name[tr]=Yerel
 Name[ug]=رايون
 Name[uk]=Локаль
 Name[vi]=Vùng
 Name[wa]=Lingaedje/payis
 Name[x-test]=xxLocalexx
-Name[zh_CN]=语系
+Name[zh_CN]=区域设置
 Name[zh_TW]=地域
diff --git a/categories/settings-personalization-applications.desktop b/categories/settings-personalization-applications.desktop
index 9e57ba89..0ef342ff 100644
--- a/categories/settings-personalization-applications.desktop
+++ b/categories/settings-personalization-applications.desktop
@@ -1,55 +1,55 @@
 [Desktop Entry]
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=applications
 X-KDE-System-Settings-Parent-Category=personalization
 X-KDE-Weight=70
 Icon=preferences-desktop-default-applications
 
 Name=Applications
 Name[ar]=التّطبيقات
 Name[bs]=Aplikacije
 Name[ca]=Aplicacions
 Name[ca@valencia]=Aplicacions
 Name[cs]=Aplikace
 Name[da]=Programmer
 Name[de]=Anwendungen
 Name[el]=Εφαρμογές
 Name[en_GB]=Applications
 Name[es]=Aplicaciones
 Name[et]=Rakendused
 Name[eu]=Aplikazioak
 Name[fi]=Sovellukset
 Name[fr]=Applications
 Name[gl]=Aplicativos
 Name[he]=יישומים
 Name[hu]=Alkalmazások
 Name[ia]=Applicationes
 Name[id]=Aplikasi
 Name[it]=Applicazioni
 Name[ja]=アプリケーション
 Name[ko]=응용 프로그램
 Name[lt]=Programos
 Name[nb]=Programmer
 Name[nds]=Programmen
 Name[nl]=Toepassingen
 Name[nn]=Program
 Name[pa]=ਐਪਲੀਕੇਸ਼ਨ
 Name[pl]=Programy
 Name[pt]=Aplicações
 Name[pt_BR]=Aplicativos
 Name[ro]=Aplicații
 Name[ru]=Приложения
 Name[se]=Prográmmat
 Name[sk]=Aplikácie
 Name[sl]=Programi
 Name[sr]=Програми
 Name[sr@ijekavian]=Програми
 Name[sr@ijekavianlatin]=Programi
 Name[sr@latin]=Programi
 Name[sv]=Program
 Name[tr]=Uygulamalar
 Name[uk]=Програми
 Name[x-test]=xxApplicationsxx
-Name[zh_CN]=应用版本
+Name[zh_CN]=应用程序
 Name[zh_TW]=應用程式