24 files changed, 91 insertions, 341 deletions
diff --git a/kdf/CMakeL10n.txt b/kdf/CMakeL10n.txt
index 93aabe2..7e06503 100644
--- a/kdf/CMakeL10n.txt
+++ b/kdf/CMakeL10n.txt
@@ -4,3 +4,9 @@ tde_l10n_create_template(
     CATALOG "kdf"
     EXCLUDES "tdeconftest.cpp"
 )
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/kdf-desktops/"
+    SOURCES *.desktop
+    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/kdf/CMakeLists.txt b/kdf/CMakeLists.txt
index 43725af..dc67af4 100644
--- a/kdf/CMakeLists.txt
+++ b/kdf/CMakeLists.txt
@@ -67,8 +67,7 @@ install( FILES kdfui.rc
   DESTINATION ${DATA_INSTALL_DIR}/kdf
 )
 
-install( FILES kdf.desktop kwikdisk.desktop
-  kcmdf.desktop
-  DESTINATION ${XDG_APPS_INSTALL_DIR}
+tde_create_translated_desktop(
+  SOURCE kdf.desktop kwikdisk.desktop kcmdf.desktop
+  PO_DIR kdf-desktops
 )
-
diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index 3526999..8927f0a 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -53,10 +53,10 @@ DiskList::DiskList(TQObject *parent, const char *name)
 
    // BackgroundProcesses ****************************************
    dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc);
-   connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
-      this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) );
-   connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ),
-      this, TQT_SLOT(dfDone() ) );
+   connect( dfProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
+      this, TQ_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) );
+   connect(dfProc,TQ_SIGNAL(processExited(TDEProcess *) ),
+      this, TQ_SLOT(dfDone() ) );
 
    readingDFStdErrOut=FALSE;
    config = kapp->config();
diff --git a/kdf/disklist.h b/kdf/disklist.h
index 926ca36..019b848 100644
--- a/kdf/disklist.h
+++ b/kdf/disklist.h
@@ -37,7 +37,7 @@
 
 #define DF_COMMAND    "df"
 // be pessimistic: df -T only works under linux !??
-#if defined(_OS_LINUX_)
+#if defined(_OS_LINUX_) || defined(__dilos__)
 #define DF_ARGS       "-kT"
 #define NO_FS_TYPE    false
 #else
@@ -94,7 +94,7 @@ private:
 
 /***************************************************************************/
 class DiskList : public TQObject
-{  Q_OBJECT
+{  TQ_OBJECT
   
 public:
    DiskList( TQObject *parent=0, const char *name=0 );
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index 1084380..391b5d9 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -56,10 +56,10 @@ void DiskEntry::init()
  // BackgroundProcesses ****************************************
 
  sysProc = new KShellProcess(); TQ_CHECK_PTR(sysProc);
- connect( sysProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
-        this, TQT_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) );
- connect( sysProc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int) ),
-        this, TQT_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) );
+ connect( sysProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
+        this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) );
+ connect( sysProc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int) ),
+        this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) );
  readingSysStdErrOut=FALSE;
 
 
diff --git a/kdf/disks.h b/kdf/disks.h
index 0a0d529..2ca286d 100644
--- a/kdf/disks.h
+++ b/kdf/disks.h
@@ -39,7 +39,7 @@
 
 class DiskEntry : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   DiskEntry(TQObject *parent=0, const char *name=0);
diff --git a/kdf/kcmdf.cpp b/kdf/kcmdf.cpp
index 4daaaab..f58a193 100644
--- a/kdf/kcmdf.cpp
+++ b/kdf/kcmdf.cpp
@@ -57,7 +57,7 @@ TQString KDiskFreeWidget::quickHelp() const
 
 extern "C"
 {
-  KDE_EXPORT TDECModule* create_kdf( TQWidget *parent, const char * /*name*/ )
+  TDE_EXPORT TDECModule* create_kdf( TQWidget *parent, const char * /*name*/ )
   {
     return new KDiskFreeWidget( parent , "kdf" );
   }
diff --git a/kdf/kcmdf.desktop b/kdf/kcmdf.desktop
index 6cc4943..89bd916 100644
--- a/kdf/kcmdf.desktop
+++ b/kdf/kcmdf.desktop
@@ -8,132 +8,7 @@ Exec=tdecmshell kcmdf
 Icon=kcmdf
 Type=Application
 Name=Storage Devices
-Name[af]=Stoorplek Toestelle
-Name[ar]=أجهزة تخزين
-Name[bg]=Твърди дискове
-Name[bs]=Uređaji za smještaj
-Name[ca]=Dispositius d'emmagatzemament
-Name[cs]=Úložná zařízení
-Name[cy]=Dyfeisiau Storio
-Name[da]=Opbevaringsenheder
-Name[de]=Speichergeräte
-Name[el]=Συσκευές αποθήκευσης
-Name[eo]=Memor-aparatoj
-Name[es]=Dispositivos de almacenamiento
-Name[et]=Salvestusseadmed
-Name[eu]=Biltegiratze Gailuak
-Name[fa]=دستگاههای ذخیره
-Name[fi]=Tallennuslaitteet
-Name[fr]=Périphériques de stockage
-Name[ga]=Gléasanna Stórais
-Name[gl]=Dispositivos de Almaceamento
-Name[he]=התקני איחסון
-Name[hi]=भंडारण औज़ार
-Name[hr]=Skladišni uređaji 
-Name[hu]=Tárolóeszközök
-Name[is]=Minnisbúnaður
-Name[it]=Dispositivi di memorizzazione
-Name[ja]=ストレージデバイス
-Name[ka]=ინფორმაციის შემნახველი მოწყობილობები
-Name[kk]=Жинақтаушы құрылғылар
-Name[km]=ឧបករណ៍ផ្ទុក
-Name[lt]=Saugojimo įrenginiai
-Name[mk]=Уреди за складирање
-Name[mt]=Apparat għas-sarr ta' informazzjoni
-Name[nb]=Lagringsenheter
-Name[nds]=Spiekerreedschappen
-Name[ne]=यन्त्र भण्डारण गर्नुहोस्
-Name[nl]=Opslagapparaten
-Name[nn]=Lagringseiningar
-Name[pa]=ਸਟੋਰੇਜ਼ ਜੰਤਰ
-Name[pl]=Urządzenia do przechowywania danych
-Name[pt]=Dispositivos de Armazenamento
-Name[pt_BR]=Dispositivos de Armazenamento
-Name[ro]=Dispozitive de stocare
-Name[ru]=Устройства хранения данных
-Name[sk]=Disky
-Name[sl]=Naprave za shranjevanje
-Name[sr]=Складишни уређаји
-Name[sr@Latn]=Skladišni uređaji
-Name[sv]=Lagringsenheter
-Name[ta]= சேமிப்பு சாதனங்கள் 
-Name[tg]=Дастгоҳҳои Захиракунӣ
-Name[th]=อุปกรณ์เก็บข้อมูล
-Name[tr]=Depolama Aygıtları
-Name[uk]=Пристрої накопичення
-Name[uz]=Saqlash uskunalari
-Name[uz@cyrillic]=Сақлаш ускуналари
-Name[wa]=Éndjins di wårdaedje
-Name[xh]=Amacebo Okugcina
-Name[zh_CN]=存储设备
-Name[zh_TW]=儲存裝置
-Name[zu]=Amathuluzi Ethala
 X-DocPath=kcontrol/storagedevices/index.html
 Comment=Shows the disk usage of the mounted devices
-Comment[af]=Vertoon die disket gebruik van die gekoppelde toestelle
-Comment[ar]=يعرض المساحة المستخدمة من الأقراص المضمومة
-Comment[az]=Bağlı avadanlıqların disk istifadəsini göstərir
-Comment[bg]=Информация за използваното пространство на монтираните устройства
-Comment[br]=Diskouez an egor implijet gant an trobarzhelloù marc'het
-Comment[bs]=Prikazuje iskorištenost diskova na montiranim uređajima
-Comment[ca]=Mostra l'ús de disc dels dispositius muntats
-Comment[cs]=Zobrazuje využití připojených diskových zařízení
-Comment[cy]=Dangos defnydd disg y dyfeisiau mowntiedig
-Comment[da]=Viser monterede enheders diskforbrug
-Comment[de]=Zeigt die Speicherbelegung eingebundener Geräte
-Comment[el]=Εμφανίζει τη χρήση αποθηκευτικού χώρου των προσαρτημένων συσκευών
-Comment[eo]=Montras la kapacitojn de la kroĉitaj aparatoj
-Comment[es]=Muestra el uso del disco en los dispositivos montados
-Comment[et]=Ühendatud seadmete kettakasutuse vaatamine
-Comment[eu]=Muntatutako diskoen erabilera erakusten du
-Comment[fa]=استفادۀ دیسک دستگاههای سوار‌شده را نمایش می‌دهد
-Comment[fi]=Näyttää levynkäytön liitetyillä laitteilla
-Comment[fr]=Affiche l'espace utilisé sur les périphériques montés
-Comment[ga]=Taispeánann úsáid diosca na ngléasanna feistithe
-Comment[gl]=Amosa o uso do disco dos dispositivos montados
-Comment[he]=מידע על השימוש בנפח האיחסון של ההתקנים המחוברים
-Comment[hi]=माउन्टेड औज़ारों के डिस्क उपयोग दिखाता है
-Comment[hr]=Prikazuje iskorištenost diskova
-Comment[hu]=Megmutatja a csatlakoztatott (mountolt) eszközök kihasználtságát
-Comment[id]=Perlihatkan penggunanan disk yang sedang dimount
-Comment[is]=Sýnir nýtingu diskanna sem eru tengdir skráarkerfinu
-Comment[it]=Mostra l'uso del disco dei dispositivi montati
-Comment[ja]=マウントされているデバイスのディスク使用状況を表示
-Comment[ka]=მონტირებული დისკების გამოყენებას
-Comment[kk]=Тіркеген құрылғыларда бар орынды көрсетеді
-Comment[km]=បង្ហាញការប្រើប្រាស់ថាសរបស់ឧបករណ៍ដែលបានម៉ោន
-Comment[ko]=마운트된 장치의 디스크 사용을 보여줍니다.
-Comment[lt]=Rodo sumontuotų įrenginių disko vietos panaudojimą
-Comment[lv]=Rāda piemontēto iekārtu diska izlietošanu
-Comment[mk]=Ја покажува искористеноста на монтираните уреди
-Comment[ms]=Memaparkan penggunaan cakera pada peranti yang dilekapkan
-Comment[mt]=Juri kemm qed jintuża mid-diski mmuntati
-Comment[nb]=Viser brukt diskplass på de monterte enhetene
-Comment[nds]=Wiest den Fastplattbruuk vun inhangt Reedschappen
-Comment[ne]=माउन्ट गरिएको यन्त्रका डिस्क उपयोग देखाउँदछ
-Comment[nl]=Toont het schijfgebruik van de aangekoppelde bestandssystemen
-Comment[nn]=Viser diskbruken for monterte einingar
-Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਜੰਤਰ ਵੇਖਾਉਦਾ ਹੈ
-Comment[pl]=Pokazuje wykorzystanie przestrzeni dyskowej na zamontowanych urządzeniach
-Comment[pt]=Mostra o espaço ocupado nos dispositivos montados
-Comment[pt_BR]=Mostra a utilização do disco nos dispositivos montados
-Comment[ro]=Afişează utilizarea spaţiului pentru dispozitivele montate
-Comment[ru]=Показывает свободное место на смонтированных устройствах
-Comment[sk]=Ukazuje využité miesto na pripojených diskových zariadeniach
-Comment[sl]=Prikaže porabo diska v priklopljenih napravah
-Comment[sr]=Приказује искоришћеност капацитета монтираних дискова
-Comment[sr@Latn]=Prikazuje iskorišćenost kapaciteta montiranih diskova
-Comment[sv]=Visar diskanvändning för monterade enheter
-Comment[ta]= ஏற்றப்பட்ட சாதனங்களின் வட்டு பயன்பாட்டை காட்டுகிறது
-Comment[tg]=Фазоҳои хомро дар дастгоҳи насбшуда нишон диҳед
-Comment[th]=แสดงการใช้พื้นทีี่ของดิสก์ที่เมานท์ใช้งานอยู่
-Comment[tr]=Bağlı aygıtların disk kullanımını gösterir
-Comment[uk]=Показує ступінь використання змонтованих пристроїв
-Comment[ven]=I sumbedza mashumisele a maano o gonyiswaho
-Comment[vi]=Hiển thềEtrạng thái sử dụng đĩa của các thiết bềEđã được mount 
-Comment[wa]=Mostere l' eployaedje des deurès plakes ki sont montêyes
-Comment[zh_CN]=显示挂接设备的磁盘使用率
-Comment[zh_TW]=顯示連接的設備的磁碟使用率
-Comment[zu]=Ikhombisa ukusebenziswa kwediski yamathuluzi okunyuka
 
 Categories=Qt;TDE;X-TDE-settings-information;
diff --git a/kdf/kcmdf.h b/kdf/kcmdf.h
index c321deb..6cb56a8 100644
--- a/kdf/kcmdf.h
+++ b/kdf/kcmdf.h
@@ -32,7 +32,7 @@
 
 class KDiskFreeWidget : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   
   public:
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index e316b3e..ea3263a 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -41,11 +41,11 @@ KDFTopLevel::KDFTopLevel(TQWidget *, const char *name)
 {
   kdf = new KDFWidget(this,"kdf",FALSE);
   TQ_CHECK_PTR(kdf);
-  (void) new TDEAction( i18n( "&Update" ), 0, TQT_TQOBJECT(kdf), TQT_SLOT( updateDF() ), actionCollection(), "updatedf" );
+  (void) new TDEAction( i18n( "&Update" ), 0, kdf, TQ_SLOT( updateDF() ), actionCollection(), "updatedf" );
 
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
-  KStdAction::preferences(TQT_TQOBJECT(kdf), TQT_SLOT(settingsBtnClicked()), actionCollection());
-  KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), 
+  KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
+  KStdAction::preferences(kdf, TQ_SLOT(settingsBtnClicked()), actionCollection());
+  KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), 
 actionCollection());
   setCentralWidget(kdf);
   //  kdf->setMinimumSize(kdf->sizeHint());
