# HG changeset patch # User Etan Reisner # Date 1235014911 0 # Node ID b93f3d152de698eda53eb1080aa38aeeeff66144 # Parent 4ea0f3edd973c8de928a8470b968bf04909df7d6# Parent bb43dea906234be20ffc28bd28e6c87a489d4966 merge of '3cf23371e3e019d9e8de26e38bab170c5ed4aca1' and 'cee63f93d8c1fdcf74c596d5958b744aa0638042' diff -r bb43dea90623 -r b93f3d152de6 finch/plugins/gntclipboard.c --- a/finch/plugins/gntclipboard.c Wed Feb 18 04:23:31 2009 +0000 +++ b/finch/plugins/gntclipboard.c Thu Feb 19 03:41:51 2009 +0000 @@ -22,7 +22,7 @@ #include "internal.h" #include -#define PLUGIN_STATIC_NAME "GntClipboard" +#define PLUGIN_STATIC_NAME GntClipboard #ifdef HAVE_X11 #include diff -r bb43dea90623 -r b93f3d152de6 finch/plugins/gntgf.c --- a/finch/plugins/gntgf.c Wed Feb 18 04:23:31 2009 +0000 +++ b/finch/plugins/gntgf.c Thu Feb 19 03:41:51 2009 +0000 @@ -21,7 +21,7 @@ #include "internal.h" -#define PLUGIN_STATIC_NAME "GntGf" +#define PLUGIN_STATIC_NAME GntGf #define PREFS_PREFIX "/plugins/gnt/gntgf" #define PREFS_EVENT PREFS_PREFIX "/events" diff -r bb43dea90623 -r b93f3d152de6 finch/plugins/grouping.c --- a/finch/plugins/grouping.c Wed Feb 18 04:23:31 2009 +0000 +++ b/finch/plugins/grouping.c Thu Feb 19 03:41:51 2009 +0000 @@ -383,6 +383,6 @@ { } -PURPLE_INIT_PLUGIN(ignore, init_plugin, info) +PURPLE_INIT_PLUGIN(grouping, init_plugin, info) diff -r bb43dea90623 -r b93f3d152de6 finch/plugins/lastlog.c --- a/finch/plugins/lastlog.c Wed Feb 18 04:23:31 2009 +0000 +++ b/finch/plugins/lastlog.c Thu Feb 19 03:41:51 2009 +0000 @@ -19,7 +19,7 @@ */ -#define PLUGIN_STATIC_NAME "GntLastlog" +#define PLUGIN_STATIC_NAME GntLastlog #include "internal.h" diff -r bb43dea90623 -r b93f3d152de6 libpurple/plugins/autoaccept.c --- a/libpurple/plugins/autoaccept.c Wed Feb 18 04:23:31 2009 +0000 +++ b/libpurple/plugins/autoaccept.c Thu Feb 19 03:41:51 2009 +0000 @@ -21,7 +21,7 @@ #define PLUGIN_ID "core-plugin_pack-autoaccept" #define PLUGIN_NAME N_("Autoaccept") -#define PLUGIN_STATIC_NAME "Autoaccept" +#define PLUGIN_STATIC_NAME Autoaccept #define PLUGIN_SUMMARY N_("Auto-accept file transfer requests from selected users.") #define PLUGIN_DESCRIPTION N_("Auto-accept file transfer requests from selected users.") #define PLUGIN_AUTHOR "Sadrul H Chowdhury " diff -r bb43dea90623 -r b93f3d152de6 libpurple/plugins/codeinline.c --- a/libpurple/plugins/codeinline.c Wed Feb 18 04:23:31 2009 +0000 +++ b/libpurple/plugins/codeinline.c Thu Feb 19 03:41:51 2009 +0000 @@ -95,4 +95,4 @@ { } -PURPLE_INIT_PLUGIN(urlcatcher, init_plugin, info) +PURPLE_INIT_PLUGIN(codeinline, init_plugin, info) diff -r bb43dea90623 -r b93f3d152de6 libpurple/plugins/newline.c --- a/libpurple/plugins/newline.c Wed Feb 18 04:23:31 2009 +0000 +++ b/libpurple/plugins/newline.c Thu Feb 19 03:41:51 2009 +0000 @@ -133,4 +133,4 @@ purple_prefs_add_bool("/plugins/core/newline/chat", TRUE); } -PURPLE_INIT_PLUGIN(lastseen, init_plugin, info) +PURPLE_INIT_PLUGIN(newline, init_plugin, info) diff -r bb43dea90623 -r b93f3d152de6 libpurple/plugins/offlinemsg.c --- a/libpurple/plugins/offlinemsg.c Wed Feb 18 04:23:31 2009 +0000 +++ b/libpurple/plugins/offlinemsg.c Thu Feb 19 03:41:51 2009 +0000 @@ -21,7 +21,7 @@ #define PLUGIN_ID "core-plugin_pack-offlinemsg" #define PLUGIN_NAME N_("Offline Message Emulation") -#define PLUGIN_STATIC_NAME "offlinemsg" +#define PLUGIN_STATIC_NAME offlinemsg #define PLUGIN_SUMMARY N_("Save messages sent to an offline user as pounce.") #define PLUGIN_DESCRIPTION N_("Save messages sent to an offline user as pounce.") #define PLUGIN_AUTHOR "Sadrul H Chowdhury " diff -r bb43dea90623 -r b93f3d152de6 libpurple/protocols/msn/contact.c --- a/libpurple/protocols/msn/contact.c Wed Feb 18 04:23:31 2009 +0000 +++ b/libpurple/protocols/msn/contact.c Thu Feb 19 03:41:51 2009 +0000 @@ -205,6 +205,7 @@ purple_debug_error("msn", "Operation {%s} failed. No response received from server.\n", msn_contact_operation_str(state->action)); + msn_session_set_error(state->session, MSN_ERROR_BAD_BLIST, NULL); return; } @@ -916,8 +917,7 @@ /* msn_get_address_book(session, NULL, NULL); */ - msn_session_disconnect(session); - purple_connection_error_reason(session->account->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Unable to retrieve MSN Address Book")); + msn_session_set_error(session, MSN_ERROR_BAD_BLIST, NULL); } } diff -r bb43dea90623 -r b93f3d152de6 libpurple/protocols/msn/state.c --- a/libpurple/protocols/msn/state.c Wed Feb 18 04:23:31 2009 +0000 +++ b/libpurple/protocols/msn/state.c Thu Feb 19 03:41:51 2009 +0000 @@ -189,12 +189,12 @@ purple_debug_info("msn", "msn get PSM\n"); payloadNode = xmlnode_from_str(xml_str, len); - if (!payloadNode){ + if (!payloadNode) { purple_debug_error("msn", "PSM XML parse Error!\n"); return NULL; } psmNode = xmlnode_get_child(payloadNode, "PSM"); - if (psmNode == NULL){ + if (psmNode == NULL) { purple_debug_info("msn", "No PSM status Node"); xmlnode_free(payloadNode); return NULL; @@ -213,7 +213,7 @@ char *ret; PurpleStatus *status = purple_presence_get_status(presence, "tune"); if (!status || !purple_status_is_active(status)) - return g_strdup_printf("\\0Music\\00\\0\\0"); + return NULL; title = purple_status_get_attr_string(status, PURPLE_TUNE_TITLE); game = purple_status_get_attr_string(status, "game"); @@ -234,7 +234,7 @@ else if (office && *office) ret = g_strdup_printf("\\0Office\\01\\0Editing {0}\\0%s\\0", office); else - ret = g_strdup_printf("\\0Music\\00\\0\\0"); + ret = NULL; return ret; } diff -r bb43dea90623 -r b93f3d152de6 libpurple/protocols/silc10/silc.c --- a/libpurple/protocols/silc10/silc.c Wed Feb 18 04:23:31 2009 +0000 +++ b/libpurple/protocols/silc10/silc.c Thu Feb 19 03:41:51 2009 +0000 @@ -1956,4 +1956,4 @@ #endif } -PURPLE_INIT_PLUGIN(silc, init_plugin, info); +PURPLE_INIT_PLUGIN(silc10, init_plugin, info); diff -r bb43dea90623 -r b93f3d152de6 pidgin/plugins/convcolors.c --- a/pidgin/plugins/convcolors.c Wed Feb 18 04:23:31 2009 +0000 +++ b/pidgin/plugins/convcolors.c Thu Feb 19 03:41:51 2009 +0000 @@ -21,7 +21,7 @@ #define PLUGIN_ID "gtk-plugin_pack-convcolors" #define PLUGIN_NAME N_("Conversation Colors") -#define PLUGIN_STATIC_NAME "Conversation Colors" +#define PLUGIN_STATIC_NAME ConversationColors #define PLUGIN_SUMMARY N_("Customize colors in the conversation window") #define PLUGIN_DESCRIPTION N_("Customize colors in the conversation window") #define PLUGIN_AUTHOR "Sadrul H Chowdhury " diff -r bb43dea90623 -r b93f3d152de6 pidgin/plugins/markerline.c --- a/pidgin/plugins/markerline.c Wed Feb 18 04:23:31 2009 +0000 +++ b/pidgin/plugins/markerline.c Thu Feb 19 03:41:51 2009 +0000 @@ -21,7 +21,7 @@ #define PLUGIN_ID "gtk-plugin_pack-markerline" #define PLUGIN_NAME N_("Markerline") -#define PLUGIN_STATIC_NAME "Markerline" +#define PLUGIN_STATIC_NAME Markerline #define PLUGIN_SUMMARY N_("Draw a line to indicate new messages in a conversation.") #define PLUGIN_DESCRIPTION N_("Draw a line to indicate new messages in a conversation.") #define PLUGIN_AUTHOR "Sadrul H Chowdhury " diff -r bb43dea90623 -r b93f3d152de6 pidgin/plugins/pidgininc.c --- a/pidgin/plugins/pidgininc.c Wed Feb 18 04:23:31 2009 +0000 +++ b/pidgin/plugins/pidgininc.c Thu Feb 19 03:41:51 2009 +0000 @@ -109,7 +109,6 @@ NULL, /**< extra_info */ NULL, /**< prefs_info */ NULL, /**< actions */ - /* padding */ NULL, NULL, diff -r bb43dea90623 -r b93f3d152de6 pidgin/plugins/timestamp.c --- a/pidgin/plugins/timestamp.c Wed Feb 18 04:23:31 2009 +0000 +++ b/pidgin/plugins/timestamp.c Thu Feb 19 03:41:51 2009 +0000 @@ -229,4 +229,4 @@ purple_prefs_add_int("/plugins/gtk/timestamp/interval", interval * 1000); } -PURPLE_INIT_PLUGIN(interval, init_plugin, info) +PURPLE_INIT_PLUGIN(timestamp, init_plugin, info) diff -r bb43dea90623 -r b93f3d152de6 po/de.po --- a/po/de.po Wed Feb 18 04:23:31 2009 +0000 +++ b/po/de.po Thu Feb 19 03:41:51 2009 +0000 @@ -11,15 +11,15 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-06 15:18+0100\n" -"PO-Revision-Date: 2009-02-06 15:15+0100\n" -"Last-Translator: Bjoern Voigt \n" -"Language-Team: Deutsch \n" +"POT-Creation-Date: 2009-02-18 21:09+0100\n" +"PO-Revision-Date: 2009-02-18 21:09+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. @@ -36,7 +36,7 @@ "Usage: %s [OPTION]...\n" "\n" " -c, --config=DIR use DIR for config files\n" -" -d, --debug print debugging messages to stdout\n" +" -d, --debug print debugging messages to stderr\n" " -h, --help display this help and exit\n" " -n, --nologin don't automatically login\n" " -v, --version display the current version and exit\n" @@ -45,7 +45,7 @@ "Benutzung: %s [OPTION]...\n" "\n" " -c, --config=VERZ benutze VERZ als Konfigurationsverzeichnis\n" -" -d, --debug drucke Debugging-Meldungen nach stdout\n" +" -d, --debug drucke Debugging-Meldungen nach stderr\n" " -h, --help zeigt diese Hilfe und beendet das Programm\n" " -n, --nologin nicht automatisch anmelden\n" " -v, --version zeigt aktuelle Version und beendet das Programm\n" @@ -1172,7 +1172,6 @@ msgid "Change status to" msgstr "Ändere Status zu" -#. Conversations msgid "Conversations" msgstr "Unterhaltungen" @@ -4033,7 +4032,7 @@ msgid "Nick changing not supported in non-MUC chatrooms" msgstr "" -"Die Änderung des Nick-Namens wird in nicht-MUC Chaträumen nicht unterstützt" +"Die Änderung des Nick-Namens wird in nicht-MUC-Chaträumen nicht unterstützt" msgid "Error retrieving room list" msgstr "Fehler beim Empfangen der Raumliste" @@ -6975,6 +6974,7 @@ msgid "Get AIM Info" msgstr "AIM-Info" +#. We only do this if the user is in our buddy list msgid "Edit Buddy Comment" msgstr "Buddy-Kommentar bearbeiten" @@ -7626,6 +7626,9 @@ msgid "Show server news" msgstr "Server-News anzeigen" +msgid "Show chat room when msg comes" +msgstr "Chatraum zeigen, wenn Nachricht empfangen wird" + msgid "Keep alive interval (seconds)" msgstr "Intervall zum Aufrechterhalten der Verbindung (Sekunden)" @@ -11365,6 +11368,9 @@ msgid "Macedonian" msgstr "Makedonisch" +msgid "Mongolian" +msgstr "Mongolisch" + msgid "Bokmål Norwegian" msgstr "Bokmål Norwegisch" @@ -11478,8 +11484,27 @@ "geschützt. Die Datei 'COPYRIGHT' enthält die komplette Liste der " "Mitwirkenden. Wir übernehmen keine Haftung für dieses Programm.

" -msgid "IRC: #pidgin on irc.freenode.net

" -msgstr "IRC: #pidgin auf irc.freenode.net

" +msgid "" +"FAQ: http://developer.pidgin.im/wiki/FAQ

" +msgstr "" +"FAQ: http://developer.pidgin.im/wiki/FAQ

" + +msgid "" +"Help via e-mail: support@pidgin.im

" +msgstr "" +"Hilfe per E-Mail: support@pidgin.im

" + +msgid "" +"IRC Channel: #pidgin on irc.freenode.net

" +msgstr "" +"IRC-Kanal: #pidgin auf irc.freenode.net

" + +msgid "XMPP MUC: devel@conference.pidgin.im

" +msgstr "XMPP-MUC: devel@conference.pidgin.im

" msgid "Current Developers" msgstr "Aktuelle Entwickler" @@ -12143,6 +12168,9 @@ msgid "Pidgin" msgstr "Pidgin" +msgid "Exiting because another libpurple client is already running.\n" +msgstr "Wird geschlossen, da bereits ein anderer libpurple-Client läuft\n" + msgid "Open All Messages" msgstr "Alle Nachrichten öffnen" @@ -12482,6 +12510,10 @@ msgid "No proxy" msgstr "Kein Proxy" +#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings +msgid "Use remote DNS with SOCKS4 proxies" +msgstr "Remote-DNS mit SOCKS4-Proxys benuten" + msgid "_User:" msgstr "_Benutzer:" @@ -13938,9 +13970,6 @@ msgid "Only when docked" msgstr "Nur wenn angedockt" -msgid "_Flash window when chat messages are received" -msgstr "_Fenster blinkt, wenn Chat-Nachrichten empfangen werden" - msgid "Windows Pidgin Options" msgstr "Windows-Pidgin-Optionen"