SOURCES: kdenetwork-branch.diff, kdepim-branch.diff, kdebase-branc...

arekm arekm at pld-linux.org
Fri Oct 27 09:15:43 CEST 2006 

Author: arekm                        Date: Fri Oct 27 07:15:43 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdenetwork-branch.diff (1.15 -> 1.16) , kdepim-branch.diff (1.28 -> 1.29) , kdebase-branch.diff (1.42 -> 1.43) , kdelibs-branch.diff (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SOURCES/kdenetwork-branch.diff
diff -u SOURCES/kdenetwork-branch.diff:1.15 SOURCES/kdenetwork-branch.diff:1.16
--- SOURCES/kdenetwork-branch.diff:1.15	Sat Oct 21 14:12:40 2006
+++ SOURCES/kdenetwork-branch.diff	Fri Oct 27 09:15:37 2006
@@ -1,7 +1,7 @@
 Index: krfb/kinetd/eventsrc
 ===================================================================
---- krfb/kinetd/eventsrc	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ krfb/kinetd/eventsrc	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- krfb/kinetd/eventsrc	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ krfb/kinetd/eventsrc	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -80,7 +80,7 @@
  Comment[es]=Recibida conexiĂłn entrante
  Comment[et]=Saadi sissetulev Ăźhendus
@@ -13,8 +13,8 @@
  Comment[gl]=RecibĂ­use unha conexiĂłn entrante
 Index: lanbrowsing/kcmlisa/kcmkiolan.desktop
 ===================================================================
---- lanbrowsing/kcmlisa/kcmkiolan.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ lanbrowsing/kcmlisa/kcmkiolan.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- lanbrowsing/kcmlisa/kcmkiolan.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ lanbrowsing/kcmlisa/kcmkiolan.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -21,7 +21,6 @@
  Name[es]=Esclavo de LAN KIO
  Name[et]=KohtvĂľrgu KIO moodul
@@ -34,8 +34,8 @@
  Comment[ga]=CumraĂ­ocht lan: agus rlan:
 Index: lanbrowsing/kcmlisa/kcmlisa.desktop
 ===================================================================
---- lanbrowsing/kcmlisa/kcmlisa.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ lanbrowsing/kcmlisa/kcmlisa.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- lanbrowsing/kcmlisa/kcmlisa.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ lanbrowsing/kcmlisa/kcmlisa.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -9,7 +9,6 @@
  X-KDE-FactoryName=lisa
  
@@ -55,8 +55,8 @@
  Comment[ga]=Cumraigh LISa
 Index: kdnssd/kdedmodule/dnssdwatcher.desktop
 ===================================================================
---- kdnssd/kdedmodule/dnssdwatcher.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kdnssd/kdedmodule/dnssdwatcher.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kdnssd/kdedmodule/dnssdwatcher.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kdnssd/kdedmodule/dnssdwatcher.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -51,7 +51,7 @@
  Comment[es]=Vigila los servicios DNS-SD y actualiza los listados de directorio
  Comment[et]=Jälgib DNS-SD teenuseid ja uuendab kataloogide nimekirju
@@ -68,8 +68,8 @@
  Comment[gl]=Deixa constancia dos servicios DNS-SD e anova as listaxes de directorios
 Index: kopete/plugins/nowlistening/nowlisteningplugin.cpp
 ===================================================================
---- kopete/plugins/nowlistening/nowlisteningplugin.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/nowlistening/nowlisteningplugin.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/nowlistening/nowlisteningplugin.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/nowlistening/nowlisteningplugin.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -308,7 +308,7 @@
  				{
  					// Check for the now listening message in parenthesis, 
@@ -95,8 +95,8 @@
  					else
 Index: kopete/plugins/alias/kopete_alias.desktop
 ===================================================================
---- kopete/plugins/alias/kopete_alias.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/alias/kopete_alias.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/alias/kopete_alias.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/alias/kopete_alias.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -24,7 +24,7 @@
  Name[cy]=Ffugenw
  Name[el]=Î‘Î˝Ď„ÎšĎƒĎ„ÎżÎšĎ‡ÎŻÎą
@@ -117,8 +117,8 @@
  Comment[gl]=Engadir alias persoĂĄis para comandos
 Index: kopete/plugins/alias/kopete_alias_config.desktop
 ===================================================================
---- kopete/plugins/alias/kopete_alias_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/alias/kopete_alias_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/alias/kopete_alias_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/alias/kopete_alias_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -20,7 +20,7 @@
  Name[cy]=Ffugenw
  Name[el]=Î‘Î˝Ď„ÎšĎƒĎ„ÎżÎšĎ‡ÎŻÎą
@@ -139,8 +139,8 @@
  Comment[gl]=Engadir alias persoĂĄis para comandos
 Index: kopete/plugins/cryptography/kopete_cryptography_config.desktop
 ===================================================================
---- kopete/plugins/cryptography/kopete_cryptography_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/cryptography/kopete_cryptography_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/cryptography/kopete_cryptography_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/cryptography/kopete_cryptography_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -78,7 +78,7 @@
  Comment[es]=Cifra mensajes usando PGP
  Comment[et]=SĂľnumite krĂźptimine PGP abil
@@ -152,8 +152,8 @@
  Comment[gl]=Encripta mensaxes con PGP
 Index: kopete/plugins/cryptography/kopete_cryptography.desktop
 ===================================================================
---- kopete/plugins/cryptography/kopete_cryptography.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/cryptography/kopete_cryptography.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/cryptography/kopete_cryptography.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/cryptography/kopete_cryptography.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -82,7 +82,7 @@
  Comment[es]=Cifra y descifra mensajes con GPG
  Comment[et]=SĂľnumite krĂźptimine ja lahtikrĂźptimine GPG abil
@@ -165,8 +165,8 @@
  Comment[gl]=Encriptar e desencriptar mensaxes con GPG
 Index: kopete/plugins/netmeeting/kopete_netmeeting_config.desktop
 ===================================================================
---- kopete/plugins/netmeeting/kopete_netmeeting_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/netmeeting/kopete_netmeeting_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/netmeeting/kopete_netmeeting_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/netmeeting/kopete_netmeeting_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -38,7 +38,7 @@
  Comment[es]=Voz y video con MSN Messenger
  Comment[et]=Audio ja video kasutamine MSN Messengeriga
@@ -178,8 +178,8 @@
  Comment[gl]=Voz e video con MSN Messenger
 Index: kopete/plugins/netmeeting/kopete_netmeeting.desktop
 ===================================================================
---- kopete/plugins/netmeeting/kopete_netmeeting.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/netmeeting/kopete_netmeeting.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/netmeeting/kopete_netmeeting.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/netmeeting/kopete_netmeeting.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -42,7 +42,7 @@
  Comment[es]=Voz y video con MSN Messenger
  Comment[et]=Audio ja video kasutamine MSN Messengeriga
@@ -191,8 +191,8 @@
  Comment[gl]=Voz e video con MSN Messenger
 Index: kopete/plugins/texteffect/kopete_texteffect.desktop
 ===================================================================
---- kopete/plugins/texteffect/kopete_texteffect.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/texteffect/kopete_texteffect.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/texteffect/kopete_texteffect.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/texteffect/kopete_texteffect.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -28,7 +28,7 @@
  Name[es]=Efecto de texto
  Name[et]=Tekstiefektid
@@ -204,8 +204,8 @@
  Name[ga]=MaisĂ­ocht TĂŠacs
 Index: kopete/plugins/texteffect/kopete_texteffect_config.desktop
 ===================================================================
---- kopete/plugins/texteffect/kopete_texteffect_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/texteffect/kopete_texteffect_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/texteffect/kopete_texteffect_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/texteffect/kopete_texteffect_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -24,7 +24,7 @@
  Name[es]=Efecto de texto
  Name[et]=Tekstiefektid
@@ -217,8 +217,8 @@
  Name[ga]=MaisĂ­ocht TĂŠacs
 Index: kopete/plugins/history/kopete_history_config.desktop
 ===================================================================
---- kopete/plugins/history/kopete_history_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/history/kopete_history_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/history/kopete_history_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/history/kopete_history_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -91,7 +91,7 @@
  Comment[es]=Plugin de Historia
  Comment[et]=Ajalooplugin
@@ -230,8 +230,8 @@
  Comment[ga]=BreiseĂĄn Staire
 Index: kopete/plugins/addbookmarks/kopete_addbookmarks.desktop
 ===================================================================
---- kopete/plugins/addbookmarks/kopete_addbookmarks.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/addbookmarks/kopete_addbookmarks.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/addbookmarks/kopete_addbookmarks.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/addbookmarks/kopete_addbookmarks.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -70,7 +70,7 @@
  Comment[es]=Anota automĂĄticamente los enlaces de los mensajes entrantes
  Comment[et]=Sissetulevates sþnumites olevate viitade automaatne lisamine järjehoidjatesse
@@ -243,8 +243,8 @@
  Comment[gl]=Marcar automĂĄticamente as ligazĂłns nas mensaxes entrantes
 Index: kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
 ===================================================================
---- kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -70,7 +70,7 @@
  Comment[es]=Anota automĂĄticamente los enlaces de los mensajes entrantes
  Comment[et]=Sissetulevates sþnumites olevate viitade automaatne lisamine järjehoidjatesse
@@ -256,8 +256,8 @@
  Comment[gl]=Marcar automĂĄticamente as ligazĂłns nas mensaxes entrantes
 Index: kopete/plugins/autoreplace/kopete_autoreplace.desktop
 ===================================================================
---- kopete/plugins/autoreplace/kopete_autoreplace.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/plugins/autoreplace/kopete_autoreplace.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/plugins/autoreplace/kopete_autoreplace.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/plugins/autoreplace/kopete_autoreplace.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -81,7 +81,7 @@
  Comment[es]=Autoreemplaza texto que puede elegir
  Comment[et]=Asendab automaatselt sinu valitud teksti
@@ -269,8 +269,8 @@
  Comment[gl]=Reemplaza automĂĄticamente algĂşn texto que tĂ­ podes escoller
 Index: kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
 ===================================================================
---- kopete/protocols/yahoo/libkyahoo/webcamtask.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/protocols/yahoo/libkyahoo/webcamtask.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/protocols/yahoo/libkyahoo/webcamtask.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/protocols/yahoo/libkyahoo/webcamtask.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -213,13 +213,11 @@
  	{
  		case ConnectedStage1:
@@ -321,8 +321,8 @@
  		kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Buffer created" << endl;
 Index: kopete/protocols/groupwise/kopete_groupwise.desktop
 ===================================================================
---- kopete/protocols/groupwise/kopete_groupwise.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/protocols/groupwise/kopete_groupwise.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/protocols/groupwise/kopete_groupwise.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/protocols/groupwise/kopete_groupwise.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -26,7 +26,7 @@
  Comment[cs]=Novell GroupWise komunikĂĄtor
  Comment[de]=Novell GroupWise-Nachrichtendienst
@@ -332,10 +332,58 @@
  Comment[fi]=Novell GroupWise -viestijä
  Comment[fr]=Messagerie GroupWise Novell
  Comment[he]=תוכנת ×”×ž×Ą×¨×™× ׊ל נובל GroupWise
+Index: kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
+===================================================================
+--- kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
+@@ -140,10 +140,39 @@
+ 		const Field::FieldListIterator end = fl.end();
+ 		for ( Field::FieldListIterator it = fl.begin(); it != end; ++it )
+ 		{
+-			Field::SingleField * propField = static_cast<Field::SingleField *>( *it );
+-			QString propName = propField->tag();
+-			QString propValue = propField->value().toString();
+-			propMap.insert( propName, propValue );
++			// assumes each property only present once
++			// check in logintask.cpp and if it's a multi field,
++			// get the value of this instance, check if it's already in the property map and append if found.
++			Field::SingleField * propField = dynamic_cast<Field::SingleField *>( *it );
++			if ( propField )
++			{
++				QString propName = propField->tag();
++				QString propValue = propField->value().toString();
++				propMap.insert( propName, propValue );
++			}
++			else
++			{
++				Field::MultiField * propList = dynamic_cast<Field::MultiField*>( *it );
++				if ( propList )
++				{
++					QString parentName = propList->tag();
++					Field::FieldList propFields = propList->fields();
++					const Field::FieldListIterator end = propFields.end();
++					for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it )
++					{
++						propField = dynamic_cast<Field::SingleField *>( *it );
++						if ( propField )
++						{
++							QString propValue = propField->value().toString();
++							QString contents = propMap[ propField->tag() ];
++							if ( !contents.isEmpty() )
++								contents.append( ", " );
++							contents.append( propField->value().toString());
++							propMap.insert( propField->tag(), contents );
++						}
++					}
++				}
++			}
+ 		}
+ 	}
+ 	if ( !propMap.empty() )
 Index: kopete/protocols/jabber/jabbercontact.cpp
 ===================================================================
---- kopete/protocols/jabber/jabbercontact.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/protocols/jabber/jabbercontact.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/protocols/jabber/jabbercontact.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/protocols/jabber/jabbercontact.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -952,7 +952,7 @@
  	
  	kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << contactId () /*<< " - " <<kdBacktrace()*/ << endl;
@@ -347,8 +395,8 @@
  		connect(m_syncTimer, SIGNAL(timeout()) , this , SLOT(slotDelayedSync()));
 Index: kopete/protocols/oscar/icq/kopete_icq.desktop
 ===================================================================
---- kopete/protocols/oscar/icq/kopete_icq.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/protocols/oscar/icq/kopete_icq.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/protocols/oscar/icq/kopete_icq.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/protocols/oscar/icq/kopete_icq.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -33,7 +33,7 @@
  Comment[es]=Protocolo de conexiĂłn de ICQ
  Comment[et]=Protokoll Ăźhendumiseks ICQ-ga
@@ -360,8 +408,8 @@
  Comment[ga]=PrĂłtacal chun ceangal le ICQ
 Index: kopete/protocols/meanwhile/kopete_meanwhile.desktop
 ===================================================================
---- kopete/protocols/meanwhile/kopete_meanwhile.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/protocols/meanwhile/kopete_meanwhile.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/protocols/meanwhile/kopete_meanwhile.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/protocols/meanwhile/kopete_meanwhile.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -23,6 +23,7 @@
  Name[ta]=ŕŽ‡ŕŽŸŕŻˆŕŽŞŕŻŕŽŞŕŽŸŕŻŕŽŸ ப௩ழுதில்
  Comment=Meanwhile (Lotus Sametime) Protocol
@@ -378,16 +426,35 @@
  Comment[is]="Meanwhile" (Lotus Sametimr) samskipturegla
  Comment[it]=Protocollo Meanwhile (Lotus Sametime)
  Comment[ja]=Meanwhile (Lotus Sametime) ăƒ—ăƒ­ăƒˆă‚łăƒŤ
-@@ -46,4 +48,5 @@
+@@ -40,10 +42,12 @@
+ 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 at Latn]=Protokol Meanwhile (Lotus Sametime)
  Comment[sv]=Meanwhile-protokoll (Lotus Sametime)
  Comment[uk]=ĐŸŃ€ĐžŃ‚ĐžĐşĐžĐť Meanwhile (Lotus Sametime)
 +Comment[zh_CN]=Meanwhile (Lotus Sametime) 协议
  Comment[zh_TW]=Meanwhile ďźˆLotus Sametimeďź‰ĺ”ĺŽšĺ¤–ćŽ›ç¨‹ĺź
+
+Property changes on: kopete/protocols/testbed/ui
+___________________________________________________________________
+Name: svn:ignore
+   + .deps
+libkopetetestbedui.la
+.libs
+Makefile
+Makefile.in
+*.moc
+
+
 Index: kopete/protocols/msn/kopete_msn.desktop
 ===================================================================
---- kopete/protocols/msn/kopete_msn.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/protocols/msn/kopete_msn.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/protocols/msn/kopete_msn.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/protocols/msn/kopete_msn.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -21,7 +21,7 @@
  Name[cy]=Negesydd MSN
  Name[da]=MSN-Messenger
@@ -408,8 +475,8 @@
  Comment[ga]=PrĂłtacal chun ceangal le MSN Messenger
 Index: kopete/protocols/msn/config/kopete_msn_config.desktop
 ===================================================================
---- kopete/protocols/msn/config/kopete_msn_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/protocols/msn/config/kopete_msn_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/protocols/msn/config/kopete_msn_config.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/protocols/msn/config/kopete_msn_config.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -26,7 +26,7 @@
  Name[es]=Plugin de MSN
  Name[et]=MSN plugin
@@ -421,8 +488,8 @@
  Name[ga]=BreiseĂĄn MSN
 Index: kopete/kopete/main.cpp
 ===================================================================
---- kopete/kopete/main.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/kopete/main.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/kopete/main.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/kopete/main.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -64,7 +64,7 @@
  	aboutData.addAuthor ( "Jason Keirstead", I18N_NOOP("Developer"), "jason at keirstead.org", "http://www.keirstead.org");
  	aboutData.addAuthor ( "Matt Rogers", I18N_NOOP("Lead Developer, AIM and ICQ plugin maintainer"), "mattr at kde.org" );
@@ -434,8 +501,8 @@
  	aboutData.addAuthor ( "Richard Smith", I18N_NOOP("Developer, UI maintainer"), "kde at metafoo.co.uk" );
 Index: kopete/kopete/eventsrc
 ===================================================================
---- kopete/kopete/eventsrc	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/kopete/eventsrc	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/kopete/eventsrc	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/kopete/eventsrc	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -10,7 +10,7 @@
  Comment[de]=Kopete-Nachrichtendienst
  Comment[el]=Î‘Ď€ÎżĎƒĎ„ÎżÎťÎ­ÎąĎ‚ ΟΡνĎ
ΟΏτων Kopete
@@ -479,7 +546,15 @@
  Name[is]=AuĂ°kenning
  Name[it]=Autorizzazione
  Name[ja]=許可
-@@ -783,6 +785,7 @@
+@@ -773,6 +775,7 @@
+ Name[pl]=Autoryzacja
+ Name[pt]=Autorização
+ Name[pt_BR]=Autorização
++Name[ru]=ĐĐ˛Ń‚ĐžŃ€Đ¸ĐˇĐ°Ń†Đ¸Ń
+ Name[sk]=AutorizĂĄcia
+ Name[sl]=Odobritev
+ Name[sr]=ĐŃƒŃ‚ĐžŃ€Đ¸ĐˇĐ°Ń†Đ¸Ń˜Đ°
+@@ -783,6 +786,7 @@
  Name[zh_TW]=čŞč­‰
  Comment=An user has accepted/declined your authorization request
  Comment[ca]=Un usuari ha autoritzat/declinat la vostra peticiĂł d'autoritzaciĂł