diff --git a/kdf/kdf.desktop b/kdf/kdf.desktop
index 074fa7a..301862a 100644
--- a/kdf/kdf.desktop
+++ b/kdf/kdf.desktop
@@ -1,69 +1,7 @@
 [Desktop Entry]
 Name=KDiskFree
-Name[hi]=केडिस्कफ्री
 
 GenericName=View Disk Usage
-GenericName[af]=Besigtig Disket Gebruik
-GenericName[ar]=عرض المستخدم من القرص
-GenericName[bg]=Свободно място на диска
-GenericName[bs]=Pregled iskorištenosti diska
-GenericName[ca]=Veure l'ús de disc
-GenericName[cs]=Zobrazení využití disku
-GenericName[cy]=Gweld Defnydd y Disg
-GenericName[da]=Se diskforbrug
-GenericName[de]=Anzeige der Festplattenbelegung
-GenericName[el]=Προβολή χρήσης του δίσκου
-GenericName[eo]=Montras la okupitan kaj liberan spacon sur la diskoj
-GenericName[es]=Muestra el uso del disco
-GenericName[et]=Kettakasutus
-GenericName[eu]=Erakutsi Diskoaren Erabilera
-GenericName[fa]=مشاهدۀ کاربرد دیسک
-GenericName[fi]=Näytä levynkäyttö
-GenericName[fr]=Affiche l'utilisation de l'espace disque
-GenericName[ga]=Taispeáin úsáid diosca
-GenericName[he]=הצגת שיעור השימוש בדיסקים
-GenericName[hi]=डिस्क उपयोग देखें
-GenericName[hr]=Prikazuje iskorištenost diska
-GenericName[hu]=Lemezterület-kijelző
-GenericName[is]=Skoða nýtni á diskum
-GenericName[it]=Mostra lo spazio disco libero
-GenericName[ja]=ディスク使用状況を表示
-GenericName[ka]=იხილეთ დისკის გამოყენება
-GenericName[kk]=Дискідегі орынды көрсету
-GenericName[km]=មើលការប្រើប្រាស់ថាស
-GenericName[lt]=Žiūrėti disko panaudojimą
-GenericName[lv]=Skatīt Diska Izmantošanu
-GenericName[mk]=Видете ја искористеноста на дискот
-GenericName[ms]=Lihat Penggunaan Cakera
-GenericName[mt]=Uri l-użu tad-diski
-GenericName[nb]=Vis diskplass
-GenericName[nds]=Fastplattbruuk wiesen
-GenericName[ne]=डिस्क उपयोग हेर्नुहोस्
-GenericName[nl]=Schijfgebruik bekijken
-GenericName[nn]=Vis diskbruk
-GenericName[pa]=ਡਿਸਕ ਦੀ ਵਰਤੀ ਥਾਂ ਵੇਖੋ
-GenericName[pl]=Informacja o wolnym miejscu na dyskach
-GenericName[pt]=Utilização do Disco
-GenericName[pt_BR]=Ver Uso do Disco
-GenericName[ro]=Afişează utilizarea discului
-GenericName[ru]=Использование дисков
-GenericName[sk]=Využitie disku
-GenericName[sl]=Pokaže porabo diska
-GenericName[sr]=Приказ искоришћености дискова
-GenericName[sr@Latn]=Prikaz iskorišćenosti diskova
-GenericName[sv]=Visa diskanvändning
-GenericName[ta]=வட்டு பயன்பாட்டை பார்க்கவும்
-GenericName[tg]=Назари Истифодабарии Диск
-GenericName[th]=แสดงการใช้พื้นที่ดิสก์
-GenericName[tr]=Disk Kullanımını Görüntüle
-GenericName[uk]=Перегляд використання диску
-GenericName[ven]=Sedzani mashumisele a Disk
-GenericName[vi]=Xem đĩa trống 
-GenericName[wa]=Vey l' eployaedje del deure plake
-GenericName[xh]=Jonga Ukusebenziseka KweDiskic
-GenericName[zh_CN]=查看磁盘使用状况
-GenericName[zh_TW]=檢視磁碟使用情形
-GenericName[zu]= Buka Ukusetshenziswa Kwediski
 
 Exec=kdf -caption "%c"
 Icon=kdf
