4 files changed, 11 insertions, 32 deletions
diff --git a/tderesources/scalix/kcal/CMakeLists.txt b/tderesources/scalix/kcal/CMakeLists.txt
index 647ad26e..88501246 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/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index ff9158d1..6b796e5d 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -66,8 +66,8 @@ ResourceScalix::ResourceScalix( const TDEConfig *config )
     mCalendar( TQString::fromLatin1("UTC") ), mOpen( false )
 {
   setType( "scalix" );
-  connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
-           this, TQT_SLOT( slotEmitResourceChanged() ) );
+  connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ),
+           this, TQ_SLOT( slotEmitResourceChanged() ) );
 }
 
 ResourceScalix::~ResourceScalix()
@@ -310,7 +310,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr
         KIncidenceChooser* ch = new KIncidenceChooser();
         ch->setIncidence( local ,inc );
         if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) {
-            connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT (  useGlobalMode() ) );
+            connect ( this, TQ_SIGNAL( useGlobalMode() ), ch, TQ_SLOT (  useGlobalMode() ) );
             if ( ch->exec() )
                 if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask )
                     emit useGlobalMode() ;
diff --git a/tderesources/scalix/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h
index b58eee85..5b283534 100644
--- a/tderesources/scalix/kcal/resourcescalix.h
+++ b/tderesources/scalix/kcal/resourcescalix.h
@@ -36,7 +36,7 @@
 
 #include <tqtimer.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 #include <libkcal/resourcecalendar.h>
@@ -50,7 +50,7 @@ class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar,
                       public KCal::IncidenceBase::Observer,
                       public Scalix::ResourceScalixBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
     friend struct TemporarySilencer;
 
diff --git a/tderesources/scalix/kcal/scalix.desktop b/tderesources/scalix/kcal/scalix.desktop
index 8ba56ef0..5c9ea9e9 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