@@ -487,7 +562,7 @@
  Comment[da]=En bruger har godkendt/afslüet din godkendelsesforespørgsel
  Comment[de]=Ein Benutzer hat Ihre Autorisierung erlaubt/abgelehnt
  Comment[el]=ÎˆÎ˝ÎąĎ‚ Ď‡ĎÎŽĎƒĎ„ÎˇĎ‚ έχξΚ Ď€ÎšĎƒĎ„ÎżĎ€ÎżÎšÎŽĎƒÎľÎš/ÎąĎ€ÎżĎĎÎŻĎˆÎľÎš τΡν ÎąÎŻĎ„ÎˇĎƒÎŽ ĎƒÎąĎ‚ γΚι Ď€ÎšĎƒĎ„ÎżĎ€ÎżÎŻÎˇĎƒÎˇ
-@@ -792,6 +795,7 @@
+@@ -792,6 +796,7 @@
  Comment[fi]=Käyttäjä on hyväksynyt/hylännyt hyväksymispyyntÜsi
  Comment[fr]=Un utilisateur a acceptĂŠ ou refusĂŠ votre demande d'autorisation
  Comment[he]=מ׊תמ׊ אי׊ר/דחה את בק׊תך לזיהוי
@@ -495,7 +570,15 @@
  Comment[is]=Notandi hefur heimilaĂ° eĂ°a hafnaĂ° beiĂ°ni Ăžinni um auĂ°kenningu auĂ°kenningabeiĂ°ni Ăžinni
  Comment[it]=Un utente ha autorizzato/declinato la tua richiesta
  Comment[ja]=ăƒŚăƒźă‚śăŻă‚ăŞăŸăŽč¨ąĺŻčŚćą‚ă‚’ć‰żčŤž/ć‹’çľśă—ăžă—ăŸ
-@@ -857,7 +861,7 @@
+@@ -801,6 +806,7 @@
+ Comment[pl]=UĹźytkownik zaakceptowaĹ‚/odrzuciĹ‚ Twoje ĹźÄ
danie autoryzacji
+ Comment[pt]=Um utilizador autorizou/rejeitou o seu pedido de autorização
+ Comment[pt_BR]=Um utilizador autorizou/rejeitou o seu pedido de autorização
++Comment[ru]=ĐŸĐžĐťŃŒĐˇĐžĐ˛Đ°Ń‚ĐľĐťŃŒ автОриСОваН вас иНи ОткНОниН Đ˛Đ°Ńˆ СапрОс
+ Comment[sk]=UŞívateĞ prijal/odmietol vaťu poŞiadavku o autorizåciu
+ Comment[sl]=Uporabnik je spejel/zavrnil vaĹĄ zahtevek za odobritev
+ Comment[sr]=КОрисник Ń˜Đľ приŃ
ватиО/ОдйиО Đ˛Đ°Ńˆ СаŃ
тов Са Đ°ŃƒŃ‚ĐžŃ€Đ¸ĐˇĐ°Ń†Đ¸Ń˜Ńƒ
+@@ -857,7 +863,7 @@
  Comment[es]=Tiene correo nuevo en la cuenta de Yahoo
  Comment[et]=Saabus uus kiri sinu Yahoo Inboxi
  Comment[eu]=E-posta berri bat jaso da zure Yahoo-ko sarrerako ontzian