diff --git a/kdf/kdf.h b/kdf/kdf.h
index c365294..7097306 100644
--- a/kdf/kdf.h
+++ b/kdf/kdf.h
@@ -30,7 +30,7 @@
 /***************************************************************/
 class KDFTopLevel : public TDEMainWindow
 {
- Q_OBJECT
+ TQ_OBJECT
   
 
   public:
diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp
index 1180d6d..b3fef55 100644
--- a/kdf/kdfconfig.cpp
+++ b/kdf/kdfconfig.cpp
@@ -79,10 +79,10 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init)
     {
       mList->addColumn( mTabName[i]->mName );
     }
-    connect( mList, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)),
-	     this, TQT_SLOT(toggleListText(TQListViewItem *,const TQPoint &,int)));
-    connect( mList, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)),
-	     this, TQT_SLOT(slotChanged()));
+    connect( mList, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)),
+	     this, TQ_SLOT(toggleListText(TQListViewItem *,const TQPoint &,int)));
+    connect( mList, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)),
+	     this, TQ_SLOT(slotChanged()));
     topLayout->addWidget( mList );
 
     TQListViewItem *mListItem = new TQListViewItem( mList );
@@ -99,17 +99,17 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init)
 
     mScroll = new TQScrollBar( this );
     TQ_CHECK_PTR(mScroll);
-    mScroll->setOrientation( Qt::Horizontal );
+    mScroll->setOrientation( TQt::Horizontal );
     mScroll->setSteps(1,20);
     mScroll->setRange(0, 180 );
     gl->addWidget( mScroll, 1, 1 );
-    connect(mScroll,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged()));
+    connect(mScroll,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotChanged()));
 
     mLCD = new TQLCDNumber( this );
     TQ_CHECK_PTR(mLCD);
     mLCD->setNumDigits( 3 );
     mLCD->setSegmentStyle(TQLCDNumber::Filled);
-    connect(mScroll,TQT_SIGNAL(valueChanged(int)),mLCD,TQT_SLOT(display(int)));
+    connect(mScroll,TQ_SIGNAL(valueChanged(int)),mLCD,TQ_SLOT(display(int)));
     gl->addMultiCellWidget( mLCD, 0, 1, 0, 0 );
 
     text = i18n("Update frequency [seconds]. The value 0 disables update" );
@@ -125,19 +125,19 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init)
     mFileManagerEdit = new TQLineEdit( this );
     TQ_CHECK_PTR(mFileManagerEdit);
     topLayout->addWidget( mFileManagerEdit );
-    connect(mFileManagerEdit,TQT_SIGNAL(textChanged (const TQString &)),this,TQT_SLOT(slotChanged()));
+    connect(mFileManagerEdit,TQ_SIGNAL(textChanged (const TQString &)),this,TQ_SLOT(slotChanged()));
 
     text = i18n("Open file manager automatically on mount");
     mOpenMountCheck = new TQCheckBox(text, this );
     TQ_CHECK_PTR(mOpenMountCheck);
     topLayout->addWidget( mOpenMountCheck );
-    connect(mOpenMountCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotChanged()));
+    connect(mOpenMountCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotChanged()));
 
     text = i18n("Pop up a window when a disk gets critically full");
     mPopupFullCheck = new TQCheckBox( text, this );
     TQ_CHECK_PTR(mPopupFullCheck);
     topLayout->addWidget( mPopupFullCheck );
-    connect(mPopupFullCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotChanged()));
+    connect(mPopupFullCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotChanged()));
   }
 
   loadSettings();
diff --git a/kdf/kdfconfig.h b/kdf/kdfconfig.h
index d5c2993..955a1a7 100644
--- a/kdf/kdfconfig.h
+++ b/kdf/kdfconfig.h
@@ -41,7 +41,7 @@ class CListView;
 
 class KDFConfigWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   class CTabName
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index 7c5121d..0c8a08e 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -95,10 +95,10 @@ void CListViewItem::setKeys (int kb_size, int kb_avail, float percent_full)
 KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init )
   : TQWidget(parent, name), mOptionDialog(0), mPopup(0), mTimer(0)
 {
-  connect(&mDiskList , TQT_SIGNAL(readDFDone() ),
-           this, TQT_SLOT (updateDFDone()) );
-  connect(&mDiskList , TQT_SIGNAL(criticallyFull(DiskEntry*)),
-           this, TQT_SLOT (criticallyFull(DiskEntry*)) );
+  connect(&mDiskList , TQ_SIGNAL(readDFDone() ),
+           this, TQ_SLOT (updateDFDone()) );
+  connect(&mDiskList , TQ_SIGNAL(criticallyFull(DiskEntry*)),
+           this, TQ_SLOT (criticallyFull(DiskEntry*)) );
 
   mTabProp.resize(8);
   mTabProp[0] = new CTabEntry( "Icon", i18n("Icon"), true, 32);
@@ -122,13 +122,13 @@ KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init )
     mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken );
     mList->setShowSortIndicator(true);
     connect( mList,
-      TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )),
-      this, TQT_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int )));
+      TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )),
+      this, TQ_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int )));
     connect( mList,
-      TQT_SIGNAL( rightButtonClicked( TQListViewItem *, const TQPoint &, int )),
-      this, TQT_SLOT( rightButtonClicked( TQListViewItem *, const TQPoint &, int )));
-    connect( mList->header(), TQT_SIGNAL(sizeChange(int, int, int)),
-      this, TQT_SLOT(columnSizeChanged(int, int, int)) );
+      TQ_SIGNAL( rightButtonClicked( TQListViewItem *, const TQPoint &, int )),
+      this, TQ_SLOT( rightButtonClicked( TQListViewItem *, const TQPoint &, int )));
+    connect( mList->header(), TQ_SIGNAL(sizeChange(int, int, int)),
+      this, TQ_SLOT(columnSizeChanged(int, int, int)) );
     makeColumns();
 
     mIsTopLevel = TQString(parent->className()) == "KDFTopLevel" ? true : false;
@@ -266,8 +266,8 @@ void KDFWidget::settingsBtnClicked( void )
     {
       mOptionDialog = new COptionDialog( this, "options", false );
       if( mOptionDialog == 0 ) { return; }
-      connect( mOptionDialog, TQT_SIGNAL(valueChanged()),
-	       this, TQT_SLOT(settingsChanged()) );
+      connect( mOptionDialog, TQ_SIGNAL(valueChanged()),
+	       this, TQ_SLOT(settingsChanged()) );
     }
     mOptionDialog->show();
   }
@@ -283,7 +283,7 @@ void KDFWidget::setUpdateFrequency( int frequency )
   // Kill current timer and restart it if the frequency is
   // larger than zero.
   //
-  TQT_TQOBJECT(this)->killTimers();
+  this->killTimers();
   if( frequency > 0 )
   {
     startTimer( frequency * 1000 );
@@ -632,7 +632,7 @@ void KDFWidget::columnSizeChanged( int, int, int )
   if( mTimer == 0 )
   {
     mTimer = new TQTimer( this );
-    connect( mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateDiskBarPixmaps()) );
+    connect( mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateDiskBarPixmaps()) );
   }
   else if( mTimer->isActive() == true )
   {
diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h
index 872379f..057761f 100644
--- a/kdf/kdfwidget.h
+++ b/kdf/kdfwidget.h
@@ -91,7 +91,7 @@ class CListViewItem : public TQListViewItem
 
 class KDFWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index c06e9c2..aba455b 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -69,11 +69,11 @@ KwikDisk::KwikDisk()
    setPixmap(KSystemTray::loadIcon("kdf"));
    show();
 
-   connect( &m_diskList, TQT_SIGNAL(readDFDone()), this, TQT_SLOT(updateDFDone()) );
-   connect( &m_diskList, TQT_SIGNAL(criticallyFull(DiskEntry*)),
-            this, TQT_SLOT(criticallyFull(DiskEntry*)) );
+   connect( &m_diskList, TQ_SIGNAL(readDFDone()), this, TQ_SLOT(updateDFDone()) );
+   connect( &m_diskList, TQ_SIGNAL(criticallyFull(DiskEntry*)),
+            this, TQ_SLOT(criticallyFull(DiskEntry*)) );
 
-   connect( contextMenu(), TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(aboutToHide()) );
+   connect( contextMenu(), TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(aboutToHide()) );
 
    loadSettings();
    updateDF();
@@ -134,7 +134,7 @@ void KwikDisk::setUpdateFrequency(int frequency)
    // Kill current timer and restart it if the frequency is
    // larger than zero.
    //
-   TQT_TQOBJECT(this)->killTimers();
+   this->killTimers();
    if( frequency > 0 )
    {
       startTimer(frequency * 1000);
@@ -184,7 +184,7 @@ void KwikDisk::updateDFDone()
       {
          entryName += TQString("\t\t\t[%1]").arg(disk->prettyKBAvail());
       }
-      int id = contextMenu()->insertItem("", this, TQT_SLOT(toggleMount(int)) );
+      int id = contextMenu()->insertItem("", this, TQ_SLOT(toggleMount(int)) );
       contextMenu()->setItemParameter(id, itemNo);
       itemNo++;
 
@@ -215,7 +215,7 @@ void KwikDisk::updateDFDone()
             qp.drawRect(0,0,pix->width(),pix->height());
             qp.end();
          }
-         contextMenu()->disconnectItem(id,disk,TQT_SLOT(toggleMount()));
+         contextMenu()->disconnectItem(id,disk,TQ_SLOT(toggleMount()));
          toolTipText = i18n("You must login as root to mount this disk");
       }
 
@@ -226,21 +226,21 @@ void KwikDisk::updateDFDone()
 
    contextMenu()->insertItem(
       KSystemTray::loadIcon("kdf"),
-      i18n("&Start KDiskFree"), this, TQT_SLOT(startKDF()),0);
+      i18n("&Start KDiskFree"), this, TQ_SLOT(startKDF()),0);
 
    contextMenu()->insertItem(
       KSystemTray::loadIcon("configure"),
-      i18n("&Configure KwikDisk..."), this, TQT_SLOT(changeSettings()),0);
+      i18n("&Configure KwikDisk..."), this, TQ_SLOT(changeSettings()),0);
 
    contextMenu()->insertItem(
       KSystemTray::loadIcon("help"),
-      KStdGuiItem::help().text(), this, TQT_SLOT(invokeHelp()),0);
+      KStdGuiItem::help().text(), this, TQ_SLOT(invokeHelp()),0);
 
    contextMenu()->insertSeparator();
 
    contextMenu()->insertItem(
       KSystemTray::loadIcon("system-log-out"),
-      KStdGuiItem::quit().text(), this, TQT_SIGNAL(quitSelected()) );
+      KStdGuiItem::quit().text(), this, TQ_SIGNAL(quitSelected()) );
 }
 
 void KwikDisk::toggleMount(int item)
@@ -297,8 +297,8 @@ void KwikDisk::changeSettings()
    {
       m_optionDialog = new COptionDialog(this, "options", FALSE);
       if( !m_optionDialog ) return;
-      connect(m_optionDialog, TQT_SIGNAL(valueChanged()),
-                        this, TQT_SLOT(loadSettings()));
+      connect(m_optionDialog, TQ_SIGNAL(valueChanged()),
+                        this, TQ_SLOT(loadSettings()));
    }
    m_optionDialog->show();
 }
@@ -335,7 +335,7 @@ int main(int argc, char **argv)
    KwikDisk *mainWin = 0;
 
    mainWin = new KwikDisk;
-   TQObject::connect(mainWin, TQT_SIGNAL(quitSelected()), &app, TQT_SLOT(quit()));
+   TQObject::connect(mainWin, TQ_SIGNAL(quitSelected()), &app, TQ_SLOT(quit()));
 
    // mainWin has WDestructiveClose flag by default, so it will delete itself.
    return app.exec();
diff --git a/kdf/kwikdisk.desktop b/kdf/kwikdisk.desktop
index c9f596f..c5f45a4 100644
--- a/kdf/kwikdisk.desktop
+++ b/kdf/kwikdisk.desktop
@@ -1,77 +1,9 @@
 [Desktop Entry]
 Name=KwikDisk
-Name[af]=Kwikdisk
-Name[eo]=Diskokroĉilo
-Name[et]=Ketaste ühendamine
-Name[fa]=Kwikدیسک
-Name[hi]=क्विक-डिस्क
-Name[ja]=マウントツール
-Name[ne]=क्विक डिस्क
-Name[sv]=Snabbdisk
-Name[ta]= கிவிக்வட்டு 
-Name[th]=เรียกใช้ดิสก์ด่วน
 Exec=kwikdisk -caption "%c"
 Icon=kwikdisk
 Type=Application
 X-DocPath=kdf/index.html
 GenericName=Removable Media Utility
-GenericName[af]=Verwyderbare Media Program
-GenericName[ar]=أداة الوسائط القابلة للإزالة
-GenericName[bg]=Преносими носители
-GenericName[br]=Ostilh media lem-laka
-GenericName[bs]=Alat za izmjenjive medije
-GenericName[ca]=Utilitat per discos extraïbles
-GenericName[cs]=Nástroj pro výměnné disky
-GenericName[cy]=Cyfleuster Cyfryngau Symudadwy
-GenericName[da]=Flytbart medieredskab
-GenericName[de]=Dienstprogramm für Wechselmedien
-GenericName[el]=Εργαλείο αφαιρούμενων μέσων
-GenericName[eo]=Ŝanĝebla disko ilo
-GenericName[es]=Herramienta de medios extraíbles
-GenericName[et]=Eemaldatavate andmekandjate utiliit
-GenericName[eu]=Euskarri Eramangarrien Erabilgarritasuna
-GenericName[fa]=برنامۀ سودمند رسانه‌ای قابل حذف
-GenericName[fi]=Poistettavan median työkalu
-GenericName[fr]=Utilitaire de média éjectable
-GenericName[ga]=Uirlis Meáin Inscortha
-GenericName[he]=כלי מדיה נשלפת
-GenericName[hi]=हटाया जा सकने वाला मीडिया यूटिलिटी
-GenericName[hr]=Alat za uklonjive medije
-GenericName[hu]=Lemezcsatlakoztató
-GenericName[is]=Diskatól
-GenericName[it]=Accessorio per i supporti rimovibili
-GenericName[ja]=リムーバブルメディアユーティリティ
-GenericName[ka]=მოხსნადი მედიის უტილიტა
-GenericName[kk]=Ауыстырмалы тасушының утилитасы
-GenericName[km]=ឧបករណ៍មេឌៀដែលអាចយកចេញ
-GenericName[lt]=Keičiamų diskų ar kitų įrenginių programa
-GenericName[mk]=Алатка за менливи носачи
-GenericName[ms]=Utiliti Media Mudah Alih
-GenericName[nb]=Verktøy for flyttbare media
-GenericName[nds]=Deenstprogramm för tuuschbore Medien
-GenericName[ne]=हटाउन योग्य मिडिया युटिलिटी
-GenericName[nl]=Verwisselbare media beheren
-GenericName[nn]=Verktøy for flyttbare medium
-GenericName[pa]=ਹਟਾਉਣਯੋਗ ਮੀਡਿਆ ਸਹੂਲਤ
-GenericName[pl]=Narzędzie do wyjmowalnych dysków
-GenericName[pt]=Utilitário para Media Removível
-GenericName[pt_BR]=Utilitário de Mídia Removível
-GenericName[ro]=Utilitar ejectare mediu
-GenericName[ru]=Управление дисками
-GenericName[sk]=Nástroj pre vymeniteľné médiá
-GenericName[sl]=Pripomoček za izmenjevalne medije
-GenericName[sr]=Алат за уклоњиве медије
-GenericName[sr@Latn]=Alat za uklonjive medije
-GenericName[sv]=Verktyg för flyttbar media
-GenericName[ta]= நீக்ககூடிய ஊடக பயன்பாடு
-GenericName[tg]=Барномаи Пуштибон барои Расонаҳои Ҷойивазшаванда
-GenericName[th]=เครื่องมือจัดการสื่อที่ถอดได้
-GenericName[tr]=Çıkartılabilir Aygıt
-GenericName[uk]=Утиліта змінних носіїв
-GenericName[wa]=Usteye po les bodjåves sopoirts
-GenericName[xh]=Umdlali wezoSasazo
-GenericName[zh_CN]=可移动介质工具
-GenericName[zh_TW]=可移動媒體公用程式
-GenericName[zu]=Umsebenzi Wonozindaba Ogudluzekayo
 Terminal=false
 Categories=Qt;TDE;System;
diff --git a/kdf/kwikdisk.h b/kdf/kwikdisk.h
index ce8db57..68bf44c 100644
--- a/kdf/kwikdisk.h
+++ b/kdf/kwikdisk.h
@@ -41,7 +41,7 @@
 */
 class KwikDisk : public KSystemTray
 {
-   Q_OBJECT
+   TQ_OBJECT
   
    public:
       KwikDisk();
diff --git a/kdf/listview.h b/kdf/listview.h
index f8a8424..d100131 100644
--- a/kdf/listview.h
+++ b/kdf/listview.h
@@ -27,7 +27,7 @@
 
 class CListView : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index 37b9ff8..dc9a771 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -59,7 +59,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
     mDiskList.readFSTAB();
     mDiskList.readDF();
     mInitializing = true;
-    connect( &mDiskList,TQT_SIGNAL(readDFDone()),this,TQT_SLOT(readDFDone()));
+    connect( &mDiskList,TQ_SIGNAL(readDFDone()),this,TQ_SLOT(readDFDone()));
 
     TQString text;
     TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint());
@@ -72,8 +72,8 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
     mList->addColumn( i18n("Mount Command") );
     mList->addColumn( i18n("Unmount Command") );
     mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken );
-    connect( mList, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-	     this, TQT_SLOT(clicked(TQListViewItem *)));
+    connect( mList, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+	     this, TQ_SLOT(clicked(TQListViewItem *)));
 
     topLayout->addWidget( mList );
 
@@ -93,47 +93,47 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
     mIconLineEdit = new TQLineEdit(mGroupBox);
     TQ_CHECK_PTR(mIconLineEdit);
     mIconLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 );
-    connect( mIconLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
-	     this,TQT_SLOT(iconChanged(const TQString&)));
-    connect( mIconLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
-	     this,TQT_SLOT(slotChanged()));
+    connect( mIconLineEdit, TQ_SIGNAL(textChanged(const TQString&)),
+	     this,TQ_SLOT(iconChanged(const TQString&)));
+    connect( mIconLineEdit, TQ_SIGNAL(textChanged(const TQString&)),
+	     this,TQ_SLOT(slotChanged()));
     gl->addWidget( mIconLineEdit, 2, 0 );
 
     mIconButton = new TDEIconButton(mGroupBox);
     mIconButton->setIconType(TDEIcon::Small, TDEIcon::Device);
     TQ_CHECK_PTR(mIconButton);
     mIconButton->setFixedWidth( mIconButton->sizeHint().height() );
-    connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString)));
+    connect(mIconButton,TQ_SIGNAL(iconChanged(TQString)),this,TQ_SLOT(iconChangedButton(TQString)));
     gl->addWidget( mIconButton, 2, 1 );
 
     //Mount
     mMountButton = new TQPushButton( i18n("Get Mount Command"), mGroupBox );
     TQ_CHECK_PTR(mMountButton);
-    connect(mMountButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectMntFile()));
+    connect(mMountButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(selectMntFile()));
     gl->addWidget( mMountButton, 1, 2 );
 
     mMountLineEdit = new TQLineEdit(mGroupBox);
     TQ_CHECK_PTR(mMountLineEdit);
     mMountLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 );
-    connect(mMountLineEdit,TQT_SIGNAL(textChanged(const TQString&)),
-	    this,TQT_SLOT(mntCmdChanged(const TQString&)));
-    connect( mMountLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
-	     this,TQT_SLOT(slotChanged()));
+    connect(mMountLineEdit,TQ_SIGNAL(textChanged(const TQString&)),
+	    this,TQ_SLOT(mntCmdChanged(const TQString&)));
+    connect( mMountLineEdit, TQ_SIGNAL(textChanged(const TQString&)),
+	     this,TQ_SLOT(slotChanged()));
     gl->addWidget( mMountLineEdit, 1, 3 );
 
     //Umount
     mUmountButton = new TQPushButton(i18n("Get Unmount Command"), mGroupBox );
     TQ_CHECK_PTR( mUmountButton );
-    connect(mUmountButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectUmntFile()));
+    connect(mUmountButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(selectUmntFile()));
     gl->addWidget( mUmountButton, 2, 2 );
 
     mUmountLineEdit=new TQLineEdit(mGroupBox);
     TQ_CHECK_PTR(mUmountLineEdit);
     mUmountLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 );
-    connect(mUmountLineEdit,TQT_SIGNAL(textChanged(const TQString&)),
-	    this,TQT_SLOT(umntCmdChanged(const TQString&)));
-    connect( mUmountLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
-	     this,TQT_SLOT(slotChanged()));
+    connect(mUmountLineEdit,TQ_SIGNAL(textChanged(const TQString&)),
+	    this,TQ_SLOT(umntCmdChanged(const TQString&)));
+    connect( mUmountLineEdit, TQ_SIGNAL(textChanged(const TQString&)),
+	     this,TQ_SLOT(slotChanged()));
     gl->addWidget( mUmountLineEdit, 2, 3 );
 
   }
diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h
index 8e510cd..d247012 100644
--- a/kdf/mntconfig.h
+++ b/kdf/mntconfig.h
@@ -45,7 +45,7 @@ class TQListViewItem;
 
 class MntConfigWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kdf/optiondialog.cpp b/kdf/optiondialog.cpp
index 6734294..6d96fe3 100644
--- a/kdf/optiondialog.cpp
+++ b/kdf/optiondialog.cpp
@@ -33,13 +33,13 @@ COptionDialog::COptionDialog( TQWidget *parent, const char *name, bool modal )
   TQVBoxLayout *l1 = new TQVBoxLayout( f1 );  
   mConf = new KDFConfigWidget( f1, "kdfconf" );
   l1->addWidget(mConf);
-  connect( mConf, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) );
+  connect( mConf, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) );
 
   TQFrame *f2 = addPage( i18n("Mount Commands") );
   TQVBoxLayout *l2 = new TQVBoxLayout( f2 );
   mMnt = new MntConfigWidget( f2, "mntconf");
   l2->addWidget(mMnt);
-  connect( mMnt, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) );
+  connect( mMnt, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) );
   enableButton( Apply, false );
   dataChanged = false;
 }
diff --git a/kdf/optiondialog.h b/kdf/optiondialog.h
index c56f8a2..77efa05 100644
--- a/kdf/optiondialog.h
+++ b/kdf/optiondialog.h
@@ -27,7 +27,7 @@ class MntConfigWidget;
 
 class COptionDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public: