Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

4 files changed, 88 insertions, 86 deletions

diff --git a/admin b/admin
-Subproject 1e5f9378a47b7a809f3027ae8f39ef506282575
+Subproject eb886af35eccf31b370f56bd3d901e9804859e0
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index fa3d8547c..99d86d13a 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -48,7 +48,9 @@ install( FILES
 
 ##### other data ################################
 
-install( FILES kdesktop.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+configure_file( kdesktop.desktop.cmake kdesktop.desktop @ONLY )
+
+install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kdesktop.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
 install( FILES kdesktop_custom_menu1 kdesktop_custom_menu2 DESTINATION ${CONFIG_INSTALL_DIR} )
 install( FILES kdesktopSetAsBackground.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
 install( FILES kdesktop.kcfg klaunch.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
diff --git a/kdesktop/kdesktop.desktop b/kdesktop/kdesktop.desktop
deleted file mode 100644
index a041cc379..000000000
--- a/kdesktop/kdesktop.desktop
+++ /dev/null
@@ -1,85 +0,0 @@
-[Desktop Entry]
-Exec=kdesktop
-X-DCOP-ServiceType=wait
-Name=KDE Desktop
-Name[af]=KDE Werkskerm
-Name[ar]=سطح المكتب KDE
-Name[az]=KDE Masa üstü
-Name[be]=Працоўны стол KDE
-Name[bn]=কে.ডি.ই. ডেস্কটপ
-Name[br]=Burev KDE
-Name[bs]=KDE radna površina
-Name[ca]=Escriptori KDE
-Name[cs]=Pracovní plocha KDE
-Name[csb]=Pùlt KDE
-Name[cy]=Penbwrdd KDE
-Name[da]=KDE-desktop
-Name[de]=KDE-Arbeitsfläche
-Name[el]=Επιφάνεια εργασίας του KDE
-Name[eo]=KDE Labortablo
-Name[es]=Escritorio de KDE
-Name[et]=KDE töölaud
-Name[eu]=KDE mahaigaina
-Name[fa]=رومیزی KDE
-Name[fi]=KDE-työpöytä
-Name[fr]=Bureau de KDE
-Name[fy]=KDE Buroblêd
-Name[ga]=Deasc KDE
-Name[gl]=Escritório de KDE
-Name[he]=שולחן העבודה של KDE
-Name[hi]=केडीई डेस्कटॉप
-Name[hr]=KDE radna površina
-Name[hu]=Munkaasztal
-Name[id]=Desktop KDE
-Name[is]=KDE skjáborð
-Name[it]=Desktop KDE
-Name[ja]=KDE デスクトップ
-Name[ka]=KDE სამუშაო დაფა
-Name[kk]=KDE үстелі
-Name[km]=ផ្ទៃតុ KDE
-Name[ko]=데스크톱
-Name[lo]=ພື້ນທີ່ທຳງານ KDE
-Name[lt]=KDE Darbastalis
-Name[lv]=KDE Darbvirsma
-Name[mk]=KDE Десктоп
-Name[mn]=КДЭ-Ажлын тавцан
-Name[ms]=Desktop KDE
-Name[mt]=Desktop KDE
-Name[nb]=KDE Skrivebord
-Name[nds]=KDE-Schriefdisch
-Name[ne]=KDE डेस्कटप
-Name[nl]=KDE Bureaublad
-Name[nn]=KDE-skrivebord
-Name[nso]=Desktop ya KDE
-Name[pa]=KDE ਵੇਹੜਾ
-Name[pl]=Pulpit KDE
-Name[pt]=Ecrã do KDE
-Name[pt_BR]=Área de Trabalho KDE
-Name[ro]=Ecran KDE
-Name[ru]=Рабочий стол KDE
-Name[rw]=KDE Ibiro 
-Name[se]=KDE-čallinbeavdi
-Name[sk]=Pracovná plocha
-Name[sl]=Namizje KDE
-Name[sr]=KDE радна површина
-Name[sr@Latn]=KDE radna površina
-Name[sv]=KDE-skrivbord
-Name[ta]=KDE மேல்மேசை
-Name[te]=కెడిఈ రంగస్థలం
-Name[tg]=Мизи Кории KDE
-Name[th]=พื้นที่ทำงาน KDE
-Name[tr]=KDE Masaüstü
-Name[tt]=KDE Östäl
-Name[uk]=Стільниця KDE
-Name[uz]=KDE ish stoli
-Name[uz@cyrillic]=KDE иш столи
-Name[ven]=Desikithopo ya KDE
-Name[vi]=Môi trường KDE
-Name[wa]=Sicribanne KDE
-Name[zh_CN]=KDE 桌面
-Name[zh_TW]=KDE 桌面
-Name[zu]=I-Desktop ye-KDE
-Type=Service
-X-KDE-StartupNotify=false
-OnlyShowIn=TDE;
-X-KDE-autostart-phase=0
diff --git a/kdesktop/kdesktop.desktop.cmake b/kdesktop/kdesktop.desktop.cmake
new file mode 100644
index 000000000..7c5a94360
--- /dev/null
+++ b/kdesktop/kdesktop.desktop.cmake
@@ -0,0 +1,85 @@
+[Desktop Entry]
+Exec=@TDE_BIN_DIR@/kdesktop
+X-DCOP-ServiceType=wait
+Name=TDE Desktop
+Name[af]=TDE Werkskerm
+Name[ar]=سطح المكتب TDE
+Name[az]=TDE Masa üstü
+Name[be]=Працоўны стол TDE
+Name[bn]=কে.ডি.ই. ডেস্কটপ
+Name[br]=Burev TDE
+Name[bs]=TDE radna površina
+Name[ca]=Escriptori TDE
+Name[cs]=Pracovní plocha TDE
+Name[csb]=Pùlt TDE
+Name[cy]=Penbwrdd TDE
+Name[da]=TDE-desktop
+Name[de]=TDE-Arbeitsfläche
+Name[el]=Επιφάνεια εργασίας του TDE
+Name[eo]=TDE Labortablo
+Name[es]=Escritorio de TDE
+Name[et]=TDE töölaud
+Name[eu]=TDE mahaigaina
+Name[fa]=رومیزی TDE
+Name[fi]=TDE-työpöytä
+Name[fr]=Bureau de TDE
+Name[fy]=TDE Buroblêd
+Name[ga]=Deasc TDE
+Name[gl]=Escritório de TDE
+Name[he]=שולחן העבודה של TDE
+Name[hi]=केडीई डेस्कटॉप
+Name[hr]=TDE radna površina
+Name[hu]=Munkaasztal
+Name[id]=Desktop TDE
+Name[is]=TDE skjáborð
+Name[it]=Desktop TDE
+Name[ja]=TDE デスクトップ
+Name[ka]=TDE სამუშაო დაფა
+Name[kk]=TDE үстелі
+Name[km]=ផ្ទៃតុ TDE
+Name[ko]=데스크톱
+Name[lo]=ພື້ນທີ່ທຳງານ TDE
+Name[lt]=TDE Darbastalis
+Name[lv]=TDE Darbvirsma
+Name[mk]=TDE Десктоп
+Name[mn]=TДЭ-Ажлын тавцан
+Name[ms]=Desktop TDE
+Name[mt]=Desktop TDE
+Name[nb]=TDE Skrivebord
+Name[nds]=TDE-Schriefdisch
+Name[ne]=TDE डेस्कटप
+Name[nl]=TDE Bureaublad
+Name[nn]=TDE-skrivebord
+Name[nso]=Desktop ya TDE
+Name[pa]=TDE ਵੇਹੜਾ
+Name[pl]=Pulpit TDE
+Name[pt]=Ecrã do TDE
+Name[pt_BR]=Área de Trabalho TDE
+Name[ro]=Ecran TDE
+Name[ru]=Рабочий стол TDE
+Name[rw]=TDE Ibiro 
+Name[se]=TDE-čallinbeavdi
+Name[sk]=Pracovná plocha
+Name[sl]=Namizje TDE
+Name[sr]=TDE радна површина
+Name[sr@Latn]=TDE radna površina
+Name[sv]=TDE-skrivbord
+Name[ta]=TDE மேல்மேசை
+Name[te]=కెడిఈ రంగస్థలం
+Name[tg]=Мизи Кории TDE
+Name[th]=พื้นที่ทำงาน TDE
+Name[tr]=TDE Masaüstü
+Name[tt]=TDE Östäl
+Name[uk]=Стільниця TDE
+Name[uz]=TDE ish stoli
+Name[uz@cyrillic]=TDE иш столи
+Name[ven]=Desikithopo ya TDE
+Name[vi]=Môi trường TDE
+Name[wa]=Sicribanne TDE
+Name[zh_CN]=TDE 桌面
+Name[zh_TW]=TDE 桌面
+Name[zu]=I-Desktop ye-TDE
+Type=Service
+X-KDE-StartupNotify=false
+OnlyShowIn=TDE;
+X-KDE-autostart-phase=0