Initial import of Trinity 3.5.11 to kdebase

Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
Will need to check for commit warnings and repair as encountered
Also needs full compile test

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

13 files changed, 21 insertions, 13 deletions

diff --git a/kcontrol/info/cdinfo.desktop b/kcontrol/info/cdinfo.desktop
index b5a441e47..17302d5b5 100644
--- a/kcontrol/info/cdinfo.desktop
+++ b/kcontrol/info/cdinfo.desktop
@@ -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-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;
diff --git a/kcontrol/info/devices.desktop b/kcontrol/info/devices.desktop
index 171224aa6..5895b8c3a 100644
--- a/kcontrol/info/devices.desktop
+++ b/kcontrol/info/devices.desktop
@@ -3,7 +3,7 @@ Exec=kcmshell devices
 Icon=kcmdevices
 Type=Application
 DocPath=kinfocenter/devices/index.html
-Categories=Qt;KDE;X-KDE-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;
 
 
 X-KDE-Library=info
diff --git a/kcontrol/info/dma.desktop b/kcontrol/info/dma.desktop
index e420acaea..bb02419ca 100644
--- a/kcontrol/info/dma.desktop
+++ b/kcontrol/info/dma.desktop
@@ -3,7 +3,7 @@ Exec=kcmshell dma
 Icon=kcmmemory
 Type=Application
 DocPath=kinfocenter/dma/index.html
-Categories=Qt;KDE;X-KDE-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;
 
 
 X-KDE-Library=info
diff --git a/kcontrol/info/interrupts.desktop b/kcontrol/info/interrupts.desktop
index a18bde656..bdfb6e6e6 100644
--- a/kcontrol/info/interrupts.desktop
+++ b/kcontrol/info/interrupts.desktop
@@ -3,7 +3,7 @@ Exec=kcmshell interrupts
 Icon=kcmmemory
 Type=Application
 DocPath=kinfocenter/interrupts/index.html
-Categories=Qt;KDE;X-KDE-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;
 
 
 X-KDE-Library=info
diff --git a/kcontrol/info/ioports.desktop b/kcontrol/info/ioports.desktop
index f66b81288..1a3505314 100644
--- a/kcontrol/info/ioports.desktop
+++ b/kcontrol/info/ioports.desktop
@@ -3,7 +3,7 @@ Exec=kcmshell ioports
 Icon=kcmmemory
 Type=Application
 DocPath=kinfocenter/ioports/index.html
-Categories=Qt;KDE;X-KDE-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;
 
 
 X-KDE-Library=info
diff --git a/kcontrol/info/memory.desktop b/kcontrol/info/memory.desktop
index f9aca9869..e94646cfe 100644
--- a/kcontrol/info/memory.desktop
+++ b/kcontrol/info/memory.desktop
@@ -245,4 +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-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;
+
diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop
index 07d6b76ce..4451c5167 100644
--- a/kcontrol/info/opengl.desktop
+++ b/kcontrol/info/opengl.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
+NoDisplay=true
 Exec=kcmshell opengl
 Icon=kcmopengl
 Type=Application
@@ -144,4 +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-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;
+
diff --git a/kcontrol/info/partitions.desktop b/kcontrol/info/partitions.desktop
index 89851a34e..ec9fce463 100644
--- a/kcontrol/info/partitions.desktop
+++ b/kcontrol/info/partitions.desktop
@@ -243,4 +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-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;
+
diff --git a/kcontrol/info/pci.desktop b/kcontrol/info/pci.desktop
index 9ee4452b3..d60a876ef 100644
--- a/kcontrol/info/pci.desktop
+++ b/kcontrol/info/pci.desktop
@@ -177,4 +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-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;
+
diff --git a/kcontrol/info/processor.desktop b/kcontrol/info/processor.desktop
index 580aa7e3a..c72f50e2c 100644
--- a/kcontrol/info/processor.desktop
+++ b/kcontrol/info/processor.desktop
@@ -246,4 +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-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;
+
diff --git a/kcontrol/info/scsi.desktop b/kcontrol/info/scsi.desktop
index 9b62edbf7..9b2aa65a8 100644
--- a/kcontrol/info/scsi.desktop
+++ b/kcontrol/info/scsi.desktop
@@ -174,4 +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-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;
+
diff --git a/kcontrol/info/sound.desktop b/kcontrol/info/sound.desktop
index 6a96da85d..4f8942871 100644
--- a/kcontrol/info/sound.desktop
+++ b/kcontrol/info/sound.desktop
@@ -240,4 +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-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;
+
diff --git a/kcontrol/info/xserver.desktop b/kcontrol/info/xserver.desktop
index 1751a4b6e..e54b9e2a4 100644
--- a/kcontrol/info/xserver.desktop
+++ b/kcontrol/info/xserver.desktop
@@ -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-information;
+Categories=Qt;KDE;X-KDE-settings-hardware;