4 files changed, 22 insertions, 238 deletions

diff --git a/kcontrol/kded/CMakeLists.txt b/kcontrol/kded/CMakeLists.txt
index c974d7ca0..149bf1f16 100644
--- a/kcontrol/kded/CMakeLists.txt
+++ b/kcontrol/kded/CMakeLists.txt
@@ -21,7 +21,10 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kcmkded.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kcmkded.desktop
+  PO_DIR kcontrol-desktops
+)
 
 
 ##### kcm_kded (module) #########################
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index f6fcd2e5a..a6bec1ca8 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -31,13 +31,13 @@
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <tdelistview.h>
 #include <tdemessagebox.h>
 #include <kservice.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kcmkded.h"
 #include "kcmkded.moc"
@@ -96,16 +96,16 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
 	_lvStartup->setAllColumnsShowFocus(true);
 	_lvStartup->header()->setStretchEnabled(true, 2);
 
-	KButtonBox *buttonBox = new KButtonBox( gb, Qt::Horizontal);
+	KButtonBox *buttonBox = new KButtonBox( gb, TQt::Horizontal);
 	_pbStart = buttonBox->addButton( i18n("Start"));
 	_pbStop = buttonBox->addButton( i18n("Stop"));
 
 	_pbStart->setEnabled( false );
 	_pbStop->setEnabled( false );
 
-	connect(_pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartService()));
-	connect(_pbStop,  TQT_SIGNAL(clicked()), TQT_SLOT(slotStopService()));
-	connect(_lvStartup, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotEvalItem(TQListViewItem*)) );
+	connect(_pbStart, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartService()));
+	connect(_pbStop,  TQ_SIGNAL(clicked()), TQ_SLOT(slotStopService()));
+	connect(_lvStartup, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotEvalItem(TQListViewItem*)) );
 
 	load();
 }
@@ -156,12 +156,12 @@ void KDEDConfig::load( bool useDefaults ) {
 	CheckListItem* clitem;
 	for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
 
-		if ( KDesktopFile::isDesktopFile( *it ) ) {
-			KDesktopFile file( *it, true, "services" );
+		if ( TDEDesktopFile::isDesktopFile( *it ) ) {
+			TDEDesktopFile file( *it, true, "services" );
 
 			if ( file.readBoolEntry("X-TDE-Kded-autoload") ) {
 				clitem = new CheckListItem(_lvStartup, TQString::null);
-				connect(clitem, TQT_SIGNAL(changed(TQCheckListItem*)), TQT_SLOT(slotItemChecked(TQCheckListItem*)));
+				connect(clitem, TQ_SIGNAL(changed(TQCheckListItem*)), TQ_SLOT(slotItemChecked(TQCheckListItem*)));
 				clitem->setOn(autoloadEnabled(&kdedrc, *it));
 				item = clitem;
 				item->setText(1, file.readName());
@@ -194,7 +194,7 @@ void KDEDConfig::save() {
 
 	for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
 
-		if ( KDesktopFile::isDesktopFile( *it ) ) {
+		if ( TDEDesktopFile::isDesktopFile( *it ) ) {
 
 			TDEConfig file( *it, false, false, "services" );
 			file.setGroup("Desktop Entry");
@@ -212,7 +212,7 @@ void KDEDConfig::save() {
 	kdedrc.sync();
 
 	DCOPRef( "kded", "kded" ).call( "reconfigure" );
-	TQTimer::singleShot(0, this, TQT_SLOT(slotServiceRunningToggled()));
+	TQTimer::singleShot(0, this, TQ_SLOT(slotServiceRunningToggled()));
 }
 
 
@@ -229,7 +229,7 @@ void KDEDConfig::getServiceStatus()
 	TQByteArray replyData;
 
 
-	if (!kapp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(),
+	if (!tdeApp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(),
 				replyType, replyData ) ) {
 
 		_lvLoD->setEnabled( false );
@@ -310,7 +310,7 @@ void KDEDConfig::slotStartService()
 	TQCString replyType;
 	TQDataStream arg( data, IO_WriteOnly );
 	arg << service;
-	if (kapp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) {
+	if (tdeApp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) {
 		TQDataStream reply(replyData, IO_ReadOnly);
 		if ( replyType == "bool" )
 		{
@@ -337,7 +337,7 @@ void KDEDConfig::slotStopService()
 	TQDataStream arg( data, IO_WriteOnly );
 
 	arg << service;
-	if (kapp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) {
+	if (tdeApp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) {
 		slotServiceRunningToggled();
 	}
 	else {
diff --git a/kcontrol/kded/kcmkded.desktop b/kcontrol/kded/kcmkded.desktop
index 2837188be..c69e29458 100644
--- a/kcontrol/kded/kcmkded.desktop
+++ b/kcontrol/kded/kcmkded.desktop
@@ -9,226 +9,7 @@ X-TDE-ParentApp=kcontrol
 Categories=Qt;TDE;X-TDE-settings-components;
 
 Name=Service Manager
-Name[af]=Diens Bestuurder
-Name[ar]=مدبر الخدمات
-Name[az]=Xidmət İdarəçisi
-Name[be]=Кіраўнік сервісаў
-Name[bg]=Системни услуги
-Name[bn]=সার্ভিস ম্যানেজার
-Name[br]=Merour ar servijoù
-Name[bs]=Upravljač servisa
-Name[ca]=Gestor del servei
-Name[cs]=Správce služeb
-Name[csb]=Menedżer ùsłëżnotów
-Name[cy]=Rheolydd Gwasanaethau
-Name[da]=Service-håndtering
-Name[de]=Diensteverwaltung
-Name[el]=Διαχειριστής υπηρεσιών
-Name[eo]=Servo-Administrilo
-Name[es]=Gestor de servicios
-Name[et]=Teenuste haldur
-Name[eu]=Zerbitzu kudeatzailea
-Name[fa]=مدیر خدمت
-Name[fi]=Palvelunhallinta
-Name[fr]=Gestionnaire de services
-Name[fy]=TDE-systeemtsjinsten
-Name[ga]=Bainisteoir Seirbhíse
-Name[gl]=Xestor de Servizos
-Name[he]=מנהל השירותים
-Name[hi]=सेवा प्रबंधक
-Name[hr]=Upravljanje uslugama
-Name[hu]=Szolgáltatások
-Name[is]=Þjónustustjóri
-Name[it]=Gestione servizi
-Name[ja]=サービスマネージャ
-Name[ka]=სერვის მენეჯერი
-Name[kk]=Қызметтерді басқару
-Name[km]=កម្មវិធី​គ្រប់គ្រង​សេវា
-Name[ko]=서비스 관리자
-Name[lo]=ຕົວຈັດການ Dhcp
-Name[lt]=Tarnybų tvarkyklė
-Name[lv]=Servisu Menedžeris
-Name[mk]=Менаџер на сервиси
-Name[mn]=Үйлчилгээ удирдагч
-Name[ms]=Pengurus Servis
-Name[mt]=Manager tas-servizzi
-Name[nb]=Tjenestebehandler
-Name[nds]=Deenstpleger
-Name[ne]=सेवा प्रबन्धक
-Name[nl]=TDE-systeemdiensten
-Name[nn]=Tenestehandsamar
-Name[nso]=Molaodi wa Tirelo
-Name[pa]=ਸੇਵਾਵਾਂ ਮੈਨੇਜਰ
-Name[pl]=Menedżer usług
-Name[pt]=Gestor de Serviços
-Name[pt_BR]=Gerenciador de Serviços
-Name[ro]=Managerul de servicii
-Name[ru]=Управление службами
-Name[rw]=MugengaSerivise
-Name[se]=Bálvalusgieđahalli
-Name[sk]=Správca služieb
-Name[sl]=Upravitelj storitev
-Name[sr]=Менаџер сервиса
-Name[sr@Latn]=Menadžer servisa
-Name[sv]=Tjänsthanterare
-Name[ta]=சேவை மேலாளர்
-Name[tg]=Мудири хидмат
-Name[th]=ตัวจัดการรบริการ
-Name[tr]=Servis Yöneticisi
-Name[tt]=Xezmät İdäräçe
-Name[uk]=Менеджер служб
-Name[uz]=Xizmat boshqaruvchisi
-Name[uz@cyrillic]=Хизмат бошқарувчиси
-Name[ven]=Mulanguli wa tshumelo
-Name[vi]=Trình quản lý Dịch vụ
-Name[wa]=Manaedjeu di siervices
-Name[xh]=Umphathi Wenkonzo
-Name[zh_CN]=服务管理器
-Name[zh_TW]=服務管理程式
-Name[zu]=Imenenja Yomsebenzi
+
 Comment=System Services Configuration
-Comment[af]=Stelsel Dienste Opstelling
-Comment[ar]=تهيئة خدمات النظام
-Comment[az]=Sistem Xidmətləri Qurğuları
-Comment[be]=Настаўленні сістэмных сервісаў
-Comment[bg]=Настройване на системните услуги
-Comment[bn]=সিস্টেম সার্ভিস কনফিগারেশন
-Comment[br]=Kefluniadur servijerien ar reiziad
-Comment[bs]=Postavke sistemskih servisa
-Comment[ca]=Configura els serveis del sistema
-Comment[cs]=Nastavení systémových služeb
-Comment[csb]=Kònfigùracëjô systemòwëch ùsłëżnotów
-Comment[cy]=Ffurfweddu Gwasanaethau Cysawd
-Comment[da]=Opsætning af systemtjenester
-Comment[de]=Einrichtung von Systemdiensten
-Comment[el]=Ρύθμιση των υπηρεσιών συστήματος
-Comment[eo]=Agordo de la sistemservoj
-Comment[es]=Configuración de los servicios del sistema
-Comment[et]=Süsteemsete teenuste seadistamine
-Comment[eu]=Sistemaren zerbitzuen konfigurazioa
-Comment[fa]=پیکربندی خدمات سیستم
-Comment[fi]=Järjestelmän palveluiden asetus
-Comment[fr]=Configuration des services du système
-Comment[fy]=TDE-systeemtsjinsten ynstelle
-Comment[ga]=Cumraíocht seirbhísí an chórais
-Comment[gl]=Configuración dos Servizos do Sistema
-Comment[he]=שינוי הגדרות שירותי המערכת
-Comment[hi]=तंत्र सेवा कॉन्फ़िगरेशन
-Comment[hr]=Konfiguracija usluga sustava
-Comment[hu]=A rendszerszolgáltatások beállításai
-Comment[is]=Stillingar kerfisþjónusta
-Comment[it]=Configurazione dei servizi di sistema
-Comment[ja]=システムサービスの設定
-Comment[ka]=სისტემური სერვისების კონფიგურაცია
-Comment[kk]=Жүйелік қызметтерді баптау
-Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​សេវា​ប្រព័ន្ធ
-Comment[ko]=TDE 서비스 설정
-Comment[lo]=ປັບແຕ່ງອອດລະບົບ
-Comment[lt]=Sistemos tarnybų konfigūravimas
-Comment[lv]=Sistēmas Servisu Konfigurācija
-Comment[mk]=Конфигурација на системските сервиси
-Comment[mn]=Системийн үйлчилгээний тохируулга
-Comment[ms]=Konfigurasi Servis Sistem
-Comment[mt]=Konfigurazzjoni tas-servizzi tas-sistema
-Comment[nb]=Systemtjenesteinnstillinger
-Comment[nds]=Systeemdeensten instellen
-Comment[ne]=प्रणाली सेवा कन्फिगरेसन
-Comment[nl]=TDE-systeemdiensten instellen
-Comment[nn]=Oppsett av systemtenester
-Comment[nso]=Peakanyo ya Ditirelo tsa System
-Comment[pa]=ਸਿਸਟਮ ਸੇਵਾਵਾਂ ਸੰਰਚਨਾ
-Comment[pl]=Konfiguracja usług systemowych
-Comment[pt]=Configuração dos Serviços do Sistema
-Comment[pt_BR]=Configuração de Serviços do Sistema
-Comment[ro]=Configurează serviciile de sistem
-Comment[ru]=Настройка системных служб
-Comment[rw]=Iboneza rya Serivise Sisitemu
-Comment[se]=Vuogádatbálvalusaid heiveheapmi
-Comment[sk]=Nastavenie systémových služieb
-Comment[sl]=Nastavitve sistemskih storitev
-Comment[sr]=Подешавање системских сервиса
-Comment[sr@Latn]=Podešavanje sistemskih servisa
-Comment[sv]=Anpassa systemets tjänster
-Comment[ta]=சாதன சேவை அமைப்பு
-Comment[tg]=Танзими хидматҳои система
-Comment[th]=ปรับแต่งบริการของระบบ
-Comment[tr]=Sistem Servisleri Yapılandırması
-Comment[tt]=Sistem Xezmätlären Caylawçı
-Comment[uk]=Конфігурація служб систем
-Comment[uz]=Tizimning xizmatlarini moslash
-Comment[uz@cyrillic]=Тизимнинг хизматларини мослаш
-Comment[ven]=Bzudzanyo ya tshumelo ya sisitemu
-Comment[vi]=Cấu hình Dịch vụ Hệ thống
-Comment[wa]=Apontiaedje des siervices do sistinme
-Comment[xh]=Uqwalaselo Lweenkonzo Zendlela zokuseneza
-Comment[zh_CN]=系统服务配置
-Comment[zh_TW]=系統服務組態
-Comment[zu]=Inhlanganisela Yemisebenzi Yesistimu
+
 Keywords=KDED;Daemon;Services;
-Keywords[ar]=KDED;Daemon;Services;مراقب;خدمات;
-Keywords[az]=KDED;Demon;Xidmətlər;
-Keywords[be]=Дэман;Сервісы;KDED;Daemon;Services;
-Keywords[bg]=услуга; обслужване; сървър; демон; KDED; Daemon; Services;
-Keywords[br]=KDED;Diaoul;Servijoù;
-Keywords[ca]=KDED;Dimoni;Serveis;
-Keywords[cs]=KDED;démon;služby;
-Keywords[csb]=KDED;demóna;ùsłëżnotë;
-Keywords[cy]=KDED;Daemon;Gwasanaethau;
-Keywords[da]=KDED;Dæmon;Tjenester;
-Keywords[de]=KDED;Dämon;Dienst;Daemon;Services;Dienste;
-Keywords[el]=KDED;Δαίμονας;Υπηρεσίες;
-Keywords[eo]=KDED;demono;servoj;
-Keywords[es]=KDED;Demonio;servicios;
-Keywords[et]=KDED;deemon;teenused;
-Keywords[eu]=KDED;Daemon-a;Zerbitzuak;
-Keywords[fa]=KDED،شبح، خدمات;
-Keywords[fi]=KDED;Palvelin;Palvelut;
-Keywords[fr]=KDED;Daemon;Démon;Services;
-Keywords[fy]=KDED;Daemon;services;tsjinsten;systeemtsjinsten;systeem;
-Keywords[ga]=KDED;Deamhan;Seirbhísí;
-Keywords[gl]=KDED;Demo;Servizos;
-Keywords[he]=KDED;תהליך רקע;שירותים;Daemon;Services;
-Keywords[hi]=केडीईडी;डेमन;सेवाएँ;
-Keywords[hr]=KDED;Daemon;Services;Demon;Usluge;
-Keywords[hu]=KDED;démon;szolgáltatás;
-Keywords[is]=KDED;þjónn;Þjónustur;púki;þræll;
-Keywords[it]=KDED;demone;servizi;
-Keywords[ja]=KDED;デーモン;サービス;
-Keywords[km]=KDED;Daemon;សេវា;
-Keywords[lt]=KDED;Daemon;Services; demonas;tarnybos;
-Keywords[lv]=KDED;Dēmoni;Servisi;
-Keywords[mn]=КДЭХ;Хэвтүүл;Services;Үйлчилгээ;
-Keywords[ms]=KDED;Daemon;Servis;
-Keywords[mt]=KDED;Daemon;Services;servizzi;
-Keywords[nb]=KDED;nisse;tjenester;daemon;
-Keywords[nds]=KDED;Daemon;Services;Dämoon;Deenst;Deensten;
-Keywords[ne]=KDED; डेइमन; सेवा;
-Keywords[nl]=KDED;Daemon;services;diensten;systeemdiensten;systeem;
-Keywords[nn]=KDED;daemon;nisse;tenester;
-Keywords[nso]=KDED;Daemon;Ditirelo;
-Keywords[pa]=KDED;Daemon;Services;ਸੇਵਾਵਾਂ;
-Keywords[pl]=KDED;demon;usługi;
-Keywords[pt]=KDED;Servidor;Serviços;
-Keywords[pt_BR]=KDED;Servidor;Serviços;
-Keywords[ro]=KDED;demon;servicii;
-Keywords[ru]=KDED;Daemon;Services;службы;служба;
-Keywords[rw]=KDED; Dayimoni;Serivise;
-Keywords[se]=KDED;daemon;bálvalusat;
-Keywords[sk]=KDED;Daemon;služby;
-Keywords[sl]=KDED;demon;storitve;
-Keywords[sr]=KDED; Демон; Сервиси;
-Keywords[sr@Latn]=KDED; Demon; Servisi;
-Keywords[sv]=KDED;Demon;Tjänster;
-Keywords[ta]=KDED;டேமான்;சேவைகள்;
-Keywords[th]=KDED;เดมอน;บริการ;
-Keywords[tr]=KDED;program;servisler;
-Keywords[uk]=KDED;демон;служби;
-Keywords[uz]=KDED;xizmat;xizmatlar;
-Keywords[uz@cyrillic]=KDED;хизмат;хизматлар;
-Keywords[ven]=KDED;Daemon;Dzitshumelo;
-Keywords[vi]=KDED;Trình nền;Dịch vụ;
-Keywords[wa]=KDED;Daemon;Services;demon;siervices;
-Keywords[xh]=KDED;Daemon;Iinkonzo;
-Keywords[zh_CN]=KDED;Daemon;Services;守护程序;服务;
-Keywords[zh_TW]=KDED;Daemon;Services;伺服程式;服務;
-Keywords[zu]=KDED;Daemon;Imisebenzi;
diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h
index 6dff072ea..eaffa3808 100644
--- a/kcontrol/kded/kcmkded.h
+++ b/kcontrol/kded/kcmkded.h
@@ -30,7 +30,7 @@ class TQPushButton;
 
 class KDEDConfig : public TDECModule
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KDEDConfig(TQWidget* parent, const char* name= 0L, const TQStringList& foo = TQStringList());
 	~KDEDConfig() {};
@@ -64,7 +64,7 @@ private:
 
 class CheckListItem : public TQObject, public TQCheckListItem
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	CheckListItem(TQListView* parent, const TQString &text);
 	~CheckListItem() { }