9 files changed, 26 insertions, 17 deletions
diff --git a/tdeabc/CMakeL10n.txt b/tdeabc/CMakeL10n.txt
index b585ce4a..d2fd5881 100644
--- a/tdeabc/CMakeL10n.txt
+++ b/tdeabc/CMakeL10n.txt
@@ -1,3 +1,9 @@
 ##### create translation templates ##############
 
 tde_l10n_auto_add_subdirectories( )
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/tdeabc-desktops/"
+    SOURCES *.desktop
+    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/tdeabc/frontend/main.cpp b/tdeabc/frontend/main.cpp
index 0e941e01..706d94e7 100644
--- a/tdeabc/frontend/main.cpp
+++ b/tdeabc/frontend/main.cpp
@@ -15,6 +15,6 @@ int main( int argc, char ** argv )
 
   MainWindow *w = new MainWindow;
   w->show();
-  app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+  app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
   return app.exec();
 }
diff --git a/tdeabc/frontend/mainWindow.ui b/tdeabc/frontend/mainWindow.ui
index 240114a6..4bce4b34 100644
--- a/tdeabc/frontend/mainWindow.ui
+++ b/tdeabc/frontend/mainWindow.ui
@@ -1365,7 +1365,7 @@
     <variable>TQString mCurrentAddress</variable>
     <variable>TQString mCurrentPhone</variable>
 </variables>
-<Q_SLOTS>
+<slots>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>fileSave()</slot>
@@ -1404,6 +1404,6 @@
     <slot>addressBookLocked()</slot>
     <slot>addressBookUnlocked()</slot>
     <slot>fileOpenStd()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/tdeabc/frontend/mainWindow.ui.h b/tdeabc/frontend/mainWindow.ui.h
index 8e678b93..5a32e6cc 100644
--- a/tdeabc/frontend/mainWindow.ui.h
+++ b/tdeabc/frontend/mainWindow.ui.h
@@ -39,12 +39,12 @@ void MainWindow::init()
   mEmailListView->header()->hide();
   mCategoryListView->header()->hide();
 
-  connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ),
-           TQT_SLOT( addressBookChanged() ) );
-  connect( mAddressBook, TQT_SIGNAL( addressBookLocked( AddressBook * ) ),
-           TQT_SLOT( addressBookLocked() ) );
-  connect( mAddressBook, TQT_SIGNAL( addressBookUnlocked( AddressBook * ) ),
-           TQT_SLOT( addressBookUnlocked() ) );
+  connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ),
+           TQ_SLOT( addressBookChanged() ) );
+  connect( mAddressBook, TQ_SIGNAL( addressBookLocked( AddressBook * ) ),
+           TQ_SLOT( addressBookLocked() ) );
+  connect( mAddressBook, TQ_SIGNAL( addressBookUnlocked( AddressBook * ) ),
+           TQ_SLOT( addressBookUnlocked() ) );
 }
 
 void MainWindow::destroy()
diff --git a/tdeabc/tdeabc2mutt/main.cpp b/tdeabc/tdeabc2mutt/main.cpp
index 0515c37d..0d9635c2 100644
--- a/tdeabc/tdeabc2mutt/main.cpp
+++ b/tdeabc/tdeabc2mutt/main.cpp
@@ -67,7 +67,7 @@ int main( int argc, char **argv )
   if ( !subString.isEmpty() ) {
     // Mutt wants a first line with some status message on it
     // See http://mutt.org/doc/manual/manual-4.html#ss4.5
-    std::cout << i18n( "Searching KDE addressbook" ).latin1() << std::endl;
+    std::cout << i18n( "Searching TDE addressbook" ).latin1() << std::endl;
   }
   object->setQuery( subString );
 
diff --git a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
index d36582ba..ea688aac 100644
--- a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
+++ b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp
@@ -42,8 +42,8 @@ void KABC2Mutt::run()
   mAddressBook = TDEABC::StdAddressBook::self( true );
   TDEABC::StdAddressBook::setAutomaticSave( false );
 
-  connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
-           this, TQT_SLOT( loadingFinished() ) );
+  connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+           this, TQ_SLOT( loadingFinished() ) );
 }
 
 void KABC2Mutt::loadingFinished()
diff --git a/tdeabc/tdeabc2mutt/tdeabc2mutt.h b/tdeabc/tdeabc2mutt/tdeabc2mutt.h
index a0e58a59..6c9960c7 100644
--- a/tdeabc/tdeabc2mutt/tdeabc2mutt.h
+++ b/tdeabc/tdeabc2mutt/tdeabc2mutt.h
@@ -24,7 +24,7 @@
 
 class KABC2Mutt : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/tdeabc/tdeabcdistlistupdater/CMakeLists.txt b/tdeabc/tdeabcdistlistupdater/CMakeLists.txt
index ddbdd7c9..a71b55ea 100644
--- a/tdeabc/tdeabcdistlistupdater/CMakeLists.txt
+++ b/tdeabc/tdeabcdistlistupdater/CMakeLists.txt
@@ -27,9 +27,10 @@ link_directories(
 
 ##### other data ################################
 
-install(
-  FILES tdeabcdistlistupdater.desktop
+tde_create_translated_desktop(
+  SOURCE tdeabcdistlistupdater.desktop
   DESTINATION ${AUTOSTART_INSTALL_DIR}
+  PO_DIR tdeabc-desktops
 )
 
 
diff --git a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop
index 5b6a8f59..ab5ef348 100644
--- a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop
+++ b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop
@@ -1,10 +1,12 @@
 [Desktop Entry]
 Name=tdeabcdistlistupdater
+
+Comment=Tool to update the old distribution lists to the new ones.
+
 Exec=tdeabcdistlistupdater --disable-autostart
 Icon=application-vnd.tde.misc
 Type=Application
-Comment=Tool to update the old distribution lists to the new ones.
 Terminal=false
 NoDisplay=true
-X-TDE-autostart-condition=tdeabcdistlistupdaterrc:Startup:EnableAutostart:true
 OnlyShowIn=TDE;
+X-TDE-autostart-condition=tdeabcdistlistupdaterrc:Startup:EnableAutostart:true