Revert "generic: change system settings and kcontrol grouping (part 1)"

This reverts commit 726e6c5213.

kcontrol/CMakeLists.txt

@@ -18,14 +18,7 @@ if(X11_Xkb_FOUND)
     add_subdirectory( keyboard )
 endif(X11_Xkb_FOUND)
 
-add_subdirectory( display )
-add_subdirectory( mouse )
-
-if (CMAKE_SYSTEM_NAME MATCHES Linux)
-   # this one doesn't seem to be very portable, Alex
-   add_subdirectory( joystick ) 
-endif (CMAKE_SYSTEM_NAME MATCHES Linux)
-
+add_subdirectory( input )
 add_subdirectory( access )
 add_subdirectory( screensaver )
 add_subdirectory( dateandtime )
@@ -56,6 +49,7 @@ add_subdirectory( kdebug )
 # TODO needs porting
 #add_subdirectory( smartcard )
 
+add_subdirectory( hardware )
 add_subdirectory( desktoppaths )
 
 if(FONTCONFIG_FOUND AND FREETYPE_FOUND)

kcontrol/autostart/autostart.desktop

@@ -8,7 +8,7 @@ X-DocPath=kcontrol/autostart/index.html
 X-KDE-Library=kcm_autostart
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=workspace-behavior
+X-KDE-System-Settings-Parent-Category=startup-and-shutdown
 
 Name=Autostart
 Name[af]=Outomatiese begin

kcontrol/componentchooser/componentchooser.desktop

@@ -7,7 +7,7 @@ X-KDE-ServiceTypes=KCModule
 X-KDE-Library=kcm_componentchooser
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=workspace-behavior
+X-KDE-System-Settings-Parent-Category=workspace-appearance-and-behavior
 X-DocPath=kcontrol/componentchooser/index.html
 
 Name=Default Applications

kcontrol/dnssd/kcm_kdnssd.desktop

@@ -189,5 +189,5 @@ X-KDE-ParentApp=kcontrol
 X-KDE-SubstituteUID=false
 X-KDE-RootOnly=true
 Categories=Qt;KDE;X-KDE-settings-network;
-X-KDE-System-Settings-Parent-Category=network-and-connectivity
+X-KDE-System-Settings-Parent-Category=network-settings
 X-KDE-Weight=70

kcontrol/hardware/CMakeLists.txt

@@ -0,0 +1,9 @@
+
+add_subdirectory( display ) 
+
+if (CMAKE_SYSTEM_NAME MATCHES Linux)
+   # this one doesn't seem to be very portable, Alex
+   add_subdirectory( joystick ) 
+endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+
+

kcontrol/hardware/display/display.desktop

@@ -3,7 +3,7 @@ Exec=kcmshell4 display
 Icon=preferences-desktop-display
 Type=Service
 X-KDE-ServiceTypes=KCModule
-X-KDE-System-Settings-Parent-Category=hardware
+
 X-KDE-Library=kcm_display
 X-KDE-ParentApp=kcontrol
 

kcontrol/hardware/joystick/joystick.desktop

@@ -10,7 +10,7 @@ Categories=Qt;KDE;X-KDE-settings-hardware;
 X-KDE-ServiceTypes=KCModule
 X-KDE-Library=kcm_joystick
 X-KDE-Test-Module=true
-X-KDE-System-Settings-Parent-Category=hardware
+X-KDE-System-Settings-Parent-Category=input-devices
 X-KDE-ParentApp=kcontrol
 X-KDE-Weight=70
 

kcontrol/input/mouse.desktop

@@ -9,7 +9,7 @@ X-KDE-Library=kcm_input
 X-KDE-Init-Symbol=mouse
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=hardware
+X-KDE-System-Settings-Parent-Category=input-devices
 X-KDE-Weight=60
 
 Name=Mouse

kcontrol/kded/kcmkded.desktop

@@ -7,7 +7,7 @@ X-KDE-ServiceTypes=KCModule
 X-KDE-Library=kcm_kded
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=workspace-behavior
+X-KDE-System-Settings-Parent-Category=startup-and-shutdown
 X-DocPath=kcontrol/kded/index.html
 
 Name=Service Manager

kcontrol/keyboard/kcm_keyboard.desktop

@@ -10,7 +10,7 @@ X-KDE-Library=kcm_keyboard
 X-KDE-Init-Symbol=keyboard
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=hardware
+X-KDE-System-Settings-Parent-Category=input-devices
 X-KDE-Weight=50
 OnlyShowIn=KDE;
 

kcontrol/kfontinst/lib/FcEngine.h

