# HG changeset patch # User Richard Laager # Date 1189966212 0 # Node ID bd60afa72fcedae136c1488999eed20785be707d # Parent 8a4748cbf8446b7ee7353b4556c3612dab1ca57f# Parent 6e2bd948a897cb81dfc4fadbcdbc2d7d948a670f propagate from branch 'im.pidgin.pidgin' (head b0967247f79b18b245cdaaaf3f803d6834aea19a) to branch 'im.pidgin.cpw.khc.msnp14' (head 208fd9d013da9f505b94f0cd9f05e9a04dd8edc8) diff -r 8a4748cbf844 -r bd60afa72fce ChangeLog --- a/ChangeLog Sun Sep 16 18:07:46 2007 +0000 +++ b/ChangeLog Sun Sep 16 18:10:12 2007 +0000 @@ -1,20 +1,54 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.2.0: +Version 2.2.1: + http://developer.pidgin.im/query?status=closed&milestone=2.2.1 + + Pidgin: + * When aliasing someone to an alias that already exists in the + same group, offer to merge the buddies into the same contact + * It's possible to keep a conversation (chat/IM) open even after closing + the conversation window/tab. + * A music emblem is displayed in the buddy list for a buddy if we know she + is listening to some soothing music. + * 'Move to' menu in buddy list context menu for moving buddies to + other groups + * Move "Smiley" to the top-level of the toolbar + +Version 2.2.0 (09/13/2007): + http://developer.pidgin.im/query?status=closed&milestone=2.2.0 + Libpurple: * New protocol plugin: MySpaceIM (Jeff Connelly, Google Summer of Code) + * XMPP enhancements. See + http://www.adiumx.com/blog/2007/07/soc-xmpp-update.php (Andreas + Monitzer, Google Summer of Code for Adium) + * Certificate management. Libpurple will validate certificates on + SSL-encrypted protocols (William Ehlhardt, Google Summer of Code) + * Some adjustments were made to fix sending messages when using + the MSN HTTP method. (Laszlo Pandy) + * Yahoo! Chat is fixed. + * Some AIM file transfer issues between Pidgin and other clients + have been fixed. (Kyryll A Mirnenko) + * Properly restore idle status and time for AIM and ICQ accounts + when they reconnect after being disconnected. Pidgin: - * Insert Horizontal Rules and Strikethrough text from toolbar + * Insert Horizontal Rules and Strikethrough text from toolbar. * Option to show protocol icons in the buddy list, from the - Buddies > Show menu (Justin Heiner) - * Ability to build with native, non-X11 GTK+ on OSX (Anders + Buddies > Show menu. (Justin Heiner) + * Ability to build with native, non-X11 GTK+ on OSX. (Anders Hasselqvist) - * Remember the 'Enable Sounds' setting for a conversation + * Remember the 'Enable Sounds' setting for a conversation. + * Right-clicking the empty space in the formatting toolbar + allows you to toggle back to the old "ungrouped" version. + * Protocols supporting account registration via Pidgin now show + a descriptive checkbox instead of a vague "Register" button. + * Fixed a bug where a tab would be shown on single conversations + when tabs were disabled. Finch: - * Per-conversation mute and logging options (accessible from the menu) + * Per-conversation mute and logging options (accessible from the menu). version 2.1.1 (08/20/2007): Yahoo: diff -r 8a4748cbf844 -r bd60afa72fce ChangeLog.API --- a/ChangeLog.API Sun Sep 16 18:07:46 2007 +0000 +++ b/ChangeLog.API Sun Sep 16 18:10:12 2007 +0000 @@ -1,6 +1,6 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -Version 2.2.0 (??/??/????): +Version 2.2.0 (09/13/2007): libpurple: Added: * PURPLE_MESSAGE_INVISIBLE flag, which can be used by @@ -18,6 +18,10 @@ * purple_conversation_get_message_history() to retrieve a list of PurpleConvMessage's in a conversation, and purple_conversation_clear_message_history to clear the history. + * purple_certificate_* functions in libpurple/certificate.h - "A public-key certificate API" + * purple_ssl_get_peer_certificates() and associated field in PurpleSslOps to retrieve a server's presented SSL certificate chain. + * PurpleSslConnection::verifier to provide a "how to verify the peer's certificates" callback to the SSL handlers. See certificate.h for more on this. + * purple_ssl_connect_with_host_fd() to create an SSL connection from a file descriptor and provide a hostname with it to authenticate the peer against. Changed: * purple_prefs_load is now called within purple_prefs_init. @@ -33,6 +37,8 @@ * pidgin_conv_attach_to_conversation, to reattach the Pidgin UI to a conversation * conversation-hiding and conversation-displayed signals. + * pidgin_text_combo_box_entry_new, pidgin_text_combo_box_entry_get_text + and pidgin_text_combo_box_entry_set_text Changed: * pidgin_conversations_fill_menu now also adds a separator and a 'Show diff -r 8a4748cbf844 -r bd60afa72fce ChangeLog.win32 --- a/ChangeLog.win32 Sun Sep 16 18:07:46 2007 +0000 +++ b/ChangeLog.win32 Sun Sep 16 18:10:12 2007 +0000 @@ -1,4 +1,4 @@ -version 2.2.0 (??/??/2007): +version 2.2.0 (09/13/2007): * Updated gtkspell to 2.0.11 * Upgrade SILC to use the 1.1.2 toolkit diff -r 8a4748cbf844 -r bd60afa72fce NEWS --- a/NEWS Sun Sep 16 18:07:46 2007 +0000 +++ b/NEWS Sun Sep 16 18:10:12 2007 +0000 @@ -1,5 +1,24 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +2.2.0 (9/13/2007): + Sean: 2.2.0 contains the results of several major Google Summer + of Code branches bringing some new, extraordinary features. We + have a new protocol, MySpaceIM, a bunch of new features for an + existing protocol, XMPP, and nifty new certificate management + to make sure your IM server is who it says it is. + + Ka-Hing: A number of you noticed crashes when dragging windows + around when certain options are enabled. Well, that was my fault, + and Sadrul fixed it. So Props to him and poos to me. I haven't + done much for this release, but the next one should contain + something that I helped work on. Hint: students are cheap slave + coders! + + Kevin: I haven't really been coding much in Pidgin, and this + release is no exception, but I will be working on getting our + wonderful web site to be a little more functional by next + release. I promise! + 2.1.1 (8/20/2007): Sean: Continuing our schedule of frequent releases, Pidgin 2.1.1 is out. In it, we've addressed a lot of UI issues from our diff -r 8a4748cbf844 -r bd60afa72fce autogen.sh --- a/autogen.sh Sun Sep 16 18:07:46 2007 +0000 +++ b/autogen.sh Sun Sep 16 18:10:12 2007 +0000 @@ -58,7 +58,7 @@ done libtoolize -c -f --automake -glib-gettextize --force --copy +glib-gettextize --force --copy --previous intltoolize --force --copy aclocal $ACLOCAL_FLAGS || exit; autoheader || exit; diff -r 8a4748cbf844 -r bd60afa72fce configure.ac --- a/configure.ac Sun Sep 16 18:07:46 2007 +0000 +++ b/configure.ac Sun Sep 16 18:10:12 2007 +0000 @@ -46,7 +46,7 @@ m4_define([purple_lt_current], [2]) m4_define([purple_major_version], [2]) m4_define([purple_minor_version], [2]) -m4_define([purple_micro_version], [0]) +m4_define([purple_micro_version], [1]) m4_define([purple_version_suffix], [devel]) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) @@ -55,7 +55,7 @@ m4_define([gnt_lt_current], [2]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [2]) -m4_define([gnt_micro_version], [0]) +m4_define([gnt_micro_version], [1]) m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) @@ -352,13 +352,19 @@ dnl ####################################################################### if test "x$with_x" = "xyes" ; then PKG_CHECK_MODULES(X11, x11, - [AC_DEFINE(HAVE_X, 1, [Define to 1 if you have X11])], + [AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11])], [AC_MSG_RESULT(no) - with_x=no]) + if test "x$x_incpath_add" != "x" -a "x$x_libpath_add" != "x"; then + X11_LIBS="$x_libpath_add" + X11_CFLAGS="$x_incpath_add" + else + with_x=no + fi + ]) AC_SUBST(X11_LIBS) AC_SUBST(X11_CFLAGS) fi - + dnl ####################################################################### dnl # Check for XScreenSaver dnl ####################################################################### @@ -2244,7 +2250,6 @@ finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc - finch/libgnt/pygnt/Makefile finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in diff -r 8a4748cbf844 -r bd60afa72fce finch/finch.h --- a/finch/finch.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/finch.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,7 +1,8 @@ /** * @defgroup finch Finch (GNT User Interface) - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntaccount.c --- a/finch/gntaccount.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntaccount.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntaccount.c GNT Account API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntaccount.h --- a/finch/gntaccount.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntaccount.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntaccount.h GNT Account API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntblist.c --- a/finch/gntblist.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntblist.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntblist.c GNT BuddyList API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntblist.h --- a/finch/gntblist.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntblist.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntblist.h GNT BuddyList API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntcertmgr.c --- a/finch/gntcertmgr.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntcertmgr.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntcertmgr.c GNT Certificate Manager API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntcertmgr.h --- a/finch/gntcertmgr.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntcertmgr.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntcertmgr.h GNT Certificate Manager API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntconn.c --- a/finch/gntconn.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntconn.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntconn.c GNT Connection API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -104,10 +105,11 @@ { FinchAutoRecon *info; PurpleAccount *account = purple_connection_get_account(gc); - - info = g_hash_table_lookup(hash, account); + GList *list; if (!gc->wants_to_die) { + info = g_hash_table_lookup(hash, account); + if (info == NULL) { info = g_new0(FinchAutoRecon, 1); g_hash_table_insert(hash, account, info); @@ -140,6 +142,17 @@ g_free(secondary); purple_account_set_enabled(account, FINCH_UI, FALSE); } + + /* If we have any open chats, we probably want to rejoin when we get back online. */ + list = purple_get_chats(); + while (list) { + PurpleConversation *conv = list->data; + list = list->next; + if (conv->account != account || + purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) + continue; + purple_conversation_set_data(conv, "want-to-rejoin", GINT_TO_POINTER(TRUE)); + } } static void diff -r 8a4748cbf844 -r bd60afa72fce finch/gntconn.h --- a/finch/gntconn.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntconn.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntconn.h GNT Connection API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntconv.c --- a/finch/gntconv.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntconv.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntconv.c GNT Conversation API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -310,13 +311,41 @@ static void account_signed_on_off(PurpleConnection *gc, gpointer null) { - GList *ims = purple_get_ims(); - while (ims) { - PurpleConversation *conv = ims->data; + GList *list = purple_get_ims(); + while (list) { + PurpleConversation *conv = list->data; PurpleConversation *cc = find_conv_with_contact(conv->account, conv->name); if (cc) generate_send_to_menu(cc->ui_data); - ims = ims->next; + list = list->next; + } + + if (PURPLE_CONNECTION_IS_CONNECTED(gc)) { + /* We just signed on. Let's see if there's any chat that we have open, + * and hadn't left before the disconnect. */ + list = purple_get_chats(); + while (list) { + PurpleConversation *conv = list->data; + gboolean del = FALSE; + PurpleChat *chat; + + list = list->next; + if (conv->account != gc->account || + !purple_conversation_get_data(conv, "want-to-rejoin")) + continue; + + chat = purple_blist_find_chat(conv->account, conv->name); + if (chat == NULL) { + GHashTable *hash = NULL; + if (PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults != NULL) + hash = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, conv->name); + chat = purple_chat_new(gc->account, conv->name, hash); + del = TRUE; + } + serv_join_chat(gc, chat->components); + if (del) + purple_blist_remove_chat(chat); + } } } diff -r 8a4748cbf844 -r bd60afa72fce finch/gntconv.h --- a/finch/gntconv.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntconv.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntconv.h GNT Conversation API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntdebug.c --- a/finch/gntdebug.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntdebug.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntdebug.c GNT Debug API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntdebug.h --- a/finch/gntdebug.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntdebug.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntdebug.h GNT Debug API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntft.c --- a/finch/gntft.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntft.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntft.c GNT File Transfer UI * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntft.h --- a/finch/gntft.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntft.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntft.h GNT File Transfer UI * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntidle.h --- a/finch/gntidle.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntidle.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntidle.h GNT Idle API * @ingroup finch - * - * finch + */ + +/* finch * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntnotify.c --- a/finch/gntnotify.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntnotify.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntnotify.c GNT Notify API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntnotify.h --- a/finch/gntnotify.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntnotify.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntnotify.h GNT Notify API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntplugin.c --- a/finch/gntplugin.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntplugin.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntplugin.c GNT Plugins API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntplugin.h --- a/finch/gntplugin.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntplugin.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntplugin.h GNT Plugins API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntpounce.c --- a/finch/gntpounce.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntpounce.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntpounce.c GNT Buddy Pounce API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntpounce.h --- a/finch/gntpounce.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntpounce.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntpounce.h GNT Buddy Pounce API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntprefs.c --- a/finch/gntprefs.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntprefs.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntprefs.c GNT Preferences API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntprefs.h --- a/finch/gntprefs.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntprefs.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntprefs.h GNT Preferences API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntrequest.c --- a/finch/gntrequest.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntrequest.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntrequest.c GNT Request API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntrequest.h --- a/finch/gntrequest.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntrequest.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntrequest.h GNT Request API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntsound.c --- a/finch/gntsound.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntsound.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntsound.c GNT Sound API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntsound.h --- a/finch/gntsound.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntsound.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntsound.h GNT Sound API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntstatus.c --- a/finch/gntstatus.c Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntstatus.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntstatus.c GNT Status API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/gntstatus.h --- a/finch/gntstatus.h Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/gntstatus.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gntstatus.h GNT Status API * @ingroup finch - * - * finch + */ + +/* finch * * Finch is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce finch/libgnt/Makefile.am --- a/finch/libgnt/Makefile.am Sun Sep 16 18:07:46 2007 +0000 +++ b/finch/libgnt/Makefile.am Sun Sep 16 18:10:12 2007 +0000 @@ -1,4 +1,4 @@ -EXTRA_DIST=genmarshal +EXTRA_DIST=genmarshal pygnt SUBDIRS = . wms pkgconfigdir = $(libdir)/pkgconfig diff -r 8a4748cbf844 -r bd60afa72fce libpurple/account.c --- a/libpurple/account.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/account.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file account.c Account API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/account.h --- a/libpurple/account.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/account.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file account.h Account API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/accountopt.c --- a/libpurple/accountopt.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/accountopt.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file accountopt.c Account Options API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/accountopt.h --- a/libpurple/accountopt.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/accountopt.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file accountopt.h Account Options API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -49,8 +50,10 @@ } default_value; - gboolean masked; - + gboolean masked; /**< Whether the value entered should be + * obscured from view (for passwords and + * similar options) + */ } PurpleAccountOption; /** @@ -184,10 +187,12 @@ const char *value); /** - * Sets the masking for an account option. + * Sets the masking for an account option. Setting this to %TRUE acts + * as a hint to the UI that the option's value should be obscured from + * view, like a password. * * @param option The account option. - * @param masked The masking. + * @param masked The masking. */ void purple_account_option_set_masked(PurpleAccountOption *option, gboolean masked); @@ -282,11 +287,13 @@ const PurpleAccountOption *option); /** - * Returns the masking for an account option. + * Returns whether an option's value should be masked from view, like a + * password. If so, the UI might display each character of the option + * as a '*' (for example). * * @param option The account option. * - * @return The masking. + * @return %TRUE if the option's value should be obscured. */ gboolean purple_account_option_get_masked(const PurpleAccountOption *option); diff -r 8a4748cbf844 -r bd60afa72fce libpurple/blist.h --- a/libpurple/blist.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/blist.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file blist.h Buddy List API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/buddyicon.c --- a/libpurple/buddyicon.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/buddyicon.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file icon.c Buddy Icon API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/buddyicon.h --- a/libpurple/buddyicon.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/buddyicon.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file buddyicon.h Buddy Icon API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/cipher.h --- a/libpurple/cipher.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/cipher.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file cipher.h Purple Cipher API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/circbuffer.c --- a/libpurple/circbuffer.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/circbuffer.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file circbuffer.h Buffer Utility Functions * @ingroup core - * - * Purple is the legal property of its developers, whose names are too numerous + */ + +/* Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * diff -r 8a4748cbf844 -r bd60afa72fce libpurple/circbuffer.h --- a/libpurple/circbuffer.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/circbuffer.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ -/* +/** * @file circbuffer.h Buffer Utility Functions * @ingroup core - * - * Purple is the legal property of its developers, whose names are too numerous + */ + +/* Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * diff -r 8a4748cbf844 -r bd60afa72fce libpurple/cmds.c --- a/libpurple/cmds.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/cmds.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file cmds.c Commands API * @ingroup core - * - * Copyright (C) 2003-2004 Timothy Ringenbach + */ + +/* Copyright (C) 2003 Timothy Ringenbach * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r 8a4748cbf844 -r bd60afa72fce libpurple/connection.c --- a/libpurple/connection.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/connection.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file connection.c Connection API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/connection.h --- a/libpurple/connection.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/connection.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file connection.h Connection API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/conversation.h --- a/libpurple/conversation.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/conversation.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file conversation.h Conversation API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/core.c --- a/libpurple/core.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/core.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file core.c Purple Core API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/core.h --- a/libpurple/core.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/core.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,7 +1,8 @@ /** * @defgroup core libpurple - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/dbus-bindings.h --- a/libpurple/dbus-bindings.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/dbus-bindings.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file dbus-bindings.h Purple DBUS Bindings * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/dbus-server.h --- a/libpurple/dbus-server.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/dbus-server.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file dbus-server.h Purple DBUS Server * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/debug.c --- a/libpurple/debug.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/debug.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file debug.c Debug API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/debug.h --- a/libpurple/debug.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/debug.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file debug.h Debug API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/desktopitem.c --- a/libpurple/desktopitem.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/desktopitem.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file purple-desktop-item.c Functions for managing .desktop files * @ingroup core - * - * Purple is the legal property of its developers, whose names are too numerous + */ + +/* Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * diff -r 8a4748cbf844 -r bd60afa72fce libpurple/desktopitem.h --- a/libpurple/desktopitem.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/desktopitem.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file desktopitem.h Functions for managing .desktop files * @ingroup core - * - * Purple is the legal property of its developers, whose names are too numerous + */ + +/* Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * diff -r 8a4748cbf844 -r bd60afa72fce libpurple/dnsquery.c --- a/libpurple/dnsquery.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/dnsquery.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file dnsquery.c DNS query API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/dnsquery.h --- a/libpurple/dnsquery.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/dnsquery.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file dnsquery.h DNS query API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/dnssrv.c --- a/libpurple/dnssrv.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/dnssrv.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,7 +1,8 @@ /** * @file dnssrv.c - * - * purple + */ + +/* purple * * Copyright (C) 2005 Thomas Butter * diff -r 8a4748cbf844 -r bd60afa72fce libpurple/dnssrv.h --- a/libpurple/dnssrv.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/dnssrv.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,10 +1,11 @@ /** * @file dnssrv.h - * - * purple + */ + +/* purple * * Copyright (C) 2005, Thomas Butter - *i + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff -r 8a4748cbf844 -r bd60afa72fce libpurple/eventloop.c --- a/libpurple/eventloop.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/eventloop.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file eventloop.c Purple Event Loop API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/eventloop.h --- a/libpurple/eventloop.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/eventloop.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file eventloop.h Purple Event Loop API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/ft.c --- a/libpurple/ft.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/ft.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,7 +1,8 @@ /** * @file ft.c File Transfer API - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/ft.h --- a/libpurple/ft.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/ft.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file ft.h File Transfer API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/gaim-compat.h --- a/libpurple/gaim-compat.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/gaim-compat.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gaim-compat.h Gaim Compat macros * @ingroup core - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/idle.h --- a/libpurple/idle.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/idle.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file idle.h Idle API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/imgstore.c --- a/libpurple/imgstore.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/imgstore.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file imgstore.h IM Image Store API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/imgstore.h --- a/libpurple/imgstore.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/imgstore.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file imgstore.h IM Image Store API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/internal.h --- a/libpurple/internal.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/internal.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file internal.h Internal definitions and includes * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/log.c --- a/libpurple/log.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/log.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file log.c Logging API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/log.h --- a/libpurple/log.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/log.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file log.h Logging API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/nat-pmp.c --- a/libpurple/nat-pmp.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/nat-pmp.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file nat-pmp.c NAT-PMP Implementation * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/nat-pmp.h --- a/libpurple/nat-pmp.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/nat-pmp.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file nat-pmp.h NAT-PMP Implementation * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/network.c --- a/libpurple/network.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/network.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file network.c Network Implementation * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/network.h --- a/libpurple/network.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/network.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file network.h Network API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/notify.c --- a/libpurple/notify.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/notify.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file notify.c Notification API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/notify.h --- a/libpurple/notify.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/notify.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file notify.h Notification API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/ntlm.c --- a/libpurple/ntlm.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/ntlm.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,7 +1,8 @@ /** * @file ntlm.c - * - * purple + */ + +/* purple * * Copyright (C) 2005 Thomas Butter * diff -r 8a4748cbf844 -r bd60afa72fce libpurple/ntlm.h --- a/libpurple/ntlm.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/ntlm.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,7 +1,8 @@ /** * @file ntlm.h - * - * purple + */ + +/* purple * * Copyright (C) 2005, Thomas Butter * diff -r 8a4748cbf844 -r bd60afa72fce libpurple/plugin.h --- a/libpurple/plugin.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/plugin.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file plugin.h Plugin API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/pluginpref.h --- a/libpurple/pluginpref.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/pluginpref.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file pluginpref.h Plugin Preferences API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/plugins/Makefile.am --- a/libpurple/plugins/Makefile.am Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/plugins/Makefile.am Sun Sep 16 18:10:12 2007 +0000 @@ -28,10 +28,13 @@ buddynote_la_LDFLAGS = -module -avoid-version ciphertest_la_LDFLAGS = -module -avoid-version codeinline_la_LDFLAGS = -module -avoid-version +debug_example_la_LDFLAGS = -module -avoid-version +helloworld_la_LDFLAGS = -module -avoid-version idle_la_LDFLAGS = -module -avoid-version joinpart_la_LDFLAGS = -module -avoid-version log_reader_la_LDFLAGS = -module -avoid-version newline_la_LDFLAGS = -module -avoid-version +notify_example_la_LDFLAGS = -module -avoid-version offlinemsg_la_LDFLAGS = -module -avoid-version pluginpref_example_la_LDFLAGS = -module -avoid-version psychic_la_LDFLAGS = -module -avoid-version @@ -59,6 +62,9 @@ noinst_LTLIBRARIES = \ ciphertest.la \ codeinline.la \ + debug_example.la \ + helloworld.la \ + notify_example.la \ pluginpref_example.la \ signals_test.la \ simple.la @@ -67,10 +73,13 @@ buddynote_la_SOURCES = buddynote.c ciphertest_la_SOURCES = ciphertest.c codeinline_la_SOURCES = codeinline.c +debug_example_la_SOURCES = debug_example.c +helloworld_la_SOURCES = helloworld.c idle_la_SOURCES = idle.c joinpart_la_SOURCES = joinpart.c log_reader_la_SOURCES = log_reader.c newline_la_SOURCES = newline.c +notify_example_la_SOURCES = notify_example.c offlinemsg_la_SOURCES = offlinemsg.c pluginpref_example_la_SOURCES = pluginpref_example.c psychic_la_SOURCES = psychic.c @@ -86,6 +95,7 @@ joinpart_la_LIBADD = $(GLIB_LIBS) log_reader_la_LIBADD = $(GLIB_LIBS) newline_la_LIBADD = $(GLIB_LIBS) +notify_example_la_LIBADD = $(GLIB_LIBS) offlinemsg_la_LIBADD = $(GLIB_LIBS) pluginpref_example_la_LIBADD = $(GLIB_LIBS) psychic_la_LIBADD = $(GLIB_LIBS) diff -r 8a4748cbf844 -r bd60afa72fce libpurple/plugins/debug_example.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/plugins/debug_example.c Sun Sep 16 18:10:12 2007 +0000 @@ -0,0 +1,128 @@ +/* + * Debug Example Plugin + * + * Copyright (C) 2007, John Bailey + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. + * + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +/* We're including glib.h again for the gboolean type. */ +#include + +/* This is the required definition of PURPLE_PLUGINS as required for a plugin, + * but we protect it with an #ifndef because config.h may define it for us + * already and this would cause an unneeded compiler warning. */ +#ifndef PURPLE_PLUGINS +# define PURPLE_PLUGINS +#endif + +/* Here we're including the necessary libpurple headers for this plugin. Note + * that we're including them in alphabetical order. This isn't necessary but + * we do this throughout our source for consistency. */ +#include "debug.h" +#include "plugin.h" +#include "version.h" + +/* It's more convenient to type PLUGIN_ID all the time than it is to type + * "core-debugexample", so define this convenience macro. */ +#define PLUGIN_ID "core-debugexample" + +/* Common practice in third-party plugins is to define convenience macros for + * many of the fields of the plugin info struct, so we'll do that for the + * purposes of demonstration. */ +#define PLUGIN_AUTHOR "John Bailey " + +/* As we've covered before, libpurple calls this function, if present, when it + * loads the plugin. Here we're using it to show off the capabilities of the + * debug API and just blindly returning TRUE to tell libpurple it's safe to + * continue loading. */ +static gboolean +plugin_load(PurplePlugin *plugin) +{ + /* Define these for convenience--we're just using them to show the + * similarities of the debug functions to the standard printf(). */ + gint i = 256; + gfloat f = 512.1024; + const gchar *s = "example string"; + + /* Introductory message */ + purple_debug_info(PLUGIN_ID, + "Called plugin_load. Beginning debug demonstration\n"); + + /* Show off the debug API a bit */ + purple_debug_misc(PLUGIN_ID, + "MISC level debug message. i = %d, f = %f, s = %s\n", i, f, s); + + purple_debug_info(PLUGIN_ID, + "INFO level debug message. i = %d, f = %f, s = %s\n", i, f, s); + + purple_debug_warning(PLUGIN_ID, + "WARNING level debug message. i = %d, f = %f, s = %s\n", i, f, s); + + purple_debug_error(PLUGIN_ID, + "ERROR level debug message. i = %d, f = %f, s = %s\n", i, f, s); + + purple_debug_fatal(PLUGIN_ID, + "FATAL level debug message. i = %d, f = %f, s = %s\n", i, f, s); + + /* Now just return TRUE to tell libpurple to finish loading. */ + return TRUE; +} + +static PurplePluginInfo info = { + PURPLE_PLUGIN_MAGIC, /* magic number */ + PURPLE_MAJOR_VERSION, /* purple major */ + PURPLE_MINOR_VERSION, /* purple minor */ + PURPLE_PLUGIN_STANDARD, /* plugin type */ + NULL, /* UI requirement */ + 0, /* flags */ + NULL, /* dependencies */ + PURPLE_PRIORITY_DEFAULT, /* priority */ + + PLUGIN_ID, /* id */ + "Debug API Example", /* name */ + VERSION, /* version */ + "Debug API Example", /* summary */ + "Debug API Example", /* description */ + PLUGIN_AUTHOR, /* author */ + "http://pidgin.im", /* homepage */ + + plugin_load, /* load */ + NULL, /* unload */ + NULL, /* destroy */ + + NULL, /* ui info */ + NULL, /* extra info */ + NULL, /* prefs info */ + NULL, /* actions */ + NULL, /* reserved */ + NULL, /* reserved */ + NULL, /* reserved */ + NULL /* reserved */ +}; + +static void +init_plugin(PurplePlugin *plugin) +{ +} + +PURPLE_INIT_PLUGIN(debugexample, init_plugin, info) + diff -r 8a4748cbf844 -r bd60afa72fce libpurple/plugins/helloworld.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/plugins/helloworld.c Sun Sep 16 18:10:12 2007 +0000 @@ -0,0 +1,136 @@ +/* + * Hello World Plugin + * + * Copyright (C) 2004, Gary Kramlich , + * 2007, John Bailey + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. + * + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +/* config.h may define PURPLE_PLUGINS; protect the definition here so that we + * don't get complaints about redefinition when it's not necessary. */ +#ifndef PURPLE_PLUGINS +# define PURPLE_PLUGINS +#endif + +#include + +#include +#include +#include + +/* we're adding this here and assigning it in plugin_load because we need + * a valid plugin handle for our call to purple_notify_message() in the + * plugin_action_test_cb() callback function */ +PurplePlugin *helloworld_plugin = NULL; + +/* This function is the callback for the plugin action we added. All we're + * doing here is displaying a message. When the user selects the plugin + * action, this function is called. */ +static void +plugin_action_test_cb (PurplePluginAction * action) +{ + purple_notify_message (helloworld_plugin, PURPLE_NOTIFY_MSG_INFO, + "Plugin Actions Test", "This is a plugin actions test :)", NULL, NULL, + NULL); +} + +/* we tell libpurple in the PurplePluginInfo struct to call this function to + * get a list of plugin actions to use for the plugin. This function gives + * libpurple that list of actions. */ +static GList * +plugin_actions (PurplePlugin * plugin, gpointer context) +{ + /* some C89 (a.k.a. ANSI C) compilers will warn if any variable declaration + * includes an initilization that calls a function. To avoid that, we + * generally initialize our variables first with constant values like NULL + * or 0 and assign to them with function calls later */ + GList *list = NULL; + PurplePluginAction *action = NULL; + + /* The action gets created by specifying a name to show in the UI and a + * callback function to call. */ + action = purple_plugin_action_new ("Plugin Action Test", plugin_action_test_cb); + + /* libpurple requires a GList of plugin actions, even if there is only one + * action in the list. We append the action to a GList here. */ + list = g_list_append (list, action); + + /* Once the list is complete, we send it to libpurple. */ + return list; +} + +static gboolean +plugin_load (PurplePlugin * plugin) +{ + purple_notify_message (plugin, PURPLE_NOTIFY_MSG_INFO, "Hello World!", + "This is the Hello World! plugin :)", NULL, NULL, + NULL); + + helloworld_plugin = plugin; /* assign this here so we have a valid handle later */ + + return TRUE; +} + +/* For specific notes on the meanings of each of these members, consult the C Plugin Howto + * on the website. */ +static PurplePluginInfo info = { + PURPLE_PLUGIN_MAGIC, + PURPLE_MAJOR_VERSION, + PURPLE_MINOR_VERSION, + PURPLE_PLUGIN_STANDARD, + NULL, + 0, + NULL, + PURPLE_PRIORITY_DEFAULT, + + "core-hello_world", + "Hello World!", + VERSION, /* This constant is defined in version.h, but you shouldn't use it for + your own plugins. We use it here because it's our plugin. */ + + "Hello World Plugin", + "Hello World Plugin", + "John Bailey ", /* correct author */ + "http://helloworld.tld", + + + plugin_load, + NULL, + NULL, + + NULL, + NULL, + NULL, + plugin_actions, /* this tells libpurple the address of the function to call + to get the list of plugin actions. */ + NULL, + NULL, + NULL, + NULL +}; + +static void +init_plugin (PurplePlugin * plugin) +{ +} + +PURPLE_INIT_PLUGIN (hello_world, init_plugin, info) diff -r 8a4748cbf844 -r bd60afa72fce libpurple/plugins/notify_example.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/plugins/notify_example.c Sun Sep 16 18:10:12 2007 +0000 @@ -0,0 +1,154 @@ +/* + * Notify API Example Plugin + * + * Copyright (C) 2007, John Bailey + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. + * + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + +/* This is the required definition of PURPLE_PLUGINS as required for a plugin, + * but we protect it with an #ifndef because config.h may define it for us + * already and this would cause an unneeded compiler warning. */ +#ifndef PURPLE_PLUGINS +# define PURPLE_PLUGINS +#endif + +#define PLUGIN_ID "core-notifyexample" +#define PLUGIN_AUTHOR "John Bailey " + +#include +#include +#include + +static PurplePlugin *notify_example = NULL; + +/* The next four functions and the calls within them should cause dialog boxes to appear + * when you select the plugin action from the Tools->Notify Example menu */ +static void +notify_error_cb(PurplePluginAction *action) +{ + purple_notify_error(notify_example, "Test Notification", "Test Notification", + "This is a test error notification"); +} + +static void +notify_info_cb(PurplePluginAction *action) +{ + purple_notify_info(notify_example, "Test Notification", "Test Notification", + "This is a test informative notification"); +} + +static void +notify_warn_cb(PurplePluginAction *action) +{ + purple_notify_warning(notify_example, "Test Notification", "Test Notification", + "This is a test warning notification"); +} + +static void +notify_format_cb(PurplePluginAction *action) +{ + purple_notify_formatted(notify_example, "Test Notification", "Test Notification", + "Test Notification", + "This is a test notification with formatted text.", NULL, NULL); +} + +static void +notify_uri_cb(PurplePluginAction *action) +{ + /* This one should open your web browser of choice. */ + purple_notify_uri(notify_example, "http://www.pidgin.im/"); +} + +static GList * +plugin_actions(PurplePlugin *plugin, gpointer context) +{ + GList *actions = NULL; + + /* Here we take advantage of return values to avoid the need for a temp variable */ + actions = g_list_prepend(actions, + purple_plugin_action_new("Show Error Notification", notify_error_cb)); + + actions = g_list_prepend(actions, + purple_plugin_action_new("Show Info Notification", notify_info_cb)); + + actions = g_list_prepend(actions, + purple_plugin_action_new("Show Warning Notification", notify_warn_cb)); + + actions = g_list_prepend(actions, + purple_plugin_action_new("Show Formatted Notification", notify_format_cb)); + + actions = g_list_prepend(actions, + purple_plugin_action_new("Show URI Notification", notify_uri_cb)); + + return g_list_reverse(actions); +} + +static gboolean +plugin_load(PurplePlugin *plugin) +{ + /* we need a handle for all the notify calls */ + notify_example = plugin; + + return TRUE; +} + +static PurplePluginInfo info = { + PURPLE_PLUGIN_MAGIC, /* magic number */ + PURPLE_MAJOR_VERSION, /* purple major */ + PURPLE_MINOR_VERSION, /* purple minor */ + PURPLE_PLUGIN_STANDARD, /* plugin type */ + NULL, /* UI requirement */ + 0, /* flags */ + NULL, /* dependencies */ + PURPLE_PRIORITY_DEFAULT, /* priority */ + + PLUGIN_ID, /* id */ + "Notify API Example", /* name */ + VERSION, /* version */ + "Notify API Example", /* summary */ + "Notify API Example", /* description */ + PLUGIN_AUTHOR, /* author */ + "http://pidgin.im", /* homepage */ + + plugin_load, /* load */ + NULL, /* unload */ + NULL, /* destroy */ + + NULL, /* ui info */ + NULL, /* extra info */ + NULL, /* prefs info */ + plugin_actions, /* actions */ + NULL, /* reserved */ + NULL, /* reserved */ + NULL, /* reserved */ + NULL /* reserved */ +}; + +static void +init_plugin(PurplePlugin *plugin) +{ +} + +PURPLE_INIT_PLUGIN(notifyexample, init_plugin, info) + diff -r 8a4748cbf844 -r bd60afa72fce libpurple/plugins/ssl/ssl-nss.c --- a/libpurple/plugins/ssl/ssl-nss.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-nss.c Sun Sep 16 18:10:12 2007 +0000 @@ -24,6 +24,7 @@ #include "certificate.h" #include "plugin.h" #include "sslconn.h" +#include "util.h" #include "version.h" #define SSL_NSS_PLUGIN_ID "ssl-nss" @@ -34,6 +35,7 @@ #include #include +#include #include #include #include @@ -454,11 +456,48 @@ * * @return TRUE if success, otherwise FALSE */ +/* This function should not be so complicated, but NSS doesn't seem to have a + "convert yon certificate to PEM format" function. */ static gboolean x509_export_certificate(const gchar *filename, PurpleCertificate *crt) { - /* TODO: WRITEME */ - return FALSE; + CERTCertificate *crt_dat; + SECItem *dercrt; + gchar *b64crt; + gchar *pemcrt; + gboolean ret = FALSE; + + g_return_val_if_fail(filename, FALSE); + g_return_val_if_fail(crt, FALSE); + g_return_val_if_fail(crt->scheme == &x509_nss, FALSE); + + crt_dat = X509_NSS_DATA(crt); + g_return_val_if_fail(crt_dat, FALSE); + + purple_debug_info("nss/x509", + "Exporting certificate to %s\n", filename); + + /* First, use NSS voodoo to create a DER-formatted certificate */ + dercrt = SEC_ASN1EncodeItem(NULL, NULL, crt_dat, + SEC_ASN1_GET(SEC_SignedCertificateTemplate)); + g_return_val_if_fail(dercrt != NULL, FALSE); + + /* Now encode it to b64 */ + b64crt = NSSBase64_EncodeItem(NULL, NULL, 0, dercrt); + SECITEM_FreeItem(dercrt, PR_TRUE); + g_return_val_if_fail(b64crt, FALSE); + + /* Wrap it in nice PEM header things */ + pemcrt = g_strdup_printf("-----BEGIN CERTIFICATE-----\n%s\n-----END CERTIFICATE-----\n", b64crt); + PORT_Free(b64crt); /* Notice that b64crt was allocated by an NSS + function; hence, we'll let NSPR free it. */ + + /* Finally, dump the silly thing to a file. */ + ret = purple_util_write_data_to_file_absolute(filename, pemcrt, -1); + + g_free(pemcrt); + + return ret; } static PurpleCertificate * @@ -509,7 +548,6 @@ g_free(crt); } -#if 0 /** Determines whether one certificate has been issued and signed by another * * @param crt Certificate to check the signature of @@ -519,12 +557,11 @@ * @TODO Modify this function to return a reason for invalidity? */ static gboolean -x509_certificate_signed_by(PurpleCertificate * crt, - PurpleCertificate * issuer) +x509_signed_by(PurpleCertificate * crt, + PurpleCertificate * issuer) { - return FALSE; + return TRUE; } -#endif static GByteArray * x509_sha1sum(PurpleCertificate *crt) @@ -564,6 +601,34 @@ } static gchar * +x509_dn (PurpleCertificate *crt) +{ + CERTCertificate *crt_dat; + + g_return_val_if_fail(crt, NULL); + g_return_val_if_fail(crt->scheme == &x509_nss, NULL); + + crt_dat = X509_NSS_DATA(crt); + g_return_val_if_fail(crt_dat, NULL); + + return g_strdup(crt_dat->subjectName); +} + +static gchar * +x509_issuer_dn (PurpleCertificate *crt) +{ + CERTCertificate *crt_dat; + + g_return_val_if_fail(crt, NULL); + g_return_val_if_fail(crt->scheme == &x509_nss, NULL); + + crt_dat = X509_NSS_DATA(crt); + g_return_val_if_fail(crt_dat, NULL); + + return g_strdup(crt_dat->subjectName); +} + +static gchar * x509_common_name (PurpleCertificate *crt) { CERTCertificate *crt_dat; @@ -642,11 +707,14 @@ &nss_activ, &nss_expir), FALSE); + /* NSS's native PRTime type *almost* corresponds to time_t; however, + it measures *microseconds* since the epoch, not seconds. Hence + the funny conversion. */ if (activation) { - *activation = nss_activ; + *activation = nss_activ / 1000000; } if (expiration) { - *expiration = nss_expir; + *expiration = nss_expir / 1000000; } return TRUE; @@ -659,10 +727,10 @@ x509_export_certificate, /* Certificate export function */ x509_copy_certificate, /* Copy */ x509_destroy_certificate, /* Destroy cert */ - NULL, /* Signed-by */ + x509_signed_by, /* Signed-by */ x509_sha1sum, /* SHA1 fingerprint */ - NULL, /* Unique ID */ - NULL, /* Issuer Unique ID */ + x509_dn, /* Unique ID */ + x509_issuer_dn, /* Issuer Unique ID */ x509_common_name, /* Subject name */ x509_check_name, /* Check subject name */ x509_times, /* Activation/Expiration time */ diff -r 8a4748cbf844 -r bd60afa72fce libpurple/pounce.c --- a/libpurple/pounce.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/pounce.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file pounce.c Buddy Pounce API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/pounce.h --- a/libpurple/pounce.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/pounce.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file pounce.h Buddy Pounce API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/prefs.h --- a/libpurple/prefs.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/prefs.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file prefs.h Prefs API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/privacy.h --- a/libpurple/privacy.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/privacy.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file privacy.h Privacy API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/jabber/.todo --- a/libpurple/protocols/jabber/.todo Sun Sep 16 18:07:46 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ - - - Browsing - - - Server Admin operations (messages, etc.) - - - Add option for user info to be published or not in JUD. - - - Delete server account. - - - Permit/Deny buddy support. - - - a populate roster from local blist. most useful if you want to migrate a blist from one account to another, also useful if something freaky happens and the server blist is lost. - - - info - - formatted. enhancement-request so that the birthday field in the setinfo form would split up into relevant fields allowing for a strict syntax (like year--month--day or so, perhaps even dropdown menus) - - - - Jabber Transports (having them show up on the buddy list should be fairly easy; having an appropriate right-click menu for them should also be somewhat easy. Providing a UI for adding transports should be rather difficult.) - - diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/jabber/Makefile.mingw --- a/libpurple/protocols/jabber/Makefile.mingw Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/jabber/Makefile.mingw Sun Sep 16 18:10:12 2007 +0000 @@ -82,6 +82,14 @@ -lintl \ -lpurple +ifeq ($(CYRUS_SASL), 1) +CYRUS_SASL_TOP := $(WIN32_DEV_TOP)/cyrus-sasl-2.1.22 +CFLAGS += -DHAVE_CYRUS_SASL +INCLUDE_PATHS += -I$(CYRUS_SASL_TOP)/include +LIB_PATHS += -L$(CYRUS_SASL_TOP)/lib +LIBS += -llibsasl +endif + include $(PIDGIN_COMMON_RULES) ## diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/jabber/adhoccommands.c --- a/libpurple/protocols/jabber/adhoccommands.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/jabber/adhoccommands.c Sun Sep 16 18:10:12 2007 +0000 @@ -22,7 +22,6 @@ #include "internal.h" #include "adhoccommands.h" -#include #include #include "internal.h" #include "xdata.h" @@ -152,8 +151,11 @@ /* display result */ xmlnode *note = xmlnode_get_child(command,"note"); - if(note) - purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), xmlnode_get_data(note), NULL); + if(note) { + char *data = xmlnode_get_data(note); + purple_notify_info(NULL, xmlnode_get_attrib(packet, "from"), data, NULL); + g_free(data); + } if(xdata) jabber_x_data_request(js, xdata, (jabber_x_data_cb)do_adhoc_ignoreme, NULL); diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/jabber/auth.c --- a/libpurple/protocols/jabber/auth.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/jabber/auth.c Sun Sep 16 18:10:12 2007 +0000 @@ -538,6 +538,9 @@ (err_code = xmlnode_get_attrib(error, "code")) && !strcmp(err_code, "401")) { js->gc->wants_to_die = TRUE; + /* Clear the pasword if it isn't being saved */ + if (!purple_account_get_remember_password(js->gc->account)) + purple_account_set_password(js->gc->account, NULL); } purple_connection_error(js->gc, msg); diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/jabber/buddy.c --- a/libpurple/protocols/jabber/buddy.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/jabber/buddy.c Sun Sep 16 18:10:12 2007 +0000 @@ -1455,10 +1455,13 @@ return; img = purple_base64_decode(b64data, &size); - if(!img) + if(!img) { + g_free(b64data); return; + } purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, img, size, checksum); + g_free(b64data); } void jabber_buddy_avatar_update_metadata(JabberStream *js, const char *from, xmlnode *items) { diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/jabber/jabber.c --- a/libpurple/protocols/jabber/jabber.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sun Sep 16 18:10:12 2007 +0000 @@ -57,8 +57,6 @@ #include "pep.h" #include "adhoccommands.h" -#include - #define JABBER_CONNECT_STEPS (js->gsc ? 9 : 5) static PurplePlugin *my_protocol = NULL; @@ -143,6 +141,7 @@ if(jabber_process_starttls(js, packet)) return; } else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE) && !js->gsc) { + js->gc->wants_to_die = TRUE; purple_connection_error(js->gc, _("You require encryption, but it is not available on this server.")); return; } @@ -458,7 +457,7 @@ if(!PURPLE_CONNECTION_IS_VALID(gc)) { purple_ssl_close(gsc); return; - } + } js = gc->proto_data; @@ -815,7 +814,7 @@ if(account->registration_cb) (account->registration_cb)(account, FALSE, account->registration_cb_user_data); jabber_connection_schedule_close(cbdata->js); -} + } g_free(cbdata->who); g_free(cbdata); } @@ -884,12 +883,12 @@ if((href = xmlnode_get_data(url))) { purple_notify_uri(NULL, href); g_free(href); - if(js->registration) { - js->gc->wants_to_die = TRUE; - if(account->registration_cb) /* succeeded, but we have no login info */ - (account->registration_cb)(account, TRUE, account->registration_cb_user_data); - jabber_connection_schedule_close(js); - } + if(js->registration) { + js->gc->wants_to_die = TRUE; + if(account->registration_cb) /* succeeded, but we have no login info */ + (account->registration_cb)(account, TRUE, account->registration_cb_user_data); + jabber_connection_schedule_close(js); + } return; } } @@ -989,14 +988,14 @@ purple_request_field_group_add_field(group, field); } - if((y = xmlnode_get_child(query, "instructions"))) - instructions = xmlnode_get_data(y); + if((y = xmlnode_get_child(query, "instructions"))) + instructions = xmlnode_get_data(y); else if(registered) instructions = g_strdup(_("Please fill out the information below " "to change your account registration.")); - else - instructions = g_strdup(_("Please fill out the information below " - "to register your new account.")); + else + instructions = g_strdup(_("Please fill out the information below " + "to register your new account.")); cbdata = g_new0(JabberRegisterCBData, 1); cbdata->js = js; @@ -1021,8 +1020,8 @@ g_free(title); } - g_free(instructions); - } + g_free(instructions); +} void jabber_register_start(JabberStream *js) { @@ -1134,17 +1133,17 @@ static void jabber_unregister_account_cb(JabberStream *js) { JabberIq *iq; xmlnode *query; - assert(js->unregistration); - - iq = jabber_iq_new_query(js,JABBER_IQ_SET,"jabber:iq:register"); - assert(iq); - query = xmlnode_get_child_with_namespace(iq->node,"query","jabber:iq:register"); - assert(query); - xmlnode_new_child(query,"remove"); - - xmlnode_set_attrib(iq->node,"to",js->user->domain); - jabber_iq_set_callback(iq,jabber_unregister_account_iq_cb,NULL); - + + g_return_if_fail(js->unregistration); + + iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:register"); + + query = xmlnode_get_child_with_namespace(iq->node, "query", "jabber:iq:register"); + + xmlnode_new_child(query, "remove"); + xmlnode_set_attrib(iq->node, "to", js->user->domain); + + jabber_iq_set_callback(iq, jabber_unregister_account_iq_cb, NULL); jabber_iq_send(iq); } @@ -1163,11 +1162,16 @@ } js = gc->proto_data; - assert(!js->unregistration); /* don't allow multiple calls */ + + if (js->unregistration) { + purple_debug_error("jabber", "Unregistration in process; ignoring duplicate request.\n"); + return; + } + js->unregistration = TRUE; js->unregistration_cb = cb; js->unregistration_user_data = user_data; - + jabber_unregister_account_cb(js); } @@ -1325,10 +1329,10 @@ void jabber_add_feature(const char *shortname, const char *namespace, JabberFeatureEnabled cb) { JabberFeature *feat; - - assert(shortname != NULL); - assert(namespace != NULL); - + + g_return_if_fail(shortname != NULL); + g_return_if_fail(namespace != NULL); + feat = g_new0(JabberFeature,1); feat->shortname = g_strdup(shortname); feat->namespace = g_strdup(namespace); @@ -1528,15 +1532,15 @@ "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), - "tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), - "tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), - "tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), - "tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), - "tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), - "tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), - "tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), - "tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), - "tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), + PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), + PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), NULL); @@ -1551,15 +1555,15 @@ "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), - "tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), - "tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), - "tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), - "tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), - "tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), - "tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), - "tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), - "tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), - "tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), + PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), + PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), NULL); @@ -1574,15 +1578,15 @@ "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), - "tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), - "tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), - "tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), - "tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), - "tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), - "tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), - "tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), - "tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), - "tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), + PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), + PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), NULL); @@ -1597,15 +1601,15 @@ "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), - "tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), - "tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), - "tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), - "tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), - "tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), - "tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), - "tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), - "tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), - "tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), + PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), + PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), NULL); @@ -1620,15 +1624,15 @@ "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), - "tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), - "tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), - "tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), - "tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), - "tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), - "tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), - "tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), - "tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), - "tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), + PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), + PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), + PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), NULL); @@ -1731,7 +1735,7 @@ _("Change XMPP Password"), _("Please enter your new password"), fields, _("OK"), G_CALLBACK(jabber_password_change_cb), _("Cancel"), NULL, - purple_connection_get_account(gc), NULL, NULL, + purple_connection_get_account(gc), NULL, NULL, js); } @@ -1899,6 +1903,9 @@ text = _("Authorization mechanism too weak"); } else if(xmlnode_get_child(packet, "not-authorized")) { js->gc->wants_to_die = TRUE; + /* Clear the pasword if it isn't being saved */ + if (!purple_account_get_remember_password(js->gc->account)) + purple_account_set_password(js->gc->account, NULL); text = _("Not Authorized"); } else if(xmlnode_get_child(packet, "temporary-auth-failure")) { text = _("Temporary Authentication Failure"); diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/jabber/libxmpp.c --- a/libpurple/protocols/jabber/libxmpp.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Sun Sep 16 18:10:12 2007 +0000 @@ -28,6 +28,7 @@ #include "internal.h" #include "accountopt.h" +#include "debug.h" #include "version.h" #include "iq.h" @@ -45,14 +46,11 @@ static PurplePluginProtocolInfo prpl_info = { + OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK | #ifdef HAVE_CYRUS_SASL - OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | - OPT_PROTO_MAIL_CHECK | OPT_PROTO_PASSWORD_OPTIONAL | + OPT_PROTO_PASSWORD_OPTIONAL | +#endif OPT_PROTO_SLASH_COMMANDS_NATIVE, -#else - OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK | - OPT_PROTO_SLASH_COMMANDS_NATIVE, -#endif NULL, /* user_splits */ NULL, /* protocol_options */ {"png", 32, 32, 96, 96, 8191, PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */ @@ -194,6 +192,9 @@ static void init_plugin(PurplePlugin *plugin) { +#ifdef HAVE_CYRUS_SASL + int ret; +#endif PurpleAccountUserSplit *split; PurpleAccountOption *option; @@ -236,7 +237,9 @@ /* XXX - If any other plugin wants SASL this won't be good ... */ #ifdef HAVE_CYRUS_SASL - sasl_client_init(NULL); + if ((ret = sasl_client_init(NULL)) != SASL_OK) { + purple_debug_error("xmpp", "Error (%d) initializing SASL.\n", ret); + } #endif jabber_register_commands(); diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/jabber/message.c --- a/libpurple/protocols/jabber/message.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/jabber/message.c Sun Sep 16 18:10:12 2007 +0000 @@ -324,7 +324,7 @@ if(type) { if(!strcmp(type, "normal")) jm->type = JABBER_MESSAGE_NORMAL; - else if(!strcmp(type, "chat")) + else if(!strcmp(type, "chat")) jm->type = JABBER_MESSAGE_CHAT; else if(!strcmp(type, "groupchat")) jm->type = JABBER_MESSAGE_GROUPCHAT; diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/jabber/presence.c --- a/libpurple/protocols/jabber/presence.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/jabber/presence.c Sun Sep 16 18:10:12 2007 +0000 @@ -192,16 +192,11 @@ jabber_tune_set(js->gc, &tuneinfo); /* update old values */ - if(js->old_artist) - g_free(js->old_artist); - if(js->old_title) - g_free(js->old_title); - if(js->old_source) - g_free(js->old_source); - if(js->old_uri) - g_free(js->old_uri); - if(js->old_track) - g_free(js->old_track); + g_free(js->old_artist); + g_free(js->old_title); + g_free(js->old_source); + g_free(js->old_uri); + g_free(js->old_track); js->old_artist = g_strdup(artist); js->old_title = g_strdup(title); js->old_source = g_strdup(source); diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/jabber/usermood.c --- a/libpurple/protocols/jabber/usermood.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/jabber/usermood.c Sun Sep 16 18:10:12 2007 +0000 @@ -23,7 +23,6 @@ #include "usermood.h" #include "pep.h" -#include #include #include "internal.h" #include "request.h" @@ -195,9 +194,9 @@ void jabber_mood_set(JabberStream *js, const char *mood, const char *text) { xmlnode *publish, *moodnode; - - assert(mood != NULL); - + + g_return_if_fail(mood != NULL); + publish = xmlnode_new("publish"); xmlnode_set_attrib(publish,"node","http://jabber.org/protocol/mood"); moodnode = xmlnode_new_child(xmlnode_new_child(publish, "item"), "mood"); diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/jabber/usernick.c --- a/libpurple/protocols/jabber/usernick.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/jabber/usernick.c Sun Sep 16 18:10:12 2007 +0000 @@ -23,7 +23,6 @@ #include "usernick.h" #include "pep.h" -#include #include #include "internal.h" #include "request.h" @@ -34,7 +33,7 @@ xmlnode *item = xmlnode_get_child(items, "item"); JabberBuddy *buddy = jabber_buddy_find(js, from, FALSE); xmlnode *nick; - const char *nickname = NULL; + char *nickname = NULL; /* ignore the tune of people not on our buddy list */ if (!buddy || !item) @@ -44,8 +43,8 @@ if (!nick) return; nickname = xmlnode_get_data(nick); - serv_got_alias(js->gc, from, nickname); + g_free(nickname); } static void do_nick_set(JabberStream *js, const char *nick) { @@ -65,7 +64,7 @@ } static void do_nick_got_own_nick_cb(JabberStream *js, const char *from, xmlnode *items) { - const char *oldnickname = NULL; + char *oldnickname = NULL; xmlnode *item = xmlnode_get_child(items,"item"); if(item) { @@ -78,6 +77,7 @@ _("This information is visible to all contacts on your contact list, so choose something appropriate."), oldnickname, FALSE, FALSE, NULL, _("Set"), PURPLE_CALLBACK(do_nick_set), _("Cancel"), NULL, purple_connection_get_account(js->gc), NULL, NULL, js); + g_free(oldnickname); } static void do_nick_set_nick(PurplePluginAction *action) { diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/jabber/usertune.c --- a/libpurple/protocols/jabber/usertune.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/jabber/usertune.c Sun Sep 16 18:10:12 2007 +0000 @@ -23,7 +23,6 @@ #include "usertune.h" #include "pep.h" -#include #include #include "internal.h" #include "request.h" @@ -42,48 +41,61 @@ if (!buddy || !item) return; - tuneinfodata.artist = ""; - tuneinfodata.title = ""; - tuneinfodata.album = ""; - tuneinfodata.track = ""; + tuneinfodata.artist = NULL; + tuneinfodata.title = NULL; + tuneinfodata.album = NULL; + tuneinfodata.track = NULL; tuneinfodata.time = -1; - tuneinfodata.url = ""; - + tuneinfodata.url = NULL; + tune = xmlnode_get_child_with_namespace(item, "tune", "http://jabber.org/protocol/tune"); if (!tune) return; + resource = jabber_buddy_find_resource(buddy, NULL); + if(!resource) + return; /* huh? */ for (tuneinfo = tune->child; tuneinfo; tuneinfo = tuneinfo->next) { if (tuneinfo->type == XMLNODE_TYPE_TAG) { if (!strcmp(tuneinfo->name, "artist")) { - if (tuneinfodata.artist[0] == '\0') /* only pick the first one */ + if (tuneinfodata.artist == NULL) /* only pick the first one */ tuneinfodata.artist = xmlnode_get_data(tuneinfo); } else if (!strcmp(tuneinfo->name, "length")) { if (tuneinfodata.time == -1) { char *length = xmlnode_get_data(tuneinfo); if (length) tuneinfodata.time = strtol(length, NULL, 10); + g_free(length); } } else if (!strcmp(tuneinfo->name, "source")) { - if (tuneinfodata.album[0] == '\0') /* only pick the first one */ + if (tuneinfodata.album == NULL) /* only pick the first one */ tuneinfodata.album = xmlnode_get_data(tuneinfo); } else if (!strcmp(tuneinfo->name, "title")) { - if (tuneinfodata.title[0] == '\0') /* only pick the first one */ + if (tuneinfodata.title == NULL) /* only pick the first one */ tuneinfodata.title = xmlnode_get_data(tuneinfo); } else if (!strcmp(tuneinfo->name, "track")) { - if (tuneinfodata.track[0] == '\0') /* only pick the first one */ + if (tuneinfodata.track == NULL) /* only pick the first one */ tuneinfodata.track = xmlnode_get_data(tuneinfo); } else if (!strcmp(tuneinfo->name, "uri")) { - if (tuneinfodata.url[0] == '\0') /* only pick the first one */ + if (tuneinfodata.url == NULL) /* only pick the first one */ tuneinfodata.url = xmlnode_get_data(tuneinfo); } } } - resource = jabber_buddy_find_resource(buddy, NULL); - if(!resource) - return; /* huh? */ status_id = jabber_buddy_state_get_status_id(resource->state); - purple_prpl_got_user_status(js->gc->account, from, status_id, PURPLE_TUNE_ARTIST, tuneinfodata.artist, PURPLE_TUNE_TITLE, tuneinfodata.title, PURPLE_TUNE_ALBUM, tuneinfodata.album, PURPLE_TUNE_TRACK, tuneinfodata.track, PURPLE_TUNE_TIME, tuneinfodata.time, PURPLE_TUNE_URL, tuneinfodata.url, NULL); + purple_prpl_got_user_status(js->gc->account, from, status_id, + PURPLE_TUNE_ARTIST, tuneinfodata.artist, + PURPLE_TUNE_TITLE, tuneinfodata.title, + PURPLE_TUNE_ALBUM, tuneinfodata.album, + PURPLE_TUNE_TRACK, tuneinfodata.track, + PURPLE_TUNE_TIME, tuneinfodata.time, + PURPLE_TUNE_URL, tuneinfodata.url, NULL); + + g_free(tuneinfodata.artist); + g_free(tuneinfodata.title); + g_free(tuneinfodata.album); + g_free(tuneinfodata.track); + g_free(tuneinfodata.url); } void jabber_tune_init(void) { diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/msn/msn.c --- a/libpurple/protocols/msn/msn.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Sun Sep 16 18:10:12 2007 +0000 @@ -2316,8 +2316,7 @@ prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - /* TODO: Mark translatable as soon as 2.2.0 is released and we're not string frozen */ - option = purple_account_option_string_new("HTTP Method Server", + option = purple_account_option_string_new(_("HTTP Method Server"), "http_method_server", MSN_HTTPCONN_SERVER); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/msn/userlist.c --- a/libpurple/protocols/msn/userlist.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/msn/userlist.c Sun Sep 16 18:10:12 2007 +0000 @@ -461,7 +461,7 @@ void msn_userlist_add_user(MsnUserList *userlist, MsnUser *user) { - userlist->users = g_list_append(userlist->users, user); + userlist->users = g_list_prepend(userlist->users, user); } void diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/myspace/Makefile.am --- a/libpurple/protocols/myspace/Makefile.am Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/myspace/Makefile.am Sun Sep 16 18:10:12 2007 +0000 @@ -2,18 +2,19 @@ pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) -SOURCES = myspace.c \ - myspace.h \ - persist.h \ +MSIMSOURCES = markup.c \ + markup.h \ message.c \ message.h \ - zap.c \ + myspace.c \ + myspace.h \ + persist.h \ session.c \ session.h \ - markup.c \ - markup.h \ user.c \ - user.h + user.h \ + zap.c \ + zap.h AM_CFLAGS = $(st) @@ -23,14 +24,14 @@ st = -DPURPLE_STATIC_PRPL noinst_LIBRARIES = libmyspace.a -libmyspace_a_SOURCES = $(SOURCES) +libmyspace_a_SOURCES = $(MSIMSOURCES) libmyspace_a_CFLAGS = $(AM_CFLAGS) else st = pkg_LTLIBRARIES = libmyspace.la -libmyspace_la_SOURCES = $(SOURCES) +libmyspace_la_SOURCES = $(MSIMSOURCES) libmyspace_la_LIBADD = $(GLIB_LIBS) endif diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/myspace/myspace.c --- a/libpurple/protocols/myspace/myspace.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.c Sun Sep 16 18:10:12 2007 +0000 @@ -2856,7 +2856,7 @@ } /** Callbacks called by Purple, to access this plugin. */ -PurplePluginProtocolInfo prpl_info = { +static PurplePluginProtocolInfo prpl_info = { /* options */ OPT_PROTO_USE_POINTSIZE /* specify font size in sane point size */ | OPT_PROTO_MAIL_CHECK, diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/oscar/.todo --- a/libpurple/protocols/oscar/.todo Sun Sep 16 18:07:46 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ - - - watch for aol's upcoming increased aim/icq merge - - - AIM - - option to ignore chat room invitations. (this is something you could vary conceivably want to be done per account, so perhaps a protocol action would be best) - - - buddies in Recent Buddies don't seem to delete right - - - direct im - - some way to close direct connect w/out closing convo. - - - failed direct im attempt should allow new attempt some way to cancel an attempt that isn't happening - - - - Voice Chat - - - - ICQ - - more privacy options - - - increased authorization support - - add info to dialog requesting autorization to allow you to check the info of the person who is requesting - - - - color support - - - set status message and of course when libpurple can set them, it needs to be able to get the ones it sets. (yes this is redundant. its a reflection of my current mood) - - - Chat (this is different from aim chat) - - - New User Registration - - - more info support - - - search for users - - - set the Nickname to be the self-alias - - - icq i18n without breaking aim - - - - The order of groups and buddies in the server list is not updated when groups and buddies are re-arranged locally in libpurple. - - diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/simple/simple.c --- a/libpurple/protocols/simple/simple.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/simple/simple.c Sun Sep 16 18:10:12 2007 +0000 @@ -693,19 +693,24 @@ } static void do_register_exp(struct simple_account_data *sip, int expire) { - char *uri = g_strdup_printf("sip:%s", sip->servername); - char *to = g_strdup_printf("sip:%s@%s", sip->username, sip->servername); - char *contact = get_contact(sip); - char *hdr = g_strdup_printf("Contact: %s\r\nExpires: %d\r\n", contact, expire); + char *uri, *to, *contact, *hdr; + + /* Set our default expiration to 900, + * as done in the initialization of the simple_account_data + * structure. + */ + if (!expire) + expire = 900; + + sip->reregister = time(NULL) + expire - 50; + + uri = g_strdup_printf("sip:%s", sip->servername); + to = g_strdup_printf("sip:%s@%s", sip->username, sip->servername); + contact = get_contact(sip); + hdr = g_strdup_printf("Contact: %s\r\nExpires: %d\r\n", contact, expire); g_free(contact); - sip->registerstatus = 1; - - if(expire) { - sip->reregister = time(NULL) + expire - 50; - } else { - sip->reregister = time(NULL) + 600; - } + sip->registerstatus = SIMPLE_REGISTER_SENT; send_sip_request(sip->gc, "REGISTER", uri, to, hdr, "", NULL, process_register_response); @@ -1013,12 +1018,12 @@ purple_debug(PURPLE_DEBUG_MISC, "simple", "in process register response response: %d\n", msg->response); switch (msg->response) { case 200: - if(sip->registerstatus < 3) { /* registered */ + if(sip->registerstatus < SIMPLE_REGISTER_COMPLETE) { /* registered */ if(purple_account_get_bool(sip->account, "dopublish", TRUE)) { send_publish(sip); } } - sip->registerstatus = 3; + sip->registerstatus = SIMPLE_REGISTER_COMPLETE; purple_connection_set_state(sip->gc, PURPLE_CONNECTED); /* get buddies from blist */ @@ -1032,16 +1037,29 @@ break; case 401: - if(sip->registerstatus != 2) { + if(sip->registerstatus != SIMPLE_REGISTER_RETRY) { purple_debug_info("simple", "REGISTER retries %d\n", sip->registrar.retries); - if(sip->registrar.retries > 3) { + if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) { + purple_debug_info("simple", "Setting wants_to_die to true.\n"); sip->gc->wants_to_die = TRUE; purple_connection_error(sip->gc, _("Incorrect password.")); return TRUE; } tmp = sipmsg_find_header(msg, "WWW-Authenticate"); fill_auth(sip, tmp, &sip->registrar); - sip->registerstatus = 2; + sip->registerstatus = SIMPLE_REGISTER_RETRY; + do_register(sip); + } + break; + default: + if (sip->registerstatus != SIMPLE_REGISTER_RETRY) { + purple_debug_info("simple", "Unrecognized return code for REGISTER.\n"); + if (sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) { + sip->gc->wants_to_die = TRUE; + purple_connection_error(sip->gc, _("Unknown server response.")); + return TRUE; + } + sip->registerstatus = SIMPLE_REGISTER_RETRY; do_register(sip); } break; @@ -1327,13 +1345,29 @@ } else { sip->proxy.retries = 0; if(!strcmp(trans->msg->method, "REGISTER")) { - if(msg->response == 401) sip->registrar.retries++; - else sip->registrar.retries = 0; + + /* This is encountered when a REGISTER request was ... + */ + if(msg->response == 401) { + /* denied until further authentication was provided. */ + sip->registrar.retries++; + } + else if (msg->response != 200) { + /* denied for some other reason! */ + sip->registrar.retries++; + } + else { + /* accepted! */ + sip->registrar.retries = 0; + } } else { if(msg->response == 401) { + /* This is encountered when a generic (MESSAGE, NOTIFY, etc) + * was denied until further authorization is provided. + */ gchar *resend, *auth, *ptmp; - if(sip->registrar.retries > 4) return; + if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) return; sip->registrar.retries++; ptmp = sipmsg_find_header(msg, "WWW-Authenticate"); @@ -1347,6 +1381,11 @@ /* resend request */ sendout_pkt(sip->gc, resend); g_free(resend); + } else { + /* Reset any count of retries that may have + * accumulated in the above branch. + */ + sip->registrar.retries = 0; } } if(trans->callback) { @@ -1696,7 +1735,8 @@ if(sip) { /* unregister */ - do_register_exp(sip, 0); + if (sip->registerstatus == SIMPLE_REGISTER_COMPLETE) + do_register_exp(sip, 0); connection_free_all(sip); if (sip->query_data != NULL) diff -r 8a4748cbf844 -r bd60afa72fce libpurple/protocols/simple/simple.h --- a/libpurple/protocols/simple/simple.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/protocols/simple/simple.h Sun Sep 16 18:10:12 2007 +0000 @@ -37,6 +37,11 @@ #include "sipmsg.h" #define SIMPLE_BUF_INC 1024 +#define SIMPLE_REGISTER_RETRY_MAX 2 + +#define SIMPLE_REGISTER_SENT 1 +#define SIMPLE_REGISTER_RETRY 2 +#define SIMPLE_REGISTER_COMPLETE 3 struct sip_dialog { gchar *ourtag; diff -r 8a4748cbf844 -r bd60afa72fce libpurple/proxy.c --- a/libpurple/proxy.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/proxy.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file proxy.c Proxy API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -400,7 +401,7 @@ */ if (!PURPLE_PROXY_CONNECT_DATA_IS_VALID(connect_data)) return; - + purple_debug_info("proxy", "Connected to %s:%d.\n", connect_data->host, connect_data->port); @@ -1992,6 +1993,13 @@ proxy_pref_cb, NULL); purple_prefs_connect_callback(handle, "/purple/proxy/password", proxy_pref_cb, NULL); + + /* Load the initial proxy settings */ + purple_prefs_trigger_callback("/purple/proxy/type"); + purple_prefs_trigger_callback("/purple/proxy/host"); + purple_prefs_trigger_callback("/purple/proxy/port"); + purple_prefs_trigger_callback("/purple/proxy/username"); + purple_prefs_trigger_callback("/purple/proxy/password"); } void diff -r 8a4748cbf844 -r bd60afa72fce libpurple/proxy.h --- a/libpurple/proxy.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/proxy.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file proxy.h Proxy API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/prpl.h --- a/libpurple/prpl.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/prpl.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file prpl.h Protocol Plugin functions * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/request.c --- a/libpurple/request.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/request.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file request.c Request API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/request.h --- a/libpurple/request.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/request.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file request.h Request API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/roomlist.c --- a/libpurple/roomlist.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/roomlist.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file roomlist.c Room List API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/roomlist.h --- a/libpurple/roomlist.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/roomlist.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file roomlist.h Room List API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/savedstatuses.c --- a/libpurple/savedstatuses.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/savedstatuses.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file savedstatuses.c Saved Status API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/savedstatuses.h --- a/libpurple/savedstatuses.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/savedstatuses.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file savedstatuses.h Saved Status API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/server.c --- a/libpurple/server.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/server.c Sun Sep 16 18:10:12 2007 +0000 @@ -143,6 +143,7 @@ */ auto_reply_pref = purple_prefs_get_string("/purple/away/auto_reply"); if ((gc->flags & PURPLE_CONNECTION_AUTO_RESP) && + flags & PURPLE_MESSAGE_AUTO_RESP && !purple_presence_is_available(presence) && strcmp(auto_reply_pref, "never")) { diff -r 8a4748cbf844 -r bd60afa72fce libpurple/server.h --- a/libpurple/server.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/server.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file server.h Server API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/signals.c --- a/libpurple/signals.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/signals.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file signals.c Signal API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/signals.h --- a/libpurple/signals.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/signals.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file signals.h Signal API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/sound.h --- a/libpurple/sound.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/sound.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file sound.h Sound API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/sslconn.c --- a/libpurple/sslconn.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/sslconn.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file sslconn.c SSL API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/sslconn.h --- a/libpurple/sslconn.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/sslconn.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file sslconn.h SSL API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/status.c --- a/libpurple/status.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/status.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file status.c Status API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -1668,6 +1669,14 @@ purple_prefs_connect_callback(handle, "/purple/status/scores/offline_msg", score_pref_changed_cb, GINT_TO_POINTER(SCORE_OFFLINE_MESSAGE)); + + purple_prefs_trigger_callback("/purple/status/scores/offline"); + purple_prefs_trigger_callback("/purple/status/scores/available"); + purple_prefs_trigger_callback("/purple/status/scores/invisible"); + purple_prefs_trigger_callback("/purple/status/scores/away"); + purple_prefs_trigger_callback("/purple/status/scores/extended_away"); + purple_prefs_trigger_callback("/purple/status/scores/idle"); + purple_prefs_trigger_callback("/purple/status/scores/offline_msg"); } void diff -r 8a4748cbf844 -r bd60afa72fce libpurple/stringref.c --- a/libpurple/stringref.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/stringref.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file stringref.c Reference-counted immutable strings * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/stringref.h --- a/libpurple/stringref.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/stringref.h Sun Sep 16 18:10:12 2007 +0000 @@ -3,8 +3,9 @@ /** * @file stringref.h Reference-counted immutable strings * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/stun.c --- a/libpurple/stun.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/stun.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file stun.c STUN (RFC3489) Implementation * @ingroup core - * - * purple + */ + +/* purple * * STUN implementation inspired by jstun [http://jstun.javawi.de/] * diff -r 8a4748cbf844 -r bd60afa72fce libpurple/stun.h --- a/libpurple/stun.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/stun.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file stun.h STUN API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/upnp.c --- a/libpurple/upnp.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/upnp.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file upnp.c UPnP Implementation * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/upnp.h --- a/libpurple/upnp.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/upnp.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file upnp.h Universal Plug N Play API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/util.c --- a/libpurple/util.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/util.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file util.h Utility Functions * @ingroup core - * - * Purple is the legal property of its developers, whose names are too numerous + */ + +/* Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * diff -r 8a4748cbf844 -r bd60afa72fce libpurple/util.h --- a/libpurple/util.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/util.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file util.h Utility Functions * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/value.c --- a/libpurple/value.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/value.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file value.c Value wrapper API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/value.h --- a/libpurple/value.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/value.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file value.h Value wrapper API * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/version.c --- a/libpurple/version.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/version.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file version.c Version Functions * @ingroup core - * - * Purple is the legal property of its developers, whose names are too numerous + */ + +/* Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * diff -r 8a4748cbf844 -r bd60afa72fce libpurple/whiteboard.h --- a/libpurple/whiteboard.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/whiteboard.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,7 +1,8 @@ /** * @file whiteboard.h The PurpleWhiteboard core object - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/xmlnode.c --- a/libpurple/xmlnode.c Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/xmlnode.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,7 +1,8 @@ /** * @file xmlnode.c XML DOM functions - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce libpurple/xmlnode.h --- a/libpurple/xmlnode.h Sun Sep 16 18:07:46 2007 +0000 +++ b/libpurple/xmlnode.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file xmlnode.h XML DOM functions * @ingroup core - * - * purple + */ + +/* purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin.spec.in --- a/pidgin.spec.in Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin.spec.in Sun Sep 16 18:10:12 2007 +0000 @@ -363,8 +363,6 @@ %{_bindir}/pidgin %{_datadir}/pixmaps/pidgin %{_datadir}/icons/hicolor/*/apps/pidgin.* -%dir %{_datadir}/sounds/pidgin -%{_datadir}/sounds/pidgin/* %{_datadir}/applications/* %{_sysconfdir}/gconf/schemas/purple.schemas @@ -374,6 +372,8 @@ %{_libdir}/libpurple.so.* %dir %{_libdir}/purple-2 +%{_datadir}/purple +%{_datadir}/sounds/purple %attr(755, root, root) %{perl_vendorarch}/Purple.pm %attr(755, root, root) %{perl_vendorarch}/auto/Purple @@ -427,7 +427,7 @@ %endif %if 0%{?_with_mono:1} -%files libpurple-mono +%files -n libpurple-mono %defattr(-, root, root) %{_libdir}/purple-2/mono.so @@ -457,6 +457,9 @@ %endif %changelog +* Fri Sep 14 2007 Stu Tomlinson +- Fix spec file for moved sounds & new CA certificates + * Thu Jul 12 2007 Stu Tomlinson - Don't hardcode silc header locations, rely on pkg-config for those, because I think I broke non-pkg-config detection of older silc diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkaccount.c --- a/pidgin/gtkaccount.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkaccount.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkaccount.c GTK+ Account Editor UI * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkaccount.h --- a/pidgin/gtkaccount.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkaccount.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkaccount.h GTK+ Account Editor UI * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkblist.c --- a/pidgin/gtkblist.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkblist.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkblist.c GTK+ BuddyList API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -124,6 +125,7 @@ #endif static PidginBuddyList *gtkblist = NULL; +static GList *groups_tree(void); static gboolean pidgin_blist_refresh_timer(PurpleBuddyList *list); static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean status_change); static void pidgin_blist_selection_changed(GtkTreeSelection *selection, gpointer data); @@ -136,13 +138,23 @@ static void redo_buddy_list(PurpleBuddyList *list, gboolean remove, gboolean rerender); static void pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBlistNode *node); static char *pidgin_get_group_title(PurpleBlistNode *gnode, gboolean expanded); - -struct _pidgin_blist_node { +static void pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBlistNode *node); + +typedef enum { + PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE = 1 << 0, /* Whether there's pending message in a conversation */ +} PidginBlistNodeFlags; + +typedef struct _pidgin_blist_node { GtkTreeRowReference *row; gboolean contact_expanded; gboolean recent_signonoff; gint recent_signonoff_timer; -}; + struct { + PurpleConversation *conv; + time_t last_message; /* timestamp for last displayed message */ + PidginBlistNodeFlags flags; + } conv; +} PidginBlistNode; static char dim_grey_string[8] = ""; static char *dim_grey() @@ -304,12 +316,36 @@ serv_send_file(b->account->gc, b->name, NULL); } +static void gtk_blist_menu_move_to_cb(GtkWidget *w, PurpleBlistNode *node) +{ + PurpleBlistNode *group = g_object_get_data(w, "groupnode"); + purple_blist_add_contact(node, group, NULL); + +} + static void gtk_blist_menu_autojoin_cb(GtkWidget *w, PurpleChat *chat) { purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-autojoin", gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(w))); } +static void gtk_blist_menu_persistent_cb(GtkWidget *w, PurpleChat *chat) +{ + purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-persistent", + gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(w))); +} + +static PurpleConversation * +find_conversation_with_buddy(PurpleBuddy *buddy) +{ + PidginBlistNode *ui = buddy->node.ui_data; + if (ui) + return ui->conv.conv; + return purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, + purple_buddy_get_name(buddy), + purple_buddy_get_account(buddy)); +} + static void gtk_blist_join_chat(PurpleChat *chat) { PurpleConversation *conv; @@ -393,6 +429,104 @@ } #endif +static void +gtk_blist_do_personize(GList *merges) +{ + PurpleBlistNode *contact = NULL; + int max = 0; + GList *tmp; + + /* First, we find the contact to merge the rest of the buddies into. + * This will be the contact with the most buddies in it; ties are broken + * by which contact is higher in the list + */ + for (tmp = merges; tmp; tmp = tmp->next) { + PurpleBlistNode *node = tmp->data; + PurpleBlistNode *b; + int i = 0; + + if (node->type == PURPLE_BLIST_BUDDY_NODE) + node = node->parent; + + if (node->type != PURPLE_BLIST_CONTACT_NODE) + continue; + + + for (b = node->child; b; b = b->next) + i++; + if (i > max) { + contact = node; + max = i; + } + } + + if (contact == NULL) + return; + + /* Merge all those buddies into this contact */ + for (tmp = merges; tmp; tmp = tmp->next) { + PurpleBlistNode *node = tmp->data; + if (node->type == PURPLE_BLIST_BUDDY_NODE) + node = node->parent; + + if (node == contact) + continue; + + purple_blist_merge_contact(node, contact); + } + + /* And show the expanded contact, so the people know what's going on */ + pidgin_blist_expand_contact_cb(NULL, contact); + g_list_free(merges); +} + +static void +gtk_blist_auto_personize(PurpleBlistNode *group, const char *alias) +{ + PurpleBlistNode *contact; + PurpleBlistNode *buddy; + GList *merges = NULL; + int i = 0; + char *a = g_utf8_casefold(alias, -1); + + for (contact = group->child; contact; contact = contact->next) { + char *node_alias; + if (contact->type != PURPLE_BLIST_CONTACT_NODE) + continue; + + node_alias = g_utf8_casefold(purple_contact_get_alias(contact), -1); + if (node_alias && !g_utf8_collate(node_alias, a)) { + merges = g_list_append(merges, contact); + i++; + g_free(node_alias); + continue; + } + g_free(node_alias); + + for (buddy = contact->child; buddy; buddy = buddy->next) { + if (buddy->type != PURPLE_BLIST_BUDDY_NODE) + continue; + + node_alias = g_utf8_casefold(purple_buddy_get_alias(buddy), -1); + if (node_alias && !g_utf8_collate(node_alias, a)) { + merges = g_list_append(merges, buddy); + i++; + } + g_free(node_alias); + } + } + g_free(a); + + if (i > 1) + { + char *msg = g_strdup_printf(ngettext("You currently have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias); + purple_request_action(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. " + "You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL, + merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free)); + g_free(msg); + } +} + static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *arg1, char *arg2, PurpleBuddyList *list) { @@ -419,13 +553,14 @@ PurpleContact *contact = (PurpleContact *)node; struct _pidgin_blist_node *gtknode = (struct _pidgin_blist_node *)node->ui_data; - if (contact->alias || gtknode->contact_expanded) + if (contact->alias || gtknode->contact_expanded) { purple_blist_alias_contact(contact, arg2); - else - { + gtk_blist_auto_personize(node->parent, arg2); + } else { PurpleBuddy *buddy = purple_contact_get_priority_buddy(contact); purple_blist_alias_buddy(buddy, arg2); serv_alias_buddy(buddy); + gtk_blist_auto_personize(node->parent, arg2); } } break; @@ -433,6 +568,7 @@ case PURPLE_BLIST_BUDDY_NODE: purple_blist_alias_buddy((PurpleBuddy*)node, arg2); serv_alias_buddy((PurpleBuddy *)node); + gtk_blist_auto_personize(node->parent->parent, arg2); break; case PURPLE_BLIST_GROUP_NODE: dest = purple_find_group(arg2); @@ -1117,6 +1253,34 @@ g_list_free(ll); } + + +static void +pidgin_append_blist_node_move_to_menu(GtkWidget *menu, PurpleBlistNode *node) +{ + GtkWidget *submenu; + GtkWidget *menuitem; + PurpleBlistNode *group; + + menuitem = gtk_menu_item_new_with_label(_("Move to")); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + gtk_widget_show(menuitem); + + submenu = gtk_menu_new(); + gtk_menu_item_set_submenu(menuitem, submenu); + + for (group = purple_blist_get_root(); group; group = group->next) { + if (group->type != PURPLE_BLIST_GROUP_NODE) + continue; + if (group == node->parent) + continue; + menuitem = pidgin_new_item_from_stock(submenu, purple_group_get_name(group), NULL, + G_CALLBACK(gtk_blist_menu_move_to_cb), node, 0, 0, NULL); + g_object_set_data(G_OBJECT(menuitem), "groupnode", group); + } + gtk_widget_show_all(submenu); +} + void pidgin_blist_make_buddy_menu(GtkWidget *menu, PurpleBuddy *buddy, gboolean sub) { PurplePluginProtocolInfo *prpl_info; @@ -1168,6 +1332,9 @@ (PurpleBlistNode *)buddy); pidgin_append_blist_node_extended_menu(menu, (PurpleBlistNode *)buddy); + if (!contact_expanded) + pidgin_append_blist_node_move_to_menu(menu, contact); + if (((PurpleBlistNode*)buddy)->parent && ((PurpleBlistNode*)buddy)->parent->child->next && !sub && !contact_expanded) { pidgin_separator(menu); @@ -1254,16 +1421,19 @@ create_chat_menu(PurpleBlistNode *node, PurpleChat *c) { GtkWidget *menu; - gboolean autojoin; + gboolean autojoin, persistent; menu = gtk_menu_new(); autojoin = (purple_blist_node_get_bool(node, "gtk-autojoin") || (purple_blist_node_get_string(node, "gtk-autojoin") != NULL)); + persistent = purple_blist_node_get_bool(node, "gtk-persistent"); pidgin_new_item_from_stock(menu, _("_Join"), PIDGIN_STOCK_CHAT, G_CALLBACK(gtk_blist_menu_join_cb), node, 0, 0, NULL); pidgin_new_check_item(menu, _("Auto-Join"), G_CALLBACK(gtk_blist_menu_autojoin_cb), node, autojoin); + pidgin_new_check_item(menu, _("Persistent"), + G_CALLBACK(gtk_blist_menu_persistent_cb), node, persistent); pidgin_new_item_from_stock(menu, _("View _Log"), NULL, G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL); @@ -1305,7 +1475,6 @@ node, 0, 0, NULL); pidgin_append_blist_node_extended_menu(menu, node); - return menu; } @@ -2263,18 +2432,19 @@ if (prpl_info && prpl_info->icon_spec.scale_rules & PURPLE_ICON_SCALE_DISPLAY) purple_buddy_icon_get_scale_size(&prpl_info->icon_spec, &scale_width, &scale_height); - if (scaled) { + if (scaled || scale_height > 200 || scale_width > 200) { + float scale_size = scaled ? 32.0 : 200.0; if(scale_height > scale_width) { - scale_width = 32.0 * (double)scale_width / (double)scale_height; - scale_height = 32; + scale_width = scale_size * (double)scale_width / (double)scale_height; + scale_height = scale_size; } else { - scale_height = 32.0 * (double)scale_height / (double)scale_width; - scale_width = 32; + scale_height = scale_size * (double)scale_height / (double)scale_width; + scale_width = scale_size; } - ret = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 32, 32); + ret = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, scale_size, scale_size); gdk_pixbuf_fill(ret, 0x00000000); - gdk_pixbuf_scale(buf, ret, (32-scale_width)/2, (32-scale_height)/2, scale_width, scale_height, (32-scale_width)/2, (32-scale_height)/2, (double)scale_width/(double)orig_width, (double)scale_height/(double)orig_height, GDK_INTERP_BILINEAR); + gdk_pixbuf_scale(buf, ret, (scale_size-scale_width)/2, (scale_size-scale_height)/2, scale_width, scale_height, (scale_size-scale_width)/2, (scale_size-scale_height)/2, (double)scale_width/(double)orig_width, (double)scale_height/(double)orig_height, GDK_INTERP_BILINEAR); if (pidgin_gdk_pixbuf_is_opaque(ret)) pidgin_gdk_pixbuf_make_round(ret); } else { @@ -3142,8 +3312,6 @@ GdkPixbuf *ret; PurplePresence *p; - - if(PURPLE_BLIST_NODE_IS_CONTACT(node)) { if(!gtknode->contact_expanded) { buddy = purple_contact_get_priority_buddy((PurpleContact*)node); @@ -3185,6 +3353,13 @@ return ret; } + if (purple_status_get_attr_string(purple_presence_get_active_status(p), PURPLE_TUNE_TITLE)) { + path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "music.png", NULL); + ret = gdk_pixbuf_new_from_file(path, NULL); + g_free(path); + return ret; + } + prpl = purple_find_prpl(purple_account_get_protocol_id(buddy->account)); if (!prpl) return NULL; @@ -3258,17 +3433,17 @@ } if(buddy) { - PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, - purple_buddy_get_name(buddy), - purple_buddy_get_account(buddy)); + PurpleConversation *conv = find_conversation_with_buddy(buddy); PurplePresence *p; gboolean trans; if(conv != NULL) { PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); - if((gtkconv == NULL || pidgin_conv_is_hidden(gtkconv)) && size == PIDGIN_STATUS_ICON_SMALL) { - return gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_MESSAGE, - icon_size, "GtkTreeView"); + if (gtkconv == NULL && size == PIDGIN_STATUS_ICON_SMALL) { + PidginBlistNode *ui = buddy->node.ui_data; + if (ui == NULL || (ui->conv.flags & PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE)) + return gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), + PIDGIN_STOCK_STATUS_MESSAGE, icon_size, "GtkTreeView"); } } @@ -3324,16 +3499,17 @@ struct _pidgin_blist_node *gtkcontactnode = NULL; char *idletime = NULL, *statustext = NULL; time_t t; - PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, - purple_buddy_get_name(b), - purple_buddy_get_account(b)); - PidginConversation *gtkconv; + PurpleConversation *conv = find_conversation_with_buddy(b); gboolean hidden_conv = FALSE; - if(conv != NULL) { - gtkconv = PIDGIN_CONVERSATION(conv); - if(gtkconv == NULL || pidgin_conv_is_hidden(gtkconv)) { - hidden_conv = TRUE; + if (conv != NULL) { + PidginBlistNode *ui = b->node.ui_data; + if (ui) { + if (ui->conv.flags & PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE) + hidden_conv = TRUE; + } else { + if (PIDGIN_CONVERSATION(conv) == NULL) + hidden_conv = TRUE; } } @@ -3668,7 +3844,7 @@ menu = NULL; } - convs = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_IM, PIDGIN_UNSEEN_TEXT, TRUE, 0); + convs = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_ANY, PIDGIN_UNSEEN_TEXT, TRUE, 0); if (!convs) /* no conversations added, don't show the menu */ return; @@ -3724,7 +3900,7 @@ gtkblist->menutrayicon = NULL; } - convs = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_IM, PIDGIN_UNSEEN_TEXT, TRUE, 0); + convs = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_ANY, PIDGIN_UNSEEN_TEXT, TRUE, 0); if (convs) { GtkWidget *img = NULL; GString *tooltip_text = NULL; @@ -3732,14 +3908,10 @@ tooltip_text = g_string_new(""); l = convs; while (l != NULL) { - if (PIDGIN_IS_PIDGIN_CONVERSATION(l->data)) { - PidginConversation *gtkconv = PIDGIN_CONVERSATION((PurpleConversation *)l->data); - - g_string_append_printf(tooltip_text, - ngettext("%d unread message from %s\n", "%d unread messages from %s\n", gtkconv->unseen_count), - gtkconv->unseen_count, - gtk_label_get_text(GTK_LABEL(gtkconv->tab_label))); - } + int count = GPOINTER_TO_INT(purple_conversation_get_data(l->data, "unseen-count")); + g_string_append_printf(tooltip_text, + ngettext("%d unread message from %s\n", "%d unread messages from %s\n", count), + count, purple_conversation_get_name(l->data)); l = l->next; } if(tooltip_text->len > 0) { @@ -3767,6 +3939,88 @@ conversation_updated_cb(conv, PURPLE_CONV_UPDATE_UNSEEN, gtkblist); } +static void +conversation_deleted_update_ui_cb(PurpleConversation *conv, struct _pidgin_blist_node *ui) +{ + if (ui->conv.conv != conv) + return; + ui->conv.conv = NULL; + ui->conv.flags = 0; + ui->conv.last_message = 0; +} + +static void +written_msg_update_ui_cb(PurpleAccount *account, const char *who, const char *message, + PurpleConversation *conv, PurpleMessageFlags flag, PurpleBlistNode *node) +{ + PidginBlistNode *ui = node->ui_data; + if (ui->conv.conv != conv || PIDGIN_CONVERSATION(conv) || + !(flag & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV))) + return; + ui->conv.flags |= PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE; + ui->conv.last_message = time(NULL); /* XXX: for lack of better data */ + pidgin_blist_update(purple_get_blist(), node); +} + +static void +displayed_msg_update_ui_cb(PurpleAccount *account, const char *who, const char *message, + PurpleConversation *conv, PurpleMessageFlags flag, PurpleBlistNode *node) +{ + PidginBlistNode *ui = node->ui_data; + if (ui->conv.conv != conv) + return; + ui->conv.flags &= ~PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE; + pidgin_blist_update(purple_get_blist(), node); +} + +static void +conversation_created_cb(PurpleConversation *conv, PidginBuddyList *gtkblist) +{ + switch (conv->type) { + case PURPLE_CONV_TYPE_IM: + { + GSList *buddies = purple_find_buddies(conv->account, conv->name); + while (buddies) { + PurpleBlistNode *buddy = buddies->data; + struct _pidgin_blist_node *ui = buddy->ui_data; + buddies = g_slist_delete_link(buddies, buddies); + if (!ui) + continue; + ui->conv.conv = conv; + ui->conv.flags = 0; + ui->conv.last_message = 0; + purple_signal_connect(purple_conversations_get_handle(), "deleting-conversation", + ui, PURPLE_CALLBACK(conversation_deleted_update_ui_cb), ui); + purple_signal_connect(purple_conversations_get_handle(), "wrote-im-msg", + ui, PURPLE_CALLBACK(written_msg_update_ui_cb), buddy); + purple_signal_connect(pidgin_conversations_get_handle(), "displayed-im-msg", + ui, PURPLE_CALLBACK(displayed_msg_update_ui_cb), buddy); + } + } + case PURPLE_CONV_TYPE_CHAT: + { + PurpleChat *chat = purple_blist_find_chat(conv->account, conv->name); + struct _pidgin_blist_node *ui; + if (!chat) + break; + ui = chat->node.ui_data; + if (!ui) + break; + ui->conv.conv = conv; + ui->conv.flags = 0; + ui->conv.last_message = 0; + purple_signal_connect(purple_conversations_get_handle(), "deleting-conversation", + ui, PURPLE_CALLBACK(conversation_deleted_update_ui_cb), ui); + purple_signal_connect(purple_conversations_get_handle(), "wrote-chat-msg", + ui, PURPLE_CALLBACK(written_msg_update_ui_cb), chat); + purple_signal_connect(pidgin_conversations_get_handle(), "displayed-chat-msg", + ui, PURPLE_CALLBACK(displayed_msg_update_ui_cb), chat); + } + default: + break; + } +} + /********************************************************************************** * Public API Functions * **********************************************************************************/ @@ -4680,6 +4934,9 @@ purple_signal_connect(purple_conversations_get_handle(), "deleting-conversation", gtkblist, PURPLE_CALLBACK(conversation_deleting_cb), gtkblist); + purple_signal_connect(purple_conversations_get_handle(), "conversation-created", + gtkblist, PURPLE_CALLBACK(conversation_created_cb), + gtkblist); gtk_widget_hide(gtkblist->headline_hbox); gtk_widget_hide(gtkblist->error_buttons); @@ -4786,6 +5043,7 @@ if(gtknode->recent_signonoff_timer > 0) purple_timeout_remove(gtknode->recent_signonoff_timer); + purple_signals_disconnect_by_handle(node->ui_data); g_free(node->ui_data); node->ui_data = NULL; } @@ -4950,7 +5208,7 @@ STATUS_ICON_COLUMN, NULL, NAME_COLUMN, title, NODE_COLUMN, gnode, - BGCOLOR_COLUMN, &bgcolor, + /* BGCOLOR_COLUMN, &bgcolor, */ GROUP_EXPANDER_COLUMN, TRUE, GROUP_EXPANDER_VISIBLE_COLUMN, TRUE, CONTACT_EXPANDER_VISIBLE_COLUMN, FALSE, @@ -5210,14 +5468,17 @@ GdkPixbuf *emblem; char *mark; gboolean showicons = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"); - const char *name = purple_chat_get_name(chat); - PurpleConversation *conv = - purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, name, chat->account); - gboolean hidden = (conv && !PIDGIN_CONVERSATION(conv)); - - if(!insert_node(list, node, &iter)) + PidginBlistNode *ui; + PurpleConversation *conv; + gboolean hidden; + + if (!insert_node(list, node, &iter)) return; + ui = node->ui_data; + conv = ui->conv.conv; + hidden = (conv && (ui->conv.flags & PIDGIN_BLIST_NODE_HAS_PENDING_MESSAGE)); + status = pidgin_blist_get_status_icon(node, PIDGIN_STATUS_ICON_SMALL); emblem = pidgin_blist_get_emblem(node); @@ -5357,15 +5618,17 @@ static GList * groups_tree(void) { - GList *tmp = NULL; + static GList *list = NULL; char *tmp2; PurpleGroup *g; PurpleBlistNode *gnode; + g_list_free(list); + list = NULL; + if (purple_get_blist()->root == NULL) { - tmp2 = g_strdup(_("Buddies")); - tmp = g_list_append(tmp, tmp2); + list = g_list_append(list, (gpointer)_("Buddies")); } else { @@ -5377,12 +5640,12 @@ { g = (PurpleGroup *)gnode; tmp2 = g->name; - tmp = g_list_append(tmp, tmp2); + list = g_list_append(list, tmp2); } } } - return tmp; + return list; } static void @@ -5411,7 +5674,7 @@ if (resp == GTK_RESPONSE_OK) { who = gtk_entry_get_text(GTK_ENTRY(data->entry)); - grp = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(data->combo)->entry)); + grp = pidgin_text_combo_box_entry_get_text(data->combo); whoalias = gtk_entry_get_text(GTK_ENTRY(data->entry_for_alias)); if (*whoalias == '\0') whoalias = NULL; @@ -5577,19 +5840,15 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4); - data->combo = gtk_combo_new(); - gtk_combo_set_popdown_strings(GTK_COMBO(data->combo), groups_tree()); + data->combo = pidgin_text_combo_box_entry_new(group, groups_tree()); gtk_table_attach_defaults(GTK_TABLE(table), data->combo, 1, 2, 3, 4); - gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_COMBO(data->combo)->entry); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_BIN(data->combo)->child); pidgin_set_accessible_label (data->combo, label); g_signal_connect(G_OBJECT(data->window), "response", G_CALLBACK(add_buddy_cb), data); gtk_widget_show_all(data->window); - - if (group != NULL) - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->combo)->entry), group); } static void @@ -5628,7 +5887,7 @@ gtk_entry_get_text(GTK_ENTRY(data->alias_entry)), components); - group_name = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(data->group_combo)->entry)); + group_name = pidgin_text_combo_box_entry_get_text(data->group_combo); if ((group = purple_find_group(group_name)) == NULL) { @@ -5931,18 +6190,11 @@ gtk_size_group_add_widget(data->sg, label); gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0); - data->group_combo = gtk_combo_new(); - gtk_combo_set_popdown_strings(GTK_COMBO(data->group_combo), groups_tree()); + data->group_combo = pidgin_text_combo_box_entry_new(group ? group->name : NULL, groups_tree()); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_BIN(data->group_combo)->child); + pidgin_set_accessible_label (data->group_combo, label); gtk_box_pack_end(GTK_BOX(rowbox), data->group_combo, TRUE, TRUE, 0); - if (group) - { - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->group_combo)->entry), - group->name); - } - gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_COMBO(data->group_combo)->entry); - pidgin_set_accessible_label (data->group_combo, label); - g_signal_connect(G_OBJECT(data->window), "response", G_CALLBACK(add_chat_resp_cb), data); diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkblist.h --- a/pidgin/gtkblist.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkblist.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkblist.h GTK+ Buddy List API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkcellrendererexpander.c --- a/pidgin/gtkcellrendererexpander.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkcellrendererexpander.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkcellrendererexpander.c GTK+ Cell Renderer Expander * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -269,6 +270,9 @@ cell_area->x + cell->xpad + (width / 2), cell_area->y + cell->ypad + (height / 2), cell->is_expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED); + if (cell->is_expanded) + gtk_paint_hline (widget->style, window, state, NULL, widget, NULL, 0, + widget->allocation.width, cell_area->y + cell_area->height); } static gboolean pidgin_cell_renderer_expander_activate(GtkCellRenderer *r, diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkcellrendererprogress.c --- a/pidgin/gtkcellrendererprogress.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkcellrendererprogress.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkcellrendererprogress.c GTK+ Cell Renderer Progress * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkcertmgr.c --- a/pidgin/gtkcertmgr.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkcertmgr.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkcertmgr.c GTK+ Certificate Manager API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -312,10 +313,6 @@ GtkTreeModel *model; gchar *id; PurpleCertificate *crt; - gchar *subject; - GByteArray *fpr_sha1; - gchar *fpr_sha1_asc; - gchar *primary, *secondary; /* See if things are selected */ if (!gtk_tree_selection_get_selected(select, &model, &iter)) { @@ -331,25 +328,9 @@ crt = purple_certificate_pool_retrieve(tpm_dat->tls_peers, id); g_return_if_fail(crt); - /* Build a notification thing */ - /* TODO: This needs a better GUI, but a notification will do for now */ - primary = g_strdup_printf(_("Certificate for %s"), id); - - fpr_sha1 = purple_certificate_get_fingerprint_sha1(crt); - fpr_sha1_asc = purple_base16_encode_chunked(fpr_sha1->data, - fpr_sha1->len); - subject = purple_certificate_get_subject_name(crt); - - secondary = g_strdup_printf(_("Common name: %s\n\nSHA1 fingerprint:\n%s"), subject, fpr_sha1_asc); + /* Fire the notification */ + purple_certificate_display_x509(crt); - purple_notify_info(tpm_dat, - _("SSL Host Certificate"), primary, secondary ); - - g_free(primary); - g_free(secondary); - g_byte_array_free(fpr_sha1, TRUE); - g_free(fpr_sha1_asc); - g_free(subject); g_free(id); purple_certificate_destroy(crt); } diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkconn.c --- a/pidgin/gtkconn.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkconn.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkconn.c GTK+ Connection API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkconn.h --- a/pidgin/gtkconn.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkconn.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,7 +1,8 @@ /** * @file gtkconn.h GTK+ Connection API - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkconv.c --- a/pidgin/gtkconv.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkconv.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkconv.c GTK+ Conversation API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -69,6 +70,8 @@ #include "gtknickcolors.h" +#define CLOSE_CONV_TIMEOUT_SECS (10 * 60) + #define AUTO_RESPONSE "<AUTO-REPLY> : " typedef enum @@ -122,7 +125,6 @@ static GtkWidget *invite_dialog = NULL; static GtkWidget *warn_close_dialog = NULL; -static PidginWindow *hidden_convwin = NULL; static GList *window_list = NULL; /* Lists of status icons at all available sizes for use as window icons */ @@ -160,6 +162,7 @@ static gboolean infopane_press_cb(GtkWidget *widget, GdkEventButton *e, PidginConversation *conv); static gboolean pidgin_userlist_motion_cb (GtkWidget *w, GdkEventMotion *event, PidginConversation *gtkconv); static void pidgin_conv_leave_cb (GtkWidget *w, GdkEventCrossing *e, PidginConversation *gtkconv); +static void hide_conv(PidginConversation *gtkconv, gboolean closetimer); static void pidgin_conv_set_position_size(PidginWindow *win, int x, int y, int width, int height); @@ -207,12 +210,49 @@ **************************************************************************/ static gboolean -close_conv_cb(GtkWidget *w, GdkEventButton *event, PidginConversation *gtkconv) -{ +close_this_sucker(gpointer data) +{ + PidginConversation *gtkconv = data; GList *list = g_list_copy(gtkconv->convs); - g_list_foreach(list, (GFunc)purple_conversation_destroy, NULL); g_list_free(list); + return FALSE; +} + +static gboolean +close_conv_cb(GtkWidget *w, GdkEventButton *dontuse, PidginConversation *gtkconv) +{ + /* We are going to destroy the conversations immediately only if the 'close immediately' + * preference is selected. Otherwise, close the conversation after a reasonable timeout + * (I am going to consider 10 minutes as a 'reasonable timeout' here. + * For chats, close immediately if the chat is not in the buddylist, or if the chat is + * not marked 'Persistent' */ + PurpleConversation *conv = gtkconv->active_conv; + PurpleAccount *account = purple_conversation_get_account(conv); + const char *name = purple_conversation_get_name(conv); + + switch (purple_conversation_get_type(conv)) { + case PURPLE_CONV_TYPE_IM: + { + if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/close_immediately")) + close_this_sucker(gtkconv); + else + hide_conv(gtkconv, TRUE); + break; + } + case PURPLE_CONV_TYPE_CHAT: + { + PurpleChat *chat = purple_blist_find_chat(account, name); + if (!chat || + !purple_blist_node_get_bool(&chat->node, "gtk-persistent")) + close_this_sucker(gtkconv); + else + hide_conv(gtkconv, FALSE); + break; + } + default: + ; + } return TRUE; } @@ -707,7 +747,7 @@ gtkconv = PIDGIN_CONVERSATION(info->conv); if (resp == GTK_RESPONSE_OK) { - buddy = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(info->entry)->entry)); + buddy = pidgin_text_combo_box_entry_get_text(info->entry); message = gtk_entry_get_text(GTK_ENTRY(info->message)); if (!g_ascii_strcasecmp(buddy, "")) @@ -754,7 +794,7 @@ "chat."), NULL); } else - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(info->entry)->entry), buddy->name); + pidgin_text_combo_box_entry_set_text(info->entry, buddy->name); gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t); } @@ -781,7 +821,7 @@ } else { - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(info->entry)->entry), username); + pidgin_text_combo_box_entry_set_text(info->entry, username); } } @@ -879,19 +919,10 @@ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); /* Now the Buddy drop-down entry field. */ - info->entry = gtk_combo_new(); - gtk_combo_set_case_sensitive(GTK_COMBO(info->entry), FALSE); - gtk_entry_set_activates_default( - GTK_ENTRY(GTK_COMBO(info->entry)->entry), TRUE); - + info->entry = pidgin_text_combo_box_entry_new(NULL, generate_invite_user_names(gc)); gtk_table_attach_defaults(GTK_TABLE(table), info->entry, 1, 2, 0, 1); gtk_label_set_mnemonic_widget(GTK_LABEL(label), info->entry); - /* Fill in the names. */ - gtk_combo_set_popdown_strings(GTK_COMBO(info->entry), - generate_invite_user_names(gc)); - - /* Now the label for "Message" */ label = gtk_label_new(NULL); gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Message:")); @@ -933,7 +964,7 @@ gtk_widget_show_all(invite_dialog); if (info != NULL) - gtk_widget_grab_focus(GTK_COMBO(info->entry)->entry); + gtk_widget_grab_focus(GTK_BIN(info->entry)->child); } static void @@ -1323,18 +1354,33 @@ add_remove_cb(NULL, PIDGIN_CONVERSATION(conv)); } -#if 0 -static void -menu_hide_conv_cb(gpointer data, guint action, GtkWidget *widget) -{ - PidginWindow *win = data; - PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(win); - PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); +static gboolean +close_already(gpointer data) +{ + purple_conversation_destroy(data); + return FALSE; +} + +static void +hide_conv(PidginConversation *gtkconv, gboolean closetimer) +{ + GList *list; + purple_signal_emit(pidgin_conversations_get_handle(), "conversation-hiding", gtkconv); - purple_conversation_set_ui_ops(conv, NULL); -} -#endif + + for (list = g_list_copy(gtkconv->convs); list; list = g_list_delete_link(list, list)) { + PurpleConversation *conv = list->data; + if (closetimer) { + guint timer = GPOINTER_TO_INT(purple_conversation_get_data(conv, "close-timer")); + if (timer) + purple_timeout_remove(timer); + timer = purple_timeout_add_seconds(CLOSE_CONV_TIMEOUT_SECS, close_already, conv); + purple_conversation_set_data(conv, "close-timer", GINT_TO_POINTER(timer)); + } + purple_conversation_set_ui_ops(conv, NULL); + } +} static void menu_close_conv_cb(gpointer data, guint action, GtkWidget *widget) @@ -2349,63 +2395,69 @@ return get_prpl_icon_list(account); } -GdkPixbuf * -pidgin_conv_get_tab_icon(PurpleConversation *conv, gboolean small_icon) -{ - PurpleAccount *account = NULL; - const char *name = NULL; - GdkPixbuf *status = NULL; - PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); - const char *icon_size = small_icon ? PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC : PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL; - g_return_val_if_fail(conv != NULL, NULL); - - account = purple_conversation_get_account(conv); - name = purple_conversation_get_name(conv); - - g_return_val_if_fail(account != NULL, NULL); - g_return_val_if_fail(name != NULL, NULL); - - /* Use the buddy icon, if possible */ - if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { - PurpleBuddy *b = purple_find_buddy(account, name); - if (b != NULL) { +static GdkPixbuf * +pidgin_conv_get_icon(PurpleConversation *conv, GtkWidget *parent, const char *icon_size) +{ + PurpleAccount *account = NULL; + const char *name = NULL; + GdkPixbuf *status = NULL; + PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); + g_return_val_if_fail(conv != NULL, NULL); + + account = purple_conversation_get_account(conv); + name = purple_conversation_get_name(conv); + + g_return_val_if_fail(account != NULL, NULL); + g_return_val_if_fail(name != NULL, NULL); + + /* Use the buddy icon, if possible */ + if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { + PurpleBuddy *b = purple_find_buddy(account, name); + if (b != NULL) { PurplePresence *p = purple_buddy_get_presence(b); - /* I hate this hack. It fixes a bug where the pending message icon - * displays in the conv tab even though it shouldn't. - * A better solution would be great. */ - if (ops && ops->update) - ops->update(NULL, (PurpleBlistNode*)b); + /* I hate this hack. It fixes a bug where the pending message icon + * displays in the conv tab even though it shouldn't. + * A better solution would be great. */ + if (ops && ops->update) + ops->update(NULL, (PurpleBlistNode*)b); /* XXX Seanegan: We really need a util function to return a pixbuf for a Presence to avoid all this switching */ if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_AWAY)) - status = pidgin_create_status_icon(PURPLE_STATUS_AWAY, PIDGIN_CONVERSATION(conv)->icon, icon_size); + status = pidgin_create_status_icon(PURPLE_STATUS_AWAY, parent, icon_size); else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_EXTENDED_AWAY)) - status = pidgin_create_status_icon(PURPLE_STATUS_EXTENDED_AWAY, PIDGIN_CONVERSATION(conv)->icon, icon_size); - else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_OFFLINE)) - status = pidgin_create_status_icon(PURPLE_STATUS_OFFLINE, PIDGIN_CONVERSATION(conv)->icon, icon_size); - else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_AVAILABLE)) - status = pidgin_create_status_icon(PURPLE_STATUS_AVAILABLE, PIDGIN_CONVERSATION(conv)->icon, icon_size); - else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_INVISIBLE)) - status = pidgin_create_status_icon(PURPLE_STATUS_INVISIBLE, PIDGIN_CONVERSATION(conv)->icon, icon_size); - else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_UNAVAILABLE)) - status = pidgin_create_status_icon(PURPLE_STATUS_UNAVAILABLE, PIDGIN_CONVERSATION(conv)->icon, icon_size); - } - } - - /* If they don't have a buddy icon, then use the PRPL icon */ - if (status == NULL) { + status = pidgin_create_status_icon(PURPLE_STATUS_EXTENDED_AWAY, parent, icon_size); + else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_OFFLINE)) + status = pidgin_create_status_icon(PURPLE_STATUS_OFFLINE, parent, icon_size); + else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_AVAILABLE)) + status = pidgin_create_status_icon(PURPLE_STATUS_AVAILABLE, parent, icon_size); + else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_INVISIBLE)) + status = pidgin_create_status_icon(PURPLE_STATUS_INVISIBLE, parent, icon_size); + else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_UNAVAILABLE)) + status = pidgin_create_status_icon(PURPLE_STATUS_UNAVAILABLE, parent, icon_size); + } + } + + /* If they don't have a buddy icon, then use the PRPL icon */ + if (status == NULL) { GtkIconSize size = gtk_icon_size_from_name(icon_size); if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { - status = gtk_widget_render_icon (PIDGIN_CONVERSATION(conv)->icon, PIDGIN_STOCK_STATUS_PERSON, - size, "GtkWidget"); + status = gtk_widget_render_icon (parent, PIDGIN_STOCK_STATUS_PERSON, + size, "GtkWidget"); } else { - status = gtk_widget_render_icon (PIDGIN_CONVERSATION(conv)->icon, PIDGIN_STOCK_STATUS_CHAT, - size, "GtkWidget"); + status = gtk_widget_render_icon (parent, PIDGIN_STOCK_STATUS_CHAT, + size, "GtkWidget"); } } return status; } +GdkPixbuf * +pidgin_conv_get_tab_icon(PurpleConversation *conv, gboolean small_icon) +{ + const char *icon_size = small_icon ? PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC : PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL; + return pidgin_conv_get_icon(conv, PIDGIN_CONVERSATION(conv)->icon, icon_size); +} + static void update_tab_icon(PurpleConversation *conv) @@ -2757,9 +2809,9 @@ PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); GdkModifierType state; - if(gtkconv->win==hidden_convwin) { - pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv); - pidgin_conv_placement_place(gtkconv); + if (gtkconv == NULL) { + pidgin_conv_attach_to_conversation(conv); + gtkconv = PIDGIN_CONVERSATION(conv); } pidgin_conv_switch_active_conversation(conv); @@ -2792,15 +2844,19 @@ PurpleConversation *conv = (PurpleConversation*)l->data; PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); - if(gtkconv == NULL || gtkconv->active_conv != conv) + if (gtkconv != NULL && gtkconv->active_conv != conv) continue; - - if (gtkconv->unseen_state >= min_state - && (!hidden_only || - (hidden_only && gtkconv->win == hidden_convwin))) { - + if (gtkconv == NULL) { + if (!hidden_only || + !purple_conversation_get_data(conv, "unseen-count")) + continue; r = g_list_prepend(r, conv); c++; + } else { + if (gtkconv->unseen_state >= min_state && !hidden_only) { + r = g_list_prepend(r, conv); + c++; + } } } @@ -2840,11 +2896,11 @@ PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); GtkWidget *icon = gtk_image_new(); - GdkPixbuf *pbuf = pidgin_conv_get_tab_icon(conv, TRUE); + GdkPixbuf *pbuf = pidgin_conv_get_icon(conv, icon, PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC); GtkWidget *item; gchar *text = g_strdup_printf("%s (%d)", - gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)), - gtkconv->unseen_count); + gtkconv ? gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)) : purple_conversation_get_name(conv), + gtkconv ? gtkconv->unseen_count : GPOINTER_TO_INT(purple_conversation_get_data(conv, "unseen-count"))); gtk_image_set_from_pixbuf(GTK_IMAGE(icon), pbuf); g_object_unref(pbuf); @@ -3102,7 +3158,7 @@ PurpleConversation *conv; GtkWidget *item; - if (win->window == NULL || win == hidden_convwin) + if (win->window == NULL) return; gtkconv = pidgin_conv_window_get_active_gtkconv(win); @@ -3653,8 +3709,7 @@ static GList *tmp = NULL; g_list_free(tmp); - - tmp = g_list_append(NULL, ""); + tmp = NULL; if (gc != NULL) { for(gnode = purple_get_blist()->root; gnode; gnode = gnode->next) { @@ -4952,6 +5007,9 @@ GtkWidget *tab_cont; PurpleBlistNode *convnode; + if (hidden) + return; + if (conv_type == PURPLE_CONV_TYPE_IM && (gtkconv = pidgin_conv_find_gtkconv(conv))) { conv->ui_data = gtkconv; if (!g_list_find(gtkconv->convs, conv)) @@ -5051,10 +5109,7 @@ G_CALLBACK(gtk_widget_grab_focus), gtkconv->entry); - if (hidden) - pidgin_conv_window_add_gtkconv(hidden_convwin, gtkconv); - else - pidgin_conv_placement_place(gtkconv); + pidgin_conv_placement_place(gtkconv); if (nick_colors == NULL) { nbr_nick_colors = NUM_NICK_COLORS; @@ -5062,11 +5117,13 @@ } } +#if 0 static void pidgin_conv_new_hidden(PurpleConversation *conv) { private_gtkconv_new(conv, TRUE); } +#endif void pidgin_conv_new(PurpleConversation *conv) @@ -5079,26 +5136,22 @@ PurpleConversation *conv, PurpleMessageFlags flags) { PurpleConversationUiOps *ui_ops = pidgin_conversations_get_conv_ui_ops(); - if (conv != NULL) - return; /* create hidden conv if hide_new pref is always */ - if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always") == 0) - { - ui_ops->create_conversation = pidgin_conv_new_hidden; - purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender); - ui_ops->create_conversation = pidgin_conv_new; - return; - } - - /* create hidden conv if hide_new pref is away and account is away */ - if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away") == 0 && - !purple_status_is_available(purple_account_get_active_status(account))) - { - ui_ops->create_conversation = pidgin_conv_new_hidden; - purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender); - ui_ops->create_conversation = pidgin_conv_new; - return; + /* or if hide_new pref is away and account is away */ + if ((strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always") == 0) || + (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away") == 0 && + !purple_status_is_available(purple_account_get_active_status(account)))) { + if (!conv) { + ui_ops->create_conversation = NULL; + conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender); + purple_conversation_set_ui_ops(conv, NULL); + ui_ops->create_conversation = pidgin_conv_new; + } + } else { + /* new message for an IM */ + if (conv && conv->type == PURPLE_CONV_TYPE_IM) + pidgin_conv_attach_to_conversation(conv); } } @@ -5107,6 +5160,9 @@ { PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); + if (!gtkconv) + return; + gtkconv->convs = g_list_remove(gtkconv->convs, conv); /* Don't destroy ourselves until all our convos are gone */ if (gtkconv->convs) { @@ -6359,8 +6415,13 @@ if ((purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) && (gtkconv->u.im->anim)) { + PurpleBuddy *buddy = purple_find_buddy(conv->account, conv->name); window_icon = gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim); + + if (buddy && !PURPLE_BUDDY_IS_ONLINE(buddy)) + gdk_pixbuf_saturate_and_pixelate(window_icon, window_icon, 0.0, FALSE); + g_object_ref(window_icon); l = g_list_append(l, window_icon); } else { @@ -6579,6 +6640,19 @@ pidgin_conv_update_fields(conv, flags); } +static void +wrote_msg_update_unseen_cb(PurpleAccount *account, const char *who, const char *message, + PurpleConversation *conv, PurpleMessageFlags flag, gpointer null) +{ + if (conv == NULL || PIDGIN_IS_PIDGIN_CONVERSATION(conv)) + return; + if (flag & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV)) { + purple_conversation_set_data(conv, "unseen-count", + GINT_TO_POINTER(GPOINTER_TO_INT(purple_conversation_get_data(conv, "unseen-count")) + 1)); + purple_conversation_update(conv, PURPLE_CONV_UPDATE_UNSEEN); + } +} + static PurpleConversationUiOps conversation_ui_ops = { pidgin_conv_new, @@ -7076,6 +7150,7 @@ account_status_changed_cb(PurpleAccount *account, PurpleStatus *oldstatus, PurpleStatus *newstatus) { +#if 0 GList *l; PurpleConversation *conv = NULL; PidginConversation *gtkconv; @@ -7085,27 +7160,7 @@ if(purple_status_is_available(oldstatus) || !purple_status_is_available(newstatus)) return; - - while ((l = hidden_convwin->gtkconvs) != NULL) - { - gtkconv = l->data; - - conv = gtkconv->active_conv; - - while(l && !purple_status_is_available( - purple_account_get_active_status( - purple_conversation_get_account(conv)))) - l = l->next; - if (!l) - break; - - pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv); - pidgin_conv_placement_place(gtkconv); - - /* TODO: do we need to do anything for any other conversations that are in the same gtkconv here? - * I'm a little concerned that not doing so will cause the "pending" indicator in the gtkblist not to be cleared. -DAA*/ - purple_conversation_update(conv, PURPLE_CONV_UPDATE_UNSEEN); - } +#endif } static void @@ -7113,32 +7168,25 @@ gconstpointer value, gpointer data) { GList *l; - PurpleConversation *conv = NULL; - PidginConversation *gtkconv; gboolean when_away = FALSE; - if(!hidden_convwin) - return; - if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always")==0) return; if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")==0) when_away = TRUE; - while ((l = hidden_convwin->gtkconvs) != NULL) + for (l = purple_get_conversations(); l; l = l->next) { - gtkconv = l->data; - - conv = gtkconv->active_conv; - + PurpleConversation *conv = l->data; + PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); + if (gtkconv) + continue; if(when_away && !purple_status_is_available( purple_account_get_active_status( purple_conversation_get_account(conv)))) continue; - - pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv); - pidgin_conv_placement_place(gtkconv); + pidgin_conv_attach_to_conversation(conv); } } @@ -7321,9 +7369,15 @@ PidginConversation *gtkconv = data; int count = 0; int timer = gtkconv->attach.timer; + time_t when = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(gtkconv->entry), "attach-start-time")); + gtkconv->attach.timer = 0; while (gtkconv->attach.current && count < 100) { /* XXX: 100 is a random value here */ PurpleConvMessage *msg = gtkconv->attach.current->data; + if (when && when < msg->when) { + gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "
", 0); + g_object_set_data(G_OBJECT(gtkconv->entry), "attach-start-time", NULL); + } pidgin_conv_write_conv(gtkconv->active_conv, msg->who, msg->who, msg->what, msg->flags, msg->when); gtkconv->attach.current = gtkconv->attach.current->prev; count++; @@ -7343,18 +7397,21 @@ { GList *list; PidginConversation *gtkconv; + int timer; if (PIDGIN_IS_PIDGIN_CONVERSATION(conv)) return FALSE; + purple_conversation_set_data(conv, "unseen-count", NULL); purple_conversation_set_ui_ops(conv, pidgin_conversations_get_conv_ui_ops()); private_gtkconv_new(conv, FALSE); gtkconv = PIDGIN_CONVERSATION(conv); list = purple_conversation_get_message_history(conv); if (list) { - list = g_list_last(list); - gtkconv->attach.current = list; + g_object_set_data(G_OBJECT(gtkconv->entry), "attach-start-time", + GINT_TO_POINTER(((PurpleConvMessage*)(list->data))->when)); + gtkconv->attach.current = g_list_last(list); gtkconv->attach.timer = g_idle_add(add_message_history_to_gtkconv, gtkconv); } else { purple_signal_emit(pidgin_conversations_get_handle(), @@ -7366,6 +7423,10 @@ pidgin_conv_chat_add_users(conv, PURPLE_CONV_CHAT(conv)->in_room, TRUE); } + timer = GPOINTER_TO_INT(purple_conversation_get_data(conv, "close-timer")); + if (timer) + purple_timeout_remove(timer); + return TRUE; } @@ -7431,6 +7492,7 @@ purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", TRUE); purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new", "never"); + purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/im/close_immediately", FALSE); #ifdef _WIN32 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/win32/minimize_new_convs", FALSE); @@ -7594,9 +7656,6 @@ purple_conversations_set_ui_ops(&conversation_ui_ops); - hidden_convwin = pidgin_conv_window_new(); - window_list = g_list_remove(window_list, hidden_convwin); - purple_signal_connect(purple_accounts_get_handle(), "account-status-changed", handle, PURPLE_CALLBACK(account_status_changed_cb), NULL); @@ -7632,6 +7691,10 @@ purple_signal_connect_priority(purple_conversations_get_handle(), "conversation-updated", handle, PURPLE_CALLBACK(pidgin_conv_updated), NULL, PURPLE_SIGNAL_PRIORITY_LOWEST); + purple_signal_connect(purple_conversations_get_handle(), "wrote-im-msg", handle, + PURPLE_CALLBACK(wrote_msg_update_unseen_cb), NULL); + purple_signal_connect(purple_conversations_get_handle(), "wrote-chat-msg", handle, + PURPLE_CALLBACK(wrote_msg_update_unseen_cb), NULL); } void @@ -7640,8 +7703,6 @@ purple_prefs_disconnect_by_handle(pidgin_conversations_get_handle()); purple_signals_disconnect_by_handle(pidgin_conversations_get_handle()); purple_signals_unregister_by_instance(pidgin_conversations_get_handle()); - pidgin_conv_window_destroy(hidden_convwin); - hidden_convwin=NULL; } @@ -8773,15 +8834,10 @@ if (win->gtkconvs) { while (win->gtkconvs) { - GList *nextgtk = win->gtkconvs->next; - PidginConversation *gtkconv = win->gtkconvs->data; - GList *nextcore = gtkconv->convs->next; - PurpleConversation *conv = gtkconv->convs->data; - purple_conversation_destroy(conv); - if (!nextgtk && !nextcore) - /* we'll end up invoking ourselves when we destroy our last child */ - /* so don't destroy ourselves right now */ - return; + gboolean last = (win->gtkconvs->next == NULL); + close_conv_cb(NULL, NULL, win->gtkconvs->data); + if (last) + break; } return; } @@ -9058,7 +9114,7 @@ if (win->gtkconvs && win->gtkconvs->next == NULL) pidgin_conv_tab_pack(win, win->gtkconvs->data); - if (!win->gtkconvs && win != hidden_convwin) + if (!win->gtkconvs) pidgin_conv_window_destroy(win); } @@ -9597,9 +9653,7 @@ gboolean pidgin_conv_is_hidden(PidginConversation *gtkconv) { - g_return_val_if_fail(gtkconv != NULL, FALSE); - - return (gtkconv->win == hidden_convwin); + return (gtkconv == NULL); } @@ -9700,3 +9754,4 @@ return colors; } + diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkconv.h --- a/pidgin/gtkconv.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkconv.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkconv.h GTK+ Conversation API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkconvwin.h --- a/pidgin/gtkconvwin.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkconvwin.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkconvwin.h GTK+ Conversation Window API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkdebug.c --- a/pidgin/gtkdebug.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkdebug.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkdebug.c GTK+ Debug API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkdebug.h --- a/pidgin/gtkdebug.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkdebug.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkdebug.h GTK+ Debug API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkdialogs.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkdialogs.c GTK+ Dialogs * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -365,7 +366,9 @@ filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "logo.png", NULL); pixbuf = gdk_pixbuf_new_from_file(filename, NULL); g_free(filename); +#if 0 /* Don't versionize the logo when the logo has the version in it */ pidgin_logo_versionize(&pixbuf, logo); +#endif gtk_widget_destroy(logo); logo = gtk_image_new_from_pixbuf(pixbuf); gdk_pixbuf_unref(pixbuf); @@ -456,7 +459,7 @@ if (retired_patch_writers[i].email != NULL) { g_string_append_printf(str, " %s <%s>
", retired_patch_writers[i].name, - retired_patch_writers[i].email, patch_writers[i].email); + retired_patch_writers[i].email, retired_patch_writers[i].email); } else { g_string_append_printf(str, " %s
", retired_patch_writers[i].name); diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkdialogs.h --- a/pidgin/gtkdialogs.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkdialogs.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,7 +1,8 @@ /** * @defgroup pidgin Pidgin (GTK+ User Interface) - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkdnd-hints.c --- a/pidgin/gtkdnd-hints.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkdnd-hints.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkdnd-hints.c GTK+ Drag-and-Drop arrow hints * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkdnd-hints.h --- a/pidgin/gtkdnd-hints.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkdnd-hints.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkdnd-hints.h GTK+ Drag-and-Drop arrow hints * @ingroup pidgin - * - * Pidgin is the legal property of its developers, whose names are too numerous + */ + +/* Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkeventloop.c --- a/pidgin/gtkeventloop.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkeventloop.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtk_eventloop.c Purple Event Loop API (gtk implementation) * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkeventloop.h --- a/pidgin/gtkeventloop.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkeventloop.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkeventloop.h Pidgin GTK+ Event Loop Implementation * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkft.c --- a/pidgin/gtkft.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkft.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkft.c GTK+ File Transfer UI * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkft.h --- a/pidgin/gtkft.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkft.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkft.h GTK+ File Transfer UI * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkgaim-compat.h --- a/pidgin/gtkgaim-compat.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkgaim-compat.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,7 +1,8 @@ /** * @file gtkgaim-compat.h Gtk Gaim Compat macros - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkidle.h --- a/pidgin/gtkidle.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkidle.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkidle.h GTK+ Idle API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkimhtml.c --- a/pidgin/gtkimhtml.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkimhtml.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkimhtml.c GTK+ IMHtml * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkimhtml.h --- a/pidgin/gtkimhtml.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkimhtml.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkimhtml.h GTK+ IM/HTML rendering component * @ingroup pidgin - * - * Pidgin is the legal property of its developers, whose names are too numerous + */ + +/* Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkimhtmltoolbar.c --- a/pidgin/gtkimhtmltoolbar.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkimhtmltoolbar.c GTK+ IMHtml Toolbar * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -739,11 +740,11 @@ while (it != NULL) { it_tmp = it; - gtk_box_pack_start(GTK_BOX(line), it->button, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(line), it->button, FALSE, FALSE, 0); gtk_widget_show(it->button); line_width += it->width; if (line_width >= max_line_width) { - gtk_box_pack_start(GTK_BOX(smiley_table), line, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(smiley_table), line, FALSE, FALSE, 0); line = gtk_hbox_new(FALSE, 0); line_width = 0; col = 0; @@ -1162,6 +1163,7 @@ GtkWidget *label; GtkWidget *insert_button; GtkWidget *font_button; + GtkWidget *smiley_button; GtkWidget *font_menu; GtkWidget *insert_menu; GtkWidget *menuitem; @@ -1263,12 +1265,6 @@ insert_menu = gtk_menu_new(); g_object_set_data(G_OBJECT(toolbar), "insert_menu", insert_menu); - menuitem = gtk_menu_item_new_with_mnemonic(_("_Smiley")); - g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK(gtk_button_clicked), toolbar->smiley); - gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem); - g_signal_connect(G_OBJECT(toolbar->smiley), "notify::sensitive", - G_CALLBACK(button_sensitiveness_changed), menuitem); - menuitem = gtk_menu_item_new_with_mnemonic(_("_Image")); g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK(gtk_button_clicked), toolbar->image); gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem); @@ -1290,6 +1286,24 @@ g_signal_connect(G_OBJECT(insert_button), "activate", G_CALLBACK(pidgin_menu_clicked), insert_menu); g_signal_connect(G_OBJECT(insert_menu), "deactivate", G_CALLBACK(pidgin_menu_deactivate), insert_button); toolbar->sml = NULL; + + /* Sep */ + sep = gtk_vseparator_new(); + gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0); + gtk_widget_show_all(sep); + + /* Smiley */ + smiley_button = gtk_button_new(); + gtk_button_set_relief(GTK_BUTTON(smiley_button), GTK_RELIEF_NONE); + bbox = gtk_hbox_new(FALSE, 3); + gtk_container_add(GTK_CONTAINER(smiley_button), bbox); + image = gtk_image_new_from_stock(PIDGIN_STOCK_TOOLBAR_SMILEY, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); + gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 0); + label = gtk_label_new_with_mnemonic(_("_Smiley")); + gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(box), smiley_button, FALSE, FALSE, 0); + g_signal_connect_swapped(G_OBJECT(smiley_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->smiley); + gtk_widget_show_all(smiley_button); gtk_box_pack_start(GTK_BOX(hbox), box, FALSE, FALSE, 0); g_object_set_data(G_OBJECT(hbox), "lean-view", box); diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtklog.c --- a/pidgin/gtklog.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtklog.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtklog.c GTK+ Log viewer * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtklog.h --- a/pidgin/gtklog.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtklog.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtklog.h GTK+ Log viewer * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkmenutray.h --- a/pidgin/gtkmenutray.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkmenutray.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkmenutray.h GTK+ Tray menu item * @ingroup pidgin - * - * Pidgin is the legal property of its developers, whose names are too numerous + */ + +/* Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtknickcolors.h --- a/pidgin/gtknickcolors.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtknickcolors.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtknickcolors.h GTK+ Conversation API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtknotify.c --- a/pidgin/gtknotify.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtknotify.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtknotify.c GTK+ Notification API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtknotify.h --- a/pidgin/gtknotify.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtknotify.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtknotify.h GTK+ Notification API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkplugin.c --- a/pidgin/gtkplugin.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkplugin.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkplugin.c GTK+ Plugins support * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkplugin.h --- a/pidgin/gtkplugin.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkplugin.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkplugin.h GTK+ Plugin API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkpluginpref.c --- a/pidgin/gtkpluginpref.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkpluginpref.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkpluginpref.c GTK+ Plugin preferences * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkpluginpref.h --- a/pidgin/gtkpluginpref.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkpluginpref.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkpluginpref.h GTK+ Plugin Preferences * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkpounce.c --- a/pidgin/gtkpounce.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkpounce.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkpounce.c GTK+ Buddy Pounce API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkpounce.h --- a/pidgin/gtkpounce.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkpounce.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkpounce.h GTK+ Buddy Pounce API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkprefs.c --- a/pidgin/gtkprefs.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkprefs.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkprefs.c GTK+ Preferences * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -993,6 +994,8 @@ pidgin_prefs_checkbox(_("Show _formatting on incoming messages"), PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", vbox); + pidgin_prefs_checkbox(_("Close IMs immediately when the tab is closed"), + PIDGIN_PREFS_ROOT "/conversations/im/close_immediately", vbox); iconpref1 = pidgin_prefs_checkbox(_("Show _detailed information"), PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", vbox); @@ -1093,7 +1096,7 @@ const char *proxy = value; if (strcmp(proxy, "none") && strcmp(proxy, "envvar")) - gtk_widget_show_all(frame); + gtk_widget_show_all(frame); else gtk_widget_hide(frame); } diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkprefs.h --- a/pidgin/gtkprefs.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkprefs.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkprefs.h GTK+ Preferences * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkprivacy.c --- a/pidgin/gtkprivacy.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkprivacy.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkprivacy.c GTK+ Privacy UI * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkprivacy.h --- a/pidgin/gtkprivacy.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkprivacy.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkprivacy.h GTK+ Privacy UI * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkrequest.c --- a/pidgin/gtkrequest.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkrequest.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkrequest.c GTK+ Request API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -998,7 +999,6 @@ /* Create the tree view */ treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE); gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE); sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkrequest.h --- a/pidgin/gtkrequest.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkrequest.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkrequest.h GTK+ Request API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkroomlist.c --- a/pidgin/gtkroomlist.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkroomlist.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkroomlist.c GTK+ Room List UI * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkroomlist.h --- a/pidgin/gtkroomlist.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkroomlist.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkroomlist.h GTK+ Room List UI * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtksavedstatuses.c --- a/pidgin/gtksavedstatuses.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtksavedstatuses.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtksavedstatus.c GTK+ Saved Status Editor UI * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtksavedstatuses.h --- a/pidgin/gtksavedstatuses.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtksavedstatuses.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtksavedstatuses.h GTK+ Saved Status Editor UI * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkscrollbook.c --- a/pidgin/gtkscrollbook.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkscrollbook.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkscrollbook.c GTK+ Scrolling notebook widget * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkscrollbook.h --- a/pidgin/gtkscrollbook.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkscrollbook.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkscrollbook GTK+ Scrolling notebook Widget * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtksession.c --- a/pidgin/gtksession.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtksession.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtksession.c X Windows session management API * @ingroup pidgin - * - * Pidgin is the legal property of its developers, whose names are too numerous + */ + +/* Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtksession.h --- a/pidgin/gtksession.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtksession.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtksession.h X Windows session management API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtksound.c --- a/pidgin/gtksound.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtksound.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtksound.c GTK+ Sound * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtksound.h --- a/pidgin/gtksound.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtksound.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtksound.h GTK+ Sound API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkstatusbox.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkstatusbox.c GTK+ Status Selection Widget * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkstatusbox.h --- a/pidgin/gtkstatusbox.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkstatusbox.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /* * @file gtkstatusbox.c GTK+ Status Selection Widget * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkthemes.h --- a/pidgin/gtkthemes.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkthemes.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkthemes.h GTK+ Smiley Theme API * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkutils.c --- a/pidgin/gtkutils.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkutils.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkutils.c GTK+ utility functions * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -3215,3 +3216,56 @@ } #endif +static void +combo_box_changed_cb(GtkComboBox *combo_box, GtkEntry *entry) +{ + char *text = gtk_combo_box_get_active_text(combo_box); + gtk_entry_set_text(entry, text ? text : ""); + g_free(text); +} + +static gboolean +entry_key_pressed_cb(GtkWidget *entry, GdkEventKey *key, GtkComboBox *combo) +{ + if (key->keyval == GDK_Down || key->keyval == GDK_Up) { + gtk_combo_box_popup(combo); + return TRUE; + } + return FALSE; +} + +GtkWidget * +pidgin_text_combo_box_entry_new(const char *default_item, GList *items) +{ + GtkComboBox *ret = NULL; + GtkWidget *the_entry = NULL; + + ret = GTK_COMBO_BOX(gtk_combo_box_new_text()); + the_entry = gtk_entry_new(); + gtk_container_add(GTK_CONTAINER(ret), the_entry); + + if (default_item) + gtk_entry_set_text(GTK_ENTRY(the_entry), default_item); + + for (; items != NULL ; items = items->next) { + char *text = items->data; + if (text && *text) + gtk_combo_box_append_text(ret, text); + } + + g_signal_connect(G_OBJECT(ret), "changed", (GCallback)combo_box_changed_cb, the_entry); + g_signal_connect_after(G_OBJECT(the_entry), "key-press-event", G_CALLBACK(entry_key_pressed_cb), ret); + + return GTK_WIDGET(ret); +} + +const char *pidgin_text_combo_box_entry_get_text(GtkWidget *widget) +{ + return gtk_entry_get_text(GTK_ENTRY(GTK_BIN((widget))->child)); +} + +void pidgin_text_combo_box_entry_set_text(GtkWidget *widget, const char *text) +{ + gtk_entry_set_text(GTK_ENTRY(GTK_BIN((widget))->child), (text)); +} + diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkutils.h --- a/pidgin/gtkutils.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkutils.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file gtkutils.h GTK+ utility functions * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this @@ -658,10 +659,37 @@ * @param ... list of integers terminated by -1 * * @return A newly created GtkTreePath. - * */ GtkTreePath *gtk_tree_path_new_from_indices (gint first_index, ...); #endif +/** + * Create a simple text GtkComboBoxEntry equivalent + * + * @param default_item Initial contents of GtkEntry + * @param items GList containing strings to add to GtkComboBox + * + * @return A newly created text GtkComboBox containing a GtkEntry + * child. + */ +GtkWidget *pidgin_text_combo_box_entry_new(const char *default_item, GList *items); + +/** + * Retrieve the text from the entry of the simple text GtkComboBoxEntry equivalent + * + * @param widget The simple text GtkComboBoxEntry equivalent widget + * + * @return The text in the widget's entry. It must not be freed + */ +const char *pidgin_text_combo_box_entry_get_text(GtkWidget *widget); + +/** + * Set the text in the entry of the simple text GtkComboBoxEntry equivalent + * + * @param widget The simple text GtkComboBoxEntry equivalent widget + * @param text The text to set + */ +void pidgin_text_combo_box_entry_set_text(GtkWidget *widget, const char *text); + #endif /* _PIDGINUTILS_H_ */ diff -r 8a4748cbf844 -r bd60afa72fce pidgin/gtkwhiteboard.h --- a/pidgin/gtkwhiteboard.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/gtkwhiteboard.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,7 +1,8 @@ /** * @file gtkwhiteboard.h The PidginWhiteboard frontend object - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/pidgin.h --- a/pidgin/pidgin.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/pidgin.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file pidgin.h UI definitions and includes * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/pidginstock.c --- a/pidgin/pidginstock.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/pidginstock.c Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file pidginstock.c GTK+ Stock resources * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/pidginstock.h --- a/pidgin/pidginstock.h Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/pidginstock.h Sun Sep 16 18:10:12 2007 +0000 @@ -1,8 +1,9 @@ /** * @file pidginstock.h GTK+ Stock resources * @ingroup pidgin - * - * pidgin + */ + +/* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this diff -r 8a4748cbf844 -r bd60afa72fce pidgin/pixmaps/emblems/16/Makefile.am --- a/pidgin/pixmaps/emblems/16/Makefile.am Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/pixmaps/emblems/16/Makefile.am Sun Sep 16 18:10:12 2007 +0000 @@ -12,6 +12,7 @@ hiptop.png \ male.png \ mobile.png \ + music.png \ not-authorized.png \ operator.png \ qq-member.png \ diff -r 8a4748cbf844 -r bd60afa72fce pidgin/pixmaps/emblems/16/music.png Binary file pidgin/pixmaps/emblems/16/music.png has changed diff -r 8a4748cbf844 -r bd60afa72fce pidgin/pixmaps/emblems/16/scalable/Makefile.am --- a/pidgin/pixmaps/emblems/16/scalable/Makefile.am Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/Makefile.am Sun Sep 16 18:10:12 2007 +0000 @@ -7,6 +7,7 @@ game.svg \ male.svg \ mobile.svg \ + music.svg \ not-authorized.svg \ qq-member.svg \ secure.svg \ diff -r 8a4748cbf844 -r bd60afa72fce pidgin/pixmaps/emblems/16/scalable/music.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emblems/16/scalable/music.svg Sun Sep 16 18:10:12 2007 +0000 @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r 8a4748cbf844 -r bd60afa72fce pidgin/pixmaps/emotes/default/24/default.theme.in --- a/pidgin/pixmaps/emotes/default/24/default.theme.in Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/24/default.theme.in Sun Sep 16 18:10:12 2007 +0000 @@ -262,7 +262,6 @@ shout.png >:o >:O beer.png *DRINK* smile-big.png :-D :D -moneymouth.png :-$ glasses-cool.png 8-) in-love.png *IN\ LOVE* ! skywalker.png C:-) c:-) C:) c:) diff -r 8a4748cbf844 -r bd60afa72fce pidgin/pixmaps/status/Makefile.am --- a/pidgin/pixmaps/status/Makefile.am Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/pixmaps/status/Makefile.am Sun Sep 16 18:10:12 2007 +0000 @@ -3,6 +3,7 @@ EXTRA_DIST = \ Makefile.mingw \ 11/Makefile.mingw \ + 11/rtl/Makefile.mingw \ 16/Makefile.mingw \ 16/rtl/Makefile.mingw \ 22/Makefile.mingw \ diff -r 8a4748cbf844 -r bd60afa72fce pidgin/plugins/crazychat/cc_features.c --- a/pidgin/plugins/crazychat/cc_features.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/plugins/crazychat/cc_features.c Sun Sep 16 18:10:12 2007 +0000 @@ -155,20 +155,16 @@ gtk_box_pack_start(GTK_BOX(ret.vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); - GtkWidget *model_combo = gtk_combo_new(); GList *glist = NULL; - glist = g_list_append(glist, "Dog"); glist = g_list_append(glist, "Shark"); - gtk_combo_set_popdown_strings(GTK_COMBO(model_combo), glist); + instance->model = pidgin_text_combo_box_entry_new(NULL, glist); g_list_free(glist); //gtk_combo_box_set_column_span_column(GTK_COMBO(model_combo), // 10); - gtk_box_pack_start(GTK_BOX(hbox), model_combo, TRUE, TRUE, 0); - gtk_widget_show(model_combo); - instance->model = model_combo; + gtk_box_pack_start(GTK_BOX(hbox), instance->model, TRUE, TRUE, 0); + gtk_widget_show(instance->model); - GtkWidget *head_material_combo = gtk_combo_new(); glist = NULL; glist = g_list_append(glist, "Red"); glist = g_list_append(glist, "Dark Brown"); @@ -176,15 +172,13 @@ glist = g_list_append(glist, "White"); glist = g_list_append(glist, "Green"); glist = g_list_append(glist, "Black"); - gtk_combo_set_popdown_strings(GTK_COMBO(head_material_combo), glist); + instance->head = pidgin_text_combo_box_entry_new(NULL, glist); g_list_free(glist); //gtk_combo_box_set_column_span_column(GTK_COMBO(head_material_combo), // 10); - gtk_box_pack_start(GTK_BOX(hbox), head_material_combo, TRUE, TRUE, 0); - gtk_widget_show(head_material_combo); - instance->head = head_material_combo; + gtk_box_pack_start(GTK_BOX(hbox), instance->head, TRUE, TRUE, 0); + gtk_widget_show(instance->head); - GtkWidget *appendage_material_combo = gtk_combo_new(); glist = NULL; glist = g_list_append(glist, "Red"); glist = g_list_append(glist, "Dark Brown"); @@ -192,20 +186,17 @@ glist = g_list_append(glist, "White"); glist = g_list_append(glist, "Green"); glist = g_list_append(glist, "Black"); - gtk_combo_set_popdown_strings(GTK_COMBO(appendage_material_combo), - glist); + instance->appendage = pidgin_text_combo_box_entry_new(NULL, glist); g_list_free(glist); //gtk_combo_box_set_column_span_column(GTK_COMBO(appendage_material_combo), 10); - gtk_box_pack_start(GTK_BOX(hbox), appendage_material_combo, + gtk_box_pack_start(GTK_BOX(hbox), instance->appendage, TRUE, TRUE, 0); - gtk_widget_show(appendage_material_combo); - instance->appendage = appendage_material_combo; + gtk_widget_show(instance->appendage); hbox = gtk_hbox_new(TRUE, 0); gtk_box_pack_start(GTK_BOX(ret.vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); - GtkWidget *lids_material_combo = gtk_combo_new(); glist = NULL; glist = g_list_append(glist, "Red"); glist = g_list_append(glist, "Dark Brown"); @@ -213,14 +204,12 @@ glist = g_list_append(glist, "White"); glist = g_list_append(glist, "Green"); glist = g_list_append(glist, "Black"); - gtk_combo_set_popdown_strings(GTK_COMBO(lids_material_combo), glist); + instance->lid = pidgin_text_combo_box_entry_new(NULL, glist); g_list_free(glist); //gtk_combo_box_set_column_span_column(GTK_COMBO(lids_material_combo), 10); - gtk_box_pack_start(GTK_BOX(hbox), lids_material_combo, TRUE, TRUE, 0); - gtk_widget_show(lids_material_combo); - instance->lid = lids_material_combo; + gtk_box_pack_start(GTK_BOX(hbox), instance->lid, TRUE, TRUE, 0); + gtk_widget_show(instance->lid); - GtkWidget *left_iris_material_combo = gtk_combo_new(); glist = NULL; glist = g_list_append(glist, "Red"); glist = g_list_append(glist, "Dark Brown"); @@ -228,17 +217,13 @@ glist = g_list_append(glist, "White"); glist = g_list_append(glist, "Green"); glist = g_list_append(glist, "Black"); - gtk_combo_set_popdown_strings(GTK_COMBO(left_iris_material_combo), - glist); + instance->left_iris = pidgin_text_combo_box_entry_new(NULL, glist); g_list_free(glist); //gtk_combo_box_set_column_span_column(GTK_COMBO(left_iris_material_combo), 10); - gtk_box_pack_start(GTK_BOX(hbox), left_iris_material_combo, - TRUE, TRUE, 0); - gtk_widget_show(left_iris_material_combo); - instance->left_iris = left_iris_material_combo; + gtk_box_pack_start(GTK_BOX(hbox), instance->left_iris, TRUE, TRUE, 0); + gtk_widget_show(instance->left_iris); /* - GtkWidget *right_iris_material_combo = gtk_combo_new(); glist = NULL; glist = g_list_append(glist, "Red"); glist = g_list_append(glist, "Dark Brown"); @@ -246,14 +231,11 @@ glist = g_list_append(glist, "White"); glist = g_list_append(glist, "Green"); glist = g_list_append(glist, "Black"); - gtk_combo_set_popdown_strings(GTK_COMBO(right_iris_material_combo), - glist); + instance->right_iris = pidgin_text_combo_box_entry_new(NULL, glist); g_list_free(glist); //gtk_combo_box_set_column_span_column(GTK_COMBO(right_iris_material_combo), 10); - gtk_box_pack_start(GTK_BOX(hbox), right_iris_material_combo, - TRUE, TRUE, 0); - gtk_widget_show(right_iris_material_combo); - instance->right_iris = right_iris_material_combo; + gtk_box_pack_start(GTK_BOX(hbox), instance->right_iris, TRUE, TRUE, 0); + gtk_widget_show(instance->right_iris); */ gtk_widget_add_events(ret.draw_area, GDK_BUTTON_PRESS_MASK); g_signal_connect(G_OBJECT(ret.draw_area), "button_press_event", diff -r 8a4748cbf844 -r bd60afa72fce pidgin/plugins/gevolution/add_buddy_dialog.c --- a/pidgin/plugins/gevolution/add_buddy_dialog.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Sun Sep 16 18:10:12 2007 +0000 @@ -68,7 +68,7 @@ const char *group_name; group_name = - gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(dialog->group_combo)->entry)); + pidgin_text_combo_box_entry_get_text(dialog->group_combo); gevo_new_person_dialog_show(dialog->book, NULL, dialog->account, dialog->username, (*group_name ? group_name : NULL), @@ -105,7 +105,7 @@ -1); group_name = - gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(dialog->group_combo)->entry)); + pidgin_text_combo_box_entry_get_text(dialog->group_combo); if (username == NULL || *username == '\0') { @@ -553,9 +553,8 @@ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_widget_show(label); - dialog->group_combo = gtk_combo_new(); - gtk_combo_set_popdown_strings(GTK_COMBO(dialog->group_combo), - gevo_get_groups()); + dialog->group_combo = + pidgin_text_combo_box_entry_new(NULL, gevo_get_groups()); gtk_box_pack_start(GTK_BOX(hbox), dialog->group_combo, TRUE, TRUE, 0); gtk_widget_show(dialog->group_combo); diff -r 8a4748cbf844 -r bd60afa72fce pidgin/plugins/gevolution/gevo-util.c --- a/pidgin/plugins/gevolution/gevo-util.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/plugins/gevolution/gevo-util.c Sun Sep 16 18:10:12 2007 +0000 @@ -55,10 +55,13 @@ GList * gevo_get_groups(void) { - GList *list = NULL; + static GList *list = NULL; PurpleGroup *g; PurpleBlistNode *gnode; + g_list_free(list); + list = NULL; + if (purple_get_blist()->root == NULL) { list = g_list_append(list, (gpointer)_("Buddies")); diff -r 8a4748cbf844 -r bd60afa72fce pidgin/plugins/gevolution/new_person_dialog.c --- a/pidgin/plugins/gevolution/new_person_dialog.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/plugins/gevolution/new_person_dialog.c Sun Sep 16 18:10:12 2007 +0000 @@ -195,10 +195,9 @@ if (!dialog->person_only) { - GtkWidget *entry = GTK_COMBO(dialog->group_combo)->entry; const char *group_name; - group_name = gtk_entry_get_text(GTK_ENTRY(entry)); + group_name = pidgin_text_combo_box_entry_get_text(dialog->group_combo); gevo_add_buddy(dialog->account, group_name, screenname, full_name); } @@ -297,9 +296,8 @@ G_CALLBACK(screenname_changed_cb), dialog); /* Group */ - dialog->group_combo = gtk_combo_new(); - gtk_combo_set_popdown_strings(GTK_COMBO(dialog->group_combo), - gevo_get_groups()); + dialog->group_combo = pidgin_text_combo_box_entry_new(NULL, + gevo_get_groups()); add_pref_box(sg, vbox, _("Group:"), dialog->group_combo); /* Separator */ diff -r 8a4748cbf844 -r bd60afa72fce pidgin/plugins/pidginrc.c --- a/pidgin/plugins/pidginrc.c Sun Sep 16 18:07:46 2007 +0000 +++ b/pidgin/plugins/pidginrc.c Sun Sep 16 18:10:12 2007 +0000 @@ -57,22 +57,16 @@ static const gchar *font_prefs[] = { "/plugins/gtk/purplerc/font/*pidgin_conv_entry", - "/plugins/gtk/purplerc/font/*pidgin_conv_imhtml", - "/plugins/gtk/purplerc/font/*pidgin_log_imhtml", "/plugins/gtk/purplerc/font/*pidgin_request_imhtml", "/plugins/gtk/purplerc/font/*pidgin_notify_imhtml", }; static const gchar *font_prefs_set[] = { "/plugins/gtk/purplerc/set/font/*pidgin_conv_entry", - "/plugins/gtk/purplerc/set/font/*pidgin_conv_imhtml", - "/plugins/gtk/purplerc/set/font/*pidgin_log_imhtml", "/plugins/gtk/purplerc/set/font/*pidgin_request_imhtml", "/plugins/gtk/purplerc/set/font/*pidgin_notify_imhtml", }; static const gchar *font_names[] = { N_("Conversation Entry"), - N_("Conversation History"), - N_("Log Viewer"), N_("Request Dialog"), N_("Notify Dialog") }; diff -r 8a4748cbf844 -r bd60afa72fce po/ChangeLog --- a/po/ChangeLog Sun Sep 16 18:07:46 2007 +0000 +++ b/po/ChangeLog Sun Sep 16 18:10:12 2007 +0000 @@ -13,6 +13,8 @@ * Italian translation updated (Claudio Satriano) * Macedonian translation updated (Арангел Ангов) * Norwegian Nynorsk translation updated (Yngve Spjeld Landro) + * Portuguese (Brazilian) translation updated (Mauricio de + L R Collares Neto) * Slovak translation updated (loptosko) * Slovenian translation updated (Martin Srebotnjak) * Spanish translation updated (Javier Fernandez-Sanguino Peña) diff -r 8a4748cbf844 -r bd60afa72fce po/pt_BR.po --- a/po/pt_BR.po Sun Sep 16 18:07:46 2007 +0000 +++ b/po/pt_BR.po Sun Sep 16 18:10:12 2007 +0000 @@ -3,12 +3,13 @@ # # This file is distributed under the same license as the Pidgin package. # +#: ../libpurple/certificate.c:543 msgid "" msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-16 01:21-0300\n" -"PO-Revision-Date: 2007-08-16 01:21-0300\n" +"POT-Creation-Date: 2007-09-14 00:00-0300\n" +"PO-Revision-Date: 2007-09-14 00:00-0300\n" "Last-Translator: Maurício de Lemos Rodrigues Collares Neto \n" "Language-Team: Maurício de Lemos Rodrigues Collares Neto status)) { -#: ../finch/gntblist.c:914 ../finch/gntconv.c:419 -#: ../libpurple/protocols/jabber/si.c:868 +#: ../finch/gntblist.c:914 ../finch/gntconv.c:518 +#: ../libpurple/protocols/jabber/si.c:874 #: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587 -#: ../pidgin/gtkconv.c:1602 +#: ../pidgin/gtkconv.c:1615 msgid "Send File" msgstr "Enviar arquivo" @@ -491,15 +501,15 @@ msgid "Confirm Remove" msgstr "Confirmar remoção" -#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224 -#: ../pidgin/gtkconv.c:1651 ../pidgin/gtkrequest.c:275 +#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226 +#: ../pidgin/gtkconv.c:1664 ../pidgin/gtkrequest.c:275 #: ../pidgin/gtkstatusbox.c:263 msgid "Remove" msgstr "Remover" #. Buddy List -#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2294 ../finch/gntprefs.c:257 -#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4267 +#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257 +#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326 msgid "Buddy List" msgstr "Lista de amigos" @@ -513,15 +523,20 @@ msgstr "(Des)ativar marca" #. General -#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632 -#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118 -#: ../libpurple/protocols/gg/gg.c:2202 -#: ../libpurple/protocols/jabber/buddy.c:274 -#: ../libpurple/protocols/jabber/buddy.c:856 -#: ../libpurple/protocols/jabber/buddy.c:1627 -#: ../libpurple/protocols/jabber/buddy.c:1809 -#: ../libpurple/protocols/jabber/jabber.c:823 -#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556 +#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637 +#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123 +#: ../libpurple/protocols/gg/gg.c:2207 +#: ../libpurple/protocols/jabber/buddy.c:286 +#: ../libpurple/protocols/jabber/buddy.c:1247 +#: ../libpurple/protocols/jabber/buddy.c:2212 +#: ../libpurple/protocols/jabber/buddy.c:2394 +#: ../libpurple/protocols/jabber/jabber.c:936 +#: ../libpurple/protocols/jabber/jabber.c:1543 +#: ../libpurple/protocols/jabber/jabber.c:1566 +#: ../libpurple/protocols/jabber/jabber.c:1589 +#: ../libpurple/protocols/jabber/jabber.c:1612 +#: ../libpurple/protocols/jabber/jabber.c:1635 +#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587 #: ../libpurple/protocols/qq/buddy_info.c:43 #: ../libpurple/protocols/silc/buddy.c:1535 #: ../libpurple/protocols/silc/ops.c:1002 @@ -531,29 +546,29 @@ #: ../libpurple/protocols/silc10/ops.c:1036 #: ../libpurple/protocols/silc10/ops.c:1179 #: ../libpurple/protocols/silc10/ops.c:1328 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3010 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029 msgid "Nickname" msgstr "Apelido" #. Idle stuff -#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260 -#: ../libpurple/protocols/bonjour/bonjour.c:333 -#: ../libpurple/protocols/jabber/buddy.c:647 -#: ../libpurple/protocols/jabber/buddy.c:687 -#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32 +#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260 +#: ../libpurple/protocols/bonjour/bonjour.c:340 +#: ../libpurple/protocols/jabber/buddy.c:787 +#: ../libpurple/protocols/jabber/buddy.c:951 +#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32 #: ../libpurple/protocols/novell/novell.c:2825 -#: ../libpurple/protocols/oscar/oscar.c:2882 -#: ../libpurple/protocols/yahoo/yahoo.c:2936 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3038 -#: ../pidgin/gtkblist.c:3443 ../pidgin/gtkprefs.c:1920 +#: ../libpurple/protocols/oscar/oscar.c:2905 +#: ../libpurple/protocols/yahoo/yahoo.c:3094 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057 +#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924 msgid "Idle" msgstr "Inativo" -#: ../finch/gntblist.c:1330 +#: ../finch/gntblist.c:1333 msgid "On Mobile" msgstr "No celular" -#: ../finch/gntblist.c:1411 +#: ../finch/gntblist.c:1414 #, c-format msgid "" "Online: %d\n" @@ -562,12 +577,12 @@ "Conectados: %d\n" "Total: %d" -#: ../finch/gntblist.c:1420 +#: ../finch/gntblist.c:1423 #, c-format msgid "Account: %s (%s)" msgstr "Conta: %s (%s)" -#: ../finch/gntblist.c:1432 +#: ../finch/gntblist.c:1435 #, c-format msgid "" "\n" @@ -576,50 +591,54 @@ "\n" "Visto pela última vez: %s atrás" -#: ../finch/gntblist.c:1698 ../pidgin/gtkdocklet.c:470 -#: ../pidgin/gtkstatusbox.c:1070 +#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470 +#: ../pidgin/gtkstatusbox.c:1071 msgid "New..." msgstr "Novo..." -#: ../finch/gntblist.c:1705 ../pidgin/gtkdocklet.c:471 -#: ../pidgin/gtkstatusbox.c:1071 +#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471 +#: ../pidgin/gtkstatusbox.c:1072 msgid "Saved..." msgstr "Salvo..." -#: ../finch/gntblist.c:2083 ../finch/gntplugin.c:254 ../finch/gntui.c:86 +#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530 msgid "Plugins" msgstr "Plugins" -#: ../finch/gntblist.c:2190 ../pidgin/gtkdialogs.c:728 -#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:947 +#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:740 +#: ../pidgin/gtkdialogs.c:879 ../pidgin/gtkdialogs.c:960 msgid "_Name" msgstr "_Nome" -#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:733 -#: ../pidgin/gtkdialogs.c:871 ../pidgin/gtkdialogs.c:952 +#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:745 +#: ../pidgin/gtkdialogs.c:884 ../pidgin/gtkdialogs.c:965 msgid "_Account" msgstr "_Conta" -#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:741 +#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:753 msgid "New Instant Message" msgstr "Nova mensagem instantânea" -#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:743 +#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:755 msgid "" "Please enter the screen name or alias of the person you would like to IM." msgstr "" "Por favor digite o nome de usuário da pessoa para quem você deseja mandar " "mensagens instantâneas." -#: ../finch/gntblist.c:2208 ../finch/gntnotify.c:79 ../libpurple/account.c:983 -#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501 -#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797 -#: ../libpurple/protocols/jabber/jabber.c:1383 -#: ../libpurple/protocols/jabber/xdata.c:336 -#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275 -#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309 -#: ../libpurple/protocols/oscar/oscar.c:6041 +#. Not multiline +#. Not masked? +#. No hints? +#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntconn.c:134 +#: ../finch/gntnotify.c:79 ../libpurple/account.c:1003 +#: ../libpurple/account.c:1253 ../libpurple/protocols/gg/gg.c:506 +#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802 +#: ../libpurple/protocols/jabber/jabber.c:1735 +#: ../libpurple/protocols/jabber/xdata.c:399 +#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303 +#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337 +#: ../libpurple/protocols/oscar/oscar.c:6077 #: ../libpurple/protocols/silc/buddy.c:454 #: ../libpurple/protocols/silc/buddy.c:1190 #: ../libpurple/protocols/silc/chat.c:447 @@ -636,54 +655,166 @@ #: ../libpurple/protocols/silc10/ops.c:1297 #: ../libpurple/protocols/silc10/ops.c:1903 #: ../libpurple/protocols/silc10/silc.c:735 -#: ../libpurple/protocols/yahoo/yahoo.c:1005 -#: ../libpurple/protocols/yahoo/yahoo.c:3336 -#: ../libpurple/protocols/yahoo/yahoo.c:3347 ../pidgin/gtkblist.c:4022 -#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:884 -#: ../pidgin/gtkdialogs.c:976 ../pidgin/gtkrequest.c:269 +#: ../libpurple/protocols/yahoo/yahoo.c:1028 +#: ../libpurple/protocols/yahoo/yahoo.c:3494 +#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036 +#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:758 +#: ../pidgin/gtkdialogs.c:897 ../pidgin/gtkdialogs.c:989 +#: ../pidgin/gtkrequest.c:269 msgid "OK" msgstr "OK" #. Create the "Options" frame. -#: ../finch/gntblist.c:2228 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791 +#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789 msgid "Options" msgstr "Opções" -#: ../finch/gntblist.c:2234 +#: ../finch/gntblist.c:2246 msgid "Send IM..." msgstr "Enviar MI..." -#: ../finch/gntblist.c:2238 +#: ../finch/gntblist.c:2250 msgid "Show empty groups" msgstr "Exibir grupos vazios" -#: ../finch/gntblist.c:2244 +#: ../finch/gntblist.c:2256 msgid "Show offline buddies" msgstr "Exibir amigos desconectados" -#: ../finch/gntblist.c:2250 +#: ../finch/gntblist.c:2262 msgid "Sort by status" msgstr "Ordenar por status" -#: ../finch/gntblist.c:2254 +#: ../finch/gntblist.c:2266 msgid "Sort alphabetically" msgstr "Ordenar alfabeticamente" -#: ../finch/gntblist.c:2258 +#: ../finch/gntblist.c:2270 msgid "Sort by log size" msgstr "Ordenar por tamanho do log" -#: ../finch/gntconn.c:110 +#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187 +msgid "Certificate Import" +msgstr "Importação de certificado" + +#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188 +msgid "Specify a hostname" +msgstr "Especifique um nome de host" + +#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189 +msgid "Type the host name this certificate is for." +msgstr "Digite o nome de host para o qual este certificado será gerado." + +#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209 +#, c-format +msgid "" +"File %s could not be imported.\n" +"Make sure that the file is readable and in PEM format.\n" +msgstr "" +"O arquivo %s não pôde ser importado.\n" +"Verifique que este arquivo pode ser acessado e que ele está no formato PEM.\n" + +#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211 +msgid "Certificate Import Error" +msgstr "Erro ao importar certificado" + +#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212 +msgid "X.509 certificate import failed" +msgstr "Falha ao importar certificado X.509" + +#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223 +msgid "Select a PEM certificate" +msgstr "Selecione um certificado PEM" + +#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244 +#, c-format +msgid "" +"Export to file %s failed.\n" +"Check that you have write permission to the target path\n" +msgstr "" +"Falha ao exportar para o arquivo %s.\n" +"Verifique se você tem permissão de escrita na pasta de destino\n" + +#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246 +msgid "Certificate Export Error" +msgstr "Erro ao exportar certificado" + +#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247 +msgid "X.509 certificate export failed" +msgstr "Falha ao exportar certificado X.509" + +#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298 +msgid "PEM X.509 Certificate Export" +msgstr "Exportar certificado PEM X.509" + +#: ../finch/gntcertmgr.c:187 +#, c-format +msgid "Certificate for %s" +msgstr "Certificado de %s" + +#: ../finch/gntcertmgr.c:194 +#, c-format +msgid "" +"Common name: %s\n" +"\n" +"SHA1 fingerprint:\n" +"%s" +msgstr "" +"Nome usual: %s\n" +"\n" +"Impressão digital SHA1:\n" +"%s" + +#: ../finch/gntcertmgr.c:197 +msgid "SSL Host Certificate" +msgstr "Certificado SSL do host" + +#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371 +#, c-format +msgid "Really delete certificate for %s?" +msgstr "Tem certeza de que deseja deletar o certificado de %s?" + +#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373 +msgid "Confirm certificate delete" +msgstr "Confirmação de remoção de certificado" + +#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:601 +msgid "Certificate Manager" +msgstr "Gerenciador de certificados" + +#. Creating the user splits +#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652 +#: ../libpurple/protocols/silc/silc.c:1007 +#: ../libpurple/protocols/silc10/silc.c:918 +msgid "Hostname" +msgstr "Nome do host" + +#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1643 +#: ../pidgin/gtkdebug.c:834 +msgid "Info" +msgstr "Info" + +#. Close button +#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181 +#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737 +#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403 +#: ../libpurple/protocols/silc/util.c:382 +#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468 +#: ../pidgin/gtkrequest.c:272 +msgid "Close" +msgstr "Fechar" + +#: ../finch/gntconn.c:123 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../finch/gntconn.c:113 +#: ../finch/gntconn.c:126 #, c-format msgid "%s disconnected." msgstr "%s desconectado." -#: ../finch/gntconn.c:114 +#: ../finch/gntconn.c:127 #, c-format msgid "" "%s\n" @@ -696,43 +827,51 @@ "O Finch não tentará reconectar esta conta até que você corrija o erro e " "reative a mesma." -#: ../finch/gntconv.c:117 +#: ../finch/gntconn.c:136 ../pidgin/gtkblist.c:4038 +msgid "Re-enable Account" +msgstr "Re-ativar conta" + +#: ../finch/gntconv.c:138 msgid "No such command." msgstr "Comando inexistente." -#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:495 +#: ../finch/gntconv.c:142 ../pidgin/gtkconv.c:488 msgid "Syntax Error: You typed the wrong number of arguments to that command." msgstr "" "Erro de sintaxe: Você digitou um número incorreto de argumentos para este " "comando." -#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:501 +#: ../finch/gntconv.c:147 ../pidgin/gtkconv.c:494 msgid "Your command failed for an unknown reason." msgstr "Seu comando falhou por um motivo desconhecido." -#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:508 +#: ../finch/gntconv.c:152 ../pidgin/gtkconv.c:501 msgid "That command only works in chats, not IMs." msgstr "Este comando só funciona em bate-papos, não em conversas." -#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:511 +#: ../finch/gntconv.c:155 ../pidgin/gtkconv.c:504 msgid "That command only works in IMs, not chats." msgstr "Este comando só funciona em conversas, não em bate-papos." -#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:516 +#: ../finch/gntconv.c:159 ../pidgin/gtkconv.c:509 msgid "That command doesn't work on this protocol." msgstr "Este comando não funciona neste protocolo." -#: ../finch/gntconv.c:224 +#: ../finch/gntconv.c:167 +msgid "Message was not sent, because you are not signed on." +msgstr "A mensagem não pôde ser enviada porque você não está conectado." + +#: ../finch/gntconv.c:250 #, c-format msgid "%s (%s -- %s)" msgstr "%s (%s -- %s)" -#: ../finch/gntconv.c:247 +#: ../finch/gntconv.c:273 #, c-format msgid "%s [%s]" msgstr "%s [%s]" -#: ../finch/gntconv.c:252 ../finch/gntconv.c:647 +#: ../finch/gntconv.c:278 ../finch/gntconv.c:772 #, c-format msgid "" "\n" @@ -741,48 +880,69 @@ "\n" "%s está digitando..." -#: ../finch/gntconv.c:271 +#: ../finch/gntconv.c:297 msgid "You have left this chat." msgstr "Você saiu deste bate-papo." -#: ../finch/gntconv.c:342 +#: ../finch/gntconv.c:386 ../pidgin/gtkconv.c:1370 +msgid "Logging started. Future messages in this conversation will be logged." +msgstr "" +"Gravação iniciada. A partir de agora, as mensagens desta conversa serão " +"gravadas." + +#: ../finch/gntconv.c:392 ../pidgin/gtkconv.c:1378 +msgid "" +"Logging stopped. Future messages in this conversation will not be logged." +msgstr "" +"Gravação parada. A partir de agora, as mensagens dessa conversa não serão " +"gravadas." + +#: ../finch/gntconv.c:441 msgid "Send To" msgstr "Enviar para" -#: ../finch/gntconv.c:386 +#: ../finch/gntconv.c:485 msgid "Conversation" msgstr "Conversa" -#: ../finch/gntconv.c:392 +#: ../finch/gntconv.c:491 msgid "Clear Scrollback" msgstr "Limpar tela" -#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190 +#: ../finch/gntconv.c:495 ../finch/gntprefs.c:190 msgid "Show Timestamps" msgstr "Exibir marcações de tempo" -#: ../finch/gntconv.c:412 +#: ../finch/gntconv.c:511 msgid "Add Buddy Pounce..." msgstr "Adicionar ação de usuário..." -#: ../finch/gntconv.c:613 +#: ../finch/gntconv.c:526 +msgid "Enable Logging" +msgstr "Ativar gravação de conversas" + +#: ../finch/gntconv.c:532 +msgid "Enable Sounds" +msgstr "Ativar sons" + +#: ../finch/gntconv.c:738 msgid " " msgstr " " #. Print the list of users in the room -#: ../finch/gntconv.c:735 +#: ../finch/gntconv.c:860 msgid "List of users:\n" msgstr "Lista de usuários:\n" -#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:338 +#: ../finch/gntconv.c:1022 ../pidgin/gtkconv.c:330 msgid "Supported debug options are: version" msgstr "As opções de depuração suportadas são: version" -#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:387 +#: ../finch/gntconv.c:1058 ../pidgin/gtkconv.c:380 msgid "No such command (in this context)." msgstr "Comando inexistente (neste contexto)." -#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:390 +#: ../finch/gntconv.c:1061 ../pidgin/gtkconv.c:383 msgid "" "Use \"/help <command>\" for help on a specific command.\n" "The following commands are available in this context:\n" @@ -790,7 +950,7 @@ "Use \"/help <comando>\" para ajuda com um comando específico.\n" "Os seguintes comandos estão disponíveis neste contexto:\n" -#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7346 +#: ../finch/gntconv.c:1119 ../pidgin/gtkconv.c:7564 msgid "" "say <message>: Send a message normally as if you weren't using a " "command." @@ -798,12 +958,12 @@ "say <mensagem>: Envia uma mensagem normalmente, como se você não " "estivesse usando um comando." -#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7349 +#: ../finch/gntconv.c:1122 ../pidgin/gtkconv.c:7567 msgid "me <action>: Send an IRC style action to a buddy or chat." msgstr "" "me <ação>: Envia uma ação do tipo do IRC para um amigo ou bate-papo." -#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7352 +#: ../finch/gntconv.c:1125 ../pidgin/gtkconv.c:7570 msgid "" "debug <option>: Send various debug information to the current " "conversation." @@ -811,43 +971,43 @@ "debug <opção>: Envia várias informações de depuração para a conversa " "atual." -#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7355 +#: ../finch/gntconv.c:1128 ../pidgin/gtkconv.c:7573 msgid "clear: Clears the conversation scrollback." msgstr "clear: Limpa a janela de conversa." -#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7361 +#: ../finch/gntconv.c:1131 ../pidgin/gtkconv.c:7579 msgid "help <command>: Help on a specific command." msgstr "help <comando>: Ajuda num comando específico." -#: ../finch/gntconv.c:991 +#: ../finch/gntconv.c:1134 msgid "users: Show the list of users in the chat." msgstr "users: Exibe a lista dos usuários que estão no bate-papo." -#: ../finch/gntconv.c:996 +#: ../finch/gntconv.c:1139 msgid "plugins: Show the plugins window." msgstr "plugins: Mostra a janela de plugins." -#: ../finch/gntconv.c:999 +#: ../finch/gntconv.c:1142 msgid "buddylist: Show the buddylist." msgstr "buddylist: Mostra a lista de amigos." -#: ../finch/gntconv.c:1002 +#: ../finch/gntconv.c:1145 msgid "accounts: Show the accounts window." msgstr "accounts: Mostra a janela de contas." -#: ../finch/gntconv.c:1005 +#: ../finch/gntconv.c:1148 msgid "debugwin: Show the debug window." msgstr "debugwin: Mostra a janela de depuração." -#: ../finch/gntconv.c:1008 +#: ../finch/gntconv.c:1151 msgid "prefs: Show the preference window." msgstr "prefs: Mostra a janela de preferências" -#: ../finch/gntconv.c:1011 +#: ../finch/gntconv.c:1154 msgid "statuses: Show the savedstatuses window." msgstr "statuses: Mostra a janela de status salvos." -#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694 +#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694 msgid "Debug Window" msgstr "Janela de depuração" @@ -873,99 +1033,95 @@ msgstr "Transferências de arquivo - %d%% de %d arquivos" #. Create the window. -#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85 +#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761 msgid "File Transfers" msgstr "Transferências de arquivos" -#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644 +#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644 msgid "Progress" msgstr "Progresso" -#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651 +#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651 msgid "Filename" msgstr "Nome do arquivo" -#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658 +#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658 msgid "Size" msgstr "Tamanho" -#: ../finch/gntft.c:198 +#: ../finch/gntft.c:200 msgid "Speed" msgstr "Velocidade" -#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665 +#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665 msgid "Remaining" msgstr "Restante" #. XXX: Use of ggp_str_to_uin() is an ugly hack! -#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572 -#: ../libpurple/protocols/bonjour/bonjour.c:337 -#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571 -#: ../libpurple/protocols/gg/gg.c:1579 -#: ../libpurple/protocols/jabber/buddy.c:638 -#: ../libpurple/protocols/jabber/buddy.c:642 -#: ../libpurple/protocols/jabber/buddy.c:677 -#: ../libpurple/protocols/jabber/jabber.c:1212 -#: ../libpurple/protocols/msn/msn.c:515 +#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575 +#: ../libpurple/protocols/bonjour/bonjour.c:344 +#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576 +#: ../libpurple/protocols/gg/gg.c:1584 +#: ../libpurple/protocols/jabber/buddy.c:778 +#: ../libpurple/protocols/jabber/buddy.c:782 +#: ../libpurple/protocols/jabber/buddy.c:941 +#: ../libpurple/protocols/jabber/jabber.c:1499 +#: ../libpurple/protocols/msn/msn.c:543 #: ../libpurple/protocols/novell/novell.c:2835 #: ../libpurple/protocols/oscar/oscar.c:820 #: ../libpurple/protocols/oscar/oscar.c:825 #: ../libpurple/protocols/oscar/oscar.c:827 -#: ../libpurple/protocols/oscar/oscar.c:2670 -#: ../libpurple/protocols/oscar/oscar.c:3748 -#: ../libpurple/protocols/sametime/sametime.c:3264 -#: ../libpurple/protocols/sametime/sametime.c:4151 -#: ../libpurple/protocols/yahoo/yahoo.c:3087 ../pidgin/gtkblist.c:3082 -#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097 +#: ../libpurple/protocols/oscar/oscar.c:2693 +#: ../libpurple/protocols/oscar/oscar.c:3773 +#: ../libpurple/protocols/sametime/sametime.c:3263 +#: ../libpurple/protocols/sametime/sametime.c:4150 +#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101 +#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143 msgid "Status" msgstr "Status" -#: ../finch/gntft.c:208 +#: ../finch/gntft.c:210 msgid "Close this window when all transfers finish" msgstr "Feche esta janela quando todas as transferências terminarem" -#: ../finch/gntft.c:215 +#: ../finch/gntft.c:217 msgid "Clear finished transfers" msgstr "Limpar transferências concluídas" -#: ../finch/gntft.c:229 +#: ../finch/gntft.c:231 msgid "Stop" msgstr "Parar" -#. Close button -#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209 -#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215 -#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382 -#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2484 -#: ../pidgin/gtkrequest.c:272 -msgid "Close" -msgstr "Fechar" - -#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972 +#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972 msgid "Waiting for transfer to begin" msgstr "Esperando o começo da transferência" -#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053 +#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053 msgid "Canceled" msgstr "Cancelada" -#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055 +#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055 msgid "Failed" msgstr "Falhou" -#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133 +#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133 #, c-format msgid "%.2f KiB/s" msgstr "%.2f KiB/s" -#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162 +#: ../finch/gntft.c:430 +#, c-format +msgid "The file was saved as %s." +msgstr "O arquivo foi salvo como %s." + +#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162 #: ../pidgin/gtkft.c:1115 msgid "Finished" msgstr "Concluída" -#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347 +#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347 msgid "Transferring" msgstr "Transferindo" @@ -977,11 +1133,11 @@ msgid "You have mail!" msgstr "Você tem email!" -#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:490 +#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495 msgid "Sender" msgstr "Remetente" -#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:497 +#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502 msgid "Subject" msgstr "Assunto" @@ -992,17 +1148,17 @@ msgstr[0] "%s (%s) tem %d nova mensagem." msgstr[1] "%s (%s) tem %d novas mensagens." -#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:336 +#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340 msgid "New Mail" msgstr "Novo e-mail" -#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:918 +#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908 #, c-format msgid "Info for %s" msgstr "Informações de %s:" #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476 -#: ../pidgin/gtknotify.c:919 +#: ../pidgin/gtknotify.c:909 msgid "Buddy Information" msgstr "Informações do amigo" @@ -1010,11 +1166,7 @@ msgid "Continue" msgstr "Continuar" -#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1630 ../pidgin/gtkdebug.c:834 -msgid "Info" -msgstr "Info" - -#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1591 +#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1604 msgid "IM" msgstr "MI" @@ -1022,7 +1174,7 @@ msgid "Join" msgstr "Entrar" -#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474 +#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473 msgid "Invite" msgstr "Convidar" @@ -1081,7 +1233,7 @@ #. Back to instant-apply! I win! BU-HAHAHA! #. Create the window #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263 -#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062 +#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066 msgid "Preferences" msgstr "Preferências" @@ -1089,7 +1241,6 @@ msgid "Please enter a buddy to pounce." msgstr "Favor digitar o amigo que terá a ação." -#. Create the window. #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516 msgid "New Buddy Pounce" msgstr "Nova ação de usuário" @@ -1103,7 +1254,7 @@ msgstr "Quem terá a ação" #. Account: -#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452 +#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455 msgid "Account:" msgstr "Conta:" @@ -1112,7 +1263,7 @@ msgstr "Nome do amigo:" #. Create the "Pounce When Buddy..." frame. -#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586 +#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584 msgid "Pounce When Buddy..." msgstr "Executar quando o amigo..." @@ -1157,7 +1308,7 @@ msgstr "Enviar uma mensagem" #. Create the "Action" frame. -#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647 +#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645 msgid "Action" msgstr "Ação" @@ -1185,70 +1336,82 @@ msgid "Pounce only when my status is not available" msgstr "Executar apenas quando meu status for indisponível" -#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295 +#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280 msgid "Recurring" msgstr "Recorrente" -#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110 +#: ../finch/gntpounce.c:617 +msgid "Cannot create pounce" +msgstr "Não foi possível criar ação de usuário" + +#: ../finch/gntpounce.c:618 +msgid "You do not have any accounts." +msgstr "Você não tem nenhuma conta." + +#: ../finch/gntpounce.c:619 +msgid "You must create an account first before you can create a pounce." +msgstr "Você precisa criar uma conta antes de poder criar uma ação de usuário." + +#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095 #, c-format msgid "Are you sure you want to delete the pounce on %s for %s?" msgstr "Você tem certeza de que deseja remover a ação sobre %s de %s?" -#: ../finch/gntpounce.c:685 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1339 +#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324 msgid "Buddy Pounces" msgstr "Ações de usuário" -#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466 +#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451 #, c-format msgid "%s has started typing to you (%s)" msgstr "%s começou a digitar para você (%s)" -#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468 +#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453 #, c-format msgid "%s has paused while typing to you (%s)" msgstr "%s pausou ao digitar para você (%s)" -#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470 +#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455 #, c-format msgid "%s has signed on (%s)" msgstr "%s conectou (%s)" -#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472 +#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457 #, c-format msgid "%s has returned from being idle (%s)" msgstr "%s voltou do estado 'Inativo' (%s)" -#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474 +#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459 #, c-format msgid "%s has returned from being away (%s)" msgstr "%s voltou do estado 'Ausente' (%s)" -#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476 +#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461 #, c-format msgid "%s has stopped typing to you (%s)" msgstr "%s parou de digitar para você (%s)" -#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478 +#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463 #, c-format msgid "%s has signed off (%s)" msgstr "%s desconectou (%s)" -#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480 +#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465 #, c-format msgid "%s has become idle (%s)" msgstr "%s se tornou inativo (%s)" -#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482 +#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467 #, c-format msgid "%s has gone away. (%s)" msgstr "%s se tornou ausente. (%s)" -#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484 +#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469 #, c-format msgid "%s has sent you a message. (%s)" msgstr "%s te enviou uma mensagem. (%s)" -#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485 +#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470 msgid "Unknown pounce event. Please report this!" msgstr "Evento de ação desconhecido. Por favor reporte isso!" @@ -1256,12 +1419,12 @@ msgid "Based on keyboard use" msgstr "A partir do uso do teclado" -#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925 +#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929 msgid "From last sent message" msgstr "A partir da última mensagem enviada" #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906 -#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938 +#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333 msgid "Never" msgstr "Nunca" @@ -1311,119 +1474,119 @@ msgstr "Mudar status para" #. Conversations -#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028 +#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340 msgid "Conversations" msgstr "Conversas" -#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039 +#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043 msgid "Logging" msgstr "Logs" -#: ../finch/gntrequest.c:563 +#: ../finch/gntrequest.c:582 msgid "Not implemented yet." msgstr "Ainda não implementado." -#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552 -#: ../pidgin/gtkrequest.c:1598 +#: ../finch/gntrequest.c:658 ../pidgin/gtkrequest.c:1555 +#: ../pidgin/gtkrequest.c:1601 msgid "Save File..." msgstr "Salvar arquivo..." -#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553 -#: ../pidgin/gtkrequest.c:1599 +#: ../finch/gntrequest.c:658 ../pidgin/gtkrequest.c:1556 +#: ../pidgin/gtkrequest.c:1602 msgid "Open File..." msgstr "Abrir arquivo..." -#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63 +#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63 msgid "Buddy logs in" msgstr "Amigo conecta" -#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64 +#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64 msgid "Buddy logs out" msgstr "Amigo desconecta" -#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65 +#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65 msgid "Message received" msgstr "Mensagem recebida" -#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66 +#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66 msgid "Message received begins conversation" msgstr "Mensagem recebida inicia conversa" -#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67 +#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67 msgid "Message sent" msgstr "Mensagem enviada" -#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68 +#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68 msgid "Person enters chat" msgstr "Pessoa entra no bate-papo" -#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69 +#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69 msgid "Person leaves chat" msgstr "Pessoa sai do bate-papo" -#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70 +#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70 msgid "You talk in chat" msgstr "Você fala no bate-papo" -#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71 +#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71 msgid "Others talk in chat" msgstr "Outros falam no bate-papo" -#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74 +#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74 msgid "Someone says your screen name in chat" msgstr "Alguém diz seu nome no bate-papo" -#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310 +#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310 msgid "GStreamer Failure" msgstr "Falha no GStreamer" -#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311 +#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311 msgid "GStreamer failed to initialize." msgstr "O GStreamer não pôde ser inicializado." -#: ../finch/gntsound.c:706 ../finch/gntsound.c:791 ../pidgin/gtkprefs.c:1584 -#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867 +#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586 +#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871 msgid "(default)" msgstr "(padrão)" -#: ../finch/gntsound.c:719 +#: ../finch/gntsound.c:728 msgid "Select Sound File ..." msgstr "Selecionar arquivo de som..." -#: ../finch/gntsound.c:893 +#: ../finch/gntsound.c:903 msgid "Sound Preferences" msgstr "Preferências de som" -#: ../finch/gntsound.c:904 +#: ../finch/gntsound.c:914 msgid "Profiles" msgstr "Perfis" -#: ../finch/gntsound.c:943 ../pidgin/gtkprefs.c:1712 +#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716 msgid "Automatic" msgstr "Automático" -#: ../finch/gntsound.c:946 +#: ../finch/gntsound.c:956 msgid "Console Beep" msgstr "Bipe do console" -#: ../finch/gntsound.c:947 ../pidgin/gtkprefs.c:1716 +#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720 msgid "Command" msgstr "Comando" -#: ../finch/gntsound.c:948 +#: ../finch/gntsound.c:958 msgid "No Sound" msgstr "Sem sons" -#: ../finch/gntsound.c:950 ../pidgin/gtkprefs.c:1707 +#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711 msgid "Sound Method" msgstr "Método para reproduzir o som" -#: ../finch/gntsound.c:955 +#: ../finch/gntsound.c:965 msgid "Method: " msgstr "Método:" -#: ../finch/gntsound.c:962 +#: ../finch/gntsound.c:972 #, c-format msgid "" "Sound Command\n" @@ -1433,55 +1596,55 @@ "(%s para nome do arquivo)" #. Sound options -#: ../finch/gntsound.c:970 ../pidgin/gtkprefs.c:1751 +#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755 msgid "Sound Options" msgstr "Opções de som" -#: ../finch/gntsound.c:971 +#: ../finch/gntsound.c:981 msgid "Sounds when conversation has focus" msgstr "Emitir sons quando a janela da conversa ganhar foco" -#: ../finch/gntsound.c:979 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 -#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42 +#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 +#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42 #: ../pidgin/plugins/timestamp_format.c:51 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334 msgid "Always" msgstr "Sempre" -#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1756 +#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760 msgid "Only when available" msgstr "Somente quando disponível" -#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1757 +#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761 msgid "Only when not available" msgstr "Somente quando não disponível" -#: ../finch/gntsound.c:988 +#: ../finch/gntsound.c:998 msgid "Volume(0-100):" msgstr "Volume(0-100):" #. Sound events -#: ../finch/gntsound.c:1005 ../pidgin/gtkprefs.c:1793 +#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797 msgid "Sound Events" msgstr "Eventos de som" -#: ../finch/gntsound.c:1007 ../pidgin/gtkprefs.c:1852 +#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856 msgid "Event" msgstr "Evento" -#: ../finch/gntsound.c:1007 +#: ../finch/gntsound.c:1019 msgid "File" msgstr "Arquivo" -#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1871 +#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875 msgid "Test" msgstr "Testar" -#: ../finch/gntsound.c:1029 ../pidgin/gtkprefs.c:1875 +#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879 msgid "Reset" msgstr "Redefinir" -#: ../finch/gntsound.c:1032 ../pidgin/gtkprefs.c:1879 +#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883 msgid "Choose..." msgstr "Escolher..." @@ -1498,9 +1661,9 @@ msgid "Saved Statuses" msgstr "Status salvos" -#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535 -#: ../libpurple/protocols/jabber/buddy.c:286 -#: ../libpurple/protocols/jabber/buddy.c:973 +#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538 +#: ../libpurple/protocols/jabber/buddy.c:298 +#: ../libpurple/protocols/jabber/buddy.c:1359 #: ../libpurple/protocols/novell/novell.c:1484 #: ../pidgin/gtksavedstatuses.c:499 msgid "Title" @@ -1510,46 +1673,55 @@ msgid "Type" msgstr "Tipo" -#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572 -#: ../libpurple/protocols/bonjour/bonjour.c:249 +#. Statuses are almost all the same. Define a macro to reduce code repetition. +#. PurpleStatusPrimitive +#. id - use default +#. name - use default +#. savable +#. user_settable +#. not independent +#. Attributes - each status can have a message. +#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575 #: ../libpurple/protocols/bonjour/bonjour.c:256 -#: ../libpurple/protocols/bonjour/bonjour.c:339 -#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574 -#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602 -#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617 -#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234 -#: ../libpurple/protocols/jabber/jabber.c:1244 -#: ../libpurple/protocols/jabber/jabber.c:1254 -#: ../libpurple/protocols/jabber/jabber.c:1264 -#: ../libpurple/protocols/jabber/jabber.c:1274 -#: ../libpurple/protocols/jabber/jabber.c:1284 -#: ../libpurple/protocols/jabber/jabber.c:1296 +#: ../libpurple/protocols/bonjour/bonjour.c:263 +#: ../libpurple/protocols/bonjour/bonjour.c:346 +#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579 +#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607 +#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622 +#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234 +#: ../libpurple/protocols/jabber/jabber.c:1531 +#: ../libpurple/protocols/jabber/jabber.c:1554 +#: ../libpurple/protocols/jabber/jabber.c:1577 +#: ../libpurple/protocols/jabber/jabber.c:1600 +#: ../libpurple/protocols/jabber/jabber.c:1623 +#: ../libpurple/protocols/jabber/jabber.c:1648 +#: ../libpurple/protocols/myspace/myspace.c:148 #: ../libpurple/protocols/novell/novell.c:2838 #: ../libpurple/protocols/novell/novell.c:2941 #: ../libpurple/protocols/novell/novell.c:2947 #: ../libpurple/protocols/novell/novell.c:2953 -#: ../libpurple/protocols/oscar/oscar.c:5502 -#: ../libpurple/protocols/oscar/oscar.c:5720 -#: ../libpurple/protocols/oscar/oscar.c:5734 -#: ../libpurple/protocols/oscar/oscar.c:5750 -#: ../libpurple/protocols/oscar/oscar.c:5757 -#: ../libpurple/protocols/oscar/oscar.c:5764 -#: ../libpurple/protocols/sametime/sametime.c:3287 -#: ../libpurple/protocols/sametime/sametime.c:3293 -#: ../libpurple/protocols/sametime/sametime.c:3299 -#: ../libpurple/protocols/sametime/sametime.c:3378 +#: ../libpurple/protocols/oscar/oscar.c:5538 +#: ../libpurple/protocols/oscar/oscar.c:5756 +#: ../libpurple/protocols/oscar/oscar.c:5770 +#: ../libpurple/protocols/oscar/oscar.c:5786 +#: ../libpurple/protocols/oscar/oscar.c:5793 +#: ../libpurple/protocols/oscar/oscar.c:5800 +#: ../libpurple/protocols/sametime/sametime.c:3286 +#: ../libpurple/protocols/sametime/sametime.c:3292 +#: ../libpurple/protocols/sametime/sametime.c:3298 +#: ../libpurple/protocols/sametime/sametime.c:3377 #: ../libpurple/protocols/silc/buddy.c:1551 #: ../libpurple/protocols/silc10/buddy.c:1551 #: ../libpurple/protocols/simple/simple.c:246 -#: ../libpurple/protocols/yahoo/yahoo.c:3590 -#: ../libpurple/protocols/yahoo/yahoo.c:3596 +#: ../libpurple/protocols/yahoo/yahoo.c:3748 +#: ../libpurple/protocols/yahoo/yahoo.c:3754 #: ../libpurple/protocols/zephyr/zephyr.c:2337 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009 msgid "Message" msgstr "Mensagem:" #. Use -#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589 +#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592 msgid "Use" msgstr "Usar" @@ -1561,56 +1733,79 @@ msgid "Please enter a non-empty title for the status." msgstr "Favor digitar um título não-vazio para o status." -#: ../finch/gntstatus.c:308 +#: ../finch/gntstatus.c:309 msgid "Duplicate title" msgstr "Título duplicado duplicada" -#: ../finch/gntstatus.c:309 +#: ../finch/gntstatus.c:310 msgid "Please enter a different title for the status." msgstr "Favor digitar um título diferente para o status." -#: ../finch/gntstatus.c:449 +#: ../finch/gntstatus.c:451 msgid "Substatus" msgstr "Substatus" -#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698 +#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698 msgid "Status:" msgstr "Status:" -#: ../finch/gntstatus.c:475 +#: ../finch/gntstatus.c:478 msgid "Message:" msgstr "Mensagem:" -#: ../finch/gntstatus.c:524 +#: ../finch/gntstatus.c:527 msgid "Edit Status" msgstr "Editar status" -#: ../finch/gntstatus.c:566 +#: ../finch/gntstatus.c:569 msgid "Use different status for following accounts" msgstr "Usar status diferente para as seguintes contas" #. Save & Use -#: ../finch/gntstatus.c:600 +#: ../finch/gntstatus.c:603 msgid "Save & Use" msgstr "Salvar e usar" -#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030 +#: ../finch/gntui.c:85 +msgid "Certificates" +msgstr "Certificados" + +#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034 msgid "Sounds" msgstr "Sons" -#: ../finch/gntui.c:89 +#: ../finch/gntui.c:91 msgid "Statuses" msgstr "Status" -#: ../finch/plugins/gntclipboard.c:149 +#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121 +#: ../finch/plugins/gntclipboard.c:128 +msgid "Error loading the plugin." +msgstr "Erro ao carregar o plugin." + +#: ../finch/plugins/gntclipboard.c:116 +msgid "Couldn't find X display" +msgstr "Não foi possível encontrar o servidor X" + +#: ../finch/plugins/gntclipboard.c:122 +msgid "Couldn't find window" +msgstr "Não foi possível encontrar a janela" + +#: ../finch/plugins/gntclipboard.c:129 +msgid "This plugin cannot be loaded because it was not built with X11 support." +msgstr "" +"O plugin não pôde ser carregado porque este não foi compilado com suporte ao " +"X11." + +#: ../finch/plugins/gntclipboard.c:158 msgid "GntClipboard" msgstr "GntClipboard" -#: ../finch/plugins/gntclipboard.c:151 +#: ../finch/plugins/gntclipboard.c:160 msgid "Clipboard plugin" msgstr "Plugin da área de transferência" -#: ../finch/plugins/gntclipboard.c:152 +#: ../finch/plugins/gntclipboard.c:161 msgid "" "When the gnt clipboard contents change, the contents are made available to " "X, if possible." @@ -1736,86 +1931,88 @@ msgid "accounts" msgstr "contas" -#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194 -#: ../libpurple/protocols/jabber/auth.c:233 +#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194 +#: ../libpurple/protocols/jabber/auth.c:256 msgid "Password is required to sign on." msgstr "Uma senha é necessária para conectar-se." -#: ../libpurple/account.c:963 +#: ../libpurple/account.c:983 #, c-format msgid "Enter password for %s (%s)" msgstr "Digite a senha para %s (%s)" -#: ../libpurple/account.c:970 +#: ../libpurple/account.c:990 msgid "Enter Password" msgstr "Digite a senha" -#: ../libpurple/account.c:975 +#: ../libpurple/account.c:995 msgid "Save password" msgstr "Salvar senha" -#: ../libpurple/account.c:1010 ../libpurple/connection.c:104 +#: ../libpurple/account.c:1030 ../libpurple/connection.c:104 +#: ../libpurple/connection.c:177 #, c-format msgid "Missing protocol plugin for %s" msgstr "Plugin de protocolo faltando para %s" -#: ../libpurple/account.c:1012 ../libpurple/connection.c:107 -#: ../pidgin/gtkblist.c:4019 +#: ../libpurple/account.c:1032 ../libpurple/connection.c:107 +#: ../pidgin/gtkblist.c:4033 msgid "Connection Error" msgstr "Erro de conexão" -#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702 -#: ../libpurple/protocols/jabber/jabber.c:1334 +#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707 +#: ../libpurple/protocols/jabber/jabber.c:1686 msgid "New passwords do not match." msgstr "Senhas novas não conferem." -#: ../libpurple/account.c:1179 +#: ../libpurple/account.c:1199 msgid "Fill out all fields completely." msgstr "Preencha todos os campos completamente." -#: ../libpurple/account.c:1202 +#: ../libpurple/account.c:1222 msgid "Original password" msgstr "Senha original" -#: ../libpurple/account.c:1209 +#: ../libpurple/account.c:1229 msgid "New password" msgstr "Nova senha" -#: ../libpurple/account.c:1216 +#: ../libpurple/account.c:1236 msgid "New password (again)" msgstr "Nova senha (novamente)" -#: ../libpurple/account.c:1222 +#: ../libpurple/account.c:1242 #, c-format msgid "Change password for %s" msgstr "Mudar senha para %s" -#: ../libpurple/account.c:1230 +#: ../libpurple/account.c:1250 msgid "Please enter your current password and your new password." msgstr "Favor digitar sua senha atual e sua nova senha." -#: ../libpurple/account.c:1261 +#: ../libpurple/account.c:1281 #, c-format msgid "Change user information for %s" msgstr "Modificar informações do usuário para %s" -#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670 +#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670 msgid "Set User Info" msgstr "Definir informações de usuário" -#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012 -#: ../libpurple/protocols/jabber/buddy.c:642 -#: ../libpurple/protocols/jabber/buddy.c:1462 -#: ../libpurple/protocols/jabber/buddy.c:1479 +#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017 +#: ../libpurple/protocols/jabber/buddy.c:782 +#: ../libpurple/protocols/jabber/buddy.c:2025 +#: ../libpurple/protocols/jabber/buddy.c:2042 #: ../libpurple/protocols/novell/novell.c:2831 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159 msgid "Unknown" msgstr "Desconhecido" -#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289 -#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68 -#: ../pidgin/gtkblist.c:5321 ../pidgin/plugins/gevolution/gevolution.c:96 +#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301 +#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69 +#: ../libpurple/protocols/myspace/myspace.c:3237 ../pidgin/gtkblist.c:5367 #: ../pidgin/plugins/gevolution/gevo-util.c:64 +#: ../pidgin/plugins/gevolution/gevolution.c:96 msgid "Buddies" msgstr "Amigos" @@ -1823,22 +2020,186 @@ msgid "buddy list" msgstr "lista de amigos" +#: ../libpurple/certificate.c:545 +msgid "(DOES NOT MATCH)" +msgstr "(NÃO COINCIDE)" + +#. Make messages +#: ../libpurple/certificate.c:549 +#, c-format +msgid "%s has presented the following certificate for just-this-once use:" +msgstr "%s enviou este certificado de uso único:" + +#: ../libpurple/certificate.c:550 +#, c-format +msgid "" +"Common name: %s %s\n" +"Fingerprint (SHA1): %s" +msgstr "" +"Nome usual: %s %s\n" +"Impressão digital (SHA1): %s" + +#. TODO: Find what the handle ought to be +#: ../libpurple/certificate.c:555 +msgid "Single-use Certificate Verification" +msgstr "Verificação de certificado de uso único" + +#. Scheme name +#. Pool name +#: ../libpurple/certificate.c:872 +msgid "Certificate Authorities" +msgstr "Autoridades de certificação" + +#. Scheme name +#. Pool name +#: ../libpurple/certificate.c:1040 +msgid "SSL Peers Cache" +msgstr "Cache dos pares SSL" + +#. Make messages +#: ../libpurple/certificate.c:1171 +#, c-format +msgid "Accept certificate for %s?" +msgstr "Aceitar certificado de %s?" + +#. TODO: Find what the handle ought to be +#: ../libpurple/certificate.c:1177 +msgid "SSL Certificate Verification" +msgstr "Verificação do certificado SSL" + +#. Number of actions +#: ../libpurple/certificate.c:1186 +msgid "Accept" +msgstr "Aceitar" + +#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214 +#: ../libpurple/protocols/qq/group_im.c:144 +#: ../libpurple/protocols/qq/group_opt.c:127 +#: ../libpurple/protocols/qq/sys_msg.c:90 +#: ../libpurple/protocols/qq/sys_msg.c:246 +msgid "Reject" +msgstr "Rejeitar" + +#: ../libpurple/certificate.c:1188 +msgid "_View Certificate..." +msgstr "_Ver certificado..." + +#. Prompt the user to authenticate the certificate +#. TODO: Provide the user with more guidance about why he is +#. being prompted +#. vrq will be completed by user_auth +#: ../libpurple/certificate.c:1288 +#, c-format +msgid "" +"The certificate presented by \"%s\" claims to be from \"%s\" instead. This " +"could mean that you are not connecting to the service you believe you are." +msgstr "" +"O certificado enviado por \"%s\" diz vir de \"%s\". Isto significa que você " +"pode não estar conectando ao serviço que pensa estar." + +#. Prompt the user to authenticate the certificate +#. vrq will be completed by user_auth +#: ../libpurple/certificate.c:1313 +#, c-format +msgid "" +"The certificate presented by \"%s\" is self-signed. It cannot be " +"automatically checked." +msgstr "" +"O certificado enviado por \"%s\" é auto-assinado. Ele não pode ser " +"verificado automaticamente." + +#: ../libpurple/certificate.c:1331 +#, c-format +msgid "The certificate chain presented for %s is not valid." +msgstr "A cadeia de certificados enviada para %s não é válida." + +#. TODO: Make this error either block the ensuing SSL +#. connection error until the user dismisses this one, or +#. stifle it. +#. TODO: Probably wrong. +#. TODO: Probably wrong +#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416 +msgid "SSL Certificate Error" +msgstr "Erro no certificado SSL" + +#: ../libpurple/certificate.c:1340 +msgid "Invalid certificate chain" +msgstr "Cadeia de certificado inválida" + +#. vrq will be completed by user_auth +#: ../libpurple/certificate.c:1360 +msgid "" +"You have no database of root certificates, so this certificate cannot be " +"validated." +msgstr "" +"você não tem um banco de dados de certificados raiz, logo este certificado " +"não pode ser validado." + +#. vrq will be completed by user_auth +#: ../libpurple/certificate.c:1382 +msgid "" +"The root certificate this one claims to be issued by is unknown to Pidgin." +msgstr "" +"O certificado raiz que expediu este certificado não é conhecido pelo Pidgin." + +#: ../libpurple/certificate.c:1408 +#, c-format +msgid "" +"The certificate chain presented by %s does not have a valid digital " +"signature from the Certificate Authority from which it claims to have a " +"signature." +msgstr "" +"A cadeia de certificado apresentada por %s não tem uma assinatura digital " +"válida vinda da Autoridade de Certificação do qual ele diz ter uma " +"assinatura." + +#: ../libpurple/certificate.c:1417 +msgid "Invalid certificate authority signature" +msgstr "Assinatura de autoridade de certificação inválida" + +#. Make messages +#: ../libpurple/certificate.c:1882 +#, c-format +msgid "" +"Common name: %s\n" +"\n" +"Fingerprint (SHA1): %s\n" +"\n" +"Activation date: %s\n" +"Expiration date: %s\n" +msgstr "" +"Nome usual: %s\n" +"\n" +"Impressão digital (SHA1): %s\n" +"\n" +"Data de ativação: %s\n" +"Data de expiração: %s\n" + +#. TODO: Find what the handle ought to be +#: ../libpurple/certificate.c:1891 +msgid "Certificate Information" +msgstr "Informações do certificado" + #: ../libpurple/connection.c:106 msgid "Registration Error" msgstr "Erro ao registrar" -#: ../libpurple/connection.c:293 +#: ../libpurple/connection.c:179 +msgid "Unregistration Error" +msgstr "Erro ao desregistrar" + +#: ../libpurple/connection.c:349 #, c-format msgid "+++ %s signed on" msgstr "+++ %s conectou" -#: ../libpurple/connection.c:323 +#: ../libpurple/connection.c:379 #, c-format msgid "+++ %s signed off" msgstr "+++ %s desconectou" -#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282 -#: ../libpurple/protocols/jabber/buddy.c:1750 +#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282 +#: ../libpurple/protocols/jabber/buddy.c:2335 #: ../libpurple/protocols/msn/servconn.c:139 #: ../libpurple/protocols/msn/session.c:322 msgid "Unknown error" @@ -1862,40 +2223,40 @@ msgid "Unable to send message." msgstr "Não foi possível enviar mensagem." -#: ../libpurple/conversation.c:1169 +#: ../libpurple/conversation.c:1211 msgid "Send Message" msgstr "Enviar mensagem" -#: ../libpurple/conversation.c:1172 +#: ../libpurple/conversation.c:1214 msgid "_Send Message" msgstr "Envia_r mensagem" -#: ../libpurple/conversation.c:1578 +#: ../libpurple/conversation.c:1620 #, c-format msgid "%s entered the room." msgstr "%s entrou na sala." -#: ../libpurple/conversation.c:1581 +#: ../libpurple/conversation.c:1623 #, c-format msgid "%s [%s] entered the room." msgstr "%s [%s] entrou na sala." -#: ../libpurple/conversation.c:1691 +#: ../libpurple/conversation.c:1733 #, c-format msgid "You are now known as %s" msgstr "Você mudou seu apelido para %s" -#: ../libpurple/conversation.c:1711 +#: ../libpurple/conversation.c:1753 #, c-format msgid "%s is now known as %s" msgstr "%s mudou seu apelido para %s" -#: ../libpurple/conversation.c:1786 +#: ../libpurple/conversation.c:1828 #, c-format msgid "%s left the room." msgstr "%s saiu da sala." -#: ../libpurple/conversation.c:1789 +#: ../libpurple/conversation.c:1831 #, c-format msgid "%s left the room (%s)." msgstr "%s saiu da sala (%s)." @@ -2418,12 +2779,12 @@ #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230 #: ../libpurple/protocols/oscar/oscar.c:1451 -#: ../libpurple/protocols/oscar/oscar.c:2243 -#: ../libpurple/protocols/oscar/oscar.c:2292 -#: ../libpurple/protocols/oscar/oscar.c:5834 -#: ../libpurple/protocols/oscar/oscar.c:5889 -#: ../libpurple/protocols/oscar/oscar.c:6115 -#: ../libpurple/protocols/oscar/oscar.c:6185 ../libpurple/request.h:1387 +#: ../libpurple/protocols/oscar/oscar.c:2226 +#: ../libpurple/protocols/oscar/oscar.c:2275 +#: ../libpurple/protocols/oscar/oscar.c:5870 +#: ../libpurple/protocols/oscar/oscar.c:5925 +#: ../libpurple/protocols/oscar/oscar.c:6151 +#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387 #: ../libpurple/request.h:1397 msgid "_Cancel" msgstr "_Cancelar" @@ -2468,8 +2829,8 @@ "automaticamente for concluída\n" "(apenas quando não há conversa com o remetente)" -#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629 -#: ../libpurple/protocols/msn/msn.c:1659 +#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660 +#: ../libpurple/protocols/msn/msn.c:1690 msgid "Notes" msgstr "Anotações" @@ -2893,7 +3254,7 @@ "O resto das mensagens será salvo como ações. Você pode alterar/remover as " "ações a partir da caixa de diálogo `Ações de usuário'" -#: ../libpurple/plugins/offlinemsg.c:152 +#: ../libpurple/plugins/offlinemsg.c:156 #, c-format msgid "" "\"%s\" is currently offline. Do you want to save the rest of the messages in " @@ -2902,19 +3263,19 @@ "\"%s\" está desconectado. Você deseja salvar o resto das mensagens como uma " "ação e enviá-las automaticamente quando \"%s\" conectar-se novamente?" -#: ../libpurple/plugins/offlinemsg.c:156 +#: ../libpurple/plugins/offlinemsg.c:160 msgid "Offline Message" msgstr "Mensagem desconectada" -#: ../libpurple/plugins/offlinemsg.c:157 +#: ../libpurple/plugins/offlinemsg.c:161 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog" msgstr "" "Você pode alterar/excluir a ação a partir da caixa de diálogo `Ações de " "usuário'" -#: ../libpurple/plugins/offlinemsg.c:161 +#: ../libpurple/plugins/offlinemsg.c:165 #: ../libpurple/protocols/msn/dialog.c:133 -#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532 +#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560 #: ../libpurple/protocols/novell/novell.c:1917 #: ../libpurple/protocols/silc/buddy.c:317 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304 @@ -2924,9 +3285,9 @@ msgid "Yes" msgstr "Sim" -#: ../libpurple/plugins/offlinemsg.c:162 +#: ../libpurple/plugins/offlinemsg.c:166 #: ../libpurple/protocols/msn/dialog.c:134 -#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532 +#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560 #: ../libpurple/protocols/novell/novell.c:1918 #: ../libpurple/protocols/silc/buddy.c:318 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305 @@ -2936,11 +3297,11 @@ msgid "No" msgstr "Não" -#: ../libpurple/plugins/offlinemsg.c:189 +#: ../libpurple/plugins/offlinemsg.c:193 msgid "Save offline messages in pounce" msgstr "Salvar mensagens offline como ações" -#: ../libpurple/plugins/offlinemsg.c:193 +#: ../libpurple/plugins/offlinemsg.c:197 msgid "Do not ask. Always save in pounce." msgstr "Não perguntar. Sempre salvar como ações." @@ -3035,6 +3396,50 @@ msgid "Tests to see that most things are working." msgstr "Verifica se a maioria das coisas estão funcionando." +#. Scheme name +#: ../libpurple/plugins/ssl/ssl-gnutls.c:903 +#: ../libpurple/plugins/ssl/ssl-nss.c:725 +msgid "X.509 Certificates" +msgstr "Certificados X.509" + +#. *< type +#. *< ui_requirement +#. *< flags +#. *< dependencies +#. *< priority +#. *< id +#: ../libpurple/plugins/ssl/ssl-gnutls.c:987 +msgid "GNUTLS" +msgstr "GNUTLS" + +#. *< name +#. *< version +#. * summary +#. * description +#: ../libpurple/plugins/ssl/ssl-gnutls.c:990 +#: ../libpurple/plugins/ssl/ssl-gnutls.c:992 +msgid "Provides SSL support through GNUTLS." +msgstr "Fornece suporte a SSL através do GNUTLS." + +#. *< type +#. *< ui_requirement +#. *< flags +#. *< dependencies +#. *< priority +#. *< id +#: ../libpurple/plugins/ssl/ssl-nss.c:810 +msgid "NSS" +msgstr "NSS" + +#. *< name +#. *< version +#. * summary +#. * description +#: ../libpurple/plugins/ssl/ssl-nss.c:813 +#: ../libpurple/plugins/ssl/ssl-nss.c:815 +msgid "Provides SSL support through Mozilla NSS." +msgstr "Fornece suporte a SSL através do Mozilla NSS." + #. *< type #. *< ui_requirement #. *< flags @@ -3053,44 +3458,6 @@ msgid "Provides a wrapper around SSL support libraries." msgstr "Fornece um envoltório para as bibliotecas de suporte à SSL." -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../libpurple/plugins/ssl/ssl-gnutls.c:275 -msgid "GNUTLS" -msgstr "GNUTLS" - -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/plugins/ssl/ssl-gnutls.c:278 -#: ../libpurple/plugins/ssl/ssl-gnutls.c:280 -msgid "Provides SSL support through GNUTLS." -msgstr "Fornece suporte a SSL através do GNUTLS." - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../libpurple/plugins/ssl/ssl-nss.c:423 -msgid "NSS" -msgstr "NSS" - -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/plugins/ssl/ssl-nss.c:426 -#: ../libpurple/plugins/ssl/ssl-nss.c:428 -msgid "Provides SSL support through Mozilla NSS." -msgstr "Fornece suporte a SSL através do Mozilla NSS." - #: ../libpurple/plugins/statenotify.c:50 #, c-format msgid "%s is no longer away." @@ -3184,25 +3551,25 @@ "rodando?" #. Creating the options for the protocol -#: ../libpurple/protocols/bonjour/bonjour.c:344 -#: ../libpurple/protocols/bonjour/bonjour.c:614 -#: ../libpurple/protocols/gg/gg.c:627 -#: ../libpurple/protocols/jabber/jabber.c:828 +#: ../libpurple/protocols/bonjour/bonjour.c:351 +#: ../libpurple/protocols/bonjour/bonjour.c:656 +#: ../libpurple/protocols/gg/gg.c:632 +#: ../libpurple/protocols/jabber/jabber.c:941 msgid "First name" msgstr "Nome" -#: ../libpurple/protocols/bonjour/bonjour.c:346 -#: ../libpurple/protocols/bonjour/bonjour.c:617 -#: ../libpurple/protocols/gg/gg.c:622 -#: ../libpurple/protocols/jabber/jabber.c:833 +#: ../libpurple/protocols/bonjour/bonjour.c:353 +#: ../libpurple/protocols/bonjour/bonjour.c:659 +#: ../libpurple/protocols/gg/gg.c:627 +#: ../libpurple/protocols/jabber/jabber.c:946 msgid "Last name" msgstr "Sobrenome" -#: ../libpurple/protocols/bonjour/bonjour.c:350 -#: ../libpurple/protocols/jabber/buddy.c:283 -#: ../libpurple/protocols/jabber/buddy.c:940 -#: ../libpurple/protocols/jabber/buddy.c:948 -#: ../libpurple/protocols/jabber/buddy.c:1629 +#: ../libpurple/protocols/bonjour/bonjour.c:357 +#: ../libpurple/protocols/jabber/buddy.c:295 +#: ../libpurple/protocols/jabber/buddy.c:1325 +#: ../libpurple/protocols/jabber/buddy.c:1335 +#: ../libpurple/protocols/jabber/buddy.c:2214 #: ../libpurple/protocols/silc/ops.c:1041 #: ../libpurple/protocols/silc/util.c:555 #: ../libpurple/protocols/silc10/ops.c:1075 @@ -3211,13 +3578,13 @@ msgid "E-Mail" msgstr "Email" -#: ../libpurple/protocols/bonjour/bonjour.c:353 -#: ../libpurple/protocols/bonjour/bonjour.c:623 +#: ../libpurple/protocols/bonjour/bonjour.c:360 +#: ../libpurple/protocols/bonjour/bonjour.c:665 msgid "AIM Account" msgstr "Conta do AIM" -#: ../libpurple/protocols/bonjour/bonjour.c:356 -#: ../libpurple/protocols/bonjour/bonjour.c:626 +#: ../libpurple/protocols/bonjour/bonjour.c:363 +#: ../libpurple/protocols/bonjour/bonjour.c:668 msgid "XMPP Account" msgstr "Conta do XMPP" @@ -3231,27 +3598,18 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/bonjour/bonjour.c:460 -#: ../libpurple/protocols/bonjour/bonjour.c:462 +#: ../libpurple/protocols/bonjour/bonjour.c:467 +#: ../libpurple/protocols/bonjour/bonjour.c:469 msgid "Bonjour Protocol Plugin" msgstr "Plugin do protocolo Bonjour" -#: ../libpurple/protocols/bonjour/bonjour.c:505 -#: ../libpurple/protocols/bonjour/bonjour.c:512 -#: ../libpurple/protocols/bonjour/bonjour.c:561 +#: ../libpurple/protocols/bonjour/bonjour.c:610 msgid "Purple Person" msgstr "Pessoa púrpura" -#. Creating the user splits -#: ../libpurple/protocols/bonjour/bonjour.c:610 -#: ../libpurple/protocols/silc/silc.c:1007 -#: ../libpurple/protocols/silc10/silc.c:918 -msgid "Hostname" -msgstr "Nome do host" - -#: ../libpurple/protocols/bonjour/bonjour.c:620 -#: ../libpurple/protocols/gg/gg.c:472 -#: ../libpurple/protocols/jabber/jabber.c:818 +#: ../libpurple/protocols/bonjour/bonjour.c:662 +#: ../libpurple/protocols/gg/gg.c:477 +#: ../libpurple/protocols/jabber/jabber.c:931 #: ../libpurple/protocols/silc/silc.c:770 #: ../libpurple/protocols/silc/silc.c:1011 #: ../libpurple/protocols/silc10/silc.c:681 @@ -3263,38 +3621,38 @@ msgid "Bonjour" msgstr "Bonjour" -#: ../libpurple/protocols/bonjour/jabber.c:383 +#: ../libpurple/protocols/bonjour/jabber.c:380 #, c-format msgid "%s has closed the conversation." msgstr "%s fechou a conversa." -#: ../libpurple/protocols/bonjour/jabber.c:435 -#: ../libpurple/protocols/bonjour/jabber.c:658 -#: ../libpurple/protocols/bonjour/jabber.c:676 +#: ../libpurple/protocols/bonjour/jabber.c:437 +#: ../libpurple/protocols/bonjour/jabber.c:660 +#: ../libpurple/protocols/bonjour/jabber.c:678 msgid "Unable to send the message, the conversation couldn't be started." msgstr "Não foi possível enviar mensagem: a conversa não pôde ser iniciada." -#: ../libpurple/protocols/bonjour/jabber.c:581 +#: ../libpurple/protocols/bonjour/jabber.c:583 msgid "Cannot open socket" msgstr "Não foi possível abrir socket" -#: ../libpurple/protocols/bonjour/jabber.c:589 +#: ../libpurple/protocols/bonjour/jabber.c:591 msgid "Error setting socket options" msgstr "Erro ao definir as opções do socket" -#: ../libpurple/protocols/bonjour/jabber.c:613 +#: ../libpurple/protocols/bonjour/jabber.c:615 msgid "Could not bind socket to port" msgstr "Não foi possível vincular socket à porta" -#: ../libpurple/protocols/bonjour/jabber.c:621 +#: ../libpurple/protocols/bonjour/jabber.c:623 msgid "Could not listen on socket" msgstr "Não foi possível escutar no socket" -#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812 +#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1828 msgid "Invalid proxy settings" msgstr "Configurações de proxy inválidas" -#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812 +#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1828 msgid "" "Either the host name or port number specified for your given proxy type is " "invalid." @@ -3364,47 +3722,49 @@ msgid "Registration completed successfully!" msgstr "O registro foi concluído com sucesso!" -#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770 -#: ../libpurple/protocols/jabber/jabber.c:807 -#: ../libpurple/protocols/jabber/jabber.c:1369 +#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775 +#: ../libpurple/protocols/jabber/jabber.c:912 +#: ../libpurple/protocols/jabber/jabber.c:915 +#: ../libpurple/protocols/jabber/jabber.c:1721 msgid "Password" msgstr "Senha" -#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775 +#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780 msgid "Password (retype)" msgstr "Senha (redigitar)" -#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780 +#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785 msgid "Enter current token" msgstr "Digite o token atual" -#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786 +#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791 msgid "Current token" msgstr "Token atual" -#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498 +#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503 msgid "Register New Gadu-Gadu Account" msgstr "Registrar nova conta do Gadu-Gadu" -#: ../libpurple/protocols/gg/gg.c:499 +#: ../libpurple/protocols/gg/gg.c:504 msgid "Please, fill in the following fields" msgstr "Por favor, preencha os seguintes campos" -#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049 -#: ../libpurple/protocols/gg/gg.c:1121 -#: ../libpurple/protocols/jabber/jabber.c:843 -#: ../libpurple/protocols/oscar/oscar.c:3757 -#: ../libpurple/protocols/oscar/oscar.c:3770 +#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054 +#: ../libpurple/protocols/gg/gg.c:1126 +#: ../libpurple/protocols/jabber/jabber.c:956 +#: ../libpurple/protocols/oscar/oscar.c:3782 +#: ../libpurple/protocols/oscar/oscar.c:3795 #: ../libpurple/protocols/qq/buddy_info.c:49 msgid "City" msgstr "Cidade" -#: ../libpurple/protocols/gg/gg.c:642 +#: ../libpurple/protocols/gg/gg.c:647 msgid "Year of birth" msgstr "Ano de nascimento" -#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558 -#: ../libpurple/protocols/oscar/oscar.c:3700 +#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589 +#: ../libpurple/protocols/myspace/user.c:115 +#: ../libpurple/protocols/oscar/oscar.c:3725 #: ../libpurple/protocols/qq/buddy_info.c:46 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236 @@ -3412,242 +3772,242 @@ msgid "Gender" msgstr "Sexo" -#: ../libpurple/protocols/gg/gg.c:646 +#: ../libpurple/protocols/gg/gg.c:651 msgid "Male or female" msgstr "Homem ou mulher" -#: ../libpurple/protocols/gg/gg.c:647 -#: ../libpurple/protocols/oscar/oscar.c:3700 +#: ../libpurple/protocols/gg/gg.c:652 +#: ../libpurple/protocols/oscar/oscar.c:3725 #: ../libpurple/protocols/qq/buddy_info.c:83 #: ../libpurple/protocols/qq/qq.c:226 msgid "Male" msgstr "Masculino" -#: ../libpurple/protocols/gg/gg.c:648 -#: ../libpurple/protocols/oscar/oscar.c:3700 +#: ../libpurple/protocols/gg/gg.c:653 +#: ../libpurple/protocols/oscar/oscar.c:3725 #: ../libpurple/protocols/qq/buddy_info.c:84 #: ../libpurple/protocols/qq/qq.c:229 msgid "Female" msgstr "Feminino" -#: ../libpurple/protocols/gg/gg.c:652 +#: ../libpurple/protocols/gg/gg.c:657 msgid "Only online" msgstr "Apenas conectado" -#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657 +#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662 msgid "Find buddies" msgstr "Encontrar amigos" -#: ../libpurple/protocols/gg/gg.c:658 +#: ../libpurple/protocols/gg/gg.c:663 msgid "Please, enter your search criteria below" msgstr "Favor digitar seu critério de busca abaixo" -#: ../libpurple/protocols/gg/gg.c:696 +#: ../libpurple/protocols/gg/gg.c:701 msgid "Fill in the fields." msgstr "Preencha os campos." -#: ../libpurple/protocols/gg/gg.c:708 +#: ../libpurple/protocols/gg/gg.c:713 msgid "Your current password is different from the one that you specified." msgstr "Sua senha atual é diferente da senha que você especificou." -#: ../libpurple/protocols/gg/gg.c:722 +#: ../libpurple/protocols/gg/gg.c:727 msgid "Unable to change password. Error occurred.\n" msgstr "Não foi possível alterar a senha. Ocorreu um erro.\n" -#: ../libpurple/protocols/gg/gg.c:731 +#: ../libpurple/protocols/gg/gg.c:736 msgid "Change password for the Gadu-Gadu account" msgstr "Mudar senha da conta do Gadu-Gadu" -#: ../libpurple/protocols/gg/gg.c:732 +#: ../libpurple/protocols/gg/gg.c:737 msgid "Password was changed successfully!" msgstr "Senha alterada com sucesso!" -#: ../libpurple/protocols/gg/gg.c:765 +#: ../libpurple/protocols/gg/gg.c:770 msgid "Current password" msgstr "Senha atual" -#: ../libpurple/protocols/gg/gg.c:790 +#: ../libpurple/protocols/gg/gg.c:795 msgid "Please, enter your current password and your new password for UIN: " msgstr "Favor digitar sua senha atual e sua nova senha do UIN: " -#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795 +#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800 msgid "Change Gadu-Gadu Password" msgstr "Alterar a senha do Gadu-Gadu" -#: ../libpurple/protocols/gg/gg.c:871 +#: ../libpurple/protocols/gg/gg.c:876 #, c-format msgid "Select a chat for buddy: %s" msgstr "Selecione o bate-papo para o amigo: %s" -#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875 +#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880 msgid "Add to chat..." msgstr "Adicionar ao bate-papo..." -#: ../libpurple/protocols/gg/gg.c:1003 -#: ../libpurple/protocols/jabber/buddy.c:1466 +#: ../libpurple/protocols/gg/gg.c:1008 +#: ../libpurple/protocols/jabber/buddy.c:2029 #: ../libpurple/protocols/novell/novell.c:2828 #: ../libpurple/protocols/oscar/oscar.c:827 -#: ../libpurple/protocols/oscar/oscar.c:5552 +#: ../libpurple/protocols/oscar/oscar.c:5588 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177 #: ../libpurple/protocols/qq/qq.c:292 -#: ../libpurple/protocols/yahoo/yahoo.c:2938 ../libpurple/status.c:153 -#: ../pidgin/gtkblist.c:3082 ../pidgin/gtkblist.c:3419 -#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059 +#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153 +#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433 +#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060 msgid "Offline" msgstr "Desconectado" -#: ../libpurple/protocols/gg/gg.c:1006 -#: ../libpurple/protocols/jabber/buddy.c:1468 +#: ../libpurple/protocols/gg/gg.c:1011 +#: ../libpurple/protocols/jabber/buddy.c:2031 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38 #: ../libpurple/protocols/novell/novell.c:2816 #: ../libpurple/protocols/qq/qq.c:280 -#: ../libpurple/protocols/yahoo/yahoo.c:2940 ../libpurple/status.c:154 -#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055 +#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154 +#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056 msgid "Available" msgstr "Disponível" #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message #. Away stuff -#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530 +#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528 #: ../libpurple/protocols/irc/msgs.c:310 -#: ../libpurple/protocols/jabber/buddy.c:1472 +#: ../libpurple/protocols/jabber/buddy.c:2035 #: ../libpurple/protocols/novell/novell.c:2819 #: ../libpurple/protocols/oscar/oscar.c:732 -#: ../libpurple/protocols/oscar/oscar.c:4504 -#: ../libpurple/protocols/oscar/oscar.c:5580 +#: ../libpurple/protocols/oscar/oscar.c:4540 +#: ../libpurple/protocols/oscar/oscar.c:5616 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284 #: ../libpurple/protocols/silc/buddy.c:1476 #: ../libpurple/protocols/silc10/buddy.c:1476 -#: ../libpurple/protocols/yahoo/yahoo.c:3492 -#: ../libpurple/protocols/yahoo/yahoo.c:3566 ../libpurple/status.c:157 -#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934 -#: ../pidgin/gtkstatusbox.c:1056 +#: ../libpurple/protocols/yahoo/yahoo.c:3650 +#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157 +#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938 +#: ../pidgin/gtkstatusbox.c:1057 msgid "Away" msgstr "Ausente" -#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112 -#: ../libpurple/protocols/oscar/oscar.c:2669 -#: ../libpurple/protocols/oscar/oscar.c:3667 +#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117 +#: ../libpurple/protocols/oscar/oscar.c:2692 +#: ../libpurple/protocols/oscar/oscar.c:3692 msgid "UIN" msgstr "UIN" -#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115 -#: ../libpurple/protocols/jabber/buddy.c:1623 -#: ../libpurple/protocols/jabber/buddy.c:1799 -#: ../libpurple/protocols/oscar/oscar.c:3678 +#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120 +#: ../libpurple/protocols/jabber/buddy.c:2208 +#: ../libpurple/protocols/jabber/buddy.c:2384 +#: ../libpurple/protocols/oscar/oscar.c:3703 #: ../libpurple/protocols/silc/ops.c:990 #: ../libpurple/protocols/silc10/ops.c:1024 msgid "First Name" msgstr "Nome" -#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124 +#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129 msgid "Birth Year" msgstr "Ano de nascimento" -#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175 -#: ../libpurple/protocols/oscar/oscar.c:3879 +#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180 +#: ../libpurple/protocols/oscar/oscar.c:3904 msgid "Unable to display the search results." msgstr "Não foi possível exibir os resultados da busca." -#: ../libpurple/protocols/gg/gg.c:1166 +#: ../libpurple/protocols/gg/gg.c:1171 msgid "Gadu-Gadu Public Directory" msgstr "Páginas amarelas do Gadu-Gadu" -#: ../libpurple/protocols/gg/gg.c:1167 +#: ../libpurple/protocols/gg/gg.c:1172 msgid "Search results" msgstr "Resultados da busca" -#: ../libpurple/protocols/gg/gg.c:1210 +#: ../libpurple/protocols/gg/gg.c:1215 msgid "No matching users found" msgstr "Nenhum usuário compatível encontrado" -#: ../libpurple/protocols/gg/gg.c:1211 +#: ../libpurple/protocols/gg/gg.c:1216 msgid "There are no users matching your search criteria." msgstr "Não existem usuários que satisfaçam seu critério de busca" -#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458 +#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463 msgid "Unable to read socket" msgstr "Não foi possível ler do socket" -#: ../libpurple/protocols/gg/gg.c:1390 +#: ../libpurple/protocols/gg/gg.c:1395 msgid "Buddy list downloaded" msgstr "Lista de amigos transferida" -#: ../libpurple/protocols/gg/gg.c:1391 +#: ../libpurple/protocols/gg/gg.c:1396 msgid "Your buddy list was downloaded from the server." msgstr "Sua lista de amigos foi transferida do servidor." -#: ../libpurple/protocols/gg/gg.c:1398 +#: ../libpurple/protocols/gg/gg.c:1403 msgid "Buddy list uploaded" msgstr "Lista de amigos enviada" -#: ../libpurple/protocols/gg/gg.c:1399 +#: ../libpurple/protocols/gg/gg.c:1404 msgid "Your buddy list was stored on the server." msgstr "Sua lista de amigos foi guardada no servidor." -#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710 +#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715 msgid "Connection failed." msgstr "Falha na conexão." -#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531 +#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559 msgid "Blocked" msgstr "Bloqueado" -#: ../libpurple/protocols/gg/gg.c:1639 +#: ../libpurple/protocols/gg/gg.c:1644 msgid "Add to chat" msgstr "Adicionar ao bate-papo" -#: ../libpurple/protocols/gg/gg.c:1648 +#: ../libpurple/protocols/gg/gg.c:1653 msgid "Unblock" msgstr "Desbloquear" -#: ../libpurple/protocols/gg/gg.c:1652 +#: ../libpurple/protocols/gg/gg.c:1657 msgid "Block" msgstr "Bloquear" -#: ../libpurple/protocols/gg/gg.c:1669 +#: ../libpurple/protocols/gg/gg.c:1674 msgid "Chat _name:" msgstr "_Nome do bate-papo:" -#: ../libpurple/protocols/gg/gg.c:1909 +#: ../libpurple/protocols/gg/gg.c:1914 msgid "Chat error" msgstr "Erro no bate-papo" -#: ../libpurple/protocols/gg/gg.c:1910 +#: ../libpurple/protocols/gg/gg.c:1915 msgid "This chat name is already in use" msgstr "Este nome de bate-papo já está sendo utilizado" -#: ../libpurple/protocols/gg/gg.c:1993 +#: ../libpurple/protocols/gg/gg.c:1998 msgid "Not connected to the server." msgstr "Não conectado ao servidor." -#: ../libpurple/protocols/gg/gg.c:2016 +#: ../libpurple/protocols/gg/gg.c:2021 msgid "Find buddies..." msgstr "Encontrar amigos..." -#: ../libpurple/protocols/gg/gg.c:2022 +#: ../libpurple/protocols/gg/gg.c:2027 msgid "Change password..." msgstr "Alterar senha..." -#: ../libpurple/protocols/gg/gg.c:2028 +#: ../libpurple/protocols/gg/gg.c:2033 msgid "Upload buddylist to Server" msgstr "Enviar lista de amigos para o servidor" -#: ../libpurple/protocols/gg/gg.c:2032 +#: ../libpurple/protocols/gg/gg.c:2037 msgid "Download buddylist from Server" msgstr "Transferir lista de amigos do servidor" -#: ../libpurple/protocols/gg/gg.c:2036 +#: ../libpurple/protocols/gg/gg.c:2041 msgid "Delete buddylist from Server" msgstr "Remover lista de amigos do servidor" -#: ../libpurple/protocols/gg/gg.c:2040 +#: ../libpurple/protocols/gg/gg.c:2045 msgid "Save buddylist to file..." msgstr "Salvar lista de amigos para um arquivo..." -#: ../libpurple/protocols/gg/gg.c:2044 +#: ../libpurple/protocols/gg/gg.c:2049 msgid "Load buddylist from file..." msgstr "Carregar lista de amigos do arquivo.." @@ -3662,16 +4022,16 @@ #. id #. name #. version -#: ../libpurple/protocols/gg/gg.c:2148 +#: ../libpurple/protocols/gg/gg.c:2153 msgid "Gadu-Gadu Protocol Plugin" msgstr "Plugin do protocolo Gadu-Gadu" #. summary -#: ../libpurple/protocols/gg/gg.c:2149 +#: ../libpurple/protocols/gg/gg.c:2154 msgid "Polish popular IM" msgstr "Cliente de mensagens instantâneas popular na Polônia" -#: ../libpurple/protocols/gg/gg.c:2203 +#: ../libpurple/protocols/gg/gg.c:2208 msgid "Gadu-Gadu User" msgstr "Usuário do Gadu-Gadu" @@ -3728,7 +4088,8 @@ msgstr "Mensagem do dia (MOTD) para %s" #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165 -#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639 +#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637 +#: ../libpurple/protocols/myspace/myspace.c:2349 msgid "Server has disconnected" msgstr "O servidor desconectou" @@ -3742,7 +4103,7 @@ msgstr "_Canal:" #: ../libpurple/protocols/irc/irc.c:267 -#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526 +#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524 msgid "_Password:" msgstr "_Senha:" @@ -3750,65 +4111,62 @@ msgid "IRC nicks may not contain whitespace" msgstr "Apelidos do IRC não podem conter espaços" +#. 1. connect to server #. connect to the server #: ../libpurple/protocols/irc/irc.c:319 -#: ../libpurple/protocols/jabber/jabber.c:1046 +#: ../libpurple/protocols/jabber/jabber.c:1279 #: ../libpurple/protocols/msn/session.c:345 +#: ../libpurple/protocols/myspace/myspace.c:301 #: ../libpurple/protocols/novell/novell.c:2182 #: ../libpurple/protocols/oscar/oscar.c:1285 #: ../libpurple/protocols/qq/qq.c:136 -#: ../libpurple/protocols/sametime/sametime.c:3724 -#: ../libpurple/protocols/simple/simple.c:1676 -#: ../libpurple/protocols/yahoo/yahoo.c:2783 +#: ../libpurple/protocols/sametime/sametime.c:3723 +#: ../libpurple/protocols/simple/simple.c:1716 +#: ../libpurple/protocols/yahoo/yahoo.c:2936 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661 msgid "Connecting" msgstr "Conectando" #: ../libpurple/protocols/irc/irc.c:327 -#: ../libpurple/protocols/jabber/jabber.c:603 -#: ../libpurple/protocols/jabber/jabber.c:950 +#: ../libpurple/protocols/jabber/jabber.c:609 +#: ../libpurple/protocols/jabber/jabber.c:1094 msgid "SSL support unavailable" msgstr "Suporte a SSL indisponível" +#. TODO: try other ports if in auto mode, then save +#. * working port and try that first next time. #: ../libpurple/protocols/irc/irc.c:338 +#: ../libpurple/protocols/myspace/myspace.c:317 #: ../libpurple/protocols/simple/simple.c:464 -#: ../libpurple/protocols/simple/simple.c:1591 +#: ../libpurple/protocols/simple/simple.c:1631 msgid "Couldn't create socket" msgstr "Não foi possível criar socket" -#: ../libpurple/protocols/irc/irc.c:416 +#: ../libpurple/protocols/irc/irc.c:421 +#: ../libpurple/protocols/myspace/myspace.c:2462 #: ../libpurple/protocols/oscar/oscar.c:1281 msgid "Couldn't connect to host" msgstr "Não foi possível conectar ao host" -#: ../libpurple/protocols/irc/irc.c:438 -#: ../libpurple/protocols/jabber/jabber.c:499 -msgid "Connection Failed" -msgstr "Falha na conexão" - -#: ../libpurple/protocols/irc/irc.c:441 -#: ../libpurple/protocols/jabber/jabber.c:502 -msgid "SSL Handshake Failed" -msgstr "Falha na negociação SSL" - -#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636 +#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634 +#: ../libpurple/protocols/myspace/myspace.c:2345 msgid "Read error" msgstr "Erro de leitura" -#: ../libpurple/protocols/irc/irc.c:775 +#: ../libpurple/protocols/irc/irc.c:773 #: ../libpurple/protocols/silc/chat.c:1412 #: ../libpurple/protocols/silc10/chat.c:1426 -#: ../libpurple/protocols/yahoo/yahoochat.c:1401 +#: ../libpurple/protocols/yahoo/yahoochat.c:1497 msgid "Users" msgstr "Usuários" -#: ../libpurple/protocols/irc/irc.c:778 -#: ../libpurple/protocols/sametime/sametime.c:3375 +#: ../libpurple/protocols/irc/irc.c:776 +#: ../libpurple/protocols/sametime/sametime.c:3374 #: ../libpurple/protocols/silc/chat.c:1415 #: ../libpurple/protocols/silc/ops.c:1389 #: ../libpurple/protocols/silc10/chat.c:1429 #: ../libpurple/protocols/silc10/ops.c:1382 -#: ../libpurple/protocols/yahoo/yahoochat.c:1410 +#: ../libpurple/protocols/yahoo/yahoochat.c:1506 msgid "Topic" msgstr "Tópico" @@ -3820,47 +4178,48 @@ #. *< id #. *< name #. *< version -#: ../libpurple/protocols/irc/irc.c:916 +#: ../libpurple/protocols/irc/irc.c:914 msgid "IRC Protocol Plugin" msgstr "Plugin do protocolo IRC" #. * summary -#: ../libpurple/protocols/irc/irc.c:917 +#: ../libpurple/protocols/irc/irc.c:915 msgid "The IRC Protocol Plugin that Sucks Less" msgstr "O plugin do protocolo IRC que é menos ruim" #. host to connect to -#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323 -#: ../libpurple/protocols/msn/msn.c:2154 -#: ../libpurple/protocols/oscar/oscar.c:6619 +#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323 +#: ../libpurple/protocols/msn/msn.c:2185 +#: ../libpurple/protocols/oscar/oscar.c:6655 #: ../libpurple/protocols/qq/qq.c:755 -#: ../libpurple/protocols/sametime/sametime.c:5728 +#: ../libpurple/protocols/sametime/sametime.c:5727 #: ../libpurple/protocols/silc/ops.c:1249 #: ../libpurple/protocols/silc/ops.c:1341 #: ../libpurple/protocols/silc10/ops.c:1244 #: ../libpurple/protocols/silc10/ops.c:1347 -#: ../libpurple/protocols/simple/simple.c:1855 +#: ../libpurple/protocols/simple/simple.c:1896 #: ../libpurple/protocols/toc/toc.c:2327 msgid "Server" msgstr "Servidor" #. port to connect to -#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159 -#: ../libpurple/protocols/oscar/oscar.c:6622 +#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190 +#: ../libpurple/protocols/oscar/oscar.c:6658 #: ../libpurple/protocols/qq/qq.c:758 -#: ../libpurple/protocols/sametime/sametime.c:5733 +#: ../libpurple/protocols/sametime/sametime.c:5732 #: ../libpurple/protocols/silc/silc.c:1918 #: ../libpurple/protocols/silc10/silc.c:1861 #: ../libpurple/protocols/toc/toc.c:2331 msgid "Port" msgstr "Porta" -#: ../libpurple/protocols/irc/irc.c:948 +#: ../libpurple/protocols/irc/irc.c:946 msgid "Encodings" msgstr "Codificações" -#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316 -#: ../libpurple/protocols/jabber/jabber.c:803 +#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316 +#: ../libpurple/protocols/jabber/jabber.c:903 +#: ../libpurple/protocols/jabber/jabber.c:906 #: ../libpurple/protocols/silc/buddy.c:1539 #: ../libpurple/protocols/silc/ops.c:1197 #: ../libpurple/protocols/silc/ops.c:1200 @@ -3876,7 +4235,7 @@ msgid "Username" msgstr "Nome do usuário" -#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317 +#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317 #: ../libpurple/protocols/silc/silc.c:1009 #: ../libpurple/protocols/silc10/silc.c:920 msgid "Real name" @@ -3886,7 +4245,7 @@ #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT); #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); #. -#: ../libpurple/protocols/irc/irc.c:962 +#: ../libpurple/protocols/irc/irc.c:960 msgid "Use SSL" msgstr "Usar SSL" @@ -3917,7 +4276,7 @@ msgstr " (identificado)" #: ../libpurple/protocols/irc/msgs.c:303 -#: ../libpurple/protocols/oscar/oscar.c:3668 +#: ../libpurple/protocols/oscar/oscar.c:3693 #: ../libpurple/protocols/silc/ops.c:1418 #: ../libpurple/protocols/silc10/ops.c:1414 msgid "Nick" @@ -4200,7 +4559,7 @@ msgstr "names [canal]: Lista os usuários que estão no canal atualmente." #: ../libpurple/protocols/irc/parse.c:137 -#: ../libpurple/protocols/jabber/jabber.c:1830 +#: ../libpurple/protocols/jabber/jabber.c:2260 msgid "nick <new nickname>: Change your nickname." msgstr "nick <novo apelido>: Muda seu apelido." @@ -4330,6 +4689,22 @@ msgid "Disconnected." msgstr "Desconectado." +#: ../libpurple/protocols/jabber/adhoccommands.c:137 +#: ../libpurple/protocols/jabber/jabber.c:670 +#: ../libpurple/protocols/jabber/jabber.c:700 +#: ../libpurple/protocols/jabber/jabber.c:1886 +msgid "Unknown Error" +msgstr "Erro desconhecido" + +#: ../libpurple/protocols/jabber/adhoccommands.c:139 +#: ../libpurple/protocols/jabber/adhoccommands.c:140 +msgid "Ad-Hoc Command Failed" +msgstr "Comando ad-hoc falhou" + +#: ../libpurple/protocols/jabber/adhoccommands.c:173 +msgid "execute" +msgstr "execute" + #: ../libpurple/protocols/jabber/auth.c:52 msgid "Server requires TLS/SSL for login. No TLS/SSL support found." msgstr "" @@ -4341,8 +4716,8 @@ msgstr "" "O servidor requer autenticação em texto puro sobre um fluxo não-criptografado" -#: ../libpurple/protocols/jabber/auth.c:294 -#: ../libpurple/protocols/jabber/auth.c:483 +#: ../libpurple/protocols/jabber/auth.c:317 +#: ../libpurple/protocols/jabber/auth.c:506 #, c-format msgid "" "%s requires plaintext authentication over an unencrypted connection. Allow " @@ -4351,33 +4726,33 @@ "%s requer autenticação via texto puro sobre uma conexão não criptografada. " "Deseja permitir isso e continuar a autenticação?" -#: ../libpurple/protocols/jabber/auth.c:296 -#: ../libpurple/protocols/jabber/auth.c:297 -#: ../libpurple/protocols/jabber/auth.c:485 -#: ../libpurple/protocols/jabber/auth.c:486 -#: ../libpurple/protocols/jabber/auth.c:570 -#: ../libpurple/protocols/jabber/auth.c:571 +#: ../libpurple/protocols/jabber/auth.c:319 +#: ../libpurple/protocols/jabber/auth.c:320 +#: ../libpurple/protocols/jabber/auth.c:508 +#: ../libpurple/protocols/jabber/auth.c:509 +#: ../libpurple/protocols/jabber/auth.c:596 +#: ../libpurple/protocols/jabber/auth.c:597 msgid "Plaintext Authentication" msgstr "Autenticação via texto puro" -#: ../libpurple/protocols/jabber/auth.c:309 -#: ../libpurple/protocols/jabber/auth.c:498 -#: ../libpurple/protocols/jabber/auth.c:582 +#: ../libpurple/protocols/jabber/auth.c:332 +#: ../libpurple/protocols/jabber/auth.c:521 +#: ../libpurple/protocols/jabber/auth.c:608 msgid "Server does not use any supported authentication method" msgstr "O servidor não utiliza nenhum método de autenticação suportado" #. This should never happen! -#: ../libpurple/protocols/jabber/auth.c:437 -#: ../libpurple/protocols/jabber/auth.c:533 -#: ../libpurple/protocols/jabber/auth.c:748 -#: ../libpurple/protocols/jabber/auth.c:889 -#: ../libpurple/protocols/jabber/auth.c:914 -#: ../libpurple/protocols/jabber/auth.c:933 -#: ../libpurple/protocols/jabber/jabber.c:115 +#: ../libpurple/protocols/jabber/auth.c:460 +#: ../libpurple/protocols/jabber/auth.c:559 +#: ../libpurple/protocols/jabber/auth.c:774 +#: ../libpurple/protocols/jabber/auth.c:915 +#: ../libpurple/protocols/jabber/auth.c:940 +#: ../libpurple/protocols/jabber/auth.c:959 +#: ../libpurple/protocols/jabber/jabber.c:123 msgid "Invalid response from server." msgstr "O servidor retornou uma resposta inválida." -#: ../libpurple/protocols/jabber/auth.c:572 +#: ../libpurple/protocols/jabber/auth.c:598 msgid "" "This server requires plaintext authentication over an unencrypted " "connection. Allow this and continue authentication?" @@ -4385,113 +4760,114 @@ "O servidor requer autenticação via texto puro sobre uma conexão não " "criptografada. Deseja permitir isso e continuar a autenticação?" -#: ../libpurple/protocols/jabber/auth.c:769 -#: ../libpurple/protocols/jabber/auth.c:792 +#: ../libpurple/protocols/jabber/auth.c:795 +#: ../libpurple/protocols/jabber/auth.c:818 msgid "Invalid challenge from server" msgstr "O servidor retornou uma identificação inválida" -#: ../libpurple/protocols/jabber/auth.c:864 +#: ../libpurple/protocols/jabber/auth.c:890 msgid "SASL error" msgstr "Erro de SASL" -#: ../libpurple/protocols/jabber/buddy.c:271 -#: ../libpurple/protocols/jabber/buddy.c:825 -#: ../libpurple/protocols/sametime/sametime.c:4129 +#: ../libpurple/protocols/jabber/buddy.c:283 +#: ../libpurple/protocols/jabber/buddy.c:1219 +#: ../libpurple/protocols/sametime/sametime.c:4128 #: ../libpurple/protocols/silc/ops.c:986 #: ../libpurple/protocols/silc10/ops.c:1020 msgid "Full Name" msgstr "Nome completo" -#: ../libpurple/protocols/jabber/buddy.c:272 -#: ../libpurple/protocols/jabber/buddy.c:838 +#: ../libpurple/protocols/jabber/buddy.c:284 +#: ../libpurple/protocols/jabber/buddy.c:1231 #: ../libpurple/protocols/silc/ops.c:998 #: ../libpurple/protocols/silc10/ops.c:1032 msgid "Family Name" msgstr "Sobrenome" -#: ../libpurple/protocols/jabber/buddy.c:273 -#: ../libpurple/protocols/jabber/buddy.c:842 +#: ../libpurple/protocols/jabber/buddy.c:285 +#: ../libpurple/protocols/jabber/buddy.c:1234 msgid "Given Name" msgstr "Nome" -#: ../libpurple/protocols/jabber/buddy.c:275 -#: ../libpurple/protocols/jabber/jabber.c:863 +#: ../libpurple/protocols/jabber/buddy.c:287 +#: ../libpurple/protocols/jabber/jabber.c:976 msgid "URL" msgstr "URL" -#: ../libpurple/protocols/jabber/buddy.c:276 -#: ../libpurple/protocols/jabber/buddy.c:894 +#: ../libpurple/protocols/jabber/buddy.c:288 +#: ../libpurple/protocols/jabber/buddy.c:1282 msgid "Street Address" msgstr "Endereço (Rua)" -#: ../libpurple/protocols/jabber/buddy.c:277 -#: ../libpurple/protocols/jabber/buddy.c:890 +#: ../libpurple/protocols/jabber/buddy.c:289 +#: ../libpurple/protocols/jabber/buddy.c:1279 msgid "Extended Address" msgstr "Endereço (Complemento)" -#: ../libpurple/protocols/jabber/buddy.c:278 -#: ../libpurple/protocols/jabber/buddy.c:898 +#: ../libpurple/protocols/jabber/buddy.c:290 +#: ../libpurple/protocols/jabber/buddy.c:1285 msgid "Locality" msgstr "Localidade" -#: ../libpurple/protocols/jabber/buddy.c:279 -#: ../libpurple/protocols/jabber/buddy.c:902 +#: ../libpurple/protocols/jabber/buddy.c:291 +#: ../libpurple/protocols/jabber/buddy.c:1288 msgid "Region" msgstr "Região" -#: ../libpurple/protocols/jabber/buddy.c:280 -#: ../libpurple/protocols/jabber/buddy.c:906 +#: ../libpurple/protocols/jabber/buddy.c:292 +#: ../libpurple/protocols/jabber/buddy.c:1291 msgid "Postal Code" msgstr "Código postal (CEP)" -#: ../libpurple/protocols/jabber/buddy.c:281 -#: ../libpurple/protocols/jabber/buddy.c:911 +#: ../libpurple/protocols/jabber/buddy.c:293 +#: ../libpurple/protocols/jabber/buddy.c:1295 #: ../libpurple/protocols/silc/silc.c:1015 #: ../libpurple/protocols/silc10/silc.c:926 msgid "Country" msgstr "País" -#: ../libpurple/protocols/jabber/buddy.c:282 -#: ../libpurple/protocols/jabber/buddy.c:922 -#: ../libpurple/protocols/jabber/buddy.c:929 +#: ../libpurple/protocols/jabber/buddy.c:294 +#: ../libpurple/protocols/jabber/buddy.c:1306 +#: ../libpurple/protocols/jabber/buddy.c:1313 msgid "Telephone" msgstr "Telefone" -#: ../libpurple/protocols/jabber/buddy.c:284 -#: ../libpurple/protocols/jabber/buddy.c:963 +#: ../libpurple/protocols/jabber/buddy.c:296 +#: ../libpurple/protocols/jabber/buddy.c:1350 msgid "Organization Name" msgstr "Nome da organização" -#: ../libpurple/protocols/jabber/buddy.c:285 -#: ../libpurple/protocols/jabber/buddy.c:967 +#: ../libpurple/protocols/jabber/buddy.c:297 +#: ../libpurple/protocols/jabber/buddy.c:1353 msgid "Organization Unit" msgstr "Grupo de trabalho" -#: ../libpurple/protocols/jabber/buddy.c:287 -#: ../libpurple/protocols/jabber/buddy.c:976 +#: ../libpurple/protocols/jabber/buddy.c:299 +#: ../libpurple/protocols/jabber/buddy.c:1362 msgid "Role" msgstr "Função" -#: ../libpurple/protocols/jabber/buddy.c:288 -#: ../libpurple/protocols/jabber/buddy.c:859 -#: ../libpurple/protocols/msn/msn.c:1627 -#: ../libpurple/protocols/oscar/oscar.c:3717 +#: ../libpurple/protocols/jabber/buddy.c:300 +#: ../libpurple/protocols/jabber/buddy.c:1250 +#: ../libpurple/protocols/msn/msn.c:1658 +#: ../libpurple/protocols/oscar/oscar.c:3742 msgid "Birthday" msgstr "Data de nascimento" -#: ../libpurple/protocols/jabber/buddy.c:289 -#: ../libpurple/protocols/jabber/buddy.c:979 -#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093 +#: ../libpurple/protocols/jabber/buddy.c:301 +#: ../libpurple/protocols/jabber/buddy.c:1365 +#: ../libpurple/protocols/jabber/chat.c:775 +#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3113 #: ../pidgin/gtkprefs.c:738 msgid "Description" msgstr "Descrição" -#: ../libpurple/protocols/jabber/buddy.c:582 -#: ../libpurple/protocols/jabber/buddy.c:583 +#: ../libpurple/protocols/jabber/buddy.c:722 +#: ../libpurple/protocols/jabber/buddy.c:723 msgid "Edit XMPP vCard" msgstr "Editar vCard do XMPP" -#: ../libpurple/protocols/jabber/buddy.c:584 +#: ../libpurple/protocols/jabber/buddy.c:724 msgid "" "All items below are optional. Enter only the information with which you feel " "comfortable." @@ -4499,116 +4875,385 @@ "Todos os itens a seguir são opcionais. Preencha apenas as informações que " "quiser." -#: ../libpurple/protocols/jabber/buddy.c:655 -#: ../libpurple/protocols/jabber/buddy.c:696 +#: ../libpurple/protocols/jabber/buddy.c:795 +#: ../libpurple/protocols/jabber/buddy.c:960 msgid "Client" msgstr "Cliente" -#: ../libpurple/protocols/jabber/buddy.c:659 -#: ../libpurple/protocols/jabber/buddy.c:700 +#: ../libpurple/protocols/jabber/buddy.c:799 +#: ../libpurple/protocols/jabber/buddy.c:964 msgid "Operating System" msgstr "Sistema operacional" -#: ../libpurple/protocols/jabber/buddy.c:669 -#: ../libpurple/protocols/jabber/libxmpp.c:202 -#: ../libpurple/protocols/jabber/si.c:853 +#: ../libpurple/protocols/jabber/buddy.c:815 +#: ../libpurple/protocols/jabber/buddy.c:975 +msgid "Last Activity" +msgstr "Última atividade" + +#: ../libpurple/protocols/jabber/buddy.c:817 +#: ../libpurple/protocols/jabber/buddy.c:977 +msgid "Service Discovery Info" +msgstr "Informações da localização de serviços" + +#: ../libpurple/protocols/jabber/buddy.c:819 +#: ../libpurple/protocols/jabber/buddy.c:979 +msgid "Service Discovery Items" +msgstr "Itens da localização de serviços" + +#: ../libpurple/protocols/jabber/buddy.c:821 +#: ../libpurple/protocols/jabber/buddy.c:981 +msgid "Extended Stanza Addressing" +msgstr "Endereçamento de Stanza estendido" + +#: ../libpurple/protocols/jabber/buddy.c:823 +#: ../libpurple/protocols/jabber/buddy.c:983 +msgid "Multi-User Chat" +msgstr "Bate-papo multiusuário" + +#: ../libpurple/protocols/jabber/buddy.c:825 +#: ../libpurple/protocols/jabber/buddy.c:985 +msgid "Multi-User Chat Extended Presence Information" +msgstr "Informações estendidas de presença em bate-papos multiusuário" + +#: ../libpurple/protocols/jabber/buddy.c:827 +#: ../libpurple/protocols/jabber/buddy.c:987 +msgid "In-Band Bytestreams" +msgstr "Bytestreams In-Band" + +#: ../libpurple/protocols/jabber/buddy.c:829 +#: ../libpurple/protocols/jabber/buddy.c:989 +msgid "Ad-Hoc Commands" +msgstr "Comandos ad-hoc" + +#: ../libpurple/protocols/jabber/buddy.c:831 +#: ../libpurple/protocols/jabber/buddy.c:991 +msgid "PubSub Service" +msgstr "Serviço PubSub" + +#: ../libpurple/protocols/jabber/buddy.c:833 +#: ../libpurple/protocols/jabber/buddy.c:993 +msgid "SOCKS5 Bytestreams" +msgstr "Bytestreams via SOCKS5" + +#: ../libpurple/protocols/jabber/buddy.c:835 +#: ../libpurple/protocols/jabber/buddy.c:995 +msgid "Out of Band Data" +msgstr "Suporte a dados 'out of band'" + +#: ../libpurple/protocols/jabber/buddy.c:837 +#: ../libpurple/protocols/jabber/buddy.c:997 +msgid "XHTML-IM" +msgstr "XHTML-IM" + +#: ../libpurple/protocols/jabber/buddy.c:839 +#: ../libpurple/protocols/jabber/buddy.c:999 +msgid "In-Band Registration" +msgstr "Registro 'In-Band'" + +#: ../libpurple/protocols/jabber/buddy.c:841 +#: ../libpurple/protocols/jabber/buddy.c:1001 +msgid "User Location" +msgstr "Localização do usuário" + +#: ../libpurple/protocols/jabber/buddy.c:843 +#: ../libpurple/protocols/jabber/buddy.c:1003 +msgid "User Avatar" +msgstr "Imagem de exibição do usuário" + +#: ../libpurple/protocols/jabber/buddy.c:845 +#: ../libpurple/protocols/jabber/buddy.c:1005 +msgid "Chat State Notifications" +msgstr "Notificações do status do bate-papo" + +#: ../libpurple/protocols/jabber/buddy.c:847 +#: ../libpurple/protocols/jabber/buddy.c:1007 +msgid "Software Version" +msgstr "Versão do software" + +#: ../libpurple/protocols/jabber/buddy.c:849 +#: ../libpurple/protocols/jabber/buddy.c:1009 +msgid "Stream Initiation" +msgstr "Inicialização de fluxoOrientação" + +#: ../libpurple/protocols/jabber/buddy.c:851 +#: ../libpurple/protocols/jabber/buddy.c:1011 +#: ../libpurple/protocols/sametime/sametime.c:3235 +msgid "File Transfer" +msgstr "Transferência de arquivo" + +#: ../libpurple/protocols/jabber/buddy.c:853 +#: ../libpurple/protocols/jabber/buddy.c:1013 +msgid "User Mood" +msgstr "Humor do usuário" + +#: ../libpurple/protocols/jabber/buddy.c:855 +#: ../libpurple/protocols/jabber/buddy.c:1015 +msgid "User Activity" +msgstr "Atividade do usuário" + +#: ../libpurple/protocols/jabber/buddy.c:857 +#: ../libpurple/protocols/jabber/buddy.c:1017 +msgid "Entity Capabilities" +msgstr "Recursos do usuário" + +#: ../libpurple/protocols/jabber/buddy.c:859 +#: ../libpurple/protocols/jabber/buddy.c:1019 +msgid "Encrypted Session Negotiations" +msgstr "Negociação de sessão criptografada" + +#: ../libpurple/protocols/jabber/buddy.c:861 +#: ../libpurple/protocols/jabber/buddy.c:1021 +msgid "User Tune" +msgstr "Música do usuário" + +#: ../libpurple/protocols/jabber/buddy.c:863 +#: ../libpurple/protocols/jabber/buddy.c:1023 +msgid "Roster Item Exchange" +msgstr "Troca de itens da lista de amigos" + +#: ../libpurple/protocols/jabber/buddy.c:865 +#: ../libpurple/protocols/jabber/buddy.c:1025 +msgid "Reachability Address" +msgstr "Endereço de contato" + +#: ../libpurple/protocols/jabber/buddy.c:867 +#: ../libpurple/protocols/jabber/buddy.c:1027 +msgid "User Profile" +msgstr "Perfil do usuário" + +#: ../libpurple/protocols/jabber/buddy.c:869 +#: ../libpurple/protocols/jabber/buddy.c:1029 +msgid "Jingle" +msgstr "Jingle" + +#: ../libpurple/protocols/jabber/buddy.c:871 +#: ../libpurple/protocols/jabber/buddy.c:1031 +msgid "Jingle Audio" +msgstr "Áudio do Jingle" + +#: ../libpurple/protocols/jabber/buddy.c:873 +#: ../libpurple/protocols/jabber/buddy.c:1033 +msgid "User Nickname" +msgstr "Apelido do usuário" + +#: ../libpurple/protocols/jabber/buddy.c:875 +#: ../libpurple/protocols/jabber/buddy.c:1035 +msgid "Jingle ICE UDP" +msgstr "ECI UDP do Jingle" + +#: ../libpurple/protocols/jabber/buddy.c:877 +#: ../libpurple/protocols/jabber/buddy.c:1037 +msgid "Jingle ICE TCP" +msgstr "ECI TCP do Jingle" + +#: ../libpurple/protocols/jabber/buddy.c:879 +#: ../libpurple/protocols/jabber/buddy.c:1039 +msgid "Jingle Raw UDP" +msgstr "UDP puro do Jingle" + +#: ../libpurple/protocols/jabber/buddy.c:881 +#: ../libpurple/protocols/jabber/buddy.c:1041 +msgid "Jingle Video" +msgstr "Vídeo do Jingle" + +#: ../libpurple/protocols/jabber/buddy.c:883 +#: ../libpurple/protocols/jabber/buddy.c:1043 +msgid "Jingle DTMF" +msgstr "Discagem a tom do Jingle" + +#: ../libpurple/protocols/jabber/buddy.c:885 +#: ../libpurple/protocols/jabber/buddy.c:1045 +msgid "Message Receipts" +msgstr "Recibos de mensagem" + +#: ../libpurple/protocols/jabber/buddy.c:887 +#: ../libpurple/protocols/jabber/buddy.c:1047 +msgid "Public Key Publishing" +msgstr "Publicação de chave pública" + +#: ../libpurple/protocols/jabber/buddy.c:889 +#: ../libpurple/protocols/jabber/buddy.c:1049 +msgid "User Chatting" +msgstr "Notificação de bate-papos" + +#: ../libpurple/protocols/jabber/buddy.c:891 +#: ../libpurple/protocols/jabber/buddy.c:1051 +msgid "User Browsing" +msgstr "Notificação de onde está navegando" + +#: ../libpurple/protocols/jabber/buddy.c:893 +#: ../libpurple/protocols/jabber/buddy.c:1053 +msgid "User Gaming" +msgstr "Notificação do que está jogando" + +#: ../libpurple/protocols/jabber/buddy.c:895 +#: ../libpurple/protocols/jabber/buddy.c:1055 +msgid "User Viewing" +msgstr "Notificação do que está assistindo" + +#: ../libpurple/protocols/jabber/buddy.c:897 +#: ../libpurple/protocols/jabber/buddy.c:1057 +#: ../libpurple/protocols/silc/ops.c:1596 +#: ../libpurple/protocols/silc/ops.c:1601 +#: ../libpurple/protocols/silc10/ops.c:1612 +#: ../libpurple/protocols/silc10/ops.c:1617 +msgid "Ping" +msgstr "Ping" + +#: ../libpurple/protocols/jabber/buddy.c:899 +#: ../libpurple/protocols/jabber/buddy.c:1059 +msgid "Stanza Encryption" +msgstr "Criptografia de Stanza" + +#: ../libpurple/protocols/jabber/buddy.c:901 +#: ../libpurple/protocols/jabber/buddy.c:1061 +msgid "Entity Time" +msgstr "Informações de horário" + +#: ../libpurple/protocols/jabber/buddy.c:903 +#: ../libpurple/protocols/jabber/buddy.c:1063 +msgid "Delayed Delivery" +msgstr "Entrega atrasada" + +#: ../libpurple/protocols/jabber/buddy.c:905 +#: ../libpurple/protocols/jabber/buddy.c:1065 +msgid "Collaborative Data Objects" +msgstr "Objetos de dados colaborativos" + +#: ../libpurple/protocols/jabber/buddy.c:907 +#: ../libpurple/protocols/jabber/buddy.c:1067 +msgid "File Repository and Sharing" +msgstr "Compartilhamento e repositório de arquivos" + +#: ../libpurple/protocols/jabber/buddy.c:909 +#: ../libpurple/protocols/jabber/buddy.c:1069 +msgid "STUN Service Discovery for Jingle" +msgstr "Serviço de descoberta STUN para o Jingle" + +#: ../libpurple/protocols/jabber/buddy.c:911 +#: ../libpurple/protocols/jabber/buddy.c:1071 +msgid "Simplified Encrypted Session Negotiation" +msgstr "Negociação de sessão criptografada simplificada" + +#: ../libpurple/protocols/jabber/buddy.c:913 +#: ../libpurple/protocols/jabber/buddy.c:1073 +msgid "Hop Check" +msgstr "Verificação de saltos" + +#: ../libpurple/protocols/jabber/buddy.c:921 +#: ../libpurple/protocols/jabber/buddy.c:1081 +#: ../libpurple/protocols/oscar/oscar.c:2899 +msgid "Capabilities" +msgstr "Recursos" + +#: ../libpurple/protocols/jabber/buddy.c:933 +#: ../libpurple/protocols/jabber/libxmpp.c:206 +#: ../libpurple/protocols/jabber/si.c:859 msgid "Resource" msgstr "Recurso" -#: ../libpurple/protocols/jabber/buddy.c:671 -#: ../libpurple/protocols/jabber/jabber.c:1243 -#: ../libpurple/protocols/jabber/jabber.c:1253 -#: ../libpurple/protocols/jabber/jabber.c:1263 -#: ../libpurple/protocols/jabber/jabber.c:1273 -#: ../libpurple/protocols/jabber/jabber.c:1283 +#: ../libpurple/protocols/jabber/buddy.c:935 +#: ../libpurple/protocols/jabber/jabber.c:1530 +#: ../libpurple/protocols/jabber/jabber.c:1553 +#: ../libpurple/protocols/jabber/jabber.c:1576 +#: ../libpurple/protocols/jabber/jabber.c:1599 +#: ../libpurple/protocols/jabber/jabber.c:1622 msgid "Priority" msgstr "Prioridade" -#: ../libpurple/protocols/jabber/buddy.c:846 +#: ../libpurple/protocols/jabber/buddy.c:1237 #: ../libpurple/protocols/silc/ops.c:994 #: ../libpurple/protocols/silc10/ops.c:1028 msgid "Middle Name" msgstr "Nome do meio" -#: ../libpurple/protocols/jabber/buddy.c:879 -#: ../libpurple/protocols/jabber/jabber.c:838 -#: ../libpurple/protocols/oscar/oscar.c:3756 -#: ../libpurple/protocols/oscar/oscar.c:3769 +#: ../libpurple/protocols/jabber/buddy.c:1270 +#: ../libpurple/protocols/jabber/jabber.c:951 +#: ../libpurple/protocols/oscar/oscar.c:3781 +#: ../libpurple/protocols/oscar/oscar.c:3794 #: ../libpurple/protocols/qq/buddy_info.c:56 #: ../libpurple/protocols/silc/ops.c:1030 #: ../libpurple/protocols/silc10/ops.c:1064 msgid "Address" msgstr "Endereço" -#: ../libpurple/protocols/jabber/buddy.c:886 +#: ../libpurple/protocols/jabber/buddy.c:1276 msgid "P.O. Box" msgstr "Caixa postal" -#: ../libpurple/protocols/jabber/buddy.c:1000 +#: ../libpurple/protocols/jabber/buddy.c:1386 msgid "Photo" msgstr "Foto" -#: ../libpurple/protocols/jabber/buddy.c:1000 +#: ../libpurple/protocols/jabber/buddy.c:1386 msgid "Logo" msgstr "Logotipo" -#: ../libpurple/protocols/jabber/buddy.c:1409 +#: ../libpurple/protocols/jabber/buddy.c:1940 msgid "Un-hide From" msgstr "Não ocultar-se de" -#: ../libpurple/protocols/jabber/buddy.c:1413 +#: ../libpurple/protocols/jabber/buddy.c:1944 msgid "Temporarily Hide From" msgstr "Ocultar-se temporariamente de" #. && NOT ME -#: ../libpurple/protocols/jabber/buddy.c:1421 +#: ../libpurple/protocols/jabber/buddy.c:1952 msgid "Cancel Presence Notification" msgstr "Cancelar notificação de presença" -#: ../libpurple/protocols/jabber/buddy.c:1428 +#: ../libpurple/protocols/jabber/buddy.c:1959 msgid "(Re-)Request authorization" msgstr "(Re-)requisitar autorização" #. if(NOT ME) #. shouldn't this just happen automatically when the buddy is #. removed? -#: ../libpurple/protocols/jabber/buddy.c:1437 +#: ../libpurple/protocols/jabber/buddy.c:1968 msgid "Unsubscribe" msgstr "Parar de monitorar a presença" -#: ../libpurple/protocols/jabber/buddy.c:1470 -#: ../libpurple/protocols/jabber/jabber.c:1252 +#: ../libpurple/protocols/jabber/buddy.c:1983 +msgid "Log In" +msgstr "Conectar" + +#: ../libpurple/protocols/jabber/buddy.c:1987 +msgid "Log Out" +msgstr "Desconectar" + +#: ../libpurple/protocols/jabber/buddy.c:2033 +#: ../libpurple/protocols/jabber/jabber.c:1552 msgid "Chatty" msgstr "Disponível para bate-papo" -#: ../libpurple/protocols/jabber/buddy.c:1474 +#: ../libpurple/protocols/jabber/buddy.c:2037 msgid "Extended Away" msgstr "Ausente (estendido)" -#: ../libpurple/protocols/jabber/buddy.c:1476 -#: ../libpurple/protocols/jabber/jabber.c:1282 +#: ../libpurple/protocols/jabber/buddy.c:2039 +#: ../libpurple/protocols/jabber/jabber.c:1621 #: ../libpurple/protocols/oscar/oscar.c:726 -#: ../libpurple/protocols/oscar/oscar.c:5756 -#: ../libpurple/protocols/sametime/sametime.c:3298 +#: ../libpurple/protocols/oscar/oscar.c:5792 +#: ../libpurple/protocols/sametime/sametime.c:3297 msgid "Do Not Disturb" msgstr "Não perturbe" -#: ../libpurple/protocols/jabber/buddy.c:1621 +#: ../libpurple/protocols/jabber/buddy.c:2206 msgid "JID" msgstr "ID Jabber" -#: ../libpurple/protocols/jabber/buddy.c:1625 -#: ../libpurple/protocols/jabber/buddy.c:1804 -#: ../libpurple/protocols/oscar/oscar.c:3679 +#: ../libpurple/protocols/jabber/buddy.c:2210 +#: ../libpurple/protocols/jabber/buddy.c:2389 +#: ../libpurple/protocols/oscar/oscar.c:3704 msgid "Last Name" msgstr "Sobrenome" -#: ../libpurple/protocols/jabber/buddy.c:1657 +#: ../libpurple/protocols/jabber/buddy.c:2242 msgid "The following are the results of your search" msgstr "Os seguintes são os resultados da sua busca" #. current comment from Jabber User Directory users.jabber.org -#: ../libpurple/protocols/jabber/buddy.c:1732 +#: ../libpurple/protocols/jabber/buddy.c:2317 msgid "" "Find a contact by entering the search criteria in the given fields. Note: " "Each field supports wild card searches (%)" @@ -4616,71 +5261,71 @@ "Encontre um contato digitando critérios de busca nos campos abaixo. Nota: " "Todos os campos suportam caracteres coringa (%)" -#: ../libpurple/protocols/jabber/buddy.c:1752 +#: ../libpurple/protocols/jabber/buddy.c:2337 msgid "Directory Query Failed" msgstr "A consulta ao serviço de diretório falhou" -#: ../libpurple/protocols/jabber/buddy.c:1753 +#: ../libpurple/protocols/jabber/buddy.c:2338 msgid "Could not query the directory server." msgstr "Não foi possível consultar o servidor do serviço de diretório." #. Try to translate the message (see static message #. list in jabber_user_dir_comments[]) -#: ../libpurple/protocols/jabber/buddy.c:1787 +#: ../libpurple/protocols/jabber/buddy.c:2372 #, c-format msgid "Server Instructions: %s" msgstr "Instruções do servidor: %s" -#: ../libpurple/protocols/jabber/buddy.c:1794 +#: ../libpurple/protocols/jabber/buddy.c:2379 msgid "Fill in one or more fields to search for any matching XMPP users." msgstr "" "Preencha um ou mais campos para procurar um usuário XMPP que satisfaça este " "critério." -#: ../libpurple/protocols/jabber/buddy.c:1814 +#: ../libpurple/protocols/jabber/buddy.c:2399 #: ../libpurple/protocols/novell/novell.c:1488 -#: ../libpurple/protocols/oscar/oscar.c:3682 -#: ../libpurple/protocols/oscar/oscar.c:3691 +#: ../libpurple/protocols/oscar/oscar.c:3707 +#: ../libpurple/protocols/oscar/oscar.c:3716 msgid "E-Mail Address" msgstr "Endereço de e-mail" -#: ../libpurple/protocols/jabber/buddy.c:1823 -#: ../libpurple/protocols/jabber/buddy.c:1824 +#: ../libpurple/protocols/jabber/buddy.c:2408 +#: ../libpurple/protocols/jabber/buddy.c:2409 msgid "Search for XMPP users" msgstr "Procurar por usuários XMPP" #. "Search" -#: ../libpurple/protocols/jabber/buddy.c:1825 +#: ../libpurple/protocols/jabber/buddy.c:2410 #: ../libpurple/protocols/qq/group.c:123 #: ../libpurple/protocols/qq/group_im.c:147 #: ../libpurple/protocols/qq/sys_msg.c:174 #: ../libpurple/protocols/qq/sys_msg.c:250 #: ../libpurple/protocols/qq/sys_msg.c:268 -#: ../libpurple/protocols/sametime/sametime.c:5612 +#: ../libpurple/protocols/sametime/sametime.c:5611 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356 msgid "Search" msgstr "Procurar" -#: ../libpurple/protocols/jabber/buddy.c:1840 +#: ../libpurple/protocols/jabber/buddy.c:2425 msgid "Invalid Directory" msgstr "Diretório inválido" -#: ../libpurple/protocols/jabber/buddy.c:1857 +#: ../libpurple/protocols/jabber/buddy.c:2442 msgid "Enter a User Directory" msgstr "Digite um diretório de usuários" -#: ../libpurple/protocols/jabber/buddy.c:1858 +#: ../libpurple/protocols/jabber/buddy.c:2443 msgid "Select a user directory to search" msgstr "Selecione um diretório de usuários para procurar" -#: ../libpurple/protocols/jabber/buddy.c:1861 +#: ../libpurple/protocols/jabber/buddy.c:2446 msgid "Search Directory" msgstr "Diretório de busca" #: ../libpurple/protocols/jabber/chat.c:41 -#: ../libpurple/protocols/oscar/oscar.c:5242 -#: ../libpurple/protocols/yahoo/yahoochat.c:962 +#: ../libpurple/protocols/oscar/oscar.c:5278 +#: ../libpurple/protocols/yahoo/yahoochat.c:1048 msgid "_Room:" msgstr "Sa_la:" @@ -4770,25 +5415,29 @@ msgid "Find Rooms" msgstr "Encontrar salas" -#: ../libpurple/protocols/jabber/jabber.c:84 +#: ../libpurple/protocols/jabber/jabber.c:92 msgid "Error initializing session" msgstr "Erro ao inicializar sessão" -#: ../libpurple/protocols/jabber/jabber.c:247 -#: ../libpurple/protocols/jabber/jabber.c:300 -#: ../libpurple/protocols/jabber/jabber.c:328 +#: ../libpurple/protocols/jabber/jabber.c:144 +msgid "You require encryption, but it is not available on this server." +msgstr "Você requereu criptografia, mas este servidor não a suporta." + +#: ../libpurple/protocols/jabber/jabber.c:258 +#: ../libpurple/protocols/jabber/jabber.c:311 +#: ../libpurple/protocols/jabber/jabber.c:339 msgid "Write error" msgstr "Erro ao enviar" -#: ../libpurple/protocols/jabber/jabber.c:396 -#: ../libpurple/protocols/jabber/jabber.c:433 +#: ../libpurple/protocols/jabber/jabber.c:407 +#: ../libpurple/protocols/jabber/jabber.c:444 msgid "Read Error" msgstr "Erro de leitura" -#: ../libpurple/protocols/jabber/jabber.c:467 +#: ../libpurple/protocols/jabber/jabber.c:481 #: ../libpurple/protocols/oscar/flap_connection.c:394 -#: ../libpurple/protocols/yahoo/yahoo.c:2402 -#: ../libpurple/protocols/yahoo/yahoo.c:2434 +#: ../libpurple/protocols/yahoo/yahoo.c:2555 +#: ../libpurple/protocols/yahoo/yahoo.c:2587 #, c-format msgid "" "Could not establish a connection with the server:\n" @@ -4797,55 +5446,70 @@ "Não foi possível estabelecer conexão com o servidor:\n" "%s" -#: ../libpurple/protocols/jabber/jabber.c:523 +#: ../libpurple/protocols/jabber/jabber.c:528 msgid "Unable to create socket" msgstr "Não foi possível criar socket" -#: ../libpurple/protocols/jabber/jabber.c:568 -#: ../libpurple/protocols/jabber/jabber.c:918 +#: ../libpurple/protocols/jabber/jabber.c:574 +#: ../libpurple/protocols/jabber/jabber.c:1062 msgid "Invalid XMPP ID" msgstr "ID do XMPP inválido" -#: ../libpurple/protocols/jabber/jabber.c:573 +#: ../libpurple/protocols/jabber/jabber.c:579 msgid "Invalid XMPP ID. Domain must be set." msgstr "ID do XMPP inválido. O domínio precisa ser especificado." -#: ../libpurple/protocols/jabber/jabber.c:644 +#: ../libpurple/protocols/jabber/jabber.c:655 #, c-format msgid "Registration of %s@%s successful" msgstr "Registro de %s@%s foi efetuado com sucesso" -#: ../libpurple/protocols/jabber/jabber.c:646 -#: ../libpurple/protocols/jabber/jabber.c:647 +#: ../libpurple/protocols/jabber/jabber.c:661 +#, c-format +msgid "Registration to %s successful" +msgstr "Registro em %s efetuado com sucesso" + +#: ../libpurple/protocols/jabber/jabber.c:663 +#: ../libpurple/protocols/jabber/jabber.c:664 msgid "Registration Successful" msgstr "Registro efetuado com sucesso" -#: ../libpurple/protocols/jabber/jabber.c:653 -#: ../libpurple/protocols/jabber/jabber.c:1524 -msgid "Unknown Error" -msgstr "Erro desconhecido" - -#: ../libpurple/protocols/jabber/jabber.c:655 -#: ../libpurple/protocols/jabber/jabber.c:656 +#: ../libpurple/protocols/jabber/jabber.c:672 +#: ../libpurple/protocols/jabber/jabber.c:673 msgid "Registration Failed" msgstr "Registro falhou" -#: ../libpurple/protocols/jabber/jabber.c:771 -#: ../libpurple/protocols/jabber/jabber.c:772 +#: ../libpurple/protocols/jabber/jabber.c:691 +#, c-format +msgid "Registration from %s successfully removed" +msgstr "Remoção do registro de %s efetuada com sucesso" + +#: ../libpurple/protocols/jabber/jabber.c:693 +#: ../libpurple/protocols/jabber/jabber.c:694 +msgid "Unregistration Successful" +msgstr "Desregistro efetuado com sucesso" + +#: ../libpurple/protocols/jabber/jabber.c:702 +#: ../libpurple/protocols/jabber/jabber.c:703 +msgid "Unregistration Failed" +msgstr "Desregistro falhou" + +#: ../libpurple/protocols/jabber/jabber.c:863 +#: ../libpurple/protocols/jabber/jabber.c:864 msgid "Already Registered" msgstr "Já está registrado" -#: ../libpurple/protocols/jabber/jabber.c:848 -#: ../libpurple/protocols/oscar/oscar.c:3758 -#: ../libpurple/protocols/oscar/oscar.c:3771 +#: ../libpurple/protocols/jabber/jabber.c:961 +#: ../libpurple/protocols/oscar/oscar.c:3783 +#: ../libpurple/protocols/oscar/oscar.c:3796 msgid "State" msgstr "Estado" -#: ../libpurple/protocols/jabber/jabber.c:853 +#: ../libpurple/protocols/jabber/jabber.c:966 msgid "Postal code" msgstr "Código postal (CEP)" -#: ../libpurple/protocols/jabber/jabber.c:858 +#: ../libpurple/protocols/jabber/jabber.c:971 #: ../libpurple/protocols/silc/ops.c:1035 #: ../libpurple/protocols/silc/silc.c:772 #: ../libpurple/protocols/silc/util.c:557 @@ -4855,377 +5519,543 @@ msgid "Phone" msgstr "Telefone" -#: ../libpurple/protocols/jabber/jabber.c:868 +#: ../libpurple/protocols/jabber/jabber.c:981 msgid "Date" msgstr "Data" -#: ../libpurple/protocols/jabber/jabber.c:876 +#: ../libpurple/protocols/jabber/jabber.c:986 +msgid "Unregister" +msgstr "Desregistrar" + +#: ../libpurple/protocols/jabber/jabber.c:993 +msgid "" +"Please fill out the information below to change your account registration." +msgstr "" +"Por favor preencha as informações abaixo para mudar seu registro de conta." + +#: ../libpurple/protocols/jabber/jabber.c:996 msgid "Please fill out the information below to register your new account." msgstr "" "Por favor preencha as informações abaixo para registrar sua nova conta." -#: ../libpurple/protocols/jabber/jabber.c:879 -#: ../libpurple/protocols/jabber/jabber.c:880 +#: ../libpurple/protocols/jabber/jabber.c:1004 +#: ../libpurple/protocols/jabber/jabber.c:1005 msgid "Register New XMPP Account" msgstr "Registrar nova conta do XMPP" -#. Register button -#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1523 +#: ../libpurple/protocols/jabber/jabber.c:1006 +#: ../libpurple/protocols/jabber/jabber.c:1015 msgid "Register" msgstr "Registrar" -#: ../libpurple/protocols/jabber/jabber.c:1050 +#: ../libpurple/protocols/jabber/jabber.c:1011 +#, c-format +msgid "Change Account Registration at %s" +msgstr "Modificar registro de conta em %s" + +#: ../libpurple/protocols/jabber/jabber.c:1012 +#, c-format +msgid "Register New Account at %s" +msgstr "Registrar nova conta em %s" + +#: ../libpurple/protocols/jabber/jabber.c:1015 +msgid "Change Registration" +msgstr "Mudar registro" + +#: ../libpurple/protocols/jabber/jabber.c:1119 +#: ../libpurple/protocols/jabber/jabber.c:1120 +msgid "Error unregistering account" +msgstr "Erro ao desregistrar conta" + +#: ../libpurple/protocols/jabber/jabber.c:1125 +#: ../libpurple/protocols/jabber/jabber.c:1126 +msgid "Account successfully unregistered" +msgstr "Conta desregistrada com sucesso" + +#: ../libpurple/protocols/jabber/jabber.c:1283 msgid "Initializing Stream" msgstr "Inicializando fluxo" -#: ../libpurple/protocols/jabber/jabber.c:1055 +#: ../libpurple/protocols/jabber/jabber.c:1288 +msgid "Initializing SSL/TLS" +msgstr "Inicializando SSL/TLS" + +#: ../libpurple/protocols/jabber/jabber.c:1292 #: ../libpurple/protocols/msn/session.c:351 msgid "Authenticating" msgstr "Autenticando" -#: ../libpurple/protocols/jabber/jabber.c:1064 +#: ../libpurple/protocols/jabber/jabber.c:1301 msgid "Re-initializing Stream" msgstr "Reinicializando fluxo" -#: ../libpurple/protocols/jabber/jabber.c:1126 -#: ../libpurple/protocols/jabber/jabber.c:1502 -#: ../libpurple/protocols/jabber/jabber.c:1543 -#: ../libpurple/protocols/jabber/jabber.c:1579 +#: ../libpurple/protocols/jabber/jabber.c:1395 +#: ../libpurple/protocols/jabber/jabber.c:1864 +#: ../libpurple/protocols/jabber/jabber.c:1908 +#: ../libpurple/protocols/jabber/jabber.c:1944 #: ../libpurple/protocols/oscar/oscar.c:825 -#: ../libpurple/protocols/oscar/oscar.c:5550 +#: ../libpurple/protocols/oscar/oscar.c:5586 msgid "Not Authorized" msgstr "Não autorizado" -#: ../libpurple/protocols/jabber/jabber.c:1168 +#: ../libpurple/protocols/jabber/jabber.c:1441 msgid "Both" msgstr "Ambas" -#: ../libpurple/protocols/jabber/jabber.c:1170 +#: ../libpurple/protocols/jabber/jabber.c:1443 msgid "From (To pending)" msgstr "De (Para pendente)" -#: ../libpurple/protocols/jabber/jabber.c:1172 +#: ../libpurple/protocols/jabber/jabber.c:1445 msgid "From" msgstr "De" -#: ../libpurple/protocols/jabber/jabber.c:1175 +#: ../libpurple/protocols/jabber/jabber.c:1448 msgid "To" msgstr "Para" -#: ../libpurple/protocols/jabber/jabber.c:1177 +#: ../libpurple/protocols/jabber/jabber.c:1450 msgid "None (To pending)" msgstr "Nenhuma (Para pendente)" -#: ../libpurple/protocols/jabber/jabber.c:1179 +#: ../libpurple/protocols/jabber/jabber.c:1452 #: ../pidgin/plugins/gevolution/eds-utils.c:73 #: ../pidgin/plugins/gevolution/eds-utils.c:86 msgid "None" msgstr "Nenhuma" -#: ../libpurple/protocols/jabber/jabber.c:1182 +#: ../libpurple/protocols/jabber/jabber.c:1455 msgid "Subscription" msgstr "Inscrição" -#: ../libpurple/protocols/jabber/jabber.c:1312 +#: ../libpurple/protocols/jabber/jabber.c:1465 +#: ../libpurple/protocols/jabber/jabber.c:1468 +#: ../libpurple/protocols/jabber/jabber.c:1532 +#: ../libpurple/protocols/jabber/jabber.c:1555 +#: ../libpurple/protocols/jabber/jabber.c:1578 +#: ../libpurple/protocols/jabber/jabber.c:1601 +#: ../libpurple/protocols/jabber/jabber.c:1624 +#: ../libpurple/protocols/jabber/usermood.c:166 +#: ../libpurple/protocols/silc/buddy.c:1557 +#: ../libpurple/protocols/silc/ops.c:1212 +#: ../libpurple/protocols/silc10/buddy.c:1557 +#: ../libpurple/protocols/silc10/ops.c:1207 +msgid "Mood" +msgstr "Humor" + +#: ../libpurple/protocols/jabber/jabber.c:1533 +#: ../libpurple/protocols/jabber/jabber.c:1556 +#: ../libpurple/protocols/jabber/jabber.c:1579 +#: ../libpurple/protocols/jabber/jabber.c:1602 +#: ../libpurple/protocols/jabber/jabber.c:1625 +msgid "Mood Text" +msgstr "Humor (texto)" + +#: ../libpurple/protocols/jabber/jabber.c:1534 +#: ../libpurple/protocols/jabber/jabber.c:1557 +#: ../libpurple/protocols/jabber/jabber.c:1580 +#: ../libpurple/protocols/jabber/jabber.c:1603 +#: ../libpurple/protocols/jabber/jabber.c:1626 +msgid "Tune Artist" +msgstr "Artista da música" + +#: ../libpurple/protocols/jabber/jabber.c:1535 +#: ../libpurple/protocols/jabber/jabber.c:1558 +#: ../libpurple/protocols/jabber/jabber.c:1581 +#: ../libpurple/protocols/jabber/jabber.c:1604 +#: ../libpurple/protocols/jabber/jabber.c:1627 +msgid "Tune Title" +msgstr "Título da música" + +#: ../libpurple/protocols/jabber/jabber.c:1536 +#: ../libpurple/protocols/jabber/jabber.c:1559 +#: ../libpurple/protocols/jabber/jabber.c:1582 +#: ../libpurple/protocols/jabber/jabber.c:1605 +#: ../libpurple/protocols/jabber/jabber.c:1628 +msgid "Tune Album" +msgstr "Álbum da música" + +#: ../libpurple/protocols/jabber/jabber.c:1537 +#: ../libpurple/protocols/jabber/jabber.c:1560 +#: ../libpurple/protocols/jabber/jabber.c:1583 +#: ../libpurple/protocols/jabber/jabber.c:1606 +#: ../libpurple/protocols/jabber/jabber.c:1629 +msgid "Tune Genre" +msgstr "Gênero da música" + +#: ../libpurple/protocols/jabber/jabber.c:1538 +#: ../libpurple/protocols/jabber/jabber.c:1561 +#: ../libpurple/protocols/jabber/jabber.c:1584 +#: ../libpurple/protocols/jabber/jabber.c:1607 +#: ../libpurple/protocols/jabber/jabber.c:1630 +msgid "Tune Comment" +msgstr "Comentário da música" + +#: ../libpurple/protocols/jabber/jabber.c:1539 +#: ../libpurple/protocols/jabber/jabber.c:1562 +#: ../libpurple/protocols/jabber/jabber.c:1585 +#: ../libpurple/protocols/jabber/jabber.c:1608 +#: ../libpurple/protocols/jabber/jabber.c:1631 +msgid "Tune Track" +msgstr "Faixa da música" + +#: ../libpurple/protocols/jabber/jabber.c:1540 +#: ../libpurple/protocols/jabber/jabber.c:1563 +#: ../libpurple/protocols/jabber/jabber.c:1586 +#: ../libpurple/protocols/jabber/jabber.c:1609 +#: ../libpurple/protocols/jabber/jabber.c:1632 +msgid "Tune Time" +msgstr "Duração da música" + +#: ../libpurple/protocols/jabber/jabber.c:1541 +#: ../libpurple/protocols/jabber/jabber.c:1564 +#: ../libpurple/protocols/jabber/jabber.c:1587 +#: ../libpurple/protocols/jabber/jabber.c:1610 +#: ../libpurple/protocols/jabber/jabber.c:1633 +msgid "Tune Year" +msgstr "Ano da música" + +#: ../libpurple/protocols/jabber/jabber.c:1542 +#: ../libpurple/protocols/jabber/jabber.c:1565 +#: ../libpurple/protocols/jabber/jabber.c:1588 +#: ../libpurple/protocols/jabber/jabber.c:1611 +#: ../libpurple/protocols/jabber/jabber.c:1634 +msgid "Tune URL" +msgstr "URL da música" + +#: ../libpurple/protocols/jabber/jabber.c:1544 +#: ../libpurple/protocols/jabber/jabber.c:1567 +#: ../libpurple/protocols/jabber/jabber.c:1590 +#: ../libpurple/protocols/jabber/jabber.c:1613 +#: ../libpurple/protocols/jabber/jabber.c:1636 +msgid "Allow Buzz" +msgstr "Permitir que chamem sua atenção" + +#: ../libpurple/protocols/jabber/jabber.c:1664 msgid "Password Changed" msgstr "Senha alterada" -#: ../libpurple/protocols/jabber/jabber.c:1313 +#: ../libpurple/protocols/jabber/jabber.c:1665 msgid "Your password has been changed." msgstr "Sua senha foi alterada." -#: ../libpurple/protocols/jabber/jabber.c:1317 -#: ../libpurple/protocols/jabber/jabber.c:1318 +#: ../libpurple/protocols/jabber/jabber.c:1669 +#: ../libpurple/protocols/jabber/jabber.c:1670 msgid "Error changing password" msgstr "Erro ao mudar a senha" -#: ../libpurple/protocols/jabber/jabber.c:1375 +#: ../libpurple/protocols/jabber/jabber.c:1727 msgid "Password (again)" msgstr "Senha (novamente)" -#: ../libpurple/protocols/jabber/jabber.c:1381 -#: ../libpurple/protocols/jabber/jabber.c:1382 +#: ../libpurple/protocols/jabber/jabber.c:1733 +#: ../libpurple/protocols/jabber/jabber.c:1734 msgid "Change XMPP Password" msgstr "Alterar senha do XMPP" -#: ../libpurple/protocols/jabber/jabber.c:1382 +#: ../libpurple/protocols/jabber/jabber.c:1734 msgid "Please enter your new password" msgstr "Favor digitar sua nova senha" -#: ../libpurple/protocols/jabber/jabber.c:1394 -#: ../libpurple/protocols/oscar/oscar.c:6336 +#: ../libpurple/protocols/jabber/jabber.c:1748 +#: ../libpurple/protocols/oscar/oscar.c:6372 #: ../libpurple/protocols/silc/silc.c:1093 #: ../libpurple/protocols/silc10/silc.c:1004 msgid "Set User Info..." msgstr "Definir informações de usuário..." #. if (js->protocol_options & CHANGE_PASSWORD) { -#: ../libpurple/protocols/jabber/jabber.c:1399 -#: ../libpurple/protocols/oscar/oscar.c:6347 +#: ../libpurple/protocols/jabber/jabber.c:1753 +#: ../libpurple/protocols/oscar/oscar.c:6383 #: ../libpurple/protocols/silc/silc.c:1089 #: ../libpurple/protocols/silc10/silc.c:1000 msgid "Change Password..." msgstr "Alterar senha..." #. } -#: ../libpurple/protocols/jabber/jabber.c:1404 +#: ../libpurple/protocols/jabber/jabber.c:1758 msgid "Search for Users..." msgstr "Procurar por usuários..." -#: ../libpurple/protocols/jabber/jabber.c:1482 +#: ../libpurple/protocols/jabber/jabber.c:1844 msgid "Bad Request" msgstr "Requisição inválida" -#: ../libpurple/protocols/jabber/jabber.c:1484 +#: ../libpurple/protocols/jabber/jabber.c:1846 msgid "Conflict" msgstr "Conflito" -#: ../libpurple/protocols/jabber/jabber.c:1486 +#: ../libpurple/protocols/jabber/jabber.c:1848 msgid "Feature Not Implemented" msgstr "Recurso não implementado" -#: ../libpurple/protocols/jabber/jabber.c:1488 +#: ../libpurple/protocols/jabber/jabber.c:1850 msgid "Forbidden" msgstr "Proibido" -#: ../libpurple/protocols/jabber/jabber.c:1490 +#: ../libpurple/protocols/jabber/jabber.c:1852 msgid "Gone" msgstr "Saiu" -#: ../libpurple/protocols/jabber/jabber.c:1492 -#: ../libpurple/protocols/jabber/jabber.c:1569 +#: ../libpurple/protocols/jabber/jabber.c:1854 +#: ../libpurple/protocols/jabber/jabber.c:1934 msgid "Internal Server Error" msgstr "Erro interno do servidor" -#: ../libpurple/protocols/jabber/jabber.c:1494 +#: ../libpurple/protocols/jabber/jabber.c:1856 msgid "Item Not Found" msgstr "Item não encontrado" -#: ../libpurple/protocols/jabber/jabber.c:1496 +#: ../libpurple/protocols/jabber/jabber.c:1858 msgid "Malformed XMPP ID" msgstr "ID do XMPP em formato inválido" -#: ../libpurple/protocols/jabber/jabber.c:1498 +#: ../libpurple/protocols/jabber/jabber.c:1860 msgid "Not Acceptable" msgstr "Não aceitável" -#: ../libpurple/protocols/jabber/jabber.c:1500 +#: ../libpurple/protocols/jabber/jabber.c:1862 msgid "Not Allowed" msgstr "Não permitido" -#: ../libpurple/protocols/jabber/jabber.c:1504 +#: ../libpurple/protocols/jabber/jabber.c:1866 msgid "Payment Required" msgstr "Pagamento requerido" -#: ../libpurple/protocols/jabber/jabber.c:1506 +#: ../libpurple/protocols/jabber/jabber.c:1868 msgid "Recipient Unavailable" msgstr "Destinatário indisponível" -#: ../libpurple/protocols/jabber/jabber.c:1510 +#: ../libpurple/protocols/jabber/jabber.c:1872 msgid "Registration Required" msgstr "Registro requerido" -#: ../libpurple/protocols/jabber/jabber.c:1512 +#: ../libpurple/protocols/jabber/jabber.c:1874 msgid "Remote Server Not Found" msgstr "Servidor remoto não encontrado" -#: ../libpurple/protocols/jabber/jabber.c:1514 +#: ../libpurple/protocols/jabber/jabber.c:1876 msgid "Remote Server Timeout" msgstr "Tempo limite esgotado ao conectar ao servidor remoto" -#: ../libpurple/protocols/jabber/jabber.c:1516 +#: ../libpurple/protocols/jabber/jabber.c:1878 msgid "Server Overloaded" msgstr "Servidor sobrecarregado" -#: ../libpurple/protocols/jabber/jabber.c:1518 +#: ../libpurple/protocols/jabber/jabber.c:1880 msgid "Service Unavailable" msgstr "Serviço indisponível" -#: ../libpurple/protocols/jabber/jabber.c:1520 +#: ../libpurple/protocols/jabber/jabber.c:1882 msgid "Subscription Required" msgstr "Inscrição requerida" -#: ../libpurple/protocols/jabber/jabber.c:1522 +#: ../libpurple/protocols/jabber/jabber.c:1884 msgid "Unexpected Request" msgstr "Requisição inesperada" -#: ../libpurple/protocols/jabber/jabber.c:1529 +#: ../libpurple/protocols/jabber/jabber.c:1891 msgid "Authorization Aborted" msgstr "Autorização abortada" -#: ../libpurple/protocols/jabber/jabber.c:1531 +#: ../libpurple/protocols/jabber/jabber.c:1893 msgid "Incorrect encoding in authorization" msgstr "Codificação da autorização incorreta" -#: ../libpurple/protocols/jabber/jabber.c:1534 +#: ../libpurple/protocols/jabber/jabber.c:1896 msgid "Invalid authzid" msgstr "Authzid inválido" -#: ../libpurple/protocols/jabber/jabber.c:1537 +#: ../libpurple/protocols/jabber/jabber.c:1899 msgid "Invalid Authorization Mechanism" msgstr "Mecanismo de autorização inválido" -#: ../libpurple/protocols/jabber/jabber.c:1540 +#: ../libpurple/protocols/jabber/jabber.c:1902 msgid "Authorization mechanism too weak" msgstr "Mecanismo de autenticação fraco demais" -#: ../libpurple/protocols/jabber/jabber.c:1545 +#: ../libpurple/protocols/jabber/jabber.c:1910 msgid "Temporary Authentication Failure" msgstr "Falha temporária na autenticação" -#: ../libpurple/protocols/jabber/jabber.c:1548 +#: ../libpurple/protocols/jabber/jabber.c:1913 msgid "Authentication Failure" msgstr "Falha na autenticação" -#: ../libpurple/protocols/jabber/jabber.c:1554 +#: ../libpurple/protocols/jabber/jabber.c:1919 msgid "Bad Format" msgstr "Formato inválido" -#: ../libpurple/protocols/jabber/jabber.c:1556 +#: ../libpurple/protocols/jabber/jabber.c:1921 msgid "Bad Namespace Prefix" msgstr "Prefixo de namespace inválido" -#: ../libpurple/protocols/jabber/jabber.c:1559 +#: ../libpurple/protocols/jabber/jabber.c:1924 msgid "Resource Conflict" msgstr "Conflito de recursos" -#: ../libpurple/protocols/jabber/jabber.c:1561 +#: ../libpurple/protocols/jabber/jabber.c:1926 #: ../libpurple/protocols/silc/silc.c:244 #: ../libpurple/protocols/silc10/ops.c:1720 msgid "Connection Timeout" msgstr "Tempo limite de conexão esgotado" -#: ../libpurple/protocols/jabber/jabber.c:1563 +#: ../libpurple/protocols/jabber/jabber.c:1928 msgid "Host Gone" msgstr "Host fora do ar" -#: ../libpurple/protocols/jabber/jabber.c:1565 +#: ../libpurple/protocols/jabber/jabber.c:1930 msgid "Host Unknown" msgstr "Host desconhecido" -#: ../libpurple/protocols/jabber/jabber.c:1567 +#: ../libpurple/protocols/jabber/jabber.c:1932 msgid "Improper Addressing" msgstr "Endereçamento impróprio" -#: ../libpurple/protocols/jabber/jabber.c:1571 +#: ../libpurple/protocols/jabber/jabber.c:1936 msgid "Invalid ID" msgstr "ID inválido" -#: ../libpurple/protocols/jabber/jabber.c:1573 +#: ../libpurple/protocols/jabber/jabber.c:1938 msgid "Invalid Namespace" msgstr "Namespace inválido" -#: ../libpurple/protocols/jabber/jabber.c:1575 +#: ../libpurple/protocols/jabber/jabber.c:1940 msgid "Invalid XML" msgstr "XML inválido" -#: ../libpurple/protocols/jabber/jabber.c:1577 +#: ../libpurple/protocols/jabber/jabber.c:1942 msgid "Non-matching Hosts" msgstr "Hosts não compatíveis" -#: ../libpurple/protocols/jabber/jabber.c:1581 +#: ../libpurple/protocols/jabber/jabber.c:1946 msgid "Policy Violation" msgstr "Violação de normas" -#: ../libpurple/protocols/jabber/jabber.c:1583 +#: ../libpurple/protocols/jabber/jabber.c:1948 msgid "Remote Connection Failed" msgstr "Falha na conexão remota" -#: ../libpurple/protocols/jabber/jabber.c:1585 +#: ../libpurple/protocols/jabber/jabber.c:1950 msgid "Resource Constraint" msgstr "Limitação de recursos" -#: ../libpurple/protocols/jabber/jabber.c:1587 +#: ../libpurple/protocols/jabber/jabber.c:1952 msgid "Restricted XML" msgstr "XML restrito" -#: ../libpurple/protocols/jabber/jabber.c:1589 +#: ../libpurple/protocols/jabber/jabber.c:1954 msgid "See Other Host" msgstr "Ver outro host" -#: ../libpurple/protocols/jabber/jabber.c:1591 +#: ../libpurple/protocols/jabber/jabber.c:1956 msgid "System Shutdown" msgstr "Desligamento do sistema" -#: ../libpurple/protocols/jabber/jabber.c:1593 +#: ../libpurple/protocols/jabber/jabber.c:1958 msgid "Undefined Condition" msgstr "Condição indefinida" -#: ../libpurple/protocols/jabber/jabber.c:1595 +#: ../libpurple/protocols/jabber/jabber.c:1960 msgid "Unsupported Encoding" msgstr "Codificação não suportada" -#: ../libpurple/protocols/jabber/jabber.c:1597 +#: ../libpurple/protocols/jabber/jabber.c:1962 msgid "Unsupported Stanza Type" msgstr "Tipo de comando (Stanza) não suportado" -#: ../libpurple/protocols/jabber/jabber.c:1599 +#: ../libpurple/protocols/jabber/jabber.c:1964 msgid "Unsupported Version" msgstr "Versão não suportada" -#: ../libpurple/protocols/jabber/jabber.c:1601 +#: ../libpurple/protocols/jabber/jabber.c:1966 msgid "XML Not Well Formed" msgstr "XML mal-formado" -#: ../libpurple/protocols/jabber/jabber.c:1603 +#: ../libpurple/protocols/jabber/jabber.c:1968 msgid "Stream Error" msgstr "Erro no fluxo XML" -#: ../libpurple/protocols/jabber/jabber.c:1686 +#: ../libpurple/protocols/jabber/jabber.c:2051 #, c-format msgid "Unable to ban user %s" msgstr "Não foi possível banir usuário %s" -#: ../libpurple/protocols/jabber/jabber.c:1706 +#: ../libpurple/protocols/jabber/jabber.c:2071 #, c-format msgid "Unknown affiliation: \"%s\"" msgstr "Filiação desconhecida: \"%s\"" -#: ../libpurple/protocols/jabber/jabber.c:1711 +#: ../libpurple/protocols/jabber/jabber.c:2076 #, c-format msgid "Unable to affiliate user %s as \"%s\"" msgstr "Não foi possível filiar usuário %s como \"%s\"" -#: ../libpurple/protocols/jabber/jabber.c:1730 +#: ../libpurple/protocols/jabber/jabber.c:2095 #, c-format msgid "Unknown role: \"%s\"" msgstr "Cargo desconhecido: \"%s\"" -#: ../libpurple/protocols/jabber/jabber.c:1735 +#: ../libpurple/protocols/jabber/jabber.c:2100 #, c-format msgid "Unable to set role \"%s\" for user: %s" msgstr "Não foi possível definir cargo \"%s\" para o usuário: %s" -#: ../libpurple/protocols/jabber/jabber.c:1788 +#: ../libpurple/protocols/jabber/jabber.c:2153 #, c-format msgid "Unable to kick user %s" msgstr "Não foi possível convidar usuário (%s)." -#: ../libpurple/protocols/jabber/jabber.c:1822 +#: ../libpurple/protocols/jabber/jabber.c:2184 +#, c-format +msgid "Unable to ping user %s" +msgstr "Não foi possível verificar presença de usuário %s" + +#: ../libpurple/protocols/jabber/jabber.c:2206 +#: ../libpurple/protocols/jabber/jabber.c:2216 +#, c-format +msgid "Unable to buzz, because there is nothing known about user %s." +msgstr "" +"Não foi possível chamar a atenção de %s, pois nada é conhecido sobre ele(a)." + +#: ../libpurple/protocols/jabber/jabber.c:2212 +#, c-format +msgid "Unable to buzz, because user %s might be offline." +msgstr "" +"Não foi possível chamar a atenção de %s, pois este(a) pode estar " +"desconectado." + +#: ../libpurple/protocols/jabber/jabber.c:2238 +#, c-format +msgid "Unable to buzz, because the user %s does not support it." +msgstr "" +"Não foi possível chamar a atenção de %s, pois este não suporta tal recurso." + +#: ../libpurple/protocols/jabber/jabber.c:2252 msgid "config: Configure a chat room." msgstr "config: Configura uma sala de bate-papo." -#: ../libpurple/protocols/jabber/jabber.c:1826 +#: ../libpurple/protocols/jabber/jabber.c:2256 msgid "configure: Configure a chat room." msgstr "configure: Configura uma sala de bate-papo." -#: ../libpurple/protocols/jabber/jabber.c:1835 +#: ../libpurple/protocols/jabber/jabber.c:2265 msgid "part [room]: Leave the room." msgstr "part [sala]: Sai da sala." -#: ../libpurple/protocols/jabber/jabber.c:1840 +#: ../libpurple/protocols/jabber/jabber.c:2270 msgid "register: Register with a chat room." msgstr "register: Registra com uma sala de bate-papo." -#: ../libpurple/protocols/jabber/jabber.c:1846 +#: ../libpurple/protocols/jabber/jabber.c:2276 msgid "topic [new topic]: View or change the topic." msgstr "topic [novo tópico]: Ver ou mudar o tópico." -#: ../libpurple/protocols/jabber/jabber.c:1852 +#: ../libpurple/protocols/jabber/jabber.c:2282 msgid "ban <user> [room]: Ban a user from the room." msgstr "ban <usuário> [sala]: Bane o usuário da sala." -#: ../libpurple/protocols/jabber/jabber.c:1858 +#: ../libpurple/protocols/jabber/jabber.c:2288 msgid "" "affiliate <user> <owner|admin|member|outcast|none>: Set a user's " "affiliation with the room." @@ -5233,7 +6063,7 @@ "affiliate <usuário> <owner|admin|member|outcast|none>: define a " "filiação do usuário com a sala." -#: ../libpurple/protocols/jabber/jabber.c:1864 +#: ../libpurple/protocols/jabber/jabber.c:2294 msgid "" "role <user> <moderator|participant|visitor|none>: Set a user's " "role in the room." @@ -5241,25 +6071,36 @@ "role <usuário> <moderator|participant|visitor|none>: Define o " "cargo do usuário na sala." -#: ../libpurple/protocols/jabber/jabber.c:1870 +#: ../libpurple/protocols/jabber/jabber.c:2300 msgid "invite <user> [message]: Invite a user to the room." msgstr "invite <usuário> [mensagem]: Convida o usuário para a sala." -#: ../libpurple/protocols/jabber/jabber.c:1876 +#: ../libpurple/protocols/jabber/jabber.c:2306 msgid "join: <room> [server]: Join a chat on this server." msgstr "join: <sala> [servidor]: Entra num bate-papo neste servidor." -#: ../libpurple/protocols/jabber/jabber.c:1882 +#: ../libpurple/protocols/jabber/jabber.c:2312 msgid "kick <user> [room]: Kick a user from the room." msgstr "kick <usuário> [sala]: Expulsa um usuário da sala." -#: ../libpurple/protocols/jabber/jabber.c:1887 +#: ../libpurple/protocols/jabber/jabber.c:2317 msgid "" "msg <user> <message>: Send a private message to another user." msgstr "" "msg <usuário> <mensagem>: Envia uma mensagem particular para " "outro usuário." +#: ../libpurple/protocols/jabber/jabber.c:2323 +msgid "ping <jid>:\tPing a user/component/server." +msgstr "" +"ping <jid>: Verifica conexão com usuário/componente/servidor." + +#: ../libpurple/protocols/jabber/jabber.c:2328 +#: ../libpurple/protocols/yahoo/yahoo.c:4142 +msgid "buzz: Buzz a user to get their attention" +msgstr "" +"buzz: Envia um alerta (buzz) para um usuário de modo a chamar a sua atenção" + #. *< type #. *< ui_requirement #. *< flags @@ -5270,84 +6111,98 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/jabber/libxmpp.c:169 -#: ../libpurple/protocols/jabber/libxmpp.c:171 +#: ../libpurple/protocols/jabber/libxmpp.c:170 +#: ../libpurple/protocols/jabber/libxmpp.c:172 msgid "XMPP Protocol Plugin" msgstr "Plugin do protocolo XMPP" #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im -#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508 +#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506 msgid "Domain" msgstr "Domínio" -#: ../libpurple/protocols/jabber/libxmpp.c:206 +#: ../libpurple/protocols/jabber/libxmpp.c:210 +msgid "Require SSL/TLS" +msgstr "Requerer SSL/TLS" + +#: ../libpurple/protocols/jabber/libxmpp.c:214 msgid "Force old (port 5223) SSL" msgstr "Forçar SSL antigo (porta 5223)" -#: ../libpurple/protocols/jabber/libxmpp.c:211 +#: ../libpurple/protocols/jabber/libxmpp.c:219 msgid "Allow plaintext auth over unencrypted streams" msgstr "Permitir autenticação em texto puro sobre fluxos não-criptografados" -#: ../libpurple/protocols/jabber/libxmpp.c:216 -#: ../libpurple/protocols/simple/simple.c:1861 +#: ../libpurple/protocols/jabber/libxmpp.c:224 +#: ../libpurple/protocols/myspace/myspace.c:3270 +#: ../libpurple/protocols/simple/simple.c:1902 msgid "Connect port" msgstr "Porta de conexão" +#. TODO: default to automatically try different ports. Make the user be +#. * able to set the first port to try (like LastConnectedPort in Windows client). #. Account options -#: ../libpurple/protocols/jabber/libxmpp.c:220 +#: ../libpurple/protocols/jabber/libxmpp.c:228 +#: ../libpurple/protocols/myspace/myspace.c:3267 #: ../libpurple/protocols/silc/silc.c:1914 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837 msgid "Connect server" msgstr "Servidor de conexão" -#: ../libpurple/protocols/jabber/message.c:102 +#: ../libpurple/protocols/jabber/message.c:103 #, c-format msgid "%s has left the conversation." msgstr "%s saiu da conversa." -#: ../libpurple/protocols/jabber/message.c:153 +#: ../libpurple/protocols/jabber/message.c:158 #, c-format msgid "Message from %s" msgstr "Mensagem de %s" -#: ../libpurple/protocols/jabber/message.c:217 +#: ../libpurple/protocols/jabber/message.c:222 #, c-format msgid "%s has set the topic to: %s" msgstr "%s mudou o tópico para: %s" -#: ../libpurple/protocols/jabber/message.c:219 +#: ../libpurple/protocols/jabber/message.c:224 #, c-format msgid "The topic is: %s" msgstr "O tópico é: %s" -#: ../libpurple/protocols/jabber/message.c:267 +#: ../libpurple/protocols/jabber/message.c:272 #, c-format msgid "Message delivery to %s failed: %s" msgstr "A entrega de mensagens para %s falhou: %s" -#: ../libpurple/protocols/jabber/message.c:270 +#: ../libpurple/protocols/jabber/message.c:275 msgid "XMPP Message Error" msgstr "Erro de mensagem do XMPP" -#: ../libpurple/protocols/jabber/message.c:359 +#: ../libpurple/protocols/jabber/message.c:304 +#: ../libpurple/protocols/yahoo/yahoo.c:4117 +#, c-format +msgid "%s has buzzed you!" +msgstr "%s chamou sua atenção!" + +#: ../libpurple/protocols/jabber/message.c:404 #, c-format msgid " (Code %s)" msgstr " (Código %s)" -#: ../libpurple/protocols/jabber/parser.c:193 +#: ../libpurple/protocols/jabber/parser.c:196 msgid "XML Parse error" msgstr "Erro ao processar XML" -#: ../libpurple/protocols/jabber/presence.c:292 +#: ../libpurple/protocols/jabber/presence.c:427 msgid "Unknown Error in presence" msgstr "Erro desconhecido na presença" -#: ../libpurple/protocols/jabber/presence.c:366 -#: ../libpurple/protocols/jabber/presence.c:367 +#: ../libpurple/protocols/jabber/presence.c:508 +#: ../libpurple/protocols/jabber/presence.c:509 msgid "Create New Room" msgstr "Criar nova sala" -#: ../libpurple/protocols/jabber/presence.c:368 +#: ../libpurple/protocols/jabber/presence.c:510 msgid "" "You are creating a new room. Would you like to configure it, or accept the " "default settings?" @@ -5355,66 +6210,112 @@ "Você está criando uma nova sala. Você deseja configurá-la, ou aceitar as " "configurações padrão?" -#: ../libpurple/protocols/jabber/presence.c:374 +#: ../libpurple/protocols/jabber/presence.c:516 msgid "_Configure Room" msgstr "_Configurar sala" -#: ../libpurple/protocols/jabber/presence.c:375 +#: ../libpurple/protocols/jabber/presence.c:517 msgid "_Accept Defaults" msgstr "_Aceitar padrões" -#: ../libpurple/protocols/jabber/presence.c:417 +#: ../libpurple/protocols/jabber/presence.c:559 #, c-format msgid "Error in chat %s" msgstr "Erro no bate-papo %s" -#: ../libpurple/protocols/jabber/presence.c:421 +#: ../libpurple/protocols/jabber/presence.c:563 #, c-format msgid "Error joining chat %s" msgstr "Erro ao entrar no bate-papo %s" -#: ../libpurple/protocols/jabber/si.c:769 +#: ../libpurple/protocols/jabber/si.c:775 #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "" "Não foi possível enviar arquivo para %s, pois o usuário não suporta " "transferência de arquivos." -#: ../libpurple/protocols/jabber/si.c:770 -#: ../libpurple/protocols/jabber/si.c:771 -#: ../libpurple/protocols/jabber/si.c:839 +#: ../libpurple/protocols/jabber/si.c:776 +#: ../libpurple/protocols/jabber/si.c:777 +#: ../libpurple/protocols/jabber/si.c:845 msgid "File Send Failed" msgstr "Falha no envio de arquivo" -#: ../libpurple/protocols/jabber/si.c:832 +#: ../libpurple/protocols/jabber/si.c:838 #, c-format msgid "Unable to send file to %s, invalid JID" msgstr "Não foi possível enviar o arquivo para %s, ID do Jabber inválido" -#: ../libpurple/protocols/jabber/si.c:834 +#: ../libpurple/protocols/jabber/si.c:840 #, c-format msgid "Unable to send file to %s, user is not online" msgstr "" "Não foi possível enviar arquivo para %s, pois o usuário não está conectado" -#: ../libpurple/protocols/jabber/si.c:836 +#: ../libpurple/protocols/jabber/si.c:842 #, c-format msgid "Unable to send file to %s, not subscribed to user presence" msgstr "" "Não foi possível enviar arquivo para %s, pois você não está recebendo " "informações de presença deste usuário" -#: ../libpurple/protocols/jabber/si.c:851 +#: ../libpurple/protocols/jabber/si.c:857 #, c-format msgid "Please select which resource of %s you would like to send a file to" msgstr "" "Favor selecionar o recurso de %s para o qual você gostaria de mandar um " "arquivo" -#: ../libpurple/protocols/jabber/si.c:867 +#: ../libpurple/protocols/jabber/si.c:873 msgid "Select a Resource" msgstr "Selecione um recurso" +#: ../libpurple/protocols/jabber/usermood.c:179 +#: ../libpurple/protocols/jabber/usermood.c:180 +msgid "Edit User Mood" +msgstr "Editar humor do usuário" + +#: ../libpurple/protocols/jabber/usermood.c:181 +msgid "Please select your mood from the list." +msgstr "Favor selecionar seu humor na lista." + +#: ../libpurple/protocols/jabber/usermood.c:183 +#: ../libpurple/protocols/jabber/usernick.c:78 +msgid "Set" +msgstr "Definir" + +#: ../libpurple/protocols/jabber/usermood.c:191 +msgid "Set Mood..." +msgstr "Definir humor..." + +#: ../libpurple/protocols/jabber/usernick.c:76 +msgid "Set User Nickname" +msgstr "Definir apelido do usuário" + +#: ../libpurple/protocols/jabber/usernick.c:76 +msgid "Please specify a new nickname for you." +msgstr "Favor digitar seu novo apelido." + +#: ../libpurple/protocols/jabber/usernick.c:77 +msgid "" +"This information is visible to all contacts on your contact list, so choose " +"something appropriate." +msgstr "" +"Como estas informações são visíveis para todos os contatos da sua lista de " +"contatos, é recomendável escolher algo apropriado." + +#: ../libpurple/protocols/jabber/usernick.c:99 +msgid "Set Nickname..." +msgstr "Definir apelido..." + +#: ../libpurple/protocols/jabber/xdata.c:378 +msgid "Actions" +msgstr "Ações" + +#: ../libpurple/protocols/jabber/xdata.c:380 +msgid "Select an action" +msgstr "Selecione uma ação" + #: ../libpurple/protocols/msn/dialog.c:110 #, c-format msgid "Buddy list synchronization issue in %s (%s)" @@ -5634,7 +6535,7 @@ #: ../libpurple/protocols/oscar/oscar.c:1378 #: ../libpurple/protocols/silc/silc.c:233 #: ../libpurple/protocols/silc10/ops.c:1709 -#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363 +#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1379 msgid "Authentication failed" msgstr "Autenticação mal sucedida" @@ -5668,39 +6569,49 @@ msgid "MSN Error: %s\n" msgstr "Erro MSN: %s\n" -#: ../libpurple/protocols/msn/msn.c:121 -msgid "You have just sent a Nudge!" -msgstr "Você acabou de chamar a atenção do usuário!" - -#: ../libpurple/protocols/msn/msn.c:146 +#: ../libpurple/protocols/msn/msn.c:130 +msgid "Nudge" +msgstr "Chamar a atenção" + +#: ../libpurple/protocols/msn/msn.c:131 +#, c-format +msgid "%s has nudged you!" +msgstr "%s chamou sua atenção!" + +#: ../libpurple/protocols/msn/msn.c:132 +#, c-format +msgid "Nudging %s..." +msgstr "Chamando a atenção de %s..." + +#: ../libpurple/protocols/msn/msn.c:174 msgid "Your new MSN friendly name is too long." msgstr "Seu novo apelido é longo demais." -#: ../libpurple/protocols/msn/msn.c:254 +#: ../libpurple/protocols/msn/msn.c:282 msgid "Set your friendly name." msgstr "Defina seu apelido." -#: ../libpurple/protocols/msn/msn.c:255 +#: ../libpurple/protocols/msn/msn.c:283 msgid "This is the name that other MSN buddies will see you as." msgstr "Esse é o nome que será visto como seu pelos outros amigos MSN." -#: ../libpurple/protocols/msn/msn.c:273 +#: ../libpurple/protocols/msn/msn.c:301 msgid "Set your home phone number." msgstr "Defina seu número de telefone de casa." -#: ../libpurple/protocols/msn/msn.c:290 +#: ../libpurple/protocols/msn/msn.c:318 msgid "Set your work phone number." msgstr "Defina seu número de telefone do trabalho." -#: ../libpurple/protocols/msn/msn.c:307 +#: ../libpurple/protocols/msn/msn.c:335 msgid "Set your mobile phone number." msgstr "Defina seu número de telefone móvel." -#: ../libpurple/protocols/msn/msn.c:322 +#: ../libpurple/protocols/msn/msn.c:350 msgid "Allow MSN Mobile pages?" msgstr "Permitir pages MSN Mobile?" -#: ../libpurple/protocols/msn/msn.c:323 +#: ../libpurple/protocols/msn/msn.c:351 msgid "" "Do you want to allow or disallow people on your buddy list to send you MSN " "Mobile pages to your cell phone or other mobile device?" @@ -5708,132 +6619,134 @@ "Você deseja permitir ou não permitir que pessoas na sua lista de amigos " "enviem pages MSN Mobile para seu celular ou outro dispositivo móvel?" -#: ../libpurple/protocols/msn/msn.c:329 +#: ../libpurple/protocols/msn/msn.c:357 msgid "Allow" msgstr "Permitir" -#: ../libpurple/protocols/msn/msn.c:330 +#: ../libpurple/protocols/msn/msn.c:358 msgid "Disallow" msgstr "Não permitir" -#: ../libpurple/protocols/msn/msn.c:346 +#: ../libpurple/protocols/msn/msn.c:374 msgid "This Hotmail account may not be active." msgstr "Esta conta do Hotmail pode não estar ativa." -#: ../libpurple/protocols/msn/msn.c:372 +#: ../libpurple/protocols/msn/msn.c:400 msgid "Send a mobile message." msgstr "Enviar uma mensagem para dispositivo móvel." -#: ../libpurple/protocols/msn/msn.c:374 +#: ../libpurple/protocols/msn/msn.c:402 msgid "Page" msgstr "Enviar" -#: ../libpurple/protocols/msn/msn.c:521 +#: ../libpurple/protocols/msn/msn.c:549 msgid "Has you" msgstr "Tem você" -#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33 -#: ../libpurple/protocols/yahoo/yahoo.c:2916 -#: ../libpurple/protocols/yahoo/yahoo.c:3600 +#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33 +#: ../libpurple/protocols/yahoo/yahoo.c:3074 +#: ../libpurple/protocols/yahoo/yahoo.c:3758 msgid "Be Right Back" msgstr "Volto já" -#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31 +#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31 #: ../libpurple/protocols/novell/novell.c:2822 #: ../libpurple/protocols/novell/novell.c:2952 #: ../libpurple/protocols/silc/buddy.c:1480 #: ../libpurple/protocols/silc/silc.c:56 #: ../libpurple/protocols/silc10/buddy.c:1480 #: ../libpurple/protocols/silc10/silc.c:47 -#: ../libpurple/protocols/yahoo/yahoo.c:2918 -#: ../libpurple/protocols/yahoo/yahoo.c:3603 +#: ../libpurple/protocols/yahoo/yahoo.c:3076 +#: ../libpurple/protocols/yahoo/yahoo.c:3761 msgid "Busy" msgstr "Ocupado" -#: ../libpurple/protocols/msn/msn.c:559 -#: ../libpurple/protocols/yahoo/yahoo.c:2926 -#: ../libpurple/protocols/yahoo/yahoo.c:3615 +#: ../libpurple/protocols/msn/msn.c:587 +#: ../libpurple/protocols/yahoo/yahoo.c:3084 +#: ../libpurple/protocols/yahoo/yahoo.c:3773 msgid "On the Phone" msgstr "Ao telefone" -#: ../libpurple/protocols/msn/msn.c:563 -#: ../libpurple/protocols/yahoo/yahoo.c:2930 -#: ../libpurple/protocols/yahoo/yahoo.c:3621 +#: ../libpurple/protocols/msn/msn.c:591 +#: ../libpurple/protocols/yahoo/yahoo.c:3088 +#: ../libpurple/protocols/yahoo/yahoo.c:3779 msgid "Out to Lunch" msgstr "Em horário de almoço" -#: ../libpurple/protocols/msn/msn.c:591 +#: ../libpurple/protocols/msn/msn.c:619 msgid "Set Friendly Name..." msgstr "Definir apelido..." -#: ../libpurple/protocols/msn/msn.c:596 +#: ../libpurple/protocols/msn/msn.c:624 msgid "Set Home Phone Number..." msgstr "Definir número de telefone de casa..." -#: ../libpurple/protocols/msn/msn.c:600 +#: ../libpurple/protocols/msn/msn.c:628 msgid "Set Work Phone Number..." msgstr "Definir número de telefone do trabalho..." -#: ../libpurple/protocols/msn/msn.c:604 +#: ../libpurple/protocols/msn/msn.c:632 msgid "Set Mobile Phone Number..." msgstr "Definir número de telefone móvel..." -#: ../libpurple/protocols/msn/msn.c:610 +#: ../libpurple/protocols/msn/msn.c:638 msgid "Enable/Disable Mobile Devices..." msgstr "Ativar/Desativar dispositivos móveis..." -#: ../libpurple/protocols/msn/msn.c:615 +#: ../libpurple/protocols/msn/msn.c:643 msgid "Allow/Disallow Mobile Pages..." msgstr "Permitir/Não permitir pages para dispositivos móveis..." -#: ../libpurple/protocols/msn/msn.c:626 +#: ../libpurple/protocols/msn/msn.c:654 msgid "Open Hotmail Inbox" msgstr "Abrir caixa de entrada do Hotmail" -#: ../libpurple/protocols/msn/msn.c:650 +#: ../libpurple/protocols/msn/msn.c:678 msgid "Send to Mobile" msgstr "Enviar para dispositivo móvel" -#: ../libpurple/protocols/msn/msn.c:660 +#: ../libpurple/protocols/msn/msn.c:688 #: ../libpurple/protocols/novell/novell.c:3408 msgid "Initiate _Chat" msgstr "Iniciar _bate-papo" -#: ../libpurple/protocols/msn/msn.c:698 +#: ../libpurple/protocols/msn/msn.c:726 msgid "SSL support is needed for MSN. Please install a supported SSL library." msgstr "" "O suporte ao SSL é necessário para o MSN. Por favor instale uma biblioteca " "SSL suportada." -#: ../libpurple/protocols/msn/msn.c:723 +#: ../libpurple/protocols/msn/msn.c:754 msgid "Failed to connect to server." msgstr "Não foi possível conectar ao servidor." -#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827 +#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808 msgid "Error retrieving profile" msgstr "Erro ao obter perfil" -#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309 +#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309 #: ../pidgin/plugins/pidginrc.c:366 msgid "General" msgstr "Geral" -#: ../libpurple/protocols/msn/msn.c:1557 -#: ../libpurple/protocols/oscar/oscar.c:3723 +#: ../libpurple/protocols/msn/msn.c:1588 +#: ../libpurple/protocols/myspace/user.c:110 +#: ../libpurple/protocols/oscar/oscar.c:3748 #: ../libpurple/protocols/qq/buddy_info.c:45 #: ../libpurple/protocols/qq/qq.c:221 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081 msgid "Age" msgstr "Idade" -#: ../libpurple/protocols/msn/msn.c:1559 +#: ../libpurple/protocols/msn/msn.c:1590 #: ../libpurple/protocols/qq/buddy_info.c:51 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096 msgid "Occupation" msgstr "Ocupação" -#: ../libpurple/protocols/msn/msn.c:1560 +#: ../libpurple/protocols/msn/msn.c:1591 +#: ../libpurple/protocols/myspace/user.c:119 #: ../libpurple/protocols/novell/novell.c:1478 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076 #: ../libpurple/protocols/zephyr/zephyr.c:798 @@ -5841,188 +6754,188 @@ msgid "Location" msgstr "Localização" -#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757 -#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770 +#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788 +#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801 msgid "Hobbies and Interests" msgstr "Hobbies e interesses" -#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691 -#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704 -#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719 +#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722 +#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735 +#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750 msgid "A Little About Me" msgstr "Um pouco sobre mim" -#: ../libpurple/protocols/msn/msn.c:1588 +#: ../libpurple/protocols/msn/msn.c:1619 msgid "Social" msgstr "Social" -#: ../libpurple/protocols/msn/msn.c:1590 +#: ../libpurple/protocols/msn/msn.c:1621 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086 msgid "Marital Status" msgstr "Estado civil" -#: ../libpurple/protocols/msn/msn.c:1591 +#: ../libpurple/protocols/msn/msn.c:1622 msgid "Interests" msgstr "Interesses" -#: ../libpurple/protocols/msn/msn.c:1592 +#: ../libpurple/protocols/msn/msn.c:1623 msgid "Pets" msgstr "Animais de estimação" -#: ../libpurple/protocols/msn/msn.c:1593 +#: ../libpurple/protocols/msn/msn.c:1624 msgid "Hometown" msgstr "Cidade natal" -#: ../libpurple/protocols/msn/msn.c:1594 +#: ../libpurple/protocols/msn/msn.c:1625 msgid "Places Lived" msgstr "Locais em que viveu" -#: ../libpurple/protocols/msn/msn.c:1595 +#: ../libpurple/protocols/msn/msn.c:1626 msgid "Fashion" msgstr "Moda" -#: ../libpurple/protocols/msn/msn.c:1596 +#: ../libpurple/protocols/msn/msn.c:1627 msgid "Humor" msgstr "Humor" -#: ../libpurple/protocols/msn/msn.c:1597 +#: ../libpurple/protocols/msn/msn.c:1628 msgid "Music" msgstr "Música" -#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779 -#: ../libpurple/protocols/msn/msn.c:1785 +#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810 +#: ../libpurple/protocols/msn/msn.c:1816 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138 msgid "Favorite Quote" msgstr "Citação favorita" -#: ../libpurple/protocols/msn/msn.c:1615 +#: ../libpurple/protocols/msn/msn.c:1646 msgid "Contact Info" msgstr "Informações do contato" -#: ../libpurple/protocols/msn/msn.c:1616 +#: ../libpurple/protocols/msn/msn.c:1647 msgid "Personal" msgstr "Pessoal" -#: ../libpurple/protocols/msn/msn.c:1619 +#: ../libpurple/protocols/msn/msn.c:1650 msgid "Significant Other" msgstr "Parceiro(a)" -#: ../libpurple/protocols/msn/msn.c:1620 +#: ../libpurple/protocols/msn/msn.c:1651 msgid "Home Phone" msgstr "Telefone doméstico" -#: ../libpurple/protocols/msn/msn.c:1621 +#: ../libpurple/protocols/msn/msn.c:1652 msgid "Home Phone 2" msgstr "Telefone doméstico 2" -#: ../libpurple/protocols/msn/msn.c:1622 -#: ../libpurple/protocols/oscar/oscar.c:3761 +#: ../libpurple/protocols/msn/msn.c:1653 +#: ../libpurple/protocols/oscar/oscar.c:3786 msgid "Home Address" msgstr "Endereço de casa" -#: ../libpurple/protocols/msn/msn.c:1623 +#: ../libpurple/protocols/msn/msn.c:1654 msgid "Personal Mobile" msgstr "Celular pessoal" -#: ../libpurple/protocols/msn/msn.c:1624 +#: ../libpurple/protocols/msn/msn.c:1655 msgid "Home Fax" msgstr "Fax doméstico" -#: ../libpurple/protocols/msn/msn.c:1625 +#: ../libpurple/protocols/msn/msn.c:1656 msgid "Personal E-Mail" msgstr "E-Mail pessoal" -#: ../libpurple/protocols/msn/msn.c:1626 +#: ../libpurple/protocols/msn/msn.c:1657 msgid "Personal IM" msgstr "MI Pessoal" -#: ../libpurple/protocols/msn/msn.c:1628 +#: ../libpurple/protocols/msn/msn.c:1659 msgid "Anniversary" msgstr "Aniversário de casamento" #. Business -#: ../libpurple/protocols/msn/msn.c:1644 +#: ../libpurple/protocols/msn/msn.c:1675 msgid "Work" msgstr "Negócios" -#: ../libpurple/protocols/msn/msn.c:1646 +#: ../libpurple/protocols/msn/msn.c:1677 #: ../libpurple/protocols/silc/ops.c:1010 #: ../libpurple/protocols/silc10/ops.c:1044 msgid "Job Title" msgstr "Título de trabalho" -#: ../libpurple/protocols/msn/msn.c:1647 -#: ../libpurple/protocols/oscar/oscar.c:3782 +#: ../libpurple/protocols/msn/msn.c:1678 +#: ../libpurple/protocols/oscar/oscar.c:3807 msgid "Company" msgstr "Empresa" -#: ../libpurple/protocols/msn/msn.c:1648 +#: ../libpurple/protocols/msn/msn.c:1679 #: ../libpurple/protocols/novell/novell.c:1480 msgid "Department" msgstr "Departamento" -#: ../libpurple/protocols/msn/msn.c:1649 +#: ../libpurple/protocols/msn/msn.c:1680 msgid "Profession" msgstr "Profissão" -#: ../libpurple/protocols/msn/msn.c:1650 +#: ../libpurple/protocols/msn/msn.c:1681 msgid "Work Phone" msgstr "Telefone do trabalho" -#: ../libpurple/protocols/msn/msn.c:1651 +#: ../libpurple/protocols/msn/msn.c:1682 msgid "Work Phone 2" msgstr "Telefone 2 do trabalho" -#: ../libpurple/protocols/msn/msn.c:1652 -#: ../libpurple/protocols/oscar/oscar.c:3774 +#: ../libpurple/protocols/msn/msn.c:1683 +#: ../libpurple/protocols/oscar/oscar.c:3799 msgid "Work Address" msgstr "Endereço de trabalho" -#: ../libpurple/protocols/msn/msn.c:1653 +#: ../libpurple/protocols/msn/msn.c:1684 msgid "Work Mobile" msgstr "Celular de trabalho" -#: ../libpurple/protocols/msn/msn.c:1654 +#: ../libpurple/protocols/msn/msn.c:1685 msgid "Work Pager" msgstr "Pager de trabalho" -#: ../libpurple/protocols/msn/msn.c:1655 +#: ../libpurple/protocols/msn/msn.c:1686 msgid "Work Fax" msgstr "Fax de trabalho" -#: ../libpurple/protocols/msn/msn.c:1656 +#: ../libpurple/protocols/msn/msn.c:1687 msgid "Work E-Mail" msgstr "E-Mail de trabalho" -#: ../libpurple/protocols/msn/msn.c:1657 +#: ../libpurple/protocols/msn/msn.c:1688 msgid "Work IM" msgstr "MI de trabalho" -#: ../libpurple/protocols/msn/msn.c:1658 +#: ../libpurple/protocols/msn/msn.c:1689 msgid "Start Date" msgstr "Data de início" -#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734 -#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748 +#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765 +#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779 msgid "Favorite Things" msgstr "Coisas favoritas" -#: ../libpurple/protocols/msn/msn.c:1793 +#: ../libpurple/protocols/msn/msn.c:1824 msgid "Last Updated" msgstr "Última atualização" -#: ../libpurple/protocols/msn/msn.c:1804 +#: ../libpurple/protocols/msn/msn.c:1835 #: ../libpurple/protocols/qq/buddy_info.c:60 #: ../libpurple/protocols/silc/ops.c:1026 #: ../libpurple/protocols/silc10/ops.c:1060 msgid "Homepage" msgstr "Página da web" -#: ../libpurple/protocols/msn/msn.c:1828 +#: ../libpurple/protocols/msn/msn.c:1859 msgid "The user has not created a public profile." msgstr "O usuário não criou um perfil público." -#: ../libpurple/protocols/msn/msn.c:1829 +#: ../libpurple/protocols/msn/msn.c:1860 msgid "" "MSN reported not being able to find the user's profile. This either means " "that the user does not exist, or that the user exists but has not created a " @@ -6032,7 +6945,7 @@ "que o usuário não existe, ou que o usuário existe mas não criou um perfil " "público." -#: ../libpurple/protocols/msn/msn.c:1833 +#: ../libpurple/protocols/msn/msn.c:1864 msgid "" "Could not find any information in the user's profile. The user most likely " "does not exist." @@ -6040,7 +6953,7 @@ "Não foi possível encontrar nenhuma informação no perfil do usuário. " "Provavelmente o usuário não existe." -#: ../libpurple/protocols/msn/msn.c:1841 +#: ../libpurple/protocols/msn/msn.c:1872 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240 msgid "Profile URL" msgstr "URL do Perfil" @@ -6055,19 +6968,19 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129 +#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160 msgid "MSN Protocol Plugin" msgstr "Plugin do protocolo MSN" -#: ../libpurple/protocols/msn/msn.c:2163 +#: ../libpurple/protocols/msn/msn.c:2194 msgid "Use HTTP Method" msgstr "Usar método HTTP" -#: ../libpurple/protocols/msn/msn.c:2168 +#: ../libpurple/protocols/msn/msn.c:2205 msgid "Show custom smileys" msgstr "Exibir emoticons personalizados" -#: ../libpurple/protocols/msn/msn.c:2176 +#: ../libpurple/protocols/msn/msn.c:2213 msgid "nudge: nudge a user to get their attention" msgstr "nudge: chama a atenção do usuário" @@ -6086,8 +6999,8 @@ #: ../libpurple/protocols/qq/udp_proxy_s5.c:268 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332 -#: ../libpurple/protocols/yahoo/yahoochat.c:1320 -#: ../libpurple/protocols/yahoo/yahoochat.c:1346 +#: ../libpurple/protocols/yahoo/yahoochat.c:1416 +#: ../libpurple/protocols/yahoo/yahoochat.c:1442 msgid "Unable to connect" msgstr "Não foi possível conectar" @@ -6299,11 +7212,6 @@ msgid "Message may have not been sent because an unknown error occurred:" msgstr "A mensagem pode não ter sido enviada devido a um erro desconhecido:" -#: ../libpurple/protocols/msn/switchboard.c:963 -#, c-format -msgid "%s just sent you a Nudge!" -msgstr "%s está chamando sua atenção!" - #: ../libpurple/protocols/msn/userlist.c:252 #, c-format msgid "%s has added you to his or her buddy list." @@ -6323,6 +7231,404 @@ msgid "The screen name specified is invalid." msgstr "O nome de usuário especificado é inválido." +#: ../libpurple/protocols/myspace/myspace.c:111 +msgid "Missing Cipher" +msgstr "Cifra não encontrada" + +#: ../libpurple/protocols/myspace/myspace.c:112 +msgid "The RC4 cipher could not be found" +msgstr "A cifra RC4 não pôde ser encontrada" + +#: ../libpurple/protocols/myspace/myspace.c:113 +msgid "" +"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will " +"not be loaded." +msgstr "" +"Atualize sua versão do libpurple para uma que tenha suporte a RC4 (>= " +"2.0.1). O plugin do MySpace não será carregado." + +#: ../libpurple/protocols/myspace/myspace.c:286 +#, c-format +msgid "" +"Sorry, passwords over %d characters in length (yours is %d) are not " +"supported by MySpace." +msgstr "" +"Desculpe, senhas com mais de %d caracteres (a sua possui %d) não são " +"suportadas pelo MySpace." + +#. Notify an error message also, because this is important! +#: ../libpurple/protocols/myspace/myspace.c:292 +#: ../libpurple/protocols/myspace/myspace.c:1794 +msgid "MySpaceIM Error" +msgstr "Erro do MySpace" + +#: ../libpurple/protocols/myspace/myspace.c:348 +msgid "Reading challenge" +msgstr "Lendo negociação de criptografia" + +#: ../libpurple/protocols/myspace/myspace.c:354 +msgid "Unexpected challenge length from server" +msgstr "Tamanho inesperado de challenge criptográfico vindo do servidor" + +#: ../libpurple/protocols/myspace/myspace.c:358 +msgid "Logging in" +msgstr "Conectando" + +#: ../libpurple/protocols/myspace/myspace.c:1276 +#, c-format +msgid "Connection to server lost (no data received within %d seconds)" +msgstr "" +"Conexão com o servidor perdida (não houve recepção de dados nos últimos %d " +"segundos)" + +#. Can't write _()'d strings in array initializers. Workaround. +#: ../libpurple/protocols/myspace/myspace.c:1319 +msgid "New mail messages" +msgstr "Novas mensagens de email" + +#: ../libpurple/protocols/myspace/myspace.c:1320 +msgid "New blog comments" +msgstr "Novos comentários no blog" + +#: ../libpurple/protocols/myspace/myspace.c:1321 +msgid "New profile comments" +msgstr "Novos comentários no perfil" + +#: ../libpurple/protocols/myspace/myspace.c:1322 +msgid "New friend requests!" +msgstr "Novos pedidos de amizade!" + +#: ../libpurple/protocols/myspace/myspace.c:1323 +msgid "New picture comments" +msgstr "Novos comentários nas fotos" + +#: ../libpurple/protocols/myspace/myspace.c:1353 +msgid "MySpace" +msgstr "MySpace" + +#. The session is now set up, ready to be connected. This emits the +#. * signedOn signal, so clients can now do anything with msimprpl, and +#. * we're ready for it (session key, userid, username all setup). +#: ../libpurple/protocols/myspace/myspace.c:1536 +#: ../libpurple/protocols/sametime/sametime.c:1544 +msgid "Connected" +msgstr "Conectado" + +#: ../libpurple/protocols/myspace/myspace.c:1547 +#: ../libpurple/protocols/myspace/myspace.c:1549 +msgid "No username set" +msgstr "Nenhum nome de usuário definido" + +#: ../libpurple/protocols/myspace/myspace.c:1548 +msgid "" +"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile." +"username and choose a username and try to login again." +msgstr "" +"Favor visitar http://e(retrieving)" msgstr " (obtendo)" -#: ../libpurple/protocols/oscar/oscar.c:5722 +#: ../libpurple/protocols/oscar/oscar.c:5758 msgid "iTunes Music Store Link" msgstr "Link para a loja de música do iTunes" -#: ../libpurple/protocols/oscar/oscar.c:5830 +#: ../libpurple/protocols/oscar/oscar.c:5866 #, c-format msgid "Buddy Comment for %s" msgstr "Comentário do amigo %s" -#: ../libpurple/protocols/oscar/oscar.c:5831 +#: ../libpurple/protocols/oscar/oscar.c:5867 msgid "Buddy Comment:" msgstr "Comentário do amigo:" -#: ../libpurple/protocols/oscar/oscar.c:5878 +#: ../libpurple/protocols/oscar/oscar.c:5914 #, c-format msgid "You have selected to open a Direct IM connection with %s." msgstr "Você selecionou abrir uma mensagem instantânea direta com %s." -#: ../libpurple/protocols/oscar/oscar.c:5882 +#: ../libpurple/protocols/oscar/oscar.c:5918 msgid "" "Because this reveals your IP address, it may be considered a security risk. " "Do you wish to continue?" @@ -7740,66 +9038,66 @@ "Por revelar seu endereço IP, isto pode ser considerado um risco de " "privacidade. Deseja continuar?" -#: ../libpurple/protocols/oscar/oscar.c:5888 -#: ../libpurple/protocols/oscar/peer.c:1022 +#: ../libpurple/protocols/oscar/oscar.c:5924 +#: ../libpurple/protocols/oscar/peer.c:1045 msgid "C_onnect" msgstr "C_onectar" -#: ../libpurple/protocols/oscar/oscar.c:5923 +#: ../libpurple/protocols/oscar/oscar.c:5959 msgid "Get AIM Info" msgstr "Ver informações do AIM" -#: ../libpurple/protocols/oscar/oscar.c:5929 +#: ../libpurple/protocols/oscar/oscar.c:5965 msgid "Edit Buddy Comment" msgstr "Editar comentário do amigo" -#: ../libpurple/protocols/oscar/oscar.c:5937 +#: ../libpurple/protocols/oscar/oscar.c:5973 msgid "Get Status Msg" msgstr "Ver mensagem de status" -#: ../libpurple/protocols/oscar/oscar.c:5950 +#: ../libpurple/protocols/oscar/oscar.c:5986 msgid "Direct IM" msgstr "Mensagem instantânea direta" -#: ../libpurple/protocols/oscar/oscar.c:5972 +#: ../libpurple/protocols/oscar/oscar.c:6008 msgid "Re-request Authorization" msgstr "Re-requisitar autorização" -#: ../libpurple/protocols/oscar/oscar.c:6031 +#: ../libpurple/protocols/oscar/oscar.c:6067 msgid "Require authorization" msgstr "Pedir autorização" -#: ../libpurple/protocols/oscar/oscar.c:6034 +#: ../libpurple/protocols/oscar/oscar.c:6070 msgid "Web aware (enabling this will cause you to receive SPAM!)" msgstr "Disponível na Web (você vai receber SPAM ao ativar isto!)" -#: ../libpurple/protocols/oscar/oscar.c:6039 +#: ../libpurple/protocols/oscar/oscar.c:6075 msgid "ICQ Privacy Options" msgstr "Opções de privacidade do ICQ" -#: ../libpurple/protocols/oscar/oscar.c:6058 +#: ../libpurple/protocols/oscar/oscar.c:6094 msgid "The new formatting is invalid." msgstr "A nova formatação é inválida." -#: ../libpurple/protocols/oscar/oscar.c:6059 +#: ../libpurple/protocols/oscar/oscar.c:6095 msgid "Screen name formatting can change only capitalization and whitespace." msgstr "" "A formatação do nome do usuário pode mudar apenas a capitalização e os " "espaços." -#: ../libpurple/protocols/oscar/oscar.c:6112 +#: ../libpurple/protocols/oscar/oscar.c:6148 msgid "Change Address To:" msgstr "Mudar endereço para:" -#: ../libpurple/protocols/oscar/oscar.c:6158 +#: ../libpurple/protocols/oscar/oscar.c:6194 msgid "you are not waiting for authorization" msgstr "você não está esperando autorização" -#: ../libpurple/protocols/oscar/oscar.c:6161 +#: ../libpurple/protocols/oscar/oscar.c:6197 msgid "You are awaiting authorization from the following buddies" msgstr "Você está esperando autorização dos seguintes amigos" -#: ../libpurple/protocols/oscar/oscar.c:6162 +#: ../libpurple/protocols/oscar/oscar.c:6198 msgid "" "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" @@ -7807,73 +9105,73 @@ "Você pode re-requisitar autorização destes amigos clicando com o botão " "direito neles e selecionando \"Re-requisitar autorização.\"" -#: ../libpurple/protocols/oscar/oscar.c:6179 +#: ../libpurple/protocols/oscar/oscar.c:6215 msgid "Find Buddy by E-Mail" msgstr "Encontrar amigo por e-mail" -#: ../libpurple/protocols/oscar/oscar.c:6180 +#: ../libpurple/protocols/oscar/oscar.c:6216 msgid "Search for a buddy by e-mail address" msgstr "Procurar por um amigo pelo endereço de e-mail" -#: ../libpurple/protocols/oscar/oscar.c:6181 +#: ../libpurple/protocols/oscar/oscar.c:6217 msgid "Type the e-mail address of the buddy you are searching for." msgstr "Digite o endereço de e-mail do amigo que você está procurando." -#: ../libpurple/protocols/oscar/oscar.c:6184 +#: ../libpurple/protocols/oscar/oscar.c:6220 msgid "_Search" msgstr "_Procurar" -#: ../libpurple/protocols/oscar/oscar.c:6342 +#: ../libpurple/protocols/oscar/oscar.c:6378 msgid "Set User Info (URL)..." msgstr "Definir informações de usuário (URL)..." -#: ../libpurple/protocols/oscar/oscar.c:6353 +#: ../libpurple/protocols/oscar/oscar.c:6389 msgid "Change Password (URL)" msgstr "Mudar senha (URL)" -#: ../libpurple/protocols/oscar/oscar.c:6357 +#: ../libpurple/protocols/oscar/oscar.c:6393 msgid "Configure IM Forwarding (URL)" msgstr "Configurar encaminhamento de mensagens (URL)" #. ICQ actions -#: ../libpurple/protocols/oscar/oscar.c:6367 +#: ../libpurple/protocols/oscar/oscar.c:6403 msgid "Set Privacy Options..." msgstr "Definir opções de privacidade..." #. AIM actions -#: ../libpurple/protocols/oscar/oscar.c:6374 +#: ../libpurple/protocols/oscar/oscar.c:6410 msgid "Confirm Account" msgstr "Confirmar conta" -#: ../libpurple/protocols/oscar/oscar.c:6378 +#: ../libpurple/protocols/oscar/oscar.c:6414 msgid "Display Currently Registered E-Mail Address" msgstr "Mostrar o endereço de E-Mail registrado atualmente" -#: ../libpurple/protocols/oscar/oscar.c:6382 +#: ../libpurple/protocols/oscar/oscar.c:6418 msgid "Change Currently Registered E-Mail Address..." msgstr "Mudar o endereço de E-Mail registrado atualmente..." -#: ../libpurple/protocols/oscar/oscar.c:6389 +#: ../libpurple/protocols/oscar/oscar.c:6425 msgid "Show Buddies Awaiting Authorization" msgstr "Mostrar amigos esperando autorização" -#: ../libpurple/protocols/oscar/oscar.c:6395 +#: ../libpurple/protocols/oscar/oscar.c:6431 msgid "Search for Buddy by E-Mail Address..." msgstr "Procurar por amigos pelo endereço de E-Mail..." -#: ../libpurple/protocols/oscar/oscar.c:6400 +#: ../libpurple/protocols/oscar/oscar.c:6436 msgid "Search for Buddy by Information" msgstr "Procurar por amigos por informações" -#: ../libpurple/protocols/oscar/oscar.c:6468 +#: ../libpurple/protocols/oscar/oscar.c:6504 msgid "Use recent buddies group" msgstr "Mostrar grupo \"Amigos Recentes\"" -#: ../libpurple/protocols/oscar/oscar.c:6471 +#: ../libpurple/protocols/oscar/oscar.c:6507 msgid "Show how long you have been idle" msgstr "Mostra por quanto tempo você esteve inativo" -#: ../libpurple/protocols/oscar/oscar.c:6626 +#: ../libpurple/protocols/oscar/oscar.c:6662 msgid "" "Always use ICQ proxy server for file transfers\n" "(slower, but does not reveal your IP address)" @@ -7881,27 +9179,27 @@ "Sempre usar o proxy do servidor ICQ para transferências de arquivo\n" "(mais lento, mas não revela seu endereço IP)" -#: ../libpurple/protocols/oscar/peer.c:674 +#: ../libpurple/protocols/oscar/peer.c:697 #, c-format msgid "Asking %s to connect to us at %s:%hu for Direct IM." msgstr "" "Pedindo para %s conectar a nós em %s:%hu para mensagem instantânea direta." -#: ../libpurple/protocols/oscar/peer.c:759 +#: ../libpurple/protocols/oscar/peer.c:782 #, c-format msgid "Attempting to connect to %s:%hu." msgstr "Tentando conectar a %s:%hu." -#: ../libpurple/protocols/oscar/peer.c:833 +#: ../libpurple/protocols/oscar/peer.c:856 msgid "Attempting to connect via proxy server." msgstr "Tentando conectar pelo servidor proxy." -#: ../libpurple/protocols/oscar/peer.c:1010 +#: ../libpurple/protocols/oscar/peer.c:1033 #, c-format msgid "%s has just asked to directly connect to %s" msgstr "%s acabou de pedir para fazer uma conexão direta com %s" -#: ../libpurple/protocols/oscar/peer.c:1014 +#: ../libpurple/protocols/oscar/peer.c:1037 msgid "" "This requires a direct connection between the two computers and is necessary " "for IM Images. Because your IP address will be revealed, this may be " @@ -8110,14 +9408,6 @@ msgid "Sorry, you are not my type..." msgstr "Desculpe, você não faz meu tipo..." -#: ../libpurple/protocols/qq/buddy_opt.c:214 -#: ../libpurple/protocols/qq/group_im.c:144 -#: ../libpurple/protocols/qq/group_opt.c:127 -#: ../libpurple/protocols/qq/sys_msg.c:90 -#: ../libpurple/protocols/qq/sys_msg.c:246 -msgid "Reject" -msgstr "Rejeitar" - #: ../libpurple/protocols/qq/buddy_opt.c:277 msgid "Add buddy with auth request failed" msgstr "Falha ao adicionar amigo com pedido de autenticação" @@ -8523,8 +9813,9 @@ msgstr "Você foi adicionado por %s" #: ../libpurple/protocols/qq/sys_msg.c:169 -msgid "Would like to add him?" -msgstr "Deseja adicioná-lo(a)?" +#: ../libpurple/protocols/qq/sys_msg.c:263 +msgid "Would you like to add him?" +msgstr "Você deseja adicioná-lo?" #: ../libpurple/protocols/qq/sys_msg.c:176 #, c-format @@ -8557,10 +9848,6 @@ msgid "%s is not in your buddy list" msgstr "%s não está na sua lista de amigos" -#: ../libpurple/protocols/qq/sys_msg.c:263 -msgid "Would you like to add him?" -msgstr "Você deseja adicioná-lo?" - #: ../libpurple/protocols/sametime/sametime.c:417 msgid "Connection closed (writing)" msgstr "Conexão fechada (escrevendo)" @@ -8624,10 +9911,6 @@ msgid "Starting Services" msgstr "Iniciando serviços" -#: ../libpurple/protocols/sametime/sametime.c:1544 -msgid "Connected" -msgstr "Conectado" - #: ../libpurple/protocols/sametime/sametime.c:1645 #, c-format msgid "" @@ -8650,7 +9933,7 @@ #. this is a regular connect, error out #: ../libpurple/protocols/sametime/sametime.c:1732 -#: ../libpurple/protocols/sametime/sametime.c:3727 +#: ../libpurple/protocols/sametime/sametime.c:3726 msgid "Unable to connect to host" msgstr "Não foi possível conectar ao servidor." @@ -8671,37 +9954,33 @@ msgid "Place Closed" msgstr "Local fechado" -#: ../libpurple/protocols/sametime/sametime.c:3230 +#: ../libpurple/protocols/sametime/sametime.c:3229 msgid "Microphone" msgstr "Microfone" +#: ../libpurple/protocols/sametime/sametime.c:3230 +msgid "Speakers" +msgstr "Caixas de som" + #: ../libpurple/protocols/sametime/sametime.c:3231 -msgid "Speakers" -msgstr "Caixas de som" - -#: ../libpurple/protocols/sametime/sametime.c:3232 msgid "Video Camera" msgstr "Câmera de vídeo" -#: ../libpurple/protocols/sametime/sametime.c:3236 -msgid "File Transfer" -msgstr "Transferência de arquivo" - -#: ../libpurple/protocols/sametime/sametime.c:3270 -#: ../libpurple/protocols/sametime/sametime.c:4146 +#: ../libpurple/protocols/sametime/sametime.c:3269 +#: ../libpurple/protocols/sametime/sametime.c:4145 msgid "Supports" msgstr "Suporta" -#: ../libpurple/protocols/sametime/sametime.c:3275 -#: ../libpurple/protocols/sametime/sametime.c:4120 +#: ../libpurple/protocols/sametime/sametime.c:3274 +#: ../libpurple/protocols/sametime/sametime.c:4119 msgid "External User" msgstr "Usuário externo" -#: ../libpurple/protocols/sametime/sametime.c:3381 +#: ../libpurple/protocols/sametime/sametime.c:3380 msgid "Create conference with user" msgstr "Criar conferência com usuário" -#: ../libpurple/protocols/sametime/sametime.c:3382 +#: ../libpurple/protocols/sametime/sametime.c:3381 #, c-format msgid "" "Please enter a topic for the new conference, and an invitation message to be " @@ -8710,27 +9989,27 @@ "Favor digitar um tópico para a nova conferência, e uma mensagem de convite " "para ser enviada para %s" -#: ../libpurple/protocols/sametime/sametime.c:3386 +#: ../libpurple/protocols/sametime/sametime.c:3385 msgid "New Conference" msgstr "Nova conferência" -#: ../libpurple/protocols/sametime/sametime.c:3388 +#: ../libpurple/protocols/sametime/sametime.c:3387 msgid "Create" msgstr "Criar" -#: ../libpurple/protocols/sametime/sametime.c:3453 +#: ../libpurple/protocols/sametime/sametime.c:3452 msgid "Available Conferences" msgstr "Conferências disponíveis" -#: ../libpurple/protocols/sametime/sametime.c:3459 +#: ../libpurple/protocols/sametime/sametime.c:3458 msgid "Create New Conference..." msgstr "Criar nova conferência..." +#: ../libpurple/protocols/sametime/sametime.c:3465 +msgid "Invite user to a conference" +msgstr "Convidar usuário para uma conferência" + #: ../libpurple/protocols/sametime/sametime.c:3466 -msgid "Invite user to a conference" -msgstr "Convidar usuário para uma conferência" - -#: ../libpurple/protocols/sametime/sametime.c:3467 #, c-format msgid "" "Select a conference from the list below to send an invite to user %s. Select " @@ -8741,27 +10020,27 @@ "usuário %s. Selecione \"Criar nova conferência\" se você deseja criar uma " "nova conferência e convidar este usuário para ela." -#: ../libpurple/protocols/sametime/sametime.c:3472 +#: ../libpurple/protocols/sametime/sametime.c:3471 msgid "Invite to Conference" msgstr "Convidar para uma conferência" -#: ../libpurple/protocols/sametime/sametime.c:3563 +#: ../libpurple/protocols/sametime/sametime.c:3562 msgid "Invite to Conference..." msgstr "Convidar para conferência..." -#: ../libpurple/protocols/sametime/sametime.c:3568 +#: ../libpurple/protocols/sametime/sametime.c:3567 msgid "Send TEST Announcement" msgstr "Enviar anúncio TEST" -#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4307 +#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4361 msgid "Topic:" msgstr "Tópico:" -#: ../libpurple/protocols/sametime/sametime.c:3615 +#: ../libpurple/protocols/sametime/sametime.c:3614 msgid "No Sametime Community Server specified" msgstr "Nenhum servidor comunitário do Sametime especificado" -#: ../libpurple/protocols/sametime/sametime.c:3637 +#: ../libpurple/protocols/sametime/sametime.c:3636 #, c-format msgid "" "No host or IP address has been configured for the Meanwhile account %s. " @@ -8770,42 +10049,42 @@ "Nenhum servidor ou endereço IP foi configurado para a conta %s do Meanwhile. " "Favor digitar um abaixo para continuar o processo de conexão." -#: ../libpurple/protocols/sametime/sametime.c:3642 +#: ../libpurple/protocols/sametime/sametime.c:3641 msgid "Meanwhile Connection Setup" msgstr "Configuração da conexão do Meanwhile" -#: ../libpurple/protocols/sametime/sametime.c:3643 +#: ../libpurple/protocols/sametime/sametime.c:3642 msgid "No Sametime Community Server Specified" msgstr "Nenhum servidor comunitário do Sametime especificado" -#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4024 +#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038 msgid "Connect" msgstr "Conectar" -#: ../libpurple/protocols/sametime/sametime.c:4136 +#: ../libpurple/protocols/sametime/sametime.c:4135 #, c-format msgid "Unknown (0x%04x)
" msgstr "Desconhecido (0x%04x)
" -#: ../libpurple/protocols/sametime/sametime.c:4138 +#: ../libpurple/protocols/sametime/sametime.c:4137 msgid "Last Known Client" msgstr "Último cliente conhecido" -#: ../libpurple/protocols/sametime/sametime.c:4302 -#: ../libpurple/protocols/sametime/sametime.c:5507 +#: ../libpurple/protocols/sametime/sametime.c:4301 +#: ../libpurple/protocols/sametime/sametime.c:5506 msgid "User Name" msgstr "Nome do usuário" -#: ../libpurple/protocols/sametime/sametime.c:4305 -#: ../libpurple/protocols/sametime/sametime.c:5510 +#: ../libpurple/protocols/sametime/sametime.c:4304 +#: ../libpurple/protocols/sametime/sametime.c:5509 msgid "Sametime ID" msgstr "ID do Sametime" -#: ../libpurple/protocols/sametime/sametime.c:4329 +#: ../libpurple/protocols/sametime/sametime.c:4328 msgid "An ambiguous user ID was entered" msgstr "Um ID de usuário ambíguo foi digitado" -#: ../libpurple/protocols/sametime/sametime.c:4330 +#: ../libpurple/protocols/sametime/sametime.c:4329 #, c-format msgid "" "The identifier '%s' may possibly refer to any of the following users. Please " @@ -8815,15 +10094,15 @@ "Por favor selecione o usuário correto a partir da lista abaixo para adicioná-" "lo a sua lista de amigos." -#: ../libpurple/protocols/sametime/sametime.c:4335 +#: ../libpurple/protocols/sametime/sametime.c:4334 msgid "Select User" msgstr "Selecionar usuário" -#: ../libpurple/protocols/sametime/sametime.c:4419 +#: ../libpurple/protocols/sametime/sametime.c:4418 msgid "Unable to add user: user not found" msgstr "Não foi possível adicionar usuário: usuário não encontrado" -#: ../libpurple/protocols/sametime/sametime.c:4421 +#: ../libpurple/protocols/sametime/sametime.c:4420 #, c-format msgid "" "The identifier '%s' did not match any users in your Sametime community. This " @@ -8832,11 +10111,11 @@ "O identificador '%s' não corresponde a nenhum usuário na sua comunidade do " "Sametime. Esta entrada foi removida da sua lista de amigos." -#: ../libpurple/protocols/sametime/sametime.c:4426 +#: ../libpurple/protocols/sametime/sametime.c:4425 msgid "Unable to add user" msgstr "Não foi possível adicionar usuário" -#: ../libpurple/protocols/sametime/sametime.c:5012 +#: ../libpurple/protocols/sametime/sametime.c:5011 #, c-format msgid "" "Error reading file %s: \n" @@ -8845,63 +10124,63 @@ "Erro ao ler arquivo %s: \n" "%s\n" -#: ../libpurple/protocols/sametime/sametime.c:5147 +#: ../libpurple/protocols/sametime/sametime.c:5146 msgid "Remotely Stored Buddy List" msgstr "Lista de amigos armazenada remotamente" -#: ../libpurple/protocols/sametime/sametime.c:5152 +#: ../libpurple/protocols/sametime/sametime.c:5151 msgid "Buddy List Storage Mode" msgstr "Modo de armazenamento da lista de amigos" -#: ../libpurple/protocols/sametime/sametime.c:5155 +#: ../libpurple/protocols/sametime/sametime.c:5154 msgid "Local Buddy List Only" msgstr "Apenas lista de amigos local" -#: ../libpurple/protocols/sametime/sametime.c:5157 +#: ../libpurple/protocols/sametime/sametime.c:5156 msgid "Merge List from Server" msgstr "Mesclar lista do servidor" -#: ../libpurple/protocols/sametime/sametime.c:5159 +#: ../libpurple/protocols/sametime/sametime.c:5158 msgid "Merge and Save List to Server" msgstr "Mesclar e salvar lista do servidor" -#: ../libpurple/protocols/sametime/sametime.c:5161 +#: ../libpurple/protocols/sametime/sametime.c:5160 msgid "Synchronize List with Server" msgstr "Sincronizar lista com o servidor" -#: ../libpurple/protocols/sametime/sametime.c:5216 +#: ../libpurple/protocols/sametime/sametime.c:5215 #, c-format msgid "Import Sametime List for Account %s" msgstr "Importar lista do Sametime da conta %s" -#: ../libpurple/protocols/sametime/sametime.c:5256 +#: ../libpurple/protocols/sametime/sametime.c:5255 #, c-format msgid "Export Sametime List for Account %s" msgstr "Exportar lista do Sametime da conta %s" -#: ../libpurple/protocols/sametime/sametime.c:5310 +#: ../libpurple/protocols/sametime/sametime.c:5309 msgid "Unable to add group: group exists" msgstr "Não foi possível adicionar grupo: o grupo existe" -#: ../libpurple/protocols/sametime/sametime.c:5311 +#: ../libpurple/protocols/sametime/sametime.c:5310 #, c-format msgid "A group named '%s' already exists in your buddy list." msgstr "Um grupo com o nome '%s' já existe na sua lista de amigos." -#: ../libpurple/protocols/sametime/sametime.c:5314 -#: ../libpurple/protocols/sametime/sametime.c:5444 +#: ../libpurple/protocols/sametime/sametime.c:5313 +#: ../libpurple/protocols/sametime/sametime.c:5443 msgid "Unable to add group" msgstr "Não foi possível adicionar grupo" -#: ../libpurple/protocols/sametime/sametime.c:5373 +#: ../libpurple/protocols/sametime/sametime.c:5372 msgid "Possible Matches" msgstr "Possíveis resultados" +#: ../libpurple/protocols/sametime/sametime.c:5388 +msgid "Notes Address Book group results" +msgstr "Resultados dos grupos do catálogo de endereços do Notes" + #: ../libpurple/protocols/sametime/sametime.c:5389 -msgid "Notes Address Book group results" -msgstr "Resultados dos grupos do catálogo de endereços do Notes" - -#: ../libpurple/protocols/sametime/sametime.c:5390 #, c-format msgid "" "The identifier '%s' may possibly refer to any of the following Notes Address " @@ -8912,15 +10191,15 @@ "endereços do Notes a seguir. Favor selecionar o grupo correto da lista " "abaixo para adicioná-lo à sua lista de amigos." -#: ../libpurple/protocols/sametime/sametime.c:5395 +#: ../libpurple/protocols/sametime/sametime.c:5394 msgid "Select Notes Address Book" msgstr "Selecionar catálogo de endereços do Notes" -#: ../libpurple/protocols/sametime/sametime.c:5438 +#: ../libpurple/protocols/sametime/sametime.c:5437 msgid "Unable to add group: group not found" msgstr "Não foi possível adicionar grupo: grupo não encontrado" -#: ../libpurple/protocols/sametime/sametime.c:5440 +#: ../libpurple/protocols/sametime/sametime.c:5439 #, c-format msgid "" "The identifier '%s' did not match any Notes Address Book groups in your " @@ -8929,11 +10208,11 @@ "O identificador '%s' não corresponde a nenhum grupo do catálogo de endereços " "Notes da sua comunidade Sametime." -#: ../libpurple/protocols/sametime/sametime.c:5481 +#: ../libpurple/protocols/sametime/sametime.c:5480 msgid "Notes Address Book Group" msgstr "Grupo do catálogo de endereços Notes" -#: ../libpurple/protocols/sametime/sametime.c:5482 +#: ../libpurple/protocols/sametime/sametime.c:5481 msgid "" "Enter the name of a Notes Address Book group in the field below to add the " "group and its members to your buddy list." @@ -8941,12 +10220,12 @@ "Digite o nome de um grupo do catálogo de endereços do Notes no campo abaixo " "para adicionar o grupo e seus membros à sua lista de contatos." -#: ../libpurple/protocols/sametime/sametime.c:5531 +#: ../libpurple/protocols/sametime/sametime.c:5530 #, c-format msgid "Search results for '%s'" msgstr "Resultados da busca por '%s'" -#: ../libpurple/protocols/sametime/sametime.c:5532 +#: ../libpurple/protocols/sametime/sametime.c:5531 #, c-format msgid "" "The identifier '%s' may possibly refer to any of the following users. You " @@ -8957,31 +10236,30 @@ "Você pode adicioná-los à lista de amigos ou enviá-los mensagens com os " "botões de ação abaixo." -#. Create the window -#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:721 +#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724 msgid "Search Results" msgstr "Resultados da procura" -#: ../libpurple/protocols/sametime/sametime.c:5564 +#: ../libpurple/protocols/sametime/sametime.c:5563 msgid "No matches" msgstr "Nenhum resultado" -#: ../libpurple/protocols/sametime/sametime.c:5565 +#: ../libpurple/protocols/sametime/sametime.c:5564 #, c-format msgid "The identifier '%s' did not match any users in your Sametime community." msgstr "" "O identificador '%s' não corresponde a nenhum usuário da sua comunidade " "Sametime." -#: ../libpurple/protocols/sametime/sametime.c:5569 +#: ../libpurple/protocols/sametime/sametime.c:5568 msgid "No Matches" msgstr "Nenhum resultado" +#: ../libpurple/protocols/sametime/sametime.c:5605 +msgid "Search for a user" +msgstr "Procurar por um usuário" + #: ../libpurple/protocols/sametime/sametime.c:5606 -msgid "Search for a user" -msgstr "Procurar por um usuário" - -#: ../libpurple/protocols/sametime/sametime.c:5607 msgid "" "Enter a name or partial ID in the field below to search for matching users " "in your Sametime community." @@ -8989,32 +10267,32 @@ "Digite um nome o ID parcial no campo abaixo para procurar por usuários " "correspondentes na sua comunidade do Sametime." -#: ../libpurple/protocols/sametime/sametime.c:5610 +#: ../libpurple/protocols/sametime/sametime.c:5609 msgid "User Search" msgstr "Procurar por usuário" -#: ../libpurple/protocols/sametime/sametime.c:5623 +#: ../libpurple/protocols/sametime/sametime.c:5622 msgid "Import Sametime List..." msgstr "Importar lista do Sametime..." -#: ../libpurple/protocols/sametime/sametime.c:5627 +#: ../libpurple/protocols/sametime/sametime.c:5626 msgid "Export Sametime List..." msgstr "Exportar lista do Sametime..." -#: ../libpurple/protocols/sametime/sametime.c:5631 +#: ../libpurple/protocols/sametime/sametime.c:5630 msgid "Add Notes Address Book Group..." msgstr "Adicionar grupo do catálogo de endereços do Notes..." -#: ../libpurple/protocols/sametime/sametime.c:5635 +#: ../libpurple/protocols/sametime/sametime.c:5634 msgid "User Search..." msgstr "Busca por usuários..." -#: ../libpurple/protocols/sametime/sametime.c:5741 +#: ../libpurple/protocols/sametime/sametime.c:5740 msgid "Force login (ignore server redirects)" msgstr "Forçar conexão (ignorar redirecionamentos do servidor)" #. pretend to be Sametime Connect -#: ../libpurple/protocols/sametime/sametime.c:5751 +#: ../libpurple/protocols/sametime/sametime.c:5750 msgid "Hide client identity" msgstr "Esconder identidade do cliente" @@ -9402,13 +10680,6 @@ msgid "User Modes" msgstr "Modos do usuário" -#: ../libpurple/protocols/silc/buddy.c:1557 -#: ../libpurple/protocols/silc/ops.c:1212 -#: ../libpurple/protocols/silc10/buddy.c:1557 -#: ../libpurple/protocols/silc10/ops.c:1207 -msgid "Mood" -msgstr "Humor" - #: ../libpurple/protocols/silc/buddy.c:1562 #: ../libpurple/protocols/silc/ops.c:1224 #: ../libpurple/protocols/silc10/buddy.c:1562 @@ -10074,13 +11345,6 @@ msgstr "Estatísticas da rede" #: ../libpurple/protocols/silc/ops.c:1596 -#: ../libpurple/protocols/silc/ops.c:1601 -#: ../libpurple/protocols/silc10/ops.c:1612 -#: ../libpurple/protocols/silc10/ops.c:1617 -msgid "Ping" -msgstr "Ping" - -#: ../libpurple/protocols/silc/ops.c:1596 #: ../libpurple/protocols/silc10/ops.c:1612 msgid "Ping failed" msgstr "Falha no ping" @@ -10237,7 +11501,7 @@ msgstr "Seu humor atual" #: ../libpurple/protocols/silc/silc.c:741 -#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638 +#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640 msgid "Normal" msgstr "Normal" @@ -10638,7 +11902,7 @@ "Internet Live Conferencing - SILC)" #: ../libpurple/protocols/silc/silc.c:1910 -#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031 +#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035 msgid "Network" msgstr "Rede" @@ -10898,26 +12162,30 @@ msgstr "Não foi possível enviar" #: ../libpurple/protocols/simple/simple.c:438 -#: ../libpurple/protocols/simple/simple.c:1489 +#: ../libpurple/protocols/simple/simple.c:1529 msgid "Could not connect" msgstr "Não foi possível conectar" -#: ../libpurple/protocols/simple/simple.c:1523 -#: ../libpurple/protocols/simple/simple.c:1565 -#: ../libpurple/protocols/simple/simple.c:1578 -#: ../libpurple/protocols/simple/simple.c:1629 +#: ../libpurple/protocols/simple/simple.c:1059 +msgid "Unknown server response." +msgstr "Resposta do servidor desconhecida." + +#: ../libpurple/protocols/simple/simple.c:1563 +#: ../libpurple/protocols/simple/simple.c:1605 +#: ../libpurple/protocols/simple/simple.c:1618 +#: ../libpurple/protocols/simple/simple.c:1669 msgid "Could not create listen socket" msgstr "Não foi possível criar socket de escuta" -#: ../libpurple/protocols/simple/simple.c:1546 +#: ../libpurple/protocols/simple/simple.c:1586 msgid "Couldn't resolve host" msgstr "Não foi possível resolver ao host" -#: ../libpurple/protocols/simple/simple.c:1637 +#: ../libpurple/protocols/simple/simple.c:1677 msgid "Could not resolve hostname" msgstr "Não foi possível resolver host" -#: ../libpurple/protocols/simple/simple.c:1654 +#: ../libpurple/protocols/simple/simple.c:1694 msgid "SIP screen names may not contain whitespaces or @ symbols" msgstr "Nomes de usuário do SIP não podem conter espaços ou arrobas" @@ -10929,36 +12197,36 @@ #. *< id #. *< name #. *< version -#: ../libpurple/protocols/simple/simple.c:1829 +#: ../libpurple/protocols/simple/simple.c:1870 msgid "SIP/SIMPLE Protocol Plugin" msgstr "Plugin do protocolo SIP/SIMPLE" #. * summary -#: ../libpurple/protocols/simple/simple.c:1830 +#: ../libpurple/protocols/simple/simple.c:1871 msgid "The SIP/SIMPLE Protocol Plugin" msgstr "Plugin do protocolo SIP/SIMPLE" -#: ../libpurple/protocols/simple/simple.c:1858 +#: ../libpurple/protocols/simple/simple.c:1899 msgid "Publish status (note: everyone may watch you)" msgstr "Anunciar status (nota: todos podem te observar)" -#: ../libpurple/protocols/simple/simple.c:1864 +#: ../libpurple/protocols/simple/simple.c:1905 msgid "Use UDP" msgstr "Usar UDP" -#: ../libpurple/protocols/simple/simple.c:1866 +#: ../libpurple/protocols/simple/simple.c:1907 msgid "Use proxy" msgstr "Usar proxy" -#: ../libpurple/protocols/simple/simple.c:1868 +#: ../libpurple/protocols/simple/simple.c:1909 msgid "Proxy" msgstr "Proxy" -#: ../libpurple/protocols/simple/simple.c:1870 +#: ../libpurple/protocols/simple/simple.c:1911 msgid "Auth User" msgstr "Usuário de autenticação" -#: ../libpurple/protocols/simple/simple.c:1872 +#: ../libpurple/protocols/simple/simple.c:1913 msgid "Auth Domain" msgstr "Domínio de autenticação" @@ -11124,8 +12392,8 @@ msgid "Password Change Successful" msgstr "Mudança de senha efetuada com sucesso" -#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5530 -#: ../pidgin/gtkblist.c:5883 +#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576 +#: ../pidgin/gtkblist.c:5929 msgid "_Group:" msgstr "_Grupo:" @@ -11188,32 +12456,26 @@ msgid "TOC Protocol Plugin" msgstr "Plugin do protocolo TOC" -#: ../libpurple/protocols/yahoo/yahoo.c:823 +#: ../libpurple/protocols/yahoo/yahoo.c:782 +#, c-format +msgid "%s has sent you a webcam invite, which is not yet supported." +msgstr "" +"%s te enviou um convite para ver webcam, que é um recurso não suportado." + +#: ../libpurple/protocols/yahoo/yahoo.c:838 msgid "Your Yahoo! message did not get sent." msgstr "Sua mensagem do Yahoo! não foi enviada." -#: ../libpurple/protocols/yahoo/yahoo.c:895 -#, c-format -msgid "%s just sent you a Buzz!" -msgstr "%s está chamando sua atenção!" - -#: ../libpurple/protocols/yahoo/yahoo.c:942 +#: ../libpurple/protocols/yahoo/yahoo.c:957 #, c-format msgid "Yahoo! system message for %s:" msgstr "Mensagem do sistema Yahoo! para %s:" -#: ../libpurple/protocols/yahoo/yahoo.c:1003 +#: ../libpurple/protocols/yahoo/yahoo.c:1026 msgid "Authorization denied message:" msgstr "Mensagem de recusa de autorização:" -#: ../libpurple/protocols/yahoo/yahoo.c:1084 -#, c-format -msgid "%s has (retroactively) denied your request to add them to your list." -msgstr "" -"O usuário %s (retroativamente) negou seu pedido para adicioná-lo à sua lista " -"de amigos." - -#: ../libpurple/protocols/yahoo/yahoo.c:1087 +#: ../libpurple/protocols/yahoo/yahoo.c:1044 #, c-format msgid "" "%s has (retroactively) denied your request to add them to your list for the " @@ -11222,11 +12484,18 @@ "O usuário %s (retroativamente) negou seu pedido para adicioná-lo à sua lista " "de amigos com o seguinte motivo: %s." -#: ../libpurple/protocols/yahoo/yahoo.c:1090 +#: ../libpurple/protocols/yahoo/yahoo.c:1047 +#, c-format +msgid "%s has (retroactively) denied your request to add them to your list." +msgstr "" +"O usuário %s (retroativamente) negou seu pedido para adicioná-lo à sua lista " +"de amigos." + +#: ../libpurple/protocols/yahoo/yahoo.c:1049 msgid "Add buddy rejected" msgstr "Pedido para adicionar amigo negado" -#: ../libpurple/protocols/yahoo/yahoo.c:1841 +#: ../libpurple/protocols/yahoo/yahoo.c:1991 #, c-format msgid "" "The Yahoo server has requested the use of an unrecognized authentication " @@ -11237,11 +12506,11 @@ "desconhecido. Provavelmente, você não conseguirá conectar com sucesso ao " "Yahoo. Verifique %s por atualizações." -#: ../libpurple/protocols/yahoo/yahoo.c:1844 +#: ../libpurple/protocols/yahoo/yahoo.c:1994 msgid "Failed Yahoo! Authentication" msgstr "Falha na autenticação do Yahoo!" -#: ../libpurple/protocols/yahoo/yahoo.c:1910 +#: ../libpurple/protocols/yahoo/yahoo.c:2060 #, c-format msgid "" "You have tried to ignore %s, but the user is on your buddy list. Clicking " @@ -11250,52 +12519,52 @@ "Você tentou ignorar %s, mas o usuário está na sua lista de amigos. Ao clicar " "\"Sim\" o usuário será removido e ignorado." -#: ../libpurple/protocols/yahoo/yahoo.c:1913 +#: ../libpurple/protocols/yahoo/yahoo.c:2063 msgid "Ignore buddy?" msgstr "Ignorar amigo?" -#: ../libpurple/protocols/yahoo/yahoo.c:1976 +#: ../libpurple/protocols/yahoo/yahoo.c:2126 msgid "Your account is locked, please log in to the Yahoo! website." msgstr "Sua conta está travada, favor entrar no site do Yahoo!." -#: ../libpurple/protocols/yahoo/yahoo.c:1979 +#: ../libpurple/protocols/yahoo/yahoo.c:2129 #, c-format msgid "Unknown error number %d. Logging into the Yahoo! website may fix this." msgstr "" "Número de erro %d desconhecido. Entrar na sua conta no site do Yahoo! pode " "corrigir isso." -#: ../libpurple/protocols/yahoo/yahoo.c:2033 +#: ../libpurple/protocols/yahoo/yahoo.c:2183 #, c-format msgid "Could not add buddy %s to group %s to the server list on account %s." msgstr "" "Não foi possível adicionar o amigo %s ao grupo %s à lista do servidor na " "conta %s." -#: ../libpurple/protocols/yahoo/yahoo.c:2036 +#: ../libpurple/protocols/yahoo/yahoo.c:2186 msgid "Could not add buddy to server list" msgstr "Não foi possível adicionar amigo à lista do servidor" -#: ../libpurple/protocols/yahoo/yahoo.c:2155 +#: ../libpurple/protocols/yahoo/yahoo.c:2305 #, c-format msgid "[ Audible %s/%s/%s.swf ] %s" msgstr "[ Audível %s/%s/%s.swf ] %s" -#: ../libpurple/protocols/yahoo/yahoo.c:2495 +#: ../libpurple/protocols/yahoo/yahoo.c:2648 msgid "Received unexpected HTTP response from server." msgstr "O servidor retornou uma resposta HTTP inválida." -#: ../libpurple/protocols/yahoo/yahoo.c:2519 -#: ../libpurple/protocols/yahoo/yahoo.c:2705 -#: ../libpurple/protocols/yahoo/yahoo.c:2808 -#: ../libpurple/protocols/yahoo/yahoo.c:2818 -#: ../libpurple/protocols/yahoo/yahoochat.c:1418 -#: ../libpurple/protocols/yahoo/yahoochat.c:1488 +#: ../libpurple/protocols/yahoo/yahoo.c:2672 +#: ../libpurple/protocols/yahoo/yahoo.c:2858 +#: ../libpurple/protocols/yahoo/yahoo.c:2961 +#: ../libpurple/protocols/yahoo/yahoo.c:2971 +#: ../libpurple/protocols/yahoo/yahoochat.c:1514 +#: ../libpurple/protocols/yahoo/yahoochat.c:1584 #: ../libpurple/protocols/yahoo/ycht.c:585 msgid "Connection problem" msgstr "Problema na conexão" -#: ../libpurple/protocols/yahoo/yahoo.c:2545 +#: ../libpurple/protocols/yahoo/yahoo.c:2698 #, c-format msgid "" "Lost connection with %s:\n" @@ -11304,7 +12573,7 @@ "A conexão com %s foi perdida:\n" "%s" -#: ../libpurple/protocols/yahoo/yahoo.c:2570 +#: ../libpurple/protocols/yahoo/yahoo.c:2723 #, c-format msgid "" "Could not establish a connection with %s:\n" @@ -11313,112 +12582,112 @@ "Não foi possível estabelecer conexão com %s:\n" "%s" -#: ../libpurple/protocols/yahoo/yahoo.c:2920 -#: ../libpurple/protocols/yahoo/yahoo.c:3606 +#: ../libpurple/protocols/yahoo/yahoo.c:3078 +#: ../libpurple/protocols/yahoo/yahoo.c:3764 msgid "Not at Home" msgstr "Fora de casa" -#: ../libpurple/protocols/yahoo/yahoo.c:2922 -#: ../libpurple/protocols/yahoo/yahoo.c:3609 +#: ../libpurple/protocols/yahoo/yahoo.c:3080 +#: ../libpurple/protocols/yahoo/yahoo.c:3767 msgid "Not at Desk" msgstr "Não estou por perto" -#: ../libpurple/protocols/yahoo/yahoo.c:2924 -#: ../libpurple/protocols/yahoo/yahoo.c:3612 +#: ../libpurple/protocols/yahoo/yahoo.c:3082 +#: ../libpurple/protocols/yahoo/yahoo.c:3770 msgid "Not in Office" msgstr "Fora do escritório" -#: ../libpurple/protocols/yahoo/yahoo.c:2928 -#: ../libpurple/protocols/yahoo/yahoo.c:3618 +#: ../libpurple/protocols/yahoo/yahoo.c:3086 +#: ../libpurple/protocols/yahoo/yahoo.c:3776 msgid "On Vacation" msgstr "De férias" -#: ../libpurple/protocols/yahoo/yahoo.c:2932 -#: ../libpurple/protocols/yahoo/yahoo.c:3624 +#: ../libpurple/protocols/yahoo/yahoo.c:3090 +#: ../libpurple/protocols/yahoo/yahoo.c:3782 msgid "Stepped Out" msgstr "Fui embora" -#: ../libpurple/protocols/yahoo/yahoo.c:3025 -#: ../libpurple/protocols/yahoo/yahoo.c:3055 +#: ../libpurple/protocols/yahoo/yahoo.c:3183 +#: ../libpurple/protocols/yahoo/yahoo.c:3213 msgid "Not on server list" msgstr "Não está na lista do servidor" -#: ../libpurple/protocols/yahoo/yahoo.c:3072 -#: ../libpurple/protocols/yahoo/yahoo.c:3130 +#: ../libpurple/protocols/yahoo/yahoo.c:3230 +#: ../libpurple/protocols/yahoo/yahoo.c:3288 msgid "Appear Online" msgstr "Parecer desconectado" -#: ../libpurple/protocols/yahoo/yahoo.c:3075 -#: ../libpurple/protocols/yahoo/yahoo.c:3151 +#: ../libpurple/protocols/yahoo/yahoo.c:3233 +#: ../libpurple/protocols/yahoo/yahoo.c:3309 msgid "Appear Permanently Offline" msgstr "Parecer desconectado permanentemente" -#: ../libpurple/protocols/yahoo/yahoo.c:3093 +#: ../libpurple/protocols/yahoo/yahoo.c:3251 msgid "Presence" msgstr "Presença" -#: ../libpurple/protocols/yahoo/yahoo.c:3136 +#: ../libpurple/protocols/yahoo/yahoo.c:3294 msgid "Appear Offline" msgstr "Parecer desconectado" -#: ../libpurple/protocols/yahoo/yahoo.c:3145 +#: ../libpurple/protocols/yahoo/yahoo.c:3303 msgid "Don't Appear Permanently Offline" msgstr "Não aparecer permanentemente desconectado" -#: ../libpurple/protocols/yahoo/yahoo.c:3193 +#: ../libpurple/protocols/yahoo/yahoo.c:3351 msgid "Join in Chat" msgstr "Entrar em um bate-papo" -#: ../libpurple/protocols/yahoo/yahoo.c:3199 +#: ../libpurple/protocols/yahoo/yahoo.c:3357 msgid "Initiate Conference" msgstr "Iniciar conferência" -#: ../libpurple/protocols/yahoo/yahoo.c:3227 +#: ../libpurple/protocols/yahoo/yahoo.c:3385 msgid "Presence Settings" msgstr "Configurações de presença" -#: ../libpurple/protocols/yahoo/yahoo.c:3233 +#: ../libpurple/protocols/yahoo/yahoo.c:3391 msgid "Start Doodling" msgstr "Começar a desenhar" -#: ../libpurple/protocols/yahoo/yahoo.c:3334 +#: ../libpurple/protocols/yahoo/yahoo.c:3492 msgid "Activate which ID?" msgstr "Ativar qual ID?" -#: ../libpurple/protocols/yahoo/yahoo.c:3345 +#: ../libpurple/protocols/yahoo/yahoo.c:3503 msgid "Join whom in chat?" msgstr "Juntar-se a quem no bate-papo?" -#: ../libpurple/protocols/yahoo/yahoo.c:3357 +#: ../libpurple/protocols/yahoo/yahoo.c:3515 msgid "Activate ID..." msgstr "Ativar ID..." -#: ../libpurple/protocols/yahoo/yahoo.c:3361 +#: ../libpurple/protocols/yahoo/yahoo.c:3519 msgid "Join User in Chat..." msgstr "Ingressar usuário no bate-papo..." -#: ../libpurple/protocols/yahoo/yahoo.c:3366 +#: ../libpurple/protocols/yahoo/yahoo.c:3524 msgid "Open Inbox" msgstr "Abrir caixa de entrada" -#: ../libpurple/protocols/yahoo/yahoo.c:3881 -msgid "You have just sent a Buzz!" -msgstr "Você acabou de chamar a atenção do usuário!" - -#: ../libpurple/protocols/yahoo/yahoo.c:3940 +#: ../libpurple/protocols/yahoo/yahoo.c:4116 +msgid "Buzz" +msgstr "Chamar a atenção" + +#: ../libpurple/protocols/yahoo/yahoo.c:4118 +#, c-format +msgid "Buzzing %s..." +msgstr "Chamando a atenção de %s..." + +#: ../libpurple/protocols/yahoo/yahoo.c:4133 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "join <sala>: Entra numa sala de bate-papo na rede do Yahoo" -#: ../libpurple/protocols/yahoo/yahoo.c:3945 +#: ../libpurple/protocols/yahoo/yahoo.c:4138 msgid "list: List rooms on the Yahoo network" msgstr "list: Lista as salas desta rede do Yahoo" -#: ../libpurple/protocols/yahoo/yahoo.c:3949 -msgid "buzz: Buzz a user to get their attention" -msgstr "" -"buzz: Envia um alerta (buzz) para um usuário de modo a chamar a sua atenção" - -#: ../libpurple/protocols/yahoo/yahoo.c:3953 +#: ../libpurple/protocols/yahoo/yahoo.c:4146 msgid "doodle: Request user to start a Doodle session" msgstr "doodle: Pede ao usuário para iniciar uma sessão para desenhar" @@ -11432,131 +12701,59 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/yahoo/yahoo.c:4161 -#: ../libpurple/protocols/yahoo/yahoo.c:4163 +#: ../libpurple/protocols/yahoo/yahoo.c:4355 +#: ../libpurple/protocols/yahoo/yahoo.c:4357 msgid "Yahoo Protocol Plugin" msgstr "Plugin do protocolo Yahoo" -#: ../libpurple/protocols/yahoo/yahoo.c:4186 +#: ../libpurple/protocols/yahoo/yahoo.c:4380 msgid "Yahoo Japan" msgstr "Yahoo Japão" -#: ../libpurple/protocols/yahoo/yahoo.c:4189 +#: ../libpurple/protocols/yahoo/yahoo.c:4383 msgid "Pager server" msgstr "Servidor do pager" -#: ../libpurple/protocols/yahoo/yahoo.c:4192 +#: ../libpurple/protocols/yahoo/yahoo.c:4386 msgid "Japan Pager server" msgstr "Servidor japonês do pager" -#: ../libpurple/protocols/yahoo/yahoo.c:4195 +#: ../libpurple/protocols/yahoo/yahoo.c:4389 msgid "Pager port" msgstr "Porta do pager" -#: ../libpurple/protocols/yahoo/yahoo.c:4198 +#: ../libpurple/protocols/yahoo/yahoo.c:4392 msgid "File transfer server" msgstr "Servidor de transferência de arquivo" -#: ../libpurple/protocols/yahoo/yahoo.c:4201 +#: ../libpurple/protocols/yahoo/yahoo.c:4395 msgid "Japan file transfer server" msgstr "Servidor japonês de transferência de arquivo" -#: ../libpurple/protocols/yahoo/yahoo.c:4204 +#: ../libpurple/protocols/yahoo/yahoo.c:4398 msgid "File transfer port" msgstr "Porta da transferência de arquivo" -#: ../libpurple/protocols/yahoo/yahoo.c:4207 +#: ../libpurple/protocols/yahoo/yahoo.c:4401 msgid "Chat room locale" msgstr "Locale da sala de bate-papo" -#: ../libpurple/protocols/yahoo/yahoo.c:4210 +#: ../libpurple/protocols/yahoo/yahoo.c:4404 msgid "Ignore conference and chatroom invitations" msgstr "Ignorar convites para bate-papos e conferências" -#: ../libpurple/protocols/yahoo/yahoo.c:4218 +#: ../libpurple/protocols/yahoo/yahoo.c:4412 msgid "Chat room list URL" msgstr "URL da lista de salas de bate-papo" -#: ../libpurple/protocols/yahoo/yahoo.c:4221 +#: ../libpurple/protocols/yahoo/yahoo.c:4415 msgid "Yahoo Chat server" msgstr "Servidor de bate-papo do Yahoo" -#: ../libpurple/protocols/yahoo/yahoo.c:4224 +#: ../libpurple/protocols/yahoo/yahoo.c:4418 msgid "Yahoo Chat port" msgstr "Porta de bate-papo do Yahoo" -#: ../libpurple/protocols/yahoo/yahoochat.c:204 -#, c-format -msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." -msgstr "" -"%s rejeitou seu convite para uma conferência na sala \"%s\" porque \"%s\"." - -#: ../libpurple/protocols/yahoo/yahoochat.c:206 -msgid "Invitation Rejected" -msgstr "Convite rejeitado" - -#: ../libpurple/protocols/yahoo/yahoochat.c:362 -msgid "Failed to join chat" -msgstr "Falha ao entrar no bate-papo" - -#. -6 -#: ../libpurple/protocols/yahoo/yahoochat.c:365 -msgid "Unknown room" -msgstr "Sala desconhecida" - -#. -15 -#: ../libpurple/protocols/yahoo/yahoochat.c:368 -msgid "Maybe the room is full" -msgstr "Talvez a sala esteja cheia" - -#. -35 -#: ../libpurple/protocols/yahoo/yahoochat.c:371 -msgid "Not available" -msgstr "Não disponível" - -#: ../libpurple/protocols/yahoo/yahoochat.c:375 -msgid "" -"Unknown error. You may need to logout and wait five minutes before being " -"able to rejoin a chatroom" -msgstr "" -"Erro desconhecido. Você pode ter que desconectar e esperar cinco minutos " -"antes de poder ingressar novamente numa sala de bate-papo" - -#: ../libpurple/protocols/yahoo/yahoochat.c:453 -#, c-format -msgid "You are now chatting in %s." -msgstr "Você está conversando em %s." - -#: ../libpurple/protocols/yahoo/yahoochat.c:628 -msgid "Failed to join buddy in chat" -msgstr "Falha ao ingressar amigo no bate-papo" - -#: ../libpurple/protocols/yahoo/yahoochat.c:629 -msgid "Maybe they're not in a chat?" -msgstr "Talvez eles não estejam em um bate-papo?" - -#: ../libpurple/protocols/yahoo/yahoochat.c:1320 -#: ../libpurple/protocols/yahoo/yahoochat.c:1346 -msgid "Fetching the room list failed." -msgstr "Falha ao obter a lista de salas." - -#: ../libpurple/protocols/yahoo/yahoochat.c:1404 -msgid "Voices" -msgstr "Vozes" - -#: ../libpurple/protocols/yahoo/yahoochat.c:1407 -msgid "Webcams" -msgstr "Webcams" - -#: ../libpurple/protocols/yahoo/yahoochat.c:1418 -#: ../libpurple/protocols/yahoo/yahoochat.c:1488 -msgid "Unable to fetch room list." -msgstr "Não foi possível obter lista de salas." - -#: ../libpurple/protocols/yahoo/yahoochat.c:1481 -msgid "User Rooms" -msgstr "Salas de usuário" - #. Write a local message to this conversation showing that a request for a #. * Doodle session has been made #. @@ -11669,6 +12866,78 @@ msgid "The user's profile is empty." msgstr "O perfil do usuário está vazio." +#: ../libpurple/protocols/yahoo/yahoochat.c:217 +#, c-format +msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." +msgstr "" +"%s rejeitou seu convite para uma conferência na sala \"%s\" porque \"%s\"." + +#: ../libpurple/protocols/yahoo/yahoochat.c:219 +msgid "Invitation Rejected" +msgstr "Convite rejeitado" + +#: ../libpurple/protocols/yahoo/yahoochat.c:438 +msgid "Failed to join chat" +msgstr "Falha ao entrar no bate-papo" + +#. -6 +#: ../libpurple/protocols/yahoo/yahoochat.c:441 +msgid "Unknown room" +msgstr "Sala desconhecida" + +#. -15 +#: ../libpurple/protocols/yahoo/yahoochat.c:444 +msgid "Maybe the room is full" +msgstr "Talvez a sala esteja cheia" + +#. -35 +#: ../libpurple/protocols/yahoo/yahoochat.c:447 +msgid "Not available" +msgstr "Não disponível" + +#: ../libpurple/protocols/yahoo/yahoochat.c:451 +msgid "" +"Unknown error. You may need to logout and wait five minutes before being " +"able to rejoin a chatroom" +msgstr "" +"Erro desconhecido. Você pode ter que desconectar e esperar cinco minutos " +"antes de poder ingressar novamente numa sala de bate-papo" + +#: ../libpurple/protocols/yahoo/yahoochat.c:534 +#, c-format +msgid "You are now chatting in %s." +msgstr "Você está conversando em %s." + +#: ../libpurple/protocols/yahoo/yahoochat.c:719 +msgid "Failed to join buddy in chat" +msgstr "Falha ao ingressar amigo no bate-papo" + +#: ../libpurple/protocols/yahoo/yahoochat.c:720 +msgid "Maybe they're not in a chat?" +msgstr "Talvez eles não estejam em um bate-papo?" + +#: ../libpurple/protocols/yahoo/yahoochat.c:1416 +#: ../libpurple/protocols/yahoo/yahoochat.c:1442 +msgid "Fetching the room list failed." +msgstr "Falha ao obter a lista de salas." + +#: ../libpurple/protocols/yahoo/yahoochat.c:1500 +msgid "Voices" +msgstr "Vozes" + +#: ../libpurple/protocols/yahoo/yahoochat.c:1503 +msgid "Webcams" +msgstr "Webcams" + +#: ../libpurple/protocols/yahoo/yahoochat.c:1514 +#: ../libpurple/protocols/yahoo/yahoochat.c:1584 +msgid "Unable to fetch room list." +msgstr "Não foi possível obter lista de salas." + +#: ../libpurple/protocols/yahoo/yahoochat.c:1577 +msgid "User Rooms" +msgstr "Salas de usuário" + #: ../libpurple/protocols/yahoo/ycht.c:456 msgid "Connection problem with the YCHT server." msgstr "Problema na conexão ao servidor YCHT." @@ -11695,11 +12964,6 @@ msgid "Unable to send to chat %s,%s,%s" msgstr "Não foi possível enviar para o bate-papo %s,%s,%s" -#: ../libpurple/protocols/zephyr/zephyr.c:786 -#: ../libpurple/protocols/zephyr/zephyr.c:1204 -msgid "User" -msgstr "Usuário" - #: ../libpurple/protocols/zephyr/zephyr.c:791 #: ../libpurple/protocols/zephyr/zephyr.c:1210 msgid "Hidden or not logged-in" @@ -11851,8 +13115,8 @@ msgid "Exposure" msgstr "Exposição" -#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032 -#: ../libpurple/proxy.c:1600 +#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:893 ../libpurple/proxy.c:1048 +#: ../libpurple/proxy.c:1616 #, c-format msgid "" "Unable to create socket:\n" @@ -11866,24 +13130,24 @@ msgid "Unable to parse response from HTTP proxy: %s\n" msgstr "Não foi possível interpretar resposta do proxy HTTP: %s\n" -#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770 -#: ../libpurple/proxy.c:782 +#: ../libpurple/proxy.c:697 ../libpurple/proxy.c:743 ../libpurple/proxy.c:779 +#: ../libpurple/proxy.c:791 #, c-format msgid "HTTP proxy connection error %d" msgstr "Erro de conexão do proxy HTTP %d" -#: ../libpurple/proxy.c:778 +#: ../libpurple/proxy.c:787 #, c-format msgid "Access denied: HTTP proxy server forbids port %d tunneling." msgstr "" "Acesso negado: o servidor proxy HTTP não permite o tunelamento da porta %d." -#: ../libpurple/proxy.c:995 +#: ../libpurple/proxy.c:1011 #, c-format msgid "Error resolving %s" msgstr "Erro ao resolver %s" -#: ../libpurple/proxy.c:1697 +#: ../libpurple/proxy.c:1713 msgid "Could not resolve host name" msgstr "Não foi possível resolver host" @@ -11921,7 +13185,17 @@ msgid "%s is now known as %s.\n" msgstr "%s mudou seu apelido para %s.\n" -#: ../libpurple/server.c:680 +#: ../libpurple/server.c:301 +#, c-format +msgid "Requesting %s's attention..." +msgstr "Chamando a atenção de %s..." + +#: ../libpurple/server.c:346 +#, c-format +msgid "%s has requested your attention!" +msgstr "%s chamou sua atenção!" + +#: ../libpurple/server.c:795 #, c-format msgid "" "%s has invited %s to the chat room %s:\n" @@ -11930,20 +13204,36 @@ "%s convidou %s para a sala de bate-papo %s:\n" "%s" -#: ../libpurple/server.c:685 +#: ../libpurple/server.c:800 #, c-format msgid "%s has invited %s to the chat room %s\n" msgstr "%s convidou %s para a sala de bate-papo %s\n" -#: ../libpurple/server.c:689 +#: ../libpurple/server.c:804 msgid "Accept chat invitation?" msgstr "Aceitar convite para bate-papo?" +#: ../libpurple/sslconn.c:163 +msgid "SSL Connection Failed" +msgstr "Falha na conexão SSL" + +#: ../libpurple/sslconn.c:165 +msgid "SSL Handshake Failed" +msgstr "Falha na negociação SSL" + +#: ../libpurple/sslconn.c:167 +msgid "SSL peer presented an invalid certificate" +msgstr "O outro lado enviou um certificado SSL inválido" + +#: ../libpurple/sslconn.c:170 +msgid "Unknown SSL error" +msgstr "Erro de SSL desconhecido" + #: ../libpurple/status.c:152 msgid "Unset" msgstr "Redefinir" -#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057 +#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058 msgid "Do not disturb" msgstr "Não perturbe" @@ -11995,12 +13285,12 @@ msgid "%x %X" msgstr "%x %X" -#: ../libpurple/util.c:2702 +#: ../libpurple/util.c:2720 #, c-format msgid "Error Reading %s" msgstr "Erro ao ler %s" -#: ../libpurple/util.c:2703 +#: ../libpurple/util.c:2721 #, c-format msgid "" "An error was encountered reading your %s. They have not been loaded, and " @@ -12009,67 +13299,67 @@ "Um erro foi encontrado ao processar sua %s. Eles(as) não foram carregados" "(as), e o antigo arquivo foi movido para %s~." -#: ../libpurple/util.c:3203 +#: ../libpurple/util.c:3221 msgid "Calculating..." msgstr "Calculando..." -#: ../libpurple/util.c:3206 +#: ../libpurple/util.c:3224 msgid "Unknown." msgstr "Desconhecido." -#: ../libpurple/util.c:3232 +#: ../libpurple/util.c:3250 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: ../libpurple/util.c:3244 +#: ../libpurple/util.c:3262 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: ../libpurple/util.c:3252 +#: ../libpurple/util.c:3270 #, c-format msgid "%s, %d hour" msgid_plural "%s, %d hours" msgstr[0] "%s, %d hora" msgstr[1] "%s, %d horas" -#: ../libpurple/util.c:3258 +#: ../libpurple/util.c:3276 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: ../libpurple/util.c:3266 +#: ../libpurple/util.c:3284 #, c-format msgid "%s, %d minute" msgid_plural "%s, %d minutes" msgstr[0] "%s, %d minuto" msgstr[1] "%s, %d minutos" -#: ../libpurple/util.c:3272 +#: ../libpurple/util.c:3290 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: ../libpurple/util.c:3532 +#: ../libpurple/util.c:3550 #, c-format msgid "Could not open %s: Redirected too many times" msgstr "Não foi possível abrir %s: Número excessivo de redirecionamentos" -#: ../libpurple/util.c:3569 ../libpurple/util.c:3864 +#: ../libpurple/util.c:3587 ../libpurple/util.c:3882 #, c-format msgid "Unable to connect to %s" msgstr "Não foi possível conectar a %s" -#: ../libpurple/util.c:3692 +#: ../libpurple/util.c:3710 #, c-format msgid "" "Unable to allocate enough memory to hold the contents from %s. The web " @@ -12078,17 +13368,17 @@ "Não foi possível alocar memória suficiente para guardar o conteúdo de %s. O " "servidor da web pode estar tentando alguma operação mal-intencionada." -#: ../libpurple/util.c:3727 +#: ../libpurple/util.c:3745 #, c-format msgid "Error reading from %s: %s" msgstr "Erro ao ler de %s: %s" -#: ../libpurple/util.c:3758 +#: ../libpurple/util.c:3776 #, c-format msgid "Error writing to %s: %s" msgstr "Erro ao gravar em %s: %s" -#: ../libpurple/util.c:3783 +#: ../libpurple/util.c:3801 #, c-format msgid "Unable to connect to %s: %s" msgstr "Não foi possível conectar a %s: %s" @@ -12114,37 +13404,37 @@ msgstr "A orientação da bandeja" #. Build the login options frame. -#: ../pidgin/gtkaccount.c:409 +#: ../pidgin/gtkaccount.c:407 msgid "Login Options" msgstr "Opções de conexão" -#: ../pidgin/gtkaccount.c:430 +#: ../pidgin/gtkaccount.c:428 msgid "Pro_tocol:" msgstr "Pro_tocolo:" -#: ../pidgin/gtkaccount.c:441 +#: ../pidgin/gtkaccount.c:439 msgid "Screen _name:" msgstr "_Nome de usuário:" -#: ../pidgin/gtkaccount.c:531 +#: ../pidgin/gtkaccount.c:529 msgid "_Local alias:" msgstr "Apelido _local:" -#: ../pidgin/gtkaccount.c:535 +#: ../pidgin/gtkaccount.c:533 msgid "Remember pass_word" msgstr "Lembrar _senha" #. Build the user options frame. -#: ../pidgin/gtkaccount.c:593 +#: ../pidgin/gtkaccount.c:591 msgid "User Options" msgstr "Opções do usuário" -#: ../pidgin/gtkaccount.c:606 +#: ../pidgin/gtkaccount.c:604 msgid "New _mail notifications" msgstr "Notificar ao receber novos e_mails" #. Buddy icon -#: ../pidgin/gtkaccount.c:611 +#: ../pidgin/gtkaccount.c:609 msgid "Use this buddy _icon for this account:" msgstr "Usar este _ícone de exibição para esta conta:" @@ -12178,7 +13468,7 @@ msgid "SOCKS 5" msgstr "SOCKS 5" -#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1208 +#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210 msgid "Use Environmental Settings" msgstr "Usar configurações do ambiente" @@ -12200,15 +13490,15 @@ msgid "Proxy Options" msgstr "Opções de proxy" -#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1202 +#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204 msgid "Proxy _type:" msgstr "_Tipo de proxy:" -#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1223 +#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225 msgid "_Host:" msgstr "_Host:" -#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1241 +#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243 msgid "_Port:" msgstr "_Porta:" @@ -12216,31 +13506,43 @@ msgid "_Username:" msgstr "_Nome de usuário:" -#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1278 +#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280 msgid "Pa_ssword:" msgstr "_Senha:" -#: ../pidgin/gtkaccount.c:1478 +#: ../pidgin/gtkaccount.c:1195 +msgid "Unable to save new account" +msgstr "Não foi possível salvar nova conta" + +#: ../pidgin/gtkaccount.c:1196 +msgid "An account already exists with the specified criteria." +msgstr "Já existe uma conta com os atributos especificados." + +#: ../pidgin/gtkaccount.c:1473 msgid "Add Account" msgstr "Adicionar conta" -#: ../pidgin/gtkaccount.c:1497 +#: ../pidgin/gtkaccount.c:1492 msgid "_Basic" msgstr "_Básico" -#: ../pidgin/gtkaccount.c:1508 +#: ../pidgin/gtkaccount.c:1499 +msgid "Create this new account on the server" +msgstr "Criar esta nova conta no servidor" + +#: ../pidgin/gtkaccount.c:1515 msgid "_Advanced" msgstr "_Avançado" -#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtkplugin.c:568 +#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568 msgid "Enabled" msgstr "Ativado" -#: ../pidgin/gtkaccount.c:2010 +#: ../pidgin/gtkaccount.c:2001 msgid "Protocol" msgstr "Protocolo" -#: ../pidgin/gtkaccount.c:2210 +#: ../pidgin/gtkaccount.c:2201 #, c-format msgid "" "Welcome to %s!\n" @@ -12264,11 +13566,11 @@ "Você pode voltar a esta janela para adicionar, alterar ou remover contas a " "partir do menu Contas->Adicionar/Editar na janela da Lista de Amigos" -#: ../pidgin/gtkblist.c:760 +#: ../pidgin/gtkblist.c:765 msgid "Join a Chat" msgstr "Entrar em um bate-papo" -#: ../pidgin/gtkblist.c:781 +#: ../pidgin/gtkblist.c:786 msgid "" "Please enter the appropriate information about the chat you would like to " "join.\n" @@ -12277,92 +13579,92 @@ "gostaria de entrar.\n" #. Set up stuff for the account box -#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5478 -#: ../pidgin/gtkblist.c:5844 ../pidgin/gtkpounce.c:540 +#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524 +#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538 #: ../pidgin/gtkroomlist.c:395 msgid "_Account:" msgstr "_Conta:" -#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602 +#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602 #: ../pidgin/gtkprivacy.c:616 msgid "_Block" msgstr "_Bloquear" -#: ../pidgin/gtkblist.c:1081 +#: ../pidgin/gtkblist.c:1086 msgid "Un_block" msgstr "Des_bloquear" -#: ../pidgin/gtkblist.c:1132 +#: ../pidgin/gtkblist.c:1137 msgid "Get _Info" msgstr "Ver _info" -#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84 +#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89 msgid "I_M" msgstr "_MI" -#: ../pidgin/gtkblist.c:1141 +#: ../pidgin/gtkblist.c:1146 msgid "_Send File" msgstr "_Enviar arquivo" -#: ../pidgin/gtkblist.c:1148 +#: ../pidgin/gtkblist.c:1153 msgid "Add Buddy _Pounce" msgstr "Adicionar ação de _usuário" -#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157 -#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285 +#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162 +#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290 msgid "View _Log" msgstr "Ver _log" -#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179 -#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291 +#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184 +#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296 msgid "_Alias..." msgstr "_Apelidar..." -#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181 -#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293 +#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186 +#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298 msgid "_Remove" msgstr "_Remover" -#: ../pidgin/gtkblist.c:1231 +#: ../pidgin/gtkblist.c:1236 msgid "Add a _Buddy" msgstr "Adicionar um _amigo" -#: ../pidgin/gtkblist.c:1234 +#: ../pidgin/gtkblist.c:1239 msgid "Add a C_hat" msgstr "Adicionar um c_hat" -#: ../pidgin/gtkblist.c:1237 +#: ../pidgin/gtkblist.c:1242 msgid "_Delete Group" msgstr "_Remover grupo" -#: ../pidgin/gtkblist.c:1239 +#: ../pidgin/gtkblist.c:1244 msgid "_Rename" msgstr "_Renomear" #. join button -#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306 -#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82 +#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306 +#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87 msgid "_Join" msgstr "_Entrar" -#: ../pidgin/gtkblist.c:1260 +#: ../pidgin/gtkblist.c:1265 msgid "Auto-Join" msgstr "Entrar automaticamente" -#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322 +#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327 msgid "_Collapse" msgstr "Re_colher" -#: ../pidgin/gtkblist.c:1327 +#: ../pidgin/gtkblist.c:1332 msgid "_Expand" msgstr "_Expandir" -#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584 -#: ../pidgin/gtkblist.c:4572 ../pidgin/gtkblist.c:4582 +#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595 +#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613 msgid "/Tools/Mute Sounds" msgstr "/Ferramentas/Não tocar sons" -#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4709 +#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4849 #: ../pidgin/gtkpounce.c:429 msgid "" "You are not currently signed on with an account that can add that buddy." @@ -12370,126 +13672,138 @@ "Você não está conectado com uma conta que permita adicionar este amigo." #. Buddies menu -#: ../pidgin/gtkblist.c:2850 +#: ../pidgin/gtkblist.c:2866 msgid "/_Buddies" msgstr "/_Amigos" -#: ../pidgin/gtkblist.c:2851 +#: ../pidgin/gtkblist.c:2867 msgid "/Buddies/New Instant _Message..." msgstr "/Amigos/Nova _mensagem instantânea..." -#: ../pidgin/gtkblist.c:2852 +#: ../pidgin/gtkblist.c:2868 msgid "/Buddies/Join a _Chat..." msgstr "/Amigos/Entrar em um _bate-papo..." -#: ../pidgin/gtkblist.c:2853 +#: ../pidgin/gtkblist.c:2869 msgid "/Buddies/Get User _Info..." msgstr "/Amigos/Ver _informações do usuário..." -#: ../pidgin/gtkblist.c:2854 +#: ../pidgin/gtkblist.c:2870 msgid "/Buddies/View User _Log..." msgstr "/Amigos/Ver _log do usuário..." -#: ../pidgin/gtkblist.c:2856 -msgid "/Buddies/Show _Offline Buddies" -msgstr "/Amigos/Exibir amig_os desconectados" - -#: ../pidgin/gtkblist.c:2857 -msgid "/Buddies/Show _Empty Groups" -msgstr "/Amigos/Exibir grupos _vazios" - -#: ../pidgin/gtkblist.c:2858 -msgid "/Buddies/Show Buddy _Details" -msgstr "/Amigos/Exibir _detalhes do amigo" - -#: ../pidgin/gtkblist.c:2859 -msgid "/Buddies/Show Idle _Times" -msgstr "/Amigos/Exibir _tempos de inatividade" - -#: ../pidgin/gtkblist.c:2860 +#: ../pidgin/gtkblist.c:2872 +msgid "/Buddies/Show" +msgstr "/Amigos/Exibir" + +#: ../pidgin/gtkblist.c:2873 +msgid "/Buddies/Show/_Offline Buddies" +msgstr "/Amigos/Exibir/Amig_os desconectados" + +#: ../pidgin/gtkblist.c:2874 +msgid "/Buddies/Show/_Empty Groups" +msgstr "/Amigos/Exibir/Grupos _vazios" + +#: ../pidgin/gtkblist.c:2875 +msgid "/Buddies/Show/Buddy _Details" +msgstr "/Amigos/Exibir/_Detalhes do amigo" + +#: ../pidgin/gtkblist.c:2876 +msgid "/Buddies/Show/Idle _Times" +msgstr "/Amigos/Exibir/_Tempos de inatividade" + +#: ../pidgin/gtkblist.c:2877 +msgid "/Buddies/Show/_Protocol Icons" +msgstr "/Amigos/Exibir/Ícones de _protocolo" + +#: ../pidgin/gtkblist.c:2878 msgid "/Buddies/_Sort Buddies" msgstr "/Amigos/Ordenar amigo_s" -#: ../pidgin/gtkblist.c:2862 +#: ../pidgin/gtkblist.c:2880 msgid "/Buddies/_Add Buddy..." msgstr "/Amigos/_Adicionar amigo..." -#: ../pidgin/gtkblist.c:2863 +#: ../pidgin/gtkblist.c:2881 msgid "/Buddies/Add C_hat..." msgstr "/Amigos/Adicionar bate-_papo..." -#: ../pidgin/gtkblist.c:2864 +#: ../pidgin/gtkblist.c:2882 msgid "/Buddies/Add _Group..." msgstr "/Amigos/Adicionar _grupo..." -#: ../pidgin/gtkblist.c:2866 +#: ../pidgin/gtkblist.c:2884 msgid "/Buddies/_Quit" msgstr "/Amigos/_Sair" #. Accounts menu -#: ../pidgin/gtkblist.c:2869 +#: ../pidgin/gtkblist.c:2887 msgid "/_Accounts" msgstr "/_Contas" -#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6542 +#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589 msgid "/Accounts/Add\\/Edit" msgstr "/Contas/Adicionar\\/Editar" #. Tools -#: ../pidgin/gtkblist.c:2873 +#: ../pidgin/gtkblist.c:2891 msgid "/_Tools" msgstr "/_Ferramentas" -#: ../pidgin/gtkblist.c:2874 +#: ../pidgin/gtkblist.c:2892 msgid "/Tools/Buddy _Pounces" msgstr "/Ferramentas/Ações de _usuário" -#: ../pidgin/gtkblist.c:2875 +#: ../pidgin/gtkblist.c:2893 +msgid "/Tools/_Certificates" +msgstr "/Ferramentas/_Certificados" + +#: ../pidgin/gtkblist.c:2894 msgid "/Tools/Plu_gins" msgstr "/Ferramentas/Plu_gins" -#: ../pidgin/gtkblist.c:2876 +#: ../pidgin/gtkblist.c:2895 msgid "/Tools/Pr_eferences" msgstr "/Ferramentas/Pr_eferências" -#: ../pidgin/gtkblist.c:2877 +#: ../pidgin/gtkblist.c:2896 msgid "/Tools/Pr_ivacy" msgstr "/Ferramentas/Pr_ivacidade" -#: ../pidgin/gtkblist.c:2879 +#: ../pidgin/gtkblist.c:2898 msgid "/Tools/_File Transfers" msgstr "/Ferramentas/Transferências de arquivo" -#: ../pidgin/gtkblist.c:2880 +#: ../pidgin/gtkblist.c:2899 msgid "/Tools/R_oom List" msgstr "/Ferramentas/_Lista de salas" -#: ../pidgin/gtkblist.c:2881 +#: ../pidgin/gtkblist.c:2900 msgid "/Tools/System _Log" msgstr "/Ferramentas/Log do _sistema" -#: ../pidgin/gtkblist.c:2883 +#: ../pidgin/gtkblist.c:2902 msgid "/Tools/Mute _Sounds" msgstr "/Ferramentas/Não tocar sons" #. Help -#: ../pidgin/gtkblist.c:2885 +#: ../pidgin/gtkblist.c:2904 msgid "/_Help" msgstr "/_Ajuda" -#: ../pidgin/gtkblist.c:2886 +#: ../pidgin/gtkblist.c:2905 msgid "/Help/Online _Help" msgstr "/Ajuda/_Ajuda online" -#: ../pidgin/gtkblist.c:2887 +#: ../pidgin/gtkblist.c:2906 msgid "/Help/_Debug Window" msgstr "/Ajuda/Janela de _depuração" -#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891 +#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910 msgid "/Help/_About" msgstr "/Ajuda/_Sobre" -#: ../pidgin/gtkblist.c:2920 +#: ../pidgin/gtkblist.c:2939 #, c-format msgid "" "\n" @@ -12498,132 +13812,128 @@ "\n" "Conta: %s" -#: ../pidgin/gtkblist.c:2998 +#: ../pidgin/gtkblist.c:3017 msgid "Buddy Alias" msgstr "Apelido do amigo" -#: ../pidgin/gtkblist.c:3027 +#: ../pidgin/gtkblist.c:3046 msgid "Logged In" msgstr "Conectado" -#: ../pidgin/gtkblist.c:3073 +#: ../pidgin/gtkblist.c:3092 msgid "Last Seen" msgstr "Visto pela última vez em" -#: ../pidgin/gtkblist.c:3093 +#: ../pidgin/gtkblist.c:3113 msgid "Spooky" msgstr "Assustador" -#: ../pidgin/gtkblist.c:3095 +#: ../pidgin/gtkblist.c:3115 msgid "Awesome" msgstr "Impressionante" -#: ../pidgin/gtkblist.c:3097 +#: ../pidgin/gtkblist.c:3117 msgid "Rockin'" msgstr "Botando pra quebrar" -#: ../pidgin/gtkblist.c:3436 +#: ../pidgin/gtkblist.c:3450 #, c-format msgid "Idle %dd %dh %02dm" msgstr "Inativo por %dd %dh %02dm" -#: ../pidgin/gtkblist.c:3438 +#: ../pidgin/gtkblist.c:3452 #, c-format msgid "Idle %dh %02dm" msgstr "Inativo por %dh %02dm" -#: ../pidgin/gtkblist.c:3440 +#: ../pidgin/gtkblist.c:3454 #, c-format msgid "Idle %dm" msgstr "Inativo por %dm" -#: ../pidgin/gtkblist.c:3585 +#: ../pidgin/gtkblist.c:3599 msgid "/Buddies/New Instant Message..." msgstr "/Amigos/Nova mensagem instantânea..." -#: ../pidgin/gtkblist.c:3586 ../pidgin/gtkblist.c:3619 +#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633 msgid "/Buddies/Join a Chat..." msgstr "/Amigos/Entrar em um bate-papo..." -#: ../pidgin/gtkblist.c:3587 +#: ../pidgin/gtkblist.c:3601 msgid "/Buddies/Get User Info..." msgstr "/Amigos/Ver informações do usuário..." -#: ../pidgin/gtkblist.c:3588 +#: ../pidgin/gtkblist.c:3602 msgid "/Buddies/Add Buddy..." msgstr "/Amigos/Adicionar amigo..." -#: ../pidgin/gtkblist.c:3589 ../pidgin/gtkblist.c:3622 +#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636 msgid "/Buddies/Add Chat..." msgstr "/Amigos/Adicionar bate-papo..." -#: ../pidgin/gtkblist.c:3590 +#: ../pidgin/gtkblist.c:3604 msgid "/Buddies/Add Group..." msgstr "/Amigos/Adicionar grupo..." -#: ../pidgin/gtkblist.c:3625 +#: ../pidgin/gtkblist.c:3639 msgid "/Tools/Privacy" msgstr "/Ferramentas/Privacidade" -#: ../pidgin/gtkblist.c:3628 +#: ../pidgin/gtkblist.c:3642 msgid "/Tools/Room List" msgstr "/Ferramentas/Lista de salas" -#: ../pidgin/gtkblist.c:3725 ../pidgin/gtkdocklet.c:153 +#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153 #, c-format msgid "%d unread message from %s\n" msgid_plural "%d unread messages from %s\n" msgstr[0] "%d mensagem não lida de %s\n" msgstr[1] "%d mensagens não lidas de %s\n" -#: ../pidgin/gtkblist.c:3805 +#: ../pidgin/gtkblist.c:3819 msgid "Manually" msgstr "Manualmente" -#: ../pidgin/gtkblist.c:3807 +#: ../pidgin/gtkblist.c:3821 msgid "Alphabetically" msgstr "Alfabeticamente" -#: ../pidgin/gtkblist.c:3808 +#: ../pidgin/gtkblist.c:3822 msgid "By status" msgstr "Por status" -#: ../pidgin/gtkblist.c:3809 +#: ../pidgin/gtkblist.c:3823 msgid "By log size" msgstr "Por tamanho do log" -#: ../pidgin/gtkblist.c:4014 ../pidgin/gtkconn.c:178 +#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178 #, c-format msgid "%s disconnected" msgstr "%s desconectado" -#: ../pidgin/gtkblist.c:4024 -msgid "Re-enable Account" -msgstr "Re-ativar conta" - -#: ../pidgin/gtkblist.c:4050 +#: ../pidgin/gtkblist.c:4064 #, c-format msgid "%s disconnected: %s" msgstr "%s desconectado: %s" -#: ../pidgin/gtkblist.c:4202 +#: ../pidgin/gtkblist.c:4216 msgid "Username:" msgstr "Nome de usuário:" -#: ../pidgin/gtkblist.c:4209 +#: ../pidgin/gtkblist.c:4223 msgid "Password:" msgstr "Senha:" -#: ../pidgin/gtkblist.c:4220 +#: ../pidgin/gtkblist.c:4234 msgid "_Login" msgstr "_Conectar" -#: ../pidgin/gtkblist.c:4303 +#: ../pidgin/gtkblist.c:4317 msgid "/Accounts" msgstr "/Contas" #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy -#: ../pidgin/gtkblist.c:4317 +#: ../pidgin/gtkblist.c:4331 #, c-format msgid "" "Welcome to %s!\n" @@ -12642,23 +13952,27 @@ #. set the Show Offline Buddies option. must be done #. * after the treeview or faceprint gets mad. -Robot101 #. -#: ../pidgin/gtkblist.c:4566 -msgid "/Buddies/Show Offline Buddies" -msgstr "/Amigos/Exibir amigos desconectados" - -#: ../pidgin/gtkblist.c:4569 -msgid "/Buddies/Show Empty Groups" -msgstr "/Amigos/Exibir grupos vazios" - -#: ../pidgin/gtkblist.c:4575 -msgid "/Buddies/Show Buddy Details" -msgstr "/Amigos/Exibir detalhes do amigo" - -#: ../pidgin/gtkblist.c:4578 -msgid "/Buddies/Show Idle Times" -msgstr "/Amigos/Exibir tempos de inatividade" - -#: ../pidgin/gtkblist.c:5455 +#: ../pidgin/gtkblist.c:4594 +msgid "/Buddies/Show/Offline Buddies" +msgstr "/Amigos/Exibir/Amigos desconectados" + +#: ../pidgin/gtkblist.c:4597 +msgid "/Buddies/Show/Empty Groups" +msgstr "/Amigos/Exibir/Grupos vazios" + +#: ../pidgin/gtkblist.c:4603 +msgid "/Buddies/Show/Buddy Details" +msgstr "/Amigos/Exibir/Detalhes do amigo" + +#: ../pidgin/gtkblist.c:4606 +msgid "/Buddies/Show/Idle Times" +msgstr "/Amigos/Exibir/Tempos de inatividade" + +#: ../pidgin/gtkblist.c:4609 +msgid "/Buddies/Show/Protocol Icons" +msgstr "/Amigos/Exibir/Ícones de protocolo" + +#: ../pidgin/gtkblist.c:5501 msgid "" "Please enter the screen name of the person you would like to add to your " "buddy list. You may optionally enter an alias, or nickname, for the buddy. " @@ -12670,19 +13984,19 @@ "possível.\n" #. End of account box -#: ../pidgin/gtkblist.c:5490 +#: ../pidgin/gtkblist.c:5536 msgid "_Screen name:" msgstr "Nome de _usuário:" -#: ../pidgin/gtkblist.c:5512 ../pidgin/gtkblist.c:5865 +#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911 msgid "A_lias:" msgstr "Ape_lido:" -#: ../pidgin/gtkblist.c:5777 +#: ../pidgin/gtkblist.c:5823 msgid "This protocol does not support chat rooms." msgstr "Este protocolo não suporta salas de bate-papo." -#: ../pidgin/gtkblist.c:5793 +#: ../pidgin/gtkblist.c:5839 msgid "" "You are not currently signed on with any protocols that have the ability to " "chat." @@ -12690,7 +14004,7 @@ "Atualmente, você não está conectado em nenhum protocolo que possui o recurso " "de bate-papo." -#: ../pidgin/gtkblist.c:5834 +#: ../pidgin/gtkblist.c:5880 msgid "" "Please enter an alias, and the appropriate information about the chat you " "would like to add to your buddy list.\n" @@ -12698,42 +14012,47 @@ "Por favor digite um apelido, e as informações apropriadas sobre o bate-papo " "que você gostaria de adicionar à sua lista de amigos.\n" -#: ../pidgin/gtkblist.c:5922 +#: ../pidgin/gtkblist.c:5968 msgid "Please enter the name of the group to be added." msgstr "Por favor digite o nome do grupo a ser criado." -#: ../pidgin/gtkblist.c:6562 +#: ../pidgin/gtkblist.c:6609 msgid "/Accounts/" msgstr "/Contas/" -#: ../pidgin/gtkblist.c:6586 +#: ../pidgin/gtkblist.c:6633 msgid "_Edit Account" msgstr "_Editar conta" -#: ../pidgin/gtkblist.c:6599 ../pidgin/gtkconv.c:3015 +#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3079 msgid "No actions available" msgstr "Nenhuma ação disponível" -#: ../pidgin/gtkblist.c:6607 +#: ../pidgin/gtkblist.c:6654 msgid "_Disable" msgstr "_Desativar" -#: ../pidgin/gtkblist.c:6619 +#: ../pidgin/gtkblist.c:6666 msgid "Enable Account" msgstr "Ativar conta" -#: ../pidgin/gtkblist.c:6625 +#: ../pidgin/gtkblist.c:6672 msgid "/Accounts/Enable Account" msgstr "/Contas/Ativar conta" -#: ../pidgin/gtkblist.c:6674 +#: ../pidgin/gtkblist.c:6721 msgid "/Tools" msgstr "/Ferramentas" -#: ../pidgin/gtkblist.c:6744 +#: ../pidgin/gtkblist.c:6791 msgid "/Buddies/Sort Buddies" msgstr "/Amigos/Ordenar amigos" +#. Widget creation function +#: ../pidgin/gtkcertmgr.c:529 +msgid "SSL Servers" +msgstr "Servidores SSL" + #: ../pidgin/gtkconn.c:179 #, c-format msgid "" @@ -12747,25 +14066,25 @@ "O %s não tentará reconectar esta conta até que você corrija o erro e reative " "a mesma." -#: ../pidgin/gtkconv.c:488 +#: ../pidgin/gtkconv.c:481 msgid "Unknown command." msgstr "Comando desconhecido." -#: ../pidgin/gtkconv.c:760 ../pidgin/gtkconv.c:786 +#: ../pidgin/gtkconv.c:753 ../pidgin/gtkconv.c:779 msgid "That buddy is not on the same protocol as this chat." msgstr "Este amigo não está usando o mesmo protocolo deste bate-papo." -#: ../pidgin/gtkconv.c:780 +#: ../pidgin/gtkconv.c:773 msgid "" "You are not currently signed on with an account that can invite that buddy." msgstr "Você não está conectado com uma conta que permita convidar este amigo." -#: ../pidgin/gtkconv.c:833 +#: ../pidgin/gtkconv.c:826 msgid "Invite Buddy Into Chat Room" msgstr "Convidar amigo para sala de bate-papo" #. Put our happy label in it. -#: ../pidgin/gtkconv.c:863 +#: ../pidgin/gtkconv.c:856 msgid "" "Please enter the name of the user you wish to invite, along with an optional " "invite message." @@ -12773,201 +14092,188 @@ "Favor digitar o nome do usuário que você gostaria de convidar, junto com uma " "mensagem de convite opcional." -#: ../pidgin/gtkconv.c:884 +#: ../pidgin/gtkconv.c:877 msgid "_Buddy:" msgstr "_Amigo:" -#: ../pidgin/gtkconv.c:904 ../pidgin/gtksavedstatuses.c:1193 -#: ../pidgin/gtksavedstatuses.c:1525 +#: ../pidgin/gtkconv.c:897 ../pidgin/gtksavedstatuses.c:1193 +#: ../pidgin/gtksavedstatuses.c:1527 msgid "_Message:" msgstr "_Mensagem:" -#: ../pidgin/gtkconv.c:961 ../pidgin/gtkconv.c:2522 ../pidgin/gtkdebug.c:218 +#: ../pidgin/gtkconv.c:955 ../pidgin/gtkconv.c:2604 ../pidgin/gtkdebug.c:218 #: ../pidgin/gtkft.c:542 msgid "Unable to open file." msgstr "Não foi possível abrir arquivo." -#: ../pidgin/gtkconv.c:967 +#: ../pidgin/gtkconv.c:961 #, c-format msgid "

Conversation with %s

\n" msgstr "

Conversas com %s

\n" -#: ../pidgin/gtkconv.c:1003 +#: ../pidgin/gtkconv.c:999 msgid "Save Conversation" msgstr "Salvar conversa" -#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742 +#: ../pidgin/gtkconv.c:1148 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742 msgid "Find" msgstr "Procurar" -#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:194 +#: ../pidgin/gtkconv.c:1174 ../pidgin/gtkdebug.c:194 msgid "_Search for:" msgstr "_Procurar por:" -#: ../pidgin/gtkconv.c:1361 -msgid "Logging started. Future messages in this conversation will be logged." -msgstr "" -"Gravação iniciada. A partir de agora, as mensagens desta conversa serão " -"gravadas." - -#: ../pidgin/gtkconv.c:1369 -msgid "" -"Logging stopped. Future messages in this conversation will not be logged." -msgstr "" -"Gravação parada. A partir de agora, as mensagens dessa conversa não serão " -"gravadas." - -#: ../pidgin/gtkconv.c:1617 +#: ../pidgin/gtkconv.c:1630 msgid "Un-Ignore" msgstr "Des-ignorar" -#: ../pidgin/gtkconv.c:1620 +#: ../pidgin/gtkconv.c:1633 msgid "Ignore" msgstr "Ignorar" -#: ../pidgin/gtkconv.c:1640 +#: ../pidgin/gtkconv.c:1653 msgid "Get Away Message" msgstr "Obter mensagem de ausência" -#: ../pidgin/gtkconv.c:1663 +#: ../pidgin/gtkconv.c:1676 msgid "Last said" msgstr "Última mensagem" -#: ../pidgin/gtkconv.c:2530 +#: ../pidgin/gtkconv.c:2612 msgid "Unable to save icon file to disk." msgstr "Não foi possível salvar arquivo de ícone no disco." -#: ../pidgin/gtkconv.c:2581 +#: ../pidgin/gtkconv.c:2663 msgid "Save Icon" msgstr "Salvar ícone" -#: ../pidgin/gtkconv.c:2633 +#: ../pidgin/gtkconv.c:2715 msgid "Animate" msgstr "Animar" -#: ../pidgin/gtkconv.c:2638 +#: ../pidgin/gtkconv.c:2720 msgid "Hide Icon" msgstr "Ocultar ícone" -#: ../pidgin/gtkconv.c:2641 +#: ../pidgin/gtkconv.c:2723 msgid "Save Icon As..." msgstr "Salvar ícone como..." -#: ../pidgin/gtkconv.c:2645 +#: ../pidgin/gtkconv.c:2727 msgid "Set Custom Icon..." msgstr "Definir ícone personalizado..." -#: ../pidgin/gtkconv.c:2658 +#: ../pidgin/gtkconv.c:2740 msgid "Remove Custom Icon" msgstr "Remover ícone personalizado" +#: ../pidgin/gtkconv.c:2867 +msgid "Show All" +msgstr "Mostrar todos" + #. Conversation menu -#: ../pidgin/gtkconv.c:2800 +#: ../pidgin/gtkconv.c:2886 msgid "/_Conversation" msgstr "/_Conversa" -#: ../pidgin/gtkconv.c:2802 +#: ../pidgin/gtkconv.c:2888 msgid "/Conversation/New Instant _Message..." msgstr "/Conversa/Nova _mensagem instantânea..." -#: ../pidgin/gtkconv.c:2807 +#: ../pidgin/gtkconv.c:2893 msgid "/Conversation/_Find..." msgstr "/Conversa/_Procurar..." -#: ../pidgin/gtkconv.c:2809 +#: ../pidgin/gtkconv.c:2895 msgid "/Conversation/View _Log" msgstr "/Conversa/Ver _log" -#: ../pidgin/gtkconv.c:2810 +#: ../pidgin/gtkconv.c:2896 msgid "/Conversation/_Save As..." msgstr "/Conversa/_Salvar como..." -#: ../pidgin/gtkconv.c:2812 +#: ../pidgin/gtkconv.c:2898 msgid "/Conversation/Clea_r Scrollback" msgstr "/Conversa/Limpa_r" -#: ../pidgin/gtkconv.c:2816 +#: ../pidgin/gtkconv.c:2902 msgid "/Conversation/Se_nd File..." msgstr "/Conversa/E_nviar arquivo..." -#: ../pidgin/gtkconv.c:2817 +#: ../pidgin/gtkconv.c:2903 msgid "/Conversation/Add Buddy _Pounce..." msgstr "/Conversa/Adicionar ação de _usuário..." -#: ../pidgin/gtkconv.c:2819 +#: ../pidgin/gtkconv.c:2905 msgid "/Conversation/_Get Info" msgstr "/Conversa/_Ver informações" -#: ../pidgin/gtkconv.c:2821 +#: ../pidgin/gtkconv.c:2907 msgid "/Conversation/In_vite..." msgstr "/Conversa/_Convidar..." -#: ../pidgin/gtkconv.c:2823 +#: ../pidgin/gtkconv.c:2909 msgid "/Conversation/M_ore" msgstr "/Conversa/M_ais" -#: ../pidgin/gtkconv.c:2827 +#: ../pidgin/gtkconv.c:2913 msgid "/Conversation/Al_ias..." msgstr "/Conversa/Apel_idar..." -#: ../pidgin/gtkconv.c:2829 +#: ../pidgin/gtkconv.c:2915 msgid "/Conversation/_Block..." msgstr "/Conversa/_Bloquear..." -#: ../pidgin/gtkconv.c:2831 +#: ../pidgin/gtkconv.c:2917 msgid "/Conversation/_Unblock..." msgstr "/Conversa/_Desbloquear..." -#: ../pidgin/gtkconv.c:2833 +#: ../pidgin/gtkconv.c:2919 msgid "/Conversation/_Add..." msgstr "/Conversa/A_dicionar..." -#: ../pidgin/gtkconv.c:2835 +#: ../pidgin/gtkconv.c:2921 msgid "/Conversation/_Remove..." msgstr "/Conversa/_Remover..." -#: ../pidgin/gtkconv.c:2840 +#: ../pidgin/gtkconv.c:2926 msgid "/Conversation/Insert Lin_k..." msgstr "/Conversa/Inserir lin_k..." -#: ../pidgin/gtkconv.c:2842 +#: ../pidgin/gtkconv.c:2928 msgid "/Conversation/Insert Imag_e..." msgstr "/Conversa/Inserir imag_em..." -#: ../pidgin/gtkconv.c:2848 +#: ../pidgin/gtkconv.c:2934 msgid "/Conversation/_Close" msgstr "/Conversa/_Fechar" #. Options -#: ../pidgin/gtkconv.c:2852 +#: ../pidgin/gtkconv.c:2938 msgid "/_Options" msgstr "/_Opções" -#: ../pidgin/gtkconv.c:2853 +#: ../pidgin/gtkconv.c:2939 msgid "/Options/Enable _Logging" msgstr "/Opções/Gravar _log" -#: ../pidgin/gtkconv.c:2854 +#: ../pidgin/gtkconv.c:2940 msgid "/Options/Enable _Sounds" msgstr "/Opções/Ativar _sons" -#: ../pidgin/gtkconv.c:2855 -msgid "/Options/Show Buddy _Icon" -msgstr "/Options/Mostrar í_cones de amigos" - -#: ../pidgin/gtkconv.c:2857 +#: ../pidgin/gtkconv.c:2942 msgid "/Options/Show Formatting _Toolbars" msgstr "/Opções/Mostrar barras de ferramen_tas de formatação" -#: ../pidgin/gtkconv.c:2858 +#: ../pidgin/gtkconv.c:2943 msgid "/Options/Show Ti_mestamps" msgstr "/Opções/_Mostrar marcações de tempo" -#: ../pidgin/gtkconv.c:3003 +#: ../pidgin/gtkconv.c:3067 msgid "/Conversation/More" msgstr "/Conversa/Mais" -#: ../pidgin/gtkconv.c:3059 +#: ../pidgin/gtkconv.c:3123 msgid "/Options" msgstr "/Opções" @@ -12976,177 +14282,173 @@ #. Make sure the 'Conversation -> More' menuitems are regenerated whenever #. * the 'Conversation' menu pops up because the entries can change after the #. * conversation is created. -#: ../pidgin/gtkconv.c:3094 ../pidgin/gtkconv.c:3126 +#: ../pidgin/gtkconv.c:3158 ../pidgin/gtkconv.c:3190 msgid "/Conversation" msgstr "/Conversa" -#: ../pidgin/gtkconv.c:3134 +#: ../pidgin/gtkconv.c:3198 msgid "/Conversation/View Log" msgstr "/Conversa/Ver log" -#: ../pidgin/gtkconv.c:3140 +#: ../pidgin/gtkconv.c:3204 msgid "/Conversation/Send File..." msgstr "/Conversa/Enviar arquivo..." -#: ../pidgin/gtkconv.c:3144 +#: ../pidgin/gtkconv.c:3208 msgid "/Conversation/Add Buddy Pounce..." msgstr "/Conversa/Adicionar ação de usuário..." -#: ../pidgin/gtkconv.c:3150 +#: ../pidgin/gtkconv.c:3214 msgid "/Conversation/Get Info" msgstr "/Conversa/Ver informações" -#: ../pidgin/gtkconv.c:3154 +#: ../pidgin/gtkconv.c:3218 msgid "/Conversation/Invite..." msgstr "/Conversa/Convidar..." -#: ../pidgin/gtkconv.c:3160 +#: ../pidgin/gtkconv.c:3224 msgid "/Conversation/Alias..." msgstr "/Conversa/Apelido..." -#: ../pidgin/gtkconv.c:3164 +#: ../pidgin/gtkconv.c:3228 msgid "/Conversation/Block..." msgstr "/Conversa/Bloquear..." -#: ../pidgin/gtkconv.c:3168 +#: ../pidgin/gtkconv.c:3232 msgid "/Conversation/Unblock..." msgstr "/Conversa/Desbloquear..." -#: ../pidgin/gtkconv.c:3172 +#: ../pidgin/gtkconv.c:3236 msgid "/Conversation/Add..." msgstr "/Conversa/Adicionar..." -#: ../pidgin/gtkconv.c:3176 +#: ../pidgin/gtkconv.c:3240 msgid "/Conversation/Remove..." msgstr "/Conversa/Remover..." -#: ../pidgin/gtkconv.c:3182 +#: ../pidgin/gtkconv.c:3246 msgid "/Conversation/Insert Link..." msgstr "/Conversa/Inserir link..." -#: ../pidgin/gtkconv.c:3186 +#: ../pidgin/gtkconv.c:3250 msgid "/Conversation/Insert Image..." msgstr "/Conversa/Inserir imagem..." -#: ../pidgin/gtkconv.c:3192 +#: ../pidgin/gtkconv.c:3256 msgid "/Options/Enable Logging" msgstr "/Opções/Gravar log" -#: ../pidgin/gtkconv.c:3195 +#: ../pidgin/gtkconv.c:3259 msgid "/Options/Enable Sounds" msgstr "/Opções/Ativar sons" -#: ../pidgin/gtkconv.c:3208 +#: ../pidgin/gtkconv.c:3272 msgid "/Options/Show Formatting Toolbars" msgstr "/Opções/Mostrar barras de ferramentas de formatação" -#: ../pidgin/gtkconv.c:3211 +#: ../pidgin/gtkconv.c:3275 msgid "/Options/Show Timestamps" msgstr "/Opções/Mostrar marcações de tempo" -#: ../pidgin/gtkconv.c:3214 -msgid "/Options/Show Buddy Icon" -msgstr "/Options/Mostrar ícones de amigos" - -#: ../pidgin/gtkconv.c:3298 ../pidgin/gtkconv.c:3340 +#: ../pidgin/gtkconv.c:3352 ../pidgin/gtkconv.c:3394 msgid "User is typing..." msgstr "O usuário está digitando..." -#: ../pidgin/gtkconv.c:3343 +#: ../pidgin/gtkconv.c:3397 msgid "User has typed something and stopped" msgstr "O usuário digitou algo e parou" #. Build the Send To menu -#: ../pidgin/gtkconv.c:3526 ../pidgin/gtkconv.c:7818 +#: ../pidgin/gtkconv.c:3580 ../pidgin/gtkconv.c:8026 msgid "_Send To" msgstr "_Enviar para" -#: ../pidgin/gtkconv.c:4239 +#: ../pidgin/gtkconv.c:4293 msgid "_Send" msgstr "_Enviar" #. Setup the label telling how many people are in the room. -#: ../pidgin/gtkconv.c:4343 +#: ../pidgin/gtkconv.c:4397 msgid "0 people in room" msgstr "0 pessoas na sala" -#: ../pidgin/gtkconv.c:5611 ../pidgin/gtkconv.c:5732 +#: ../pidgin/gtkconv.c:5768 ../pidgin/gtkconv.c:5889 #, c-format msgid "%d person in room" msgid_plural "%d people in room" msgstr[0] "%d pessoa na sala" msgstr[1] "%d pessoas na sala" -#: ../pidgin/gtkconv.c:6341 ../pidgin/gtkstatusbox.c:659 +#: ../pidgin/gtkconv.c:6490 ../pidgin/gtkstatusbox.c:659 msgid "Typing" msgstr "Digitando" -#: ../pidgin/gtkconv.c:6345 +#: ../pidgin/gtkconv.c:6494 msgid "Stopped Typing" msgstr "Parou de digitar" -#: ../pidgin/gtkconv.c:6348 +#: ../pidgin/gtkconv.c:6497 msgid "Nick Said" msgstr "Apelido mencionado" -#: ../pidgin/gtkconv.c:6351 ../pidgin/gtkdocklet.c:492 +#: ../pidgin/gtkconv.c:6500 ../pidgin/gtkdocklet.c:492 msgid "Unread Messages" msgstr "Mensagens não lidas" -#: ../pidgin/gtkconv.c:6354 +#: ../pidgin/gtkconv.c:6503 msgid "New Event" msgstr "Novo evento" -#: ../pidgin/gtkconv.c:7358 +#: ../pidgin/gtkconv.c:7576 msgid "clear: Clears all conversation scrollbacks." msgstr "clear: Limpa todas as janela de conversa." -#: ../pidgin/gtkconv.c:7522 +#: ../pidgin/gtkconv.c:7740 msgid "Confirm close" msgstr "Confirmar fechamento" -#: ../pidgin/gtkconv.c:7554 +#: ../pidgin/gtkconv.c:7772 msgid "You have unread messages. Are you sure you want to close the window?" msgstr "" "Você tem mensagens não lidas. Tem certeza de que deseja fechar a janela?" -#: ../pidgin/gtkconv.c:8145 +#: ../pidgin/gtkconv.c:8359 msgid "Close other tabs" msgstr "Fechar as outras abas" -#: ../pidgin/gtkconv.c:8151 +#: ../pidgin/gtkconv.c:8365 msgid "Close all tabs" msgstr "Fechar todas as abas" -#: ../pidgin/gtkconv.c:8159 +#: ../pidgin/gtkconv.c:8373 msgid "Detach this tab" msgstr "Separar esta aba" -#: ../pidgin/gtkconv.c:8165 +#: ../pidgin/gtkconv.c:8379 msgid "Close this tab" msgstr "Fechar esta aba" -#: ../pidgin/gtkconv.c:8651 +#: ../pidgin/gtkconv.c:8879 msgid "Close conversation" msgstr "Fechar conversa" -#: ../pidgin/gtkconv.c:9251 +#: ../pidgin/gtkconv.c:9481 msgid "Last created window" msgstr "Última janela criada" -#: ../pidgin/gtkconv.c:9253 +#: ../pidgin/gtkconv.c:9483 msgid "Separate IM and Chat windows" msgstr "Separar janelas de MI e bate-papos" -#: ../pidgin/gtkconv.c:9255 ../pidgin/gtkprefs.c:1412 +#: ../pidgin/gtkconv.c:9485 ../pidgin/gtkprefs.c:1414 msgid "New window" msgstr "Nova janela" -#: ../pidgin/gtkconv.c:9257 +#: ../pidgin/gtkconv.c:9487 msgid "By group" msgstr "Por grupo" -#: ../pidgin/gtkconv.c:9259 +#: ../pidgin/gtkconv.c:9489 msgid "By account" msgstr "Por conta" @@ -13210,7 +14512,7 @@ msgid "Fatal Error" msgstr "Erro fatal" -#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113 +#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116 msgid "lead developer" msgstr "desenvolvedor principal" @@ -13221,8 +14523,8 @@ #: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81 #: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83 #: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85 -#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:89 -#: ../pidgin/gtkdialogs.c:90 +#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90 +#: ../pidgin/gtkdialogs.c:91 msgid "developer" msgstr "desenvolvedor" @@ -13234,376 +14536,391 @@ msgid "support/QA" msgstr "suporte/QA" -#: ../pidgin/gtkdialogs.c:104 -msgid "win32 port" -msgstr "port para Win32" - -#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106 -msgid "maintainer" -msgstr "mantenedor" - -#: ../pidgin/gtkdialogs.c:107 -msgid "libfaim maintainer" -msgstr "mantenedor da libfaim" - -#: ../pidgin/gtkdialogs.c:108 +#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111 msgid "developer & webmaster" msgstr "desenvolvedor & webmaster" +#: ../pidgin/gtkdialogs.c:98 +msgid "Senior Contributor/QA" +msgstr "Contribuidor Sênior/QA" + +#: ../pidgin/gtkdialogs.c:107 +msgid "win32 port" +msgstr "port para Win32" + +#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109 +msgid "maintainer" +msgstr "mantenedor" + +#: ../pidgin/gtkdialogs.c:110 +msgid "libfaim maintainer" +msgstr "mantenedor da libfaim" + #. If "lazy bum" translates literally into a serious insult, use something else or omit it. -#: ../pidgin/gtkdialogs.c:110 +#: ../pidgin/gtkdialogs.c:113 msgid "hacker and designated driver [lazy bum]" msgstr "hacker e dirigente designado [vagabundo preguiçoso]" -#: ../pidgin/gtkdialogs.c:111 +#: ../pidgin/gtkdialogs.c:114 msgid "XMPP developer" msgstr "desenvolvedor do XMPP" -#: ../pidgin/gtkdialogs.c:112 +#: ../pidgin/gtkdialogs.c:115 msgid "original author" msgstr "autor original" -#: ../pidgin/gtkdialogs.c:128 +#: ../pidgin/gtkdialogs.c:132 msgid "Afrikaans" msgstr "Africâner" -#: ../pidgin/gtkdialogs.c:129 +#: ../pidgin/gtkdialogs.c:133 msgid "Arabic" msgstr "Árabe" -#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131 -#: ../pidgin/gtkdialogs.c:217 +#: ../pidgin/gtkdialogs.c:134 +msgid "Belarusian Latin" +msgstr "Latim bielorrusso" + +#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:136 +#: ../pidgin/gtkdialogs.c:223 msgid "Bulgarian" msgstr "Búlgaro" -#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133 -#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135 +#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138 +#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140 msgid "Bengali" msgstr "Bengali" -#: ../pidgin/gtkdialogs.c:136 +#: ../pidgin/gtkdialogs.c:141 msgid "Bosnian" msgstr "Bósnio" -#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:218 -#: ../pidgin/gtkdialogs.c:219 +#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:224 +#: ../pidgin/gtkdialogs.c:225 msgid "Catalan" msgstr "Catalão" -#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139 +#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144 msgid "Valencian-Catalan" msgstr "Valenciano-Catalão" -#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:220 +#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:226 msgid "Czech" msgstr "Tcheco" -#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142 +#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:147 msgid "Danish" msgstr "Dinamarquês" -#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144 -#: ../pidgin/gtkdialogs.c:221 +#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149 +#: ../pidgin/gtkdialogs.c:227 msgid "German" msgstr "Alemão" -#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146 -#: ../pidgin/gtkdialogs.c:147 +#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151 +#: ../pidgin/gtkdialogs.c:152 msgid "Dzongkha" msgstr "Dzongkha" -#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149 +#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:154 msgid "Greek" msgstr "Grego" -#: ../pidgin/gtkdialogs.c:150 +#: ../pidgin/gtkdialogs.c:155 msgid "Australian English" msgstr "Inglês australiano" -#: ../pidgin/gtkdialogs.c:151 +#: ../pidgin/gtkdialogs.c:156 msgid "Canadian English" msgstr "Inglês canadense" -#: ../pidgin/gtkdialogs.c:152 +#: ../pidgin/gtkdialogs.c:157 msgid "British English" msgstr "Inglês britânico" -#: ../pidgin/gtkdialogs.c:153 +#: ../pidgin/gtkdialogs.c:158 msgid "Esperanto" msgstr "Esperanto" -#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:222 -#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224 -#: ../pidgin/gtkdialogs.c:225 +#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:228 +#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230 +#: ../pidgin/gtkdialogs.c:231 msgid "Spanish" msgstr "Espanhol" -#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156 +#: ../pidgin/gtkdialogs.c:160 +msgid "Estonian" +msgstr "Estônio" + +#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:162 msgid "Euskera(Basque)" msgstr "Basco" -#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158 -#: ../pidgin/gtkdialogs.c:159 +#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164 +#: ../pidgin/gtkdialogs.c:165 msgid "Persian" msgstr "Persa" -#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226 -#: ../pidgin/gtkdialogs.c:227 +#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:232 +#: ../pidgin/gtkdialogs.c:233 msgid "Finnish" msgstr "Finlandês" -#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228 -#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230 -#: ../pidgin/gtkdialogs.c:231 +#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:234 +#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236 +#: ../pidgin/gtkdialogs.c:237 msgid "French" msgstr "Francês" -#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163 +#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:169 +#: ../pidgin/gtkdialogs.c:238 msgid "Galician" msgstr "Galego" -#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165 +#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171 msgid "Gujarati" msgstr "Guzerate" -#: ../pidgin/gtkdialogs.c:165 +#: ../pidgin/gtkdialogs.c:171 msgid "Gujarati Language Team" msgstr "Time de tradução do idioma Guzerate" -#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:232 +#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:239 msgid "Hebrew" msgstr "Hebraico" -#: ../pidgin/gtkdialogs.c:167 +#: ../pidgin/gtkdialogs.c:173 msgid "Hindi" msgstr "Hindu" -#: ../pidgin/gtkdialogs.c:168 +#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:240 msgid "Hungarian" msgstr "Húngaro" -#: ../pidgin/gtkdialogs.c:169 +#: ../pidgin/gtkdialogs.c:175 msgid "Indonesian" msgstr "Bahasa Indonésia" -#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:233 +#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:241 msgid "Italian" msgstr "Italiano" -#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:234 -#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236 +#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:242 +#: ../pidgin/gtkdialogs.c:243 ../pidgin/gtkdialogs.c:244 msgid "Japanese" msgstr "Japonês" -#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:237 +#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:245 msgid "Georgian" msgstr "Geórgio" -#: ../pidgin/gtkdialogs.c:172 +#: ../pidgin/gtkdialogs.c:178 msgid "Ubuntu Georgian Translators" msgstr "Tradutores do Ubuntu do idioma Geórgio" -#: ../pidgin/gtkdialogs.c:173 +#: ../pidgin/gtkdialogs.c:179 msgid "Kannada" msgstr "Canarês" -#: ../pidgin/gtkdialogs.c:173 +#: ../pidgin/gtkdialogs.c:179 msgid "Kannada Translation team" msgstr "Time de tradução do idioma Canarês" -#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:238 -#: ../pidgin/gtkdialogs.c:239 +#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:246 +#: ../pidgin/gtkdialogs.c:247 msgid "Korean" msgstr "Coreano" -#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:176 -#: ../pidgin/gtkdialogs.c:177 +#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182 +#: ../pidgin/gtkdialogs.c:183 msgid "Kurdish" msgstr "Curdo" -#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:240 -#: ../pidgin/gtkdialogs.c:241 +#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:248 +#: ../pidgin/gtkdialogs.c:249 msgid "Lithuanian" msgstr "Lituano" -#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180 -#: ../pidgin/gtkdialogs.c:242 +#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:186 +#: ../pidgin/gtkdialogs.c:250 msgid "Macedonian" msgstr "Macedônio" -#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:243 +#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:251 msgid "Bokmål Norwegian" msgstr "Dano-Norueguês" -#: ../pidgin/gtkdialogs.c:182 +#: ../pidgin/gtkdialogs.c:188 msgid "Nepali" msgstr "Nepalês" -#: ../pidgin/gtkdialogs.c:183 +#: ../pidgin/gtkdialogs.c:189 msgid "Dutch, Flemish" msgstr "Holandês, Flamengo" -#: ../pidgin/gtkdialogs.c:184 -msgid "Norwegian Nynorsk" -msgstr "Novo norueguês" - -#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:186 -#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:244 -msgid "Polish" -msgstr "Polonês" - -#: ../pidgin/gtkdialogs.c:188 -msgid "Portuguese" -msgstr "Português" - -#: ../pidgin/gtkdialogs.c:189 -msgid "Portuguese-Brazil" -msgstr "Português do Brasil" - #: ../pidgin/gtkdialogs.c:190 +msgid "Norwegian Nynorsk" +msgstr "Novo norueguês" + +#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192 +#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:252 +msgid "Polish" +msgstr "Polonês" + +#: ../pidgin/gtkdialogs.c:194 +msgid "Portuguese" +msgstr "Português" + +#: ../pidgin/gtkdialogs.c:195 +msgid "Portuguese-Brazil" +msgstr "Português do Brasil" + +#: ../pidgin/gtkdialogs.c:196 msgid "Pashto" msgstr "Afegão" -#: ../pidgin/gtkdialogs.c:191 +#: ../pidgin/gtkdialogs.c:197 msgid "Romanian" msgstr "Romeno" -#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:245 -#: ../pidgin/gtkdialogs.c:246 +#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:253 +#: ../pidgin/gtkdialogs.c:254 msgid "Russian" msgstr "Russo" -#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194 -#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248 -#: ../pidgin/gtkdialogs.c:249 +#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200 +#: ../pidgin/gtkdialogs.c:255 ../pidgin/gtkdialogs.c:256 +#: ../pidgin/gtkdialogs.c:257 msgid "Slovak" msgstr "Eslovaco" -#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:250 +#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258 msgid "Slovenian" msgstr "Esloveno" -#: ../pidgin/gtkdialogs.c:196 +#: ../pidgin/gtkdialogs.c:202 msgid "Albanian" msgstr "Albanês" -#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198 +#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204 msgid "Serbian" msgstr "Sérvio" -#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:251 +#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:259 +#: ../pidgin/gtkdialogs.c:260 msgid "Swedish" msgstr "Sueco" -#: ../pidgin/gtkdialogs.c:200 +#: ../pidgin/gtkdialogs.c:206 msgid "Tamil" msgstr "Tamil" -#: ../pidgin/gtkdialogs.c:201 +#: ../pidgin/gtkdialogs.c:207 msgid "Telugu" msgstr "Telugu" -#: ../pidgin/gtkdialogs.c:202 +#: ../pidgin/gtkdialogs.c:208 msgid "Thai" msgstr "Tailandês" -#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:252 +#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:261 msgid "Turkish" msgstr "Turco" -#: ../pidgin/gtkdialogs.c:204 +#: ../pidgin/gtkdialogs.c:210 msgid "Vietnamese" msgstr "Vietnamita" -#: ../pidgin/gtkdialogs.c:204 +#: ../pidgin/gtkdialogs.c:210 msgid "T.M.Thanh and the Gnome-Vi Team" msgstr "T.M.Thanh e o time do Gnome-Vi" -#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:253 +#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:262 msgid "Simplified Chinese" msgstr "Chinês Simplificado" -#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207 -#: ../pidgin/gtkdialogs.c:208 +#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:213 +#: ../pidgin/gtkdialogs.c:214 msgid "Hong Kong Chinese" msgstr "Chinês de Hong Kong" -#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:210 -#: ../pidgin/gtkdialogs.c:254 +#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216 +#: ../pidgin/gtkdialogs.c:263 msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: ../pidgin/gtkdialogs.c:216 +#: ../pidgin/gtkdialogs.c:222 msgid "Amharic" msgstr "Amhárico" -#: ../pidgin/gtkdialogs.c:339 +#: ../pidgin/gtkdialogs.c:348 #, c-format msgid "About %s" msgstr "Sobre o %s" -#: ../pidgin/gtkdialogs.c:377 +#: ../pidgin/gtkdialogs.c:386 #, c-format msgid "" "%s is a graphical modular messaging client based on libpurple which is " "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, " -"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at " -"once. It is written using GTK+.

You may modify and redistribute the " -"program under the terms of the GPL (version 2 or later). A copy of the GPL " -"is contained in the 'COPYING' file distributed with %s. %s is copyrighted " -"by its contributors. See the 'COPYRIGHT' file for the complete list of " -"contributors. We provide no warranty for this program.

" +"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and " +"QQ all at once. It is written using GTK+.

You may modify and " +"redistribute the program under the terms of the GPL (version 2 or later). A " +"copy of the GPL is contained in the 'COPYING' file distributed with %s. %s " +"is copyrighted by its contributors. See the 'COPYRIGHT' file for the " +"complete list of contributors. We provide no warranty for this program." +"

" msgstr "" "O %s é um cliente de mensagens modular capaz de usar o AIM, MSN, Yahoo!, " "XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, " -"Zephyr, Gadu-Gadu e QQ de uma vez só. Ele é escrito usando o GTK+." +"Zephyr, MySpace, Gadu-Gadu e QQ de uma vez só. Ele é escrito usando o GTK+." "

Você pode modificar e redistribuir o programa sob os termos da GPL " "(versão 2 ou superior). Uma cópia da GPL está contida no arquivo 'COPYING' " "distribuído com o %s. Os direitos de cópia do %s pertencem aos seus " "contribuidoes. Veja o arquivo 'COPYRIGHT' para uma lista completa destes " "contribuidores. Não oferecemos nenhuma garantia para este programa.

" -#: ../pidgin/gtkdialogs.c:392 +#: ../pidgin/gtkdialogs.c:404 msgid "IRC: #pidgin on irc.freenode.net

" msgstr "IRC: #pidgin no irc.freenode.net

" -#: ../pidgin/gtkdialogs.c:397 +#: ../pidgin/gtkdialogs.c:409 msgid "Current Developers" msgstr "Desenvolvedores atuais" -#: ../pidgin/gtkdialogs.c:412 +#: ../pidgin/gtkdialogs.c:424 msgid "Crazy Patch Writers" msgstr "Escritores de patch malucos" -#: ../pidgin/gtkdialogs.c:427 +#: ../pidgin/gtkdialogs.c:439 msgid "Retired Developers" msgstr "Desenvolvedores aposentados" -#: ../pidgin/gtkdialogs.c:442 +#: ../pidgin/gtkdialogs.c:454 msgid "Retired Crazy Patch Writers" msgstr "Escritores de patch aposentados" -#: ../pidgin/gtkdialogs.c:457 +#: ../pidgin/gtkdialogs.c:469 msgid "Artists" msgstr "Artistas" -#: ../pidgin/gtkdialogs.c:472 +#: ../pidgin/gtkdialogs.c:484 msgid "Current Translators" msgstr "Atuais tradutores" -#: ../pidgin/gtkdialogs.c:492 +#: ../pidgin/gtkdialogs.c:504 msgid "Past Translators" msgstr "Antigos tradutores" -#: ../pidgin/gtkdialogs.c:510 +#: ../pidgin/gtkdialogs.c:522 msgid "Debugging Information" msgstr "Informações de depuração" -#: ../pidgin/gtkdialogs.c:879 +#: ../pidgin/gtkdialogs.c:892 msgid "Get User Info" msgstr "Ver informações do usuário" -#: ../pidgin/gtkdialogs.c:881 +#: ../pidgin/gtkdialogs.c:894 msgid "" "Please enter the screen name or alias of the person whose info you would " "like to view." @@ -13611,43 +14928,43 @@ "Por favor digite o nome de usuário da pessoa cuja informação você gostaria " "de ver." -#: ../pidgin/gtkdialogs.c:971 +#: ../pidgin/gtkdialogs.c:984 msgid "View User Log" msgstr "Ver log do usuário" -#: ../pidgin/gtkdialogs.c:973 +#: ../pidgin/gtkdialogs.c:986 msgid "" "Please enter the screen name or alias of the person whose log you would like " "to view." msgstr "" "Por favor digite o nome de usuário da pessoa cujo log você gostaria de ver." -#: ../pidgin/gtkdialogs.c:993 +#: ../pidgin/gtkdialogs.c:1006 msgid "Alias Contact" msgstr "Apelidar contato" -#: ../pidgin/gtkdialogs.c:994 +#: ../pidgin/gtkdialogs.c:1007 msgid "Enter an alias for this contact." msgstr "Digite um apelido para este contato." -#: ../pidgin/gtkdialogs.c:1016 +#: ../pidgin/gtkdialogs.c:1029 #, c-format msgid "Enter an alias for %s." msgstr "Digite um apelido para %s." -#: ../pidgin/gtkdialogs.c:1018 +#: ../pidgin/gtkdialogs.c:1031 msgid "Alias Buddy" msgstr "Apelidar amigo" -#: ../pidgin/gtkdialogs.c:1039 +#: ../pidgin/gtkdialogs.c:1052 msgid "Alias Chat" msgstr "Apelidar bate-papo" -#: ../pidgin/gtkdialogs.c:1040 +#: ../pidgin/gtkdialogs.c:1053 msgid "Enter an alias for this chat." msgstr "Digite um apelido para este bate-papo." -#: ../pidgin/gtkdialogs.c:1079 +#: ../pidgin/gtkdialogs.c:1092 #, c-format msgid "" "You are about to remove the contact containing %s and %d other buddy from " @@ -13662,15 +14979,15 @@ "Você está prestes a remover o contato que contém %s e %d outros amigos da " "sua lista de amigos. Deseja continuar?" -#: ../pidgin/gtkdialogs.c:1087 +#: ../pidgin/gtkdialogs.c:1100 msgid "Remove Contact" msgstr "Remover contato" -#: ../pidgin/gtkdialogs.c:1090 +#: ../pidgin/gtkdialogs.c:1103 msgid "_Remove Contact" msgstr "_Remover contato" -#: ../pidgin/gtkdialogs.c:1121 +#: ../pidgin/gtkdialogs.c:1134 #, c-format msgid "" "You are about to merge the group called %s into the group called %s. Do you " @@ -13679,15 +14996,15 @@ "Você está prestes a mesclar o grupo %s com o grupo chamado %s. Deseja " "continuar?" -#: ../pidgin/gtkdialogs.c:1128 +#: ../pidgin/gtkdialogs.c:1141 msgid "Merge Groups" msgstr "Mesclar grupos" -#: ../pidgin/gtkdialogs.c:1131 +#: ../pidgin/gtkdialogs.c:1144 msgid "_Merge Groups" msgstr "_Mesclar grupos" -#: ../pidgin/gtkdialogs.c:1181 +#: ../pidgin/gtkdialogs.c:1194 #, c-format msgid "" "You are about to remove the group %s and all its members from your buddy " @@ -13696,30 +15013,30 @@ "Você está prestes a remover o grupo %s e todos os seus membros da sua lista " "de amigos. Deseja continuar?" -#: ../pidgin/gtkdialogs.c:1184 +#: ../pidgin/gtkdialogs.c:1197 msgid "Remove Group" msgstr "Remover grupo" -#: ../pidgin/gtkdialogs.c:1187 +#: ../pidgin/gtkdialogs.c:1200 msgid "_Remove Group" msgstr "_Remover grupo" -#: ../pidgin/gtkdialogs.c:1220 +#: ../pidgin/gtkdialogs.c:1233 #, c-format msgid "" "You are about to remove %s from your buddy list. Do you want to continue?" msgstr "" "Você está prestes a remover %s da sua lista de amigos. Deseja continuar?" -#: ../pidgin/gtkdialogs.c:1223 +#: ../pidgin/gtkdialogs.c:1236 msgid "Remove Buddy" msgstr "Remover amigo" -#: ../pidgin/gtkdialogs.c:1226 +#: ../pidgin/gtkdialogs.c:1239 msgid "_Remove Buddy" msgstr "_Remover amigo" -#: ../pidgin/gtkdialogs.c:1247 +#: ../pidgin/gtkdialogs.c:1260 #, c-format msgid "" "You are about to remove the chat %s from your buddy list. Do you want to " @@ -13728,11 +15045,11 @@ "Você está prestes a remover o bate-papo %s da sua lista de amigos. Deseja " "continuar?" -#: ../pidgin/gtkdialogs.c:1250 +#: ../pidgin/gtkdialogs.c:1263 msgid "Remove Chat" msgstr "Remover bate-papo" -#: ../pidgin/gtkdialogs.c:1253 +#: ../pidgin/gtkdialogs.c:1266 msgid "_Remove Chat" msgstr "_Remover bate-papo" @@ -13841,7 +15158,7 @@ msgstr "_Detalhes da transferência" #. Pause button -#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89 +#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94 msgid "_Pause" msgstr "_Pausar" @@ -13854,7 +15171,7 @@ msgid "Paste as Plain _Text" msgstr "Colar como _texto puro" -#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1138 +#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190 msgid "_Reset formatting" msgstr "Limpa_r formatação" @@ -13937,27 +15254,27 @@ msgid "_Save Image..." msgstr "_Salvar imagem..." -#: ../pidgin/gtkimhtmltoolbar.c:153 +#: ../pidgin/gtkimhtmltoolbar.c:162 msgid "Select Font" msgstr "Selecionar fonte" -#: ../pidgin/gtkimhtmltoolbar.c:232 +#: ../pidgin/gtkimhtmltoolbar.c:241 msgid "Select Text Color" msgstr "Selecionar cor do texto" -#: ../pidgin/gtkimhtmltoolbar.c:311 +#: ../pidgin/gtkimhtmltoolbar.c:320 msgid "Select Background Color" msgstr "Selecionar cor de fundo" -#: ../pidgin/gtkimhtmltoolbar.c:400 +#: ../pidgin/gtkimhtmltoolbar.c:409 msgid "_URL" msgstr "_URL" -#: ../pidgin/gtkimhtmltoolbar.c:408 +#: ../pidgin/gtkimhtmltoolbar.c:417 msgid "_Description" msgstr "_Descrição" -#: ../pidgin/gtkimhtmltoolbar.c:411 +#: ../pidgin/gtkimhtmltoolbar.c:420 msgid "" "Please enter the URL and description of the link that you want to insert. " "The description is optional." @@ -13965,91 +15282,155 @@ "Por favor digite a URL e a descrição do link que você gostaria de inserir. " "A descrição é opcional." -#: ../pidgin/gtkimhtmltoolbar.c:415 +#: ../pidgin/gtkimhtmltoolbar.c:424 msgid "Please enter the URL of the link that you want to insert." msgstr "Por favor digite a URL do link que você gostaria de inserir." -#: ../pidgin/gtkimhtmltoolbar.c:420 +#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098 msgid "Insert Link" msgstr "Inserir link" -#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207 +#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258 msgid "_Insert" msgstr "_Inserir" -#: ../pidgin/gtkimhtmltoolbar.c:493 +#: ../pidgin/gtkimhtmltoolbar.c:513 #, c-format msgid "Failed to store image: %s\n" msgstr "Não foi possível armazenar imagem: %s\n" -#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529 +#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549 msgid "Insert Image" msgstr "Inserir imagem" -#: ../pidgin/gtkimhtmltoolbar.c:740 +#: ../pidgin/gtkimhtmltoolbar.c:760 msgid "This theme has no available smileys." msgstr "Este tema não possui emoticons disponíveis." #. show everything -#: ../pidgin/gtkimhtmltoolbar.c:757 +#: ../pidgin/gtkimhtmltoolbar.c:777 msgid "Smile!" msgstr "Emoticon!" -#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164 +#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215 msgid "_Font" msgstr "_Fonte" -#: ../pidgin/gtkimhtmltoolbar.c:1124 +#: ../pidgin/gtkimhtmltoolbar.c:1050 +msgid "Group Items" +msgstr "Agrupar itens" + +#: ../pidgin/gtkimhtmltoolbar.c:1050 +msgid "Ungroup Items" +msgstr "Desagrupar itens" + +#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287 +msgid "Bold" +msgstr "Negrito" + +#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294 +msgid "Italic" +msgstr "Itálico" + +#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301 +msgid "Underline" +msgstr "Sublinhado" + +#: ../pidgin/gtkimhtmltoolbar.c:1087 +msgid "Strikethrough" +msgstr "Tachado" + +#: ../pidgin/gtkimhtmltoolbar.c:1089 +msgid "Increase Font Size" +msgstr "Aumentar tamanho da fonte" + +#: ../pidgin/gtkimhtmltoolbar.c:1090 +msgid "Decrease Font Size" +msgstr "Diminuir tamanho da fonte" + +#: ../pidgin/gtkimhtmltoolbar.c:1092 +msgid "Font Face" +msgstr "Tipo da fonte" + +#: ../pidgin/gtkimhtmltoolbar.c:1093 +msgid "Background Color" +msgstr "Cor do fundo" + +#: ../pidgin/gtkimhtmltoolbar.c:1094 +msgid "Foreground Color" +msgstr "Cor da fonte" + +#: ../pidgin/gtkimhtmltoolbar.c:1096 +msgid "Reset Formatting" +msgstr "Limpar formatação" + +#: ../pidgin/gtkimhtmltoolbar.c:1099 +msgid "Insert IM Image" +msgstr "Inserir imagem de MI" + +#: ../pidgin/gtkimhtmltoolbar.c:1100 +msgid "Insert Smiley" +msgstr "Inserir emoticon" + +#: ../pidgin/gtkimhtmltoolbar.c:1175 msgid "_Bold" msgstr "_Negrito" -#: ../pidgin/gtkimhtmltoolbar.c:1125 +#: ../pidgin/gtkimhtmltoolbar.c:1176 msgid "_Italic" msgstr "_Itálico" -#: ../pidgin/gtkimhtmltoolbar.c:1126 +#: ../pidgin/gtkimhtmltoolbar.c:1177 msgid "_Underline" msgstr "_Sublinhado" -#: ../pidgin/gtkimhtmltoolbar.c:1127 +#: ../pidgin/gtkimhtmltoolbar.c:1178 +msgid "Strikethrough" +msgstr "Tachado" + +#: ../pidgin/gtkimhtmltoolbar.c:1179 msgid "_Larger" msgstr "_Maior" -#: ../pidgin/gtkimhtmltoolbar.c:1129 +#: ../pidgin/gtkimhtmltoolbar.c:1181 msgid "_Normal" msgstr "N_ormal" -#: ../pidgin/gtkimhtmltoolbar.c:1131 +#: ../pidgin/gtkimhtmltoolbar.c:1183 msgid "_Smaller" msgstr "M_enor" #. If we want to show the formatting for the following items, we would #. * need to update them when formatting changes. The above items don't need #. * no updating nor nothin' -#: ../pidgin/gtkimhtmltoolbar.c:1135 +#: ../pidgin/gtkimhtmltoolbar.c:1187 msgid "_Font face" msgstr "_Fonte" -#: ../pidgin/gtkimhtmltoolbar.c:1136 +#: ../pidgin/gtkimhtmltoolbar.c:1188 msgid "Foreground _color" msgstr "_Cor da fonte" -#: ../pidgin/gtkimhtmltoolbar.c:1137 +#: ../pidgin/gtkimhtmltoolbar.c:1189 msgid "Bac_kground color" msgstr "Co_r do fundo" -#: ../pidgin/gtkimhtmltoolbar.c:1215 +#: ../pidgin/gtkimhtmltoolbar.c:1266 msgid "_Smiley" msgstr "_Emoticon!" -#: ../pidgin/gtkimhtmltoolbar.c:1221 +#: ../pidgin/gtkimhtmltoolbar.c:1272 msgid "_Image" msgstr "Ima_gem" -#: ../pidgin/gtkimhtmltoolbar.c:1227 +#: ../pidgin/gtkimhtmltoolbar.c:1278 msgid "_Link" msgstr "_Link" +#: ../pidgin/gtkimhtmltoolbar.c:1284 +msgid "_Horizontal rule" +msgstr "Régua _horizontal" + #: ../pidgin/gtklog.c:292 #, c-format msgid "" @@ -14220,44 +15601,44 @@ msgid "Pidgin" msgstr "Pidgin" -#: ../pidgin/gtknotify.c:344 +#: ../pidgin/gtknotify.c:348 msgid "Open All Messages" msgstr "Abrir todas as mensagens" -#: ../pidgin/gtknotify.c:396 +#: ../pidgin/gtknotify.c:401 msgid "You have mail!" msgstr "Você tem e-mail!" -#: ../pidgin/gtknotify.c:516 +#: ../pidgin/gtknotify.c:521 #, c-format msgid "%s has %d new message." msgid_plural "%s has %d new messages." msgstr[0] "%s tem %d nova mensagem." msgstr[1] "%s tem %d novas mensagens." -#: ../pidgin/gtknotify.c:527 +#: ../pidgin/gtknotify.c:532 #, c-format msgid "You have %d new e-mail." msgid_plural "You have %d new e-mails." msgstr[0] "Você tem %d novo e-mail." msgstr[1] "Você tem %d novos e-mails." -#: ../pidgin/gtknotify.c:967 +#: ../pidgin/gtknotify.c:957 #, c-format msgid "The browser command \"%s\" is invalid." msgstr "O comando de navegador \"%s\" é inválido." -#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:981 -#: ../pidgin/gtknotify.c:994 ../pidgin/gtknotify.c:1122 +#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971 +#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112 msgid "Unable to open URL" msgstr "Não foi possível abrir URL" -#: ../pidgin/gtknotify.c:979 ../pidgin/gtknotify.c:992 +#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982 #, c-format msgid "Error launching \"%s\": %s" msgstr "Erro ao executar \"%s\": %s" -#: ../pidgin/gtknotify.c:1123 +#: ../pidgin/gtknotify.c:1113 msgid "" "The 'Manual' browser command has been chosen, but no command has been set." msgstr "" @@ -14311,99 +15692,100 @@ msgstr "Selecione um arquivo" #. Create the "Pounce on Whom" frame. -#: ../pidgin/gtkpounce.c:533 +#: ../pidgin/gtkpounce.c:531 msgid "Pounce on Whom" msgstr "Quem terá a ação" -#: ../pidgin/gtkpounce.c:560 +#: ../pidgin/gtkpounce.c:558 msgid "_Buddy name:" msgstr "_Nome do amigo:" +#: ../pidgin/gtkpounce.c:592 +msgid "Si_gns on" +msgstr "_Conectar" + #: ../pidgin/gtkpounce.c:594 -msgid "Si_gns on" -msgstr "_Conectar" +msgid "Signs o_ff" +msgstr "_Desconectar" #: ../pidgin/gtkpounce.c:596 -msgid "Signs o_ff" -msgstr "_Desconectar" +msgid "Goes a_way" +msgstr "O amigo ficar _ausente" #: ../pidgin/gtkpounce.c:598 -msgid "Goes a_way" -msgstr "O amigo ficar _ausente" +msgid "Ret_urns from away" +msgstr "Volta_r da ausência" #: ../pidgin/gtkpounce.c:600 -msgid "Ret_urns from away" -msgstr "Volta_r da ausência" +msgid "Becomes _idle" +msgstr "Tornar-se _inativo" #: ../pidgin/gtkpounce.c:602 -msgid "Becomes _idle" -msgstr "Tornar-se _inativo" - -#: ../pidgin/gtkpounce.c:604 msgid "Is no longer i_dle" msgstr "Não estiver mais i_nativo" -#: ../pidgin/gtkpounce.c:606 +#: ../pidgin/gtkpounce.c:604 msgid "Starts _typing" msgstr "C_omeçar a digitar" +#: ../pidgin/gtkpounce.c:606 +msgid "P_auses while typing" +msgstr "P_ausar ao digitar" + #: ../pidgin/gtkpounce.c:608 -msgid "P_auses while typing" -msgstr "P_ausar ao digitar" - -#: ../pidgin/gtkpounce.c:610 msgid "Stops t_yping" msgstr "Parar de di_gitar" -#: ../pidgin/gtkpounce.c:612 +#: ../pidgin/gtkpounce.c:610 msgid "Sends a _message" msgstr "En_viar uma mensagem" +#: ../pidgin/gtkpounce.c:653 +msgid "Ope_n an IM window" +msgstr "Abrir uma jan_ela de MI" + #: ../pidgin/gtkpounce.c:655 -msgid "Ope_n an IM window" -msgstr "Abrir uma jan_ela de MI" - -#: ../pidgin/gtkpounce.c:657 msgid "_Pop up a notification" msgstr "Exibir notificação _popup" -#: ../pidgin/gtkpounce.c:659 +#: ../pidgin/gtkpounce.c:657 msgid "Send a _message" msgstr "Envia_r uma mensagem" +#: ../pidgin/gtkpounce.c:659 +msgid "E_xecute a command" +msgstr "E_xecutar um comando" + #: ../pidgin/gtkpounce.c:661 -msgid "E_xecute a command" -msgstr "E_xecutar um comando" - -#: ../pidgin/gtkpounce.c:663 msgid "P_lay a sound" msgstr "Tocar um _som" -#: ../pidgin/gtkpounce.c:669 +#: ../pidgin/gtkpounce.c:667 msgid "Brows_e..." msgstr "Proc_urar..." -#: ../pidgin/gtkpounce.c:671 +#: ../pidgin/gtkpounce.c:669 msgid "Br_owse..." msgstr "Proc_urar..." -#: ../pidgin/gtkpounce.c:672 +#: ../pidgin/gtkpounce.c:670 msgid "Pre_view" msgstr "Pré-_visualizar" -#: ../pidgin/gtkpounce.c:799 +#: ../pidgin/gtkpounce.c:797 msgid "P_ounce only when my status is not Available" msgstr "_Executar apenas quando meu status não for Disponível" -#: ../pidgin/gtkpounce.c:804 +#: ../pidgin/gtkpounce.c:802 msgid "_Recurring" msgstr "_Recorrente" -#: ../pidgin/gtkpounce.c:1260 +#: ../pidgin/gtkpounce.c:1245 msgid "Pounce Target" msgstr "Alvo da ação" #: ../pidgin/gtkprefs.c:385 +#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1 msgid "Default" msgstr "Padrão" @@ -14447,7 +15829,7 @@ msgid "_Hide new IM conversations:" msgstr "_Esconder novas conversas de MI:" -#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939 +#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943 msgid "When away" msgstr "Quando ausente" @@ -14544,11 +15926,11 @@ msgid "Conversation _font:" msgstr "_Fonte para as conversas:" -#: ../pidgin/gtkprefs.c:1041 +#: ../pidgin/gtkprefs.c:1042 msgid "Default Formatting" msgstr "Formatação padrão" -#: ../pidgin/gtkprefs.c:1059 +#: ../pidgin/gtkprefs.c:1061 msgid "" "This is how your outgoing message text will appear when you use protocols " "that support formatting." @@ -14556,119 +15938,119 @@ "Sua mensagem enviada aparecerá assim quando você usar protocolos que " "suportem formatação." -#: ../pidgin/gtkprefs.c:1125 +#: ../pidgin/gtkprefs.c:1127 msgid "ST_UN server:" msgstr "_Servidor ST_UN:" -#: ../pidgin/gtkprefs.c:1137 +#: ../pidgin/gtkprefs.c:1139 msgid "Example: stunserver.org" msgstr "Exemplo: stunserver.org" -#: ../pidgin/gtkprefs.c:1141 +#: ../pidgin/gtkprefs.c:1143 msgid "_Autodetect IP address" msgstr "Detectar endereço IP _automaticamente" -#: ../pidgin/gtkprefs.c:1150 +#: ../pidgin/gtkprefs.c:1152 msgid "Public _IP:" msgstr "_IP público:" -#: ../pidgin/gtkprefs.c:1179 +#: ../pidgin/gtkprefs.c:1181 msgid "Ports" msgstr "Portas" -#: ../pidgin/gtkprefs.c:1182 +#: ../pidgin/gtkprefs.c:1184 msgid "_Manually specify range of ports to listen on" msgstr "Especificar _manualmente as portas a escutar" -#: ../pidgin/gtkprefs.c:1185 +#: ../pidgin/gtkprefs.c:1187 msgid "_Start port:" msgstr "Porta _inicial:" -#: ../pidgin/gtkprefs.c:1192 +#: ../pidgin/gtkprefs.c:1194 msgid "_End port:" msgstr "Porta _final:" -#: ../pidgin/gtkprefs.c:1200 +#: ../pidgin/gtkprefs.c:1202 msgid "Proxy Server" msgstr "Servidor proxy" -#: ../pidgin/gtkprefs.c:1204 +#: ../pidgin/gtkprefs.c:1206 msgid "No proxy" msgstr "Nenhum proxy" -#: ../pidgin/gtkprefs.c:1260 +#: ../pidgin/gtkprefs.c:1262 msgid "_User:" msgstr "_Usuário:" -#: ../pidgin/gtkprefs.c:1325 +#: ../pidgin/gtkprefs.c:1327 msgid "Seamonkey" msgstr "Seamonkey" -#: ../pidgin/gtkprefs.c:1326 -msgid "Opera" -msgstr "Opera" - -#: ../pidgin/gtkprefs.c:1327 -msgid "Netscape" -msgstr "Netscape" - #: ../pidgin/gtkprefs.c:1328 -msgid "Mozilla" -msgstr "Mozilla" +msgid "Opera" +msgstr "Opera" #: ../pidgin/gtkprefs.c:1329 -msgid "Konqueror" -msgstr "Konqueror" +msgid "Netscape" +msgstr "Netscape" #: ../pidgin/gtkprefs.c:1330 -msgid "GNOME Default" -msgstr "Padrão do GNOME" +msgid "Mozilla" +msgstr "Mozilla" #: ../pidgin/gtkprefs.c:1331 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../pidgin/gtkprefs.c:1332 +msgid "GNOME Default" +msgstr "Padrão do GNOME" + +#: ../pidgin/gtkprefs.c:1333 msgid "Galeon" msgstr "Galeon" -#: ../pidgin/gtkprefs.c:1332 +#: ../pidgin/gtkprefs.c:1334 msgid "Firefox" msgstr "Firefox" -#: ../pidgin/gtkprefs.c:1333 +#: ../pidgin/gtkprefs.c:1335 msgid "Firebird" msgstr "Firebird" -#: ../pidgin/gtkprefs.c:1334 +#: ../pidgin/gtkprefs.c:1336 msgid "Epiphany" msgstr "Epiphany" -#: ../pidgin/gtkprefs.c:1343 +#: ../pidgin/gtkprefs.c:1345 msgid "Manual" msgstr "Manual" -#: ../pidgin/gtkprefs.c:1396 +#: ../pidgin/gtkprefs.c:1398 msgid "Browser Selection" msgstr "Seleção do navegador" -#: ../pidgin/gtkprefs.c:1400 +#: ../pidgin/gtkprefs.c:1402 msgid "_Browser:" msgstr "_Navegador:" -#: ../pidgin/gtkprefs.c:1408 +#: ../pidgin/gtkprefs.c:1410 msgid "_Open link in:" msgstr "_Abrir link no:" -#: ../pidgin/gtkprefs.c:1410 +#: ../pidgin/gtkprefs.c:1412 msgid "Browser default" msgstr "Navegador padrão" -#: ../pidgin/gtkprefs.c:1411 +#: ../pidgin/gtkprefs.c:1413 msgid "Existing window" msgstr "Janela existente" -#: ../pidgin/gtkprefs.c:1413 +#: ../pidgin/gtkprefs.c:1415 msgid "New tab" msgstr "Nova aba" -#: ../pidgin/gtkprefs.c:1427 +#: ../pidgin/gtkprefs.c:1429 #, c-format msgid "" "_Manual:\n" @@ -14677,63 +16059,63 @@ "_Manual:\n" "(%s para URL)" -#: ../pidgin/gtkprefs.c:1467 +#: ../pidgin/gtkprefs.c:1469 msgid "Log _format:" msgstr "_Formato do log:" -#: ../pidgin/gtkprefs.c:1472 +#: ../pidgin/gtkprefs.c:1474 msgid "Log all _instant messages" msgstr "_Gravar todas as mensagens instantâneas" -#: ../pidgin/gtkprefs.c:1474 -msgid "Log all c_hats" -msgstr "Gravar todos os _bate-papos" - #: ../pidgin/gtkprefs.c:1476 +msgid "Log all c_hats" +msgstr "Gravar todos os _bate-papos" + +#: ../pidgin/gtkprefs.c:1478 msgid "Log all _status changes to system log" msgstr "Gravar todos as mudanças de _status no log do sistema" -#: ../pidgin/gtkprefs.c:1622 +#: ../pidgin/gtkprefs.c:1624 msgid "Sound Selection" msgstr "Seleção de som" -#: ../pidgin/gtkprefs.c:1632 +#: ../pidgin/gtkprefs.c:1634 msgid "Quietest" msgstr "Muito silencioso" -#: ../pidgin/gtkprefs.c:1634 -msgid "Quieter" -msgstr "Mais silencioso" - #: ../pidgin/gtkprefs.c:1636 +msgid "Quieter" +msgstr "Mais silencioso" + +#: ../pidgin/gtkprefs.c:1638 msgid "Quiet" msgstr "Silencioso" -#: ../pidgin/gtkprefs.c:1640 +#: ../pidgin/gtkprefs.c:1642 msgid "Loud" msgstr "Alto" -#: ../pidgin/gtkprefs.c:1642 +#: ../pidgin/gtkprefs.c:1644 msgid "Louder" msgstr "Mais alto" -#: ../pidgin/gtkprefs.c:1644 +#: ../pidgin/gtkprefs.c:1646 msgid "Loudest" msgstr "Muito alto" -#: ../pidgin/gtkprefs.c:1708 +#: ../pidgin/gtkprefs.c:1712 msgid "_Method:" msgstr "_Método:" -#: ../pidgin/gtkprefs.c:1710 +#: ../pidgin/gtkprefs.c:1714 msgid "Console beep" msgstr "Bipe do console" -#: ../pidgin/gtkprefs.c:1717 +#: ../pidgin/gtkprefs.c:1721 msgid "No sounds" msgstr "Sem sons" -#: ../pidgin/gtkprefs.c:1725 +#: ../pidgin/gtkprefs.c:1729 #, c-format msgid "" "Sound c_ommand:\n" @@ -14742,81 +16124,81 @@ "C_omando do som:\n" "(%s para nome do arquivo)" -#: ../pidgin/gtkprefs.c:1752 +#: ../pidgin/gtkprefs.c:1756 msgid "Sounds when conversation has _focus" msgstr "Emitir sons quando a janela da conversa _ganhar foco" -#: ../pidgin/gtkprefs.c:1754 +#: ../pidgin/gtkprefs.c:1758 msgid "Enable sounds:" msgstr "Ativar sons:" -#: ../pidgin/gtkprefs.c:1765 +#: ../pidgin/gtkprefs.c:1769 msgid "Volume:" msgstr "Volume:" -#: ../pidgin/gtkprefs.c:1845 +#: ../pidgin/gtkprefs.c:1849 msgid "Play" msgstr "Tocar" -#: ../pidgin/gtkprefs.c:1922 +#: ../pidgin/gtkprefs.c:1926 msgid "_Report idle time:" msgstr "Mostrar _tempo de inatividade:" -#: ../pidgin/gtkprefs.c:1927 +#: ../pidgin/gtkprefs.c:1931 msgid "Based on keyboard or mouse use" msgstr "A partir do uso do mouse/teclado" -#: ../pidgin/gtkprefs.c:1936 +#: ../pidgin/gtkprefs.c:1940 msgid "_Auto-reply:" msgstr "_Auto-resposta:" -#: ../pidgin/gtkprefs.c:1940 +#: ../pidgin/gtkprefs.c:1944 msgid "When both away and idle" msgstr "Quando ausente e inativo" #. Auto-away stuff -#: ../pidgin/gtkprefs.c:1946 +#: ../pidgin/gtkprefs.c:1950 msgid "Auto-away" msgstr "Auto-ausente" -#: ../pidgin/gtkprefs.c:1948 +#: ../pidgin/gtkprefs.c:1952 msgid "Change status when _idle" msgstr "Mudar status após _inatividade" -#: ../pidgin/gtkprefs.c:1952 +#: ../pidgin/gtkprefs.c:1956 msgid "_Minutes before becoming idle:" msgstr "_Minutos antes de tornar inativo:" -#: ../pidgin/gtkprefs.c:1960 +#: ../pidgin/gtkprefs.c:1964 msgid "Change _status to:" msgstr "Mudar status para:" #. Signon status stuff -#: ../pidgin/gtkprefs.c:1981 +#: ../pidgin/gtkprefs.c:1985 msgid "Status at Startup" msgstr "Status na inicialização" -#: ../pidgin/gtkprefs.c:1983 +#: ../pidgin/gtkprefs.c:1987 msgid "Use status from last _exit at startup" msgstr "Usar o s_tatus da última saída ao iniciar" -#: ../pidgin/gtkprefs.c:1989 +#: ../pidgin/gtkprefs.c:1993 msgid "Status to a_pply at startup:" msgstr "Status a a_plicar na inicialização:" -#: ../pidgin/gtkprefs.c:2027 +#: ../pidgin/gtkprefs.c:2031 msgid "Interface" msgstr "Interface" -#: ../pidgin/gtkprefs.c:2029 +#: ../pidgin/gtkprefs.c:2033 msgid "Smiley Themes" msgstr "Temas de emoticons" -#: ../pidgin/gtkprefs.c:2036 +#: ../pidgin/gtkprefs.c:2040 msgid "Browser" msgstr "Navegador" -#: ../pidgin/gtkprefs.c:2040 +#: ../pidgin/gtkprefs.c:2044 msgid "Status / Idle" msgstr "Status / Inativo" @@ -14907,23 +16289,23 @@ msgid "Apply" msgstr "Aplicar" -#: ../pidgin/gtkrequest.c:1504 +#: ../pidgin/gtkrequest.c:1507 msgid "That file already exists" msgstr "Este arquivo já existe" -#: ../pidgin/gtkrequest.c:1505 -msgid "Would you like to overwrite it?" -msgstr "Você deseja sobrescrevê-lo?" - #: ../pidgin/gtkrequest.c:1508 +msgid "Would you like to overwrite it?" +msgstr "Você deseja sobrescrevê-lo?" + +#: ../pidgin/gtkrequest.c:1511 msgid "Overwrite" msgstr "Sobrescrever" -#: ../pidgin/gtkrequest.c:1509 +#: ../pidgin/gtkrequest.c:1512 msgid "Choose New Name" msgstr "Escolher novo nome" -#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661 +#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664 msgid "Select Folder..." msgstr "Selecionar pasta..." @@ -14965,7 +16347,7 @@ msgid "_Title:" msgstr "_Título:" -#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494 +#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496 msgid "_Status:" msgstr "_Status:" @@ -14979,7 +16361,7 @@ msgid "Sa_ve & Use" msgstr "Sal_var e usar" -#: ../pidgin/gtksavedstatuses.c:1477 +#: ../pidgin/gtksavedstatuses.c:1479 #, c-format msgid "Status for %s" msgstr "Status de %s" @@ -14992,21 +16374,21 @@ msgid "Google Talk" msgstr "Google Talk" -#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411 +#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421 #, c-format msgid "The following error has occurred loading %s: %s" msgstr "O seguinte erro ocorreu ao carregar %s: %s." -#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413 +#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423 msgid "Failed to load image" msgstr "Falha ao carregar imagem" -#: ../pidgin/gtkutils.c:1487 +#: ../pidgin/gtkutils.c:1497 #, c-format msgid "Cannot send folder %s." msgstr "Não foi possível enviar a pasta %s." -#: ../pidgin/gtkutils.c:1488 +#: ../pidgin/gtkutils.c:1498 #, c-format msgid "" "%s cannot transfer a folder. You will need to send the files within " @@ -15015,12 +16397,12 @@ "O %s não pode transferir uma pasta. Você terá que enviar os arquivos que " "estão dentro dela individualmente." -#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532 -#: ../pidgin/gtkutils.c:1539 +#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542 +#: ../pidgin/gtkutils.c:1549 msgid "You have dragged an image" msgstr "Você arrastou uma imagem" -#: ../pidgin/gtkutils.c:1521 +#: ../pidgin/gtkutils.c:1531 msgid "" "You can send this image as a file transfer, embed it into this message, or " "use it as the buddy icon for this user." @@ -15028,23 +16410,23 @@ "Você pode usar esta imagem numa transferência de arquivo, incluí-la nesta " "mensagem, ou usá-la como o ícone de amigo para este usuário." -#: ../pidgin/gtkutils.c:1527 ../pidgin/gtkutils.c:1547 +#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557 msgid "Set as buddy icon" msgstr "Definir como ícone de amigo" -#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548 +#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558 msgid "Send image file" msgstr "Enviar arquivo de imagem" -#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548 +#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558 msgid "Insert in message" msgstr "Inserir na mensagem" -#: ../pidgin/gtkutils.c:1533 +#: ../pidgin/gtkutils.c:1543 msgid "Would you like to set it as the buddy icon for this user?" msgstr "Você deseja defini-la como o ícone de amigo deste usuário?" -#: ../pidgin/gtkutils.c:1540 +#: ../pidgin/gtkutils.c:1550 msgid "" "You can send this image as a file transfer, or use it as the buddy icon for " "this user." @@ -15052,7 +16434,7 @@ "Você pode usar esta imagem numa transferência de arquivo, ou usá-la como o " "ícone de amigo para este usuário." -#: ../pidgin/gtkutils.c:1541 +#: ../pidgin/gtkutils.c:1551 msgid "" "You can insert this image into this message, or use it as the buddy icon for " "this user" @@ -15065,11 +16447,11 @@ #. * send. The only logical one is "Application," but do we really want to send a binary and nothing else? #. * Probably not. I'll just give an error and return. #. The original patch sent the icon used by the launcher. That's probably wrong -#: ../pidgin/gtkutils.c:1599 +#: ../pidgin/gtkutils.c:1609 msgid "Cannot send launcher" msgstr "Não é possível enviar atalhos" -#: ../pidgin/gtkutils.c:1599 +#: ../pidgin/gtkutils.c:1609 msgid "" "You dragged a desktop launcher. Most likely you wanted to send whatever this " "launcher points to instead of this launcher itself." @@ -15077,7 +16459,7 @@ "Você arrastou um atalho da área de trabalho. Provavelmente você queria " "enviar o destino do atalho, e não o atalho em si." -#: ../pidgin/gtkutils.c:2334 +#: ../pidgin/gtkutils.c:2344 #, c-format msgid "" "File: %s\n" @@ -15088,25 +16470,25 @@ "Tamanho do arquivo: %s\n" "Dimensões da imagem: %dx%d" -#: ../pidgin/gtkutils.c:2630 +#: ../pidgin/gtkutils.c:2640 #, c-format msgid "The file '%s' is too large for %s. Please try a smaller image.\n" msgstr "O arquivo '%s' é grande demais para %s. Tente uma imagem menor.\n" -#: ../pidgin/gtkutils.c:2632 +#: ../pidgin/gtkutils.c:2642 msgid "Icon Error" msgstr "Erro no ícone" -#: ../pidgin/gtkutils.c:2633 +#: ../pidgin/gtkutils.c:2643 msgid "Could not set icon" msgstr "Não foi possível definir o ícone" -#: ../pidgin/gtkutils.c:2733 +#: ../pidgin/gtkutils.c:2743 #, c-format msgid "Failed to open file '%s': %s" msgstr "Falha ao abrir arquivo '%s': %s" -#: ../pidgin/gtkutils.c:2782 +#: ../pidgin/gtkutils.c:2792 #, c-format msgid "" "Failed to load image '%s': reason not known, probably a corrupt image file" @@ -15122,30 +16504,34 @@ msgid "Select color" msgstr "Selecionar cor" -#: ../pidgin/pidginstock.c:81 +#: ../pidgin/pidginstock.c:86 msgid "_Alias" msgstr "_Apelido:" -#: ../pidgin/pidginstock.c:83 +#: ../pidgin/pidginstock.c:88 msgid "Close _tabs" msgstr "Fechar _abas" -#: ../pidgin/pidginstock.c:85 +#: ../pidgin/pidginstock.c:90 msgid "_Get Info" msgstr "_Ver info" -#: ../pidgin/pidginstock.c:86 +#: ../pidgin/pidginstock.c:91 msgid "_Invite" msgstr "Conv_idar" -#: ../pidgin/pidginstock.c:87 +#: ../pidgin/pidginstock.c:92 msgid "_Modify" msgstr "_Modificar" -#: ../pidgin/pidginstock.c:88 +#: ../pidgin/pidginstock.c:93 msgid "_Open Mail" msgstr "_Abrir e-mail" +#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2 +msgid "Pidgin smileys" +msgstr "Emoticons do Pidgin" + #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1 msgid "Penguin Pimps" msgstr "Penguin Pimps" @@ -15317,18 +16703,6 @@ msgid "Select Color for %s" msgstr "Selecione a cor de %s" -#: ../pidgin/plugins/convcolors.c:287 -msgid "Bold" -msgstr "Negrito" - -#: ../pidgin/plugins/convcolors.c:294 -msgid "Italic" -msgstr "Itálico" - -#: ../pidgin/plugins/convcolors.c:301 -msgid "Underline" -msgstr "Sublinhado" - #: ../pidgin/plugins/convcolors.c:310 msgid "Ignore incoming format" msgstr "Ignorar formato original" @@ -15575,15 +16949,6 @@ msgid "E-mail:" msgstr "E-mail:" -#: ../pidgin/plugins/gtkbuddynote.c:34 -#, c-format -msgid "" -"\n" -"Buddy Note: %s" -msgstr "" -"\n" -"Comentário do amigo: %s" - #. *< type #. *< ui_requirement #. *< flags @@ -15605,6 +16970,15 @@ "Teste para ver se todos os sinais da interface estão funcionando " "corretamente." +#: ../pidgin/plugins/gtkbuddynote.c:34 +#, c-format +msgid "" +"\n" +"Buddy Note: %s" +msgstr "" +"\n" +"Comentário do amigo: %s" + #: ../pidgin/plugins/history.c:188 msgid "History" msgstr "Histórico" @@ -15653,11 +17027,11 @@ msgid "Draw Markerline in " msgstr "Desenhar linha em" -#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676 +#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682 msgid "_IM windows" msgstr "Janelas de mensagens _instantâneas" -#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683 +#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689 msgid "C_hat windows" msgstr "J_anelas de bate-papo" @@ -15673,32 +17047,32 @@ msgid "Music messaging session confirmed." msgstr "Sessão de conversa musical confirmada." -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430 msgid "Music Messaging" msgstr "Conversa musical" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431 msgid "There was a conflict in running the command:" msgstr "Houve um conflito ao executar o comando:" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539 msgid "Error Running Editor" msgstr "Erro ao executar editor" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540 msgid "The following error has occurred:" msgstr "O seguinte erro ocorreu:" #. Configuration frame -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639 msgid "Music Messaging Configuration" msgstr "Configuração de conversa musical" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643 msgid "Score Editor Path" msgstr "Caminho do editor de partituras" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644 msgid "_Apply" msgstr "_Aplicar" @@ -15710,12 +17084,12 @@ #. *< id #. *< name #. *< version -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685 msgid "Music Messaging Plugin for collaborative composition." msgstr "Plugin de conversa musical para composição colaborativa." #. * summary -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687 msgid "" "The Music Messaging Plugin allows a number of users to simultaneously work " "on a piece of music by editting a common score in real-time." @@ -15725,74 +17099,74 @@ "tempo real." #. ---------- "Notify For" ---------- -#: ../pidgin/plugins/notify.c:672 +#: ../pidgin/plugins/notify.c:678 msgid "Notify For" msgstr "Notificar para" -#: ../pidgin/plugins/notify.c:691 +#: ../pidgin/plugins/notify.c:697 msgid "\t_Only when someone says your screen name" msgstr "\t_Apenas quando alguém menciona seu nome" -#: ../pidgin/plugins/notify.c:701 +#: ../pidgin/plugins/notify.c:707 msgid "_Focused windows" msgstr "_Janelas com foco" #. ---------- "Notification Methods" ---------- -#: ../pidgin/plugins/notify.c:709 +#: ../pidgin/plugins/notify.c:715 msgid "Notification Methods" msgstr "Métodos de notificação" -#: ../pidgin/plugins/notify.c:716 +#: ../pidgin/plugins/notify.c:722 msgid "Prepend _string into window title:" msgstr "Inserir este _texto no título da janela:" #. Count method button -#: ../pidgin/plugins/notify.c:735 +#: ../pidgin/plugins/notify.c:741 msgid "Insert c_ount of new messages into window title" msgstr "Inserir c_ontador de novas mensagens no título da janela" #. Count xprop method button -#: ../pidgin/plugins/notify.c:744 +#: ../pidgin/plugins/notify.c:750 msgid "Insert count of new message into _X property" msgstr "Inserir c_ontador de novas mensagens na propriedade _X" #. Urgent method button -#: ../pidgin/plugins/notify.c:752 +#: ../pidgin/plugins/notify.c:758 msgid "Set window manager \"_URGENT\" hint" msgstr "Definir a opção \"_URGENT\" do gerenciador de janelas" #. Raise window method button -#: ../pidgin/plugins/notify.c:761 +#: ../pidgin/plugins/notify.c:767 msgid "R_aise conversation window" msgstr "Coloc_ar janela de conversa no topo" #. ---------- "Notification Removals" ---------- -#: ../pidgin/plugins/notify.c:769 +#: ../pidgin/plugins/notify.c:775 msgid "Notification Removal" msgstr "Remoção de notificação" #. Remove on focus button -#: ../pidgin/plugins/notify.c:774 +#: ../pidgin/plugins/notify.c:780 msgid "Remove when conversation window _gains focus" msgstr "Remover quando a janela da conversa _ganhar foco" #. Remove on click button -#: ../pidgin/plugins/notify.c:781 +#: ../pidgin/plugins/notify.c:787 msgid "Remove when conversation window _receives click" msgstr "_Remover quando a janela da conversa for clicada" #. Remove on type button -#: ../pidgin/plugins/notify.c:789 +#: ../pidgin/plugins/notify.c:795 msgid "Remove when _typing in conversation window" msgstr "Remover ao _digitar na janela da conversa" #. Remove on message send button -#: ../pidgin/plugins/notify.c:797 +#: ../pidgin/plugins/notify.c:803 msgid "Remove when a _message gets sent" msgstr "Remover quando uma _mensagem for enviada" #. Remove on conversation switch button -#: ../pidgin/plugins/notify.c:806 +#: ../pidgin/plugins/notify.c:812 msgid "Remove on switch to conversation ta_b" msgstr "Remover ao mudar para a a_ba da conversa" @@ -15802,7 +17176,7 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/notify.c:901 +#: ../pidgin/plugins/notify.c:907 msgid "Message Notification" msgstr "Notificação de mensagens" @@ -15810,7 +17184,7 @@ #. *< version #. * summary #. * description -#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906 +#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912 msgid "Provides a variety of ways of notifying you of unread messages." msgstr "Oferece diversas maneiras de te notificar sobre mensagens não lidas." @@ -16185,44 +17559,44 @@ "Este plugin permite ao usuário personalizar os formatos de marcação de tempo " "nas conversas e logs." -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174 -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593 -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645 msgid "Opacity:" msgstr "Opacidade:" #. IM Convo trans options -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562 msgid "IM Conversation Windows" msgstr "Janelas de conversa por mensagem instantânea" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563 msgid "_IM window transparency" msgstr "Transparência da janela de _mensagem instantânea" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577 msgid "_Show slider bar in IM window" msgstr "_Mostrar slider na janela de mensagem instantânea" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584 msgid "Remove IM window transparency on focus" msgstr "Remover transparência da janela quando esta ganhar foco" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582 -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635 msgid "Always on top" msgstr "Sempre no topo" #. Buddy List trans options -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619 msgid "Buddy List Window" msgstr "Janela da lista de amigos" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620 msgid "_Buddy List window transparency" msgstr "Transparência da janela da _lista de amigos" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633 msgid "Remove Buddy List window transparency on focus" msgstr "Remover a transparência da lista de amigos ao focá-la" @@ -16232,19 +17606,19 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693 msgid "Transparency" msgstr "Transparência" #. *< name #. *< version #. * summary -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696 msgid "Variable Transparency for the buddy list and conversations." msgstr "Transparência variável para a lista de amigos e conversas." #. * description -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698 msgid "" "This plugin enables variable alpha transparency on conversation windows and " "the buddy list.\n" diff -r 8a4748cbf844 -r bd60afa72fce po/zh_TW.po --- a/po/zh_TW.po Sun Sep 16 18:07:46 2007 +0000 +++ b/po/zh_TW.po Sun Sep 16 18:10:12 2007 +0000 @@ -3,7 +3,7 @@ # Copyright (C) 2003-2007, Ambrose C. Li # # This file is distributed under the same license as the "Pidgin" package. -# $InternalId: zh_TW.po,v 1.479 2007/07/15 15:13:59 acli Exp $ +# $InternalId: zh_TW.po,v 1.489 2007/09/14 04:05:55 acli Exp $ # # ---------------------------------------------------------- # For internal use only: @@ -46,13 +46,14 @@ # NOTE 所有語文名稱（除「世界語」外）一概譯成「XX文」，不譯「XX語」，因為寫下的是文，不是語 # ---------------------------------------------------------- # -msgid "" -msgstr "" -"Project-Id-Version: Pidgin 2.1.0\n" -"POT-Creation-Date: 2007-07-15 03:23-0400\n" -"PO-Revision-Date: 2007-07-13 04:19-0400\n" -"Last-Translator: Ambrose Li , Paladin R. Liu \n" +#: ../libpurple/certificate.c:543 +msgid "" +msgstr "" +"Project-Id-Version: Pidgin 2.2.0\n" +"POT-Creation-Date: 2007-09-11 03:29-0400\n" +"PO-Revision-Date: 2007-09-13 14:52+0800\n" +"Last-Translator: Ambrose C. Li , Paladin R. Liu " +"\n" "Language-Team: Chinese (Traditional) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,17 +64,17 @@ # NOTE Untranslated #. Translators may want to transliterate the name. #. It is not to be translated. -#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327 -#: ../finch/finch.c:404 +#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329 +#: ../finch/finch.c:415 msgid "Finch" msgstr "Finch" -#: ../finch/finch.c:204 +#: ../finch/finch.c:206 #, c-format msgid "%s. Try `%s -h' for more information.\n" msgstr "%s。執行「%s -h」以獲得更進一步的資訊。\n" -#: ../finch/finch.c:206 +#: ../finch/finch.c:208 #, c-format msgid "" "%s\n" @@ -95,7 +96,7 @@ " -v, --version 顯示版本訊息並離開\n" # NOTE 第二、三個 %s 係目錄名稱（不是程式名） -#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708 +#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711 #, c-format msgid "" "%s encountered errors migrating your settings from %s to %s. Please " @@ -105,15 +106,18 @@ "%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤，請調查後改以人手完成轉移程序，" "並透過 http://developer.pidgin.im 回報這個錯誤。" -#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299 -#: ../finch/gntblist.c:424 ../finch/gntblist.c:437 ../finch/gntplugin.c:185 -#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308 -#: ../libpurple/protocols/jabber/buddy.c:1464 +#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299 +#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185 +#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309 +#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121 +#: ../finch/plugins/gntclipboard.c:128 +#: ../libpurple/protocols/jabber/buddy.c:2027 #: ../libpurple/protocols/jabber/chat.c:677 #: ../libpurple/protocols/jabber/chat.c:688 -#: ../libpurple/protocols/jabber/jabber.c:1227 +#: ../libpurple/protocols/jabber/jabber.c:1511 #: ../libpurple/protocols/qq/group_join.c:328 -#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456 +#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57 +#: ../libpurple/protocols/silc/ops.c:1456 #: ../libpurple/protocols/silc10/ops.c:1451 msgid "Error" msgstr "錯誤" @@ -127,86 +131,90 @@ msgid "Screenname of an account must be non-empty." msgstr "帳號不可留空。" -#: ../finch/gntaccount.c:431 +#: ../finch/gntaccount.c:436 msgid "New mail notifications" msgstr "新郵件通知" -#: ../finch/gntaccount.c:441 +#: ../finch/gntaccount.c:446 msgid "Remember password" msgstr "記住密碼" -#: ../finch/gntaccount.c:479 +#: ../finch/gntaccount.c:484 msgid "There's no protocol plugins installed." msgstr "未有安裝任何協定模組。" -#: ../finch/gntaccount.c:480 +#: ../finch/gntaccount.c:485 msgid "(You probably forgot to 'make install'.)" msgstr "（大概是忘記了執行「make install」了。）" -#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1473 -#: ../pidgin/gtkblist.c:4014 +#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473 +#: ../pidgin/gtkblist.c:4037 msgid "Modify Account" msgstr "修改帳號" # XXX check -#: ../finch/gntaccount.c:490 +#: ../finch/gntaccount.c:495 msgid "New Account" msgstr "新帳號" -#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695 +#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695 msgid "Protocol:" msgstr "通訊協定：" -#: ../finch/gntaccount.c:523 +#: ../finch/gntaccount.c:528 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291 msgid "Screen name:" msgstr "帳號：" -#: ../finch/gntaccount.c:536 +#: ../finch/gntaccount.c:541 msgid "Password:" msgstr "密碼：" -#: ../finch/gntaccount.c:546 +#: ../finch/gntaccount.c:551 msgid "Alias:" msgstr "別名：" #. Cancel button #. Cancel -#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632 -#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:412 -#: ../finch/gntblist.c:447 ../finch/gntblist.c:794 ../finch/gntblist.c:996 -#: ../finch/gntblist.c:1092 ../finch/gntblist.c:2198 ../finch/gntplugin.c:378 -#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264 -#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:481 ../finch/gntstatus.c:606 -#: ../libpurple/account.c:984 ../libpurple/account.c:1234 -#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173 -#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502 -#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798 -#: ../libpurple/protocols/gg/gg.c:879 -#: ../libpurple/protocols/jabber/buddy.c:588 -#: ../libpurple/protocols/jabber/buddy.c:1826 -#: ../libpurple/protocols/jabber/buddy.c:1862 +#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637 +#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420 +#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004 +#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 +#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666 +#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144 +#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609 +#: ../libpurple/account.c:1004 ../libpurple/account.c:1254 +#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215 +#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507 +#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803 +#: ../libpurple/protocols/gg/gg.c:884 +#: ../libpurple/protocols/jabber/buddy.c:728 +#: ../libpurple/protocols/jabber/buddy.c:2389 +#: ../libpurple/protocols/jabber/buddy.c:2425 #: ../libpurple/protocols/jabber/chat.c:786 -#: ../libpurple/protocols/jabber/jabber.c:882 -#: ../libpurple/protocols/jabber/jabber.c:1384 -#: ../libpurple/protocols/jabber/si.c:868 -#: ../libpurple/protocols/jabber/xdata.c:337 -#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276 -#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310 -#: ../libpurple/protocols/msn/msn.c:331 -#: ../libpurple/protocols/oscar/oscar.c:6073 -#: ../libpurple/protocols/oscar/peer.c:1023 +#: ../libpurple/protocols/jabber/jabber.c:1009 +#: ../libpurple/protocols/jabber/jabber.c:1018 +#: ../libpurple/protocols/jabber/jabber.c:1733 +#: ../libpurple/protocols/jabber/si.c:874 +#: ../libpurple/protocols/jabber/usermood.c:185 +#: ../libpurple/protocols/jabber/usernick.c:79 +#: ../libpurple/protocols/jabber/xdata.c:400 +#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304 +#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338 +#: ../libpurple/protocols/msn/msn.c:359 +#: ../libpurple/protocols/oscar/oscar.c:6078 +#: ../libpurple/protocols/oscar/peer.c:1046 #: ../libpurple/protocols/qq/buddy_info.c:484 #: ../libpurple/protocols/qq/buddy_opt.c:214 -#: ../libpurple/protocols/qq/buddy_opt.c:409 +#: ../libpurple/protocols/qq/buddy_opt.c:411 #: ../libpurple/protocols/qq/group.c:124 #: ../libpurple/protocols/qq/group_join.c:140 #: ../libpurple/protocols/qq/group_join.c:365 #: ../libpurple/protocols/qq/group_opt.c:144 #: ../libpurple/protocols/qq/group_opt.c:399 -#: ../libpurple/protocols/qq/sys_msg.c:115 -#: ../libpurple/protocols/qq/sys_msg.c:174 -#: ../libpurple/protocols/qq/sys_msg.c:269 +#: ../libpurple/protocols/qq/sys_msg.c:113 +#: ../libpurple/protocols/qq/sys_msg.c:172 +#: ../libpurple/protocols/qq/sys_msg.c:266 #: ../libpurple/protocols/sametime/sametime.c:3388 #: ../libpurple/protocols/sametime/sametime.c:3474 #: ../libpurple/protocols/sametime/sametime.c:3645 @@ -229,110 +237,113 @@ #: ../libpurple/protocols/silc10/ops.c:1904 #: ../libpurple/protocols/silc10/silc.c:736 #: ../libpurple/protocols/silc10/silc.c:942 -#: ../libpurple/protocols/yahoo/yahoo.c:989 -#: ../libpurple/protocols/yahoo/yahoo.c:3248 -#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1908 -#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:5915 -#: ../pidgin/gtkdialogs.c:727 ../pidgin/gtkdialogs.c:865 -#: ../pidgin/gtkdialogs.c:957 ../pidgin/gtkdialogs.c:977 -#: ../pidgin/gtkdialogs.c:1001 ../pidgin/gtkdialogs.c:1023 -#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1112 -#: ../pidgin/gtkdialogs.c:1168 ../pidgin/gtkdialogs.c:1207 -#: ../pidgin/gtkdialogs.c:1234 ../pidgin/gtkimhtmltoolbar.c:425 -#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115 +#: ../libpurple/protocols/yahoo/yahoo.c:1029 +#: ../libpurple/protocols/yahoo/yahoo.c:3495 +#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908 +#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971 +#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:757 +#: ../pidgin/gtkdialogs.c:896 ../pidgin/gtkdialogs.c:988 +#: ../pidgin/gtkdialogs.c:1008 ../pidgin/gtkdialogs.c:1032 +#: ../pidgin/gtkdialogs.c:1054 ../pidgin/gtkdialogs.c:1102 +#: ../pidgin/gtkdialogs.c:1143 ../pidgin/gtkdialogs.c:1199 +#: ../pidgin/gtkdialogs.c:1238 ../pidgin/gtkdialogs.c:1265 +#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327 +#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100 #: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578 #: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344 -#: ../pidgin/gtkstatusbox.c:1582 +#: ../pidgin/gtkstatusbox.c:1573 msgid "Cancel" msgstr "取消" #. Save button #. Save -#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 -#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:484 ../finch/gntstatus.c:594 -#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50 -#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748 +#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310 +#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264 +#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597 +#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50 +#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748 #: ../pidgin/gtkrequest.c:276 msgid "Save" msgstr "儲存" -#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1900 -#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576 +#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900 +#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567 #, c-format msgid "Are you sure you want to delete %s?" msgstr "您確定要刪除 %s？" -#: ../finch/gntaccount.c:629 +#: ../finch/gntaccount.c:634 msgid "Delete Account" msgstr "刪除帳號" #. Delete button -#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701 -#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143 -#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326 -#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273 -#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581 +#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706 +#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728 +#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209 +#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326 +#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273 +#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572 msgid "Delete" msgstr "刪除" -#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2104 ../finch/gntui.c:77 -#: ../pidgin/gtkaccount.c:2327 ../pidgin/gtkdocklet.c:522 +#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82 +#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522 msgid "Accounts" msgstr "帳號清單" -#: ../finch/gntaccount.c:669 +#: ../finch/gntaccount.c:674 msgid "You can enable/disable accounts from the following list." msgstr "以下列表的帳號可隨意啟用、停用。" #. Add button -#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342 -#: ../finch/gntblist.c:412 ../finch/gntblist.c:447 ../finch/gntnotify.c:379 -#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198 -#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116 -#: ../libpurple/protocols/qq/sys_msg.c:175 -#: ../libpurple/protocols/qq/sys_msg.c:270 +#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342 +#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305 +#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198 +#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114 +#: ../libpurple/protocols/qq/sys_msg.c:173 +#: ../libpurple/protocols/qq/sys_msg.c:267 #: ../libpurple/protocols/sametime/sametime.c:5486 #: ../libpurple/protocols/silc/chat.c:615 -#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500 -#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1651 +#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494 +#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644 #: ../pidgin/gtkrequest.c:274 msgid "Add" msgstr "加入" #. Modify button -#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710 +#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720 msgid "Modify" msgstr "修改" -#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2447 +#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441 #, c-format msgid "%s%s%s%s has made %s his or her buddy%s%s" msgstr "%s%s%s%s 加入了 %s 為他（她）的好友 %s%s" -#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2499 +#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493 msgid "Add buddy to your list?" msgstr "將使用者加入您的好友清單？" # NOTE: 最頭的 %s%s%s%s 是對方帳號，或帳號括弧別名（第二、四個 %s 是括弧） # NOTE: 最尾的 %s%s 是空白或「: 訊息」，基本上可以不理會（也不能怎樣理會） -#: ../finch/gntaccount.c:927 ../pidgin/gtkaccount.c:2551 +#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551 #, c-format msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s" msgstr "使用者 %s%s%s%s 想要將 %s 加入他（她）的好友清單%s%s。" -#: ../finch/gntaccount.c:952 ../finch/gntaccount.c:955 -#: ../finch/gntaccount.c:982 ../pidgin/gtkaccount.c:2574 +#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966 +#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574 #: ../pidgin/gtkaccount.c:2580 msgid "Authorize buddy?" msgstr "給予認證？" -#: ../finch/gntaccount.c:959 ../finch/gntaccount.c:986 +#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997 #: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581 msgid "Authorize" msgstr "給予認證" -#: ../finch/gntaccount.c:960 ../finch/gntaccount.c:987 +#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998 #: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582 msgid "Deny" msgstr "拒絕" @@ -357,36 +368,36 @@ msgid "Error adding buddy" msgstr "新增好友途中發生了錯誤" -#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2864 -#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtksavedstatuses.c:979 +#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881 +#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979 msgid "Screen Name" msgstr "帳號" -#: ../finch/gntblist.c:327 ../finch/gntblist.c:404 ../finch/gntblist.c:1240 -#: ../libpurple/protocols/msn/msn.c:1364 +#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249 +#: ../libpurple/protocols/msn/msn.c:1392 #: ../libpurple/protocols/silc/chat.c:606 #: ../libpurple/protocols/silc10/chat.c:590 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:680 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:704 #: ../libpurple/protocols/zephyr/zephyr.c:788 -#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976 -#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022 +#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1007 +#: ../pidgin/gtkdialogs.c:1031 ../pidgin/gtkdialogs.c:1053 #: ../pidgin/gtkrequest.c:277 msgid "Alias" msgstr "別名" -#: ../finch/gntblist.c:330 ../finch/gntblist.c:407 +#: ../finch/gntblist.c:330 ../finch/gntblist.c:412 msgid "Group" msgstr "群組" -#: ../finch/gntblist.c:334 ../finch/gntblist.c:395 ../finch/gntblist.c:1292 -#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572 +#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304 +#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190 -#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482 -#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:443 +#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488 +#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445 msgid "Account" msgstr "帳號" -#: ../finch/gntblist.c:340 ../finch/gntblist.c:843 +#: ../finch/gntblist.c:340 ../finch/gntblist.c:851 #: ../libpurple/protocols/silc/buddy.c:725 #: ../libpurple/protocols/silc/buddy.c:1027 #: ../libpurple/protocols/silc/buddy.c:1072 @@ -395,7 +406,7 @@ #: ../libpurple/protocols/silc10/buddy.c:1033 #: ../libpurple/protocols/silc10/buddy.c:1080 #: ../libpurple/protocols/silc10/buddy.c:1180 -#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420 +#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445 msgid "Add Buddy" msgstr "新增好友" @@ -405,15 +416,16 @@ msgid "Please enter buddy information." msgstr "請輸入好友的資訊。" -#: ../finch/gntblist.c:367 ../libpurple/blist.c:1190 +#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190 msgid "Chats" msgstr "聊天" # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」 #. Extract their Name and put it in -#: ../finch/gntblist.c:401 ../libpurple/protocols/jabber/jabber.c:813 -#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618 -#: ../libpurple/protocols/msn/msn.c:1645 +#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:925 +#: ../libpurple/protocols/jabber/jabber.c:928 +#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1646 +#: ../libpurple/protocols/msn/msn.c:1673 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581 #: ../pidgin/gtkroomlist.c:617 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132 @@ -421,161 +433,166 @@ msgid "Name" msgstr "名稱" -#: ../finch/gntblist.c:410 ../finch/gntblist.c:845 ../pidgin/gtkblist.c:5800 +#: ../finch/gntblist.c:415 ../finch/gntblist.c:818 +msgid "Auto-join" +msgstr "自動加入" + +#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856 msgid "Add Chat" msgstr "新增聊天室" -#: ../finch/gntblist.c:411 +#: ../finch/gntblist.c:419 msgid "You can edit more information from the context menu later." msgstr "如果要繼續修改其他細節，請用快顯選單。" -#: ../finch/gntblist.c:424 ../finch/gntblist.c:437 +#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 msgid "Error adding group" msgstr "新增群組途中發生了錯誤" -#: ../finch/gntblist.c:425 +#: ../finch/gntblist.c:433 msgid "You must give a name for the group to add." msgstr "請給您新增的群組輸入名稱。" -#: ../finch/gntblist.c:438 +#: ../finch/gntblist.c:446 msgid "A group with the name already exists." msgstr "那個群組已經存在" # TODO 請覆查核實：是「加入」抑或「新增」? -#: ../finch/gntblist.c:445 ../finch/gntblist.c:847 +#: ../finch/gntblist.c:453 ../finch/gntblist.c:855 #: ../libpurple/protocols/sametime/sametime.c:5396 -#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5911 +#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967 msgid "Add Group" msgstr "加入群組" # TODO 要覆查 - 20061026 -#: ../finch/gntblist.c:445 +#: ../finch/gntblist.c:453 msgid "Enter the name of the group" msgstr "請給群組輸入名稱。" -#: ../finch/gntblist.c:793 +#: ../finch/gntblist.c:801 msgid "Edit Chat" msgstr "修改聊天室" -#: ../finch/gntblist.c:793 +#: ../finch/gntblist.c:801 msgid "Please Update the necessary fields." msgstr "請按需要更新欄位內的資訊。" # TODO 要覆查 - 20061025 -#: ../finch/gntblist.c:794 ../finch/gntstatus.c:204 +#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204 msgid "Edit" msgstr "修改" -#: ../finch/gntblist.c:810 -msgid "Auto-join" -msgstr "自動加入" - # XXX 還是「修改選項」？ -#: ../finch/gntblist.c:819 +#: ../finch/gntblist.c:827 msgid "Edit Settings" msgstr "修改設定" # XXX 20070518 -#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926 +#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930 msgid "Information" msgstr "資訊" -#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926 +#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930 msgid "Retrieving..." msgstr "讀取中..." -#: ../finch/gntblist.c:895 ../finch/gntconv.c:407 +#: ../finch/gntblist.c:903 ../finch/gntconv.c:484 #: ../libpurple/protocols/silc/chat.c:899 #: ../libpurple/protocols/silc10/chat.c:883 msgid "Get Info" msgstr "取得資訊" -#: ../finch/gntblist.c:899 +#: ../finch/gntblist.c:907 msgid "Add Buddy Pounce" msgstr "加入好友狀態捕捉" #. if (q_bud && is_online(q_bud->status)) { -#: ../finch/gntblist.c:906 ../finch/gntconv.c:419 -#: ../libpurple/protocols/jabber/si.c:868 -#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585 -#: ../pidgin/gtkconv.c:1599 +#: ../finch/gntblist.c:914 ../finch/gntconv.c:496 +#: ../libpurple/protocols/jabber/si.c:874 +#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587 +#: ../pidgin/gtkconv.c:1592 msgid "Send File" msgstr "傳送檔案" -#: ../finch/gntblist.c:910 +#: ../finch/gntblist.c:918 msgid "View Log" msgstr "觀看日誌" -#: ../finch/gntblist.c:991 +#: ../finch/gntblist.c:999 #, c-format msgid "Please enter the new name for %s" msgstr "請輸入 %s 的新密碼" -#: ../finch/gntblist.c:993 ../finch/gntblist.c:1240 +#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249 msgid "Rename" msgstr "重命名" -#: ../finch/gntblist.c:993 +#: ../finch/gntblist.c:1001 msgid "Set Alias" msgstr "設定別名" # FIXME 譯文有待改進 - 20061029 -#: ../finch/gntblist.c:994 +#: ../finch/gntblist.c:1002 msgid "Enter empty string to reset the name." msgstr "如果要重置名稱，請輸入空白字串。" -#: ../finch/gntblist.c:1070 +#: ../finch/gntblist.c:1078 msgid "Removing this contact will also remove all the buddies in the contact" msgstr "移除這組好友會同時移除裏面的所有好友" -#: ../finch/gntblist.c:1078 +#: ../finch/gntblist.c:1086 msgid "Removing this group will also remove all the buddies in the group" msgstr "移除這個群組會同時移除裏面的所有好友" -#: ../finch/gntblist.c:1083 +#: ../finch/gntblist.c:1091 #, c-format msgid "Are you sure you want to remove %s?" msgstr "您確定要刪除 %s？" #. XXX: anything to do with the returned ui-handle? -#: ../finch/gntblist.c:1086 +#: ../finch/gntblist.c:1094 msgid "Confirm Remove" msgstr "確認移除" -#: ../finch/gntblist.c:1091 ../finch/gntblist.c:1242 ../finch/gntft.c:224 -#: ../pidgin/gtkconv.c:1648 ../pidgin/gtkrequest.c:275 +#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226 +#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275 #: ../pidgin/gtkstatusbox.c:263 msgid "Remove" msgstr "移除" #. Buddy List -#: ../finch/gntblist.c:1216 ../finch/gntblist.c:2283 ../finch/gntprefs.c:257 -#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256 -#: ../pidgin/plugins/win32/winprefs/winprefs.c:330 +#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257 +#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:326 msgid "Buddy List" msgstr "好友清單" # XXX - 20061122 # NOTE (01時35分37秒) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved -#: ../finch/gntblist.c:1247 +#: ../finch/gntblist.c:1256 msgid "Place tagged" msgstr "移動已標記的項目" # FIXME - 20061122 -#: ../finch/gntblist.c:1252 +#: ../finch/gntblist.c:1261 msgid "Toggle Tag" msgstr "切換標記" #. General -#: ../finch/gntblist.c:1287 ../libpurple/protocols/gg/gg.c:632 -#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118 -#: ../libpurple/protocols/gg/gg.c:2202 -#: ../libpurple/protocols/jabber/buddy.c:274 -#: ../libpurple/protocols/jabber/buddy.c:856 -#: ../libpurple/protocols/jabber/buddy.c:1627 -#: ../libpurple/protocols/jabber/buddy.c:1809 -#: ../libpurple/protocols/jabber/jabber.c:823 -#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556 +#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637 +#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123 +#: ../libpurple/protocols/gg/gg.c:2207 +#: ../libpurple/protocols/jabber/buddy.c:286 +#: ../libpurple/protocols/jabber/buddy.c:1247 +#: ../libpurple/protocols/jabber/buddy.c:2190 +#: ../libpurple/protocols/jabber/buddy.c:2372 +#: ../libpurple/protocols/jabber/jabber.c:938 +#: ../libpurple/protocols/jabber/jabber.c:1540 +#: ../libpurple/protocols/jabber/jabber.c:1563 +#: ../libpurple/protocols/jabber/jabber.c:1586 +#: ../libpurple/protocols/jabber/jabber.c:1609 +#: ../libpurple/protocols/jabber/jabber.c:1632 +#: ../libpurple/protocols/msn/msn.c:1400 ../libpurple/protocols/msn/msn.c:1584 #: ../libpurple/protocols/qq/buddy_info.c:43 #: ../libpurple/protocols/silc/buddy.c:1535 #: ../libpurple/protocols/silc/ops.c:1002 @@ -585,29 +602,29 @@ #: ../libpurple/protocols/silc10/ops.c:1036 #: ../libpurple/protocols/silc10/ops.c:1179 #: ../libpurple/protocols/silc10/ops.c:1328 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2998 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029 msgid "Nickname" msgstr "暱稱" #. Idle stuff -#: ../finch/gntblist.c:1307 ../finch/gntprefs.c:260 -#: ../libpurple/protocols/bonjour/bonjour.c:314 -#: ../libpurple/protocols/jabber/buddy.c:647 -#: ../libpurple/protocols/jabber/buddy.c:687 -#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32 +#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260 +#: ../libpurple/protocols/bonjour/bonjour.c:340 +#: ../libpurple/protocols/jabber/buddy.c:787 +#: ../libpurple/protocols/jabber/buddy.c:951 +#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32 #: ../libpurple/protocols/novell/novell.c:2825 -#: ../libpurple/protocols/oscar/oscar.c:2888 -#: ../libpurple/protocols/yahoo/yahoo.c:2915 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026 -#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918 +#: ../libpurple/protocols/oscar/oscar.c:2905 +#: ../libpurple/protocols/yahoo/yahoo.c:3094 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057 +#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924 msgid "Idle" msgstr "閒置" -#: ../finch/gntblist.c:1320 +#: ../finch/gntblist.c:1333 msgid "On Mobile" msgstr "使用行動裝置中" -#: ../finch/gntblist.c:1400 +#: ../finch/gntblist.c:1414 #, c-format msgid "" "Online: %d\n" @@ -616,12 +633,12 @@ "上線：%d 人\n" "總數：%d 人" -#: ../finch/gntblist.c:1409 +#: ../finch/gntblist.c:1423 #, c-format msgid "Account: %s (%s)" msgstr "帳號：%s (%s)" -#: ../finch/gntblist.c:1421 +#: ../finch/gntblist.c:1435 #, c-format msgid "" "\n" @@ -631,51 +648,55 @@ "最後見到：%s前" # XXX check -#: ../finch/gntblist.c:1687 ../pidgin/gtkdocklet.c:470 -#: ../pidgin/gtkstatusbox.c:1070 +#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470 +#: ../pidgin/gtkstatusbox.c:1071 msgid "New..." msgstr "新增..." # NOTE 這是很差的原文，指「已儲存」(Saved) 的「狀態」:P # NOTE 上下文有一些常用(?)的狀態及「新增」（新增一個狀態），彈出的視窗也有「新增」，可能應該叫「狀態一覽」或者「狀態清單」一類的…… -#: ../finch/gntblist.c:1694 ../pidgin/gtkdocklet.c:471 -#: ../pidgin/gtkstatusbox.c:1071 +#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471 +#: ../pidgin/gtkstatusbox.c:1072 msgid "Saved..." msgstr "狀態清單..." -#: ../finch/gntblist.c:2072 ../finch/gntplugin.c:254 ../finch/gntui.c:82 +#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530 msgid "Plugins" msgstr "模組清單" # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」 -#: ../finch/gntblist.c:2179 ../pidgin/gtkdialogs.c:708 -#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927 +#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:738 +#: ../pidgin/gtkdialogs.c:877 ../pidgin/gtkdialogs.c:958 msgid "_Name" msgstr "名稱(_N)" -#: ../finch/gntblist.c:2184 ../pidgin/gtkdialogs.c:713 -#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932 +#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:743 +#: ../pidgin/gtkdialogs.c:882 ../pidgin/gtkdialogs.c:963 msgid "_Account" msgstr "帳號(_A)" -#: ../finch/gntblist.c:2192 ../pidgin/gtkdialogs.c:721 +#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:751 msgid "New Instant Message" msgstr "新即時訊息" -#: ../finch/gntblist.c:2194 ../pidgin/gtkdialogs.c:723 +#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:753 msgid "" "Please enter the screen name or alias of the person you would like to IM." msgstr "請輸入您所想要發送即時訊息對象的帳號。" -#: ../finch/gntblist.c:2197 ../finch/gntnotify.c:79 ../libpurple/account.c:983 -#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501 -#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797 -#: ../libpurple/protocols/jabber/jabber.c:1383 -#: ../libpurple/protocols/jabber/xdata.c:336 -#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275 -#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309 -#: ../libpurple/protocols/oscar/oscar.c:6072 +#. Not multiline +#. Not masked? +#. No hints? +#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntnotify.c:79 +#: ../libpurple/account.c:1003 ../libpurple/account.c:1253 +#: ../libpurple/protocols/gg/gg.c:506 ../libpurple/protocols/gg/gg.c:665 +#: ../libpurple/protocols/gg/gg.c:802 +#: ../libpurple/protocols/jabber/jabber.c:1732 +#: ../libpurple/protocols/jabber/xdata.c:399 +#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303 +#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337 +#: ../libpurple/protocols/oscar/oscar.c:6077 #: ../libpurple/protocols/silc/buddy.c:454 #: ../libpurple/protocols/silc/buddy.c:1190 #: ../libpurple/protocols/silc/chat.c:447 @@ -692,43 +713,161 @@ #: ../libpurple/protocols/silc10/ops.c:1297 #: ../libpurple/protocols/silc10/ops.c:1903 #: ../libpurple/protocols/silc10/silc.c:735 -#: ../libpurple/protocols/yahoo/yahoo.c:988 -#: ../libpurple/protocols/yahoo/yahoo.c:3247 -#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013 -#: ../pidgin/gtkdialogs.c:726 ../pidgin/gtkdialogs.c:864 -#: ../pidgin/gtkdialogs.c:956 ../pidgin/gtkrequest.c:269 +#: ../libpurple/protocols/yahoo/yahoo.c:1028 +#: ../libpurple/protocols/yahoo/yahoo.c:3494 +#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036 +#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:756 +#: ../pidgin/gtkdialogs.c:895 ../pidgin/gtkdialogs.c:987 +#: ../pidgin/gtkrequest.c:269 msgid "OK" msgstr "確定" #. Create the "Options" frame. -#: ../finch/gntblist.c:2217 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791 +#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789 msgid "Options" msgstr "選項" -#: ../finch/gntblist.c:2223 +#: ../finch/gntblist.c:2246 msgid "Send IM..." msgstr "送出即時訊息..." -#: ../finch/gntblist.c:2227 +#: ../finch/gntblist.c:2250 msgid "Show empty groups" msgstr "顯示空的好的群組" -#: ../finch/gntblist.c:2233 +#: ../finch/gntblist.c:2256 msgid "Show offline buddies" msgstr "顯示離線好友" -#: ../finch/gntblist.c:2239 +#: ../finch/gntblist.c:2262 msgid "Sort by status" msgstr "依照狀態排列" -#: ../finch/gntblist.c:2243 +#: ../finch/gntblist.c:2266 msgid "Sort alphabetically" msgstr "依照字母排列" -#: ../finch/gntblist.c:2247 +#: ../finch/gntblist.c:2270 msgid "Sort by log size" msgstr "依照日誌大小排列" +#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187 +msgid "Certificate Import" +msgstr "匯入憑證" + +#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188 +msgid "Specify a hostname" +msgstr "請指定主機名稱" + +# XXX 譯文有待改進 - acli 20070913 +#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189 +msgid "Type the host name this certificate is for." +msgstr "請輸入這張憑證所屬的主機名稱。" + +#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209 +#, c-format +msgid "" +"File %s could not be imported.\n" +"Make sure that the file is readable and in PEM format.\n" +msgstr "" +"無法匯入檔案「%s」。\n" +"請檢查檔案是否可讀及是否為 PEM 格式。\n" + +#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211 +msgid "Certificate Import Error" +msgstr "憑證匯入錯誤" + +#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212 +msgid "X.509 certificate import failed" +msgstr "X.509 憑證匯入失敗" + +#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223 +msgid "Select a PEM certificate" +msgstr "選擇PEM憑證" + +#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244 +#, c-format +msgid "" +"Export to file %s failed.\n" +"Check that you have write permission to the target path\n" +msgstr "" +"無法匯出至檔案「%s」。\n" +"請確定您有權限寫入目標檔\n" + +#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246 +msgid "Certificate Export Error" +msgstr "憑證匯出錯誤" + +#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247 +msgid "X.509 certificate export failed" +msgstr "X.509 憑證匯出失敗" + +#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298 +msgid "PEM X.509 Certificate Export" +msgstr "匯出 X.509 憑證" + +#. Build a notification thing +#. TODO: This needs a better GUI, but a notification will do for now +#: ../finch/gntcertmgr.c:187 ../pidgin/gtkcertmgr.c:336 +#, c-format +msgid "Certificate for %s" +msgstr "%s 的憑證" + +#: ../finch/gntcertmgr.c:194 ../pidgin/gtkcertmgr.c:343 +#, c-format +msgid "" +"Common name: %s\n" +"\n" +"SHA1 fingerprint:\n" +"%s" +msgstr "" +"全名：%s\n" +"\n" +"SHA1 指紋：\n" +"%s" + +#: ../finch/gntcertmgr.c:197 ../pidgin/gtkcertmgr.c:346 +msgid "SSL Host Certificate" +msgstr "SSL 主機憑證" + +#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:391 +#, c-format +msgid "Really delete certificate for %s?" +msgstr "確定要刪除 %s 的憑證？" + +#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:393 +msgid "Confirm certificate delete" +msgstr "確定刪除憑證" + +#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:621 +msgid "Certificate Manager" +msgstr "憑證管理" + +#. Creating the user splits +#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652 +#: ../libpurple/protocols/silc/silc.c:1007 +#: ../libpurple/protocols/silc10/silc.c:918 +msgid "Hostname" +msgstr "主機名稱" + +# XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼 +# XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」 +# XXX 注：現在 (2.0.0b4) 不是了，除錯視窗的「過濾程度」竟有「Info」（資訊）級別…… +#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620 +#: ../pidgin/gtkdebug.c:834 +msgid "Info" +msgstr "資訊" + +#. Close button +#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181 +#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737 +#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403 +#: ../libpurple/protocols/silc/util.c:382 +#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468 +#: ../pidgin/gtkrequest.c:272 +msgid "Close" +msgstr "關閉" + #: ../finch/gntconn.c:110 #, c-format msgid "%s (%s)" @@ -751,42 +890,46 @@ "\n" "在您更正這個錯誤並重新啟動這個帳號前，Finch 將不會再試著重新連線。" -#: ../finch/gntconv.c:117 +#: ../finch/gntconv.c:119 msgid "No such command." msgstr "無此指令。" -#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:492 +#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469 msgid "Syntax Error: You typed the wrong number of arguments to that command." msgstr "語法錯誤：輸入的參數少於指令所需的參數數量。" -#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:498 +#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475 msgid "Your command failed for an unknown reason." msgstr "指令執行失敗，原因不明。" -#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:505 +#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482 msgid "That command only works in chats, not IMs." msgstr "這個指令只在聊天室內有效，在即時訊息中無效。" -#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:508 +#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485 msgid "That command only works in IMs, not chats." msgstr "這個指令只在即時訊息中有效，在聊天室內無效。" -#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:513 +#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490 msgid "That command doesn't work on this protocol." msgstr "這個指令在這個通訊協定內無效。" +#: ../finch/gntconv.c:148 +msgid "Message was not sent, because you are not signed on." +msgstr "因為您並未登入，所以訊息無法送出：" + # XXX 這是什麼？ -#: ../finch/gntconv.c:224 +#: ../finch/gntconv.c:231 #, c-format msgid "%s (%s -- %s)" msgstr "%s (%s -- %s)" -#: ../finch/gntconv.c:247 +#: ../finch/gntconv.c:254 #, c-format msgid "%s [%s]" msgstr "%s [%s]" -#: ../finch/gntconv.c:252 ../finch/gntconv.c:647 +#: ../finch/gntconv.c:259 ../finch/gntconv.c:747 #, c-format msgid "" "\n" @@ -795,48 +938,65 @@ "\n" "%s 正在輸入..." -#: ../finch/gntconv.c:271 +#: ../finch/gntconv.c:278 msgid "You have left this chat." msgstr "您離開了聊天室。" -#: ../finch/gntconv.c:342 +#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351 +msgid "Logging started. Future messages in this conversation will be logged." +msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。" + +#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359 +msgid "" +"Logging stopped. Future messages in this conversation will not be logged." +msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。" + +#: ../finch/gntconv.c:419 msgid "Send To" msgstr "傳送到" -#: ../finch/gntconv.c:386 +#: ../finch/gntconv.c:463 msgid "Conversation" msgstr "交談" -#: ../finch/gntconv.c:392 +#: ../finch/gntconv.c:469 msgid "Clear Scrollback" msgstr "清空交談內容" -#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190 +#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190 msgid "Show Timestamps" msgstr "顯示時間戳記" -#: ../finch/gntconv.c:412 +#: ../finch/gntconv.c:489 msgid "Add Buddy Pounce..." msgstr "加入好友狀態捕捉..." -#: ../finch/gntconv.c:614 +#: ../finch/gntconv.c:504 +msgid "Enable Logging" +msgstr "開始記錄日誌" + +#: ../finch/gntconv.c:510 +msgid "Enable Sounds" +msgstr "啟動音效" + +#: ../finch/gntconv.c:713 msgid " " msgstr "<自動回應> " #. Print the list of users in the room -#: ../finch/gntconv.c:735 +#: ../finch/gntconv.c:835 msgid "List of users:\n" msgstr "使用者列表：\n" -#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:335 +#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311 msgid "Supported debug options are: version" msgstr "支援的除錯選項有：version" -#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:384 +#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361 msgid "No such command (in this context)." msgstr "沒有這個指令（可在這裏使用）" -#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:387 +#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364 msgid "" "Use \"/help <command>\" for help on a specific command.\n" "The following commands are available in this context:\n" @@ -844,60 +1004,60 @@ "要獲得某一指令的說明，輸入「/help <指令>」即可。\n" "在這裏，可用的指令有：\n" -#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7198 +#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538 msgid "" "say <message>: Send a message normally as if you weren't using a " "command." msgstr "say <訊息>：將指定的訊息當成一般訊息正常送出，而非當為指令處理。" -#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7201 +#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541 msgid "me <action>: Send an IRC style action to a buddy or chat." msgstr "me <要執行的動作>：模仿IRC，執行一個動作。" -#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7204 +#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544 msgid "" "debug <option>: Send various debug information to the current " "conversation." msgstr "debug <選項>：向目前的交談送出一些除錯資訊。" # XXX -#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7207 +#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547 msgid "clear: Clears the conversation scrollback." msgstr "clear：清空交談的回捲緩衝區" -#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7213 +#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553 msgid "help <command>: Help on a specific command." msgstr "help <指令>：顯示某一指令的說明。" -#: ../finch/gntconv.c:991 +#: ../finch/gntconv.c:1109 msgid "users: Show the list of users in the chat." msgstr "users：顯示這個聊天室內的使用者。" -#: ../finch/gntconv.c:996 +#: ../finch/gntconv.c:1114 msgid "plugins: Show the plugins window." msgstr "plugins：顯示「模組」視窗" -#: ../finch/gntconv.c:999 +#: ../finch/gntconv.c:1117 msgid "buddylist: Show the buddylist." msgstr "buddylist：顯示好友清單。" -#: ../finch/gntconv.c:1002 +#: ../finch/gntconv.c:1120 msgid "accounts: Show the accounts window." msgstr "accounts：顯示帳號清單。" -#: ../finch/gntconv.c:1005 +#: ../finch/gntconv.c:1123 msgid "debugwin: Show the debug window." msgstr "debugwin：顯示除錯視窗" -#: ../finch/gntconv.c:1008 +#: ../finch/gntconv.c:1126 msgid "prefs: Show the preference window." msgstr "prefs：顯示「偏好設定」視窗" -#: ../finch/gntconv.c:1011 +#: ../finch/gntconv.c:1129 msgid "statuses: Show the savedstatuses window." msgstr "statuses：「狀態清單」視窗" -#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694 +#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694 msgid "Debug Window" msgstr "除錯視窗" @@ -923,101 +1083,97 @@ msgstr "檔案傳輸：%2$d 個檔案完成了 %1$d%%" #. Create the window. -#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81 +#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761 msgid "File Transfers" msgstr "檔案傳輸" -#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644 +#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644 msgid "Progress" msgstr "進度" -#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651 +#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651 msgid "Filename" msgstr "檔名" -#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658 +#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658 msgid "Size" msgstr "大小" -#: ../finch/gntft.c:198 +#: ../finch/gntft.c:200 msgid "Speed" msgstr "速度" -#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665 +#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665 msgid "Remaining" msgstr "剩餘" #. XXX: Use of ggp_str_to_uin() is an ugly hack! -#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572 -#: ../libpurple/protocols/bonjour/bonjour.c:318 -#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571 -#: ../libpurple/protocols/gg/gg.c:1579 -#: ../libpurple/protocols/jabber/buddy.c:638 -#: ../libpurple/protocols/jabber/buddy.c:642 -#: ../libpurple/protocols/jabber/buddy.c:677 -#: ../libpurple/protocols/jabber/jabber.c:1212 -#: ../libpurple/protocols/msn/msn.c:515 +#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575 +#: ../libpurple/protocols/bonjour/bonjour.c:344 +#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576 +#: ../libpurple/protocols/gg/gg.c:1584 +#: ../libpurple/protocols/jabber/buddy.c:778 +#: ../libpurple/protocols/jabber/buddy.c:782 +#: ../libpurple/protocols/jabber/buddy.c:941 +#: ../libpurple/protocols/jabber/jabber.c:1496 +#: ../libpurple/protocols/msn/msn.c:543 #: ../libpurple/protocols/novell/novell.c:2835 -#: ../libpurple/protocols/oscar/oscar.c:821 -#: ../libpurple/protocols/oscar/oscar.c:826 -#: ../libpurple/protocols/oscar/oscar.c:828 -#: ../libpurple/protocols/oscar/oscar.c:2676 -#: ../libpurple/protocols/oscar/oscar.c:3794 +#: ../libpurple/protocols/oscar/oscar.c:820 +#: ../libpurple/protocols/oscar/oscar.c:825 +#: ../libpurple/protocols/oscar/oscar.c:827 +#: ../libpurple/protocols/oscar/oscar.c:2693 +#: ../libpurple/protocols/oscar/oscar.c:3773 #: ../libpurple/protocols/sametime/sametime.c:3263 #: ../libpurple/protocols/sametime/sametime.c:4150 -#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070 -#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085 +#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101 +#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143 msgid "Status" msgstr "狀態" -#: ../finch/gntft.c:208 +#: ../finch/gntft.c:210 msgid "Close this window when all transfers finish" msgstr "所有的檔案傳輸完畢時，關閉這個視窗" -#: ../finch/gntft.c:215 +#: ../finch/gntft.c:217 msgid "Clear finished transfers" msgstr "清除已完成的傳輸" -#: ../finch/gntft.c:229 +#: ../finch/gntft.c:231 msgid "Stop" msgstr "中止" -#. Close button -#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209 -#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215 -#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382 -#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474 -#: ../pidgin/gtkrequest.c:272 -msgid "Close" -msgstr "關閉" - # XXX 暫譯 -#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972 +#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972 msgid "Waiting for transfer to begin" msgstr "等待開始傳輸檔案中..." -#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053 +#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053 msgid "Canceled" msgstr "已取消" -#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055 +#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055 msgid "Failed" msgstr "失敗" # XXX pending Paladin's confirmation - acli 20070713 -#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133 +#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133 #, c-format msgid "%.2f KiB/s" msgstr "%.2f kB/s" -#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162 +#: ../finch/gntft.c:430 +#, c-format +msgid "The file was saved as %s." +msgstr "成功存檔至 %s。" + +#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162 #: ../pidgin/gtkft.c:1115 msgid "Finished" msgstr "已完成" -#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347 +#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347 msgid "Transferring" msgstr "傳輸中" @@ -1030,11 +1186,11 @@ msgid "You have mail!" msgstr "您收到郵件！" -#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489 +#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495 msgid "Sender" msgstr "發信人" -#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496 +#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502 msgid "Subject" msgstr "主題" @@ -1045,32 +1201,25 @@ msgstr[0] "%s (%s) 有 %d 封新郵件。" msgstr[1] "%s (%s) 有 %d 封新郵件。" -#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335 +#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340 msgid "New Mail" msgstr "新郵件" -#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:916 +#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908 #, c-format msgid "Info for %s" msgstr "%s 的資訊" #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476 -#: ../pidgin/gtknotify.c:917 +#: ../pidgin/gtknotify.c:909 msgid "Buddy Information" msgstr "好友資訊" -#: ../finch/gntnotify.c:376 +#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367 msgid "Continue" msgstr "繼續" -# XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼 -# XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」 -# XXX 注：現在 (2.0.0b4) 不是了，除錯視窗的「過濾程度」竟有「Info」（資訊）級別…… -#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834 -msgid "Info" -msgstr "資訊" - -#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1588 +#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581 msgid "IM" msgstr "即時訊息" @@ -1138,7 +1287,7 @@ #. Back to instant-apply! I win! BU-HAHAHA! #. Create the window #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263 -#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060 +#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066 msgid "Preferences" msgstr "偏好設定" @@ -1146,7 +1295,6 @@ msgid "Please enter a buddy to pounce." msgstr "請輸入一個好友以進行捕捉。" -#. Create the window. #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516 msgid "New Buddy Pounce" msgstr "新增好友狀態捕捉" @@ -1160,7 +1308,7 @@ msgstr "捕捉誰的狀態" #. Account: -#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452 +#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455 msgid "Account:" msgstr "帳號：" @@ -1169,7 +1317,7 @@ msgstr "好友名稱：" #. Create the "Pounce When Buddy..." frame. -#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586 +#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584 msgid "Pounce When Buddy..." msgstr "捕捉狀態..." @@ -1214,7 +1362,7 @@ msgstr "送出一個訊息" #. Create the "Action" frame. -#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647 +#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645 msgid "Action" msgstr "執行動作" @@ -1242,72 +1390,84 @@ msgid "Pounce only when my status is not available" msgstr "只在我的狀態不為「上線」時啟用" -#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295 +#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280 msgid "Recurring" msgstr "重覆發生" -#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110 +#: ../finch/gntpounce.c:617 +msgid "Cannot create pounce" +msgstr "無法新增好友狀態捕捉" + +#: ../finch/gntpounce.c:618 +msgid "You do not have any accounts." +msgstr "未有設定任何帳號" + +#: ../finch/gntpounce.c:619 +msgid "You must create an account first before you can create a pounce." +msgstr "新增好友狀態捕捉前，必須先新增一個帳號。" + +#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095 #, c-format msgid "Are you sure you want to delete the pounce on %s for %s?" msgstr "您確定您要刪除對 %2$s 的 %1$s 捕捉？" -#: ../finch/gntpounce.c:685 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339 +#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324 msgid "Buddy Pounces" msgstr "好友狀態捕捉" -#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466 +#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451 #, c-format msgid "%s has started typing to you (%s)" msgstr "%s 開始輸入訊息給您 (%s)" -#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468 +#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453 #, c-format msgid "%s has paused while typing to you (%s)" msgstr "%s 暫停輸入訊息給您 (%s)" -#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470 +#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455 #, c-format msgid "%s has signed on (%s)" msgstr "%s 已經登入 (%s)" -#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472 +#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457 #, c-format msgid "%s has returned from being idle (%s)" msgstr "%s 由閒置返回 (%s)" -#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474 +#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459 #, c-format msgid "%s has returned from being away (%s)" msgstr "%s 由離開返回 (%s)" -#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476 +#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461 #, c-format msgid "%s has stopped typing to you (%s)" msgstr "%s 停止輸入訊息給您 (%s)" -#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478 +#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463 #, c-format msgid "%s has signed off (%s)" msgstr "%s 已經登出 (%s)" -#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480 +#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465 #, c-format msgid "%s has become idle (%s)" msgstr "%s 變更狀態為閒置 (%s)" # XXX This string is very problematic. The other person might have changed to any non-available # XXX status like "Busy" (not necessarily "Away"), and "已經離開" seems misleading. - 20061123 -#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482 +#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467 #, c-format msgid "%s has gone away. (%s)" msgstr "%s 已經離開。 (%s)" -#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484 +#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469 #, c-format msgid "%s has sent you a message. (%s)" msgstr "%s 送出一個訊息給您。 (%s)" -#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485 +#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470 msgid "Unknown pounce event. Please report this!" msgstr "未知的捕捉事件。請回報這個問題！" @@ -1315,13 +1475,13 @@ msgid "Based on keyboard use" msgstr "以鍵盤的使用為基準" -#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923 +#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929 msgid "From last sent message" msgstr "從上次送出訊息時為基準" #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906 -#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936 -#: ../pidgin/plugins/win32/winprefs/winprefs.c:337 +#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:333 msgid "Never" msgstr "從不" @@ -1370,12 +1530,12 @@ msgstr "更改狀態為" #. Conversations -#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026 -#: ../pidgin/plugins/win32/winprefs/winprefs.c:344 +#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:340 msgid "Conversations" msgstr "交談" -#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037 +#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043 msgid "Logging" msgstr "日誌" @@ -1383,16 +1543,167 @@ msgid "Not implemented yet." msgstr "該功能尚未實作" -#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1526 -#: ../pidgin/gtkrequest.c:1572 +#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555 +#: ../pidgin/gtkrequest.c:1601 msgid "Save File..." msgstr "儲存檔案..." -#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1527 -#: ../pidgin/gtkrequest.c:1573 +#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556 +#: ../pidgin/gtkrequest.c:1602 msgid "Open File..." msgstr "開啟檔案..." +#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63 +msgid "Buddy logs in" +msgstr "好友登入" + +#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64 +msgid "Buddy logs out" +msgstr "好友登出" + +#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65 +msgid "Message received" +msgstr "收到訊息" + +#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66 +msgid "Message received begins conversation" +msgstr "訊息收到，開始進行交談" + +#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67 +msgid "Message sent" +msgstr "訊息送出" + +#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68 +msgid "Person enters chat" +msgstr "有人進入聊天室" + +#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69 +msgid "Person leaves chat" +msgstr "有人離開聊天室" + +#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70 +msgid "You talk in chat" +msgstr "您在聊天室說話" + +#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71 +msgid "Others talk in chat" +msgstr "其他人進入聊天室" + +#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74 +msgid "Someone says your screen name in chat" +msgstr "有人在聊天室中提到您的名字" + +#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310 +msgid "GStreamer Failure" +msgstr "GStreamer 錯誤" + +#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311 +msgid "GStreamer failed to initialize." +msgstr "GStreamer 初始化失敗。" + +#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586 +#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871 +msgid "(default)" +msgstr "(預設)" + +#: ../finch/gntsound.c:728 +msgid "Select Sound File ..." +msgstr "選擇音效檔..." + +#: ../finch/gntsound.c:903 +msgid "Sound Preferences" +msgstr "音效設定" + +#: ../finch/gntsound.c:914 +msgid "Profiles" +msgstr "個人資料" + +#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716 +msgid "Automatic" +msgstr "自動" + +#: ../finch/gntsound.c:956 +msgid "Console Beep" +msgstr "嗶一聲" + +#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720 +msgid "Command" +msgstr "指令" + +#: ../finch/gntsound.c:958 +msgid "No Sound" +msgstr "無音效" + +#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711 +msgid "Sound Method" +msgstr "音效播放方式" + +#: ../finch/gntsound.c:965 +msgid "Method: " +msgstr "播放方式：" + +#: ../finch/gntsound.c:972 +#, c-format +msgid "" +"Sound Command\n" +"(%s for filename)" +msgstr "" +"音效指令：\n" +"(請以 %s 代表檔名)" + +#. Sound options +#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755 +msgid "Sound Options" +msgstr "音效選項" + +#: ../finch/gntsound.c:981 +msgid "Sounds when conversation has focus" +msgstr "當交談取得輸入焦點發出音效" + +#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 +#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42 +#: ../pidgin/plugins/timestamp_format.c:51 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:334 +msgid "Always" +msgstr "務必" + +#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760 +msgid "Only when available" +msgstr "上線而非離開期間" + +#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761 +msgid "Only when not available" +msgstr "離開期間" + +#: ../finch/gntsound.c:998 +msgid "Volume(0-100):" +msgstr "音量(0-100)：" + +#. Sound events +#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797 +msgid "Sound Events" +msgstr "事件音效" + +#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856 +msgid "Event" +msgstr "事件" + +#: ../finch/gntsound.c:1019 +msgid "File" +msgstr "檔案" + +#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875 +msgid "Test" +msgstr "測試" + +#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879 +msgid "Reset" +msgstr "重置" + +#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883 +msgid "Choose..." +msgstr "選擇..." + #: ../finch/gntstatus.c:137 #, c-format msgid "Are you sure you want to delete \"%s\"" @@ -1408,9 +1719,9 @@ msgstr "狀態清單" # FIXME 原文一詞兩義，根本無法翻譯 -#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535 -#: ../libpurple/protocols/jabber/buddy.c:286 -#: ../libpurple/protocols/jabber/buddy.c:973 +#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538 +#: ../libpurple/protocols/jabber/buddy.c:298 +#: ../libpurple/protocols/jabber/buddy.c:1359 #: ../libpurple/protocols/novell/novell.c:1484 #: ../pidgin/gtksavedstatuses.c:499 msgid "Title" @@ -1421,30 +1732,39 @@ msgid "Type" msgstr "格式" -#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572 -#: ../libpurple/protocols/bonjour/bonjour.c:247 -#: ../libpurple/protocols/bonjour/bonjour.c:254 -#: ../libpurple/protocols/bonjour/bonjour.c:320 -#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574 -#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602 -#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617 -#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234 -#: ../libpurple/protocols/jabber/jabber.c:1244 -#: ../libpurple/protocols/jabber/jabber.c:1254 -#: ../libpurple/protocols/jabber/jabber.c:1264 -#: ../libpurple/protocols/jabber/jabber.c:1274 -#: ../libpurple/protocols/jabber/jabber.c:1284 -#: ../libpurple/protocols/jabber/jabber.c:1296 +#. Statuses are almost all the same. Define a macro to reduce code repetition. +#. PurpleStatusPrimitive +#. id - use default +#. name - use default +#. savable +#. user_settable +#. not independent +#. Attributes - each status can have a message. +#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575 +#: ../libpurple/protocols/bonjour/bonjour.c:256 +#: ../libpurple/protocols/bonjour/bonjour.c:263 +#: ../libpurple/protocols/bonjour/bonjour.c:346 +#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579 +#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607 +#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622 +#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234 +#: ../libpurple/protocols/jabber/jabber.c:1528 +#: ../libpurple/protocols/jabber/jabber.c:1551 +#: ../libpurple/protocols/jabber/jabber.c:1574 +#: ../libpurple/protocols/jabber/jabber.c:1597 +#: ../libpurple/protocols/jabber/jabber.c:1620 +#: ../libpurple/protocols/jabber/jabber.c:1645 +#: ../libpurple/protocols/myspace/myspace.c:148 #: ../libpurple/protocols/novell/novell.c:2838 #: ../libpurple/protocols/novell/novell.c:2941 #: ../libpurple/protocols/novell/novell.c:2947 #: ../libpurple/protocols/novell/novell.c:2953 -#: ../libpurple/protocols/oscar/oscar.c:5533 -#: ../libpurple/protocols/oscar/oscar.c:5751 -#: ../libpurple/protocols/oscar/oscar.c:5765 -#: ../libpurple/protocols/oscar/oscar.c:5781 -#: ../libpurple/protocols/oscar/oscar.c:5788 -#: ../libpurple/protocols/oscar/oscar.c:5795 +#: ../libpurple/protocols/oscar/oscar.c:5538 +#: ../libpurple/protocols/oscar/oscar.c:5756 +#: ../libpurple/protocols/oscar/oscar.c:5770 +#: ../libpurple/protocols/oscar/oscar.c:5786 +#: ../libpurple/protocols/oscar/oscar.c:5793 +#: ../libpurple/protocols/oscar/oscar.c:5800 #: ../libpurple/protocols/sametime/sametime.c:3286 #: ../libpurple/protocols/sametime/sametime.c:3292 #: ../libpurple/protocols/sametime/sametime.c:3298 @@ -1452,15 +1772,15 @@ #: ../libpurple/protocols/silc/buddy.c:1551 #: ../libpurple/protocols/silc10/buddy.c:1551 #: ../libpurple/protocols/simple/simple.c:246 -#: ../libpurple/protocols/yahoo/yahoo.c:3494 -#: ../libpurple/protocols/yahoo/yahoo.c:3500 +#: ../libpurple/protocols/yahoo/yahoo.c:3748 +#: ../libpurple/protocols/yahoo/yahoo.c:3754 #: ../libpurple/protocols/zephyr/zephyr.c:2337 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009 msgid "Message" msgstr "訊息" #. Use -#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589 +#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592 msgid "Use" msgstr "使用" @@ -1472,53 +1792,79 @@ msgid "Please enter a non-empty title for the status." msgstr "請為這個狀態輸入一個非空白的標題。" -#: ../finch/gntstatus.c:308 +#: ../finch/gntstatus.c:309 msgid "Duplicate title" msgstr "標題重覆" -#: ../finch/gntstatus.c:309 +#: ../finch/gntstatus.c:310 msgid "Please enter a different title for the status." msgstr "為給這個狀態輸入另一個標題。" -#: ../finch/gntstatus.c:449 +#: ../finch/gntstatus.c:451 msgid "Substatus" msgstr "子狀態" -#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698 +#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698 msgid "Status:" msgstr "狀態：" -#: ../finch/gntstatus.c:475 +#: ../finch/gntstatus.c:478 msgid "Message:" msgstr "訊息：" -#: ../finch/gntstatus.c:524 +#: ../finch/gntstatus.c:527 msgid "Edit Status" msgstr "修改狀態" -#: ../finch/gntstatus.c:566 +#: ../finch/gntstatus.c:569 msgid "Use different status for following accounts" msgstr "為部份帳號設定不同的狀態" #. Save & Use -#: ../finch/gntstatus.c:600 +#: ../finch/gntstatus.c:603 msgid "Save & Use" msgstr "儲存並使用" -#: ../finch/gntui.c:84 +#: ../finch/gntui.c:85 +msgid "Certificates" +msgstr "憑證" + +#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034 +msgid "Sounds" +msgstr "音效" + +#: ../finch/gntui.c:91 msgid "Statuses" msgstr "狀態" -#: ../finch/plugins/gntclipboard.c:149 +#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121 +#: ../finch/plugins/gntclipboard.c:128 +msgid "Error loading the plugin." +msgstr "載入模組途中遭遇錯誤。" + +#: ../finch/plugins/gntclipboard.c:116 +msgid "Couldn't find X display" +msgstr "找不到 X Display 的設定" + +#: ../finch/plugins/gntclipboard.c:122 +#, fuzzy +msgid "Couldn't find window" +msgstr "無法開啟檔案" + +#: ../finch/plugins/gntclipboard.c:129 +msgid "This plugin cannot be loaded because it was not built with X11 support." +msgstr "無法載入模組，因為建置模組時沒有給它加入 X11 支援。" + +#: ../finch/plugins/gntclipboard.c:158 msgid "GntClipboard" msgstr "GntClipboard" -#: ../finch/plugins/gntclipboard.c:151 +#: ../finch/plugins/gntclipboard.c:160 msgid "Clipboard plugin" msgstr "剪貼簿模組" # FIXME: 這很不通順 -#: ../finch/plugins/gntclipboard.c:152 +#: ../finch/plugins/gntclipboard.c:161 msgid "" "When the gnt clipboard contents change, the contents are made available to " "X, if possible." @@ -1641,71 +1987,72 @@ msgid "accounts" msgstr "帳號清單" -#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194 -#: ../libpurple/protocols/jabber/auth.c:233 +#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194 +#: ../libpurple/protocols/jabber/auth.c:256 msgid "Password is required to sign on." msgstr "登入時需要密碼。" -#: ../libpurple/account.c:963 +#: ../libpurple/account.c:983 #, c-format msgid "Enter password for %s (%s)" msgstr "輸入 %s (%s) 的密碼" -#: ../libpurple/account.c:970 +#: ../libpurple/account.c:990 msgid "Enter Password" msgstr "輸入密碼" -#: ../libpurple/account.c:975 +#: ../libpurple/account.c:995 msgid "Save password" msgstr "儲存密碼" -#: ../libpurple/account.c:1010 ../libpurple/connection.c:104 +#: ../libpurple/account.c:1030 ../libpurple/connection.c:104 +#: ../libpurple/connection.c:177 #, c-format msgid "Missing protocol plugin for %s" msgstr "找不到 %s 的協定模組" -#: ../libpurple/account.c:1012 ../libpurple/connection.c:107 -#: ../pidgin/gtkblist.c:4010 +#: ../libpurple/account.c:1032 ../libpurple/connection.c:107 +#: ../pidgin/gtkblist.c:4033 msgid "Connection Error" msgstr "連線錯誤" -#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702 -#: ../libpurple/protocols/jabber/jabber.c:1334 +#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707 +#: ../libpurple/protocols/jabber/jabber.c:1683 msgid "New passwords do not match." msgstr "新密碼並不相符。" # NOTE 譯文更動 by Ambrose -#: ../libpurple/account.c:1179 +#: ../libpurple/account.c:1199 msgid "Fill out all fields completely." msgstr "請填妥整份表格所有的欄位。" -#: ../libpurple/account.c:1202 +#: ../libpurple/account.c:1222 msgid "Original password" msgstr "舊密碼" -#: ../libpurple/account.c:1209 +#: ../libpurple/account.c:1229 msgid "New password" msgstr "新密碼" -#: ../libpurple/account.c:1216 +#: ../libpurple/account.c:1236 msgid "New password (again)" msgstr "新密碼（再次確認）" -#: ../libpurple/account.c:1222 +#: ../libpurple/account.c:1242 #, c-format msgid "Change password for %s" msgstr "修改 %s 的密碼" -#: ../libpurple/account.c:1230 +#: ../libpurple/account.c:1250 msgid "Please enter your current password and your new password." msgstr "請輸入您目前的密碼以及希望使用的新密碼。" -#: ../libpurple/account.c:1261 +#: ../libpurple/account.c:1281 #, c-format msgid "Change user information for %s" msgstr "更改 %s 的個人資訊" -#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670 +#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670 msgid "Set User Info" msgstr "設定使用者資訊" @@ -1716,19 +2063,20 @@ # XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」） # XXX 或者「未知」（出現了 Pidgin 未見過的狀態代號） # XXX - Ambrose 20061123 -#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012 -#: ../libpurple/protocols/jabber/buddy.c:642 -#: ../libpurple/protocols/jabber/buddy.c:1462 -#: ../libpurple/protocols/jabber/buddy.c:1479 +#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017 +#: ../libpurple/protocols/jabber/buddy.c:782 +#: ../libpurple/protocols/jabber/buddy.c:2025 +#: ../libpurple/protocols/jabber/buddy.c:2042 #: ../libpurple/protocols/novell/novell.c:2831 -#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159 +#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159 msgid "Unknown" msgstr "未知" -#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289 -#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68 -#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevolution.c:96 +#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301 +#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69 +#: ../libpurple/protocols/myspace/myspace.c:3238 ../pidgin/gtkblist.c:5367 #: ../pidgin/plugins/gevolution/gevo-util.c:64 +#: ../pidgin/plugins/gevolution/gevolution.c:96 msgid "Buddies" msgstr "好友" @@ -1736,22 +2084,184 @@ msgid "buddy list" msgstr "好友清單" +#: ../libpurple/certificate.c:545 +msgid "(DOES NOT MATCH)" +msgstr "（並不相符）" + +# XXX 這是暫譯 - acli 20070913 +#. Make messages +#: ../libpurple/certificate.c:549 +#, c-format +msgid "%s has presented the following certificate for just-this-once use:" +msgstr "%s 出示了以下隨用即棄的憑證：" + +#: ../libpurple/certificate.c:550 +#, c-format +msgid "" +"Common name: %s %s\n" +"Fingerprint (SHA1): %s" +msgstr "" +"全名：%s %s\n" +"指紋 (SHA1)：%s" + +# XXX 這是暫譯 - acli 20070913 +#. TODO: Find what the handle ought to be +#: ../libpurple/certificate.c:555 +msgid "Single-use Certificate Verification" +msgstr "核實即棄憑證" + +#. Scheme name +#. Pool name +#: ../libpurple/certificate.c:872 +msgid "Certificate Authorities" +msgstr "憑證機構" + +# TODO Untranslated - acli 20070913 +#. Scheme name +#. Pool name +#: ../libpurple/certificate.c:1040 +msgid "SSL Peers Cache" +msgstr "SSL Peer 快取" + +#. Make messages +#: ../libpurple/certificate.c:1171 +#, c-format +msgid "Accept certificate for %s?" +msgstr "接受 %s 的憑證嗎？" + +#. TODO: Find what the handle ought to be +#: ../libpurple/certificate.c:1177 +msgid "SSL Certificate Verification" +msgstr "核實 SSL 憑證" + +#. Number of actions +#: ../libpurple/certificate.c:1186 +msgid "Accept" +msgstr "接受" + +#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214 +#: ../libpurple/protocols/qq/group_im.c:144 +#: ../libpurple/protocols/qq/group_opt.c:127 +#: ../libpurple/protocols/qq/sys_msg.c:90 +#: ../libpurple/protocols/qq/sys_msg.c:246 +msgid "Reject" +msgstr "拒絕" + +#: ../libpurple/certificate.c:1188 +msgid "_View Certificate..." +msgstr "檢視憑證(_V)" + +# FIXME 譯文不太通順 - acli 20070913 +#. Prompt the user to authenticate the certificate +#. TODO: Provide the user with more guidance about why he is +#. being prompted +#. vrq will be completed by user_auth +#: ../libpurple/certificate.c:1288 +#, c-format +msgid "" +"The certificate presented by \"%s\" claims to be from \"%s\" instead. This " +"could mean that you are not connecting to the service you believe you are." +msgstr "" +"「%s」出示的憑證聲稱它應該屬於「%s」，您目前可能的連線可能不是您心目中希望使" +"用的服務。" + +#. Prompt the user to authenticate the certificate +#. vrq will be completed by user_auth +#: ../libpurple/certificate.c:1313 +#, c-format +msgid "" +"The certificate presented by \"%s\" is self-signed. It cannot be " +"automatically checked." +msgstr "「%s」出示的憑證是自簽的，無法自動進行核實。" + +#: ../libpurple/certificate.c:1331 +#, c-format +msgid "The certificate chain presented for %s is not valid." +msgstr "「%s」出示的憑證鍊是無效的。" + +#. TODO: Make this error either block the ensuing SSL +#. connection error until the user dismisses this one, or +#. stifle it. +#. TODO: Probably wrong. +#. TODO: Probably wrong +#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416 +msgid "SSL Certificate Error" +msgstr "SSL 憑證錯誤" + +#: ../libpurple/certificate.c:1340 +msgid "Invalid certificate chain" +msgstr "無效的憑證鏈" + +#. vrq will be completed by user_auth +#: ../libpurple/certificate.c:1360 +msgid "" +"You have no database of root certificates, so this certificate cannot be " +"validated." +msgstr "" + +#. vrq will be completed by user_auth +#: ../libpurple/certificate.c:1382 +msgid "" +"The root certificate this one claims to be issued by is unknown to Pidgin." +msgstr "" + +#: ../libpurple/certificate.c:1408 +#, c-format +msgid "" +"The certificate chain presented by %s does not have a valid digital " +"signature from the Certificate Authority from which it claims to have a " +"signature." +msgstr "" +"「%s」出示的憑證鍊聲稱它是由某憑證機構簽發，但實際上卻沒有該憑證機構的有效簽" +"章。" + +#: ../libpurple/certificate.c:1417 +msgid "Invalid certificate authority signature" +msgstr "憑證機構的簽章是無效的" + +#. Make messages +#: ../libpurple/certificate.c:1882 +#, c-format +msgid "" +"Common name: %s\n" +"\n" +"Fingerprint (SHA1): %s\n" +"\n" +"Activation date: %s\n" +"Expiration date: %s\n" +msgstr "" +"全名：%s\n" +"\n" +"指紋 (SHA1)：%s\n" +"\n" +"生效日期：%s\n" +"失效日期：%s\n" + +#. TODO: Find what the handle ought to be +#: ../libpurple/certificate.c:1891 +msgid "Certificate Information" +msgstr "憑證資訊" + #: ../libpurple/connection.c:106 msgid "Registration Error" msgstr "註冊錯誤" -#: ../libpurple/connection.c:293 +#: ../libpurple/connection.c:179 +msgid "Unregistration Error" +msgstr "未註冊錯誤" + +#: ../libpurple/connection.c:349 #, c-format msgid "+++ %s signed on" msgstr "+++ %s 登入" -#: ../libpurple/connection.c:323 +#: ../libpurple/connection.c:379 #, c-format msgid "+++ %s signed off" msgstr "+++ %s 登出" -#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282 -#: ../libpurple/protocols/jabber/buddy.c:1750 +#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282 +#: ../libpurple/protocols/jabber/buddy.c:2313 #: ../libpurple/protocols/msn/servconn.c:139 #: ../libpurple/protocols/msn/session.c:322 msgid "Unknown error" @@ -1770,45 +2280,45 @@ msgid "The message is too large." msgstr "這個訊息太大了。" -#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284 -#: ../libpurple/protocols/bonjour/jabber.c:326 +#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255 +#: ../libpurple/protocols/bonjour/jabber.c:298 msgid "Unable to send message." msgstr "無法送出訊息。" -#: ../libpurple/conversation.c:1169 +#: ../libpurple/conversation.c:1211 msgid "Send Message" msgstr "送出訊息" -#: ../libpurple/conversation.c:1172 +#: ../libpurple/conversation.c:1214 msgid "_Send Message" msgstr "送出訊息(_S)" -#: ../libpurple/conversation.c:1578 +#: ../libpurple/conversation.c:1620 #, c-format msgid "%s entered the room." msgstr "%s 進入聊天室。" -#: ../libpurple/conversation.c:1581 +#: ../libpurple/conversation.c:1623 #, c-format msgid "%s [%s] entered the room." msgstr "%s [%s] 進入聊天室。" -#: ../libpurple/conversation.c:1691 +#: ../libpurple/conversation.c:1733 #, c-format msgid "You are now known as %s" msgstr "你改變暱稱為 %s" -#: ../libpurple/conversation.c:1711 +#: ../libpurple/conversation.c:1753 #, c-format msgid "%s is now known as %s" msgstr "%s 改變暱稱為 %s" -#: ../libpurple/conversation.c:1786 +#: ../libpurple/conversation.c:1828 #, c-format msgid "%s left the room." msgstr "%s 離開聊天室。" -#: ../libpurple/conversation.c:1789 +#: ../libpurple/conversation.c:1831 #, c-format msgid "%s left the room (%s)." msgstr "%s 離開聊天室 (%s)。" @@ -2184,15 +2694,15 @@ msgid "Old flat format" msgstr "舊式平面檔案" -#: ../libpurple/log.c:837 +#: ../libpurple/log.c:838 msgid "Logging of this conversation failed." msgstr "無法記錄這個交談。" -#: ../libpurple/log.c:1280 +#: ../libpurple/log.c:1281 msgid "XML" msgstr "XML" -#: ../libpurple/log.c:1364 +#: ../libpurple/log.c:1365 #, c-format msgid "" "(%s) %s <AUTO-" @@ -2201,7 +2711,7 @@ "(%s) %s <自動回應>:" " %s
\n" -#: ../libpurple/log.c:1366 +#: ../libpurple/log.c:1367 #, c-format msgid "" "(%s) %s <AUTO-" @@ -2211,16 +2721,16 @@ " %s
\n" # XXX 暫譯 -#: ../libpurple/log.c:1424 ../libpurple/log.c:1557 +#: ../libpurple/log.c:1425 ../libpurple/log.c:1558 msgid "Unable to find log path!" msgstr "找不到日誌檔案！" -#: ../libpurple/log.c:1436 ../libpurple/log.c:1566 +#: ../libpurple/log.c:1437 ../libpurple/log.c:1567 #, c-format msgid "Could not read file: %s" msgstr "無法讀取檔案：%s" -#: ../libpurple/log.c:1498 +#: ../libpurple/log.c:1499 #, c-format msgid "(%s) %s : %s\n" msgstr "(%s) %s <自動回覆>：%s\n" @@ -2310,13 +2820,13 @@ #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230 -#: ../libpurple/protocols/oscar/oscar.c:1458 -#: ../libpurple/protocols/oscar/oscar.c:2251 -#: ../libpurple/protocols/oscar/oscar.c:2298 -#: ../libpurple/protocols/oscar/oscar.c:5865 -#: ../libpurple/protocols/oscar/oscar.c:5920 -#: ../libpurple/protocols/oscar/oscar.c:6146 -#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387 +#: ../libpurple/protocols/oscar/oscar.c:1451 +#: ../libpurple/protocols/oscar/oscar.c:2226 +#: ../libpurple/protocols/oscar/oscar.c:2275 +#: ../libpurple/protocols/oscar/oscar.c:5870 +#: ../libpurple/protocols/oscar/oscar.c:5925 +#: ../libpurple/protocols/oscar/oscar.c:6151 +#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387 #: ../libpurple/request.h:1397 msgid "_Cancel" msgstr "取消(_C)" @@ -2374,8 +2884,8 @@ "當完成自動接受檔案傳輸時跳出視窗通知\n" "（只發生在未與傳送者進行交談的情況下）" -#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629 -#: ../libpurple/protocols/msn/msn.c:1659 +#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1657 +#: ../libpurple/protocols/msn/msn.c:1687 msgid "Notes" msgstr "備註" @@ -2395,18 +2905,18 @@ #. *< dependencies #. *< priority #. *< id -#: ../libpurple/plugins/buddynote.c:90 +#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71 msgid "Buddy Notes" msgstr "好友備註" #. *< name #. *< version -#: ../libpurple/plugins/buddynote.c:92 +#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73 msgid "Store notes on particular buddies." msgstr "給個別好友加上備註。" #. *< summary -#: ../libpurple/plugins/buddynote.c:93 +#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74 msgid "Adds the option to store notes for buddies on your buddy list." msgstr "提供給好友清單上的好友加上備註的功能。" @@ -2609,44 +3119,44 @@ #. * offset is way off. The user should never really see it, but #. * it's here just in case. The parens are to make it clear it's #. * not a real timezone. -#: ../libpurple/plugins/log_reader.c:492 +#: ../libpurple/plugins/log_reader.c:493 msgid "(UTC)" msgstr "(UTC)" -#: ../libpurple/plugins/log_reader.c:1573 +#: ../libpurple/plugins/log_reader.c:1577 msgid "User is offline." msgstr "使用者是離線的。" -#: ../libpurple/plugins/log_reader.c:1579 +#: ../libpurple/plugins/log_reader.c:1583 msgid "Auto-response sent:" msgstr "自動回應送出：" -#: ../libpurple/plugins/log_reader.c:1589 -#: ../libpurple/plugins/log_reader.c:1592 +#: ../libpurple/plugins/log_reader.c:1593 +#: ../libpurple/plugins/log_reader.c:1596 #: ../libpurple/plugins/statenotify.c:80 #, c-format msgid "%s has signed off." msgstr "%s 已經登出。" -#: ../libpurple/plugins/log_reader.c:1606 +#: ../libpurple/plugins/log_reader.c:1610 msgid "One or more messages may have been undeliverable." msgstr "一個或多個訊息可能傳送失敗。" -#: ../libpurple/plugins/log_reader.c:1616 +#: ../libpurple/plugins/log_reader.c:1620 msgid "You were disconnected from the server." msgstr "您已經停止與伺服器的連線。" -#: ../libpurple/plugins/log_reader.c:1624 +#: ../libpurple/plugins/log_reader.c:1628 msgid "" "You are currently disconnected. Messages will not be received unless you are " "logged in." msgstr "您目前是離線狀態。在您重新登入前，將無法收到任何訊息。" -#: ../libpurple/plugins/log_reader.c:1639 +#: ../libpurple/plugins/log_reader.c:1643 msgid "Message could not be sent because the maximum length was exceeded." msgstr "由於達到長度上限，所以訊息無法送出。" -#: ../libpurple/plugins/log_reader.c:1644 +#: ../libpurple/plugins/log_reader.c:1648 msgid "Message could not be sent." msgstr "訊息無法送出。" @@ -2654,68 +3164,68 @@ #. The names of IM clients are marked for translation at the request of #. translators who wanted to transliterate them. Many translators #. choose to leave them alone. Choose what's best for your language. -#: ../libpurple/plugins/log_reader.c:2344 -#: ../libpurple/plugins/log_reader.c:2467 +#: ../libpurple/plugins/log_reader.c:2349 +#: ../libpurple/plugins/log_reader.c:2472 msgid "Adium" msgstr "Adium" #. The names of IM clients are marked for translation at the request of #. translators who wanted to transliterate them. Many translators #. choose to leave them alone. Choose what's best for your language. -#: ../libpurple/plugins/log_reader.c:2357 -#: ../libpurple/plugins/log_reader.c:2472 +#: ../libpurple/plugins/log_reader.c:2362 +#: ../libpurple/plugins/log_reader.c:2477 msgid "Fire" msgstr "Fire" #. The names of IM clients are marked for translation at the request of #. translators who wanted to transliterate them. Many translators #. choose to leave them alone. Choose what's best for your language. -#: ../libpurple/plugins/log_reader.c:2369 -#: ../libpurple/plugins/log_reader.c:2476 +#: ../libpurple/plugins/log_reader.c:2374 +#: ../libpurple/plugins/log_reader.c:2481 msgid "Messenger Plus!" msgstr "Messenger Plus!" #. The names of IM clients are marked for translation at the request of #. translators who wanted to transliterate them. Many translators #. choose to leave them alone. Choose what's best for your language. -#: ../libpurple/plugins/log_reader.c:2383 -#: ../libpurple/plugins/log_reader.c:2481 +#: ../libpurple/plugins/log_reader.c:2388 +#: ../libpurple/plugins/log_reader.c:2486 msgid "QIP" msgstr "QIP" #. The names of IM clients are marked for translation at the request of #. translators who wanted to transliterate them. Many translators #. choose to leave them alone. Choose what's best for your language. -#: ../libpurple/plugins/log_reader.c:2395 -#: ../libpurple/plugins/log_reader.c:2485 +#: ../libpurple/plugins/log_reader.c:2400 +#: ../libpurple/plugins/log_reader.c:2490 msgid "MSN Messenger" msgstr "MSN Messenger" #. The names of IM clients are marked for translation at the request of #. translators who wanted to transliterate them. Many translators #. choose to leave them alone. Choose what's best for your language. -#: ../libpurple/plugins/log_reader.c:2407 -#: ../libpurple/plugins/log_reader.c:2489 +#: ../libpurple/plugins/log_reader.c:2412 +#: ../libpurple/plugins/log_reader.c:2494 msgid "Trillian" msgstr "Trillian" #. Add general preferences. -#: ../libpurple/plugins/log_reader.c:2449 +#: ../libpurple/plugins/log_reader.c:2454 msgid "General Log Reading Configuration" msgstr "基本的日誌讀取設定" -#: ../libpurple/plugins/log_reader.c:2453 +#: ../libpurple/plugins/log_reader.c:2458 msgid "Fast size calculations" msgstr "快速計算日誌大小" # XXX 譯文計有「啟發式XX」、「經驗法則」、「發現技法」、「探索法」、「探究法」等（後兩者似乎只限用於數學） # XXX 這裏的「name heuristics」是指一些幫助 Pidgin「估計」帳號身分的經驗性規則；單從字義判斷，合用的譯文只有「經驗法則」 -#: ../libpurple/plugins/log_reader.c:2457 +#: ../libpurple/plugins/log_reader.c:2462 msgid "Use name heuristics" msgstr "匹配帳號時使用經驗法則 (heuristics)" #. Add Log Directory preferences. -#: ../libpurple/plugins/log_reader.c:2463 +#: ../libpurple/plugins/log_reader.c:2468 msgid "Log Directory" msgstr "日誌目錄" @@ -2725,20 +3235,20 @@ #. *< dependencies #. *< priority #. *< id -#: ../libpurple/plugins/log_reader.c:2518 +#: ../libpurple/plugins/log_reader.c:2523 msgid "Log Reader" msgstr "日誌檢視器" #. *< name #. *< version #. * summary -#: ../libpurple/plugins/log_reader.c:2522 +#: ../libpurple/plugins/log_reader.c:2527 msgid "Includes other IM clients' logs in the log viewer." msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。" # XXX 譯文有待改進（第二段） - 20061025 #. * description -#: ../libpurple/plugins/log_reader.c:2526 +#: ../libpurple/plugins/log_reader.c:2531 msgid "" "When viewing logs, this plugin will include logs from other IM clients. " "Currently, this includes Adium, MSN Messenger, and Trillian.\n" @@ -2802,7 +3312,7 @@ "未能送出的訊息將會儲存成「好友狀態捕捉」。如有需要，訊息可在「好友狀態捕捉」" "的對話視窗中編輯或刪除。" -#: ../libpurple/plugins/offlinemsg.c:152 +#: ../libpurple/plugins/offlinemsg.c:156 #, c-format msgid "" "\"%s\" is currently offline. Do you want to save the rest of the messages in " @@ -2811,17 +3321,17 @@ "「%s」目前為離線，您要使用「好友狀態捕捉」功能儲存未能送出的訊息嗎？（儲存的" "訊息將在「%s」下次登入時自動送出）" -#: ../libpurple/plugins/offlinemsg.c:156 +#: ../libpurple/plugins/offlinemsg.c:160 msgid "Offline Message" msgstr "離線訊息" -#: ../libpurple/plugins/offlinemsg.c:157 +#: ../libpurple/plugins/offlinemsg.c:161 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog" msgstr "您可以在「好友狀態捕捉」的對話視窗中編輯或刪除狀態捕捉" -#: ../libpurple/plugins/offlinemsg.c:161 +#: ../libpurple/plugins/offlinemsg.c:165 #: ../libpurple/protocols/msn/dialog.c:133 -#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532 +#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560 #: ../libpurple/protocols/novell/novell.c:1917 #: ../libpurple/protocols/silc/buddy.c:317 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304 @@ -2831,9 +3341,9 @@ msgid "Yes" msgstr "是" -#: ../libpurple/plugins/offlinemsg.c:162 +#: ../libpurple/plugins/offlinemsg.c:166 #: ../libpurple/protocols/msn/dialog.c:134 -#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532 +#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560 #: ../libpurple/protocols/novell/novell.c:1918 #: ../libpurple/protocols/silc/buddy.c:318 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305 @@ -2843,11 +3353,11 @@ msgid "No" msgstr "否" -#: ../libpurple/plugins/offlinemsg.c:189 +#: ../libpurple/plugins/offlinemsg.c:193 msgid "Save offline messages in pounce" msgstr "使用「好友狀態捕捉」儲存離線訊息" -#: ../libpurple/plugins/offlinemsg.c:193 +#: ../libpurple/plugins/offlinemsg.c:197 msgid "Do not ask. Always save in pounce." msgstr "毋須提問，務必使用「好友狀態捕捉」儲存離線訊息。" @@ -2911,7 +3421,7 @@ #. *< dependencies #. *< priority #. *< id -#: ../libpurple/plugins/signals-test.c:684 +#: ../libpurple/plugins/signals-test.c:711 msgid "Signals Test" msgstr "信號測試" @@ -2919,8 +3429,8 @@ #. *< version #. * summary #. * description -#: ../libpurple/plugins/signals-test.c:687 -#: ../libpurple/plugins/signals-test.c:689 +#: ../libpurple/plugins/signals-test.c:714 +#: ../libpurple/plugins/signals-test.c:716 msgid "Test to see that all signals are working properly." msgstr "檢查各種信號是否都能正常運作。" @@ -2942,6 +3452,50 @@ msgid "Tests to see that most things are working." msgstr "用來測試是否大部份的東西都能正常運作。" +#. Scheme name +#: ../libpurple/plugins/ssl/ssl-gnutls.c:903 +#: ../libpurple/plugins/ssl/ssl-nss.c:657 +msgid "X.509 Certificates" +msgstr "" + +#. *< type +#. *< ui_requirement +#. *< flags +#. *< dependencies +#. *< priority +#. *< id +#: ../libpurple/plugins/ssl/ssl-gnutls.c:987 +msgid "GNUTLS" +msgstr "GNUTLS" + +#. *< name +#. *< version +#. * summary +#. * description +#: ../libpurple/plugins/ssl/ssl-gnutls.c:990 +#: ../libpurple/plugins/ssl/ssl-gnutls.c:992 +msgid "Provides SSL support through GNUTLS." +msgstr "透過 GNUTLS 提供 SSL 的支援。" + +#. *< type +#. *< ui_requirement +#. *< flags +#. *< dependencies +#. *< priority +#. *< id +#: ../libpurple/plugins/ssl/ssl-nss.c:742 +msgid "NSS" +msgstr "NSS" + +#. *< name +#. *< version +#. * summary +#. * description +#: ../libpurple/plugins/ssl/ssl-nss.c:745 +#: ../libpurple/plugins/ssl/ssl-nss.c:747 +msgid "Provides SSL support through Mozilla NSS." +msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。" + #. *< type #. *< ui_requirement #. *< flags @@ -2960,44 +3514,6 @@ msgid "Provides a wrapper around SSL support libraries." msgstr "為支援 SSL 的函式庫提供一個 Wrapper。" -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../libpurple/plugins/ssl/ssl-gnutls.c:275 -msgid "GNUTLS" -msgstr "GNUTLS" - -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/plugins/ssl/ssl-gnutls.c:278 -#: ../libpurple/plugins/ssl/ssl-gnutls.c:280 -msgid "Provides SSL support through GNUTLS." -msgstr "透過 GNUTLS 提供 SSL 的支援。" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../libpurple/plugins/ssl/ssl-nss.c:423 -msgid "NSS" -msgstr "NSS" - -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/plugins/ssl/ssl-nss.c:426 -#: ../libpurple/plugins/ssl/ssl-nss.c:428 -msgid "Provides SSL support through Mozilla NSS." -msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。" - #: ../libpurple/plugins/statenotify.c:50 #, c-format msgid "%s is no longer away." @@ -3086,25 +3602,43 @@ "Unable to establish connection with the local mDNS server. Is it running?" msgstr "無法與近端的 mDNS 伺服器建立連線。它在執行中嗎？" -#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for -#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message -#. Away stuff -#: ../libpurple/protocols/bonjour/bonjour.c:294 -#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530 -#: ../libpurple/protocols/irc/msgs.c:310 -#: ../libpurple/protocols/jabber/buddy.c:1472 -#: ../libpurple/protocols/novell/novell.c:2819 -#: ../libpurple/protocols/oscar/oscar.c:733 -#: ../libpurple/protocols/oscar/oscar.c:4545 -#: ../libpurple/protocols/oscar/oscar.c:5611 -#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476 -#: ../libpurple/protocols/silc10/buddy.c:1476 -#: ../libpurple/protocols/yahoo/yahoo.c:3397 -#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157 -#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932 -#: ../pidgin/gtkstatusbox.c:1056 -msgid "Away" -msgstr "離開" +#. Creating the options for the protocol +#: ../libpurple/protocols/bonjour/bonjour.c:351 +#: ../libpurple/protocols/bonjour/bonjour.c:656 +#: ../libpurple/protocols/gg/gg.c:632 +#: ../libpurple/protocols/jabber/jabber.c:943 +msgid "First name" +msgstr "名" + +#: ../libpurple/protocols/bonjour/bonjour.c:353 +#: ../libpurple/protocols/bonjour/bonjour.c:659 +#: ../libpurple/protocols/gg/gg.c:627 +#: ../libpurple/protocols/jabber/jabber.c:948 +msgid "Last name" +msgstr "姓" + +#: ../libpurple/protocols/bonjour/bonjour.c:357 +#: ../libpurple/protocols/jabber/buddy.c:295 +#: ../libpurple/protocols/jabber/buddy.c:1325 +#: ../libpurple/protocols/jabber/buddy.c:1335 +#: ../libpurple/protocols/jabber/buddy.c:2192 +#: ../libpurple/protocols/silc/ops.c:1041 +#: ../libpurple/protocols/silc/util.c:555 +#: ../libpurple/protocols/silc10/ops.c:1075 +#: ../libpurple/protocols/silc10/util.c:551 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061 +msgid "E-Mail" +msgstr "電子郵件" + +#: ../libpurple/protocols/bonjour/bonjour.c:360 +#: ../libpurple/protocols/bonjour/bonjour.c:665 +msgid "AIM Account" +msgstr "AIM 帳號" + +#: ../libpurple/protocols/bonjour/bonjour.c:363 +#: ../libpurple/protocols/bonjour/bonjour.c:668 +msgid "XMPP Account" +msgstr "XMPP 帳號" #. *< type #. *< ui_requirement @@ -3116,42 +3650,20 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/bonjour/bonjour.c:425 -#: ../libpurple/protocols/bonjour/bonjour.c:427 +#: ../libpurple/protocols/bonjour/bonjour.c:467 +#: ../libpurple/protocols/bonjour/bonjour.c:469 msgid "Bonjour Protocol Plugin" msgstr "Bonjour 協定模組" # XXX 這原文很奇怪 - ambrose 20070414 # NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條 -#: ../libpurple/protocols/bonjour/bonjour.c:470 -#: ../libpurple/protocols/bonjour/bonjour.c:477 -#: ../libpurple/protocols/bonjour/bonjour.c:535 +#: ../libpurple/protocols/bonjour/bonjour.c:610 msgid "Purple Person" msgstr "連絡人" -#. Creating the user splits -#: ../libpurple/protocols/bonjour/bonjour.c:583 -#: ../libpurple/protocols/silc/silc.c:1007 -#: ../libpurple/protocols/silc10/silc.c:918 -msgid "Hostname" -msgstr "主機名稱" - -#. Creating the options for the protocol -#: ../libpurple/protocols/bonjour/bonjour.c:587 -#: ../libpurple/protocols/gg/gg.c:627 -#: ../libpurple/protocols/jabber/jabber.c:828 -msgid "First name" -msgstr "名" - -#: ../libpurple/protocols/bonjour/bonjour.c:590 -#: ../libpurple/protocols/gg/gg.c:622 -#: ../libpurple/protocols/jabber/jabber.c:833 -msgid "Last name" -msgstr "姓" - -#: ../libpurple/protocols/bonjour/bonjour.c:593 -#: ../libpurple/protocols/gg/gg.c:472 -#: ../libpurple/protocols/jabber/jabber.c:818 +#: ../libpurple/protocols/bonjour/bonjour.c:662 +#: ../libpurple/protocols/gg/gg.c:477 +#: ../libpurple/protocols/jabber/jabber.c:933 #: ../libpurple/protocols/silc/silc.c:770 #: ../libpurple/protocols/silc/silc.c:1011 #: ../libpurple/protocols/silc10/silc.c:681 @@ -3159,43 +3671,35 @@ msgid "E-mail" msgstr "電子郵件" -#: ../libpurple/protocols/bonjour/bonjour.c:596 -msgid "AIM Account" -msgstr "AIM 帳號" - -#: ../libpurple/protocols/bonjour/bonjour.c:599 -msgid "XMPP Account" -msgstr "XMPP 帳號" - # NOTE 這是通訊協定名稱，不是問候語 #: ../libpurple/protocols/bonjour/bonjour.h:33 msgid "Bonjour" msgstr "Bonjour" -#: ../libpurple/protocols/bonjour/jabber.c:395 +#: ../libpurple/protocols/bonjour/jabber.c:380 #, c-format msgid "%s has closed the conversation." msgstr "%s 已經關閉這個交談。" -#: ../libpurple/protocols/bonjour/jabber.c:441 -#: ../libpurple/protocols/bonjour/jabber.c:654 -#: ../libpurple/protocols/bonjour/jabber.c:679 +#: ../libpurple/protocols/bonjour/jabber.c:437 +#: ../libpurple/protocols/bonjour/jabber.c:660 +#: ../libpurple/protocols/bonjour/jabber.c:678 msgid "Unable to send the message, the conversation couldn't be started." msgstr "無法送出訊息，交談無法開始。" -#: ../libpurple/protocols/bonjour/jabber.c:575 +#: ../libpurple/protocols/bonjour/jabber.c:583 msgid "Cannot open socket" msgstr "無法開啟Socket" -#: ../libpurple/protocols/bonjour/jabber.c:583 +#: ../libpurple/protocols/bonjour/jabber.c:591 msgid "Error setting socket options" msgstr "設定 Socket 選項時錯誤" -#: ../libpurple/protocols/bonjour/jabber.c:607 +#: ../libpurple/protocols/bonjour/jabber.c:615 msgid "Could not bind socket to port" msgstr "無法聯結 Socket 到通訊埠" -#: ../libpurple/protocols/bonjour/jabber.c:615 +#: ../libpurple/protocols/bonjour/jabber.c:623 msgid "Could not listen on socket" msgstr "無法監聽 Socket" @@ -3272,269 +3776,293 @@ msgid "Registration completed successfully!" msgstr "註冊成功！" -#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770 -#: ../libpurple/protocols/jabber/jabber.c:807 -#: ../libpurple/protocols/jabber/jabber.c:1369 +#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775 +#: ../libpurple/protocols/jabber/jabber.c:914 +#: ../libpurple/protocols/jabber/jabber.c:917 +#: ../libpurple/protocols/jabber/jabber.c:1718 msgid "Password" msgstr "密碼" -#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775 +#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780 msgid "Password (retype)" msgstr "密碼（再次輸入）" -#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780 +#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785 msgid "Enter current token" msgstr "輸入目前的密碼" -#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786 +#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791 msgid "Current token" msgstr "目前密碼" -#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498 +#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503 msgid "Register New Gadu-Gadu Account" msgstr "註冊新的 Gadu-Gadu 帳號" -#: ../libpurple/protocols/gg/gg.c:499 +#: ../libpurple/protocols/gg/gg.c:504 msgid "Please, fill in the following fields" msgstr "請輸入以下的欄位" -#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049 -#: ../libpurple/protocols/gg/gg.c:1121 -#: ../libpurple/protocols/jabber/jabber.c:843 -#: ../libpurple/protocols/oscar/oscar.c:3803 -#: ../libpurple/protocols/oscar/oscar.c:3816 +#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054 +#: ../libpurple/protocols/gg/gg.c:1126 +#: ../libpurple/protocols/jabber/jabber.c:958 +#: ../libpurple/protocols/oscar/oscar.c:3782 +#: ../libpurple/protocols/oscar/oscar.c:3795 #: ../libpurple/protocols/qq/buddy_info.c:49 msgid "City" msgstr "城市" -#: ../libpurple/protocols/gg/gg.c:642 +#: ../libpurple/protocols/gg/gg.c:647 msgid "Year of birth" msgstr "出生年" -#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558 -#: ../libpurple/protocols/oscar/oscar.c:3746 +#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1586 +#: ../libpurple/protocols/myspace/user.c:115 +#: ../libpurple/protocols/oscar/oscar.c:3725 #: ../libpurple/protocols/qq/buddy_info.c:46 -#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227 -#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067 +#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229 +#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091 msgid "Gender" msgstr "性別" -#: ../libpurple/protocols/gg/gg.c:646 +#: ../libpurple/protocols/gg/gg.c:651 msgid "Male or female" msgstr "男性或女性" -#: ../libpurple/protocols/gg/gg.c:647 -#: ../libpurple/protocols/oscar/oscar.c:3746 +#: ../libpurple/protocols/gg/gg.c:652 +#: ../libpurple/protocols/oscar/oscar.c:3725 #: ../libpurple/protocols/qq/buddy_info.c:83 -#: ../libpurple/protocols/qq/qq.c:224 +#: ../libpurple/protocols/qq/qq.c:226 msgid "Male" msgstr "男" -#: ../libpurple/protocols/gg/gg.c:648 -#: ../libpurple/protocols/oscar/oscar.c:3746 +#: ../libpurple/protocols/gg/gg.c:653 +#: ../libpurple/protocols/oscar/oscar.c:3725 #: ../libpurple/protocols/qq/buddy_info.c:84 -#: ../libpurple/protocols/qq/qq.c:227 +#: ../libpurple/protocols/qq/qq.c:229 msgid "Female" msgstr "女" -#: ../libpurple/protocols/gg/gg.c:652 +#: ../libpurple/protocols/gg/gg.c:657 msgid "Only online" msgstr "只有上線" -#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657 +#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662 msgid "Find buddies" msgstr "搜尋好友" -#: ../libpurple/protocols/gg/gg.c:658 +#: ../libpurple/protocols/gg/gg.c:663 msgid "Please, enter your search criteria below" msgstr "請在下方輸入您的搜尋條件" -#: ../libpurple/protocols/gg/gg.c:696 +#: ../libpurple/protocols/gg/gg.c:701 msgid "Fill in the fields." msgstr "填到欄位中。" -#: ../libpurple/protocols/gg/gg.c:708 +#: ../libpurple/protocols/gg/gg.c:713 msgid "Your current password is different from the one that you specified." msgstr "您目前所提供的密碼與指定的帳號不符。" -#: ../libpurple/protocols/gg/gg.c:722 +#: ../libpurple/protocols/gg/gg.c:727 msgid "Unable to change password. Error occurred.\n" msgstr "無法修改密碼。錯誤發生。\n" -#: ../libpurple/protocols/gg/gg.c:731 +#: ../libpurple/protocols/gg/gg.c:736 msgid "Change password for the Gadu-Gadu account" msgstr "變更 Gadu-Gadu 帳號的密碼" -#: ../libpurple/protocols/gg/gg.c:732 +#: ../libpurple/protocols/gg/gg.c:737 msgid "Password was changed successfully!" msgstr "密碼修改成功！" -#: ../libpurple/protocols/gg/gg.c:765 +#: ../libpurple/protocols/gg/gg.c:770 msgid "Current password" msgstr "舊密碼" -#: ../libpurple/protocols/gg/gg.c:790 +#: ../libpurple/protocols/gg/gg.c:795 msgid "Please, enter your current password and your new password for UIN: " msgstr "請輸入您的舊密碼及你的新密碼：" -#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795 +#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800 msgid "Change Gadu-Gadu Password" msgstr "變更 Gadu-Gadu 密碼" -#: ../libpurple/protocols/gg/gg.c:871 +#: ../libpurple/protocols/gg/gg.c:876 #, c-format msgid "Select a chat for buddy: %s" msgstr "選取一個聊天室給好友；%s" -#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875 +#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880 msgid "Add to chat..." msgstr "新增到聊天室..." -#: ../libpurple/protocols/gg/gg.c:1003 -#: ../libpurple/protocols/jabber/buddy.c:1466 +#: ../libpurple/protocols/gg/gg.c:1008 +#: ../libpurple/protocols/jabber/buddy.c:2029 #: ../libpurple/protocols/novell/novell.c:2828 -#: ../libpurple/protocols/oscar/oscar.c:828 -#: ../libpurple/protocols/oscar/oscar.c:5583 +#: ../libpurple/protocols/oscar/oscar.c:827 +#: ../libpurple/protocols/oscar/oscar.c:5588 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177 -#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153 -#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411 -#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059 +#: ../libpurple/protocols/qq/qq.c:292 +#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153 +#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433 +#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060 msgid "Offline" msgstr "離線" -#: ../libpurple/protocols/gg/gg.c:1006 -#: ../libpurple/protocols/jabber/buddy.c:1468 +#: ../libpurple/protocols/gg/gg.c:1011 +#: ../libpurple/protocols/jabber/buddy.c:2031 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38 #: ../libpurple/protocols/novell/novell.c:2816 -#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154 -#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055 +#: ../libpurple/protocols/qq/qq.c:280 +#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154 +#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056 msgid "Available" msgstr "上線" -#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112 -#: ../libpurple/protocols/oscar/oscar.c:2675 -#: ../libpurple/protocols/oscar/oscar.c:3713 +#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for +#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message +#. Away stuff +#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528 +#: ../libpurple/protocols/irc/msgs.c:310 +#: ../libpurple/protocols/jabber/buddy.c:2035 +#: ../libpurple/protocols/novell/novell.c:2819 +#: ../libpurple/protocols/oscar/oscar.c:732 +#: ../libpurple/protocols/oscar/oscar.c:4540 +#: ../libpurple/protocols/oscar/oscar.c:5616 +#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284 +#: ../libpurple/protocols/silc/buddy.c:1476 +#: ../libpurple/protocols/silc10/buddy.c:1476 +#: ../libpurple/protocols/yahoo/yahoo.c:3650 +#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157 +#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938 +#: ../pidgin/gtkstatusbox.c:1057 +msgid "Away" +msgstr "離開" + +#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117 +#: ../libpurple/protocols/oscar/oscar.c:2692 +#: ../libpurple/protocols/oscar/oscar.c:3692 msgid "UIN" msgstr "帳號" -#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115 -#: ../libpurple/protocols/jabber/buddy.c:1623 -#: ../libpurple/protocols/jabber/buddy.c:1799 -#: ../libpurple/protocols/oscar/oscar.c:3724 +#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120 +#: ../libpurple/protocols/jabber/buddy.c:2186 +#: ../libpurple/protocols/jabber/buddy.c:2362 +#: ../libpurple/protocols/oscar/oscar.c:3703 #: ../libpurple/protocols/silc/ops.c:990 #: ../libpurple/protocols/silc10/ops.c:1024 msgid "First Name" msgstr "名" -#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124 +#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129 msgid "Birth Year" msgstr "出生年" -#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175 -#: ../libpurple/protocols/oscar/oscar.c:3925 +#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180 +#: ../libpurple/protocols/oscar/oscar.c:3904 msgid "Unable to display the search results." msgstr "無法顯示搜尋結果。" # FIXME 這不像對，要覆查 - 20061028 -#: ../libpurple/protocols/gg/gg.c:1166 +#: ../libpurple/protocols/gg/gg.c:1171 msgid "Gadu-Gadu Public Directory" msgstr "Gadu-Gadu 公共字典" -#: ../libpurple/protocols/gg/gg.c:1167 +#: ../libpurple/protocols/gg/gg.c:1172 msgid "Search results" msgstr "搜尋結果" -#: ../libpurple/protocols/gg/gg.c:1210 +#: ../libpurple/protocols/gg/gg.c:1215 msgid "No matching users found" msgstr "找不到符合的使用者" -#: ../libpurple/protocols/gg/gg.c:1211 +#: ../libpurple/protocols/gg/gg.c:1216 msgid "There are no users matching your search criteria." msgstr "無法依照搜尋條件找到相符的使用者。" -#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458 +#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463 msgid "Unable to read socket" msgstr "無法讀取 Socket" -#: ../libpurple/protocols/gg/gg.c:1390 +#: ../libpurple/protocols/gg/gg.c:1395 msgid "Buddy list downloaded" msgstr "下載好友清單" -#: ../libpurple/protocols/gg/gg.c:1391 +#: ../libpurple/protocols/gg/gg.c:1396 msgid "Your buddy list was downloaded from the server." msgstr "您已從伺服器下載好友清單。" -#: ../libpurple/protocols/gg/gg.c:1398 +#: ../libpurple/protocols/gg/gg.c:1403 msgid "Buddy list uploaded" msgstr "上傳好友清單" -#: ../libpurple/protocols/gg/gg.c:1399 +#: ../libpurple/protocols/gg/gg.c:1404 msgid "Your buddy list was stored on the server." msgstr "您的好友清單已被存放於伺服器上。" -#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710 +#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715 msgid "Connection failed." msgstr "連線失敗。" -#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531 +#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559 msgid "Blocked" msgstr "封鎖" -#: ../libpurple/protocols/gg/gg.c:1639 +#: ../libpurple/protocols/gg/gg.c:1644 msgid "Add to chat" msgstr "新增到聊天室" -#: ../libpurple/protocols/gg/gg.c:1648 +#: ../libpurple/protocols/gg/gg.c:1653 msgid "Unblock" msgstr "解除封鎖" -#: ../libpurple/protocols/gg/gg.c:1652 +#: ../libpurple/protocols/gg/gg.c:1657 msgid "Block" msgstr "封鎖" -#: ../libpurple/protocols/gg/gg.c:1669 +#: ../libpurple/protocols/gg/gg.c:1674 msgid "Chat _name:" msgstr "聊天室名稱(_N)：" -#: ../libpurple/protocols/gg/gg.c:1909 +#: ../libpurple/protocols/gg/gg.c:1914 msgid "Chat error" msgstr "聊天錯誤" -#: ../libpurple/protocols/gg/gg.c:1910 +#: ../libpurple/protocols/gg/gg.c:1915 msgid "This chat name is already in use" msgstr "聊天室名稱正在使用中" -#: ../libpurple/protocols/gg/gg.c:1993 +#: ../libpurple/protocols/gg/gg.c:1998 msgid "Not connected to the server." msgstr "尚未連線到伺服器。" -#: ../libpurple/protocols/gg/gg.c:2016 +#: ../libpurple/protocols/gg/gg.c:2021 msgid "Find buddies..." msgstr "尋找好友..." -#: ../libpurple/protocols/gg/gg.c:2022 +#: ../libpurple/protocols/gg/gg.c:2027 msgid "Change password..." msgstr "修改密碼..." -#: ../libpurple/protocols/gg/gg.c:2028 +#: ../libpurple/protocols/gg/gg.c:2033 msgid "Upload buddylist to Server" msgstr "上傳好友清單到伺服器" -#: ../libpurple/protocols/gg/gg.c:2032 +#: ../libpurple/protocols/gg/gg.c:2037 msgid "Download buddylist from Server" msgstr "自伺服器下載好友清單" -#: ../libpurple/protocols/gg/gg.c:2036 +#: ../libpurple/protocols/gg/gg.c:2041 msgid "Delete buddylist from Server" msgstr "將伺服器上的好友清單刪除" -#: ../libpurple/protocols/gg/gg.c:2040 +#: ../libpurple/protocols/gg/gg.c:2045 msgid "Save buddylist to file..." msgstr "儲存好友清單到檔案中..." -#: ../libpurple/protocols/gg/gg.c:2044 +#: ../libpurple/protocols/gg/gg.c:2049 msgid "Load buddylist from file..." msgstr "自檔案讀取好友清單..." @@ -3549,16 +4077,16 @@ #. id #. name #. version -#: ../libpurple/protocols/gg/gg.c:2148 +#: ../libpurple/protocols/gg/gg.c:2153 msgid "Gadu-Gadu Protocol Plugin" msgstr "Gadu-Gadu 協定模組" #. summary -#: ../libpurple/protocols/gg/gg.c:2149 +#: ../libpurple/protocols/gg/gg.c:2154 msgid "Polish popular IM" msgstr "波蘭廣受歡迎的即時通訊程式" -#: ../libpurple/protocols/gg/gg.c:2203 +#: ../libpurple/protocols/gg/gg.c:2208 msgid "Gadu-Gadu User" msgstr "Gadu-Gadu 使用者" @@ -3615,7 +4143,8 @@ msgstr "%s 的是日訊息" #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165 -#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639 +#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637 +#: ../libpurple/protocols/myspace/myspace.c:2350 msgid "Server has disconnected" msgstr "伺服器已停止連線" @@ -3629,7 +4158,7 @@ msgstr "頻道(_C)：" #: ../libpurple/protocols/irc/irc.c:267 -#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526 +#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524 msgid "_Password:" msgstr "密碼(_P)：" @@ -3637,71 +4166,64 @@ msgid "IRC nicks may not contain whitespace" msgstr "IRC 暱稱不可含有空白字元" +#. 1. connect to server #. connect to the server #: ../libpurple/protocols/irc/irc.c:319 -#: ../libpurple/protocols/jabber/jabber.c:1046 +#: ../libpurple/protocols/jabber/jabber.c:1276 #: ../libpurple/protocols/msn/session.c:345 +#: ../libpurple/protocols/myspace/myspace.c:301 #: ../libpurple/protocols/novell/novell.c:2182 -#: ../libpurple/protocols/oscar/oscar.c:1288 +#: ../libpurple/protocols/oscar/oscar.c:1285 #: ../libpurple/protocols/qq/qq.c:136 #: ../libpurple/protocols/sametime/sametime.c:3723 -#: ../libpurple/protocols/simple/simple.c:1671 -#: ../libpurple/protocols/yahoo/yahoo.c:2762 +#: ../libpurple/protocols/simple/simple.c:1677 +#: ../libpurple/protocols/yahoo/yahoo.c:2936 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661 msgid "Connecting" msgstr "連線中" # XXX 暫譯 #: ../libpurple/protocols/irc/irc.c:327 -#: ../libpurple/protocols/jabber/jabber.c:603 -#: ../libpurple/protocols/jabber/jabber.c:950 +#: ../libpurple/protocols/jabber/jabber.c:611 +#: ../libpurple/protocols/jabber/jabber.c:1096 msgid "SSL support unavailable" msgstr "沒有 SSL 支援" +#. TODO: try other ports if in auto mode, then save +#. * working port and try that first next time. #: ../libpurple/protocols/irc/irc.c:338 +#: ../libpurple/protocols/myspace/myspace.c:317 #: ../libpurple/protocols/simple/simple.c:464 -#: ../libpurple/protocols/simple/simple.c:1586 +#: ../libpurple/protocols/simple/simple.c:1592 msgid "Couldn't create socket" msgstr "無法建立 Socket" -#: ../libpurple/protocols/irc/irc.c:416 -#: ../libpurple/protocols/oscar/oscar.c:1284 +#: ../libpurple/protocols/irc/irc.c:421 +#: ../libpurple/protocols/myspace/myspace.c:2463 +#: ../libpurple/protocols/oscar/oscar.c:1281 msgid "Couldn't connect to host" msgstr "無法連到伺服器" -# FIXME ambiguous - 20061025 -# NOTE Jabber 協定 Stream Error 的一種，即 -# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html -# XXX 真正的意思是「無法連線至認證所需的遠端資源」，不是「連線失敗」（見上列文章） -#: ../libpurple/protocols/irc/irc.c:438 -#: ../libpurple/protocols/jabber/jabber.c:499 -msgid "Connection Failed" -msgstr "無法連線至認證所需的遠端資源" - -#: ../libpurple/protocols/irc/irc.c:441 -#: ../libpurple/protocols/jabber/jabber.c:502 -msgid "SSL Handshake Failed" -msgstr "SSL 交談失敗" - # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西 -#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636 +#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634 +#: ../libpurple/protocols/myspace/myspace.c:2346 msgid "Read error" msgstr "讀取錯誤" -#: ../libpurple/protocols/irc/irc.c:775 +#: ../libpurple/protocols/irc/irc.c:773 #: ../libpurple/protocols/silc/chat.c:1412 #: ../libpurple/protocols/silc10/chat.c:1426 -#: ../libpurple/protocols/yahoo/yahoochat.c:1401 +#: ../libpurple/protocols/yahoo/yahoochat.c:1497 msgid "Users" msgstr "使用者" -#: ../libpurple/protocols/irc/irc.c:778 +#: ../libpurple/protocols/irc/irc.c:776 #: ../libpurple/protocols/sametime/sametime.c:3374 #: ../libpurple/protocols/silc/chat.c:1415 #: ../libpurple/protocols/silc/ops.c:1389 #: ../libpurple/protocols/silc10/chat.c:1429 #: ../libpurple/protocols/silc10/ops.c:1382 -#: ../libpurple/protocols/yahoo/yahoochat.c:1410 +#: ../libpurple/protocols/yahoo/yahoochat.c:1506 msgid "Topic" msgstr "主題" @@ -3713,34 +4235,34 @@ #. *< id #. *< name #. *< version -#: ../libpurple/protocols/irc/irc.c:916 +#: ../libpurple/protocols/irc/irc.c:914 msgid "IRC Protocol Plugin" msgstr "IRC 協定模組" #. * summary -#: ../libpurple/protocols/irc/irc.c:917 +#: ../libpurple/protocols/irc/irc.c:915 msgid "The IRC Protocol Plugin that Sucks Less" msgstr "較好的 IRC 協定模組" #. host to connect to -#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323 -#: ../libpurple/protocols/msn/msn.c:2154 -#: ../libpurple/protocols/oscar/oscar.c:6650 -#: ../libpurple/protocols/qq/qq.c:756 +#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323 +#: ../libpurple/protocols/msn/msn.c:2182 +#: ../libpurple/protocols/oscar/oscar.c:6655 +#: ../libpurple/protocols/qq/qq.c:755 #: ../libpurple/protocols/sametime/sametime.c:5727 #: ../libpurple/protocols/silc/ops.c:1249 #: ../libpurple/protocols/silc/ops.c:1341 #: ../libpurple/protocols/silc10/ops.c:1244 #: ../libpurple/protocols/silc10/ops.c:1347 -#: ../libpurple/protocols/simple/simple.c:1850 +#: ../libpurple/protocols/simple/simple.c:1856 #: ../libpurple/protocols/toc/toc.c:2327 msgid "Server" msgstr "伺服器" #. port to connect to -#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159 -#: ../libpurple/protocols/oscar/oscar.c:6653 -#: ../libpurple/protocols/qq/qq.c:759 +#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2187 +#: ../libpurple/protocols/oscar/oscar.c:6658 +#: ../libpurple/protocols/qq/qq.c:758 #: ../libpurple/protocols/sametime/sametime.c:5732 #: ../libpurple/protocols/silc/silc.c:1918 #: ../libpurple/protocols/silc10/silc.c:1861 @@ -3748,12 +4270,13 @@ msgid "Port" msgstr "通訊埠" -#: ../libpurple/protocols/irc/irc.c:948 +#: ../libpurple/protocols/irc/irc.c:946 msgid "Encodings" msgstr "編碼" -#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316 -#: ../libpurple/protocols/jabber/jabber.c:803 +#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316 +#: ../libpurple/protocols/jabber/jabber.c:905 +#: ../libpurple/protocols/jabber/jabber.c:908 #: ../libpurple/protocols/silc/buddy.c:1539 #: ../libpurple/protocols/silc/ops.c:1197 #: ../libpurple/protocols/silc/ops.c:1200 @@ -3769,7 +4292,7 @@ msgid "Username" msgstr "使用者" -#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317 +#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317 #: ../libpurple/protocols/silc/silc.c:1009 #: ../libpurple/protocols/silc10/silc.c:920 msgid "Real name" @@ -3779,7 +4302,7 @@ #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT); #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); #. -#: ../libpurple/protocols/irc/irc.c:962 +#: ../libpurple/protocols/irc/irc.c:960 msgid "Use SSL" msgstr "使用 SSL" @@ -3813,7 +4336,7 @@ msgstr " (已驗證)" #: ../libpurple/protocols/irc/msgs.c:303 -#: ../libpurple/protocols/oscar/oscar.c:3714 +#: ../libpurple/protocols/oscar/oscar.c:3693 #: ../libpurple/protocols/silc/ops.c:1418 #: ../libpurple/protocols/silc10/ops.c:1414 msgid "Nick" @@ -4093,7 +4616,7 @@ msgstr "names [頻道]：列出目前在頻道中的使用者清單。" #: ../libpurple/protocols/irc/parse.c:137 -#: ../libpurple/protocols/jabber/jabber.c:1813 +#: ../libpurple/protocols/jabber/jabber.c:2254 msgid "nick <new nickname>: Change your nickname." msgstr "nick <新暱稱>：改變您的暱稱。" @@ -4222,6 +4745,22 @@ msgid "Disconnected." msgstr "停止連線。" +#: ../libpurple/protocols/jabber/adhoccommands.c:138 +#: ../libpurple/protocols/jabber/jabber.c:672 +#: ../libpurple/protocols/jabber/jabber.c:702 +#: ../libpurple/protocols/jabber/jabber.c:1883 +msgid "Unknown Error" +msgstr "未知錯誤" + +#: ../libpurple/protocols/jabber/adhoccommands.c:140 +#: ../libpurple/protocols/jabber/adhoccommands.c:141 +msgid "Ad-Hoc Command Failed" +msgstr "" + +#: ../libpurple/protocols/jabber/adhoccommands.c:174 +msgid "execute" +msgstr "" + #: ../libpurple/protocols/jabber/auth.c:52 msgid "Server requires TLS/SSL for login. No TLS/SSL support found." msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。" @@ -4230,248 +4769,520 @@ msgid "Server requires plaintext authentication over an unencrypted stream" msgstr "伺服器需要經由未經加密的串流進行明文認證" -#: ../libpurple/protocols/jabber/auth.c:294 -#: ../libpurple/protocols/jabber/auth.c:483 +#: ../libpurple/protocols/jabber/auth.c:317 +#: ../libpurple/protocols/jabber/auth.c:506 #, c-format msgid "" "%s requires plaintext authentication over an unencrypted connection. Allow " "this and continue authentication?" msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續進行認證？" -#: ../libpurple/protocols/jabber/auth.c:296 -#: ../libpurple/protocols/jabber/auth.c:297 -#: ../libpurple/protocols/jabber/auth.c:485 -#: ../libpurple/protocols/jabber/auth.c:486 -#: ../libpurple/protocols/jabber/auth.c:570 -#: ../libpurple/protocols/jabber/auth.c:571 +#: ../libpurple/protocols/jabber/auth.c:319 +#: ../libpurple/protocols/jabber/auth.c:320 +#: ../libpurple/protocols/jabber/auth.c:508 +#: ../libpurple/protocols/jabber/auth.c:509 +#: ../libpurple/protocols/jabber/auth.c:593 +#: ../libpurple/protocols/jabber/auth.c:594 msgid "Plaintext Authentication" msgstr "明文認證" -#: ../libpurple/protocols/jabber/auth.c:309 -#: ../libpurple/protocols/jabber/auth.c:498 -#: ../libpurple/protocols/jabber/auth.c:582 +#: ../libpurple/protocols/jabber/auth.c:332 +#: ../libpurple/protocols/jabber/auth.c:521 +#: ../libpurple/protocols/jabber/auth.c:605 msgid "Server does not use any supported authentication method" msgstr "伺服器並不提供任何一種被支援的認證方式" #. This should never happen! -#: ../libpurple/protocols/jabber/auth.c:437 -#: ../libpurple/protocols/jabber/auth.c:533 -#: ../libpurple/protocols/jabber/auth.c:748 -#: ../libpurple/protocols/jabber/auth.c:889 -#: ../libpurple/protocols/jabber/auth.c:914 -#: ../libpurple/protocols/jabber/auth.c:933 -#: ../libpurple/protocols/jabber/jabber.c:115 +#: ../libpurple/protocols/jabber/auth.c:460 +#: ../libpurple/protocols/jabber/auth.c:556 +#: ../libpurple/protocols/jabber/auth.c:771 +#: ../libpurple/protocols/jabber/auth.c:912 +#: ../libpurple/protocols/jabber/auth.c:937 +#: ../libpurple/protocols/jabber/auth.c:956 +#: ../libpurple/protocols/jabber/jabber.c:125 msgid "Invalid response from server." msgstr "伺服器送來了無效的回應。" -#: ../libpurple/protocols/jabber/auth.c:572 +#: ../libpurple/protocols/jabber/auth.c:595 msgid "" "This server requires plaintext authentication over an unencrypted " "connection. Allow this and continue authentication?" msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證？" # XXX 好像有些怪，譯文有待改進 -#: ../libpurple/protocols/jabber/auth.c:769 #: ../libpurple/protocols/jabber/auth.c:792 +#: ../libpurple/protocols/jabber/auth.c:815 msgid "Invalid challenge from server" msgstr "伺服器送來了無效的驗證挑戰" # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西 -#: ../libpurple/protocols/jabber/auth.c:864 +#: ../libpurple/protocols/jabber/auth.c:887 msgid "SASL error" msgstr "SASL 錯誤" -#: ../libpurple/protocols/jabber/buddy.c:271 -#: ../libpurple/protocols/jabber/buddy.c:825 +#: ../libpurple/protocols/jabber/buddy.c:283 +#: ../libpurple/protocols/jabber/buddy.c:1219 #: ../libpurple/protocols/sametime/sametime.c:4128 #: ../libpurple/protocols/silc/ops.c:986 #: ../libpurple/protocols/silc10/ops.c:1020 msgid "Full Name" msgstr "全名" -#: ../libpurple/protocols/jabber/buddy.c:272 -#: ../libpurple/protocols/jabber/buddy.c:838 +#: ../libpurple/protocols/jabber/buddy.c:284 +#: ../libpurple/protocols/jabber/buddy.c:1231 #: ../libpurple/protocols/silc/ops.c:998 #: ../libpurple/protocols/silc10/ops.c:1032 msgid "Family Name" msgstr "姓" -#: ../libpurple/protocols/jabber/buddy.c:273 -#: ../libpurple/protocols/jabber/buddy.c:842 +#: ../libpurple/protocols/jabber/buddy.c:285 +#: ../libpurple/protocols/jabber/buddy.c:1234 msgid "Given Name" msgstr "名" -#: ../libpurple/protocols/jabber/buddy.c:275 -#: ../libpurple/protocols/jabber/jabber.c:863 +#: ../libpurple/protocols/jabber/buddy.c:287 +#: ../libpurple/protocols/jabber/jabber.c:978 msgid "URL" msgstr "URL" -#: ../libpurple/protocols/jabber/buddy.c:276 -#: ../libpurple/protocols/jabber/buddy.c:894 +#: ../libpurple/protocols/jabber/buddy.c:288 +#: ../libpurple/protocols/jabber/buddy.c:1282 msgid "Street Address" msgstr "街道地址" -#: ../libpurple/protocols/jabber/buddy.c:277 -#: ../libpurple/protocols/jabber/buddy.c:890 +#: ../libpurple/protocols/jabber/buddy.c:289 +#: ../libpurple/protocols/jabber/buddy.c:1279 msgid "Extended Address" msgstr "地址(續)" -#: ../libpurple/protocols/jabber/buddy.c:278 -#: ../libpurple/protocols/jabber/buddy.c:898 +#: ../libpurple/protocols/jabber/buddy.c:290 +#: ../libpurple/protocols/jabber/buddy.c:1285 msgid "Locality" msgstr "市／村" -#: ../libpurple/protocols/jabber/buddy.c:279 -#: ../libpurple/protocols/jabber/buddy.c:902 +#: ../libpurple/protocols/jabber/buddy.c:291 +#: ../libpurple/protocols/jabber/buddy.c:1288 msgid "Region" msgstr "省／州" -#: ../libpurple/protocols/jabber/buddy.c:280 -#: ../libpurple/protocols/jabber/buddy.c:906 +#: ../libpurple/protocols/jabber/buddy.c:292 +#: ../libpurple/protocols/jabber/buddy.c:1291 msgid "Postal Code" msgstr "郵遞區號" -#: ../libpurple/protocols/jabber/buddy.c:281 -#: ../libpurple/protocols/jabber/buddy.c:911 +#: ../libpurple/protocols/jabber/buddy.c:293 +#: ../libpurple/protocols/jabber/buddy.c:1295 #: ../libpurple/protocols/silc/silc.c:1015 #: ../libpurple/protocols/silc10/silc.c:926 msgid "Country" msgstr "國家" -#: ../libpurple/protocols/jabber/buddy.c:282 -#: ../libpurple/protocols/jabber/buddy.c:922 -#: ../libpurple/protocols/jabber/buddy.c:929 +#: ../libpurple/protocols/jabber/buddy.c:294 +#: ../libpurple/protocols/jabber/buddy.c:1306 +#: ../libpurple/protocols/jabber/buddy.c:1313 msgid "Telephone" msgstr "電話" -#: ../libpurple/protocols/jabber/buddy.c:283 -#: ../libpurple/protocols/jabber/buddy.c:940 -#: ../libpurple/protocols/jabber/buddy.c:948 -#: ../libpurple/protocols/jabber/buddy.c:1629 -#: ../libpurple/protocols/silc/ops.c:1041 -#: ../libpurple/protocols/silc/util.c:555 -#: ../libpurple/protocols/silc10/ops.c:1075 -#: ../libpurple/protocols/silc10/util.c:551 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037 -msgid "E-Mail" -msgstr "電子郵件" - -#: ../libpurple/protocols/jabber/buddy.c:284 -#: ../libpurple/protocols/jabber/buddy.c:963 +#: ../libpurple/protocols/jabber/buddy.c:296 +#: ../libpurple/protocols/jabber/buddy.c:1350 msgid "Organization Name" msgstr "所屬機構" -#: ../libpurple/protocols/jabber/buddy.c:285 -#: ../libpurple/protocols/jabber/buddy.c:967 +#: ../libpurple/protocols/jabber/buddy.c:297 +#: ../libpurple/protocols/jabber/buddy.c:1353 msgid "Organization Unit" msgstr "所屬部門" -#: ../libpurple/protocols/jabber/buddy.c:287 -#: ../libpurple/protocols/jabber/buddy.c:976 +#: ../libpurple/protocols/jabber/buddy.c:299 +#: ../libpurple/protocols/jabber/buddy.c:1362 msgid "Role" msgstr "職責" -#: ../libpurple/protocols/jabber/buddy.c:288 -#: ../libpurple/protocols/jabber/buddy.c:859 -#: ../libpurple/protocols/msn/msn.c:1627 -#: ../libpurple/protocols/oscar/oscar.c:3763 +#: ../libpurple/protocols/jabber/buddy.c:300 +#: ../libpurple/protocols/jabber/buddy.c:1250 +#: ../libpurple/protocols/msn/msn.c:1655 +#: ../libpurple/protocols/oscar/oscar.c:3742 msgid "Birthday" msgstr "生日" -#: ../libpurple/protocols/jabber/buddy.c:289 -#: ../libpurple/protocols/jabber/buddy.c:979 -#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081 +#: ../libpurple/protocols/jabber/buddy.c:301 +#: ../libpurple/protocols/jabber/buddy.c:1365 +#: ../libpurple/protocols/jabber/chat.c:775 +#: ../libpurple/protocols/jabber/usermood.c:176 ../pidgin/gtkblist.c:3113 #: ../pidgin/gtkprefs.c:738 msgid "Description" msgstr "描述" -#: ../libpurple/protocols/jabber/buddy.c:582 -#: ../libpurple/protocols/jabber/buddy.c:583 +#: ../libpurple/protocols/jabber/buddy.c:722 +#: ../libpurple/protocols/jabber/buddy.c:723 msgid "Edit XMPP vCard" msgstr "編輯 XMPP vCard" -#: ../libpurple/protocols/jabber/buddy.c:584 +#: ../libpurple/protocols/jabber/buddy.c:724 msgid "" "All items below are optional. Enter only the information with which you feel " "comfortable." msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。" # NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：gaim） -#: ../libpurple/protocols/jabber/buddy.c:655 -#: ../libpurple/protocols/jabber/buddy.c:696 +#: ../libpurple/protocols/jabber/buddy.c:795 +#: ../libpurple/protocols/jabber/buddy.c:960 msgid "Client" msgstr "用戶端" -#: ../libpurple/protocols/jabber/buddy.c:659 -#: ../libpurple/protocols/jabber/buddy.c:700 +#: ../libpurple/protocols/jabber/buddy.c:799 +#: ../libpurple/protocols/jabber/buddy.c:964 msgid "Operating System" msgstr "作業系統" +#: ../libpurple/protocols/jabber/buddy.c:815 +#: ../libpurple/protocols/jabber/buddy.c:975 +msgid "Last Activity" +msgstr "" + +#: ../libpurple/protocols/jabber/buddy.c:817 +#: ../libpurple/protocols/jabber/buddy.c:977 +msgid "Service Discovery Info" +msgstr "服務探尋資訊" + +#: ../libpurple/protocols/jabber/buddy.c:819 +#: ../libpurple/protocols/jabber/buddy.c:979 +msgid "Service Discovery Items" +msgstr "" + +#: ../libpurple/protocols/jabber/buddy.c:821 +#: ../libpurple/protocols/jabber/buddy.c:981 +#, fuzzy +msgid "Extended Stanza Addressing" +msgstr "地址(續)" + +#: ../libpurple/protocols/jabber/buddy.c:823 +#: ../libpurple/protocols/jabber/buddy.c:983 +msgid "Multi-User Chat" +msgstr "" + +#: ../libpurple/protocols/jabber/buddy.c:825 +#: ../libpurple/protocols/jabber/buddy.c:985 +#, fuzzy +msgid "Multi-User Chat Extended Presence Information" +msgstr "這個使用者沒有他的相關資訊。" + +# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm +#: ../libpurple/protocols/jabber/buddy.c:827 +#: ../libpurple/protocols/jabber/buddy.c:987 +msgid "In-Band Bytestreams" +msgstr "帶內位元組串流" + +#: ../libpurple/protocols/jabber/buddy.c:829 +#: ../libpurple/protocols/jabber/buddy.c:989 +#, fuzzy +msgid "Ad-Hoc Commands" +msgstr "指令" + +#: ../libpurple/protocols/jabber/buddy.c:831 +#: ../libpurple/protocols/jabber/buddy.c:991 +msgid "PubSub Service" +msgstr "PubSub 服務" + +#: ../libpurple/protocols/jabber/buddy.c:833 +#: ../libpurple/protocols/jabber/buddy.c:993 +msgid "SOCKS5 Bytestreams" +msgstr "SOCKS5 位元組串流" + +#: ../libpurple/protocols/jabber/buddy.c:835 +#: ../libpurple/protocols/jabber/buddy.c:995 +msgid "Out of Band Data" +msgstr "帶外數據" + +# NOTE Untranslated +#: ../libpurple/protocols/jabber/buddy.c:837 +#: ../libpurple/protocols/jabber/buddy.c:997 +msgid "XHTML-IM" +msgstr "XHTML-IM" + +#: ../libpurple/protocols/jabber/buddy.c:839 +#: ../libpurple/protocols/jabber/buddy.c:999 +#, fuzzy +msgid "In-Band Registration" +msgstr "註冊錯誤" + +#: ../libpurple/protocols/jabber/buddy.c:841 +#: ../libpurple/protocols/jabber/buddy.c:1001 +msgid "User Location" +msgstr "使用者所在位置" + +#: ../libpurple/protocols/jabber/buddy.c:843 +#: ../libpurple/protocols/jabber/buddy.c:1003 +msgid "User Avatar" +msgstr "使用者化身" + +#: ../libpurple/protocols/jabber/buddy.c:845 +#: ../libpurple/protocols/jabber/buddy.c:1005 +#, fuzzy +msgid "Chat State Notifications" +msgstr "好友狀態通知" + +# NOTE Jabber 協定中 Stream Error 的一種，即 +# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html +#: ../libpurple/protocols/jabber/buddy.c:847 +#: ../libpurple/protocols/jabber/buddy.c:1007 +msgid "Software Version" +msgstr "軟體版本" + +#: ../libpurple/protocols/jabber/buddy.c:849 +#: ../libpurple/protocols/jabber/buddy.c:1009 +msgid "Stream Initiation" +msgstr "開始串流" + +#: ../libpurple/protocols/jabber/buddy.c:851 +#: ../libpurple/protocols/jabber/buddy.c:1011 +#: ../libpurple/protocols/sametime/sametime.c:3235 +msgid "File Transfer" +msgstr "檔案傳輸" + +#: ../libpurple/protocols/jabber/buddy.c:853 +#: ../libpurple/protocols/jabber/buddy.c:1013 +msgid "User Mood" +msgstr "使用者情緒" + +# XXX may be wrong +#: ../libpurple/protocols/jabber/buddy.c:855 +#: ../libpurple/protocols/jabber/buddy.c:1015 +#, fuzzy +msgid "User Activity" +msgstr "使用者數目上限" + +#: ../libpurple/protocols/jabber/buddy.c:857 +#: ../libpurple/protocols/jabber/buddy.c:1017 +#, fuzzy +msgid "Entity Capabilities" +msgstr "相容性" + +# FIXME 這聽來不對 - acli 20070913 +#: ../libpurple/protocols/jabber/buddy.c:859 +#: ../libpurple/protocols/jabber/buddy.c:1019 +msgid "Encrypted Session Negotiations" +msgstr "加密工作階段協商" + +#: ../libpurple/protocols/jabber/buddy.c:861 +#: ../libpurple/protocols/jabber/buddy.c:1021 +#, fuzzy +msgid "User Tune" +msgstr "使用者" + +#: ../libpurple/protocols/jabber/buddy.c:863 +#: ../libpurple/protocols/jabber/buddy.c:1023 +#, fuzzy +msgid "Roster Item Exchange" +msgstr "要交換密鑰之即時訊息" + +#: ../libpurple/protocols/jabber/buddy.c:865 +#: ../libpurple/protocols/jabber/buddy.c:1025 +#, fuzzy +msgid "Reachability Address" +msgstr "電子郵件" + +#: ../libpurple/protocols/jabber/buddy.c:867 +#: ../libpurple/protocols/jabber/buddy.c:1027 +msgid "User Profile" +msgstr "使用者資料" + +#: ../libpurple/protocols/jabber/buddy.c:869 +#: ../libpurple/protocols/jabber/buddy.c:1029 +msgid "Jingle" +msgstr "Jingle" + +#: ../libpurple/protocols/jabber/buddy.c:871 +#: ../libpurple/protocols/jabber/buddy.c:1031 +msgid "Jingle Audio" +msgstr "Jingle 音訊" + +#: ../libpurple/protocols/jabber/buddy.c:873 +#: ../libpurple/protocols/jabber/buddy.c:1033 +msgid "User Nickname" +msgstr "使用者暱稱" + +#: ../libpurple/protocols/jabber/buddy.c:875 +#: ../libpurple/protocols/jabber/buddy.c:1035 +msgid "Jingle ICE UDP" +msgstr "Jingle ICE UDP" + +#: ../libpurple/protocols/jabber/buddy.c:877 +#: ../libpurple/protocols/jabber/buddy.c:1037 +msgid "Jingle ICE TCP" +msgstr "Jingle ICE TCP" + +#: ../libpurple/protocols/jabber/buddy.c:879 +#: ../libpurple/protocols/jabber/buddy.c:1039 +msgid "Jingle Raw UDP" +msgstr "" + +#: ../libpurple/protocols/jabber/buddy.c:881 +#: ../libpurple/protocols/jabber/buddy.c:1041 +msgid "Jingle Video" +msgstr "Jingle 視訊" + +#: ../libpurple/protocols/jabber/buddy.c:883 +#: ../libpurple/protocols/jabber/buddy.c:1043 +msgid "Jingle DTMF" +msgstr "Jingle DTMF" + +#: ../libpurple/protocols/jabber/buddy.c:885 +#: ../libpurple/protocols/jabber/buddy.c:1045 +msgid "Message Receipts" +msgstr "收到的訊息" + +#: ../libpurple/protocols/jabber/buddy.c:887 +#: ../libpurple/protocols/jabber/buddy.c:1047 +msgid "Public Key Publishing" +msgstr "發佈公鑰" + +# NOTE Jabber 新功能規格 +#: ../libpurple/protocols/jabber/buddy.c:889 +#: ../libpurple/protocols/jabber/buddy.c:1049 +msgid "User Chatting" +msgstr "" + +#: ../libpurple/protocols/jabber/buddy.c:891 +#: ../libpurple/protocols/jabber/buddy.c:1051 +msgid "User Browsing" +msgstr "使用者瀏覽" + +# NOTE Jabber 新功能規格 +#: ../libpurple/protocols/jabber/buddy.c:893 +#: ../libpurple/protocols/jabber/buddy.c:1053 +msgid "User Gaming" +msgstr "" + +# NOTE Jabber 新功能規格 +#: ../libpurple/protocols/jabber/buddy.c:895 +#: ../libpurple/protocols/jabber/buddy.c:1055 +msgid "User Viewing" +msgstr "" + +#: ../libpurple/protocols/jabber/buddy.c:897 +#: ../libpurple/protocols/jabber/buddy.c:1057 +#: ../libpurple/protocols/silc/ops.c:1596 +#: ../libpurple/protocols/silc/ops.c:1601 +#: ../libpurple/protocols/silc10/ops.c:1612 +#: ../libpurple/protocols/silc10/ops.c:1617 +msgid "Ping" +msgstr "Ping" + +#: ../libpurple/protocols/jabber/buddy.c:899 +#: ../libpurple/protocols/jabber/buddy.c:1059 +#, fuzzy +msgid "Stanza Encryption" +msgstr "Trillian 加密" + +#: ../libpurple/protocols/jabber/buddy.c:901 +#: ../libpurple/protocols/jabber/buddy.c:1061 +msgid "Entity Time" +msgstr "" + +# XXX 暫譯- acli 20070913 +#: ../libpurple/protocols/jabber/buddy.c:903 +#: ../libpurple/protocols/jabber/buddy.c:1063 +msgid "Delayed Delivery" +msgstr "延遲送出" + +#: ../libpurple/protocols/jabber/buddy.c:905 +#: ../libpurple/protocols/jabber/buddy.c:1065 +msgid "Collaborative Data Objects" +msgstr "" + +#: ../libpurple/protocols/jabber/buddy.c:907 +#: ../libpurple/protocols/jabber/buddy.c:1067 +msgid "File Repository and Sharing" +msgstr "" + +#: ../libpurple/protocols/jabber/buddy.c:909 +#: ../libpurple/protocols/jabber/buddy.c:1069 +msgid "STUN Service Discovery for Jingle" +msgstr "Jingle 用的 STUN 服務偵測" + +# FIXME 這聽來不對 +#: ../libpurple/protocols/jabber/buddy.c:911 +#: ../libpurple/protocols/jabber/buddy.c:1071 +msgid "Simplified Encrypted Session Negotiation" +msgstr "簡化加密工作階段協商" + +#: ../libpurple/protocols/jabber/buddy.c:913 +#: ../libpurple/protocols/jabber/buddy.c:1073 +msgid "Hop Check" +msgstr "" + +#: ../libpurple/protocols/jabber/buddy.c:921 +#: ../libpurple/protocols/jabber/buddy.c:1081 +#: ../libpurple/protocols/oscar/oscar.c:2899 +msgid "Capabilities" +msgstr "相容性" + # TODO Untranslated # NOTE 譯文刪除 by Ambrose # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串， # NOTE 用以表示在多處地方同時登入了的情形下，目前的實在位置 # NOTE 見 http://www.jabber.org/user/userguide.html -#: ../libpurple/protocols/jabber/buddy.c:669 -#: ../libpurple/protocols/jabber/libxmpp.c:202 -#: ../libpurple/protocols/jabber/si.c:853 +#: ../libpurple/protocols/jabber/buddy.c:933 +#: ../libpurple/protocols/jabber/libxmpp.c:205 +#: ../libpurple/protocols/jabber/si.c:859 msgid "Resource" msgstr "" -#: ../libpurple/protocols/jabber/buddy.c:671 -#: ../libpurple/protocols/jabber/jabber.c:1243 -#: ../libpurple/protocols/jabber/jabber.c:1253 -#: ../libpurple/protocols/jabber/jabber.c:1263 -#: ../libpurple/protocols/jabber/jabber.c:1273 -#: ../libpurple/protocols/jabber/jabber.c:1283 +#: ../libpurple/protocols/jabber/buddy.c:935 +#: ../libpurple/protocols/jabber/jabber.c:1527 +#: ../libpurple/protocols/jabber/jabber.c:1550 +#: ../libpurple/protocols/jabber/jabber.c:1573 +#: ../libpurple/protocols/jabber/jabber.c:1596 +#: ../libpurple/protocols/jabber/jabber.c:1619 msgid "Priority" msgstr "優先次序" # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同 -#: ../libpurple/protocols/jabber/buddy.c:846 +#: ../libpurple/protocols/jabber/buddy.c:1237 #: ../libpurple/protocols/silc/ops.c:994 #: ../libpurple/protocols/silc10/ops.c:1028 msgid "Middle Name" msgstr "英文別名" -#: ../libpurple/protocols/jabber/buddy.c:879 -#: ../libpurple/protocols/jabber/jabber.c:838 -#: ../libpurple/protocols/oscar/oscar.c:3802 -#: ../libpurple/protocols/oscar/oscar.c:3815 +#: ../libpurple/protocols/jabber/buddy.c:1270 +#: ../libpurple/protocols/jabber/jabber.c:953 +#: ../libpurple/protocols/oscar/oscar.c:3781 +#: ../libpurple/protocols/oscar/oscar.c:3794 #: ../libpurple/protocols/qq/buddy_info.c:56 #: ../libpurple/protocols/silc/ops.c:1030 #: ../libpurple/protocols/silc10/ops.c:1064 msgid "Address" msgstr "地址" -#: ../libpurple/protocols/jabber/buddy.c:886 +#: ../libpurple/protocols/jabber/buddy.c:1276 msgid "P.O. Box" msgstr "郵政信箱" -#: ../libpurple/protocols/jabber/buddy.c:1000 +#: ../libpurple/protocols/jabber/buddy.c:1386 msgid "Photo" msgstr "照片" # NOTE 見 http://www.jabber.org/jeps/jep-0054.html -#: ../libpurple/protocols/jabber/buddy.c:1000 +#: ../libpurple/protocols/jabber/buddy.c:1386 msgid "Logo" msgstr "標誌" -#: ../libpurple/protocols/jabber/buddy.c:1409 +#: ../libpurple/protocols/jabber/buddy.c:1940 msgid "Un-hide From" msgstr "現身給" -#: ../libpurple/protocols/jabber/buddy.c:1413 +#: ../libpurple/protocols/jabber/buddy.c:1944 msgid "Temporarily Hide From" msgstr "暫時隱身於" #. && NOT ME -#: ../libpurple/protocols/jabber/buddy.c:1421 +#: ../libpurple/protocols/jabber/buddy.c:1952 msgid "Cancel Presence Notification" msgstr "取消上線狀態通知" -#: ../libpurple/protocols/jabber/buddy.c:1428 +#: ../libpurple/protocols/jabber/buddy.c:1959 msgid "(Re-)Request authorization" msgstr "要求或重新要求認證" @@ -4480,43 +5291,51 @@ #. if(NOT ME) #. shouldn't this just happen automatically when the buddy is #. removed? -#: ../libpurple/protocols/jabber/buddy.c:1437 +#: ../libpurple/protocols/jabber/buddy.c:1968 msgid "Unsubscribe" msgstr "從好友名單中移除" -#: ../libpurple/protocols/jabber/buddy.c:1470 -#: ../libpurple/protocols/jabber/jabber.c:1252 +#: ../libpurple/protocols/jabber/buddy.c:1983 +msgid "Log In" +msgstr "登入" + +#: ../libpurple/protocols/jabber/buddy.c:1987 +msgid "Log Out" +msgstr "登出" + +#: ../libpurple/protocols/jabber/buddy.c:2033 +#: ../libpurple/protocols/jabber/jabber.c:1549 msgid "Chatty" msgstr "想聊天" -#: ../libpurple/protocols/jabber/buddy.c:1474 +#: ../libpurple/protocols/jabber/buddy.c:2037 msgid "Extended Away" msgstr "長時間離開" -#: ../libpurple/protocols/jabber/buddy.c:1476 -#: ../libpurple/protocols/jabber/jabber.c:1282 -#: ../libpurple/protocols/oscar/oscar.c:727 -#: ../libpurple/protocols/oscar/oscar.c:5787 +#: ../libpurple/protocols/jabber/buddy.c:2039 +#: ../libpurple/protocols/jabber/jabber.c:1618 +#: ../libpurple/protocols/oscar/oscar.c:726 +#: ../libpurple/protocols/oscar/oscar.c:5792 #: ../libpurple/protocols/sametime/sametime.c:3297 msgid "Do Not Disturb" msgstr "請勿打擾" -#: ../libpurple/protocols/jabber/buddy.c:1621 +#: ../libpurple/protocols/jabber/buddy.c:2184 msgid "JID" msgstr "JID" -#: ../libpurple/protocols/jabber/buddy.c:1625 -#: ../libpurple/protocols/jabber/buddy.c:1804 -#: ../libpurple/protocols/oscar/oscar.c:3725 +#: ../libpurple/protocols/jabber/buddy.c:2188 +#: ../libpurple/protocols/jabber/buddy.c:2367 +#: ../libpurple/protocols/oscar/oscar.c:3704 msgid "Last Name" msgstr "姓" -#: ../libpurple/protocols/jabber/buddy.c:1657 +#: ../libpurple/protocols/jabber/buddy.c:2220 msgid "The following are the results of your search" msgstr "以下為搜尋結果" #. current comment from Jabber User Directory users.jabber.org -#: ../libpurple/protocols/jabber/buddy.c:1732 +#: ../libpurple/protocols/jabber/buddy.c:2295 msgid "" "Find a contact by entering the search criteria in the given fields. Note: " "Each field supports wild card searches (%)" @@ -4524,44 +5343,44 @@ "請在適用欄位填寫搜尋條件，以便搜尋想找的聯絡人。注意：所有欄位均支援以萬用字" "元 (%) 搜尋" -#: ../libpurple/protocols/jabber/buddy.c:1752 +#: ../libpurple/protocols/jabber/buddy.c:2315 msgid "Directory Query Failed" msgstr "查詢目錄伺服器失敗" -#: ../libpurple/protocols/jabber/buddy.c:1753 +#: ../libpurple/protocols/jabber/buddy.c:2316 msgid "Could not query the directory server." msgstr "無法查詢目錄伺服器" #. Try to translate the message (see static message #. list in jabber_user_dir_comments[]) -#: ../libpurple/protocols/jabber/buddy.c:1787 +#: ../libpurple/protocols/jabber/buddy.c:2350 #, c-format msgid "Server Instructions: %s" msgstr "伺服器指令：%s" -#: ../libpurple/protocols/jabber/buddy.c:1794 +#: ../libpurple/protocols/jabber/buddy.c:2357 msgid "Fill in one or more fields to search for any matching XMPP users." msgstr "填入一個或多個欄位，以搜尋XMPP使用者。" -#: ../libpurple/protocols/jabber/buddy.c:1814 +#: ../libpurple/protocols/jabber/buddy.c:2377 #: ../libpurple/protocols/novell/novell.c:1488 -#: ../libpurple/protocols/oscar/oscar.c:3728 -#: ../libpurple/protocols/oscar/oscar.c:3737 +#: ../libpurple/protocols/oscar/oscar.c:3707 +#: ../libpurple/protocols/oscar/oscar.c:3716 msgid "E-Mail Address" msgstr "電子郵件" -#: ../libpurple/protocols/jabber/buddy.c:1823 -#: ../libpurple/protocols/jabber/buddy.c:1824 +#: ../libpurple/protocols/jabber/buddy.c:2386 +#: ../libpurple/protocols/jabber/buddy.c:2387 msgid "Search for XMPP users" msgstr "搜尋XMPP使用者" #. "Search" -#: ../libpurple/protocols/jabber/buddy.c:1825 +#: ../libpurple/protocols/jabber/buddy.c:2388 #: ../libpurple/protocols/qq/group.c:123 #: ../libpurple/protocols/qq/group_im.c:147 -#: ../libpurple/protocols/qq/sys_msg.c:176 -#: ../libpurple/protocols/qq/sys_msg.c:253 -#: ../libpurple/protocols/qq/sys_msg.c:271 +#: ../libpurple/protocols/qq/sys_msg.c:174 +#: ../libpurple/protocols/qq/sys_msg.c:250 +#: ../libpurple/protocols/qq/sys_msg.c:268 #: ../libpurple/protocols/sametime/sametime.c:5611 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356 @@ -4569,25 +5388,25 @@ msgstr "搜尋" # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西 -#: ../libpurple/protocols/jabber/buddy.c:1840 +#: ../libpurple/protocols/jabber/buddy.c:2403 msgid "Invalid Directory" msgstr "無效目錄" -#: ../libpurple/protocols/jabber/buddy.c:1857 +#: ../libpurple/protocols/jabber/buddy.c:2420 msgid "Enter a User Directory" msgstr "進入使用者目錄。" -#: ../libpurple/protocols/jabber/buddy.c:1858 +#: ../libpurple/protocols/jabber/buddy.c:2421 msgid "Select a user directory to search" msgstr "選擇一個使用者目錄以進行搜尋" -#: ../libpurple/protocols/jabber/buddy.c:1861 +#: ../libpurple/protocols/jabber/buddy.c:2424 msgid "Search Directory" msgstr "搜尋目錄" #: ../libpurple/protocols/jabber/chat.c:41 -#: ../libpurple/protocols/oscar/oscar.c:5273 -#: ../libpurple/protocols/yahoo/yahoochat.c:962 +#: ../libpurple/protocols/oscar/oscar.c:5278 +#: ../libpurple/protocols/yahoo/yahoochat.c:1048 msgid "_Room:" msgstr "聊天室(_R)：" @@ -4686,25 +5505,29 @@ msgstr "尋找聊天室" # XXX 譯文有待改進 -#: ../libpurple/protocols/jabber/jabber.c:84 +#: ../libpurple/protocols/jabber/jabber.c:94 msgid "Error initializing session" msgstr "對工作階段進行初始化時發生了錯誤" -#: ../libpurple/protocols/jabber/jabber.c:247 -#: ../libpurple/protocols/jabber/jabber.c:300 -#: ../libpurple/protocols/jabber/jabber.c:328 +#: ../libpurple/protocols/jabber/jabber.c:146 +msgid "You require encryption, but it is not available on this server." +msgstr "您指定必須加密，但這伺服器沒有加密功能。" + +#: ../libpurple/protocols/jabber/jabber.c:260 +#: ../libpurple/protocols/jabber/jabber.c:313 +#: ../libpurple/protocols/jabber/jabber.c:341 msgid "Write error" msgstr "寫入錯誤" -#: ../libpurple/protocols/jabber/jabber.c:396 -#: ../libpurple/protocols/jabber/jabber.c:433 +#: ../libpurple/protocols/jabber/jabber.c:409 +#: ../libpurple/protocols/jabber/jabber.c:446 msgid "Read Error" msgstr "讀取錯誤" -#: ../libpurple/protocols/jabber/jabber.c:467 -#: ../libpurple/protocols/oscar/flap_connection.c:386 -#: ../libpurple/protocols/yahoo/yahoo.c:2381 -#: ../libpurple/protocols/yahoo/yahoo.c:2413 +#: ../libpurple/protocols/jabber/jabber.c:483 +#: ../libpurple/protocols/oscar/flap_connection.c:394 +#: ../libpurple/protocols/yahoo/yahoo.c:2555 +#: ../libpurple/protocols/yahoo/yahoo.c:2587 #, c-format msgid "" "Could not establish a connection with the server:\n" @@ -4713,55 +5536,70 @@ "無法與伺服器建立連線:\n" "%s" -#: ../libpurple/protocols/jabber/jabber.c:523 +#: ../libpurple/protocols/jabber/jabber.c:530 msgid "Unable to create socket" msgstr "無法建立 Socket" -#: ../libpurple/protocols/jabber/jabber.c:568 -#: ../libpurple/protocols/jabber/jabber.c:918 +#: ../libpurple/protocols/jabber/jabber.c:576 +#: ../libpurple/protocols/jabber/jabber.c:1064 msgid "Invalid XMPP ID" msgstr "XMPP 帳號無效" -#: ../libpurple/protocols/jabber/jabber.c:573 +#: ../libpurple/protocols/jabber/jabber.c:581 msgid "Invalid XMPP ID. Domain must be set." msgstr "XMPP 帳號無效，域名是必須設定的。" -#: ../libpurple/protocols/jabber/jabber.c:644 +#: ../libpurple/protocols/jabber/jabber.c:657 #, c-format msgid "Registration of %s@%s successful" msgstr "成功註冊 %s@%s" -#: ../libpurple/protocols/jabber/jabber.c:646 -#: ../libpurple/protocols/jabber/jabber.c:647 +#: ../libpurple/protocols/jabber/jabber.c:663 +#, c-format +msgid "Registration to %s successful" +msgstr "成功註冊 %s" + +#: ../libpurple/protocols/jabber/jabber.c:665 +#: ../libpurple/protocols/jabber/jabber.c:666 msgid "Registration Successful" msgstr "註冊成功" -#: ../libpurple/protocols/jabber/jabber.c:653 -#: ../libpurple/protocols/jabber/jabber.c:1524 -msgid "Unknown Error" -msgstr "未知錯誤" - -#: ../libpurple/protocols/jabber/jabber.c:655 -#: ../libpurple/protocols/jabber/jabber.c:656 +#: ../libpurple/protocols/jabber/jabber.c:674 +#: ../libpurple/protocols/jabber/jabber.c:675 msgid "Registration Failed" msgstr "註冊失敗" -#: ../libpurple/protocols/jabber/jabber.c:771 -#: ../libpurple/protocols/jabber/jabber.c:772 +#: ../libpurple/protocols/jabber/jabber.c:693 +#, c-format +msgid "Registration from %s successfully removed" +msgstr "成功移除 %s 的註冊" + +#: ../libpurple/protocols/jabber/jabber.c:695 +#: ../libpurple/protocols/jabber/jabber.c:696 +msgid "Unregistration Successful" +msgstr "移除註冊成功" + +#: ../libpurple/protocols/jabber/jabber.c:704 +#: ../libpurple/protocols/jabber/jabber.c:705 +msgid "Unregistration Failed" +msgstr "移除註冊失敗" + +#: ../libpurple/protocols/jabber/jabber.c:865 +#: ../libpurple/protocols/jabber/jabber.c:866 msgid "Already Registered" msgstr "已經註冊" -#: ../libpurple/protocols/jabber/jabber.c:848 -#: ../libpurple/protocols/oscar/oscar.c:3804 -#: ../libpurple/protocols/oscar/oscar.c:3817 +#: ../libpurple/protocols/jabber/jabber.c:963 +#: ../libpurple/protocols/oscar/oscar.c:3783 +#: ../libpurple/protocols/oscar/oscar.c:3796 msgid "State" msgstr "省／州" -#: ../libpurple/protocols/jabber/jabber.c:853 +#: ../libpurple/protocols/jabber/jabber.c:968 msgid "Postal code" msgstr "郵遞區號" -#: ../libpurple/protocols/jabber/jabber.c:858 +#: ../libpurple/protocols/jabber/jabber.c:973 #: ../libpurple/protocols/silc/ops.c:1035 #: ../libpurple/protocols/silc/silc.c:772 #: ../libpurple/protocols/silc/util.c:557 @@ -4771,43 +5609,80 @@ msgid "Phone" msgstr "電話" -#: ../libpurple/protocols/jabber/jabber.c:868 +#: ../libpurple/protocols/jabber/jabber.c:983 msgid "Date" msgstr "日期" -#: ../libpurple/protocols/jabber/jabber.c:876 +#: ../libpurple/protocols/jabber/jabber.c:988 +msgid "Unregister" +msgstr "移除註冊" + +#: ../libpurple/protocols/jabber/jabber.c:995 +msgid "" +"Please fill out the information below to change your account registration." +msgstr "請填寫以下資料以更新您的註冊資料。" + +#: ../libpurple/protocols/jabber/jabber.c:998 msgid "Please fill out the information below to register your new account." msgstr "為您的新帳戶註冊，請填寫下列資料：" -#: ../libpurple/protocols/jabber/jabber.c:879 -#: ../libpurple/protocols/jabber/jabber.c:880 +#: ../libpurple/protocols/jabber/jabber.c:1006 +#: ../libpurple/protocols/jabber/jabber.c:1007 msgid "Register New XMPP Account" msgstr "註冊新的 XMPP 帳戶" -#. Register button -#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518 +#: ../libpurple/protocols/jabber/jabber.c:1008 +#: ../libpurple/protocols/jabber/jabber.c:1017 msgid "Register" msgstr "註冊" -#: ../libpurple/protocols/jabber/jabber.c:1050 +#: ../libpurple/protocols/jabber/jabber.c:1013 +#, c-format +msgid "Change Account Registration at %s" +msgstr "變更 %s 上的註冊資訊" + +#: ../libpurple/protocols/jabber/jabber.c:1014 +#, c-format +msgid "Register New Account at %s" +msgstr "註冊在 %s 的新帳號" + +#: ../libpurple/protocols/jabber/jabber.c:1017 +msgid "Change Registration" +msgstr "變更註冊資訊" + +#: ../libpurple/protocols/jabber/jabber.c:1121 +#: ../libpurple/protocols/jabber/jabber.c:1122 +msgid "Error unregistering account" +msgstr "移除帳號註冊錯誤" + +#: ../libpurple/protocols/jabber/jabber.c:1127 +#: ../libpurple/protocols/jabber/jabber.c:1128 +msgid "Account successfully unregistered" +msgstr "移除帳號註冊成功" + +#: ../libpurple/protocols/jabber/jabber.c:1280 msgid "Initializing Stream" msgstr "串流初始中" -#: ../libpurple/protocols/jabber/jabber.c:1055 +#: ../libpurple/protocols/jabber/jabber.c:1285 +msgid "Initializing SSL/TLS" +msgstr "SSL/TLS 初始中" + +#: ../libpurple/protocols/jabber/jabber.c:1289 #: ../libpurple/protocols/msn/session.c:351 msgid "Authenticating" msgstr "認證中" -#: ../libpurple/protocols/jabber/jabber.c:1064 +#: ../libpurple/protocols/jabber/jabber.c:1298 msgid "Re-initializing Stream" msgstr "串流重新初始中" -#: ../libpurple/protocols/jabber/jabber.c:1126 -#: ../libpurple/protocols/jabber/jabber.c:1502 -#: ../libpurple/protocols/jabber/jabber.c:1543 -#: ../libpurple/protocols/jabber/jabber.c:1579 -#: ../libpurple/protocols/oscar/oscar.c:826 -#: ../libpurple/protocols/oscar/oscar.c:5581 +#: ../libpurple/protocols/jabber/jabber.c:1392 +#: ../libpurple/protocols/jabber/jabber.c:1861 +#: ../libpurple/protocols/jabber/jabber.c:1902 +#: ../libpurple/protocols/jabber/jabber.c:1938 +#: ../libpurple/protocols/oscar/oscar.c:825 +#: ../libpurple/protocols/oscar/oscar.c:5586 msgid "Not Authorized" msgstr "未認證" @@ -4816,91 +5691,198 @@ # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification -#: ../libpurple/protocols/jabber/jabber.c:1168 +#: ../libpurple/protocols/jabber/jabber.c:1438 msgid "Both" msgstr "已互相認證" # NOTE Jabber 術語，見「Both」條 -#: ../libpurple/protocols/jabber/jabber.c:1170 +#: ../libpurple/protocols/jabber/jabber.c:1440 msgid "From (To pending)" msgstr "已認證對方（但仍等待對方認證您）" # FIXME 原文一詞兩義，根本無法翻譯 # NOTE gntnotify 字義為「發信人」 # NOTE Jabber 術語字義見「Both」條 -#: ../libpurple/protocols/jabber/jabber.c:1172 +#: ../libpurple/protocols/jabber/jabber.c:1442 msgid "From" msgstr "已認證對方" # NOTE Jabber 術語，見「Both」條 -#: ../libpurple/protocols/jabber/jabber.c:1175 +#: ../libpurple/protocols/jabber/jabber.c:1445 msgid "To" msgstr "已獲對方認證" # NOTE Jabber 術語，見「Both」條 -#: ../libpurple/protocols/jabber/jabber.c:1177 +#: ../libpurple/protocols/jabber/jabber.c:1447 msgid "None (To pending)" msgstr "無（但正等待對方認證您）" -#: ../libpurple/protocols/jabber/jabber.c:1179 +#: ../libpurple/protocols/jabber/jabber.c:1449 #: ../pidgin/plugins/gevolution/eds-utils.c:73 #: ../pidgin/plugins/gevolution/eds-utils.c:86 msgid "None" msgstr "無" # NOTE Jabber 術語，見「Both」條 -#: ../libpurple/protocols/jabber/jabber.c:1182 +#: ../libpurple/protocols/jabber/jabber.c:1452 msgid "Subscription" msgstr "認證狀態" -#: ../libpurple/protocols/jabber/jabber.c:1312 +#: ../libpurple/protocols/jabber/jabber.c:1462 +#: ../libpurple/protocols/jabber/jabber.c:1465 +#: ../libpurple/protocols/jabber/jabber.c:1529 +#: ../libpurple/protocols/jabber/jabber.c:1552 +#: ../libpurple/protocols/jabber/jabber.c:1575 +#: ../libpurple/protocols/jabber/jabber.c:1598 +#: ../libpurple/protocols/jabber/jabber.c:1621 +#: ../libpurple/protocols/jabber/usermood.c:167 +#: ../libpurple/protocols/silc/buddy.c:1557 +#: ../libpurple/protocols/silc/ops.c:1212 +#: ../libpurple/protocols/silc10/buddy.c:1557 +#: ../libpurple/protocols/silc10/ops.c:1207 +msgid "Mood" +msgstr "心情" + +#: ../libpurple/protocols/jabber/jabber.c:1530 +#: ../libpurple/protocols/jabber/jabber.c:1553 +#: ../libpurple/protocols/jabber/jabber.c:1576 +#: ../libpurple/protocols/jabber/jabber.c:1599 +#: ../libpurple/protocols/jabber/jabber.c:1622 +msgid "Mood Text" +msgstr "描述情緒" + +#: ../libpurple/protocols/jabber/jabber.c:1531 +#: ../libpurple/protocols/jabber/jabber.c:1554 +#: ../libpurple/protocols/jabber/jabber.c:1577 +#: ../libpurple/protocols/jabber/jabber.c:1600 +#: ../libpurple/protocols/jabber/jabber.c:1623 +msgid "Tune Artist" +msgstr "樂手名稱" + +#: ../libpurple/protocols/jabber/jabber.c:1532 +#: ../libpurple/protocols/jabber/jabber.c:1555 +#: ../libpurple/protocols/jabber/jabber.c:1578 +#: ../libpurple/protocols/jabber/jabber.c:1601 +#: ../libpurple/protocols/jabber/jabber.c:1624 +msgid "Tune Title" +msgstr "樂曲名稱" + +#: ../libpurple/protocols/jabber/jabber.c:1533 +#: ../libpurple/protocols/jabber/jabber.c:1556 +#: ../libpurple/protocols/jabber/jabber.c:1579 +#: ../libpurple/protocols/jabber/jabber.c:1602 +#: ../libpurple/protocols/jabber/jabber.c:1625 +msgid "Tune Album" +msgstr "專輯名稱" + +#: ../libpurple/protocols/jabber/jabber.c:1534 +#: ../libpurple/protocols/jabber/jabber.c:1557 +#: ../libpurple/protocols/jabber/jabber.c:1580 +#: ../libpurple/protocols/jabber/jabber.c:1603 +#: ../libpurple/protocols/jabber/jabber.c:1626 +msgid "Tune Genre" +msgstr "樂曲種類" + +#: ../libpurple/protocols/jabber/jabber.c:1535 +#: ../libpurple/protocols/jabber/jabber.c:1558 +#: ../libpurple/protocols/jabber/jabber.c:1581 +#: ../libpurple/protocols/jabber/jabber.c:1604 +#: ../libpurple/protocols/jabber/jabber.c:1627 +#, fuzzy +msgid "Tune Comment" +msgstr "好友說明" + +# NOTE 參見 http://www.xmpp.org/extensions/xep-0118.html +# FIXME +#: ../libpurple/protocols/jabber/jabber.c:1536 +#: ../libpurple/protocols/jabber/jabber.c:1559 +#: ../libpurple/protocols/jabber/jabber.c:1582 +#: ../libpurple/protocols/jabber/jabber.c:1605 +#: ../libpurple/protocols/jabber/jabber.c:1628 +msgid "Tune Track" +msgstr "樂曲 ID" + +#: ../libpurple/protocols/jabber/jabber.c:1537 +#: ../libpurple/protocols/jabber/jabber.c:1560 +#: ../libpurple/protocols/jabber/jabber.c:1583 +#: ../libpurple/protocols/jabber/jabber.c:1606 +#: ../libpurple/protocols/jabber/jabber.c:1629 +msgid "Tune Time" +msgstr "樂曲長度" + +#: ../libpurple/protocols/jabber/jabber.c:1538 +#: ../libpurple/protocols/jabber/jabber.c:1561 +#: ../libpurple/protocols/jabber/jabber.c:1584 +#: ../libpurple/protocols/jabber/jabber.c:1607 +#: ../libpurple/protocols/jabber/jabber.c:1630 +msgid "Tune Year" +msgstr "作曲年份" + +#: ../libpurple/protocols/jabber/jabber.c:1539 +#: ../libpurple/protocols/jabber/jabber.c:1562 +#: ../libpurple/protocols/jabber/jabber.c:1585 +#: ../libpurple/protocols/jabber/jabber.c:1608 +#: ../libpurple/protocols/jabber/jabber.c:1631 +msgid "Tune URL" +msgstr "樂曲網址" + +#: ../libpurple/protocols/jabber/jabber.c:1541 +#: ../libpurple/protocols/jabber/jabber.c:1564 +#: ../libpurple/protocols/jabber/jabber.c:1587 +#: ../libpurple/protocols/jabber/jabber.c:1610 +#: ../libpurple/protocols/jabber/jabber.c:1633 +#, fuzzy +msgid "Allow Buzz" +msgstr "允許" + +#: ../libpurple/protocols/jabber/jabber.c:1661 msgid "Password Changed" msgstr "密碼修改成功" -#: ../libpurple/protocols/jabber/jabber.c:1313 +#: ../libpurple/protocols/jabber/jabber.c:1662 msgid "Your password has been changed." msgstr "成功修改了您的密碼。" -#: ../libpurple/protocols/jabber/jabber.c:1317 -#: ../libpurple/protocols/jabber/jabber.c:1318 +#: ../libpurple/protocols/jabber/jabber.c:1666 +#: ../libpurple/protocols/jabber/jabber.c:1667 msgid "Error changing password" msgstr "修改密碼期間出現錯誤" -#: ../libpurple/protocols/jabber/jabber.c:1375 +#: ../libpurple/protocols/jabber/jabber.c:1724 msgid "Password (again)" msgstr "舊密碼（再次確認）" -#: ../libpurple/protocols/jabber/jabber.c:1381 -#: ../libpurple/protocols/jabber/jabber.c:1382 +#: ../libpurple/protocols/jabber/jabber.c:1730 +#: ../libpurple/protocols/jabber/jabber.c:1731 msgid "Change XMPP Password" msgstr "修改 XMPP 密碼" -#: ../libpurple/protocols/jabber/jabber.c:1382 +#: ../libpurple/protocols/jabber/jabber.c:1731 msgid "Please enter your new password" msgstr "請輸入您的新密碼" -#: ../libpurple/protocols/jabber/jabber.c:1394 -#: ../libpurple/protocols/oscar/oscar.c:6367 +#: ../libpurple/protocols/jabber/jabber.c:1745 +#: ../libpurple/protocols/oscar/oscar.c:6372 #: ../libpurple/protocols/silc/silc.c:1093 #: ../libpurple/protocols/silc10/silc.c:1004 msgid "Set User Info..." msgstr "設定使用者資訊..." #. if (js->protocol_options & CHANGE_PASSWORD) { -#: ../libpurple/protocols/jabber/jabber.c:1399 -#: ../libpurple/protocols/oscar/oscar.c:6378 +#: ../libpurple/protocols/jabber/jabber.c:1750 +#: ../libpurple/protocols/oscar/oscar.c:6383 #: ../libpurple/protocols/silc/silc.c:1089 #: ../libpurple/protocols/silc10/silc.c:1000 msgid "Change Password..." msgstr "修改密碼..." #. } -#: ../libpurple/protocols/jabber/jabber.c:1404 +#: ../libpurple/protocols/jabber/jabber.c:1755 msgid "Search for Users..." msgstr "搜尋使用者..." # NOTE 見 http://www.jabber.org/jeps/jep-0103.html -#: ../libpurple/protocols/jabber/jabber.c:1482 +#: ../libpurple/protocols/jabber/jabber.c:1841 msgid "Bad Request" msgstr "傳送網址時發生了不明的錯誤" @@ -4908,52 +5890,52 @@ # NOTE（大概係指登入用的使用者自定字串）或工作階段登入，以致無法存取 # NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt # NOTE 譯文更動 by Ambrose -#: ../libpurple/protocols/jabber/jabber.c:1484 +#: ../libpurple/protocols/jabber/jabber.c:1843 msgid "Conflict" msgstr "名稱或位址衝突" -#: ../libpurple/protocols/jabber/jabber.c:1486 +#: ../libpurple/protocols/jabber/jabber.c:1845 msgid "Feature Not Implemented" msgstr "該功能尚未實作" # NOTE Jabber 錯誤 ，意思正常（表示權限不夠） # NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt -#: ../libpurple/protocols/jabber/jabber.c:1488 +#: ../libpurple/protocols/jabber/jabber.c:1847 msgid "Forbidden" msgstr "權限不夠" # NOTE Jabber 錯誤 ，表示使用者或伺服器曾經上線，後來離了線 # NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt -#: ../libpurple/protocols/jabber/jabber.c:1490 +#: ../libpurple/protocols/jabber/jabber.c:1849 msgid "Gone" msgstr "已離線" -#: ../libpurple/protocols/jabber/jabber.c:1492 -#: ../libpurple/protocols/jabber/jabber.c:1569 +#: ../libpurple/protocols/jabber/jabber.c:1851 +#: ../libpurple/protocols/jabber/jabber.c:1928 msgid "Internal Server Error" msgstr "伺服器內部錯誤" -#: ../libpurple/protocols/jabber/jabber.c:1494 +#: ../libpurple/protocols/jabber/jabber.c:1853 msgid "Item Not Found" msgstr "項目未找到" # FIXME 譯文聽來好像有點怪 20070518 acli -#: ../libpurple/protocols/jabber/jabber.c:1496 +#: ../libpurple/protocols/jabber/jabber.c:1855 msgid "Malformed XMPP ID" msgstr "畸型的 XMPP 帳號" # NOTE Jabber 錯誤 ，表示所送出的要求未能達到伺服器或收件人所訂下的 # NOTE 條件（例如訊息中含有禁字），以致無法存取 # NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt -#: ../libpurple/protocols/jabber/jabber.c:1498 +#: ../libpurple/protocols/jabber/jabber.c:1857 msgid "Not Acceptable" msgstr "無法接受" -#: ../libpurple/protocols/jabber/jabber.c:1500 +#: ../libpurple/protocols/jabber/jabber.c:1859 msgid "Not Allowed" msgstr "不被允許" -#: ../libpurple/protocols/jabber/jabber.c:1504 +#: ../libpurple/protocols/jabber/jabber.c:1863 msgid "Payment Required" msgstr "必須付款" @@ -4961,78 +5943,78 @@ # NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt # NOTE「暫時無法聯絡」應該比「不存在」通順 # NOTE 譯文更動 by Ambrose -#: ../libpurple/protocols/jabber/jabber.c:1506 +#: ../libpurple/protocols/jabber/jabber.c:1865 msgid "Recipient Unavailable" msgstr "暫時無法聯絡接收者" -#: ../libpurple/protocols/jabber/jabber.c:1510 +#: ../libpurple/protocols/jabber/jabber.c:1869 msgid "Registration Required" msgstr "必須註冊" -#: ../libpurple/protocols/jabber/jabber.c:1512 +#: ../libpurple/protocols/jabber/jabber.c:1871 msgid "Remote Server Not Found" msgstr "遠端伺服器未找到" -#: ../libpurple/protocols/jabber/jabber.c:1514 +#: ../libpurple/protocols/jabber/jabber.c:1873 msgid "Remote Server Timeout" msgstr "遠端伺服器逾時" -#: ../libpurple/protocols/jabber/jabber.c:1516 +#: ../libpurple/protocols/jabber/jabber.c:1875 msgid "Server Overloaded" msgstr "伺服器超載" # NOTE Jabber 錯誤 ，表示伺服器收到一個意義不明的指令 # NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt # NOTE 譯文更動 by Ambrose -#: ../libpurple/protocols/jabber/jabber.c:1518 +#: ../libpurple/protocols/jabber/jabber.c:1877 msgid "Service Unavailable" msgstr "不提供該項服務" # NOTE Jabber 錯誤 ，表示使用「服務」前 # NOTE 必須事先取得「Subscription」（認證） # NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt -#: ../libpurple/protocols/jabber/jabber.c:1520 +#: ../libpurple/protocols/jabber/jabber.c:1879 msgid "Subscription Required" msgstr "必須認證" -#: ../libpurple/protocols/jabber/jabber.c:1522 +#: ../libpurple/protocols/jabber/jabber.c:1881 msgid "Unexpected Request" msgstr "未預期的要求" -#: ../libpurple/protocols/jabber/jabber.c:1529 +#: ../libpurple/protocols/jabber/jabber.c:1888 msgid "Authorization Aborted" msgstr "認證取消" -#: ../libpurple/protocols/jabber/jabber.c:1531 +#: ../libpurple/protocols/jabber/jabber.c:1890 msgid "Incorrect encoding in authorization" msgstr "認證含錯誤的編碼" -#: ../libpurple/protocols/jabber/jabber.c:1534 +#: ../libpurple/protocols/jabber/jabber.c:1893 msgid "Invalid authzid" msgstr "無效的 authzid" # XXX 要覆查譯文 -#: ../libpurple/protocols/jabber/jabber.c:1537 +#: ../libpurple/protocols/jabber/jabber.c:1896 msgid "Invalid Authorization Mechanism" msgstr "無效的認證機制" -#: ../libpurple/protocols/jabber/jabber.c:1540 +#: ../libpurple/protocols/jabber/jabber.c:1899 msgid "Authorization mechanism too weak" msgstr "認證機制太薄弱了" -#: ../libpurple/protocols/jabber/jabber.c:1545 +#: ../libpurple/protocols/jabber/jabber.c:1904 msgid "Temporary Authentication Failure" msgstr "認證暫時失敗" -#: ../libpurple/protocols/jabber/jabber.c:1548 +#: ../libpurple/protocols/jabber/jabber.c:1907 msgid "Authentication Failure" msgstr "認證失敗" -#: ../libpurple/protocols/jabber/jabber.c:1554 +#: ../libpurple/protocols/jabber/jabber.c:1913 msgid "Bad Format" msgstr "無效的格式" -#: ../libpurple/protocols/jabber/jabber.c:1556 +#: ../libpurple/protocols/jabber/jabber.c:1915 msgid "Bad Namespace Prefix" msgstr "無效的 Namespace Prefix" @@ -5042,11 +6024,11 @@ # NOTE 見 http://www.jabber.org/user/userguide.html # NOTE Jabber 協定中 Stanza Error 的一種，即 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html -#: ../libpurple/protocols/jabber/jabber.c:1559 +#: ../libpurple/protocols/jabber/jabber.c:1918 msgid "Resource Conflict" msgstr "已經以指定的 Resource 在其他地方登入" -#: ../libpurple/protocols/jabber/jabber.c:1561 +#: ../libpurple/protocols/jabber/jabber.c:1920 #: ../libpurple/protocols/silc/silc.c:244 #: ../libpurple/protocols/silc10/ops.c:1720 msgid "Connection Timeout" @@ -5054,170 +6036,191 @@ # NOTE Jabber 協定中 Stream Error 的一種，即 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html -#: ../libpurple/protocols/jabber/jabber.c:1563 +#: ../libpurple/protocols/jabber/jabber.c:1922 msgid "Host Gone" msgstr "伺服器已不再支援所給定的伺服器名稱" # NOTE Jabber 協定中 Stream Error 的一種，即 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html -#: ../libpurple/protocols/jabber/jabber.c:1565 +#: ../libpurple/protocols/jabber/jabber.c:1924 msgid "Host Unknown" msgstr "不明的伺服器名稱" -#: ../libpurple/protocols/jabber/jabber.c:1567 +#: ../libpurple/protocols/jabber/jabber.c:1926 msgid "Improper Addressing" msgstr "錯誤的定址" -#: ../libpurple/protocols/jabber/jabber.c:1571 +#: ../libpurple/protocols/jabber/jabber.c:1930 msgid "Invalid ID" msgstr "帳號無效" # FIXME 必須覆查譯文 -#: ../libpurple/protocols/jabber/jabber.c:1573 +#: ../libpurple/protocols/jabber/jabber.c:1932 msgid "Invalid Namespace" msgstr "命名空間無效" -#: ../libpurple/protocols/jabber/jabber.c:1575 +#: ../libpurple/protocols/jabber/jabber.c:1934 msgid "Invalid XML" msgstr "無效的 XML" # XXX 這是暫譯，譯文有待改進 # NOTE Jabber 協定中的「nonmatching-hosts」 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html -#: ../libpurple/protocols/jabber/jabber.c:1577 +#: ../libpurple/protocols/jabber/jabber.c:1936 msgid "Non-matching Hosts" msgstr "主機名稱不相乎" # XXX 這是暫譯，譯文有待改進。不過好像真的有人這樣寫，大概沒有太大的問題 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html -#: ../libpurple/protocols/jabber/jabber.c:1581 +#: ../libpurple/protocols/jabber/jabber.c:1940 msgid "Policy Violation" msgstr "違反了服務政策" # NOTE Jabber 協定 Stream Error 的一種，即 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html -#: ../libpurple/protocols/jabber/jabber.c:1583 +#: ../libpurple/protocols/jabber/jabber.c:1942 msgid "Remote Connection Failed" msgstr "無法連線至認證所需的遠端資源" # NOTE Jabber 協定 Stream Error 的一種，即 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html -#: ../libpurple/protocols/jabber/jabber.c:1585 +#: ../libpurple/protocols/jabber/jabber.c:1944 msgid "Resource Constraint" msgstr "伺服器資源短缺" # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html -#: ../libpurple/protocols/jabber/jabber.c:1587 +#: ../libpurple/protocols/jabber/jabber.c:1946 msgid "Restricted XML" msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素" # NOTE Jabber 協定中 Stream Error 的一種，即 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html -#: ../libpurple/protocols/jabber/jabber.c:1589 +#: ../libpurple/protocols/jabber/jabber.c:1948 msgid "See Other Host" msgstr "伺服器在認證期間要求了重新導向至另一伺服器" # NOTE Jabber 協定中 Stream Error 的一種，即 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html -#: ../libpurple/protocols/jabber/jabber.c:1591 +#: ../libpurple/protocols/jabber/jabber.c:1950 msgid "System Shutdown" msgstr "伺服器目前在關機中" # NOTE 見 http://www.jabber.org/jeps/jep-0103.html -#: ../libpurple/protocols/jabber/jabber.c:1593 +#: ../libpurple/protocols/jabber/jabber.c:1952 msgid "Undefined Condition" msgstr "傳送網址時發生了不明的錯誤" # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html -#: ../libpurple/protocols/jabber/jabber.c:1595 +#: ../libpurple/protocols/jabber/jabber.c:1954 msgid "Unsupported Encoding" msgstr "伺服器不支援給定的字元編碼" # NOTE Jabber 協定中 Stream Error 的一種，即 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html -#: ../libpurple/protocols/jabber/jabber.c:1597 +#: ../libpurple/protocols/jabber/jabber.c:1956 msgid "Unsupported Stanza Type" msgstr "伺服器不支援給定的段落類別 (Stanza Type)" # NOTE Jabber 協定中 Stream Error 的一種，即 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html -#: ../libpurple/protocols/jabber/jabber.c:1599 +#: ../libpurple/protocols/jabber/jabber.c:1958 msgid "Unsupported Version" msgstr "不支援給定的 XMPP 版本" -#: ../libpurple/protocols/jabber/jabber.c:1601 +#: ../libpurple/protocols/jabber/jabber.c:1960 msgid "XML Not Well Formed" msgstr "XML 文件格式有問題" -#: ../libpurple/protocols/jabber/jabber.c:1603 +#: ../libpurple/protocols/jabber/jabber.c:1962 msgid "Stream Error" msgstr "串流錯誤" -#: ../libpurple/protocols/jabber/jabber.c:1670 +#: ../libpurple/protocols/jabber/jabber.c:2045 #, c-format msgid "Unable to ban user %s" msgstr "無法禁止使用者 %s" # XXX 暫譯「（會員）等級」 - ambrose 20070415 # NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值 -#: ../libpurple/protocols/jabber/jabber.c:1690 +#: ../libpurple/protocols/jabber/jabber.c:2065 #, c-format msgid "Unknown affiliation: \"%s\"" msgstr "不明的等級：「%s」" # XXX 暫譯 - ambrose 20070415 -#: ../libpurple/protocols/jabber/jabber.c:1695 +#: ../libpurple/protocols/jabber/jabber.c:2070 #, c-format msgid "Unable to affiliate user %s as \"%s\"" msgstr "無法將使用者 %s 的等級設定為「%s」" # XXX 暫譯 - ambrose 20070415 # NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值 -#: ../libpurple/protocols/jabber/jabber.c:1714 +#: ../libpurple/protocols/jabber/jabber.c:2089 #, c-format msgid "Unknown role: \"%s\"" msgstr "不明的身份：「%s」" # XXX 暫譯 - ambrose 20070415 -#: ../libpurple/protocols/jabber/jabber.c:1721 +#: ../libpurple/protocols/jabber/jabber.c:2094 #, c-format msgid "Unable to set role \"%s\" for user: %s" msgstr "無法將使用者 %2$s 的身份設定為「%1$s」" -#: ../libpurple/protocols/jabber/jabber.c:1774 +#: ../libpurple/protocols/jabber/jabber.c:2147 #, c-format msgid "Unable to kick user %s" msgstr "無法踢出使用者 %s" -#: ../libpurple/protocols/jabber/jabber.c:1805 +#: ../libpurple/protocols/jabber/jabber.c:2178 +#, c-format +msgid "Unable to ping user %s" +msgstr "無法 Ping 使用者 %s" + +#: ../libpurple/protocols/jabber/jabber.c:2200 +#: ../libpurple/protocols/jabber/jabber.c:2210 +#, c-format +msgid "Unable to buzz, because there is nothing known about user %s." +msgstr "" + +#: ../libpurple/protocols/jabber/jabber.c:2206 +#, c-format +msgid "Unable to buzz, because user %s might be offline." +msgstr "" + +#: ../libpurple/protocols/jabber/jabber.c:2232 +#, fuzzy, c-format +msgid "Unable to buzz, because the user %s does not support it." +msgstr "無法播放音效，因為所選取的檔案 (%s) 不存在。" + +#: ../libpurple/protocols/jabber/jabber.c:2246 msgid "config: Configure a chat room." msgstr "config：設定一個聊天室" -#: ../libpurple/protocols/jabber/jabber.c:1809 +#: ../libpurple/protocols/jabber/jabber.c:2250 msgid "configure: Configure a chat room." msgstr "configure：設定一個聊天室" -#: ../libpurple/protocols/jabber/jabber.c:1818 +#: ../libpurple/protocols/jabber/jabber.c:2259 msgid "part [room]: Leave the room." msgstr "part [聊天室]：離開聊天室。" -#: ../libpurple/protocols/jabber/jabber.c:1823 +#: ../libpurple/protocols/jabber/jabber.c:2264 msgid "register: Register with a chat room." msgstr "register：加入一個聊天室" -#: ../libpurple/protocols/jabber/jabber.c:1829 +#: ../libpurple/protocols/jabber/jabber.c:2270 msgid "topic [new topic]: View or change the topic." msgstr "topic [新主題]：檢視或修改聊天主題" -#: ../libpurple/protocols/jabber/jabber.c:1835 +#: ../libpurple/protocols/jabber/jabber.c:2276 msgid "ban <user> [room]: Ban a user from the room." msgstr "ban <使用者> [聊天室]：禁止某使用者進入聊天室" # XXX 暫譯「（會員）等級」 - ambrose 20070415 -#: ../libpurple/protocols/jabber/jabber.c:1841 +#: ../libpurple/protocols/jabber/jabber.c:2282 msgid "" "affiliate <user> <owner|admin|member|outcast|none>: Set a user's " "affiliation with the room." @@ -5226,7 +6229,7 @@ "在這聊天室內的等級" # NOTE 譯文改動 by ambrose -#: ../libpurple/protocols/jabber/jabber.c:1847 +#: ../libpurple/protocols/jabber/jabber.c:2288 msgid "" "role <user> <moderator|participant|visitor|none>: Set a user's " "role in the room." @@ -5234,23 +6237,32 @@ "role <使用者> <moderator|participant|visitor|none>: 設定使用者在" "這聊天室內的身份。" -#: ../libpurple/protocols/jabber/jabber.c:1853 +#: ../libpurple/protocols/jabber/jabber.c:2294 msgid "invite <user> [message]: Invite a user to the room." msgstr "invite <使用者> [訊息]：邀請使用者進入聊天室" -#: ../libpurple/protocols/jabber/jabber.c:1859 +#: ../libpurple/protocols/jabber/jabber.c:2300 msgid "join: <room> [server]: Join a chat on this server." msgstr "join: <聊天室> [伺服器]：加入位於這個伺服器的一個聊天室" -#: ../libpurple/protocols/jabber/jabber.c:1865 +#: ../libpurple/protocols/jabber/jabber.c:2306 msgid "kick <user> [room]: Kick a user from the room." msgstr "kick <使用者> [聊天室]：將使用者從聊天室中踢出。" -#: ../libpurple/protocols/jabber/jabber.c:1870 +#: ../libpurple/protocols/jabber/jabber.c:2311 msgid "" "msg <user> <message>: Send a private message to another user." msgstr "msg <使用者> <訊息>：傳送私人訊息給另一個使用者" +#: ../libpurple/protocols/jabber/jabber.c:2317 +msgid "ping <jid>:\tPing a user/component/server." +msgstr "" + +#: ../libpurple/protocols/jabber/jabber.c:2322 +#: ../libpurple/protocols/yahoo/yahoo.c:4142 +msgid "buzz: Buzz a user to get their attention" +msgstr "buzz: 給好友一個「嗶」引他（她）注意" + #. *< type #. *< ui_requirement #. *< flags @@ -5261,125 +6273,139 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/jabber/libxmpp.c:169 -#: ../libpurple/protocols/jabber/libxmpp.c:171 +#: ../libpurple/protocols/jabber/libxmpp.c:172 +#: ../libpurple/protocols/jabber/libxmpp.c:174 msgid "XMPP Protocol Plugin" msgstr "XMPP 協定模組" #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im -#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508 +#: ../libpurple/protocols/jabber/libxmpp.c:201 ../pidgin/gtkaccount.c:506 msgid "Domain" msgstr "域名" -#: ../libpurple/protocols/jabber/libxmpp.c:206 +#: ../libpurple/protocols/jabber/libxmpp.c:209 +msgid "Require SSL/TLS" +msgstr "需要 SSL/TLS" + +#: ../libpurple/protocols/jabber/libxmpp.c:213 msgid "Force old (port 5223) SSL" msgstr "強迫使用舊式 SSL (port 5223)" # NOTE 譯文更動 by Ambrose -#: ../libpurple/protocols/jabber/libxmpp.c:211 +#: ../libpurple/protocols/jabber/libxmpp.c:218 msgid "Allow plaintext auth over unencrypted streams" msgstr "允許使用明文，在未經加密的串流上進行認證" -#: ../libpurple/protocols/jabber/libxmpp.c:216 -#: ../libpurple/protocols/simple/simple.c:1856 +#: ../libpurple/protocols/jabber/libxmpp.c:223 +#: ../libpurple/protocols/myspace/myspace.c:3271 +#: ../libpurple/protocols/simple/simple.c:1862 msgid "Connect port" msgstr "連線埠" +#. TODO: default to automatically try different ports. Make the user be +#. * able to set the first port to try (like LastConnectedPort in Windows client). #. Account options -#: ../libpurple/protocols/jabber/libxmpp.c:220 +#: ../libpurple/protocols/jabber/libxmpp.c:227 +#: ../libpurple/protocols/myspace/myspace.c:3268 #: ../libpurple/protocols/silc/silc.c:1914 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837 msgid "Connect server" msgstr "連結伺服器" -#: ../libpurple/protocols/jabber/message.c:102 +#: ../libpurple/protocols/jabber/message.c:103 #, c-format msgid "%s has left the conversation." msgstr "%s 已經離開這個交談。" -#: ../libpurple/protocols/jabber/message.c:153 +#: ../libpurple/protocols/jabber/message.c:158 #, c-format msgid "Message from %s" msgstr "由 %s 發出的訊息" -#: ../libpurple/protocols/jabber/message.c:217 +#: ../libpurple/protocols/jabber/message.c:222 #, c-format msgid "%s has set the topic to: %s" msgstr "%s 把聊天主題設定為：%s" -#: ../libpurple/protocols/jabber/message.c:219 +#: ../libpurple/protocols/jabber/message.c:224 #, c-format msgid "The topic is: %s" msgstr "主題：%s" -#: ../libpurple/protocols/jabber/message.c:267 +#: ../libpurple/protocols/jabber/message.c:272 #, c-format msgid "Message delivery to %s failed: %s" msgstr "無法傳送訊息到 %s：%s" -#: ../libpurple/protocols/jabber/message.c:270 +#: ../libpurple/protocols/jabber/message.c:275 msgid "XMPP Message Error" msgstr "XMPP 訊息錯誤" -#: ../libpurple/protocols/jabber/message.c:359 +#: ../libpurple/protocols/jabber/message.c:304 +#: ../libpurple/protocols/yahoo/yahoo.c:4117 +#, fuzzy, c-format +msgid "%s has buzzed you!" +msgstr "%s 已將您 [%s] 加入到他（她）的好友清單" + +#: ../libpurple/protocols/jabber/message.c:404 #, c-format msgid " (Code %s)" msgstr " (代碼 %s)" -#: ../libpurple/protocols/jabber/parser.c:193 +#: ../libpurple/protocols/jabber/parser.c:196 msgid "XML Parse error" msgstr "XML 分析錯誤" -#: ../libpurple/protocols/jabber/presence.c:290 +#: ../libpurple/protocols/jabber/presence.c:427 msgid "Unknown Error in presence" msgstr "不明的上線狀態錯誤" -#: ../libpurple/protocols/jabber/presence.c:364 -#: ../libpurple/protocols/jabber/presence.c:365 +#: ../libpurple/protocols/jabber/presence.c:508 +#: ../libpurple/protocols/jabber/presence.c:509 msgid "Create New Room" msgstr "建立新聊天室" -#: ../libpurple/protocols/jabber/presence.c:366 +#: ../libpurple/protocols/jabber/presence.c:510 msgid "" "You are creating a new room. Would you like to configure it, or accept the " "default settings?" msgstr "您正要建立一個新的聊天室，您要設定它，還是使用預設值？" -#: ../libpurple/protocols/jabber/presence.c:372 +#: ../libpurple/protocols/jabber/presence.c:516 msgid "_Configure Room" msgstr "設定聊天室(_C)" -#: ../libpurple/protocols/jabber/presence.c:373 +#: ../libpurple/protocols/jabber/presence.c:517 msgid "_Accept Defaults" msgstr "使用預設值(_A)" -#: ../libpurple/protocols/jabber/presence.c:409 +#: ../libpurple/protocols/jabber/presence.c:559 #, c-format msgid "Error in chat %s" msgstr "聊天室 %s 發生錯誤" -#: ../libpurple/protocols/jabber/presence.c:412 +#: ../libpurple/protocols/jabber/presence.c:563 #, c-format msgid "Error joining chat %s" msgstr "加入聊天室 %s 時發生錯誤" -#: ../libpurple/protocols/jabber/si.c:769 +#: ../libpurple/protocols/jabber/si.c:775 #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "無法傳送檔案至 %s，因為對方不支援檔案傳輸" -#: ../libpurple/protocols/jabber/si.c:770 -#: ../libpurple/protocols/jabber/si.c:771 -#: ../libpurple/protocols/jabber/si.c:839 +#: ../libpurple/protocols/jabber/si.c:776 +#: ../libpurple/protocols/jabber/si.c:777 +#: ../libpurple/protocols/jabber/si.c:845 msgid "File Send Failed" msgstr "傳送檔案失敗" -#: ../libpurple/protocols/jabber/si.c:832 +#: ../libpurple/protocols/jabber/si.c:838 #, c-format msgid "Unable to send file to %s, invalid JID" msgstr "無法送出訊息給 %s，因為這個 JID 是無效的" -#: ../libpurple/protocols/jabber/si.c:834 +#: ../libpurple/protocols/jabber/si.c:840 #, c-format msgid "Unable to send file to %s, user is not online" msgstr "無法傳送檔案至 %s，因為對方目前沒有連線" @@ -5387,21 +6413,67 @@ # NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription # FIXME 這很明顯是有問題的譯文，但這是這個 PO 檔現有的譯法（見「To」條）； # FIXME 如果這個要改，其他有關 presence 的譯文也要一齊改才行。-acli 20070614 -#: ../libpurple/protocols/jabber/si.c:836 +#: ../libpurple/protocols/jabber/si.c:842 #, c-format msgid "Unable to send file to %s, not subscribed to user presence" msgstr "無法傳送檔案至 %s，因為未獲對方認證" # FIXME 這不通順 - acli 20070614 -#: ../libpurple/protocols/jabber/si.c:851 +#: ../libpurple/protocols/jabber/si.c:857 #, c-format msgid "Please select which resource of %s you would like to send a file to" msgstr "請指定檔案應該傳送至 %s 的那一個 Resource" -#: ../libpurple/protocols/jabber/si.c:867 +#: ../libpurple/protocols/jabber/si.c:873 msgid "Select a Resource" msgstr "選擇一個 Resource" +#: ../libpurple/protocols/jabber/usermood.c:180 +#: ../libpurple/protocols/jabber/usermood.c:181 +msgid "Edit User Mood" +msgstr "編輯使用者情緒" + +#: ../libpurple/protocols/jabber/usermood.c:182 +msgid "Please select your mood from the list." +msgstr "" + +#: ../libpurple/protocols/jabber/usermood.c:184 +#: ../libpurple/protocols/jabber/usernick.c:79 +msgid "Set" +msgstr "設定" + +#: ../libpurple/protocols/jabber/usermood.c:192 +msgid "Set Mood..." +msgstr "設定情緒..." + +# XXX may be wrong +#: ../libpurple/protocols/jabber/usernick.c:77 +msgid "Set User Nickname" +msgstr "設定使用者暱稱" + +#: ../libpurple/protocols/jabber/usernick.c:77 +msgid "Please specify a new nickname for you." +msgstr "請為您自己設定新的暱稱。" + +#: ../libpurple/protocols/jabber/usernick.c:78 +msgid "" +"This information is visible to all contacts on your contact list, so choose " +"something appropriate." +msgstr "" + +#: ../libpurple/protocols/jabber/usernick.c:100 +msgid "Set Nickname..." +msgstr "設定暱稱..." + +#: ../libpurple/protocols/jabber/xdata.c:378 +msgid "Actions" +msgstr "動作" + +# XXX 要覆查 +#: ../libpurple/protocols/jabber/xdata.c:380 +msgid "Select an action" +msgstr "選擇一個動作" + # XXX 暫譯 #: ../libpurple/protocols/msn/dialog.c:110 #, c-format @@ -5625,7 +6697,7 @@ msgstr "伺服器太忙碌" #: ../libpurple/protocols/msn/error.c:222 -#: ../libpurple/protocols/oscar/oscar.c:1381 +#: ../libpurple/protocols/oscar/oscar.c:1378 #: ../libpurple/protocols/silc/silc.c:233 #: ../libpurple/protocols/silc10/ops.c:1709 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363 @@ -5665,42 +6737,52 @@ msgid "MSN Error: %s\n" msgstr "MSN 錯誤：%s\n" -#: ../libpurple/protocols/msn/msn.c:121 -msgid "You have just sent a Nudge!" -msgstr "您剛送出了一個呼叫！" - -#: ../libpurple/protocols/msn/msn.c:146 +#: ../libpurple/protocols/msn/msn.c:130 +msgid "Nudge" +msgstr "" + +#: ../libpurple/protocols/msn/msn.c:131 +#, c-format +msgid "%s has nudged you!" +msgstr "%s 呼叫您！" + +#: ../libpurple/protocols/msn/msn.c:132 +#, c-format +msgid "Nudging %s..." +msgstr "" + +#: ../libpurple/protocols/msn/msn.c:174 msgid "Your new MSN friendly name is too long." msgstr "您的新 MSN 暱稱太長。" -#: ../libpurple/protocols/msn/msn.c:254 +#: ../libpurple/protocols/msn/msn.c:282 msgid "Set your friendly name." msgstr "設定您的暱稱。" # NOTE MSN的暱稱不像Yahoo；使用者可以輸入任何的新暱稱， # NOTE 即使和使用者的帳號毫無關係，似乎也是有效的 # XXX 這看來是一個鈙述句，事實上是對使用者發出的請求／問題 -#: ../libpurple/protocols/msn/msn.c:255 +#: ../libpurple/protocols/msn/msn.c:283 msgid "This is the name that other MSN buddies will see you as." msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。" -#: ../libpurple/protocols/msn/msn.c:273 +#: ../libpurple/protocols/msn/msn.c:301 msgid "Set your home phone number." msgstr "設定您的住家電話號碼。" -#: ../libpurple/protocols/msn/msn.c:290 +#: ../libpurple/protocols/msn/msn.c:318 msgid "Set your work phone number." msgstr "設定您的辦公室電話號碼。" -#: ../libpurple/protocols/msn/msn.c:307 +#: ../libpurple/protocols/msn/msn.c:335 msgid "Set your mobile phone number." msgstr "設定您的行動電話號碼。" -#: ../libpurple/protocols/msn/msn.c:322 +#: ../libpurple/protocols/msn/msn.c:350 msgid "Allow MSN Mobile pages?" msgstr "允許 MSN 傳呼？" -#: ../libpurple/protocols/msn/msn.c:323 +#: ../libpurple/protocols/msn/msn.c:351 msgid "" "Do you want to allow or disallow people on your buddy list to send you MSN " "Mobile pages to your cell phone or other mobile device?" @@ -5708,321 +6790,323 @@ "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話，或是其他的行動" "裝置上呢？" -#: ../libpurple/protocols/msn/msn.c:329 +#: ../libpurple/protocols/msn/msn.c:357 msgid "Allow" msgstr "允許" -#: ../libpurple/protocols/msn/msn.c:330 +#: ../libpurple/protocols/msn/msn.c:358 msgid "Disallow" msgstr "不允許" -#: ../libpurple/protocols/msn/msn.c:346 +#: ../libpurple/protocols/msn/msn.c:374 msgid "This Hotmail account may not be active." msgstr "這個Hotmail帳號可能尚未被啟動。" -#: ../libpurple/protocols/msn/msn.c:372 +#: ../libpurple/protocols/msn/msn.c:400 msgid "Send a mobile message." msgstr "送出行動訊息。" -#: ../libpurple/protocols/msn/msn.c:374 +#: ../libpurple/protocols/msn/msn.c:402 msgid "Page" msgstr "傳呼" -#: ../libpurple/protocols/msn/msn.c:521 +#: ../libpurple/protocols/msn/msn.c:549 msgid "Has you" msgstr "你在他（她）的好友清單裏" -#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33 -#: ../libpurple/protocols/yahoo/yahoo.c:2895 -#: ../libpurple/protocols/yahoo/yahoo.c:3504 +#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33 +#: ../libpurple/protocols/yahoo/yahoo.c:3074 +#: ../libpurple/protocols/yahoo/yahoo.c:3758 msgid "Be Right Back" msgstr "馬上回來" -#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31 +#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31 #: ../libpurple/protocols/novell/novell.c:2822 #: ../libpurple/protocols/novell/novell.c:2952 #: ../libpurple/protocols/silc/buddy.c:1480 #: ../libpurple/protocols/silc/silc.c:56 #: ../libpurple/protocols/silc10/buddy.c:1480 #: ../libpurple/protocols/silc10/silc.c:47 -#: ../libpurple/protocols/yahoo/yahoo.c:2897 -#: ../libpurple/protocols/yahoo/yahoo.c:3507 +#: ../libpurple/protocols/yahoo/yahoo.c:3076 +#: ../libpurple/protocols/yahoo/yahoo.c:3761 msgid "Busy" msgstr "忙碌" -#: ../libpurple/protocols/msn/msn.c:559 -#: ../libpurple/protocols/yahoo/yahoo.c:2905 -#: ../libpurple/protocols/yahoo/yahoo.c:3519 +#: ../libpurple/protocols/msn/msn.c:587 +#: ../libpurple/protocols/yahoo/yahoo.c:3084 +#: ../libpurple/protocols/yahoo/yahoo.c:3773 msgid "On the Phone" msgstr "電話中" -#: ../libpurple/protocols/msn/msn.c:563 -#: ../libpurple/protocols/yahoo/yahoo.c:2909 -#: ../libpurple/protocols/yahoo/yahoo.c:3525 +#: ../libpurple/protocols/msn/msn.c:591 +#: ../libpurple/protocols/yahoo/yahoo.c:3088 +#: ../libpurple/protocols/yahoo/yahoo.c:3779 msgid "Out to Lunch" msgstr "外出用餐" -#: ../libpurple/protocols/msn/msn.c:591 +#: ../libpurple/protocols/msn/msn.c:619 msgid "Set Friendly Name..." msgstr "設定暱稱..." -#: ../libpurple/protocols/msn/msn.c:596 +#: ../libpurple/protocols/msn/msn.c:624 msgid "Set Home Phone Number..." msgstr "設定住家電話號碼..." -#: ../libpurple/protocols/msn/msn.c:600 +#: ../libpurple/protocols/msn/msn.c:628 msgid "Set Work Phone Number..." msgstr "設定工作電話號碼..." -#: ../libpurple/protocols/msn/msn.c:604 +#: ../libpurple/protocols/msn/msn.c:632 msgid "Set Mobile Phone Number..." msgstr "設定行動電話號碼..." -#: ../libpurple/protocols/msn/msn.c:610 +#: ../libpurple/protocols/msn/msn.c:638 msgid "Enable/Disable Mobile Devices..." msgstr "開啟 / 關閉行動裝置..." -#: ../libpurple/protocols/msn/msn.c:615 +#: ../libpurple/protocols/msn/msn.c:643 msgid "Allow/Disallow Mobile Pages..." msgstr "允許 / 不允許 Mobile Page..." -#: ../libpurple/protocols/msn/msn.c:626 +#: ../libpurple/protocols/msn/msn.c:654 msgid "Open Hotmail Inbox" msgstr "開啟Hotmail收件匣" -#: ../libpurple/protocols/msn/msn.c:650 +#: ../libpurple/protocols/msn/msn.c:678 msgid "Send to Mobile" msgstr "傳送至行動電話" -#: ../libpurple/protocols/msn/msn.c:660 +#: ../libpurple/protocols/msn/msn.c:688 #: ../libpurple/protocols/novell/novell.c:3408 msgid "Initiate _Chat" msgstr "開啟聊天室(_C)" # XXX 暫譯 -#: ../libpurple/protocols/msn/msn.c:698 +#: ../libpurple/protocols/msn/msn.c:726 msgid "SSL support is needed for MSN. Please install a supported SSL library." msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。" -#: ../libpurple/protocols/msn/msn.c:723 +#: ../libpurple/protocols/msn/msn.c:751 msgid "Failed to connect to server." msgstr "無法連線到伺服器。" -#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:784 +#: ../libpurple/protocols/msn/msn.c:1507 ../libpurple/protocols/msn/msn.c:1855 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:808 msgid "Error retrieving profile" msgstr "取得個人資訊時發生錯誤" -#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309 +#: ../libpurple/protocols/msn/msn.c:1578 ../pidgin/plugins/convcolors.c:309 #: ../pidgin/plugins/pidginrc.c:366 msgid "General" msgstr "一般" -#: ../libpurple/protocols/msn/msn.c:1557 -#: ../libpurple/protocols/oscar/oscar.c:3769 +#: ../libpurple/protocols/msn/msn.c:1585 +#: ../libpurple/protocols/myspace/user.c:110 +#: ../libpurple/protocols/oscar/oscar.c:3748 #: ../libpurple/protocols/qq/buddy_info.c:45 -#: ../libpurple/protocols/qq/qq.c:219 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057 +#: ../libpurple/protocols/qq/qq.c:221 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081 msgid "Age" msgstr "年齡" -#: ../libpurple/protocols/msn/msn.c:1559 +#: ../libpurple/protocols/msn/msn.c:1587 #: ../libpurple/protocols/qq/buddy_info.c:51 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096 msgid "Occupation" msgstr "職業" -#: ../libpurple/protocols/msn/msn.c:1560 +#: ../libpurple/protocols/msn/msn.c:1588 +#: ../libpurple/protocols/myspace/user.c:119 #: ../libpurple/protocols/novell/novell.c:1478 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076 #: ../libpurple/protocols/zephyr/zephyr.c:798 #: ../libpurple/protocols/zephyr/zephyr.c:1215 msgid "Location" msgstr "所在位置" -#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757 -#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770 +#: ../libpurple/protocols/msn/msn.c:1593 ../libpurple/protocols/msn/msn.c:1785 +#: ../libpurple/protocols/msn/msn.c:1791 ../libpurple/protocols/msn/msn.c:1798 msgid "Hobbies and Interests" msgstr "嗜好/興趣" -#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691 -#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704 -#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719 +#: ../libpurple/protocols/msn/msn.c:1599 ../libpurple/protocols/msn/msn.c:1719 +#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732 +#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1747 msgid "A Little About Me" msgstr "自我簡介" -#: ../libpurple/protocols/msn/msn.c:1588 +#: ../libpurple/protocols/msn/msn.c:1616 msgid "Social" msgstr "社交" -#: ../libpurple/protocols/msn/msn.c:1590 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062 +#: ../libpurple/protocols/msn/msn.c:1618 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086 msgid "Marital Status" msgstr "婚姻狀況" -#: ../libpurple/protocols/msn/msn.c:1591 +#: ../libpurple/protocols/msn/msn.c:1619 msgid "Interests" msgstr "興趣" -#: ../libpurple/protocols/msn/msn.c:1592 +#: ../libpurple/protocols/msn/msn.c:1620 msgid "Pets" msgstr "寵物" -#: ../libpurple/protocols/msn/msn.c:1593 +#: ../libpurple/protocols/msn/msn.c:1621 msgid "Hometown" msgstr "故鄉" -#: ../libpurple/protocols/msn/msn.c:1594 +#: ../libpurple/protocols/msn/msn.c:1622 msgid "Places Lived" msgstr "居住過的地方" -#: ../libpurple/protocols/msn/msn.c:1595 +#: ../libpurple/protocols/msn/msn.c:1623 msgid "Fashion" msgstr "時尚" -#: ../libpurple/protocols/msn/msn.c:1596 +#: ../libpurple/protocols/msn/msn.c:1624 msgid "Humor" msgstr "幽默" -#: ../libpurple/protocols/msn/msn.c:1597 +#: ../libpurple/protocols/msn/msn.c:1625 msgid "Music" msgstr "音樂" # NOTE 日文po檔及MSN本身均譯「座右銘」 -#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779 -#: ../libpurple/protocols/msn/msn.c:1785 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114 +#: ../libpurple/protocols/msn/msn.c:1626 ../libpurple/protocols/msn/msn.c:1807 +#: ../libpurple/protocols/msn/msn.c:1813 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138 msgid "Favorite Quote" msgstr "座右銘" -#: ../libpurple/protocols/msn/msn.c:1615 +#: ../libpurple/protocols/msn/msn.c:1643 msgid "Contact Info" msgstr "聯絡資訊" -#: ../libpurple/protocols/msn/msn.c:1616 +#: ../libpurple/protocols/msn/msn.c:1644 msgid "Personal" msgstr "個人資料" -#: ../libpurple/protocols/msn/msn.c:1619 +#: ../libpurple/protocols/msn/msn.c:1647 msgid "Significant Other" msgstr "另一半" -#: ../libpurple/protocols/msn/msn.c:1620 +#: ../libpurple/protocols/msn/msn.c:1648 msgid "Home Phone" msgstr "住家電話" -#: ../libpurple/protocols/msn/msn.c:1621 +#: ../libpurple/protocols/msn/msn.c:1649 msgid "Home Phone 2" msgstr "住家電話2" -#: ../libpurple/protocols/msn/msn.c:1622 -#: ../libpurple/protocols/oscar/oscar.c:3807 +#: ../libpurple/protocols/msn/msn.c:1650 +#: ../libpurple/protocols/oscar/oscar.c:3786 msgid "Home Address" msgstr "住家地址" -#: ../libpurple/protocols/msn/msn.c:1623 +#: ../libpurple/protocols/msn/msn.c:1651 msgid "Personal Mobile" msgstr "個人行動電話" -#: ../libpurple/protocols/msn/msn.c:1624 +#: ../libpurple/protocols/msn/msn.c:1652 msgid "Home Fax" msgstr "住家傳真" -#: ../libpurple/protocols/msn/msn.c:1625 +#: ../libpurple/protocols/msn/msn.c:1653 msgid "Personal E-Mail" msgstr "個人電子郵件" -#: ../libpurple/protocols/msn/msn.c:1626 +#: ../libpurple/protocols/msn/msn.c:1654 msgid "Personal IM" msgstr "個人即時訊息帳號" -#: ../libpurple/protocols/msn/msn.c:1628 +#: ../libpurple/protocols/msn/msn.c:1656 msgid "Anniversary" msgstr "週年紀念日" #. Business -#: ../libpurple/protocols/msn/msn.c:1644 +#: ../libpurple/protocols/msn/msn.c:1672 msgid "Work" msgstr "工作資料" -#: ../libpurple/protocols/msn/msn.c:1646 +#: ../libpurple/protocols/msn/msn.c:1674 #: ../libpurple/protocols/silc/ops.c:1010 #: ../libpurple/protocols/silc10/ops.c:1044 msgid "Job Title" msgstr "職銜" -#: ../libpurple/protocols/msn/msn.c:1647 -#: ../libpurple/protocols/oscar/oscar.c:3828 +#: ../libpurple/protocols/msn/msn.c:1675 +#: ../libpurple/protocols/oscar/oscar.c:3807 msgid "Company" msgstr "公司名稱" -#: ../libpurple/protocols/msn/msn.c:1648 +#: ../libpurple/protocols/msn/msn.c:1676 #: ../libpurple/protocols/novell/novell.c:1480 msgid "Department" msgstr "所屬部門" -#: ../libpurple/protocols/msn/msn.c:1649 +#: ../libpurple/protocols/msn/msn.c:1677 msgid "Profession" msgstr "專業" -#: ../libpurple/protocols/msn/msn.c:1650 +#: ../libpurple/protocols/msn/msn.c:1678 msgid "Work Phone" msgstr "商務電話" -#: ../libpurple/protocols/msn/msn.c:1651 +#: ../libpurple/protocols/msn/msn.c:1679 msgid "Work Phone 2" msgstr "商務電話2" -#: ../libpurple/protocols/msn/msn.c:1652 -#: ../libpurple/protocols/oscar/oscar.c:3820 +#: ../libpurple/protocols/msn/msn.c:1680 +#: ../libpurple/protocols/oscar/oscar.c:3799 msgid "Work Address" msgstr "工作地址" -#: ../libpurple/protocols/msn/msn.c:1653 +#: ../libpurple/protocols/msn/msn.c:1681 msgid "Work Mobile" msgstr "商務行動電話" -#: ../libpurple/protocols/msn/msn.c:1654 +#: ../libpurple/protocols/msn/msn.c:1682 msgid "Work Pager" msgstr "商務呼叫器" -#: ../libpurple/protocols/msn/msn.c:1655 +#: ../libpurple/protocols/msn/msn.c:1683 msgid "Work Fax" msgstr "商務傳真" -#: ../libpurple/protocols/msn/msn.c:1656 +#: ../libpurple/protocols/msn/msn.c:1684 msgid "Work E-Mail" msgstr "商務電子郵件" -#: ../libpurple/protocols/msn/msn.c:1657 +#: ../libpurple/protocols/msn/msn.c:1685 msgid "Work IM" msgstr "商務即時訊息帳號" -#: ../libpurple/protocols/msn/msn.c:1658 +#: ../libpurple/protocols/msn/msn.c:1686 msgid "Start Date" msgstr "開始日期" -#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734 -#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748 +#: ../libpurple/protocols/msn/msn.c:1756 ../libpurple/protocols/msn/msn.c:1762 +#: ../libpurple/protocols/msn/msn.c:1769 ../libpurple/protocols/msn/msn.c:1776 msgid "Favorite Things" msgstr "喜愛事物" -#: ../libpurple/protocols/msn/msn.c:1793 +#: ../libpurple/protocols/msn/msn.c:1821 msgid "Last Updated" msgstr "更新日期" -#: ../libpurple/protocols/msn/msn.c:1804 +#: ../libpurple/protocols/msn/msn.c:1832 #: ../libpurple/protocols/qq/buddy_info.c:60 #: ../libpurple/protocols/silc/ops.c:1026 #: ../libpurple/protocols/silc10/ops.c:1060 msgid "Homepage" msgstr "網頁" -#: ../libpurple/protocols/msn/msn.c:1828 +#: ../libpurple/protocols/msn/msn.c:1856 msgid "The user has not created a public profile." msgstr "這個使用者未有建立公開的個人資料。" -#: ../libpurple/protocols/msn/msn.c:1829 +#: ../libpurple/protocols/msn/msn.c:1857 msgid "" "MSN reported not being able to find the user's profile. This either means " "that the user does not exist, or that the user exists but has not created a " @@ -6031,15 +7115,15 @@ "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在；亦有可能使" "用者存在，但沒有建立公開的個人資料。" -#: ../libpurple/protocols/msn/msn.c:1833 +#: ../libpurple/protocols/msn/msn.c:1861 msgid "" "Could not find any information in the user's profile. The user most likely " "does not exist." msgstr "" "在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。" -#: ../libpurple/protocols/msn/msn.c:1841 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216 +#: ../libpurple/protocols/msn/msn.c:1869 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240 msgid "Profile URL" msgstr "個人資料網址" @@ -6053,19 +7137,19 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129 +#: ../libpurple/protocols/msn/msn.c:2155 ../libpurple/protocols/msn/msn.c:2157 msgid "MSN Protocol Plugin" msgstr "MSN 協定模組" -#: ../libpurple/protocols/msn/msn.c:2163 +#: ../libpurple/protocols/msn/msn.c:2191 msgid "Use HTTP Method" msgstr "使用 HTTP 方式" -#: ../libpurple/protocols/msn/msn.c:2168 +#: ../libpurple/protocols/msn/msn.c:2196 msgid "Show custom smileys" msgstr "顯示使用者圖示" -#: ../libpurple/protocols/msn/msn.c:2176 +#: ../libpurple/protocols/msn/msn.c:2204 msgid "nudge: nudge a user to get their attention" msgstr "nudge：呼叫使用者，引起他們的注意" @@ -6084,8 +7168,8 @@ #: ../libpurple/protocols/qq/udp_proxy_s5.c:268 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332 -#: ../libpurple/protocols/yahoo/yahoochat.c:1320 -#: ../libpurple/protocols/yahoo/yahoochat.c:1346 +#: ../libpurple/protocols/yahoo/yahoochat.c:1416 +#: ../libpurple/protocols/yahoo/yahoochat.c:1442 msgid "Unable to connect" msgstr "無法連線" @@ -6206,8 +7290,8 @@ msgstr "解析 HTTP 途中發生錯誤。" #: ../libpurple/protocols/msn/session.c:307 -#: ../libpurple/protocols/oscar/oscar.c:3481 -#: ../libpurple/protocols/yahoo/yahoo.c:202 +#: ../libpurple/protocols/oscar/flap_connection.c:384 +#: ../libpurple/protocols/yahoo/yahoo.c:205 msgid "You have signed on from another location." msgstr "您由其他的地方登入。" @@ -6230,10 +7314,11 @@ "Your MSN buddy list is temporarily unavailable. Please wait and try again." msgstr "暫時無法取得您的好友清單，請過一會後重試。" +# See cnscode.org.tw #: ../libpurple/protocols/msn/session.c:346 #: ../libpurple/protocols/msn/session.c:348 msgid "Handshaking" -msgstr "交談中" +msgstr "交握中" #: ../libpurple/protocols/msn/session.c:349 msgid "Starting authentication" @@ -6300,30 +7385,430 @@ msgid "Message may have not been sent because an unknown error occurred:" msgstr "因為發生不明的錯誤，訊息可能沒有送出：" -#: ../libpurple/protocols/msn/switchboard.c:963 -#, c-format -msgid "%s just sent you a Nudge!" -msgstr "%s 在呼叫您！" - -#: ../libpurple/protocols/msn/userlist.c:250 +#: ../libpurple/protocols/msn/userlist.c:252 #, c-format msgid "%s has added you to his or her buddy list." msgstr "%s 將您加入他（她）的好友清單。" -#: ../libpurple/protocols/msn/userlist.c:319 +#: ../libpurple/protocols/msn/userlist.c:321 #, c-format msgid "%s has removed you from his or her buddy list." msgstr "%s 將您從他（她）的好友清單中移除。" -#: ../libpurple/protocols/msn/userlist.c:641 +#: ../libpurple/protocols/msn/userlist.c:643 #, c-format msgid "Unable to add \"%s\"." msgstr "無法新增「%s」。" -#: ../libpurple/protocols/msn/userlist.c:643 +#: ../libpurple/protocols/msn/userlist.c:645 msgid "The screen name specified is invalid." msgstr "您所輸入的帳號無效。" +# XXX 暫譯 - 20061025/20070912 +#: ../libpurple/protocols/myspace/myspace.c:111 +msgid "Missing Cipher" +msgstr "欠缺需要的加密方法" + +# XXX 暫譯 - 20061025/20070912 +#: ../libpurple/protocols/myspace/myspace.c:112 +msgid "The RC4 cipher could not be found" +msgstr "找不到 RC4 加密方法" + +#: ../libpurple/protocols/myspace/myspace.c:113 +msgid "" +"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will " +"not be loaded." +msgstr "" +"無法載入 MySpaceIM 模組。請升級至有 RC4 支援的 libpurple（即 2.0.1 版為以" +"上）。" + +#: ../libpurple/protocols/myspace/myspace.c:286 +#, c-format +msgid "" +"Sorry, passwords over %d characters in length (yours is %d) are not " +"supported by MySpace." +msgstr "MySpace 恕不支援長於 %d 個字元的密碼，而您的密碼已是 %d 個字元長。" + +#. Notify an error message also, because this is important! +#: ../libpurple/protocols/myspace/myspace.c:292 +#: ../libpurple/protocols/myspace/myspace.c:1795 +msgid "MySpaceIM Error" +msgstr "MySpaceIM 錯誤" + +# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西 +#: ../libpurple/protocols/myspace/myspace.c:348 +msgid "Reading challenge" +msgstr "讀取驗證挑戰中" + +# XXX 好像有些怪，譯文有待改進 +#: ../libpurple/protocols/myspace/myspace.c:354 +#, fuzzy +msgid "Unexpected challenge length from server" +msgstr "伺服器送來的驗證挑戰有意料之外的長度" + +#: ../libpurple/protocols/myspace/myspace.c:358 +msgid "Logging in" +msgstr "登入中" + +#: ../libpurple/protocols/myspace/myspace.c:1276 +#, c-format +msgid "Connection to server lost (no data received within %d seconds)" +msgstr "與伺服器失去連線（%d 秒內收不到任何數據）" + +#. Can't write _()'d strings in array initializers. Workaround. +#: ../libpurple/protocols/myspace/myspace.c:1319 +msgid "New mail messages" +msgstr "有新郵件" + +#: ../libpurple/protocols/myspace/myspace.c:1320 +msgid "New blog comments" +msgstr "網誌有新留言" + +#: ../libpurple/protocols/myspace/myspace.c:1321 +msgid "New profile comments" +msgstr "個人資料網頁有新留言" + +# FIXME 譯文很不通順 - acli 20070913 +#: ../libpurple/protocols/myspace/myspace.c:1322 +msgid "New friend requests!" +msgstr "有新的交友要求！" + +#: ../libpurple/protocols/myspace/myspace.c:1323 +msgid "New picture comments" +msgstr "相片集有新留言" + +#: ../libpurple/protocols/myspace/myspace.c:1353 +msgid "MySpace" +msgstr "MySpace" + +# TODO 要覆查 - 20061027 +#. The session is now set up, ready to be connected. This emits the +#. * signedOn signal, so clients can now do anything with msimprpl, and +#. * we're ready for it (session key, userid, username all setup). +#: ../libpurple/protocols/myspace/myspace.c:1537 +#: ../libpurple/protocols/sametime/sametime.c:1544 +msgid "Connected" +msgstr "已連結" + +#: ../libpurple/protocols/myspace/myspace.c:1548 +#: ../libpurple/protocols/myspace/myspace.c:1550 +msgid "No username set" +msgstr "未有設定使用者名稱" + +#: ../libpurple/protocols/myspace/myspace.c:1549 +msgid "" +"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile." +"username and choose a username and try to login again." +msgstr "" +"請到 http://editprofile.myspace.com/index.cfm?fuseaction=profile.username 選" +"擇一個使用者名稱後，再嘗試重新登入。" + +#: ../libpurple/protocols/myspace/myspace.c:1776 +#, c-format +msgid "Protocol error, code %d: %s" +msgstr "通訊協定錯誤，代碼 %d：%s" + +#: ../libpurple/protocols/myspace/myspace.c:1966 +#: ../libpurple/protocols/myspace/myspace.c:2000 +msgid "Failed to add buddy" +msgstr "無法新增好友" + +#: ../libpurple/protocols/myspace/myspace.c:1966 +msgid "'addbuddy' command failed." +msgstr "「addbuddy」指令失敗。" + +#: ../libpurple/protocols/myspace/myspace.c:2000 +#: ../libpurple/protocols/myspace/myspace.c:2241 +msgid "persist command failed" +msgstr "「persist」指令失敗" + +#: ../libpurple/protocols/myspace/myspace.c:2109 +#, c-format +msgid "No such user: %s" +msgstr "無此使用者：%s" + +#: ../libpurple/protocols/myspace/myspace.c:2110 +msgid "User lookup" +msgstr "搜尋使用者" + +#: ../libpurple/protocols/myspace/myspace.c:2222 +#: ../libpurple/protocols/myspace/myspace.c:2241 +#: ../libpurple/protocols/myspace/myspace.c:2263 +msgid "Failed to remove buddy" +msgstr "無法移除使用者" + +#: ../libpurple/protocols/myspace/myspace.c:2222 +msgid "'delbuddy' command failed" +msgstr "「delbuddy」指令失敗" + +#: ../libpurple/protocols/myspace/myspace.c:2263 +msgid "blocklist command failed" +msgstr "「blocklist」指令失敗" + +#: ../libpurple/protocols/myspace/myspace.c:2309 +#, fuzzy +msgid "Invalid input condition" +msgstr "完成連線" + +#. TODO: g_realloc like msn, yahoo, irc, jabber? +#: ../libpurple/protocols/myspace/myspace.c:2327 +#: ../libpurple/protocols/myspace/myspace.c:2358 +msgid "Read buffer full" +msgstr "讀取用的暫存區滿了" + +#: ../libpurple/protocols/myspace/myspace.c:2396 +msgid "Unparseable message" +msgstr "無法解析訊息" + +#: ../libpurple/protocols/myspace/myspace.c:2465 +#, c-format +msgid "Couldn't connect to host: %s (%d)" +msgstr "無法連到伺服器：%s (%d)" + +# NOTE 這是群組名稱 +#: ../libpurple/protocols/myspace/myspace.c:2636 +msgid "IM Friends" +msgstr "即時訊息的好友" + +#: ../libpurple/protocols/myspace/myspace.c:2735 +#, c-format +msgid "" +"%d buddies were added or updated from the server (including buddies already " +"on the server-side list)" +msgstr "從伺服器新增或更新了 %d 個好友（包括已在好友清單上的好友）" + +#: ../libpurple/protocols/myspace/myspace.c:2736 +msgid "Add contacts from server" +msgstr "從伺服器加入聯絡人" + +#: ../libpurple/protocols/myspace/myspace.c:2788 +#: ../libpurple/protocols/myspace/myspace.c:2853 +msgid "Add friends from MySpace.com" +msgstr "從 MySpace.com 新增好友" + +#: ../libpurple/protocols/myspace/myspace.c:2789 +msgid "Importing friends failed" +msgstr "匯入好友失敗" + +#. TODO: find out how +#: ../libpurple/protocols/myspace/myspace.c:2845 +msgid "Find people..." +msgstr "尋找好友..." + +#: ../libpurple/protocols/myspace/myspace.c:2848 +msgid "Change IM name..." +msgstr "變更即時通訊名稱..." + +# NOTE 這似乎是視窗標題 +#: ../libpurple/protocols/myspace/myspace.c:3150 +msgid "myim URL handler" +msgstr "myim 網址處理器" + +#: ../libpurple/protocols/myspace/myspace.c:3151 +msgid "No suitable MySpaceIM account could be found to open this myim URL." +msgstr "無法找可以開啟這個 myim 網址的 MySpaceIM 帳號。" + +#: ../libpurple/protocols/myspace/myspace.c:3152 +msgid "Enable the proper MySpaceIM account and try again." +msgstr "請啟用合適的 MySpaceIM 帳號後再重試。" + +#: ../libpurple/protocols/myspace/myspace.c:3275 +msgid "Show display name in status text" +msgstr "在狀態列顯示暱稱" + +#: ../libpurple/protocols/myspace/myspace.c:3278 +msgid "Show headline in status text" +msgstr "在狀態列顯示標題" + +#: ../libpurple/protocols/myspace/myspace.c:3283 +msgid "Send emoticons" +msgstr "傳送表情圖示" + +#: ../libpurple/protocols/myspace/myspace.c:3288 +msgid "Screen resolution (dots per inch)" +msgstr "熒幕解像度（DPI）" + +#: ../libpurple/protocols/myspace/myspace.c:3291 +msgid "Base font size (points)" +msgstr "基礎字體大小(點)" + +#: ../libpurple/protocols/myspace/user.c:95 +#: ../libpurple/protocols/zephyr/zephyr.c:786 +#: ../libpurple/protocols/zephyr/zephyr.c:1204 +msgid "User" +msgstr "使用者" + +#. TODO: link to username, if available +#: ../libpurple/protocols/myspace/user.c:102 +#: ../libpurple/protocols/oscar/oscar.c:2957 +msgid "Profile" +msgstr "個人資料" + +#: ../libpurple/protocols/myspace/user.c:124 +msgid "Headline" +msgstr "頭條消息" + +#: ../libpurple/protocols/myspace/user.c:129 +msgid "Song" +msgstr "歌曲" + +#: ../libpurple/protocols/myspace/user.c:134 +msgid "Total Friends" +msgstr "好友總數" + +#: ../libpurple/protocols/myspace/user.c:145 +#: ../libpurple/protocols/myspace/user.c:148 +#: ../libpurple/protocols/myspace/user.c:151 +msgid "Client Version" +msgstr "客戶端版本" + +#. TODO: icons for each zap +#: ../libpurple/protocols/myspace/zap.c:44 +#: ../libpurple/protocols/myspace/zap.c:177 +msgid "Zap" +msgstr "電" + +#: ../libpurple/protocols/myspace/zap.c:44 +#, fuzzy, c-format +msgid "%s has zapped you!" +msgstr "%s 已將您 [%s] 加入到他（她）的好友清單" + +#: ../libpurple/protocols/myspace/zap.c:44 +#, fuzzy, c-format +msgid "Zapping %s..." +msgstr "呼叫 %s" + +#: ../libpurple/protocols/myspace/zap.c:45 +msgid "Whack" +msgstr "摑" + +#: ../libpurple/protocols/myspace/zap.c:45 +#, fuzzy, c-format +msgid "%s has whacked you!" +msgstr "%s 已將您 [%s] 加入到他（她）的好友清單" + +#: ../libpurple/protocols/myspace/zap.c:45 +#, c-format +msgid "Whacking %s..." +msgstr "摑 %s 中..." + +#: ../libpurple/protocols/myspace/zap.c:46 +#, fuzzy +msgid "Torch" +msgstr "主題" + +#: ../libpurple/protocols/myspace/zap.c:46 +#, fuzzy, c-format +msgid "%s has torched you!" +msgstr "該使用者拒絕了您" + +#: ../libpurple/protocols/myspace/zap.c:46 +#, c-format +msgid "Torching %s..." +msgstr "燒 %s 中..." + +#: ../libpurple/protocols/myspace/zap.c:47 +msgid "Smooch" +msgstr "親吻" + +#: ../libpurple/protocols/myspace/zap.c:47 +#, fuzzy, c-format +msgid "%s has smooched you!" +msgstr "%s 已經登入。" + +#: ../libpurple/protocols/myspace/zap.c:47 +#, c-format +msgid "Smooching %s..." +msgstr "親吻 %s 中..." + +#: ../libpurple/protocols/myspace/zap.c:48 +msgid "Hug" +msgstr "擁抱" + +#: ../libpurple/protocols/myspace/zap.c:48 +#, fuzzy, c-format +msgid "%s has hugged you!" +msgstr "%s 已經登入。" + +#: ../libpurple/protocols/myspace/zap.c:48 +#, c-format +msgid "Hugging %s..." +msgstr "擁抱 %s 中..." + +#: ../libpurple/protocols/myspace/zap.c:49 +#, fuzzy +msgid "Slap" +msgstr "斯洛伐克文" + +#: ../libpurple/protocols/myspace/zap.c:49 +#, fuzzy, c-format +msgid "%s has slapped you!" +msgstr "%s 已將您 [%s] 加入到他（她）的好友清單" + +#: ../libpurple/protocols/myspace/zap.c:49 +#, c-format +msgid "Slapping %s..." +msgstr "" + +#: ../libpurple/protocols/myspace/zap.c:50 +msgid "Goose" +msgstr "掐屁股" + +#: ../libpurple/protocols/myspace/zap.c:50 +#, c-format +msgid "%s has goosed you!" +msgstr "%s 掐了您的屁股！" + +#: ../libpurple/protocols/myspace/zap.c:50 +#, c-format +msgid "Goosing %s..." +msgstr "掐 %s 的屁股中..." + +# TODO Untranslated +#: ../libpurple/protocols/myspace/zap.c:51 +msgid "High-five" +msgstr "High-five" + +# TODO Untranslated +#: ../libpurple/protocols/myspace/zap.c:51 +#, c-format +msgid "%s has high-fived you!" +msgstr "%s high-five 了您！" + +# TODO Untranslated +#: ../libpurple/protocols/myspace/zap.c:51 +#, c-format +msgid "High-fiving %s..." +msgstr "High-five %s 中..." + +#: ../libpurple/protocols/myspace/zap.c:52 +msgid "Punk" +msgstr "" + +#: ../libpurple/protocols/myspace/zap.c:52 +#, fuzzy, c-format +msgid "%s has punk'd you!" +msgstr "%s 已經登入。" + +#: ../libpurple/protocols/myspace/zap.c:52 +#, c-format +msgid "Punking %s..." +msgstr "" + +#: ../libpurple/protocols/myspace/zap.c:53 +msgid "Raspberry" +msgstr "" + +#: ../libpurple/protocols/myspace/zap.c:53 +#, c-format +msgid "%s has raspberried you!" +msgstr "" + +#: ../libpurple/protocols/myspace/zap.c:53 +#, c-format +msgid "Raspberrying %s..." +msgstr "" + #: ../libpurple/protocols/novell/nmuser.c:1864 msgid "Required parameters not passed in" msgstr "沒有提供所需的參數" @@ -6675,18 +8160,18 @@ msgid "Server port" msgstr "伺服器通訊埠" -#: ../libpurple/protocols/oscar/flap_connection.c:379 -#: ../libpurple/protocols/yahoo/yahoo.c:2292 -#: ../libpurple/protocols/yahoo/yahoo.c:2459 +#: ../libpurple/protocols/oscar/flap_connection.c:387 +#: ../libpurple/protocols/yahoo/yahoo.c:2466 +#: ../libpurple/protocols/yahoo/yahoo.c:2633 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580 #: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436 msgid "Server closed the connection." msgstr "伺服器關閉連線。" -#: ../libpurple/protocols/oscar/flap_connection.c:381 -#: ../libpurple/protocols/yahoo/yahoo.c:2286 -#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592 +#: ../libpurple/protocols/oscar/flap_connection.c:389 +#: ../libpurple/protocols/yahoo/yahoo.c:2460 +#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220 #: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448 #, c-format @@ -6697,7 +8182,7 @@ "與伺服器之間的連線突然中斷:\n" "%s" -#: ../libpurple/protocols/oscar/flap_connection.c:384 +#: ../libpurple/protocols/oscar/flap_connection.c:392 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233 #: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404 #: ../libpurple/proxy.c:1461 @@ -6735,7 +8220,7 @@ msgstr "ICQ 協定模組" #: ../libpurple/protocols/oscar/libicq.c:147 -#: ../libpurple/protocols/yahoo/yahoo.c:4111 +#: ../libpurple/protocols/yahoo/yahoo.c:4407 #: ../libpurple/protocols/zephyr/zephyr.c:2997 msgid "Encoding" msgstr "編碼" @@ -6765,7 +8250,7 @@ msgid "Direct IM established" msgstr "即時訊息已經建立" -#: ../libpurple/protocols/oscar/oft.c:657 +#: ../libpurple/protocols/oscar/oft.c:656 #, c-format msgid "File %s is %s, which is larger than the maximum size of %s." msgstr "檔案「%s」大小為 %s，超過了 %s 這個上限。" @@ -6871,7 +8356,7 @@ msgid "Not while on AOL" msgstr "在 AOL 時不允許" -#: ../libpurple/protocols/oscar/oscar.c:348 +#: ../libpurple/protocols/oscar/oscar.c:347 msgid "" "(There was an error receiving this message. The buddy you are speaking with " "is probably using a different encoding than expected. If you know what " @@ -6882,7 +8367,7 @@ "編碼；如果您知道那是什麼編碼，請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」" "欄位指定。）" -#: ../libpurple/protocols/oscar/oscar.c:457 +#: ../libpurple/protocols/oscar/oscar.c:456 #, c-format msgid "" "(There was an error receiving this message. Either you and %s have " @@ -6892,22 +8377,22 @@ "用有問題的用戶端程式。）" #. Label -#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2359 -#: ../pidgin/gtkutils.c:2389 +#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386 +#: ../pidgin/gtkutils.c:2416 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334 msgid "Buddy Icon" msgstr "好友圖示" -#: ../libpurple/protocols/oscar/oscar.c:642 +#: ../libpurple/protocols/oscar/oscar.c:641 msgid "Voice" msgstr "聲音" # NOTE 將「直接消息」改譯為「即時訊息」 -#: ../libpurple/protocols/oscar/oscar.c:645 +#: ../libpurple/protocols/oscar/oscar.c:644 msgid "AIM Direct IM" msgstr "AIM 式即時訊息" -#: ../libpurple/protocols/oscar/oscar.c:648 +#: ../libpurple/protocols/oscar/oscar.c:647 #: ../libpurple/protocols/silc/silc.c:768 #: ../libpurple/protocols/silc/util.c:553 #: ../libpurple/protocols/silc10/silc.c:679 @@ -6915,33 +8400,33 @@ msgid "Chat" msgstr "聊天" -#: ../libpurple/protocols/oscar/oscar.c:651 -#: ../libpurple/protocols/oscar/oscar.c:5989 +#: ../libpurple/protocols/oscar/oscar.c:650 +#: ../libpurple/protocols/oscar/oscar.c:5994 msgid "Get File" msgstr "接收檔案" -#: ../libpurple/protocols/oscar/oscar.c:658 +#: ../libpurple/protocols/oscar/oscar.c:657 msgid "Games" msgstr "遊戲" -#: ../libpurple/protocols/oscar/oscar.c:661 +#: ../libpurple/protocols/oscar/oscar.c:660 msgid "Add-Ins" msgstr "模組" -#: ../libpurple/protocols/oscar/oscar.c:664 +#: ../libpurple/protocols/oscar/oscar.c:663 msgid "Send Buddy List" msgstr "送出好友清單" -#: ../libpurple/protocols/oscar/oscar.c:667 +#: ../libpurple/protocols/oscar/oscar.c:666 msgid "ICQ Direct Connect" msgstr "ICQ 式直接連線" # NOTE 據其他PO檔的譯文看，「AP」應該不是「應用程式」 -#: ../libpurple/protocols/oscar/oscar.c:670 +#: ../libpurple/protocols/oscar/oscar.c:669 msgid "AP User" msgstr "AP 使用者" -#: ../libpurple/protocols/oscar/oscar.c:673 +#: ../libpurple/protocols/oscar/oscar.c:672 msgid "ICQ RTF" msgstr "ICQ RTF" @@ -6952,100 +8437,101 @@ # NOTE (18:17:29) KingAnt: Right... # NOTE (18:17:36) wing: what does that mean though? # NOTE (18:17:48) KingAnt: I have no idea--probably nothing -#: ../libpurple/protocols/oscar/oscar.c:676 +#: ../libpurple/protocols/oscar/oscar.c:675 msgid "Nihilist" msgstr "Nihilist" -#: ../libpurple/protocols/oscar/oscar.c:679 +#: ../libpurple/protocols/oscar/oscar.c:678 msgid "ICQ Server Relay" msgstr "ICQ 伺服器轉送" -#: ../libpurple/protocols/oscar/oscar.c:682 +#: ../libpurple/protocols/oscar/oscar.c:681 msgid "Old ICQ UTF8" msgstr "舊式 ICQ UTF8" -#: ../libpurple/protocols/oscar/oscar.c:685 +#: ../libpurple/protocols/oscar/oscar.c:684 msgid "Trillian Encryption" msgstr "Trillian 加密" -#: ../libpurple/protocols/oscar/oscar.c:688 +#: ../libpurple/protocols/oscar/oscar.c:687 msgid "ICQ UTF8" msgstr "ICQ UTF8" # NOTE 這似乎是一種掌上電腦的牌子 -#: ../libpurple/protocols/oscar/oscar.c:691 +#: ../libpurple/protocols/oscar/oscar.c:690 msgid "Hiptop" msgstr "Hiptop" -#: ../libpurple/protocols/oscar/oscar.c:694 +#: ../libpurple/protocols/oscar/oscar.c:693 msgid "Security Enabled" msgstr "有保安功能" # XXX 暫譯 -#: ../libpurple/protocols/oscar/oscar.c:697 +#: ../libpurple/protocols/oscar/oscar.c:696 msgid "Video Chat" msgstr "視像聊天" # XXX 暫譯 -#: ../libpurple/protocols/oscar/oscar.c:701 +#: ../libpurple/protocols/oscar/oscar.c:700 msgid "iChat AV" msgstr "iChat 視像聊天" -#: ../libpurple/protocols/oscar/oscar.c:704 +#: ../libpurple/protocols/oscar/oscar.c:703 msgid "Live Video" msgstr "動態視訊" # NOTE AIM_CAPS_CAMERA，即是什麼呢(^^;) -#: ../libpurple/protocols/oscar/oscar.c:707 +#: ../libpurple/protocols/oscar/oscar.c:706 msgid "Camera" msgstr "照相機" -#: ../libpurple/protocols/oscar/oscar.c:725 -#: ../libpurple/protocols/oscar/oscar.c:5759 +#: ../libpurple/protocols/oscar/oscar.c:724 +#: ../libpurple/protocols/oscar/oscar.c:5764 msgid "Free For Chat" msgstr "我有空聊天" -#: ../libpurple/protocols/oscar/oscar.c:729 -#: ../libpurple/protocols/oscar/oscar.c:5794 +#: ../libpurple/protocols/oscar/oscar.c:728 +#: ../libpurple/protocols/oscar/oscar.c:5799 msgid "Not Available" msgstr "長時間離開" -#: ../libpurple/protocols/oscar/oscar.c:731 -#: ../libpurple/protocols/oscar/oscar.c:5780 +#: ../libpurple/protocols/oscar/oscar.c:730 +#: ../libpurple/protocols/oscar/oscar.c:5785 msgid "Occupied" msgstr "忙碌" # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html -#: ../libpurple/protocols/oscar/oscar.c:735 +#: ../libpurple/protocols/oscar/oscar.c:734 msgid "Web Aware" msgstr "允許其他使用者在網路上查看您目前的狀態" -#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183 -#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156 -#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058 +#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183 +#: ../libpurple/protocols/qq/qq.c:288 +#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156 +#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059 msgid "Invisible" msgstr "隱身" -#: ../libpurple/protocols/oscar/oscar.c:739 +#: ../libpurple/protocols/oscar/oscar.c:738 msgid "Online" msgstr "上線" -#: ../libpurple/protocols/oscar/oscar.c:838 -#: ../libpurple/protocols/oscar/oscar.c:3721 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1121 +#: ../libpurple/protocols/oscar/oscar.c:837 +#: ../libpurple/protocols/oscar/oscar.c:3700 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125 msgid "IP Address" msgstr "IP 位址" -#: ../libpurple/protocols/oscar/oscar.c:845 -#: ../libpurple/protocols/oscar/oscar.c:2867 +#: ../libpurple/protocols/oscar/oscar.c:844 +#: ../libpurple/protocols/oscar/oscar.c:2884 msgid "Warning Level" msgstr "警告等級" -#: ../libpurple/protocols/oscar/oscar.c:855 +#: ../libpurple/protocols/oscar/oscar.c:854 msgid "Buddy Comment" msgstr "好友說明" -#: ../libpurple/protocols/oscar/oscar.c:995 +#: ../libpurple/protocols/oscar/oscar.c:994 #, c-format msgid "" "Could not connect to authentication server:\n" @@ -7054,7 +8540,7 @@ "無法連線至認證伺服器：\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:1003 +#: ../libpurple/protocols/oscar/oscar.c:1002 #, c-format msgid "" "Could not connect to BOS server:\n" @@ -7063,20 +8549,20 @@ "無法連線到 BOS 伺服器：\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:1043 +#: ../libpurple/protocols/oscar/oscar.c:1042 msgid "Screen name sent" msgstr "送出帳號" -#: ../libpurple/protocols/oscar/oscar.c:1048 +#: ../libpurple/protocols/oscar/oscar.c:1047 msgid "Connection established, cookie sent" msgstr "連線已建立，並已送出 Cookie" #. TODO: Don't call this with ssi -#: ../libpurple/protocols/oscar/oscar.c:1077 +#: ../libpurple/protocols/oscar/oscar.c:1076 msgid "Finalizing connection" msgstr "完成連線" -#: ../libpurple/protocols/oscar/oscar.c:1261 +#: ../libpurple/protocols/oscar/oscar.c:1258 #, c-format msgid "" "Unable to login: Could not sign on as %s because the screen name is " @@ -7086,31 +8572,31 @@ "無法登入：無法以 %s 身份登入，因為這個帳號是無效的。帳號必須為有效電郵地址；" "或者以英文字母起始，並只含英文字母、數字及空白；或者只由數字組成。" -#: ../libpurple/protocols/oscar/oscar.c:1346 -#: ../libpurple/protocols/yahoo/yahoo.c:1934 +#: ../libpurple/protocols/oscar/oscar.c:1343 +#: ../libpurple/protocols/yahoo/yahoo.c:2102 msgid "Invalid screen name." msgstr "帳號無效。" -#: ../libpurple/protocols/oscar/oscar.c:1353 +#: ../libpurple/protocols/oscar/oscar.c:1350 #: ../libpurple/protocols/qq/login_logout.c:483 -#: ../libpurple/protocols/simple/simple.c:1037 -#: ../libpurple/protocols/yahoo/yahoo.c:1952 +#: ../libpurple/protocols/simple/simple.c:1039 +#: ../libpurple/protocols/yahoo/yahoo.c:2123 msgid "Incorrect password." msgstr "錯誤的密碼。" -#: ../libpurple/protocols/oscar/oscar.c:1358 +#: ../libpurple/protocols/oscar/oscar.c:1355 msgid "Your account is currently suspended." msgstr "您的帳號目前停用中。" # NOTE「暫時無法使用」應該比「暫時不存在」通順 # NOTE 譯文更動 by Ambrose #. service temporarily unavailable -#: ../libpurple/protocols/oscar/oscar.c:1362 +#: ../libpurple/protocols/oscar/oscar.c:1359 msgid "The AOL Instant Messenger service is temporarily unavailable." msgstr "暫時無法使用 AOL 即時訊息服務。" -#: ../libpurple/protocols/oscar/oscar.c:1367 -#: ../libpurple/protocols/oscar/oscar.c:1378 +#: ../libpurple/protocols/oscar/oscar.c:1364 +#: ../libpurple/protocols/oscar/oscar.c:1375 msgid "" "You have been connecting and disconnecting too frequently. Wait ten minutes " "and try again. If you continue to try, you will need to wait even longer." @@ -7118,44 +8604,44 @@ "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連" "線，那麼您的等待時間將會更加的延長。" -#: ../libpurple/protocols/oscar/oscar.c:1372 +#: ../libpurple/protocols/oscar/oscar.c:1369 #, c-format msgid "The client version you are using is too old. Please upgrade at %s" msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新" -#: ../libpurple/protocols/oscar/oscar.c:1412 +#: ../libpurple/protocols/oscar/oscar.c:1408 msgid "Could Not Connect" msgstr "無法連線" -#: ../libpurple/protocols/oscar/oscar.c:1417 +#: ../libpurple/protocols/oscar/oscar.c:1412 msgid "Received authorization" msgstr "收到認證" -#: ../libpurple/protocols/oscar/oscar.c:1440 +#: ../libpurple/protocols/oscar/oscar.c:1434 msgid "The SecurID key entered is invalid." msgstr "您所輸入的 SecurID 碼無效。" -#: ../libpurple/protocols/oscar/oscar.c:1454 +#: ../libpurple/protocols/oscar/oscar.c:1447 msgid "Enter SecurID" msgstr "請輸入 SecurID" -#: ../libpurple/protocols/oscar/oscar.c:1455 +#: ../libpurple/protocols/oscar/oscar.c:1448 msgid "Enter the 6 digit number from the digital display." msgstr "請輸入數碼顯示器所顯示的六位數字。" #. * #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. #. -#: ../libpurple/protocols/oscar/oscar.c:1457 -#: ../libpurple/protocols/oscar/oscar.c:2250 -#: ../libpurple/protocols/oscar/oscar.c:2297 -#: ../libpurple/protocols/oscar/oscar.c:5864 -#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387 +#: ../libpurple/protocols/oscar/oscar.c:1450 +#: ../libpurple/protocols/oscar/oscar.c:2225 +#: ../libpurple/protocols/oscar/oscar.c:2274 +#: ../libpurple/protocols/oscar/oscar.c:5869 +#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387 msgid "_OK" msgstr "確定(_O)" -#: ../libpurple/protocols/oscar/oscar.c:1496 -#: ../libpurple/protocols/oscar/oscar.c:1539 +#: ../libpurple/protocols/oscar/oscar.c:1489 +#: ../libpurple/protocols/oscar/oscar.c:1532 #, c-format msgid "" "You may be disconnected shortly. You may want to use TOC until this is " @@ -7164,53 +8650,53 @@ "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有" "沒有更新。" -#: ../libpurple/protocols/oscar/oscar.c:1499 -#: ../libpurple/protocols/oscar/oscar.c:1542 +#: ../libpurple/protocols/oscar/oscar.c:1492 +#: ../libpurple/protocols/oscar/oscar.c:1535 msgid "Unable to get a valid AIM login hash." msgstr "無法取得有效的 AIM 登入碼。" -#: ../libpurple/protocols/oscar/oscar.c:1627 +#: ../libpurple/protocols/oscar/oscar.c:1620 #, c-format msgid "You may be disconnected shortly. Check %s for updates." msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。" -#: ../libpurple/protocols/oscar/oscar.c:1630 +#: ../libpurple/protocols/oscar/oscar.c:1623 msgid "Unable to get a valid login hash." msgstr "無法取得有效的登入碼。" -#: ../libpurple/protocols/oscar/oscar.c:1659 +#: ../libpurple/protocols/oscar/oscar.c:1652 msgid "Password sent" msgstr "密碼送出" -#: ../libpurple/protocols/oscar/oscar.c:1715 +#: ../libpurple/protocols/oscar/oscar.c:1708 msgid "Unable to initialize connection" msgstr "無法初始化連結" -#: ../libpurple/protocols/oscar/oscar.c:2220 +#: ../libpurple/protocols/oscar/oscar.c:2195 msgid "Please authorize me so I can add you to my buddy list." msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。" -#: ../libpurple/protocols/oscar/oscar.c:2248 +#: ../libpurple/protocols/oscar/oscar.c:2223 msgid "Authorization Request Message:" msgstr "認證要求訊息：" -#: ../libpurple/protocols/oscar/oscar.c:2249 +#: ../libpurple/protocols/oscar/oscar.c:2224 msgid "Please authorize me!" msgstr "請通過我的認證！" -#: ../libpurple/protocols/oscar/oscar.c:2289 -#: ../libpurple/protocols/oscar/oscar.c:2296 -#: ../libpurple/protocols/oscar/oscar.c:2423 -#: ../libpurple/protocols/oscar/oscar.c:5242 -#: ../libpurple/protocols/yahoo/yahoo.c:987 +#: ../libpurple/protocols/oscar/oscar.c:2265 +#: ../libpurple/protocols/oscar/oscar.c:2273 +#: ../libpurple/protocols/oscar/oscar.c:2400 +#: ../libpurple/protocols/oscar/oscar.c:5247 +#: ../libpurple/protocols/yahoo/yahoo.c:1027 msgid "No reason given." msgstr "沒有給予原因。" -#: ../libpurple/protocols/oscar/oscar.c:2295 +#: ../libpurple/protocols/oscar/oscar.c:2272 msgid "Authorization Denied Message:" msgstr "拒絕認證訊息：" -#: ../libpurple/protocols/oscar/oscar.c:2423 +#: ../libpurple/protocols/oscar/oscar.c:2400 #, c-format msgid "" "The user %u has denied your request to add them to your buddy list for the " @@ -7220,17 +8706,17 @@ "使用者 %u 因為下列原因，拒絕了您將其加入好友清單的要求：\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2424 +#: ../libpurple/protocols/oscar/oscar.c:2401 msgid "ICQ authorization denied." msgstr "ICQ 認證拒絕。" #. Someone has granted you authorization -#: ../libpurple/protocols/oscar/oscar.c:2431 +#: ../libpurple/protocols/oscar/oscar.c:2408 #, c-format msgid "The user %u has granted your request to add them to your buddy list." msgstr "使用者 %u 同意了您將其加入好友清單的要求。" -#: ../libpurple/protocols/oscar/oscar.c:2439 +#: ../libpurple/protocols/oscar/oscar.c:2416 #, c-format msgid "" "You have received a special message\n" @@ -7243,7 +8729,7 @@ "來自：%s [%s]\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2447 +#: ../libpurple/protocols/oscar/oscar.c:2424 #, c-format msgid "" "You have received an ICQ page\n" @@ -7256,7 +8742,7 @@ "來自：%s [%s]\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2455 +#: ../libpurple/protocols/oscar/oscar.c:2432 #, c-format msgid "" "You have received an ICQ e-mail from %s [%s]\n" @@ -7269,38 +8755,38 @@ "訊息為：\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:2476 +#: ../libpurple/protocols/oscar/oscar.c:2453 #, c-format msgid "ICQ user %u has sent you a buddy: %s (%s)" msgstr "ICQ 使用者 %u 送來一個好友資訊：%s (%s)" -#: ../libpurple/protocols/oscar/oscar.c:2482 +#: ../libpurple/protocols/oscar/oscar.c:2459 msgid "Do you want to add this buddy to your buddy list?" msgstr "您想將他（她）加入到您的好友名單中嗎？" -#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308 +#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308 msgid "_Add" msgstr "加入(_A)" -#: ../libpurple/protocols/oscar/oscar.c:2488 +#: ../libpurple/protocols/oscar/oscar.c:2465 msgid "_Decline" msgstr "婉拒(_D)" -#: ../libpurple/protocols/oscar/oscar.c:2572 +#: ../libpurple/protocols/oscar/oscar.c:2589 #, c-format msgid "You missed %hu message from %s because it was invalid." msgid_plural "You missed %hu messages from %s because they were invalid." msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它是無效的。" msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們是無效的。" -#: ../libpurple/protocols/oscar/oscar.c:2581 +#: ../libpurple/protocols/oscar/oscar.c:2598 #, c-format msgid "You missed %hu message from %s because it was too large." msgid_plural "You missed %hu messages from %s because they were too large." msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它太大了。" msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們太大了。" -#: ../libpurple/protocols/oscar/oscar.c:2590 +#: ../libpurple/protocols/oscar/oscar.c:2607 #, c-format msgid "" "You missed %hu message from %s because the rate limit has been exceeded." @@ -7310,21 +8796,21 @@ msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們傳送的速度太快。" # XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同 -#: ../libpurple/protocols/oscar/oscar.c:2599 +#: ../libpurple/protocols/oscar/oscar.c:2616 #, c-format msgid "You missed %hu message from %s because he/she was too evil." msgid_plural "You missed %hu messages from %s because he/she was too evil." msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。" msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。" -#: ../libpurple/protocols/oscar/oscar.c:2608 +#: ../libpurple/protocols/oscar/oscar.c:2625 #, c-format msgid "You missed %hu message from %s because you are too evil." msgid_plural "You missed %hu messages from %s because you are too evil." msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。" msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。" -#: ../libpurple/protocols/oscar/oscar.c:2617 +#: ../libpurple/protocols/oscar/oscar.c:2634 #, c-format msgid "You missed %hu message from %s for an unknown reason." msgid_plural "You missed %hu messages from %s for an unknown reason." @@ -7332,63 +8818,55 @@ msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。" #. Data is assumed to be the destination sn -#: ../libpurple/protocols/oscar/oscar.c:2772 +#: ../libpurple/protocols/oscar/oscar.c:2789 #, c-format msgid "Unable to send message: %s" msgstr "無法送出訊息：%s" -#: ../libpurple/protocols/oscar/oscar.c:2772 -#: ../libpurple/protocols/oscar/oscar.c:2777 -#: ../libpurple/protocols/oscar/oscar.c:2841 +#: ../libpurple/protocols/oscar/oscar.c:2789 +#: ../libpurple/protocols/oscar/oscar.c:2794 +#: ../libpurple/protocols/oscar/oscar.c:2858 msgid "Unknown reason." msgstr "原因不明。" -#: ../libpurple/protocols/oscar/oscar.c:2775 +#: ../libpurple/protocols/oscar/oscar.c:2792 #: ../libpurple/protocols/sametime/sametime.c:2409 #, c-format msgid "Unable to send message to %s:" msgstr "無法送出訊息至 %s：" -#: ../libpurple/protocols/oscar/oscar.c:2841 +#: ../libpurple/protocols/oscar/oscar.c:2858 #, c-format msgid "User information not available: %s" msgstr "無法取得個人資訊：%s" -#: ../libpurple/protocols/oscar/oscar.c:2872 +#: ../libpurple/protocols/oscar/oscar.c:2889 msgid "Online Since" msgstr "上線自" # XXX 改譯「註冊日期」會否比較通順？ -#: ../libpurple/protocols/oscar/oscar.c:2877 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161 +#: ../libpurple/protocols/oscar/oscar.c:2894 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185 msgid "Member Since" msgstr "成為成員的時間" -#: ../libpurple/protocols/oscar/oscar.c:2882 -msgid "Capabilities" -msgstr "相容性" - -#: ../libpurple/protocols/oscar/oscar.c:2912 +#: ../libpurple/protocols/oscar/oscar.c:2929 msgid "Available Message" msgstr "尚有訊息" -#: ../libpurple/protocols/oscar/oscar.c:2940 -msgid "Profile" -msgstr "個人資料" - -#: ../libpurple/protocols/oscar/oscar.c:3020 +#: ../libpurple/protocols/oscar/oscar.c:3037 msgid "Your AIM connection may be lost." msgstr "您的 AIM 可能斷線了。" # The conversion failed! #. The conversion failed! -#: ../libpurple/protocols/oscar/oscar.c:3208 +#: ../libpurple/protocols/oscar/oscar.c:3225 msgid "" "[Unable to display a message from this user because it contained invalid " "characters.]" msgstr "「無法顯示來自這個使用者的訊息，因為它包含了無效字元。」" -#: ../libpurple/protocols/oscar/oscar.c:3411 +#: ../libpurple/protocols/oscar/oscar.c:3389 msgid "" "The last action you attempted could not be performed because you are over " "the rate limit. Please wait 10 seconds and try again." @@ -7396,114 +8874,110 @@ "您最近做的一個動作無法完成，因為您已經達到發送訊息速率的上限。請等待十秒後再" "試一次。" -#: ../libpurple/protocols/oscar/oscar.c:3483 -msgid "You have been signed off for an unknown reason." -msgstr "您因為不明原因而登出。" - -#: ../libpurple/protocols/oscar/oscar.c:3496 +#: ../libpurple/protocols/oscar/oscar.c:3472 #: ../libpurple/protocols/toc/toc.c:977 #, c-format msgid "You have been disconnected from chat room %s." msgstr "您已經由聊天室 %s 停止連線。" -#: ../libpurple/protocols/oscar/oscar.c:3743 +#: ../libpurple/protocols/oscar/oscar.c:3722 #: ../libpurple/protocols/silc/util.c:585 #: ../libpurple/protocols/silc10/util.c:581 msgid "Mobile Phone" msgstr "行動電話" -#: ../libpurple/protocols/oscar/oscar.c:3773 +#: ../libpurple/protocols/oscar/oscar.c:3752 msgid "Personal Web Page" msgstr "個人網頁" -#: ../libpurple/protocols/oscar/oscar.c:3797 +#: ../libpurple/protocols/oscar/oscar.c:3776 #: ../libpurple/protocols/qq/buddy_info.c:40 msgid "Additional Information" msgstr "其他資訊" -#: ../libpurple/protocols/oscar/oscar.c:3805 -#: ../libpurple/protocols/oscar/oscar.c:3818 +#: ../libpurple/protocols/oscar/oscar.c:3784 +#: ../libpurple/protocols/oscar/oscar.c:3797 msgid "Zip Code" msgstr "郵遞區號" -#: ../libpurple/protocols/oscar/oscar.c:3829 +#: ../libpurple/protocols/oscar/oscar.c:3808 msgid "Division" msgstr "部門" -#: ../libpurple/protocols/oscar/oscar.c:3830 +#: ../libpurple/protocols/oscar/oscar.c:3809 msgid "Position" msgstr "職位" -#: ../libpurple/protocols/oscar/oscar.c:3832 +#: ../libpurple/protocols/oscar/oscar.c:3811 msgid "Web Page" msgstr "網頁" -#: ../libpurple/protocols/oscar/oscar.c:3835 +#: ../libpurple/protocols/oscar/oscar.c:3814 msgid "Work Information" msgstr "工作資訊" # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??) -#: ../libpurple/protocols/oscar/oscar.c:3891 +#: ../libpurple/protocols/oscar/oscar.c:3870 msgid "Pop-Up Message" msgstr "彈出訊息" # Patch by Kevin Leung -#: ../libpurple/protocols/oscar/oscar.c:3931 +#: ../libpurple/protocols/oscar/oscar.c:3910 #, c-format msgid "The following screen name is associated with %s" msgid_plural "The following screen names are associated with %s" msgstr[0] "下列是 %s 的帳號" msgstr[1] "下列是 %s 的帳號" -#: ../libpurple/protocols/oscar/oscar.c:3936 +#: ../libpurple/protocols/oscar/oscar.c:3915 msgid "Screen name" msgstr "帳號" -#: ../libpurple/protocols/oscar/oscar.c:3962 +#: ../libpurple/protocols/oscar/oscar.c:3941 #, c-format msgid "No results found for e-mail address %s" msgstr "找不到和電子郵件地址 %s 相關的結果" -#: ../libpurple/protocols/oscar/oscar.c:3983 +#: ../libpurple/protocols/oscar/oscar.c:3962 #, c-format msgid "You should receive an e-mail asking to confirm %s." msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。" -#: ../libpurple/protocols/oscar/oscar.c:3985 +#: ../libpurple/protocols/oscar/oscar.c:3964 msgid "Account Confirmation Requested" msgstr "帳號確認" -#: ../libpurple/protocols/oscar/oscar.c:4016 +#: ../libpurple/protocols/oscar/oscar.c:3995 msgid "Error Changing Account Info" msgstr "更改帳號資訊錯誤" -#: ../libpurple/protocols/oscar/oscar.c:4019 +#: ../libpurple/protocols/oscar/oscar.c:3998 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " "differs from the original." msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號與原本的不同。" -#: ../libpurple/protocols/oscar/oscar.c:4022 +#: ../libpurple/protocols/oscar/oscar.c:4001 #, c-format msgid "Error 0x%04x: Unable to format screen name because it is invalid." msgstr "錯誤 0x%04x：無法格式化帳號，因為它是無效的。" -#: ../libpurple/protocols/oscar/oscar.c:4025 +#: ../libpurple/protocols/oscar/oscar.c:4004 #, c-format msgid "" "Error 0x%04x: Unable to format screen name because the requested screen name " "is too long." msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號太長。" -#: ../libpurple/protocols/oscar/oscar.c:4028 +#: ../libpurple/protocols/oscar/oscar.c:4007 #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because there is already a " "request pending for this screen name." msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個帳號尚有要求等待處理。" -#: ../libpurple/protocols/oscar/oscar.c:4031 +#: ../libpurple/protocols/oscar/oscar.c:4010 #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because the given address has " @@ -7511,37 +8985,37 @@ msgstr "" "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址和太多的帳號產生關連。" -#: ../libpurple/protocols/oscar/oscar.c:4034 +#: ../libpurple/protocols/oscar/oscar.c:4013 #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because the given address is " "invalid." msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址是無效的。" -#: ../libpurple/protocols/oscar/oscar.c:4037 +#: ../libpurple/protocols/oscar/oscar.c:4016 #, c-format msgid "Error 0x%04x: Unknown error." msgstr "錯誤 0x%04x：未知錯誤。" -#: ../libpurple/protocols/oscar/oscar.c:4047 +#: ../libpurple/protocols/oscar/oscar.c:4026 #, c-format msgid "The e-mail address for %s is %s" msgstr "%s 的電子郵件地址為 %s" -#: ../libpurple/protocols/oscar/oscar.c:4049 +#: ../libpurple/protocols/oscar/oscar.c:4028 msgid "Account Info" msgstr "帳號資訊" -#: ../libpurple/protocols/oscar/oscar.c:4221 +#: ../libpurple/protocols/oscar/oscar.c:4211 msgid "" "Your IM Image was not sent. You must be Direct Connected to send IM Images." msgstr "無法傳送即時訊息影像；要傳送即時訊息影像，必須與對方直接連線。" -#: ../libpurple/protocols/oscar/oscar.c:4487 +#: ../libpurple/protocols/oscar/oscar.c:4482 msgid "Unable to set AIM profile." msgstr "無法設定 AIM 個人資料。" -#: ../libpurple/protocols/oscar/oscar.c:4488 +#: ../libpurple/protocols/oscar/oscar.c:4483 msgid "" "You have probably requested to set your profile before the login procedure " "completed. Your profile remains unset; try setting it again when you are " @@ -7550,7 +9024,7 @@ "您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後" "再重新進行設定。" -#: ../libpurple/protocols/oscar/oscar.c:4502 +#: ../libpurple/protocols/oscar/oscar.c:4497 #, c-format msgid "" "The maximum profile length of %d byte has been exceeded. It has been " @@ -7561,11 +9035,11 @@ msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。" msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。" -#: ../libpurple/protocols/oscar/oscar.c:4507 +#: ../libpurple/protocols/oscar/oscar.c:4502 msgid "Profile too long." msgstr "個人資訊過長。" -#: ../libpurple/protocols/oscar/oscar.c:4552 +#: ../libpurple/protocols/oscar/oscar.c:4547 #, c-format msgid "" "The maximum away message length of %d byte has been exceeded. It has been " @@ -7576,11 +9050,11 @@ msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。" msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。" -#: ../libpurple/protocols/oscar/oscar.c:4557 +#: ../libpurple/protocols/oscar/oscar.c:4552 msgid "Away message too long." msgstr "離開訊息過長。" -#: ../libpurple/protocols/oscar/oscar.c:4626 +#: ../libpurple/protocols/oscar/oscar.c:4621 #, c-format msgid "" "Could not add the buddy %s because the screen name is invalid. Screen names " @@ -7591,9 +9065,9 @@ "效電郵地址；或者必須以英文字母為開頭，同時由「英文字母」、「數字」和「空白」" "所組成，或者單純以「數字」組成。" -#: ../libpurple/protocols/oscar/oscar.c:4628 -#: ../libpurple/protocols/oscar/oscar.c:5051 -#: ../libpurple/protocols/oscar/oscar.c:5066 +#: ../libpurple/protocols/oscar/oscar.c:4623 +#: ../libpurple/protocols/oscar/oscar.c:5056 +#: ../libpurple/protocols/oscar/oscar.c:5071 msgid "Unable To Add" msgstr "無法加入" @@ -7609,16 +9083,15 @@ "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失，可能可以在幾" "個小時後取得。" -#: ../libpurple/protocols/oscar/oscar.c:4937 -#: ../libpurple/protocols/oscar/oscar.c:4938 -#: ../libpurple/protocols/oscar/oscar.c:4943 -#: ../libpurple/protocols/oscar/oscar.c:5120 -#: ../libpurple/protocols/oscar/oscar.c:5121 +#: ../libpurple/protocols/oscar/oscar.c:4915 +#: ../libpurple/protocols/oscar/oscar.c:4917 +#: ../libpurple/protocols/oscar/oscar.c:5125 #: ../libpurple/protocols/oscar/oscar.c:5126 +#: ../libpurple/protocols/oscar/oscar.c:5131 msgid "Orphans" msgstr "孤兒們" -#: ../libpurple/protocols/oscar/oscar.c:5049 +#: ../libpurple/protocols/oscar/oscar.c:5054 #, c-format msgid "" "Could not add the buddy %s because you have too many buddies in your buddy " @@ -7627,17 +9100,17 @@ "因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重" "試。" -#: ../libpurple/protocols/oscar/oscar.c:5049 -#: ../libpurple/protocols/oscar/oscar.c:5064 +#: ../libpurple/protocols/oscar/oscar.c:5054 +#: ../libpurple/protocols/oscar/oscar.c:5069 msgid "(no name)" msgstr "(沒有名字)" -#: ../libpurple/protocols/oscar/oscar.c:5063 +#: ../libpurple/protocols/oscar/oscar.c:5068 #, c-format msgid "Could not add the buddy %s for an unknown reason." msgstr "無法把 %s 加入好友清單，原因不明。" -#: ../libpurple/protocols/oscar/oscar.c:5157 +#: ../libpurple/protocols/oscar/oscar.c:5162 #, c-format msgid "" "The user %s has given you permission to add you to their buddy list. Do you " @@ -7647,23 +9120,23 @@ "呢？" # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的 -#: ../libpurple/protocols/oscar/oscar.c:5165 +#: ../libpurple/protocols/oscar/oscar.c:5170 msgid "Authorization Given" msgstr "給予認證" #. Granted -#: ../libpurple/protocols/oscar/oscar.c:5238 +#: ../libpurple/protocols/oscar/oscar.c:5243 #, c-format msgid "The user %s has granted your request to add them to your buddy list." msgstr "使用者 %s 允許了您將他（她）加入好友清單的要求。" # NOTE 這是我們發出的認證要求被對方允許時顯示的 -#: ../libpurple/protocols/oscar/oscar.c:5239 +#: ../libpurple/protocols/oscar/oscar.c:5244 msgid "Authorization Granted" msgstr "認證獲允" #. Denied -#: ../libpurple/protocols/oscar/oscar.c:5242 +#: ../libpurple/protocols/oscar/oscar.c:5247 #, c-format msgid "" "The user %s has denied your request to add them to your buddy list for the " @@ -7673,32 +9146,32 @@ "使用者 %s 因為下列原因，拒絕了您將他（她）加入好友清單的要求：\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:5243 +#: ../libpurple/protocols/oscar/oscar.c:5248 msgid "Authorization Denied" msgstr "認證被拒" # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的 # NOTE: KingAnt 提供的字義有些不同，暫時不予理會 -#: ../libpurple/protocols/oscar/oscar.c:5279 +#: ../libpurple/protocols/oscar/oscar.c:5284 #: ../libpurple/protocols/toc/toc.c:1371 msgid "_Exchange:" msgstr "頻道號碼(_E)：" -#: ../libpurple/protocols/oscar/oscar.c:5319 +#: ../libpurple/protocols/oscar/oscar.c:5324 msgid "Invalid chat name specified." msgstr "給予了無效的聊天室名稱。" -#: ../libpurple/protocols/oscar/oscar.c:5388 +#: ../libpurple/protocols/oscar/oscar.c:5393 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats." msgstr "無法傳送即時訊息影像；AIM 聊天並不支援即時訊息影像的傳送。" -#: ../libpurple/protocols/oscar/oscar.c:5548 #: ../libpurple/protocols/oscar/oscar.c:5553 +#: ../libpurple/protocols/oscar/oscar.c:5558 msgid "Away Message" msgstr "離開訊息" # XXX 好像不對，又好像沒問題 -#: ../libpurple/protocols/oscar/oscar.c:5553 +#: ../libpurple/protocols/oscar/oscar.c:5558 msgid "(retrieving)" msgstr " (搜尋中)" @@ -7706,90 +9179,90 @@ # NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message? # NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status # XXX 所以這應該是有問題的譯文，但暫時想不到怎樣改善 - ambrose 20070415 -#: ../libpurple/protocols/oscar/oscar.c:5753 +#: ../libpurple/protocols/oscar/oscar.c:5758 msgid "iTunes Music Store Link" msgstr "iTunes Store 網站連結" -#: ../libpurple/protocols/oscar/oscar.c:5861 +#: ../libpurple/protocols/oscar/oscar.c:5866 #, c-format msgid "Buddy Comment for %s" msgstr "%s 的好友說明" -#: ../libpurple/protocols/oscar/oscar.c:5862 +#: ../libpurple/protocols/oscar/oscar.c:5867 msgid "Buddy Comment:" msgstr "好友說明：" -#: ../libpurple/protocols/oscar/oscar.c:5909 +#: ../libpurple/protocols/oscar/oscar.c:5914 #, c-format msgid "You have selected to open a Direct IM connection with %s." msgstr "您選擇了與 %s 開啟一個直接即時訊息。" -#: ../libpurple/protocols/oscar/oscar.c:5913 +#: ../libpurple/protocols/oscar/oscar.c:5918 msgid "" "Because this reveals your IP address, it may be considered a security risk. " "Do you wish to continue?" msgstr "這樣將會曝露出您的 IP 位址，因此可能會有隱私上的風險。您想要繼續嗎？" -#: ../libpurple/protocols/oscar/oscar.c:5919 -#: ../libpurple/protocols/oscar/peer.c:1022 +#: ../libpurple/protocols/oscar/oscar.c:5924 +#: ../libpurple/protocols/oscar/peer.c:1045 msgid "C_onnect" msgstr "連線(_O)" -#: ../libpurple/protocols/oscar/oscar.c:5954 +#: ../libpurple/protocols/oscar/oscar.c:5959 msgid "Get AIM Info" msgstr "取得 AIM 資訊" -#: ../libpurple/protocols/oscar/oscar.c:5960 +#: ../libpurple/protocols/oscar/oscar.c:5965 msgid "Edit Buddy Comment" msgstr "編輯好友說明" -#: ../libpurple/protocols/oscar/oscar.c:5968 +#: ../libpurple/protocols/oscar/oscar.c:5973 msgid "Get Status Msg" msgstr "取得狀態訊息" # NOTE 將「直接消息」改譯為「即時訊息」 -#: ../libpurple/protocols/oscar/oscar.c:5981 +#: ../libpurple/protocols/oscar/oscar.c:5986 msgid "Direct IM" msgstr "即時訊息" -#: ../libpurple/protocols/oscar/oscar.c:6003 +#: ../libpurple/protocols/oscar/oscar.c:6008 msgid "Re-request Authorization" msgstr "重新要求認證" # NOTE Require意為「需要」，不是「要求」 -#: ../libpurple/protocols/oscar/oscar.c:6062 +#: ../libpurple/protocols/oscar/oscar.c:6067 msgid "Require authorization" msgstr "需要認證" -#: ../libpurple/protocols/oscar/oscar.c:6065 +#: ../libpurple/protocols/oscar/oscar.c:6070 msgid "Web aware (enabling this will cause you to receive SPAM!)" msgstr "允許其他使用者在網路上查看您目前的狀態（會導致您收到垃圾訊息！）" -#: ../libpurple/protocols/oscar/oscar.c:6070 +#: ../libpurple/protocols/oscar/oscar.c:6075 msgid "ICQ Privacy Options" msgstr "ICQ 隱私選頊" -#: ../libpurple/protocols/oscar/oscar.c:6089 +#: ../libpurple/protocols/oscar/oscar.c:6094 msgid "The new formatting is invalid." msgstr "新的格式是無效的。" -#: ../libpurple/protocols/oscar/oscar.c:6090 +#: ../libpurple/protocols/oscar/oscar.c:6095 msgid "Screen name formatting can change only capitalization and whitespace." msgstr "帳號格式化只能改變大寫以及空白。" -#: ../libpurple/protocols/oscar/oscar.c:6143 +#: ../libpurple/protocols/oscar/oscar.c:6148 msgid "Change Address To:" msgstr "變更地址為：" -#: ../libpurple/protocols/oscar/oscar.c:6189 +#: ../libpurple/protocols/oscar/oscar.c:6194 msgid "you are not waiting for authorization" msgstr "您並沒有在等待驗證" -#: ../libpurple/protocols/oscar/oscar.c:6192 +#: ../libpurple/protocols/oscar/oscar.c:6197 msgid "You are awaiting authorization from the following buddies" msgstr "您目前正在等待下列好友的認證" -#: ../libpurple/protocols/oscar/oscar.c:6193 +#: ../libpurple/protocols/oscar/oscar.c:6198 msgid "" "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" @@ -7797,74 +9270,74 @@ "您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇" "「要求重新認證」。" -#: ../libpurple/protocols/oscar/oscar.c:6210 +#: ../libpurple/protocols/oscar/oscar.c:6215 msgid "Find Buddy by E-Mail" msgstr "以電子郵件地址來找尋好友" -#: ../libpurple/protocols/oscar/oscar.c:6211 +#: ../libpurple/protocols/oscar/oscar.c:6216 msgid "Search for a buddy by e-mail address" msgstr "使用電子郵件地址搜尋好友" -#: ../libpurple/protocols/oscar/oscar.c:6212 +#: ../libpurple/protocols/oscar/oscar.c:6217 msgid "Type the e-mail address of the buddy you are searching for." msgstr "請輸入對方的電子郵件地址。" -#: ../libpurple/protocols/oscar/oscar.c:6215 +#: ../libpurple/protocols/oscar/oscar.c:6220 msgid "_Search" msgstr "搜尋(_S)" -#: ../libpurple/protocols/oscar/oscar.c:6373 +#: ../libpurple/protocols/oscar/oscar.c:6378 msgid "Set User Info (URL)..." msgstr "設定使用者資訊 (透過網頁)..." -#: ../libpurple/protocols/oscar/oscar.c:6384 +#: ../libpurple/protocols/oscar/oscar.c:6389 msgid "Change Password (URL)" msgstr "修改密碼 (透過網頁)" -#: ../libpurple/protocols/oscar/oscar.c:6388 +#: ../libpurple/protocols/oscar/oscar.c:6393 msgid "Configure IM Forwarding (URL)" msgstr "設定即時訊息的轉送 (透過網頁)" # NOTE 譯文更動 by Ambrose #. ICQ actions -#: ../libpurple/protocols/oscar/oscar.c:6398 +#: ../libpurple/protocols/oscar/oscar.c:6403 msgid "Set Privacy Options..." msgstr "設定隱私選項..." #. AIM actions -#: ../libpurple/protocols/oscar/oscar.c:6405 +#: ../libpurple/protocols/oscar/oscar.c:6410 msgid "Confirm Account" msgstr "確認帳號" -#: ../libpurple/protocols/oscar/oscar.c:6409 +#: ../libpurple/protocols/oscar/oscar.c:6414 msgid "Display Currently Registered E-Mail Address" msgstr "顯示目前所註冊的電子郵件位址" -#: ../libpurple/protocols/oscar/oscar.c:6413 +#: ../libpurple/protocols/oscar/oscar.c:6418 msgid "Change Currently Registered E-Mail Address..." msgstr "修改目前所註冊的電子郵件位址..." -#: ../libpurple/protocols/oscar/oscar.c:6420 +#: ../libpurple/protocols/oscar/oscar.c:6425 msgid "Show Buddies Awaiting Authorization" msgstr "顯示等待認證的好友" -#: ../libpurple/protocols/oscar/oscar.c:6426 +#: ../libpurple/protocols/oscar/oscar.c:6431 msgid "Search for Buddy by E-Mail Address..." msgstr "使用電子郵件地址搜尋好友..." -#: ../libpurple/protocols/oscar/oscar.c:6431 +#: ../libpurple/protocols/oscar/oscar.c:6436 msgid "Search for Buddy by Information" msgstr "依照資訊尋找好友" -#: ../libpurple/protocols/oscar/oscar.c:6499 +#: ../libpurple/protocols/oscar/oscar.c:6504 msgid "Use recent buddies group" msgstr "使用「Recent Buddies」群組" -#: ../libpurple/protocols/oscar/oscar.c:6502 +#: ../libpurple/protocols/oscar/oscar.c:6507 msgid "Show how long you have been idle" msgstr "顯示您閒置多久時間" -#: ../libpurple/protocols/oscar/oscar.c:6657 +#: ../libpurple/protocols/oscar/oscar.c:6662 msgid "" "Always use ICQ proxy server for file transfers\n" "(slower, but does not reveal your IP address)" @@ -7872,26 +9345,26 @@ "務必使用 ICQ 的代理伺服器來進行檔案傳輸\n" "（較慢，但不會暴露您的 IP 位址）" -#: ../libpurple/protocols/oscar/peer.c:674 +#: ../libpurple/protocols/oscar/peer.c:697 #, c-format msgid "Asking %s to connect to us at %s:%hu for Direct IM." msgstr "正在要求 %s 連線至此處 (%s:%hu)，以便建立即時訊息。" -#: ../libpurple/protocols/oscar/peer.c:759 +#: ../libpurple/protocols/oscar/peer.c:782 #, c-format msgid "Attempting to connect to %s:%hu." msgstr "正在嘗試連線至 %s；%hu。" -#: ../libpurple/protocols/oscar/peer.c:833 +#: ../libpurple/protocols/oscar/peer.c:856 msgid "Attempting to connect via proxy server." msgstr "正在嘗試透過 Proxy 伺服器連線。" -#: ../libpurple/protocols/oscar/peer.c:1010 +#: ../libpurple/protocols/oscar/peer.c:1033 #, c-format msgid "%s has just asked to directly connect to %s" msgstr "%s 剛剛要求直接連線到 %s" -#: ../libpurple/protocols/oscar/peer.c:1014 +#: ../libpurple/protocols/oscar/peer.c:1037 msgid "" "This requires a direct connection between the two computers and is necessary " "for IM Images. Because your IP address will be revealed, this may be " @@ -8086,7 +9559,6 @@ msgstr "您拒絕了 %d 的要求" #: ../libpurple/protocols/qq/buddy_opt.c:209 -#: ../libpurple/protocols/qq/group_opt.c:137 msgid "Input your reason:" msgstr "請輸入原因：" @@ -8103,39 +9575,33 @@ msgid "Sorry, you are not my type..." msgstr "對不起，我和你，合不來的……" -#: ../libpurple/protocols/qq/buddy_opt.c:214 -#: ../libpurple/protocols/qq/group_im.c:144 -#: ../libpurple/protocols/qq/group_opt.c:127 -#: ../libpurple/protocols/qq/sys_msg.c:91 -#: ../libpurple/protocols/qq/sys_msg.c:249 -msgid "Reject" -msgstr "拒絕" - #: ../libpurple/protocols/qq/buddy_opt.c:277 -msgid "Add buddy with auth request fails" +msgid "Add buddy with auth request failed" msgstr "連同認證要求的新增好友失敗" -#: ../libpurple/protocols/qq/buddy_opt.c:308 +#. TODO: We don't really need to notify the user about this, do we? +#: ../libpurple/protocols/qq/buddy_opt.c:309 msgid "You have successfully removed a buddy" msgstr "您成功移除了一個好友" -#: ../libpurple/protocols/qq/buddy_opt.c:336 -msgid "You have successfully removed yourself from a buddy" -msgstr "您成功從一個好友的好友清單中移除了您自己" - -#: ../libpurple/protocols/qq/buddy_opt.c:402 +#. TODO: Does the user really need to be notified about this? +#: ../libpurple/protocols/qq/buddy_opt.c:338 +msgid "You have successfully removed yourself from your friend's buddy list" +msgstr "您成功從對方的好友清單中移除了您自己" + +#: ../libpurple/protocols/qq/buddy_opt.c:404 #, c-format msgid "User %d needs authentication" msgstr "使用者 %d 需要認證" -#: ../libpurple/protocols/qq/buddy_opt.c:404 +#: ../libpurple/protocols/qq/buddy_opt.c:406 #: ../libpurple/protocols/qq/group_join.c:136 msgid "Input request here" msgstr "請輸入要求" # XXX - 20061026 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands -#: ../libpurple/protocols/qq/buddy_opt.c:405 +#: ../libpurple/protocols/qq/buddy_opt.c:407 #: ../libpurple/protocols/qq/group_join.c:137 msgid "Would you be my friend?" msgstr "想同我交個朋友嗎？" @@ -8143,22 +9609,22 @@ #. multiline #. masked #. hint -#: ../libpurple/protocols/qq/buddy_opt.c:406 +#: ../libpurple/protocols/qq/buddy_opt.c:408 #: ../libpurple/protocols/qq/group_join.c:138 #: ../libpurple/protocols/qq/group_opt.c:143 msgid "Send" msgstr "送出" -#: ../libpurple/protocols/qq/buddy_opt.c:416 -#, c-format -msgid "You have added %d in buddy list" +#: ../libpurple/protocols/qq/buddy_opt.c:418 +#, c-format +msgid "You have added %d to buddy list" msgstr "成功將 %d 加入好友清單" -#: ../libpurple/protocols/qq/buddy_opt.c:513 +#: ../libpurple/protocols/qq/buddy_opt.c:515 msgid "QQid Error" msgstr "QQid 錯誤" -#: ../libpurple/protocols/qq/buddy_opt.c:514 +#: ../libpurple/protocols/qq/buddy_opt.c:516 msgid "Invalid QQid" msgstr "無效的 QQid" @@ -8187,7 +9653,7 @@ msgstr "QQ 群" #: ../libpurple/protocols/qq/group.c:120 -msgid "Please input external group ID" +msgid "Please enter external group ID" msgstr "請輸入外部 Group ID" # NOTE 參見 hi.qq.com/intro/mo.shtml?d10.htm @@ -8197,12 +9663,12 @@ #: ../libpurple/protocols/qq/group_im.c:126 #, c-format -msgid "User %d applied to join group %d" +msgid "User %d requested to join group %d" msgstr "使用者 %d 要求加入群組 %d" #: ../libpurple/protocols/qq/group_im.c:127 #: ../libpurple/protocols/qq/group_im.c:181 -#: ../libpurple/protocols/qq/sys_msg.c:195 +#: ../libpurple/protocols/qq/sys_msg.c:193 #, c-format msgid "Reason: %s" msgstr "原因：%s" @@ -8222,37 +9688,37 @@ #: ../libpurple/protocols/qq/group_im.c:141 #: ../libpurple/protocols/qq/group_opt.c:128 -#: ../libpurple/protocols/qq/sys_msg.c:92 -#: ../libpurple/protocols/qq/sys_msg.c:251 +#: ../libpurple/protocols/qq/sys_msg.c:91 +#: ../libpurple/protocols/qq/sys_msg.c:248 msgid "Approve" msgstr "允許" #: ../libpurple/protocols/qq/group_im.c:180 #, c-format -msgid "You request to join group %d has been rejected by admin %d" -msgstr "管理人 %d 拒絕了您加入群組 %d" +msgid "Your request to join group %d has been rejected by admin %d" +msgstr "管理人 %2$d 拒絕了您加入群組 %1$d" #: ../libpurple/protocols/qq/group_im.c:221 #, c-format -msgid "You request to join group %d has been approved by admin %d" -msgstr "管理人 %d 允許了您加入群組 %d" +msgid "Your request to join group %d has been approved by admin %d" +msgstr "管理人 %2$d 允許了您加入群組 %1$d" #: ../libpurple/protocols/qq/group_im.c:257 #, c-format -msgid "You [%d] has exit group \"%d\"" +msgid "You [%d] have left group \"%d\"" msgstr "您 [%d] 退出了群組「%d」" #: ../libpurple/protocols/qq/group_im.c:291 #, c-format -msgid "You [%d] has been added by group \"%d\"" -msgstr "群組「%2$d」新增了您 [%1$d]" +msgid "You [%d] have been added to group \"%d\"" +msgstr "您 [%d] 已經被加入群組 \"%d\"" #: ../libpurple/protocols/qq/group_im.c:292 msgid "This group has been added to your buddy list" msgstr "群組已新增至好友清單。" #: ../libpurple/protocols/qq/group_internal.c:41 -msgid "I am not member" +msgid "I am not a member" msgstr "我不是成員" #: ../libpurple/protocols/qq/group_internal.c:44 @@ -8276,7 +9742,7 @@ msgstr "這群組不容許外人加入" #: ../libpurple/protocols/qq/group_join.c:233 -msgid "You have successfully exited the group" +msgid "You have successfully left the group" msgstr "您成功離開群組" #: ../libpurple/protocols/qq/group_join.c:257 @@ -8284,16 +9750,16 @@ msgstr "QQ 群組認證" #: ../libpurple/protocols/qq/group_join.c:258 -msgid "Your authorization operation has been accepted by the QQ server" +msgid "Your authorization request has been accepted by the QQ server" msgstr "QQ 伺服器接受了您的認證" #: ../libpurple/protocols/qq/group_join.c:329 -msgid "You inputted a group id outside the acceptable range" +msgid "You entered a group ID outside the acceptable range" msgstr "指定的群組 ID 在有效範圍之外" #: ../libpurple/protocols/qq/group_join.c:360 -msgid "Are you sure to exit this Qun?" -msgstr "您確定要離開這個群 (Qun) 嗎？" +msgid "Are you sure you want to leave this Qun?" +msgstr "您確定要離開群組？" #: ../libpurple/protocols/qq/group_join.c:362 msgid "" @@ -8301,10 +9767,6 @@ "this operation will eventually remove this Qun." msgstr "請注意，假如您是創立者，這最終會把這個群 (Qun) 移除。" -#: ../libpurple/protocols/qq/group_join.c:367 -msgid "Go ahead" -msgstr "確定" - #: ../libpurple/protocols/qq/group_network.c:92 #, c-format msgid "Code [0x%02X]: %s" @@ -8314,20 +9776,24 @@ msgid "Group Operation Error" msgstr "群組操作錯誤" -#. we wanna see window +#. we want to see window #: ../libpurple/protocols/qq/group_opt.c:124 -#: ../libpurple/protocols/qq/sys_msg.c:88 -msgid "Do you wanna approve the request?" +#: ../libpurple/protocols/qq/sys_msg.c:87 +msgid "Do you want to approve the request?" msgstr "允許這個要求？" +#: ../libpurple/protocols/qq/group_opt.c:137 +msgid "Enter your reason:" +msgstr "請輸入原因：" + # NOTE QQ「member」應是「成員」 #: ../libpurple/protocols/qq/group_opt.c:235 -msgid "You have successfully modify Qun member" +msgid "You have successfully modified Qun member" msgstr "成功更改了群的一個成員" # FIXME 暫譯 ambrose 20070415 #: ../libpurple/protocols/qq/group_opt.c:305 -msgid "You have successfully modify Qun information" +msgid "You have successfully modified Qun information" msgstr "成功更改了群的資訊" #: ../libpurple/protocols/qq/group_opt.c:392 @@ -8347,20 +9813,18 @@ msgstr "系統訊息" #: ../libpurple/protocols/qq/im.c:576 -msgid "Server ACK" -msgstr "伺服器回應" - -#: ../libpurple/protocols/qq/im.c:576 msgid "Failed to send IM." msgstr "送出即時訊息失敗。" +# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西 #: ../libpurple/protocols/qq/keep_alive.c:87 -msgid "Keep alive error, seems connection lost!" -msgstr "Keep alive 發生錯誤，連線似乎已突然中斷！" +#, fuzzy +msgid "Keep alive error" +msgstr "讀取錯誤" #: ../libpurple/protocols/qq/login_logout.c:408 -msgid "Request login token error!" -msgstr "「登入要求」Token 出現錯誤" +msgid "Error requesting login token" +msgstr "取得 Login Token 錯誤" #: ../libpurple/protocols/qq/login_logout.c:486 msgid "Unable to login, check debug log" @@ -8386,101 +9850,87 @@ msgid "Unknown-%d" msgstr "未知（代碼 %d）" -# NOTE 文中的「%s」是「UDP」或「TCP」，所以譯文應為「位址」而非「地址」 -#: ../libpurple/protocols/qq/qq.c:209 -#, c-format -msgid "%s Address" -msgstr "%s 位址" +#: ../libpurple/protocols/qq/qq.c:211 +msgid "TCP Address" +msgstr "TCP 位址" + +#: ../libpurple/protocols/qq/qq.c:213 +msgid "UDP Address" +msgstr "UDP 位址" # FIXME 這是暫譯，但在有限的資料下（我沒有QQ帳戶）應該是大致正確的譯法 - Ambrose 20070414 -#: ../libpurple/protocols/qq/qq.c:240 +#: ../libpurple/protocols/qq/qq.c:242 msgid "Level" msgstr "成長階段" -#: ../libpurple/protocols/qq/qq.c:278 -msgid "QQ: Available" -msgstr "QQ: 上線" - -#: ../libpurple/protocols/qq/qq.c:282 -msgid "QQ: Away" -msgstr "QQ: 離開" - -#: ../libpurple/protocols/qq/qq.c:286 -msgid "QQ: Invisible" -msgstr "QQ: 隱身" - -#: ../libpurple/protocols/qq/qq.c:290 -msgid "QQ: Offline" -msgstr "QQ: 離線" - -#: ../libpurple/protocols/qq/qq.c:371 +#: ../libpurple/protocols/qq/qq.c:373 msgid "Invalid name" msgstr "名稱無效" # NOTE 參見 qq.h -#: ../libpurple/protocols/qq/qq.c:437 +#: ../libpurple/protocols/qq/qq.c:439 #, c-format msgid "Current Online: %d
\n" msgstr "目前上線好友: %d 人
\n" -#: ../libpurple/protocols/qq/qq.c:438 +#: ../libpurple/protocols/qq/qq.c:440 #, c-format msgid "Last Refresh: %s
\n" msgstr "最近更新時間：%s
\n" -#: ../libpurple/protocols/qq/qq.c:442 +#: ../libpurple/protocols/qq/qq.c:444 #, c-format msgid "Connection Mode: %s
\n" msgstr "連線模式：%s
\n" -#: ../libpurple/protocols/qq/qq.c:443 +#: ../libpurple/protocols/qq/qq.c:445 #, c-format msgid "Server IP: %s: %d
\n" msgstr "伺服器位址：%s：%d
\n" # XXX - 20061027 -#: ../libpurple/protocols/qq/qq.c:444 +#: ../libpurple/protocols/qq/qq.c:446 #, c-format msgid "My Public IP: %s
\n" msgstr "自己位址：%s
\n" -#: ../libpurple/protocols/qq/qq.c:449 +#: ../libpurple/protocols/qq/qq.c:451 #, c-format msgid "Login Time: %s
\n" msgstr "登入時間：%s
\n" -#: ../libpurple/protocols/qq/qq.c:450 +#: ../libpurple/protocols/qq/qq.c:452 #, c-format msgid "Last Login IP: %s
\n" msgstr "上次登入位址：%s
\n" -#: ../libpurple/protocols/qq/qq.c:451 +#: ../libpurple/protocols/qq/qq.c:453 #, c-format msgid "Last Login Time: %s\n" msgstr "上次登入時間：%s\n" # XXX - 20061027 -#: ../libpurple/protocols/qq/qq.c:455 +#: ../libpurple/protocols/qq/qq.c:457 msgid "Login Information" msgstr "登入資訊" -#: ../libpurple/protocols/qq/qq.c:531 -msgid "Modify My Information" -msgstr "修改資訊" - -#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680 +#: ../libpurple/protocols/qq/qq.c:533 +msgid "Set My Information" +msgstr "設定我的資訊" + +#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680 msgid "Change Password" msgstr "修改密碼" -#: ../libpurple/protocols/qq/qq.c:537 +#: ../libpurple/protocols/qq/qq.c:539 msgid "Show Login Information" msgstr "顯示登入資訊" -#: ../libpurple/protocols/qq/qq.c:558 -msgid "Exit this QQ Qun" +#: ../libpurple/protocols/qq/qq.c:560 +msgid "Leave this QQ Qun" msgstr "離開這個 QQ 群 (Qun)" -#: ../libpurple/protocols/qq/qq.c:582 +#: ../libpurple/protocols/qq/qq.c:584 msgid "Block this buddy" msgstr "封鎖這個好友" @@ -8494,26 +9944,13 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725 +#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727 msgid "QQ Protocol\tPlugin" msgstr "QQ 協定模組" -#: ../libpurple/protocols/qq/qq.c:750 -msgid "Login in TCP" -msgstr "以 TCP 登入" - -#: ../libpurple/protocols/qq/qq.c:753 -msgid "Login Hidden" -msgstr "以隱藏狀態登入" - -#: ../libpurple/protocols/qq/qq_proxy.c:497 -msgid "Socket send error" -msgstr "寫入 Socket 途中發生錯誤" - -# XXX - 20061027 -#: ../libpurple/protocols/qq/qq_proxy.c:500 -msgid "Connection refused" -msgstr "連線被拒" +#: ../libpurple/protocols/qq/qq.c:752 +msgid "Connect using TCP" +msgstr "使用 TCP 連結" #: ../libpurple/protocols/qq/recv_core.c:309 msgid "Socket error" @@ -8542,62 +9979,59 @@ msgid "Connection lost" msgstr "連線中斷" +# FIXME 譯文有待改進 - 20070912 acli #. cancel login progress #: ../libpurple/protocols/qq/sendqueue.c:131 msgid "Login failed, no reply" msgstr "登入失敗，沒有回應" -#: ../libpurple/protocols/qq/sys_msg.c:112 -msgid "Do you wanna add this buddy?" -msgstr "您想將這個使用者加入到您的好友名單中嗎？" +#: ../libpurple/protocols/qq/sys_msg.c:110 +msgid "Do you want to add this buddy?" +msgstr "您要加入這個使用者到好友清單中嗎？" #. only need to get value -#: ../libpurple/protocols/qq/sys_msg.c:168 +#: ../libpurple/protocols/qq/sys_msg.c:166 #, c-format msgid "You have been added by %s" msgstr "%s 已將您加入到他（她）的好友清單" -#: ../libpurple/protocols/qq/sys_msg.c:171 -msgid "Would like to add him?" -msgstr "您想將他（她）加入到您的好友清單嗎？" - -#: ../libpurple/protocols/qq/sys_msg.c:178 -#, c-format -msgid "%s has added you [%s]" -msgstr "%s 已將您 [%s] 加入到他（她）的好友清單" - -#: ../libpurple/protocols/qq/sys_msg.c:194 +# FIXME fix the original string :P +#: ../libpurple/protocols/qq/sys_msg.c:169 +#: ../libpurple/protocols/qq/sys_msg.c:263 +msgid "Would you like to add him?" +msgstr "您要將他（她）加入您的好友清單嗎？" + +#: ../libpurple/protocols/qq/sys_msg.c:176 +#, c-format +msgid "%s has added you [%s] to his or her buddy list" +msgstr "%s 將您 [%s] 加入他（她）的好友清單。" + +#: ../libpurple/protocols/qq/sys_msg.c:192 #, c-format msgid "User %s rejected your request" msgstr "使用者「%s」拒絕了您的要求" -#: ../libpurple/protocols/qq/sys_msg.c:214 -#, c-format -msgid "User %s has approved your request" -msgstr "使用者「%s」允許了您的要求" - -#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze +#: ../libpurple/protocols/qq/sys_msg.c:212 +#, c-format +msgid "User %s approved your request" +msgstr "使用者 %s 允許了您的要求" + #. TODO: this should go through purple_account_request_authorization() -#: ../libpurple/protocols/qq/sys_msg.c:241 -#, c-format -msgid "%s wanna add you [%s] as friends" -msgstr "%s 想要將您（%s）加入他（她）的好友清單" - -#: ../libpurple/protocols/qq/sys_msg.c:242 +#: ../libpurple/protocols/qq/sys_msg.c:238 +#, c-format +msgid "%s wants to add you [%s] as a friend" +msgstr "%s 想要將您 [%s] 加入他（她）的好友清單" + +#: ../libpurple/protocols/qq/sys_msg.c:239 #, c-format msgid "Message: %s" msgstr "訊息：%s" -#: ../libpurple/protocols/qq/sys_msg.c:264 +#: ../libpurple/protocols/qq/sys_msg.c:261 #, c-format msgid "%s is not in your buddy list" msgstr "%s 不在您的好友清單內" -# FIXME fix the original string :P -#: ../libpurple/protocols/qq/sys_msg.c:266 -msgid "Would you like to add him?" -msgstr "您要將他（她）加入您的好友清單嗎？" - #: ../libpurple/protocols/sametime/sametime.c:417 msgid "Connection closed (writing)" msgstr "連線關閉（寫入）" @@ -8629,17 +10063,21 @@ msgid "Get Notes Address Book Info" msgstr "取得 Notes 通訊錄資訊" +# NOTE 見cnscode.org.tw +# FIXME 譯文有待改進 #: ../libpurple/protocols/sametime/sametime.c:1504 msgid "Sending Handshake" -msgstr "傳送 Handshake" - +msgstr "傳送交握中" + +# NOTE 見cnscode.org.tw #: ../libpurple/protocols/sametime/sametime.c:1509 msgid "Waiting for Handshake Acknowledgement" -msgstr "等待 Handshake 回應" - +msgstr "等待交握回應" + +# NOTE 見cnscode.org.tw #: ../libpurple/protocols/sametime/sametime.c:1514 msgid "Handshake Acknowledged, Sending Login" -msgstr "Handshake收到回應，送出登入要求" +msgstr "收到交握回應，送出登入要求中" #: ../libpurple/protocols/sametime/sametime.c:1519 msgid "Waiting for Login Acknowledgement" @@ -8647,11 +10085,11 @@ #: ../libpurple/protocols/sametime/sametime.c:1524 msgid "Login Redirected" -msgstr "重新導向登入" +msgstr "登入已被重新導向" #: ../libpurple/protocols/sametime/sametime.c:1530 msgid "Forcing Login" -msgstr "強行登入" +msgstr "強行登入中" #: ../libpurple/protocols/sametime/sametime.c:1534 msgid "Login Acknowledged" @@ -8662,11 +10100,6 @@ msgid "Starting Services" msgstr "啟動服務" -# TODO 要覆查 - 20061027 -#: ../libpurple/protocols/sametime/sametime.c:1544 -msgid "Connected" -msgstr "已連結" - #: ../libpurple/protocols/sametime/sametime.c:1645 #, c-format msgid "" @@ -8723,10 +10156,6 @@ msgid "Video Camera" msgstr "視訊" -#: ../libpurple/protocols/sametime/sametime.c:3235 -msgid "File Transfer" -msgstr "檔案傳輸" - #: ../libpurple/protocols/sametime/sametime.c:3269 #: ../libpurple/protocols/sametime/sametime.c:4145 msgid "Supports" @@ -8794,7 +10223,7 @@ msgid "Send TEST Announcement" msgstr "送出測試通告" -#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4274 +#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338 msgid "Topic:" msgstr "主題：" @@ -8821,7 +10250,7 @@ msgid "No Sametime Community Server Specified" msgstr "未指定 Sametime 社群伺服器" -#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4015 +#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038 msgid "Connect" msgstr "連線" @@ -8997,8 +10426,7 @@ "「%s」可能指下列任何一個使用者。您可使用下面的按紐，把他（她）們新增至好友清" "單內，或向他（她）們發出訊息。" -#. Create the window -#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:719 +#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724 msgid "Search Results" msgstr "搜尋結果" @@ -9437,13 +10865,6 @@ msgid "User Modes" msgstr "使用者模式" -#: ../libpurple/protocols/silc/buddy.c:1557 -#: ../libpurple/protocols/silc/ops.c:1212 -#: ../libpurple/protocols/silc10/buddy.c:1557 -#: ../libpurple/protocols/silc10/ops.c:1207 -msgid "Mood" -msgstr "心情" - #: ../libpurple/protocols/silc/buddy.c:1562 #: ../libpurple/protocols/silc/ops.c:1224 #: ../libpurple/protocols/silc10/buddy.c:1562 @@ -9978,7 +11399,7 @@ #: ../libpurple/protocols/silc/ops.c:1326 #: ../libpurple/protocols/silc10/ops.c:1183 #: ../libpurple/protocols/silc10/ops.c:1332 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071 msgid "Real Name" msgstr "姓名" @@ -10113,13 +11534,6 @@ msgstr "網路統計資料" #: ../libpurple/protocols/silc/ops.c:1596 -#: ../libpurple/protocols/silc/ops.c:1601 -#: ../libpurple/protocols/silc10/ops.c:1612 -#: ../libpurple/protocols/silc10/ops.c:1617 -msgid "Ping" -msgstr "Ping" - -#: ../libpurple/protocols/silc/ops.c:1596 #: ../libpurple/protocols/silc10/ops.c:1612 msgid "Ping failed" msgstr "Ping 失敗" @@ -10273,7 +11687,7 @@ msgstr "您目前的心情" #: ../libpurple/protocols/silc/silc.c:741 -#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636 +#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640 msgid "Normal" msgstr "正常" @@ -10666,7 +12080,7 @@ msgstr "安全性網際網路即時會議 (SILC) 協定" #: ../libpurple/protocols/silc/silc.c:1910 -#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029 +#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035 msgid "Network" msgstr "網路" @@ -10933,26 +12347,26 @@ msgstr "無法寫入" #: ../libpurple/protocols/simple/simple.c:438 -#: ../libpurple/protocols/simple/simple.c:1484 +#: ../libpurple/protocols/simple/simple.c:1490 msgid "Could not connect" msgstr "無法連結" -#: ../libpurple/protocols/simple/simple.c:1518 -#: ../libpurple/protocols/simple/simple.c:1560 -#: ../libpurple/protocols/simple/simple.c:1573 -#: ../libpurple/protocols/simple/simple.c:1624 +#: ../libpurple/protocols/simple/simple.c:1524 +#: ../libpurple/protocols/simple/simple.c:1566 +#: ../libpurple/protocols/simple/simple.c:1579 +#: ../libpurple/protocols/simple/simple.c:1630 msgid "Could not create listen socket" msgstr "無法建立 Socket 監聽" -#: ../libpurple/protocols/simple/simple.c:1541 +#: ../libpurple/protocols/simple/simple.c:1547 msgid "Couldn't resolve host" msgstr "無法解析主機" -#: ../libpurple/protocols/simple/simple.c:1632 +#: ../libpurple/protocols/simple/simple.c:1638 msgid "Could not resolve hostname" msgstr "無法解析主機" -#: ../libpurple/protocols/simple/simple.c:1649 +#: ../libpurple/protocols/simple/simple.c:1655 msgid "SIP screen names may not contain whitespaces or @ symbols" msgstr "SIP 的帳號不可含有空白字元或「@」符號" @@ -10964,36 +12378,36 @@ #. *< id #. *< name #. *< version -#: ../libpurple/protocols/simple/simple.c:1824 +#: ../libpurple/protocols/simple/simple.c:1830 msgid "SIP/SIMPLE Protocol Plugin" msgstr "SIP/SIMPLE 通訊協定模組" #. * summary -#: ../libpurple/protocols/simple/simple.c:1825 +#: ../libpurple/protocols/simple/simple.c:1831 msgid "The SIP/SIMPLE Protocol Plugin" msgstr "SIP/SIMPLE 通訊協定模組" -#: ../libpurple/protocols/simple/simple.c:1853 +#: ../libpurple/protocols/simple/simple.c:1859 msgid "Publish status (note: everyone may watch you)" msgstr "刊登狀態（請注意：任何人都能看到您）" -#: ../libpurple/protocols/simple/simple.c:1859 +#: ../libpurple/protocols/simple/simple.c:1865 msgid "Use UDP" msgstr "使用 UDP" -#: ../libpurple/protocols/simple/simple.c:1861 +#: ../libpurple/protocols/simple/simple.c:1867 msgid "Use proxy" msgstr "使用 Proxy" -#: ../libpurple/protocols/simple/simple.c:1863 +#: ../libpurple/protocols/simple/simple.c:1869 msgid "Proxy" msgstr "代理伺服器" -#: ../libpurple/protocols/simple/simple.c:1865 +#: ../libpurple/protocols/simple/simple.c:1871 msgid "Auth User" msgstr "認證使用者" -#: ../libpurple/protocols/simple/simple.c:1867 +#: ../libpurple/protocols/simple/simple.c:1873 msgid "Auth Domain" msgstr "認證域名" @@ -11157,8 +12571,8 @@ msgid "Password Change Successful" msgstr "密碼修改成功" -#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519 -#: ../pidgin/gtkblist.c:5873 +#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576 +#: ../pidgin/gtkblist.c:5929 msgid "_Group:" msgstr "群組(_G)：" @@ -11218,33 +12632,27 @@ msgid "TOC Protocol Plugin" msgstr "TOC 協定模組" +#: ../libpurple/protocols/yahoo/yahoo.c:782 +#, c-format +msgid "%s has sent you a webcam invite, which is not yet supported." +msgstr "%s 送來了一個視像聊天的邀請，但目前還沒有視像聊天的支援。" + # NOTE 譯文更動 by Ambrose -#: ../libpurple/protocols/yahoo/yahoo.c:810 +#: ../libpurple/protocols/yahoo/yahoo.c:838 msgid "Your Yahoo! message did not get sent." msgstr "無法送出您的 Yahoo! 訊息。" -# XXX 可能可以譯得生動一點 -#: ../libpurple/protocols/yahoo/yahoo.c:880 -#, c-format -msgid "%s just sent you a Buzz!" -msgstr "%s 在呼叫您！" - # XXX 暫譯 -#: ../libpurple/protocols/yahoo/yahoo.c:927 +#: ../libpurple/protocols/yahoo/yahoo.c:957 #, c-format msgid "Yahoo! system message for %s:" msgstr "%s 的 Yahoo! 系統訊息：" -#: ../libpurple/protocols/yahoo/yahoo.c:986 +#: ../libpurple/protocols/yahoo/yahoo.c:1026 msgid "Authorization denied message:" msgstr "拒絕認證訊息：" -#: ../libpurple/protocols/yahoo/yahoo.c:1067 -#, c-format -msgid "%s has (retroactively) denied your request to add them to your list." -msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。" - -#: ../libpurple/protocols/yahoo/yahoo.c:1070 +#: ../libpurple/protocols/yahoo/yahoo.c:1044 #, c-format msgid "" "%s has (retroactively) denied your request to add them to your list for the " @@ -11253,11 +12661,16 @@ "使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的要求：%" "s" -#: ../libpurple/protocols/yahoo/yahoo.c:1073 +#: ../libpurple/protocols/yahoo/yahoo.c:1047 +#, c-format +msgid "%s has (retroactively) denied your request to add them to your list." +msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。" + +#: ../libpurple/protocols/yahoo/yahoo.c:1049 msgid "Add buddy rejected" msgstr "新增好友被拒" -#: ../libpurple/protocols/yahoo/yahoo.c:1824 +#: ../libpurple/protocols/yahoo/yahoo.c:1991 #, c-format msgid "" "The Yahoo server has requested the use of an unrecognized authentication " @@ -11267,11 +12680,11 @@ "Yahoo 伺服器要求了使用一種不明的認證方式，因此很可能不會成功登入 Yahoo。請到 " "%s 檢查有沒有更新的版本。" -#: ../libpurple/protocols/yahoo/yahoo.c:1827 +#: ../libpurple/protocols/yahoo/yahoo.c:1994 msgid "Failed Yahoo! Authentication" msgstr "Yahoo! 認證失敗" -#: ../libpurple/protocols/yahoo/yahoo.c:1893 +#: ../libpurple/protocols/yahoo/yahoo.c:2060 #, c-format msgid "" "You have tried to ignore %s, but the user is on your buddy list. Clicking " @@ -11280,49 +12693,49 @@ "您嘗試忽略在您的好友名單內的 %s。如果您打算把他（她）從您的好友清單中移除，並" "隨即忽略他（她），請按一下「是」。" -#: ../libpurple/protocols/yahoo/yahoo.c:1896 +#: ../libpurple/protocols/yahoo/yahoo.c:2063 msgid "Ignore buddy?" msgstr "忽略使用者？" -#: ../libpurple/protocols/yahoo/yahoo.c:1955 +#: ../libpurple/protocols/yahoo/yahoo.c:2126 msgid "Your account is locked, please log in to the Yahoo! website." msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。" -#: ../libpurple/protocols/yahoo/yahoo.c:1958 +#: ../libpurple/protocols/yahoo/yahoo.c:2129 #, c-format msgid "Unknown error number %d. Logging into the Yahoo! website may fix this." msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。" -#: ../libpurple/protocols/yahoo/yahoo.c:2012 +#: ../libpurple/protocols/yahoo/yahoo.c:2183 #, c-format msgid "Could not add buddy %s to group %s to the server list on account %s." msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。" -#: ../libpurple/protocols/yahoo/yahoo.c:2015 +#: ../libpurple/protocols/yahoo/yahoo.c:2186 msgid "Could not add buddy to server list" msgstr "無法將好友新增至伺服器上的清單內" -#: ../libpurple/protocols/yahoo/yahoo.c:2134 +#: ../libpurple/protocols/yahoo/yahoo.c:2305 #, c-format msgid "[ Audible %s/%s/%s.swf ] %s" msgstr "[ 音效檔 %s/%s/%s.swf ] %s" # XXX 暫譯 - 20061025 -#: ../libpurple/protocols/yahoo/yahoo.c:2474 +#: ../libpurple/protocols/yahoo/yahoo.c:2648 msgid "Received unexpected HTTP response from server." msgstr "伺服器發出了奇怪的 HTTP 回應。" -#: ../libpurple/protocols/yahoo/yahoo.c:2498 -#: ../libpurple/protocols/yahoo/yahoo.c:2684 -#: ../libpurple/protocols/yahoo/yahoo.c:2787 -#: ../libpurple/protocols/yahoo/yahoo.c:2797 -#: ../libpurple/protocols/yahoo/yahoochat.c:1418 -#: ../libpurple/protocols/yahoo/yahoochat.c:1488 +#: ../libpurple/protocols/yahoo/yahoo.c:2672 +#: ../libpurple/protocols/yahoo/yahoo.c:2858 +#: ../libpurple/protocols/yahoo/yahoo.c:2961 +#: ../libpurple/protocols/yahoo/yahoo.c:2971 +#: ../libpurple/protocols/yahoo/yahoochat.c:1514 +#: ../libpurple/protocols/yahoo/yahoochat.c:1584 #: ../libpurple/protocols/yahoo/ycht.c:585 msgid "Connection problem" msgstr "連線錯誤" -#: ../libpurple/protocols/yahoo/yahoo.c:2524 +#: ../libpurple/protocols/yahoo/yahoo.c:2698 #, c-format msgid "" "Lost connection with %s:\n" @@ -11331,7 +12744,7 @@ "與 %s 之間的連線突然中斷:\n" "%s" -#: ../libpurple/protocols/yahoo/yahoo.c:2549 +#: ../libpurple/protocols/yahoo/yahoo.c:2723 #, c-format msgid "" "Could not establish a connection with %s:\n" @@ -11340,28 +12753,28 @@ "無法與 %s 建立連線:\n" "%s" -#: ../libpurple/protocols/yahoo/yahoo.c:2899 -#: ../libpurple/protocols/yahoo/yahoo.c:3510 +#: ../libpurple/protocols/yahoo/yahoo.c:3078 +#: ../libpurple/protocols/yahoo/yahoo.c:3764 msgid "Not at Home" msgstr "不在家" -#: ../libpurple/protocols/yahoo/yahoo.c:2901 -#: ../libpurple/protocols/yahoo/yahoo.c:3513 +#: ../libpurple/protocols/yahoo/yahoo.c:3080 +#: ../libpurple/protocols/yahoo/yahoo.c:3767 msgid "Not at Desk" msgstr "不在座位" -#: ../libpurple/protocols/yahoo/yahoo.c:2903 -#: ../libpurple/protocols/yahoo/yahoo.c:3516 +#: ../libpurple/protocols/yahoo/yahoo.c:3082 +#: ../libpurple/protocols/yahoo/yahoo.c:3770 msgid "Not in Office" msgstr "不在辦公室" -#: ../libpurple/protocols/yahoo/yahoo.c:2907 -#: ../libpurple/protocols/yahoo/yahoo.c:3522 +#: ../libpurple/protocols/yahoo/yahoo.c:3086 +#: ../libpurple/protocols/yahoo/yahoo.c:3776 msgid "On Vacation" msgstr "渡假去了" -#: ../libpurple/protocols/yahoo/yahoo.c:2911 -#: ../libpurple/protocols/yahoo/yahoo.c:3528 +#: ../libpurple/protocols/yahoo/yahoo.c:3090 +#: ../libpurple/protocols/yahoo/yahoo.c:3782 msgid "Stepped Out" msgstr "走出去了" @@ -11369,92 +12782,96 @@ # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy # NOTE isn't on the server's buddy list/ which also means you won't # NOTE be able to see when they log on, etc) -#: ../libpurple/protocols/yahoo/yahoo.c:3004 -#: ../libpurple/protocols/yahoo/yahoo.c:3034 +#: ../libpurple/protocols/yahoo/yahoo.c:3183 +#: ../libpurple/protocols/yahoo/yahoo.c:3213 msgid "Not on server list" msgstr "不在伺服器上的清單中" -#: ../libpurple/protocols/yahoo/yahoo.c:3051 -#: ../libpurple/protocols/yahoo/yahoo.c:3109 +#: ../libpurple/protocols/yahoo/yahoo.c:3230 +#: ../libpurple/protocols/yahoo/yahoo.c:3288 msgid "Appear Online" msgstr "報稱上線" # NOTE Yahoo 官方譯「永遠顯示離線」，說白一點其實即是（針對某人）「長期隠身」 -#: ../libpurple/protocols/yahoo/yahoo.c:3054 -#: ../libpurple/protocols/yahoo/yahoo.c:3130 +#: ../libpurple/protocols/yahoo/yahoo.c:3233 +#: ../libpurple/protocols/yahoo/yahoo.c:3309 msgid "Appear Permanently Offline" msgstr "長期報稱離線" -#: ../libpurple/protocols/yahoo/yahoo.c:3072 +#: ../libpurple/protocols/yahoo/yahoo.c:3251 msgid "Presence" msgstr "上線狀態" # NOTE 下次登入時不報稱離線，所以加「暫時」字眼 -#: ../libpurple/protocols/yahoo/yahoo.c:3115 +#: ../libpurple/protocols/yahoo/yahoo.c:3294 msgid "Appear Offline" msgstr "暫時報稱離線" # NOTE 這是清單內的一個指令 -#: ../libpurple/protocols/yahoo/yahoo.c:3124 +#: ../libpurple/protocols/yahoo/yahoo.c:3303 msgid "Don't Appear Permanently Offline" msgstr "停止長期報稱離線" # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」 -#: ../libpurple/protocols/yahoo/yahoo.c:3172 +#: ../libpurple/protocols/yahoo/yahoo.c:3351 msgid "Join in Chat" msgstr "加入好友目前所在的聊天室" # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。 -#: ../libpurple/protocols/yahoo/yahoo.c:3178 +#: ../libpurple/protocols/yahoo/yahoo.c:3357 msgid "Initiate Conference" msgstr "開啟會議室" -#: ../libpurple/protocols/yahoo/yahoo.c:3206 +#: ../libpurple/protocols/yahoo/yahoo.c:3385 msgid "Presence Settings" msgstr "上線狀態設定" -#: ../libpurple/protocols/yahoo/yahoo.c:3212 +#: ../libpurple/protocols/yahoo/yahoo.c:3391 msgid "Start Doodling" msgstr "開始 Doodle" -#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over -#: ../libpurple/protocols/yahoo/yahoo.c:3245 -msgid "Active which ID?" -msgstr "啟動哪一個 ID？" +#: ../libpurple/protocols/yahoo/yahoo.c:3492 +msgid "Activate which ID?" +msgstr "啟用哪一個 ID？" # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」 -#: ../libpurple/protocols/yahoo/yahoo.c:3256 +#: ../libpurple/protocols/yahoo/yahoo.c:3503 msgid "Join whom in chat?" -msgstr "加入哪個好友目前所在的聊天室？" - -#: ../libpurple/protocols/yahoo/yahoo.c:3268 +msgstr "加入誰的聊天室？" + +#: ../libpurple/protocols/yahoo/yahoo.c:3515 msgid "Activate ID..." msgstr "啟動 ID..." -#: ../libpurple/protocols/yahoo/yahoo.c:3272 +#: ../libpurple/protocols/yahoo/yahoo.c:3519 msgid "Join User in Chat..." msgstr "加入好友目前所在的聊天室..." -# XXX 可能可以譯得生動一點 -#: ../libpurple/protocols/yahoo/yahoo.c:3779 -msgid "You have just sent a Buzz!" -msgstr "您剛送出了一個呼叫！" - -#: ../libpurple/protocols/yahoo/yahoo.c:3838 +#: ../libpurple/protocols/yahoo/yahoo.c:3524 +msgid "Open Inbox" +msgstr "開啟收件匣" + +#: ../libpurple/protocols/yahoo/yahoo.c:4116 +msgid "Buzz" +msgstr "嗶！" + +# XXX 這是暫譯 - acli 20070913 +#: ../libpurple/protocols/yahoo/yahoo.c:4118 +#, c-format +msgid "Buzzing %s..." +msgstr "正在給 %s 一個嗶..." + +#: ../libpurple/protocols/yahoo/yahoo.c:4133 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "join: <聊天室>：加入位於 Yahoo! 網路的一個聊天室" -#: ../libpurple/protocols/yahoo/yahoo.c:3843 +#: ../libpurple/protocols/yahoo/yahoo.c:4138 msgid "list: List rooms on the Yahoo network" msgstr "list：列出Yahoo網路上的聊天室清單" -#: ../libpurple/protocols/yahoo/yahoo.c:3847 -msgid "buzz: Buzz a user to get their attention" -msgstr "buzz: 給好友一個「嗶」引他（她）注意" - -#: ../libpurple/protocols/yahoo/yahoo.c:3851 +#: ../libpurple/protocols/yahoo/yahoo.c:4146 msgid "doodle: Request user to start a Doodle session" msgstr "doodle: 要求使用者開始 Doodle Session" @@ -11468,134 +12885,60 @@ #. *< version #. * summary #. * description -#: ../libpurple/protocols/yahoo/yahoo.c:4059 -#: ../libpurple/protocols/yahoo/yahoo.c:4061 +#: ../libpurple/protocols/yahoo/yahoo.c:4355 +#: ../libpurple/protocols/yahoo/yahoo.c:4357 msgid "Yahoo Protocol Plugin" msgstr "Yahoo 協定模組" -#: ../libpurple/protocols/yahoo/yahoo.c:4084 +#: ../libpurple/protocols/yahoo/yahoo.c:4380 msgid "Yahoo Japan" msgstr "Yahoo Japan" -#: ../libpurple/protocols/yahoo/yahoo.c:4087 +#: ../libpurple/protocols/yahoo/yahoo.c:4383 msgid "Pager server" msgstr "傳呼伺服器" -#: ../libpurple/protocols/yahoo/yahoo.c:4090 +#: ../libpurple/protocols/yahoo/yahoo.c:4386 msgid "Japan Pager server" msgstr "傳呼伺服器（日本地區）" -#: ../libpurple/protocols/yahoo/yahoo.c:4093 +#: ../libpurple/protocols/yahoo/yahoo.c:4389 msgid "Pager port" msgstr "傳呼系統通訊埠" -#: ../libpurple/protocols/yahoo/yahoo.c:4096 +#: ../libpurple/protocols/yahoo/yahoo.c:4392 msgid "File transfer server" msgstr "檔案傳輸伺服器" -#: ../libpurple/protocols/yahoo/yahoo.c:4099 +#: ../libpurple/protocols/yahoo/yahoo.c:4395 msgid "Japan file transfer server" msgstr "檔案傳輸伺服器（日本地區）" -#: ../libpurple/protocols/yahoo/yahoo.c:4102 +#: ../libpurple/protocols/yahoo/yahoo.c:4398 msgid "File transfer port" msgstr "檔案傳輸通訊埠" # XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!) -#: ../libpurple/protocols/yahoo/yahoo.c:4105 +#: ../libpurple/protocols/yahoo/yahoo.c:4401 msgid "Chat room locale" msgstr "聊天室區域 (Locale)" -#: ../libpurple/protocols/yahoo/yahoo.c:4108 +#: ../libpurple/protocols/yahoo/yahoo.c:4404 msgid "Ignore conference and chatroom invitations" msgstr "忽略會議室與聊天室邀請" -#: ../libpurple/protocols/yahoo/yahoo.c:4116 +#: ../libpurple/protocols/yahoo/yahoo.c:4412 msgid "Chat room list URL" msgstr "聊天室清單所在網址" -#: ../libpurple/protocols/yahoo/yahoo.c:4119 +#: ../libpurple/protocols/yahoo/yahoo.c:4415 msgid "Yahoo Chat server" msgstr "Yahoo 聊天伺服器" -#: ../libpurple/protocols/yahoo/yahoo.c:4122 +#: ../libpurple/protocols/yahoo/yahoo.c:4418 msgid "Yahoo Chat port" msgstr "Yahoo 聊天室通訊埠" -#: ../libpurple/protocols/yahoo/yahoochat.c:204 -#, c-format -msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." -msgstr "%s 婉拒了你詢問他（她）到會議室「%s」的邀請，理由是「%s」。" - -#: ../libpurple/protocols/yahoo/yahoochat.c:206 -msgid "Invitation Rejected" -msgstr "邀請被婉拒了" - -#: ../libpurple/protocols/yahoo/yahoochat.c:362 -msgid "Failed to join chat" -msgstr "無法加入聊天室" - -#. -6 -#: ../libpurple/protocols/yahoo/yahoochat.c:365 -msgid "Unknown room" -msgstr "未知聊天室" - -#. -15 -#: ../libpurple/protocols/yahoo/yahoochat.c:368 -msgid "Maybe the room is full" -msgstr "也許聊天室使用者已經到達上限" - -#. -35 -#: ../libpurple/protocols/yahoo/yahoochat.c:371 -msgid "Not available" -msgstr "聊天室不存在" - -#: ../libpurple/protocols/yahoo/yahoochat.c:375 -msgid "" -"Unknown error. You may need to logout and wait five minutes before being " -"able to rejoin a chatroom" -msgstr "未知的錯誤。您或許需要登出並等待五分鐘，以重新進入聊天室" - -#: ../libpurple/protocols/yahoo/yahoochat.c:453 -#, c-format -msgid "You are now chatting in %s." -msgstr "您現在進入「%s」進行聊天。" - -#: ../libpurple/protocols/yahoo/yahoochat.c:628 -msgid "Failed to join buddy in chat" -msgstr "無法加入好友目前所在的聊天室" - -#: ../libpurple/protocols/yahoo/yahoochat.c:629 -msgid "Maybe they're not in a chat?" -msgstr "可能他（她）並不在聊天室內？" - -#: ../libpurple/protocols/yahoo/yahoochat.c:1320 -#: ../libpurple/protocols/yahoo/yahoochat.c:1346 -msgid "Fetching the room list failed." -msgstr "讀取聊天室清單發生錯誤。" - -# NOTE 解「可語音聊天的使用者數目」(marv) -#: ../libpurple/protocols/yahoo/yahoochat.c:1404 -msgid "Voices" -msgstr "可語音聊天" - -# NOTE 解「可視像聊天的使用者數目」(marv) -#: ../libpurple/protocols/yahoo/yahoochat.c:1407 -msgid "Webcams" -msgstr "可視像聊天" - -#: ../libpurple/protocols/yahoo/yahoochat.c:1418 -#: ../libpurple/protocols/yahoo/yahoochat.c:1488 -msgid "Unable to fetch room list." -msgstr "無法取得聊天室清單。" - -# NOTE wing: does "User Rooms" mean rooms created by users? i guess yes? -# NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms -# NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room -#: ../libpurple/protocols/yahoo/yahoochat.c:1481 -msgid "User Rooms" -msgstr "使用者建立之聊天室" - #. Write a local message to this conversation showing that a request for a #. * Doodle session has been made #. @@ -11611,86 +12954,86 @@ msgstr "無法建立檔案介紹。" #. TODO: what to do here - do we really have to disconnect? -#: ../libpurple/protocols/yahoo/yahoo_packet.c:302 +#: ../libpurple/protocols/yahoo/yahoo_packet.c:307 msgid "Write Error" msgstr "寫入錯誤" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:773 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 msgid "Yahoo! Japan Profile" msgstr "Yahoo! Japan 個人資料" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:774 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "Yahoo! 個人資料" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:814 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:838 msgid "" "Sorry, profiles marked as containing adult content are not supported at this " "time." msgstr "對不起，暫時並不支援內容被列為兒童不宜的個人資訊。" # NOTE 注意：鏈結在譯文之下顯示，故譯成「以下」 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:816 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:840 msgid "" "If you wish to view this profile, you will need to visit this link in your " "web browser:" msgstr "您如果想看這則個人資訊，請用您的瀏覽器開啟以下連結：" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034 msgid "Yahoo! ID" msgstr "Yahoo! 帳號" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117 msgid "Hobbies" msgstr "嗜好" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103 -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131 msgid "Latest News" msgstr "最新消息" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152 msgid "Home Page" msgstr "網頁" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167 msgid "Cool Link 1" msgstr "酷連結(一)" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172 msgid "Cool Link 2" msgstr "酷連結(二)" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176 msgid "Cool Link 3" msgstr "酷連結(三)" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190 msgid "Last Update" msgstr "更新日期" # NOTE 譯文更動 by Ambrose -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199 #, c-format msgid "User information for %s unavailable" msgstr "無法取得使用者 %s 的個人資訊" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205 msgid "" "Sorry, this profile seems to be in a language or format that is not " "supported at this time." msgstr "對不起，這則個人資訊似乎是使用目前尚未被支援的語言或格式。" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221 msgid "" "Could not retrieve the user's profile. This most likely is a temporary " "server-side problem. Please try again later." msgstr "" "無法取得使用者的個人資料。這很有可能只是伺服器出現暫時性的問題，請稍後重試。" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224 msgid "" "Could not retrieve the user's profile. This most likely means that the user " "does not exist; however, Yahoo! sometimes does fail to find a user's " @@ -11699,10 +13042,84 @@ "無法取得使用者的個人資料。這很有可能表示這個使用者並不存在；然而，Yahoo! 會不" "時找不到使用者的個人資料。若果您知道使用者確實存在，請稍後重試。" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207 +#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231 msgid "The user's profile is empty." msgstr "這個使用者的資訊是空白的。" +#: ../libpurple/protocols/yahoo/yahoochat.c:217 +#, c-format +msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." +msgstr "%s 婉拒了你詢問他（她）到會議室「%s」的邀請，理由是「%s」。" + +#: ../libpurple/protocols/yahoo/yahoochat.c:219 +msgid "Invitation Rejected" +msgstr "邀請被婉拒了" + +#: ../libpurple/protocols/yahoo/yahoochat.c:438 +msgid "Failed to join chat" +msgstr "無法加入聊天室" + +#. -6 +#: ../libpurple/protocols/yahoo/yahoochat.c:441 +msgid "Unknown room" +msgstr "未知聊天室" + +#. -15 +#: ../libpurple/protocols/yahoo/yahoochat.c:444 +msgid "Maybe the room is full" +msgstr "也許聊天室使用者已經到達上限" + +#. -35 +#: ../libpurple/protocols/yahoo/yahoochat.c:447 +msgid "Not available" +msgstr "聊天室不存在" + +#: ../libpurple/protocols/yahoo/yahoochat.c:451 +msgid "" +"Unknown error. You may need to logout and wait five minutes before being " +"able to rejoin a chatroom" +msgstr "未知的錯誤。您或許需要登出並等待五分鐘，以重新進入聊天室" + +#: ../libpurple/protocols/yahoo/yahoochat.c:534 +#, c-format +msgid "You are now chatting in %s." +msgstr "您現在進入「%s」進行聊天。" + +#: ../libpurple/protocols/yahoo/yahoochat.c:719 +msgid "Failed to join buddy in chat" +msgstr "無法加入好友目前所在的聊天室" + +#: ../libpurple/protocols/yahoo/yahoochat.c:720 +msgid "Maybe they're not in a chat?" +msgstr "可能他（她）並不在聊天室內？" + +#: ../libpurple/protocols/yahoo/yahoochat.c:1416 +#: ../libpurple/protocols/yahoo/yahoochat.c:1442 +msgid "Fetching the room list failed." +msgstr "讀取聊天室清單發生錯誤。" + +# NOTE 解「可語音聊天的使用者數目」(marv) +#: ../libpurple/protocols/yahoo/yahoochat.c:1500 +msgid "Voices" +msgstr "可語音聊天" + +# NOTE 解「可視像聊天的使用者數目」(marv) +#: ../libpurple/protocols/yahoo/yahoochat.c:1503 +msgid "Webcams" +msgstr "可視像聊天" + +#: ../libpurple/protocols/yahoo/yahoochat.c:1514 +#: ../libpurple/protocols/yahoo/yahoochat.c:1584 +msgid "Unable to fetch room list." +msgstr "無法取得聊天室清單。" + +# NOTE wing: does "User Rooms" mean rooms created by users? i guess yes? +# NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms +# NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room +#: ../libpurple/protocols/yahoo/yahoochat.c:1577 +msgid "User Rooms" +msgstr "使用者建立之聊天室" + #: ../libpurple/protocols/yahoo/ycht.c:456 msgid "Connection problem with the YCHT server." msgstr "與 YCHT 伺服器出現連線錯誤" @@ -11727,11 +13144,6 @@ msgid "Unable to send to chat %s,%s,%s" msgstr "無法傳送至聊天室 %s,%s,%s" -#: ../libpurple/protocols/zephyr/zephyr.c:786 -#: ../libpurple/protocols/zephyr/zephyr.c:1204 -msgid "User" -msgstr "使用者" - #: ../libpurple/protocols/zephyr/zephyr.c:791 #: ../libpurple/protocols/zephyr/zephyr.c:1210 msgid "Hidden or not logged-in" @@ -11976,7 +13388,17 @@ msgid "%s is now known as %s.\n" msgstr "%s 改變暱稱為 %s。\n" -#: ../libpurple/server.c:680 +#: ../libpurple/server.c:301 +#, c-format +msgid "Requesting %s's attention..." +msgstr "" + +#: ../libpurple/server.c:346 +#, c-format +msgid "%s has requested your attention!" +msgstr "%s 引起了您的注意！" + +#: ../libpurple/server.c:795 #, c-format msgid "" "%s has invited %s to the chat room %s:\n" @@ -11985,20 +13407,40 @@ "%s 邀請 %s 到聊天室「%s」：\n" "%s" -#: ../libpurple/server.c:685 +#: ../libpurple/server.c:800 #, c-format msgid "%s has invited %s to the chat room %s\n" msgstr "%s 邀請了 %s 到聊天室「%s」：\n" -#: ../libpurple/server.c:689 +#: ../libpurple/server.c:804 msgid "Accept chat invitation?" msgstr "接受邀請嗎？" +# FIXME ambiguous - 20061025 +# NOTE Jabber 協定 Stream Error 的一種，即 +# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html +# XXX 真正的意思是「無法連線至認證所需的遠端資源」，不是「連線失敗」（見上列文章） +#: ../libpurple/sslconn.c:163 +msgid "SSL Connection Failed" +msgstr "SSL 連線失敗" + +#: ../libpurple/sslconn.c:165 +msgid "SSL Handshake Failed" +msgstr "SSL 交談失敗" + +#: ../libpurple/sslconn.c:167 +msgid "SSL peer presented an invalid certificate" +msgstr "SSL peer 出示了無效的憑證" + +#: ../libpurple/sslconn.c:170 +msgid "Unknown SSL error" +msgstr "未知的 SSL 錯誤" + #: ../libpurple/status.c:152 msgid "Unset" msgstr "取消設定" -#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057 +#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058 msgid "Do not disturb" msgstr "請勿打擾" @@ -12050,13 +13492,13 @@ msgid "%x %X" msgstr "%x %X" -#: ../libpurple/util.c:2691 +#: ../libpurple/util.c:2720 #, c-format msgid "Error Reading %s" msgstr "讀取 %s 途中發生了錯誤" # NOTE 「They」是什麼呢？譯成「它們」的話，「它們」又是什麼呢？寫長一點好了。 -#: ../libpurple/util.c:2692 +#: ../libpurple/util.c:2721 #, c-format msgid "" "An error was encountered reading your %s. They have not been loaded, and " @@ -12064,84 +13506,84 @@ msgstr "" "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。" -#: ../libpurple/util.c:3192 +#: ../libpurple/util.c:3221 msgid "Calculating..." msgstr "計算中..." -#: ../libpurple/util.c:3195 +#: ../libpurple/util.c:3224 msgid "Unknown." msgstr "未知。" -#: ../libpurple/util.c:3221 +#: ../libpurple/util.c:3250 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" msgstr[1] "%d 秒" -#: ../libpurple/util.c:3233 +#: ../libpurple/util.c:3262 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日" msgstr[1] "%d 日" -#: ../libpurple/util.c:3241 +#: ../libpurple/util.c:3270 #, c-format msgid "%s, %d hour" msgid_plural "%s, %d hours" msgstr[0] "%s %d 小時" msgstr[1] "%s %d 小時" -#: ../libpurple/util.c:3247 +#: ../libpurple/util.c:3276 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 小時" msgstr[1] "%d 小時" -#: ../libpurple/util.c:3255 +#: ../libpurple/util.c:3284 #, c-format msgid "%s, %d minute" msgid_plural "%s, %d minutes" msgstr[0] "%s %d 分" msgstr[1] "%s %d 分" -#: ../libpurple/util.c:3261 +#: ../libpurple/util.c:3290 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" msgstr[1] "%d 分" -#: ../libpurple/util.c:3521 +#: ../libpurple/util.c:3550 #, c-format msgid "Could not open %s: Redirected too many times" msgstr "無法打開 %s：重新導向的次數超過了上限" -#: ../libpurple/util.c:3558 ../libpurple/util.c:3853 +#: ../libpurple/util.c:3587 ../libpurple/util.c:3882 #, c-format msgid "Unable to connect to %s" msgstr "無法連線到「%s」" -#: ../libpurple/util.c:3681 +#: ../libpurple/util.c:3710 #, c-format msgid "" "Unable to allocate enough memory to hold the contents from %s. The web " "server may be trying something malicious." msgstr "無法為讀入「%s」取得足夠的記憶體，網站的伺服器可能懷有惡意。" -#: ../libpurple/util.c:3716 +#: ../libpurple/util.c:3745 #, c-format msgid "Error reading from %s: %s" msgstr "讀入 %s 途中發生錯誤：%s" -#: ../libpurple/util.c:3747 +#: ../libpurple/util.c:3776 #, c-format msgid "Error writing to %s: %s" msgstr "寫入 %s 途中發生了錯誤：%s" -#: ../libpurple/util.c:3772 +#: ../libpurple/util.c:3801 #, c-format msgid "Unable to connect to %s: %s" msgstr "無法連線到 %s：%s" @@ -12168,39 +13610,39 @@ msgstr "系統匣方向" #. Build the login options frame. -#: ../pidgin/gtkaccount.c:409 +#: ../pidgin/gtkaccount.c:407 msgid "Login Options" msgstr "登入選項" -#: ../pidgin/gtkaccount.c:430 +#: ../pidgin/gtkaccount.c:428 msgid "Pro_tocol:" msgstr "通訊協定(_T)：" -#: ../pidgin/gtkaccount.c:441 +#: ../pidgin/gtkaccount.c:439 msgid "Screen _name:" msgstr "帳號(_N)：" # NOTE Debian 譯「local」為「本地端」，「本機」是Windows譯法，但在這裏好像比較妥當 # XXX -#: ../pidgin/gtkaccount.c:531 +#: ../pidgin/gtkaccount.c:529 msgid "_Local alias:" msgstr "帳號別名（只在本機生效）(_L)：" -#: ../pidgin/gtkaccount.c:535 +#: ../pidgin/gtkaccount.c:533 msgid "Remember pass_word" msgstr "記住密碼(_W)" #. Build the user options frame. -#: ../pidgin/gtkaccount.c:593 +#: ../pidgin/gtkaccount.c:591 msgid "User Options" msgstr "使用者自定選項" -#: ../pidgin/gtkaccount.c:606 +#: ../pidgin/gtkaccount.c:604 msgid "New _mail notifications" msgstr "新郵件通知(_M)" #. Buddy icon -#: ../pidgin/gtkaccount.c:611 +#: ../pidgin/gtkaccount.c:609 msgid "Use this buddy _icon for this account:" msgstr "使用下列好友圖示(_I)：" @@ -12236,7 +13678,7 @@ msgid "SOCKS 5" msgstr "SOCKS 5" -#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206 +#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210 msgid "Use Environmental Settings" msgstr "使用環境變數設定" @@ -12258,15 +13700,15 @@ msgid "Proxy Options" msgstr "代理伺服器選項" -#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200 +#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204 msgid "Proxy _type:" msgstr "代理伺服器型態(_T)：" -#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221 +#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225 msgid "_Host:" msgstr "主機位址(_H)：" -#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239 +#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243 msgid "_Port:" msgstr "通訊埠(_P)：" @@ -12274,10 +13716,18 @@ msgid "_Username:" msgstr "使用者(_U)：" -#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276 +#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280 msgid "Pa_ssword:" msgstr "密碼(_S)：" +#: ../pidgin/gtkaccount.c:1195 +msgid "Unable to save new account" +msgstr "無法儲存新帳號" + +#: ../pidgin/gtkaccount.c:1196 +msgid "An account already exists with the specified criteria." +msgstr "已有一個乎合指定條件的帳號。" + #: ../pidgin/gtkaccount.c:1473 msgid "Add Account" msgstr "新增帳號" @@ -12286,19 +13736,23 @@ msgid "_Basic" msgstr "基本設定(_B)" -#: ../pidgin/gtkaccount.c:1503 +#: ../pidgin/gtkaccount.c:1499 +msgid "Create this new account on the server" +msgstr "在伺服器上建立這個新帳號" + +#: ../pidgin/gtkaccount.c:1515 msgid "_Advanced" msgstr "進階設定(_A)" -#: ../pidgin/gtkaccount.c:1975 ../pidgin/gtkplugin.c:568 +#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568 msgid "Enabled" msgstr "啟動" -#: ../pidgin/gtkaccount.c:2003 +#: ../pidgin/gtkaccount.c:2001 msgid "Protocol" msgstr "通訊協定" -#: ../pidgin/gtkaccount.c:2203 +#: ../pidgin/gtkaccount.c:2201 #, c-format msgid "" "Welcome to %s!\n" @@ -12322,231 +13776,243 @@ # TODO 看起來應該為加一個新的聊天室，並把聊天室歸類到某個群組。 # NOTE 譯文更動 by Paladin -#: ../pidgin/gtkblist.c:763 +#: ../pidgin/gtkblist.c:765 msgid "Join a Chat" msgstr "加入聊天室" -#: ../pidgin/gtkblist.c:784 +#: ../pidgin/gtkblist.c:786 msgid "" "Please enter the appropriate information about the chat you would like to " "join.\n" msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n" #. Set up stuff for the account box -#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467 -#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540 +#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524 +#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538 #: ../pidgin/gtkroomlist.c:395 msgid "_Account:" msgstr "帳號(_A)：" -#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602 +#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602 #: ../pidgin/gtkprivacy.c:616 msgid "_Block" msgstr "封鎖(_B)" -#: ../pidgin/gtkblist.c:1084 +#: ../pidgin/gtkblist.c:1086 msgid "Un_block" msgstr "解除封鎖(_B)" -#: ../pidgin/gtkblist.c:1135 +#: ../pidgin/gtkblist.c:1137 msgid "Get _Info" msgstr "取得資訊(_I)" -#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84 +#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89 msgid "I_M" msgstr "即時訊息(_M)" -#: ../pidgin/gtkblist.c:1144 +#: ../pidgin/gtkblist.c:1146 msgid "_Send File" msgstr "傳送檔案(_S)" -#: ../pidgin/gtkblist.c:1151 +#: ../pidgin/gtkblist.c:1153 msgid "Add Buddy _Pounce" msgstr "加入好友狀態捕捉(_P)" -#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159 -#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285 +#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162 +#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290 msgid "View _Log" msgstr "觀看日誌(_L)" -#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180 -#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291 +#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184 +#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296 msgid "_Alias..." msgstr "別名(_A)..." -#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182 -#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293 +#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186 +#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298 msgid "_Remove" msgstr "移除(_R)" -#: ../pidgin/gtkblist.c:1232 +#: ../pidgin/gtkblist.c:1236 msgid "Add a _Buddy" msgstr "新增一個好友(_B)" -#: ../pidgin/gtkblist.c:1235 +#: ../pidgin/gtkblist.c:1239 msgid "Add a C_hat" msgstr "新增一個聊天室(_H)" -#: ../pidgin/gtkblist.c:1238 +#: ../pidgin/gtkblist.c:1242 msgid "_Delete Group" msgstr "刪除群組(_D)" -#: ../pidgin/gtkblist.c:1240 +#: ../pidgin/gtkblist.c:1244 msgid "_Rename" msgstr "重命名(_R)" #. join button -#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306 -#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82 +#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306 +#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87 msgid "_Join" msgstr "加入(_J)" -#: ../pidgin/gtkblist.c:1260 +#: ../pidgin/gtkblist.c:1265 msgid "Auto-Join" msgstr "自動加入" -#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321 +#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327 msgid "_Collapse" msgstr "收起(_C)" -#: ../pidgin/gtkblist.c:1326 +#: ../pidgin/gtkblist.c:1332 msgid "_Expand" msgstr "展開(_E)" -#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583 -#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571 +#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595 +#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613 msgid "/Tools/Mute Sounds" msgstr "/工具/靜音" # XXX 暫譯 -#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4602 +#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826 #: ../pidgin/gtkpounce.c:429 msgid "" "You are not currently signed on with an account that can add that buddy." msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。" #. Buddies menu -#: ../pidgin/gtkblist.c:2838 +#: ../pidgin/gtkblist.c:2866 msgid "/_Buddies" msgstr "/好友(_B)" -#: ../pidgin/gtkblist.c:2839 +#: ../pidgin/gtkblist.c:2867 msgid "/Buddies/New Instant _Message..." msgstr "/好友/新即時訊息(_M)" -#: ../pidgin/gtkblist.c:2840 +#: ../pidgin/gtkblist.c:2868 msgid "/Buddies/Join a _Chat..." msgstr "/好友/加入聊天室(_C)" -#: ../pidgin/gtkblist.c:2841 +#: ../pidgin/gtkblist.c:2869 msgid "/Buddies/Get User _Info..." msgstr "/好友/取得使用者資訊(_I)..." # NOTE 此處譯「讀取」似乎較「取得」好一點 -#: ../pidgin/gtkblist.c:2842 +#: ../pidgin/gtkblist.c:2870 msgid "/Buddies/View User _Log..." msgstr "/好友/讀取使用者日誌(_L)..." -#: ../pidgin/gtkblist.c:2844 -msgid "/Buddies/Show _Offline Buddies" -msgstr "/好友/顯示離線好友(_O)" - -#: ../pidgin/gtkblist.c:2845 -msgid "/Buddies/Show _Empty Groups" -msgstr "/好友/顯示空白的群組(_E)" - -#: ../pidgin/gtkblist.c:2846 -msgid "/Buddies/Show Buddy _Details" -msgstr "/好友/顯示好友細節(_D)" - -#: ../pidgin/gtkblist.c:2847 -msgid "/Buddies/Show Idle _Times" -msgstr "/好友/顯示閒置時間(_T)" - -#: ../pidgin/gtkblist.c:2848 +#: ../pidgin/gtkblist.c:2872 +msgid "/Buddies/Show" +msgstr "/好友/顯示" + +#: ../pidgin/gtkblist.c:2873 +msgid "/Buddies/Show/_Offline Buddies" +msgstr "/好友/顯示/離線好友(_O)" + +#: ../pidgin/gtkblist.c:2874 +msgid "/Buddies/Show/_Empty Groups" +msgstr "/好友/顯示/空白群組(_E)" + +#: ../pidgin/gtkblist.c:2875 +msgid "/Buddies/Show/Buddy _Details" +msgstr "/好友/顯示/好友細節(_D)" + +#: ../pidgin/gtkblist.c:2876 +msgid "/Buddies/Show/Idle _Times" +msgstr "/好友/顯示/閒置時間(_T)" + +#: ../pidgin/gtkblist.c:2877 +msgid "/Buddies/Show/_Protocol Icons" +msgstr "/好友/顯示/通訊協定圖示(_P)" + +#: ../pidgin/gtkblist.c:2878 msgid "/Buddies/_Sort Buddies" msgstr "/好友/好友清單排序(_S)" -#: ../pidgin/gtkblist.c:2850 +#: ../pidgin/gtkblist.c:2880 msgid "/Buddies/_Add Buddy..." msgstr "/好友/新增好友(_A)..." -#: ../pidgin/gtkblist.c:2851 +#: ../pidgin/gtkblist.c:2881 msgid "/Buddies/Add C_hat..." msgstr "/好友/新增聊天室(_H)..." -#: ../pidgin/gtkblist.c:2852 +#: ../pidgin/gtkblist.c:2882 msgid "/Buddies/Add _Group..." msgstr "/好友/新增群組(_G)..." -#: ../pidgin/gtkblist.c:2854 +#: ../pidgin/gtkblist.c:2884 msgid "/Buddies/_Quit" msgstr "/好友/結束程式(_Q)" #. Accounts menu -#: ../pidgin/gtkblist.c:2857 +#: ../pidgin/gtkblist.c:2887 msgid "/_Accounts" msgstr "/帳號(_A)" -#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532 +#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589 msgid "/Accounts/Add\\/Edit" msgstr "/帳號(_A)/新增\\/編輯" #. Tools -#: ../pidgin/gtkblist.c:2861 +#: ../pidgin/gtkblist.c:2891 msgid "/_Tools" msgstr "工具(_T)" -#: ../pidgin/gtkblist.c:2862 +#: ../pidgin/gtkblist.c:2892 msgid "/Tools/Buddy _Pounces" msgstr "/工具/好友狀態捕捉(_P)" -#: ../pidgin/gtkblist.c:2863 +#: ../pidgin/gtkblist.c:2893 +msgid "/Tools/_Certificates" +msgstr "/工具/憑證(_C)" + +#: ../pidgin/gtkblist.c:2894 msgid "/Tools/Plu_gins" msgstr "/工具/模組(_G)" -#: ../pidgin/gtkblist.c:2864 +#: ../pidgin/gtkblist.c:2895 msgid "/Tools/Pr_eferences" msgstr "/工具/偏好設定(_E)" -#: ../pidgin/gtkblist.c:2865 +#: ../pidgin/gtkblist.c:2896 msgid "/Tools/Pr_ivacy" msgstr "/工具/隱私設定(_I)" -#: ../pidgin/gtkblist.c:2867 +#: ../pidgin/gtkblist.c:2898 msgid "/Tools/_File Transfers" msgstr "/工具/檔案傳輸(_F)" -#: ../pidgin/gtkblist.c:2868 +#: ../pidgin/gtkblist.c:2899 msgid "/Tools/R_oom List" msgstr "/工具/聊天室清單(_O)" -#: ../pidgin/gtkblist.c:2869 +#: ../pidgin/gtkblist.c:2900 msgid "/Tools/System _Log" msgstr "/工具/系統日誌(_L)" -#: ../pidgin/gtkblist.c:2871 +#: ../pidgin/gtkblist.c:2902 msgid "/Tools/Mute _Sounds" msgstr "/工具/靜音(_S)" #. Help -#: ../pidgin/gtkblist.c:2873 +#: ../pidgin/gtkblist.c:2904 msgid "/_Help" msgstr "/說明(_H)" -#: ../pidgin/gtkblist.c:2874 +#: ../pidgin/gtkblist.c:2905 msgid "/Help/Online _Help" msgstr "/說明/線上說明(_H)" -#: ../pidgin/gtkblist.c:2875 +#: ../pidgin/gtkblist.c:2906 msgid "/Help/_Debug Window" msgstr "/說明/除錯視窗(_D)" -#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879 +#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910 msgid "/Help/_About" msgstr "/說明/關於(_A)" -#: ../pidgin/gtkblist.c:2908 +#: ../pidgin/gtkblist.c:2939 #, c-format msgid "" "\n" @@ -12555,133 +14021,133 @@ "\n" "帳號：%s" -#: ../pidgin/gtkblist.c:2986 +#: ../pidgin/gtkblist.c:3017 msgid "Buddy Alias" msgstr "好友別名" -#: ../pidgin/gtkblist.c:3015 +#: ../pidgin/gtkblist.c:3046 msgid "Logged In" msgstr "已登入" -#: ../pidgin/gtkblist.c:3061 +#: ../pidgin/gtkblist.c:3092 msgid "Last Seen" msgstr "上次登入" # XXX「Spooky」一般來說只是「恐怖」，不一定是「幽靈似的」才算「Spooky」 -#: ../pidgin/gtkblist.c:3081 +#: ../pidgin/gtkblist.c:3113 msgid "Spooky" msgstr "幽靈似的" -#: ../pidgin/gtkblist.c:3083 +#: ../pidgin/gtkblist.c:3115 msgid "Awesome" msgstr "頂呱呱" -#: ../pidgin/gtkblist.c:3085 +#: ../pidgin/gtkblist.c:3117 msgid "Rockin'" msgstr "頂呱呱" -#: ../pidgin/gtkblist.c:3428 +#: ../pidgin/gtkblist.c:3450 #, c-format msgid "Idle %dd %dh %02dm" msgstr "閒置 %d 日 %d 小時 %02d 分" -#: ../pidgin/gtkblist.c:3430 +#: ../pidgin/gtkblist.c:3452 #, c-format msgid "Idle %dh %02dm" msgstr "閒置 %d 小時 %02d 分" -#: ../pidgin/gtkblist.c:3432 +#: ../pidgin/gtkblist.c:3454 #, c-format msgid "Idle %dm" msgstr "閒置 %d 分" -#: ../pidgin/gtkblist.c:3577 +#: ../pidgin/gtkblist.c:3599 msgid "/Buddies/New Instant Message..." msgstr "/好友/新即時訊息..." -#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611 +#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633 msgid "/Buddies/Join a Chat..." msgstr "/好友/加入聊天室(_C)..." -#: ../pidgin/gtkblist.c:3579 +#: ../pidgin/gtkblist.c:3601 msgid "/Buddies/Get User Info..." msgstr "/好友/取得使用者資訊..." -#: ../pidgin/gtkblist.c:3580 +#: ../pidgin/gtkblist.c:3602 msgid "/Buddies/Add Buddy..." msgstr "/好友/新增好友..." -#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614 +#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636 msgid "/Buddies/Add Chat..." msgstr "/好友/新增聊天室..." -#: ../pidgin/gtkblist.c:3582 +#: ../pidgin/gtkblist.c:3604 msgid "/Buddies/Add Group..." msgstr "/好友/新增群組..." -#: ../pidgin/gtkblist.c:3617 +#: ../pidgin/gtkblist.c:3639 msgid "/Tools/Privacy" msgstr "/工具/隱私設定" -#: ../pidgin/gtkblist.c:3620 +#: ../pidgin/gtkblist.c:3642 msgid "/Tools/Room List" msgstr "/工具/聊天室清單" -#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153 +#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153 #, c-format msgid "%d unread message from %s\n" msgid_plural "%d unread messages from %s\n" msgstr[0] "%d 個由 %s 發出的未讀取訊息\n" msgstr[1] "%d 個由 %s 發出的未讀取訊息\n" -#: ../pidgin/gtkblist.c:3797 +#: ../pidgin/gtkblist.c:3819 msgid "Manually" msgstr "使用者自定" -#: ../pidgin/gtkblist.c:3799 +#: ../pidgin/gtkblist.c:3821 msgid "Alphabetically" msgstr "依照字母" -#: ../pidgin/gtkblist.c:3800 +#: ../pidgin/gtkblist.c:3822 msgid "By status" msgstr "依照狀態" -#: ../pidgin/gtkblist.c:3801 +#: ../pidgin/gtkblist.c:3823 msgid "By log size" msgstr "依照日誌大小" -#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178 +#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178 #, c-format msgid "%s disconnected" msgstr "%s 結束連線" -#: ../pidgin/gtkblist.c:4015 +#: ../pidgin/gtkblist.c:4038 msgid "Re-enable Account" msgstr "重新啟動帳號" -#: ../pidgin/gtkblist.c:4039 +#: ../pidgin/gtkblist.c:4064 #, c-format msgid "%s disconnected: %s" msgstr "%s 結束連線：%s" -#: ../pidgin/gtkblist.c:4191 +#: ../pidgin/gtkblist.c:4216 msgid "Username:" msgstr "使用者名稱：" -#: ../pidgin/gtkblist.c:4198 +#: ../pidgin/gtkblist.c:4223 msgid "Password:" msgstr "密碼：" -#: ../pidgin/gtkblist.c:4209 +#: ../pidgin/gtkblist.c:4234 msgid "_Login" msgstr "登入(_L)" -#: ../pidgin/gtkblist.c:4292 +#: ../pidgin/gtkblist.c:4317 msgid "/Accounts" msgstr "/帳號" #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy -#: ../pidgin/gtkblist.c:4306 +#: ../pidgin/gtkblist.c:4331 #, c-format msgid "" "Welcome to %s!\n" @@ -12699,23 +14165,27 @@ #. set the Show Offline Buddies option. must be done #. * after the treeview or faceprint gets mad. -Robot101 #. -#: ../pidgin/gtkblist.c:4555 -msgid "/Buddies/Show Offline Buddies" -msgstr "/好友/顯示離線好友" - -#: ../pidgin/gtkblist.c:4558 -msgid "/Buddies/Show Empty Groups" -msgstr "/好友/顯示空的好的群組" - -#: ../pidgin/gtkblist.c:4564 -msgid "/Buddies/Show Buddy Details" -msgstr "/好友/顯示好友細節" - -#: ../pidgin/gtkblist.c:4567 -msgid "/Buddies/Show Idle Times" -msgstr "/好友/顯示閒置時間" - -#: ../pidgin/gtkblist.c:5444 +#: ../pidgin/gtkblist.c:4594 +msgid "/Buddies/Show/Offline Buddies" +msgstr "/好友/顯示/離線好友" + +#: ../pidgin/gtkblist.c:4597 +msgid "/Buddies/Show/Empty Groups" +msgstr "/好友/顯示/空群組" + +#: ../pidgin/gtkblist.c:4603 +msgid "/Buddies/Show/Buddy Details" +msgstr "/好友/顯示/好友細節" + +#: ../pidgin/gtkblist.c:4606 +msgid "/Buddies/Show/Idle Times" +msgstr "/好友/顯示/閒置時間" + +#: ../pidgin/gtkblist.c:4609 +msgid "/Buddies/Show/Protocol Icons" +msgstr "/好友/顯示/通訊協定圖示" + +#: ../pidgin/gtkblist.c:5501 msgid "" "Please enter the screen name of the person you would like to add to your " "buddy list. You may optionally enter an alias, or nickname, for the buddy. " @@ -12725,71 +14195,76 @@ "在好友清單中顯示。\n" #. End of account box -#: ../pidgin/gtkblist.c:5479 +#: ../pidgin/gtkblist.c:5536 msgid "_Screen name:" msgstr "帳號(_S)：" -#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855 +#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911 msgid "A_lias:" msgstr "別名(_L)：" -#: ../pidgin/gtkblist.c:5767 +#: ../pidgin/gtkblist.c:5823 msgid "This protocol does not support chat rooms." msgstr "這個通訊協定不支援聊天室。" -#: ../pidgin/gtkblist.c:5783 +#: ../pidgin/gtkblist.c:5839 msgid "" "You are not currently signed on with any protocols that have the ability to " "chat." msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。" -#: ../pidgin/gtkblist.c:5824 +#: ../pidgin/gtkblist.c:5880 msgid "" "Please enter an alias, and the appropriate information about the chat you " "would like to add to your buddy list.\n" msgstr "請輸入別名，或者關於您所想加入好友清單的聊天室的適當資訊。\n" -#: ../pidgin/gtkblist.c:5912 +#: ../pidgin/gtkblist.c:5968 msgid "Please enter the name of the group to be added." msgstr "請給您新增的群組輸入名稱。" # XXX -#: ../pidgin/gtkblist.c:6552 +#: ../pidgin/gtkblist.c:6609 msgid "/Accounts/" msgstr "/帳號/" -#: ../pidgin/gtkblist.c:6576 +#: ../pidgin/gtkblist.c:6633 msgid "_Edit Account" msgstr "編輯帳號(_E)" # NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單， # NOTE 譯成「不允許」會非常怪 -#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2982 +#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056 msgid "No actions available" msgstr "沒有相關指令" # #NOTE 和下一個「Enable Account」對應。 -#: ../pidgin/gtkblist.c:6597 +#: ../pidgin/gtkblist.c:6654 msgid "_Disable" msgstr "停用帳號(_D)" -#: ../pidgin/gtkblist.c:6609 +#: ../pidgin/gtkblist.c:6666 msgid "Enable Account" msgstr "啟動帳號" # XXX -#: ../pidgin/gtkblist.c:6615 +#: ../pidgin/gtkblist.c:6672 msgid "/Accounts/Enable Account" msgstr "/帳號/啟動帳號" -#: ../pidgin/gtkblist.c:6664 +#: ../pidgin/gtkblist.c:6721 msgid "/Tools" msgstr "/工具" -#: ../pidgin/gtkblist.c:6734 +#: ../pidgin/gtkblist.c:6791 msgid "/Buddies/Sort Buddies" msgstr "/好友/好友清單排序" +#. Widget creation function +#: ../pidgin/gtkcertmgr.c:549 +msgid "SSL Servers" +msgstr "SSL 伺服器" + #: ../pidgin/gtkconn.c:179 #, c-format msgid "" @@ -12801,225 +14276,216 @@ "%s\n" "在您更正這個錯誤並重新啟動這個帳號前，%s 將不會再試著重新連線。" -#: ../pidgin/gtkconv.c:485 +#: ../pidgin/gtkconv.c:462 msgid "Unknown command." msgstr "未知的指令" -#: ../pidgin/gtkconv.c:757 ../pidgin/gtkconv.c:783 +#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760 msgid "That buddy is not on the same protocol as this chat." msgstr "該個好友與這個聊天並非使用同一種的通訊協定" # XXX 暫譯 -#: ../pidgin/gtkconv.c:777 +#: ../pidgin/gtkconv.c:754 msgid "" "You are not currently signed on with an account that can invite that buddy." msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。" -#: ../pidgin/gtkconv.c:830 +#: ../pidgin/gtkconv.c:807 msgid "Invite Buddy Into Chat Room" msgstr "邀請好友進入聊天室" #. Put our happy label in it. -#: ../pidgin/gtkconv.c:860 +#: ../pidgin/gtkconv.c:837 msgid "" "Please enter the name of the user you wish to invite, along with an optional " "invite message." msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。" -#: ../pidgin/gtkconv.c:881 +#: ../pidgin/gtkconv.c:858 msgid "_Buddy:" msgstr "好友(_B)：" -#: ../pidgin/gtkconv.c:901 ../pidgin/gtksavedstatuses.c:1193 -#: ../pidgin/gtksavedstatuses.c:1525 +#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193 +#: ../pidgin/gtksavedstatuses.c:1527 msgid "_Message:" msgstr "訊息(_M)：" -#: ../pidgin/gtkconv.c:958 ../pidgin/gtkconv.c:2506 ../pidgin/gtkdebug.c:218 +#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218 #: ../pidgin/gtkft.c:542 msgid "Unable to open file." msgstr "無法開啟檔案。" -#: ../pidgin/gtkconv.c:964 +#: ../pidgin/gtkconv.c:942 #, c-format msgid "

Conversation with %s

\n" msgstr "

與 %s 的交談

\n" -#: ../pidgin/gtkconv.c:1000 +#: ../pidgin/gtkconv.c:980 msgid "Save Conversation" msgstr "儲存聊天內容" -#: ../pidgin/gtkconv.c:1149 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742 +#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742 msgid "Find" msgstr "搜尋" -#: ../pidgin/gtkconv.c:1175 ../pidgin/gtkdebug.c:194 +#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194 msgid "_Search for:" msgstr "搜尋(_S)：" -#: ../pidgin/gtkconv.c:1358 -msgid "Logging started. Future messages in this conversation will be logged." -msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。" - -#: ../pidgin/gtkconv.c:1366 -msgid "" -"Logging stopped. Future messages in this conversation will not be logged." -msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。" - -#: ../pidgin/gtkconv.c:1614 +#: ../pidgin/gtkconv.c:1607 msgid "Un-Ignore" msgstr "取消忽略使用者" # NOTE「Ignore」原譯「忽略使用者」，但 gtkprefs.c 中的「Ignore」 # NOTE 乃「忽略格式」的意思，故只能譯成「忽略」 -#: ../pidgin/gtkconv.c:1617 +#: ../pidgin/gtkconv.c:1610 msgid "Ignore" msgstr "忽略" -#: ../pidgin/gtkconv.c:1637 +#: ../pidgin/gtkconv.c:1630 msgid "Get Away Message" msgstr "取得離開訊息" -#: ../pidgin/gtkconv.c:1660 +#: ../pidgin/gtkconv.c:1653 msgid "Last said" msgstr "上次提到" -#: ../pidgin/gtkconv.c:2514 +#: ../pidgin/gtkconv.c:2589 msgid "Unable to save icon file to disk." msgstr "無法儲存圖示檔案至磁碟上。" -#: ../pidgin/gtkconv.c:2565 +#: ../pidgin/gtkconv.c:2640 msgid "Save Icon" msgstr "儲存圖示" -#: ../pidgin/gtkconv.c:2617 +#: ../pidgin/gtkconv.c:2692 msgid "Animate" msgstr "動畫" -#: ../pidgin/gtkconv.c:2622 +#: ../pidgin/gtkconv.c:2697 msgid "Hide Icon" msgstr "隱藏圖示" # NOTE 這是Right-Click圖示時顯示的指令，譯「As」為「為」會很奇怪 -#: ../pidgin/gtkconv.c:2625 +#: ../pidgin/gtkconv.c:2700 msgid "Save Icon As..." msgstr "儲存圖示..." -#: ../pidgin/gtkconv.c:2629 +#: ../pidgin/gtkconv.c:2704 msgid "Set Custom Icon..." msgstr "自定圖示..." -#: ../pidgin/gtkconv.c:2642 +#: ../pidgin/gtkconv.c:2717 msgid "Remove Custom Icon" msgstr "移除自定圖示" +#: ../pidgin/gtkconv.c:2844 +msgid "Show All" +msgstr "全部顯示" + #. Conversation menu -#: ../pidgin/gtkconv.c:2784 +#: ../pidgin/gtkconv.c:2863 msgid "/_Conversation" msgstr "/交談(_C)" -#: ../pidgin/gtkconv.c:2786 +#: ../pidgin/gtkconv.c:2865 msgid "/Conversation/New Instant _Message..." msgstr "/好友/新即時訊息(_M)..." -#: ../pidgin/gtkconv.c:2791 +#: ../pidgin/gtkconv.c:2870 msgid "/Conversation/_Find..." msgstr "/交談/搜尋(_F)..." -#: ../pidgin/gtkconv.c:2793 +#: ../pidgin/gtkconv.c:2872 msgid "/Conversation/View _Log" msgstr "/交談/觀看歷史記錄(_L)" -#: ../pidgin/gtkconv.c:2794 +#: ../pidgin/gtkconv.c:2873 msgid "/Conversation/_Save As..." msgstr "/交談/另存新檔(_S)..." -#: ../pidgin/gtkconv.c:2796 +#: ../pidgin/gtkconv.c:2875 msgid "/Conversation/Clea_r Scrollback" msgstr "/交談/清空交談內容(_R)" -#: ../pidgin/gtkconv.c:2800 +#: ../pidgin/gtkconv.c:2879 msgid "/Conversation/Se_nd File..." msgstr "/交談/傳送檔案(_N)..." -#: ../pidgin/gtkconv.c:2801 +#: ../pidgin/gtkconv.c:2880 msgid "/Conversation/Add Buddy _Pounce..." msgstr "/交談/新增好友狀態捕捉(_P)..." -#: ../pidgin/gtkconv.c:2803 +#: ../pidgin/gtkconv.c:2882 msgid "/Conversation/_Get Info" msgstr "/交談/取得資訊(_G)" -#: ../pidgin/gtkconv.c:2805 +#: ../pidgin/gtkconv.c:2884 msgid "/Conversation/In_vite..." msgstr "/交談/邀請(_V)..." -#: ../pidgin/gtkconv.c:2807 +#: ../pidgin/gtkconv.c:2886 msgid "/Conversation/M_ore" msgstr "/交談/更多(_O)" -#: ../pidgin/gtkconv.c:2811 +#: ../pidgin/gtkconv.c:2890 msgid "/Conversation/Al_ias..." msgstr "/交談/別名(_I)..." -#: ../pidgin/gtkconv.c:2813 +#: ../pidgin/gtkconv.c:2892 msgid "/Conversation/_Block..." msgstr "/交談/封鎖(_B)..." -#: ../pidgin/gtkconv.c:2815 +#: ../pidgin/gtkconv.c:2894 msgid "/Conversation/_Unblock..." msgstr "/交談/解除封鎖(_B)..." -#: ../pidgin/gtkconv.c:2817 +#: ../pidgin/gtkconv.c:2896 msgid "/Conversation/_Add..." msgstr "/交談/新增(_A)..." -#: ../pidgin/gtkconv.c:2819 +#: ../pidgin/gtkconv.c:2898 msgid "/Conversation/_Remove..." msgstr "/交談/移除(_R)..." -#: ../pidgin/gtkconv.c:2824 +#: ../pidgin/gtkconv.c:2903 msgid "/Conversation/Insert Lin_k..." msgstr "/交談/插入連結(_k)..." -#: ../pidgin/gtkconv.c:2826 +#: ../pidgin/gtkconv.c:2905 msgid "/Conversation/Insert Imag_e..." msgstr "/交談/插入影像(_E)..." -#: ../pidgin/gtkconv.c:2832 +#: ../pidgin/gtkconv.c:2911 msgid "/Conversation/_Close" msgstr "/交談/關閉(_C)" #. Options -#: ../pidgin/gtkconv.c:2836 +#: ../pidgin/gtkconv.c:2915 msgid "/_Options" msgstr "/選項(_O)" -#: ../pidgin/gtkconv.c:2837 +#: ../pidgin/gtkconv.c:2916 msgid "/Options/Enable _Logging" msgstr "/選項/開始記錄日誌(_L)" -#: ../pidgin/gtkconv.c:2838 +#: ../pidgin/gtkconv.c:2917 msgid "/Options/Enable _Sounds" msgstr "/選項/開啟音效(_S)" -#: ../pidgin/gtkconv.c:2839 -msgid "/Options/Show Buddy _Icon" -msgstr "/選項/顯示好友圖示(_I)" - -#: ../pidgin/gtkconv.c:2841 +#: ../pidgin/gtkconv.c:2919 msgid "/Options/Show Formatting _Toolbars" msgstr "/選項/顯示格式工具列(_T)" -#: ../pidgin/gtkconv.c:2842 +#: ../pidgin/gtkconv.c:2920 msgid "/Options/Show Ti_mestamps" msgstr "/選項/顯示時間戳記(_M)" -#: ../pidgin/gtkconv.c:2918 +#: ../pidgin/gtkconv.c:3044 msgid "/Conversation/More" msgstr "/交談/更多" -#: ../pidgin/gtkconv.c:3026 +#: ../pidgin/gtkconv.c:3100 msgid "/Options" msgstr "/選項" @@ -13028,177 +14494,173 @@ #. Make sure the 'Conversation -> More' menuitems are regenerated whenever #. * the 'Conversation' menu pops up because the entries can change after the #. * conversation is created. -#: ../pidgin/gtkconv.c:3061 ../pidgin/gtkconv.c:3093 +#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167 msgid "/Conversation" msgstr "/交談" -#: ../pidgin/gtkconv.c:3101 +#: ../pidgin/gtkconv.c:3175 msgid "/Conversation/View Log" msgstr "/交談/觀看歷史記錄" -#: ../pidgin/gtkconv.c:3107 +#: ../pidgin/gtkconv.c:3181 msgid "/Conversation/Send File..." msgstr "/交談/傳送檔案..." -#: ../pidgin/gtkconv.c:3111 +#: ../pidgin/gtkconv.c:3185 msgid "/Conversation/Add Buddy Pounce..." msgstr "/交談/新增好友狀態捕捉..." -#: ../pidgin/gtkconv.c:3117 +#: ../pidgin/gtkconv.c:3191 msgid "/Conversation/Get Info" msgstr "/交談/取得資訊" -#: ../pidgin/gtkconv.c:3121 +#: ../pidgin/gtkconv.c:3195 msgid "/Conversation/Invite..." msgstr "/交談/邀請..." -#: ../pidgin/gtkconv.c:3127 +#: ../pidgin/gtkconv.c:3201 msgid "/Conversation/Alias..." msgstr "/交談/別名..." -#: ../pidgin/gtkconv.c:3131 +#: ../pidgin/gtkconv.c:3205 msgid "/Conversation/Block..." msgstr "/交談/封鎖..." -#: ../pidgin/gtkconv.c:3135 +#: ../pidgin/gtkconv.c:3209 msgid "/Conversation/Unblock..." msgstr "/交談/解除封鎖..." -#: ../pidgin/gtkconv.c:3139 +#: ../pidgin/gtkconv.c:3213 msgid "/Conversation/Add..." msgstr "/交談/新增..." -#: ../pidgin/gtkconv.c:3143 +#: ../pidgin/gtkconv.c:3217 msgid "/Conversation/Remove..." msgstr "/交談/移除..." -#: ../pidgin/gtkconv.c:3149 +#: ../pidgin/gtkconv.c:3223 msgid "/Conversation/Insert Link..." msgstr "/交談/插入連結..." -#: ../pidgin/gtkconv.c:3153 +#: ../pidgin/gtkconv.c:3227 msgid "/Conversation/Insert Image..." msgstr "/交談/插入影像..." -#: ../pidgin/gtkconv.c:3159 +#: ../pidgin/gtkconv.c:3233 msgid "/Options/Enable Logging" msgstr "/選項/開始記錄日誌" -#: ../pidgin/gtkconv.c:3162 +#: ../pidgin/gtkconv.c:3236 msgid "/Options/Enable Sounds" msgstr "/選項/開啟音效" -#: ../pidgin/gtkconv.c:3175 +#: ../pidgin/gtkconv.c:3249 msgid "/Options/Show Formatting Toolbars" msgstr "/選項/顯示格式工具列" -#: ../pidgin/gtkconv.c:3178 +#: ../pidgin/gtkconv.c:3252 msgid "/Options/Show Timestamps" msgstr "/選項/顯示時間戳記" -#: ../pidgin/gtkconv.c:3181 -msgid "/Options/Show Buddy Icon" -msgstr "/選項/顯示好友圖示" - -#: ../pidgin/gtkconv.c:3265 ../pidgin/gtkconv.c:3307 +#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371 msgid "User is typing..." msgstr "對方正在輸入..." -#: ../pidgin/gtkconv.c:3310 +#: ../pidgin/gtkconv.c:3374 msgid "User has typed something and stopped" msgstr "對方輸入了一些東西，不過暫停了" #. Build the Send To menu -#: ../pidgin/gtkconv.c:3492 +#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000 msgid "_Send To" msgstr "傳送到(_S)" -#: ../pidgin/gtkconv.c:4206 +#: ../pidgin/gtkconv.c:4270 msgid "_Send" msgstr "傳送(_S)" #. Setup the label telling how many people are in the room. -#: ../pidgin/gtkconv.c:4310 +#: ../pidgin/gtkconv.c:4374 msgid "0 people in room" msgstr "沒有人在這個房間" -#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617 +#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863 #, c-format msgid "%d person in room" msgid_plural "%d people in room" msgstr[0] "%d 個人在這個房間" msgstr[1] "%d 個人在這個房間" -#: ../pidgin/gtkconv.c:6216 ../pidgin/gtkstatusbox.c:659 +#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659 msgid "Typing" msgstr "輸入中" -#: ../pidgin/gtkconv.c:6222 +#: ../pidgin/gtkconv.c:6468 msgid "Stopped Typing" msgstr "停止輸入" -#: ../pidgin/gtkconv.c:6227 +#: ../pidgin/gtkconv.c:6471 msgid "Nick Said" msgstr "暱稱被提及" -#: ../pidgin/gtkconv.c:6232 ../pidgin/gtkdocklet.c:492 +#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492 msgid "Unread Messages" msgstr "未讀訊息" -#: ../pidgin/gtkconv.c:6237 +#: ../pidgin/gtkconv.c:6477 msgid "New Event" msgstr "新事件" # XXX -#: ../pidgin/gtkconv.c:7210 +#: ../pidgin/gtkconv.c:7550 msgid "clear: Clears all conversation scrollbacks." msgstr "clear：清空所有交談的回捲緩衝區" -#: ../pidgin/gtkconv.c:7374 +#: ../pidgin/gtkconv.c:7714 msgid "Confirm close" msgstr "確認關閉" -#: ../pidgin/gtkconv.c:7406 +#: ../pidgin/gtkconv.c:7746 msgid "You have unread messages. Are you sure you want to close the window?" msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎？" -#: ../pidgin/gtkconv.c:7978 +#: ../pidgin/gtkconv.c:8333 msgid "Close other tabs" msgstr "關閉其他分頁" -#: ../pidgin/gtkconv.c:7984 +#: ../pidgin/gtkconv.c:8339 msgid "Close all tabs" msgstr "關閉所有分頁" -#: ../pidgin/gtkconv.c:7992 +#: ../pidgin/gtkconv.c:8347 msgid "Detach this tab" msgstr "分離這個分頁" -#: ../pidgin/gtkconv.c:7998 +#: ../pidgin/gtkconv.c:8353 msgid "Close this tab" msgstr "關閉這個分頁" -#: ../pidgin/gtkconv.c:8444 +#: ../pidgin/gtkconv.c:8853 msgid "Close conversation" msgstr "關閉交談" -#: ../pidgin/gtkconv.c:8968 +#: ../pidgin/gtkconv.c:9455 msgid "Last created window" msgstr "上一個開啟的視窗" -#: ../pidgin/gtkconv.c:8970 +#: ../pidgin/gtkconv.c:9457 msgid "Separate IM and Chat windows" msgstr "以不同的視窗顯示即時訊息和聊天" -#: ../pidgin/gtkconv.c:8972 ../pidgin/gtkprefs.c:1410 +#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414 msgid "New window" msgstr "新視窗" -#: ../pidgin/gtkconv.c:8974 +#: ../pidgin/gtkconv.c:9461 msgid "By group" msgstr "依群組" -#: ../pidgin/gtkconv.c:8976 +#: ../pidgin/gtkconv.c:9463 msgid "By account" msgstr "依帳號" @@ -13272,25 +14734,22 @@ msgid "Fatal Error" msgstr "嚴重錯誤訊息" -#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117 +#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116 msgid "lead developer" msgstr "主要開發者" #: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73 #: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75 -#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78 -#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80 -#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82 -#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84 -#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88 -#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90 +#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77 +#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79 +#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81 +#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83 +#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85 +#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90 +#: ../pidgin/gtkdialogs.c:91 msgid "developer" msgstr "開發者" -#: ../pidgin/gtkdialogs.c:77 -msgid "developer & webmaster" -msgstr "開發者兼網站管理員" - #: ../pidgin/gtkdialogs.c:86 msgid "support" msgstr "支援" @@ -13299,162 +14758,175 @@ msgid "support/QA" msgstr "支援兼品管" -#: ../pidgin/gtkdialogs.c:109 +#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111 +msgid "developer & webmaster" +msgstr "開發者兼網站管理員" + +#: ../pidgin/gtkdialogs.c:98 +msgid "Senior Contributor/QA" +msgstr "資深貢獻者兼品管" + +#: ../pidgin/gtkdialogs.c:107 msgid "win32 port" msgstr "Windows 版本移植" -#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111 +#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109 msgid "maintainer" msgstr "維護者" -#: ../pidgin/gtkdialogs.c:112 +#: ../pidgin/gtkdialogs.c:110 msgid "libfaim maintainer" msgstr "libfaim 維護者" #. If "lazy bum" translates literally into a serious insult, use something else or omit it. -#: ../pidgin/gtkdialogs.c:114 +#: ../pidgin/gtkdialogs.c:113 msgid "hacker and designated driver [lazy bum]" msgstr "程式編寫者兼指定司機 [死懶鬼]" +#: ../pidgin/gtkdialogs.c:114 +msgid "XMPP developer" +msgstr "XMPP 開發者" + #: ../pidgin/gtkdialogs.c:115 -msgid "XMPP developer" -msgstr "XMPP 開發者" - -#: ../pidgin/gtkdialogs.c:116 msgid "original author" msgstr "原作者" # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A -#: ../pidgin/gtkdialogs.c:123 +#: ../pidgin/gtkdialogs.c:132 msgid "Afrikaans" msgstr "南非荷蘭文" -#: ../pidgin/gtkdialogs.c:124 +#: ../pidgin/gtkdialogs.c:133 msgid "Arabic" msgstr "阿拉伯文" -#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126 -#: ../pidgin/gtkdialogs.c:213 +#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135 +#: ../pidgin/gtkdialogs.c:222 msgid "Bulgarian" msgstr "保加利亞文" -#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128 -#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130 +#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137 +#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139 msgid "Bengali" msgstr "孟加拉文" # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2 # NOTE 港譯「波斯尼亞」，台一般譯「波士尼亞」 -#: ../pidgin/gtkdialogs.c:131 +#: ../pidgin/gtkdialogs.c:140 msgid "Bosnian" msgstr "波希尼亞文" # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C -#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214 -#: ../pidgin/gtkdialogs.c:215 +#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223 +#: ../pidgin/gtkdialogs.c:224 msgid "Catalan" msgstr "加泰隆文" # NOTE 直譯是「瓦倫西亞式加泰隆文」，但正常的叫法是直接寫「瓦倫西亞語」(Valencian) -#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134 +#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143 msgid "Valencian-Catalan" msgstr "瓦倫西亞文" -#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216 +#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225 msgid "Czech" msgstr "捷克文" -#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137 +#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146 msgid "Danish" msgstr "丹麥文" -#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139 -#: ../pidgin/gtkdialogs.c:217 +#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148 +#: ../pidgin/gtkdialogs.c:226 msgid "German" msgstr "德文" # NOTE 國名是「不丹」，中譯文依國名不依語文名 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D -#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141 -#: ../pidgin/gtkdialogs.c:142 +#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150 +#: ../pidgin/gtkdialogs.c:151 msgid "Dzongkha" msgstr "不丹文" -#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144 +#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153 msgid "Greek" msgstr "希臘文" -#: ../pidgin/gtkdialogs.c:145 +#: ../pidgin/gtkdialogs.c:154 msgid "Australian English" msgstr "澳洲式英文" -#: ../pidgin/gtkdialogs.c:146 +#: ../pidgin/gtkdialogs.c:155 msgid "Canadian English" msgstr "加拿大式英文" -#: ../pidgin/gtkdialogs.c:147 +#: ../pidgin/gtkdialogs.c:156 msgid "British English" msgstr "英式英文" # XXX 寫下的應是文，不是語，但實在真是好像沒有人寫「世界文」的 - Ambrose -#: ../pidgin/gtkdialogs.c:148 +#: ../pidgin/gtkdialogs.c:157 msgid "Esperanto" msgstr "世界語" -#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218 -#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220 -#: ../pidgin/gtkdialogs.c:221 +#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227 +#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229 +#: ../pidgin/gtkdialogs.c:230 msgid "Spanish" msgstr "西班牙文" -#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151 +#: ../pidgin/gtkdialogs.c:159 +msgid "Estonian" +msgstr "愛沙尼亞文" + +#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161 msgid "Euskera(Basque)" msgstr "巴斯克文" -#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153 -#: ../pidgin/gtkdialogs.c:154 +#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163 +#: ../pidgin/gtkdialogs.c:164 msgid "Persian" msgstr "波斯文" -#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222 -#: ../pidgin/gtkdialogs.c:223 +#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231 +#: ../pidgin/gtkdialogs.c:232 msgid "Finnish" msgstr "芬蘭文" -#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224 -#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226 -#: ../pidgin/gtkdialogs.c:227 +#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233 +#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235 +#: ../pidgin/gtkdialogs.c:236 msgid "French" msgstr "法文" # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1 -#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158 +#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168 +#: ../pidgin/gtkdialogs.c:237 msgid "Galician" msgstr "加里西亞文" # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2 -#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160 +#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170 msgid "Gujarati" msgstr "古吉拉特文" -#: ../pidgin/gtkdialogs.c:160 +#: ../pidgin/gtkdialogs.c:170 msgid "Gujarati Language Team" msgstr "古吉拉特文翻譯小組" -#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228 +#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238 msgid "Hebrew" msgstr "希伯來文" # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H -#: ../pidgin/gtkdialogs.c:162 +#: ../pidgin/gtkdialogs.c:172 msgid "Hindi" msgstr "印度文" -#: ../pidgin/gtkdialogs.c:163 +#: ../pidgin/gtkdialogs.c:173 msgid "Hungarian" msgstr "匈牙利文" -#: ../pidgin/gtkdialogs.c:164 +#: ../pidgin/gtkdialogs.c:174 msgid "Indonesian" msgstr "印尼文" @@ -13463,54 +14935,54 @@ # NOTE 臺灣的中國圖書分類法亦有「意大利」條，譯「意大利」應該比較好。 # NOTE【參見「Slovenian」】 # NOTE 註：因 zh_TW 和 zh_HK 正式分家，還原成台式譯法「義大利」 -#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229 +#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239 msgid "Italian" msgstr "義大利文" -#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230 -#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232 +#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240 +#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242 msgid "Japanese" msgstr "日文" -#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233 +#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243 msgid "Georgian" msgstr "喬治亞文" # FIXME 可以譯好一點 20070520 acli -#: ../pidgin/gtkdialogs.c:167 +#: ../pidgin/gtkdialogs.c:177 msgid "Ubuntu Georgian Translators" msgstr "Ubuntu 旗下所有喬治亞文翻譯人員" # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K # NOTE 註：KDE 譯「坎納達」 -#: ../pidgin/gtkdialogs.c:168 +#: ../pidgin/gtkdialogs.c:178 msgid "Kannada" msgstr "康納達文" -#: ../pidgin/gtkdialogs.c:168 +#: ../pidgin/gtkdialogs.c:178 msgid "Kannada Translation team" msgstr "康納達文翻譯小組" -#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234 -#: ../pidgin/gtkdialogs.c:235 +#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244 +#: ../pidgin/gtkdialogs.c:245 msgid "Korean" msgstr "韓文" # NOTE 港譯只有「庫爾德」，台譯有「庫德」（標準譯法，看來亦較常見）和「庫爾德」 # NOTE 註：因 zh_TW 和 zh_HK 正式分家，保留台式譯法「庫德」 -#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171 -#: ../pidgin/gtkdialogs.c:172 +#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181 +#: ../pidgin/gtkdialogs.c:182 msgid "Kurdish" msgstr "庫德文" -#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236 -#: ../pidgin/gtkdialogs.c:237 +#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246 +#: ../pidgin/gtkdialogs.c:247 msgid "Lithuanian" msgstr "立陶宛文" # NOTE「馬其頓文」是一種東歐語文，跟希臘的馬其頓並無關係 -#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175 -#: ../pidgin/gtkdialogs.c:238 +#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185 +#: ../pidgin/gtkdialogs.c:248 msgid "Macedonian" msgstr "馬其頓文" @@ -13519,61 +14991,55 @@ # NOTE 其他譯法包括：丹麥－挪威文（大英百科）、丹麥式挪威文（維基百科）、東挪威文、標準挪威文（國內不是標準，國外是 :P） # NOTE 譯音一般放在「挪威文」後的括弧內，也有不用括弧把譯音放在「挪威」和「文」之間 # NOTE 採用「標準」一詞，參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2 -#: ../pidgin/gtkdialogs.c:176 +#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249 msgid "Bokmål Norwegian" msgstr "標準挪威文" -#: ../pidgin/gtkdialogs.c:177 +#: ../pidgin/gtkdialogs.c:187 msgid "Nepali" msgstr "尼泊爾文" # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/ # XXX Dutch 和 Flemish 是同一種語言，是否應該只寫「荷蘭文」，刪去「法蘭德斯文」？ -#: ../pidgin/gtkdialogs.c:178 +#: ../pidgin/gtkdialogs.c:188 msgid "Dutch, Flemish" msgstr "荷蘭文／法蘭德斯文" -# XXX 這應該是「nn」碼，即「Nynorsk Norwegian」，所以直譯「挪威文」並不恰當 -# XXX 但這真是「no」碼，但 no.po 其實已經不存在……無來頭…… -#: ../pidgin/gtkdialogs.c:179 -msgid "Norwegian" -msgstr "挪威文" - -#: ../pidgin/gtkdialogs.c:180 +#: ../pidgin/gtkdialogs.c:189 msgid "Norwegian Nynorsk" msgstr "新挪威文" -#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182 -#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239 +#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191 +#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250 msgid "Polish" msgstr "波蘭文" -#: ../pidgin/gtkdialogs.c:184 +#: ../pidgin/gtkdialogs.c:193 msgid "Portuguese" msgstr "標準萄文" -#: ../pidgin/gtkdialogs.c:185 +#: ../pidgin/gtkdialogs.c:194 msgid "Portuguese-Brazil" msgstr "巴西萄文" # NOTE「普什圖」在三地都看來是較正常的譯法 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2 -#: ../pidgin/gtkdialogs.c:186 +#: ../pidgin/gtkdialogs.c:195 msgid "Pashto" msgstr "普什圖文" -#: ../pidgin/gtkdialogs.c:187 +#: ../pidgin/gtkdialogs.c:196 msgid "Romanian" msgstr "羅馬尼亞文" -#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240 -#: ../pidgin/gtkdialogs.c:241 +#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251 +#: ../pidgin/gtkdialogs.c:252 msgid "Russian" msgstr "俄文" -#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190 -#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243 -#: ../pidgin/gtkdialogs.c:244 +#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199 +#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254 +#: ../pidgin/gtkdialogs.c:255 msgid "Slovak" msgstr "斯洛伐克文" @@ -13581,99 +15047,101 @@ # NOTE 以粵語發音，跟臺譯反而發音較準；況且，這至少名義上也是zh_TW； # NOTE 所以不跟港譯（其實是大陸譯法），跟臺譯。 # NOTE【參見「Italian」】 -#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245 +#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256 msgid "Slovenian" msgstr "斯洛維尼亞文" -#: ../pidgin/gtkdialogs.c:192 +#: ../pidgin/gtkdialogs.c:201 msgid "Albanian" msgstr "阿爾巴尼亞文" -#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194 +#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203 msgid "Serbian" msgstr "塞爾維亞文" -#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246 +#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257 +#: ../pidgin/gtkdialogs.c:258 msgid "Swedish" msgstr "瑞典文" # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T # NOTE 港一般譯「泰米爾」，台一般譯「塔米爾」（看來較常見）或「泰米爾」 -#: ../pidgin/gtkdialogs.c:196 +#: ../pidgin/gtkdialogs.c:205 msgid "Tamil" msgstr "坦米爾文" # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T -#: ../pidgin/gtkdialogs.c:197 +#: ../pidgin/gtkdialogs.c:206 msgid "Telugu" msgstr "德拉威文" -#: ../pidgin/gtkdialogs.c:198 +#: ../pidgin/gtkdialogs.c:207 msgid "Thai" msgstr "泰文" -#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247 +#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259 msgid "Turkish" msgstr "土耳其文" -#: ../pidgin/gtkdialogs.c:200 +#: ../pidgin/gtkdialogs.c:209 msgid "Vietnamese" msgstr "越南文" -#: ../pidgin/gtkdialogs.c:200 +#: ../pidgin/gtkdialogs.c:209 msgid "T.M.Thanh and the Gnome-Vi Team" msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員" -#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248 +#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260 msgid "Simplified Chinese" msgstr "簡體中文" -#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203 -#: ../pidgin/gtkdialogs.c:204 +#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212 +#: ../pidgin/gtkdialogs.c:213 msgid "Hong Kong Chinese" msgstr "港式中文" -#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206 -#: ../pidgin/gtkdialogs.c:249 +#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215 +#: ../pidgin/gtkdialogs.c:261 msgid "Traditional Chinese" msgstr "正體中文" # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A -#: ../pidgin/gtkdialogs.c:212 +#: ../pidgin/gtkdialogs.c:221 msgid "Amharic" msgstr "阿姆哈拉文" -#: ../pidgin/gtkdialogs.c:334 +#: ../pidgin/gtkdialogs.c:346 #, c-format msgid "About %s" msgstr "關於 %s" -#: ../pidgin/gtkdialogs.c:372 +#: ../pidgin/gtkdialogs.c:384 #, c-format msgid "" "%s is a graphical modular messaging client based on libpurple which is " "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, " -"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at " -"once. It is written using GTK+.

You may modify and redistribute the " -"program under the terms of the GPL (version 2 or later). A copy of the GPL " -"is contained in the 'COPYING' file distributed with %s. %s is copyrighted " -"by its contributors. See the 'COPYRIGHT' file for the complete list of " -"contributors. We provide no warranty for this program.

" +"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and " +"QQ all at once. It is written using GTK+.

You may modify and " +"redistribute the program under the terms of the GPL (version 2 or later). A " +"copy of the GPL is contained in the 'COPYING' file distributed with %s. %s " +"is copyrighted by its contributors. See the 'COPYRIGHT' file for the " +"complete list of contributors. We provide no warranty for this program." +"

" msgstr "" "%s 係一個以 GTK+ 開發，圖形介面式的模組化訊息程式，以 libpurple 為基礎，同時" "提供 AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、" -"Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu 及 QQ 等功能。

倘若您希望修" -"改或發佈這個程式，只需按照 GPL（任擇第二版或較新的其他版本）的條款即可；%s 內" -"已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著作，版權歸全" -"部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任" -"何保用。

" - -#: ../pidgin/gtkdialogs.c:387 +"Lotus Sametime、Bonjour、Zephyr、MySpaceIM、Gadu-Gadu 及 QQ 等功能。

" +"倘若您希望修改或發佈這個程式，只需按照 GPL（任擇第二版或較新的其他版本）的條" +"款即可；%s 內已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著" +"作，版權歸全部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程" +"式恕不提供任何保用。

" + +#: ../pidgin/gtkdialogs.c:402 msgid "IRC: #pidgin on irc.freenode.net

" msgstr "" "IRC: irc.freenode.net 上的 #pidgin 頻道

" -#: ../pidgin/gtkdialogs.c:392 +#: ../pidgin/gtkdialogs.c:407 msgid "Current Developers" msgstr "現任開發者" @@ -13681,80 +15149,85 @@ # NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 gaim 賣力」 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類…… # NOTE 不過這樣好像有點過份，所以翻成「狂熱的模組作者」會比較好 :P -#: ../pidgin/gtkdialogs.c:407 +#: ../pidgin/gtkdialogs.c:422 msgid "Crazy Patch Writers" msgstr "狂熱的模組作者" -#: ../pidgin/gtkdialogs.c:422 +#: ../pidgin/gtkdialogs.c:437 msgid "Retired Developers" msgstr "前任開發者" +# NOTE 參見「Crazy Patch Writer」條 +#: ../pidgin/gtkdialogs.c:452 +msgid "Retired Crazy Patch Writers" +msgstr "前任的狂熱模組作者" + # NOTE 可譯「美工人員」，但那是很保守的譯法；Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人，所以很明顯是「設計員」 -#: ../pidgin/gtkdialogs.c:437 +#: ../pidgin/gtkdialogs.c:467 msgid "Artists" msgstr "平面設計" -#: ../pidgin/gtkdialogs.c:452 +#: ../pidgin/gtkdialogs.c:482 msgid "Current Translators" msgstr "現任譯者" -#: ../pidgin/gtkdialogs.c:472 +#: ../pidgin/gtkdialogs.c:502 msgid "Past Translators" msgstr "前任譯者" # NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」 -#: ../pidgin/gtkdialogs.c:490 +#: ../pidgin/gtkdialogs.c:520 msgid "Debugging Information" msgstr "除錯專用資訊" -#: ../pidgin/gtkdialogs.c:859 +#: ../pidgin/gtkdialogs.c:890 msgid "Get User Info" msgstr "取得使用者資訊" -#: ../pidgin/gtkdialogs.c:861 +#: ../pidgin/gtkdialogs.c:892 msgid "" "Please enter the screen name or alias of the person whose info you would " "like to view." msgstr "請輸入您所想要查詢對象的帳號。" -#: ../pidgin/gtkdialogs.c:951 +#: ../pidgin/gtkdialogs.c:982 msgid "View User Log" msgstr "觀看使用者日誌" -#: ../pidgin/gtkdialogs.c:953 +#: ../pidgin/gtkdialogs.c:984 msgid "" "Please enter the screen name or alias of the person whose log you would like " "to view." msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。" # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」 -#: ../pidgin/gtkdialogs.c:973 +#: ../pidgin/gtkdialogs.c:1004 msgid "Alias Contact" msgstr "為這組好友加上別名" # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」 -#: ../pidgin/gtkdialogs.c:974 +#: ../pidgin/gtkdialogs.c:1005 msgid "Enter an alias for this contact." msgstr "請為這組好友輸入一個別名。" -#: ../pidgin/gtkdialogs.c:996 +#: ../pidgin/gtkdialogs.c:1027 #, c-format msgid "Enter an alias for %s." msgstr "請為 %s 輸入一個別名" -#: ../pidgin/gtkdialogs.c:998 +#: ../pidgin/gtkdialogs.c:1029 msgid "Alias Buddy" msgstr "為這個好友加上別名" -#: ../pidgin/gtkdialogs.c:1019 +#: ../pidgin/gtkdialogs.c:1050 msgid "Alias Chat" msgstr "給聊天室改別名" -#: ../pidgin/gtkdialogs.c:1020 +#: ../pidgin/gtkdialogs.c:1051 msgid "Enter an alias for this chat." msgstr "請為這個聊天室輸入一個別名。" -#: ../pidgin/gtkdialogs.c:1059 +#: ../pidgin/gtkdialogs.c:1090 #, c-format msgid "" "You are about to remove the contact containing %s and %d other buddy from " @@ -13770,32 +15243,32 @@ "作嗎？" # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間 -#: ../pidgin/gtkdialogs.c:1067 +#: ../pidgin/gtkdialogs.c:1098 msgid "Remove Contact" msgstr "移除這組好友" # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間 -#: ../pidgin/gtkdialogs.c:1070 +#: ../pidgin/gtkdialogs.c:1101 msgid "_Remove Contact" msgstr "移除聯絡人(_R)" # TODO 譯文有待改進 - 20061025 -#: ../pidgin/gtkdialogs.c:1101 +#: ../pidgin/gtkdialogs.c:1132 #, c-format msgid "" "You are about to merge the group called %s into the group called %s. Do you " "want to continue?" msgstr "您正試著將群組 %s 與 %s 合併，新群組以後者命名。您要繼續這個動作嗎？" -#: ../pidgin/gtkdialogs.c:1108 +#: ../pidgin/gtkdialogs.c:1139 msgid "Merge Groups" msgstr "合併群組" -#: ../pidgin/gtkdialogs.c:1111 +#: ../pidgin/gtkdialogs.c:1142 msgid "_Merge Groups" msgstr "合併群組(_M)" -#: ../pidgin/gtkdialogs.c:1161 +#: ../pidgin/gtkdialogs.c:1192 #, c-format msgid "" "You are about to remove the group %s and all its members from your buddy " @@ -13803,42 +15276,42 @@ msgstr "" "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎？" -#: ../pidgin/gtkdialogs.c:1164 +#: ../pidgin/gtkdialogs.c:1195 msgid "Remove Group" msgstr "移除群組" -#: ../pidgin/gtkdialogs.c:1167 +#: ../pidgin/gtkdialogs.c:1198 msgid "_Remove Group" msgstr "移除群組(_R)" -#: ../pidgin/gtkdialogs.c:1200 +#: ../pidgin/gtkdialogs.c:1231 #, c-format msgid "" "You are about to remove %s from your buddy list. Do you want to continue?" msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎？" # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間 -#: ../pidgin/gtkdialogs.c:1203 +#: ../pidgin/gtkdialogs.c:1234 msgid "Remove Buddy" msgstr "移除這個好友" # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間 -#: ../pidgin/gtkdialogs.c:1206 +#: ../pidgin/gtkdialogs.c:1237 msgid "_Remove Buddy" msgstr "移除這個好友(_R)" -#: ../pidgin/gtkdialogs.c:1227 +#: ../pidgin/gtkdialogs.c:1258 #, c-format msgid "" "You are about to remove the chat %s from your buddy list. Do you want to " "continue?" msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎？" -#: ../pidgin/gtkdialogs.c:1230 +#: ../pidgin/gtkdialogs.c:1261 msgid "Remove Chat" msgstr "移除聊天室" -#: ../pidgin/gtkdialogs.c:1233 +#: ../pidgin/gtkdialogs.c:1264 msgid "_Remove Chat" msgstr "移除聊天室(_R)" @@ -13954,7 +15427,7 @@ msgstr "檔案傳輸細節(_D)" #. Pause button -#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89 +#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94 msgid "_Pause" msgstr "暫停(_P)" @@ -13964,44 +15437,44 @@ msgstr "恢復(_R)" # NOTE Nautilus譯「貼上文本」，Abiword譯「未格式化貼上」，聽來都有些怪 -#: ../pidgin/gtkimhtml.c:795 +#: ../pidgin/gtkimhtml.c:815 msgid "Paste as Plain _Text" msgstr "貼上純文字(_T)" -#: ../pidgin/gtkimhtml.c:812 +#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190 msgid "_Reset formatting" msgstr "清除格式化(_R)" -#: ../pidgin/gtkimhtml.c:1349 +#: ../pidgin/gtkimhtml.c:1372 msgid "Hyperlink color" msgstr "連結顏色" -#: ../pidgin/gtkimhtml.c:1350 +#: ../pidgin/gtkimhtml.c:1373 msgid "Color to draw hyperlinks." msgstr "顯示連結時所用的顏色。" -#: ../pidgin/gtkimhtml.c:1353 +#: ../pidgin/gtkimhtml.c:1376 msgid "Hyperlink prelight color" msgstr "連結顏色" -#: ../pidgin/gtkimhtml.c:1354 +#: ../pidgin/gtkimhtml.c:1377 msgid "Color to draw hyperlinks when mouse is over them." msgstr "當滑鼠經過連結時的連結顏色。" -#: ../pidgin/gtkimhtml.c:1575 +#: ../pidgin/gtkimhtml.c:1597 msgid "_Copy E-Mail Address" msgstr "複製電子郵件地址(_C)" -#: ../pidgin/gtkimhtml.c:1587 +#: ../pidgin/gtkimhtml.c:1609 msgid "_Open Link in Browser" msgstr "在瀏覽器中打開連結(_O)" -#: ../pidgin/gtkimhtml.c:1597 +#: ../pidgin/gtkimhtml.c:1619 msgid "_Copy Link Location" msgstr "複製連結位址(_C)" # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式 -#: ../pidgin/gtkimhtml.c:3341 +#: ../pidgin/gtkimhtml.c:3365 msgid "" "Unrecognized file type\n" "\n" @@ -14012,7 +15485,7 @@ "暫且當成 PNG 檔處理。" # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式 -#: ../pidgin/gtkimhtml.c:3344 +#: ../pidgin/gtkimhtml.c:3368 msgid "" "Unrecognized file type\n" "\n" @@ -14022,7 +15495,7 @@ "\n" "暫且當成 PNG 檔處理。" -#: ../pidgin/gtkimhtml.c:3373 +#: ../pidgin/gtkimhtml.c:3397 #, c-format msgid "" "Error saving image\n" @@ -14033,7 +15506,7 @@ "\n" "%s" -#: ../pidgin/gtkimhtml.c:3376 +#: ../pidgin/gtkimhtml.c:3400 #, c-format msgid "" "Error saving image\n" @@ -14044,130 +15517,201 @@ "\n" "%s" -#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466 +#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490 msgid "Save Image" msgstr "儲存影像" -#: ../pidgin/gtkimhtml.c:3494 +#: ../pidgin/gtkimhtml.c:3518 msgid "_Save Image..." msgstr "儲存影像(_S)..." -#: ../pidgin/gtkimhtmltoolbar.c:153 +#: ../pidgin/gtkimhtmltoolbar.c:162 msgid "Select Font" msgstr "選擇字型" -#: ../pidgin/gtkimhtmltoolbar.c:232 +#: ../pidgin/gtkimhtmltoolbar.c:241 msgid "Select Text Color" msgstr "設定文字顏色" -#: ../pidgin/gtkimhtmltoolbar.c:311 +#: ../pidgin/gtkimhtmltoolbar.c:320 msgid "Select Background Color" msgstr "設定背景顏色" -#: ../pidgin/gtkimhtmltoolbar.c:400 +#: ../pidgin/gtkimhtmltoolbar.c:409 msgid "_URL" msgstr "_URL" -#: ../pidgin/gtkimhtmltoolbar.c:408 +#: ../pidgin/gtkimhtmltoolbar.c:417 msgid "_Description" msgstr "描述(_D)" -#: ../pidgin/gtkimhtmltoolbar.c:411 +#: ../pidgin/gtkimhtmltoolbar.c:420 msgid "" "Please enter the URL and description of the link that you want to insert. " "The description is optional." msgstr "請輸入您所要插入的 URL 及它的描述，描述是選擇性的，可不用輸入。" -#: ../pidgin/gtkimhtmltoolbar.c:415 +#: ../pidgin/gtkimhtmltoolbar.c:424 msgid "Please enter the URL of the link that you want to insert." msgstr "請輸入您所要插入的 URL。" -#: ../pidgin/gtkimhtmltoolbar.c:420 +#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098 msgid "Insert Link" msgstr "加入連結" -#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155 +#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258 msgid "_Insert" msgstr "插入(_I)" -#: ../pidgin/gtkimhtmltoolbar.c:493 +#: ../pidgin/gtkimhtmltoolbar.c:513 #, c-format msgid "Failed to store image: %s\n" msgstr "無法儲存影像：%s\n" -#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529 +#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549 msgid "Insert Image" msgstr "插入影像" # XXX 譯文不通順 -#: ../pidgin/gtkimhtmltoolbar.c:740 +#: ../pidgin/gtkimhtmltoolbar.c:760 msgid "This theme has no available smileys." msgstr "這個表情主題不含任何表情。" #. show everything -#: ../pidgin/gtkimhtmltoolbar.c:757 +#: ../pidgin/gtkimhtmltoolbar.c:777 msgid "Smile!" msgstr "笑一個！" -#: ../pidgin/gtkimhtmltoolbar.c:1064 -msgid "_Bold" -msgstr "粗體(_B)" +#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215 +msgid "_Font" +msgstr "字型(_F)" + +#: ../pidgin/gtkimhtmltoolbar.c:1050 +#, fuzzy +msgid "Group Items" +msgstr "群組 ID：" + +#: ../pidgin/gtkimhtmltoolbar.c:1050 +msgid "Ungroup Items" +msgstr "解除群組" + +#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287 +msgid "Bold" +msgstr "粗體" # NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型，「斜體」其實是誤譯，但已根深蒂固，不可能改正 -#: ../pidgin/gtkimhtmltoolbar.c:1065 -msgid "_Italic" -msgstr "斜體(_I)" - -#: ../pidgin/gtkimhtmltoolbar.c:1066 -msgid "_Underline" -msgstr "底線(_U)" - -#: ../pidgin/gtkimhtmltoolbar.c:1067 -msgid "_Larger" -msgstr "放大字體(_L)" - -#: ../pidgin/gtkimhtmltoolbar.c:1069 +#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294 +msgid "Italic" +msgstr "斜體" + +#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301 +msgid "Underline" +msgstr "底線" + +#: ../pidgin/gtkimhtmltoolbar.c:1087 +msgid "Strikethrough" +msgstr "刪除線" + +#: ../pidgin/gtkimhtmltoolbar.c:1089 +msgid "Increase Font Size" +msgstr "放大字體" + +#: ../pidgin/gtkimhtmltoolbar.c:1090 +msgid "Decrease Font Size" +msgstr "縮小字體" + +#: ../pidgin/gtkimhtmltoolbar.c:1092 +msgid "Font Face" +msgstr "字型" + +#: ../pidgin/gtkimhtmltoolbar.c:1093 +msgid "Background Color" +msgstr "背景顏色" + +# XXX 譯「文字顏色」會否較好？ - acli 20070614 +#: ../pidgin/gtkimhtmltoolbar.c:1094 +msgid "Foreground Color" +msgstr "前景顏色" + +#: ../pidgin/gtkimhtmltoolbar.c:1096 +msgid "Reset Formatting" +msgstr "清除格式化" + +#: ../pidgin/gtkimhtmltoolbar.c:1099 +msgid "Insert IM Image" +msgstr "插入影像" + +#: ../pidgin/gtkimhtmltoolbar.c:1100 +msgid "Insert Smiley" +msgstr "插入表情" + +#: ../pidgin/gtkimhtmltoolbar.c:1175 +msgid "_Bold" +msgstr "粗體(_B)" + +# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型，「斜體」其實是誤譯，但已根深蒂固，不可能改正 +#: ../pidgin/gtkimhtmltoolbar.c:1176 +msgid "_Italic" +msgstr "斜體(_I)" + +#: ../pidgin/gtkimhtmltoolbar.c:1177 +msgid "_Underline" +msgstr "底線(_U)" + +# NOTE 這看來是一般PO檔的譯法（印刷術語看來也沒有既有譯法） +#: ../pidgin/gtkimhtmltoolbar.c:1178 +msgid "Strikethrough" +msgstr "刪除線" + +#: ../pidgin/gtkimhtmltoolbar.c:1179 +#, fuzzy +msgid "_Larger" +msgstr "" +"儲存影像途中發生錯誤\n" +"\n" +"%s" + +#: ../pidgin/gtkimhtmltoolbar.c:1181 msgid "_Normal" msgstr "正常(_N)" -#: ../pidgin/gtkimhtmltoolbar.c:1071 -msgid "_Smaller" -msgstr "縮小字體(_S)" - -#: ../pidgin/gtkimhtmltoolbar.c:1072 +#: ../pidgin/gtkimhtmltoolbar.c:1183 +msgid "_Smaller" +msgstr "縮小(_S)" + +#. If we want to show the formatting for the following items, we would +#. * need to update them when formatting changes. The above items don't need +#. * no updating nor nothin' +#: ../pidgin/gtkimhtmltoolbar.c:1187 msgid "_Font face" msgstr "字型(_F)" # XXX 譯「文字顏色」會否較好？ - acli 20070614 -#: ../pidgin/gtkimhtmltoolbar.c:1073 -msgid "_Foreground color" -msgstr "前景顏色(_F)" - -#: ../pidgin/gtkimhtmltoolbar.c:1074 -msgid "_Background color" -msgstr "背景顏色(_B)" - -#: ../pidgin/gtkimhtmltoolbar.c:1100 -msgid "_Font" -msgstr "字型(_F)" - -#: ../pidgin/gtkimhtmltoolbar.c:1135 -msgid "_Reset font" -msgstr "清除格式化(_R)" +#: ../pidgin/gtkimhtmltoolbar.c:1188 +msgid "Foreground _color" +msgstr "前景顏色(_C)" + +#: ../pidgin/gtkimhtmltoolbar.c:1189 +msgid "Bac_kground color" +msgstr "背景顏色(_K)" # XXX -#: ../pidgin/gtkimhtmltoolbar.c:1162 +#: ../pidgin/gtkimhtmltoolbar.c:1266 msgid "_Smiley" msgstr "笑一個！(_S)" -#: ../pidgin/gtkimhtmltoolbar.c:1168 +#: ../pidgin/gtkimhtmltoolbar.c:1272 msgid "_Image" msgstr "影像(_I)" -#: ../pidgin/gtkimhtmltoolbar.c:1174 +#: ../pidgin/gtkimhtmltoolbar.c:1278 msgid "_Link" msgstr "連結(_L)" +#: ../pidgin/gtkimhtmltoolbar.c:1284 +msgid "_Horizontal rule" +msgstr "橫線(_H)" + # XXX 不通順 - ambrose 20070415 #: ../pidgin/gtklog.c:292 #, c-format @@ -14252,14 +15796,14 @@ msgid "System Log" msgstr "系統日誌" -#: ../pidgin/gtkmain.c:385 +#: ../pidgin/gtkmain.c:386 #, c-format msgid "%s %s. Try `%s -h' for more information.\n" msgstr "%s %s。執行「%s -h」以獲得更進一步的資訊。\n" # FIXME # NOTE hard-code 了一個「Pidgin」在譯文裏，但刪掉會有點困難（令文句難明），故暫時保留，待想到怎樣刪掉才算 -#: ../pidgin/gtkmain.c:387 +#: ../pidgin/gtkmain.c:388 #, c-format msgid "" "%s %s\n" @@ -14286,7 +15830,7 @@ "哪些帳號，並使用逗號分隔) \n" " -v, --version 顯示版本訊息並離開\n" -#: ../pidgin/gtkmain.c:511 +#: ../pidgin/gtkmain.c:512 #, c-format msgid "" "%s has segfaulted and attempted to dump a core file.\n" @@ -14311,48 +15855,48 @@ # TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work #. Translators may want to transliterate the name. #. It is not to be translated. -#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50 +#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50 msgid "Pidgin" msgstr "Pidgin" -#: ../pidgin/gtknotify.c:343 +#: ../pidgin/gtknotify.c:348 msgid "Open All Messages" msgstr "開啟所有訊息" -#: ../pidgin/gtknotify.c:395 +#: ../pidgin/gtknotify.c:401 msgid "You have mail!" msgstr "您有郵件！" -#: ../pidgin/gtknotify.c:515 +#: ../pidgin/gtknotify.c:521 #, c-format msgid "%s has %d new message." msgid_plural "%s has %d new messages." msgstr[0] "%s 有 %d 封新郵件。" msgstr[1] "%s 有 %d 封新郵件。" -#: ../pidgin/gtknotify.c:526 +#: ../pidgin/gtknotify.c:532 #, c-format msgid "You have %d new e-mail." msgid_plural "You have %d new e-mails." msgstr[0] "您有 %d 封新郵件。" msgstr[1] "您有 %d 封新郵件。" -#: ../pidgin/gtknotify.c:965 +#: ../pidgin/gtknotify.c:957 #, c-format msgid "The browser command \"%s\" is invalid." msgstr "瀏覽器指令「%s」是無效的。" -#: ../pidgin/gtknotify.c:967 ../pidgin/gtknotify.c:979 -#: ../pidgin/gtknotify.c:992 ../pidgin/gtknotify.c:1120 +#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971 +#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112 msgid "Unable to open URL" msgstr "無法開啟網頁" -#: ../pidgin/gtknotify.c:977 ../pidgin/gtknotify.c:990 +#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982 #, c-format msgid "Error launching \"%s\": %s" msgstr "啟動 \"%s\" 時發生錯誤：%s" -#: ../pidgin/gtknotify.c:1121 +#: ../pidgin/gtknotify.c:1113 msgid "" "The 'Manual' browser command has been chosen, but no command has been set." msgstr "您選用了「使用者自定瀏覽器」，卻未有設定指令。" @@ -14404,100 +15948,100 @@ msgstr "選擇檔案" #. Create the "Pounce on Whom" frame. -#: ../pidgin/gtkpounce.c:533 +#: ../pidgin/gtkpounce.c:531 msgid "Pounce on Whom" msgstr "捕捉誰的狀態" -#: ../pidgin/gtkpounce.c:560 +#: ../pidgin/gtkpounce.c:558 msgid "_Buddy name:" msgstr "好友名稱(_B)：" +#: ../pidgin/gtkpounce.c:592 +msgid "Si_gns on" +msgstr "登入(_G)" + #: ../pidgin/gtkpounce.c:594 -msgid "Si_gns on" -msgstr "登入(_G)" +msgid "Signs o_ff" +msgstr "登出(_F)" #: ../pidgin/gtkpounce.c:596 -msgid "Signs o_ff" -msgstr "登出(_F)" +msgid "Goes a_way" +msgstr "離開(_W)" #: ../pidgin/gtkpounce.c:598 -msgid "Goes a_way" -msgstr "離開(_W)" +msgid "Ret_urns from away" +msgstr "返回(_U)" #: ../pidgin/gtkpounce.c:600 -msgid "Ret_urns from away" -msgstr "返回(_U)" +msgid "Becomes _idle" +msgstr "閒置(_I)" #: ../pidgin/gtkpounce.c:602 -msgid "Becomes _idle" -msgstr "閒置(_I)" - -#: ../pidgin/gtkpounce.c:604 msgid "Is no longer i_dle" msgstr "不再閒置(_D)" -#: ../pidgin/gtkpounce.c:606 +#: ../pidgin/gtkpounce.c:604 msgid "Starts _typing" msgstr "開始輸入(_T)" +#: ../pidgin/gtkpounce.c:606 +msgid "P_auses while typing" +msgstr "暫停輸入(_A)" + #: ../pidgin/gtkpounce.c:608 -msgid "P_auses while typing" -msgstr "暫停輸入(_A)" - -#: ../pidgin/gtkpounce.c:610 msgid "Stops t_yping" msgstr "停止輸入(_Y)" -#: ../pidgin/gtkpounce.c:612 +#: ../pidgin/gtkpounce.c:610 msgid "Sends a _message" msgstr "送出一個訊息(_M)" +#: ../pidgin/gtkpounce.c:653 +msgid "Ope_n an IM window" +msgstr "開啟即時訊息視窗(_N)" + #: ../pidgin/gtkpounce.c:655 -msgid "Ope_n an IM window" -msgstr "開啟即時訊息視窗(_N)" - -#: ../pidgin/gtkpounce.c:657 msgid "_Pop up a notification" msgstr "彈出通知(_P)" -#: ../pidgin/gtkpounce.c:659 +#: ../pidgin/gtkpounce.c:657 msgid "Send a _message" msgstr "送出訊息(_M)" +#: ../pidgin/gtkpounce.c:659 +msgid "E_xecute a command" +msgstr "執行指令(_X)" + #: ../pidgin/gtkpounce.c:661 -msgid "E_xecute a command" -msgstr "執行指令(_X)" - -#: ../pidgin/gtkpounce.c:663 msgid "P_lay a sound" msgstr "播放音效(_L)" -#: ../pidgin/gtkpounce.c:669 +#: ../pidgin/gtkpounce.c:667 msgid "Brows_e..." msgstr "瀏覽(_E)..." -#: ../pidgin/gtkpounce.c:671 +#: ../pidgin/gtkpounce.c:669 msgid "Br_owse..." msgstr "瀏覽(_O)..." -#: ../pidgin/gtkpounce.c:672 +#: ../pidgin/gtkpounce.c:670 msgid "Pre_view" msgstr "預覽(_V)" -#: ../pidgin/gtkpounce.c:799 +#: ../pidgin/gtkpounce.c:797 msgid "P_ounce only when my status is not Available" msgstr "只在我的狀態不為「上線」時啟用(_O)" -#: ../pidgin/gtkpounce.c:804 +#: ../pidgin/gtkpounce.c:802 msgid "_Recurring" msgstr "重覆發生(_R)" -#: ../pidgin/gtkpounce.c:1260 +#: ../pidgin/gtkpounce.c:1245 msgid "Pounce Target" msgstr "捕捉目標" #: ../pidgin/gtkprefs.c:385 -#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1 +#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1 msgid "Default" msgstr "預設" @@ -14531,13 +16075,6 @@ msgid "_Show system tray icon:" msgstr "顯示系統工作匣圖示(_S)：" -#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756 -#: ../pidgin/plugins/timestamp_format.c:42 -#: ../pidgin/plugins/timestamp_format.c:51 -#: ../pidgin/plugins/win32/winprefs/winprefs.c:338 -msgid "Always" -msgstr "務必" - #: ../pidgin/gtkprefs.c:898 msgid "On unread messages" msgstr "有未讀訊息時" @@ -14550,7 +16087,7 @@ msgid "_Hide new IM conversations:" msgstr "隱藏新的即時訊息交談(_H)：" -#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937 +#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943 msgid "When away" msgstr "離開期間" @@ -14603,9 +16140,10 @@ msgid "Show _formatting on incoming messages" msgstr "顯示所收訊息的格式化(_F)" +# TODO 要覆查 - acli 20070912 #: ../pidgin/gtkprefs.c:997 -msgid "Show buddy _icons" -msgstr "顯示好友圖示(_I)" +msgid "Show _detailed information" +msgstr "顯示詳細資訊(_D)" #: ../pidgin/gtkprefs.c:999 msgid "Enable buddy ic_on animation" @@ -14648,132 +16186,132 @@ msgid "Conversation _font:" msgstr "交談用的字型(_F)：" -#: ../pidgin/gtkprefs.c:1041 +#: ../pidgin/gtkprefs.c:1042 msgid "Default Formatting" msgstr "預設格式" # NOTE 這不是說明文，而是樣本本身，玩死人了 :P -#: ../pidgin/gtkprefs.c:1057 +#: ../pidgin/gtkprefs.c:1061 msgid "" "This is how your outgoing message text will appear when you use protocols " "that support formatting." msgstr "" "這是一個樣本。假如您使用的協定支援格式化，送出訊息的式樣將會類似這段文字。" -#: ../pidgin/gtkprefs.c:1123 +#: ../pidgin/gtkprefs.c:1127 msgid "ST_UN server:" msgstr "STUN 伺服器(_U)：" -#: ../pidgin/gtkprefs.c:1135 +#: ../pidgin/gtkprefs.c:1139 msgid "Example: stunserver.org" msgstr "例：stunserver.org" -#: ../pidgin/gtkprefs.c:1139 +#: ../pidgin/gtkprefs.c:1143 msgid "_Autodetect IP address" msgstr "自動偵測 IP 位址(_A)" -#: ../pidgin/gtkprefs.c:1148 +#: ../pidgin/gtkprefs.c:1152 msgid "Public _IP:" msgstr "公共IP (_I)：" -#: ../pidgin/gtkprefs.c:1177 +#: ../pidgin/gtkprefs.c:1181 msgid "Ports" msgstr "通訊埠" -#: ../pidgin/gtkprefs.c:1180 +#: ../pidgin/gtkprefs.c:1184 msgid "_Manually specify range of ports to listen on" msgstr "自定通訊埠監聽範圍(_M)" -#: ../pidgin/gtkprefs.c:1183 +#: ../pidgin/gtkprefs.c:1187 msgid "_Start port:" msgstr "啟始通訊埠(_S)：" -#: ../pidgin/gtkprefs.c:1190 +#: ../pidgin/gtkprefs.c:1194 msgid "_End port:" msgstr "結束通訊埠(_E)：" -#: ../pidgin/gtkprefs.c:1198 +#: ../pidgin/gtkprefs.c:1202 msgid "Proxy Server" msgstr "代理伺服器" # NOTE 理由同前，不用「毋須」，改為「不使用」 -#: ../pidgin/gtkprefs.c:1202 +#: ../pidgin/gtkprefs.c:1206 msgid "No proxy" msgstr "不使用代理伺服器" -#: ../pidgin/gtkprefs.c:1258 +#: ../pidgin/gtkprefs.c:1262 msgid "_User:" msgstr "使用者(_U)：" -#: ../pidgin/gtkprefs.c:1323 +#: ../pidgin/gtkprefs.c:1327 msgid "Seamonkey" msgstr "Seamonkey" -#: ../pidgin/gtkprefs.c:1324 +#: ../pidgin/gtkprefs.c:1328 msgid "Opera" msgstr "Opera" -#: ../pidgin/gtkprefs.c:1325 +#: ../pidgin/gtkprefs.c:1329 msgid "Netscape" msgstr "Netscape" -#: ../pidgin/gtkprefs.c:1326 +#: ../pidgin/gtkprefs.c:1330 msgid "Mozilla" msgstr "Mozilla" -#: ../pidgin/gtkprefs.c:1327 +#: ../pidgin/gtkprefs.c:1331 msgid "Konqueror" msgstr "Konqueror" -#: ../pidgin/gtkprefs.c:1328 +#: ../pidgin/gtkprefs.c:1332 msgid "GNOME Default" msgstr "GNOME預設" -#: ../pidgin/gtkprefs.c:1329 +#: ../pidgin/gtkprefs.c:1333 msgid "Galeon" msgstr "Galeon" -#: ../pidgin/gtkprefs.c:1330 +#: ../pidgin/gtkprefs.c:1334 msgid "Firefox" msgstr "Firefox" -#: ../pidgin/gtkprefs.c:1331 +#: ../pidgin/gtkprefs.c:1335 msgid "Firebird" msgstr "Firebird" -#: ../pidgin/gtkprefs.c:1332 +#: ../pidgin/gtkprefs.c:1336 msgid "Epiphany" msgstr "Epiphany" -#: ../pidgin/gtkprefs.c:1341 +#: ../pidgin/gtkprefs.c:1345 msgid "Manual" msgstr "使用者自定" -#: ../pidgin/gtkprefs.c:1394 +#: ../pidgin/gtkprefs.c:1398 msgid "Browser Selection" msgstr "選擇瀏覽器" -#: ../pidgin/gtkprefs.c:1398 +#: ../pidgin/gtkprefs.c:1402 msgid "_Browser:" msgstr "瀏覽器(_B)：" -#: ../pidgin/gtkprefs.c:1406 +#: ../pidgin/gtkprefs.c:1410 msgid "_Open link in:" msgstr "在瀏覽器中打開連結(_O)：" -#: ../pidgin/gtkprefs.c:1408 +#: ../pidgin/gtkprefs.c:1412 msgid "Browser default" msgstr "瀏覽器預設" -#: ../pidgin/gtkprefs.c:1409 +#: ../pidgin/gtkprefs.c:1413 msgid "Existing window" msgstr "既有的視窗" -#: ../pidgin/gtkprefs.c:1411 +#: ../pidgin/gtkprefs.c:1415 msgid "New tab" msgstr "新分頁" -#: ../pidgin/gtkprefs.c:1425 +#: ../pidgin/gtkprefs.c:1429 #, c-format msgid "" "_Manual:\n" @@ -14782,80 +16320,63 @@ "使用者自定(_M)：\n" "(請以 %s 代表網址)" -#: ../pidgin/gtkprefs.c:1465 +#: ../pidgin/gtkprefs.c:1469 msgid "Log _format:" msgstr "日誌格式(_F)：" -#: ../pidgin/gtkprefs.c:1470 +#: ../pidgin/gtkprefs.c:1474 msgid "Log all _instant messages" msgstr "記錄所有即時訊息(_I)" -#: ../pidgin/gtkprefs.c:1472 +#: ../pidgin/gtkprefs.c:1476 msgid "Log all c_hats" msgstr "記錄所有聊天內容(_H)" -#: ../pidgin/gtkprefs.c:1474 +#: ../pidgin/gtkprefs.c:1478 msgid "Log all _status changes to system log" msgstr "記錄所有狀態改變至系統日誌(_S)" -#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671 -#: ../pidgin/gtkprefs.c:1865 -msgid "(default)" -msgstr "(預設)" - -#: ../pidgin/gtkprefs.c:1620 +#: ../pidgin/gtkprefs.c:1624 msgid "Sound Selection" msgstr "選取音效" -#: ../pidgin/gtkprefs.c:1630 +#: ../pidgin/gtkprefs.c:1634 msgid "Quietest" msgstr "最小聲" -#: ../pidgin/gtkprefs.c:1632 +#: ../pidgin/gtkprefs.c:1636 msgid "Quieter" msgstr "再小聲" -#: ../pidgin/gtkprefs.c:1634 +#: ../pidgin/gtkprefs.c:1638 msgid "Quiet" msgstr "小聲" -#: ../pidgin/gtkprefs.c:1638 +#: ../pidgin/gtkprefs.c:1642 msgid "Loud" msgstr "大聲" -#: ../pidgin/gtkprefs.c:1640 +#: ../pidgin/gtkprefs.c:1644 msgid "Louder" msgstr "再大聲" -#: ../pidgin/gtkprefs.c:1642 +#: ../pidgin/gtkprefs.c:1646 msgid "Loudest" msgstr "最大聲" -#: ../pidgin/gtkprefs.c:1705 -msgid "Sound Method" -msgstr "音效播放方式" - -#: ../pidgin/gtkprefs.c:1706 +#: ../pidgin/gtkprefs.c:1712 msgid "_Method:" msgstr "播放方式(_M)：" -#: ../pidgin/gtkprefs.c:1708 +#: ../pidgin/gtkprefs.c:1714 msgid "Console beep" msgstr "嗶一聲" -#: ../pidgin/gtkprefs.c:1710 -msgid "Automatic" -msgstr "自動" - -#: ../pidgin/gtkprefs.c:1714 -msgid "Command" -msgstr "指令" - -#: ../pidgin/gtkprefs.c:1715 +#: ../pidgin/gtkprefs.c:1721 msgid "No sounds" msgstr "無音效" -#: ../pidgin/gtkprefs.c:1723 +#: ../pidgin/gtkprefs.c:1729 #, c-format msgid "" "Sound c_ommand:\n" @@ -14864,118 +16385,82 @@ "音效指令(_C)：\n" "(請以 %s 代表檔名)" -#: ../pidgin/gtkprefs.c:1749 -msgid "Sound Options" -msgstr "音效選項" - -#: ../pidgin/gtkprefs.c:1750 +#: ../pidgin/gtkprefs.c:1756 msgid "Sounds when conversation has _focus" msgstr "當交談取得輸入焦點發出音效(_F)" -#: ../pidgin/gtkprefs.c:1752 +#: ../pidgin/gtkprefs.c:1758 msgid "Enable sounds:" msgstr "啟動音效：" -#: ../pidgin/gtkprefs.c:1754 -msgid "Only when available" -msgstr "上線而非離開期間" - -#: ../pidgin/gtkprefs.c:1755 -msgid "Only when not available" -msgstr "離開期間" - -#: ../pidgin/gtkprefs.c:1763 +#: ../pidgin/gtkprefs.c:1769 msgid "Volume:" msgstr "音量：" -#: ../pidgin/gtkprefs.c:1791 -msgid "Sound Events" -msgstr "事件音效" - -#: ../pidgin/gtkprefs.c:1843 +#: ../pidgin/gtkprefs.c:1849 msgid "Play" msgstr "播放" -#: ../pidgin/gtkprefs.c:1850 -msgid "Event" -msgstr "事件" - -#: ../pidgin/gtkprefs.c:1869 -msgid "Test" -msgstr "測試" - -#: ../pidgin/gtkprefs.c:1873 -msgid "Reset" -msgstr "重置" - -#: ../pidgin/gtkprefs.c:1877 -msgid "Choose..." -msgstr "選擇..." - -#: ../pidgin/gtkprefs.c:1920 +#: ../pidgin/gtkprefs.c:1926 msgid "_Report idle time:" msgstr "閒置時間基準(_R)" -#: ../pidgin/gtkprefs.c:1925 +#: ../pidgin/gtkprefs.c:1931 msgid "Based on keyboard or mouse use" msgstr "以鍵盤及滑鼠的使用為基準" -#: ../pidgin/gtkprefs.c:1934 +#: ../pidgin/gtkprefs.c:1940 msgid "_Auto-reply:" msgstr "何時送出自動回應：" -#: ../pidgin/gtkprefs.c:1938 +#: ../pidgin/gtkprefs.c:1944 msgid "When both away and idle" msgstr "當離開並同時閒置時" #. Auto-away stuff -#: ../pidgin/gtkprefs.c:1944 +#: ../pidgin/gtkprefs.c:1950 msgid "Auto-away" msgstr "自動離開" -#: ../pidgin/gtkprefs.c:1946 +#: ../pidgin/gtkprefs.c:1952 msgid "Change status when _idle" msgstr "閒置時更改狀態(_I)" # NOTE 譯文更動 by Ambrose -#: ../pidgin/gtkprefs.c:1950 -msgid "_Minutes before changing status:" +#: ../pidgin/gtkprefs.c:1956 +msgid "_Minutes before becoming idle:" msgstr "閒置多少分鐘更改狀態(_M)：" -#: ../pidgin/gtkprefs.c:1958 +#: ../pidgin/gtkprefs.c:1964 msgid "Change _status to:" msgstr "更改狀態為(_S)：" #. Signon status stuff -#: ../pidgin/gtkprefs.c:1979 +#: ../pidgin/gtkprefs.c:1985 msgid "Status at Startup" msgstr "啟動時狀態" -#: ../pidgin/gtkprefs.c:1981 +#: ../pidgin/gtkprefs.c:1987 msgid "Use status from last _exit at startup" msgstr "使用上次結束前的狀態" -#: ../pidgin/gtkprefs.c:1987 +#: ../pidgin/gtkprefs.c:1993 msgid "Status to a_pply at startup:" msgstr "啟動時套用的狀態：" -#: ../pidgin/gtkprefs.c:2025 +#: ../pidgin/gtkprefs.c:2031 msgid "Interface" msgstr "介面" -#: ../pidgin/gtkprefs.c:2027 +#: ../pidgin/gtkprefs.c:2033 msgid "Smiley Themes" msgstr "表情主題" -#: ../pidgin/gtkprefs.c:2028 -msgid "Sounds" -msgstr "音效" - -#: ../pidgin/gtkprefs.c:2034 +#: ../pidgin/gtkprefs.c:2040 msgid "Browser" msgstr "瀏覽器" -#: ../pidgin/gtkprefs.c:2038 +#: ../pidgin/gtkprefs.c:2044 msgid "Status / Idle" msgstr "狀態／閒置" @@ -15064,23 +16549,23 @@ msgid "Apply" msgstr "套用" -#: ../pidgin/gtkrequest.c:1478 +#: ../pidgin/gtkrequest.c:1507 msgid "That file already exists" msgstr "那個檔案已經存在" -#: ../pidgin/gtkrequest.c:1479 +#: ../pidgin/gtkrequest.c:1508 msgid "Would you like to overwrite it?" msgstr "您要覆蓋它嗎？" -#: ../pidgin/gtkrequest.c:1482 +#: ../pidgin/gtkrequest.c:1511 msgid "Overwrite" msgstr "覆寫" -#: ../pidgin/gtkrequest.c:1483 +#: ../pidgin/gtkrequest.c:1512 msgid "Choose New Name" msgstr "選取新名稱" -#: ../pidgin/gtkrequest.c:1621 ../pidgin/gtkrequest.c:1635 +#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664 msgid "Select Folder..." msgstr "選擇資料匣..." @@ -15122,7 +16607,7 @@ msgid "_Title:" msgstr "標題(_T)：" -#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494 +#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496 msgid "_Status:" msgstr "狀態(_S)：" @@ -15136,94 +16621,46 @@ msgid "Sa_ve & Use" msgstr "儲存並使用(_V)" -#: ../pidgin/gtksavedstatuses.c:1477 +#: ../pidgin/gtksavedstatuses.c:1479 #, c-format msgid "Status for %s" msgstr "狀態：%s" -#: ../pidgin/gtksound.c:63 -msgid "Buddy logs in" -msgstr "好友登入" - -#: ../pidgin/gtksound.c:64 -msgid "Buddy logs out" -msgstr "好友登出" - -#: ../pidgin/gtksound.c:65 -msgid "Message received" -msgstr "收到訊息" - -#: ../pidgin/gtksound.c:66 -msgid "Message received begins conversation" -msgstr "訊息收到，開始進行交談" - -#: ../pidgin/gtksound.c:67 -msgid "Message sent" -msgstr "訊息送出" - -#: ../pidgin/gtksound.c:68 -msgid "Person enters chat" -msgstr "有人進入聊天室" - -#: ../pidgin/gtksound.c:69 -msgid "Person leaves chat" -msgstr "有人離開聊天室" - -#: ../pidgin/gtksound.c:70 -msgid "You talk in chat" -msgstr "您在聊天室說話" - -#: ../pidgin/gtksound.c:71 -msgid "Others talk in chat" -msgstr "其他人進入聊天室" - -#: ../pidgin/gtksound.c:74 -msgid "Someone says your screen name in chat" -msgstr "有人在聊天室中提到您的名字" - -#: ../pidgin/gtksound.c:310 -msgid "GStreamer Failure" -msgstr "GStreamer 錯誤" - -#: ../pidgin/gtksound.c:311 -msgid "GStreamer failed to initialize." -msgstr "GStreamer 初始化失敗。" - #: ../pidgin/gtkstatusbox.c:663 msgid "Waiting for network connection" msgstr "等待網路連線..." -#: ../pidgin/gtkutils.c:627 +#: ../pidgin/gtkutils.c:631 msgid "Google Talk" msgstr "Google Talk" -#: ../pidgin/gtkutils.c:1384 ../pidgin/gtkutils.c:1407 +#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421 #, c-format msgid "The following error has occurred loading %s: %s" msgstr "載入 %s 時發生以下錯誤：%s" -#: ../pidgin/gtkutils.c:1387 ../pidgin/gtkutils.c:1409 +#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423 msgid "Failed to load image" msgstr "讀取影像失敗" -#: ../pidgin/gtkutils.c:1483 +#: ../pidgin/gtkutils.c:1497 #, c-format msgid "Cannot send folder %s." msgstr "無法傳送目錄 %s。" -#: ../pidgin/gtkutils.c:1484 +#: ../pidgin/gtkutils.c:1498 #, c-format msgid "" "%s cannot transfer a folder. You will need to send the files within " "individually." msgstr "%s 沒有辦法傳送目錄，您需要個別傳送目錄內的檔案。" -#: ../pidgin/gtkutils.c:1516 ../pidgin/gtkutils.c:1528 -#: ../pidgin/gtkutils.c:1535 +#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542 +#: ../pidgin/gtkutils.c:1549 msgid "You have dragged an image" msgstr "您拖曳了一個影像" -#: ../pidgin/gtkutils.c:1517 +#: ../pidgin/gtkutils.c:1531 msgid "" "You can send this image as a file transfer, embed it into this message, or " "use it as the buddy icon for this user." @@ -15231,23 +16668,23 @@ "您可以透過檔案傳輸、插入訊息，或者把它當成是你的好友圖示等方式，來傳送影像檔" "給這個使用者。" -#: ../pidgin/gtkutils.c:1523 ../pidgin/gtkutils.c:1543 +#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557 msgid "Set as buddy icon" msgstr "設為好友圖示" -#: ../pidgin/gtkutils.c:1524 ../pidgin/gtkutils.c:1544 +#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558 msgid "Send image file" msgstr "傳送影像檔" -#: ../pidgin/gtkutils.c:1525 ../pidgin/gtkutils.c:1544 +#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558 msgid "Insert in message" msgstr "插入到訊息" -#: ../pidgin/gtkutils.c:1529 +#: ../pidgin/gtkutils.c:1543 msgid "Would you like to set it as the buddy icon for this user?" msgstr "您要把它設為這個使用者的好友圖示嗎？" -#: ../pidgin/gtkutils.c:1536 +#: ../pidgin/gtkutils.c:1550 msgid "" "You can send this image as a file transfer, or use it as the buddy icon for " "this user." @@ -15255,7 +16692,7 @@ "您可以透過檔案傳輸，或者把它當成是你的好友圖示等方式，來傳送影像檔給這個使用" "者。" -#: ../pidgin/gtkutils.c:1537 +#: ../pidgin/gtkutils.c:1551 msgid "" "You can insert this image into this message, or use it as the buddy icon for " "this user" @@ -15268,17 +16705,17 @@ #. * send. The only logical one is "Application," but do we really want to send a binary and nothing else? #. * Probably not. I'll just give an error and return. #. The original patch sent the icon used by the launcher. That's probably wrong -#: ../pidgin/gtkutils.c:1595 +#: ../pidgin/gtkutils.c:1609 msgid "Cannot send launcher" msgstr "無法傳送啟動器" -#: ../pidgin/gtkutils.c:1595 +#: ../pidgin/gtkutils.c:1609 msgid "" "You dragged a desktop launcher. Most likely you wanted to send whatever this " "launcher points to instead of this launcher itself." msgstr "您拖曳了一個啟動器；您大概想傳送啟動器要啟動的檔案，而不是啟動器本身。" -#: ../pidgin/gtkutils.c:2317 +#: ../pidgin/gtkutils.c:2344 #, c-format msgid "" "File: %s\n" @@ -15289,25 +16726,25 @@ "檔案大小： %s\n" "圖像尺寸： %d×%d" -#: ../pidgin/gtkutils.c:2613 +#: ../pidgin/gtkutils.c:2640 #, c-format msgid "The file '%s' is too large for %s. Please try a smaller image.\n" msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n" -#: ../pidgin/gtkutils.c:2615 +#: ../pidgin/gtkutils.c:2642 msgid "Icon Error" msgstr "圖像錯誤" -#: ../pidgin/gtkutils.c:2616 +#: ../pidgin/gtkutils.c:2643 msgid "Could not set icon" msgstr "無法設定圖像" -#: ../pidgin/gtkutils.c:2716 +#: ../pidgin/gtkutils.c:2743 #, c-format msgid "Failed to open file '%s': %s" msgstr "無法開啟檔案「%s」：%s" -#: ../pidgin/gtkutils.c:2765 +#: ../pidgin/gtkutils.c:2792 #, c-format msgid "" "Failed to load image '%s': reason not known, probably a corrupt image file" @@ -15321,31 +16758,31 @@ msgid "Select color" msgstr "選擇顏色" -#: ../pidgin/pidginstock.c:81 +#: ../pidgin/pidginstock.c:86 msgid "_Alias" msgstr "別名(_A)" -#: ../pidgin/pidginstock.c:83 +#: ../pidgin/pidginstock.c:88 msgid "Close _tabs" msgstr "關閉分頁(_T)" -#: ../pidgin/pidginstock.c:85 +#: ../pidgin/pidginstock.c:90 msgid "_Get Info" msgstr "取得資訊(_G)" -#: ../pidgin/pidginstock.c:86 +#: ../pidgin/pidginstock.c:91 msgid "_Invite" msgstr "邀請(_I)" -#: ../pidgin/pidginstock.c:87 +#: ../pidgin/pidginstock.c:92 msgid "_Modify" msgstr "修改(_M)" -#: ../pidgin/pidginstock.c:88 +#: ../pidgin/pidginstock.c:93 msgid "_Open Mail" msgstr "開啟郵件(_O)" -#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2 +#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2 msgid "Pidgin smileys" msgstr "Pidgin 表情圖示" @@ -15362,38 +16799,38 @@ msgid "none" msgstr "無" -#: ../pidgin/plugins/cap/cap.c:449 +#: ../pidgin/plugins/cap/cap.c:450 msgid "Display Statistics" msgstr "顯示統計資料" -#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464 +#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465 msgid "Response Probability:" msgstr "「回答」或然率：" -#: ../pidgin/plugins/cap/cap.c:810 +#: ../pidgin/plugins/cap/cap.c:811 msgid "Statistics Configuration" msgstr "統計設定" # NOTE 參閱 gtk/plugins/cap/README #. msg_difference spinner -#: ../pidgin/plugins/cap/cap.c:813 +#: ../pidgin/plugins/cap/cap.c:814 msgid "Maximum response timeout:" msgstr "好友作出回覆的時間上限：" -#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823 -#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150 +#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824 +#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150 msgid "minutes" msgstr "分鐘" #. last_seen spinner -#: ../pidgin/plugins/cap/cap.c:820 +#: ../pidgin/plugins/cap/cap.c:821 msgid "Maximum last-seen difference:" msgstr "" # NOTE 參閱 gtk/plugins/cap/README # FIXME 但這只能是暫譯，譯文絕對有待改進 #. threshold spinner -#: ../pidgin/plugins/cap/cap.c:827 +#: ../pidgin/plugins/cap/cap.c:828 msgid "Threshold:" msgstr "精密度：" @@ -15403,18 +16840,18 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/cap/cap.c:935 +#: ../pidgin/plugins/cap/cap.c:936 msgid "Contact Availability Prediction" msgstr "好友在線狀態預測" #. *< name #. *< version -#: ../pidgin/plugins/cap/cap.c:937 +#: ../pidgin/plugins/cap/cap.c:938 msgid "Contact Availability Prediction plugin." msgstr "好友在線狀態預測模組" #. * summary -#: ../pidgin/plugins/cap/cap.c:938 +#: ../pidgin/plugins/cap/cap.c:939 msgid "" "The contact availability plugin (cap) is used to display statistical " "information about buddies in a users contact list." @@ -15528,19 +16965,6 @@ msgid "Select Color for %s" msgstr "為%s選擇顏色" -#: ../pidgin/plugins/convcolors.c:287 -msgid "Bold" -msgstr "粗體" - -# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型，「斜體」其實是誤譯，但已根深蒂固，不可能改正 -#: ../pidgin/plugins/convcolors.c:294 -msgid "Italic" -msgstr "斜體" - -#: ../pidgin/plugins/convcolors.c:301 -msgid "Underline" -msgstr "底線" - #: ../pidgin/plugins/convcolors.c:310 msgid "Ignore incoming format" msgstr "忽略收到訊息中的自訂格式" @@ -15705,30 +17129,30 @@ msgid "_Associate Buddy" msgstr "聯結好友 (_A)" -#: ../pidgin/plugins/gevolution/gevolution.c:238 -#: ../pidgin/plugins/gevolution/gevolution.c:244 +#: ../pidgin/plugins/gevolution/gevolution.c:240 +#: ../pidgin/plugins/gevolution/gevolution.c:246 msgid "Unable to send e-mail" msgstr "無法送出電子郵件" -#: ../pidgin/plugins/gevolution/gevolution.c:239 +#: ../pidgin/plugins/gevolution/gevolution.c:241 msgid "The evolution executable was not found in the PATH." msgstr "在 PATH 裡找不到可執行的 Evolution 程式。" -#: ../pidgin/plugins/gevolution/gevolution.c:245 +#: ../pidgin/plugins/gevolution/gevolution.c:247 msgid "An e-mail address was not found for this buddy." msgstr "找不到與這個好友相關的電郵地址。" # NOTE 注意！evolution 本身的譯法是「目錄服務」而非「通訊錄」 -#: ../pidgin/plugins/gevolution/gevolution.c:271 +#: ../pidgin/plugins/gevolution/gevolution.c:273 msgid "Add to Address Book" msgstr "增加到通訊錄" -#: ../pidgin/plugins/gevolution/gevolution.c:283 +#: ../pidgin/plugins/gevolution/gevolution.c:285 msgid "Send E-Mail" msgstr "傳送電子郵件" #. Configuration frame -#: ../pidgin/plugins/gevolution/gevolution.c:410 +#: ../pidgin/plugins/gevolution/gevolution.c:412 msgid "Evolution Integration Configuration" msgstr "Evolution 整合設定" @@ -15736,7 +17160,7 @@ # NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list. # NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't #. Label -#: ../pidgin/plugins/gevolution/gevolution.c:413 +#: ../pidgin/plugins/gevolution/gevolution.c:415 msgid "Select all accounts that buddies should be auto-added to." msgstr "請選擇新增好友至那幾個帳號。" @@ -15746,7 +17170,7 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/gevolution/gevolution.c:525 +#: ../pidgin/plugins/gevolution/gevolution.c:527 msgid "Evolution Integration" msgstr "Evolution 整合" @@ -15757,8 +17181,8 @@ #. *< version #. * summary #. * description -#: ../pidgin/plugins/gevolution/gevolution.c:528 #: ../pidgin/plugins/gevolution/gevolution.c:530 +#: ../pidgin/plugins/gevolution/gevolution.c:532 msgid "Provides integration with Evolution." msgstr "提供和 Evolution 的整合。" @@ -15811,6 +17235,15 @@ msgid "Test to see that all ui signals are working properly." msgstr "檢查使用者介面的各種信號是否都能正常運作。" +#: ../pidgin/plugins/gtkbuddynote.c:34 +#, c-format +msgid "" +"\n" +"Buddy Note: %s" +msgstr "" +"\n" +"好友備註：%s" + #: ../pidgin/plugins/history.c:188 msgid "History" msgstr "歷史記錄" @@ -15860,11 +17293,11 @@ msgid "Draw Markerline in " msgstr "在何處使用標示線" -#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676 +#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682 msgid "_IM windows" msgstr "即時訊息視窗(_I)" -#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683 +#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689 msgid "C_hat windows" msgstr "聊天視窗(_H)" @@ -15880,32 +17313,32 @@ msgid "Music messaging session confirmed." msgstr "成功確定音樂訊息工作階段。" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428 msgid "Music Messaging" msgstr "音樂訊息" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429 msgid "There was a conflict in running the command:" msgstr "執行下列指令時發生衝突：" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537 msgid "Error Running Editor" msgstr "執行編輯器途中發生錯誤" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538 msgid "The following error has occurred:" msgstr "發生了下列錯誤：" #. Configuration frame -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637 msgid "Music Messaging Configuration" msgstr "音樂訊息設定" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641 msgid "Score Editor Path" msgstr "樂譜編輯器路徑" -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642 msgid "_Apply" msgstr "套用(_A)" @@ -15917,12 +17350,12 @@ #. *< id #. *< name #. *< version -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683 msgid "Music Messaging Plugin for collaborative composition." msgstr "集體作曲用的音樂訊息模組" #. * summary -#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676 +#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685 msgid "" "The Music Messaging Plugin allows a number of users to simultaneously work " "on a piece of music by editting a common score in real-time." @@ -15930,35 +17363,35 @@ "音樂訊息模組為音樂編寫提供即時傳訊功能，讓多個使用者能同時編輯同一份樂譜。" #. ---------- "Notify For" ---------- -#: ../pidgin/plugins/notify.c:672 +#: ../pidgin/plugins/notify.c:678 msgid "Notify For" msgstr "通知種類" -#: ../pidgin/plugins/notify.c:691 +#: ../pidgin/plugins/notify.c:697 msgid "\t_Only when someone says your screen name" msgstr "\t只當有人提到您的名字(_O)" -#: ../pidgin/plugins/notify.c:701 +#: ../pidgin/plugins/notify.c:707 msgid "_Focused windows" msgstr "焦點視窗(_F)" #. ---------- "Notification Methods" ---------- -#: ../pidgin/plugins/notify.c:709 +#: ../pidgin/plugins/notify.c:715 msgid "Notification Methods" msgstr "通知方式" -#: ../pidgin/plugins/notify.c:716 +#: ../pidgin/plugins/notify.c:722 msgid "Prepend _string into window title:" msgstr "加入字串到視窗標題之前(_S)：" #. Count method button -#: ../pidgin/plugins/notify.c:735 +#: ../pidgin/plugins/notify.c:741 msgid "Insert c_ount of new messages into window title" msgstr "加入新訊息數目到視窗標題中(_O)" # TODO 要覆查 - 20061029 #. Count xprop method button -#: ../pidgin/plugins/notify.c:744 +#: ../pidgin/plugins/notify.c:750 msgid "Insert count of new message into _X property" msgstr "加入新訊息數目到 X 屬性中(_X)" @@ -15966,42 +17399,42 @@ # NOTE「URGENT」一字大概應該保留，因為絕大多數的視窗管理員都不支援，而且會引致奇怪的後果 # NOTE 譯文更動 by Ambrose #. Urgent method button -#: ../pidgin/plugins/notify.c:752 +#: ../pidgin/plugins/notify.c:758 msgid "Set window manager \"_URGENT\" hint" msgstr "設定視窗的「URGENT」（緊急資訊）提示(_U)" #. Raise window method button -#: ../pidgin/plugins/notify.c:761 +#: ../pidgin/plugins/notify.c:767 msgid "R_aise conversation window" msgstr "浮現交談視窗(_A)" #. ---------- "Notification Removals" ---------- -#: ../pidgin/plugins/notify.c:769 +#: ../pidgin/plugins/notify.c:775 msgid "Notification Removal" msgstr "通知移除" #. Remove on focus button -#: ../pidgin/plugins/notify.c:774 +#: ../pidgin/plugins/notify.c:780 msgid "Remove when conversation window _gains focus" msgstr "當交談取得輸入焦點時移除通知(_G)" #. Remove on click button -#: ../pidgin/plugins/notify.c:781 +#: ../pidgin/plugins/notify.c:787 msgid "Remove when conversation window _receives click" msgstr "當交談視窗被點選時移除通知(_R)" #. Remove on type button -#: ../pidgin/plugins/notify.c:789 +#: ../pidgin/plugins/notify.c:795 msgid "Remove when _typing in conversation window" msgstr "當在交談視窗中輸入時移除通知(_T)" #. Remove on message send button -#: ../pidgin/plugins/notify.c:797 +#: ../pidgin/plugins/notify.c:803 msgid "Remove when a _message gets sent" msgstr "送出訊息後移除通知(_M)" #. Remove on conversation switch button -#: ../pidgin/plugins/notify.c:806 +#: ../pidgin/plugins/notify.c:812 msgid "Remove on switch to conversation ta_b" msgstr "當視窗標籤被點選後移除通知(_B)" @@ -16011,7 +17444,7 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/notify.c:901 +#: ../pidgin/plugins/notify.c:907 msgid "Message Notification" msgstr "訊息通知" @@ -16019,7 +17452,7 @@ #. *< version #. * summary #. * description -#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906 +#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912 msgid "Provides a variety of ways of notifying you of unread messages." msgstr "提供多種方式來通知您有未讀取的訊息。" @@ -16396,45 +17829,45 @@ "timestamp formats." msgstr "這個模組允許使用者自行設定交談與日誌的訊息時間戳記格式。" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174 -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589 -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645 msgid "Opacity:" msgstr "不透明度：" #. IM Convo trans options -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562 msgid "IM Conversation Windows" msgstr "即時訊息交談視窗" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563 msgid "_IM window transparency" msgstr "即時訊息視窗透明度(_I)" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577 msgid "_Show slider bar in IM window" msgstr "在即時訊息視窗中顯示 Slider Bar(_S)" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584 msgid "Remove IM window transparency on focus" msgstr "在即時訊息視窗取得焦點時移除透明度" # XXX 應該是指W32程式中「將視窗保持於桌面最上層」功能。 -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578 -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635 msgid "Always on top" msgstr "總是在最上層" #. Buddy List trans options -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619 msgid "Buddy List Window" msgstr "好友清單視窗" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620 msgid "_Buddy List window transparency" msgstr "好友清單視窗透明度(_B)" -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633 msgid "Remove Buddy List window transparency on focus" msgstr "取得輸入焦點時移除好友清單視窗透明度" @@ -16444,19 +17877,19 @@ #. *< dependencies #. *< priority #. *< id -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693 msgid "Transparency" msgstr "透明度" #. *< name #. *< version #. * summary -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696 msgid "Variable Transparency for the buddy list and conversations." msgstr "交談視窗及好友清單產生的半透明效果。" #. * description -#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689 +#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698 msgid "" "This plugin enables variable alpha transparency on conversation windows and " "the buddy list.\n" @@ -16467,47 +17900,47 @@ "\n" "* 請注意：這個模組需要至少 Win2000 的 Windows 版本才能產生效果。" -#: ../pidgin/plugins/win32/winprefs/winprefs.c:307 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:303 msgid "GTK+ Runtime Version" msgstr "GTK+ Runtime 版本" #. Autostart -#: ../pidgin/plugins/win32/winprefs/winprefs.c:315 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:311 msgid "Startup" msgstr "啟動" -#: ../pidgin/plugins/win32/winprefs/winprefs.c:316 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:312 #, c-format msgid "_Start %s on Windows startup" msgstr "當 Windows 啟動時同時執行 %s (_S)" -#: ../pidgin/plugins/win32/winprefs/winprefs.c:331 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:327 msgid "_Dockable Buddy List" msgstr "可停駐的好友清單(_D)" #. Blist On Top -#: ../pidgin/plugins/win32/winprefs/winprefs.c:335 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:331 msgid "_Keep Buddy List window on top:" msgstr "好友清單視窗保持在桌面最上層(_K)；" #. XXX: Did this ever work? -#: ../pidgin/plugins/win32/winprefs/winprefs.c:340 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:336 msgid "Only when docked" msgstr "只在停駐時生效" -#: ../pidgin/plugins/win32/winprefs/winprefs.c:345 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:341 msgid "_Flash window when chat messages are received" msgstr "收到聊天訊息後閃動視窗(_F)" -#: ../pidgin/plugins/win32/winprefs/winprefs.c:375 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:371 msgid "Windows Pidgin Options" msgstr "Windows 版 Pidgin 選項" -#: ../pidgin/plugins/win32/winprefs/winprefs.c:377 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:373 msgid "Options specific to Pidgin for Windows." msgstr "Windows 版 Pidgin 的相關選項。" -#: ../pidgin/plugins/win32/winprefs/winprefs.c:378 +#: ../pidgin/plugins/win32/winprefs/winprefs.c:374 msgid "" "Provides options specific to Pidgin for Windows , such as buddy list docking." msgstr "提供 Windows 版 Pidgin 的相關選項，例如好友清單的停駐功能。" @@ -16561,6 +17994,99 @@ msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。" +#~ msgid "You have just sent a Nudge!" +#~ msgstr "您剛送出了一個呼叫！" + +#~ msgid "%s just sent you a Nudge!" +#~ msgstr "%s 在呼叫您！" + +#~ msgid "You have been signed off for an unknown reason." +#~ msgstr "您因為不明原因而登出。" + +#~ msgid "Are you sure to exit this Qun?" +#~ msgstr "您確定要離開這個群 (Qun) 嗎？" + +#~ msgid "Go ahead" +#~ msgstr "確定" + +#~ msgid "Server ACK" +#~ msgstr "伺服器回應" + +#~ msgid "Keep alive error, seems connection lost!" +#~ msgstr "Keep alive 發生錯誤，連線似乎已突然中斷！" + +#~ msgid "Request login token error!" +#~ msgstr "「登入要求」Token 出現錯誤" + +# NOTE 文中的「%s」是「UDP」或「TCP」，所以譯文應為「位址」而非「地址」 +#~ msgid "%s Address" +#~ msgstr "%s 位址" + +#~ msgid "QQ: Available" +#~ msgstr "QQ: 上線" + +#~ msgid "QQ: Away" +#~ msgstr "QQ: 離開" + +#~ msgid "QQ: Invisible" +#~ msgstr "QQ: 隱身" + +#~ msgid "QQ: Offline" +#~ msgstr "QQ: 離線" + +#~ msgid "Modify My Information" +#~ msgstr "修改資訊" + +#~ msgid "Login in TCP" +#~ msgstr "以 TCP 登入" + +#~ msgid "Login Hidden" +#~ msgstr "以隱藏狀態登入" + +#~ msgid "Socket send error" +#~ msgstr "寫入 Socket 途中發生錯誤" + +# XXX - 20061027 +#~ msgid "Connection refused" +#~ msgstr "連線被拒" + +#~ msgid "Would like to add him?" +#~ msgstr "您想將他（她）加入到您的好友清單嗎？" + +# XXX 可能可以譯得生動一點 +#~ msgid "%s just sent you a Buzz!" +#~ msgstr "%s 在呼叫您！" + +# XXX 可能可以譯得生動一點 +#~ msgid "You have just sent a Buzz!" +#~ msgstr "您剛送出了一個呼叫！" + +#~ msgid "/Options/Show Buddy _Icon" +#~ msgstr "/選項/顯示好友圖示(_I)" + +#~ msgid "/Options/Show Buddy Icon" +#~ msgstr "/選項/顯示好友圖示" + +# XXX 這應該是「nn」碼，即「Nynorsk Norwegian」，所以直譯「挪威文」並不恰當 +# XXX 但這真是「no」碼，但 no.po 其實已經不存在……無來頭…… +#~ msgid "Norwegian" +#~ msgstr "挪威文" + +#~ msgid "_Bold" +#~ msgstr "粗體(_B)" + +#~ msgid "_Larger" +#~ msgstr "放大字體(_L)" + +#~ msgid "_Smaller" +#~ msgstr "縮小字體(_S)" + +#~ msgid "_Reset font" +#~ msgstr "清除格式化(_R)" + +#~ msgid "Show buddy _icons" +#~ msgstr "顯示好友圖示(_I)" + # NOTE 沒辦法，用不到着重號，又沒法改換字型…… #~ msgid "Commands are not supported yet. Message was NOT sent." #~ msgstr "尚未支援指令，訊息因此沒有被送出。" @@ -16589,24 +18115,15 @@ #~ msgid "/Buddies/_About Pidgin" #~ msgstr "/好友/關於 Pidgin(_A)" -#~ msgid "Larger font size" -#~ msgstr "放大字體" - #~ msgid "Smaller font size" #~ msgstr "縮小字體" -#~ msgid "Reset formatting" -#~ msgstr "清除格式化" - #~ msgid "Insert link" #~ msgstr "插入連結" #~ msgid "Insert image" #~ msgstr "插入影像" -#~ msgid "Insert smiley" -#~ msgstr "插入表情" - #~ msgid "Tools" #~ msgstr "工具" @@ -16798,13 +18315,6 @@ #~ msgid "" #~ "\n" -#~ "Buddy Alias: %s" -#~ msgstr "" -#~ "\n" -#~ "好友別名：%s" - -#~ msgid "" -#~ "\n" #~ "Nickname: %s" #~ msgstr "" #~ "\n" @@ -17033,10 +18543,6 @@ #~ msgstr "格式化帳號..." # XXX 要覆查 -#~ msgid "Selection" -#~ msgstr "選擇" - -# XXX 要覆查 #~ msgid "Faces" #~ msgstr "好友圖示" @@ -17054,9 +18560,6 @@ #~ msgid "Information below may not be accurate
\n" #~ msgstr "【下列資訊可能不準確】
\n" -#~ msgid "Change My Face" -#~ msgstr "修改好友圖示" - #~ msgid "Please wait for new version" #~ msgstr "請等待新版本推出" @@ -17113,9 +18616,6 @@ #~ msgid "Gaim - Save As..." #~ msgstr "Gaim - 儲存為..." -#~ msgid "Buzz!!" -#~ msgstr "嗶！" - #~ msgid "The user %s wants to add %s to his or her buddy list%s%s." #~ msgstr "使用者 %s 想要將 %s 加入他（她）的好友清單%s%s。" @@ -17252,9 +18752,6 @@ #~ msgid "Use TLS if available" #~ msgstr "TLS 可用則用" -#~ msgid "Require TLS" -#~ msgstr "需要TLS" - #~ msgid "Lost connection with server for an unknown reason." #~ msgstr "因為不明原因導致與伺服器連線中斷。" @@ -17310,18 +18807,12 @@ #~ msgid "Unable to add \"%s\" to your Napster hotlist" #~ msgstr "無法將「%s」加入您的 Napster 熱門清單中" -#~ msgid "%s requested your information" -#~ msgstr "%s 查詢您的使用者資訊" - #~ msgid "%s requested a PING" #~ msgstr "%s 要求一個 PING" #~ msgid "NAPSTER Protocol Plugin" #~ msgstr "NAPSTER 協定模組" -#~ msgid "Unable to play sound because the chosen file (%s) does not exist." -#~ msgstr "無法播放音效，因為所選取的檔案 (%s) 不存在。" - #~ msgid "" #~ "Unable to play sound because the 'Command' sound method has been chosen, " #~ "but no command has been set." @@ -17354,9 +18845,6 @@ #~ msgid "Chat is currently unavailable" #~ msgstr "目前無法使用聊天室" -#~ msgid "Unable to create new connection." -#~ msgstr "無法開啟新連結。" - #~ msgid "Auth host" #~ msgstr "認證伺服器" @@ -17417,9 +18905,6 @@ #~ msgid "Call ended." #~ msgstr "結束呼叫。" -#~ msgid "Calling %s" -#~ msgstr "呼叫 %s" - #~ msgid "End Call" #~ msgstr "結束呼叫" @@ -17447,9 +18932,6 @@ #~ msgid "Realname" #~ msgstr "姓名" -#~ msgid "Email Address" -#~ msgstr "電子郵件" - #~ msgid "EMail" #~ msgstr "電子郵件" @@ -17518,194 +19000,3 @@ #, fuzzy #~ msgid "Web aware" #~ msgstr "允許其他使用者在網路上查看您目前的狀態" - -# XXX 這個有點怪，譯錯？ -#~ msgid "Active" -#~ msgstr "啟動" - -#~ msgid "Add User" -#~ msgstr "新增使用者" - -#~ msgid "Write a gtkrc file with these settings to %s" -#~ msgstr "將這些設定寫入到 %s 的 gtkrc 檔" - -#~ msgid "Screenname:" -#~ msgstr "帳號：" - -#~ msgid "Host name" -#~ msgstr "主機名稱" - -#~ msgid "Default status messages" -#~ msgstr "預設狀態訊息" - -#~ msgid "Edit Status Messages" -#~ msgstr "編輯狀態訊息" - -#~ msgid "Set Status Messages..." -#~ msgstr "設定狀態訊息..." - -#~ msgid "Not At Home" -#~ msgstr "不在家" - -#~ msgid "Not At Desk" -#~ msgstr "不在座位" - -#~ msgid "Not In Office" -#~ msgstr "不在辦公室" - -#~ msgid "Hello!" -#~ msgstr "您好！" - -#~ msgid "Gaim" -#~ msgstr "Gaim" - -#~ msgid "Gaim - Signed off" -#~ msgstr "Gaim - 已登出" - -#~ msgid "Gaim - Away" -#~ msgstr "Gaim - 離開" - -#~ msgid "Set account idle time" -#~ msgstr "設定帳號閒置時間" - -#~ msgid "Unset account idle time" -#~ msgstr "取消帳號閒置時間設定" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Do you wish to add him or her to your buddy list?" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "您想將他（她）加入到您的好友名單中嗎？" - -#~ msgid "_Alias Buddy..." -#~ msgstr "為這個好友加上別名(_A)..." - -# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」 -#~ msgid "Alias Contact..." -#~ msgstr "為這組好友加上別名..." - -#~ msgid "/Tools/Account Ac_tions" -#~ msgstr "/工具/帳號相關指令(_T)" - -#~ msgid "/Tools/A_ccounts" -#~ msgstr "/工具/帳號清單(_C)" - -#~ msgid "Idle " -#~ msgstr "閒置" - -#~ msgid "/Tools/Account Actions" -#~ msgstr "/工具/帳號相關指令" - -#~ msgid "Active Developers" -#~ msgstr "現任開發者" - -#~ msgid "Change password" -#~ msgstr "修改密碼" - -#~ msgid "Error processing event or response (%s)." -#~ msgstr "處理事件或回覆時發生錯誤 (%s)。" - -#~ msgid "Hide Disconnect Errors" -#~ msgstr "不顯示中斷連線錯誤" - -#~ msgid "Hide Login Errors" -#~ msgstr "不顯示登入錯誤" - -#~ msgid "Hide Reconnecting Dialog" -#~ msgstr "隱藏重新連線交談視窗" - -#~ msgid "When you are kicked offline, this reconnects you." -#~ msgstr "當你斷線時，系統會自動幫你重新連線。" - -# NOTE 譯文核實 by Etan Reisner (開發者之一) -#~ msgid "Use last matching buddy" -#~ msgstr "使用最後（而非最先）一個匹配的好友帳號" - -# NOTE 每行不可太長，並要人手用「\n」分隔，否則視窗會過闊 -#~ msgid "" -#~ "The buddy with the lowest score is the buddy who will have priority in " -#~ "the contact.\n" -#~ "The default values (offline = 4, away = 2, and idle = 1) will use what " -#~ "used to be\n" -#~ "the built-in order: active, idle, away, away + idle, offline." -#~ msgstr "" -#~ "若果一個好友其實概括了好幾個好友帳號，通訊時便根據這裏\n" -#~ "所給定的得分值計分，積分最少者為「優先」，成為當時實際\n" -#~ "使用的好友帳號。\n" -#~ "「離線」狀態預設得 4 分，「離開」兩分，「閒置」1 分。\n" -#~ "要得出預設的優先次序「沒閒置→閒置→離開→離開兼閒置」，\n" -#~ "使用上列的預設值即可。" - -#~ msgid "_Keep the dialog open" -#~ msgstr "保持對話框開啟(_K)" - -#~ msgid "A_way" -#~ msgstr "離開(_W)" - -#~ msgid "_Idle" -#~ msgstr "閒置(_I)" - -#~ msgid "Retur_n from idle" -#~ msgstr "由閒置返回(_N)" - -#~ msgid "Bro_wse..." -#~ msgstr "瀏覽(_W)..." - -#~ msgid "Remove Buddy Pounce" -#~ msgstr "移除好友狀態捕捉" - -#~ msgid "_Queue new messages when away" -#~ msgstr "在離開時，將所有的新訊息置入佇列中(_Q)" - -#~ msgid "Unable to set AIM away message." -#~ msgstr "無法設定 AIM 離開訊息。" - -#~ msgid "" -#~ "You have probably requested to set your away message before the login " -#~ "procedure completed. You remain in a \"present\" state; try setting it " -#~ "again when you are fully connected." -#~ msgstr "" -#~ "您試著在登入程序完成前修改您的離開訊息，您的狀態將維持目前所設定的狀態。請" -#~ "在完全登入後再設定一次。" - -#~ msgid "Verify all IM message signatures" -#~ msgstr "核實所有即時訊息的簽章" - -#~ msgid "Digitally sign all channel messages" -#~ msgstr "數位簽署所有頻道訊息" - -#~ msgid "Verify all channel message signatures" -#~ msgstr "核實所有頻道訊息的簽章" - -#~ msgid "(%d message)" -#~ msgid_plural "(%d messages)" -#~ msgstr[0] "（%d 個訊息）" -#~ msgstr[1] "（%d 個訊息）" - -#~ msgid "(1 message)" -#~ msgstr "（一個訊息）" - -#~ msgid "Default auto-away" -#~ msgstr "預設自動離開" - -#~ msgid "_Sorting:" -#~ msgstr "排序方式(_S)：" - -#~ msgid "Buddy Display" -#~ msgstr "好友顯示" - -# XXX 暫譯 -#~ msgid "Show more buddy details" -#~ msgstr "顯示更多使用者細節" - -#~ msgid "Gnome Default" -#~ msgstr "GNOME預設值" - -#~ msgid "Away m_essage:" -#~ msgstr "離開訊息(_M)：" - -#~ msgid "IRC" -#~ msgstr "IRC"