changeset 27917:1114dfd1881a

propagate from branch 'im.pidgin.pidgin' (head fbb7e560b9517ff3eb66340bc3f0006a42a3820c) to branch 'im.pidgin.pidgin.yaz' (head 734127a00a9ce8898e1b3b8d62a94a8d27783dec)

--- a/libpurple/protocols/oscar/oscar.c	Sun Jan 04 10:16:38 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Mon Jan 05 14:14:43 2009 +0000
@@ -1681,10 +1681,10 @@
 	}
 	if (in != '\n') {
 		char buf[256];
-		GHashTable *ui_info = purple_core_get_ui_info();		
-		g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly.  You may want to use TOC until "
-			"this is fixed.  Check %s for updates."),
-				   ((ui_info && g_hash_table_lookup(ui_info, "website")) ? (char *)g_hash_table_lookup(ui_info, "website") : PURPLE_WEBSITE));
+		GHashTable *ui_info = purple_core_get_ui_info();
+		g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly.  "
+				"If so, check %s for updates."),
+				((ui_info && g_hash_table_lookup(ui_info, "website")) ? (char *)g_hash_table_lookup(ui_info, "website") : PURPLE_WEBSITE));
 		purple_notify_warning(pos->gc, NULL,
 							_("Unable to get a valid AIM login hash."),
 							buf);

--- a/libpurple/protocols/qq/ChangeLog	Sun Jan 04 10:16:38 2009 +0000
+++ b/libpurple/protocols/qq/ChangeLog	Mon Jan 05 14:14:43 2009 +0000
@@ -1,3 +1,9 @@
+2008.12.28 - flos <lonicerae(at)gmail.com>
+	* Fixes #7908
+
+2008.12.28 - flos <lonicerae(at)gmail.com>
+	* References #7908
+
 2008.12.25 - flos <lonicerae(at)gmail.com>
 	* References #7821
 	* Updated authors

--- a/libpurple/protocols/qq/qq_network.c	Sun Jan 04 10:16:38 2009 +0000
+++ b/libpurple/protocols/qq/qq_network.c	Mon Jan 05 14:14:43 2009 +0000
@@ -174,14 +174,16 @@
  *  Please conside tcp_pending and udp_pending */
 gboolean qq_connect_later(gpointer data)
 {
-	PurpleConnection *gc = (PurpleConnection *) data;
-	qq_data *qd;
-	char *server;
+	PurpleConnection *gc;
+	char *tmp_server;
 	int port;
 	gchar **segments;
+	qq_data *qd;
 
+	gc = (PurpleConnection *) data;
 	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, FALSE);
 	qd = (qq_data *) gc->proto_data;
+	tmp_server = NULL;
 
 	if (qd->check_watcher > 0) {
 		purple_timeout_remove(qd->check_watcher);
@@ -191,9 +193,11 @@
 
 	if (qd->redirect_ip.s_addr != 0) {
 		/* redirect to new server */
-		server = g_strdup_printf("%s:%d", inet_ntoa(qd->redirect_ip), qd->redirect_port);
-		qd->servers = g_list_append(qd->servers, server);
-		qd->curr_server = server;
+		tmp_server = g_strdup_printf("%s:%d", inet_ntoa(qd->redirect_ip), qd->redirect_port);
+		qd->servers = g_list_append(qd->servers, tmp_server);
+
+		qd->curr_server = tmp_server;
+		tmp_server = NULL;
 
 		qd->redirect_ip.s_addr = 0;
 		qd->redirect_port = 0;
@@ -211,21 +215,30 @@
 	}
 
 	segments = g_strsplit_set(qd->curr_server, ":", 0);
-	server = g_strdup(segments[0]);
-	port = atoi(segments[1]);
-	if (port <= 0) {
-		purple_debug_info("QQ", "Port not define in %s\n", qd->curr_server);
+	tmp_server = g_strdup(segments[0]);
+	if (NULL != segments[1]) {
+		port = atoi(segments[1]);
+		if (port <= 0) {
+			purple_debug_info("QQ", "Port not define in %s, use default.\n", qd->curr_server);
+			port = QQ_DEFAULT_PORT;
+		}
+	} else {
+		purple_debug_info("QQ", "Error splitting server string: %s, setting port to default.\n", qd->curr_server);
 		port = QQ_DEFAULT_PORT;
 	}
+
 	g_strfreev(segments);
 
 	qd->connect_retry--;
-	if ( !connect_to_server(gc, server, port) ) {
+	if ( !connect_to_server(gc, tmp_server, port) ) {
 			purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 				_("Unable to connect."));
 	}
 
+	g_free(tmp_server);
+	tmp_server = NULL;
+
 	qd->check_watcher = purple_timeout_add_seconds(QQ_CONNECT_CHECK, connect_check, gc);
 	return FALSE;	/* timeout callback stops */
 }

--- a/po/bn.po	Sun Jan 04 10:16:38 2009 +0000
+++ b/po/bn.po	Mon Jan 05 14:14:43 2009 +0000
@@ -1,14 +1,16 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the GAIM package.
-# INDRANIL DAS GUPTA (ইন্দ্রনীল দাশগুপ্ত) <[e-mail]>, 2005.
-# Samia Nimatullah <[e-mail]>, 2005.
-# Tisa Nafisa <[e-mail]>, 2007.
-# Jamil Ahmed <[e-mail]>, 2007.
-# Israt Jahan <[e-mail]>, 2008.
+# Pidgin Bengali translations (bn_BD, bn_IN)
 #
-msgid ""
-msgstr ""
-"Project-Id-Version: GAIM 2.5.3\n"
+# Copyright (C) 2005 INDRANIL DAS GUPTA (ইন্দ্রনীল দাশগুপ্ত) <[e-mail]>
+# Copyright (C) 2005 Samia Nimatullah <[e-mail]>
+# Copyright (C) 2007 Tisa Nafisa <[e-mail]>
+# Copyright (C) 2007 Jamil Ahmed <[e-mail]>
+# Copyright (C) 2008 Israt Jahan <[e-mail]>
+#
+# This file is distributed under the same license as the Pidgin package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Pidgin 2.5.3\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-12-18 01:17-0800\n"
 "PO-Revision-Date: 2008-11-13 17:07+0600\n"

--- a/po/ca.po	Sun Jan 04 10:16:38 2009 +0000
+++ b/po/ca.po	Mon Jan 05 14:14:43 2009 +0000
@@ -33,8 +33,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-19 17:53+0100\n"
-"PO-Revision-Date: 2008-12-20 17:15+0100\n"
+"POT-Creation-Date: 2009-01-05 01:42+0100\n"
+"PO-Revision-Date: 2009-01-05 01:44+0100\n"
 "Last-Translator: Josep Puigdemont i Casamajó <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -4196,6 +4196,9 @@
 msgid "Re-initializing Stream"
 msgstr "S'està reinicialitzant el flux"
 
+msgid "Server doesn't support blocking"
+msgstr "El servidor no permet blocar"
+
 msgid "Not Authorized"
 msgstr "No autoritzat"
 
@@ -4954,7 +4957,6 @@
 msgid "Passport account not yet verified"
 msgstr "El compte de passaport encara no està verificat"
 
-#, c-format
 msgid "Passport account suspended"
 msgstr "El compte de passaport s'ha suspès"
 
@@ -6576,12 +6578,10 @@
 msgstr "_D'acord"
 
 #, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Se us pot desconnectar d'aquí a poc temps. Si voleu, podeu emprar TOC fins "
-"que això es resolgui. Comproveu si hi ha actualitzacions a %s."
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Pot ser que es desconnecti d'aquí a poc. Si això passés, comproveu si hi ha "
+"actualitzacions a %s."
 
 # FIXME: hash (josep)
 msgid "Unable to get a valid AIM login hash."
@@ -7535,13 +7535,11 @@
 msgid " TCP"
 msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "Mòbil"
-
-#, fuzzy
+msgstr " FromMobile"
+
 msgid " BindMobile"
-msgstr "Mòbil"
+msgstr " BindMobile"
 
 msgid " Video"
 msgstr " Vídeo"
@@ -9335,6 +9333,9 @@
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Els noms d'usuari SIP no poden contenir espais en blanc ni @"
 
+msgid "SIP connect server not specified"
+msgstr "No s'ha especificat el servidor SIP al qual connectar-se"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14102,6 +14103,13 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 
+#~ msgid ""
+#~ "You may be disconnected shortly.  You may want to use TOC until this is "
+#~ "fixed.  Check %s for updates."
+#~ msgstr ""
+#~ "Se us pot desconnectar d'aquí a poc temps. Si voleu, podeu emprar TOC "
+#~ "fins que això es resolgui. Comproveu si hi ha actualitzacions a %s."
+
 #~ msgid "Connection to server lost (no data received within %d second)"
 #~ msgid_plural ""
 #~ "Connection to server lost (no data received within %d seconds)"

--- a/po/de.po	Sun Jan 04 10:16:38 2009 +0000
+++ b/po/de.po	Mon Jan 05 14:14:43 2009 +0000
@@ -11,15 +11,15 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-18 23:08+0100\n"
-"PO-Revision-Date: 2008-12-18 20:11+0100\n"
-"Last-Translator: Bjoern Voigt <[e-mail]>\n"
-"Language-Team: Deutsch <[e-mail]>\n"
+"POT-Creation-Date: 2009-01-04 12:29+0100\n"
+"PO-Revision-Date: 2009-01-04 12:29+0100\n"
+"Last-Translator: Jochen Kemnade <[e-mail]>\n"
+"Language-Team: German <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.2\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -9263,6 +9263,9 @@
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-Benutzernamen dürfen keine Leerzeichen oder @-Symbole enthalten"
 
+msgid "SIP connect server not specified"
+msgstr "SIP-Verbindungsserver nicht angegeben"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags

--- a/po/fr.po	Sun Jan 04 10:16:38 2009 +0000
+++ b/po/fr.po	Mon Jan 05 14:14:43 2009 +0000
@@ -4,7 +4,7 @@
 # Copyright (C) 2002, Stéphane Pontier <[e-mail]>
 # Copyright (C) 2002, Stéphane Wirtel <[e-mail]>
 # Copyright (C) 2002, Loïc Jeannin <[e-mail]>
-# Copyright (C) 2002-2008, Éric Boumaour <[e-mail]>
+# Copyright (C) 2002-2009, Éric Boumaour <[e-mail]>
 #
 # This file is distributed under the same license as the Pidgin package.
 #
@@ -21,8 +21,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-16 10:10+0100\n"
-"PO-Revision-Date: 2008-12-16 10:09+0100\n"
+"POT-Creation-Date: 2009-01-05 10:49+0100\n"
+"PO-Revision-Date: 2009-01-05 10:48+0100\n"
 "Last-Translator: Éric Boumaour <[e-mail]>\n"
 "Language-Team: fr <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -4191,6 +4191,9 @@
 msgid "Re-initializing Stream"
 msgstr "Réinitialisation du flux"
 
+msgid "Server doesn't support blocking"
+msgstr "Le serveur ne supporte pas le blocage"
+
 msgid "Not Authorized"
 msgstr "Non autorisé"
 
@@ -4947,7 +4950,6 @@
 msgid "Passport account not yet verified"
 msgstr "Le compte Passeport n'est pas encore validé"
 
-#, c-format
 msgid "Passport account suspended"
 msgstr "Le compte Passeport est suspendu"
 
@@ -6548,12 +6550,10 @@
 msgstr "_OK"
 
 #, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Vous risquez d'être déconnecté sous peu. Veuillez essayer d'utiliser TOC "
-"entre-temps si cela arrive. Visitez %s pour plus d'informations."
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Vous risquez d'être déconnecté sous peu. Si c'est le cas, consultez %s pour "
+"plus d'informations."
 
 msgid "Unable to get a valid AIM login hash."
 msgstr "Impossible de récupérer un code de connexion AIM valide."
@@ -9310,6 +9310,9 @@
 msgstr ""
 "Les noms d'utilisateur SIP ne peuvent pas avoir d'espace ou de symbole @."
 
+msgid "SIP connect server not specified"
+msgstr "Serveur de connexion SIP non spécifié"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14053,42 +14056,9 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 
-#~ msgid "Connection to server lost (no data received within %d second)"
-#~ msgid_plural ""
-#~ "Connection to server lost (no data received within %d seconds)"
-#~ msgstr[0] ""
-#~ "Connexion avec le serveur perdue (aucune donnée depuis %d seconde)."
-#~ msgstr[1] ""
-#~ "Connexion avec le serveur perdue (aucune donnée depuis %d secondes)."
-
-#~ msgid "%d needs Q&A"
-#~ msgstr "%d a besoin d'une réponse"
-
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Ajouter une réponse de contact"
-
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Impossible de récupérer la réponse du serveur"
-
-#~ msgid "Keep alive error"
-#~ msgstr "Erreur de Keep alive"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "Connexion perdue avec le serveur :\n"
-#~ "%d, %s"
-
-#~ msgid "Connecting server ..."
-#~ msgstr "Connexion au serveur..."
-
 #~ msgid "Failed to send IM."
 #~ msgstr "Impossible d'envoyer le message."
 
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Vous n'êtes pas membre du groupe « %s ».\n"
-
 #~ msgid "User information for %s unavailable"
 #~ msgstr "Les informations sur %s ne sont pas disponibles"
 

--- a/po/hu.po	Sun Jan 04 10:16:38 2009 +0000
+++ b/po/hu.po	Mon Jan 05 14:14:43 2009 +0000
@@ -1,16 +1,16 @@
 # Hungarian translation of pidgin.
-# Copyright (C) 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Pidgin package.
 # The Hungarian translation of Gaim was sponsored by Novell Hungary, many thanks for it!
 #
 # Zoltan Sutto <[e-mail]>, 2003.
-# Gabor Kelemen <[e-mail]>, 2005, 2006, 2007, 2008.
+# Gabor Kelemen <[e-mail]>, 2005, 2006, 2007, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-18 12:34+0100\n"
-"PO-Revision-Date: 2008-12-18 12:29+0100\n"
+"POT-Creation-Date: 2009-01-04 22:44+0100\n"
+"PO-Revision-Date: 2009-01-04 22:42+0100\n"
 "Last-Translator: Gabor Kelemen <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -4156,6 +4156,9 @@
 msgid "Re-initializing Stream"
 msgstr "A folyam újrainicializálása"
 
+msgid "Server doesn't support blocking"
+msgstr "A kiszolgáló nem támogatja a blokkolást"
+
 msgid "Not Authorized"
 msgstr "Nem engedélyezett"
 
@@ -4909,7 +4912,6 @@
 msgid "Passport account not yet verified"
 msgstr "Passport fiók (MSN igazolvány) még nincs ellenőrizve"
 
-#, c-format
 msgid "Passport account suspended"
 msgstr "A Passport fiók felfüggesztve"
 
@@ -6505,12 +6507,10 @@
 msgstr "_OK"
 
 #, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Hamarosan megszakad a kapcsolat. A helyreállításig használja a TOC-ot. "
-"Frissítésekért keresse fel a következő címet: %s."
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Hamarosan megszakadhat a kapcsolat. Ebbben az esetben keressen frissítéseket "
+"a következő címen: %s."
 
 msgid "Unable to get a valid AIM login hash."
 msgstr "Nem kérhető le érvényes AIM belépő hash."
@@ -9287,6 +9287,9 @@
 "A SIP felhasználónevek nem tartalmazhatnak üreshely-karaktert vagy @ "
 "szimbólumot"
 
+msgid "SIP connect server not specified"
+msgstr "A SIP kapcsolatkiszolgáló nincs megadva"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags