24 files changed, 99 insertions, 455 deletions
diff --git a/kworldwatch/CMakeL10n.txt b/kworldwatch/CMakeL10n.txt
index a63584f..114f848 100644
--- a/kworldwatch/CMakeL10n.txt
+++ b/kworldwatch/CMakeL10n.txt
@@ -1,3 +1,12 @@
 ##### create translation templates ##############
 
 tde_l10n_create_template( "kworldclock" )
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/kworldwatch-desktops/"
+    SOURCES *.desktop
+    EXCLUDES maps/
+    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
+
+tde_l10n_auto_add_subdirectories()
diff --git a/kworldwatch/CMakeLists.txt b/kworldwatch/CMakeLists.txt
index 72bc706..b183050 100644
--- a/kworldwatch/CMakeLists.txt
+++ b/kworldwatch/CMakeLists.txt
@@ -59,20 +59,23 @@ tde_install_icons( kworldclock )
 
 ##### other data ################################
 
-install( FILES kworldclock.desktop
-  DESTINATION ${XDG_APPS_INSTALL_DIR}
+tde_create_translated_desktop(
+  SOURCE kworldclock.desktop
+  PO_DIR kworldwatch-desktops
 )
 
-install( FILES kdeworld.desktop
-  DESTINATION
-    ${DATA_INSTALL_DIR}/kdesktop/programs
+tde_create_translated_desktop(
+  SOURCE kdeworld.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/kdesktop/programs
+  PO_DIR kworldwatch-desktops
 )
 
 install( FILES zone.tab
   DESTINATION ${DATA_INSTALL_DIR}/kworldclock
 )
 
-install( FILES kwwapplet.desktop
+tde_create_translated_desktop(
+  SOURCE kwwapplet.desktop
   DESTINATION ${DATA_INSTALL_DIR}/kicker/applets
+  PO_DIR kworldwatch-desktops
 )
-
diff --git a/kworldwatch/about.ui b/kworldwatch/about.ui
index bd9cd69..2eb6ff2 100644
--- a/kworldwatch/about.ui
+++ b/kworldwatch/about.ui
@@ -209,9 +209,9 @@ Copyright: (c) 2000 Matthias Hoelzer-Kluepfel</string>
 <includes>
     <include location="global" impldecl="in declaration">kseparator.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>PushButton2_clicked()</slot>
     <slot>accept()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kworldwatch/applet.cpp b/kworldwatch/applet.cpp
index f358dac..6e7ebb8 100644
--- a/kworldwatch/applet.cpp
+++ b/kworldwatch/applet.cpp
@@ -42,7 +42,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
+  TDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
   {
     TDEGlobal::locale()->insertCatalogue("kworldclock");
     TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translation
@@ -94,7 +94,7 @@ bool KWWApplet::eventFilter( TQObject *o, TQEvent *e )
 {
   if ((e->type() == TQEvent::MouseButtonPress) || (e->type() == TQEvent::MouseButtonDblClick)) 
   {
-    mousePressEvent(TQT_TQMOUSEEVENT(e));
+    mousePressEvent(static_cast<TQMouseEvent*>(e));
     return true;
   }
 
@@ -115,7 +115,7 @@ void KWWApplet::mousePressEvent(TQMouseEvent *e)
     clicked = e->type() == TQMouseEvent::MouseButtonDblClick;
   }
 
-  if (clicked && e->button() == Qt::LeftButton) 
+  if (clicked && e->button() == TQt::LeftButton) 
   {
     KRun::run("kworldclock", KURL::List());
   }
diff --git a/kworldwatch/applet.h b/kworldwatch/applet.h
index 63f2036..5b4f22e 100644
--- a/kworldwatch/applet.h
+++ b/kworldwatch/applet.h
@@ -41,7 +41,7 @@ class MapWidget;
 
 class KWWApplet : public KPanelApplet
 {
-  Q_OBJECT
+  TQ_OBJECT
   
     
 public:
diff --git a/kworldwatch/cities.cpp b/kworldwatch/cities.cpp
index 8179ed3..ab7cfd9 100644
--- a/kworldwatch/cities.cpp
+++ b/kworldwatch/cities.cpp
@@ -32,7 +32,7 @@
 
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 
 #include "cities.h"
diff --git a/kworldwatch/flags.cpp b/kworldwatch/flags.cpp
index 26ca4e6..f66462e 100644
--- a/kworldwatch/flags.cpp
+++ b/kworldwatch/flags.cpp
@@ -28,7 +28,7 @@
 #include <limits.h>
 
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 
 #include "flags.h"
diff --git a/kworldwatch/flow.cpp b/kworldwatch/flow.cpp
index 519ed85..3d7a0c0 100644
--- a/kworldwatch/flow.cpp
+++ b/kworldwatch/flow.cpp
@@ -68,7 +68,7 @@ int SimpleFlow::heightForWidth( int w ) const
 
 void SimpleFlow::addItem( TQLayoutItem *item)
 {
-    list.append( TQT_TQLAYOUTITEM(item) );
+    list.append( item );
 }
 
 bool SimpleFlow::hasHeightForWidth() const
@@ -83,22 +83,12 @@ TQSize SimpleFlow::sizeHint() const
 
 TQSizePolicy::ExpandData SimpleFlow::expanding() const
 {
-#ifdef USE_QT4
-    return (Qt::Orientation)TQSizePolicy::NoDirection;
-#else // USE_QT4
     return TQSizePolicy::NoDirection;
-#endif // USE_QT4
 }
 
 TQLayoutIterator SimpleFlow::iterator()
 {
-    // [FIXME]
-#ifdef USE_QT4
-    #warning [FIXME] ContainerAreaLayout iterators may not function correctly under Qt4
-    return TQLayoutIterator(this);	    	// [FIXME]
-#else // USE_QT4
     return TQLayoutIterator( new SimpleFlowIterator( &list ) );
-#endif // USE_QT4
 }
 
 void SimpleFlow::setGeometry( const TQRect &r )
@@ -142,34 +132,3 @@ TQSize SimpleFlow::minimumSize() const
     }
     return s;
 }
-
-#ifdef USE_QT4
-/*!
-    \reimp
-*/
-int SimpleFlow::count() const {
-	return list.count();
-}
-
-/*!
-    \reimp
-*/
-TQLayoutItem* SimpleFlow::itemAt(int index) const {
-	return index >= 0 && index < list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(list).at(index)) : 0;
-}
-
-/*!
-    \reimp
-*/
-TQLayoutItem* SimpleFlow::takeAt(int index) {
-	if (index < 0 || index >= list.count())
-		return 0;
-	TQLayoutItem *item = list.at(index);
-	list.remove(list.at(index));
-	delete item;
-
-	invalidate();
-	return item;
-}
-#endif // USE_QT4
-
diff --git a/kworldwatch/flow.h b/kworldwatch/flow.h
index e027e64..6eed52e 100644
--- a/kworldwatch/flow.h
+++ b/kworldwatch/flow.h
@@ -42,10 +42,6 @@ public:
     TQLayoutIterator iterator();
     TQSizePolicy::ExpandData expanding() const;
 
-#ifdef USE_QT4
-	QLAYOUT_REQUIRED_METHOD_DECLARATIONS
-#endif // USE_QT4
-
 protected:
     void setGeometry( const TQRect& );
 
diff --git a/kworldwatch/kdeworld.desktop b/kworldwatch/kdeworld.desktop
index 95258bb..1a2273c 100644
--- a/kworldwatch/kdeworld.desktop
+++ b/kworldwatch/kdeworld.desktop
@@ -1,68 +1,5 @@
 [TDE Desktop Program]
 Comment=TDE WorldClock by Matthias Hoelzer-Kluepfel
-Comment[af]=Tde Wêreld horlosie deur Matthias Hoelzer-kluepfel
-Comment[ar]=ساعة عالمية لTDE من ماتياس هولتسر-كلوبفل
-Comment[az]=Matthias Hoelzer-Kluepfel'den TDE Dünya Saatı
-Comment[be]=Сусветны гадзіннік TDE (аўтар Matthias Hoelzer-Kluepfel)
-Comment[bg]=Часовник, който показва часа в различни точки на света
-Comment[bn]=কে.ডি.ই. বিশ্বঘড়ি, তৈরি করেছেন ম্যাথিয়াস হোলজার-ক্লুপফেল
-Comment[br]=Eurier bedel TDE gant Matthias Hoelzer-Kluepfel
-Comment[ca]=Rellotge mundial TDE per Matthias Hoelzer-Kluepfel
-Comment[cs]=TDE WorldClock od Matthiase Hoelzer-Kluepfela
-Comment[cy]=Cloc y Byd TDE gan Matthias Hoelzer-Kluepfel
-Comment[da]=TDE Verdensur af Matthias Hoelzer-Kluepfel
-Comment[de]=TDE-Weltzeituhr
-Comment[el]=Παγκόσμιο ρολόι του TDE από τον Matthias Hoelzer-Kluepfel
-Comment[eo]=TDE-mondhorloĝo
-Comment[es]=El reloj mundial de TDE por Matthias Hoelzer-Kluepfel
-Comment[et]=TDE maailma kell - Matthias Hoelzer-Kluepfel
-Comment[eu]=TDE WorldWatch Matthias Hoelzer-Kluepfelek egina
-Comment[fa]=ساعت جهانی TDE توسط ماتیوز هولزر-کلوپفل
-Comment[fi]=Maailmankello, tehnyt Matthias Hoelzer-Kluepfel
-Comment[fr]=L'horloge planétaire de TDE par Matthias Hoelzer-Kluepfel
-Comment[ga]=TDE WorldClock le Matthias Hoelzer-Kluepfel
-Comment[gl]=Reloxo Mundial de TDE  por Matthias Hoelzer-Kluepfel
-Comment[he]=השעון העולמי של TDE מאת מתיאס הולצר-קליפפל
-Comment[hi]=केडीई विश्व घड़ी- मैथियास होल्ज़र-क्लूपफेल द्वारा
-Comment[hr]=TDE svjetski sat, autor Matthias Hoelzer-Kluepfel
-Comment[hu]=TDE világóra (készítette: Matthias Hoelzer-Kluepfel)
-Comment[is]=Heimsklukka TDE, eftir Matthias Hoelzer-Kluepfel
-Comment[it]=Orologio mondiale di TDE scritto da Matthias Hoelzer-Kluepfel
-Comment[km]=នាឡិកាពិភពលោក TDE ដោយ Matthias Hoelzer-Kluepfel
-Comment[ko]=Matthias Hoelzer-Kluepfel이 만든 TDE 세계 시계
-Comment[lt]=Matthias Hoelzer-Kluepfelio darytas TDE Pasaulio Laikrodis
-Comment[lv]=TDE pasaules pulkstens no Matthias Hoelzer-Kluepfel
-Comment[mk]=Светски часовник во TDE од Matthias Hoelzer-Kluepfel
-Comment[ms]=Jam Dunia TDE oleh Matthias Hoelzer-Kluepfel
-Comment[mt]=TDE WorldClock ta' Matthias Hoelzer-Kluepfel
-Comment[nb]=TDE Verdensur av Matthias Hoelzer-Kluepfel
-Comment[nds]=TDE-Weltklock vun Matthias Hoelzer-Kluepfel
-Comment[ne]=माथ्यिस होइल्जर क्लूप्फेलद्वारा केडीई विश्वव्यापी घडी
-Comment[nl]=TDE WorldClock door Matthias Hoelzer-Kluepfel
-Comment[nn]=Verdsur for TDE av Matthias Hoelzer-Kluepfel
-Comment[pl]=Czas uniwersalny w TDE autorstwa Matthiasa Hoelzera-Kluepfela
-Comment[pt]=Relógio Global do TDE de Matthias Hoelzer-Kluepfel
-Comment[pt_BR]=Relógio Mundial TDE criado por Matthias Hoelzer-Kluepfel
-Comment[ro]=Ceas mondial TDE de Matthias Hoelzer-Kluepfel
-Comment[ru]=Всемирные часы TDE от Matthias Hoelzer-Kluepfel
-Comment[sk]=TDE svetové hodiny od Matthiasa Hoelzer-Kluepfela
-Comment[sl]=TDE WorldClock avtorja Matthiasa Hoelzer-Kluepfela
-Comment[sr]=TDE WorldClock од Матијаса Хелцера-Клипфела (Matthias Hölzer-Klüpfel)
-Comment[sr@Latn]=TDE WorldClock od Matijasa Helcera-Klipfela (Matthias Hölzer-Klüpfel)
-Comment[sv]=TDE:s världsklocka av Matthias Hoelzer-Kluepfel
-Comment[ta]= TDE உலக கடிகாரம் by Matthias Hoelzer-Kluepfel
-Comment[tg]=TDE Соати Ҷаҳон аз Маттиас Холзер-Клупфел
-Comment[th]=นาฬิกาทั่วโลกของ TDE โดย Matthias Hoelzer-Kluepfel
-Comment[tr]=Matthias Hoelzer-Kluepfel'den TDE Dünya Saati
-Comment[uk]=Всесвітній годинник TDE від Matthias Hoelzer-Kluepfel
-Comment[uz]=Matias Hoʻlser-Klyupfel (Matthias Hoelzer-Kluepfel) yaratgan TDE dunyo soati
-Comment[uz@cyrillic]=Матиас Ҳўлцер-Клюпфел (Matthias Hoelzer-Kluepfel) яратган TDE дунё соати
-Comment[ven]=Tshifhinga tsha lifhasi nga Matthias Hoelzer-Kluepfel
-Comment[wa]=Ôrlodje daegnrece po TDE, sicrît pa Matthias Hoelzer-Kluepfel
-Comment[xh]=Ukhangelo lwehlabathi lwe TDE ngu Matthias Hoelzer-Kluepfel
-Comment[zh_CN]=TDE 世界时钟(作者：Matthias Hoelzer-Kluepfel)
-Comment[zh_TW]=TDE 世界表 (Matthias Hoelzer-Kluepfel)
-Comment[zu]=Iwashi Lomhlaba lwe TDE ngu Matthias Hoelzer-Kluepfel
 Executable=kworldclock
 Command=kworldclock --dump --size %xx%y -o %f
 PreviewCommand=kworldclock --dump --size %xx%y -o %f
diff --git a/kworldwatch/kworldclock.desktop b/kworldwatch/kworldclock.desktop
index 88e34de..9e8eda9 100644
--- a/kworldwatch/kworldclock.desktop
+++ b/kworldwatch/kworldclock.desktop
@@ -1,76 +1,8 @@
 [Desktop Entry]
 Name=KWorldClock
-Name[bn]=কে-ওয়ার্ল্ড-ক্লক
-Name[de]=Weltzeituhr
-Name[el]=Παγκόσμιο ρολόι
-Name[fi]=Maailmankello
-Name[fr]=Horloge planétaire
-Name[he]=שעון עולמי
-Name[hr]=KSvjetski sat
-Name[mk]=КСветскиЧасовник
-Name[nb]=Verdensklokke
-Name[ne]=केडीई विश्वव्यापी घडी
-Name[pa]=ਕੇ-ਸੰਸਾਰ ਘੜੀ
-Name[pl]=Zegar światowy
-Name[sk]=Svetové hodiny
-Name[sl]=Svetovna ura
-Name[sv]=Världsklocka
-Name[ta]=கே உலக கடிகாரம்
-Name[tg]=Соати Ҷаҳонӣ
-Name[tr]=KDünyaSaati
-Name[wa]=Ôrlodje daegnrece
+
 GenericName=World Clock
-GenericName[be]=Сусветны гадзіннік
-GenericName[bg]=Световен часовник
-GenericName[bn]=বিশ্ব ঘড়ি
-GenericName[br]=Eurier bedel
-GenericName[ca]=Rellotge mundial
-GenericName[cs]=Světové hodiny
-GenericName[cy]=Cloc Byd
-GenericName[da]=Verdensur
-GenericName[de]=Weltzeituhr
-GenericName[el]=Παγκόσμιο ρολόι
-GenericName[eo]=Mondhorloĝo
-GenericName[es]=Reloj mundial
-GenericName[et]=Maailma kell
-GenericName[fa]=ساعت جهانی
-GenericName[fi]=Maailmankello
-GenericName[fr]=Horloge planétaire
-GenericName[gl]=Relóxio Global
-GenericName[he]=שעון עולמי
-GenericName[hr]=Svjetski sat
-GenericName[hu]=Világóra
-GenericName[is]=Heimsklukka
-GenericName[it]=Orologio mondiale
-GenericName[ja]=世界時計
-GenericName[km]=នាឡិកាពិភពលោក
-GenericName[ko]=세계 시계
-GenericName[lv]=Pasaules pulkstenis
-GenericName[mk]=Светски часовник
-GenericName[mt]=Arloġġ Dinji
-GenericName[nb]=Verdensklokke
-GenericName[nds]=Weltklock
-GenericName[ne]=विश्वव्यापी घडी
-GenericName[nl]=Wereldklok
-GenericName[nn]=Verdsur
-GenericName[pa]=ਸੰਸਾਰ ਘੜੀ
-GenericName[pl]=Zegar światowy
-GenericName[pt]=Relógio Global
-GenericName[pt_BR]=Relógio Mundial
-GenericName[ro]=Ceas mondial
-GenericName[ru]=Всемирные часы
-GenericName[sk]=Svetové hodiny
-GenericName[sl]=Svetovna ura
-GenericName[sr]=Светски часовник
-GenericName[sr@Latn]=Svetski časovnik
-GenericName[sv]=Världsklocka
-GenericName[ta]=உலக கடிகாரம்
-GenericName[tg]=Соати Ҷаҳонӣ
-GenericName[tr]=Dünya Saati
-GenericName[uk]=Всесвітній годинник
-GenericName[wa]=Ôrlodje daegnrece
-GenericName[zh_CN]=世界时钟
-GenericName[zh_TW]=世界時鐘
+
 X-DocPath=kworldclock/index.html
 Exec=kworldclock
 Icon=kworldclock
diff --git a/kworldwatch/kwwapplet.desktop b/kworldwatch/kwwapplet.desktop
index a0ee657..e69bfcd 100644
--- a/kworldwatch/kwwapplet.desktop
+++ b/kworldwatch/kwwapplet.desktop
@@ -2,106 +2,5 @@
 Type=Plugin
 Icon=kworldclock
 Name=World Wide Watch
-Name[af]=Wêreld Wye Waarneem
-Name[az]=Dünya Saatı
-Name[be]=Сусветны гадзіннік
-Name[bg]=Световен часовник
-Name[bn]=বিশ্বব্যাপী নজর
-Name[br]=Eurier bedel
-Name[ca]=Rellotge de tot el món mundial
-Name[cs]=Světové hodiny
-Name[cy]=Oriawr Fyd-Eang
-Name[da]=Verdensur
-Name[de]=Weltzeituhr
-Name[el]=Παγκόσμιος χάρτης
-Name[eo]=Mondhorloĝo
-Name[es]=Reloj mundial
-Name[et]=Maailma kell
-Name[eu]=Mundu Osoko Ikuspena
-Name[fa]=ساعت گستردۀ جهانی
-Name[fi]=Maailmankello
-Name[fr]=Applet horloge planétaire
-Name[gl]=Relóxio Mundial
-Name[he]=צג עולמי
-Name[hi]=वर्ल्ड वाइड वाच
-Name[hr]=Sat širom svijeta
-Name[hu]=Világóra
-Name[is]=Heimsklukka
-Name[it]=Orologio globale
-Name[ja]=世界時計
-Name[km]=នាឡិកាពិភពលោក
-Name[ko]=세계 시간 보기
-Name[lt]=Pasaulio vaizdas
-Name[nb]=Verdensur
-Name[nds]=Weltkieker
-Name[ne]=विश्वव्यापी घडी
-Name[pl]=Czas uniwersalny
-Name[pt]=Relógio Global
-Name[pt_BR]=Relógio Mundial
-Name[ro]=Hartă mondială
-Name[ru]=Всемирные часы
-Name[sl]=Svetovna ura
-Name[sv]=Världsklocka
-Name[ta]=  உலகளாவிய கடிகாரம்
-Name[tg]=Соати Ҷаҳони Кушод
-Name[th]=ดูเวลาทั่วโลก
-Name[tr]=Dünya Saati
-Name[uk]=Тенета часових поясів світу
-Name[ven]=U sedza lifhasi lothe
-Name[wa]=Eure eyet loumaedje sol Daegne
-Name[xh]=Ukhangelo ngokubanzi kwehlabathi
-Name[zh_CN]=世界时钟
-Name[zh_TW]=世界表
-Name[zu]=UKubheka Okubanzi Komhlaba Wonke
 Comment=Displays time and sunshine on a world map
-Comment[ar]=يعرض الوقت و وقت شروق الشمس على خريطة عالمية
-Comment[be]=Паказвае час і сонечны свет на карце свету
-Comment[bg]=Показване на часа и времето от денонощието на световната карта
-Comment[bn]=বিশ্ব মানচিত্র ব্যবহার করে সময় ও সূর্যালোক দেখায়
-Comment[ca]=Mostra l'hora i la llum del sol a un mapa del món
-Comment[cs]=Zobrazuje čas a sluneční svit na světové mapě
-Comment[cy]=Dangos amser ac heulwen ar fap y byd
-Comment[da]=Viser tid og solskin på et verdenskort
-Comment[de]=Zeigt die Zeit- und Sonnenzonen auf einer Weltkarte
-Comment[el]=Εμφανίζει την ώρα και την ηλιοφάνεια σε ένα παγκόσμιο χάρτη
-Comment[eo]=Montru tempon kaj sunleviĝon sur monda mapo
-Comment[es]=Muestra la hora y la luz diurna en un mapamundi
-Comment[et]=Kellaaeg ja päikesetõus maailma kaardil
-Comment[eu]=Bistaratu ordua eta eguzki izpiak munduko mapan
-Comment[fa]=زمان و طلوع آفتاب را در نگاشت جهانی نمایش می‌دهد
-Comment[fi]=Näyttää ajan ja auringonvalon maailmankartalla
-Comment[fr]=Affiche l'avancement de la journée sur un planisphère
-Comment[ga]=Taispeáin an t-am agus suíomh na gréine ar léarscáil an domhain
-Comment[gl]=Mostra a hora e a luz solar nun mapa-mundi
-Comment[he]=מציג את הזמן והזריחה במפת העולם
-Comment[hr]=Prikazuje vrijeme i sunce na karti svijeta
-Comment[hu]=Megmutatja a világtérképen az időzónákat és a nappal-éjszaka állapotokat
-Comment[is]=Sýnir tíma og sólskin á heimskorti
-Comment[it]=Mostra l'ora e la luce solare in una mappa del mondo
-Comment[ja]=世界地図で時刻と日照を表示
-Comment[km]=បង្ហាញពេលវេលា និងពន្លឺព្រះអាទិត្យលើផែនទីពិភពលោក
-Comment[ko]=시간과 해 상태를 세계 지도에서 보기
-Comment[lv]=Rāda laiku un saules apspīdēto teritoriju uz pasaules kartes
-Comment[mk]=Прикажува време и сончева светлина на карта на светот
-Comment[nb]=Vis tid og steder med solskinn på et verdenskart
-Comment[nds]=Wiest Tiet un Sünnschien op'n Weltkoort
-Comment[ne]=विश्व मानचित्रमा समय र सूर्योदय प्रदर्शन गर्दछ
-Comment[nl]=Toont de tijd en zonneschijn op een wereldkaart
-Comment[nn]=Viser tid og solskin på eit verdskart
-Comment[pl]=Pokazuje czas i zasięg słońca na mapie świata
-Comment[pt]=Mostra a hora e luz solar num mapa mundo
-Comment[pt_BR]=Mostra a hora e a linha do dia/noite num mapa mundial
-Comment[ro]=Afişează timpul şi răsăritul soarelului pe o hartă mondială
-Comment[ru]=Время и солнечная сторона на карте мира
-Comment[sk]=Zobrazí čas a slnečný svit na mape sveta
-Comment[sl]=Prikazuje čas in sončno svetlobo na zemljevidu sveta
-Comment[sr]=Приказује време и осунчаност на мапи света
-Comment[sr@Latn]=Prikazuje vreme i osunčanost na mapi sveta
-Comment[sv]=Visar tid och solsken på en världskarta
-Comment[tg]=Намоиши вақти рузона ва шабона дар харитаи ҷаҳонӣ
-Comment[tr]=Bir dünya haritası üzerinde zamanı ve gün ışığını gösterir
-Comment[uk]=Показує час і сонячний бік на карті світу
-Comment[wa]=Mostere l' eure eyet l' loumire do djoû so ene mape daegnrece
-Comment[zh_CN]=在世界地图上显示时间和阳光
-Comment[zh_TW]=在世界地圖上顯示時間與日光
 X-TDE-Library=ww_panelapplet
diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp
index e113d3a..78bd401 100644
--- a/kworldwatch/main.cpp
+++ b/kworldwatch/main.cpp
@@ -66,11 +66,11 @@ WorldWideWatch::WorldWideWatch(bool restore, TQWidget *parent, const char *name)
   _clocks = new ZoneClockPanel(w);
   vbox->addWidget(_clocks);
 
-  connect(_map, TQT_SIGNAL(addClockClicked(const TQString &)), _clocks, TQT_SLOT(addClock(const TQString &)));
-  connect(_map, TQT_SIGNAL(saveSettings()), this, TQT_SLOT(doSave()));
+  connect(_map, TQ_SIGNAL(addClockClicked(const TQString &)), _clocks, TQ_SLOT(addClock(const TQString &)));
+  connect(_map, TQ_SIGNAL(saveSettings()), this, TQ_SLOT(doSave()));
 
   if (restore)
-    load(kapp->config());
+    load(tdeApp->config());
 }
 
 
@@ -96,14 +96,14 @@ void WorldWideWatch::save(TDEConfig *config)
 
 void WorldWideWatch::doSave()
 {
-  save(kapp->config());
+  save(tdeApp->config());
 }
 
 
 void WatchApplication::dumpMap()
 {
   // guess some default parameters
-  TQSize mapSize(kapp->desktop()->size());
+  TQSize mapSize(tdeApp->desktop()->size());
  
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
  
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
   TDEAboutData about("kworldclock", I18N_NOOP("TDE World Clock"), "1.5");
   TDECmdLineArgs::init(argc, argv, &about);
   TDECmdLineArgs::addCmdLineOptions(options);
-  KUniqueApplication::addCmdLineOptions();
+  TDEUniqueApplication::addCmdLineOptions();
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->isSet("themes"))
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
     return 0;
   }
 