@@ -49,7 +49,7 @@ class KDE_EXPORT CFcEngine
 {
     public:
 
-    class Xft;
+    struct Xft;
     
     struct TRange
     {

kcontrol/knotify/kcmnotify.desktop

@@ -8,7 +8,7 @@ X-DocPath=kcontrol/kcmnotify/index.html
 X-KDE-Library=kcm_knotify
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=workspace-behavior
+X-KDE-System-Settings-Parent-Category=application-and-system-notifications
 X-KDE-Weight=50
 
 Name=Manage Notifications

kcontrol/knotify/knotify.h

@@ -58,6 +58,8 @@ private:
     KComboBox *m_appCombo;
     KNotifyConfigWidget *m_notifyWidget;
     PlayerSettingsDialog *m_playerSettings;
+    QPushButton *m_psb;
+
 };
 
 class PlayerSettingsDialog : public QWidget

kcontrol/launch/kcmlaunch.desktop

@@ -8,7 +8,7 @@ Exec=kcmshell4 kcmlaunch
 X-KDE-Library=kcm_launch
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=workspace-behavior
+X-KDE-System-Settings-Parent-Category=application-and-system-notifications
 X-KDE-Weight=80
 
 Name=Launch Feedback

kcontrol/randr/randr.desktop

@@ -8,7 +8,7 @@ X-KDE-ParentApp=kcontrol
 #This is always false when kbuildsycoca runs, probably because it is now a QCoreApplication
 #Hidden[$e]=$(if xdpyinfo|grep RANDR > /dev/null; then echo "false"; else echo "true"; fi)
 
-X-KDE-System-Settings-Parent-Category=hardware
+X-KDE-System-Settings-Parent-Category=display
 X-KDE-Weight=50
 
 Name=Size & Orientation

kcontrol/screensaver/screensaver.desktop

@@ -8,7 +8,7 @@ X-DocPath=kcontrol/screensaver/index.html
 X-KDE-Library=kcm_screensaver
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=workspace-behavior
+X-KDE-System-Settings-Parent-Category=display
 X-KDE-Weight=70
 
 Name=Screen Locker

keditfiletype/filetypes.desktop

@@ -7,7 +7,7 @@ X-DocPath=kcontrol/filetypes/index.html
 
 X-KDE-Library=kcm_filetypes
 X-KDE-ParentApp=kcontrol
-X-KDE-System-Settings-Parent-Category=workspace-behavior
+X-KDE-System-Settings-Parent-Category=application-appearance-and-behavior
 
 Name=File Associations
 Name[af]=Lêer Assosiasies

powerdevil/kcmodule/global/powerdevilglobalconfig.desktop

@@ -8,7 +8,7 @@ X-DocPath=kcontrol/powerdevil/index.html#advanced-settings
 X-KDE-Library=kcm_powerdevilglobalconfig
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=hardware
+X-KDE-System-Settings-Parent-Category=power-management
 X-KDE-Weight=99
 
 Name=Advanced Settings

powerdevil/kcmodule/profiles/powerdevilprofilesconfig.desktop

@@ -8,7 +8,7 @@ X-DocPath=kcontrol/powerdevil/index.html
 X-KDE-Library=kcm_powerdevilprofilesconfig
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=hardware
+X-KDE-System-Settings-Parent-Category=power-management
 X-KDE-Weight=1
 
 Name=Energy Saving

systemsettings/app/SettingsBase.cpp

@@ -194,9 +194,11 @@ void SettingsBase::initMenuList(MenuItem * parent)
     for (int i = 0; i < categories.size(); ++i) {
         const KService::Ptr entry = categories.at(i);
         const QString parentCategory = entry->property("X-KDE-System-Settings-Parent-Category").toString();
-        if ( parentCategory == parent->category() ) {
-            MenuItem * categoryItem = new MenuItem(true, parent);
-            MenuItem * menuItem = new MenuItem(true, categoryItem);
+        const QString parentCategory2 = entry->property("X-KDE-System-Settings-Parent-Category-V2").toString();
+        if ( parentCategory == parent->category() ||
+             // V2 entries must not be empty if they want to become a proper category.
+             ( !parentCategory2.isEmpty() && parentCategory2 == parent->category() ) ) {
+            MenuItem * menuItem = new MenuItem(true, parent);
             menuItem->setService( entry );
             if( menuItem->category() == "lost-and-found" ) {
                 lostFound = menuItem;
@@ -212,7 +214,8 @@ void SettingsBase::initMenuList(MenuItem * parent)
     for (int i = 0; i < modules.size(); ++i) {
         const KService::Ptr entry = modules.at(i);
         const QString category = entry->property("X-KDE-System-Settings-Parent-Category").toString();
-        if( !parent->category().isEmpty() && category == parent->category() ) {
+        const QString category2 = entry->property("X-KDE-System-Settings-Parent-Category-V2").toString();
+        if( !parent->category().isEmpty() && (category == parent->category() || category2 == parent->category()) ) {
             // Add the module info to the menu
             MenuItem * infoItem = new MenuItem(false, parent);
             infoItem->setService( entry );

systemsettings/categories/CMakeLists.txt

@@ -3,18 +3,33 @@ install( FILES systemsettingscategory.desktop DESTINATION  ${SERVICETYPES_INSTAL
 
 install( FILES 
                settings-accessibility.desktop
-               settings-accessibility.desktop
-               settings-network-and-connectivity.desktop
                settings-account-details.desktop
-               settings-permissions.desktop
+               settings-application-and-system-notifications.desktop
+               settings-application-appearance-and-behavior.desktop
+               settings-application-appearance.desktop
                settings-audio-and-video.desktop
-               settings-personal-information.desktop
                settings-desktop-appearance.desktop
-               settings-shortcuts-and-gestures.desktop
+               settings-display.desktop
                settings-hardware.desktop
-               settings-system-administration.desktop
+               settings-input-devices.desktop
                settings-locale.desktop
-               settings-workspace-behavior.desktop
                settings-lost-and-found.desktop
+               settings-network-and-connectivity.desktop
+               settings-network-settings.desktop
+               settings-permissions.desktop
+               settings-personal-information.desktop
+               settings-power-management.desktop
+               settings-removable-devices.desktop
+               settings-shortcuts-and-gestures.desktop
+               settings-startup-and-shutdown.desktop
+               settings-system-administration.desktop
+               settings-window-behaviour.desktop
+               settings-workspace-appearance-and-behavior.desktop
+               settings-workspace-behavior.desktop
          DESTINATION  ${SERVICES_INSTALL_DIR} )
 
+install( FILES 
+         settings-bluetooth.desktop
+         #settings-desktop.desktop
+         settings-sharing.desktop
+         DESTINATION  ${SERVICES_INSTALL_DIR} )

systemsettings/categories/settings-accessibility.desktop

@@ -2,6 +2,7 @@
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=accessibility
+X-KDE-System-Settings-Parent-Category=workspace-appearance-and-behavior
 Icon=preferences-desktop-accessibility
 
 Name=Accessibility

systemsettings/categories/settings-account-details.desktop

@@ -2,6 +2,7 @@
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=account-details
+X-KDE-System-Settings-Parent-Category=application-appearance-and-behavior
 Icon=preferences-desktop-user
 
 Name=Account Details

systemsettings/categories/settings-application-and-system-notifications.desktop

@@ -0,0 +1,70 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=SystemSettingsCategory
+X-KDE-System-Settings-Category=application-and-system-notifications
+X-KDE-System-Settings-Parent-Category=application-appearance-and-behavior
+Icon=preferences-desktop-notification
+
+Name=Application and System Notifications
+Name[ar]=تنبيهات التطبيقات والنظام
+Name[ast]=Notificaciones d'aplicaciones y del sistema
+Name[bg]=Програмни и системни съобщения
+Name[bn]=অ্যাপলিকেশন এবং সিস্টেম বিজ্ঞপ্তি
+Name[bs]=Sistemska i programska obavještenja
+Name[ca]=Notificacions de les aplicacions i del sistema
+Name[ca@valencia]=Notificacions de les aplicacions i del sistema
+Name[cs]=Oznamování aplikací a systému
+Name[da]=Program- og systembekendtgørelser
+Name[de]=Anwendungs- und Systembenachrichtigungen
+Name[el]=Ειδοποιήσεις εφαρμογών και συστήματος
+Name[en_GB]=Application and System Notifications
+Name[es]=Notificaciones de aplicaciones y del sistema
+Name[et]=Rakenduste ja süsteemi märguanded
+Name[eu]=Aplikazio- eta sistema-jakinarazpenak
+Name[fi]=Ohjelma- ja järjestelmäilmoitukset
+Name[fr]=Notifications des applications et du système
+Name[gl]=Notificacións dos programas e do sistema
+Name[he]=הודעות מערכת והודעות יישום
+Name[hi]=अनुप्रयोग व तंत्र सूचनाएँ
+Name[hr]=Obavijesti sustava i aplikacija
+Name[hu]=Alkalmazás- és rendszerértesítések
+Name[ia]=Applicationes e notificationes de systema
+Name[id]=Notifikasi Sistem dan Aplikasi
+Name[is]=Tilkynningar kerfis og forrita
+Name[it]=Notifiche delle applicazioni e di sistema
+Name[ja]=アプリケーションとシステムの通知
+Name[kk]=Қолданба мен жүйелік құлақтандырулары
+Name[km]=កា​រជូនដំណឹង​ប្រព័ន្ធ និង​កម្មវិធី​
+Name[kn]=ಅನ್ವಯ ಹಾಗು ವ್ಯವಸ್ಥೆಯ ಸೂಚನೆಗಳು
+Name[ko]=프로그램 및 시스템 알림
+Name[lt]=Programų ir sistemos pranešimai
+Name[lv]=Programmu un sistēmas paziņojumi
+Name[mr]=अनुप्रयोग व प्रणाली सूचना
+Name[nb]=Program- og systemvarsler
+Name[nds]=Programm- un Systeembescheden
+Name[nl]=Programma- en systeemmeldingen
+Name[nn]=Program- og system­varslingar
+Name[pa]=ਐਪਲੀਕੇਸ਼ਨ ਤੇ ਸਿਸਟਮ ਨੋਟੀਫਿਕੇਸ਼ਨ
+Name[pl]=Powiadomienia programów i systemu
+Name[pt]=Notificações das Aplicações e do Sistema
+Name[pt_BR]=Notificações dos aplicativos e do sistema
+Name[ro]=Notificare aplicații și sistem
+Name[ru]=Уведомления
+Name[si]=යෙදුම් සහ පද්ධති දැනුම්දීම්
+Name[sk]=Upozornenia aplikácií a systému
+Name[sl]=Obvestila programov in sistema
+Name[sr]=Системска и програмска обавештења
+Name[sr@ijekavian]=Системска и програмска обавјештења
+Name[sr@ijekavianlatin]=Sistemska i programska obavještenja
+Name[sr@latin]=Sistemska i programska obaveštenja
+Name[sv]=Program- och systemunderrättelser
+Name[tg]=Барномаҳо ва огоҳномаҳои система
+Name[th]=การแจ้งให้ทราบของโปรแกรมและระบบ
+Name[tr]=Uygulama ve Sistem Bildirimleri
+Name[ug]=پروگرامما ۋە سىستېما ئۇقتۇرۇشى
+Name[uk]=Сповіщення програм і системи
+Name[vi]=Thông báo hệ thống và ứng dụng
+Name[wa]=Notifiaedjes des programes eyet do sistinme
+Name[x-test]=xxApplication and System Notificationsxx
+Name[zh_CN]=应用程序和系统通知
+Name[zh_TW]=應用程式與系統通知

systemsettings/categories/settings-application-appearance-and-behavior.desktop

@@ -0,0 +1,66 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=SystemSettingsCategory
+X-KDE-System-Settings-Category=application-appearance-and-behavior
+X-KDE-System-Settings-Parent-Category=
+X-KDE-Weight=80
+Icon=preferences-desktop-theme
+
+Name=Common Appearance and Behavior
+Name[ar]=المظهر والسلوك المشتركان
+Name[ast]=Apariencia y comportamientu comunes
+Name[bg]=Общ изглед и поведение
+Name[bn]=সাধারণ চেহারা এবং আচরণ
+Name[bs]=Opšti izgled i ponašanje
+Name[ca]=Aparença i comportament usual
+Name[ca@valencia]=Aparença i comportament usual
+Name[da]=Fælles udseende og opførsel
+Name[de]=Allgemeines Erscheinungsbild und Verhalten
+Name[el]=Κοινή εμφάνιση και συμπεριφορά
+Name[en_GB]=Common Appearance and Behaviour
+Name[es]=Apariencia y comportamiento comunes
+Name[et]=Üldine välimus ja käitumine
+Name[eu]=Itxura eta portaera arruntak
+Name[fi]=Yleinen ulkoasu ja toiminta
+Name[gl]=Aparencia e comportamento comúns
+Name[he]=התנהגות ומראה אחידים
+Name[hi]=सामान्य रूप व स्वभाव
+Name[hr]=Zajednički izgled i ponašanje
+Name[hu]=Általános megjelenés és működés
+Name[ia]=Apparentia e comportamento commun
+Name[id]=Perilaku dan Tampilan Umum
+Name[is]=Sameiginlegt útlit og hegðun
+Name[kk]=Жалпы көрнісі мен тәртібі
+Name[km]=រូបរាង និង​ឥរិយាបថ​ធម្មតា​
+Name[kn]=ಸಾಮಾನ್ಯ ಗೋಚರಿಕೆ ಹಾಗು ವರ್ತನೆ
+Name[ko]=공통 모양과 행동
+Name[lt]=Bendra išvaizda ir elgsena
+Name[lv]=Tipisks izskats un izturēšanās
+Name[mr]=सामान्य दर्शनीयता व वर्तन
+Name[nb]=Felles utseende og oppførsel
+Name[nds]=Allmeen Utsehn un Bedregen
+Name[nl]=Gemeenschappelijk uiterlijk en gedrag
+Name[nn]=Vanleg utsjånad og oppførsel
+Name[pa]=ਆਮ ਦਿੱਖ ਤੇ ਰਵੱਈਆ
+Name[pl]=Powszechny wygląd i zachowanie
+Name[pt]=Aparência e Comportamento Comuns
+Name[pt_BR]=Aparência e comportamento comuns
+Name[ro]=Aspect și comportament comun
+Name[ru]=Основные параметры внешнего вида и поведения
+Name[sk]=Spoločný vzhľad a správanie
+Name[sl]=Splošen videz in obnašanje
+Name[sr]=Општи изглед и понашање
+Name[sr@ijekavian]=Општи изглед и понашање
+Name[sr@ijekavianlatin]=Opšti izgled i ponašanje
+Name[sr@latin]=Opšti izgled i ponašanje
+Name[sv]=Gemensamt utseende och beteende
+Name[tg]=Намуди зоҳирӣ ва рафтори умумӣ
+Name[th]=รูปลักษณ์และพฤติกรรมทั่วไป
+Name[tr]=Genel Görünüm ve Davranış
+Name[ug]=ئاممىۋى قىياپەت ۋە مەشغۇلات
+Name[uk]=Загальний вигляд і поведінка
+Name[vi]=Diện mạo và hành vi chung
+Name[wa]=Comone rivnance eyet dujhance
+Name[x-test]=xxCommon Appearance and Behaviorxx
+Name[zh_CN]=公共外观和行为
+Name[zh_TW]=通用外觀與行為

systemsettings/categories/settings-application-appearance.desktop

@@ -0,0 +1,70 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=SystemSettingsCategory
+X-KDE-System-Settings-Category=application-appearance
+X-KDE-System-Settings-Parent-Category=application-appearance-and-behavior
+Icon=preferences-desktop-theme
+
+Name=Application Appearance
+Name[ar]=مظهر التطبيقات
+Name[ast]=Apariencia de les aplicaciones
+Name[bg]=Изглед на програмите
+Name[bn]=অ্যাপলিকেশন-এর চেহারা
+Name[bs]=Izgled programa
+Name[ca]=Aparença de les aplicacions
+Name[ca@valencia]=Aparença de les aplicacions
+Name[cs]=Vzhled aplikací
+Name[da]=Programmers udseende
+Name[de]=Erscheinungsbild von Anwendungen
+Name[el]=Εμφάνιση εφαρμογών
+Name[en_GB]=Application Appearance
+Name[es]=Apariencia de las aplicaciones
+Name[et]=Rakenduste välimus
+Name[eu]=Aplikazioen itxura
+Name[fi]=Sovellusten ulkoasu
+Name[fr]=Apparence des applications
+Name[gl]=Aparencia dos programas
+Name[he]=מראה יישום
+Name[hi]=अनुप्रयोग रूप
+Name[hr]=Izgled aplikacija
+Name[hu]=Az alkalmazások megjelenése
+Name[ia]=Apparentia de application
+Name[id]=Tampilan Aplikasi
+Name[is]=Útlit forrita
+Name[it]=Aspetto delle applicazioni
+Name[ja]=アプリケーションの外観
+Name[kk]=Қолданба көрінісі
+Name[km]=រូបរាង​កម្មវិធី​
+Name[kn]=ಅನ್ವಯ ಗೋಚರಿಕೆ
+Name[ko]=프로그램 모양
+Name[lt]=Programų išvaizda
+Name[lv]=Programmu izskats
+Name[mr]=अनुप्रयोग दर्शनीयता
+Name[nb]=Programutseende
+Name[nds]=Programmutsehn
+Name[nl]=Uiterlijk van programma
+Name[nn]=Program­utsjånad
+Name[pa]=ਐਪਲੀਕੇਸ਼ਨ ਦਿੱਖ
+Name[pl]=Wygląd programów
+Name[pt]=Aparência das Aplicações
+Name[pt_BR]=Aparência dos aplicativos
+Name[ro]=Aspect aplicații
+Name[ru]=Оформление приложений
+Name[si]=යෙදුම් පෙනුම
+Name[sk]=Vzhľad aplikácií
+Name[sl]=Videz programov
+Name[sr]=Изглед програма
+Name[sr@ijekavian]=Изглед програма
+Name[sr@ijekavianlatin]=Izgled programa
+Name[sr@latin]=Izgled programa
+Name[sv]=Programutseende
+Name[tg]=Намуди зоҳирии барнома
+Name[th]=รูปลักษณ์ของโปรแกรม
+Name[tr]=Uygulama Görünümü
+Name[ug]=پروگرامما كۆرۈنۈشى
+Name[uk]=Вигляд вікон програм
+Name[vi]=Diện mạo ứng dụng
+Name[wa]=Rivnance des programes
+Name[x-test]=xxApplication Appearancexx
+Name[zh_CN]=应用程序外观
+Name[zh_TW]=應用程式外觀

systemsettings/categories/settings-audio-and-video.desktop

@@ -2,6 +2,7 @@
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=audio-and-video
+X-KDE-System-Settings-Parent-Category=hardware
 X-KDE-Weight=200
 Icon=applications-multimedia
 

systemsettings/categories/settings-bluetooth.desktop

@@ -0,0 +1,93 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=SystemSettingsCategory
+X-KDE-System-Settings-Category=bluetooth
+X-KDE-System-Settings-Parent-Category=network-and-connectivity
+Icon=preferences-system-bluetooth
+
+Name=Bluetooth
+Name[ar]=بلوتوث
+Name[ast]=Bluetooth
+Name[be]=Bluetooth
+Name[be@latin]=Bluetooth
+Name[bg]=Bluetooth
+Name[bn]=ব্লু-টুথ
+Name[bn_IN]=ব্লু-টুথ
+Name[bs]=Blutut
+Name[ca]=Bluetooth
+Name[ca@valencia]=Bluetooth
+Name[cs]=Bluetooth
+Name[csb]=Bluetooth
+Name[da]=Bluetooth
+Name[de]=Bluetooth
+Name[el]=Bluetooth
+Name[en_GB]=Bluetooth
+Name[eo]=Bluetooth
+Name[es]=Bluetooth
+Name[et]=Bluetooth
+Name[eu]=Bluetootha
+Name[fa]=بلوتوث
+Name[fi]=Bluetooth
+Name[fr]=Bluetooth
+Name[fy]=Bluetooth
+Name[ga]=Bluetooth
+Name[gl]=Bluetooth
+Name[gu]=બ્લ્યુટુથ
+Name[he]=Bluetooth
+Name[hi]=ब्लूटूथ
+Name[hne]=ब्लूटूथ
+Name[hr]=Bluetooth
+Name[hu]=Bluetooth
+Name[ia]=Bluetooth
+Name[id]=Bluetooth
+Name[is]=Blátönn
+Name[it]=Bluetooth
+Name[ja]=Bluetooth
+Name[ka]=Bluetooth
+Name[kk]=Bluetooth
+Name[km]=ប៊្លូសធូស
+Name[kn]=ಬ್ಲೂಟೂತ್
+Name[ko]=블루투스
+Name[ku]=Bluetooth
+Name[lt]=Bluetooth
+Name[lv]=Bluetooth
+Name[mai]=ब्लूटूथ
+Name[mk]=Bluetooth
+Name[ml]=ബ്ലൂടൂത്ത്
+Name[mr]=ब्लूटूथ
+Name[ms]=Bluetooth
+Name[nb]=Bluetooth
+Name[nds]=Bluetooth
+Name[ne]=ब्लुटुथ
+Name[nl]=Bluetooth
+Name[nn]=Bluetooth
+Name[or]=ବ୍ଲୁଟୁଥ
+Name[pa]=ਬਲਿਊਟੁੱਥ
+Name[pl]=Bluetooth
+Name[pt]=Bluetooth
+Name[pt_BR]=Bluetooth
+Name[ro]=Bluetooth
+Name[ru]=Bluetooth
+Name[se]=Bluetooth
+Name[si]=Bluetooth
+Name[sk]=Bluetooth
+Name[sl]=Bluetooth
+Name[sr]=Блутут
+Name[sr@ijekavian]=Блутут
+Name[sr@ijekavianlatin]=Bluetooth
+Name[sr@latin]=Bluetooth
+Name[sv]=Blåtand
+Name[ta]=Bluetooth
+Name[te]=బ్లూటూత్
+Name[tg]=Bluetooth
+Name[th]=บลูทูธ
+Name[tr]=Bluetooth
+Name[ug]=كۆكچىش
+Name[uk]=Bluetooth
+Name[uz]=Bluetooth
+Name[uz@cyrillic]=Bluetooth
+Name[vi]=Bluetooth 
+Name[wa]=Bluetooth
+Name[x-test]=xxBluetoothxx
+Name[zh_CN]=蓝牙
+Name[zh_TW]=藍牙

systemsettings/categories/settings-desktop-appearance.desktop

@@ -2,6 +2,7 @@
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=desktop-appearance
+X-KDE-System-Settings-Parent-Category=workspace-appearance-and-behavior
 X-KDE-Weight=80
 Icon=preferences-desktop-theme
 

systemsettings/categories/settings-display.desktop

@@ -0,0 +1,160 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=SystemSettingsCategory
+X-KDE-System-Settings-Category=display
+X-KDE-System-Settings-Parent-Category=hardware
+Icon=preferences-desktop-display
+
+Name=Display and Monitor
+Name[ar]=العرض والشاشة
+Name[ast]=Pantalla y monitor
+Name[bg]=Екран и монитор
+Name[bn]=ডিসপ্লে ও মনিটর
+Name[bs]=Prikaz i monitor
+Name[ca]=Pantalla i monitor
+Name[ca@valencia]=Pantalla i monitor
+Name[cs]=Obrazovka a monitor
+Name[da]=Skærm
+Name[de]=Anzeige und Monitor
+Name[el]=Απεικόνιση και οθόνη
+Name[en_GB]=Display and Monitor
+Name[es]=Pantalla y monitor
+Name[et]=Ekraan ja monitor
+Name[eu]=Bistaratzea eta monitorea
+Name[fi]=Näyttö
+Name[fr]=Affichage et surveillance
+Name[ga]=Scáileán agus Monatóir
+Name[gl]=Pantalla e monitor
+Name[he]=תצוגה וצגים
+Name[hr]=Zaslon i monitor
+Name[hu]=Kijelző és monitor
+Name[ia]=Monstrator e Monitor
+Name[id]=Tampilan dan Monitor
+Name[is]=Skjáir og birting
+Name[it]=Schermo e video
+Name[ja]=ディスプレイとモニタ
+Name[kk]=Дисплей мен монитор
+Name[km]=បង្ហាញ និង​ត្រួតពិនិត្យ
+Name[kn]=ಪ್ರದರ್ಶಕ ಹಾಗು ವ್ಯವಸ್ಥಾಪಕ
+Name[ko]=디스플레이와 모니터
+Name[lt]=Ekranas ir monitorius
+Name[lv]=Ekrāns un monitors
+Name[mr]=डिस्प्ले व मॉनिटर
+Name[nb]=Skjerm og monitor
+Name[nds]=Schirm un Monitor
+Name[nl]=Scherm en monitor
+Name[nn]=Skjerm og skjerm­bilete
+Name[pa]=ਡਿਸਪਲੇਅ ਤੇ ਮਾਨੀਟਰ
+Name[pl]=Wyświetlanie i monitor
+Name[pt]=Ecrã e Monitor
+Name[pt_BR]=Tela e monitor
+Name[ro]=Afișaj și monitor
+Name[ru]=Экран
+Name[si]=ප්‍රදර්ශනය සහ මොනිටරය
+Name[sk]=Obrazovka a monitor
+Name[sl]=Zasloni in prikazovalniki
+Name[sr]=Приказ и монитор
+Name[sr@ijekavian]=Приказ и монитор
+Name[sr@ijekavianlatin]=Prikaz i monitor
+Name[sr@latin]=Prikaz i monitor
+Name[sv]=Bildskärm
+Name[th]=ระบบแสดงผลและจอภาพ
+Name[tr]=Görüntü ve Ekran
+Name[ug]=كۆرسىتىش ۋە كۆزەتكۈچ
+Name[uk]=Показ зображення і монітор
+Name[vi]=Màn hình và hiển thị
+Name[wa]=Håynaedje eyet waitroûle
+Name[x-test]=xxDisplay and Monitorxx
+Name[zh_CN]=显示和监控
+Name[zh_TW]=顯示與螢幕
+Comment=Display Settings
+Comment[af]=Skerm Instellings
+Comment[ar]=إعدادات العرض
+Comment[ast]=Preferencies de la pantalla
+Comment[be]=Настаўленні экрану
+Comment[be@latin]=Nałady ekrana
+Comment[bg]=Настройки на екрана
+Comment[bn]=ডিসপ্লে সেটিংস
+Comment[bn_IN]=প্রদর্শন সংক্রান্ত বৈশিষ্ট্য
+Comment[br]=Kefluniañ an diskwel
+Comment[bs]=Postavke ekrana
+Comment[ca]=Arranjament de la pantalla
+Comment[ca@valencia]=Arranjament de la pantalla
+Comment[cs]=Nastavení obrazovky
+Comment[csb]=Ùstôw ekranu
+Comment[cy]=Gosodiadau Arddangos
+Comment[da]=Skærmindstillinger
+Comment[de]=Anzeige-Einstellungen
+Comment[el]=Ρυθμίσεις οθόνης
+Comment[en_GB]=Display Settings
+Comment[eo]=Vidigila agordo
+Comment[es]=Preferencias de la pantalla
+Comment[et]=Monitoride seadistused
+Comment[eu]=Pantailaren ezarpenak
+Comment[fa]=نمایش تنظیمات
+Comment[fi]=Näytön asetukset
+Comment[fr]=Configuration de l'affichage
+Comment[fy]=Byldskerm ynstellings
+Comment[ga]=Socruithe an Scáileáin
+Comment[gl]=Configuración da pantalla
+Comment[gu]=ડિસ્પ્લે ગોઠવણીઓ
+Comment[he]=הגדרות תצוגה
+Comment[hi]=प्रकटन विन्यास
+Comment[hne]=देखइया सेटिंग
+Comment[hr]=Postavke zaslona
+Comment[hsb]=Nastajenja za wobrazowku
+Comment[hu]=Megjelenési beállítások
+Comment[ia]=Monstra preferentias
+Comment[id]=Pengaturan Tampilan
+Comment[is]=Stillingar skjás
+Comment[it]=Impostazioni dello schermo
+Comment[ja]=ディスプレイの設定
+Comment[ka]=დისპლეის კონფიგურირება
+Comment[kk]=Дисплей баптаулары
+Comment[km]=កំណត់​ការ​បង្ហាញ
+Comment[kn]=ಪ್ರದರ್ಶಕದ ಸಂಯೋಜನೆಗಳು
+Comment[ko]=디스플레이 설정
+Comment[ku]=Mîhengên Dîmenderê
+Comment[lt]=Ekrano parametrai
+Comment[lv]=Ekrāna parametri
+Comment[mai]=जमावट देखाबू
+Comment[mk]=Поставувања на приказот
+Comment[ml]=പ്രദര്‍ശനത്തിന്റെ സജ്ജീകരണങ്ങള്‍
+Comment[mr]=डिस्प्ले संयोजना
+Comment[ms]=Seting Paparan
+Comment[nb]=Skjerminnstillinger
+Comment[nds]=Dorstellen inrichten
+Comment[ne]=सेटिङ प्रदर्शन गर्नुहोस्
+Comment[nl]=Beeldscherminstellingen
+Comment[nn]=Skjerminnstillingar
+Comment[or]=ପ୍ରଦର୍ଶକ ସଂରଚନା
+Comment[pa]=ਡਿਸਪਲੇਅ ਸੈਟਿੰਗ
+Comment[pl]=Ustawienia ekranu
+Comment[pt]=Configuração do ecrã
+Comment[pt_BR]=Configurações da tela
+Comment[ro]=Configurări afișare
+Comment[ru]=Настройка экрана
+Comment[se]=Šearbmaheivehusat
+Comment[si]=සංදර්ශන සැකසුම්
+Comment[sk]=Nastavenie obrazovky
+Comment[sl]=Nastavitve zaslona
+Comment[sr]=Поставке екрана
+Comment[sr@ijekavian]=Поставке екрана
+Comment[sr@ijekavianlatin]=Postavke ekrana
+Comment[sr@latin]=Postavke ekrana
+Comment[sv]=Anpassa bildskärm
+Comment[ta]=அமைப்புகளை காட்டு
+Comment[te]=ప్రదర్శన అమరికలు
+Comment[tg]=Танзимоти экран
+Comment[th]=ตั้งค่าต่าง ๆ ของการแสดงผล
+Comment[tr]=Ekran Ayarları
+Comment[ug]=كۆرۈنمە يۈز تەڭشىكى
+Comment[uk]=Налаштування дисплея
+Comment[uz]=Displeyning moslamalari
+Comment[uz@cyrillic]=Дисплейнинг мосламалари
+Comment[vi]=Thiết lập hiển thị
+Comment[wa]=Apontiaedjes do Håynaedje
+Comment[x-test]=xxDisplay Settingsxx
+Comment[zh_CN]=显示设置
+Comment[zh_TW]=顯示設定
+

systemsettings/categories/settings-hardware.desktop

@@ -2,6 +2,7 @@
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=hardware
+X-KDE-System-Settings-Parent-Category=
 X-KDE-Weight=200
 Icon=preferences-desktop-peripherals
 

systemsettings/categories/settings-input-devices.desktop

@@ -0,0 +1,73 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=SystemSettingsCategory
+X-KDE-System-Settings-Category=input-devices
+X-KDE-System-Settings-Parent-Category=hardware
+Icon=preferences-desktop-peripherals
+
+Name=Input Devices
+Name[ar]=أجهزة الإدخال
+Name[ast]=Preseos d'entrada
+Name[bg]=Входни устройства
+Name[bn]=ইনপুট ডিভাইস
+Name[bs]=Uređaji
+Name[ca]=Dispositius d'entrada
+Name[ca@valencia]=Dispositius d'entrada
+Name[cs]=Vstupní zařízení
+Name[da]=Input-enheder
+Name[de]=Eingabegeräte
+Name[el]=Συσκευές εισόδου
+Name[en_GB]=Input Devices
+Name[es]=Dispositivos de entrada
+Name[et]=Sisendseadmed
+Name[eu]=Sarrerako gailuak
+Name[fi]=Näppäimistö ja syöttölaitteet
+Name[fr]=Périphériques d'entrée
+Name[ga]=Gléasanna Ionchurtha
+Name[gl]=Dispositivos de entrada
+Name[gu]=ઇનપુટ ઉપકરણો
+Name[he]=התקני קלט
+Name[hi]=इंपुट औज़ार
+Name[hr]=Ulazni uređaji
+Name[hu]=Beviteli eszközök
+Name[ia]=Dispositivos de Ingresso
+Name[id]=Divais Masukan
+Name[is]=Inntakstæki
+Name[it]=Dispositivi di immissione
+Name[ja]=入力デバイス
+Name[kk]=Енгізу құрылғылар
+Name[km]=ឧបករណ៍​បញ្ចូល
+Name[kn]=ಇನ್ ಪುಟ್ ಸಾಧನಗಳು
+Name[ko]=입력 장치
+Name[lt]=Įvedimo įrenginiai
+Name[lv]=Ievades iekārtas
+Name[mr]=इनपुट साधने
+Name[nb]=Inndataenheter
+Name[nds]=Ingaav-Reedschappen
+Name[nl]=Invoerapparaten
+Name[nn]=Inn­einingar
+Name[pa]=ਇੰਪੁੱਟ ਜੰਤਰ
+Name[pl]=Urządzenia wejściowe
+Name[pt]=Dispositivos de Entrada
+Name[pt_BR]=Dispositivos de entrada
+Name[ro]=Dispozitive de intrare
+Name[ru]=Устройства ввода
+Name[si]=ආදාන මෙවලම්
+Name[sk]=Vstupné zariadenia
+Name[sl]=Vhodne naprave
+Name[sr]=Улазни уређаји
+Name[sr@ijekavian]=Улазни уређаји
+Name[sr@ijekavianlatin]=Ulazni uređaji
+Name[sr@latin]=Ulazni uređaji
+Name[sv]=Inmatningsenheter
+Name[tg]=Дастгоҳҳои воридотӣ
+Name[th]=อุปกรณ์ป้อนข้อมูล
+Name[tr]=Girdi Aygıtları
+Name[ug]=كىرگۈزۈش ئۈسكۈنىسى
+Name[uk]=Пристрої введення
+Name[vi]=Thiết bị nhập
+Name[wa]=Éndjins èn intrêye
+Name[x-test]=xxInput Devicesxx
+Name[zh_CN]=输入设备
+Name[zh_TW]=輸入裝置
+

systemsettings/categories/settings-locale.desktop

@@ -2,6 +2,7 @@
 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

systemsettings/categories/settings-lost-and-found.desktop

@@ -2,6 +2,7 @@
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=lost-and-found
+X-KDE-System-Settings-Parent-Category=
 X-KDE-Weight=250
 Icon=applications-system
 

systemsettings/categories/settings-network-and-connectivity.desktop

@@ -2,6 +2,7 @@
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=network-and-connectivity
+X-KDE-System-Settings-Parent-Category=
 Icon=preferences-system-network-connection
 
 Name=Network and Connectivity

systemsettings/categories/settings-network-settings.desktop

@@ -0,0 +1,95 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=SystemSettingsCategory
+X-KDE-System-Settings-Category=network-settings
+X-KDE-System-Settings-Parent-Category=network-and-connectivity
+Icon=preferences-system-network
+
+Name=Network Settings
+Name[ar]=إعدادات الشبكة
+Name[ast]=Preferencies de rede
+Name[be]=Настаўленні сеткі
+Name[be@latin]=Nałady sietki
+Name[bg]=Мрежови настройки
+Name[bn]=নেটওয়ার্ক সেটিংস
+Name[bn_IN]=নেটওয়ার্ক সংক্রান্ত বৈশিষ্ট্য
+Name[br]=Kefluniadur ar Rouedad
+Name[bs]=Mrežne postavke
+Name[ca]=Paràmetres de xarxa
+Name[ca@valencia]=Paràmetres de xarxa
+Name[cs]=Nastavení sítě
+Name[csb]=Sécowi nastôw
+Name[da]=Netværksindstillinger
+Name[de]=Netzwerkeinstellungen
+Name[el]=Ρυθμίσεις δικτύου
+Name[en_GB]=Network Settings
+Name[eo]=Reta agordo
+Name[es]=Preferencias de red
+Name[et]=Võrguseadistused
+Name[eu]=Sareko ezarpenak
+Name[fa]=تنظیمات شبکه
+Name[fi]=Verkkoasetukset
+Name[fr]=Configuration de réseau
+Name[fy]=Netwurk ynstellings
+Name[ga]=Socruithe Líonra
+Name[gl]=Configuración da rede
+Name[gu]=નેટવર્ક ગોઠવણીઓ
+Name[he]=הגדרות רשת
+Name[hi]=नेटवर्क विन्यास 
+Name[hne]=नेटवर्क सेटिंग 
+Name[hr]=Postavke mreže
+Name[hu]=Hálózati beállítások
+Name[ia]=Preferentias de rete
+Name[id]=Pengaturan Jaringan
+Name[is]=Netstillingar
+Name[it]=Impostazioni di rete
+Name[ja]=ネットワークの設定
+Name[ka]=ქსელის პარამეტრები
+Name[kk]=Желі параметрлері
+Name[km]=ការ​កំណត់​បណ្តាញ​
+Name[kn]=ಜಾಲ ಸಂಯೋಜನೆಗಳು
+Name[ko]=네트워크 설정
+Name[ku]=Mîhengên Torê
+Name[lt]=Tinklo nustatymai
+Name[lv]=Tīkla iestatījumi
+Name[mai]=नेटवर्क विन्यास 
+Name[mk]=Поставувања за мрежа
+Name[ml]=ശൃംഖലയുടെ സജ്ജീകരണങ്ങള്‍
+Name[mr]=संजाळ संयोजना
+Name[ms]=Tetapan Rangkaian
+Name[nb]=Nettverksinnstillinger
+Name[nds]=Nettwarkinstellen
+Name[ne]=सञ्जाल सेटिङ
+Name[nl]=Netwerkinstellingen
+Name[nn]=Nettverk
+Name[oc]=Paramètres ret
+Name[or]=ନେଟୱର୍କ ବିନ୍ୟାସ
+Name[pa]=ਨੈੱਟਵਰਕ ਸੈਟਿੰਗ
+Name[pl]=Ustawienia sieci
+Name[pt]=Configuração da Rede
+Name[pt_BR]=Configurações de rede
+Name[ro]=Configurări rețea
+Name[ru]=Настройка сети
+Name[se]=Fierpmádatheivehusat
+Name[si]=ජාල සැකසුම්
+Name[sk]=Nastavenie siete
+Name[sl]=Nastavitve omrežja
+Name[sr]=Мрежне поставке
+Name[sr@ijekavian]=Мрежне поставке
+Name[sr@ijekavianlatin]=Mrežne postavke
+Name[sr@latin]=Mrežne postavke
+Name[sv]=Nätverksinställningar
+Name[ta]=Network Settings
+Name[te]=నెట్వర్‍క్   అమర్పులు
+Name[tg]=Танзимотҳои Интернетӣ
+Name[th]=ตั้งค่าระบบเครือข่าย
+Name[tr]=Ağ Ayarları
+Name[ug]=تور تەڭشەكلىرى
+Name[uk]=Мережні параметри
+Name[uz]=Tarmoqning moslamalari
+Name[uz@cyrillic]=Тармоқнинг мосламалари
+Name[vi]=Thiết lập mạng
+Name[wa]=Apontiaedjes rantoele
+Name[x-test]=xxNetwork Settingsxx
+Name[zh_CN]=网络设置
+Name[zh_TW]=網路設定

systemsettings/categories/settings-permissions.desktop

@@ -2,6 +2,7 @@
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=permissions
+X-KDE-System-Settings-Parent-Category=system-administration
 Icon=preferences-other
 
 Name=Permissions

systemsettings/categories/settings-personal-information.desktop

@@ -2,6 +2,7 @@
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=personal-information
+X-KDE-System-Settings-Parent-Category=application-appearance-and-behavior
 Icon=preferences-desktop-user
 
 Name=Personal Information