6 files changed, 20 insertions, 69 deletions
diff --git a/tderesources/birthdays/CMakeLists.txt b/tderesources/birthdays/CMakeLists.txt
index 7ac1be77..720204d2 100644
--- a/tderesources/birthdays/CMakeLists.txt
+++ b/tderesources/birthdays/CMakeLists.txt
@@ -33,7 +33,11 @@ install( FILES
 
 ##### other data ################################
 
-install( FILES tdeabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
+tde_create_translated_desktop(
+  SOURCE tdeabc.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal
+  PO_DIR tderesources-desktops
+)
 
 
 ##### kcal_tdeabc (module) #######################
diff --git a/tderesources/birthdays/resourcetdeabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp
index d36ebddd..2e937a7d 100644
--- a/tderesources/birthdays/resourcetdeabc.cpp
+++ b/tderesources/birthdays/resourcetdeabc.cpp
@@ -125,7 +125,7 @@ bool ResourceTDEABC::doOpen()
   kdDebug(5800) << "ResourceTDEABC::doOpen()" << endl;
 
   mAddressbook = TDEABC::StdAddressBook::self( true );
-  connect( mAddressbook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT( reload() ) );
+  connect( mAddressbook, TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT( reload() ) );
 
   return true;
 }
@@ -220,7 +220,7 @@ bool ResourceTDEABC::doLoad()
     TQString anniversary_string = (*it).custom( "KADDRESSBOOK", "X-Anniversary" );
     if (anniversary_string.isEmpty() )
       continue;
-    TQDateTime anniversary = TQDate::fromString( anniversary_string, Qt::ISODate );
+    TQDateTime anniversary = TQDate::fromString( anniversary_string, TQt::ISODate );
     if ( !anniversary.isValid() )
       continue;
 
@@ -232,7 +232,7 @@ bool ResourceTDEABC::doLoad()
       for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
         if ( name == (*addrIt).realName() ) {
           TQDate spouseAnniversary =
-            TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+            TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
           if ( anniversary == TQDateTime(spouseAnniversary) ) {
             found = true;
             break;
@@ -247,7 +247,7 @@ bool ResourceTDEABC::doLoad()
   }
 
   for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
-    TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+    TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
     kdDebug(5800) << "found a anniversary " << TQString(anniversary.toString()) << endl;
     TQString name;
     TQString name_1 = (*addrIt).nickName();
diff --git a/tderesources/birthdays/resourcetdeabc.h b/tderesources/birthdays/resourcetdeabc.h
index 5ba80ca1..7cc2f771 100644
--- a/tderesources/birthdays/resourcetdeabc.h
+++ b/tderesources/birthdays/resourcetdeabc.h
@@ -33,7 +33,7 @@
 
 #include "libkcal/resourcecalendar.h"
 
-#include "libtdepim/tdepimmacros.h"
+#include <kdemacros.h>
 
 namespace TDEIO {
 class FileCopyJob;
@@ -45,9 +45,9 @@ namespace KCal {
 /**
   Resource providing birthdays and anniversaries as events.
 */
-class KDE_EXPORT ResourceTDEABC : public ResourceCalendar
+class TDE_EXPORT ResourceTDEABC : public ResourceCalendar
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     friend class ResourceTDEABCConfig;
@@ -77,7 +77,7 @@ class KDE_EXPORT ResourceTDEABC : public ResourceCalendar
     TDEABC::Lock *lock();
 
     /** 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. */
     bool deleteEvent(Event *);
@@ -109,7 +109,7 @@ class KDE_EXPORT ResourceTDEABC : public ResourceCalendar
     /**
       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.
@@ -129,7 +129,7 @@ class KDE_EXPORT ResourceTDEABC : public ResourceCalendar
     */
     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 );
 
     /** Remove journal from the calendar. */
diff --git a/tderesources/birthdays/resourcetdeabcconfig.cpp b/tderesources/birthdays/resourcetdeabcconfig.cpp
index 0f9b3279..4b3b0a1d 100644
--- a/tderesources/birthdays/resourcetdeabcconfig.cpp
+++ b/tderesources/birthdays/resourcetdeabcconfig.cpp
@@ -61,13 +61,13 @@ ResourceTDEABCConfig::ResourceTDEABCConfig( TQWidget* parent,  const char* name
   mCategoryView->setEnabled( false );
   topLayout->addMultiCellWidget( mCategoryView, 4, 4, 0, 1 );
 
-  connect( mUseCategories, TQT_SIGNAL( toggled( bool ) ),
-           mCategoryView, TQT_SLOT( setEnabled( bool ) ) );
+  connect( mUseCategories, TQ_SIGNAL( toggled( bool ) ),
+           mCategoryView, TQ_SLOT( setEnabled( bool ) ) );
 
   mAlarmTimeEdit->setDisabled(true);
   mALabel->setDisabled(true);
 
-  connect(mAlarm, TQT_SIGNAL(clicked()), TQT_SLOT(alarmClicked()));
+  connect(mAlarm, TQ_SIGNAL(clicked()), TQ_SLOT(alarmClicked()));
 
   setReadOnly( true );
 
diff --git a/tderesources/birthdays/resourcetdeabcconfig.h b/tderesources/birthdays/resourcetdeabcconfig.h
index 80efd02b..88ade268 100644
--- a/tderesources/birthdays/resourcetdeabcconfig.h
+++ b/tderesources/birthdays/resourcetdeabcconfig.h
@@ -40,7 +40,7 @@ namespace KCal {
 */
 class ResourceTDEABCConfig : public KRES::ConfigWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     ResourceTDEABCConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tderesources/birthdays/tdeabc.desktop b/tderesources/birthdays/tdeabc.desktop
index aafbce9c..44c6c369 100644
--- a/tderesources/birthdays/tdeabc.desktop
+++ b/tderesources/birthdays/tdeabc.desktop
@@ -1,59 +1,6 @@
 [Desktop Entry]
 Name=Birthdays From KAddressBook
-Name[af]=Verjaarsdae uit KAddressBook
-Name[ar]=تواريخ الميلد من KAddressBook
-Name[be]=Дні нараджэння з K Адраснай кнігі
-Name[bg]=Рождени дни от адресника
-Name[br]=Deizioù-ha-bloazioù eus KAddressBook
-Name[bs]=Rođendani iz KAddressBook adresara
-Name[ca]=Aniversaris des de KAddressBook
-Name[cs]=Narozeniny z Knihy adres
-Name[cy]=Penblwyddi o KLlyfrCyfeiriadau
-Name[da]=Fødselsdage fra KAddressBook
-Name[de]=Geburtstage aus dem Adressbuch
-Name[el]=Γενέθλια από το KAddressBook
-Name[eo]=Naskiĝdatoj de KAdresaro
-Name[es]=Cumpleaños desde KAddressBook
-Name[et]=Sünnipäevad TDE aadressiraamatust
-Name[eu]=Urtebetetzeak KAddressBook-etik
-Name[fa]=تولدها از KAddressBook
-Name[fi]=Syntymäpäivät TDE:n osoitekirjasta
-Name[fr]=Dates de naissance de KAddressBook
-Name[fy]=Jierddagen út KAddressBook
-Name[ga]=Breithlaethanta ó KAddressBook
-Name[gl]=Cumpreanos de KAddressBook
-Name[he]=ימי הולדת מתוך KAddressBook
-Name[hi]=के-एड्रेस-बुक से जन्मतिथि
-Name[hu]=Születésnapok a KAddressBookból
-Name[is]=Afmælisdagar úr KAddressBook
-Name[it]=Compleanni da KAddessBook
-Name[ja]=アドレス帳の誕生日
-Name[kk]=KAddressBook-тағы туған күндер
-Name[km]=ថ្ងៃខួបកំណើតពី KAddressBook
-Name[lt]=Gimtadieniai iš KAddressBook
-Name[mk]=Родендени од КАдресар
-Name[ms]=Tarikh Lahir dari  KAddressBook
-Name[nb]=Bursdagsimport fra KAddressbook
-Name[nds]=Geboortsdaag ut KAdressbook
-Name[ne]=केडीई ठेगाना पुस्तिकामा भएका जन्मदिन
-Name[nl]=Verjaardagen uit KAddressBook
-Name[nn]=Fødselsdagar frå TDE-adresseboka
-Name[pl]=Urodziny z Książki adresowej
-Name[pt]=Aniversários do KAddressBook
-Name[pt_BR]=Datas de Nascimento do KAddressBook
-Name[ro]=Date de naştere din KAddressBook
-Name[ru]=Дни рождения из адресной книги TDE
-Name[sk]=Dátumy narodenia z adresára TDE
-Name[sl]=Rojstni dnevi iz Adresarja
-Name[sr]=Рођендани из KAddressBook-а
-Name[sr@Latn]=Rođendani iz KAddressBook-a
-Name[sv]=Födelsedagar från adressboken
-Name[ta]=கேமுகவரிபுத்தகத்தில் இருந்து பிறந்ததேதிகள்
-Name[tg]=Рӯзҳои таваллуд аз китоби адресии TDE
-Name[tr]=TDE Adres Defterinden Doğum Günleri
-Name[uk]=Дні народження з KAddressBook
-Name[zh_CN]=KAddressBook 中的生日
-Name[zh_TW]=自 KaddressBook 匯入生日
+
 X-TDE-Library=kcal_tdeabc
 Type=Service
 X-TDE-ServiceTypes=TDEResources/Plugin