7 files changed, 22 insertions, 107 deletions
diff --git a/tderesources/exchange/CMakeLists.txt b/tderesources/exchange/CMakeLists.txt
index fc2f9cc3..b3e107f7 100644
--- a/tderesources/exchange/CMakeLists.txt
+++ b/tderesources/exchange/CMakeLists.txt
@@ -27,7 +27,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES exchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
+tde_create_translated_desktop(
+  SOURCE exchange.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal
+  PO_DIR tderesources-desktops
+)
 
 
 ##### resourcecalendarexchange (module) #########
diff --git a/tderesources/exchange/exchange.desktop b/tderesources/exchange/exchange.desktop
index 96f57cda..945c09b6 100644
--- a/tderesources/exchange/exchange.desktop
+++ b/tderesources/exchange/exchange.desktop
@@ -1,53 +1,8 @@
 [Desktop Entry]
+Name=Exchange 2000 Server
+
 Type=Service
 X-TDE-Library=resourcecalendarexchange
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=exchange
 X-TDE-ServiceTypes=TDEResources/Plugin
-Name=Exchange 2000 Server
-Name[af]=Exchange 2000 Bediener
-Name[be]=Сэрвэр Exchange 2000
-Name[bg]=Сървър Exchange 2000
-Name[br]=Servijer Exchange 2000
-Name[ca]=Servidor Exchange 2000
-Name[cs]=Exchange 2000 server
-Name[da]=Exchange 2000 server
-Name[el]=Εξυπηρετητής Exchange2000
-Name[es]=Servidor Exchange 2000
-Name[et]=Exchange 2000 server
-Name[eu]=Exchange 2000 zerbitzaria
-Name[fa]=کارساز Exchange ۲۰۰۰
-Name[fi]=Exchange 2000 -palvelin
-Name[fr]=Serveur Exchange2000
-Name[fy]=Exchange2000-tsjinner
-Name[ga]=Freastalaí Exchange 2000
-Name[gl]=Servidor Exchange 2000
-Name[hu]=Exchange 2000-kiszolgáló
-Name[is]=Exchange 2000 þjónn
-Name[it]=Server Exchange 2000
-Name[ja]=Exchange 2000 サーバ
-Name[kk]=MS Exchange 2000 сервері
-Name[km]=ម៉ាស៊ីនបម្រើ Exchange ២០០០
-Name[lt]=Exchange 2000 serveris
-Name[mk]=Exchange 2000-сервер
-Name[ms]=Pelayan Exchange 2000 
-Name[nb]=Exchange 2000-tjener
-Name[nds]=Exchange2000-Server
-Name[ne]=एक्सचेन्ज 2000 सर्भर
-Name[nl]=Exchange2000-server
-Name[nn]=Exchange 2000-tenar
-Name[pl]=Serwer Exchange 2000
-Name[pt]=Servidor Exchange 2000
-Name[pt_BR]=Servidor Exchange2000
-Name[ru]=Сервер Microsoft Exchange 2000
-Name[sk]=Exchange 2000 server
-Name[sl]=Strežnik Exchange 2000
-Name[sr]=Exchange 2000 сервер
-Name[sr@Latn]=Exchange 2000 server
-Name[sv]=Exchange 2000-server
-Name[ta]=பரிமாற்ற 2000 சேவகன்
-Name[tr]=Exchange 2000 Sunucusu
-Name[uk]=Сервер Exchange 2000
-Name[zh_CN]=Exchange 2000 服务器
-Name[zh_TW]=Exchange 2000 伺服器
-
diff --git a/tderesources/exchange/exchange_deprecated.desktop b/tderesources/exchange/exchange_deprecated.desktop
index eba22eed..69cb86cb 100644
--- a/tderesources/exchange/exchange_deprecated.desktop
+++ b/tderesources/exchange/exchange_deprecated.desktop
@@ -1,48 +1,4 @@
 [Desktop Entry]
 Hidden=true
-Name=Exchange 2000 Server (deprecated)
-Name[af]=Exchange 2000 Bediener (nie verder ondersteun)
-Name[bg]=Сървър Exchange 2000 (остаряло)
-Name[ca]=Servidor Exchange 2000 (desaconsellat)
-Name[cs]=Exchange 2000 server (zastaralé)
-Name[da]=Exchange 2000 server (forældet)
-Name[de]=Exchange 2000 Server (veraltet)
-Name[el]=Εξυπηρετητής Exchange2000 (ξεπερασμένος)
-Name[es]=Servidor Exchange 2000 (obsoleto)
-Name[et]=Exchange 2000 server (iganenud)
-Name[eu]=Exchange 2000 zerbitzaria (zaharkituta)
-Name[fa]=کارسازExchange ۲۰۰۰ (محکوم)
-Name[fi]=Exchange 2000 -palvelin (vanhentunut)
-Name[fr]=Serveur Exchange2000 (désuet)
-Name[fy]=Exchange 2000-tsjinner (ôfrieden)
-Name[ga]=Freastalaí Exchange 2000 (as dáta)
-Name[gl]=Servidor Exchange 2000 (desaprobado)
-Name[hu]=Exchange 2000-kiszolgáló (elavult)
-Name[is]=Exchange 2000 þjónn (úrelt)
-Name[it]=Server Exchange 2000 (deprecato)
-Name[ja]=Exchange 2000 サーバ (廃止予定)
-Name[kk]=MS Exchange 2000 сервері (ескірген)
-Name[km]=ម៉ាស៊ីនបម្រើ Exchange ២០០០ (មិនសូវល្អ)
-Name[lt]=Exchange 2000 serveris (deprecated)
-Name[mk]=Exchange 2000-сервер (застарено)
-Name[ms]=Pelayan Exchange 2000  (tidak disetujui)
-Name[nb]=Exchange 2000-tjener (frarådet)
-Name[nds]=Exchange2000-Server (utlopen Ünnerstütten)
-Name[ne]=एक्सचेन्ज २००० सर्भर (अनुचित ठानिएको)
-Name[nl]=Exchange 2000-server (afgeraden)
-Name[nn]=Exchange 2000-tenar (frårådd)
-Name[pl]=Serwer Exchange 2000 (przestarzałe)
-Name[pt]=Servidor Exchange 2000 (depreciado)
-Name[pt_BR]=Servidor Exchange2000 (versão de compatibilidade)
-Name[ru]=Сервер Microsoft Exchange 2000 (устаревший)
-Name[sk]=Exchange 2000 server (deprecated)
-Name[sl]=Strežnik Exchange 2000 (opuščeno)
-Name[sr]=Exchange 2000 сервер (неодобраван)
-Name[sr@Latn]=Exchange 2000 server (neodobravan)
-Name[sv]=Exchange 2000-server (avråds från)
-Name[ta]=பரிமாற்ற 2000 சேவகன் (மாறுபாடானது)
-Name[tr]=Exchange 2000 Sunucusu
-Name[uk]=Сервер Exchange 2000 (застаріле)
-Name[zh_CN]=Exchange 2000 服务器(不推荐使用)
-Name[zh_TW]=Exchange 2000 伺服器(已廢除)
 
+Name=Exchange 2000 Server (deprecated)
diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp
index ae65f9cd..a2cbbed0 100644
--- a/tderesources/exchange/resourceexchange.cpp
+++ b/tderesources/exchange/resourceexchange.cpp
@@ -123,18 +123,18 @@ bool ResourceExchange::doOpen()
   kdDebug() << "ResourceExchange::doOpen()" << endl;
 
   mClient = new ExchangeClient( mAccount, mTimeZoneId );
-  connect( mClient, TQT_SIGNAL( downloadFinished( int, const TQString & ) ),
-           TQT_SLOT( slotDownloadFinished( int, const TQString & ) ) );
-  connect( mClient, TQT_SIGNAL( event( KCal::Event *, const KURL & ) ),
-           TQT_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) );
+  connect( mClient, TQ_SIGNAL( downloadFinished( int, const TQString & ) ),
+           TQ_SLOT( slotDownloadFinished( int, const TQString & ) ) );
+  connect( mClient, TQ_SIGNAL( event( KCal::Event *, const KURL & ) ),
+           TQ_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) );
 
 #if 0
   kdDebug() << "Creating monitor" << endl;
   TQHostAddress ip;
   ip.setAddress( mAccount->host() );
   mMonitor = new ExchangeMonitor( mAccount, ExchangeMonitor::CallBack, ip );
-  connect( mMonitor, TQT_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQT_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) );
-  connect( mMonitor, TQT_SIGNAL(error(int , const TQString&)), this, TQT_SLOT(slotMonitorError(int , const TQString&)) );
+  connect( mMonitor, TQ_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQ_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) );
+  connect( mMonitor, TQ_SIGNAL(error(int , const TQString&)), this, TQ_SLOT(slotMonitorError(int , const TQString&)) );
 
   mMonitor->addWatch( mAccount->calendarURL(), ExchangeMonitor::UpdateNewMember, 1 );
 #endif
diff --git a/tderesources/exchange/resourceexchange.h b/tderesources/exchange/resourceexchange.h
index 120a4de9..c944e9d7 100644
--- a/tderesources/exchange/resourceexchange.h
+++ b/tderesources/exchange/resourceexchange.h
@@ -47,7 +47,7 @@ class CalFormat;
 // FIXME: Use ResourceCached
 class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -84,7 +84,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
 //    void close();
 
     /** Add Event to calendar. */
-    KDE_DEPRECATED bool addEvent( Event *event );
+    TDE_DEPRECATED bool addEvent( Event *event );
     bool addEvent( Event *event, const TQString &subresource );
 
     /** deletes an event from this calendar. */
@@ -121,7 +121,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
     /**
       Add a todo to the todolist.
     */
-    KDE_DEPRECATED bool addTodo( Todo *todo );
+    TDE_DEPRECATED bool addTodo( Todo *todo );
     bool addTodo( Todo *todo, const TQString &subresource );
     /**
       Remove a todo from the todolist.
@@ -142,7 +142,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
     Todo::List rawTodosForDate( const TQDate &date );
 
     /** Add a Journal entry to calendar */
-    KDE_DEPRECATED bool addJournal( Journal *journal );
+    TDE_DEPRECATED bool addJournal( Journal *journal );
     bool addJournal( Journal *journal, const TQString &subresource );
     /** deletes an event from this calendar. */
     virtual bool deleteJournal(Journal *);
diff --git a/tderesources/exchange/resourceexchangeconfig.cpp b/tderesources/exchange/resourceexchangeconfig.cpp
index 3b3bf14f..57ad9d0f 100644
--- a/tderesources/exchange/resourceexchangeconfig.cpp
+++ b/tderesources/exchange/resourceexchangeconfig.cpp
@@ -62,7 +62,7 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent,  const char* n
 
   mAutoMailbox = new TQCheckBox( i18n( "Determine mailbox &automatically" ), this );
   mainLayout->addMultiCellWidget( mAutoMailbox, 5, 5, 0, 1 );
-  connect( mAutoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) );
+  connect( mAutoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) );
 
   mMailboxEdit = new KLineEdit( this );
   mainLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), this ), 6, 0 );
@@ -70,11 +70,11 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent,  const char* n
 
   mTryFindMailbox = new TQPushButton( i18n( "&Find" ), this );
   mainLayout->addWidget( mTryFindMailbox, 6, 2 );
-  connect( mTryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) );
+  connect( mTryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) );
 
   label = new TQLabel( i18n( "Cache timeout:" ), this );
   mCacheEdit = new KIntNumInput( this );
-  connect(mCacheEdit, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(slotCacheEditChanged( int )));
+  connect(mCacheEdit, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(slotCacheEditChanged( int )));
   mCacheEdit->setMinValue( 0 );
   mainLayout->addWidget( label, 7, 0 );
   mainLayout->addWidget( mCacheEdit, 7, 1 );
diff --git a/tderesources/exchange/resourceexchangeconfig.h b/tderesources/exchange/resourceexchangeconfig.h
index c008c2ce..f9332bad 100644
--- a/tderesources/exchange/resourceexchangeconfig.h
+++ b/tderesources/exchange/resourceexchangeconfig.h
@@ -36,7 +36,7 @@ namespace KCal {
 
 class ResourceExchangeConfig : public KRES::ConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public: