# HG changeset patch # User Gary Kramlich # Date 1231214976 0 # Node ID 68265bcc88146650a22bb85030fa9a5b39aff0ef # Parent 19cd8f986e4a71b143ce4682426db4abb2cde78b# Parent 568b786c36f9d13f85fdd1cae00b0e9b9c1de071 propagate from branch 'im.pidgin.pidgin' (head c6844c5e097e3d947d35507e2e93557dfe8e0aee) to branch 'im.pidgin.pidgin.next.minor' (head 2326b430b25cce89fdeb73bf002ab639ef5dce4e) diff -r 19cd8f986e4a -r 68265bcc8814 libpurple/core.c --- a/libpurple/core.c Tue Jan 06 03:57:32 2009 +0000 +++ b/libpurple/core.c Tue Jan 06 04:09:36 2009 +0000 @@ -139,7 +139,7 @@ * subsystem right away too. */ purple_plugins_init(); - + /* Initialize all static protocols. */ static_proto_init(); @@ -219,7 +219,6 @@ purple_accounts_uninit(); purple_savedstatuses_uninit(); purple_status_uninit(); - purple_prefs_uninit(); purple_sound_uninit(); purple_theme_manager_uninit(); purple_xfers_uninit(); @@ -251,6 +250,7 @@ #ifdef _WIN32 wpurple_cleanup(); #endif + purple_prefs_uninit(); _core = NULL; } diff -r 19cd8f986e4a -r 68265bcc8814 libpurple/ft.c --- a/libpurple/ft.c Tue Jan 06 03:57:32 2009 +0000 +++ b/libpurple/ft.c Tue Jan 06 04:09:36 2009 +0000 @@ -700,7 +700,7 @@ msg = g_strdup_printf(_("Transfer of file %s complete"), purple_xfer_get_filename(xfer)); else - msg = g_strdup_printf(_("File transfer complete")); + msg = g_strdup(_("File transfer complete")); purple_xfer_conversation_write(xfer, msg, FALSE); g_free(msg); } @@ -1140,7 +1140,7 @@ } else { - msg = g_strdup_printf(_("File transfer cancelled")); + msg = g_strdup(_("File transfer cancelled")); } purple_xfer_conversation_write(xfer, msg, FALSE); g_free(msg); diff -r 19cd8f986e4a -r 68265bcc8814 libpurple/plugin.c --- a/libpurple/plugin.c Tue Jan 06 03:57:32 2009 +0000 +++ b/libpurple/plugin.c Tue Jan 06 04:09:36 2009 +0000 @@ -374,7 +374,7 @@ */ if (plugin->info->id == NULL || *plugin->info->id == '\0') { - plugin->error = g_strdup_printf(_("This plugin has not defined an ID.")); + plugin->error = g_strdup(_("This plugin has not defined an ID.")); purple_debug_error("plugins", "%s is not loadable: info->id is not defined.\n", plugin->path); plugin->unloadable = TRUE; return plugin; diff -r 19cd8f986e4a -r 68265bcc8814 libpurple/prefs.c --- a/libpurple/prefs.c Tue Jan 06 03:57:32 2009 +0000 +++ b/libpurple/prefs.c Tue Jan 06 04:09:36 2009 +0000 @@ -715,7 +715,8 @@ name = pref_full_name(pref); - purple_debug_info("prefs", "removing pref %s\n", name); + if (prefs_loaded) + purple_debug_info("prefs", "removing pref %s\n", name); g_hash_table_remove(prefs_hash, name); g_free(name); @@ -1449,7 +1450,7 @@ sync_prefs(); } - purple_prefs_disconnect_by_handle(purple_prefs_get_handle()); + prefs_loaded = FALSE; purple_prefs_destroy(); g_hash_table_destroy(prefs_hash); prefs_hash = NULL; diff -r 19cd8f986e4a -r 68265bcc8814 libpurple/protocols/myspace/myspace.c --- a/libpurple/protocols/myspace/myspace.c Tue Jan 06 03:57:32 2009 +0000 +++ b/libpurple/protocols/myspace/myspace.c Tue Jan 06 04:09:36 2009 +0000 @@ -540,7 +540,7 @@ guchar hash_pw[HASH_SIZE]; guchar key[HASH_SIZE]; - gchar *password_utf16le, *password_utf8_lc; + gchar *password_truncated, *password_utf16le, *password_utf8_lc; GString *data; guchar *data_out; size_t data_out_len; @@ -555,10 +555,19 @@ g_return_val_if_fail(password != NULL, NULL); g_return_val_if_fail(response_len != NULL, NULL); + /* + * Truncate password to 10 characters. Their "change password" + * web page doesn't let you enter more than 10 characters, but you + * can enter more than 10 when logging in on myspace.com and they + * truncate it. + */ + password_truncated = g_strndup(password, 10); + /* Convert password to lowercase (required for passwords containing * uppercase characters). MySpace passwords are lowercase, * see ticket #2066. */ - password_utf8_lc = g_utf8_strdown(password, -1); + password_utf8_lc = g_utf8_strdown(password_truncated, -1); + g_free(password_truncated); /* Convert ASCII password to UTF16 little endian */ purple_debug_info("msim", "converting password to UTF-16LE\n"); @@ -567,8 +576,6 @@ &conv_bytes_read, &conv_bytes_written, &conv_error); g_free(password_utf8_lc); - g_return_val_if_fail(conv_bytes_read == strlen(password), NULL); - if (conv_error != NULL) { purple_debug_error("msim", "g_convert password UTF8->UTF16LE failed: %s", diff -r 19cd8f986e4a -r 68265bcc8814 libpurple/protocols/novell/novell.c --- a/libpurple/protocols/novell/novell.c Tue Jan 06 03:57:32 2009 +0000 +++ b/libpurple/protocols/novell/novell.c Tue Jan 06 04:09:36 2009 +0000 @@ -2523,8 +2523,8 @@ /* The conference was not found, must be closed */ chat = purple_find_chat(gc, id); if (chat) { - str = g_strdup_printf(_("This conference has been closed." - " No more messages can be sent.")); + str = g_strdup(_("This conference has been closed." + " No more messages can be sent.")); purple_conversation_write(chat, NULL, str, PURPLE_MESSAGE_SYSTEM, time(NULL)); g_free(str); } diff -r 19cd8f986e4a -r 68265bcc8814 libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Tue Jan 06 03:57:32 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Jan 06 04:09:36 2009 +0000 @@ -739,21 +739,21 @@ static char *oscar_icqstatus(int state) { /* Make a cute little string that shows the status of the dude or dudet */ if (state & AIM_ICQ_STATE_CHAT) - return g_strdup_printf(_("Free For Chat")); + return g_strdup(_("Free For Chat")); else if (state & AIM_ICQ_STATE_DND) - return g_strdup_printf(_("Do Not Disturb")); + return g_strdup(_("Do Not Disturb")); else if (state & AIM_ICQ_STATE_OUT) - return g_strdup_printf(_("Not Available")); + return g_strdup(_("Not Available")); else if (state & AIM_ICQ_STATE_BUSY) - return g_strdup_printf(_("Occupied")); + return g_strdup(_("Occupied")); else if (state & AIM_ICQ_STATE_AWAY) - return g_strdup_printf(_("Away")); + return g_strdup(_("Away")); else if (state & AIM_ICQ_STATE_WEBAWARE) - return g_strdup_printf(_("Web Aware")); + return g_strdup(_("Web Aware")); else if (state & AIM_ICQ_STATE_INVISIBLE) - return g_strdup_printf(_("Invisible")); + return g_strdup(_("Invisible")); else - return g_strdup_printf(_("Online")); + return g_strdup(_("Online")); } static void @@ -1658,10 +1658,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); diff -r 19cd8f986e4a -r 68265bcc8814 libpurple/protocols/oscar/peer.c --- a/libpurple/protocols/oscar/peer.c Tue Jan 06 03:57:32 2009 +0000 +++ b/libpurple/protocols/oscar/peer.c Tue Jan 06 04:09:36 2009 +0000 @@ -859,7 +859,7 @@ { gchar *tmp; PurpleConversation *conv; - tmp = g_strdup_printf(_("Attempting to connect via proxy server.")); + tmp = g_strdup(_("Attempting to connect via proxy server.")); conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, conn->sn); purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL)); diff -r 19cd8f986e4a -r 68265bcc8814 libpurple/protocols/qq/ChangeLog --- a/libpurple/protocols/qq/ChangeLog Tue Jan 06 03:57:32 2009 +0000 +++ b/libpurple/protocols/qq/ChangeLog Tue Jan 06 04:09:36 2009 +0000 @@ -1,3 +1,9 @@ +2008.12.28 - flos + * Fixes #7908 + +2008.12.28 - flos + * References #7908 + 2008.12.25 - flos * References #7821 * Updated authors diff -r 19cd8f986e4a -r 68265bcc8814 libpurple/protocols/qq/qq_network.c --- a/libpurple/protocols/qq/qq_network.c Tue Jan 06 03:57:32 2009 +0000 +++ b/libpurple/protocols/qq/qq_network.c Tue Jan 06 04:09:36 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 */ } diff -r 19cd8f986e4a -r 68265bcc8814 libpurple/protocols/simple/simple.c --- a/libpurple/protocols/simple/simple.c Tue Jan 06 03:57:32 2009 +0000 +++ b/libpurple/protocols/simple/simple.c Tue Jan 06 04:09:36 2009 +0000 @@ -1951,8 +1951,7 @@ if (userserver[1] == NULL || userserver[1][0] == '\0') { purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, - _("Unable to connect to server. Please enter the " - "address of the server you wish to connect to.")); + _("SIP connect server not specified")); return; } diff -r 19cd8f986e4a -r 68265bcc8814 po/bn.po --- a/po/bn.po Tue Jan 06 03:57:32 2009 +0000 +++ b/po/bn.po Tue Jan 06 04:09:36 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 (ইন্দ্রনীল দাশগুপ্ত) , 2005. -# Samia Nimatullah , 2005. -# Tisa Nafisa , 2007. -# Jamil Ahmed , 2007. -# Israt Jahan , 2008. +# Pidgin Bengali translations (bn_BD, bn_IN) # -msgid "" -msgstr "" -"Project-Id-Version: GAIM 2.5.3\n" +# Copyright (C) 2005 INDRANIL DAS GUPTA (ইন্দ্রনীল দাশগুপ্ত) +# Copyright (C) 2005 Samia Nimatullah +# Copyright (C) 2007 Tisa Nafisa +# Copyright (C) 2007 Jamil Ahmed +# Copyright (C) 2008 Israt Jahan +# +# 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" diff -r 19cd8f986e4a -r 68265bcc8814 po/ca.po --- a/po/ca.po Tue Jan 06 03:57:32 2009 +0000 +++ b/po/ca.po Tue Jan 06 04:09:36 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 20:36+0100\n" "Last-Translator: Josep Puigdemont i Casamajó \n" "Language-Team: Catalan \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)" @@ -14748,9 +14756,6 @@ #~ "Podeu obtenir la versió %s de:
http://" #~ "pidgin.im." -#~ msgid "WinGaim Options" -#~ msgstr "Opcions del WinGaim" - #~ msgid "" #~ "%d buddy from group %s was not removed because it belongs to an account " #~ "which is disabled or offline. This buddy and the group were not " @@ -16010,62 +16015,18 @@ #~ msgid "Error communicating with Gadu-Gadu server" #~ msgstr "S'ha produït un error en comunicar amb el servidor Gadu-Gadu" -#~ msgid "" -#~ "Gaim was unable to complete your request due to a problem communicating " -#~ "with the Gadu-Gadu HTTP server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut completar la vostra petició perquè hi ha hagut un " -#~ "problema en la comunicació amb el servidor HTTP Gadu-Gadu. Torneu-ho a " -#~ "intentar més tard." - #~ msgid "Unable to import Gadu-Gadu buddy list" #~ msgstr "No s'ha pogut importar la llista d'amics de Gadu-Gadu" -#~ msgid "" -#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server. Please " -#~ "try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut connectar-se al servidor de llistes d'amics del Gadu-" -#~ "Gadu. Torneu-ho a intentar més tard." - -#~ msgid "" -#~ "Gaim was unable to connect to the buddy list server. Please try again " -#~ "later." -#~ msgstr "" -#~ "El Gaim no s'ha pogut connectar al servidor de llistes d'amics. Torneu-ho " -#~ "a intentar més tard." - #~ msgid "Unable to delete Gadu-Gadu buddy list" #~ msgstr "No s'ha pogut suprimir la llista d'amics de Gadu-Gadu" #~ msgid "Unable to access directory" #~ msgstr "No s'ha pogut accedir al directori" -#~ msgid "" -#~ "Gaim was unable to search the Directory because it was unable to connect " -#~ "to the directory server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut cercar al directori perquè no s'hi ha pogut " -#~ "connectar. Torneu-ho a intentar més tard." - -#~ msgid "" -#~ "Gaim was unable to change your password due to an error connecting to the " -#~ "Gadu-Gadu server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut canviar la contrasenya a causa d'un error mentre es " -#~ "comunicava amb el servidor Gadu-Gadu. Torneu-ho a intentar més tard." - #~ msgid "Unable to access user profile." #~ msgstr "No s'ha pogut accedir al perfil de l'usuari." -#~ msgid "" -#~ "Gaim was unable to access this user's profile due to an error connecting " -#~ "to the directory server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut accedir al perfil de l'usuari atès que s'ha produït " -#~ "un error en connectar-se al servidor de directori. Torneu-ho a intentar " -#~ "més tard." - #~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them." #~ msgstr "L'usuari %s (%s%s%s%s%s) vol que l'autoritzeu." @@ -16207,13 +16168,6 @@ #~ msgid "/Buddies/Log Out" #~ msgstr "/Amics/Desconnecta" -#~ msgid "" -#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte " -#~ "(1,048,576 bytes)." -#~ msgstr "" -#~ "El Gaim no pot enviar fitxer a través de Yahoo! que siguin més grans d'un " -#~ "Megabyte (1.048.576 bytes)." - #~ msgid "Miscellaneous error" #~ msgstr "Error miscel·lani" @@ -16241,12 +16195,6 @@ #~ msgid "MSN error for account %s" #~ msgstr "S'ha produït un error MSN per al compte %s" -#~ msgid "Moving Gaim Settings.." -#~ msgstr "S'està movent les opcions del Gaim..." - -#~ msgid "Moving Gaim user settings to: " -#~ msgstr "S'està movent les opcions d'usuaris del Gaim a: " - #~ msgid "Notification" #~ msgstr "Notificació" diff -r 19cd8f986e4a -r 68265bcc8814 po/ca@valencia.po --- a/po/ca@valencia.po Tue Jan 06 03:57:32 2009 +0000 +++ b/po/ca@valencia.po Tue Jan 06 04:09:36 2009 +0000 @@ -34,7 +34,7 @@ "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" +"PO-Revision-Date: 2009-01-05 20:36+0100\n" "Last-Translator: Josep Puigdemont i Casamajó \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -14739,9 +14739,6 @@ #~ "Podeu obtenir la versió %s de:
http://" #~ "pidgin.im." -#~ msgid "WinGaim Options" -#~ msgstr "Opcions del WinGaim" - #~ msgid "" #~ "%d buddy from group %s was not removed because it belongs to an account " #~ "which is disabled or offline. This buddy and the group were not " @@ -16001,62 +15998,18 @@ #~ msgid "Error communicating with Gadu-Gadu server" #~ msgstr "S'ha produït un error en comunicar amb el servidor Gadu-Gadu" -#~ msgid "" -#~ "Gaim was unable to complete your request due to a problem communicating " -#~ "with the Gadu-Gadu HTTP server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut completar la vostra petició perquè hi ha hagut un " -#~ "problema en la comunicació amb el servidor HTTP Gadu-Gadu. Torneu-ho a " -#~ "intentar més tard." - #~ msgid "Unable to import Gadu-Gadu buddy list" #~ msgstr "No s'ha pogut importar la llista d'amics de Gadu-Gadu" -#~ msgid "" -#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server. Please " -#~ "try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut connectar-se al servidor de llistes d'amics del Gadu-" -#~ "Gadu. Torneu-ho a intentar més tard." - -#~ msgid "" -#~ "Gaim was unable to connect to the buddy list server. Please try again " -#~ "later." -#~ msgstr "" -#~ "El Gaim no s'ha pogut connectar al servidor de llistes d'amics. Torneu-ho " -#~ "a intentar més tard." - #~ msgid "Unable to delete Gadu-Gadu buddy list" #~ msgstr "No s'ha pogut suprimir la llista d'amics de Gadu-Gadu" #~ msgid "Unable to access directory" #~ msgstr "No s'ha pogut accedir al directori" -#~ msgid "" -#~ "Gaim was unable to search the Directory because it was unable to connect " -#~ "to the directory server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut cercar al directori perquè no s'hi ha pogut " -#~ "connectar. Torneu-ho a intentar més tard." - -#~ msgid "" -#~ "Gaim was unable to change your password due to an error connecting to the " -#~ "Gadu-Gadu server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut canviar la contrasenya a causa d'un error mentre es " -#~ "comunicava amb el servidor Gadu-Gadu. Torneu-ho a intentar més tard." - #~ msgid "Unable to access user profile." #~ msgstr "No s'ha pogut accedir al perfil de l'usuari." -#~ msgid "" -#~ "Gaim was unable to access this user's profile due to an error connecting " -#~ "to the directory server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut accedir al perfil de l'usuari atès que s'ha produït " -#~ "un error en connectar-se al servidor de directori. Torneu-ho a intentar " -#~ "més tard." - #~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them." #~ msgstr "L'usuari %s (%s%s%s%s%s) vol que l'autoritzeu." @@ -16198,13 +16151,6 @@ #~ msgid "/Buddies/Log Out" #~ msgstr "/Amics/Desconnecta" -#~ msgid "" -#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte " -#~ "(1,048,576 bytes)." -#~ msgstr "" -#~ "El Gaim no pot enviar fitxer a través de Yahoo! que siguin més grans d'un " -#~ "Megabyte (1.048.576 bytes)." - #~ msgid "Miscellaneous error" #~ msgstr "Error miscel·lani" @@ -16232,12 +16178,6 @@ #~ msgid "MSN error for account %s" #~ msgstr "S'ha produït un error MSN per al compte %s" -#~ msgid "Moving Gaim Settings.." -#~ msgstr "S'està movent les opcions del Gaim..." - -#~ msgid "Moving Gaim user settings to: " -#~ msgstr "S'està movent les opcions d'usuaris del Gaim a: " - #~ msgid "Notification" #~ msgstr "Notificació" diff -r 19cd8f986e4a -r 68265bcc8814 po/de.po --- a/po/de.po Tue Jan 06 03:57:32 2009 +0000 +++ b/po/de.po Tue Jan 06 04:09:36 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 \n" -"Language-Team: Deutsch \n" +"POT-Creation-Date: 2009-01-05 17:34+0100\n" +"PO-Revision-Date: 2009-01-05 17:34+0100\n" +"Last-Translator: Jochen Kemnade \n" +"Language-Team: German \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. @@ -4168,6 +4168,9 @@ msgid "Re-initializing Stream" msgstr "Initialisiere Stream nochmal" +msgid "Server doesn't support blocking" +msgstr "Server unterstützt kein Blockieren" + msgid "Not Authorized" msgstr "Nicht autorisiert" @@ -6487,12 +6490,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 "" -"Die Verbindung kann schnell unterbrochen werden. Vielleicht wollen Sie TOC " -"benutzen bis dieser Fehler behoben wurde. Suchen Sie auf %s nach Updates." +msgid "You may be disconnected shortly. If so, check %s for updates." +msgstr "" +"Sie werden eventuell gleich abgemeldet. In diesem Fall, überprüfen Sie %s " +"auf Updates." msgid "Unable to get a valid AIM login hash." msgstr "Konnte keinen gültigen AIM Login-Hash bekommen." @@ -9263,6 +9264,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 diff -r 19cd8f986e4a -r 68265bcc8814 po/fr.po --- a/po/fr.po Tue Jan 06 03:57:32 2009 +0000 +++ b/po/fr.po Tue Jan 06 04:09:36 2009 +0000 @@ -4,7 +4,7 @@ # Copyright (C) 2002, Stéphane Pontier # Copyright (C) 2002, Stéphane Wirtel # Copyright (C) 2002, Loïc Jeannin -# Copyright (C) 2002-2008, Éric Boumaour +# Copyright (C) 2002-2009, Éric Boumaour # # 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 \n" "Language-Team: fr \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" diff -r 19cd8f986e4a -r 68265bcc8814 po/hu.po --- a/po/hu.po Tue Jan 06 03:57:32 2009 +0000 +++ b/po/hu.po Tue Jan 06 04:09:36 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 , 2003. -# Gabor Kelemen , 2005, 2006, 2007, 2008. +# Gabor Kelemen , 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 \n" "Language-Team: Hungarian \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