15 files changed, 62 insertions, 360 deletions
diff --git a/tdeioslave/http/CMakeLists.txt b/tdeioslave/http/CMakeLists.txt
index aff6d0a4e..a8570d60f 100644
--- a/tdeioslave/http/CMakeLists.txt
+++ b/tdeioslave/http/CMakeLists.txt
@@ -32,10 +32,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES
+tde_create_translated_desktop(
+  SOURCE
     http_cache_cleaner.desktop http.protocol https.protocol
     webdav.protocol webdavs.protocol
-  DESTINATION ${SERVICES_INSTALL_DIR} )
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR tdeioslave-desktops
+)
 
 
 ##### tdeio_http_cache_cleaner ####################
@@ -59,7 +62,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
 set( target tdeio_http )
 
 set( ${target}_SRCS
-  http.cc
+  http.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/tdeioslave/http/Makefile.am b/tdeioslave/http/Makefile.am
index 8e2eb4187..f4f4ddc7f 100644
--- a/tdeioslave/http/Makefile.am
+++ b/tdeioslave/http/Makefile.am
@@ -13,7 +13,7 @@ lib_LTLIBRARIES=
 tdeinit_LTLIBRARIES = tdeio_http_cache_cleaner.la
 kde_module_LTLIBRARIES = tdeio_http.la
 
-tdeio_http_la_SOURCES = http.cc
+tdeio_http_la_SOURCES = http.cpp
 tdeio_http_la_METASOURCES = AUTO
 tdeio_http_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_TQT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la
 tdeio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
diff --git a/tdeioslave/http/README.webdav b/tdeioslave/http/README.webdav
index d7f6cca26..7d0d2528b 100644
--- a/tdeioslave/http/README.webdav
+++ b/tdeioslave/http/README.webdav
@@ -13,7 +13,7 @@ Applications supporting extended webdav features
 [none currently]
 
 Much of the info here is elaborated by rfc #2518; the rest can be understood by reading
-davPropStat() in http.cc, specifically the setMetaData() calls.
+davPropStat() in http.cpp, specifically the setMetaData() calls.
 
 Extended information is transferred via tdeio's metadata system...
 
@@ -44,9 +44,9 @@ To create a lock, call a special request, with the following data:
 
 int, value 5 (LOCK request)
 KURL url - the location of the resource to lock
-QString scope - the scope of the lock, currently "exclusive" or "shared"
-QString type - the type of the lock, currently only "write"
-QString owner (optional) - owner contact details (url)
+TQString scope - the scope of the lock, currently "exclusive" or "shared"
+TQString type - the type of the lock, currently only "write"
+TQString owner (optional) - owner contact details (url)
 
 Additionally, the lock timeout requested from the server may be altered from the default
 of Infinity by setting the metadata "davTimeout" to the number of seconds, or 0 for
diff --git a/tdeioslave/http/http.cc b/tdeioslave/http/http.cpp
index 8cd0f7a64..7520349d9 100644
--- a/tdeioslave/http/http.cc
+++ b/tdeioslave/http/http.cpp
@@ -57,13 +57,13 @@
 #include <kservice.h>
 #include <krfcdate.h>
 #include <kmdcodec.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kresolver.h>
 #include <kmimemagic.h>
 #include <dcopclient.h>
 #include <kdatastream.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <kremoteencoding.h>
 
@@ -93,7 +93,7 @@
 using namespace TDEIO;
 
 extern "C" {
-  KDE_EXPORT int kdemain(int argc, char **argv);
+  TDE_EXPORT int kdemain(int argc, char **argv);
 }
 
 int kdemain( int argc, char **argv )
@@ -4444,10 +4444,10 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ )
 
   HTTPFilterChain chain;
 
-  TQObject::connect(&chain, TQT_SIGNAL(output(const TQByteArray &)),
-          this, TQT_SLOT(slotData(const TQByteArray &)));
-  TQObject::connect(&chain, TQT_SIGNAL(error(int, const TQString &)),
-          this, TQT_SLOT(error(int, const TQString &)));
+  TQObject::connect(&chain, TQ_SIGNAL(output(const TQByteArray &)),
+          this, TQ_SLOT(slotData(const TQByteArray &)));
+  TQObject::connect(&chain, TQ_SIGNAL(error(int, const TQString &)),
+          this, TQ_SLOT(error(int, const TQString &)));
 
    // decode all of the transfer encodings
   while (!m_qTransferEncodings.isEmpty())
diff --git a/tdeioslave/http/http.h b/tdeioslave/http/http.h
index aacdf1d47..51ec5b232 100644
--- a/tdeioslave/http/http.h
+++ b/tdeioslave/http/http.h
@@ -48,7 +48,7 @@ namespace TDEIO {
 
 class HTTPProtocol : public TQObject, public TDEIO::TCPSlaveBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   HTTPProtocol( const TQCString &protocol, const TQCString &pool,
                 const TQCString &app );
diff --git a/tdeioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp
index aaf94d25a..0375042e8 100644
--- a/tdeioslave/http/http_cache_cleaner.cpp
+++ b/tdeioslave/http/http_cache_cleaner.cpp
@@ -32,11 +32,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqstring.h>
 #include <tqptrlist.h>
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <dcopclient.h>
 #include <tdeprotocolmanager.h>
 
@@ -77,7 +77,7 @@ public:
 };
 
 // !START OF SYNC!
-// Keep the following in sync with the cache code in http.cc
+// Keep the following in sync with the cache code in http.cpp
 #define CACHE_REVISION "7\n"
 
 FileInfo *readEntry( const TQString &filename)
@@ -158,7 +158,7 @@ FileInfo *readEntry( const TQString &filename)
    unlink( CEF.data());
    return 0;
 }
-// Keep the above in sync with the cache code in http.cc
+// Keep the above in sync with the cache code in http.cpp
 // !END OF SYNC!
 
 void scanDirectory(FileInfoList &fileEntries, const TQString &name, const TQString &strDir)
@@ -187,7 +187,7 @@ void scanDirectory(FileInfoList &fileEntries, const TQString &name, const TQStri
    }
 }
 
-extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
+extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
 {
    TDELocale::setMainCatalogue("tdelibs");
    TDECmdLineArgs::init( argc, argv, appName,
diff --git a/tdeioslave/http/http_cache_cleaner.desktop b/tdeioslave/http/http_cache_cleaner.desktop
index 63410bdd5..58597e63e 100644
--- a/tdeioslave/http/http_cache_cleaner.desktop
+++ b/tdeioslave/http/http_cache_cleaner.desktop
@@ -1,168 +1,6 @@
 [Desktop Entry]
 Type=Service
 Name=HTTP Cache Cleaner
-Name[af]=Http Kas Skoonmaker
-Name[ar]=مزيل كاش HTTP
-Name[az]=HTTP Ön Yaddaş Təmizləyici
-Name[be]=Ачыстка кэшу HTTP
-Name[bg]=Изчистване на кеш-паметта на HTTP
-Name[bn]=এইচ-টি-টি-পি ক্যাশ ক্লীনার
-Name[br]=Naeter Krubuilh HTTP
-Name[bs]=Čistač HTTP cache-a
-Name[ca]=Neteja la memòria cau del HTTP
-Name[cs]=Nástroj pro vyprázdnění cache protokolu HTTP
-Name[csb]=Czëszczenié cache HTTP
-Name[cy]=Glanhauwr Storfa HTTP
-Name[da]=HTTP-cache-rydder
-Name[de]=Aufräumprogramm für den HTTP-Zwischenspeicher
-Name[el]=Καθαριστής λανθάνουσας μνήμης HTTP
-Name[eo]=HTTP-Tenejpurigilo
-Name[es]=Limpiador del caché de HTTP
-Name[et]=HTTP vahemälu puhastaja
-Name[eu]=HTTP cache-garbitzailea
-Name[fa]=پاک‌کنندۀ نهانگاه قام
-Name[fi]=HTTP-välimuistin tyhjentäjä
-Name[fr]=Nettoyage du cache HTTP
-Name[fy]=HTTP Cache oprommer
-Name[ga]=Glantóir Taisce HTTP
-Name[gl]=Limpador da caché de HTTP
-Name[he]=מנקה מטמון ה־HTTP
-Name[hi]=HTTP कैश साफ करने वाला
-Name[hr]=Brisanje HTTP pohrane
-Name[hu]=HTTP gyorstártisztító
-Name[id]=Pembersih Cache HTTP
-Name[is]=Hreinsiforrit HTTP skyndiminnis
-Name[it]=Ripulitore della cache HTTP
-Name[ja]=HTTP キャッシュマネージャ
-Name[ka]=HTTP ბუფერის გასუფთავება
-Name[kk]=HTTP бүркемесін босату
-Name[km]=កម្មវិធីសម្អាតឃ្លាំងសម្ងាត់ HTTP
-Name[ko]=HTTP 캐시 정리
-Name[lb]=Opraumer fir den HTTP-Zwëschespäicher
-Name[lt]=HTTP krepšio ištuštintojas
-Name[lv]=HTTP Kešatmiņas tīrītājs
-Name[mk]=Бришење на HTTP-кешот
-Name[mn]=HTTP-завсрын хадгалагчийн цэвэрлэгээ
-Name[ms]=Pembersih Penyimpan HTTP
-Name[mt]=Tindif tal-cache HTTP
-Name[nb]=HTTP Mellomlagerrenser
-Name[nds]=Reenmaker för HTTP-Twischenspieker
-Name[ne]=HTTP क्यास क्लीनर
-Name[nl]=HTTP Cache opschonen
-Name[nn]=HTTP-mellomlageropprensking
-Name[nso]=Sehlwekisi sa Polokelo ya HTTP
-Name[oc]=Netejador de cabia HTTP
-Name[pa]=HTTP ਕੈਂਚੇ ਸਾਫ਼
-Name[pl]=Czyszczenie bufora HTTP
-Name[pt]=Limpeza da Cache de HTTP
-Name[pt_BR]=Limpador de cache HTTP
-Name[ro]=Curăţător cache HTTP
-Name[ru]=Очистка кэша HTTP
-Name[rw]=Musukura Ubwihisho HTTP
-Name[se]=HTTP gaskarádjosa buhtisteaddji
-Name[sk]=Čistič vyrovnávacej pamäti HTTP
-Name[sl]=Čistilnik predpomnilnika HTTP
-Name[sq]=Pastrues për Depon e Fshehtësitëve të HTTP
-Name[sr]=Чистач HTTP кеша
-Name[sr@Latn]=Čistač HTTP keša
-Name[sv]=HTTP-cacherensare
-Name[ta]=HTTP தற்காலிக நினைவகத்தை சுத்தம் செய்தல்
-Name[te]=హెచ్ టిటిపి కోశం శుభ్రంచేసేది
-Name[tg]=HTTP Софкунаки Махфӣ
-Name[th]=ตัวล้างแคช HTTP
-Name[tr]=HTTP Önbellek Temizleyici
-Name[tt]=HTTP Alxäteren Buşatqıç
-Name[uk]=Очищувач кешу HTTP
-Name[uz]=HTTP kesh boʻshatgich
-Name[uz@cyrillic]=HTTP кэш бўшатгич
-Name[ven]=Tshikulumagi tsha HTTP Cache
-Name[vi]=Bộ làm sạch bộ nhớ tạm HTTP
-Name[xh]=Umcoci wendawo efihlakeleyo yokugcina we HTTP
-Name[zh_CN]=HTTP 缓存清除程序
-Name[zh_HK]=HTTP 快取清除程式
-Name[zh_TW]=HTTP 快取清除程式
-Name[zu]=Umhlanzi we-Cache ye-HTTP
-Exec=tdeio_http_cache_cleaner
 Comment=Cleans up old entries from the HTTP cache
-Comment[af]=Skoonmaak begin ou inskrywings van die Http kas
-Comment[ar]=يزيل المداخل القديمة من كاش HTTP
-Comment[az]=HTTP ön yaddaşından köhnə girişləri silər
-Comment[be]=Выдаляе старыя запісы з кэшу HTTP
-Comment[bg]=Изчистване на старите данни в кеш-паметта на HTTP
-Comment[bn]=HTTP ক্যাশ থেকে পুরনো তথ্য মুছে ফেলে
-Comment[br]=Skarañ enmontoù kozh diwar ar grubuilh HTTP
-Comment[bs]=Čisti stare datoteke iz HTTP cache-a
-Comment[ca]=Neteja les entrades antigues de la memòria cau del HTTP
-Comment[cs]=Odstraňuje staré položky z HTTP cache
-Comment[csb]=Rëmô stôré wpisënczi z cache HTTP
-Comment[cy]=Glanhau'r hen gofnodion o'r storfa HTTP
-Comment[da]=Rydder op i gamle indgange fra HTTP-cachen
-Comment[de]=Löscht alte Einträge aus dem HTTP-Zwischenspeicher
-Comment[el]=Καθαρίζει παλιές καταχωρήσεις από τη λανθάνουσα μνήμη HTTP
-Comment[eo]=Forigas malnovajn erojn el HTTP-tenejo
-Comment[es]=Elimina entradas antiguas del caché de HTTP
-Comment[et]=Puhastab HTTP vahemälu vanadest kirjetest
-Comment[eu]=HTTP cachearen sarrera zaharrak garbitzen ditu
-Comment[fa]=مدخلهای قدیمی را از نهانگاه قام پاک می‌کند
-Comment[fi]=Puhdistaa vanhat tiedot HTTP-välimuistista
-Comment[fr]=Efface les anciennes entrées du cache HTTP
-Comment[fy]=Ferwidert âlde items út de HTTP-cache
-Comment[ga]=Glanann seaniontrálacha ón taisce HTTP
-Comment[gl]=Elimina as entradas antigas da caché de HTTP
-Comment[he]=מנקה רשומות ישנות ממטמון ה־HTTP
-Comment[hi]=HTTP कैश से पुरानी प्रविष्टि साफ करे
-Comment[hr]=Uklanjanje starih datoteka iz HTTP privremene lokalne pohrane
-Comment[hu]=Kitörli a régi bejegyzéseket a HTTP gyorstárból
-Comment[id]=Membersihkan entri lama dari cache HTTP
-Comment[is]=Hreinsar gamlar færslur úr HTTP skyndiminninu
-Comment[it]=Ripulisce la cache HTTP dalle voci vecchie
-Comment[ja]=HTTP キャッシュから古いエントリを削除します
-Comment[ka]=HTTP ბუფერის მოძველებელი ელემენტების 
-Comment[kk]=HTTP бүркемесін ескі жазулардан тазалау
-Comment[km]=សម្អាតធាតុចាស់ៗពីឃ្លាំងសម្ងាត់ HTTP
-Comment[ko]=HTTP 캐시에서 오래된 것들을 정리합니다
-Comment[lb]=Entfernt al Entréen aus dem HTTP-Zwëschespäicher
-Comment[lt]=Išvalo senus įrašus iš HTTP krepšio
-Comment[lv]=Iztīra vecos ierakstus no HTTP kešatmiņas
-Comment[mk]=Ги брише старите работи од HTTP кешот
-Comment[mn]=HTTP-завсрын хадгалагчаас хуучин бичлэгийг устгах
-Comment[ms]=Membersihkan masukan lama daripada penyimpan HTTP
-Comment[mt]=Ineħħi fajls antiki mill-cache tal-HTTP
-Comment[nb]=Fjerner gamle oppføringer fra hurtiglageret for HTTP
-Comment[nds]=Smitt ole Indrääg ut den HTTP-Twischenspieker rut
-Comment[ne]=HTTP क्यासबाट पुराना प्रविष्टिहरू सफा गर्दछ
-Comment[nl]=Verwijdert oude items uit de HTTP-cache
-Comment[nn]=Reinskar opp i gamle oppføringar i HTTP-mellomlageret
-Comment[nso]=E hlwekisa ditsenyo tsa kgale gotswa polokelong ya HTTP
-Comment[oc]=Neteja les entrades antigues dèu cabia HTTP
-Comment[pa]=HTTP ਕੈਂਚੇ ਤੋਂ ਪੁਰਾਣੀਆਂ ਇਕਾਈਆਂ ਸਾਫ
-Comment[pl]=Usuwa stare wpisy z bufora HTTP
-Comment[pt]=Limpa o conteúdo desactualizado da cache do HTTP
-Comment[pt_BR]=Limpa itens velhos do cache HTTP
-Comment[ro]=Elimină înregistrările vechi din cache-ul HTTP
-Comment[ru]=Удаление устаревших элементов из кэша HTTP
-Comment[rw]=Isukura ibyinjijwe bishaje biri mu bwihisho HTTP
-Comment[se]=Buhtista boares merko3/4iid HTTP gaskarádjosis
-Comment[sk]=Vyčistiť staré záznamy z vyrovnávacej pamäti HTTP
-Comment[sl]=Zbriše stare vnose iz pomnilnika HTTP
-Comment[sq]=I pastron hyrjet e vjetra nga depoja e fshehtësive të HTTP
-Comment[sr]=Чисти старе ставке из HTTP кеша
-Comment[sr@Latn]=Čisti stare stavke iz HTTP keša
-Comment[sv]=Rensar bort gamla poster från HTTP-cachen
-Comment[ta]=HTTP நினைவத்திலிருந்து பழைய உள்ளீடுகளை சுத்தம் செய்கிறது
-Comment[te]=హెచ్ టిటిపి కోశం నుంచి పాత ఆరొపములను శుభ్రం చేసేది
-Comment[tg]=Ёддоштҳои Кӯҳна аз HTTP Махфӣ Тоза Кунед
-Comment[th]=ล้างรายการเก่าๆ จากแคช HTTP
-Comment[tr]=HTTP önbelleğinden eski girişleri siler
-Comment[tt]=HTTP alxäterendä bulğan iske keremnär beterä
-Comment[uk]=Вичищає старі елементи з кешу HTTP
-Comment[uz]=HTTP keshidagi eski elementlarni oʻchiradi
-Comment[uz@cyrillic]=HTTP кэшидаги эски элементларни ўчиради
-Comment[ven]=I kulumaga zwithu zwakale u bva kha HTTP cache
-Comment[vi]=Xoá sạch các mục nhập cũ ra bộ nhớ tạm HTTP.
-Comment[xh]=Icoca amangeno amadala asuka twindawo efihlakeleyo yokugcina ye HTTP
-Comment[zh_CN]=从 HTTP 缓存中清除旧条目
-Comment[zh_HK]=從 HTTP 快取中清除舊的項目
-Comment[zh_TW]=從 HTTP 快取中清除舊的項目
-Comment[zu]=Ihlanza izingeniso ezindalam ezisuka kwi-cache ye-HTTP
+Exec=tdeio_http_cache_cleaner
 X-TDE-StartupNotify=false
diff --git a/tdeioslave/http/kcookiejar/CMakeLists.txt b/tdeioslave/http/kcookiejar/CMakeLists.txt
index e5e622989..5bf804615 100644
--- a/tdeioslave/http/kcookiejar/CMakeLists.txt
+++ b/tdeioslave/http/kcookiejar/CMakeLists.txt
@@ -27,8 +27,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kcookiejar.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
+tde_create_translated_desktop(
+  SOURCE kcookiejar.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/kded
+  PO_DIR tdeioslave-desktops
+)
+
 install( FILES kcookiescfg.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+
 install( FILES domain_info DESTINATION ${DATA_INSTALL_DIR}/tdehtml )
 
 
@@ -58,6 +64,5 @@ set( ${target}_SRCS
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK tdeui-shared tdeinit_kded-shared
-  DEPENDENCIES dcopidl
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/http/kcookiejar/kcookiejar.desktop b/tdeioslave/http/kcookiejar/kcookiejar.desktop
index 31b0f91f5..e62d7e2c5 100644
--- a/tdeioslave/http/kcookiejar/kcookiejar.desktop
+++ b/tdeioslave/http/kcookiejar/kcookiejar.desktop
@@ -1,151 +1,7 @@
 [Desktop Entry]
 Type=Service
 Name=KDED Cookie Jar Module
-Name[af]=Kded Koekie Houer Module
-Name[ar]=وحدة Jar لكعكة KDED
-Name[az]=KDED Kökə Jar Modulu
-Name[be]=Модуль "печыва" KDED
-Name[bg]=Модул KDED Cookie Jar
-Name[bn]=KDED কুকি জার মডিউল
-Name[bs]=KDED modul "Tegla sa keksima"
-Name[ca]=Mòdul Jar de cookies per a KDED
-Name[cs]=KDED modul pro cookies
-Name[csb]=Sprôwianié kùszkama
-Name[cy]=Modiwl Jar Cwci KDED
-Name[da]=KDED-cookie-jar-modul
-Name[de]=Cookie-Verwaltung
-Name[el]=Άρθρωμα Cookie Jar του KDED
-Name[eo]=KDED-kuketotraktila modulo
-Name[es]=Módulo Jar de cookies de KDED
-Name[et]=KDED Cookie Jar moodul
-Name[eu]=KDED Cookie Jar modulua
-Name[fa]=پیمانۀ ظرف کوکی KDED
-Name[fi]=KDED-evästemoduuli
-Name[fr]=Module Jar de cookie KDED
-Name[fy]=KDED-module foar it bewarjen fan Koekjes
-Name[gl]=Módulo Jar de cookies de KDED
-Name[he]=מודול צנצנת העוגיות של KDED
-Name[hi]=KDED कुकी जार मॉड्यूल
-Name[hr]=KDED modul za čuvanje kolačića
-Name[hu]=KDED cookie-modul
-Name[id]=Modul Penyimpanan Cookies KDED
-Name[is]=KDED smákökukrukka
-Name[it]=Modulo Jar dei cookie per KDED
-Name[ja]=KDED クッキー Jar モジュール
-Name[ka]=KDED-ის ბმულების Jar მოდული
-Name[kk]=KDED cookie модулі
-Name[km]=ម៉ូឌុល Jar នៃខូគី KDED
-Name[ko]=KDED 쿠키 JAR 모듈
-Name[lb]=KDED-Modul fir d'Verwaltung vun de Cookien
-Name[lt]=KDED slapukų rinkinio modulis
-Name[lv]=KDED Cepumu Jar modulis
-Name[mk]=KDED модул Тегла со колачиња
-Name[ms]=Modul Balang Cecikut KDED
-Name[mt]=Modulu tal-"cookies" KDED
-Name[nb]=KDEDs modul for informasjonskapsler (Cookie Jar)
-Name[nds]=KDED-Kookjepleeg
-Name[ne]=KDED कुकी जार मोड्युल
-Name[nl]=KDED-module voor het opslaan van cookies
-Name[nn]=KDED-informasjonskapselmodul
-Name[nso]=Seripa sa Jar ya Cookie ya KDED
-Name[pa]=KDED ਕੂਕੀਜ਼ Jar ਮੈਡੀਊਲ
-Name[pl]=Zarządzanie ciasteczkami
-Name[pt]=Módulo de 'Cookies' do KDED
-Name[pt_BR]=Módulo de Cookie Jar do KDED
-Name[ro]=Modul Cookie JAR pentru KDED
-Name[ru]=Служба cookie
-Name[rw]=Igice Jar Inyandikonyakwirema KDED
-Name[se]=KDED gáhkošlihtti-moduvla
-Name[sk]=Modul pre cookies KDED
-Name[sl]=Modul posode za piškotke KDED
-Name[sq]=Modul i KDED-it për Qyp të keksave nga KDED
-Name[sr]=KDED модул тегле за колачиће
-Name[sr@Latn]=KDED modul tegle za kolačiće
-Name[sv]=KDED-kakburksmodul
-Name[ta]=KDED தற்காலிக நினைவக சாடி பகுதி
-Name[te]=కెడిఈడి కుకీ జాడి మాడ్యూల్
-Name[tg]=Модули KDED Cookie Jar
-Name[th]=โมดูลโถคุกกี KDED
-Name[tr]=KDED Cookie Jar Modülü
-Name[tt]=KDED'nıñ Cookie Modulı
-Name[uk]=Модуль глечика з куками KDED
-Name[uz]=KDED kuki idish moduli
-Name[uz@cyrillic]=KDED куки идиш модули
-Name[ven]=Modulu wa Jar wa Cookie ya KDED
-Name[vi]=Mô-đun Cookie Jar của KDED
-Name[xh]=Isicatshulwa se KDED Cookie Jar
-Name[zh_CN]=KDED Cookie Jar 模块
-Name[zh_HK]=KDED Cookie Jar 模組
-Name[zh_TW]=KDED Cookie Jar 模組
-Name[zu]=Ingxenye Yojeke ye-Cookie ye-KDED
 Comment=Keeps track of all cookies in the system
-Comment[af]=Hou tred van al die koekies in die stelsel
-Comment[ar]=يراقب جميع الكعكات الموجودة على النظام
-Comment[be]=Захоўвае звесткі пра "печыва"
-Comment[bg]=Контрол над всички бисквитки в системата
-Comment[bn]=সিস্টেমে সমস্ত কুকি-র খোঁজখবর রাখে
-Comment[bs]=Prati sve kolačiće (cookije) na sistemu
-Comment[ca]=Segueix totes les galetes en el sistema
-Comment[cs]=Spravuje Cookies v počítači
-Comment[csb]=Trzëmô wszëtczé kùszczi w systemie
-Comment[da]=Holder styr på alle cookier på systemet
-Comment[de]=Verwaltet die Cookies in KDED
-Comment[el]=Διατηρεί αρχείο από όλα τα cookies στο σύστημα
-Comment[eo]=Registras ĉiujn kuketojn en la sistemo
-Comment[es]=Mantiene registro todas las cookies en el sistema
-Comment[et]=Hoiab silma peal kõigil süsteemi küpsistel
-Comment[eu]=Sistemaren cookie guztien jarraipena egiten du
-Comment[fa]=رد همۀ کوکیها را در سیستم نگه می‌دارد
-Comment[fi]=Seuraa järjestelmän evästeitä
-Comment[fr]=Conserve une trace de tous les cookies dans le système
-Comment[fy]=Hâld by wer alle koekjes binne
-Comment[gl]=Manter as pegadas de todas as Cookies no sistema
-Comment[he]=מבצע מעקב אחרי כל העוגיות במערכת
-Comment[hi]=तंत्र की सभी कुकी की जानकारी रखता है
-Comment[hr]=Vođenje evidencije o svim kolačićima na sustavu
-Comment[hu]=Nyomon követi a rendszerben létrejövő cookie-kat
-Comment[id]=Menyimpan semua cookies pada sistem
-Comment[is]=Heldur utanum allar smákökur í kerfinu
-Comment[it]=Tiene traccia di tutti i cookie del sistema
-Comment[ja]=システムのすべてのクッキーを管理します
-Comment[ka]=სისტემის ყველა ბმულის თვალმიდევნება
-Comment[kk]=Жүйедегі бүкіл cookie файлдарды бақылау
-Comment[km]=រក្សាការតាមដានខូគីទាំងអស់ក្នុងប្រព័ន្ធ
-Comment[lb]=Iwwerwaacht all d'Cookie vum System
-Comment[lt]=Seka visus slapukus sistemoje
-Comment[lv]=Seko visiem sistēmā esošajiem cepumiem
-Comment[mk]=Води сметка за сите колачиња во системот
-Comment[ms]=Memerhati semua cecikut dalam sistem
-Comment[nb]=Holder rede på alle informasjonskapsler i systemet
-Comment[nds]=Passt all Kookjes in't Systeem
-Comment[ne]=प्रणालीमा सबै कुकीहरूको पदचिन्ह राख्दछ
-Comment[nl]=Houdt alle cookies in het systeem bij
-Comment[nn]=Held greie på informasjonskapslane
-Comment[pa]=ਸਿਸਟਮ ਦੇ ਸਾਰੇ ਕੂਕੀਜ਼ ਦਾ ਰਿਕਾਰਡ ਰੱਖੋ
-Comment[pl]=Przechowuje wszystkie ciasteczka w systemie
-Comment[pt]=Mantém um registo de todos os 'cookies' no sistema
-Comment[pt_BR]=Mantém informações sobre todos os cookies do sistema
-Comment[ro]=Administrează toate "cookie"-urile din sistem
-Comment[ru]=Управление закладками-cookie в KDED
-Comment[rw]=Iguma inzira y'inyandikonyakwirema zose muri sisitemu
-Comment[se]=Halddaša buot diehtočoahkuid
-Comment[sk]=Sleduje všetky cookie v systéme
-Comment[sl]=Opazuje vse piškotke v sistemu
-Comment[sr]=Води евиденцију о свим колачићима на систему
-Comment[sr@Latn]=Vodi evidenciju o svim kolačićima na sistemu
-Comment[sv]=Håller ordning på alla kakor i systemet
-Comment[ta]=கணினியின் எல்லா தற்காலிக நினைவகங்களையும் கண்காணிக்கிறது
-Comment[te]=వ్యవస్థలోని అన్ని కుకీల జాడని వుంచుకుంటుంది
-Comment[tg]=Гузаргоҳи ҳамаша Cookies дар система муҳофизат кунед
-Comment[th]=ใช้ติดตามคุกกีทั้งหมดในระบบ
-Comment[tr]=Sistemdeki tüm çerezleri izler
-Comment[tt]=Sistemdäge bar cookie'larnı küz astında tota
-Comment[uk]=Стежить за всіма куками в системі
-Comment[uz]=Tizimdagi hamma kukilarni kuzatadi
-Comment[uz@cyrillic]=Тизимдаги ҳамма кукиларни кузатади
-Comment[vi]=Theo dõi các tập tin cookie trong hệ thống.
-Comment[zh_CN]=将全部 cookies 的记录保存在系统中
-Comment[zh_TW]=追蹤系統所有的 cookies
 X-TDE-ServiceTypes=KDEDModule
 Exec=kcookiejar
 X-DCOP-ServiceType=Unique
diff --git a/tdeioslave/http/kcookiejar/kcookieserver.cpp b/tdeioslave/http/kcookiejar/kcookieserver.cpp
index 798b06318..372d4281a 100644
--- a/tdeioslave/http/kcookiejar/kcookieserver.cpp
+++ b/tdeioslave/http/kcookiejar/kcookieserver.cpp
@@ -39,14 +39,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kcookiejar.h"
 #include "kcookiewin.h"
 #include "kcookieserver.h"
 
 extern "C" {
-    KDE_EXPORT KDEDModule *create_kcookiejar(const TQCString &name)
+    TDE_EXPORT KDEDModule *create_kcookiejar(const TQCString &name)
     {
        return new KCookieServer(name);
     }
@@ -87,7 +87,7 @@ KCookieServer::KCookieServer(const TQCString &name)
    mRequestList = new RequestList;
    mAdvicePending = false;
    mTimer = new TQTimer();
-   connect( mTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotSave()));
+   connect( mTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotSave()));
    mConfig = new TDEConfig("kcookiejarrc");
    mCookieJar->loadConfig( mConfig );
 
@@ -107,8 +107,8 @@ KCookieServer::KCookieServer(const TQCString &name)
    {
       mCookieJar->loadCookies( filename);
    }
-   connect(this, TQT_SIGNAL(windowUnregistered(long)),
-           this, TQT_SLOT(slotDeleteSessionCookies(long)));
+   connect(this, TQ_SIGNAL(windowUnregistered(long)),
+           this, TQ_SLOT(slotDeleteSessionCookies(long)));
 }
 
 KCookieServer::~KCookieServer()
diff --git a/tdeioslave/http/kcookiejar/kcookieserver.h b/tdeioslave/http/kcookiejar/kcookieserver.h
index 2cbb9ccf1..4603808e0 100644
--- a/tdeioslave/http/kcookiejar/kcookieserver.h
+++ b/tdeioslave/http/kcookiejar/kcookieserver.h
@@ -38,7 +38,7 @@ class TDEConfig;
 
 class KCookieServer : public KDEDModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 public:
   KCookieServer(const TQCString &);
diff --git a/tdeioslave/http/kcookiejar/kcookiewin.cpp b/tdeioslave/http/kcookiejar/kcookiewin.cpp
index 5b78d6956..c60097aaf 100644
--- a/tdeioslave/http/kcookiejar/kcookiewin.cpp
+++ b/tdeioslave/http/kcookiejar/kcookiewin.cpp
@@ -65,7 +65,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #endif
 
@@ -76,11 +76,11 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
                         int defaultButton, bool showDetails )
            :KDialog( parent, "cookiealert", true )
 {
-#ifndef Q_WS_QWS //FIXME(E): Implement for Qt Embedded
+#ifndef TQ_WS_QWS //FIXME(E): Implement for Qt Embedded
     setCaption( i18n("Cookie Alert") );
     setIcon( SmallIcon("cookie") );
     // all cookies in the list should have the same window at this time, so let's take the first
-# ifdef Q_WS_X11
+# ifdef TQ_WS_X11
     if( cookieList.first()->windowIds().count() > 0 )
     {
         XSetTransientForHint( tqt_xdisplay(), winId(), cookieList.first()->windowIds().first());
@@ -89,7 +89,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     {
         // No window associated... make sure the user notices our dialog.
         KWin::setState( winId(), NET::KeepAbove );
-        kapp->updateUserTimestamp();
+        tdeApp->updateUserTimestamp();
     }
 # endif
 #endif
@@ -102,7 +102,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     hBox->setSpacing( KDialog::spacingHint() );
     TQLabel* icon = new TQLabel( hBox );
     icon->setPixmap( TQMessageBox::standardIcon(TQMessageBox::Warning) );
-    icon->setAlignment( Qt::AlignCenter );
+    icon->setAlignment( TQt::AlignCenter );
     icon->setFixedSize( 2*icon->sizeHint() );
 
     int count = cookieList.count();
@@ -111,7 +111,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     TQString txt = i18n("You received a cookie from",
                        "You received %n cookies from", count);
     TQLabel* lbl = new TQLabel( txt, vBox );
-    lbl->setAlignment( Qt::AlignCenter );
+    lbl->setAlignment( TQt::AlignCenter );
     KHttpCookiePtr cookie = cookieList.first();
 
     TQString host (cookie->host());
@@ -128,10 +128,10 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     if (cookie->isCrossDomain())
        txt += i18n(" <b>[Cross Domain!]</b>");
     lbl = new TQLabel( txt, vBox );
-    lbl->setAlignment( Qt::AlignCenter );
+    lbl->setAlignment( TQt::AlignCenter );
     lbl = new TQLabel( i18n("Do you want to accept or reject?"), vBox );
-    lbl->setAlignment( Qt::AlignCenter );
-    vlayout->addWidget( hBox, 0, Qt::AlignLeft );
+    lbl->setAlignment( TQt::AlignCenter );
+    vlayout->addWidget( hBox, 0, TQt::AlignLeft );
 
     // Cookie Details dialog...
     m_detailView = new KCookieDetail( cookieList, count, this );
@@ -182,20 +182,20 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     TQPushButton* btn = new TQPushButton( i18n("&Accept"), bbox );
     btn->setDefault( true );
     btn->setFocus();
-    connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+    connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
     bbLay->addWidget( btn );
     btn = new TQPushButton( i18n("&Reject"), bbox );
-    connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+    connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
     bbLay->addWidget( btn );
     bbLay->addStretch( 1 );
 #ifndef TQT_NO_ACCEL
     TQAccel* a = new TQAccel( this );
-    a->connectItem( a->insertItem(Qt::Key_Escape), btn, TQT_SLOT(animateClick()) );
+    a->connectItem( a->insertItem(TQt::Key_Escape), btn, TQ_SLOT(animateClick()) );
 #endif
 
     m_button = new TQPushButton( bbox );
     m_button->setText( m_showDetails ? i18n("&Details <<"):i18n("&Details >>") );
-    connect( m_button, TQT_SIGNAL(clicked()), TQT_SLOT(slotCookieDetails()) );
+    connect( m_button, TQ_SIGNAL(clicked()), TQ_SLOT(slotCookieDetails()) );
     bbLay->addWidget( m_button );
 #ifndef TQT_NO_WHATSTHIS
     TQWhatsThis::add( m_button, i18n("See or modify the cookie information") );
@@ -315,7 +315,7 @@ KCookieDetail::KCookieDetail( KHttpCookieList cookieList, int cookieCount,
         TQPushButton* btnNext = new TQPushButton( i18n("Next cookie","&Next >>"), this );
         btnNext->setFixedSize( btnNext->sizeHint() );
         grid->addMultiCellWidget( btnNext, 8, 8, 0, 1 );
-        connect( btnNext, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextCookie()) );
+        connect( btnNext, TQ_SIGNAL(clicked()), TQ_SLOT(slotNextCookie()) );
 #ifndef TQT_NO_TOOLTIP
         TQToolTip::add( btnNext, i18n("Show details of the next cookie") );
 #endif
diff --git a/tdeioslave/http/kcookiejar/kcookiewin.h b/tdeioslave/http/kcookiejar/kcookiewin.h
index d739732dc..ddf744019 100644
--- a/tdeioslave/http/kcookiejar/kcookiewin.h
+++ b/tdeioslave/http/kcookiejar/kcookiewin.h
@@ -39,7 +39,7 @@ class KURLLabel;
 
 class KCookieDetail : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public :
     KCookieDetail( KHttpCookieList cookieList, int cookieCount, TQWidget *parent=0,
@@ -63,7 +63,7 @@ private slots:
 
 class KCookieWin : public KDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public :
     KCookieWin( TQWidget *parent, KHttpCookieList cookieList, int defaultButton=0,
diff --git a/tdeioslave/http/kcookiejar/main.cpp b/tdeioslave/http/kcookiejar/main.cpp
index 414afb41f..229cb1da2 100644
--- a/tdeioslave/http/kcookiejar/main.cpp
+++ b/tdeioslave/http/kcookiejar/main.cpp
@@ -40,7 +40,7 @@ static const TDECmdLineOptions options[] =
  TDECmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 {
    TDELocale::setMainCatalogue("tdelibs");
    TDECmdLineArgs::init(argc, argv, "kcookiejar", I18N_NOOP("HTTP cookie daemon"),
@@ -50,14 +50,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 
    TDEInstance a("kcookiejar");
    
-   kapp->dcopClient()->attach();
+   tdeApp->dcopClient()->attach();
 
    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    TQCString replyType;
    TQByteArray replyData;
    if (args->isSet("remove-all"))
    {
-      kapp->dcopClient()->call( "kded", "kcookiejar", "deleteAllCookies()", TQByteArray(), replyType, replyData);
+      tdeApp->dcopClient()->call( "kded", "kcookiejar", "deleteAllCookies()", TQByteArray(), replyType, replyData);
    }
    if (args->isSet("remove"))
    {
@@ -65,7 +65,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
       TQByteArray params;
       TQDataStream stream(params, IO_WriteOnly);
       stream << domain;
-      kapp->dcopClient()->call( "kded", "kcookiejar", "deleteCookiesFromDomain(TQString)", params, replyType, replyData);
+      tdeApp->dcopClient()->call( "kded", "kcookiejar", "deleteCookiesFromDomain(TQString)", params, replyType, replyData);
    }
    if (args->isSet("shutdown"))
    {
@@ -73,11 +73,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
       TQByteArray params;
       TQDataStream stream(params, IO_WriteOnly);
       stream << module;
-      kapp->dcopClient()->call( "kded", "kded", "unloadModule(TQCString)", params, replyType, replyData);
+      tdeApp->dcopClient()->call( "kded", "kded", "unloadModule(TQCString)", params, replyType, replyData);
    }
    else if(args->isSet("reload-config"))
    {
-      kapp->dcopClient()->call( "kded", "kcookiejar", "reloadPolicy()", TQByteArray(), replyType, replyData);
+      tdeApp->dcopClient()->call( "kded", "kcookiejar", "reloadPolicy()", TQByteArray(), replyType, replyData);
    }
    else
    {
@@ -85,7 +85,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
       TQByteArray params;
       TQDataStream stream(params, IO_WriteOnly);
       stream << module;
-      kapp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", params, replyType, replyData);
+      tdeApp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", params, replyType, replyData);
    }
 
    return 0;
diff --git a/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
index 9d720d6c4..29c808abb 100644
--- a/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
+++ b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "../kcookiejar.cpp"