-  if (!KUniqueApplication::start())
+  if (!TDEUniqueApplication::start())
     return 0;
 
   WatchApplication app;
diff --git a/kworldwatch/main.h b/kworldwatch/main.h
index ba7e233..7ef2792 100644
--- a/kworldwatch/main.h
+++ b/kworldwatch/main.h
@@ -29,7 +29,7 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tdemainwindow.h>
 
 
@@ -39,7 +39,7 @@ class ZoneClockPanel;
 
 class WorldWideWatch : public TDEMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
@@ -69,14 +69,14 @@ private:
 };
 
 
-class WatchApplication : public KUniqueApplication
+class WatchApplication : public TDEUniqueApplication
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
 
-  WatchApplication() : KUniqueApplication() {};
+  WatchApplication() : TDEUniqueApplication() {};
 
   int newInstance();
 
diff --git a/kworldwatch/maploader.cpp b/kworldwatch/maploader.cpp
index ce192f2..d5efd29 100644
--- a/kworldwatch/maploader.cpp
+++ b/kworldwatch/maploader.cpp
@@ -36,8 +36,8 @@
 
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.h>
+#include <tdedesktopfile.h>
 #include <kimageeffect.h>
 
 
@@ -52,7 +52,7 @@ TQPtrList<MapTheme> MapLoader::themes()
   TQStringList files = TDEGlobal::dirs()->findAllResources("data", "kworldclock/maps/*/*.desktop");
   for (TQStringList::Iterator it=files.begin(); it != files.end(); ++it)
     {
-      KDesktopFile conf(*it);
+      TDEDesktopFile conf(*it);
       conf.setGroup("Theme");
       result.append(new MapTheme(conf.readName(), conf.readEntry("Theme")));
     }
