Improve compatibility with non-Trinity environment menus and add a single

menu item for Trinity control center for those environments.

18 files changed, 74 insertions, 9 deletions

diff --git a/applnk/tde-settings-accessibility.directory b/applnk/tde-settings-accessibility.directory
index 97ff1ab6b..31e7de561 100644
--- a/applnk/tde-settings-accessibility.directory
+++ b/applnk/tde-settings-accessibility.directory
@@ -45,7 +45,7 @@ Name[lv]=Reģionāls un Pieejamība
 Name[mk]=Регионалност и пристапливост
 Name[mn]=Бүслүүр-тохируулга & Хэрэглэх тохь
 Name[ms]=Pemudahcapai & Tetapan Tempatan
-Name[mt]=Reġjonali u Aċċessibiltà
+Name[mt]=Reġjonali u Aċċessibilt�
 Name[nb]=Regionalt og tilgjengelighet
 Name[nds]=Regioon & Behinnertenhülp
 Name[ne]=क्षेत्रीय र पहुँचयोग्य
@@ -64,7 +64,7 @@ Name[sk]=Prístupnosť a regionálne nastavenie
 Name[sl]=Regionalnost in dostopnost
 Name[sr]=Регија и приступачност
 Name[sr@Latn]=Regija i pristupačnost
-Name[ss]=Kutfolakala kalula & kwesifundza 
+Name[ss]=Kutfolakala kalula & kwesifundza
 Name[sv]=Region och handikappstöd
 Name[ta]=நாடும் & அணுகலும்
 Name[te]=ప్రాంతియతా & అందుబాటు
@@ -83,3 +83,4 @@ Name[zh_CN]=区域和辅助功能
 Name[zh_TW]=區域性與易用性
 Name[zu]=Okwesifunda & Igunya lokungena
 Icon=locale
+OnlyShowIn=TDE;
diff --git a/applnk/tde-settings-components.directory b/applnk/tde-settings-components.directory
index 25d6530e9..be957e008 100644
--- a/applnk/tde-settings-components.directory
+++ b/applnk/tde-settings-components.directory
@@ -83,3 +83,4 @@ Name[zh_CN]=TDE 组件
 Name[zh_TW]=TDE 元件
 Name[zu]= Amalunga e-TDE
 Icon=blockdevice
+OnlyShowIn=TDE;
diff --git a/applnk/tde-settings-desktop.directory b/applnk/tde-settings-desktop.directory
index e961bb763..2a3e8cdb7 100644
--- a/applnk/tde-settings-desktop.directory
+++ b/applnk/tde-settings-desktop.directory
@@ -61,7 +61,7 @@ Name[sk]=Plocha
 Name[sl]=Namizje
 Name[sr]=Радна површина
 Name[sr@Latn]=Radna površina
-Name[ss]=Desktop 
+Name[ss]=Desktop
 Name[sv]=Skrivbord
 Name[ta]=மேல்மேசை
 Name[te]=రంగస్ఠలం
@@ -78,3 +78,4 @@ Name[wa]=Sicribanne
 Name[zh_CN]=桌面
 Name[zh_TW]=桌面
 Icon=desktop
+OnlyShowIn=TDE;
diff --git a/applnk/tde-settings-hardware.directory b/applnk/tde-settings-hardware.directory
index 2941d4e4f..ced4f06ea 100644
--- a/applnk/tde-settings-hardware.directory
+++ b/applnk/tde-settings-hardware.directory
@@ -57,3 +57,4 @@ Name[wa]=Éndjolreye
 Name[zh_CN]=硬件
 Name[zh_TW]=硬體
 Icon=input_devices_settings
+OnlyShowIn=TDE;
diff --git a/applnk/tde-settings-looknfeel.directory b/applnk/tde-settings-looknfeel.directory
index 713a575e7..354bb535a 100644
--- a/applnk/tde-settings-looknfeel.directory
+++ b/applnk/tde-settings-looknfeel.directory
@@ -59,7 +59,7 @@ Name[pt]=Aparência e Temas
 Name[pt_BR]=Aparência & Temas
 Name[ro]=Aspect și tematici
 Name[ru]=Внешний вид и темы
-Name[rw]=Imigaragarire & Insanganyamatsiko 
+Name[rw]=Imigaragarire & Insanganyamatsiko
 Name[se]=Fárda ja fáttát
 Name[sk]=Vzhľad a témy
 Name[sl]=Videz in teme
@@ -84,3 +84,4 @@ Name[zh_CN]=外观和主题
 Name[zh_TW]=外觀與主題
 Name[zu]=Ukubukeka & Izingqikithi
 Icon=looknfeel
+OnlyShowIn=TDE;
diff --git a/applnk/tde-settings-network.directory b/applnk/tde-settings-network.directory
index df310163f..b696a4c9c 100644
--- a/applnk/tde-settings-network.directory
+++ b/applnk/tde-settings-network.directory
@@ -84,3 +84,4 @@ Name[zh_CN]=Internet 和网络
 Name[zh_TW]=網路
 Name[zu]=Internet & Uxhumano olusakazekile
 Icon=network
+OnlyShowIn=TDE;
diff --git a/applnk/tde-settings-peripherals.directory b/applnk/tde-settings-peripherals.directory
index 01bb7623f..d3232ade6 100644
--- a/applnk/tde-settings-peripherals.directory
+++ b/applnk/tde-settings-peripherals.directory
@@ -85,3 +85,4 @@ Name[zh_CN]=外设
 Name[zh_TW]=週邊設備
 Name[zu]=Imixhantela
 Icon=input_devices_settings
+OnlyShowIn=TDE;
diff --git a/applnk/tde-settings-power.directory b/applnk/tde-settings-power.directory
index 34220a95a..4300afb07 100644
--- a/applnk/tde-settings-power.directory
+++ b/applnk/tde-settings-power.directory
@@ -86,3 +86,4 @@ Name[zh_CN]=电源控制
 Name[zh_TW]=電源控制
 Name[zu]=Ukulawulwa kwamandla
 Icon=energy
+OnlyShowIn=TDE;
diff --git a/applnk/tde-settings-security.directory b/applnk/tde-settings-security.directory
index 758cb7333..3e495cc14 100644
--- a/applnk/tde-settings-security.directory
+++ b/applnk/tde-settings-security.directory
@@ -84,3 +84,4 @@ Name[zh_CN]=安全和隐私
 Name[zh_TW]=安全性與私密性
 Name[zu]=Ukuvikeleka & Ingasese
 Icon=password
+OnlyShowIn=TDE;
diff --git a/applnk/tde-settings-sound.directory b/applnk/tde-settings-sound.directory
index b4dbe2aaf..ff34efa50 100644
--- a/applnk/tde-settings-sound.directory
+++ b/applnk/tde-settings-sound.directory
@@ -83,3 +83,4 @@ Name[zh_CN]=声音和多媒体
 Name[zh_TW]=聲音與多媒體
 Name[zu]=Umsindo & Onozindaba abaningi
 Icon=multimedia
+OnlyShowIn=TDE;
diff --git a/applnk/tde-settings-system.directory b/applnk/tde-settings-system.directory
index d40f9a066..a19a80211 100644
--- a/applnk/tde-settings-system.directory
+++ b/applnk/tde-settings-system.directory
@@ -82,3 +82,4 @@ Name[zh_CN]=系统管理
 Name[zh_TW]=系統管理
 Name[zu]=Ukugcinwa kwe-sistimu
 Icon=kcmsystem
+OnlyShowIn=TDE;
diff --git a/applnk/tde-settings-webbrowsing.directory b/applnk/tde-settings-webbrowsing.directory
index 3d0666d38..a9c650840 100644
--- a/applnk/tde-settings-webbrowsing.directory
+++ b/applnk/tde-settings-webbrowsing.directory
@@ -65,7 +65,7 @@ Name[sk]=Webový prehliadač
 Name[sl]=Spletni brskalnik
 Name[sr]=Веб прегледач
 Name[sr@Latn]=Veb pregledač
-Name[ss]=Ibrawuza ye-Web 
+Name[ss]=Ibrawuza ye-Web
 Name[sv]=Webbläsning
 Name[ta]=வலை உலாவி
 Name[te]=వెబ్ బ్రౌజర్
@@ -83,3 +83,4 @@ Name[zh_CN]=Web 浏览器
 Name[zh_TW]=網頁瀏覽器
 Name[zu]=Umcingi we-Web
 Icon=konqueror
+OnlyShowIn=TDE;
diff --git a/kcontrol/kcontrol/CMakeLists.txt b/kcontrol/kcontrol/CMakeLists.txt
index 5d7ba23f7..16e2d84b6 100644
--- a/kcontrol/kcontrol/CMakeLists.txt
+++ b/kcontrol/kcontrol/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 
 tde_install_icons()
 install( FILES kcontrolui.rc DESTINATION ${DATA_INSTALL_DIR}/kcontrol )
-install( FILES  KControl.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES  KControl.desktop tde-kcontrol.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
 ##### kcontrol (tdeinit) ########################
diff --git a/kcontrol/kcontrol/Makefile.am b/kcontrol/kcontrol/Makefile.am
index f39a2ee3f..36bf04783 100644
--- a/kcontrol/kcontrol/Makefile.am
+++ b/kcontrol/kcontrol/Makefile.am
@@ -38,7 +38,7 @@ kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
 rccontroldir = $(kde_datadir)/kcontrol
 rccontrol_DATA = kcontrolui.rc
 
-xdg_apps_DATA = KControl.desktop
+xdg_apps_DATA = KControl.desktop tde-kcontrol.desktop
 
 KDE_ICON=AUTO
 
diff --git a/kcontrol/kcontrol/tde-kcontrol.desktop b/kcontrol/kcontrol/tde-kcontrol.desktop
new file mode 100644
index 000000000..f27736e6e
--- /dev/null
+++ b/kcontrol/kcontrol/tde-kcontrol.desktop
@@ -0,0 +1,52 @@
+[Desktop Entry]
+Exec=kcontrol -caption "%c" %i %m
+Icon=kcontrol
+Type=Application
+DocPath=kcontrol/index.html
+X-TDE-StartupNotify=true
+
+Name=TDE Control Center
+Name[ca]=Centre de control del TDE
+Name[cs]=Ovládací centrum TDE
+Name[da]=TDE Kontrolcenter
+Name[de]=TDE Kontrollzentrum
+Name[en_GB]=TDE Control Centre
+Name[es]=Centro de control de TDE
+Name[et]=TDE Juhtimiskeskus
+Name[eu]=TDE Kontrol gunea
+Name[fa]=مرکز کنترل
+Name[fi]=TDE:Ohjauskeskus
+Name[fr]=Centre de configuration de TDE
+Name[fy]=Konfiguraasjesintrum
+Name[ga]=Lárionad Rialaithe TDE
+Name[gl]=Centro de Control TDE
+Name[he]=מרכז הבקרה TDE
+Name[hu]=TDE Vezérlőpult
+Name[it]=Centro di controllo TDE
+Name[kk]=TDE Басқару орталығы
+Name[km]=មជ្ឈមណ្ឌល​បញ្ជា TDE
+Name[ko]=TDE 제어판 모듈
+Name[lt]=TDE Valdymo centras
+Name[lv]=TDE Vadības Centrs
+Name[nb]=TDE Kontrollpanel
+Name[nds]=TDE-Kuntrullzentrum
+Name[nl]=TDE-Configuratiecentrum
+Name[pa]=TDE ਕੰਟਰੋਲ ਕੇਂਦਰ
+Name[pl]=Centrum sterowania TDE
+Name[pt]=Centro de Controlo TDE
+Name[pt_BR]=Centro de Controle TDE
+Name[ro]=TDE Centrul de control
+Name[ru]=Центр управления TDE
+Name[sk]=Ovládacie Centrum TDE
+Name[sl]=TDE-Nadzorno središče
+Name[sr@Latn]=TDE Kontrolni centar
+Name[sv]=TDE:Inställningscentralen
+Name[tr]=TDE Kontrol Merkezi
+Name[uk]=Центр керування TDE
+Name[vi]=Trung tâm Điều khiển TDE
+Name[zh_CN]=TDE 控制中心
+Name[zh_TW]=TDE 控制中心
+
+X-DCOP-ServiceType=Unique
+Categories=Qt;TDE;Settings;
+NotShowIn=TDE;
diff --git a/konqueror/konquerorsu.desktop b/konqueror/konquerorsu.desktop
index 560eee326..58bb4ff8e 100644
--- a/konqueror/konquerorsu.desktop
+++ b/konqueror/konquerorsu.desktop
@@ -87,4 +87,4 @@ GenericName[zh_TW]=檔案總管 - 超級使用者模式
 GenericName[zu]=Imenenja yamafayela - Indlela Yomsebenzisi Omkhulu
 
 Categories=Qt;TDE;X-TDE-System-su;
-NotShowIn=GNOME;
+OnlyShowIn=TDE;
diff --git a/konsole/konsolesu.desktop b/konsole/konsolesu.desktop
index c9804576d..7cd4e4e46 100644
--- a/konsole/konsolesu.desktop
+++ b/konsole/konsolesu.desktop
@@ -5,6 +5,7 @@ Icon=konsole
 DocPath=konsole/index.html
 MimeType=application/x-konsole;
 Terminal=false
+OnlyShowIn=TDE;
 
 Name=Konsole
 GenericName=Terminal Program - Super User Mode
diff --git a/ksysguard/gui/x-ksysguard.desktop b/ksysguard/gui/x-ksysguard.desktop
index cc4ef9e79..2e96b62c0 100644
--- a/ksysguard/gui/x-ksysguard.desktop
+++ b/ksysguard/gui/x-ksysguard.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-NotShowIn=GNOME;
+OnlyShowIn=TDE;
 MimeType=application/x-ksysguard
 Comment=TDE System Guard
 Comment[af]=TDE Stelsel Wag