8 files changed, 19 insertions, 112 deletions
diff --git a/akregator/src/mk4storage/CMakeLists.txt b/akregator/src/mk4storage/CMakeLists.txt
index c229d6ec..a1c78613 100644
--- a/akregator/src/mk4storage/CMakeLists.txt
+++ b/akregator/src/mk4storage/CMakeLists.txt
@@ -27,7 +27,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES akregator_mk4storage_plugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE akregator_mk4storage_plugin.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR akregator-desktops
+)
+
 install( FILES mk4config.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 
diff --git a/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop b/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
index 4d932dcf..28d3cb0e 100644
--- a/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
+++ b/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
@@ -1,99 +1,10 @@
 [Desktop Entry]
-Type=Service
 Name=Metakit storage backend
-Name[af]=Metakit stoor agterkant
-Name[bg]=Приставка за архивиране Metakit
-Name[ca]=Dorsal de emmagatzematge Metakit
-Name[cs]=Metakit úložiště
-Name[da]=Metakit lagringsgrænseflade
-Name[de]=Metakit Archiv-Modul
-Name[el]=Σύστημα υποστήριξης αποθήκευσης Metakit
-Name[eo]=Metakit datumstora maŝino
-Name[es]=Dorsal de almacenamiento Metakit
-Name[et]=Metakiti salvestamisrakendus
-Name[eu]=Metakit-en biltegiratze euskarria
-Name[fa]=پشتیبان ذخیره‌گاه Metakit
-Name[fi]=Metakit-tallennusajuri
-Name[fr]=Stockage avec Metakit
-Name[fy]=Metakit-opslachefterein
-Name[gl]=Manexador do almacenador Metakit
-Name[hu]=Metakit tároló
-Name[is]=Metakit geymslu bakendi
-Name[it]=Backend archiviazione metakit
-Name[ja]=メタキットストレージバックエンド
-Name[kk]=Metakit архивтеу бағдарламасы
-Name[km]=កម្មវិធីខាងក្រោយសម្រាប់រក្សាទុក (Metakit)
-Name[ko]=Metakit 저장소 백엔드
-Name[lt]=Metakit saugojimo programinė sąsaja
-Name[ms]=Hujung belakang storan Metakit 
-Name[nb]=Metakit lagringsbakstykke
-Name[nds]=Metakit-Archivmoduul
-Name[ne]=मेटाकिट भण्डारण ब्याकइन्ड
-Name[nl]=Metakit-opslagbackend
-Name[nn]=Metakit-lagringsbakstykke
-Name[pl]=System przechowywania Metakit
-Name[pt]=Infra-estrutura de armazenamento Metakit
-Name[pt_BR]=Mecanismo de armazenamento Metakit
-Name[ru]=Движок Metakit
-Name[sl]=Shranjevanje Metakit
-Name[sr]=Систем за смештање Мета комплета
-Name[sr@Latn]=Sistem za smeštanje Meta kompleta
-Name[sv]=Metakit lagringsgränssnitt
-Name[tr]=Metakit depolama arka ucu
-Name[uk]=Програма зберігання Metakit
-Name[zh_CN]=Metakit 存储后端
-Name[zh_TW]=Metakit 儲存後端介面
-X-TDE-Library=libakregator_mk4storage_plugin
+
 Comment=Plugin for Akregator
-Comment[af]=Inprop module vir Akregator
-Comment[be]=Утулка для Akregator
-Comment[bg]=Приставка за Akregator
-Comment[br]=Lugent evit Akregator
-Comment[ca]=Endollable per a l'Akregator
-Comment[cs]=Modul pro Akregator
-Comment[de]=Modul für Akregator
-Comment[el]=Πρόσθετο για το Akregator
-Comment[eo]=Kromprogramo por Akregator
-Comment[es]=Extensión para Akregator
-Comment[et]=Akregatori plugin
-Comment[eu]=Akregator-en plugina
-Comment[fa]=وصله برای Akregator
-Comment[fi]=Liitännäinen Akregatoriin
-Comment[fr]=Module pour Akregator
-Comment[fy]=Plugin foar Akregator
-Comment[ga]=Breiseán Akregator
-Comment[gl]=Extensión para Akregator
-Comment[he]=תוסף עבור Akregator
-Comment[hu]=Akregator bővítőmodul
-Comment[is]=Íforrit fyrir Akregator
-Comment[it]=Plugin per Akregator
-Comment[ja]=Akregator 用プラグイン
-Comment[kk]=Akregator-дың плагин модулі
-Comment[km]=កម្មវិធីជំនួយ Akregator
-Comment[ko]=Akregator 플러그인
-Comment[lt]=Akregator skirtas priedas
-Comment[mk]=Приклучок за Akregator
-Comment[ms]=Plugin untuk Akregator
-Comment[nb]=Programtillegg for Akregator
-Comment[nds]=Moduul för Akregator
-Comment[ne]=एक्रिगेटरका लागि प्लगइन
-Comment[nl]=Plugin voor Akregator
-Comment[nn]=Programtillegg til Akregator
-Comment[pl]=Wtyczka dla Akregatora
-Comment[pt]='Plugin' para o Akregator
-Comment[pt_BR]=Plug-in para o Akregator
-Comment[ru]=Модуль Akregator
-Comment[se]=Lassemoduvla Akregatorii
-Comment[sk]=Modul pre Akregator
-Comment[sl]=Vstavek za Akregator
-Comment[sr]=Прикључак за Akregator
-Comment[sr@Latn]=Priključak za Akregator
-Comment[sv]=Insticksprogram för Akregator
-Comment[tr]=Akregator Eklentisi
-Comment[uk]=Втулок для Akregator
-Comment[uz]=Akregator учун плагин
-Comment[zh_CN]=Akregator 插件
-Comment[zh_TW]=Akregator 外掛程式
+
+Type=Service
+X-TDE-Library=libakregator_mk4storage_plugin
 X-TDE-ServiceTypes=Akregator/Plugin
 
 X-TDE-akregator-plugintype=storage
@@ -103,4 +14,3 @@ X-TDE-akregator-email=frank.osterfeld@kdemail.net
 X-TDE-akregator-rank=255
 X-TDE-akregator-version=1
 X-TDE-akregator-framework-version=1
-
diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES
index 160c4bad..edd5f861 100644
--- a/akregator/src/mk4storage/metakit/CHANGES
+++ b/akregator/src/mk4storage/metakit/CHANGES
@@ -1686,5 +1686,3 @@ ALSO LISTED IN THE RELEASE HISTORY
     Moves do not involve any data copying w.r.t. subviews and memo's.
 
 The old release history is at http://www.equi4.com/metakit/history.html
-
-# vim: tw=72
diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp
index c028b156..09b4c2de 100644
--- a/akregator/src/mk4storage/mk4confwidget.cpp
+++ b/akregator/src/mk4storage/mk4confwidget.cpp
@@ -52,7 +52,7 @@ MK4ConfWidget::MK4ConfWidget() : MK4ConfWidgetBase()
         label->setEnabled(true);
     }
     filereq->setURL(MK4Config::archivePath());
-    connect(cbUseDefault, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChkBoxUseDefault(bool)));
+    connect(cbUseDefault, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChkBoxUseDefault(bool)));
     
 }
 
diff --git a/akregator/src/mk4storage/mk4confwidget.h b/akregator/src/mk4storage/mk4confwidget.h
index 194295de..797ad5c0 100644
--- a/akregator/src/mk4storage/mk4confwidget.h
+++ b/akregator/src/mk4storage/mk4confwidget.h
@@ -32,7 +32,7 @@ namespace Backend {
 
 class MK4ConfWidget : public MK4ConfWidgetBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         
diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui
index c5c837a5..9eea1d7d 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -104,9 +104,6 @@
                     <property name="text">
                         <string>&amp;OK</string>
                     </property>
-                    <property name="accel">
-                        <string></string>
-                    </property>
                     <property name="autoDefault">
                         <bool>true</bool>
                     </property>
@@ -132,9 +129,6 @@
                     <property name="text">
                         <string>&amp;Cancel</string>
                     </property>
-                    <property name="accel">
-                        <string></string>
-                    </property>
                     <property name="autoDefault">
                         <bool>true</bool>
                     </property>
@@ -170,9 +164,9 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp
index 1e104bd3..0331e0f1 100644
--- a/akregator/src/mk4storage/storagemk4impl.cpp
+++ b/akregator/src/mk4storage/storagemk4impl.cpp
@@ -263,7 +263,7 @@ void StorageMK4Impl::markDirty()
     {
         d->modified = true;
         // commit changes after 3 seconds
-        TQTimer::singleShot(3000, this, TQT_SLOT(slotCommit()));
+        TQTimer::singleShot(3000, this, TQ_SLOT(slotCommit()));
     }
 }
 
diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h
index d6c4a59c..8fcde1ea 100644
--- a/akregator/src/mk4storage/storagemk4impl.h
+++ b/akregator/src/mk4storage/storagemk4impl.h
@@ -36,7 +36,7 @@ namespace Backend {
  */
 class StorageMK4Impl : public Storage
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public: