3 files changed, 12 insertions, 33 deletions
diff --git a/tderesources/scalix/knotes/CMakeLists.txt b/tderesources/scalix/knotes/CMakeLists.txt
index 2c088be7..b5fcdf4f 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/resourcescalix.h b/tderesources/scalix/knotes/resourcescalix.h
index 6a3676c1..592fc0a3 100644
--- a/tderesources/scalix/knotes/resourcescalix.h
+++ b/tderesources/scalix/knotes/resourcescalix.h
@@ -38,7 +38,7 @@
 #include <libkcal/calendarlocal.h>
 #include "../shared/resourcescalixbase.h"
 #include "../shared/subresource.h"
-#include <tdepimmacros.h>
+#include <tdemacros.h>
 
 
 namespace Scalix {
@@ -48,11 +48,11 @@ namespace Scalix {
  * addresses in an IMAP folder in KMail (or other conforming email
  * clients).
  */
-class KDE_EXPORT ResourceScalix : public ResourceNotes,
+class TDE_EXPORT ResourceScalix : public ResourceNotes,
                       public KCal::IncidenceBase::Observer,
                       public ResourceScalixBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tderesources/scalix/knotes/scalix.desktop b/tderesources/scalix/knotes/scalix.desktop
index 4852f8d2..998db887 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