Merge branch 'master' into bug/3014/krfbbug/3014/krfb

69 files changed, 243 insertions, 1076 deletions

diff --git a/kopete/protocols/gadu/CMakeLists.txt b/kopete/protocols/gadu/CMakeLists.txt
index bb5326d4..9d349a82 100644
--- a/kopete/protocols/gadu/CMakeLists.txt
+++ b/kopete/protocols/gadu/CMakeLists.txt
@@ -32,7 +32,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kopete_gadu.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kopete_gadu.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
 
 
 ##### kopete_gadu (module) ######################
diff --git a/kopete/protocols/gadu/kopete_gadu.desktop b/kopete/protocols/gadu/kopete_gadu.desktop
index a232d492..350a12d1 100644
--- a/kopete/protocols/gadu/kopete_gadu.desktop
+++ b/kopete/protocols/gadu/kopete_gadu.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Service
-X-Kopete-Version=1000900
 Icon=gadu_protocol
 X-TDE-ServiceTypes=Kopete/Protocol
+X-Kopete-Version=1000900
+
 X-Kopete-Messaging-Protocol=messaging/gadu
 X-TDE-Library=kopete_gadu
 X-TDE-PluginInfo-Author=Grzegorz Jaskiewicz
@@ -14,65 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=Gadu-Gadu
-Name[fa]=Gadu-Gadu‌
-Name[hi]=गडू-गडू
-Name[ne]=गादु-गादु
-Name[tr]=Gadu Gadu
+
 Comment=Protocol to connect to Gadu-Gadu
-Comment[ar]=البرتوكول سيتصل بـ Gadu-Gadu
-Comment[be]=Пратакол Gadu-Gadu
-Comment[bg]=Протокол за връзка с Gadu-Gadu
-Comment[bn]=Gadu-Gadu-তে সংযোগ করতে প্রোটোকল
-Comment[br]=Komenad kevreañ ouzh Gadu-Gadu
-Comment[bs]=Gadu-Gadu protokol
-Comment[ca]=Protocol per a connectar-se a Gadu-Gadu
-Comment[cs]=Protokol k připojení ke Gadu-Gadu
-Comment[cy]=Protocol i gysylltu â Gadu-Gadu
-Comment[da]=Protokol til at forbinde til Gadu-Gadu
-Comment[de]=Protokoll zur Verbindung mit Gadu-Gadu
-Comment[el]=Πρωτόκολλο για σύνδεση στο Gadu-Gadu
-Comment[es]=Protocolo de conexión a Gadu-Gadu
-Comment[et]=Protokoll ühendumiseks Gadu-Gaduga
-Comment[eu]=Gadu-Gadu-ra konektatzeko protokoloa
-Comment[fa]=قرارداد برای اتصال Gadu-Gadu‌
-Comment[fi]=Yhteyskäytäntö Gadu-Gadu-verkkoon kytkeytymiseen
-Comment[fr]=Protocole pour se connecter sur Gadu-Gadu
-Comment[ga]=Prótacal chun ceangal le Gadu-Gadu
-Comment[gl]=Protocolo para conectarse a Gadu-Gadu
-Comment[he]=פרוטוקול התחברות ל- Gadu-Gadu
-Comment[hi]=गडू-गडू से जुड़ने का प्रोटोकॉल
-Comment[hr]=Protokol za povezivanje na Gadu-Gadu
-Comment[hu]=Protokoll a Gadu-Gadu használatához
-Comment[is]=Samskiptamáti til að tengjast Gadu-Gadu
-Comment[it]=Protocollo per connessione a Gadu-Gadu
-Comment[ja]=Gadu-Gadu に接続するプロトコル
-Comment[ka]=Gadu-Gadu-სთან დაკავშირების ოქმი
-Comment[kk]=Gadu-Gadu-ға қосылу протоколы
-Comment[km]=ពិធីការ​​ភ្ជាប់​ទៅ Gadu-Gadu​
-Comment[lt]=Protokolas prisijungimui prie Gadu-Gadu
-Comment[mk]=Протокол за поврзување на Gadu-Gadu
-Comment[nb]=Protokoll for å koble til Gadu-Gadu
-Comment[nds]=Protokoll för't Tokoppeln na Gadu-Gadu
-Comment[ne]=गादु-गादुमा जडान गर्ने प्रोटोकल
-Comment[nl]=Protocol voor Gadu-Gadu
-Comment[nn]=Protokoll for å kopla til Gadu-Gadu
-Comment[pl]=Protokół połączenia z serwerem Gadu-Gadu
-Comment[pt]=Um protocolo para se ligar ao Gadu-Gadu
-Comment[pt_BR]=Protocolo para conexão ao Gadu-Gadu
-Comment[ro]=Protocol de conectare la Gadu-Gadu
-Comment[ru]=Протокол для подключения к Gadu-Gadu
-Comment[sk]=Protokol pre pripojenie k Gadu-Gadu
-Comment[sl]=Protokol za povezavo na Gadu-Gadu
-Comment[sr]=Протокол за повезивање на Gadu-Gadu
-Comment[sr@Latn]=Protokol za povezivanje na Gadu-Gadu
-Comment[sv]=Protokoll för att ansluta till Gadu-Gadu
-Comment[ta]=Gadu-Gadu உடன் இணைக்க விதிமுறை
-Comment[tg]=Қарордоди пайвастшавӣ ба Gadu-Gadu
-Comment[tr]=Gadu Gadu'ya bağlantı iletişim kuralı
-Comment[uk]=Протокол для з'єднання з Gadu-Gadu
-Comment[uz]=Gadu-Gadu bilan aloqa oʻrnatish uchun protokol
-Comment[uz@cyrillic]=Gadu-Gadu билан алоқа ўрнатиш учун протокол
-Comment[zh_CN]=连接到 Gadu-Gadu 协议
-Comment[zh_HK]=用來連接至 Gadu-Gadu 的通訊協定
-Comment[zh_TW]=連線到 Gadu-Gadu 的協定
diff --git a/kopete/protocols/groupwise/CMakeLists.txt b/kopete/protocols/groupwise/CMakeLists.txt
index c6df3323..c129ffe8 100644
--- a/kopete/protocols/groupwise/CMakeLists.txt
+++ b/kopete/protocols/groupwise/CMakeLists.txt
@@ -9,6 +9,11 @@
 #
 #################################################
 
+if( NOT TQCA_FOUND )
+  set( TQCA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libgroupwise/qca/src )
+  set( TQCA_LIBRARIES "groupwise_tqca-static" )
+endif( )
+
 add_subdirectory( icons )
 add_subdirectory( libgroupwise )
 add_subdirectory( ui )
@@ -18,12 +23,12 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}/ui
   ${CMAKE_CURRENT_SOURCE_DIR}/libgroupwise
   ${CMAKE_CURRENT_SOURCE_DIR}/libgroupwise/tasks
-  ${CMAKE_CURRENT_SOURCE_DIR}/libgroupwise/qca/src
   ${CMAKE_CURRENT_SOURCE_DIR}/ui
   ${CMAKE_SOURCE_DIR}/kopete/libkopete
   ${CMAKE_SOURCE_DIR}/kopete/libkopete/ui
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )
 
 link_directories(
@@ -33,7 +38,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kopete_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kopete_groupwise.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
+
 install( FILES gwchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_groupwise )
 
 
@@ -45,6 +55,6 @@ tde_add_kpart( kopete_groupwise AUTOMOC
     gwconnector.cpp gwmessagemanager.cpp gwcontactlist.cpp
   LINK
     kopetegroupwiseui-static groupwise-static groupwise_tasks-static
-    groupwise_qca-static kopete-shared
+    ${TQCA_LIBRARIES} kopete-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index f102b3f9..b98d5911 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -43,7 +43,7 @@
 #include <kopeteview.h>
 
 #include "client.h"
-#include <qca.h>
+#include <tqca.h>
 #include "gwcontact.h"
 #include "gwcontactlist.h"
 #include "gwprotocol.h"
diff --git a/kopete/protocols/groupwise/kopete_groupwise.desktop b/kopete/protocols/groupwise/kopete_groupwise.desktop
index aadcbc68..7a608ace 100644
--- a/kopete/protocols/groupwise/kopete_groupwise.desktop
+++ b/kopete/protocols/groupwise/kopete_groupwise.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Service
-X-Kopete-Version=1000900
 Icon=groupwise_protocol
 X-TDE-ServiceTypes=Kopete/Protocol
+X-Kopete-Version=1000900
+
 X-TDE-Library=kopete_groupwise
 X-Kopete-Messaging-Protocol=messaging/groupwise
 X-TDE-PluginInfo-Author=Will Stephenson
@@ -14,47 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=GroupWise
-Name[bn]=গ্রুপ-ওয়াইজ
-Name[fa]=گروه هوشیار
-Name[ne]=समूहगत
-Name[ta]=குழு படி
-Name[tr]=Akıllı Gruplama
+
 Comment=Novell GroupWise Messenger
-Comment[bn]=নোভেল গ্রুপ-ওয়াইজ বার্তাবাহক
-Comment[cs]=Novell GroupWise komunikátor
-Comment[de]=Novell GroupWise-Nachrichtendienst
-Comment[es]=Mensajería GroupWise de Novell
-Comment[fa]=پیام‌رسان GroupWise ناول
-Comment[fi]=Novell GroupWise -viestijä
-Comment[fr]=Messagerie GroupWise Novell
-Comment[he]=תוכנת המסרים של נובל GroupWise
-Comment[is]=Novell GroupWise skilaboðaþjónustan
-Comment[it]=Messaggistica per GroupWise di Novell
-Comment[ja]=Novell GroupWise メッセンジャー
-Comment[ka]= Novell GroupWise მყისიერი შეტყობინებების მაცნე
-Comment[kk]=Novell GroupWise хабарласуы
-Comment[km]=កម្មវិធី​ផ្ញើ​សារ​របស់​ណូវែល - GroupWise
-Comment[lt]=Novell GroupWise žinučių klientas
-Comment[mk]=Гласник за Novell GroupWise 
-Comment[nb]=Novell GroupWise meldingsprogram
-Comment[nds]=Novell GroupWise-Kortnarichtendeenst
-Comment[ne]=नोभेल समूहगत मेसेन्जर
-Comment[nl]=Protocol voor Novell GroupWise Messenger
-Comment[nn]=Lynmeldingsprogrammet Novell GroupWise
-Comment[pl]=Komunikator Novell GroupWise
-Comment[pt_BR]=Mensageiro do GroupWise da Novell
-Comment[ru]=Программа обмена сообщениями Novell GroupWise
-Comment[se]=Novell GroupWise-šleađgadieđáhusprográmma
-Comment[sl]=Sporočilnik za Novell GroupWise
-Comment[sr]=Novell-ов гласник GroupWise
-Comment[sr@Latn]=Novell-ov glasnik GroupWise
-Comment[sv]=Novell GroupWise-meddelandeklient
-Comment[ta]=Novell GroupWise உடனடி தூதர்
-Comment[tg]=Пайёмбари Novell GroupWise 
-Comment[tr]=Novell Akıllı Grup İletişimi
-Comment[uk]=Програма обміну повідомленнями Novell GroupWise
-Comment[uz]=Novell GroupWise mesenjer
-Comment[uz@cyrillic]=Novell GroupWise месенжер
-Comment[zh_CN]=Novell GroupWise 信使
-Comment[zh_TW]=Novell GroupWise 即時訊息
diff --git a/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt b/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
index ef158cd9..7fb622e1 100644
--- a/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
+++ b/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
@@ -9,7 +9,9 @@
 #
 #################################################
 
-add_subdirectory( qca )
+if( NOT TQCA_FOUND )
+  add_subdirectory( qca )
+endif( )
 add_subdirectory( tasks )
 
 # add_definitions(
@@ -19,10 +21,10 @@ add_subdirectory( tasks )
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/qca/src
   ${CMAKE_SOURCE_DIR}/kopete/libkopete
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )
 
 
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
index 67d22462..0c395159 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -21,7 +21,7 @@
 
 //#include <tqtextstream.h>
 //#include <tqguardedptr.h>
-// #include <qca.h>
+// #include <tqca.h>
 // #include <stdlib.h>
 // #include "bytestream.h"
 // #include "base64.h"
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
index c7166ffe..c63868f7 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
@@ -20,7 +20,7 @@
 #ifndef GW_CLIENTSTREAM_H
 #define GW_CLIENTSTREAM_H
 
-#include <qca.h>
+#include <tqca.h>
 
 #include "gwfield.h"
 #include "stream.h"
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt b/kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt
index 9c74e339..c14c9761 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt
@@ -15,8 +15,8 @@ include_directories(
 )
 
 
-##### groupwise_qca (static) ####################
+##### groupwise_tqca (static) ###################
 
-tde_add_library( groupwise_qca STATIC_PIC AUTOMOC
-  SOURCES qca.cpp
+tde_add_library( groupwise_tqca STATIC_PIC AUTOMOC
+  SOURCES tqca.cpp
 )
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
index e9a361d9..4441fe33 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
@@ -1,8 +1,8 @@
 METASOURCES = AUTO
 
-noinst_LTLIBRARIES = libqca.la
+noinst_LTLIBRARIES = libtqca.la
 INCLUDES = $(all_includes)
 
-libqca_la_SOURCES = \
-	qca.cpp
-# libqca_la_LIBADD = -lqt-mt
+libtqca_la_SOURCES = \
+	tqca.cpp
+# libtqca_la_LIBADD = -lqt-mt
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/tqca.cpp
index 3981964a..5656addf 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/tqca.cpp
@@ -1,5 +1,5 @@
 /*
- * qca.cpp - TQt Cryptographic Architecture
+ * tqca.cpp - TQt Cryptographic Architecture
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
@@ -18,7 +18,7 @@
  *
  */
 
-#include "qca.h"
+#include "tqca.h"
 
 #include <tqptrlist.h>
 #include <tqdir.h>
@@ -30,7 +30,7 @@
 #include <tqapplication.h>
 #include <tqguardedptr.h>
 #include <stdlib.h>
-#include "qcaprovider.h"
+#include "tqcaprovider.h"
 
 #if defined(Q_OS_WIN32)
 #define PLUGIN_EXT "dll"
@@ -1483,4 +1483,4 @@ TQByteArray SASL::readOutgoing()
 	return a;
 }
 
-#include "qca.moc"
+#include "tqca.moc"
diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.h b/kopete/protocols/groupwise/libgroupwise/qca/src/tqca.h
index 7a8a3af4..701aeb31 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qca.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/tqca.h
@@ -1,5 +1,5 @@
 /*
- * qca.h - TQt Cryptographic Architecture
+ * tqca.h - TQt Cryptographic Architecture
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h b/kopete/protocols/groupwise/libgroupwise/qca/src/tqcaprovider.h
index b0e5385a..f88d1b4f 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/tqcaprovider.h
@@ -1,5 +1,5 @@
 /*
- * qcaprovider.h - TQCA Plugin API
+ * tqcaprovider.h - TQCA Plugin API
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 #include <tqdatetime.h>
 #include <tqobject.h>
 #include <tqhostaddress.h>
-#include "qca.h"
+#include "tqca.h"
 
 #define TQCA_PLUGIN_VERSION 1
 
diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
index 7965e08a..372d7d9a 100644
--- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
@@ -19,7 +19,7 @@
 
 #include <tqtimer.h>
 
-#include <qca.h>
+#include <tqca.h>
 
 #include "qcatlshandler.h"
 
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc
index edeb0239..d14fb46b 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf.cc
+++ b/kopete/protocols/groupwise/libgroupwise/rtf.cc
@@ -646,9 +646,9 @@ extern int rtflex (void);
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
     
 #line 46 "rtf.ll"
 
@@ -697,7 +697,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -930,9 +930,9 @@ case YY_STATE_EOF(INITIAL):
  */
 static int yy_get_next_buffer (void)
 {
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
+    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = (yytext_ptr);
+	int number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1056,14 +1056,14 @@ static int yy_get_next_buffer (void)
 
     static yy_state_type yy_get_previous_state (void)
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
     
 	yy_current_state = (yy_start);
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			(yy_last_accepting_state) = yy_current_state;
@@ -1088,10 +1088,10 @@ static int yy_get_next_buffer (void)
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
-	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
+	int yy_is_jam;
+    	char *yy_cp = (yy_c_buf_p);
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		(yy_last_accepting_state) = yy_current_state;
@@ -1664,7 +1664,7 @@ int rtflex_destroy  (void)
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
-	register int i;
+	int i;
     	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -1673,7 +1673,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s )
 {
-	register int n;
+	int n;
     	for ( n = 0; s[n]; ++n )
 		;
 
diff --git a/kopete/protocols/groupwise/libgroupwise/securestream.h b/kopete/protocols/groupwise/libgroupwise/securestream.h
index d5b877fd..ccf916e6 100644
--- a/kopete/protocols/groupwise/libgroupwise/securestream.h
+++ b/kopete/protocols/groupwise/libgroupwise/securestream.h
@@ -21,7 +21,7 @@
 #ifndef SECURESTREAM_H
 #define SECURESTREAM_H
 
-#include <qca.h>
+#include <tqca.h>
 #include "tlshandler.h"
 #include "bytestream.h"
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt b/kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt
index 1fc4a60a..8c85f94e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt
@@ -13,9 +13,9 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/..
-  ${CMAKE_CURRENT_SOURCE_DIR}/../qca/src
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )
 
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
index f4df0b8a..a4b1fee0 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
+++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
@@ -19,7 +19,7 @@
 
 #include "gwclientstream.h"
 #include "gwconnector.h"
-#include <qca.h>
+#include <tqca.h>
 #include "tqcatlshandler.h"
 #include "requestfactory.h"
 #include "request.h"
diff --git a/kopete/protocols/groupwise/ui/CMakeLists.txt b/kopete/protocols/groupwise/ui/CMakeLists.txt
index 2045bef7..c9ea2643 100644
--- a/kopete/protocols/groupwise/ui/CMakeLists.txt
+++ b/kopete/protocols/groupwise/ui/CMakeLists.txt
@@ -12,13 +12,13 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../libgroupwise
-  ${CMAKE_CURRENT_SOURCE_DIR}/../libgroupwise/qca/src
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_BINARY_DIR}/kopete/libkopete/ui
   ${CMAKE_SOURCE_DIR}/kopete/libkopete
   ${CMAKE_SOURCE_DIR}/kopete/libkopete/ui
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )
 
 
diff --git a/kopete/protocols/irc/CMakeLists.txt b/kopete/protocols/irc/CMakeLists.txt
index 6c795704..3ff14a16 100644
--- a/kopete/protocols/irc/CMakeLists.txt
+++ b/kopete/protocols/irc/CMakeLists.txt
@@ -31,9 +31,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES
-    kopete_irc.desktop irc.protocol
-  DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kopete_irc.desktop irc.protocol
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
 
 install( FILES
     ircnetworks.xml ircchatui.rc
diff --git a/kopete/protocols/irc/kopete_irc.desktop b/kopete/protocols/irc/kopete_irc.desktop
index 8c7893f5..35412bcf 100644
--- a/kopete/protocols/irc/kopete_irc.desktop
+++ b/kopete/protocols/irc/kopete_irc.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Service
-X-Kopete-Version=1000900
 Icon=irc_protocol
 X-TDE-ServiceTypes=Kopete/Protocol
+X-Kopete-Version=1000900
+
 X-TDE-Library=kopete_irc
 X-Kopete-Messaging-Protocol=messaging/irc
 X-TDE-PluginInfo-Author=Kopete Developers
@@ -14,66 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=IRC
-Name[bn]=আই-আর-সি
-Name[hi]=आईआरसी
-Name[ne]=आइआरसी
-Comment=Protocol to connect to IRC
-Comment[ar]=البروتوكل سيتصل بـ IRC
-Comment[be]=Пратакол IRC
-Comment[bg]=Протокол за връзка с IRC
-Comment[bn]=আই-আর-সিতে সংযোগ করতে প্রোটোকল
-Comment[br]=Komenad kevreañ ouzh IRC
-Comment[bs]=IRC protokol
-Comment[ca]=Protocol per a connectar-se a l'IRC
-Comment[cs]=Protokol k připojení k IRC
-Comment[cy]=Protocol i gysylltu ag IRC
-Comment[da]=Protokol til at forbinde til IRC
-Comment[de]=Protokoll zur Verbindung mit IRC
-Comment[el]=Πρωτόκολλο για σύνδεση στο IRC
-Comment[es]=Protocolo de conexión al IRC
-Comment[et]=Protokoll ühendumiseks IRC-ga
-Comment[eu]=IRC-ra konektatzeko protokoloa
-Comment[fa]=قرار داد برای اتصال  به IRC
-Comment[fi]=Yhteyskäytänötö IRC-verkkoon kytkeytymiseen
-Comment[fr]=Protocole pour se connecter sur IRC
-Comment[ga]=Prótacal chun ceangal le IRC
-Comment[gl]=Protocolo para conectar a IRC
-Comment[he]=פרוטוקול התחברות ל- IRC
-Comment[hi]=आईआरसी से जुड़ने का प्रोटोकॉल
-Comment[hr]=Protokol za povezivanje na IRC
-Comment[hu]=Protokoll az IRC használatához
-Comment[is]=Samskiptamáti til að tengjast IRC
-Comment[it]=Protocollo per connessione a IRC
-Comment[ja]=IRC に接続するプロトコル
-Comment[ka]=IRC-თან დაკავშირების ოქმი
-Comment[kk]=IRC-ге қосылу протоколы
-Comment[km]=ពិធីការ​​ភ្ជាប់​ទៅ IRC
-Comment[lt]=Protokolas prisijungimui prie IRC
-Comment[mk]=Протокол за поврзување на IRC
-Comment[nb]=Protokoll for å koble til IRC
-Comment[nds]=Protokoll för't Tokoppeln na IRC
-Comment[ne]=आइआरसी मा जडान गर्ने प्रोटोकल
-Comment[nl]=Protocol voor Internet Relay Chat (IRC)
-Comment[nn]=Protokoll for å kopla til IRC
-Comment[pl]=Protokół połączenia z serwerem IRC
-Comment[pt]=Protocolo para ligar ao IRC
-Comment[pt_BR]=Protocolo de conexão ao IRC
-Comment[ro]=Protocol de conectare la IRC
-Comment[ru]=Протокол для подключения к IRC
-Comment[sk]=Protokol pre pripojenie k IRC
-Comment[sl]=Protokol za povezavo na IRC
-Comment[sr]=Протокол за повезивање на IRC
-Comment[sr@Latn]=Protokol za povezivanje na IRC
-Comment[sv]=Protokoll för att ansluta till IRC
-Comment[ta]=IRC உடன் இணைக்க விதிமுறை
-Comment[tg]=Қарордоди пайвастшавӣ ба IRC
-Comment[tr]=IRC'ye bağlantı iletişim kuralı
-Comment[uk]=Протокол для з'єднання з IRC
-Comment[uz]=IRC bilan aloqa oʻrnatish uchun protokol
-Comment[uz@cyrillic]=IRC билан алоқа ўрнатиш учун протокол
-Comment[wa]=Protocole po s' raloyî so les canås IRC
-Comment[zh_CN]=连接到 IRC 协议
-Comment[zh_HK]=用來連接至 IRC 的通訊協定
-Comment[zh_TW]=連線到 IRC 的協定
 
+Comment=Protocol to connect to IRC
diff --git a/kopete/protocols/jabber/CMakeLists.txt b/kopete/protocols/jabber/CMakeLists.txt
index 61202e95..571b9ba0 100644
--- a/kopete/protocols/jabber/CMakeLists.txt
+++ b/kopete/protocols/jabber/CMakeLists.txt
@@ -9,6 +9,11 @@
 #
 #################################################
 
+if( NOT TQCA_FOUND )
+  set( TQCA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libiris/qca/src )
+  set( TQCA_LIBRARIES "tqca-static" )
+endif( )
+
 add_subdirectory( ui )
 add_subdirectory( icons )
 add_subdirectory( libiris )
@@ -34,7 +39,6 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/include
   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/jabber
   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/xmpp-im
-  ${CMAKE_CURRENT_SOURCE_DIR}/libiris/qca/src
   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/util
   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/network
   ${CMAKE_CURRENT_SOURCE_DIR}/ui
@@ -44,6 +48,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )
 
 link_directories(
@@ -53,7 +58,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kopete_jabber.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kopete_jabber.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
+
 install( FILES jabberchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_jabber )
 
 
@@ -79,7 +89,7 @@ tde_add_kpart( kopete_jabber AUTOMOC
   LINK
     jabberclient-static kopetejabberui-static
     iris_jabber-static iris_xmpp_core-static iris_xmpp_im-static iris-static
-    qca-static cutestuff_network-static cutestuff_util-static ${JINGLE_LIBRARIES}
+    ${TQCA_LIBRARIES} cutestuff_network-static cutestuff_util-static ${JINGLE_LIBRARIES}
     kopete-shared idn
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index 3fa61483..dc04ec6b 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -25,7 +25,7 @@
 #include "filetransfer.h"
 #include "xmpp.h"
 #include "xmpp_tasks.h"
-#include <qca.h>
+#include <tqca.h>
 #include "bsocket.h"
 
 #include "jabberaccount.h"
diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp
index ef90323c..0bcdaebd 100644
--- a/kopete/protocols/jabber/jabberclient.cpp
+++ b/kopete/protocols/jabber/jabberclient.cpp
@@ -24,7 +24,7 @@
 #include <tqtimer.h>
 #include <tqregexp.h>
 
-#include <qca.h>
+#include <tqca.h>
 #include <bsocket.h>
 #include <filetransfer.h>
 #include <xmpp_tasks.h>
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/md5c.c b/kopete/protocols/jabber/jingle/libjingle/talk/base/md5c.c
index eb2c034d..ec40d72b 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/md5c.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/md5c.c
@@ -173,7 +173,7 @@ MD5Final(unsigned char digest[16], struct MD5Context *ctx)
 void
 MD5Transform(uint32 buf[4], uint32 const in[16])
 {
-	register uint32 a, b, c, d;
+	uint32 a, b, c, d;
 
 	a = buf[0];
 	b = buf[1];
diff --git a/kopete/protocols/jabber/kopete_jabber.desktop b/kopete/protocols/jabber/kopete_jabber.desktop
index 45552e42..19359048 100644
--- a/kopete/protocols/jabber/kopete_jabber.desktop
+++ b/kopete/protocols/jabber/kopete_jabber.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Service
-X-Kopete-Version=1000900
 Icon=jabber_protocol
 X-TDE-ServiceTypes=Kopete/Protocol
+X-Kopete-Version=1000900
+
 X-TDE-Library=kopete_jabber
 X-Kopete-Messaging-Protocol=messaging/xmpp
 X-TDE-PluginInfo-Author=Kopete Developers
@@ -14,66 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=Jabber
-Name[hi]=जैबर
-Name[ne]=ज्याबर
-Name[pa]=ਜੱਬਰ
-Name[ta]=ஜாபர்
-Comment=Protocol to connect to Jabber
-Comment[ar]=البروتوكول سيتصل بـ Jabber
-Comment[be]=Пратакол Jabber
-Comment[bg]=Протокол за връзка с Jabber
-Comment[bn]=Jabber-এ সংযোগ করতে প্রোটোকল
-Comment[br]=Komenad kevreañ ouzh Jabber
-Comment[bs]=Jabber protokol
-Comment[ca]=Protocol per a connectar-se a Jabber
-Comment[cs]=Protokol k připojení k Jabberu
-Comment[cy]=Protocol i gysylltu â Jabber
-Comment[da]=Protokol til at forbinde til Jabber
-Comment[de]=Protokoll zur Verbindung mit Jabber
-Comment[el]=Πρωτόκολλο για σύνδεση στο Jabber
-Comment[es]=Protocolo de conexión con Jabber
-Comment[et]=Protokoll ühendumiseks Jabberiga
-Comment[eu]=Jabber-era konektatzeko protokoloa
-Comment[fa]=قرارداد برای اتصال به Jabber
-Comment[fi]=Yhteyskäytäntö Jabber-verkkoon kytkeytymiseen
-Comment[fr]=Protocole pour se connecter sur Jabber
-Comment[ga]=Prótacal chun ceangal le Jabber
-Comment[gl]=Protocolo para se conectar a Jabber
-Comment[he]=פרוטוקול התחברות ל- Jabber
-Comment[hi]=जैबर से जुड़ने का प्रोटोकॉल
-Comment[hr]=Protokol za povezivanje na Jabber
-Comment[hu]=Protokoll a Jabber használatához
-Comment[is]=Samskiptamáti til að tengjast Jabber
-Comment[it]=Protocollo per connessione a Jabber
-Comment[ja]=Jabber に接続するプロトコル
-Comment[ka]=Jabberთან დაკავშირების ოქმი
-Comment[kk]=Jabber-ге қосылу протоколы
-Comment[km]=ពិធីការ​ភ្ជាប់​ទៅ Jabber
-Comment[lt]=Protokolas prisijungimui prie Jabber
-Comment[mk]=Протокол за поврзување на Jabber
-Comment[nb]=Protokoll for å koble til Jabber
-Comment[nds]=Protokoll för't Tokoppeln na Jabber
-Comment[ne]=ज्याबरमा जडान गर्ने प्रोटोकल
-Comment[nl]=Protocol voor Jabber
-Comment[nn]=Protokoll for å kopla til Jabber
-Comment[pl]=Protokół połączenia z serwerem Jabbera
-Comment[pt]=Um protocolo para se ligar ao Jabber
-Comment[pt_BR]=Protocolo para conexão ao Jabber
-Comment[ro]=Protocol de conectare la Jabber
-Comment[ru]=Протокол для подключения к Jabber
-Comment[sk]=Protokol pre pripojenie k Jabber
-Comment[sl]=Protokol za povezavo na Jabber
-Comment[sr]=Протокол за повезивање на Jabber
-Comment[sr@Latn]=Protokol za povezivanje na Jabber
-Comment[sv]=Protokoll för att ansluta till Jabber
-Comment[ta]=ஜாபருடன் இணைக்க விதிமுறை
-Comment[tg]=Қарордоди пайвастшавӣ ба Jabber
-Comment[tr]=Jabber'e bağlantı iletişim kuralı
-Comment[uk]=Протокол для з'єднання з Jabber
-Comment[uz]=Jabber uchun protokol
-Comment[uz@cyrillic]=Jabber учун протокол
-Comment[zh_CN]=连接到 Jabber 协议
-Comment[zh_HK]=用來連接至 Jabber 的通訊協定
-Comment[zh_TW]=連到 Jabber 的協定
 
+Comment=Protocol to connect to Jabber
diff --git a/kopete/protocols/jabber/libiris/CMakeLists.txt b/kopete/protocols/jabber/libiris/CMakeLists.txt
index 6c649aa5..0f18fa52 100644
--- a/kopete/protocols/jabber/libiris/CMakeLists.txt
+++ b/kopete/protocols/jabber/libiris/CMakeLists.txt
@@ -10,5 +10,7 @@
 #################################################
 
 add_subdirectory( iris )
-add_subdirectory( qca )
+if( NOT TQCA_FOUND )
+  add_subdirectory( qca )
+endif( )
 add_subdirectory( cutestuff )
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt b/kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt
index 151dd407..22e517fc 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt
@@ -12,9 +12,9 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../util
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../qca/src
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )
 
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
index 5e900119..ed211ac5 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
@@ -24,7 +24,7 @@
 #include <tqurl.h>
 #include <tqtimer.h>
 #include <tqguardedptr.h>
-#include <qca.h>
+#include <tqca.h>
 #include <stdlib.h>
 #include "bsocket.h"
 #include "base64.h"
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/CMakeLists.txt b/kopete/protocols/jabber/libiris/iris/jabber/CMakeLists.txt
index fc694180..2739cbee 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/CMakeLists.txt
+++ b/kopete/protocols/jabber/libiris/iris/jabber/CMakeLists.txt
@@ -16,10 +16,10 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/../xmpp-core
   ${CMAKE_CURRENT_SOURCE_DIR}/../../cutestuff/util
   ${CMAKE_CURRENT_SOURCE_DIR}/../../cutestuff/network
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../qca/src
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )
 
 
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
index 4170897c..7cbf759a 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
@@ -25,7 +25,7 @@
 #include <tqtimer.h>
 #include <tqguardedptr.h>
 #include <stdlib.h>
-#include <qca.h>
+#include <tqca.h>
 #include "xmpp_xmlcommon.h"
 #include "../xmpp-core/hash.h"
 #include "socks.h"
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/CMakeLists.txt b/kopete/protocols/jabber/libiris/iris/xmpp-core/CMakeLists.txt
index 4361f30e..78aeea48 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/CMakeLists.txt
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/CMakeLists.txt
@@ -12,11 +12,11 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../include
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../qca/src
   ${CMAKE_CURRENT_SOURCE_DIR}/../../cutestuff/util
   ${CMAKE_CURRENT_SOURCE_DIR}/../../cutestuff/network
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )
 
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
index be32bda6..a27811ec 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
@@ -32,7 +32,7 @@
 #include "xmpp.h"
 
 #include <tqguardedptr.h>
-#include <qca.h>
+#include <tqca.h>
 #include "safedelete.h"
 
 #ifdef NO_NDNS
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.h
index d91767ce..99b8c7f6 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.h
@@ -21,7 +21,7 @@
 #ifndef HASH_H
 #define HASH_H
 
-#include <qcaprovider.h>
+#include <tqcaprovider.h>
 
 namespace XMPP
 {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
index f9328436..4f9533bc 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
@@ -25,7 +25,7 @@
 
 #include "protocol.h"
 
-#include <qca.h>
+#include <tqca.h>
 #include "base64.h"
 #include "hash.h"
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
index 4d60e3d3..ac4f60b6 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
@@ -21,7 +21,7 @@
 #ifndef SECURESTREAM_H
 #define SECURESTREAM_H
 
-#include <qca.h>
+#include <tqca.h>
 #include "bytestream.h"
 
 #define USE_TLSHANDLER
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
index ca55c72a..1bd4f715 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <tqvaluelist.h>
-#include <qca.h>
+#include <tqca.h>
 #include <stdlib.h>
 #include "base64.h"
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.h
index 3c888362..dc4bd64b 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.h
@@ -21,7 +21,7 @@
 #ifndef SIMPLESASL_H
 #define SIMPLESASL_H
 
-#include <qcaprovider.h>
+#include <tqcaprovider.h>
 
 namespace XMPP
 {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
index f8652b35..e0d09d8e 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -47,7 +47,7 @@
 #include <tqtextstream.h>
 #include <tqguardedptr.h>
 #include <tqtimer.h>
-#include <qca.h>
+#include <tqca.h>
 #include <stdlib.h>
 #include "bytestream.h"
 #include "base64.h"
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
index ea613b75..86092bad 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
@@ -21,7 +21,7 @@
 #include "xmpp.h"
 
 #include <tqtimer.h>
-#include <qca.h>
+#include <tqca.h>
 
 using namespace XMPP;
 
diff --git a/kopete/protocols/jabber/libiris/qca/src/CMakeLists.txt b/kopete/protocols/jabber/libiris/qca/src/CMakeLists.txt
index 46de2435..162ecffa 100644
--- a/kopete/protocols/jabber/libiris/qca/src/CMakeLists.txt
+++ b/kopete/protocols/jabber/libiris/qca/src/CMakeLists.txt
@@ -15,8 +15,8 @@ include_directories(
 )
 
 
-##### qca (static) ##############################
+##### tqca (static) #############################
 
-tde_add_library( qca STATIC_PIC AUTOMOC
-  SOURCES qca.cpp
+tde_add_library( tqca STATIC_PIC AUTOMOC
+  SOURCES tqca.cpp
 )
diff --git a/kopete/protocols/jabber/libiris/qca/src/Makefile.am b/kopete/protocols/jabber/libiris/qca/src/Makefile.am
index b43d303e..8c3c80d8 100644
--- a/kopete/protocols/jabber/libiris/qca/src/Makefile.am
+++ b/kopete/protocols/jabber/libiris/qca/src/Makefile.am
@@ -1,7 +1,7 @@
 METASOURCES = AUTO
 
-noinst_LTLIBRARIES = libqca.la
+noinst_LTLIBRARIES = libtqca.la
 INCLUDES = $(all_includes)
 
-libqca_la_SOURCES = \
-	qca.cpp
+libtqca_la_SOURCES = \
+	tqca.cpp
diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.cpp b/kopete/protocols/jabber/libiris/qca/src/tqca.cpp
index 89df0bb0..a4e8ab11 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qca.cpp
+++ b/kopete/protocols/jabber/libiris/qca/src/tqca.cpp
@@ -1,5 +1,5 @@
 /*
- * qca.cpp - TQt Cryptographic Architecture
+ * tqca.cpp - TQt Cryptographic Architecture
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
@@ -18,7 +18,7 @@
  *
  */
 
-#include "qca.h"
+#include "tqca.h"
 
 #include <tqptrlist.h>
 #include <tqdir.h>
@@ -30,7 +30,7 @@
 #include <tqapplication.h>
 #include <tqguardedptr.h>
 #include <stdlib.h>
-#include "qcaprovider.h"
+#include "tqcaprovider.h"
 
 #if defined(Q_OS_WIN32)
 #define PLUGIN_EXT "dll"
@@ -1478,4 +1478,4 @@ TQByteArray SASL::readOutgoing()
 	return a;
 }
 
-#include "qca.moc"
+#include "tqca.moc"
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h b/kopete/protocols/jabber/libiris/qca/src/tqca.h
index 7a8a3af4..701aeb31 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
+++ b/kopete/protocols/jabber/libiris/qca/src/tqca.h
@@ -1,5 +1,5 @@
 /*
- * qca.h - TQt Cryptographic Architecture
+ * tqca.h - TQt Cryptographic Architecture
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
diff --git a/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h b/kopete/protocols/jabber/libiris/qca/src/tqcaprovider.h
index b0e5385a..f88d1b4f 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h
+++ b/kopete/protocols/jabber/libiris/qca/src/tqcaprovider.h
@@ -1,5 +1,5 @@
 /*
- * qcaprovider.h - TQCA Plugin API
+ * tqcaprovider.h - TQCA Plugin API
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 #include <tqdatetime.h>
 #include <tqobject.h>
 #include <tqhostaddress.h>
-#include "qca.h"
+#include "tqca.h"
 
 #define TQCA_PLUGIN_VERSION 1
 
diff --git a/kopete/protocols/jabber/tdeioslave/CMakeLists.txt b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt
index 4736203b..4f612b99 100644
--- a/kopete/protocols/jabber/tdeioslave/CMakeLists.txt
+++ b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt
@@ -27,7 +27,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES jabberdisco.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE jabberdisco.protocol
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
 
 
 ##### tdeio_jabberdisco (module) ##################
@@ -37,6 +41,6 @@ tde_add_kpart( tdeio_jabberdisco AUTOMOC
   LINK
     jabberclient-static
     iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
-    qca-static cutestuff_network-static cutestuff_util-static tdeio-shared idn
+    ${TQCA_LIBRARIES} cutestuff_network-static cutestuff_util-static tdeio-shared idn
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol
index 48466876..ed3a9deb 100644
--- a/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol
@@ -9,45 +9,5 @@ makedir=false
 linking=false
 moving=false
 Icon=remote
+
 Description=A TDEIO slave for Jabber Service Discovery
-Description[be]=Модуль tdeioslave для пошуку сервісаў Jabber
-Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ
-Description[bs]=TDEIO slave za otkrivanje Jabber servisa
-Description[ca]=Un esclau TDEIO pel servei de de descoberta del Jabber
-Description[cs]=Pomocný protokol pro zjišťování služeb Jabber
-Description[da]=En tdeioslave til at opdage jabber service
-Description[de]=Ein Ein-/Ausgabemodul zum Auffinden von Jabber-Diensten
-Description[el]=Ένα tdeioslave για την ανίχνευση υπηρεσίας Jabber
-Description[es]=Un «tdeioslave» para el servicio de descubrimiento jabber
-Description[et]=Jabberi teenuste tuvastamise TDEIO-moodul
-Description[eu]=Jabber aurkikuntza zerbitzureako TDEIO morroi bat
-Description[fa]=یک پیرو TDEIO برای خدمت اکتشافی Jabber
-Description[fr]=Un module d'entrée / sortie pour la recherche de service Jabber
-Description[gl]=Un TDEIO slave para Jabber Service Discovery
-Description[hu]=TDE-protokoll a Jabber szolgáltatáskereső használatához
-Description[is]=tdeioslave fyrir Jabber þjónustu uppgötvun
-Description[it]=Un TDEIO slave per il servizio di discovery per Jabber
-Description[ja]=Jabber Service Discovery の TDEIO スレーブ
-Description[ka]=TDEIO slave Jabber სერვისის დირექტორიისთვის
-Description[kk]=Jabber қызметін байқау TDEIO slave қызметі
-Description[km]=TDEIO slave មួយ​សម្រាប់​របក​គំហើញ​សេវា Jabber
-Description[lt]=Priedas (tdeioslave) FISH protokolui
-Description[nb]=En tdeioslave for Jabber tjenestesøk
-Description[nds]=En In-/Utgaavmoduul för't Finnen vun Jabber-Deensten
-Description[ne]=ज्याबर सेवा खोजीका लागि कियो स्लाभ
-Description[nl]=Een tdeioslave voor Jabber Service Discovery
-Description[nn]=Ein TDEIO-slave for Jabber-tenesteoppdaging
-Description[pl]=Wtyczka protokołu TDEIO dla usługi odkrywania usług Jabbera (Jabber Service Discovery)
-Description[pt]=Um 'tdeioslave' para a Descoberta de Serviços do Jabber
-Description[pt_BR]=Um TDEIO-Slave para a descoberta de serviço do Jabber
-Description[ru]=Обработчик TDEIO для обнаружения служб Jabber
-Description[sk]=TDEIO otrok pre Jabber Service Discovery
-Description[sl]=TDEIO slave za odkrivanje storitev za Jabber
-Description[sr]=TDEIO слуга за Jabber Service Discovery
-Description[sr@Latn]=TDEIO sluga za Jabber Service Discovery
-Description[sv]=En I/O-slav för Jabber tjänstupptäckt
-Description[tr]=Jabber Servis Bulucu için KIOSlave
-Description[uk]=Підлеглий В/В для виявлення служби Jabber
-Description[zh_CN]=Jabber 服务发现的 TDEIO slave
-Description[zh_HK]=用於發現 Jabber 服務的 TDEIO slave
-Description[zh_TW]=Jabber 服務的 tdeioslave
diff --git a/kopete/protocols/jabber/ui/CMakeLists.txt b/kopete/protocols/jabber/ui/CMakeLists.txt
index a4488d62..0493c9ee 100644
--- a/kopete/protocols/jabber/ui/CMakeLists.txt
+++ b/kopete/protocols/jabber/ui/CMakeLists.txt
@@ -16,13 +16,13 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/jabber
   ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/xmpp-im
-  ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/qca/src
   ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/cutestuff/util
   ${CMAKE_CURRENT_SOURCE_DIR}/../../../libkopete
   ${CMAKE_CURRENT_SOURCE_DIR}/../../../libkopete/ui
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TQCA_INCLUDE_DIR}
 )
 
 
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
index 753636e0..a75e206e 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
@@ -33,7 +33,7 @@
 #include <tqtimer.h>
 #include <tqregexp.h>
 
-#include <qca.h>
+#include <tqca.h>
 #include "xmpp.h"
 #include "xmpp_tasks.h"
 
diff --git a/kopete/protocols/meanwhile/CMakeLists.txt b/kopete/protocols/meanwhile/CMakeLists.txt
index 198dfaac..91c7cabd 100644
--- a/kopete/protocols/meanwhile/CMakeLists.txt
+++ b/kopete/protocols/meanwhile/CMakeLists.txt
@@ -32,7 +32,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kopete_meanwhile.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kopete_meanwhile.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
 
 
 ##### kopete_meanwhile (module) #######################
diff --git a/kopete/protocols/meanwhile/kopete_meanwhile.desktop b/kopete/protocols/meanwhile/kopete_meanwhile.desktop
index 49ae69fb..ec556e3e 100644
--- a/kopete/protocols/meanwhile/kopete_meanwhile.desktop
+++ b/kopete/protocols/meanwhile/kopete_meanwhile.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Service
-X-Kopete-Version=1000900
 Icon=meanwhile_protocol
 X-TDE-ServiceTypes=Kopete/Protocol
+X-Kopete-Version=1000900
+
 X-TDE-Library=kopete_meanwhile
 X-Kopete-Messaging-Protocol=messaging/meanwhile
 X-TDE-PluginInfo-Author=Jeremy Kerr
@@ -14,45 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=Meanwhile
-Name[is]=Á meðan
-Name[mk]=Во меѓувреме
-Name[nb]=Imens
-Name[ne]=उक्त अवधि
-Name[sk]=Medzitým
-Name[ta]=இடைப்பட்ட பொழுதில்
+
 Comment=Meanwhile (Lotus Sametime) Protocol
-Comment[bg]=Протокол с Meanwhile (Lotus Sametime)
-Comment[ca]=Protocol Meanwhile (Lotus Sametime)
-Comment[cs]=Meanwhile (Lotus Sametime) protokol
-Comment[da]=Meanwhile-protokol (Lotus Sametime)
-Comment[de]=Meanwhile-Protokoll (Lotus Sametime)
-Comment[el]=Πρωτόκολλο Meanwhile (Lotus Sametime)
-Comment[es]=Protocolo Meanwhile (Lotus Sametime)
-Comment[et]=Meanwhile (Lotus Sametime) protokoll
-Comment[fa]=قرارداد Meanwhile‌ (گاهی لوتوس)
-Comment[fr]=Protocole Meanwhile (Lotus Sametime)
-Comment[he]=פרוטוקול Meanwhile
-Comment[hu]=Protokoll a Meanwhile (Lotus Sametime) használatához
-Comment[is]="Meanwhile" (Lotus Sametimr) samskipturegla
-Comment[it]=Protocollo Meanwhile (Lotus Sametime)
-Comment[ja]=Meanwhile (Lotus Sametime) プロトコル
-Comment[km]=ពីធីការ Meanwhile (Lotus Sametime)
-Comment[lt]=Meanwhile (Lotus Sametime) protokolas
-Comment[nb]=Programtillegg for Meanwhile-protokoll (Lotus Sametime)
-Comment[nds]=Meanwhile-Protokoll (Lotus Sametime)
-Comment[ne]=उक्त समयको (उही समयको लोटस) प्रोटोकल
-Comment[nl]=Procotol voor Meanwhile (Lotus Sametime)
-Comment[pl]=Protokół Meanwhile (Lotus Sametime)
-Comment[pt]=Protocolo Meanwhile (Lotus Sametime)
-Comment[pt_BR]=Protocolo Meanwhile (Lotus Sametime)
-Comment[ru]=Протокол Meanwhile (Lotus Sametime)
-Comment[sk]=Meanwhile (Lotus Sametime) Protokol
-Comment[sl]=Protokol Meanwhile (Lotus Sametime)
-Comment[sr]=Протокол Meanwhile (Lotus Sametime)
-Comment[sr@Latn]=Protokol Meanwhile (Lotus Sametime)
-Comment[sv]=Meanwhile-protokoll (Lotus Sametime)
-Comment[tr]=Meanwhile Protokolü
-Comment[uk]=Протокол Meanwhile (Lotus Sametime)
-Comment[zh_CN]=Meanwhile (Lotus Sametime) 协议
-Comment[zh_TW]=Meanwhile （Lotus Sametime）協定外掛程式
diff --git a/kopete/protocols/msn/CMakeLists.txt b/kopete/protocols/msn/CMakeLists.txt
index f38683d8..04fe35e2 100644
--- a/kopete/protocols/msn/CMakeLists.txt
+++ b/kopete/protocols/msn/CMakeLists.txt
@@ -40,7 +40,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kopete_msn.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kopete_msn.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
+
 install( FILES msnchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_msn )
 
 
diff --git a/kopete/protocols/msn/config/CMakeLists.txt b/kopete/protocols/msn/config/CMakeLists.txt
index d9fd401b..5a32cc1c 100644
--- a/kopete/protocols/msn/config/CMakeLists.txt
+++ b/kopete/protocols/msn/config/CMakeLists.txt
@@ -23,9 +23,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES
-    kopete_msn_config.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
+tde_create_translated_desktop(
+  SOURCE kopete_msn_config.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog
+  PO_DIR kopete-desktops
+)
 
 
 ##### kcm_kopete_msn (module) ###################
diff --git a/kopete/protocols/msn/config/kopete_msn_config.desktop b/kopete/protocols/msn/config/kopete_msn_config.desktop
index 4754ae1f..3d06e7f9 100644
--- a/kopete/protocols/msn/config/kopete_msn_config.desktop
+++ b/kopete/protocols/msn/config/kopete_msn_config.desktop
@@ -10,114 +10,5 @@ X-TDE-ParentApp=kopete_msn
 X-TDE-ParentComponents=kopete_msn
 
 Name=MSN Plugin
-Name[ar]=توصيلة MSN
-Name[be]=Модуль MSN
-Name[bg]=MSN
-Name[bn]=এমএসএন প্লাগিন
-Name[br]=Lugent MSN
-Name[bs]=MSN dodatak
-Name[ca]=Connector de MSN
-Name[cs]=MSN modul
-Name[cy]=Ategyn MSN
-Name[da]=MSN-Plugin
-Name[de]=MSN-Modul
-Name[el]=Πρόσθετο MSN
-Name[es]=Complemento de MSN
-Name[et]=MSN plugin
-Name[eu]=MSN Plugin-a
-Name[fa]=وصلۀ ام‌اس‌ان
-Name[fi]=MSN-liitännäinen
-Name[fr]=Module MSN
-Name[ga]=Breiseán MSN
-Name[gl]=Plugin para MSN
-Name[he]=תוסף MSN
-Name[hi]=एमएसएन प्लगइन
-Name[hr]=MSN umetak
-Name[hu]=MSN modul
-Name[is]=MSN íforrit
-Name[it]=Plugin MSN
-Name[ja]=MSN プラグイン
-Name[ka]=MSN მოდული
-Name[kk]=MSN плагин модулі
-Name[km]=កម្មវិធី​ជំនួយ MSN
-Name[lt]=MSN įskiepis
-Name[mk]=MSN-приклучок
-Name[nb]=MSN programtillegg
-Name[nds]=MSN-Moduul
-Name[ne]=एमएसएन प्लगइन
-Name[nl]=MSN-plugin
-Name[nn]=MSN-programtillegg
-Name[pa]=MSN ਪਲੱਗਇਨ
-Name[pl]=Wtyczka MSN
-Name[pt]='Plugin' MSN
-Name[pt_BR]=Plug-in MSN
-Name[ro]=Modul MSN
-Name[ru]=Модуль MSN
-Name[se]=MSN-lassemoduvla
-Name[sk]=Modul MSN
-Name[sl]=Vstavek za MSN
-Name[sr]=MSN прикључак
-Name[sr@Latn]=MSN priključak
-Name[sv]=MSN-insticksprogram
-Name[ta]=MSN செருகல்
-Name[tg]=Модули MSN
-Name[tr]=MSN Eklentisi
-Name[uk]=Втулок MSN
-Name[uz]=MSN plagini
-Name[uz@cyrillic]=MSN плагини
-Name[wa]=Tchôke-divins MSN
-Name[zh_CN]=MSN 插件
-Name[zh_HK]=MSN 插件
-Name[zh_TW]=MSN 外掛程式
-Comment=Microsoft Network Protocol
-Comment[ar]=بروتوكول شبكة Microsoft
-Comment[be]=Пратакол сеткі Microsoft Network
-Comment[bg]=Протокол за връзка с Microsoft Network
-Comment[bn]=মাইক্রোসফ্ট নেটওয়ার্ক প্রোটোকল
-Comment[br]=Komenad rouedad Microsoft
-Comment[bs]=Microsoft Network protokol
-Comment[ca]=Protocol per a la xarxa de Microsoft
-Comment[cs]=Protokol sítě Microsoft
-Comment[cy]=Protocol Rhwydwaith Microsoft
-Comment[de]=Microsoft Netzwerk-Protokoll
-Comment[el]=Πρωτόκολλο Microsoft Network
-Comment[es]=Protocolo de red de Microsoft
-Comment[et]=Microsofti võrguprotokoll
-Comment[fa]=قرارداد شبکۀ میکروسافت
-Comment[fi]=Microsoft Network -yhteyskäytäntö
-Comment[fr]=Protocole réseau Microsoft
-Comment[ga]=Prótacal Gréasáin Mhicrosoft
-Comment[gl]=Protocolo para a rede de Microsoft
-Comment[he]=תוסף חיבור לרשת מיקרוסופט
-Comment[hi]=माइक्रोसॉफ्ट नेटवर्क प्रोटोकॉल
-Comment[hr]=Microsoft mrežni protokol
-Comment[hu]=Microsoft hálózati protokoll
-Comment[is]=Microsoft Network Protocol 
-Comment[it]=Protocollo di rete Microsoft
-Comment[ja]=Microsoft ネットワークプロトコル
-Comment[ka]=Microsoft ქსელის ოქმი
-Comment[kk]=Microsoft Network желі протоколы
-Comment[km]=ពិធីការ​បណ្ដាញ​ម៉ៃក្រូសូហ្វ
-Comment[lt]=Microsoft tinklo protokolas
-Comment[mk]=Мрежен протокол на Microsoft
-Comment[nds]=Microsoft-Nettwarkprotokoll
-Comment[ne]=माइक्रोसफ्ट सञ्जाल प्रोटोकल
-Comment[nl]=Protocol voor Microsoft Network
-Comment[nn]=Microsoft Network-protokoll
-Comment[pl]=Protokół Microsoft Network
-Comment[pt]=Protocolo da Microsoft Network
-Comment[pt_BR]=Protocolo de Rede Microsoft
-Comment[ru]=Протокол сети Microsoft Network
-Comment[sl]=Protokol za povezavo na MSN
-Comment[sv]=Microsoft-nätverksprotokoll
-Comment[ta]=மைக்ரோசாப்ட் இணைய விதிமுறை
-Comment[tg]=Қарордоди Шабакаи Microsoft
-Comment[tr]=Microsoft Ağ Protokolü
-Comment[uk]=Мережний протокол Microsoft
-Comment[uz]=Microsoft tarmogʻi bilan aloqa oʻrnatish uchun protokol
-Comment[uz@cyrillic]=Microsoft тармоғи билан алоқа ўрнатиш учун протокол
-Comment[wa]=Protocole pol rantoele da Microsoft
-Comment[zh_CN]=Microsoft Network 协议
-Comment[zh_HK]=Microsoft 網絡通訊協定
-Comment[zh_TW]=Microsoft 網路協定
 
+Comment=Microsoft Network Protocol
diff --git a/kopete/protocols/msn/kopete_msn.desktop b/kopete/protocols/msn/kopete_msn.desktop
index 8f74c113..7aeacafb 100644
--- a/kopete/protocols/msn/kopete_msn.desktop
+++ b/kopete/protocols/msn/kopete_msn.desktop
@@ -2,8 +2,9 @@
 Type=Service
 Icon=msn_protocol
 ServiceTypes=Kopete/Protocol
-X-TDE-Library=kopete_msn
 X-Kopete-Version=1000900
+
+X-TDE-Library=kopete_msn
 X-Kopete-Messaging-Protocol=messaging/msn
 X-TDE-PluginInfo-Author=Kopete Developers
 X-TDE-PluginInfo-Email=kopete-devel@kde.org
@@ -14,86 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=MSN Messenger
-Name[ar]=مرسال MSN
-Name[bn]=এমএসএন বার্তাবাহক
-Name[cy]=Negesydd MSN
-Name[da]=MSN-Messenger
-Name[de]=MSN-Messenger
-Name[eo]=MSN-mesaĝilo
-Name[fa]=پیام‌رسان ام‌اس‌ان
-Name[gl]=MSN Messanger
-Name[hi]=एमएसएन मैसेंजर
-Name[ja]=MSN メッセンジャー
-Name[km]=កម្មវិធី​ផ្ញើសារ MSN
-Name[lt]=MSN žinučių klientas
-Name[mk]=Гласник за MSN 
-Name[nds]=MSN-Kortnarichtendeenst
-Name[ne]=एमएसएन मेसेन्जर
-Name[pa]=MSN ਸੁਨੇਹੇਦਾਰ
-Name[pl]=Komunikator MSN Messenger
-Name[pt_BR]=Mensageiro MSN
-Name[ro]=Mesaje instantanee MSN
-Name[tg]=MSN Пайёмбар
-Name[uk]=Кур'єр MSN
-Name[uz]=MSN mesenjer
-Name[uz@cyrillic]=MSN месенжер
-Comment=Protocol to connect to MSN Messenger
-Comment[ar]=البرتوكول سيتصل بمرسال MSN
-Comment[be]=Пратакол MSN Messenger
-Comment[bg]=Протокол за връзка с MSN Messenger
-Comment[bn]=এমএসএন বার্তাবাহকে সংযোগ করতে প্রোটোকল
-Comment[br]=Komenad kevreañ ouzh MSN Messenger
-Comment[bs]=MSN Messenger protokol
-Comment[ca]=Protocol per a connectar-se a MSN Messenger
-Comment[cs]=Protokol k připojení k MSN Messengeru
-Comment[cy]=Protocol i gysylltu â Negesydd MSN
-Comment[da]=Protokol til at forbinde til MSN-Messenger
-Comment[de]=Protokoll zur Verbindung mit dem MSN-Messenger
-Comment[el]=Πρωτόκολλο για σύνδεση στο MSN Messenger
-Comment[es]=Protocolo para conectar con MSN Messenger
-Comment[et]=Protokoll ühendumiseks MSN Messengeriga
-Comment[eu]=MSN Messenger-era konektatzeko protokoloa
-Comment[fa]=قرارداد برای اتصال به پیام‌رسان ام‌اس‌ان
-Comment[fi]=Yhteyskäytäntö MSN Messanger -verkkoon kytkeytymiseen
-Comment[fr]=Protocole pour se connecter sur MSN Messenger
-Comment[ga]=Prótacal chun ceangal le MSN Messenger
-Comment[gl]=Protocolo para se conectar ó MSN Messanger
-Comment[he]=פרוטוקול התחברות ל- MSN Messenger
-Comment[hi]=एमएसएन मैसेंजर से जुड़ने का प्रोटोकॉल
-Comment[hr]=Protokol za povezivanje na MSN Messenger
-Comment[hu]=Protokoll az MSN Messenger használatához
-Comment[is]=Samskiptamáti til að tengjast MSN Messenger
-Comment[it]=Protocollo per connessione a MSN Messenger
-Comment[ja]=MSN メッセンジャーに接続するプロトコル
-Comment[ka]=MSN Messenger დაკავშირების ოქმი
-Comment[kk]=MSN Messenger-ге қосылу протоколы
-Comment[km]=ពិធីការ​ដើម្បី​ភ្ជាប់​ទៅ​កម្មវិធី​ផ្ញើសារ MSN
-Comment[lt]=Protokolas prisijungimui prie MSN žinučių kliento
-Comment[mk]=Протокол за поврзување на Гласникот на MSN
-Comment[nb]=Protokoll for å koble til MSN Messenger
-Comment[nds]=Protokoll för't Tokoppeln na den MSN-Kortnarichtendeenst
-Comment[ne]=एमएसएन मेसेन्जरमा जडान गर्नुपर्ने प्रोटोकल
-Comment[nl]=Protocol voor MSN Messenger
-Comment[nn]=Protokoll for å kopla til MSN Messenger
-Comment[pl]=Protokół połączenia z serwerem MSN Messenger
-Comment[pt]=Um protocolo para ser ligar ao MSN Messenger
-Comment[pt_BR]=Protocolo para conexão ao MSN Messenger
-Comment[ro]=Protocol de conectare la MSN Messenger
-Comment[ru]=Протокол для подключения к MSN Messenger
-Comment[sk]=Protokol pre pripojenie k MSN Messenger
-Comment[sl]=Protokol za povezavo na MSN Messenger
-Comment[sr]=Протокол за повезивање на MSN Messenger
-Comment[sr@Latn]=Protokol za povezivanje na MSN Messenger
-Comment[sv]=Protokoll för att ansluta till MSN-meddelandeklient
-Comment[ta]= MSN Messenger யுடன் இணைக்க விதிமுறை
-Comment[tg]=Қарордоди пайвастшавӣ ба MSN Пайёмбар
-Comment[tr]=MSN Messenger'a bağlantı iletişim kuralı
-Comment[uk]=Протокол для з'єднання з MSN Messenger
-Comment[uz]=MSN mesenjer bilan aloqa oʻrnatish uchun protokol
-Comment[uz@cyrillic]=MSN месенжер билан алоқа ўрнатиш учун протокол
-Comment[wa]=Protocole po s' raloyî a MSN
-Comment[zh_CN]=连接到 MSN Messenger 协议
-Comment[zh_HK]=用來連接至 MSN Messenger 的通訊協定
-Comment[zh_TW]=連線到 MSN 的協定
 
+Comment=Protocol to connect to MSN Messenger
diff --git a/kopete/protocols/oscar/aim/CMakeLists.txt b/kopete/protocols/oscar/aim/CMakeLists.txt
index 75230df3..2c055bb8 100644
--- a/kopete/protocols/oscar/aim/CMakeLists.txt
+++ b/kopete/protocols/oscar/aim/CMakeLists.txt
@@ -30,9 +30,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES
-    kopete_aim.desktop aim.protocol
-  DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kopete_aim.desktop aim.protocol
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
 
 
 ##### kopete_aim (module) #######################
diff --git a/kopete/protocols/oscar/aim/kopete_aim.desktop b/kopete/protocols/oscar/aim/kopete_aim.desktop
index cf590551..9a161120 100644
--- a/kopete/protocols/oscar/aim/kopete_aim.desktop
+++ b/kopete/protocols/oscar/aim/kopete_aim.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Service
-X-Kopete-Version=1000900
 Icon=aim_protocol
 X-TDE-ServiceTypes=Kopete/Protocol
+X-Kopete-Version=1000900
+
 X-TDE-Library=kopete_aim
 X-Kopete-Messaging-Protocol=messaging/aim
 X-TDE-PluginInfo-Author=Kopete Developers
@@ -14,64 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=AIM
-Name[bn]=এ-আই-এম
-Name[hi]=एआरईएम
-Name[ne]=एआईएम
+
 Comment=Protocol to connect to AIM
-Comment[ar]=البرتوكول سيتصل بـ AIM
-Comment[be]=Пратакол AIM
-Comment[bg]=Протокол за връзка с AIM
-Comment[bn]=এ-আই-এমতে সংযোগ করতে প্রোটোকল
-Comment[br]=Komenad kevreañ ouzh AIM
-Comment[bs]=AIM protokol
-Comment[ca]=Protocol per a connectar-se a AIM
-Comment[cs]=Protokol k připojení k AIM
-Comment[cy]=Protocol i gysylltu ag AIM
-Comment[da]=Protokol til at forbinde til AIM
-Comment[de]=Protokoll zur Verbindung mit dem AIM
-Comment[el]=Πρωτόκολλο για σύνδεση στο AIM
-Comment[es]=Protocolo para conectar a AIM
-Comment[et]=Protokoll ühendumiseks AIM-iga
-Comment[eu]=AIM-era konektatzeko protokoloa
-Comment[fa]=قرارداد برای اتصال به AIM
-Comment[fi]=Yhteyskäytäntö AIM-verkkoon kytkeytymiseen
-Comment[fr]=Protocole pour se connecter sur AIM
-Comment[ga]=Prótacal chun ceangal le AIM
-Comment[gl]=Protocolo para se conectar ó AIM
-Comment[he]=פרוטוקול התחברות ל- AIM
-Comment[hi]=से जुड़ने का प्रोटोकॉल
-Comment[hr]=Protokol za povezivanje na AIM
-Comment[hu]=Protokoll az AIM használatához
-Comment[is]=Samskiptamáti til að tengjast AIM
-Comment[it]=Protocollo per connessione a AIM
-Comment[ja]=AIM に接続するプロトコル
-Comment[ka]=AIM დაკავშირების ოქმი
-Comment[kk]=AIM-ге қосылу протоколы
-Comment[km]=ពិធីការ​ភ្ជាប់​ទៅ AIM
-Comment[lt]=Protokolas prisijungimui prie AIM
-Comment[mk]=Протокол за поврзување на AIM
-Comment[nb]=Protokoll for å koble til AIM
-Comment[nds]=Protokoll för't Tokoppeln na AIM
-Comment[ne]=एआईएम मा जडान गर्नुपर्ने प्रोटोकल
-Comment[nl]=Protocol voor AOL Instant Messenger
-Comment[nn]=Protokoll for å kopla til AIM
-Comment[pl]=Protokół połączenia z serwerem AIM
-Comment[pt]=Um protocolo para se ligar ao AIM
-Comment[pt_BR]=Protocolo de conexão ao AIM
-Comment[ro]=Protocol de conectare la AIM
-Comment[ru]=Протокол для подключения к AIM
-Comment[sk]=Protokol pre pripojenie k AIM
-Comment[sl]=Protokol za povezavo na AIM
-Comment[sr]=Протокол за повезивање на AIM
-Comment[sr@Latn]=Protokol za povezivanje na AIM
-Comment[sv]=Protokoll för att ansluta till AIM
-Comment[ta]=IRC உடன் இணைக்க விதிமுறை
-Comment[tg]=Қарордоди пайвастшавӣ ба AIM
-Comment[tr]=AIM'e bağlantı iletişim kuralı
-Comment[uk]=Протокол для з'єднання з AIM
-Comment[uz]=AIM bilan aloqa oʻrnatish uchun protokol
-Comment[uz@cyrillic]=AIM билан алоқа ўрнатиш учун протокол
-Comment[zh_CN]=连接到 AIM 协议
-Comment[zh_HK]=用來連接至 AIM 的通訊協定
-Comment[zh_TW]=連線到 AIM 的協定
diff --git a/kopete/protocols/oscar/icq/CMakeLists.txt b/kopete/protocols/oscar/icq/CMakeLists.txt
index 20f8b11a..8e264890 100644
--- a/kopete/protocols/oscar/icq/CMakeLists.txt
+++ b/kopete/protocols/oscar/icq/CMakeLists.txt
@@ -30,8 +30,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kopete_icq.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES x-icq.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
+tde_create_translated_desktop(
+  SOURCE kopete_icq.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
+
+tde_create_translated_desktop(
+  SOURCE x-icq.desktop
+  DESTINATION ${MIME_INSTALL_DIR}/application
+  PO_DIR kopete-desktops
+)
 
 
 ##### kopete_icq (module) #######################
diff --git a/kopete/protocols/oscar/icq/kopete_icq.desktop b/kopete/protocols/oscar/icq/kopete_icq.desktop
index 5fd121ad..852b7095 100644
--- a/kopete/protocols/oscar/icq/kopete_icq.desktop
+++ b/kopete/protocols/oscar/icq/kopete_icq.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Service
-X-Kopete-Version=1000900
 Icon=icq_protocol
 X-TDE-ServiceTypes=Kopete/Protocol
+X-Kopete-Version=1000900
+
 X-TDE-Library=kopete_icq
 X-Kopete-Messaging-Protocol=messaging/icq
 X-TDE-PluginInfo-Author=Kopete Developers
@@ -14,65 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=ICQ
-Name[bn]=আই-সি-কিউ
-Name[hi]=आईसीक्यू
-Name[ne]=आईसीक्यू
-Comment=Protocol to connect to ICQ
-Comment[ar]=البرتوكول سيتصل بـ ICQ
-Comment[be]=Пратакол ICQ
-Comment[bg]=Протокол за връзка с ICQ
-Comment[bn]=আই-সি-কিউতে সংযোগ করতে প্রোটোকল
-Comment[br]=Komenad kevreañ ouzh ICQ
-Comment[bs]=ICQ protokol
-Comment[ca]=Protocol per a connectar-se a ICQ
-Comment[cs]=Protokol k připojení k ICQ
-Comment[cy]=Protocol i gysylltu ag ICQ
-Comment[da]=Protokol til at forbinde til ICQ
-Comment[de]=Protokoll zur Verbindung mit ICQ
-Comment[el]=Πρωτόκολλο για σύνδεση στο ICQ
-Comment[es]=Protocolo de conexión de ICQ
-Comment[et]=Protokoll ühendumiseks ICQ-ga
-Comment[eu]=ICQ-ra konektatzeko protokoloa
-Comment[fa]=قرارداد برای اتصال به ICQ
-Comment[fi]=Yhteyskäytäntö ICQ-verkkoon kytkeytymiseen
-Comment[fr]=Protocole pour se connecter sur ICQ
-Comment[ga]=Prótacal chun ceangal le ICQ
-Comment[gl]=Protocolo para se conectar á rede ICQ
-Comment[he]=פרוטוקול התחברות ל- ICQ
-Comment[hi]=आईसीक्यू से जुड़ने का प्रोटोकॉल
-Comment[hr]=Protokol za povezivanje na ICQ
-Comment[hu]=Protokoll az ICQ használatához
-Comment[is]=Samskiptamáti til að tengjast ICQ
-Comment[it]=Protocollo per connessione a ICQ
-Comment[ja]=ICQ に接続するプロトコル
-Comment[ka]=ICQ დაკავშირების ოქმი
-Comment[kk]=ICQ-ге қосылу протоколы
-Comment[km]=ពិធីការភ្ជាប់​ទៅ ICQ
-Comment[lt]=Protokolas prisijungimui prie ICQ
-Comment[mk]=Протокол за поврзување на ICQ
-Comment[nb]=Protokoll for å koble til ICQ
-Comment[nds]=Protokoll för't Tokoppeln na ICQ
-Comment[ne]=आईसीक्यू मा जडान गर्नुपर्ने प्रोटोकल
-Comment[nl]=Protocol voor ICQ
-Comment[nn]=Protokoll for å kopla til ICQ
-Comment[pl]=Protokół połączenia z serwerem ICQ
-Comment[pt]=Um protocolo para se ligar ao ICQ
-Comment[pt_BR]=Protocolo de conexão ao ICQ
-Comment[ro]=Protocol de conectare la ICQ
-Comment[ru]=Протокол для подключения к ICQ
-Comment[sk]=Protokol pre pripojenie k ICQ
-Comment[sl]=Protokol za povezavo na ICQ
-Comment[sr]=Протокол за повезивање на ICQ
-Comment[sr@Latn]=Protokol za povezivanje na ICQ
-Comment[sv]=Protokoll för att ansluta till ICQ
-Comment[ta]=ICQ உடன் இணைக்க விதிமுறை
-Comment[tg]=Қарордоди пайвастшавӣ ба ICQ
-Comment[tr]=ICQ'a bağlantı iletişim kuralı
-Comment[uk]=Протокол для з'єднання з ICQ
-Comment[uz]=ICQ bilan aloqa oʻrnatish uchun protokol
-Comment[uz@cyrillic]=ICQ билан алоқа ўрнатиш учун протокол
-Comment[zh_CN]=连接到 ICQ 协议
-Comment[zh_HK]=用來連接至 ICQ 的通訊協定
-Comment[zh_TW]=連線到 ICQ 的協定
 
+Comment=Protocol to connect to ICQ
diff --git a/kopete/protocols/oscar/icq/x-icq.desktop b/kopete/protocols/oscar/icq/x-icq.desktop
index 1d8b3eb2..99c7cc0f 100644
--- a/kopete/protocols/oscar/icq/x-icq.desktop
+++ b/kopete/protocols/oscar/icq/x-icq.desktop
@@ -1,60 +1,7 @@
 [Desktop Entry]
-Comment=ICQ Contact
-Comment[ar]=جهة اتصال على ICQ
-Comment[be]=ICQ
-Comment[bg]=Връзка с ICQ Contact
-Comment[bn]=আই-সি-কিউ যোগাযোগ
-Comment[br]=Darempred ICQ
-Comment[bs]=ICQ kontakt
-Comment[ca]=Contacte ICQ
-Comment[cs]=ICQ kontakt
-Comment[cy]=Cysylltiad ICQ
-Comment[da]=ICQ-Kontakt
-Comment[de]=ICQ-Kontakt
-Comment[el]=Επαφή ICQ
-Comment[eo]=ICQ-kontakto
-Comment[es]=Contacto de ICQ
-Comment[et]=ICQ kontakt
-Comment[eu]=ICQ kontaktua
-Comment[fa]=تماس ICQ
-Comment[fi]=ICQ-kontakti
-Comment[fr]=Contact ICQ
-Comment[gl]=Contacto ICQ
-Comment[he]=איש-קשר ICQ
-Comment[hi]=आईसीक्यू सम्पर्क
-Comment[hr]=ICQ kontakt
-Comment[hu]=ICQ-kapcsolat
-Comment[is]=ICQ tengiliður
-Comment[it]=Contatto ICQ
-Comment[ja]=ICQ コンタクト
-Comment[ka]=ICQ მეგობარი
-Comment[kk]=ICQ байланыс
-Comment[km]=ទំនាក់​ទំនង​ ICQ
-Comment[lt]=ICQ kontaktas
-Comment[mk]=Контакт на ICQ 
-Comment[nb]=ICQ kontakt
-Comment[nds]=ICQ-Kontakt
-Comment[ne]=आईसीक्यू सम्पर्क
-Comment[nl]=ICQ contact
-Comment[nn]=ICQ-kontakt
-Comment[pl]=Kontakt ICQ
-Comment[pt]=Contacto de ICQ
-Comment[pt_BR]=Contato ICQ
-Comment[ru]=Контакт ICQ
-Comment[se]=ICQ-oktavuohta
-Comment[sk]=Kontakt ICQ
-Comment[sl]=Stik ICQ
-Comment[sr]=ICQ контакт
-Comment[sr@Latn]=ICQ kontakt
-Comment[sv]=ICQ-kontakt
-Comment[ta]=ICQ தொடர்பு
-Comment[tg]=Пайвастшавии ICQ 
-Comment[tr]=ICQ Bağlantısı
-Comment[uk]=Контакт ICQ
-Comment[zh_CN]=ICQ 联系人
-Comment[zh_HK]=ICQ 聯絡人
-Comment[zh_TW]=ICQ 聯絡人
 Type=MimeType
 MimeType=application/x-icq
 Patterns=*.uin;*.icq
 Icon=licq
+
+Comment=ICQ Contact
diff --git a/kopete/protocols/oscar/liboscar/rtf.cc b/kopete/protocols/oscar/liboscar/rtf.cc
index 67753b20..514c9c67 100644
--- a/kopete/protocols/oscar/liboscar/rtf.cc
+++ b/kopete/protocols/oscar/liboscar/rtf.cc
@@ -590,9 +590,9 @@ YY_MALLOC_DECL
 
 YY_DECL
 	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
 
 #line 46 "rtf.ll"
 
@@ -639,7 +639,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
 				yy_last_accepting_state = yy_current_state;
@@ -874,9 +874,9 @@ case YY_STATE_EOF(INITIAL):
 
 static int yy_get_next_buffer()
 	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
-	register int number_to_move, i;
+	char *dest = yy_current_buffer->yy_ch_buf;
+	char *source = yytext_ptr;
+	int number_to_move, i;
 	int ret_val;
 
 	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
@@ -1006,14 +1006,14 @@ static int yy_get_next_buffer()
 
 static yy_state_type yy_get_previous_state()
 	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
 
 	yy_current_state = yy_start;
 
 	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			yy_last_accepting_state = yy_current_state;
@@ -1045,10 +1045,10 @@ static yy_state_type yy_try_NUL_trans( yy_current_state )
 yy_state_type yy_current_state;
 #endif
 	{
-	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
+	int yy_is_jam;
+	char *yy_cp = yy_c_buf_p;
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		yy_last_accepting_state = yy_current_state;
@@ -1069,14 +1069,14 @@ yy_state_type yy_current_state;
 
 #ifndef YY_NO_UNPUT
 #ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
+static void yyunput( int c, char *yy_bp )
 #else
 static void yyunput( c, yy_bp )
 int c;
-register char *yy_bp;
+char *yy_bp;
 #endif
 	{
-	register char *yy_cp = yy_c_buf_p;
+	char *yy_cp = yy_c_buf_p;
 
 	/* undo effects of setting up yytext */
 	*yy_cp = yy_hold_char;
@@ -1084,10 +1084,10 @@ register char *yy_bp;
 	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
+		int number_to_move = yy_n_chars + 2;
+		char *dest = &yy_current_buffer->yy_ch_buf[
 					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
+		char *source =
 				&yy_current_buffer->yy_ch_buf[number_to_move];
 
 		while ( source > yy_current_buffer->yy_ch_buf )
@@ -1548,7 +1548,7 @@ yyconst char *s2;
 int n;
 #endif
 	{
-	register int i;
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 	}
@@ -1562,7 +1562,7 @@ static int yy_flex_strlen( s )
 yyconst char *s;
 #endif
 	{
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
diff --git a/kopete/protocols/sms/CMakeLists.txt b/kopete/protocols/sms/CMakeLists.txt
index 017ae01e..39b0d297 100644
--- a/kopete/protocols/sms/CMakeLists.txt
+++ b/kopete/protocols/sms/CMakeLists.txt
@@ -32,7 +32,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kopete_sms.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kopete_sms.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
 
 
 ##### kopete_sms (module) #######################
diff --git a/kopete/protocols/sms/kopete_sms.desktop b/kopete/protocols/sms/kopete_sms.desktop
index bd542632..a53dc984 100644
--- a/kopete/protocols/sms/kopete_sms.desktop
+++ b/kopete/protocols/sms/kopete_sms.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Service
-X-Kopete-Version=1000900
 Icon=sms_protocol
 X-TDE-ServiceTypes=Kopete/Protocol
+X-Kopete-Version=1000900
+
 X-Kopete-Messaging-Protocol=messaging/sms
 X-TDE-Library=kopete_sms
 X-TDE-PluginInfo-Author=Richard Lärkäng
@@ -14,68 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=SMS
-Name[bn]=এস-এম-এস
-Name[fa]=خدمت پیام کوتاه
-Name[hi]=एसएमएस
-Name[km]=សេវា​សារ​ខ្លីៗ
-Name[ne]=एस एम एस
-Name[zh_CN]=短信息
+
 Comment=Protocol to send SMS messages
-Comment[ar]=سيرسل البروتوكول رسالة عن  طريق خدمة الرسائل القصيرة
-Comment[be]=Пратакол адпраўлення паведамленняў SMS
-Comment[bg]=Протокол за изпращане на SMS съобщения
-Comment[bn]=এস-এম-এস বার্তা পাঠাতে প্রোটোকল
-Comment[br]=Komenad evit kas kemennadoù SMS
-Comment[bs]=Protokol za slanje SMS poruka
-Comment[ca]=Protocol per a enviar missatges SMS
-Comment[cs]=Protokol k odesílání SMS zpráv
-Comment[cy]=Protocol i anfon negeseuon SMS
-Comment[da]=Protokol til at sende SMS-beskeder
-Comment[de]=Protokoll zur Versendung von SMS-Nachrichten
-Comment[el]=Πρωτόκολλο για αποστολή μηνυμάτων SMS
-Comment[es]=Protocolo de envío de SMS
-Comment[et]=Protokoll SMS-ide saatmiseks
-Comment[eu]=SMS mezuak bidaltzeko protokoloa
-Comment[fa]=قرارداد برای ارسال پیامهای کوتاه
-Comment[fi]=Yhteyskäytäntö SMS-viestien lähettämiseen
-Comment[fr]=Protocole pour envoyer des SMS
-Comment[ga]=Prótacal chun teachtaireachtaí SMS a sheoladh
-Comment[gl]=Protocolo para enviar mansaxes SMS
-Comment[he]=פרוטוקול שליחת הודעות SMS
-Comment[hi]=से जुड़ने का प्रोटोकॉल
-Comment[hr]=Protokol za slanje SMS poruka
-Comment[hu]=Protokoll SMS üzenetek küldéséhez
-Comment[is]=Samskiptamáti til að senda SMS skilaboð
-Comment[it]=Protocollo per inviare messaggi SMS
-Comment[ja]=SMS メッセージを送るプロトコル
-Comment[ka]=SMS შეტყობინებების გაგზავნის ოქმი
-Comment[kk]=SMS хабарларын жіберу протоколы
-Comment[km]=ពិធីការ​ដើម្បី​ផ្ញើ​សារ​ខ្លីៗ
-Comment[lt]=Protokolas SMS žinučių siuntimui
-Comment[mk]=Протокол за испраќање на SMS-пораки
-Comment[nb]=Protokoll for å sende SMS-meldinger
-Comment[nds]=Protokoll för't Sennen vun SMS-Narichten
-Comment[ne]=एस एम एस सन्देश पठाउने प्रोटोकल
-Comment[nl]=Protocol voor verzenden van SMS-berichten
-Comment[nn]=Protokoll for å senda SMS-meldingar
-Comment[pl]=Protokół wysyłania wiadomości SMS
-Comment[pt]=Protocolo para enviar mensagens SMS
-Comment[pt_BR]=Protocolo para o envio de mensagens SMS
-Comment[ro]=Protocol de trimis mesaje SMS
-Comment[ru]=Протокол отправки сообщений SMS
-Comment[sk]=Protokol pre posielanie správ SMS
-Comment[sl]=Protokol za pošiljanje SMS sporočil
-Comment[sr]=Протокол за слање SMS порука
-Comment[sr@Latn]=Protokol za slanje SMS poruka
-Comment[sv]=Protokoll för att skicka SMS-meddelanden
-Comment[ta]=SMS செய்தி அனுப்ப விதிமுறை
-Comment[tg]=Қарордод барои фиристодани SMS пайёмҳо
-Comment[tr]=SMS mesajları gönderme iletişim kuralı
-Comment[uk]=Протокол для відсилання SMS повідомлень
-Comment[uz]=SMS xabarlarni joʻnatish uchun protokol
-Comment[uz@cyrillic]=SMS хабарларни жўнатиш учун протокол
-Comment[wa]=Protocole po-z evoyî des messaedje SMS
-Comment[zh_CN]=发送短信息的协议
-Comment[zh_HK]=用來發送 SMS 訊息的通訊協定
-Comment[zh_TW]=送 SMS 訊息的協定
diff --git a/kopete/protocols/testbed/CMakeLists.txt b/kopete/protocols/testbed/CMakeLists.txt
index 6052845a..378bc307 100644
--- a/kopete/protocols/testbed/CMakeLists.txt
+++ b/kopete/protocols/testbed/CMakeLists.txt
@@ -28,7 +28,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kopete_testbed.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kopete_testbed.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
 
 
 ##### kopete_testbed (module) ###################
diff --git a/kopete/protocols/testbed/kopete_testbed.desktop b/kopete/protocols/testbed/kopete_testbed.desktop
index 522c26b8..75247821 100644
--- a/kopete/protocols/testbed/kopete_testbed.desktop
+++ b/kopete/protocols/testbed/kopete_testbed.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Service
-X-Kopete-Version=1000900
 Icon=testbed_protocol
 X-TDE-ServiceTypes=Kopete/Protocol
+X-Kopete-Version=1000900
+
 X-TDE-Library=kopete_testbed
 X-Kopete-Messaging-Protocol=messaging/testbed
 X-TDE-PluginInfo-Author=Will Stephenson
@@ -14,84 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=Testbed
-Name[ar]=مكان اختبار
-Name[bn]=পরীক্ষাস্থল
-Name[cy]=Mainc Arbrofi
-Name[eo]=Testejo
-Name[et]=Testija
-Name[fi]=Testipenkki
-Name[gl]=testbed
-Name[hi]=टेस्टबेड
-Name[hr]=Probno okruženje
-Name[hu]=Tesztelési
-Name[is]=Prufuhorn
-Name[lt]=Tikrinimas
-Name[nb]=Testbenk
-Name[ne]=टेस्टबेड
-Name[nl]=Testomgeving
-Name[nn]=Testbenk
-Name[pl]=Testowy
-Name[pt]=Testes
-Name[sk]=Test
-Name[sr]=Пробни сто
-Name[sr@Latn]=Probni sto
-Name[sv]=Testomgivning
-Name[tr]=Deneme ortamı
-Name[uk]=Тест
-Name[zh_CN]=测试床
+
 Comment=Kopete test protocol
-Comment[ar]=بروتوكول اختبار Kopete
-Comment[be]=Тэставы пратакол Kopete
-Comment[bg]=Пробен протокол на Kopete
-Comment[bn]=কপেট পরীক্ষা প্রোটোকল
-Comment[bs]=Kopete testni protokol
-Comment[ca]=Protocol per a proves en Kopete
-Comment[cy]=Protocol arbrofi Kopete
-Comment[da]=Kopete test-protokol
-Comment[de]=Kopete Testprotokoll
-Comment[el]=Πρωτόκολλο ελέγχου του Kopete
-Comment[es]=Protocolo de prueba de Kopete
-Comment[et]=Kopete testprotokoll
-Comment[eu]=Kopete proba protokoloa
-Comment[fa]=Kopete قرارداد را آزمایش می‌کند
-Comment[fi]=Kopeten testiyhteyskäytäntö
-Comment[fr]=Protocole de test de Kopete
-Comment[ga]=Prótacal tástála Kopete
-Comment[gl]=Protocolo de Kopete para probas
-Comment[he]=פרוטוקול הניסוי של Kopete
-Comment[hi]=के-ऑप्टी टेस्ट प्रोटोकॉल
-Comment[hr]=Kopete protokol za testiranje
-Comment[hu]=Kopete tesztprotokoll
-Comment[is]=Kopete prufuíhlutur
-Comment[it]=Protocollo di test di Kopete
-Comment[ja]=Kopete テストプロトコル
-Comment[ka]=Kopete-ს ტესტირების ოქმი
-Comment[kk]=Kopete сынау протоколы
-Comment[km]=ពិធីការ​សាកល្បង Kopete
-Comment[lt]=Kopete tikrinimo protokolas
-Comment[mk]=Протокол за тестирање на Kopete
-Comment[nb]=Kopete protokoll for tester
-Comment[nds]=Kopete-Pröövprotokoll
-Comment[ne]=कोपेट परीक्षण प्रोटोकल
-Comment[nl]=Kopete testprotocol
-Comment[nn]=Kopete-protokoll for testing
-Comment[pl]=Protokół testowy Kopete
-Comment[pt]=Protocolo de teste do Kopete
-Comment[pt_BR]=Protocolo de Teste do Kopete
-Comment[ro]=Protocol de test Kopete
-Comment[ru]=Тестовый протокол Kopete
-Comment[se]=Kopete geahččalanprotokolla
-Comment[sk]=Testovací protokol Kopete
-Comment[sl]=Preskusni protokol za Kopete
-Comment[sr]=Kopete-ов протокол за тестирање
-Comment[sr@Latn]=Kopete-ov protokol za testiranje
-Comment[sv]=Testprotokoll för Kopete
-Comment[ta]=Kopete விதிமுறை சோதனை
-Comment[tg]=Қарордоди санҷишии Kopete 
-Comment[tr]=Kopete deneme protokolü
-Comment[uk]=Тестовий протокол Kopete
-Comment[wa]=Protocole di saye po Kopete
-Comment[zh_CN]=Kopete 测试协议
-Comment[zh_HK]=Kopete 測試通訊協定
-Comment[zh_TW]=Kopete 測試協定
diff --git a/kopete/protocols/winpopup/CMakeLists.txt b/kopete/protocols/winpopup/CMakeLists.txt
index e80e8e51..241de707 100644
--- a/kopete/protocols/winpopup/CMakeLists.txt
+++ b/kopete/protocols/winpopup/CMakeLists.txt
@@ -30,9 +30,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES
-    kopete_wp.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kopete_wp.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
 
 install( PROGRAMS
     winpopup-send.sh winpopup-install.sh
diff --git a/kopete/protocols/winpopup/kopete_wp.desktop b/kopete/protocols/winpopup/kopete_wp.desktop
index 20a48fd0..344f2ece 100644
--- a/kopete/protocols/winpopup/kopete_wp.desktop
+++ b/kopete/protocols/winpopup/kopete_wp.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Service
-X-Kopete-Version=1000900
 Icon=wp_protocol
 X-TDE-ServiceTypes=Kopete/Protocol
+X-Kopete-Version=1000900
+
 X-TDE-Library=kopete_wp
 X-Kopete-Messaging-Protocol=messaging/winpopup
 X-TDE-PluginInfo-Author=Gav Wood
@@ -14,72 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=WinPopup
-Name[ar]=منبثقWin
-Name[bn]=উইন পপ-আপ
-Name[ca]=Finestres emergents
-Name[eu]=WinPopup plugina
-Name[hi]=विन-पॉपअप
-Name[lt]=Windows iššokančios žinutės
-Name[ne]=विन पपअप
-Name[nn]=Vindaugsmeldingar
-Name[pt_BR]=Janela de Contexto
-Name[zh_CN]=WinPoup
+
 Comment=Protocol to send Windows WinPopup messages
-Comment[ar]=البرتوكول سيصدر رسائل Windows المنبثقة
-Comment[be]=Пратакол Windows WinPopup
-Comment[bg]=Протокол за изпращане на съобщения Windows WinPopup
-Comment[bn]=উইন্ডোজ উইন পপ-আপ বার্তা পাঠাতে প্রোটোকল
-Comment[br]=Komenad evit kas kemennadoù Windows WinPopup
-Comment[bs]=Protokol za slanje Windows WinPopup poruka
-Comment[ca]=Protocol per a enviar missatges de finestres emergents de Windows
-Comment[cs]=Protokol k odesílání WinPopup zpráv
-Comment[cy]=Protocol i anfon negeseuon WinPopup
-Comment[da]=Protokol til at sende Windows WinPopup-beskeder
-Comment[de]=Protokoll zur Versendung von Windows WinPopup-Nachrichten
-Comment[el]=Πρωτόκολλο για αποστολή μηνυμάτων Windows WinPopup
-Comment[es]=Protocolo para enviar un mensaje emergente de windows
-Comment[et]=Protokoll Windowsi WinPopup sõnumite saatmiseks
-Comment[eu]=Windows WinPopup mezuak bidaltzeko protokoloa
-Comment[fa]=قرارداد ارسال پیامهای WinPopup ویندوز
-Comment[fi]=Yhteyskäytäntö Windows WinPopup-viestien lähettämiseen
-Comment[fr]=Protocole pour envoyer des messages WinPopup
-Comment[ga]=Prótacal chun teachtaireachtaí Windows WinPopup a sheoladh
-Comment[gl]=Protocolo para enviar mensaxes a máquinas Windows mediante o protocolo Winpopup
-Comment[he]=תוסף לשליחת מסרי WinPopup
-Comment[hi]=विंडोज़ विन-पॉपअप मैसेंजर भेजने का प्रोटोकॉल
-Comment[hr]=Protokol za slanje Windows WinPopup poruka
-Comment[hu]=Protokoll Windows felbukkanó üzenetek küldéséhez
-Comment[is]=Samskiptamáti til að senda Windows WinPopup skeyti
-Comment[it]=Protocollo per inviare messaggi Windows WinPopup
-Comment[ja]=Windows の WinPopup メッセージを送るプロトコル
-Comment[ka]=Windows WinPopup შეტყობინებების გაგზავნის ოქმი
-Comment[kk]=Windows WinPopup хабарларды жіберу протоколы
-Comment[km]=ពិធីការ​ដើម្បី​ផ្ញើ​សារ WinPopup របស់​វ៉ីនដូ
-Comment[lt]=Protokolas Windows iššokančių žinučių siuntimui
-Comment[mk]=Протокол за испраќање на пораки со Windows WinPopup 
-Comment[nb]=Protokoll for å sende Windows WinPopup -meldinger
-Comment[nds]=Protokoll för't Sennen vun Windows-WinPopup-Narichten
-Comment[ne]=विन्डोज विन पपअप सन्देश पठाउनुपर्ने प्रोटोकल
-Comment[nl]=Protocol voor verzenden van WinPopup-berichten
-Comment[nn]=Protokoll for å senda Windows-vindaugsmeldingar
-Comment[pl]=Protokół wysyłania komunikatów Windows WinPopup
-Comment[pt]=Um protocolo para enviar mensagens de WinPopup do Windows
-Comment[pt_BR]=Protocolo para o envio de mensagens de janela do Windows
-Comment[ro]=Protocol de trimis mesaje Windows WinPopup
-Comment[ru]=Протокол для отправки сообщений Windows WinPopup
-Comment[sk]=Protokol pre posielanie správ Windows WinPopup
-Comment[sl]=Protokol za pošiljanje sporočil za Windows WinPopup
-Comment[sr]=Протокол за слање Windows WinPopup порука
-Comment[sr@Latn]=Protokol za slanje Windows WinPopup poruka
-Comment[sv]=Protokoll för att skicka Windows WinPopup-meddelanden
-Comment[ta]=விண்டோஸ் தோன்றும் சாளர செய்தியை அனுப்புவதற்கான நெறிமுறை
-Comment[tg]=Қарордод барои фиристодани Windows WinPopup пайёмҳо 
-Comment[tr]=Windows WinPopup mesajları gönderme iletişim kuralı
-Comment[uk]=Протокол для відсилання повідомлень WinPopup
-Comment[uz]=Windows WinPopup xabarlarni joʻnatish uchun protokol
-Comment[uz@cyrillic]=Windows WinPopup хабарларни жўнатиш учун протокол
-Comment[wa]=Protocole po les messaedjes WinPopup di Windows
-Comment[zh_CN]=发送 Windows WinPopup 信息的协议
-Comment[zh_HK]=用來發送 Windows WinPopup 訊息的通訊協定
-Comment[zh_TW]=送出 WinPopup 訊息的協定
diff --git a/kopete/protocols/yahoo/CMakeLists.txt b/kopete/protocols/yahoo/CMakeLists.txt
index 124fc32a..7e542286 100644
--- a/kopete/protocols/yahoo/CMakeLists.txt
+++ b/kopete/protocols/yahoo/CMakeLists.txt
@@ -34,7 +34,12 @@ link_directories(
 ##### other data ################################
 
 install( FILES yahooconferenceui.rc yahoochatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_yahoo )
-install( FILES kopete_yahoo.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+
+tde_create_translated_desktop(
+  SOURCE kopete_yahoo.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kopete-desktops
+)
 
 
 ##### kopete_yahoo (module) #####################
diff --git a/kopete/protocols/yahoo/kopete_yahoo.desktop b/kopete/protocols/yahoo/kopete_yahoo.desktop
index 7ace3fe1..d9ddba93 100644
--- a/kopete/protocols/yahoo/kopete_yahoo.desktop
+++ b/kopete/protocols/yahoo/kopete_yahoo.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Service
-X-Kopete-Version=1000900
 Icon=yahoo_protocol
 X-TDE-ServiceTypes=Kopete/Protocol
+X-Kopete-Version=1000900
+
 X-TDE-Library=kopete_yahoo
 X-Kopete-Messaging-Protocol=messaging/yahoo
 X-TDE-PluginInfo-Author=Kopete Developers
@@ -14,70 +15,7 @@ X-TDE-PluginInfo-Category=Protocols
 X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=false
+
 Name=Yahoo
-Name[bn]=ইয়্যাহু
-Name[fa]=یاهو
-Name[hi]=याहू
-Name[km]=យ៉ាហ៊ូ
-Name[ne]=याहू
-Name[pa]=ਯਾਹੂ
-Name[ta]=யாஹூ
-Comment=Protocol to connect to Yahoo
-Comment[ar]=سيتصل البروتوكول بـ Yahoo
-Comment[be]=Пратакол Yahoo
-Comment[bg]=Протокол за връзка с Yahoo
-Comment[bn]=ইয়্যাহুতে সংযোগ করতে প্রোটোকল
-Comment[br]=Komenad kevreañ ouzh Yahoo
-Comment[bs]=Yahoo protokol
-Comment[ca]=Protocol per a connectar-se a Yahoo
-Comment[cs]=Protokol k připojení k Yahoo
-Comment[cy]=Protocol i gysylltu â Yahoo
-Comment[da]=Protokol til at forbinde til Yahoo
-Comment[de]=Protokoll zur Verbindung mit Yahoo
-Comment[el]=Πρωτόκολλο για σύνδεση στο Yahoo
-Comment[es]=Protocolo para conectar a Yahoo
-Comment[et]=Protokoll ühendumiseks Yahooga
-Comment[eu]=Yahoo-ra konektatzeko protokoloa
-Comment[fa]=قرارداد برای اتصال به یاهو
-Comment[fi]=Yhteyskäytäntö Yahoo-verkkoon kytkeytymiseen
-Comment[fr]=Protocole pour se connecter sur Yahoo
-Comment[ga]=Prótacal chun ceangal le Yahoo
-Comment[gl]=Protocolo para se conectar a Yahoo
-Comment[he]=פרוטוקול התחברות ל- Yahoo
-Comment[hi]=से जुड़ने का प्रोटोकॉल
-Comment[hr]=Protokol za povezivanje na Yahoo
-Comment[hu]=Protokoll a Yahoo-hoz való csatlakozáshoz
-Comment[is]=Samskiptamáti til að tengjast Yahoo
-Comment[it]=Protocollo per connessione a Yahoo
-Comment[ja]=Yahoo に接続するプロトコル
-Comment[ka]=Yahoo-სთან დაკავშირების ოქმი
-Comment[kk]=Yahoo-ға қосылу протоколы
-Comment[km]=ពិធីការ​ដើម្បី​ភ្ជាប់​ទៅ​យ៉ាហ៊ូ
-Comment[lt]=Protokolas prisijungimui prie Yahoo
-Comment[mk]=Протокол за поврзување на Yahoo
-Comment[nb]=Protokoll for å koble til Yahoo
-Comment[nds]=Protokoll för't Tokoppeln na Yahoo
-Comment[ne]=याहूमा जडान गर्नुपर्ने प्रोटोकल
-Comment[nl]=Protocol voor Yahoo
-Comment[nn]=Protokoll for å kopla til Yahoo
-Comment[pl]=Protokół połączenia z serwerem Yahoo
-Comment[pt]=Um protocolo para se ligar ao Yahoo
-Comment[pt_BR]=Protocolo para conexão ao Yahoo
-Comment[ro]=Protocol de conectare la Yahoo
-Comment[ru]=Протокол для подключения к Yahoo
-Comment[sk]=Protokol pre pripojenie k Yahoo
-Comment[sl]=Protokol za povezavo na Yahoo
-Comment[sr]=Протокол за повезивање на Yahoo
-Comment[sr@Latn]=Protokol za povezivanje na Yahoo
-Comment[sv]=Protokoll för att ansluta till Yahoo
-Comment[ta]=யாஹூ உடன் இணைக்க விதிமுறை
-Comment[tg]=Қарордоди пайвастшавӣ ба Yahoo
-Comment[tr]=Yahoo'ya bağlantı iletişim kuralı
-Comment[uk]=Протокол для з'єднання з Yahoo
-Comment[uz]=Yahoo bilan aloqa oʻrnatish uchun protokol
-Comment[uz@cyrillic]=Yahoo билан алоқа ўрнатиш учун протокол
-Comment[wa]=Protocole po s' raloyî a Yahoo
-Comment[zh_CN]=连接到 Yahoo 协议
-Comment[zh_HK]=用來連接至 Yahoo 的通訊協定
-Comment[zh_TW]=連線到 Yahoo 的協定
 
+Comment=Protocol to connect to Yahoo