7 files changed, 26 insertions, 86 deletions
diff --git a/tderesources/scalix/kcal/CMakeLists.txt b/tderesources/scalix/kcal/CMakeLists.txt
index 647ad26ed..88501246e 100644
--- a/tderesources/scalix/kcal/CMakeLists.txt
+++ b/tderesources/scalix/kcal/CMakeLists.txt
@@ -24,9 +24,11 @@ link_directories(
 
 ##### other data ################################
 
-install(
-  FILES scalix.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
+tde_create_translated_desktop(
+  SOURCE scalix.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal
+  PO_DIR tderesources-desktops
+)
 
 install(
   FILES ../uninstall.desktop
diff --git a/tderesources/scalix/kcal/scalix.desktop b/tderesources/scalix/kcal/scalix.desktop
index 8ba56ef06..5c9ea9e93 100644
--- a/tderesources/scalix/kcal/scalix.desktop
+++ b/tderesources/scalix/kcal/scalix.desktop
@@ -1,29 +1,6 @@
 [Desktop Entry]
 Name=Calendar on Scalix Server via KMail
-Name[bg]=Календар на сървъра Scalix през KMail
-Name[ca]=Calendari en un servidor Scalix mitjançant el KMail
-Name[da]=Kalender på Scalix-server via KMail
-Name[de]=Kalender auf einem Scalix-Server via KMail
-Name[el]=Ημερολόγιο σε εξυπηρετητή Scalix μέσω του KMail
-Name[es]=Calendario en servidor Scalix por medio de KMail
-Name[et]=Kalender Scalix-serveris (KMaili vahendusel)
-Name[fr]=Agenda sur serveur Scalix via KMail
-Name[is]=Dagatal á Scalix-þjóni gegnum KMail
-Name[it]=Calendario su server Scalix via KMail
-Name[ja]=KMail 経由 Scalix サーバのカレンダー
-Name[km]=ប្រតិទិននៅលើម៉ាស៊ីនបម្រើ Scalix តាមរយៈ KMail
-Name[nds]=Kalenner op Scalix-Server över KMail
-Name[nl]=Agenda op Scalix-server via KMail
-Name[pl]=Kalendarz na serwerze Scalix za pośrednictwem KMaila
-Name[pt_BR]=Calendário em Servidor Scalix via KMail
-Name[ru]=Календарь на сервере Scalix через KMail
-Name[sk]=Kalendár na Scalix serveri pomocou KMail
-Name[sr]=Календар на Scalix серверу преко KMail-а
-Name[sr@Latn]=Kalendar na Scalix serveru preko KMail-a
-Name[sv]=Kalender på Scalix-server via Kmail
-Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Takvim
-Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的日历
-Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的行事曆
+
 X-TDE-Library=kcal_scalix
 Type=Service
 X-TDE-ServiceTypes=TDEResources/Plugin
diff --git a/tderesources/scalix/knotes/CMakeLists.txt b/tderesources/scalix/knotes/CMakeLists.txt
index 2c088be76..b5fcdf4f5 100644
--- a/tderesources/scalix/knotes/CMakeLists.txt
+++ b/tderesources/scalix/knotes/CMakeLists.txt
@@ -25,16 +25,17 @@ link_directories(
 
 ##### other data ################################
 
-# FIXME this is a conflict
-
-install(
-  FILES scalix.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes )
+tde_create_translated_desktop(
+  SOURCE scalix.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes
+  PO_DIR tderesources-desktops
+)
 
 install(
   FILES ../uninstall.desktop
-  RENAME scalix.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes )
+  RENAME imap.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes
+)
 
 
 ##### knotes_scalix (module) ####################
diff --git a/tderesources/scalix/knotes/scalix.desktop b/tderesources/scalix/knotes/scalix.desktop
index 4852f8d2e..998db8878 100644
--- a/tderesources/scalix/knotes/scalix.desktop
+++ b/tderesources/scalix/knotes/scalix.desktop
@@ -1,28 +1,6 @@
 [Desktop Entry]
 Name=Notes on Scalix Server via KMail
-Name[bg]=Бележки на сървъра Scalix през KMail
-Name[ca]=Notes en un servidor Scalix mitjançant el KMail
-Name[da]=Noter på Scalix-server via KMail
-Name[de]=Notizen auf einem Scalix-Server via KMail
-Name[el]=Σημειώσεις σε εξυπηρετητή Scalix μέσω του KMail
-Name[es]=Notas en servidor Scalix por medio de KMail
-Name[et]=Kalender Scalix-serveris (KMaili vahendusel)
-Name[fr]=Notes sur serveur Scalix via KMail
-Name[is]=Minnismiðar á Scalix-þjóni gegnum KMail
-Name[it]=Note su server Scalix via KMail
-Name[ja]=KMail 経由 Scalix サーバのメモ
-Name[km]=ចំណាំនៅលើម៉ាស៊ីនបម្រើ Scalix តាមរយៈ KMail
-Name[nds]=Notizen op Scalix-Server över KMail
-Name[nl]=Notities op Scalix-server via KMail
-Name[pl]=Notatki na serwerze Scalix za pośrednictwem KMaila
-Name[ru]=Заметки на сервере Scalix через KMail
-Name[sk]=Poznámky na Scalix serveri pomocou KMail
-Name[sr]=Белешке на Scalix серверу преко KMail-а
-Name[sr@Latn]=Beleške na Scalix serveru preko KMail-a
-Name[sv]=Anteckningar på Scalix-server via Kmail
-Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Takvim
-Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的日历
-Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的便條
+
 X-TDE-Library=knotes_scalix
 Type=Service
 X-TDE-ServiceTypes=TDEResources/Plugin
diff --git a/tderesources/scalix/tdeabc/CMakeLists.txt b/tderesources/scalix/tdeabc/CMakeLists.txt
index 5875d5ac7..d677a306d 100644
--- a/tderesources/scalix/tdeabc/CMakeLists.txt
+++ b/tderesources/scalix/tdeabc/CMakeLists.txt
@@ -24,9 +24,11 @@ link_directories(
 
 ##### other data ################################
 
-install(
-  FILES scalix.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
+tde_create_translated_desktop(
+  SOURCE scalix.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc
+  PO_DIR tderesources-desktops
+)
 
 install(
   FILES ../uninstall.desktop
diff --git a/tderesources/scalix/tdeabc/scalix.desktop b/tderesources/scalix/tdeabc/scalix.desktop
index 673082db9..99817840a 100644
--- a/tderesources/scalix/tdeabc/scalix.desktop
+++ b/tderesources/scalix/tdeabc/scalix.desktop
@@ -1,28 +1,6 @@
 [Desktop Entry]
 Name=Addressbook on Scalix Server via KMail
-Name[bg]=Адресник на сървъра Scalix през KMail
-Name[ca]=Llibreta d'adreces en un servidor Scalix mitjançant el KMail
-Name[da]=Adressebog på Scalix-server via KMail
-Name[de]=Adressbuch auf einem Scalix-Server via KMail
-Name[el]=Βιβλίο διευθύνσεων σε εξυπηρετητή Scalix μέσω του KMail
-Name[es]=Libreta de direcciones en servidor Scalix por medio de KMail
-Name[et]=Aadressiraamat Scalix-serveris (KMaili vahendusel)
-Name[fr]=Carnet d'adresses sur serveur Scalix via KMail
-Name[is]=Vistfangaskrá á Scalix-þjóni gegnum KMail
-Name[it]=Rubrica indirizzi su server Scalix via KMail
-Name[ja]=KMail 経由 Scalix サーバのアドレス帳
-Name[km]=សៀវភៅអាសយដ្ឋាននៅលើម៉ាស៊ីនបម្រើ Scalix តាមរយៈ KMail
-Name[nds]=Adressbook op Scalix-Server över KMail
-Name[nl]=Adresboek op Scalix-server via KMail
-Name[pl]=Książka adresowa na serwerze Scalix za pośrednictwem KMaila
-Name[ru]=Адресная книга на сервере Scalix через KMail
-Name[sk]=Adresár na Scalix serveri pomocou KMail
-Name[sr]=Адресар на Scalix серверу преко KMail-а
-Name[sr@Latn]=Adresar na Scalix serveru preko KMail-a
-Name[sv]=Adressbok på Scalix-server via Kmail
-Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Adres Defteri
-Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的地址簿
-Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的通訊錄
+
 X-TDE-Library=tdeabc_scalix
 Type=Service
 X-TDE-ServiceTypes=TDEResources/Plugin
diff --git a/tderesources/scalix/tdeioslave/CMakeLists.txt b/tderesources/scalix/tdeioslave/CMakeLists.txt
index d1ae38444..717e5cb17 100644
--- a/tderesources/scalix/tdeioslave/CMakeLists.txt
+++ b/tderesources/scalix/tdeioslave/CMakeLists.txt
@@ -23,9 +23,11 @@ link_directories(
 
 ##### other data ################################
 
-install(
-  FILES scalix.protocol scalixs.protocol
-  DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE scalix.protocol scalixs.protocol
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR tderesources-desktops
+)
 
 
 ##### tdeio_scalix (module) #######################