Reorganize KControl menu tree.

* Rename Peripherals -> Hardware.
* Move former KInfoCenter items -> Hardware/Information.
* Move Monitor & Display -> System Administration.
pull/2/head
Darrell Anderson 12 years ago
parent 4ea2a2e8fe
commit 0e28eaf4f4

@ -1 +1 @@
Subproject commit eb886af35eccf31b370f56bd3d901e9804859e06
Subproject commit 1e5f9378a47b7a809f3027ae8f39ef5062825756

@ -46,12 +46,19 @@
</Menu>
</Menu>
<Menu>
<Name>Peripherals</Name>
<Directory>kde-settings-peripherals.directory</Directory><!-- Rename KDE4? -->
<Name>Hardware</Name>
<Directory>kde-settings-hardware.directory</Directory>
<Include>
<Category>X-KDE-settings-peripherals</Category><!-- Remove KDE4 -->
<Category>X-KDE-settings-peripherals</Category>
<Category>X-KDE-settings-hardware</Category>
</Include>
<Menu>
<Name>Information</Name>
<Directory>kde-settings-information.directory</Directory>
<Include>
<Category>X-KDE-settings-information</Category>
</Include>
</Menu>
</Menu>
<Menu>
<Name>PowerControl</Name>

@ -1,23 +1,25 @@
[Desktop Entry]
Exec=kcmshell displayconfig
Icon=background
Type=Application
DocPath=kcontrol/displayconfig/index.html
X-KDE-Library=displayconfig
X-KDE-ParentApp=kcontrol
X-KDE-RootOnly=true
X-KDE-SubstituteUID=true
Categories=Qt;KDE;X-KDE-settings-peripherals;
Categories=Qt;KDE;X-KDE-settings-system;
Comment=Configure display
Comment[en_US]=Configure display
DocPath=kcontrol/displayconfig.html
Exec[$e]=kcmshell displayconfig
GenericName=
GenericName[en_US]=
Icon=background
Keywords=monitor,resolution,display
MimeType=
Name=Monitor and Display
Name[en_US]=Monitor and Display
NoDisplay=false
Name=Monitor & Display
Name[en_US]=Monitor & Display
NoDisplay=false
Path[$e]=
StartupNotify=true
Terminal=false
TerminalOptions=
Type=Application
X-DCOP-ServiceType=
X-KDE-Library=displayconfig
X-KDE-ParentApp=kcontrol
X-KDE-RootOnly=true
X-KDE-SubstituteUID=true
X-KDE-Username=

@ -9,7 +9,7 @@ X-KDE-ParentApp=kcontrol
X-KDE-RootOnly=true
X-KDE-SubstituteUID=true
Categories=Qt;KDE;X-KDE-settings-peripherals;
Categories=Qt;KDE;X-KDE-settings-hardware;
Comment=Configure display ICC profile
Comment[en_US]=Configure display ICC profile
DocPath=kcontrol/iccconfig.html
@ -18,4 +18,6 @@ GenericName[en_US]=
Keywords=ICC,display,color,profile
MimeType=
Name=ICC Color Profile
Name[en_US]=ICC Color Profile
Name[en_US]=ICC Color Profile
NoDisplay=false

@ -163,4 +163,4 @@ Keywords[uk]=CD-ROM Information,CD-ROM,CD,CD Drive,Writer Capabilities,Інфо
Keywords[vi]=Thông tin đĩa CD-ROM,CD-ROM,CD, ổ đĩa CD, Khả năng ổ ghi
Keywords[wa]=Informåcion do CD-ROM,CD-ROM,CD,léjheu d' CD,Usteyes di scrijhaedje
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;

@ -3,7 +3,7 @@ Exec=kcmshell devices
Icon=kcmdevices
Type=Application
DocPath=kinfocenter/devices/index.html
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;
X-KDE-Library=info

@ -3,7 +3,7 @@ Exec=kcmshell dma
Icon=kcmmemory
Type=Application
DocPath=kinfocenter/dma/index.html
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;
X-KDE-Library=info

@ -3,7 +3,7 @@ Exec=kcmshell interrupts
Icon=kcmmemory
Type=Application
DocPath=kinfocenter/interrupts/index.html
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;
X-KDE-Library=info

@ -3,7 +3,7 @@ Exec=kcmshell ioports
Icon=kcmmemory
Type=Application
DocPath=kinfocenter/ioports/index.html
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;
X-KDE-Library=info

@ -245,5 +245,5 @@ Keywords[xh]=Inkumbulo,RAM,Inkumbulo yobume,Inkumbulo yomzimba,Inkumbulo yokwahl
Keywords[zh_CN]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,内存,虚拟存储,物理存储,共享内存,交换,系统信息
Keywords[zh_TW]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,記憶體,虛擬記憶體,實體記憶體,共享記憶體,系統資訊
Keywords[zu]=Inkumbulo,RAM,Inkumbulo yamanga,Inkumbulo siqu,Inkumbulo yokwabelana,Shintshanisa,Ulwazi Lwesistimu
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;

@ -8,7 +8,7 @@ DocPath=kinfocenter/opengl/index.html
X-KDE-Library=info
X-KDE-FactoryName=opengl
X-KDE-ParentApp=kinfocenter
X-KDE-ParentApp=kcontrol
Name=OpenGL
Name[bn]=ওপেন-জি-এল
@ -145,5 +145,5 @@ Keywords[wa]=OpenGL,DRI,GLX,3D,VideoCard,cåte videyo,Hardware Acceleration,Grap
Keywords[zh_CN]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,显卡,硬件加速,图形,X 服务器,显示
Keywords[zh_TW]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,顯示卡,硬體加速,圖形,顯示
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;

@ -243,5 +243,5 @@ Keywords[zh_CN]=Partitions,Harddrive,HD,System Information,分区,硬盘,系统
Keywords[zh_TW]=Partitions,Harddrive,HD,System Information,磁碟分割區,硬式磁碟機,硬碟,系統資訊
Keywords[zu]=Izahluko,Harddrive,HD,Ulwazi Lwesistimu
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;

@ -177,5 +177,5 @@ Keywords[xh]=PCI,PCI-Amacebo,PCI-Ibhasi,Ulwazi lwendlela
Keywords[zh_CN]=PCI,PCI-Devices,PCI-Bus,System Information,PCI 设备,PCI 总线,系统信息
Keywords[zh_TW]=PCI,PCI-Devices,PCI-Bus,System Information,PCI 設備,PCI 匯流排,系統資訊
Keywords[zu]=PCI,Amathuluzi-PCI,Ibhasi-PCI,Ulwaz Lwesistimu
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;

@ -246,5 +246,5 @@ Keywords[xh]=Umqhubekekisi,CPU,FPU,MHz,Inkcukacha Yendlela yokusebenza
Keywords[zh_CN]=Processor,CPU,FPU,MHz,System Information,处理器,系统信息
Keywords[zh_TW]=Processor,CPU,FPU,MHz,System Information,處理器,中央處理器,浮點運算器,系統資訊
Keywords[zu]=Umqhubekisi,CPU,FPU,MHz,Ulwazi Lwesistimu
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;

@ -174,5 +174,5 @@ Keywords[xh]=SCSI,SCSI-Ibhasi,Ulwazi lwendlela
Keywords[zh_CN]=SCSI,SCSI-Bus,System Information,SCSI 总线,系统信息
Keywords[zh_TW]=SCSI,SCSI-Bus,System Information,系統資訊
Keywords[zu]=SCSI,Ibhasi-SCSI,Ulwazi Lwesistimu
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;

@ -240,5 +240,5 @@ Keywords[vi]=Âm thanh,âm,Bo mạch âm thanh,Midi,OSS,Thông tin Hệ thống
Keywords[wa]=Son,Audiocåte son,MIDI,OSS,informåcion do sistinme
Keywords[zh_CN]=Sound,Audio,Soundcard,MIDI,OSS,System Information,音频,音响,声卡,系统信息
Keywords[zh_TW]=Sound,Audio,Soundcard,Midi,OSS,系統資訊
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;

@ -224,4 +224,4 @@ Keywords[wa]=X,X-Server,XServer,sierveu X,XFree86,håynaedje,Display,cåte videy
Keywords[zh_CN]=X,X-Server,XServer,XFree86,Display,VideoCard,System InformationX 服务器,显示器,显卡,系统信息
Keywords[zh_TW]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,X 伺服器,X伺服器,顯示器,顯示卡,系統資訊
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;

@ -170,5 +170,5 @@ Comment[zh_CN]=网络接口信息
Comment[zh_TW]=網路界面資訊
Comment[zu]=Ulwazi lomxhumanisi woxhumano olusakazekile
Categories=Qt;KDE;X-KDE-settings-network;
Categories=Qt;KDE;X-KDE-settings-information;

@ -7,7 +7,7 @@ DocPath=kinfocenter/samba/index.html
X-KDE-Library=samba
X-KDE-FactoryName=samba
X-KDE-ParentApp=kinfocenter
X-KDE-ParentApp=kcontrol
Name=Samba Status
Name[ar]=حالة Samba

@ -237,4 +237,4 @@ Keywords[zh_CN]=USB,devices,viewer,control,设备,查看器,控制
Keywords[zh_TW]=USB,devices,viewer,control,裝置,檢視器,控制
Keywords[zu]=USB,amathukuzi ananjongo,umbukisi,lawula
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;

@ -216,5 +216,5 @@ Keywords[wa]=1394,IEEE 1394,Firewire,éndjins,håyneu,contrôle,corwaitaedje
Keywords[zh_CN]=1394,Firewire,devices,viewer,control,设备,查看器,控制,火线
Keywords[zh_TW]=1394,Firewire,devices,viewer,control,裝置,檢視器,控制
Categories=Qt;KDE;X-KDE-settings-hardware;
Categories=Qt;KDE;X-KDE-settings-information;

Loading…
Cancel
Save