6 files changed, 23 insertions, 213 deletions
diff --git a/kcontrol/privacy/CMakeLists.txt b/kcontrol/privacy/CMakeLists.txt
index fe13ab4a7..a3e5008a0 100644
--- a/kcontrol/privacy/CMakeLists.txt
+++ b/kcontrol/privacy/CMakeLists.txt
@@ -21,7 +21,10 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES privacy.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE privacy.desktop
+  PO_DIR kcontrol-desktops
+)
 
 
 ##### kcm_privacy (module) ######################
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index c1ff81338..7f32c438a 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -22,13 +22,13 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
-#include <ksimpleconfig.h>
-#include <kprocess.h>
+#include <tdesimpleconfig.h>
+#include <tdeprocess.h>
 #include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tderecentdocument.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqstringlist.h>
 #include <tqfile.h>
@@ -36,8 +36,8 @@
 
 KPrivacyManager::KPrivacyManager()
 {
-  if (!kapp->dcopClient()->isAttached())
-    kapp->dcopClient()->attach();
+  if (!tdeApp->dcopClient()->isAttached())
+    tdeApp->dcopClient()->attach();
 
   m_error = false;
 }
@@ -75,12 +75,12 @@ bool KPrivacyManager::clearThumbnails()
 
 bool KPrivacyManager::clearRunCommandHistory() const
 {
-  return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") );
+  return tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") );
 }
 
 bool KPrivacyManager::clearAllCookies() const
 {
-  return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") );
+  return tdeApp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") );
 }
 
 bool KPrivacyManager::clearSavedClipboardContents()
@@ -98,7 +98,7 @@ bool KPrivacyManager::clearSavedClipboardContents()
     return true;
   }
 
-  return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") );
+  return tdeApp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") );
 }
 
 bool KPrivacyManager::clearFormCompletion() const
@@ -123,7 +123,7 @@ bool KPrivacyManager::clearRecentDocuments() const
 
 bool KPrivacyManager::clearQuickStartMenu() const
 {
-  return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") );
+  return tdeApp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") );
 }
 
 bool KPrivacyManager::clearWebHistory()
@@ -134,10 +134,10 @@ bool KPrivacyManager::clearWebHistory()
   if(!isApplicationRegistered("konqueror"))
   {
     kdDebug() << "couldn't find Konqueror instance, preloading." << endl;
-    kapp->tdeinitExec("konqueror", args, 0,0);
+    tdeApp->tdeinitExec("konqueror", args, 0,0);
   }
 
-  return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+  return tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
                                    "notifyClear(TQCString)", TQString("") );
 }
 
@@ -170,7 +170,7 @@ bool KPrivacyManager::clearKPDFDocData()
 bool KPrivacyManager::isApplicationRegistered(const TQString &appName)
 {
 
-  QCStringList regApps = kapp->dcopClient()->registeredApplications();
+  QCStringList regApps = tdeApp->dcopClient()->registeredApplications();
 
   for ( QCStringList::Iterator it = regApps.begin(); it != regApps.end(); ++it )
     if((*it).find(appName.latin1()) != -1) return true;
diff --git a/kcontrol/privacy/kprivacymanager.h b/kcontrol/privacy/kprivacymanager.h
index 70d7b77cf..b0649c7c2 100644
--- a/kcontrol/privacy/kprivacymanager.h
+++ b/kcontrol/privacy/kprivacymanager.h
@@ -29,7 +29,7 @@
 
 class KPrivacyManager : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     KPrivacyManager();
 
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index 71fc3313b..87247547e 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -126,7 +126,7 @@ Privacy::Privacy(TQWidget *parent, const char *name)
   clearFavIcons->setText(1, i18n("Clears the FavIcons cached from visited websites"));
   clearKPDFDocData->setText(1, i18n("Clears all KPDF document data files"));
 
-  connect(sw, TQT_SIGNAL(selectionChanged()), TQT_SLOT(changed()));
+  connect(sw, TQ_SIGNAL(selectionChanged()), TQ_SLOT(changed()));
 
   // store all entries in a list for easy access later on
   checklist.append(clearThumbnails);
@@ -141,9 +141,9 @@ Privacy::Privacy(TQWidget *parent, const char *name)
   checklist.append(clearFavIcons);
   checklist.append(clearKPDFDocData);
 
-  connect(cleaningDialog->cleanupButton, TQT_SIGNAL(clicked()), TQT_SLOT(cleanup()));
-  connect(cleaningDialog->selectAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectAll()));
-  connect(cleaningDialog->selectNoneButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectNone()));
+  connect(cleaningDialog->cleanupButton, TQ_SIGNAL(clicked()), TQ_SLOT(cleanup()));
+  connect(cleaningDialog->selectAllButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectAll()));
+  connect(cleaningDialog->selectNoneButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectNone()));
 
   load();
 }
@@ -318,7 +318,7 @@ void Privacy::cleanup()
 extern "C"
 {
 
-  KDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/)
   {
     TDEGlobal::locale()->insertCatalogue("privacy");
     return new Privacy(parent, "Privacy");
diff --git a/kcontrol/privacy/privacy.desktop b/kcontrol/privacy/privacy.desktop
index 5a88c413c..e068586bb 100644
--- a/kcontrol/privacy/privacy.desktop
+++ b/kcontrol/privacy/privacy.desktop
@@ -9,200 +9,7 @@ Icon=trashcan_empty
 X-DocPath=kcontrol/privacy/index.html
 
 Name=Privacy
-Name[af]=Privaatheid
-Name[ar]=الخصوصية
-Name[az]=Gizlilik
-Name[be]=Прыватнасць
-Name[bg]=Анонимност
-Name[bn]=প্রাইভেসি
-Name[br]=Buhez prevez
-Name[bs]=Privatnost
-Name[ca]=Privacitat
-Name[cs]=Soukromí
-Name[csb]=Priwatnosc
-Name[cy]=Preifatrwydd
-Name[de]=Privatsphäre
-Name[el]=Προσωπικό απόρρητο
-Name[eo]=Privataj aferoj
-Name[es]=Privacidad
-Name[et]=Privaatsus
-Name[eu]=Pribatutasuna
-Name[fa]=محرمانگی
-Name[fi]=Yksityisyys
-Name[fr]=Confidentialité
-Name[ga]=Príobháideachas
-Name[gl]=Intimidade
-Name[he]=פרטיות
-Name[hi]=गोपनीयता
-Name[hr]=Privatnost
-Name[hu]=Magánjellegű adatok törlése
-Name[is]=Einkamál
-Name[ja]=プライバシー
-Name[ka]=კონფიდენციალურობა
-Name[kk]=Қарақшылыққа қарсылық
-Name[km]=ភាពឯកជន
-Name[lt]=Privatumas
-Name[lv]=Privātums
-Name[mk]=Приватност
-Name[ms]=Privasi
-Name[mt]=Privatezza
-Name[nb]=Personvern
-Name[nds]=Privaatrebeet
-Name[ne]=गोप्यता
-Name[nn]=Personvern
-Name[pa]=ਰਹੱਸ
-Name[pl]=Prywatność
-Name[pt]=Privacidade
-Name[pt_BR]=Privacidade
-Name[ro]=Intimitate
-Name[ru]=Конфиденциальность
-Name[rw]=Umwihariko
-Name[se]=Iežassuodjaleapmi
-Name[sk]=Súkromie
-Name[sl]=Zasebnost
-Name[sr]=Приватност
-Name[sr@Latn]=Privatnost
-Name[sv]=Integritet
-Name[ta]=தனிமை
-Name[te]=ప్రైవసి
-Name[th]=ความเป็นส่วนตัว
-Name[tr]=Gizlilik
-Name[tt]=Xosusílıq
-Name[uk]=Конфіденційність
-Name[uz]=Shaxsiy maʼlumot
-Name[uz@cyrillic]=Шахсий маълумот
-Name[vi]=Riêng tư
-Name[wa]=Vikereye da vosse
-Name[zh_CN]=隐私
-Name[zh_TW]=隱私權
 
 Comment=Clean unwanted traces the user leaves on the system
-Comment[af]=Voetspore wat deur gebruikers op die stelsel gelaat word skoon maak
-Comment[ar]=لتنظيف الآثار غير المرغوب بها التي يتركها المستخدم على
-Comment[be]=Выдаляе файлы, што застаюцца пасля працы карыстальніка на кампутары
-Comment[bg]=Настройване заличаването на личната информация
-Comment[bn]=পর অবশিষ্ট চিহ্নগুলি পরিশোধন কর
-Comment[bs]=Čisti neželjene tragove koje korisnik ostavlja na sistemu
-Comment[ca]=Netejar les traces no desitjades que va deixant un usuari pel sistema
-Comment[cs]=Čištění citlivých údajů
-Comment[csb]=Zezwôlô remac niepòrządané szlachë jaczé òstałë pò brëkòwnikù w systemie
-Comment[cy]=Glanhau olion nas dymunir y mae'r defnyddiwr yn eu gadael ar y cysawd
-Comment[da]=Rense systemet for uønskede spor som brugeren efterlader
-Comment[de]=Unerwünschte Spuren von Benutzern auf dem System beseitigen
-Comment[el]=Τον καθαρισμό των ιχνών που ο χρήστης αφήνει στο σύστημα
-Comment[eo]=Forigas uzantajn spurojn
-Comment[es]=Limpiar pistas que el usuario deja en el sistema sin querer
-Comment[et]=Kõrvaldada süsteemist kasutaja jäetud jäljed
-Comment[eu]=Erabiltzaileek sisteman zehar nahi izan gabe uzten dituzten aztarnak garbitzen dituen
-Comment[fa]=پاک کردن ردیابیهای ناخواسته، که کاربر در سیستم به جا می‌گذارد
-Comment[fi]=Ei-toivottujen jälkien siivoamiseen järjestelmästä
-Comment[fr]=Effacer les traces indésirables qu'un utilisateur laisse sur le système
-Comment[fy]=Ûnwenste efterbluiwende sporen fan brûkers wiskje
-Comment[gl]=Limpar os rastos non desexados que o usuario deixa no sistema
-Comment[he]=למחיקת עקבות לא רצויים שמשתמש משאיר אחריו במערכת
-Comment[hi]=अवांछित पदचिह्नों को साफ करने
-Comment[hr]=Brisanje neželjenih tragova koje su korisnici ostavili na sustavu
-Comment[hu]=A rendszerben létrejött, privát adatok biztonságos törlése
-Comment[is]=Hreinsa burt upplýsingar og gögn sem ekki er æskilegt að verði eftir á vélinni
-Comment[it]=Cancellare le tracce indesiderate che l'utente lascia nel sistema
-Comment[ja]=システムの利用を終えた後の不要な利用形跡を削除
-Comment[ka]=წმენდს მომხმარებლის არასასურველ ნაკვალევს სისტემაში
-Comment[kk]=Зиянды пайдаланушының қалдырған іздерді өшіретін
-Comment[km]=បីសម្អាដាន ដែលអ្នកប្រើបន្សល់ទុកលើប្រព័ន្ធ
-Comment[lt]=Padedantis išvalyti nepageidaujamus naudotojo veiklos sistemoje pėdsakus
-Comment[lv]=Iztīrīt nevēlamas pēdas, ko atstāj lietotājs sistēmā
-Comment[mk]=Ги чисти несаканите траги кои ги остава корисникот на системот
-Comment[mn]=Cистем дэх хэрэглэгчийн хэрэглэхгүй охрисон хог цэвэрлэгчийн
-Comment[mt]=Tnaddaf traċċi li l-user jista' jħalli fuq is-sistema
-Comment[nb]=Fjerner uønskede spor som brukeren etterlater i systemet
-Comment[nds]=Bruuksporen vun't Systeem wegmaken
-Comment[ne]=प्रयोगकर्ताले प्रणालीमा छोडेका नचाहेका पदचिन्ह हटाउन
-Comment[nl]=Ongewenste sporen die gebruikers achterlaten kunt wissen
-Comment[nn]=Fjernar uønskte spor som brukeren etterlèt seg i systemet
-Comment[pa]=ਸਿਸਟਮ 'ਤੇ ਉਪਭੋਗੀ ਦੀ ਨਾ-ਲੋੜੀਦੀ ਪਛਾਣ ਨੂੰ ਸਮਾਪਤ ਕਰਦਾ ਹੈ।
-Comment[pl]=Usunąć niepożądane ślady pozostawiane przez użytkownika w systemie
-Comment[pt]=Limpar os registos indesejáveis que o utilizador deixa no sistema
-Comment[pt_BR]=Limpar traços não-desejados do usuário no sistema
-Comment[ro]=Șterge urmele nedorite pe care le lasă un utilizator în sistem
-Comment[ru]=Очищающий нежелательные следы, оставленные пользователем в операционной системе
-Comment[rw]=Gusiba ibirango bidakenewe ukoresha yasize kuri sisitemu
-Comment[se]=Váldá eret luottaid maid geavaheaddji guođđa vuogádahkii
-Comment[sk]=Vyčistenie nežiadúcich infomácií, ktoré používateľ necháva v systéme
-Comment[sl]=Počisti nezaželene sledi, ki jih uporabnik pusti na sistemu
-Comment[sr]=Уклања трагове активности корисника на систему
-Comment[sr@Latn]=Uklanja tragove aktivnosti korisnika na sistemu
-Comment[sv]=Bort oönskade spår användaren lämnat i systemet
-Comment[ta]=பயனீட்டாளர் விட்டுவைத்த தேவை இல்லாத சுவடுகளை நீக்கும்
-Comment[tg]=тоза кардани дирагуниҳои номатлуб, ки бо корбарон дар система монда шудаанд
-Comment[th]=อาดร่องรอยไม่พึงประสงค์ที่ผู้ใช้ปล่อยเอาไว้บนระบบ
-Comment[tr]=Kullanıcının bıraktığı iztenilmeyen izlemeleri temizleyen
-Comment[tt]=Qullanuçıdan soñ sistem eçendä qalğan ezlär beterüçe
-Comment[uk]=Очищення небажаної інформації залишеної користувачем у системі
-Comment[vi]=Xoá các dấu vết mà người sử dụng để lại trên hệ thống
-Comment[wa]=Rnetyî les passêyes nén volowes ki l' uzeu leye sol sistinme
-Comment[zh_CN]=清除用户留在系统中痕迹的
-Comment[zh_TW]=清除使用者不希望留在系統中的痕跡
 
 Keywords=Privacy;privacy;
-Keywords[ar]=خصوصية، الخصوصية;
-Keywords[az]=Gizlilik;gizlilik;
-Keywords[be]=Бяспека;Прыватнасць;Privacy;privacy;
-Keywords[bg]=анонимност; лична; информация; тайна; Privacy; privacy;
-Keywords[br]=Buhez prevez;buhez prevez;
-Keywords[bs]=Privacy;privacy;privatnost;
-Keywords[ca]=Privacitat;privacitat;
-Keywords[cs]=soukromí;
-Keywords[csb]=Priwatnosc;prowatno;swòjno; swòjnosc;priwatny nastôw;
-Keywords[cy]=Preifatrwydd; preifatrwydd;
-Keywords[de]=privatsphäre;
-Keywords[el]=Προσωπικό απόρρητο;προσωπικό απόρρητο;
-Keywords[eo]=privataj aferoj;privataj aferoj;
-Keywords[es]=Privacidad;privacidad;
-Keywords[et]=Privaatsus;privaatsus;
-Keywords[eu]=Pribatutasuna;pribatutasuna;
-Keywords[fa]=محرمانگی، محرمانگی;
-Keywords[fi]=Yksityisyys; yksityisyys;
-Keywords[fr]=Confidentialité;confidentialité;
-Keywords[fy]=privacy;
-Keywords[ga]=Príobháideachas;príobháideachas;
-Keywords[gl]=Intimidade;intimidade;
-Keywords[he]=פרטיות;פרטיות; Privacy;privacy;
-Keywords[hi]=गोपनीय;गोपनीयता;
-Keywords[hr]=Privacy;privacy;Privatnost;privatnost;privatno;
-Keywords[hu]=adatvédelem;adatbiztonság;
-Keywords[is]=Privacy;privacy;einkamál;
-Keywords[it]=privacy;riservatezza;
-Keywords[ja]=プライバシー;
-Keywords[km]=ភាពឯកជន;
-Keywords[lt]=Privacy;privacy;privatumas;Privatumas;
-Keywords[lv]=Privāts;privātums;
-Keywords[mk]=Privacy;privacy;Приватност;приватност;
-Keywords[mt]=Privacy;privacy;privatezza;
-Keywords[nb]=personvern;privat;
-Keywords[nds]=Privaatrebeet;
-Keywords[ne]=गोप्यता; गोप्यता;
-Keywords[nl]=privacy;
-Keywords[nn]=personvern;privat;
-Keywords[pa]=Privacy;ਰਹੱਸ; ਨਿੱਜੀ;
-Keywords[pl]=Prywatność;prywatność;ustawienia prywatności;
-Keywords[pt]=privacidade;
-Keywords[pt_BR]=Privacidade;privacidade;
-Keywords[ro]=intimitate;
-Keywords[rw]=Umwihariko;umwihariko;
-Keywords[se]=Iežassuodjaleapmi;iežassuodjaleapmi;
-Keywords[sk]=Privacy;privacy;súkromie;
-Keywords[sl]=Zasebnost;zasebnost;
-Keywords[sr]=Privacy;privacy;Приватност;приватност;приватно;
-Keywords[sr@Latn]=Privacy;privacy;Privatnost;privatnost;privatno;
-Keywords[sv]=Integritet;privatliv;
-Keywords[ta]=தனிப்பட்ட;தனிப்பட்ட;
-Keywords[te]=ప్రైవసి;
-Keywords[th]=ความเป็นส่วนตัว;
-Keywords[tr]=gizlilik;
-Keywords[uk]=Конфіденційність;
-Keywords[uz]=Shaxsiy maʼlumot;shaxsiy maʼlumot;
-Keywords[uz@cyrillic]=Шахсий маълумот;шахсий маълумот;
-Keywords[vi]=Riêng tư;riêng tư;
-Keywords[wa]=privé;privêye vikereye;vikerêye da vosse;
-Keywords[zh_CN]=Privacy;privacy;隐私;
-Keywords[zh_TW]=Privacy;privacy;隱私權;
diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h
index 74d199dcf..808bf3f98 100644
--- a/kcontrol/privacy/privacy.h
+++ b/kcontrol/privacy/privacy.h
@@ -30,7 +30,7 @@
 
 class Privacy: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Privacy( TQWidget *parent=0, const char *name=0 );