@@ -504,7 +587,7 @@
  Comment[fi]=Uutta postia saapunut Yahoo-sähkÜpostilaatikkoon
  Comment[fr]=Un nouveau message est arrivĂŠ dans votre boĂŽte aux lettres Yahoo
  Comment[gl]=Unha nova mensaxe chegou ao teu cartafol de entrada de Yahoo
-@@ -895,6 +899,7 @@
+@@ -895,6 +901,7 @@
  [msn_alert]
  Name=MSN Alert
  Name[ca]=Alerta del MSN
@@ -512,7 +595,7 @@
  Name[da]=MSN-alarm
  Name[de]=MSN-Warnung
  Name[el]=Î•ÎšÎ´ÎżĎ€ÎżÎŻÎˇĎƒÎˇ Ď„ÎżĎ
 MSN
-@@ -904,6 +909,7 @@
+@@ -904,6 +911,7 @@
  Name[fi]=MSN-varoitus
  Name[fr]=Alerte MSN
  Name[he]=אזהרה ׊ל MSN
@@ -520,7 +603,15 @@
  Name[is]=MSN skeyti
  Name[it]=Avviso MSN
  Name[km]=សេáž
áž€áŸ’ážŠáž¸â€‹áž‡ážźáž“ážŠáŸ†ážŽážšáž„ MSN
-@@ -922,6 +928,7 @@
+@@ -912,6 +920,7 @@
+ Name[pl]=Alarm MSN
+ Name[pt]=Alerta MSN
+ Name[pt_BR]=Alerta MSN
++Name[ru]=ĐŸŃ€ĐľĐ´ŃƒĐżŃ€ĐľĐśĐ´ĐľĐ˝Đ¸Đľ MSN
+ Name[sk]=MSN Upozornenie
+ Name[sl]=Alarm MSN
+ Name[sr]=MSN аНарП
+@@ -922,6 +931,7 @@
  Name[zh_TW]=MSN č­Śĺ‘Š
  Comment=A new alert has been sent to you
  Comment[ca]=Se us ha enviat una nova alerta
@@ -528,7 +619,7 @@
  Comment[da]=En ny alarm er sendt til dig
  Comment[de]=Sie haben eine neue Warnung erhalten
  Comment[el]=Σις ĎƒĎ„ÎŹÎťÎ¸ÎˇÎşÎľ ΟΚι νέι ÎľÎšÎ´ÎżĎ€ÎżÎŻÎˇĎƒÎˇ
-@@ -931,6 +938,7 @@
+@@ -931,6 +941,7 @@
  Comment[fi]=Sinulle on lähetetty uusi varoitus
  Comment[fr]=Une nouvelle alerte vous a ĂŠtĂŠ envoyĂŠe
  Comment[he]=אזהרה חד׊ה נ׊לחה אליך
@@ -536,7 +627,15 @@
  Comment[is]=ÞÊr hefur verið sent nýtt skeyti
  Comment[it]=Ti è stato inviato un avviso
  Comment[ja]=ć–°ă—ă„ă‚˘ăƒŠăƒźăƒˆă‚’ĺ—äżĄă—ăžă—ăŸ
-@@ -1275,7 +1283,7 @@
+@@ -940,6 +951,7 @@
+ Comment[pl]=Nowy alarm został wysłany do Ciebie
+ Comment[pt]=Foi enviada um novo alerta
+ Comment[pt_BR]=Foi enviada um novo alerta
++Comment[ru]=Đ’Đ°Đź ОтправНонО ĐżŃ€ĐľĐ´ŃƒĐżŃ€ĐľĐśĐ´ĐľĐ˝Đ¸Đľ
+ Comment[sk]=Bolo vĂĄm poslanĂŠ novĂŠ upozornenie
+ Comment[sl]=Poslan vam je bil alarm
+ Comment[sr]=ĐŸĐžŃĐťĐ°Ń‚ ваП Ń˜Đľ нОви аНарП
+@@ -1275,7 +1287,7 @@
  Comment[es]=Ocurrio un error en la conexiĂłn
  Comment[et]=Ăœhendusega tekkis viga
  Comment[eu]=Errore bat gertatu da konexioan
@@ -545,10 +644,35 @@
  Comment[fi]=Yhteydessä tapahtui virhe
  Comment[fr]=Une erreur de connexion est apparue
  Comment[gl]=Ocorreu un erro na conexiĂłn
+@@ -1382,6 +1394,7 @@
+ Comment[pl]=PoĹ‚Ä
czenie zostało przerwane
+ Comment[pt]=A ligação foi-se abaixo
+ Comment[pt_BR]=A ligação foi-se abaixo
++Comment[ru]=РаСрыв соединения
+ Comment[sk]=Spojenie sa stratilo
+ Comment[sl]=Povezava je bila prekinjena
+ Comment[sr]=ВоСа Ń˜Đľ Đ¸ĐˇĐłŃƒĐąŃ™ĐľĐ˝Đ°
+@@ -1427,7 +1440,7 @@
+ Name[pl]=Nie moĹźna siÄ™ poĹ‚Ä
czyć
+ Name[pt]=Não É Possível Ligar
+ Name[pt_BR]=NĂŁo foi possĂ­vel efetuar a conexĂŁo
+-Name[ru]=Не ŃƒĐ´Đ°Ń‘Ń‚ŃŃ ŃĐžĐľĐ´Đ¸Đ˝Đ¸Ń‚ŃŒŃŃ
++Name[ru]=Не ŃƒĐ´Đ°Ń‘Ń‚ŃŃ ĐżĐžĐ´ĐşĐťŃŽŃ‡Đ¸Ń‚ŃŒŃŃ
+ Name[sk]=NedĂĄ sa pripojiĹĽ
+ Name[sl]=Povezava ni mogoča
+ Name[sr]=ĐŸĐžĐ˛ĐľĐˇĐ¸Đ˛Đ°ŃšĐľ Đ˝ĐľĐźĐžĐłŃƒŃ›Đľ
+@@ -1637,6 +1650,7 @@
+ Comment[pl]=WystÄ
piĹ‚ bĹ‚Ä
d wewnętrzny usługi
+ Comment[pt]=Ocorreu um erro interno do serviço
+ Comment[pt_BR]=Ocorreu um erro interno do serviço
++Comment[ru]=Đ’Đ˝ŃƒŃ‚Ń€ĐľĐ˝Đ˝ŃŃ ĐžŃˆĐ¸ĐąĐşĐ° ŃĐťŃƒĐśĐąŃ‹
+ Comment[sk]=Nastala internĂĄ chyba servera
+ Comment[sl]=PriĹĄlo je do notranje napake pri storitvi
+ Comment[sr]=Đ”ĐžŃˆĐťĐž Ń˜Đž Đ´Đž инторно ĐłŃ€ĐľŃˆĐşĐľ сорвиса
 Index: kopete/kopete/kopete.desktop
 ===================================================================
---- kopete/kopete/kopete.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/kopete/kopete.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/kopete/kopete.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/kopete/kopete.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -17,7 +17,7 @@
  GenericName[es]=MensajerĂ­a instantĂĄnea
  GenericName[et]=Kiirsuhtlemisrakendus
@@ -569,8 +693,8 @@
  Comment[gl]=MensaxerĂ­a InstantĂĄnea
 Index: kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
 ===================================================================
---- kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -76,7 +76,7 @@
  Comment[es]=Aquí­ puede configurar los dispositivos de sonido y audio de Kopete
  Comment[et]=Siin saab muuta Kopete video- ja heliseadmete seadistusi
@@ -582,8 +706,8 @@
  Comment[gl]=AquĂ­ podes modificar as opciĂłns dos dispositivos de video e audio de Kopete
 Index: kopete/kopete/chatwindow/chatmessagepart.cpp
 ===================================================================
---- kopete/kopete/chatwindow/chatmessagepart.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/kopete/chatwindow/chatmessagepart.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/kopete/chatwindow/chatmessagepart.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/kopete/chatwindow/chatmessagepart.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -568,9 +568,23 @@
  {
  	KopetePrefs *p = KopetePrefs::prefs();
@@ -625,8 +749,8 @@
  		.arg( p->linkColor().name() );
 Index: kopete/kopete/Makefile.am
 ===================================================================
---- kopete/kopete/Makefile.am	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/kopete/Makefile.am	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/kopete/Makefile.am	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/kopete/Makefile.am	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -9,6 +9,7 @@
  	-I$(kopete_srcdir)/kopete/addcontactwizard \
  	-I$(kopete_srcdir)/kopete/config/accounts \
@@ -637,8 +761,8 @@
  	-I$(kopete_builddir)/kopete/contactlist \
 Index: kopete/kopete.kdevelop
 ===================================================================
---- kopete/kopete.kdevelop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/kopete.kdevelop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/kopete.kdevelop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/kopete.kdevelop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -205,6 +205,14 @@
        <argumentsHintDelay>100</argumentsHintDelay>
        <automaticHeaderCompletion>true</automaticHeaderCompletion>
@@ -656,8 +780,8 @@
      <creategettersetter>
 Index: kopete/libkopete/kopetemessagehandler.cpp
 ===================================================================
---- kopete/libkopete/kopetemessagehandler.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/libkopete/kopetemessagehandler.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/libkopete/kopetemessagehandler.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/libkopete/kopetemessagehandler.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -76,7 +76,6 @@
  {
  public:
@@ -683,8 +807,8 @@
  
 Index: kopete/libkopete/kopetemetacontact.cpp
 ===================================================================
---- kopete/libkopete/kopetemetacontact.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ kopete/libkopete/kopetemetacontact.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- kopete/libkopete/kopetemetacontact.cpp	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ kopete/libkopete/kopetemetacontact.cpp	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -687,7 +687,13 @@
  
  QImage MetaContact::photo() const
@@ -702,8 +826,8 @@
  Picture &MetaContact::picture() const
 Index: knewsticker/knewstickerstub/knewstickerstub.desktop
 ===================================================================
---- knewsticker/knewstickerstub/knewstickerstub.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ knewsticker/knewstickerstub/knewstickerstub.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- knewsticker/knewstickerstub/knewstickerstub.desktop	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ knewsticker/knewstickerstub/knewstickerstub.desktop	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -12,7 +12,7 @@
  Name[es]=Interfaz de configuraciĂłn de KNewsTicker
  Name[et]=Uudistejälgija seadistamine
@@ -715,8 +839,8 @@
  Name[gl]=Interface de ConfiguraciĂłn de KNewsTicker
 Index: knewsticker/eventsrc
 ===================================================================
---- knewsticker/eventsrc	(.../tags/KDE/3.5.5/kdenetwork)	(revision 597702)
-+++ knewsticker/eventsrc	(.../branches/KDE/3.5/kdenetwork)	(revision 597702)
+--- knewsticker/eventsrc	(.../tags/KDE/3.5.5/kdenetwork)	(revision 599441)
++++ knewsticker/eventsrc	(.../branches/KDE/3.5/kdenetwork)	(revision 599441)
 @@ -83,7 +83,7 @@
  Name[es]=Nuevas noticias disponibles
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdenetwork-branch.diff?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.42&r2=1.43&f=u
    http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.40&r2=1.41&f=u

More information about the pld-cvs-commit mailing list