6 files changed, 13 insertions, 92 deletions
diff --git a/tdeabc/plugins/net/CMakeLists.txt b/tdeabc/plugins/net/CMakeLists.txt
index 71a5c49df..532e82755 100644
--- a/tdeabc/plugins/net/CMakeLists.txt
+++ b/tdeabc/plugins/net/CMakeLists.txt
@@ -39,7 +39,11 @@ install( FILES
 
 ##### other data ################################
 
-install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
+tde_create_translated_desktop(
+  SOURCE net.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc
+  PO_DIR tdeabc-desktops
+)
 
 
 ##### tdeabc_net (library) ########################
diff --git a/tdeabc/plugins/net/net.desktop b/tdeabc/plugins/net/net.desktop
index 42f265e74..445a62f91 100644
--- a/tdeabc/plugins/net/net.desktop
+++ b/tdeabc/plugins/net/net.desktop
@@ -1,88 +1,5 @@
 [Desktop Entry]
 Name=Network
-Name[af]=Netwerk
-Name[ar]=الشبكة
-Name[az]=Şəbəkə
-Name[be]=Сетка
-Name[bn]=নেটওয়ার্ক
-Name[br]=Rouedad
-Name[bs]=Mreža
-Name[ca]=Xarxa
-Name[cs]=Síť
-Name[csb]=Sec
-Name[cy]=Rhydwaith
-Name[da]=Netværk
-Name[de]=Netzwerk
-Name[el]=Δίκτυο
-Name[eo]=Reto
-Name[es]=Red
-Name[et]=Võrk
-Name[eu]=Sarea
-Name[fa]=شبکه
-Name[fi]=Verkko
-Name[fr]=Réseau
-Name[fy]=Netwurk
-Name[ga]=Líonra
-Name[gl]=Rede
-Name[he]=רשת
-Name[hi]=नेटवर्क
-Name[hr]=Mreža
-Name[hsb]=Syć
-Name[hu]=Hálózat
-Name[id]=Jaringan
-Name[is]=Net
-Name[it]=Rete
-Name[ja]=ネットワーク
-Name[ka]=ქსელი
-Name[kk]=Желі
-Name[km]=បណ្តាញ
-Name[ko]=네트워크
-Name[ku]=Tor
-Name[lb]=Netzwierk
-Name[lt]=Tinklas
-Name[lv]=Tīkls
-Name[mi]=Hao
-Name[mk]=Мрежа
-Name[mn]=Сүлжээ
-Name[ms]=Jaringan
-Name[nds]=Nettwark
-Name[ne]=सञ्जाल
-Name[nl]=Netwerk
-Name[nn]=Nettverk
-Name[nso]=Kgokagano
-Name[oc]=Resèu
-Name[pa]=ਨੈੱਟਵਰਕ
-Name[pl]=Sieć
-Name[pt]=Rede
-Name[pt_BR]=Rede
-Name[ro]=Reţea
-Name[ru]=Сеть
-Name[rw]=Urusobe
-Name[se]=Fierbmi
-Name[sk]=Sieť
-Name[sl]=Omrežje
-Name[sq]=Rrjeta
-Name[sr]=Мрежа
-Name[sr@Latn]=Mreža
-Name[ss]=Luchungechunge
-Name[sv]=Nätverk
-Name[ta]=பிணையம்
-Name[te]=కలన జాలం
-Name[tg]=Шабака
-Name[th]=ระบบเครือข่าย
-Name[tr]=Ağ
-Name[tt]=Çeltär
-Name[uk]=Мережа
-Name[uz]=Tarmoq
-Name[uz@cyrillic]=Tarмоқ
-Name[ven]=Vhukwamani
-Name[vi]=mạng
-Name[wa]=Rantoele
-Name[xh]=Umsebenzi womnatha
-Name[zh_CN]=网络
-Name[zh_HK]=網絡
-Name[zh_TW]=網路
-Name[zu]=Umsebenzi wokuxhumana okusakazekile
 X-TDE-Library=tdeabc_net
 Type=Service
 X-TDE-ServiceTypes=TDEResources/Plugin
diff --git a/tdeabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp
index cb908cd22..08fa8764a 100644
--- a/tdeabc/plugins/net/resourcenet.cpp
+++ b/tdeabc/plugins/net/resourcenet.cpp
@@ -192,8 +192,8 @@ bool ResourceNet::asyncLoad()
   TDEIO::Scheduler::checkSlaveOnHold( true );
   d->mLoadJob = TDEIO::file_copy( mUrl, dest, -1, true, false, false );
   d->mIsLoading = true;
-  connect( d->mLoadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           this, TQT_SLOT( downloadFinished( TDEIO::Job* ) ) );
+  connect( d->mLoadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQ_SLOT( downloadFinished( TDEIO::Job* ) ) );
 
   return true;
 }
@@ -286,8 +286,8 @@ bool ResourceNet::asyncSave( Ticket* )
   TDEIO::Scheduler::checkSlaveOnHold( true );
   d->mIsSaving = true;
   d->mSaveJob = TDEIO::file_copy( src, mUrl, -1, true, false, false );
-  connect( d->mSaveJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           this, TQT_SLOT( uploadFinished( TDEIO::Job* ) ) );
+  connect( d->mSaveJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQ_SLOT( uploadFinished( TDEIO::Job* ) ) );
 
   return true;
 }
@@ -352,7 +352,7 @@ void ResourceNet::downloadFinished( TDEIO::Job* )
 
   if ( !hasTempFile() || mTempFile->status() != 0 ) {
     d->mLastErrorString = i18n( "Download failed: Unable to create temporary file" );
-    TQTimer::singleShot( 0, this, TQT_SLOT( signalError() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( signalError() ) );
     return;
   }
 
diff --git a/tdeabc/plugins/net/resourcenet.h b/tdeabc/plugins/net/resourcenet.h
index e190c63c8..0ce7bf862 100644
--- a/tdeabc/plugins/net/resourcenet.h
+++ b/tdeabc/plugins/net/resourcenet.h
@@ -44,7 +44,7 @@ class FormatPlugin;
 */
 class KABC_EXPORT ResourceNet : public Resource
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceNet( const TDEConfig* );
diff --git a/tdeabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h
index 513c77de2..df1a73ba6 100644
--- a/tdeabc/plugins/net/resourcenetconfig.h
+++ b/tdeabc/plugins/net/resourcenetconfig.h
@@ -30,7 +30,7 @@ namespace TDEABC {
 
 class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceNetConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tdeabc/plugins/net/resourcenetplugin.cpp b/tdeabc/plugins/net/resourcenetplugin.cpp
index cd87cc000..0e3b1d3c7 100644
--- a/tdeabc/plugins/net/resourcenetplugin.cpp
+++ b/tdeabc/plugins/net/resourcenetplugin.cpp
@@ -25,7 +25,7 @@ using namespace TDEABC;
 
 extern "C"
 {
-  KDE_EXPORT void *init_tdeabc_net()
+  TDE_EXPORT void *init_tdeabc_net()
   {
     return new KRES::PluginFactory<ResourceNet, ResourceNetConfig>();
   }