diff --git a/kworldwatch/maps/CMakeL10n.txt b/kworldwatch/maps/CMakeL10n.txt
new file mode 100644
index 0000000..df2cdc1
--- /dev/null
+++ b/kworldwatch/maps/CMakeL10n.txt
@@ -0,0 +1,7 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/kworldwatch-maps/"
+    SOURCES *.desktop
+    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/kworldwatch/maps/depths/CMakeLists.txt b/kworldwatch/maps/depths/CMakeLists.txt
index 44405bc..0b66487 100644
--- a/kworldwatch/maps/depths/CMakeLists.txt
+++ b/kworldwatch/maps/depths/CMakeLists.txt
@@ -9,8 +9,15 @@
 #
 #################################################
 
-install( FILES depths.desktop 400.jpg 800.jpg
+install(
+  FILES
+    400.jpg 800.jpg
   DESTINATION
     ${DATA_INSTALL_DIR}/kworldclock/maps/depths
 )
 
+tde_create_translated_desktop(
+  SOURCE depths.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/kworldclock/maps/depths
+  PO_DIR kworldwatch-maps
+)
diff --git a/kworldwatch/maps/depths/depths.desktop b/kworldwatch/maps/depths/depths.desktop
index 33a11a5..e93f038 100644
--- a/kworldwatch/maps/depths/depths.desktop
+++ b/kworldwatch/maps/depths/depths.desktop
@@ -1,64 +1,3 @@
 [Theme]
 Name=Surface Depth
-Name[af]=Oppervlakte Diepte
-Name[ar]=عمق السطح
-Name[az]=Səth Dərinliyi
-Name[be]=Глыбіня паверхні
-Name[bg]=Релеф на земната повърхност
-Name[bn]=পৃষ্ঠের গভীরতা
-Name[br]=Krogad en egor
-Name[ca]=Extensió de la superfície
-Name[cs]=Plocha do hloubky
-Name[cy]=Dyfnder Arwyneb
-Name[da]=Overfladedybde
-Name[de]=Oberflächenstruktur
-Name[el]=Βάθος επιφάνειας
-Name[eo]=Surfacprofundo
-Name[es]=Profundidad de superficie
-Name[et]=Pinnasügavus
-Name[eu]=Azalaren Sakona
-Name[fa]=عمق سطح
-Name[fi]=Pinnan syvyys
-Name[fr]=Relief
-Name[ga]=Doimhneacht an Dromchla
-Name[gl]=Profundidade da Superfície
-Name[he]=מעמקים
-Name[hi]=सतह गहराई
-Name[hr]=Površinska dubina
-Name[hu]=Felületmélység
-Name[is]=Yfirborðsdýpt
-Name[it]=Profondità superficie
-Name[ja]=表面の深さ
-Name[km]=ជម្រៅផ្ទៃ
-Name[ko]=표면 깊이
-Name[lt]=Paviršiaus gylis
-Name[lv]=Virsmas dziļums
-Name[mk]=Длабочина на површина
-Name[mt]=Fond tal-wiċċ
-Name[nb]=Overflate-dybde
-Name[nds]=Böversiet-Deepde
-Name[ne]=धरातलिय गहिराइ
-Name[nl]=Oppervlaktediepte
-Name[nn]=Overflatedjupne
-Name[pl]=Głębokość powierzchni
-Name[pt]=Profundidade da Superfície
-Name[pt_BR]=Profundidade de superfície
-Name[ro]=Suprafaţă de adîncimi
-Name[ru]=Глубина поверхности
-Name[sk]=Hĺbka povrchu
-Name[sl]=Globina ploskve
-Name[sr]=Дубина рељефа
-Name[sr@Latn]=Dubina reljefa
-Name[sv]=Ytdjup
-Name[ta]=  தள ஆழம்
-Name[tg]=Қаъри Сатҳ
-Name[th]=ความลึกพื้นผิว
-Name[tr]=Yüzey Derinliği
-Name[uk]=Глибина поверхні
-Name[ven]=Vhulapfu uya fhasi
-Name[wa]=Surface e relief
-Name[xh]=Ubunzulu Bomphezulu
-Name[zh_CN]=表面纵深
-Name[zh_TW]=表面深度
-Name[zu]=Ubunzulu Baphezulu
 Theme=depths
diff --git a/kworldwatch/maps/flatworld/CMakeLists.txt b/kworldwatch/maps/flatworld/CMakeLists.txt
index 25085a9..a7f5541 100644
--- a/kworldwatch/maps/flatworld/CMakeLists.txt
+++ b/kworldwatch/maps/flatworld/CMakeLists.txt
@@ -9,9 +9,15 @@
 #
 #################################################
 
-install( FILES flatworld.desktop 200.jpg 400.jpg
-  800.jpg 1200.jpg 1600.jpg
+install(
+  FILES
+    200.jpg 400.jpg 800.jpg 1200.jpg 1600.jpg
   DESTINATION
     ${DATA_INSTALL_DIR}/kworldclock/maps/flatworld
 )
 
+tde_create_translated_desktop(
+  SOURCE flatworld.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/kworldclock/maps/flatworld
+  PO_DIR kworldwatch-maps
+)
diff --git a/kworldwatch/maps/flatworld/flatworld.desktop b/kworldwatch/maps/flatworld/flatworld.desktop
index 56ff332..70468c2 100644
--- a/kworldwatch/maps/flatworld/flatworld.desktop
+++ b/kworldwatch/maps/flatworld/flatworld.desktop
@@ -1,53 +1,3 @@
 [Theme]
 Name=Flat World
-Name[be]=Плоскі свет
-Name[bg]=Без релеф на земната повърхност
-Name[bn]=সমতল বিশ্ব
-Name[br]=Bed kompez
-Name[cs]=Plochý svět
-Name[cy]=Byd Gwastad
-Name[da]=Flad verden
-Name[de]=Flache Welt
-Name[el]=Επίπεδος κόσμος
-Name[eo]=Plana Mondo
-Name[es]=Mundo plano
-Name[et]=Lame maailm
-Name[eu]=Mundu zabal
-Name[fa]=جهان مسطح
-Name[fi]=Laakea maailma
-Name[fr]=Monde plat
-Name[ga]=Domhan Cothrom
-Name[gl]=Mundo Chao
-Name[he]=עולם שטוח
-Name[hr]=Pljosnati svijet
-Name[hu]=Lapos világ
-Name[is]=Flatur heimur
-Name[it]=Mondo piatto
-Name[ja]=平坦な世界図
-Name[km]=ពិភពលោកសំប៉ែត
-Name[ko]=평평한 세계
-Name[lv]=Plakana pasaule
-Name[mk]=Рамен свет
-Name[mt]=Dinja Ċatta
-Name[nb]=Flat verden
-Name[nds]=Platte Welt
-Name[ne]=फराकिलो संसार
-Name[nl]=Vlakke wereld
-Name[pl]=Płaski świat
-Name[pt]=Mundo Plano
-Name[pt_BR]=Mundo Plano
-Name[ro]=Suprafaţă plată
-Name[ru]=Плоский мир
-Name[sk]=Plochý svet
-Name[sl]=Ploščati svet
-Name[sr]=Раван свет
-Name[sr@Latn]=Ravan svet
-Name[sv]=Platt värld
-Name[ta]=படிமான உலகம்
-Name[tg]=Ҷаҳони ҳамворӣ
-Name[tr]=Düz Dünya
-Name[uk]=Плоский світ
-Name[wa]=Plate Daegne
-Name[zh_CN]=平面世界
-Name[zh_TW]=平面世界
 Theme=flatworld
diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp
index 5acc5ce..24e69f7 100644
--- a/kworldwatch/mapwidget.cpp
+++ b/kworldwatch/mapwidget.cpp
@@ -43,7 +43,7 @@
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqcursor.h>
 #include <tqpainter.h>
@@ -69,7 +69,7 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
 
   if (restore)
     {
-      TDEConfig *config = kapp->config();
+      TDEConfig *config = tdeApp->config();
       if (applet)
 	config = new TDEConfig("kwwwappletrc");
       _theme = config->readEntry("Theme", "depths");
@@ -88,19 +88,19 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
   int id;
   _flagPopup = new TQPopupMenu(this);
   TQPixmap flag = TQPixmap(locate("data", "kworldclock/pics/flag-red.png"));
-  id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Red"), this, TQT_SLOT(addFlag(int)));
+  id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Red"), this, TQ_SLOT(addFlag(int)));
   _flagPopup->setItemParameter(id, 0);
   flag = TQPixmap(locate("data", "kworldclock/pics/flag-green.png"));
-  id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Green"), this, TQT_SLOT(addFlag(int)));
+  id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Green"), this, TQ_SLOT(addFlag(int)));
   _flagPopup->setItemParameter(id, 1);
   flag = TQPixmap(locate("data", "kworldclock/pics/flag-blue.png"));
-  id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Blue"), this, TQT_SLOT(addFlag(int)));
+  id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Blue"), this, TQ_SLOT(addFlag(int)));
   _flagPopup->setItemParameter(id, 2);
-  id = _flagPopup->insertItem(i18n("Add &Custom..."), this, TQT_SLOT(addFlag(int)));
+  id = _flagPopup->insertItem(i18n("Add &Custom..."), this, TQ_SLOT(addFlag(int)));
   _flagPopup->setItemParameter(id, 3);
   _flagPopup->insertSeparator();
-  _flagPopup->insertItem(i18n("&Remove Flag"), this, TQT_SLOT(removeFlag()));
-  _flagPopup->insertItem(i18n("&Remove All Flags"), this, TQT_SLOT(removeAllFlags()));
+  _flagPopup->insertItem(i18n("&Remove Flag"), this, TQ_SLOT(removeFlag()));
+  _flagPopup->insertItem(i18n("&Remove All Flags"), this, TQ_SLOT(removeAllFlags()));
 
   _themePopup = new TQPopupMenu(this);
   _themes = MapLoader::themes();
@@ -108,13 +108,13 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
   TQPtrListIterator<MapTheme> it(_themes);
   for ( ; it.current(); ++it)
     {
-      int id = _themePopup->insertItem(it.current()->name(), this, TQT_SLOT(themeSelected(int)));
+      int id = _themePopup->insertItem(it.current()->name(), this, TQ_SLOT(themeSelected(int)));
       _themePopup->setItemParameter(id, cnt++);
       it.current()->setID(id);
     }
 
   TQPopupMenu *_clocksPopup = new TQPopupMenu(this);
-  _clocksPopup->insertItem(i18n("&Add..."), this, TQT_SLOT(addClock()));
+  _clocksPopup->insertItem(i18n("&Add..."), this, TQ_SLOT(addClock()));
 
   _popup = new TQPopupMenu(this);
   _popup->insertItem(i18n("&Flags"), _flagPopup);
@@ -124,21 +124,21 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
 
   _popup->insertSeparator();
   _popup->insertItem(i18n("&Map Theme"), _themePopup);
-  _illuminationID = _popup->insertItem(i18n("Show &Daylight"), this, TQT_SLOT(toggleIllumination()));
-  _citiesID = _popup->insertItem(i18n("Show &Cities"), this, TQT_SLOT(toggleCities()));
-  _flagsID = _popup->insertItem(i18n("Show F&lags"), this, TQT_SLOT(toggleFlags()));
+  _illuminationID = _popup->insertItem(i18n("Show &Daylight"), this, TQ_SLOT(toggleIllumination()));
+  _citiesID = _popup->insertItem(i18n("Show &Cities"), this, TQ_SLOT(toggleCities()));
+  _flagsID = _popup->insertItem(i18n("Show F&lags"), this, TQ_SLOT(toggleFlags()));
 
   if (!applet)
     {
       _popup->insertSeparator();
-      _popup->insertItem(i18n("&Save Settings"), this, TQT_SLOT(slotSaveSettings()));
+      _popup->insertItem(i18n("&Save Settings"), this, TQ_SLOT(slotSaveSettings()));
     }
 
   _popup->insertSeparator();
-  _popup->insertItem(i18n("&About"), this, TQT_SLOT(about()));
+  _popup->insertItem(i18n("&About"), this, TQ_SLOT(about()));
 
   TQTimer *timer = new TQTimer(this);
-  connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
+  connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
   timer->start(1000);
 
   _cityIndicator = new TQLabel(0,0, WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM );
@@ -152,9 +152,9 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
   _cityIndicator->setPalette(TQToolTip::palette());
 
   if (restore && !applet)
-    load(kapp->config());
+    load(tdeApp->config());
     
-  connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateCityIndicator()));
+  connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateCityIndicator()));
 }
 
 
@@ -410,7 +410,7 @@ void MapWidget::themeSelected(int index)
 
 void MapWidget::mousePressEvent(TQMouseEvent *ev)
 {
-  if (ev->button() == Qt::RightButton)
+  if (ev->button() == TQt::RightButton)
     {
       _flagPos = ev->pos();
       _popup->exec(ev->globalPos()); 
diff --git a/kworldwatch/mapwidget.h b/kworldwatch/mapwidget.h
index 21126cb..b7704a4 100644
--- a/kworldwatch/mapwidget.h
+++ b/kworldwatch/mapwidget.h
@@ -55,7 +55,7 @@ class FlagList;
 
 class MapWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp
index a2279c2..e791b98 100644
--- a/kworldwatch/zoneclock.cpp
+++ b/kworldwatch/zoneclock.cpp
@@ -69,9 +69,9 @@ ZoneClock::ZoneClock(const TQString &zone, const TQString &name, TQWidget *paren
   hbox->addWidget(_timeLabel, 0, TQt::AlignRight);
 
   _popup = new TQPopupMenu(this);
-  _popup->insertItem(i18n("&Edit..."), this, TQT_SLOT(editClock()));
-  _popup->insertItem(i18n("&Add..."), this, TQT_SLOT(slotAddClock()));
-  _popup->insertItem(i18n("&Remove"), this, TQT_SLOT(slotRemoveClock()));
+  _popup->insertItem(i18n("&Edit..."), this, TQ_SLOT(editClock()));
+  _popup->insertItem(i18n("&Add..."), this, TQ_SLOT(slotAddClock()));
+  _popup->insertItem(i18n("&Remove"), this, TQ_SLOT(slotRemoveClock()));
 
   _nameLabel->installEventFilter(this);
   _timeLabel->installEventFilter(this);
@@ -87,7 +87,7 @@ void ZoneClock::slotRemoveClock()
   // So instead we fire up an idle event triggering the delete
   // after the return.
 
-  TQTimer::singleShot(0, this, TQT_SLOT(removeTimeout()));
+  TQTimer::singleShot(0, this, TQ_SLOT(removeTimeout()));
 }
 
 
@@ -138,7 +138,7 @@ bool ZoneClock::eventFilter(TQObject *obj, TQEvent *ev)
   if (ev->type() == TQEvent::MouseButtonPress)
     {
       TQMouseEvent *e = (TQMouseEvent*)ev;
-      if (e->button() == Qt::RightButton)
+      if (e->button() == TQt::RightButton)
 	_popup->exec(e->globalPos());
     }
 
@@ -172,7 +172,7 @@ ZoneClockPanel::ZoneClockPanel(TQWidget *parent, const char *name)
 
   TQTimer *t = new TQTimer(this);
 
-  connect(t, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateTimer()));
+  connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateTimer()));
   t->start(500);
 
   _clocks.setAutoDelete(true);
@@ -202,9 +202,9 @@ void ZoneClockPanel::addClock(const TQString &zone, const TQString &name)
 
   realign();
 
-  connect(zc, TQT_SIGNAL(addClock(const TQString &)), this, TQT_SLOT(addClock(const TQString &)));
-  connect(zc, TQT_SIGNAL(changed()), this, TQT_SLOT(realign()));
-  connect(zc, TQT_SIGNAL(removeMe(ZoneClock *)), this, TQT_SLOT(removeClock(ZoneClock *)));
+  connect(zc, TQ_SIGNAL(addClock(const TQString &)), this, TQ_SLOT(addClock(const TQString &)));
+  connect(zc, TQ_SIGNAL(changed()), this, TQ_SLOT(realign()));
+  connect(zc, TQ_SIGNAL(removeMe(ZoneClock *)), this, TQ_SLOT(removeClock(ZoneClock *)));
 }
 
 
diff --git a/kworldwatch/zoneclock.h b/kworldwatch/zoneclock.h
index ba8c6b6..55af262 100644
--- a/kworldwatch/zoneclock.h
+++ b/kworldwatch/zoneclock.h
@@ -45,7 +45,7 @@ class ClockDialog;
 
 class ZoneClock : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
@@ -97,7 +97,7 @@ private:
 
 class ZoneClockPanel : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public: