Mercurial > pidgin
changeset 31276:8cb7b4fe18da
propagate from branch 'im.pidgin.pidgin' (head 9166d0ffe82472b17cee09aabbef61d8ec6e3e44)
to branch 'im.pidgin.pidgin.mxit' (head 3113fa54190de8c27a27e7001e9d902dca70037c)
author | andrew.victor@mxit.com |
---|---|
date | Wed, 11 Aug 2010 07:36:56 +0000 (2010-08-11) |
parents | 6260abdb218c (current diff) d21c8058ead0 (diff) |
children | 69760676c50c |
files | ChangeLog |
diffstat | 40 files changed, 1258 insertions(+), 1530 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jul 30 12:56:42 2010 +0000 +++ b/ChangeLog Wed Aug 11 07:36:56 2010 +0000 @@ -1,6 +1,10 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.7.3 (??/??/????): +version 2.7.4 (MM/DD/YYYY): + General: + * Fix search path for Tk when compiling on Debian Squeeze. (#12465) + +version 2.7.3 (08/10/2010): General: * Use silent build rules for automake >1.11. You can enable verbose builds with the --disable-silent-rules configure option, or using @@ -22,6 +26,28 @@ IRC: * Fix non-ASCII arguments to /mode et al. (thanks to Max Ulidtko) + MSN: + * Support for web-based buddy icons, used when a buddy logs in to the + messenger on the Live website. + * Fix file transfers with some clients that don't support direct + connections (e.g., papyon, telepathy-butterfly, etc.) (#12150) + + MXit: + * Fix filename for the Shocked emoticon. (#12364) + * Implement the new naming conventions where possible. (MXitId, etc) + * Display a message in the Groupchat window when you invite somebody. + * Birthday field in profile cannot be edited when server says it is + locked. + * If a buddy is offline, show in their profile when last they were online. + * Handle pushed profile update packets (ie, when changing your avatar via + the Gallery bot). + * If a buddy is offline and we see from their profile that they have + updated their avatar, request the new avatar image from the server. + * Fix a possible crash if a link is clicked while disconnected. + * Unescape any escaped characters in a chatroom nickname. + * Add the new MXit moods and emoticons. + * MXit emoticons added to the small emoticon theme. + XMPP: * Allow connecting to servers that only advertise GSSAPI and expect a fallback to legacy IQ authentication (broken in 2.7.0). @@ -66,7 +92,7 @@ version 2.7.2 (07/21/2010): AIM and ICQ: * Fix a crash bug related to X-Status messages that can be triggered by - remove users. This is CVE-2010-2528. + remote users. This is CVE-2010-2528. * Fix a rare crash bug caused by certain incoming SMS messages (discovered by Jan Kaluza--thanks Jan!). * Change HTML sent from ICQ accounts so that official ICQ clients
--- a/ChangeLog.API Fri Jul 30 12:56:42 2010 +0000 +++ b/ChangeLog.API Wed Aug 11 07:36:56 2010 +0000 @@ -1,6 +1,8 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.7.3 (??/??/????): +version 2.7.4 (MM/DD/YYYY): + +version 2.7.3 (08/10/2010): libpurple: Fixed: * purple_account_[gs]et_public_alias no longer crash when
--- a/NEWS Fri Jul 30 12:56:42 2010 +0000 +++ b/NEWS Wed Aug 11 07:36:56 2010 +0000 @@ -2,6 +2,16 @@ Our development blog is available at: http://planet.pidgin.im +2.7.3 (08/10/2010): + Mark: Lots of little incremental[1] bug fixes and enhancements in this + release. + + [1] No whales were harmed[2] during the creation of this release. + [2] Probably. + + John: Finally got some fixes out there for you Yahoo users behind some + particularly annoying firewalls and proxies, among other fixes. Enjoy! + 2.7.2 (07/21/2010): Mark: We discovered a security issue in Pidgin 2.7.0 and 2.7.1 and decided to release a patched version quickly. This release contains
--- a/configure.ac Fri Jul 30 12:56:42 2010 +0000 +++ b/configure.ac Wed Aug 11 07:36:56 2010 +0000 @@ -46,7 +46,7 @@ m4_define([purple_lt_current], [7]) m4_define([purple_major_version], [2]) m4_define([purple_minor_version], [7]) -m4_define([purple_micro_version], [3]) +m4_define([purple_micro_version], [4]) 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], [8]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [8]) -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]) @@ -2248,6 +2248,7 @@ TKCONFIG=no TKCONFIGDIRS="/usr/lib \ /usr/lib64 \ + /usr/lib/tk8.5 \ /usr/lib/tk8.4 \ /usr/lib/tk8.3 \ /usr/lib/tk8.2 \
--- a/libpurple/debug.h Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/debug.h Wed Aug 11 07:36:56 2010 +0000 @@ -176,20 +176,24 @@ gboolean purple_debug_is_verbose(void); /** - * Enable or disable verbose debugging. This ordinarily should only be called + * Enable or disable unsafe debugging. This ordinarily should only be called * by #purple_debug_init, but there are cases where this can be useful for * plugins. * - * @param unsafe TRUE to enable verbose debugging or FALSE to disable it. + * @param unsafe TRUE to enable debug logging of messages that could + * potentially contain passwords and other sensitive information. + * FALSE to disable it. * * @since 2.6.0 */ void purple_debug_set_unsafe(gboolean unsafe); /** - * Check if unsafe debugging is enabled. + * Check if unsafe debugging is enabled. Defaults to FALSE. * - * @return TRUE if verbose debugging is enabled, FALSE if it is not. + * @return TRUE if the debug logging of all messages is enabled, FALSE + * if messages that could potentially contain passwords and other + * sensitive information are not logged. * * @since 2.6.0 */
--- a/libpurple/network.c Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/network.c Wed Aug 11 07:36:56 2010 +0000 @@ -98,6 +98,7 @@ PurpleNetworkListenCallback cb; gpointer cb_data; UPnPMappingAddRemove *mapping_data; + int timer; }; #ifdef HAVE_NETWORKMANAGER @@ -373,6 +374,7 @@ gint *value = g_new(gint, 1); listen_data = data; + listen_data->timer = 0; /* add port mapping to hash table */ *key = purple_network_get_port_from_fd(listen_data->listenfd); @@ -504,7 +506,7 @@ { purple_debug_info("network", "Skipping external port mapping.\n"); /* The pmp_map_cb does what we want to do */ - purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data); + listen_data->timer = purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data); } /* Attempt a NAT-PMP Mapping, which will return immediately */ else if (purple_pmp_create_map(((socket_type == SOCK_STREAM) ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP), @@ -512,7 +514,7 @@ { purple_debug_info("network", "Created NAT-PMP mapping on port %i\n", actual_port); /* We want to return listen_data now, and on the next run loop trigger the cb and destroy listen_data */ - purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data); + listen_data->timer = purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data); } else { @@ -584,6 +586,9 @@ if (listen_data->mapping_data != NULL) purple_upnp_cancel_port_mapping(listen_data->mapping_data); + if (listen_data->timer > 0) + purple_timeout_remove(listen_data->timer); + g_free(listen_data); }
--- a/libpurple/protocols/jabber/chat.c Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/jabber/chat.c Wed Aug 11 07:36:56 2010 +0000 @@ -173,8 +173,10 @@ xmlnode_set_namespace(x, "http://jabber.org/protocol/muc#user"); invite = xmlnode_new_child(x, "invite"); xmlnode_set_attrib(invite, "to", name); - body = xmlnode_new_child(invite, "reason"); - xmlnode_insert_data(body, msg, -1); + if (msg) { + body = xmlnode_new_child(invite, "reason"); + xmlnode_insert_data(body, msg, -1); + } } else { xmlnode_set_attrib(message, "to", name); /* @@ -184,14 +186,17 @@ * * Left here for compatibility. */ - body = xmlnode_new_child(message, "body"); - xmlnode_insert_data(body, msg, -1); + if (msg) { + body = xmlnode_new_child(message, "body"); + xmlnode_insert_data(body, msg, -1); + } x = xmlnode_new_child(message, "x"); xmlnode_set_attrib(x, "jid", room_jid); /* The better place for it! XEP-0249 style. */ - xmlnode_set_attrib(x, "reason", msg); + if (msg) + xmlnode_set_attrib(x, "reason", msg); xmlnode_set_namespace(x, "jabber:x:conference"); }
--- a/libpurple/protocols/jabber/jabber.c Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/jabber/jabber.c Wed Aug 11 07:36:56 2010 +0000 @@ -567,8 +567,7 @@ if (NULL == packet) return; - if (!PURPLE_CONNECTION_IS_VALID(pc)) - return; + g_return_if_fail(PURPLE_CONNECTION_IS_VALID(pc)); js = purple_connection_get_protocol_data(pc); @@ -625,7 +624,7 @@ /* TODO: It should be possible to make this check unnecessary */ if(!PURPLE_CONNECTION_IS_VALID(gc)) { purple_ssl_close(gsc); - return; + g_return_if_reached(); } while((len = purple_ssl_read(gsc, buf, sizeof(buf) - 1)) > 0) { @@ -660,8 +659,7 @@ int len; static char buf[4096]; - if(!PURPLE_CONNECTION_IS_VALID(gc)) - return; + g_return_if_fail(PURPLE_CONNECTION_IS_VALID(gc)); if((len = read(js->fd, buf, sizeof(buf) - 1)) > 0) { gc->last_received = time(NULL); @@ -721,7 +719,7 @@ /* TODO: It should be possible to make this check unnecessary */ if(!PURPLE_CONNECTION_IS_VALID(gc)) { purple_ssl_close(gsc); - return; + g_return_if_reached(); } js = gc->proto_data; @@ -816,8 +814,7 @@ JabberStream *js; /* If the connection is already disconnected, we don't need to do anything else */ - if(!PURPLE_CONNECTION_IS_VALID(gc)) - return; + g_return_if_fail(PURPLE_CONNECTION_IS_VALID(gc)); js = gc->proto_data; js->gsc = NULL;
--- a/libpurple/protocols/jabber/message.c Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/jabber/message.c Wed Aug 11 07:36:56 2010 +0000 @@ -587,8 +587,10 @@ jm->thread_id = xmlnode_get_data(child); } else if(!strcmp(child->name, "body") && !strcmp(xmlns, NS_XMPP_CLIENT)) { if(!jm->body) { - char *msg = xmlnode_to_str(child, NULL); - jm->body = purple_strdup_withhtml(msg); + char *msg = xmlnode_get_data(child); + char *escaped = purple_markup_escape_text(msg, -1); + jm->body = purple_strdup_withhtml(escaped); + g_free(escaped); g_free(msg); } } else if(!strcmp(child->name, "html") && !strcmp(xmlns, NS_XHTML_IM)) {
--- a/libpurple/protocols/msn/directconn.h Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/msn/directconn.h Wed Aug 11 07:36:56 2010 +0000 @@ -131,7 +131,7 @@ * Creates, initializes, and returns a new MsnDirectConn structure. */ MsnDirectConn * -msn_dc_new(MsnSlpCall *slplink); +msn_dc_new(MsnSlpCall *slpcall); /* * Destroys an MsnDirectConn structure. Frees every buffer allocated earlier
--- a/libpurple/protocols/msn/msn.c Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/msn/msn.c Wed Aug 11 07:36:56 2010 +0000 @@ -2204,6 +2204,7 @@ const gchar *url_text, size_t len, const gchar *error_message) { MsnGetInfoData *info_data = (MsnGetInfoData *)data; + MsnSession *session; PurpleNotifyUserInfo *user_info; char *stripped, *p, *q, *tmp; char *user_url = NULL; @@ -2221,15 +2222,8 @@ purple_debug_info("msn", "In msn_got_info,url_text:{%s}\n",url_text); - /* Make sure the connection is still valid */ - /* TODO: Instead of this, we should be canceling this when we disconnect */ - if (g_list_find(purple_connections_get_all(), info_data->gc) == NULL) - { - purple_debug_warning("msn", "invalid connection. ignoring buddy info.\n"); - g_free(info_data->name); - g_free(info_data); - return; - } + session = purple_connection_get_protocol_data(info_data->gc); + session->url_datas = g_slist_remove(session->url_datas, url_data); user_info = purple_notify_user_info_new(); has_tooltip_text = msn_tooltip_extract_info_text(user_info, info_data); @@ -2614,13 +2608,14 @@ /* Try to put the photo in there too, if there's one */ if (photo_url_text) { - purple_util_fetch_url_len(photo_url_text, FALSE, NULL, FALSE, MAX_HTTP_BUDDYICON_BYTES, msn_got_photo, - info2_data); + url_data = purple_util_fetch_url_len(photo_url_text, FALSE, NULL, FALSE, + MAX_HTTP_BUDDYICON_BYTES, + msn_got_photo, info2_data); + session->url_datas = g_slist_prepend(session->url_datas, url_data); } else { - /* Emulate a callback */ - /* TODO: Huh? */ + /* Finish the Get Info and show the user something */ msn_got_photo(NULL, info2_data, NULL, 0, NULL); } } @@ -2639,10 +2634,12 @@ PurpleNotifyUserInfo *user_info = info2_data->user_info; char *photo_url_text = info2_data->photo_url_text; - /* Make sure the connection is still valid if we got here by fetching a photo url */ - /* TODO: Instead of this, we should be canceling this when we disconnect */ - if (url_text && (error_message != NULL || - g_list_find(purple_connections_get_all(), info_data->gc) == NULL)) + if (url_data) { + MsnSession *session = purple_connection_get_protocol_data(info_data->gc); + session->url_datas = g_slist_remove(session->url_datas, url_data); + } + + if (url_text && error_message) { purple_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n"); g_free(stripped); @@ -2697,8 +2694,10 @@ static void msn_get_info(PurpleConnection *gc, const char *name) { + MsnSession *session = purple_connection_get_protocol_data(gc); MsnGetInfoData *data; char *url; + PurpleUtilFetchUrlData *url_data; data = g_new0(MsnGetInfoData, 1); data->gc = gc; @@ -2706,9 +2705,10 @@ url = g_strdup_printf("%s%s", PROFILE_URL, name); - purple_util_fetch_url(url, FALSE, - "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)", - TRUE, msn_got_info, data); + url_data = purple_util_fetch_url(url, FALSE, + "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)", + TRUE, msn_got_info, data); + session->url_datas = g_slist_prepend(session->url_datas, url_data); g_free(url); }
--- a/libpurple/protocols/msn/object.c Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/msn/object.c Wed Aug 11 07:36:56 2010 +0000 @@ -96,15 +96,29 @@ GET_STRING_TAG(friendly, "Friendly"); GET_STRING_TAG(sha1d, "SHA1D"); GET_STRING_TAG(sha1c, "SHA1C"); + GET_STRING_TAG(url, "Url"); + GET_STRING_TAG(url1, "Url1"); /* If we are missing any of the required elements then discard the object */ - /* SHA1C is not always sent anymore */ if (obj->creator == NULL || obj->size == 0 || obj->type == 0 - || obj->location == NULL || obj->friendly == NULL - || obj->sha1d == NULL /*|| obj->sha1c == NULL*/) { + || obj->sha1d == NULL) { purple_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str); msn_object_destroy(obj); - obj = NULL; + return NULL; + } + + if (obj->location == NULL || obj->friendly == NULL) { + /* Location/friendly are required for non-buddyicon objects */ + if (obj->type != MSN_OBJECT_USERTILE) { + purple_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str); + msn_object_destroy(obj); + return NULL; + /* Buddy icon object can contain Url/Url1 instead */ + } else if (obj->url == NULL || obj->url1 == NULL) { + purple_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str); + msn_object_destroy(obj); + return NULL; + } } return obj; @@ -284,6 +298,24 @@ obj->sha1c = g_strdup(sha1c); } +void +msn_object_set_url(MsnObject *obj, const char *url) +{ + g_return_if_fail(obj != NULL); + + g_free(obj->url); + obj->url = g_strdup(url); +} + +void +msn_object_set_url1(MsnObject *obj, const char *url) +{ + g_return_if_fail(obj != NULL); + + g_free(obj->url1); + obj->url1 = g_strdup(url); +} + const char * msn_object_get_creator(const MsnObject *obj) { @@ -352,6 +384,22 @@ } } +const char * +msn_object_get_url(const MsnObject *obj) +{ + g_return_val_if_fail(obj != NULL, NULL); + + return obj->url; +} + +const char * +msn_object_get_url1(const MsnObject *obj) +{ + g_return_val_if_fail(obj != NULL, NULL); + + return obj->url1; +} + static MsnObject * msn_object_find_local(const char *sha1) {
--- a/libpurple/protocols/msn/object.h Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/msn/object.h Wed Aug 11 07:36:56 2010 +0000 @@ -50,6 +50,8 @@ char *friendly; char *sha1d; char *sha1c; + char *url; + char *url1; } MsnObject; /** @@ -155,6 +157,20 @@ void msn_object_set_image(MsnObject *obj, PurpleStoredImage *img); /** + * Sets the url field in a MsnObject. + * + * @param url The url value. + */ +void msn_object_set_url(MsnObject *obj, const char *url); + +/** + * Sets the url1 field in a MsnObject. + * + * @param url1 The url1 value. + */ +void msn_object_set_url1(MsnObject *obj, const char *url); + +/** * Returns a MsnObject's creator value. * * @param obj The object. @@ -235,6 +251,24 @@ */ PurpleStoredImage *msn_object_get_image(const MsnObject *obj); +/** + * Returns a MsnObject's url value. + * + * @param obj The object. + * + * @return The url value. + */ +const char *msn_object_get_url(const MsnObject *obj); + +/** + * Returns a MsnObject's url1 value. + * + * @param obj The object. + * + * @return The url1 value. + */ +const char *msn_object_get_url1(const MsnObject *obj); + void msn_object_set_local(MsnObject *obj); #endif /* MSN_OBJECT_H */
--- a/libpurple/protocols/msn/session.c Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/msn/session.c Wed Aug 11 07:36:56 2010 +0000 @@ -57,6 +57,11 @@ session->destroying = TRUE; + while (session->url_datas) { + purple_util_fetch_url_cancel(session->url_datas->data); + session->url_datas = g_slist_delete_link(session->url_datas, session->url_datas); + } + if (session->connected) msn_session_disconnect(session);
--- a/libpurple/protocols/msn/session.h Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/msn/session.h Wed Aug 11 07:36:56 2010 +0000 @@ -122,6 +122,8 @@ GHashTable *soap_table; guint soap_cleanup_handle; + + GSList *url_datas; /**< PurpleUtilFetchUrlData to be cancelled on exit */ }; /**
--- a/libpurple/protocols/msn/slp.c Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/msn/slp.c Wed Aug 11 07:36:56 2010 +0000 @@ -39,6 +39,11 @@ static void request_user_display(MsnUser *user); +typedef struct { + MsnSession *session; + const char *remote_user; + const char *sha1; +} MsnFetchUserDisplayData; /************************************************************************** * Util @@ -936,7 +941,8 @@ purple_debug_error("msn", "Received non-OK result: %s\n", error ? error : "Unknown"); - if (type && !strcmp(type, "application/x-msnmsgr-transreqbody")) { + if (type && (!strcmp(type, "application/x-msnmsgr-transreqbody") + || !strcmp(type, "application/x-msnmsgr-transrespbody"))) { MsnDirectConn *dc = slpcall->slplink->dc; if (dc) { msn_dc_fallback_to_sb(dc); @@ -1405,6 +1411,26 @@ } static void +fetched_user_display(PurpleUtilFetchUrlData *url_data, gpointer user_data, + const gchar *url_text, gsize len, const gchar *error_message) +{ + MsnFetchUserDisplayData *data = user_data; + MsnSession *session = data->session; + + session->url_datas = g_slist_remove(session->url_datas, url_data); + + if (url_text) { + purple_buddy_icons_set_for_user(session->account, data->remote_user, + g_memdup(url_text, len), len, + data->sha1); + } + + end_user_display(NULL, session); + + g_free(user_data); +} + +static void request_user_display(MsnUser *user) { PurpleAccount *account; @@ -1425,8 +1451,20 @@ if (g_ascii_strcasecmp(user->passport, purple_account_get_username(account))) { - msn_slplink_request_object(slplink, info, got_user_display, - end_user_display, obj); + const char *url = msn_object_get_url1(obj); + if (url) { + MsnFetchUserDisplayData *data = g_new0(MsnFetchUserDisplayData, 1); + PurpleUtilFetchUrlData *url_data; + data->session = session; + data->remote_user = user->passport; + data->sha1 = info; + url_data = purple_util_fetch_url_len(url, TRUE, NULL, TRUE, 200*1024, + fetched_user_display, data); + session->url_datas = g_slist_prepend(session->url_datas, url_data); + } else { + msn_slplink_request_object(slplink, info, got_user_display, + end_user_display, obj); + } } else {
--- a/libpurple/protocols/msn/soap.c Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/msn/soap.c Wed Aug 11 07:36:56 2010 +0000 @@ -68,7 +68,6 @@ GQueue *queue; MsnSoapRequest *current_request; - gboolean unsafe_debug; } MsnSoapConnection; static gboolean msn_soap_connection_run(gpointer data); @@ -80,7 +79,6 @@ conn->session = session; conn->host = g_strdup(host); conn->queue = g_queue_new(); - conn->unsafe_debug = purple_debug_is_unsafe(); return conn; } @@ -509,7 +507,7 @@ purple_debug_info("soap", "read: %s\n", g_strerror(perrno)); if (conn->current_request && conn->current_request->secure && - !conn->unsafe_debug) + !purple_debug_is_unsafe()) purple_debug_misc("soap", "Received secure request.\n"); else if (count != 0) purple_debug_misc("soap", "current %s\n", conn->buf->str + cursor); @@ -659,7 +657,7 @@ g_string_append(conn->buf, "\r\n"); g_string_append(conn->buf, body); - if (req->secure && !conn->unsafe_debug) + if (req->secure && !purple_debug_is_unsafe()) purple_debug_misc("soap", "Sending secure request.\n"); else purple_debug_misc("soap", "%s\n", conn->buf->str);
--- a/libpurple/protocols/oscar/oscar.c Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Wed Aug 11 07:36:56 2010 +0000 @@ -3014,7 +3014,8 @@ case 0x1a: { /* Handle SMS or someone has sent you a greeting card or requested buddies? */ ByteStream qbs; - int smstype, taglen, smslen; + guint16 smstype; + guint32 taglen, smslen; char *tagstr = NULL, *smsmsg = NULL; xmlnode *xmlroot = NULL, *xmltmp = NULL; gchar *uin = NULL, *message = NULL;
--- a/libpurple/protocols/yahoo/libymsg.c Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Wed Aug 11 07:36:56 2010 +0000 @@ -2702,6 +2702,7 @@ PurpleAccount *account; YahooData *yd = gc->proto_data; struct yahoo_p2p_data *p2p_data; + const char *norm_username; f = yahoo_friend_find(gc, who); account = purple_connection_get_account(gc); @@ -2734,10 +2735,11 @@ sprintf(temp_str, "%d", ip); base64_ip = purple_base64_encode( (guchar *)temp_str, strlen(temp_str) ); + norm_username = purple_normalize(account, purple_account_get_username(account)); pkt = yahoo_packet_new(YAHOO_SERVICE_PEERTOPEER, YAHOO_STATUS_AVAILABLE, 0); yahoo_packet_hash(pkt, "sssissis", - 1, purple_normalize(account, purple_account_get_username(account)), - 4, purple_normalize(account, purple_account_get_username(account)), + 1, norm_username, + 4, norm_username, 12, base64_ip, /* base64 encode ip */ 61, 0, /* To-do : figure out what is 61 for?? */ 2, "",
--- a/libpurple/protocols/zephyr/ZVariables.c Fri Jul 30 12:56:42 2010 +0000 +++ b/libpurple/protocols/zephyr/ZVariables.c Wed Aug 11 07:36:56 2010 +0000 @@ -30,10 +30,10 @@ if ((varfile = get_localvarfile()) == NULL) return ((char *)0); - if ((ret = get_varval(varfile, var)) != ZERR_NONE) { - g_free(varfile); + ret = get_varval(varfile, var); + g_free(varfile); + if (ret != ZERR_NONE) return ret; - } #ifdef WIN32 varfile = g_strdup("C:\\zephyr\\zephyr.var");
--- a/pidgin/win32/nsis/nsis_translations.desktop.in Fri Jul 30 12:56:42 2010 +0000 +++ b/pidgin/win32/nsis/nsis_translations.desktop.in Wed Aug 11 07:36:56 2010 +0000 @@ -6,7 +6,7 @@ # "Next >" appears on a button on the License Page of the Installer _PIDGINLICENSEBUTTON=Next > -# $(^Name) is the current Version name (e.g. Pidgin 2.7.0). $_CLICK will become a translated version of "Click Next to continue." +# $(^Name) is the current Version name (e.g. Pidgin 2.7.0). $_CLICK will become a translated version of "Click Next to continue." DO NOT translate the CLICK in $_CLICK. It will break the installer. _PIDGINLICENSEBOTTOMTEXT=$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK #Installer Subsection Text
--- a/pidgin/win32/nsis/pidgin-installer.nsi Fri Jul 30 12:56:42 2010 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Wed Aug 11 07:36:56 2010 +0000 @@ -541,6 +541,7 @@ Delete "$INSTDIR\ca-certs\StartCom_Certification_Authority.pem" Delete "$INSTDIR\ca-certs\StartCom_Free_SSL_CA.pem" Delete "$INSTDIR\ca-certs\Thawte_Premium_Server_CA.pem" + Delete "$INSTDIR\ca-certs\ValiCert_Class_2_VA.crt" Delete "$INSTDIR\ca-certs\VeriSign_Class3_Extended_Validation_CA.pem" Delete "$INSTDIR\ca-certs\Verisign_Class3_Primary_CA.pem" Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem"
--- a/po/ChangeLog Fri Jul 30 12:56:42 2010 +0000 +++ b/po/ChangeLog Wed Aug 11 07:36:56 2010 +0000 @@ -3,10 +3,16 @@ version 2.7.3 * Bengali translation updated (Jamil Ahmed) * Chinese (Simplified) translation updated (Aron Xu) + * Czech translation updated (David Vachulka) * Dutch translation updated (Gideon van Melle) + * Hebrew translation updated (Shalom Craimer) * Norwegian Nynorsk translation updated (Yngve Spjeld Landro) + * Polish translation updated (Piotr Dr�g) + * Punjabi translation updated (Amanpreet Singh Alam) * Russian translation updated (�仆�仂仆 弌舒仄仂�于舒仍仂于) + * Slovenian translation updated (Martin Srebotnjak) * Spanish translation updated (Javier Fern叩ndez-Sanguino Pe単a) + * Ukrainian translation updated (Oleksandr Kovalenko) version 2.7.2 * No changes
--- a/po/ca.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/ca.po Wed Aug 11 07:36:56 2010 +0000 @@ -33,8 +33,8 @@ msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 01:17-0400\n" -"PO-Revision-Date: 2010-05-30 16:10+0200\n" +"POT-Creation-Date: 2010-08-01 08:49+0200\n" +"PO-Revision-Date: 2010-08-01 08:46+0200\n" "Last-Translator: Josep Puigdemont i Casamaj坦 <josep.puigdemont@gmail.com>\n" "Language-Team: Catalan <tradgnome@softcatala.net>\n" "Language: ca\n" @@ -87,9 +87,8 @@ msgid "Error" msgstr "Error" -#, fuzzy msgid "Account was not modified" -msgstr "No s'ha afegit el compte" +msgstr "No s'ha modificat el compte" msgid "Account was not added" msgstr "No s'ha afegit el compte" @@ -100,10 +99,12 @@ msgid "" "The account's protocol cannot be changed while it is connected to the server." msgstr "" +"No es pot canviar el protocol del compte si s'est� connectat al servidor." msgid "" "The account's username cannot be changed while it is connected to the server." msgstr "" +"No es pot canviar el nom d'usuari del compte si s'est� connectat al servidor." msgid "New mail notifications" msgstr "Notifica si hi ha correu nou" @@ -1724,6 +1725,8 @@ "The certificate is not valid yet. Check that your computer's date and time " "are accurate." msgstr "" +"El certificat encara no 辿s v�lid. Comproveu que la data i l'hora de " +"l'ordinador siguin correctes." msgid "The certificate has expired and should not be considered valid." msgstr "El certificat ha expirat i no s'hauria de considerar v�lid." @@ -2293,7 +2296,7 @@ msgstr "Esteu emprant %s, per嘆 aquest connector requereix %s." msgid "This plugin has not defined an ID." -msgstr "Aquest connector no ha definit cap ID." +msgstr "Aquest connector no ha definit cap identificador." #, c-format msgid "Plugin magic mismatch %d (need %d)" @@ -3880,17 +3883,18 @@ msgid "Server thinks authentication is complete, but client does not" msgstr "El servidor creu que s'ha completat l'autenticaci坦, per嘆 el client no" -#, fuzzy msgid "Server may require plaintext authentication over an unencrypted stream" -msgstr "El servidor requereix autenticaci坦 de text sobre un flux no xifrat" - -#, fuzzy, c-format +msgstr "" +"Podria ser que el servidor requer鱈s autenticaci坦 de text sobre un flux no " +"xifrat" + +#, c-format msgid "" "%s may require plaintext authentication over an unencrypted connection. " "Allow this and continue authentication?" msgstr "" -"%s requereix autenticaci坦 de text sobre un flux no xifrat. Voleu permetre-ho " -"i continuar amb l'autenticaci坦?" +"Podria ser que %s requer鱈s autenticaci坦 de text sobre un flux no xifrat. " +"Voleu permetre-ho i continuar amb l'autenticaci坦?" msgid "SASL authentication failed" msgstr "Ha fallat l'autenticaci坦 SASL" @@ -3953,7 +3957,7 @@ msgstr "El gestor de connexions BOSH ha tancat la connexi坦." msgid "No session ID given" -msgstr "No s'ha indicat cap ID" +msgstr "No s'ha indicat cap identificador" msgid "Unsupported version of BOSH protocol" msgstr "Aquesta versi坦 del protocol BOSH no est� implementada" @@ -4254,13 +4258,13 @@ msgstr "S'ha esgitat el temps d'espera (ping)" msgid "Invalid XMPP ID" -msgstr "ID de l'XMPP inv�lid" +msgstr "L'identificador XMPP no 辿s v�lid" msgid "Invalid XMPP ID. Username portion must be set." -msgstr "L'ID de l'XMPP no 辿s v�lid. Cal especificar el nom d'usuari." +msgstr "L'identificador XMPP no 辿s v�lid. Cal especificar el nom d'usuari." msgid "Invalid XMPP ID. Domain must be set." -msgstr "L'ID de l'XMPP no 辿s v�lid. Cal especificar un domini." +msgstr "L'identificador XMPP no 辿s v�lid. Cal especificar un domini." # FIXME msgid "Malformed BOSH URL" @@ -4479,7 +4483,7 @@ # FIX msgid "Malformed XMPP ID" -msgstr "L'ID de l'XMPP est� malm竪s" +msgstr "L'identificador XMPP est� malm竪s" msgid "Not Acceptable" msgstr "No 辿s acceptable" @@ -4557,7 +4561,7 @@ msgstr "Adre巽ament incorrecte" msgid "Invalid ID" -msgstr "ID inv�lid" +msgstr "L'identificador no 辿s v�lid" msgid "Invalid Namespace" msgstr "Espai de noms inv�lid" @@ -4838,7 +4842,7 @@ msgstr "Les versions del XMPP no coincideixen" msgid "XMPP stream missing ID" -msgstr "Manca l'ID del fluxe XMPP" +msgstr "Manca l'identificador del fluxe XMPP" msgid "XML Parse error" msgstr "Error en l'an�lisi de l'XML" @@ -5989,8 +5993,8 @@ msgid "The two PINs you entered do not match." msgstr "Els dos PIN que heu introdu誰t no coincideixen." -msgid "The name you entered is invalid." -msgstr "El nom que heu introdu誰t no 辿s v�lid." +msgid "The Display Name you entered is invalid." +msgstr "El nom d'usuari que heu introdu誰t no 辿s v�lid." msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -6012,9 +6016,8 @@ "Encara no s'ha pogut recuperar la informaci坦 del vostre perfil. Torneu-ho a " "intentar m辿s tard." -#, fuzzy msgid "Your UID" -msgstr "El vostre MXitID" +msgstr "El vostre UID" #. pin #. pin (required) @@ -6084,16 +6087,12 @@ msgid "Connecting..." msgstr "S'est� connectant..." -#, fuzzy -msgid "The Display Name you entered is invalid." -msgstr "El nom que heu introdu誰t no 辿s v�lid." - msgid "The PIN you entered has an invalid length [7-10]." msgstr "La llargada del PIN que heu introdu誰t no 辿s v�lida [4-10]." #. mxit login name msgid "MXit ID" -msgstr "" +msgstr "Identificador MXit" #. show the form to the user to complete msgid "Register New MXit Account" @@ -6125,13 +6124,13 @@ msgid "Invalid country selected. Please try again." msgstr "El pa鱈s seleccionat no 辿s v�lid. Intenteu-ho de nou." -#, fuzzy msgid "The MXit ID you entered is not registered. Please register first." -msgstr "El nom d'usuari no est� registrat, cal que primer el registreu." - -#, fuzzy +msgstr "" +"L'identificador MXit que heu entrat no est� registrat, cal que primer el " +"registreu." + msgid "The MXit ID you entered is already registered. Please choose another." -msgstr "Aquest nom d'usuari ja est� registrat, escolliu-ne un altre." +msgstr "Aquest identificador MXit ja est� registrat, escolliu-ne un altre." msgid "Internal error. Please try again later." msgstr "S'ha produ誰t un error intern. Torneu-ho a provar m辿s tard." @@ -6176,9 +6175,8 @@ msgid "Hidden Number" msgstr "Nombre ocult" -#, fuzzy msgid "Your MXit ID..." -msgstr "El vostre MXitID" +msgstr "El vostre identificador MXit..." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -6202,13 +6200,11 @@ msgstr "Nom de la _Sala:" #. Display system message in chat window -#, fuzzy msgid "You have invited" -msgstr "Teniu correu!" - -#, fuzzy +msgstr "Heu convidat" + msgid "Last Online" -msgstr "En l鱈nia" +msgstr "Darrer cop en l鱈nia" #. we must have lost the connection, so terminate it so that we can reconnect msgid "We have lost the connection to MXit. Please reconnect." @@ -6880,7 +6876,7 @@ msgstr "Oficina de correu electr嘆nic" msgid "User ID" -msgstr "ID de l'usuari" +msgstr "Identificador de l'usuari" #. tag = _("DN"); #. value = nm_user_record_get_dn(user_record); @@ -7531,8 +7527,8 @@ "You missed %hu message from %s because the rate limit has been exceeded." msgid_plural "" "You missed %hu messages from %s because the rate limit has been exceeded." -msgstr[0] "S'ha perdut %hu missatge de %s perqu竪 no era v�lid." -msgstr[1] "S'han perdut %hu missatges de %s perqu竪 no eren v�lids." +msgstr[0] "S'ha perdut %hu missatge de %s perqu竪 s'ha excedit el l鱈mit." +msgstr[1] "S'han perdut %hu missatges de %s perqu竪 s'ha excedit el l鱈mit." #, c-format msgid "" @@ -7992,10 +7988,10 @@ msgstr "SNAC inv�lid" msgid "Server rate limit exceeded" -msgstr "" +msgstr "S'ha excedit el l鱈mit de velocitat del servidor" msgid "Client rate limit exceeded" -msgstr "" +msgstr "S'ha excedit el l鱈mit de velocitat del client" msgid "Service unavailable" msgstr "Servei no disponible" @@ -8313,10 +8309,10 @@ msgstr "Missatge: %s" msgid "ID: " -msgstr "ID: " +msgstr "Identificador: " msgid "Group ID" -msgstr "ID del Grup" +msgstr "Identificador del Grup" msgid "QQ Qun" msgstr "QQ Qun" @@ -8784,7 +8780,7 @@ #, c-format msgid "<b>Notes Group ID:</b> %s<br>" -msgstr "<b>ID del grup Notes:</b> %s<br>" +msgstr "<b>Identificador del grup Notes:</b> %s<br>" #, c-format msgid "Info for Group %s" @@ -8946,10 +8942,10 @@ msgstr "Nom d'usuari" msgid "Sametime ID" -msgstr "ID de Sametime" +msgstr "Identificador de Sametime" msgid "An ambiguous user ID was entered" -msgstr "S'ha introdu誰t un ID d'usuari ambigu" +msgstr "S'ha introdu誰t un identificador d'usuari ambigu" #, c-format msgid "" @@ -10245,7 +10241,7 @@ msgstr "doodle: fa una petici坦 a l'usuari per iniciar una sessi坦 Doodle" msgid "Yahoo ID..." -msgstr "ID de Yahoo..." +msgstr "Identificador del Yahoo..." #. *< type #. *< ui_requirement @@ -10277,15 +10273,15 @@ msgid "Ignore conference and chatroom invitations" msgstr "Bloca invitacions a confer竪ncies i sales de xat" -#, fuzzy msgid "Use account proxy for HTTP and HTTPS connections" -msgstr "Empra un compte per al servidor intermediari per a connexions SSL" +msgstr "" +"Empra un compte per al servidor intermediari per a connexions HTTP i HTTPS" msgid "Chat room list URL" msgstr "URL de la llista de sales de xat" msgid "Yahoo JAPAN ID..." -msgstr "ID de Yahoo del Jap坦..." +msgstr "Identificador de Yahoo del Jap坦..." #. *< type #. *< ui_requirement @@ -10497,13 +10493,13 @@ msgstr "Comen巽a a dibuixar" msgid "Select the ID you want to activate" -msgstr "Seleccioneu l'ID que vulgueu activar" +msgstr "Seleccioneu l'identificador que vulgueu activar" msgid "Join whom in chat?" msgstr "A qui us voleu unir al xat?" msgid "Activate ID..." -msgstr "Activa l'ID..." +msgstr "Activa l'identificador..." msgid "Join User in Chat..." msgstr "Entra a un xat d'un usuari..." @@ -10561,7 +10557,7 @@ "navegador:" msgid "Yahoo! ID" -msgstr "ID de Yahoo!" +msgstr "Identificador de Yahoo!" msgid "Hobbies" msgstr "Aficions" @@ -13180,13 +13176,11 @@ "Ara se sortir� at竪s que ja hi ha un altre client del libpurple executant-" "se.\n" -#, fuzzy msgid "_Media" -msgstr "/_Medi" - -#, fuzzy +msgstr "_Medi" + msgid "_Hangup" -msgstr "Penja" +msgstr "_Penja" #, c-format msgid "%s wishes to start an audio/video session with you." @@ -15512,6 +15506,9 @@ msgid "You do not have permission to uninstall this application." msgstr "No tens perm鱈s per desinstal.lar aquesta aplicaci坦." +#~ msgid "The name you entered is invalid." +#~ msgstr "El nom que heu introdu誰t no 辿s v�lid." + #~ msgid "The certificate is not valid yet." #~ msgstr "El certificat encara no 辿s v�lid."
--- a/po/ca@valencia.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/ca@valencia.po Wed Aug 11 07:36:56 2010 +0000 @@ -33,14 +33,14 @@ msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 01:17-0400\n" -"PO-Revision-Date: 2010-05-25 21:51+0200\n" +"POT-Creation-Date: 2010-08-02 09:57-0400\n" +"PO-Revision-Date: 2010-08-01 08:46+0200\n" "Last-Translator: Josep Puigdemont i Casamaj坦 <josep.puigdemont@gmail.com>\n" "Language-Team: Catalan <tradgnome@softcatala.net>\n" -"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #. Translators may want to transliterate the name. @@ -87,9 +87,8 @@ msgid "Error" msgstr "Error" -#, fuzzy msgid "Account was not modified" -msgstr "No s'ha afegit el compte" +msgstr "No s'ha modificat el compte" msgid "Account was not added" msgstr "No s'ha afegit el compte" @@ -100,10 +99,12 @@ msgid "" "The account's protocol cannot be changed while it is connected to the server." msgstr "" +"No es pot canviar el protocol del compte si s'est� connectat al servidor." msgid "" "The account's username cannot be changed while it is connected to the server." msgstr "" +"No es pot canviar el nom d'usuari del compte si s'est� connectat al servidor." msgid "New mail notifications" msgstr "Notifica si hi ha correu nou" @@ -335,7 +336,8 @@ "En suprimir este contacte, tamb辿 se suprimiran tots els amics que hi haja" msgid "Removing this group will also remove all the buddies in the group" -msgstr "En suprimir este grup, tamb辿 se suprimiran tots els amics que hi haja" +msgstr "" +"En suprimir este grup, tamb辿 se suprimiran tots els amics que hi haja" #, c-format msgid "Are you sure you want to remove %s?" @@ -594,7 +596,8 @@ msgid "Syntax Error: You typed the wrong number of arguments to that command." msgstr "" -"Error de sintaxi: heu escrit un nombre d'arguments equivocat per a esta orde." +"Error de sintaxi: heu escrit un nombre d'arguments equivocat per a esta " +"orde." msgid "Your command failed for an unknown reason." msgstr "L'orde ha fallat per motius desconeguts." @@ -766,8 +769,8 @@ "de les diferents classes de missatge en les finestres de conversa.<br> " "<classe>: receive (rep), send (envia), highlight (ressalta), action " "(acci坦), timestamp (marca de temps)<br> <primer pla/fons>: black " -"(negre), red (roig), green (verd), blue (blau), white (blanc), gray (gris), " -"darkgray (gris fosc), magenta, cyan (cian), default (per defecte)" +"(negre), red (roig), green (verd), blue (blau), white (blanc), gray " +"(gris), darkgray (gris fosc), magenta, cyan (cian), default (per defecte)" "<br><br>EXEMPLE:<br> msgcolor send cyan default" msgid "Unable to open file." @@ -890,8 +893,8 @@ msgid "" "Chats will only be logged if the \"Log all chats\" preference is enabled." msgstr "" -"Els xats nom辿s es registraran si s'habilita la prefer竪ncia 束Registra tots " -"els xats損." +"Els xats nom辿s es registraran si s'habilita la prefer竪ncia 束Registra tots els " +"xats損." msgid "No logs were found" msgstr "No s'ha trobat cap registre" @@ -1722,6 +1725,8 @@ "The certificate is not valid yet. Check that your computer's date and time " "are accurate." msgstr "" +"El certificat encara no 辿s v�lid. Comproveu que la data i l'hora de " +"l'ordinador siguen correctes." msgid "The certificate has expired and should not be considered valid." msgstr "El certificat ha expirat i no s'hauria de considerar v�lid." @@ -2183,7 +2188,8 @@ "True if the command used to handle this type of URL should be run in a " "terminal." msgstr "" -"Cert si l'orde emprada per este tipus d'URL s'ha d'executar en un terminal." +"Cert si l'orde emprada per este tipus d'URL s'ha d'executar en un " +"terminal." msgid "Whether the specified command should handle \"aim\" URLs" msgstr "Si l'orde especificada ha de gestionar URL 束aim損" @@ -2290,7 +2296,7 @@ msgstr "Esteu emprant %s, per嘆 este connector requereix %s." msgid "This plugin has not defined an ID." -msgstr "Este connector no ha definit cap ID." +msgstr "Este connector no ha definit cap identificador." #, c-format msgid "Plugin magic mismatch %d (need %d)" @@ -2736,8 +2742,8 @@ "Prepends a newline to messages so that the rest of the message appears below " "the username in the conversation window." msgstr "" -"Afig una l鱈nia nova abans de cada missatge de manera que, en les finestres " -"de conversa, els missatges apareixen sota el nom d'usuari." +"Afig una l鱈nia nova abans de cada missatge de manera que, en les " +"finestres de conversa, els missatges apareixen sota el nom d'usuari." msgid "Offline Message Emulation" msgstr "Emulaci坦 de missatge de fora de l鱈nia" @@ -2805,7 +2811,8 @@ msgstr "" "Vos permet for巽ar que les contrasenyes siguen d'un sol 炭s per a comptes dels " "quals no s'alcen les contrasenyes.\n" -"Nota: per poder fer servir aix嘆, cal que no s'alce la contrasenya del compte." +"Nota: per poder fer servir aix嘆, cal que no s'alce la contrasenya del " +"compte." #. *< type #. *< ui_requirement @@ -2832,8 +2839,8 @@ "Causes conversation windows to appear as other users begin to message you. " "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!" msgstr "" -"Fa que apareguen finestres de conversa aix鱈 que altres usuaris vos comencen " -"a enviar missatges. Funciona per a AIM, ICQ, XMPP, Sametime, i Yahoo!" +"Fa que apareguen finestres de conversa aix鱈 que altres usuaris vos comencen a " +"enviar missatges. Funciona per a AIM, ICQ, XMPP, Sametime, i Yahoo!" msgid "You feel a disturbance in the force..." msgstr "Sentireu un certa pertorbaci坦 en la for巽a..." @@ -3669,8 +3676,8 @@ "must be a channel operator to do this." msgstr "" "devoice <sobrenom1> [sobrenom2] ...: treu l'estat de veu a alg炭, " -"prevenint que parlin al canal si este est� moderat (+m). Heu de ser operador " -"del canal per poder fer aix嘆." +"prevenint que parlin al canal si este est� moderat (+m). Heu de ser " +"operador del canal per poder fer aix嘆." msgid "" "invite <nick> [room]: Invite someone to join you in the specified " @@ -3876,17 +3883,18 @@ msgid "Server thinks authentication is complete, but client does not" msgstr "El servidor creu que s'ha completat l'autenticaci坦, per嘆 el client no" -#, fuzzy msgid "Server may require plaintext authentication over an unencrypted stream" -msgstr "El servidor requereix autenticaci坦 de text sobre un flux no xifrat" - -#, fuzzy, c-format +msgstr "" +"Podria ser que el servidor requer鱈s autenticaci坦 de text sobre un flux no " +"xifrat" + +#, c-format msgid "" "%s may require plaintext authentication over an unencrypted connection. " "Allow this and continue authentication?" msgstr "" -"%s requereix autenticaci坦 de text sobre un flux no xifrat. Voleu permetre-ho " -"i continuar amb l'autenticaci坦?" +"Podria ser que %s requer鱈s autenticaci坦 de text sobre un flux no xifrat. " +"Voleu permetre-ho i continuar amb l'autenticaci坦?" msgid "SASL authentication failed" msgstr "Ha fallat l'autenticaci坦 SASL" @@ -3949,7 +3957,7 @@ msgstr "El gestor de connexions BOSH ha tancat la connexi坦." msgid "No session ID given" -msgstr "No s'ha indicat cap ID" +msgstr "No s'ha indicat cap identificador" msgid "Unsupported version of BOSH protocol" msgstr "Esta versi坦 del protocol BOSH no est� implementada" @@ -4250,13 +4258,13 @@ msgstr "S'ha esgitat el temps d'espera (ping)" msgid "Invalid XMPP ID" -msgstr "ID de l'XMPP inv�lid" +msgstr "L'identificador XMPP no 辿s v�lid" msgid "Invalid XMPP ID. Username portion must be set." -msgstr "L'ID de l'XMPP no 辿s v�lid. Cal especificar el nom d'usuari." +msgstr "L'identificador XMPP no 辿s v�lid. Cal especificar el nom d'usuari." msgid "Invalid XMPP ID. Domain must be set." -msgstr "L'ID de l'XMPP no 辿s v�lid. Cal especificar un domini." +msgstr "L'identificador XMPP no 辿s v�lid. Cal especificar un domini." # FIXME msgid "Malformed BOSH URL" @@ -4475,7 +4483,7 @@ # FIX msgid "Malformed XMPP ID" -msgstr "L'ID de l'XMPP est� malm辿s" +msgstr "L'identificador XMPP est� malm辿s" msgid "Not Acceptable" msgstr "No 辿s acceptable" @@ -4553,7 +4561,7 @@ msgstr "Adre巽ament incorrecte" msgid "Invalid ID" -msgstr "ID inv�lid" +msgstr "L'identificador no 辿s v�lid" msgid "Invalid Namespace" msgstr "Espai de noms inv�lid" @@ -4834,7 +4842,7 @@ msgstr "Les versions del XMPP no coincideixen" msgid "XMPP stream missing ID" -msgstr "Manca l'ID del fluxe XMPP" +msgstr "Manca l'identificador del fluxe XMPP" msgid "XML Parse error" msgstr "Error en l'an�lisi de l'XML" @@ -5488,7 +5496,8 @@ #, c-format msgid "" "MSN servers are currently blocking the following regular expressions:<br/>%s" -msgstr "Actualment, servidors MSN bloquen estes expressions regulars:<br/>%s" +msgstr "" +"Actualment, servidors MSN bloquen estes expressions regulars:<br/>%s" msgid "This account does not have email enabled." msgstr "Este compte no t辿 el correu habilitat." @@ -5984,8 +5993,8 @@ msgid "The two PINs you entered do not match." msgstr "Els dos PIN que heu introdu誰t no coincideixen." -msgid "The name you entered is invalid." -msgstr "El nom que heu introdu誰t no 辿s v�lid." +msgid "The Display Name you entered is invalid." +msgstr "El nom d'usuari que heu introdu誰t no 辿s v�lid." msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -6007,9 +6016,8 @@ "Encara no s'ha pogut recuperar la informaci坦 del vostre perfil. Torneu-ho a " "intentar m辿s tard." -#, fuzzy msgid "Your UID" -msgstr "El vostre MXitID" +msgstr "El vostre UID" #. pin #. pin (required) @@ -6079,16 +6087,12 @@ msgid "Connecting..." msgstr "S'est� connectant..." -#, fuzzy -msgid "The Display Name you entered is invalid." -msgstr "El nom que heu introdu誰t no 辿s v�lid." - msgid "The PIN you entered has an invalid length [7-10]." msgstr "La llargada del PIN que heu introdu誰t no 辿s v�lida [4-10]." #. mxit login name msgid "MXit ID" -msgstr "" +msgstr "Identificador MXit" #. show the form to the user to complete msgid "Register New MXit Account" @@ -6120,13 +6124,13 @@ msgid "Invalid country selected. Please try again." msgstr "El pa鱈s seleccionat no 辿s v�lid. Intenteu-ho de nou." -#, fuzzy msgid "The MXit ID you entered is not registered. Please register first." -msgstr "El nom d'usuari no est� registrat, cal que primer el registreu." - -#, fuzzy +msgstr "" +"L'identificador MXit que heu entrat no est� registrat, cal que primer el " +"registreu." + msgid "The MXit ID you entered is already registered. Please choose another." -msgstr "Este nom d'usuari ja est� registrat, escolliu-ne un altre." +msgstr "Este identificador MXit ja est� registrat, escolliu-ne un altre." msgid "Internal error. Please try again later." msgstr "S'ha produ誰t un error intern. Torneu-ho a provar m辿s tard." @@ -6171,9 +6175,8 @@ msgid "Hidden Number" msgstr "Nombre ocult" -#, fuzzy msgid "Your MXit ID..." -msgstr "El vostre MXitID" +msgstr "El vostre identificador MXit..." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -6187,26 +6190,21 @@ msgstr "Habilita la pantalla de presentaci坦 emergent" #. you were kicked -#, fuzzy msgid "You have been kicked from this MultiMX." -msgstr "Vos han fet fora: (%s)" - -#, fuzzy +msgstr "Vos han fet fora d'este MultiMX." + msgid "was kicked" -msgstr "bufetejat" - -#, fuzzy +msgstr "ha estat fet fora" + msgid "_Room Name:" -msgstr "_Sala:" +msgstr "Nom de la _Sala:" #. Display system message in chat window -#, fuzzy msgid "You have invited" -msgstr "Teniu correu!" - -#, fuzzy +msgstr "Heu convidat" + msgid "Last Online" -msgstr "En l鱈nia" +msgstr "Darrer cop en l鱈nia" #. we must have lost the connection, so terminate it so that we can reconnect msgid "We have lost the connection to MXit. Please reconnect." @@ -6478,8 +6476,8 @@ msgid "No suitable MySpaceIM account could be found to open this myim URL." msgstr "" -"No s'ha pogut trobar cap compte adequat a MySpaceIM per poder obrir este URL " -"myim." +"No s'ha pogut trobar cap compte adequat a MySpaceIM per poder obrir este " +"URL myim." msgid "Enable the proper MySpaceIM account and try again." msgstr "Habiliteu el compte MySpaceIM adequat i proveu-ho de nou." @@ -6773,7 +6771,8 @@ "This evaluation version does not allow more than ten users to log in at one " "time" msgstr "" -"Esta versi坦 d'avaluaci坦 no permet que entren m辿s de deu usuaris a la vegada" +"Esta versi坦 d'avaluaci坦 no permet que entren m辿s de deu usuaris a la " +"vegada" msgid "The user is either offline or you are blocked" msgstr "L'usuari est� fora de l鱈nia o b辿 esteu blocat" @@ -6789,8 +6788,8 @@ #, c-format msgid "Unable to send message. Could not get details for user (%s)." msgstr "" -"No s'ha pogut enviar el missatge. No s'han pogut obtindre detalls de " -"l'usuari (%s)." +"No s'ha pogut enviar el missatge. No s'han pogut obtindre detalls de l'usuari " +"(%s)." #, c-format msgid "Unable to add %s to your buddy list (%s)." @@ -6808,8 +6807,8 @@ #, c-format msgid "Unable to send message to %s. Could not create the conference (%s)." msgstr "" -"No s'ha pogut enviar el missatge a %s. No s'ha pogut crear la confer竪ncia " -"(%s)." +"No s'ha pogut enviar el missatge a %s. No s'ha pogut crear la confer竪ncia (%" +"s)." #, c-format msgid "Unable to send message. Could not create the conference (%s)." @@ -6855,8 +6854,8 @@ #, c-format msgid "Unable to change server side privacy settings (%s)." msgstr "" -"No s'han pogut canviar els par�metres de privadesa en la part del servidor " -"(%s)." +"No s'han pogut canviar els par�metres de privadesa en la part del servidor (%" +"s)." #, c-format msgid "Unable to create conference (%s)." @@ -6877,7 +6876,7 @@ msgstr "Oficina de correu electr嘆nic" msgid "User ID" -msgstr "ID de l'usuari" +msgstr "Identificador de l'usuari" #. tag = _("DN"); #. value = nm_user_record_get_dn(user_record); @@ -7197,8 +7196,8 @@ "%s tried to send you a %s file, but we only allow files up to %s over Direct " "IM. Try using file transfer instead.\n" msgstr "" -"%s vos ha intentat enviar un fitxer %s, per嘆 ara mateix nom辿s permetem " -"enviar fitxers de fins a %s a trav辿s de MI directa. Proveu-ho fent servir la " +"%s vos ha intentat enviar un fitxer %s, per嘆 ara mateix nom辿s permetem enviar " +"fitxers de fins a %s a trav辿s de MI directa. Proveu-ho fent servir la " "transfer竪ncia de fitxers.\n" # FIXME @@ -7222,8 +7221,9 @@ "(There was an error receiving this message. Either you and %s have " "different encodings selected, or %s has a buggy client.)" msgstr "" -"(S'ha produ誰t un error en rebre este missatge. �s molt possible que %s empri " -"una codificaci坦 diferent a la vostra, o que %s tinga un client defectu坦s)" +"(S'ha produ誰t un error en rebre este missatge. �s molt possible que %s " +"empri una codificaci坦 diferent a la vostra, o que %s tinga un client " +"defectu坦s)" #. Label msgid "Buddy Icon" @@ -7358,9 +7358,9 @@ "a valid email address, or start with a letter and contain only letters, " "numbers and spaces, or contain only numbers." msgstr "" -"No s'ha pogut entrar com a %s perqu竪 este nom d'usuari no 辿s v�lid. Els noms " -"d'usuari han de ser adreces de correu v�lides, o comen巽ar amb una lletra i " -"contindre nom辿s lletres, nombres o espais, o nom辿s nombres." +"No s'ha pogut entrar com a %s perqu竪 este nom d'usuari no 辿s v�lid. Els " +"noms d'usuari han de ser adreces de correu v�lides, o comen巽ar amb una " +"lletra i contindre nom辿s lletres, nombres o espais, o nom辿s nombres." #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." @@ -7527,8 +7527,8 @@ "You missed %hu message from %s because the rate limit has been exceeded." msgid_plural "" "You missed %hu messages from %s because the rate limit has been exceeded." -msgstr[0] "S'ha perdut %hu missatge de %s perqu竪 no era v�lid." -msgstr[1] "S'han perdut %hu missatges de %s perqu竪 no eren v�lids." +msgstr[0] "S'ha perdut %hu missatge de %s perqu竪 s'ha excedit el l鱈mit." +msgstr[1] "S'han perdut %hu missatges de %s perqu竪 s'ha excedit el l鱈mit." #, c-format msgid "" @@ -7895,8 +7895,8 @@ "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" msgstr "" -"Podeu tornar a demanar l'autoritzaci坦 d'estos amics fent-hi clic a sobre amb " -"el bot坦 dret del ratol鱈, i seleccionant 束Torna a demanar l'autoritzaci坦損." +"Podeu tornar a demanar l'autoritzaci坦 d'estos amics fent-hi clic a sobre " +"amb el bot坦 dret del ratol鱈, i seleccionant 束Torna a demanar l'autoritzaci坦損." msgid "Find Buddy by Email" msgstr "Troba un amic per l'adre巽a de correu" @@ -7988,10 +7988,10 @@ msgstr "SNAC inv�lid" msgid "Server rate limit exceeded" -msgstr "" +msgstr "S'ha excedit el l鱈mit de velocitat del servidor" msgid "Client rate limit exceeded" -msgstr "" +msgstr "S'ha excedit el l鱈mit de velocitat del client" msgid "Service unavailable" msgstr "Servei no disponible" @@ -8027,7 +8027,7 @@ msgstr "Drets insuficients" msgid "In local permit/deny" -msgstr "En la llista de perm竪s/denegat local" +msgstr "En la llista de perm辿s/denegat local" msgid "Warning level too high (sender)" msgstr "Nivell d'av鱈s massa alt (remitent)" @@ -8051,7 +8051,7 @@ msgstr "Cua plena" msgid "Not while on AOL" -msgstr "No es pot fer mentre estigui a AOL" +msgstr "No es pot fer mentre estiga a AOL" msgid "Aquarius" msgstr "Aquari" @@ -8309,10 +8309,10 @@ msgstr "Missatge: %s" msgid "ID: " -msgstr "ID: " +msgstr "Identificador: " msgid "Group ID" -msgstr "ID del Grup" +msgstr "Identificador del Grup" msgid "QQ Qun" msgstr "QQ Qun" @@ -8429,8 +8429,7 @@ #, c-format msgid "<b>Joining Qun %u is approved by admin %u for %s</b>" -msgstr "" -"<b>L'administrador %2$u vos ha perm辿s unir-vos al Qun %1$u per %3$s</b>" +msgstr "<b>L'administrador %2$u vos ha perm辿s unir-vos al Qun %1$u per %3$s</b>" #, c-format msgid "<b>Removed buddy %u.</b>" @@ -8560,8 +8559,7 @@ msgid "<p><i>And, all the boys in the backroom...</i><br>\n" msgstr "<p><i>I tothom que ho ha fet possible...<i><br>\n" -#, fuzzy -msgid "<i>Feel free to join us!</i> :)" +msgid "<i>Feel free to join vos!</i> :)" msgstr "<i>No dubteu a col揃laborar amb nosaltres!</i> :)" #, c-format @@ -8782,7 +8780,7 @@ #, c-format msgid "<b>Notes Group ID:</b> %s<br>" -msgstr "<b>ID del grup Notes:</b> %s<br>" +msgstr "<b>Identificador del grup Notes:</b> %s<br>" #, c-format msgid "Info for Group %s" @@ -8944,10 +8942,10 @@ msgstr "Nom d'usuari" msgid "Sametime ID" -msgstr "ID de Sametime" +msgstr "Identificador de Sametime" msgid "An ambiguous user ID was entered" -msgstr "S'ha introdu誰t un ID d'usuari ambigu" +msgstr "S'ha introdu誰t un identificador d'usuari ambigu" #, c-format msgid "" @@ -9881,7 +9879,8 @@ msgstr "topic [<tema nou>]: mostra o canvia el tema" msgid "join <channel> [<password>]: Join a chat on this network" -msgstr "join <canal> [<contrasenya>]: entra en un xat d'esta xarxa" +msgstr "" +"join <canal> [<contrasenya>]: entra en un xat d'esta xarxa" msgid "list: List channels on this network" msgstr "list: llista els canals en esta xarxa" @@ -10242,7 +10241,7 @@ msgstr "doodle: fa una petici坦 a l'usuari per iniciar una sessi坦 Doodle" msgid "Yahoo ID..." -msgstr "ID de Yahoo..." +msgstr "Identificador del Yahoo..." #. *< type #. *< ui_requirement @@ -10274,15 +10273,15 @@ msgid "Ignore conference and chatroom invitations" msgstr "Bloca invitacions a confer竪ncies i sales de xat" -#, fuzzy msgid "Use account proxy for HTTP and HTTPS connections" -msgstr "Empra un compte per al servidor intermediari per a connexions SSL" +msgstr "" +"Empra un compte per al servidor intermediari per a connexions HTTP i HTTPS" msgid "Chat room list URL" msgstr "URL de la llista de sales de xat" msgid "Yahoo JAPAN ID..." -msgstr "ID de Yahoo del Jap坦..." +msgstr "Identificador de Yahoo del Jap坦..." #. *< type #. *< ui_requirement @@ -10300,8 +10299,8 @@ #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." msgstr "" -"%s vos ha enviat una invitaci坦 a la seua c�mera web, per嘆 aix嘆 encara no " -"est� implementat." +"%s vos ha enviat una invitaci坦 a la seua c�mera web, per嘆 aix嘆 encara no est� " +"implementat." msgid "Your SMS was not delivered" msgstr "No s'ha enviat l'SMS" @@ -10318,15 +10317,14 @@ "%s has (retroactively) denied your request to add them to your list for the " "following reason: %s." msgstr "" -"%s vos ha denegat (retroactivament) la petici坦 d'afegir-lo a la vostra " -"llista pel seg端ent motiu:\n" +"%s vos ha denegat (retroactivament) la petici坦 d'afegir-lo a la vostra llista " +"pel seg端ent motiu:\n" "%s" #, c-format msgid "%s has (retroactively) denied your request to add them to your list." msgstr "" -"%s vos ha denegat (retroactivament) la petici坦 d'afegir-lo a la vostra " -"llista." +"%s vos ha denegat (retroactivament) la petici坦 d'afegir-lo a la vostra llista." msgid "Add buddy rejected" msgstr "S'ha rebutjat afegir l'amic" @@ -10495,13 +10493,13 @@ msgstr "Comen巽a a dibuixar" msgid "Select the ID you want to activate" -msgstr "Seleccioneu l'ID que vulgueu activar" +msgstr "Seleccioneu l'identificador que vulgueu activar" msgid "Join whom in chat?" msgstr "A qui vos voleu unir al xat?" msgid "Activate ID..." -msgstr "Activa l'ID..." +msgstr "Activa l'identificador..." msgid "Join User in Chat..." msgstr "Entra a un xat d'un usuari..." @@ -10555,10 +10553,11 @@ "If you wish to view this profile, you will need to visit this link in your " "web browser:" msgstr "" -"Si voleu veure este perfil, haureu de visitar este enlla巽 amb el navegador:" +"Si voleu veure este perfil, haureu de visitar este enlla巽 amb el " +"navegador:" msgid "Yahoo! ID" -msgstr "ID de Yahoo!" +msgstr "Identificador de Yahoo!" msgid "Hobbies" msgstr "Aficions" @@ -10597,9 +10596,9 @@ "does not exist; however, Yahoo! sometimes does fail to find a user's " "profile. If you know that the user exists, please try again later." msgstr "" -"No s'ha pogut obtindre el perfil de l'usuari. El m辿s segur 辿s que l'usuari " -"no existisca, tot i que a vegades Yahoo! no pot trobar els perfils d'usuari. " -"Si sabeu del cert que l'usuari existeix, torneu-ho a intentar m辿s tard." +"No s'ha pogut obtindre el perfil de l'usuari. El m辿s segur 辿s que l'usuari no " +"existisca, tot i que a vegades Yahoo! no pot trobar els perfils d'usuari. Si " +"sabeu del cert que l'usuari existeix, torneu-ho a intentar m辿s tard." msgid "The user's profile is empty." msgstr "El perfil d'usuari est� buit." @@ -10627,8 +10626,8 @@ "Unknown error. You may need to logout and wait five minutes before being " "able to rejoin a chatroom" msgstr "" -"S'ha produ誰t un error desconegut. Potser caldr� que eixiu i espereu uns cinc " -"minuts abans d'intentar tornar a entrar a la sala de xat" +"S'ha produ誰t un error desconegut. Potser caldr� que eixiu i espereu uns " +"cinc minuts abans d'intentar tornar a entrar a la sala de xat" #, c-format msgid "You are now chatting in %s." @@ -10708,11 +10707,13 @@ msgid "inst <instance>: Set the instance to be used on this class" msgstr "" -"inst <inst�ncia>: especifica la inst�ncia a fer servir en esta classe" +"inst <inst�ncia>: especifica la inst�ncia a fer servir en esta " +"classe" msgid "topic <instance>: Set the instance to be used on this class" msgstr "" -"topic <inst�ncia>: especifica la inst�ncia a fer servir en esta classe" +"topic <inst�ncia>: especifica la inst�ncia a fer servir en esta " +"classe" msgid "sub <class> <instance> <recipient>: Join a new chat" msgstr "" @@ -11198,8 +11199,8 @@ "voleu que el %s es connecte amb m辿s comptes de missatgeria instant�nia (MI), " "torneu a pr辿mer <b>Afig</b> fins a configurar-los tots.\n" "\n" -"Podeu tornar a esta finestra per afegir, editar o suprimir comptes, a partir " -"del men炭 <b>Comptes->Gestiona els comptes</b> a finestra de la llista " +"Podeu tornar a esta finestra per afegir, editar o suprimir comptes, a " +"partir del men炭 <b>Comptes->Gestiona els comptes</b> a finestra de la llista " "d'amics." #. Buddy List @@ -11335,8 +11336,8 @@ "choosing 'Expand' from the contact's context menu" msgstr "" "En fusionar estos contactes fareu que compartisquen una mateixa entrada en " -"la llista d'amics i en la finestra de conversa. M辿s avant els podreu separar " -"amb l'opci坦 'Expandeix' del men炭 contextual del contacte." +"la llista d'amics i en la finestra de conversa. M辿s avant els podreu " +"separar amb l'opci坦 'Expandeix' del men炭 contextual del contacte." msgid "Please update the necessary fields." msgstr "Actualitzeu els camps necessaris." @@ -12493,8 +12494,8 @@ "to multiple messaging services at once. %s is written in C using GTK+. %s " "is released, and may be modified and redistributed, under the terms of the " "GPL version 2 (or later). A copy of the GPL is distributed with %s. %s is " -"copyrighted by its contributors, a list of whom is also distributed with " -"%s. There is no warranty for %s.<BR><BR>" +"copyrighted by its contributors, a list of whom is also distributed with %" +"s. There is no warranty for %s.<BR><BR>" msgstr "" "El %s 辿s un client de missatgeria basat en libpurple que permet connectar-" "vos a diferents serveis de missatgeria instant�nia al mateix temps. El %s " @@ -12527,11 +12528,11 @@ "<br/>" msgstr "" "<font size=\"4\"><b>Ajuda d'altres usuaris del Pidgin</b>:</font> <a href=" -"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Esta 辿s una llista de " -"correu <b>p炭blica</b>. (<a href=\"http://pidgin.im/pipermail/support/" +"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Esta 辿s una llista " +"de correu <b>p炭blica</b>. (<a href=\"http://pidgin.im/pipermail/support/" "\">arxiu</a>)<br/>No vos podem ajudar amb connectors d'altres prove誰dors.<br/" -">En esta llista s'hi empra principalment l'<b>angl辿s</b>. Podeu escriure-hi " -"en un altre idioma, per嘆 辿s possible que les respostes no siguen de gaire " +">En esta llista s'hi empra principalment l'<b>angl辿s</b>. Podeu escriure-" +"hi en un altre idioma, per嘆 辿s possible que les respostes no siguen de gaire " "ajuda.<br/>" #, c-format @@ -12933,8 +12934,8 @@ "This smiley is disabled because a custom smiley exists for this shortcut:\n" " %s" msgstr "" -"Esta emoticona est� inhabilitada perqu竪 hi ha una emoticona personalitzada " -"per esta drecera:\n" +"Esta emoticona est� inhabilitada perqu竪 hi ha una emoticona " +"personalitzada per esta drecera:\n" " %s" msgid "Smile!" @@ -13057,16 +13058,16 @@ #, c-format msgid "" -"Are you sure you want to permanently delete the log of the conversation in " -"%s which started at %s?" +"Are you sure you want to permanently delete the log of the conversation in %" +"s which started at %s?" msgstr "" "Esteu segur que voleu suprimir el registre de la conversa a %s iniciada a " "les %s?" #, c-format msgid "" -"Are you sure you want to permanently delete the system log which started at " -"%s?" +"Are you sure you want to permanently delete the system log which started at %" +"s?" msgstr "" "Esteu segur que voleu suprimir permanentment el registre del sistema iniciat " "a les %s?" @@ -13172,15 +13173,14 @@ #, c-format msgid "Exiting because another libpurple client is already running.\n" msgstr "" -"Ara s'eixir� at竪s que ja hi ha un altre client del libpurple executant-se.\n" - -#, fuzzy +"Ara s'eixir� at竪s que ja hi ha un altre client del libpurple executant-" +"se.\n" + msgid "_Media" -msgstr "/_Medi" - -#, fuzzy +msgstr "_Medi" + msgid "_Hangup" -msgstr "Penja" +msgstr "_Penja" #, c-format msgid "%s wishes to start an audio/video session with you." @@ -13962,8 +13962,7 @@ msgid "" "A custom smiley for '%s' already exists. Please use a different shortcut." msgstr "" -"Ja hi ha una emoticona personalitzada per a 束%s損. Indiqueu-ne una de " -"diferent." +"Ja hi ha una emoticona personalitzada per a 束%s損. Indiqueu-ne una de diferent." msgid "Custom Smiley" msgstr "Emoticona personalitzada" @@ -14043,8 +14042,8 @@ "You can send this image as a file transfer, embed it into this message, or " "use it as the buddy icon for this user." msgstr "" -"Podeu enviar esta imatge com una transfer竪ncia de fitxer, incrustar-la en el " -"missatge, o emprar-la com a icona d'amic per a este usuari." +"Podeu enviar esta imatge com una transfer竪ncia de fitxer, incrustar-la en " +"el missatge, o emprar-la com a icona d'amic per a este usuari." msgid "Set as buddy icon" msgstr "Estableix com a icona de l'amic" @@ -14062,15 +14061,15 @@ "You can send this image as a file transfer, or use it as the buddy icon for " "this user." msgstr "" -"Podeu enviar esta imatge com una transfer竪ncia de fitxer, o emprar-la com a " -"icona d'amic per a este usuari." +"Podeu enviar esta imatge com una transfer竪ncia de fitxer, o emprar-la com " +"a icona d'amic per a este usuari." msgid "" "You can insert this image into this message, or use it as the buddy icon for " "this user" msgstr "" -"Podeu incrustar esta imatge en el missatge o utilitzar-la com a icona per a " -"este usuari." +"Podeu incrustar esta imatge en el missatge o utilitzar-la com a icona per " +"a este usuari." #. I don't know if we really want to do anything here. Most of #. * the desktop item types are crap like "MIME Type" (I have no @@ -15267,8 +15266,7 @@ msgid "Remove Buddy List window transparency on focus" msgstr "" -"Treu la transpar竪ncia de la finestra de la llista d'amics en obtindre el " -"focus" +"Treu la transpar竪ncia de la finestra de la llista d'amics en obtindre el focus" #. *< type #. *< ui_requirement @@ -15292,8 +15290,8 @@ "\n" "* Note: This plugin requires Win2000 or greater." msgstr "" -"Este connector habilita la transpar竪ncia variables en finestres de conversa, " -"i la llista d'amics.\n" +"Este connector habilita la transpar竪ncia variables en finestres de " +"conversa, i la llista d'amics.\n" "\n" "* Nota: este connector requereix Windows 2000 o superior." @@ -15423,13 +15421,13 @@ #, no-c-format msgid "" "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual " -"installation instructions are at: http://developer.pidgin.im/wiki/Installing" -"%20Pidgin#manual_win32_spellcheck_installation" +"installation instructions are at: http://developer.pidgin.im/wiki/Installing%" +"20Pidgin#manual_win32_spellcheck_installation" msgstr "" "S'ha produ誰t un error en instal揃lar el corrector ortogr�fic ($R3).$\\rSi " "falla en reintentar-ho, podeu seguir les instruccions d'instal揃laci坦 manual " -"d'ac鱈: http://developer.pidgin.im/wiki/Installing" -"%20Pidgin#manual_win32_spellcheck_installation" +"d'ac鱈: http://developer.pidgin.im/wiki/Installing%" +"20Pidgin#manual_win32_spellcheck_installation" #. Installer Subsection Text msgid "GTK+ Runtime (required if not present)" @@ -15506,6 +15504,9 @@ msgid "You do not have permission to uninstall this application." msgstr "No tens perm鱈s per desinstal.lar esta aplicaci坦." +#~ msgid "The name you entered is invalid." +#~ msgstr "El nom que heu introdu誰t no 辿s v�lid." + #~ msgid "The certificate is not valid yet." #~ msgstr "El certificat encara no 辿s v�lid." @@ -17302,8 +17303,8 @@ #~ "Server requires TLS/SSL for login. Select \"Use TLS if available\" in " #~ "account properties" #~ msgstr "" -#~ "El servidor requereix TLS/SSL per a entrar. Seleccioneu 束Empra TLS si " -#~ "est� disponible損 en les propietats del compte" +#~ "El servidor requereix TLS/SSL per a entrar. Seleccioneu 束Empra TLS si est� " +#~ "disponible損 en les propietats del compte" #~ msgid "Use TLS if available" #~ msgstr "Empra TLS si est� disponible"
--- a/po/cs.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/cs.po Wed Aug 11 07:36:56 2010 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: pidgin VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 01:17-0400\n" -"PO-Revision-Date: 2010-05-26 18:44+0100\n" +"POT-Creation-Date: 2010-08-07 13:11-0400\n" +"PO-Revision-Date: 2010-08-01 18:18+0100\n" "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n" "Language-Team: Czech <cs@li.org>\n" "Language: cs\n" @@ -63,9 +63,8 @@ msgid "Error" msgstr "Chyba" -#, fuzzy msgid "Account was not modified" -msgstr "��et nebyl p�id叩n" +msgstr "��et nebyl upraven" msgid "Account was not added" msgstr "��et nebyl p�id叩n" @@ -75,11 +74,11 @@ msgid "" "The account's protocol cannot be changed while it is connected to the server." -msgstr "" +msgstr "Protokol 炭�tu nem哲転e b箪t zm�n�n, kdy転 je p�ipojen k serveru." msgid "" "The account's username cannot be changed while it is connected to the server." -msgstr "" +msgstr "Jm辿no u転ivatele 炭�tu nem哲転e b箪t zm�n�no, kdy転 je p�ipojen k serveru." msgid "New mail notifications" msgstr "Upozorn�n鱈 na nov辿 zpr叩vy" @@ -1680,7 +1679,7 @@ msgid "" "The certificate is not valid yet. Check that your computer's date and time " "are accurate." -msgstr "" +msgstr "Certifik叩t je neplatn箪. Zkontrolujte datum a �as po�鱈ta�e." msgid "The certificate has expired and should not be considered valid." msgstr "Certifik叩t vypr邸el a nem�l by b箪t pova転ov叩n za platn箪." @@ -3818,17 +3817,16 @@ msgid "Server thinks authentication is complete, but client does not" msgstr "Server pova転uje ov��en鱈 za kompletn鱈, ale klient ne" -#, fuzzy msgid "Server may require plaintext authentication over an unencrypted stream" -msgstr "Server vy転aduje textovou autentizaci v ne邸ifrovan辿m proudu" - -#, fuzzy, c-format +msgstr "Server m哲転e vy転adovat textovou autentizaci v ne邸ifrovan辿m proudu" + +#, c-format msgid "" "%s may require plaintext authentication over an unencrypted connection. " "Allow this and continue authentication?" msgstr "" -"%s vy転aduje textovou autentizaci p�es ne邸ifrovan辿 spojen鱈. Povolit to a " -"pokra�ovat v autentizaci?" +"%s m哲転e vy転adovat textovou autentizaci p�es ne邸ifrovan辿 spojen鱈. Povolit to " +"a pokra�ovat v autentizaci?" msgid "SASL authentication failed" msgstr "SASL autentizace selhala" @@ -5882,8 +5880,8 @@ msgid "The two PINs you entered do not match." msgstr "PINy nesouhlas鱈." -msgid "The name you entered is invalid." -msgstr "Zadan箪 jm辿no nen鱈 platn辿" +msgid "The Display Name you entered is invalid." +msgstr "Zadan箪 jm辿no pro zobrazen鱈 nen鱈 platn辿" msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -5901,9 +5899,8 @@ msgid "Your profile information is not yet retrieved. Please try again later." msgstr "Informace z profilu nebyly z鱈sk叩ny, zkuste to pros鱈m pozd�ji." -#, fuzzy msgid "Your UID" -msgstr "Tvoje MXitId" +msgstr "Tvoje UID" #. pin #. pin (required) @@ -5971,16 +5968,12 @@ msgid "Connecting..." msgstr "P�ipojov叩n鱈..." -#, fuzzy -msgid "The Display Name you entered is invalid." -msgstr "Zadan箪 jm辿no nen鱈 platn辿" - msgid "The PIN you entered has an invalid length [7-10]." msgstr "Zadan箪 PIN m叩 neplatnou d辿lku [7-10]." #. mxit login name msgid "MXit ID" -msgstr "" +msgstr "MXit ID" #. show the form to the user to complete msgid "Register New MXit Account" @@ -6008,13 +6001,11 @@ msgid "Invalid country selected. Please try again." msgstr "Vybr叩na neplatn叩 zem�, zkuste to pros鱈m pozd�ji." -#, fuzzy msgid "The MXit ID you entered is not registered. Please register first." -msgstr "U転ivatelsk辿 jm辿no nen鱈 registrov叩no. Nejd�鱈v se registrujte." - -#, fuzzy +msgstr "MXit ID nen鱈 registrov叩no. Nejd�鱈v se registrujte." + msgid "The MXit ID you entered is already registered. Please choose another." -msgstr "U転ivatelsk辿 jm辿no u転 je registrovan辿, zkuste jin辿." +msgstr "MXit ID u転 je registrovan辿, zkuste jin辿." msgid "Internal error. Please try again later." msgstr "Chyba. Zkuste to pros鱈m pozd�ji" @@ -6058,9 +6049,8 @@ msgid "Hidden Number" msgstr "Skryt辿 �鱈slo" -#, fuzzy msgid "Your MXit ID..." -msgstr "Tvoje MXitId" +msgstr "Tvoje MXit ID..." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -6074,26 +6064,21 @@ msgstr "Povolit zobrazen鱈 spou邸t�c鱈 obrazovky" #. you were kicked -#, fuzzy msgid "You have been kicked from this MultiMX." -msgstr "Byl jste vykopnut: (%s)" - -#, fuzzy +msgstr "Byl jste vykopnut z MultiMX." + msgid "was kicked" -msgstr "�patn箪 l鱈stek" - -#, fuzzy +msgstr "byl vykopnut" + msgid "_Room Name:" msgstr "_M鱈stnost:" #. Display system message in chat window -#, fuzzy msgid "You have invited" -msgstr "P�i邸la v叩m po邸ta!" - -#, fuzzy +msgstr "P�i邸lo v叩m pozv叩n鱈" + msgid "Last Online" -msgstr "P�ipojen" +msgstr "Naposledy p�ipojen" #. we must have lost the connection, so terminate it so that we can reconnect msgid "We have lost the connection to MXit. Please reconnect." @@ -7865,10 +7850,10 @@ msgstr "Neplatn辿 SNAC" msgid "Server rate limit exceeded" -msgstr "" +msgstr "P�ekro�en limit pom�ru serveru" msgid "Client rate limit exceeded" -msgstr "" +msgstr "P�ekro�en limit pom�ru klienta" msgid "Service unavailable" msgstr "Slu転ba nedostupn叩" @@ -10123,9 +10108,8 @@ msgid "Ignore conference and chatroom invitations" msgstr "Ignorovat pozv叩n鱈 do konferenc鱈 a m鱈stnost鱈 chatu" -#, fuzzy msgid "Use account proxy for HTTP and HTTPS connections" -msgstr "Pou転鱈t proxy pro SSL p�ipojen鱈" +msgstr "Pou転鱈t proxy 炭�tu pro HTTP a HTTPS p�ipojen鱈" msgid "Chat room list URL" msgstr "URL seznamu m鱈stnost鱈 chatu" @@ -12746,7 +12730,7 @@ " %s" msgid "Smile!" -msgstr "�sm�v!" +msgstr "Smajl鱈k!" msgid "_Manage custom smileys" msgstr "_Spravovat u転ivatelsk辿 smajl鱈ky" @@ -12845,7 +12829,7 @@ msgstr "�_sm�v!" msgid "_Attention!" -msgstr "Va邸e pozornost!" +msgstr "Vy転叩dat pozornost!" msgid "Log Deletion Failed" msgstr "Selhalo maz叩n鱈 z叩znamu" @@ -12976,13 +12960,11 @@ msgid "Exiting because another libpurple client is already running.\n" msgstr "Exiting because another libpurple client is already running.\n" -#, fuzzy msgid "_Media" -msgstr "/_Multim辿dia" - -#, fuzzy +msgstr "_M辿dia" + msgid "_Hangup" -msgstr "Zav�sit" +msgstr "_Zav�sit" #, c-format msgid "%s wishes to start an audio/video session with you." @@ -13043,7 +13025,7 @@ msgstr "Odm鱈tnout" msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>" -msgstr "<span weight=\"bold\" size=\"larger\">Jste sledov叩n!</span>" +msgstr "<span weight=\"bold\" size=\"larger\">Sledov叩n鱈</span>" msgid "The following plugins will be unloaded." msgstr "N叩sleduj鱈c鱈 z叩suvn辿 moduly budou odebr叩ny." @@ -15256,6 +15238,9 @@ msgid "You do not have permission to uninstall this application." msgstr "Nem叩te opr叩vn�n鱈 k odinstalaci t辿to aplikace." +#~ msgid "The name you entered is invalid." +#~ msgstr "Zadan箪 jm辿no nen鱈 platn辿" + #~ msgid "The certificate is not valid yet." #~ msgstr "Certifik叩t je neplatn箪."
--- a/po/de.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/de.po Wed Aug 11 07:36:56 2010 +0000 @@ -11,14 +11,14 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 01:17-0400\n" -"PO-Revision-Date: 2010-07-20 18:52+0200\n" -"Last-Translator: Bj旦rn Voigt <bjoern@cs.tu-berlin.de>\n" +"POT-Creation-Date: 2010-08-01 00:18+0200\n" +"PO-Revision-Date: 2010-08-01 00:16+0200\n" +"Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n" "Language-Team: Deutsch <de@li.org>\n" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Translators may want to transliterate the name. @@ -6002,8 +6002,8 @@ msgid "The two PINs you entered do not match." msgstr "Die beiden PINs, die Sie eingegeben haben, stimmen nicht 端berein." -msgid "The name you entered is invalid." -msgstr "Der eingegebene Name ist ung端ltig." +msgid "The Display Name you entered is invalid." +msgstr "Der eingegebene Anzeigename ist ung端ltig." msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -6025,9 +6025,8 @@ "Ihre Profil-Informationen wurden noch nicht abgerufen. Bitte versuchen Sie " "es sp辰ter noch einmal." -#, fuzzy msgid "Your UID" -msgstr "Ihre MXit-ID" +msgstr "Ihre UID" #. pin #. pin (required) @@ -6099,16 +6098,12 @@ msgid "Connecting..." msgstr "Verbinde..." -#, fuzzy -msgid "The Display Name you entered is invalid." -msgstr "Der eingegebene Name ist ung端ltig." - msgid "The PIN you entered has an invalid length [7-10]." msgstr "Die eingegebene PIN hat eine ung端ltige L辰nge [7-10]." #. mxit login name msgid "MXit ID" -msgstr "" +msgstr "MXit-ID" #. show the form to the user to complete msgid "Register New MXit Account" @@ -6143,16 +6138,15 @@ msgid "Invalid country selected. Please try again." msgstr "Ung端ltiges Land gew辰hlt. Bitte versuchen Sie es noch einmal." -#, fuzzy msgid "The MXit ID you entered is not registered. Please register first." msgstr "" -"Benutzername ist nicht registriert. Bitte registrieren Sie Sich zuerst." - -#, fuzzy +"Die von Ihnen eingegebene MXit-ID ist nicht registriert. Bitte registrieren " +"Sie Sich zuerst." + msgid "The MXit ID you entered is already registered. Please choose another." msgstr "" -"Der Benutzername ist bereits registriert. Bitte w辰hlen Sie einen anderen " -"Benutzernamen." +"Die von Ihnen eingegebene MXit-ID ist bereits registriert. Bitte w辰hlen Sie " +"eine andere." msgid "Internal error. Please try again later." msgstr "Internet Fehler. Versuchen Sie es sp辰ter noch einmal." @@ -6196,9 +6190,8 @@ msgid "Hidden Number" msgstr "Versteckte Nummer" -#, fuzzy msgid "Your MXit ID..." -msgstr "Ihre MXit-ID" +msgstr "Ihre MXit-ID..." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -6222,13 +6215,11 @@ msgstr "_Raumname:" #. Display system message in chat window -#, fuzzy msgid "You have invited" -msgstr "Sie haben Post!" - -#, fuzzy +msgstr "Sie haben eingeladen" + msgid "Last Online" -msgstr "Online" +msgstr "Zuletzt online" #. we must have lost the connection, so terminate it so that we can reconnect msgid "We have lost the connection to MXit. Please reconnect." @@ -6810,8 +6801,8 @@ #, c-format msgid "Unable to send message. Could not get details for user (%s)." msgstr "" -"Kann die Nachricht nicht senden. Kann die Details vom Benutzer nicht holen " -"(%s)." +"Kann die Nachricht nicht senden. Kann die Details vom Benutzer nicht holen (%" +"s)." #, c-format msgid "Unable to add %s to your buddy list (%s)." @@ -6829,8 +6820,8 @@ #, c-format msgid "Unable to send message to %s. Could not create the conference (%s)." msgstr "" -"Kann die Nachricht nicht an %s senden. Kann die Konferenz nicht erstellen " -"(%s)." +"Kann die Nachricht nicht an %s senden. Kann die Konferenz nicht erstellen (%" +"s)." #, c-format msgid "Unable to send message. Could not create the conference (%s)." @@ -7243,8 +7234,8 @@ "(There was an error receiving this message. Either you and %s have " "different encodings selected, or %s has a buggy client.)" msgstr "" -"(Es gab einen Fehler beim Empfang dieser Nachricht. Entweder haben Sie und " -"%s unterschiedliche Kodierungen gesetzt oder %s hat einen fehlerhaften " +"(Es gab einen Fehler beim Empfang dieser Nachricht. Entweder haben Sie und %" +"s unterschiedliche Kodierungen gesetzt oder %s hat einen fehlerhaften " "Client.)" #. Label @@ -8471,8 +8462,8 @@ #, c-format msgid "<b>Joining Qun %u is approved by admin %u for %s</b>" msgstr "" -"<b>Das Betreten des Qun %u wurde vom Admin best辰tigt wegen by admin %u for " -"%s</b>" +"<b>Das Betreten des Qun %u wurde vom Admin best辰tigt wegen by admin %u for %" +"s</b>" #, c-format msgid "<b>Removed buddy %u.</b>" @@ -12544,8 +12535,8 @@ "to multiple messaging services at once. %s is written in C using GTK+. %s " "is released, and may be modified and redistributed, under the terms of the " "GPL version 2 (or later). A copy of the GPL is distributed with %s. %s is " -"copyrighted by its contributors, a list of whom is also distributed with " -"%s. There is no warranty for %s.<BR><BR>" +"copyrighted by its contributors, a list of whom is also distributed with %" +"s. There is no warranty for %s.<BR><BR>" msgstr "" "%s ist ein Nachrichtendienst, basierend auf libpurple, der die Verbindung zu " "mehreren Nachrichtendiensten gleichzeitig unterst端tzt. %s wird in C " @@ -13117,16 +13108,16 @@ #, c-format msgid "" -"Are you sure you want to permanently delete the log of the conversation in " -"%s which started at %s?" +"Are you sure you want to permanently delete the log of the conversation in %" +"s which started at %s?" msgstr "" "Wollen Sie wirklich den Mitschnitt der Unterhaltung in %s, gestartet am %s, " "permanent l旦schen?" #, c-format msgid "" -"Are you sure you want to permanently delete the system log which started at " -"%s?" +"Are you sure you want to permanently delete the system log which started at %" +"s?" msgstr "" "Wollen Sie wirklich den Systemmitschnitt, gestartet am %s, permanent l旦schen?" @@ -13234,13 +13225,11 @@ msgid "Exiting because another libpurple client is already running.\n" msgstr "Wird geschlossen, da bereits ein anderer libpurple-Client l辰uft\n" -#, fuzzy msgid "_Media" -msgstr "/_Medien" - -#, fuzzy +msgstr "_Medien" + msgid "_Hangup" -msgstr "Auflegen" +msgstr "_Auflegen" #, c-format msgid "%s wishes to start an audio/video session with you." @@ -15471,13 +15460,13 @@ #, no-c-format msgid "" "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual " -"installation instructions are at: http://developer.pidgin.im/wiki/Installing" -"%20Pidgin#manual_win32_spellcheck_installation" +"installation instructions are at: http://developer.pidgin.im/wiki/Installing%" +"20Pidgin#manual_win32_spellcheck_installation" msgstr "" "Fehler beim Installieren der Rechtschreibkontrolle ($R3).$\\rFalls ein " "erneuter Versuch fehlschl辰gt, finden Sie Anweisungen zur manuellen " -"Installation unter: http://developer.pidgin.im/wiki/Installing" -"%20Pidgin#manual_win32_spellcheck_installation" +"Installation unter: http://developer.pidgin.im/wiki/Installing%" +"20Pidgin#manual_win32_spellcheck_installation" #. Installer Subsection Text msgid "GTK+ Runtime (required if not present)" @@ -15552,188 +15541,7 @@ #. Text displayed on Installer Finish Page msgid "Visit the Pidgin Web Page" -msgstr "Besuchen Sie die Pidgin Webseite" +msgstr "Besuchen Sie die Pidgin-Webseite" msgid "You do not have permission to uninstall this application." msgstr "Sie haben keine Berechtigung, diese Anwendung zu deinstallieren." - -#~ msgid "The nick name you entered is invalid." -#~ msgstr "Der eingegebene Spitzname ist ung端ltig." - -#~ msgid "MXit Login Name" -#~ msgstr "MXit-Login-Name" - -#~ msgid "Nick Name" -#~ msgstr "Spitzname" - -#~ msgid "Your Mobile Number..." -#~ msgstr "Ihre Handynummer..." - -#~ msgid "/Media/_Hangup" -#~ msgstr "/Medien/_Auflegen" - -#~ msgid "The certificate is not valid yet." -#~ msgstr "Das Zertifikat ist noch nicht g端ltig." - -#~ msgid "Rate to host" -#~ msgstr "Bewertung zum Host" - -#~ msgid "Rate to client" -#~ msgstr "Bewertung zum Client" - -#~ msgid "Unknown reason." -#~ msgstr "Unbekannter Grund." - -#~ msgid "Current Mood" -#~ msgstr "Momentane Stimmung" - -#~ msgid "New Mood" -#~ msgstr "Neue Stimmung" - -#~ msgid "Change your Mood" -#~ msgstr "Ihre Stimmung 辰ndern" - -#~ msgid "How do you feel right now?" -#~ msgstr "Wie f端hlen Sie sich gerade?" - -#~ msgid "Change Mood..." -#~ msgstr "Stimmung 辰ndern..." - -#~ msgid "Artist" -#~ msgstr "Interpret" - -#~ msgid "Album" -#~ msgstr "Album" - -#~ msgid "Pager server" -#~ msgstr "Pager-Server" - -#~ msgid "Yahoo Chat server" -#~ msgstr "Yahoo-Chat-Server" - -#~ msgid "Yahoo Chat port" -#~ msgstr "Yahoo-Chat-Port" - -#~ msgid "Orientation" -#~ msgstr "Ausrichtung" - -#~ msgid "The orientation of the tray." -#~ msgstr "Die Ausrichtung der Kontrollleiste." - -#~ msgid "Error creating conference." -#~ msgstr "Fehler beim Erstellen der Konferenz." - -#~ msgid "Unable to bind socket to port: %s" -#~ msgstr "Kann die Socket nicht an den Port binden: %s" - -#~ msgid "Unable to listen on socket: %s" -#~ msgstr "Lauschen auf Socket nicht m旦glich: %s" - -#~ msgid "%s just sent you a Nudge!" -#~ msgstr "%s hat Sie gerade angesto�en!" - -#~ msgid "Friendly name changes too rapidly" -#~ msgstr "Benutzernamen werden zu oft ge辰ndert" - -#~ msgid "This Hotmail account may not be active." -#~ msgstr "Dieses Hotmail-Konto ist vielleicht nicht aktiv." - -#~ msgid "Profile URL" -#~ msgstr "URL des Profils" - -#~ msgid "MSN Protocol Plugin" -#~ msgstr "MSN-Protokoll-Plugin" - -#~ msgid "%s is not a valid group." -#~ msgstr "%s ist keine g端ltige Gruppe." - -#~ msgid "Unknown error." -#~ msgstr "Unbekannter Fehler." - -#~ msgid "%s on %s (%s)" -#~ msgstr "%s auf %s (%s)" - -#~ msgid "Unable to add user on %s (%s)" -#~ msgstr "Kann den Benutzer nicht zu %s (%s) hinzuf端gen" - -#~ msgid "Unable to block user on %s (%s)" -#~ msgstr "Kann den Benutzer nicht f端r %s (%s) blockieren" - -#~ msgid "Unable to permit user on %s (%s)" -#~ msgstr "Kann den Benutzer nicht f端r %s (%s) erlauben" - -#~ msgid "%s could not be added because your buddy list is full." -#~ msgstr "%s konnte nicht hinzugef端gt werden, da Ihre Buddy-Liste voll ist." - -#~ msgid "%s is not a valid passport account." -#~ msgstr "%s ist kein g端ltiges Passport-Konto." - -#~ msgid "Service Temporarily Unavailable." -#~ msgstr "Dienst momentan nicht verf端gbar." - -#~ msgid "Unable to rename group" -#~ msgstr "Kann die Gruppe nicht umbenennen" - -#~ msgid "Unable to delete group" -#~ msgstr "Kann die Gruppe nicht l旦schen" - -#~ msgid "%s has added you to his or her buddy list." -#~ msgstr "Der Benutzer %s hat Sie zu seiner Buddy-Liste hinzugef端gt." - -#~ msgid "%s has removed you from his or her buddy list." -#~ msgstr "Der Benutzer %s hat Sie von seiner Buddy-Liste gel旦scht." - -#~ msgid "" -#~ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ" -#~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>" -#~ msgstr "" -#~ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ" -#~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>" - -#~ msgid "" -#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>" -#~ msgstr "" -#~ "<FONT SIZE=\"4\">IRC-Kanal:</FONT> #pidgin auf irc.freenode.net<BR><BR>" - -#~ msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>" -#~ msgstr "" -#~ "<FONT SIZE=\"4\">XMPP-MUC:</FONT> devel@conference.pidgin.im<BR><BR>" - -#~ msgid "Debugging Information" -#~ msgstr "Debugging-Information" - -#~ msgid "" -#~ "Unrecognized file type\n" -#~ "\n" -#~ "Defaulting to PNG." -#~ msgstr "" -#~ "Nicht erkannter Dateityp\n" -#~ "\n" -#~ "Verwende Standard (PNG)." - -#~ msgid "" -#~ "Error saving image\n" -#~ "\n" -#~ "%s" -#~ msgstr "" -#~ "Fehler beim Speichern des Bildes\n" -#~ "\n" -#~ "%s" - -#~ msgid "Failed to open file '%s': %s" -#~ msgstr "�ffnen der Datei '%s' fehlgeschlagen: %s" - -#~ msgid "" -#~ "Failed to load image '%s': reason not known, probably a corrupt image file" -#~ msgstr "" -#~ "Bild '%s' konnte nicht geladen werden: Grund unbekannt, vermutlich eine " -#~ "korrupte Bilddatei" - -#~ msgid "Insert an <iq/> stanza." -#~ msgstr "Einen <iq/> Block einf端gen." - -#~ msgid "Insert a <presence/> stanza." -#~ msgstr "Einen <presence/> Block einf端gen." - -#~ msgid "Insert a <message/> stanza." -#~ msgstr "Einen <message/> Block einf端gen."
--- a/po/es.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/es.po Wed Aug 11 07:36:56 2010 +0000 @@ -5,10 +5,10 @@ # Copyright (C) April 2003, JM P辿rez C叩ncer <jm@cocoloco.dyn.dhs.org> # Copyright (c) December 2003, Francisco Javier F. Serrador # <franciscojavier.fernandez.serrador@hispalinux.es>, 2003. +# Copyright (C) February 2010, Francisco Javier F. Serrador <fserrador@gmail.com> # Copyright (C) June 2002, April 2003, January 2004, March 2004, September 2004, -# January 2005, 2006-2008, July 2009, July 2010 +# January 2005, 2006-2008, July 2009, July 2010, August 2010 # Javier Fern叩ndez-Sanguino Pe単a <jfs@debian.org> -# Copyright (C) February 2010, Francisco Javier F. Serrador <fserrador@gmail.com> # # Agradecemos la ayuda de revisi坦n realizada por: # Nathaniel Case, Santiago Erquicia, Francisco Javier F. Serrador, @@ -53,8 +53,8 @@ msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 02:07-0400\n" -"PO-Revision-Date: 2010-07-25 16:41+0200\n" +"POT-Creation-Date: 2010-08-07 13:11-0400\n" +"PO-Revision-Date: 2010-08-02 23:10+0200\n" "Last-Translator: Javier Fern叩ndez-Sanguino <jfs@debian.org>\n" "Language-Team: Spanish team <es@li.org>\n" "Language: \n" @@ -6088,7 +6088,7 @@ msgid "The two PINs you entered do not match." msgstr "Las dos PINes que introdujo no coinciden." -msgid "The name you entered is invalid." +msgid "The Display Name you entered is invalid." msgstr "El nombre que introdujo es inv叩lido." msgid "" @@ -6183,9 +6183,6 @@ msgid "Connecting..." msgstr "Conectando..." -msgid "The Display Name you entered is invalid." -msgstr "El nombre que introdujo es inv叩lido." - msgid "The PIN you entered has an invalid length [7-10]." msgstr "El PIN que ha introducido no tiene una longitud v叩lida [7-10]." @@ -13236,13 +13233,11 @@ msgid "Exiting because another libpurple client is already running.\n" msgstr "Saliendo porque est叩 ejecut叩ndose otro cliente de libpurple.\n" -#, fuzzy msgid "_Media" -msgstr "/_Media" - -#, fuzzy +msgstr "_Media" + msgid "_Hangup" -msgstr "Colgar" +msgstr "_Colgar" #, c-format msgid "%s wishes to start an audio/video session with you." @@ -15571,6 +15566,9 @@ msgid "You do not have permission to uninstall this application." msgstr "No tiene permisos para desinstalar esta aplicaci坦n." +#~ msgid "The name you entered is invalid." +#~ msgstr "El nombre que introdujo es inv叩lido." + #~ msgid "/Media/_Hangup" #~ msgstr "/Media/_Colgar"
--- a/po/fr.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/fr.po Wed Aug 11 07:36:56 2010 +0000 @@ -21,14 +21,14 @@ msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 01:17-0400\n" -"PO-Revision-Date: 2010-02-22 17:08+0200\n" +"POT-Creation-Date: 2010-08-03 18:32+0200\n" +"PO-Revision-Date: 2010-08-03 18:31+0200\n" "Last-Translator: �ric Boumaour <zongo_fr@users.sourceforge.net>\n" "Language-Team: fr <fr@li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=2; plural=n>1;\n" #. Translators may want to transliterate the name. @@ -75,9 +75,8 @@ msgid "Error" msgstr "Erreur" -#, fuzzy msgid "Account was not modified" -msgstr "Le compte n'a pas 辿t辿 ajout辿." +msgstr "Le compte n'a pas 辿t辿 modifi辿." msgid "Account was not added" msgstr "Le compte n'a pas 辿t辿 ajout辿." @@ -88,10 +87,14 @@ msgid "" "The account's protocol cannot be changed while it is connected to the server." msgstr "" +"Le protocole du compte ne peut pas 棚tre chang辿 pendant que celui-ci est " +"connect辿." msgid "" "The account's username cannot be changed while it is connected to the server." msgstr "" +"Le nom d'utilisateur du compte ne peut pas 棚tre chang辿 pendant que celui-ci " +"est connect辿." msgid "New mail notifications" msgstr "Avertir des nouveaux courriers" @@ -862,8 +865,8 @@ "System events will only be logged if the \"Log all status changes to system " "log\" preference is enabled." msgstr "" -"Les 辿v辿nements syst竪me ne seront archiv辿s que si l'option 束�Archiver tous " -"les changements d'辿tat dans les archives syst竪me�損 est activ辿e." +"Les 辿v辿nements syst竪me ne seront archiv辿s que si l'option 束�Archiver tous les " +"changements d'辿tat dans les archives syst竪me�損 est activ辿e." msgid "" "Instant messages will only be logged if the \"Log all instant messages\" " @@ -1705,6 +1708,8 @@ "The certificate is not valid yet. Check that your computer's date and time " "are accurate." msgstr "" +"Ce certificat n'est pas encore valide. Veuillez v辿rifier que la date et " +"l'heure sur cette machine sont bien r辿gl辿es." msgid "The certificate has expired and should not be considered valid." msgstr "Le certificat a expir辿 et ne devrait pas 棚tre consid辿r辿 valide." @@ -2759,8 +2764,7 @@ msgstr "Message d辿connect辿" msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog" -msgstr "" -"Vous pouvez modifier ou supprimer l'alerte dans la fen棚tre 束�Alertes�損." +msgstr "Vous pouvez modifier ou supprimer l'alerte dans la fen棚tre 束�Alertes�損." msgid "Yes" msgstr "Oui" @@ -3880,19 +3884,19 @@ msgstr "" "Le serveur pense que l'authentification est termin辿e, et le client non." -#, fuzzy msgid "Server may require plaintext authentication over an unencrypted stream" msgstr "" -"Le serveur demande une authentification en texte non chiffr辿 au travers d'un " -"flux crypt辿." - -#, fuzzy, c-format +"Le serveur peut demander une authentification en texte non chiffr辿 au " +"travers d'un flux non crypt辿." + +#, c-format msgid "" "%s may require plaintext authentication over an unencrypted connection. " "Allow this and continue authentication?" msgstr "" -"%s demande une authentification en texte clair au travers d'une connexion " -"non crypt辿e. Voulez-vous autoriser ceci et continuer l'authentification�?" +"%s peut demander une authentification en texte clair au travers d'une " +"connexion non crypt辿e. Voulez-vous autoriser ceci et continuer " +"l'authentification�?" msgid "SASL authentication failed" msgstr "�chec de l'authentification SASL" @@ -5984,8 +5988,8 @@ msgid "The two PINs you entered do not match." msgstr "Les nouveaux codes d'acc竪s diff竪rent." -msgid "The name you entered is invalid." -msgstr "Le nom saisi est non valide." +msgid "The Display Name you entered is invalid." +msgstr "Le nom � afficher saisi est non valide." msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -6006,9 +6010,8 @@ "Les informations de votre profil n'ont pu 棚tre r辿cup辿r辿es. Veuillez " "r辿essayer plus tard." -#, fuzzy msgid "Your UID" -msgstr "Votre MXitId" +msgstr "Votre UID" #. pin #. pin (required) @@ -6080,16 +6083,12 @@ msgid "Connecting..." msgstr "Connexion..." -#, fuzzy -msgid "The Display Name you entered is invalid." -msgstr "Le nom saisi est non valide." - msgid "The PIN you entered has an invalid length [7-10]." msgstr "Le code d'acc竪s saisi n'a pas la bonne taille [7-10]." #. mxit login name msgid "MXit ID" -msgstr "" +msgstr "Identifiant MXit" #. show the form to the user to complete msgid "Register New MXit Account" @@ -6120,15 +6119,14 @@ msgid "Invalid country selected. Please try again." msgstr "Pays choisi non valide. Veuillez r辿essayer plus tard." -#, fuzzy msgid "The MXit ID you entered is not registered. Please register first." msgstr "" -"Le nom d'utilisateur n'est pas enregistr辿. Veuillez l'enregistrer d'abord." - -#, fuzzy +"L'identifiant MXit saisi n'est pas enregistr辿. Veuillez l'enregistrer " +"d'abord." + msgid "The MXit ID you entered is already registered. Please choose another." msgstr "" -"Le nom d'utilisateur est d辿j� enregistr辿. Veuillez en choisir un autre." +"L'identifiant MXit saisi est d辿j� enregistr辿. Veuillez en choisir un autre." msgid "Internal error. Please try again later." msgstr "Erreur interne. Veuillez r辿essayer plus tard." @@ -6172,9 +6170,8 @@ msgid "Hidden Number" msgstr "Num辿ro cach辿" -#, fuzzy msgid "Your MXit ID..." -msgstr "Votre MXitId" +msgstr "Votre identifiant MXitId..." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -6188,26 +6185,21 @@ msgstr "Activer l'affichage de la banni竪re" #. you were kicked -#, fuzzy msgid "You have been kicked from this MultiMX." -msgstr "Vous avez 辿t辿 expuls辿�: (%s)" - -#, fuzzy +msgstr "Vous avez 辿t辿 expuls辿 de ce MultiMX." + msgid "was kicked" -msgstr "Mauvais ticket" - -#, fuzzy +msgstr "a 辿t辿 expuls辿" + msgid "_Room Name:" msgstr "_Salon�:" #. Display system message in chat window -#, fuzzy msgid "You have invited" -msgstr "Vous avez du courrier�!" - -#, fuzzy +msgstr "Vous avez 辿t辿 invit辿" + msgid "Last Online" -msgstr "En ligne" +msgstr "En ligne derni竪rement" #. we must have lost the connection, so terminate it so that we can reconnect msgid "We have lost the connection to MXit. Please reconnect." @@ -7983,15 +7975,14 @@ "d'images. Votre adresse IP sera r辿v辿l辿e et ceci peut 棚tre consid辿r辿 comme " "une faille de s辿curit辿." -#, fuzzy msgid "Invalid SNAC" -msgstr "Identifiant non valide" +msgstr "SNAC non valide" msgid "Server rate limit exceeded" -msgstr "" +msgstr "Vitesse du serveur d辿pass辿e" msgid "Client rate limit exceeded" -msgstr "" +msgstr "Vitesse du client d辿pass辿e" msgid "Service unavailable" msgstr "Service non disponible" @@ -10260,9 +10251,8 @@ msgid "Ignore conference and chatroom invitations" msgstr "Ignorer les invitations aux conf辿rences et salons de discussions" -#, fuzzy msgid "Use account proxy for HTTP and HTTPS connections" -msgstr "Utiliser le proxy du compte pour les connexions SSL" +msgstr "Utiliser le proxy du compte pour les connexions HTTP et HTTPS" msgid "Chat room list URL" msgstr "URL de liste des salons de discussions" @@ -10356,8 +10346,8 @@ msgstr "" "Le serveur Yahoo! a demand辿 une m辿thode d'authentification non reconnue. " "Cette version de l'application n'arrivera probablement pas � se connecter au " -"service Yahoo!. Vous pouvez v辿rifier qu'une mise � jour est disponible sur " -"%s." +"service Yahoo!. Vous pouvez v辿rifier qu'une mise � jour est disponible sur %" +"s." msgid "Failed Yahoo! Authentication" msgstr "�chec de l'authentification Yahoo!" @@ -12472,8 +12462,8 @@ "to multiple messaging services at once. %s is written in C using GTK+. %s " "is released, and may be modified and redistributed, under the terms of the " "GPL version 2 (or later). A copy of the GPL is distributed with %s. %s is " -"copyrighted by its contributors, a list of whom is also distributed with " -"%s. There is no warranty for %s.<BR><BR>" +"copyrighted by its contributors, a list of whom is also distributed with %" +"s. There is no warranty for %s.<BR><BR>" msgstr "" "%s est un client de messagerie bas辿 sur libpurple capable de se connecter � " "de multiples services de messageries instantan辿es. %s est 辿crit en C et " @@ -13028,16 +13018,16 @@ #, c-format msgid "" -"Are you sure you want to permanently delete the log of the conversation in " -"%s which started at %s?" +"Are you sure you want to permanently delete the log of the conversation in %" +"s which started at %s?" msgstr "" "�tes-vous s短r de vouloir supprimer les archives de la conversation dans %s " "dat辿e du %s�?" #, c-format msgid "" -"Are you sure you want to permanently delete the system log which started at " -"%s?" +"Are you sure you want to permanently delete the system log which started at %" +"s?" msgstr "�tes-vous s短r de vouloir supprimer les archives syst竪me dat辿es du %s�?" msgid "Delete Log?" @@ -13143,13 +13133,11 @@ msgid "Exiting because another libpurple client is already running.\n" msgstr "Arr棚t � cause d'un autre client libpurple existant.\n" -#, fuzzy msgid "_Media" -msgstr "/_M辿dia" - -#, fuzzy +msgstr "_M辿dia" + msgid "_Hangup" -msgstr "Raccrocher" +msgstr "_Raccrocher" #, c-format msgid "%s wishes to start an audio/video session with you." @@ -14852,8 +14840,8 @@ "'Enter' in the entry box to send. Watch the debug window." msgstr "" "Permet d'envoyer des donn辿es brutes aux protocoles en mode texte (XMPP, MSN, " -"IRC, TOC). Tapez 束�Entr辿e�損 dans la bo樽te de saisie pour envoyer. Observez " -"le r辿sultat dans la fen棚tre de debug." +"IRC, TOC). Tapez 束�Entr辿e�損 dans la bo樽te de saisie pour envoyer. Observez le " +"r辿sultat dans la fen棚tre de debug." #, c-format msgid "You can upgrade to %s %s today." @@ -15378,13 +15366,13 @@ #, no-c-format msgid "" "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual " -"installation instructions are at: http://developer.pidgin.im/wiki/Installing" -"%20Pidgin#manual_win32_spellcheck_installation" +"installation instructions are at: http://developer.pidgin.im/wiki/Installing%" +"20Pidgin#manual_win32_spellcheck_installation" msgstr "" "Erreur lors de l'installation du correcteur orthographique ($R3).$\\rSi une " "nouvelle tentative 辿choue, veuillez suivre les instructions sur http://" -"developer.pidgin.im/wiki/Installing" -"%20Pidgin#manual_win32_spellcheck_installation" +"developer.pidgin.im/wiki/Installing%" +"20Pidgin#manual_win32_spellcheck_installation" #. Installer Subsection Text msgid "GTK+ Runtime (required if not present)" @@ -15463,6 +15451,9 @@ msgid "You do not have permission to uninstall this application." msgstr "Vous n'avez pas les permissions pour supprimer cette application." +#~ msgid "The name you entered is invalid." +#~ msgstr "Le nom saisi est non valide." + #~ msgid "The certificate is not valid yet." #~ msgstr "Le certificat n'est pas encore valide."
--- a/po/he.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/he.po Wed Aug 11 07:36:56 2010 +0000 @@ -1,5 +1,5 @@ # Pidgin Hebrew translation -# Copyright (C) 2005-2009, Shalom Craimer <scraimer at gmail dot com> +# Copyright (C) 2005-2010, Shalom Craimer <scraimer at gmail dot com> # Copyright (C) 2003, Pavel Bibergal cyberkm@barak-online.net # # This file is distributed under the same license as the Pidgin package. @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: he\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 01:17-0400\n" -"PO-Revision-Date: 2010-05-24 15:59+0200\n" +"POT-Creation-Date: 2010-08-07 13:11-0400\n" +"PO-Revision-Date: 2010-08-01 09:55+0200\n" "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n" "Language-Team: Hebrew <he@li.org>\n" "Language: he\n" @@ -60,9 +60,8 @@ msgid "Error" msgstr "廩����" -#, fuzzy msgid "Account was not modified" -msgstr "��廩��� �� ��廖廝" +msgstr "��廩��� �� 廣����" msgid "Account was not added" msgstr "��廩��� �� ��廖廝" @@ -72,11 +71,11 @@ msgid "" "The account's protocol cannot be changed while it is connected to the server." -msgstr "" +msgstr "�� ��廬� �廩��廬 �廬 �廚廨���廡�� 廩� ��廩��� �廣��� ����廨." msgid "" "The account's username cannot be changed while it is connected to the server." -msgstr "" +msgstr "�� ��廬� �廩��廬 �廬 廩� ��廩廬�廩 �廣��� ����廨 �廩廨廬." msgid "New mail notifications" msgstr "���廣� 廣� ���廨 ��廩" @@ -1652,7 +1651,7 @@ msgid "" "The certificate is not valid yet. Check that your computer's date and time " "are accurate." -msgstr "" +msgstr "�廬廣��� 廣�� �� �廬�廡廝. �廩 ����� �� �廩廣� ��廬�廨�� 廩� ��廩�� �����廡��." msgid "The certificate has expired and should not be considered valid." msgstr "廬�廡廝 �廬廣��� 廚�, ���� ��� ���廩��� �廬廡廚�." @@ -3747,15 +3746,16 @@ msgid "Server thinks authentication is complete, but client does not" msgstr "�廩廨廬 廖��廨 廩�����廬 �廖廬��� ��廢���, ��� 廬���廬 ��廡�� �� �廖����" -#, fuzzy msgid "Server may require plaintext authentication over an unencrypted stream" -msgstr "�廩廨廬 ��廨廩 ����廬 �� ��廢廚� �廣� 廬廡廩�廨廬 �� ��廢廚�廬" - -#, fuzzy, c-format +msgstr "��廬�� ��廩廨廬 ��廨廩 ����廬 �� ��廢廚� �廣� 廬廡廩�廨廬 �� ��廢廚�廬" + +#, c-format msgid "" "%s may require plaintext authentication over an unencrypted connection. " "Allow this and continue authentication?" -msgstr "%s ��廨廩 ����廬 �� ��廢廚� �廣� 廬廡廩�廨廬 �� ��廢廚�廬. ��廚廩廨 ����廩�� ��� ��廬?" +msgstr "" +"��廬�� ��廩廨廬 %s ��廨廩 ����廬 �� ��廢廚� �廣� 廬廡廩�廨廬 �� ��廢廚�廬. ��廚廩廨 ����廩�� ��� " +"��廬?" msgid "SASL authentication failed" msgstr "����廬 SASL ��廩�" @@ -5786,8 +5786,8 @@ msgid "The two PINs you entered do not match." msgstr "廩�� �-PIN 廩���廬 ���� ����." -msgid "The name you entered is invalid." -msgstr "�廩� 廩���廬 ���� ��廡�." +msgid "The Display Name you entered is invalid." +msgstr "���廬 廩�-廬廢��� �� 廬廡廝." msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -5805,9 +5805,8 @@ msgid "Your profile information is not yet retrieved. Please try again later." msgstr "廚廨�� �廚廨�廚�� 廩�� 廣�� �� �廬廡���. �廩 ��廖�廬 廩��廬 ����廨 ��廬廨." -#, fuzzy msgid "Your UID" -msgstr "���� MXit 廩��" +msgstr "�-UID 廩��" #. pin #. pin (required) @@ -5875,16 +5874,12 @@ msgid "Connecting..." msgstr "�廬��廨..." -#, fuzzy -msgid "The Display Name you entered is invalid." -msgstr "�廩� 廩���廬 ���� ��廡�." - msgid "The PIN you entered has an invalid length [7-10]." msgstr "�-PIN 廩���廬 �廣� ��廨� ��-��廡� [7-10[." #. mxit login name msgid "MXit ID" -msgstr "" +msgstr "���� MXit" #. show the form to the user to complete msgid "Register New MXit Account" @@ -5912,13 +5907,11 @@ msgid "Invalid country selected. Please try again." msgstr "���廨� �廨廛 ��-��廡�廬. �廩 ��廖�廬 廩��廬." -#, fuzzy msgid "The MXit ID you entered is not registered. Please register first." -msgstr "廩� ��廩廬�廩 ���� 廨廩��. ���� ���廨廩� 廡���." - -#, fuzzy +msgstr "���� �- Mxit 廩���� ���� 廨廩��. ���� ���廨廩� 廡���." + msgid "The MXit ID you entered is already registered. Please choose another." -msgstr "廩� ��廩廬�廩 ��廨 廨廩��. �廩 ����廨 廩� �廩廬�廩 ��廨." +msgstr "���� MXit �� ��廨 廨廩��. �廩 ����廨 廩� �廩廬�廩 ��廨." msgid "Internal error. Please try again later." msgstr "廩���� 廚����廬. �廩 ��廖�廬 ����廨 ��廬廨." @@ -5962,9 +5955,8 @@ msgid "Hidden Number" msgstr "�廖廚廨 廖���" -#, fuzzy msgid "Your MXit ID..." -msgstr "���� MXit 廩��" +msgstr "���� MXit 廩��.." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -5978,26 +5970,21 @@ msgstr "�廚廩廨 廚廬��廬 ����-�廡���" #. you were kicked -#, fuzzy msgid "You have been kicked from this MultiMX." -msgstr "��廣�廬: (%s)" - -#, fuzzy +msgstr "��廣�廬 �廬�� MultiMX ��." + msgid "was kicked" -msgstr "�廨��廖 �� 廬廡��" - -#, fuzzy +msgstr "��廣�/�" + msgid "_Room Name:" -msgstr "_��廨:" +msgstr "廩� _��廨:" #. Display system message in chat window -#, fuzzy msgid "You have invited" -msgstr "�廩 �� ���廨!" - -#, fuzzy +msgstr "�����廬" + msgid "Last Online" -msgstr "����廨" +msgstr "����廨 ��廨��" #. we must have lost the connection, so terminate it so that we can reconnect msgid "We have lost the connection to MXit. Please reconnect." @@ -7708,10 +7695,10 @@ msgstr "SNAC �� 廬廡廝" msgid "Server rate limit exceeded" -msgstr "" +msgstr "�廚廨�廬 �廣�廨 �����廬 �廩廨廬" msgid "Client rate limit exceeded" -msgstr "" +msgstr "�廚廨�廬 �廣�廨 �����廬 ��廡��" msgid "Service unavailable" msgstr "�廩�廨�廬 ���� ����" @@ -9945,9 +9932,8 @@ msgid "Ignore conference and chatroom invitations" msgstr "�廬廣�� ������廬 �廩���廬-�廣��� ����廨�-廢'��" -#, fuzzy msgid "Use account proxy for HTTP and HTTPS connections" -msgstr "�廩廬�廩 ��廩��� 廩廨廬-廬���� 廣��廨 ����廨� SSL" +msgstr "�廬廩�廩 ��廬��� 廣��廨 ��廩��� �廩��� ����廨� HTTP �-HTTPS" msgid "Chat room list URL" msgstr "��廡�� 廩� 廨廩��廬 ��廨� �廢'��" @@ -12749,13 +12735,11 @@ msgid "Exiting because another libpurple client is already running.\n" msgstr "�廖��� ������ 廩��廨 廨廢� 廬���� ��廨廬 廩��廩廬�廩 �廖廚廨��廬 libpurple.\n" -#, fuzzy msgid "_Media" -msgstr "/_����" - -#, fuzzy +msgstr "_����" + msgid "_Hangup" -msgstr "�廬�廬廡" +msgstr "�廬_�廬廡" #, c-format msgid "%s wishes to start an audio/video session with you." @@ -15008,6 +14992,9 @@ msgid "You do not have permission to uninstall this application." msgstr ".��� �� ���廬 ����廡 廬���� ��廬" +#~ msgid "The name you entered is invalid." +#~ msgstr "�廩� 廩���廬 ���� ��廡�." + #~ msgid "The certificate is not valid yet." #~ msgstr "�廬廣��� 廣���� ���� 廬廡廚�."
--- a/po/nl.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/nl.po Wed Aug 11 07:36:56 2010 +0000 @@ -6,12 +6,12 @@ # msgid "" msgstr "" -"Project-Id-Version: pidgin 2.7.1\n" +"Project-Id-Version: pidgin 2.7.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 01:18-0400\n" -"PO-Revision-Date: 2010-07-25 14:26+0100\n" -"Last-Translator: Gideon van Melle <translations@gvmelle.com>\n" -"Language-Team: Dutch <translations@gmvelle.com>\n" +"POT-Creation-Date: 2010-08-07 13:11-0400\n" +"PO-Revision-Date: 2010-08-01 09:08+0100\n" +"Last-Translator: Dingoe <translations@gvmelle.com>\n" +"Language-Team: Dutch <translations@gvmelle.com>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5970,8 +5970,8 @@ msgid "The two PINs you entered do not match." msgstr "De twee PINcodes die u invulde zijn niet gelijk." -msgid "The name you entered is invalid." -msgstr "De naam die u invoerde is ongeldig." +msgid "The Display Name you entered is invalid." +msgstr "De schermnaam die u invoerde is ongeldig." msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -6065,9 +6065,6 @@ msgid "Connecting..." msgstr "Bezig met Verbinden..." -msgid "The Display Name you entered is invalid." -msgstr "De schermnaam die u invoerde is ongeldig." - msgid "The PIN you entered has an invalid length [7-10]." msgstr "De PINcode die u invulde heeft een ongeldige lengte [7-10]." @@ -13133,13 +13130,11 @@ msgid "Exiting because another libpurple client is already running.\n" msgstr "We sluiten af, omdat een andere libpurple cli谷nt al actief is.\n" -#, fuzzy msgid "_Media" -msgstr "/_Media" - -#, fuzzy +msgstr "_Media" + msgid "_Hangup" -msgstr "Ophangen" +msgstr "_Ophangen" #, c-format msgid "%s wishes to start an audio/video session with you." @@ -15325,7 +15320,7 @@ "is provided here for information purposes only. $_CLICK" msgstr "" "$(^Naam) is uitgegeven onder de GNU Generale Publieke Licentie (GPL). De " -"licentie wordt hier slechts gegeven voor informatieve doeleinden. $_KLIK" +"licentie wordt hier slechts gegeven voor informatieve doeleinden. $_CLICK" #. Installer Subsection Detailed Description msgid "A multi-platform GUI toolkit, used by Pidgin" @@ -15467,6 +15462,9 @@ msgid "You do not have permission to uninstall this application." msgstr "U mag dit programma niet verwijderen." +#~ msgid "The name you entered is invalid." +#~ msgstr "De naam die u invoerde is ongeldig." + #~ msgid "/Media/_Hangup" #~ msgstr "/Media/Op_hangen"
--- a/po/nn.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/nn.po Wed Aug 11 07:36:56 2010 +0000 @@ -1,11 +1,12 @@ # # Yngve Spjeld Landro <l10n@landro.net>, 2010. +# msgid "" msgstr "" "Project-Id-Version: gtranslator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 02:06-0400\n" -"PO-Revision-Date: 2010-07-21 23:06+0100\n" +"POT-Creation-Date: 2010-08-07 13:11-0400\n" +"PO-Revision-Date: 2010-08-01 22:11+0200\n" "Last-Translator: Yngve Spjeld Landro <l10n@landro.net>\n" "Language-Team: Norwegian Nynorsk <l10n@landro.net>\n" "Language: nn\n" @@ -5924,8 +5925,8 @@ msgid "The two PINs you entered do not match." msgstr "Dei to PIN-ane du skreiv inn samsvarer ikkje." -msgid "The name you entered is invalid." -msgstr "Namnet du skreiv er ugyldig." +msgid "The Display Name you entered is invalid." +msgstr "Visingsnamnet du skreiv er ugyldig." msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -5944,9 +5945,8 @@ msgid "Your profile information is not yet retrieved. Please try again later." msgstr "Profilopplysningane dine er ikkje henta enno. Pr淡v igjen seinare." -#, fuzzy msgid "Your UID" -msgstr "MXit-ID-en din" +msgstr "UID-en din" #. pin #. pin (required) @@ -6017,16 +6017,12 @@ msgid "Connecting..." msgstr "Koplar til��" -#, fuzzy -msgid "The Display Name you entered is invalid." -msgstr "Namnet du skreiv er ugyldig." - msgid "The PIN you entered has an invalid length [7-10]." msgstr "PIN-en du skreiv nyttar ei ulovleg lengd [7-10]." #. mxit login name msgid "MXit ID" -msgstr "" +msgstr "MXit-ID" #. show the form to the user to complete msgid "Register New MXit Account" @@ -6054,13 +6050,11 @@ msgid "Invalid country selected. Please try again." msgstr "Du valde eit ugyldig land. Pr淡v igjen seinare." -#, fuzzy msgid "The MXit ID you entered is not registered. Please register first." -msgstr "Brukarnamnet er ikkje registrert. Registrer deg f淡rst." - -#, fuzzy +msgstr "MXit-id-en du brukte er ikkje registrert. Registrer deg f淡rst." + msgid "The MXit ID you entered is already registered. Please choose another." -msgstr "Brukarnamnet er allereie registrert. Vel eit anna brukarnamn." +msgstr "MXit-id-en er allereie registrert. Vel ein annan ein." msgid "Internal error. Please try again later." msgstr "Intern feil. Pr淡v igjen seinare." @@ -6104,9 +6098,8 @@ msgid "Hidden Number" msgstr "Skjult nummer" -#, fuzzy msgid "Your MXit ID..." -msgstr "MXit-ID-en din" +msgstr "MXit-id-en din��" #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -6131,13 +6124,11 @@ msgstr "Rom_namn:" #. Display system message in chat window -#, fuzzy msgid "You have invited" -msgstr "Du har f奪tt e-post." - -#, fuzzy +msgstr "Du har invitert " + msgid "Last Online" -msgstr "Tilkopla" +msgstr "Sist tilkopla" #. we must have lost the connection, so terminate it so that we can reconnect msgid "We have lost the connection to MXit. Please reconnect." @@ -13035,13 +13026,11 @@ msgid "Exiting because another libpurple client is already running.\n" msgstr "Avsluttar sidan en annan libpurple-klient allereie kj淡rer.\n" -#, fuzzy msgid "_Media" -msgstr "/_Media" - -#, fuzzy +msgstr "_Media" + msgid "_Hangup" -msgstr "Legg p奪" +msgstr "_Legg pa�" #, c-format msgid "%s wishes to start an audio/video session with you."
--- a/po/pa.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/pa.po Wed Aug 11 07:36:56 2010 +0000 @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 01:18-0400\n" -"PO-Revision-Date: 2010-01-26 05:27+0530\n" +"POT-Creation-Date: 2010-08-07 13:11-0400\n" +"PO-Revision-Date: 2010-08-08 07:23+0530\n" "Last-Translator: A S Alam <aalam@users.sf.net>\n" -"Language-Team: 爬��爬�爬鉦━爰� <punjabi-users@lists.sf.net>\n" +"Language-Team: testLokalize <punjabi-users@lists.sf.net>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,9 +64,8 @@ msgid "Error" msgstr "爬�爬迦┐爰�" -#, fuzzy msgid "Account was not modified" -msgstr "爬�爬�爬鉦�爬�爬� 爬伍┝爬鉦┏爬� 爬�┨爰�爬� 爬�爰�爬む┥ 爬�爬逗�" +msgstr "爬�爬�爬鉦�爬�爬� 爬伍�爬о┸爬� 爬�┨爰�爬� 爬�爬� 爬伍�爬逗�" msgid "Account was not added" msgstr "爬�爬�爬鉦�爬�爬� 爬伍┝爬鉦┏爬� 爬�┨爰�爬� 爬�爰�爬む┥ 爬�爬逗�" @@ -76,11 +75,11 @@ msgid "" "The account's protocol cannot be changed while it is connected to the server." -msgstr "" +msgstr "爬�爬�爬鉦�爬�爬� 爬�┥ 爬�┛爰�爬�爰�爬�爬鉦┣ 爬�└爬迦┸爬� 爬�┨爰�爬� 爬�爬� 爬伍�爬�┥, 爬�爬��爬� 爬�爬� 爬伍┛爬朽┛ 爬�┥爬� 爬�爰�爬��爰�爬� 爬�爰�爬む┥ 爬�爬逗�爛�" msgid "" "The account's username cannot be changed while it is connected to the server." -msgstr "" +msgstr "爬�爬�爬鉦�爬�爬� 爬�┥ 爬��爬�爬酌┛-爬�┥爬� 爬�└爬迦┸爬� 爬�┨爰�爬� 爬�爬� 爬伍�爬�┥, 爬�爬��爬� 爬�爬� 爬伍┛爬朽┛ 爬�┥爬� 爬�爰�爬��爰�爬� 爬�爰�爬む┥ 爬�爬逗�爛�" msgid "New mail notifications" msgstr "爬�┻爰�爬� 爬��爬� 爬��爬�爰�爬�┸爬�爰�爬伍┝爬�" @@ -1251,9 +1250,8 @@ msgid "Someone says your username in chat" msgstr "爬�爬逗┯爰� 爬�� 爬む�爬項┥爬÷┥ 爬�┥爬� 爬�爰園┣爬�┥爬� 爬��爬萎┥爬� 爬迦┸爬� 爬項�" -#, fuzzy msgid "Attention received" -msgstr "爬�爬�爬�爰�爬朽�爬伍┝爬� 爬迦�爰�爰�爬��" +msgstr "爬�爬�爬�爰�爬朽�爬伍┝爬� 爬迦�爰�爰�爬�� 爬項�" msgid "GStreamer Failure" msgstr "爬�爰�爬伍�爬萎�爬�┛ 爬��爬迦�爬�" @@ -1636,13 +1634,11 @@ msgid "Set User Info" msgstr "爬��爬�爬酌┛ 爬�爬鉦┌爬�爬鉦┛爰� 爬�┸爬�" -#, fuzzy msgid "This protocol does not support setting a public alias." -msgstr "爬�爬� 爬��爬萎�爬�爰�爬�爬鉦┣ 爬�爰園┣爬�┥爬� 爬萎�爬� 爬迦� 爬伍┨爬鉦�爬� 爬�┨爰�爬� 爬項�爛�" - -#, fuzzy +msgstr "爬�爬� 爬��爬萎�爬�爰�爬�爬鉦┣ 爬�━爬迦┸爬� 爬�爬�-爬�┥爬� 爬迦�爬� 爬迦� 爬伍┨爬鉦�爬� 爬�┨爰�爬� 爬項�爛�" + msgid "This protocol does not support fetching the public alias." -msgstr "爬�爬� 爬��爬萎�爬�爰�爬�爬鉦┣ 爬�爰園┣爬�┥爬� 爬萎�爬� 爬迦� 爬伍┨爬鉦�爬� 爬�┨爰�爬� 爬項�爛�" +msgstr "爬�爬� 爬��爬萎�爬�爰�爬�爬鉦┣ 爬�━爬迦┸爬� 爬�爬�-爬�┥爬� 爬迦�爬� 爬迦� 爬伍┨爬鉦�爬� 爬�┨爰�爬� 爬項�爛�" msgid "Unknown" msgstr "爬�爬��爬鉦┌" @@ -1664,7 +1660,7 @@ msgid "" "The certificate is not valid yet. Check that your computer's date and time " "are accurate." -msgstr "" +msgstr "爬伍┛爬�爰�爬�┸爬�爰�爬� 爬項┥爬� 爬迦┥爬�爰� 爬�┨爰�爬� 爬項�爛� 爬�爬�┌爰� 爬�爰萎┴爬逗�爬�爬� 爬�� 爬�┸爬む� 爬む� 爬伍┏爬鉦� 爬�爰�爰園� 爬�爬萎� 爬�爬� 爬�爰� 爬�爬� 爬�爰�爬� 爬項�爛�" msgid "The certificate has expired and should not be considered valid." msgstr "爬伍┛爬�爰�爬�┸爬�爰�爬� 爬�� 爬�┸爬�爬� 爬��爰園� 爬�爰�爰園�爰� 爬項� 爬�爬む� 爬�爬鉦�爬�爬� 爬�┨爰�爬� 爬��爬�┸爬� 爬�爬� 爬伍�爬�┥ 爬項�爛�" @@ -3775,17 +3771,16 @@ msgid "Server thinks authentication is complete, but client does not" msgstr "爬伍┛爬朽┛ 爬伍�爬�爬�┥ 爬項� 爬�爬� 爬�┛爬�┥爬��爬逗┐爬� 爬��爬萎� 爬項� 爬�爬� 爬項�, 爬�┛ 爬�爬迦┥爬�爬� 爬�┨爰�爬�" -#, fuzzy msgid "Server may require plaintext authentication over an unencrypted stream" -msgstr "爬伍┛爬朽┛ 爬��爰� 爬�爰園� 爬�爬酌�爬�-爬�爰萎�爰�爬萎┸爬��爬� 爬伍�爬萎�爬� 爬迦� 爬�┣爰�爬�-爬�爰�爬�爬伍� 爬�┛爬�┥爬��爬逗┐爬� 爬�� 爬迦�爰� 爬項�爛�" - -#, fuzzy, c-format +msgstr "爬伍┛爬朽┛ 爬��爰� 爬�爰園� 爬�爬酌�爬�-爬�爰萎�爰�爬萎┸爬��爬� 爬伍�爬萎�爬� 爬迦� 爬�┣爰�爬�-爬�爰�爬�爬伍� 爬�┛爬�┥爬��爬逗┐爬� 爬�� 爬迦�爰� 爬項� 爬伍�爬�� 爬項�爛�" + +#, c-format msgid "" "%s may require plaintext authentication over an unencrypted connection. " "Allow this and continue authentication?" msgstr "" -"%s 爬迦� 爬�爬酌�爬�-爬�爰萎�爰�爬萎┸爬��爬� 爬�爰�爬��爬�爬伍┝爬� 爬�爰園┐爰� 爬�┣爰�爬�-爬�爰�爬�爬伍� 爬�┛爬�┥爬��爬逗┐爬� 爬迦�爰�爰�爬�� 爬項�爛� 爬�爰� 爬�爬� 爬�┛爬�┥爬�┸爬�爬む┥ 爬�┬爬�爬酌�爬� " -"爬�爬萎�爰� 爬�爬鉦┛爰� 爬萎�爬�爬�┥ 爬項�?" +"%s 爬迦� 爬�爬酌�爬�-爬�爰萎�爰�爬萎┸爬��爬� 爬�爰�爬��爬�爬伍┝爬� 爬�爰園┐爰� 爬�┣爰�爬�-爬�爰�爬�爬伍� 爬�┛爬�┥爬��爬逗┐爬� 爬迦�爰�爰�爬�� 爬項� 爬伍�爬�� 爬項�爛� 爬�爰� 爬�爬� 爬�┛爬�┥爬�┸爬�爬む┥ " +"爬�┬爬�爬酌�爬� 爬�爬萎�爰� 爬�爬鉦┛爰� 爬萎�爬�爬�┥ 爬項�?" msgid "SASL authentication failed" msgstr "SASL 爬��爬萎┏爬鉦┌爬逗�爬む┥ 爬�爬伍┼爬�" @@ -3795,38 +3790,35 @@ msgid "SASL error: %s" msgstr "SASL 爬�爬迦┐爰�: %s" -#, fuzzy msgid "Invalid Encoding" -msgstr "爬�爬迦┐ 爬�爰萎┴爰�爰園� 爬項┥爬迦┐" - -#, fuzzy +msgstr "爬�爬迦┐ 爬�爰萎�爰�爬÷┸爰萎�" + msgid "Unsupported Extension" -msgstr "爬�┥爬伍┨爬鉦�爬� 爬朽┛爬�爬�" +msgstr "爬�爬酌�爬�-爬伍┨爬鉦�爬� 爬�爬�爬伍�爰�爬�┯爬酌┬" msgid "" "Unexpected response from the server. This may indicate a possible MITM " "attack" -msgstr "" +msgstr "爬伍┛爬朽┛ 爬朽┣爰�爬� 爬�爬��爬鉦┌ 爬�爬朽┥爬� 爬項�爛� 爬�爬� 爬伍�爬〝┻ MITM 爬項┏爬迦� 爬�┥ 爬伍�爬�爰�爬� 爬項� 爬伍�爬�┥ 爬項�爛�" msgid "" "The server does support channel binding, but did not appear to advertise " "it. This indicates a likely MITM attack" msgstr "" - -#, fuzzy +"爬伍┛爬朽┛ 爬�爰�爬�┣ 爬�┥爬�爬÷┸爰萎� 爬迦� 爬伍┨爬鉦�爬� 爬�┨爰�爬� 爬項�, 爬�┛ 爬�爬迦┥爬� 爬�┨爰�爬� 爬�爰�爬む┥ 爬�爬鉦┴爬�┥ 爬項�爛� 爬�爬� MITM 爬項┏爬迦� 爬�� 爬伍�爬�爰�爬� " +"爬項� 爬伍�爬�┥ 爬項�爛�" + msgid "Server does not support channel binding" -msgstr "爬伍┛爬朽┛ 爬�┥爬��爬�� 爬迦� 爬伍┨爬鉦�爬� 爬�┨爰�爬� 爬項�" - -#, fuzzy +msgstr "爬伍┛爬朽┛ 爬�爰�爬�┣ 爬�┥爬�爬÷┸爰萎� 爬迦� 爬伍┨爬鉦�爬� 爬�┨爰�爬� 爬項�" + msgid "Unsupported channel binding method" -msgstr "爬�┥-爬伍┨爬鉦�爬� 爬�爰萎�爰�爬÷┸爰萎�" +msgstr "爬�┥-爬伍┨爬鉦�爬� 爬�爰�爬�┣ 爬�┥爬�爬÷┸爰萎� 爬∇�爬�" msgid "User not found" msgstr "爬��爬�爬酌┛ 爬��爬�爰�爬� 爬�┨爰�爬� 爬項�" -#, fuzzy msgid "Invalid Username Encoding" -msgstr "爬�爬迦┐ 爬��爬�爬酌┛ 爬�┥爬�" +msgstr "爬�爬迦┐ 爬��爬�爬酌┛ 爬�爰萎�爰�爬÷┸爰萎�" msgid "Resource Constraint" msgstr "爬伍┛爰�爬� 爬�┥爬��爬��" @@ -4144,9 +4136,8 @@ msgid "Invalid XMPP ID" msgstr "爬�爬迦┐ XMPP ID" -#, fuzzy msgid "Invalid XMPP ID. Username portion must be set." -msgstr "爬�爬迦┐ XMPP ID 爬項�爛� 爬÷�爬��爬� 爬伍�爰園� 爬�爬萎┬爰� 爬迦┥爬�爬酌┏爰� 爬項�爛�" +msgstr "爬�爬迦┐ XMPP ID 爬項�爛� 爬��爬�爬酌┛-爬�┥爬� 爬伍�爰園� 爬�爬萎┬爬� 爬迦┥爬�爬酌┏爰� 爬項�爛�" msgid "Invalid XMPP ID. Domain must be set." msgstr "爬�爬迦┐ XMPP ID 爬項�爛� 爬÷�爬��爬� 爬伍�爰園� 爬�爬萎┬爰� 爬迦┥爬�爬酌┏爰� 爬項�爛�" @@ -4278,13 +4269,11 @@ msgid "Allow Buzz" msgstr "爬��爬�爬� 爬�┬爬�爬酌�爬�" -#, fuzzy msgid "Mood Name" -msgstr "爬��爬� 爬�┥爬�" - -#, fuzzy +msgstr "爬��爬� 爬�┥爬�" + msgid "Mood Comment" -msgstr "爬伍�爬��爬項� 爬�爬逗�爬�┌爰�" +msgstr "爬��爬� 爬�爬逗�爬�┌爰�" #. primitive #. ID @@ -4578,9 +4567,8 @@ msgid "Initiate Media" msgstr "爬��爬÷┸爬� 爬伍┝爰�爬萎�" -#, fuzzy msgid "Account does not support PEP, can't set mood" -msgstr "爬�爬� 爬��爬萎�爬�爰�爬�爬鉦┣ 爬�爰園┣爬�┥爬� 爬萎�爬� 爬迦� 爬伍┨爬鉦�爬� 爬�┨爰�爬� 爬項�爛�" +msgstr "爬�爬�爬鉦�爬�爬� PEP 爬迦� 爬伍┨爬鉦�爬� 爬�┨爰�爬�, 爬��爬� 爬伍�爰園� 爬�┨爰�爬� 爬�爰�爬む┥ 爬�爬� 爬伍�爬�┥" msgid "config: Configure a chat room." msgstr "config: Configure a chat room." @@ -4634,9 +4622,8 @@ msgid "buzz: Buzz a user to get their attention" msgstr "爬��爬�爬�: 爬��爬�爬酌┛ 爬�┥ 爬о┸爬�爬� 爬��爬�爬�爬� 爬朽┥爬伍┐爰� 爬�爬� 爬��爰� 爬��爬�爬� 爬〝�爬�爰�" -#, fuzzy msgid "mood: Set current user mood" -msgstr "爬�爰�爬� 爬��爬�爬酌┛ 爬�爰�爬��" +msgstr "爬��爬�: 爬��爬�爰�爬�┥ 爬��爬�爬酌┛ 爬��爬� 爬伍�爰園� 爬�爬萎�" msgid "Extended Away" msgstr "爬�┨爰�爰萎� 爬む�爬� 爬��爬�" @@ -4714,18 +4701,17 @@ msgid "(Code %s)" msgstr "(爬�爰�爬� %s)" -#, fuzzy msgid "A custom smiley in the message is too large to send." -msgstr "爬伍�爬��爬項┥ 爬〝�爬�爬� 爬迦� 爬�爬伍┼爬� 爬項�爛� 爬伍�爬��爬項┥ 爬�┨爰�爬� 爬朽�爬÷┥ 爬項�爛�" +msgstr "爬伍�爬��爬項� '爬� 爬�┯爰萎└爰�爬�┥ 爬伍┏爬鉦�爬迦� 爬�┨爰�爬� 爬朽�爬÷┥ 爬項�爛�" msgid "XMPP stream header missing" -msgstr "" +msgstr "XMPP 爬伍�爬萎�爬� 爬項�爰園─爬� 爬伍�爬〝┻ 爬�┨爰�爬� 爬項�" msgid "XMPP Version Mismatch" -msgstr "" +msgstr "XMPP 爬朽┛爬�爬� 爬�┨爰�爬� 爬�┸爬迦└爬�" msgid "XMPP stream missing ID" -msgstr "" +msgstr "XMPP 爬伍�爰�爬萎┏ ID 爬�爰�爰萎┏ 爬項�" msgid "XML Parse error" msgstr "XML 爬�┥爬萎┯ 爬�爬迦┐爰�" @@ -4784,7 +4770,7 @@ msgstr "爬�┥爬�爬� %s 爬��爰� 爬〝�爬�爬� 爬迦� 爬�爬伍┏爬萎�爬� 爬項�, 爬�┥爬�爬� 爬�爬萎┥爬�爬伍┼爬� 爬迦� 爬伍┨爬逗┓爰�爬�爰� 爬�┨爰�爬�" msgid "File Send Failed" -msgstr "爬�┥爬�爬� 爬〝�爬�爬�┥ 爬�爬伍┼爬�" +msgstr "爬�┥爬�爬� 爬〝�爬�爬� 爬迦� 爬��爬迦�爬�" #, c-format msgid "Unable to send file to %s, invalid JID" @@ -4803,31 +4789,26 @@ msgid "Please select the resource of %s to which you would like to send a file" msgstr "爬�爰�爬�� 爬�爬� 爬�爬逗┨爰�爰� %s 爬�� 爬伍┛爰�爬� 爬む�爬伍�爬� 爬�爰園� 爬�┥爬�爬� 爬む�爬� 爬む�爬伍�爬� 爬〝�爬�爬�� 爬�爬鉦┨爰�爰萎└爰� 爬項�" -#, fuzzy msgid "Afraid" -msgstr "爬�爬萎━爰�" - -#, fuzzy +msgstr "爬÷┛爬逗�" + msgid "Amazed" -msgstr "爬伍┝爬萎┏爬伍┝爬鉦┛" - -#, fuzzy +msgstr "爬÷�爬�-爬〝�爬�" + msgid "Amorous" -msgstr "爬伍┝爬鉦┬爬�┥爬�" +msgstr "爬�爬伍┝爬�爬鉦┬爬�" msgid "Angry" msgstr "爬�爰�爰園┯爰� 爬朽┸爰園�" -#, fuzzy msgid "Annoyed" -msgstr "爬�┥爬��爬��爬伍┝爰�爬�┥" +msgstr "爬�爬酌┸爰園└爰�" msgid "Anxious" msgstr "爬��爬�爰�爬�" -#, fuzzy msgid "Aroused" -msgstr "爬む�爬伍�爬� 爬〝�爬�爬逗�" +msgstr "爬�爬鉦�爬�┥" msgid "Ashamed" msgstr "爬伍┝爬萎┏爬伍┝爬鉦┛" @@ -4835,279 +4816,231 @@ msgid "Bored" msgstr "爬�爰園�爬逗�" -#, fuzzy msgid "Brave" -msgstr "爬伍�爬〝┥爬迦�" - -#, fuzzy +msgstr "爬�┣爰�爬�" + msgid "Calm" -msgstr "爬萎�爬迦�爬�" - -#, fuzzy +msgstr "爬伍┝爬鉦�爬�" + msgid "Cautious" -msgstr "爬�爰園┣爬�┥爬�" - -#, fuzzy +msgstr "爬�爰�爬�爬�" + msgid "Cold" -msgstr "爬�爰�爰�爰�" - -#, fuzzy +msgstr "爬�爰萎─" + msgid "Confident" -msgstr "爬�爬�爬萎┥" - -#, fuzzy +msgstr "爬項�爬伍┣爰� 爬�┥爬�" + msgid "Confused" -msgstr "爬�爬鉦┛爰� 爬萎�爬�爰�" - -#, fuzzy +msgstr "爬�爬迦�爬逗�" + msgid "Contemplative" -msgstr "爬伍�爬�┛爬�" - -#, fuzzy +msgstr "爬�爰萎┐爬� 爬о┸爬�爬�" + msgid "Contented" -msgstr "爬�爰�爰�爬逗�" - -#, fuzzy +msgstr "爬�┛爬伍�爬�" + msgid "Cranky" -msgstr "爬�爰萎┴爬��" +msgstr "爬朽�爬項┏爰�" msgid "Crazy" -msgstr "" - -#, fuzzy +msgstr "爬�爰園┣爬�" + msgid "Creative" -msgstr "爬�┌爬鉦�" - -#, fuzzy +msgstr "爬伍┸爬萎�爬�┯爬酌�爬�" + msgid "Curious" -msgstr "爬伍┝爬鉦┬爬�┥爬�" - -#, fuzzy +msgstr "爬�爬逗�爬伍�" + msgid "Dejected" -msgstr "爬�爬��爬鉦┛ 爬�爰�爬む┥" - -#, fuzzy +msgstr "爬�┸爰萎┏爰�爬�爰�爬�┥" + msgid "Depressed" -msgstr "爬項�爬鉦�爬�" - -#, fuzzy +msgstr "爬��爬�爰�" + msgid "Disappointed" -msgstr "爬�爰�爬��爬�爬謹┬ 爬��爬� 爬項�爛�" +msgstr "爬�┸爬萎┥爬伍┝" msgid "Disgusted" -msgstr "" - -#, fuzzy +msgstr "爬�爰園�爬逗�" + msgid "Dismayed" -msgstr "爬�爬��爬� 爬項�" - -#, fuzzy +msgstr "爬÷┛爬逗�" + msgid "Distracted" -msgstr "爬�爰園─" +msgstr "爬��爬о┸爬�爬�┥" msgid "Embarrassed" -msgstr "" - -#, fuzzy +msgstr "爬�┛爰�爬伍┝爬鉦┬" + msgid "Envious" -msgstr "爬��爬�爰�爬�" +msgstr "爬�爬萎�爬鉦┣爰�" msgid "Excited" msgstr "爬�爰�爬伍┝ 爬朽┸爰園�" -#, fuzzy msgid "Flirtatious" -msgstr "爬伍┝爬鉦┬爬�┥爬�" - -#, fuzzy +msgstr "爬��爬酌┛爰�" + msgid "Frustrated" -msgstr "爬�┨爬逗┣爬鉦� 爬�┥爬�" +msgstr "爬�┸爬萎┥爬伍┝" msgid "Grateful" -msgstr "" - -#, fuzzy +msgstr "爬�爬項┯爬鉦┬爬��爬�" + msgid "Grieving" -msgstr "爬迦┸爬� 爬�爬� 爬萎┸爬項┥ 爬項�..." +msgstr "爬伍�爬�爰�" msgid "Grumpy" -msgstr "爬�爬萎�爰萎┴爰�" - -#, fuzzy +msgstr "爬萎�爰園�爬�" + msgid "Guilty" -msgstr "爬謹┨爬逗┛" +msgstr "爬伍┝爬萎┏爬逗�爬�┥" msgid "Happy" msgstr "爬�爰�爬伍┝" msgid "Hopeful" -msgstr "" +msgstr "爬�爬伍┻爰萎└" msgid "Hot" msgstr "爬項┥爬�" msgid "Humbled" -msgstr "" +msgstr "爬�┸爬�┥爬�┥" msgid "Humiliated" -msgstr "" - -#, fuzzy +msgstr "爬�爬迦�爬� 爬�爰�爬む┥" + msgid "Hungry" -msgstr "爬�爰�爰園┯爰� 爬朽┸爰園�" - -#, fuzzy +msgstr "爬〝�爰園�爬�" + msgid "Hurt" -msgstr "爬項┥爬伍┥" +msgstr "爬�└爬伍┣爰�爬�爰�" msgid "Impressed" -msgstr "" - -#, fuzzy +msgstr "爬�┛爬〝┥爬朽┸爬�" + msgid "In awe" -msgstr "爬�┸爬�爬� 爬�┥爬�" +msgstr "爬伍┬爬�┥爬� '爬�" msgid "In love" msgstr "爬�┸爬�爬� 爬�┥爬�" -#, fuzzy msgid "Indignant" -msgstr "爬�爰萎─爰�爬��爬伍┝爰�爬�爬�" - -#, fuzzy +msgstr "爬萎�爰園┯爬逗�" + msgid "Interested" -msgstr "爬�┸爬迦�爬伍┴爰�爬�爬�" - -#, fuzzy +msgstr "爬�爬む┯爬�" + msgid "Intoxicated" -msgstr "爬伍�爬�┥ 爬〝�爬�爬逗�" +msgstr "爬�└爬項�爬伍┝" msgid "Invincible" msgstr "爬�爬�爬逗�爬�" msgid "Jealous" -msgstr "爬�爬萎�爬鉦┣爰�" - -#, fuzzy +msgstr "爬�爬萎�爬�" + msgid "Lonely" -msgstr "爬�┥爬�爬�┛" - -#, fuzzy +msgstr "爬�爰園�爬迦�" + msgid "Lost" -msgstr "爬伍┃ 爬む�爬� 爬�爰園�爰�" +msgstr "爬�爰�爬�爬�爬逗�" msgid "Lucky" -msgstr "" - -#, fuzzy +msgstr "爬�爬逗┯爬�┐ 爬朽┥爬迦┥" + msgid "Mean" -msgstr "爬�爬萎┏爬�" - -#, fuzzy +msgstr "爬伍┝爰�爬�" + msgid "Moody" -msgstr "爬��爬�" +msgstr "爬�┸爬迦�爰�爬�" msgid "Nervous" -msgstr "" - -#, fuzzy +msgstr "爬��爬�爬�┣爬逗�" + msgid "Neutral" -msgstr "爬朽�爬萎┻爬�" - -#, fuzzy +msgstr "爬�爬�┸爬伍┝爬�爬�" + msgid "Offended" -msgstr "爬�爬�┣爬鉦�爬�" +msgstr "爬��爬伍┝爰�" msgid "Outraged" -msgstr "" - -#, fuzzy +msgstr "爬�爬む┸爰園�爬�爬鉦┛爰�" + msgid "Playful" -msgstr "爬�爬迦┥爬�" - -#, fuzzy +msgstr "爬萎�爬��爰�" + msgid "Proud" -msgstr "爬�爰園�爰�" - -#, fuzzy +msgstr "爬��爬酌┥爬�爰�" + msgid "Relaxed" -msgstr "爬�爬伍┣爰� 爬�┥爬�" - -#, fuzzy +msgstr "爬伍�爬伍┐" + msgid "Relieved" -msgstr "爬�┸爬迦�" - -#, fuzzy +msgstr "爬�爬萎┥爬� '爬�" + msgid "Remorseful" -msgstr "爬項�爬鉦�" - -#, fuzzy +msgstr "爬�┯爬酌�爬鉦┐爬鉦┴爬��爬萎┬" + msgid "Restless" -msgstr "爬萎�爬逗┯爬�爬�" +msgstr "爬��爬�爰�爬�" msgid "Sad" msgstr "爬�爬�┥爬�" -#, fuzzy msgid "Sarcastic" -msgstr "爬�┛爬鉦�爰�" +msgstr "爬朽┸爬�爰萎�爬��" msgid "Satisfied" -msgstr "" - -#, fuzzy +msgstr "爬伍�爬む�爬伍┝爬�" + msgid "Serious" -msgstr "爬伍┝爬鉦┬爬�┥爬�" - -#, fuzzy +msgstr "爬�爰萎┃爰�爬�" + msgid "Shocked" -msgstr "爬�┥爬��爬��" +msgstr "爬伍└爬�┥" msgid "Shy" -msgstr "" +msgstr "爬伍�爬�爬鉦�" msgid "Sick" msgstr "爬��爬�┥爬�" #. Sleepy / Tired msgid "Sleepy" -msgstr "爬�爬�┥爬伍�爬�爬�" +msgstr "爬�爬��爬�爬�┥" msgid "Spontaneous" -msgstr "" - -#, fuzzy +msgstr "爬迦�爬鉦┐爬鉦┛" + msgid "Stressed" -msgstr "爬伍┴爰�爬�" - -#, fuzzy +msgstr "爬�━爬鉦� '爬�" + msgid "Strong" -msgstr "爬�爰�爬�" +msgstr "爬��爬酌━爰�爬�" msgid "Surprised" -msgstr "" +msgstr "爬項�爬萎┥爬�" msgid "Thankful" -msgstr "" +msgstr "爬о�爬�┻爬鉦└爰�" msgid "Thirsty" -msgstr "" - -#, fuzzy +msgstr "爬�爰園�爬�" + msgid "Tired" -msgstr "爬�┥爬�爬�" - -#, fuzzy +msgstr "爬ム�爬�爬逗�/爬ム�爬�爰�" + msgid "Undefined" -msgstr "爬項�爬�爬鉦� 爬迦┥爬�爬�" - -#, fuzzy +msgstr "爬�爬伍┴爬伍┝爬�" + msgid "Weak" -msgstr "爬о�爬�┥" - -#, fuzzy +msgstr "爬項┣爬�爬�" + msgid "Worried" -msgstr "爬�爰園�爬逗�" +msgstr "爬�爬逗�爬む┥爬む�爬�" msgid "Set User Nickname" msgstr "爬��爬�爬酌┛ 爬�┥爬� 爬伍�爰園� 爬�爬萎�" @@ -5352,12 +5285,12 @@ #, c-format msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>" -msgstr "%s 爬�� 爬朽�爬÷┸爬� 爬�爬迦┸爰園┴ 爬〝�爬�爰�爛� <a href='audio://%s'>爬�爬迦┥爬�爬� 爬迦� 爬�爬迦┸爰園� 爬�爬萎�</a>" +msgstr "%s 爬�� 爬朽┸爬÷�爬� 爬�爬迦┸爰園┴ 爬〝�爬�爰�爛� <a href='audio://%s'>爬�爬迦┥爬�爬� 爬迦� 爬�爬迦┸爰園� 爬�爬萎�</a>" # , c-format #, c-format msgid "%s sent a voice clip, but it could not be saved" -msgstr "%s 爬�� 爬朽�爬÷┸爬� 爬�爬迦┸爰園┴ 爬〝�爬�爰�, 爬�┛ 爬伍�爬〝┥爬迦� 爬�┨爰�爬� 爬�爬� 爬伍�爰�爛�" +msgstr "%s 爬�� 爬朽┸爬÷�爬� 爬�爬迦┸爰園┴ 爬〝�爬�爰�, 爬�┛ 爬伍�爬〝┥爬迦� 爬�┨爰�爬� 爬�爬� 爬伍�爰�爛�" # , c-format #, c-format @@ -5701,9 +5634,8 @@ msgid "Show custom smileys" msgstr "爬�爬伍�爬� 爬伍┏爬鉦�爬迦� 爬朽�爬�爰�" -#, fuzzy msgid "Allow direct connections" -msgstr "爬�爰�爬��爬�爬伍┝爬� 爬�┌爬鉦�爬� 爬迦� 爬�爬伍┼爬� 爬項�爛�" +msgstr "爬伍┸爰園├爬� 爬�爰�爬��爬�爬伍┝爬� 爬�┬爬�爬酌�爬� 爬項�" msgid "nudge: nudge a user to get their attention" msgstr "nudge: 爬��爬�爬酌┛ 爬�┥ 爬о┸爬�爬� 爬�爬逗�爬�爬� 爬朽┥爬伍┐爰� 爬伍�爬�┐ (爬伍�爬�爰�爬�) 爬�┥爬萎�" @@ -5902,8 +5834,8 @@ msgid "The two PINs you entered do not match." msgstr "爬む�爬項┥爬÷� 爬朽┣爰�爬� 爬�┸爰園┐爰� 爬��爬朽�爬� 爬�┸爰萎┬ 爬�爬�┯ '爬� 爬�┸爬迦└爰� 爬�┨爰�爬� 爬項┬爛�" -msgid "The name you entered is invalid." -msgstr "爬む�爬項┥爬÷� 爬朽┣爰�爬� 爬�┸爰園┐爬� 爬�┥爬� 爬�爬迦┐ 爬項�爛�" +msgid "The Display Name you entered is invalid." +msgstr "爬む�爬項┥爬÷� 爬朽┣爰�爬� 爬�┸爰園┐爬� 爬÷┸爬伍┴爬迦�爬� 爬�┥爬� 爬�爬迦┐ 爬項�爛�" msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -5922,7 +5854,7 @@ msgstr "爬む�爬項┥爬÷� 爬�┛爰�爬�┥爬�爬� 爬�爬鉦┌爬�爬鉦┛爰� 爬項┥爬迦� 爬迦� 爬�┨爰�爬� 爬�爬� 爬項�爛� 爬�┥爬�爬� 爬朽┸爰園� 爬�爰�爬伍┝爬逗┯爬� 爬�爬萎� 爬�爰�爛�" msgid "Your UID" -msgstr "" +msgstr "爬む�爬項┥爬÷┥ UID" #. pin #. pin (required) @@ -5990,16 +5922,12 @@ msgid "Connecting..." msgstr "爬�爰�爬��爬�爬� 爬�爰�爬む┥ 爬�爬� 爬萎┸爬項┥ 爬項�..." -#, fuzzy -msgid "The Display Name you entered is invalid." -msgstr "爬む�爬項┥爬÷� 爬朽┣爰�爬� 爬�┸爰園┐爬� 爬�┥爬� 爬�爬迦┐ 爬項�爛�" - msgid "The PIN you entered has an invalid length [7-10]." msgstr "爬む�爬項┥爬÷� 爬朽┣爰�爬� 爬�┸爰園┐爰� PIN 爬�� 爬迦�爬�┥爬� 爬�爬迦┐ 爬項� [7-10]" #. mxit login name msgid "MXit ID" -msgstr "" +msgstr "MXit ID" #. show the form to the user to complete msgid "Register New MXit Account" @@ -6027,13 +5955,11 @@ msgid "Invalid country selected. Please try again." msgstr "爬�爬迦┐ 爬��爬伍┝ 爬�爰�爬�┸爬�爛� 爬��爬� 爬�爰�爬伍┝爬逗┯爬� 爬�爬萎� 爬�爰�爛�" -#, fuzzy msgid "The MXit ID you entered is not registered. Please register first." -msgstr "爬��爬�爬酌┛-爬�┥爬� 爬萎�爬逗┯爬�爬� 爬�┨爰�爬� 爬項�爛� 爬�┨爬逗┣爬鉦� 爬萎�爬逗┯爬�爬� 爬�爬萎� 爬�爰�爛�" - -#, fuzzy +msgstr "爬む�爬項┥爬÷� 爬朽┣爰�爬� 爬�┸爰園┐爬� MXit ID 爬萎�爬逗┯爬�爬� 爬�┨爰�爬� 爬項�爛� 爬�┨爬逗┣爬鉦� 爬萎�爬逗┯爬�爬� 爬�爬萎� 爬�爰�爛�" + msgid "The MXit ID you entered is already registered. Please choose another." -msgstr "爬��爬�爬酌┛-爬�┥爬� 爬�┨爬逗┣爬鉦� 爬項� 爬萎�爬逗┯爬�爬� 爬項�爛� 爬朽�爬�爬萎┥ 爬��爬�爬酌┛ 爬�┥爬� 爬�爰�爬�� 爬�爰�爛�" +msgstr "爬む�爬項┥爬÷� 爬朽┣爰�爬� 爬�┸爰園┐爬� MXit ID 爬�┨爬逗┣爬鉦� 爬項� 爬萎�爬逗┯爬�爬� 爬項�爛� 爬朽�爬�爬萎┥ 爬�爰�爬�� 爬�爰�爛�" msgid "Internal error. Please try again later." msgstr "爬�爰萎└爬萎�爬�� 爬�爬迦┐爰�爛� 爬�┥爬�爬� '爬� 爬朽┸爰園� 爬�爰�爬伍┝爬逗┯爬� 爬�爬萎� 爬�爰�爛�" @@ -6070,17 +5996,15 @@ msgid "Status Message" msgstr "爬項┥爬迦┐ 爬伍�爬��爬項┥" -#, fuzzy msgid "Rejection Message" -msgstr "爬��爬萎┥爬�┐ 爬項�爬� 爬伍�爬��爬項�" +msgstr "爬�爬��爬鉦┛ 爬伍�爬��爬項┥" #. hidden number msgid "Hidden Number" msgstr "爬��爬�┛ 爬�爬項┣爰�" -#, fuzzy msgid "Your MXit ID..." -msgstr "Yahoo ID..." +msgstr "爬む�爬項┥爬÷┥ MXit ID..." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -6095,26 +6019,21 @@ # , c-format #. you were kicked -#, fuzzy msgid "You have been kicked from this MultiMX." -msgstr "爬む�爬項┥爬��爰� 爬�爰�爰園─爬� 爬�┥爬萎┸爬�: (%s)" - -#, fuzzy +msgstr "爬む�爬項┥爬�� 爬�爬� 爬�┣爬�爰�MX 爬む�爬� 爬�爬逗�爬� 爬�爰�爬む┥ 爬�爬逗�爛�" + msgid "was kicked" -msgstr "爬�爬迦┐ 爬�爬逗�爬�" - -#, fuzzy +msgstr "爬�爬逗�爬� 爬�爰�爬む┥" + msgid "_Room Name:" -msgstr "爬萎�爬�(_R):" +msgstr "爬萎�爬� 爬�┥爬�(_R):" #. Display system message in chat window -#, fuzzy msgid "You have invited" -msgstr "爬む�爬項┥爬��爰� 爬��爬� 爬�爬� 爬項�!" - -#, fuzzy +msgstr "爬む�爬項┥爬��爰� 爬伍�爬�┥ 爬項�" + msgid "Last Online" -msgstr "爬�爬�┣爬鉦�爬�" +msgstr "爬�爬�爬萎� 爬�爬�┣爬鉦�爬�" #. we must have lost the connection, so terminate it so that we can reconnect msgid "We have lost the connection to MXit. Please reconnect." @@ -6839,9 +6758,9 @@ msgid "Server port" msgstr "爬伍┛爬朽┛ 爬��爬萎�" -#, fuzzy, c-format +#, c-format msgid "Received unexpected response from %s: %s" -msgstr "%s 爬む�爬� 爬�爬�爬鉦┬爬� 爬�爬朽┥爬� 爬�┸爬迦┸爬�" +msgstr "%s 爬む�爬� 爬�爬�爬鉦┬爬� 爬�爬朽┥爬� 爬�┸爬迦┸爬�: %s" #, c-format msgid "Received unexpected response from %s" @@ -6865,14 +6784,16 @@ "Server requested that you fill out a CAPTCHA in order to sign in, but this " "client does not currently support CAPTCHAs." msgstr "" +"爬伍┛爬朽┛ 爬�� 爬��爬� 爬�爰�爬む� 爬項� 爬�爬� 爬む�爬伍�爬� 爬伍┥爬�爬� 爬�爬萎┬ 爬迦� CAPTCHA 爬〝┛爰�, 爬�┛ 爬�爬� 爬�爬迦┥爬�爬� CAPTCHA 爬迦� 爬伍┨爬鉦�爬� " +"爬�┨爰�爬� 爬項�爛�" msgid "AOL does not allow your screen name to authenticate here" msgstr "AOL 爬む�爬項┥爬÷� 爬伍�爬萎�爬� 爬�┥爬� 爬��爰� 爬�爰園┘爰� 爬�┛爬�┥爬�┸爬� 爬�爬萎┬ 爬�┨爰�爬� 爬�┸爰萎└爬� 爬項�爛�" # , c-format -#, fuzzy, c-format +#, c-format msgid "Error requesting %s" -msgstr "%s 爬��爬� 爬��爬萎┥爬� 爬�爬迦┐爰�: %s" +msgstr "%s 爬��爬� 爬��爬萎┥爬� 爬�爬迦┐爰�" msgid "Could not join chat room" msgstr "爬�爰�爬� 爬萎�爬� 爬朽┸爰園� 爬�┥爬�爬� 爬�┨爰�爬� 爬項�爬�爬� 爬�爬� 爬伍�爬逗�" @@ -6941,104 +6862,88 @@ msgstr "%s 爬��爰� 爬伍�爬��爬項┥ 爬〝�爬�爬� 爬迦� 爬�爬伍┏爬萎�爬�: %s" msgid "Thinking" -msgstr "" - -#, fuzzy +msgstr "爬伍�爬� 爬萎┸爬項┥/爬萎┨爰� 爬項┥爬�" + msgid "Shopping" -msgstr "爬迦┸爬�爬�┥ 爬��爬� 爬�爰�爬む┥" - -#, fuzzy +msgstr "爬�爬萎�爬�└爬鉦┛爰� 爬�爬� 爬萎┸爬項┥/爬萎┨爰� 爬項┥爬�" + msgid "Questioning" -msgstr "爬伍┻爬鉦┣ 爬÷┥爬�爬迦┥爬�" - -#, fuzzy +msgstr "爬伍┻爬鉦┣ 爬�爬� 爬萎┸爬項┥/爬萎┨爰� 爬項┥爬�" + msgid "Eating" -msgstr "爬��爬�爬酌┸爰萎�" - -#, fuzzy +msgstr "爬�爬鉦┌爬� 爬�爬� 爬萎┸爬項┥/爬萎┨爰� 爬項┥爬�" + msgid "Watching a movie" -msgstr "爬�爰園� 爬�爰�爬� 爬�爰�爬÷� 爬�爬� 爬萎┨爰� 爬項�" +msgstr "爬�┸爬迦┏ 爬�� 爬萎┸爬項┥ 爬項┥爬�" msgid "Typing" msgstr "爬迦┸爬� 爬萎┸爬項┥/爬萎┨爰� 爬項�" -#, fuzzy msgid "At the office" -msgstr "爬�┼爬酌┐爬� '爬� 爬�┨爰�爬�" +msgstr "爬�┼爬酌┐爬� '爬� 爬項┥爬�" msgid "Taking a bath" -msgstr "" +msgstr "爬�爬伍┝爬�┥爬� 爬�爬� 爬萎┸爬項┥ 爬項┥爬�" msgid "Watching TV" -msgstr "" - -#, fuzzy +msgstr "TV 爬朽�爬�爬逗� 爬�爬� 爬萎┸爬項┥ 爬項�" + msgid "Having fun" -msgstr "爬項�爬�爬� 爬�爰園┴" - -#, fuzzy +msgstr "爬��爬�爬鉦� 爬�爬萎└爬�" + msgid "Sleeping" -msgstr "爬�爬�┥爬伍�爬�爬�" +msgstr "爬伍� 爬萎┨爰�" msgid "Using a PDA" -msgstr "" - -#, fuzzy +msgstr "PDA 爬�� 爬朽┛爬む�爬�" + msgid "Meeting friends" -msgstr "IM 爬��爬伍┐" - -#, fuzzy +msgstr "爬��爬伍┐爬鉦� 爬�┥爬� 爬�┸爬� 爬萎┨爰�" + msgid "On the phone" msgstr "爬��爬� 爬�爰園┐爰�" -#, fuzzy msgid "Surfing" -msgstr "爬�爬朽┸爬萎┐爰�" +msgstr "爬伍┛爬�┝ 爬�爬� 爬萎┨爰�" #. "I am mobile." / "John is mobile." msgid "Mobile" msgstr "爬��爬�┥爬�爬�" msgid "Searching the web" -msgstr "" +msgstr "爬朽�爰園━ 爬�爰園┐爰� 爬�爰�爬� 爬�爬鉦┛爰�" msgid "At a party" -msgstr "" +msgstr "爬�┥爬萎�爰� '爬�" msgid "Having Coffee" -msgstr "" +msgstr "爬�爬鉦┼爬酌� 爬�� 爬萎┸爬項┥/爬萎┨爰� 爬項┥爬�" #. Playing video games -#, fuzzy msgid "Gaming" -msgstr "爬��爬�爬酌┛ 爬�爰�爬�" +msgstr "爬�爰�爬÷┥爬�" msgid "Browsing the web" -msgstr "" - -#, fuzzy +msgstr "爬朽�爰園━ 爬�┛爬鉦�爬�爬� 爬�爬萎�" + msgid "Smoking" -msgstr "爬�爰�爬�" - -#, fuzzy +msgstr "爬伍┸爬�爬萎� 爬�� 爬萎┨爰�" + msgid "Writing" -msgstr "爬�爰萎┏ 爬�爬� 爬萎┸爬項┥/爬萎┨爰� 爬項┥爬�" +msgstr "爬迦┸爬� 爬萎┨爰�" #. Drinking [Alcohol] -#, fuzzy msgid "Drinking" -msgstr "爬�爰萎┏ 爬�爬� 爬萎┸爬項┥/爬萎┨爰� 爬項┥爬�" +msgstr "爬��爰園� 爬迦┥ 爬萎┨爰�" msgid "Listening to music" msgstr "爬伍�爬�爰�爬� 爬伍�爬� 爬萎┸爬項┥/爬萎┨爰� 爬項┥爬�" -#, fuzzy msgid "Studying" -msgstr "爬〝�爬�爬逗� 爬�爬� 爬萎┸爬項┥ 爬項�" - -#, fuzzy +msgstr "爬��爰�爬� 爬萎┸爬項┥/爬萎┨爰� 爬項┥爬�" + msgid "In the restroom" -msgstr "爬�┸爬迦�爬伍┴爰�爬�爬�" +msgstr "爬�爬萎┥爬�-爬�爬�┛爰� '爬�" msgid "Received invalid data on connection with server" msgstr "爬伍┛爬朽┛ 爬�┥爬� 爬�爰�爬��爬�爬伍┝爬� 爬�爰園┐爰� 爬�爬迦┐ 爬÷┥爬�爬� 爬�┸爬迦┸爬� 爬項�爛�" @@ -7141,7 +7046,7 @@ msgstr "爬�爰�爬÷┥爬�" msgid "ICQ Xtraz" -msgstr "" +msgstr "ICQ Xtraz" msgid "Add-Ins" msgstr "爬項�爬�" @@ -7209,25 +7114,20 @@ msgid "Invisible" msgstr "爬�爬�┸爰園�" -#, fuzzy msgid "Evil" -msgstr "爬�爬��爬�" - -#, fuzzy +msgstr "爬��爬萎┥" + msgid "Depression" -msgstr "爬�爬逗�爬む┥" - -#, fuzzy +msgstr "爬�爬�┥爬伍�" + msgid "At home" -msgstr "爬��爬萎� 爬�┥爬萎�" - -#, fuzzy +msgstr "爬�爬萎�" + msgid "At work" -msgstr "爬��爰園�爬朽┛爬�" - -#, fuzzy +msgstr "爬�爰萎┏ 爬�爰園┐爰�" + msgid "At lunch" -msgstr "爬��爬��爬項┛ 爬�� 爬�爬鉦┌爰� 爬迦� 爬�┥爬項┛" +msgstr "爬��爬��爬項┛ 爬�� 爬�爬鉦┌爰� 爬迦�" msgid "IP Address" msgstr "IP 爬�爬÷┛爰�爰園┯" @@ -7704,9 +7604,8 @@ msgid "iTunes Music Store Link" msgstr "iTunes 爬伍�爬�爰�爬� 爬伍�爰�爬� 爬迦┸爰萎�" -#, fuzzy msgid "Lunch" -msgstr "爬�┸爰萎�" +msgstr "爬��爬�┨爬逗┛ 爬�┥ 爬�爬鉦┌爬�" #, c-format msgid "Buddy Comment for %s" @@ -7740,9 +7639,8 @@ msgid "Edit Buddy Comment" msgstr "爬��爬÷� 爬�爬逗�爬�┌爰� 爬伍�爬�" -#, fuzzy msgid "Get X-Status Msg" -msgstr "爬伍┘爬逗┐爰� 爬伍�爬��爬項┥ 爬迦┻爰�" +msgstr "X-爬項┥爬迦┐ 爬伍�爬��爬項┥ 爬迦┻爰�" msgid "End Direct IM Session" msgstr "爬伍┸爰園├爬� IM 爬伍┝爰�爬伍┝爬� 爬��爬� 爬�爰�爬む┥" @@ -7870,10 +7768,10 @@ msgstr "爬�爬迦┐ SNAC" msgid "Server rate limit exceeded" -msgstr "" +msgstr "爬伍┛爬朽┛ 爬萎�爬� 爬迦┸爬�� 爬朽�爬� 爬�爬�" msgid "Client rate limit exceeded" -msgstr "" +msgstr "爬�爬迦┥爬�爬� 爬萎�爬� 爬迦┸爬�� 爬朽�爬� 爬�爬�" msgid "Service unavailable" msgstr "爬伍┛爬朽┸爬� 爬�爬�┣爰園━爬� 爬�┨爰�爬�" @@ -8218,9 +8116,8 @@ msgstr "爬�爬÷┏爬逗┬" #. XXX: Should this be "Topic"? -#, fuzzy msgid "Room Title" -msgstr "爬萎�爬� 爬迦┸爬伍�" +msgstr "爬萎�爬� 爬�爬鉦�爬�爬�" msgid "Notice" msgstr "爬��爬�爬逗┯" @@ -10109,9 +10006,8 @@ msgid "Ignore conference and chatroom invitations" msgstr "爬�爬�┼爬萎�爬� 爬�爬む� 爬�爰�爬�-爬萎�爬� 爬伍�爬�� 爬�爬�─爬逗�爬�爰� 爬�爬萎�" -#, fuzzy msgid "Use account proxy for HTTP and HTTPS connections" -msgstr "SSL 爬�爰�爬��爬�爬伍┝爬�┥爬� 爬迦� 爬�爬�爬鉦�爬�爬� 爬�┛爬鉦�爬伍� 爬朽┛爬む�爬�" +msgstr "HTTP 爬�爬む� HTTPS 爬�爰�爬��爬�爬伍┝爬�┥爬� 爬迦� 爬�爬�爬鉦�爬�爬� 爬�┛爬鉦�爬伍� 爬朽┛爬む�爬�" msgid "Chat room list URL" msgstr "爬�爰園┣爬�┥爬� 爬萎�爬� 爬迦┸爬伍� Url" @@ -10181,13 +10077,12 @@ "爬�爬�爬鉦�爬�爬� 爬迦┥爬� 爬項�爬�爬�: 爬�爬��爬鉦┌ 爬�爬鉦┛爬�イ Yahoo! 爬朽�爬�┯爬鉦�爬� 爬�爰園┐爰� 爬迦┥爬�爬�爬� 爬�爬萎┬ 爬�┥爬� 爬伍┏爰園┯爬逗� 爬項�爬� 爬項� 爬伍�爬�� 爬項�爛�" #. indicates a lock due to logging in too frequently -#, fuzzy msgid "" "Account locked: You have been logging in too frequently. Wait a few minutes " "before trying to connect again. Logging into the Yahoo! website may help." msgstr "" -"爬�爬�爬鉦�爬�爬� 爬迦┥爬� 爬項�爬�爬�: 爬�┨爰�爬� 爬伍┥爬萎�爬�爬� 爬迦┥爬�爬�爬� 爬�爰�爬伍┝爬逗┯爬� 爬�爬萎�爰�爛� Yahoo! 爬朽�爬�┯爬鉦�爬� 爬�爰園┐爰� 爬迦┥爬�爬�爬� 爬�爬萎┬ 爬�┥爬� " -"爬伍┏爰園┯爬逗� 爬項�爬� 爬項� 爬伍�爬�� 爬項�爛�" +"爬�爬�爬鉦�爬�爬� 爬迦┥爬� 爬項�爬�爬�: 爬�┨爰�爬� 爬伍┥爬萎�爬�爬� 爬迦┥爬�爬�爬� 爬�爰�爬伍┝爬逗┯爬� 爬�爬萎�爰�爛� 爬��爰� 爬�爰�爬��爬�爬� 爬�爬萎┬ 爬む�爬� 爬�┨爬逗┣爬鉦� 爬�爰�爬� 爬�┸爰萎� 爬�爬÷�爬� 爬迦┻爰� " +"爬�爰�爛� Yahoo! 爬朽�爬�┯爬鉦�爬� 爬�爰園┐爰� 爬迦┥爬�爬�爬� 爬�爬萎┬ 爬�┥爬� 爬伍┏爰園┯爬逗� 爬項�爬� 爬項� 爬伍�爬�� 爬項�爛�" #. username or password missing msgid "Username or password missing" @@ -10268,14 +10163,13 @@ msgid "Unable to establish a connection with %s: %s" msgstr "%s 爬�┥爬� 爬�爰園� 爬�爰�爬��爬�爬伍┝爬� 爬�┌爬鉦�爬� 爬�┨爰�爬� 爬�爬� 爬伍�爬逗�: %s" -#, fuzzy msgid "Unable to connect: The server returned an empty response." -msgstr "MXit 爬伍┛爬朽┛ 爬�┥爬� 爬�爰�爬��爬�爬� 爬項�爬� 爬迦� 爬�爬伍┏爬萎�爬� 爬項�爛� 爬�爬�┌爰� 爬伍┛爬朽┛ 爬伍�爬�爬逗�爬� 爬�爰�爰園� 爬�爬萎� 爬�爰�爛�" +msgstr "爬�爰�爬��爬�爬� 爬�爬萎┬ 爬迦� 爬�爬伍┏爬萎�爬�: 爬伍┛爬朽┛ 爬�� 爬�爬鉦┣爰� 爬�爬朽┥爬� 爬�┸爰園┐爬� 爬項�爛�" msgid "" "Unable to connect: The server's response did not contain the necessary " "information" -msgstr "" +msgstr "爬�爰�爬��爬�爬� 爬�爬萎┬ 爬迦� 爬�爬伍┏爬萎�爬�: 爬伍┛爬朽┛ 爬�┥ 爬�爬朽┥爬� 爬迦�爰�爰�爬�� 爬�爬鉦┌爬�爬鉦┛爰� 爬�┨爰�爬� 爬萎�爬�爬�┥ 爬項�爛�" msgid "Not at Home" msgstr "爬�爬萎� 爬�┨爰�爬�" @@ -10723,9 +10617,8 @@ msgid "Extended away" msgstr "爬�┨爰�爰萎� 爬む�爬� 爬��爬�" -#, fuzzy msgid "Feeling" -msgstr "爬�┸爬迦┸爬�" +msgstr "爬�┨爬逗┯爰�爬� 爬�爬� 爬萎┨爰�" #, c-format msgid "%s (%s) changed status from %s to %s" @@ -11256,13 +11149,11 @@ msgid "Unknown node type" msgstr "爬�爬��爬鉦┌ 爬��爬� 爬�爬鉦�爬�" -#, fuzzy msgid "Please select your mood from the list" -msgstr "爬迦┸爬伍┐ 爬む�爬� 爬�爬�┌爬� 爬��爬� 爬�爰�爬�� 爬�爰�爛�" - -#, fuzzy +msgstr "爬迦┸爬伍� '爬�爰�爬� 爬�爬�┌爬� 爬��爬� 爬�爰�爬��" + msgid "Message (optional)" -msgstr "爬踸迦�爬�爬� (爬�爰�爬�┻爬鉦�)" +msgstr "爬伍�爬��爬項┥ (爬�爰�爬�┻爬鉦�)" msgid "Edit User Mood" msgstr "爬��爬�爬酌┛ 爬��爬� 爬伍�爬�" @@ -11345,9 +11236,8 @@ msgid "/Tools/Pr_ivacy" msgstr "/爬�爰�爬�/爬�┛爬鉦�爬朽�爬伍�(_i)" -#, fuzzy msgid "/Tools/Set _Mood" -msgstr "/爬�爰�爬�/爬伍┸爬伍�爬� 爬迦┥爬� 爬朽�爬�爰�(_L)" +msgstr "/爬�爰�爬�/爬��爬� 爬伍�爰園� 爬�爬萎�(_M)" msgid "/Tools/_File Transfers" msgstr "/爬�爰�爬�/爬�┥爬�爬� 爬�爬萎┥爬�爬伍┼爬�(_F)" @@ -11368,20 +11258,17 @@ msgid "/Help/Online _Help" msgstr "/爬��爬�└/爬�爬�┣爬鉦�爬� 爬��爬�└(_H)" -#, fuzzy msgid "/Help/_Build Information" -msgstr "爬��爬÷� 爬�爬鉦┌爬�爬鉦┛爰�" +msgstr "/爬��爬�└/爬�┸爬迦─ 爬�爬鉦┌爬�爬鉦┛爰�(_B)" msgid "/Help/_Debug Window" msgstr "/爬��爬�└/爬÷�爬��爬� 爬朽┸爰萎─爰�(_D)" -#, fuzzy msgid "/Help/De_veloper Information" -msgstr "爬伍┛爬朽┛ 爬�爬鉦┌爬�爬鉦┛爰�" - -#, fuzzy +msgstr "/爬��爬�└/爬÷┸爬朽�爬迦┴爬� 爬�爬鉦┌爬�爬鉦┛爰�(_v)" + msgid "/Help/_Translator Information" -msgstr "爬��爬萎┥爬�爬朽�爬� 爬�爬鉦┌爬�爬鉦┛爰�" +msgstr "/爬��爬�└/爬�爬��爬朽┥爬�� 爬�爬鉦┌爬�爬鉦┛爰�(_T)" msgid "/Help/_About" msgstr "/爬��爬�└/爬�爬� 爬�┥爬萎�(_A)" @@ -11606,9 +11493,8 @@ msgid "_Edit Account" msgstr "爬�爬�爬鉦�爬�爬� 爬伍�爬�(_E)" -#, fuzzy msgid "Set _Mood..." -msgstr "爬��爬� 爬伍�爰園� 爬�爬萎�..." +msgstr "爬��爬� 爬伍�爰園� 爬�爬萎�(_M)..." msgid "No actions available" msgstr "爬�爰�爬� 爬�爬鉦┛爬朽┥爬� 爬�爬�┣爰園━爬� 爬�┨爰�爬�" @@ -11728,9 +11614,8 @@ msgid "/Conversation/Se_nd File..." msgstr "/爬�爰園┣爬�┥爬�/爬�┥爬�爬� 爬〝�爬�爰�(_n)..." -#, fuzzy msgid "/Conversation/Get _Attention" -msgstr "/爬�爰園┣爬�┥爬�/爬�爬鉦┌爬�爬鉦┛爰� 爬迦┻爰�" +msgstr "/爬�爰園┣爬�┥爬�/爬о┸爬�爬� 爬��爬�爰�(_A)" msgid "/Conversation/Add Buddy _Pounce..." msgstr "/爬�爰園┣爬�┥爬�/爬��爬�┯ 爬��爬÷� 爬伍┝爬鉦┏爬逗┣(_P)..." @@ -11805,17 +11690,16 @@ msgstr "/爬�爰園┣爬�┥爬�/爬��爬÷┸爬�/爬�爬÷�爬� 爬�爬鉦┣" msgid "/Conversation/Media/Video Call" -msgstr "/爬�爰園┣爬�┥爬�/爬��爬÷┸爬�/爬朽�爬÷┸爬� 爬�爬鉦┣" +msgstr "/爬�爰園┣爬�┥爬�/爬��爬÷┸爬�/爬朽┸爬÷�爬� 爬�爬鉦┣" msgid "/Conversation/Media/Audio\\/Video Call" -msgstr "/爬�爰園┣爬�┥爬�/爬��爬÷┸爬�/爬�爬÷�爬�\\/爬朽�爬÷┸爬� 爬�爬鉦┣" +msgstr "/爬�爰園┣爬�┥爬�/爬��爬÷┸爬�/爬�爬÷�爬�\\/爬朽┸爬÷�爬� 爬�爬鉦┣" msgid "/Conversation/Send File..." msgstr "/爬�爰園┣爬�┥爬�/爬�┥爬�爬� 爬〝�爬�爰�..." -#, fuzzy msgid "/Conversation/Get Attention" -msgstr "/爬�爰園┣爬�┥爬�/爬�爬鉦┌爬�爬鉦┛爰� 爬迦┻爰�" +msgstr "/爬�爰園┣爬�┥爬�/爬о┸爬�爬� 爬迦┻爰�" msgid "/Conversation/Add Buddy Pounce..." msgstr "/爬�爰園┣爬�┥爬�/爬��爬�┯ 爬��爬÷� 爬伍┝爬鉦┏爬逗┣..." @@ -11881,13 +11765,11 @@ msgid "0 people in room" msgstr "爬萎�爬� 爬朽┸爰園� 0 爬朽┸爬�爬�爬む�" -#, fuzzy msgid "Close Find bar" -msgstr "爬�爬� 爬�爰�爬� 爬��爬� 爬�爬萎�" - -#, fuzzy +msgstr "爬�爰�爬� 爬��爬�爰� 爬��爬� 爬�爬萎�" + msgid "Find:" -msgstr "爬�爰�爬�" +msgstr "爬�爰�爬�:" #, c-format msgid "%d person in room" @@ -12050,9 +11932,8 @@ msgid "Arabic" msgstr "爬�爬萎━爰�" -#, fuzzy msgid "Assamese" -msgstr "爬伍┝爬萎┏爬伍┝爬鉦┛" +msgstr "爬�爬伍┥爬��" msgid "Belarusian Latin" msgstr "爬��爬迦┥爬萎�爬伍� 爬迦�爬�爬逗┬" @@ -12063,9 +11944,8 @@ msgid "Bengali" msgstr "爬��爬�爬鉦┣爰�" -#, fuzzy msgid "Bengali-India" -msgstr "爬��爬�爬鉦┣爰�" +msgstr "爬��爬�爬鉦┣爰�-爬〝┥爬萎┐爰�" msgid "Bosnian" msgstr "爬��爬伍┬爰�爬�爬�" @@ -12181,9 +12061,8 @@ msgid "Macedonian" msgstr "爬��爬�爬÷�爬��爬�爬�" -#, fuzzy msgid "Malayalam" -msgstr "爬�┣爬鉦�" +msgstr "爬�┣爬逗�爬迦┏" msgid "Mongolian" msgstr "爬��爬�爰�爬迦�爬�爬�" @@ -12209,9 +12088,8 @@ msgid "Occitan" msgstr "爬�爰園┯爰�爬�爬鉦┬" -#, fuzzy msgid "Oriya" -msgstr "Opera" +msgstr "爬�爰�爰�爬�" msgid "Punjabi" msgstr "爬��爬�爬鉦━爰�" @@ -12294,7 +12172,7 @@ msgid "Lithuanian" msgstr "爬迦�爬ム�爬朽┬爰�爬�爬�" -#, fuzzy, c-format +#, c-format msgid "" "%s is a messaging client based on libpurple which is capable of connecting " "to multiple messaging services at once. %s is written in C using GTK+. %s " @@ -12305,11 +12183,11 @@ msgstr "" "%s libpurple 爬�爰園┐爰� 爬�爬о┥爬萎┸爬� 爬�爰園� 爬�爬萎┥爬�┸爬�爬� 爬��爬÷�爬迦┛ 爬��爬伍�爬�爬酌┸爰萎� 爬�爬迦┥爬�爬� 爬項�, 爬�爰� 爬�爬� AIM, MSN, Yahoo!, " "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, " -"Zephyr, NySpaceIM, Gadu-Gadu 爬�爬む� QQ 爬伍┃ 爬�┥爬� 爬�爰園�爰� 爬�爬鉦�爬� 爬�爰�爬��爬�爬� 爬�爬萎┬ 爬�� 爬��爬� 爬項�爛� 爬�爬� 爬��爰� GTK" -"+ 爬�� 爬朽┛爬む�爬� 爬�爬萎�爰� 爬迦┸爬�爬逗� 爬�爬逗� 爬項�爛�<BR><BR>爬む�爬伍�爬� 爬�┛爰�爬�爬萎┥爬� 爬��爰� GPL (爬朽┛爬�爬� 2 爬�爬鉦� 爬�┻爰�爬�) 爬��爬�爬� 爬伍┝爬萎┐爬鉦� " -"爬��爬む┥爬�� 爬伍�爬� 爬�爬む� 爬朽�爬� 爬伍�爬�� 爬項�爛� GPL 爬�� 爬�爬鉦┴爰� 爬��爰� %s 爬�┥爬� 'COPYING' 爬�┥爬�爬� 爬朽┸爰園� 爬�┸爰園┐爬� 爬�爬逗� 爬項�爛� %s " -"爬�爬� 爬�� 爬��爬�爬�┥爬��爬�爬� 爬�爰�爬� 爬�爬鉦┴爰�-爬萎┥爬�爬� 爬項�爛� 爬��爬�爬�┥爬��爬�爬� 爬�� 爬迦┸爬伍� 爬朽�爬�爬� 爬朽┥爬伍┐爰� 'COPYRIGHT' 爬�┥爬�爬� 爬朽�爬�爰�爛� " -"爬�爬� 爬�┛爰�爬�爬萎┥爬� 爬�┥爬萎� 爬む�爬項┥爬��爰� 爬�爬伍�爬� 爬�爰�爬� 爬朽┥爬萎�爬�爰� 爬�┨爰�爬� 爬�┸爰萎└爰� 爬項┥爬�爛�<BR><BR>" +"Zephyr, NySpaceIM, Gadu-Gadu 爬�爬む� QQ 爬伍┃ 爬�┥爬� 爬�爰園�爰� 爬�爬鉦�爬� 爬�爰�爬��爬�爬� 爬�爬萎┬ 爬�� 爬��爬� 爬項�爛� %s 爬��爰� GTK" +"+ 爬�� 爬朽┛爬む�爬� 爬�爬萎�爰� 爬迦┸爬�爬逗� 爬�爬逗� 爬項�爛� 爬む�爬伍�爬� %s 爬��爰� GPL 爬朽┛爬�爬� 爰� (爬�爬鉦� 爬�┻爰�爬�) 爬��爬�爬� 爬伍┝爬萎┐爬鉦� 爬��爬む┥爬�� 爬伍�爬� 爬�爬む� " +"爬朽�爬� 爬伍�爬�� 爬項�爛� GPL 爬�� 爬�爬鉦┴爰� 爬��爰� %s 爬�┥爬� 'COPYING' 爬�┥爬�爬� 爬朽┸爰園� 爬�┸爰園┐爬� 爬�爬逗� 爬項�爛� %s 爬�爬� 爬�� " +"爬��爬�爬�┥爬��爬�爬� 爬�爰�爬� 爬�爬鉦┴爰�-爬萎┥爬�爬� 爬項�, 爬�爬逗┯ 爬�� 爬迦┸爬伍� %s 爬�┥爬� 爬�爬�┣爰園━爬� 爬�爬萎┻爬鉦� 爬�爬� 爬萎┨爰� 爬項�爛� %s 爬�┥爬萎� 爬む�爬項┥爬��爰� " +"爬�爬伍�爬� 爬�爰�爬� 爬朽┥爬萎�爬�爰� 爬�┨爰�爬� 爬�┸爰萎└爰� 爬項┥爬�爛�<BR><BR>" #, c-format msgid "" @@ -12318,8 +12196,11 @@ "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin." "im<BR><BR>" msgstr "" - -#, fuzzy, c-format +"<FONT SIZE=\"4\"><B>爬��爬�└ 爬迦� 爬伍┛爰�爬�</B></FONT><BR>\t<A HREF=\"%s\">爬朽�爰園━爬伍┥爬�爬�</A><BR>" +"\t<A HREF=\"%s\">爬�爬�爬伍┛ 爬��爰園�爰� 爬�爬鉦�爬�� 爬伍┻爬鉦┣</A><BR>\tIRC 爬�爰�爬�┣: #pidgin on irc.freenode." +"net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>" + +#, c-format msgid "" "<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by " "e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/" @@ -12333,20 +12214,19 @@ "im\">support@pidgin.im</a><br/>爬�爬� <b>爬�━爬迦┸爬�</b> 爬��爬迦┸爰萎� 爬迦┸爬伍� 爬項�! (<a href=" "\"http://pidgin.im/pipermail/support/\">爬�爬�爬鉦�爬�</a>) <br/>爬�爬伍�爬� 爬伍�爬む�爬む┛ 爬о┸爬� 爬�┛爰�爬�爰�爬�爬鉦┣ " "爬�爬鉦� 爬�┣爰園�爬�爬� 爬迦� 爬��爬�└ 爬�┨爰�爬� 爬�爬� 爬伍�爬��!<br/>爬�爬� 爬迦┸爬伍� 爬�� 爬��爬� 爬〝┥爬伍┝爬� <b>爬�爰萎�爬萎�爬�爬酌�</b> 爬項�爛� 爬む�爬伍�爬� 爬項�爬� " -"爬〝┥爬伍┝爬� 爬朽┸爰園� 爬��爬伍� 爬�爬� 爬む┥爬� 爬伍�爬�� 爬項�, 爬�┛ 爬�爬朽┥爬� 爬�爰園� 爬�┸爬迦┌ 爬�� 爬伍�爬〝┻爬鉦┬爬� 爬萎┨爰�爬�爰�爛�<br/><br/>" +"爬〝┥爬伍┝爬� 爬朽┸爰園� 爬��爬伍� 爬�爬� 爬む┥爬� 爬伍�爬�� 爬項�, 爬�┛ 爬�爬朽┥爬� 爬�爰園� 爬�┸爬迦┌ 爬�� 爬伍�爬〝┻爬鉦┬爬� 爬萎┨爰�爬�爰�爛�<br/>" #, c-format msgid "About %s" msgstr "%s 爬�┥爬萎�" -#, fuzzy msgid "Build Information" -msgstr "爬��爬÷� 爬�爬鉦┌爬�爬鉦┛爰�" +msgstr "爬�┸爬迦─ 爬�爬鉦┌爬�爬鉦┛爰�" #. End of not to be translated section -#, fuzzy, c-format +#, c-format msgid "%s Build Information" -msgstr "爬��爬÷� 爬�爬鉦┌爬�爬鉦┛爰�" +msgstr "%s 爬�┸爬迦─ 爬�爬鉦┌爬�爬鉦┛爰�" msgid "Current Developers" msgstr "爬��爬�爰�爬�┥ 爬÷�爬朽�爬迦┴爬�" @@ -12360,9 +12240,9 @@ msgid "Retired Crazy Patch Writers" msgstr "爬萎┸爬�爬鉦�爬� 爬項�爬� 爬��爬�爬� 爬迦�爬�爬�" -#, fuzzy, c-format +#, c-format msgid "%s Developer Information" -msgstr "爬伍┛爬朽┛ 爬�爬鉦┌爬�爬鉦┛爰�" +msgstr "%s 爬÷┸爬朽�爬迦┴爬� 爬�爬鉦┌爬�爬鉦┛爰�" msgid "Current Translators" msgstr "爬��爬�爰�爬�┥ 爬�爬��爬朽┥爬��" @@ -12370,9 +12250,9 @@ msgid "Past Translators" msgstr "爬��爬萎┥爬�� 爬�爬��爬朽┥爬��" -#, fuzzy, c-format +#, c-format msgid "%s Translator Information" -msgstr "爬項�爬� 爬�爬鉦┌爬�爬鉦┛爰�" +msgstr "%s 爬�爬��爬朽┥爬� 爬�爬鉦┌爬�爬鉦┛爰�" msgid "_Name" msgstr "爬�┥爬�(_N)" @@ -12771,9 +12651,8 @@ msgid "Insert Smiley" msgstr "爬伍┏爬鉦�爬迦� 爬伍┝爬鉦┏爬� 爬�爬萎�" -#, fuzzy msgid "Send Attention" -msgstr "爬〝�爬�爰� 爬��爬�" +msgstr "爬о┸爬�爬� 爬��爬�爰�" msgid "<b>_Bold</b>" msgstr "<b>爬�爰�爰�爬�(_B)</b>" @@ -12821,7 +12700,7 @@ msgstr "爬伍┏爬鉦�爬�(_S)!" msgid "_Attention!" -msgstr "" +msgstr "爬о┸爬�爬� 爬�┸爬�(_A)!" msgid "Log Deletion Failed" msgstr "爬迦┥爬�爬�爬� 爬項�爬鉦�爬� 爬迦� 爬��爬迦�爬�" @@ -12948,13 +12827,11 @@ msgid "Exiting because another libpurple client is already running.\n" msgstr "爬��爬� 爬�爰�爬む┥ 爬�爬� 爬萎┸爬項┥ 爬項�, 爬�爬逗�爬�爬�爬� 爬�爰園� 爬項�爬� libpurple 爬�爬迦┥爬�爬� 爬�┨爬逗┣爬鉦� 爬項� 爬�爰園┣ 爬萎┸爬項┥ 爬項�爛�\n" -#, fuzzy msgid "_Media" -msgstr "/爬��爬÷┸爬�(_M)" - -#, fuzzy +msgstr "爬��爬÷┸爬�(_M)" + msgid "_Hangup" -msgstr "爬項�爬�爬� 爬�爰園┴" +msgstr "爬項�爬�爬� 爬�爰園┴(_H)" #, c-format msgid "%s wishes to start an audio/video session with you." @@ -13900,9 +13777,8 @@ msgid "_Save File" msgstr "爬�┥爬�爬� 爬伍�爬〝┥爬迦�(_S)" -#, fuzzy msgid "Do you really want to clear?" -msgstr "爬�爰� 爬む�爬伍�爬� %s 爬��爰� 爬項�爬鉦�爬�┥ 爬�爬鉦┨爰�爰萎└爰� 爬項�?" +msgstr "爬�爰� 爬む�爬伍�爬� 爬伍┥爬�┝ 爬�爬萎┬爬� 爬�爬鉦┨爰�爰萎└爰� 爬項�?" msgid "Select color" msgstr "爬萎�爬� 爬�爰�爬��" @@ -14869,21 +14745,18 @@ msgid "Timestamp Format Options" msgstr "爬�爬鉦�爬�-爬伍�爰�爬�爬� 爬�┥爬萎┏爰�爬� 爬�爰�爬�" -#, fuzzy, c-format +#, c-format msgid "_Force timestamp format:" -msgstr "24-爬�爰萎�爰� 爬伍┏爬鉦� 爬�┥爬萎┏爰�爬� 爬迦� 爬��爰�爬��爬�(_F)" - -#, fuzzy +msgstr "爬伍┏爬鉦�-爬��爬項┛ 爬�┥爬萎┏爰�爬� 爬迦� 爬��爬酌━爰�爬�(_F):" + msgid "Use system default" -msgstr "爬朽�爬項�爬� (爬÷�爬伍�爬�爬鉦┴) 爬÷┸爬�┥爬迦�" - -#, fuzzy +msgstr "爬伍┸爬伍�爬� 爬÷┸爬�┥爬迦� 爬朽┛爬む�爬�" + msgid "12 hour time format" -msgstr "24-爬�爰萎�爰� 爬伍┏爬鉦� 爬�┥爬萎┏爰�爬� 爬迦� 爬��爰�爬��爬�(_F)" - -#, fuzzy +msgstr "爰о� 爬�爰萎�爬� 爬伍┏爬鉦� 爬�┥爬萎┏爰�爬�" + msgid "24 hour time format" -msgstr "24-爬�爰萎�爰� 爬伍┏爬鉦� 爬�┥爬萎┏爰�爬� 爬迦� 爬��爰�爬��爬�(_F)" +msgstr "爰�� 爬�爰萎�爰� 爬伍┏爬鉦� 爬�┥爬萎┏爰�爬�" msgid "Show dates in..." msgstr "爬�┸爬む� 爬朽�爬�爰�..." @@ -15078,7 +14951,6 @@ msgstr "爬萎┥爬� XMPP 爬��爬項�爬萎┥ 爬〝�爬�爰� 爬�爬む� 爬迦┻爰�" #. * description -#, fuzzy msgid "This plugin is useful for debugging XMPP servers or clients." msgstr "爬�爬� 爬�┣爰園�爬�爬� XMPP 爬伍┛爬朽┛ 爬�爬鉦� 爬�爬迦┥爬�爬� 爬÷�爬��爬� 爬迦� 爬�┥爬�爬��爬��爬� 爬項�爛�" @@ -15087,36 +14959,37 @@ "$(^Name) is released under the GNU General Public License (GPL). The license " "is provided here for information purposes only. $_CLICK" msgstr "" +"$(^Name) 爬��爰� 爬�爬�� 爬�爬萎┬爬� 爬�━爬迦┸爬� 爬迦┥爬�爬伍�爬�爬� (GPL) 爬項�爬� 爬�爬鉦┛爰� 爬�爰�爬む┥ 爬�爬逗� 爬項�爛� 爬迦┥爬�爬伍�爬�爬� 爬�爰園┘爰� 爬�爰�爬朽┣ " +"爬�爬鉦┌爬�爬鉦┛爰� 爬��爬� 爬�� 爬��爬伍└ 爬�┥爬� 爬項� 爬�┸爰園┐爬� 爬�爬� 爬萎┸爬項┥ 爬項�爛� $_CLICK" #. Installer Subsection Detailed Description msgid "A multi-platform GUI toolkit, used by Pidgin" -msgstr "" +msgstr "爬�┣爬�爰�-爬�┣爰�爬�爬�┥爬萎┏ GUI 爬�爰�爬迦�爬逗�爬�, 爬�┸爬÷�爬逗┬ 爬朽┣爰�爬� 爬朽┛爬む� 爬�爬鉦�爬�� 爬項�" msgid "" "An instance of Pidgin is currently running. Please exit Pidgin and try " "again." -msgstr "" +msgstr "爬�┸爬÷�爬逗┬ 爬�爬� 爬伍┏爰�爬� 爬�爰園┣ 爬萎┸爬項┥ 爬項�爛� 爬�┸爬÷�爬逗┬ 爬��爬� 爬�爬萎�爰� 爬��爬� 爬�爰�爬伍┝爬逗┯爬� 爬�爬萎� 爬�爰�爛�" #. Installer Subsection Detailed Description msgid "Core Pidgin files and dlls" -msgstr "" +msgstr "爬�爰�爬� 爬�┸爬÷�爬逗┬ 爬�┥爬�爬迦┥爬� 爬む� dll " #. Installer Subsection Detailed Description msgid "Create a Start Menu entry for Pidgin" -msgstr "" +msgstr "爬�┸爬÷�爬逗┬ 爬迦� 爬伍�爬鉦┛爬� 爬��爬�� 爬�爬�爬�爬萎� 爬�┌爬鉦�" #. Installer Subsection Detailed Description msgid "Create a shortcut to Pidgin on the Desktop" -msgstr "" +msgstr "爬�┸爬÷�爬逗┬ 爬迦� 爬÷�爬伍�爬�爬鉦┴ 爬�爰園┐爰� 爬伍┝爬鉦┛爬�爬�爰園� 爬�┌爬鉦�" #. Installer Subsection Text msgid "Debug Symbols (for reporting crashes)" -msgstr "" +msgstr "爬÷�爬��爬� 爬伍┸爰萎━爬� (爬�爬萎�爬伍┝ 爬萎┸爬��爬萎� 爬�爬萎┬ 爬迦�)" #. Installer Subsection Text -#, fuzzy msgid "Desktop" -msgstr "爬朽�爬項�爬� (爬÷�爬伍�爬�爬鉦┴) 爬÷┸爬�┥爬迦�" +msgstr "爬÷�爬伍�爬�爬鉦┴" #. $R2 will display the URL that the GTK+ Runtime failed to download from msgid "" @@ -15124,12 +14997,17 @@ "function; if retrying fails, you may need to use the 'Offline Installer' " "from http://pidgin.im/download/windows/ ." msgstr "" +"GTK+ Runtime ($R2) 爬÷┥爬�爬�┣爰�爬� 爬�爬萎┬ 爬��爬萎┥爬� 爬�爬迦┐爰� 爬項�爛�$\\r爬�爬� 爬�┸爬÷�爬逗┬ 爬�� 爬�爰萎┏ 爬�爬萎┬ 爬迦� 爬迦┥爬�爬酌┏爰� 爬項�爛� " +"爬�爰� 爬朽┥爬� 爬朽┥爬� 爬��爬萎┥爬�┐ 爬�爬萎┬ 爬迦� 爬��爬迦�爬� 爬項�爬朽� 爬む┥爬� 爬む�爬伍�爬� http://pidgin.im/download/windows/ " +"'爬�爬�┣爬鉦�爬� 爬�爰萎┯爬�爬鉦┣爬�' 爬朽┛爬む┌ 爬�┥爬萎� 爬伍�爬�爰�爛�" #. $R2 will display the URL that the Debug Symbols failed to download from msgid "" "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to " "use the 'Offline Installer' from http://pidgin.im/download/windows/ ." msgstr "" +"爬÷�爬��爬� 爬伍┸爰萎━爬� ($R2) 爬�爰萎┯爬�爬鉦┣ 爬�爬萎┬ 爬��爬萎┥爬� 爬�爬迦┐爰�爛�$\\r爬�爰� 爬��爬萎┥爬�┐ 爬�爬萎┬ 爬迦� 爬��爬迦�爬� 爬項�爰萎└爬� 爬項� 爬む┥爬� 爬む�爬項┥爬��爰� " +"http://pidgin.im/download/windows/ 爬む�爬� '爬�爬�┣爬鉦�爬� 爬�爰萎┯爬�爬鉦┣爬�' 爬朽┛爬む┌爬� 爬�� 爬伍�爬�┥ 爬項�爛�" #. $R3 will display the URL that the Dictionary failed to download from #, no-c-format @@ -15138,80 +15016,85 @@ "installation instructions are at: http://developer.pidgin.im/wiki/Installing" "%20Pidgin#manual_win32_spellcheck_installation" msgstr "" +"爬伍┴爰�爬迦�爰�爰園� ($R3) 爬�爰萎┯爬�爬鉦┣ 爬�爬萎┬ 爬��爬萎┥爬� 爬�爬迦┐爰�爛� $\\r爬�爰� 爬迦�爬� 爬迦� 爬��爬迦�爬� 爬項�爬朽� 爬む┥爬� 爬�爰�爬� 爬�爰萎┯爬�爬鉦┣ 爬�爬萎┬ 爬迦� " +"爬項└爬鉦�爬む┥爬� 爬朽�爬�爰�: http://developer.pidgin.im/wiki/Installing" +"%20Pidgin#manual_win32_spellcheck_installation" #. Installer Subsection Text -#, fuzzy msgid "GTK+ Runtime (required if not present)" -msgstr "GTK+ Runtime 爬朽┛爬�爬�" +msgstr "GTK+ Runtime (爬�爰� 爬��爬�爰�爬� 爬�┥ 爬項�爬朽� 爬む┥爬� 爬�爬鉦┨爰�爬�┥ 爬項�)" #. Installer Subsection Text -#, fuzzy msgid "Localizations" -msgstr "爬伍┘爬逗┐爰�" +msgstr "爬�爬��爬朽┥爬�" #. "Next >" appears on a button on the License Page of the Installer msgid "Next >" -msgstr "" +msgstr "爬�爰園�爰� >" #. Installer Subsection Text -#, fuzzy msgid "Pidgin Instant Messaging Client (required)" -msgstr "爬�┸爬÷�爬逗┬ 爬�爰萎�爬萎┬爰�爬� 爬��爬伍�爬�爬酌┛" +msgstr "爬�┸爬÷�爬逗┬ 爬む�爬萎�爬� 爬�爰萎�爬萎┬爰�爬� 爬��爬伍�爬�爬酌┛ (爬迦┥爬�爬酌┏爰�)" msgid "" "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be " "already present).$\\rAre you sure you want to skip installing the GTK+ " "Runtime?" msgstr "" +"爬�┸爬÷�爬逗┬ 爬迦� 爬�爬��爬�爰�爬� GTK+ 爬萎┬爬�爬鉦�爬� 爬�爬鉦┨爰�爬�┥ 爬項� (爬�爰� 爬�爬� 爬項┥爬迦� 爬��爬�爰�爬� 爬�┨爰�爬� 爬�爬鉦┴爬�┥ 爬項�爛�)$\\r爬�爰� 爬む�爬伍�爬� GTK" +"+ 爬萎┬爬�爬鉦�爬� 爬��爰� 爬�爰萎┯爬�爬鉦┣ 爬�爬萎┬ 爬��爰� 爬�爰園─爬�┥ 爬�爬鉦┨爰�爰萎└爰� 爬項�?" #. Installer Subsection Text -#, fuzzy msgid "Shortcuts" msgstr "爬伍┝爬鉦┛爬�爬�爰園�" #. Installer Subsection Detailed Description msgid "Shortcuts for starting Pidgin" -msgstr "" +msgstr "爬�┸爬÷�爬逗┬ 爬伍┝爰�爬萎� 爬�爬萎┬ 爬迦� 爬伍┝爬鉦┛爬�爬�爰園�" #. Installer Subsection Text msgid "Spellchecking Support" -msgstr "" +msgstr "爬伍┴爰�爬� 爬�爰�爰園� 爬伍┨爬逗┓爰�爬�" #. Installer Subsection Text -#, fuzzy msgid "Start Menu" -msgstr "爬謹�爬萎�爬�爬�" +msgstr "爬伍�爬鉦┛爬� 爬��爬��" #. Installer Subsection Detailed Description msgid "" "Support for Spellchecking. (Internet connection required for installation)" -msgstr "" - -#, fuzzy +msgstr "爬伍┴爰�爬� 爬�爰�爰園� 爬�爬萎┬ 爬迦� 爬伍┨爬逗┓爰�爬�爛� (爬�爰萎┯爬�爬鉦┣爰�爬伍┝爬� 爬迦� 爬�爰萎�爬萎┬爰�爰園� 爬�爰�爬��爬�爬伍┝爬� 爬�爬鉦┨爰�爬�┥ 爬項�)" + msgid "The installer is already running." -msgstr "\"%s\" 爬�┥爬� 爬�┨爬逗┣爬鉦� 爬項� 爬朽┛爬む�爬� '爬� 爬項�|" +msgstr "爬�爰萎┯爬�爬鉦┣爬� 爬�┨爬逗┣爬鉦� 爬項� 爬�爰園┣ 爬萎┸爬項┥ 爬項�爛�" msgid "" "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely " "that another user installed this application." msgstr "" +"爬�爬�-爬�爰萎┯爬�爬鉦┣爬� 爬�┸爬÷�爬逗┬ 爬迦� 爬萎┸爬�爬伍�爬萎� 爬�爬�爬�爬萎�爬�爬� 爬�┨爰�爬� 爬迦�爬� 爬伍�爬逗�爛�$\\r爬�爰萎� 爬�爬鉦┴爬�┥ 爬項� 爬�爬� 爬項�爬� 爬��爬�爬酌┛ 爬�� 爬�爬� " +"爬�爬�┣爰�爬�爰�爬伍┝爬� 爬�爰萎┯爬�爬鉦┣ 爬�爰�爬む� 爬項�爛�" #. Installer Subsection Text -#, fuzzy msgid "URI Handlers" -msgstr "myim URL 爬項�爬�爬÷┣爬�" +msgstr "URI 爬項�爰園─爬迦┛" msgid "" "Unable to uninstall the currently installed version of Pidgin. The new " "version will be installed without removing the currently installed version." msgstr "" +"爬�┸爬÷�爬逗┬ 爬�� 爬��爬�爰�爬�┥ 爬�爰萎┯爬�爬鉦┣ 爬朽┛爬�爬� 爬��爰� 爬項�爬鉦�爬� 爬迦� 爬�爬伍┏爬萎�爬� 爬項�爛� 爬�┻爬鉦� 爬朽┛爬�爬� 爬��爬�爰�爬�┥ 爬�爰萎┯爬�爬鉦┣ 爬朽┛爬�爬� 爬��爰� 爬�┸爬�┥爬� " +"爬項�爬鉦� 爬項� 爬�爰萎┯爬�爬鉦┣ 爬�爰�爬む┥ 爬�爬鉦┻爰�爬�爬鉦イ" #. Text displayed on Installer Finish Page msgid "Visit the Pidgin Web Page" -msgstr "" +msgstr "爬�┸爬÷�爬逗┬ 爬朽�爰園━ 爬��爬�爬� 爬�爰園┐爰� 爬�爬鉦�" msgid "You do not have permission to uninstall this application." -msgstr "" +msgstr "爬む�爬項┥爬��爰� 爬�爬� 爬�爬�┣爰�爬�爰�爬伍┝爬� 爬�爰萎┯爬�爬鉦┣ 爬�爬萎┬ 爬迦� 爬�爬о┸爬�爬鉦┛ 爬�┨爰�爬� 爬項┬爛�" + +#~ msgid "The name you entered is invalid." +#~ msgstr "爬む�爬項┥爬÷� 爬朽┣爰�爬� 爬�┸爰園┐爬� 爬�┥爬� 爬�爬迦┐ 爬項�爛�" #~ msgid "The certificate is not valid yet." #~ msgstr "爬伍┛爬�爰�爬�┸爬�爰�爬� 爬∇�爰園�爬朽┥爬� 爬�┨爰�爬� 爬項�爛�"
--- a/po/pl.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/pl.po Wed Aug 11 07:36:56 2010 +0000 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Pidgin Polish translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 01:18-0400\n" -"PO-Revision-Date: 2010-05-24 14:19+0200\n" +"POT-Creation-Date: 2010-08-07 13:11-0400\n" +"PO-Revision-Date: 2010-08-06 20:24+0200\n" "Last-Translator: Piotr Dr�g <piotrdrag@gmail.com>\n" "Language-Team: Polish <pl@li.org>\n" "Language: pl\n" @@ -68,9 +68,8 @@ msgid "Error" msgstr "B��d" -#, fuzzy msgid "Account was not modified" -msgstr "Nie dodano konta" +msgstr "Nie zmodyfikowano konta" msgid "Account was not added" msgstr "Nie dodano konta" @@ -81,10 +80,13 @@ msgid "" "The account's protocol cannot be changed while it is connected to the server." msgstr "" +"Protok坦� konta nie mo甜e by� zmieniany, kiedy jest po��czone z serwerem." msgid "" "The account's username cannot be changed while it is connected to the server." msgstr "" +"Nazwa u甜ytkownika konta nie mo甜e by� zmieniana, kiedy jest po��czone z " +"serwerem." msgid "New mail notifications" msgstr "Powiadomienia o nowej poczcie" @@ -1707,6 +1709,8 @@ "The certificate is not valid yet. Check that your computer's date and time " "are accurate." msgstr "" +"Certyfikat nie jest jeszcze prawid�owy. Prosz� sprawdzi�, czy data i czas " +"komputera s� dok�adne." msgid "The certificate has expired and should not be considered valid." msgstr "Certyfikat wygas� i nie powinien ju甜 by� uwa甜any za prawid�owy." @@ -3392,7 +3396,7 @@ msgstr "_Has�o:" msgid "IRC nick and server may not contain whitespace" -msgstr "Pseudonimy IRC nie mog� zawiera� spacji" +msgstr "Pseudonimy i serwery IRC nie mog� zawiera� spacji" msgid "SSL support unavailable" msgstr "Obs�uga SSL jest niedost�pna" @@ -3872,19 +3876,18 @@ msgid "Server thinks authentication is complete, but client does not" msgstr "Serwer uwa甜a, 甜e uwierzytelnienie zosta�o uko�czone, a klient nie" -#, fuzzy msgid "Server may require plaintext authentication over an unencrypted stream" msgstr "" -"Serwer wymaga uwierzytelnienia w zwyk�ym tek�cie za po�rednictwem " -"niezaszyfrowanego strumienia" - -#, fuzzy, c-format +"Serwer mo甜e wymaga� uwierzytelnienia w zwyk�ym tek�cie przez niezaszyfrowany " +"strumie�" + +#, c-format msgid "" "%s may require plaintext authentication over an unencrypted connection. " "Allow this and continue authentication?" msgstr "" -"%s wymaga uwierzytelnienia w zwyk�ym tek�cie za po�rednictwem " -"niezaszyfrowanego strumienia. Pozwoli� i kontynuowa� uwierzytelnianie?" +"%s mo甜e wymaga� uwierzytelnienia w zwyk�ym tek�cie przez niezaszyfrowany " +"strumie�. Pozwoli� i kontynuowa� uwierzytelnianie?" msgid "SASL authentication failed" msgstr "Uwierzytelnienie SASL si� nie powiod�o" @@ -5974,8 +5977,8 @@ msgid "The two PINs you entered do not match." msgstr "Oba podane kody PIN nie zgadzaj� si�." -msgid "The name you entered is invalid." -msgstr "Podana nazwa jest nieprawid�owa." +msgid "The Display Name you entered is invalid." +msgstr "Podana wy�wietlana nazwa jest nieprawid�owa." msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -5995,9 +5998,8 @@ msgstr "" "Nie pobrano jeszcze informacji o profilu. Prosz� spr坦bowa� ponownie p坦添niej." -#, fuzzy msgid "Your UID" -msgstr "MXitId u甜ytkownika" +msgstr "UID u甜ytkownika" #. pin #. pin (required) @@ -6068,16 +6070,12 @@ msgid "Connecting..." msgstr "��czenie..." -#, fuzzy -msgid "The Display Name you entered is invalid." -msgstr "Podana nazwa jest nieprawid�owa." - msgid "The PIN you entered has an invalid length [7-10]." msgstr "Podany kod PIN ma nieprawid�ow� d�ugo�� [7-10]." #. mxit login name msgid "MXit ID" -msgstr "" +msgstr "Identyfikator MXit" #. show the form to the user to complete msgid "Register New MXit Account" @@ -6108,14 +6106,13 @@ msgid "Invalid country selected. Please try again." msgstr "Wybrano nieprawid�owy kraj. Prosz� spr坦bowa� ponownie." -#, fuzzy msgid "The MXit ID you entered is not registered. Please register first." msgstr "" -"Nie zarejestrowano nazwy u甜ytkownika. Prosz� najpierw si� zarejestrowa�." - -#, fuzzy +"Podany identyfikator MXit nie jest zarejestrowany. Prosz� najpierw si� " +"zarejestrowa�." + msgid "The MXit ID you entered is already registered. Please choose another." -msgstr "Nazwa u甜ytkownika jest ju甜 zarejestrowana. Prosz� wybra� inn� nazw�." +msgstr "Identyfikator MXit jest ju甜 zarejestrowany. Prosz� wybra� inny." msgid "Internal error. Please try again later." msgstr "Wewn�trzny b��d. Prosz� spr坦bowa� ponownie p坦添niej." @@ -6159,9 +6156,8 @@ msgid "Hidden Number" msgstr "Ukryty numer" -#, fuzzy msgid "Your MXit ID..." -msgstr "MXitId u甜ytkownika" +msgstr "Identyfikator MXit u甜ytkownika..." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -6175,26 +6171,21 @@ msgstr "W��czenie wyskakuj�cego ekranu powitalnego" #. you were kicked -#, fuzzy msgid "You have been kicked from this MultiMX." -msgstr "U甜ytkownik zosta� wyrzucony: (%s)" - -#, fuzzy +msgstr "U甜ytkownik zosta� wyrzucony z tego MultiMX." + msgid "was kicked" -msgstr "B��dny bilet" - -#, fuzzy +msgstr "zosta� wyrzucony" + msgid "_Room Name:" -msgstr "_Pok坦j:" +msgstr "_Nazwa pokoju:" #. Display system message in chat window -#, fuzzy msgid "You have invited" -msgstr "Nowa wiadomo��." - -#, fuzzy +msgstr "Zaproszono" + msgid "Last Online" -msgstr "Online" +msgstr "Ostatnio online" #. we must have lost the connection, so terminate it so that we can reconnect msgid "We have lost the connection to MXit. Please reconnect." @@ -7987,85 +7978,74 @@ "niezb�dne dla obraz坦w komunikatora. Poniewa甜 adres IP zostanie ujawniony, " "mo甜e si� to wi�za� z zagro甜eniem prywatno�ci." -#, fuzzy msgid "Invalid SNAC" -msgstr "Nieprawid�owy identyfikator" +msgstr "Nieprawid�owe SNAC" msgid "Server rate limit exceeded" -msgstr "" +msgstr "Przekroczono ograniczenie pr�dko�ci serwera" msgid "Client rate limit exceeded" -msgstr "" - -#, fuzzy +msgstr "Przekroczono ograniczenie pr�dko�ci klienta" + msgid "Service unavailable" msgstr "Us�uga jest niedost�pna" -#, fuzzy msgid "Service not defined" -msgstr "Nie odnaleziono konferencji" +msgstr "Nie okre�lono us�ugi" msgid "Obsolete SNAC" -msgstr "" - -#, fuzzy +msgstr "Przestarza�e SNAC" + msgid "Not supported by host" -msgstr "Nieobs�ugiwane" - -#, fuzzy +msgstr "Nieobs�ugiwane przez serwer" + msgid "Not supported by client" -msgstr "Nieobs�ugiwane" +msgstr "Nieobs�ugiwane przez klienta" msgid "Refused by client" -msgstr "" +msgstr "Odmowa klienta" msgid "Reply too big" -msgstr "" - -#, fuzzy +msgstr "Odpowied添 jest za du甜a" + msgid "Responses lost" -msgstr "Prawdopodobie�stwo odpowiedzi:" - -#, fuzzy +msgstr "Utracono odpowiedzi" + msgid "Request denied" -msgstr "Wysy�anie pro�by" +msgstr "Odrzucono pro�by" msgid "Busted SNAC payload" -msgstr "" +msgstr "Uszkodzone dane SNAC" msgid "Insufficient rights" -msgstr "" +msgstr "Niewystarczaj�ce uprawnienia" msgid "In local permit/deny" -msgstr "" +msgstr "W lokalnym pozwoleniu/odmowie" msgid "Warning level too high (sender)" -msgstr "" +msgstr "Poziom ostrze甜enia jest za wysoki (nadawca)" msgid "Warning level too high (receiver)" -msgstr "" - -#, fuzzy +msgstr "Poziom ostrze甜enia jest za wysoki (odbiorca)" + msgid "User temporarily unavailable" -msgstr "Us�uga jest tymczasowo niedost�pna" - -#, fuzzy +msgstr "U甜ytkownik jest tymczasowo niedost�pny" + msgid "No match" msgstr "Brak wynik坦w" -#, fuzzy msgid "List overflow" msgstr "Lista jest pe�na" -#, fuzzy msgid "Request ambiguous" -msgstr "Wysy�anie pro�by" +msgstr "Niejednoznaczna pro�ba" msgid "Queue full" -msgstr "" +msgstr "Kolejka jest pe�na" msgid "Not while on AOL" -msgstr "" +msgstr "Nie podczas u甜ywania AOL" msgid "Aquarius" msgstr "Wodnik" @@ -10270,9 +10250,8 @@ msgid "Ignore conference and chatroom invitations" msgstr "Ignorowanie zaprosze� do konferencji" -#, fuzzy msgid "Use account proxy for HTTP and HTTPS connections" -msgstr "U甜ycie po�rednika konta dla po��cze� SSL" +msgstr "U甜ycie po�rednika konta dla po��cze� HTTP i HTTPS" msgid "Chat room list URL" msgstr "Adres URL listy pokoi konferencji" @@ -13147,13 +13126,11 @@ "Ko�czenie pracy, poniewa甜 inny klient biblioteki libpurple jest ju甜 " "uruchomiony.\n" -#, fuzzy msgid "_Media" -msgstr "/_Multimedia" - -#, fuzzy +msgstr "_Multimedia" + msgid "_Hangup" -msgstr "Roz��cz si�" +msgstr "_Roz��cz si�" #, c-format msgid "%s wishes to start an audio/video session with you." @@ -15459,29 +15436,3 @@ msgid "You do not have permission to uninstall this application." msgstr "Brak uprawnie� do odinstalowania tego programu." - -#~ msgid "The certificate is not valid yet." -#~ msgstr "Certyfikat nie jest jeszcze prawid�owy." - -#~ msgid "The nick name you entered is invalid." -#~ msgstr "Podany pseudonim jest nieprawid�owy." - -#~ msgid "MXit Login Name" -#~ msgstr "Login MXit" - -#~ msgid "Nick Name" -#~ msgstr "Pseudonim" - -#~ msgid "Your Mobile Number..." -#~ msgstr "Numer telefonu kom坦rkowego..." - -#, fuzzy -#~ msgid "Rate to host" -#~ msgstr "Zapro� do konferencji" - -#, fuzzy -#~ msgid "Rate to client" -#~ msgstr "Ostatni znany klient" - -#~ msgid "/Media/_Hangup" -#~ msgstr "/Multimedia/_Roz��cz si�"
--- a/po/ru.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/ru.po Wed Aug 11 07:36:56 2010 +0000 @@ -15600,7 +15600,7 @@ "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely " "that another user installed this application." msgstr "" -"��仂亞�舒仄仄舒 �亟舒仍亠仆亳� 仆亠 仄仂亢亠� 仆舒亶�亳 亟舒仆仆�亠 Pidgin 于 �亠亠���亠.$\\�仂�仂亢亠, ��仂 " +"��仂亞�舒仄仄舒 �亟舒仍亠仆亳� 仆亠 仄仂亢亠� 仆舒亶�亳 亟舒仆仆�亠 Pidgin 于 �亠亠���亠.$\\r�仂�仂亢亠, ��仂 " "仗�亳仍仂亢亠仆亳亠 ���舒仆仂于亳仍 亟��亞仂亶 仗仂仍�亰仂于舒�亠仍�." #. Installer Subsection Text
--- a/po/sl.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/sl.po Wed Aug 11 07:36:56 2010 +0000 @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Pidgin 2.7.1\n" +"Project-Id-Version: Pidgin 2.7.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 01:18-0400\n" -"PO-Revision-Date: 2010-05-22 11:26+0100\n" +"POT-Creation-Date: 2010-08-07 13:11-0400\n" +"PO-Revision-Date: 2010-07-30 14:57+0100\n" "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n" "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n" "Language: \n" @@ -65,9 +65,8 @@ msgid "Error" msgstr "Napaka" -#, fuzzy msgid "Account was not modified" -msgstr "Ra�un ni bil dodan" +msgstr "Ra�un ni bil spremenjen" msgid "Account was not added" msgstr "Ra�un ni bil dodan" @@ -78,10 +77,13 @@ msgid "" "The account's protocol cannot be changed while it is connected to the server." msgstr "" +"Protokola ra�una ni mogo�e spremeniti, medtem ko je povezan s stre転nikom." msgid "" "The account's username cannot be changed while it is connected to the server." msgstr "" +"Uporabni邸kega imena ra�una ni mogo�e spremeniti, medtem ko je povezan s " +"stre転nikom." msgid "New mail notifications" msgstr "Obve邸�anje o prispeli po邸ti" @@ -1698,6 +1700,8 @@ "The certificate is not valid yet. Check that your computer's date and time " "are accurate." msgstr "" +"Potrdilo 邸e ni veljavno. Preverite, da sta datum in �as va邸ega sistema " +"pravilno nastavljena." msgid "The certificate has expired and should not be considered valid." msgstr "" @@ -3870,18 +3874,18 @@ msgid "Server thinks authentication is complete, but client does not" msgstr "Stre転nik meni, da je overovitev dokon�ana, odjemalec pa ne" -#, fuzzy msgid "Server may require plaintext authentication over an unencrypted stream" msgstr "" -"Stre転nik zahteva overovitev z navadnim besedilom preko ne邸ifriranega toka" - -#, fuzzy, c-format +"Stre転nik lahko zahteva overovitev z navadnim besedilom preko ne邸ifriranega " +"toka" + +#, c-format msgid "" "%s may require plaintext authentication over an unencrypted connection. " "Allow this and continue authentication?" msgstr "" -"%s zahteva overovitev z navadnim besedilom preko ne邸ifrirane povezave. Se " -"strinjate s tem in 転elite nadaljevati z overovitvijo?" +"%s lahko zahteva overovitev z navadnim besedilom preko ne邸ifrirane povezave. " +"Se strinjate s tem in 転elite nadaljevati z overovitvijo?" msgid "SASL authentication failed" msgstr "Overovitev SASL ni uspela" @@ -5961,8 +5965,8 @@ msgid "The two PINs you entered do not match." msgstr "Vnesena PIN-a se ne ujemata." -msgid "The name you entered is invalid." -msgstr "Vneseno ime ni veljavno." +msgid "The Display Name you entered is invalid." +msgstr "Vneseno pojavno ime ni veljavno." msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -5980,9 +5984,8 @@ msgid "Your profile information is not yet retrieved. Please try again later." msgstr "Podatki o va邸em profilu 邸e niso pridobljen. Poskusite znova kasneje." -#, fuzzy msgid "Your UID" -msgstr "Va邸 MXitId" +msgstr "Va邸 UID" #. pin #. pin (required) @@ -6054,16 +6057,12 @@ msgid "Connecting..." msgstr "Povezovanje ..." -#, fuzzy -msgid "The Display Name you entered is invalid." -msgstr "Vneseno ime ni veljavno." - msgid "The PIN you entered has an invalid length [7-10]." msgstr "Vneseni PIN ni veljavne dol転ine [7-10]." #. mxit login name msgid "MXit ID" -msgstr "" +msgstr "MXit ID" #. show the form to the user to complete msgid "Register New MXit Account" @@ -6092,13 +6091,12 @@ msgid "Invalid country selected. Please try again." msgstr "Izbrana neveljavna dr転ava. Poskusite znova kasneje." -#, fuzzy msgid "The MXit ID you entered is not registered. Please register first." -msgstr "Uporabni邸ko ime ni registrirano. Najprej se registrirajte." - -#, fuzzy +msgstr "" +"ID za MXit, ki ste ga vnesli, ni registriran. Najprej se registrirajte." + msgid "The MXit ID you entered is already registered. Please choose another." -msgstr "Uporabni邸ko ime je 転e registrirano. Izberite drugo ime." +msgstr "ID za MXit, ki ste ga vnesli, je 転e registriran. Izberite drugo ime." msgid "Internal error. Please try again later." msgstr "Notranja napaka. Poskusite znova pozneje." @@ -6142,9 +6140,8 @@ msgid "Hidden Number" msgstr "Skrita 邸tevilka" -#, fuzzy msgid "Your MXit ID..." -msgstr "Va邸 MXitId" +msgstr "Va邸 MXit ID ..." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -6158,26 +6155,21 @@ msgstr "Omogo�i pozdravno okno ob zagonu" #. you were kicked -#, fuzzy msgid "You have been kicked from this MultiMX." -msgstr "Brcnjeni ste bili: (%s)" - -#, fuzzy +msgstr "Brcnjeni ste bili s tega MultiMX." + msgid "was kicked" -msgstr "Napa�na vstopnica" - -#, fuzzy +msgstr "je bil brcnjen" + msgid "_Room Name:" -msgstr "_Soba:" +msgstr "_Ime sobe:" #. Display system message in chat window -#, fuzzy msgid "You have invited" -msgstr "Dobili ste po邸to!" - -#, fuzzy +msgstr "Povabili ste uporabnika" + msgid "Last Online" -msgstr "Prisoten" +msgstr "Nazadnje povezan" #. we must have lost the connection, so terminate it so that we can reconnect msgid "We have lost the connection to MXit. Please reconnect." @@ -7970,85 +7962,74 @@ "za sporo�anje s slikami. Ker bo razkrit naslov IP, sodi ta povezava med " "tveganja zasebnosti." -#, fuzzy msgid "Invalid SNAC" -msgstr "Neveljaven ID" +msgstr "Neveljaven SNAC" msgid "Server rate limit exceeded" -msgstr "" +msgstr "Prekora�ena omejitev hitrosti stre転nika" msgid "Client rate limit exceeded" -msgstr "" - -#, fuzzy +msgstr "Prekora�ena omejitev hitrosti odjemalca" + msgid "Service unavailable" msgstr "Storitev ni dostopna" -#, fuzzy msgid "Service not defined" -msgstr "Konference ni mogo�e najti" +msgstr "Storitev ni definirana" msgid "Obsolete SNAC" -msgstr "" - -#, fuzzy +msgstr "Zastarel SNAC" + msgid "Not supported by host" -msgstr "Ni podprto" - -#, fuzzy +msgstr "Ni podprto s strani gostitelja" + msgid "Not supported by client" -msgstr "Ni podprto" +msgstr "Ni podprto s strani odjemalca" msgid "Refused by client" -msgstr "" +msgstr "Zavrnjeno s strani odjemalca" msgid "Reply too big" -msgstr "" - -#, fuzzy +msgstr "Odgovor preobse転en" + msgid "Responses lost" -msgstr "Verjetnost odgovora:" - -#, fuzzy +msgstr "Odgovori izgubljeni" + msgid "Request denied" -msgstr "Zahteva v teku" +msgstr "Zahteva zavrnjena" msgid "Busted SNAC payload" -msgstr "" +msgstr "Razkrinkana obremenitev SNAC" msgid "Insufficient rights" -msgstr "" +msgstr "Nezadostne pravice" msgid "In local permit/deny" -msgstr "" +msgstr "V krajevnem dovoli/prepovej" msgid "Warning level too high (sender)" -msgstr "" +msgstr "Raven opozoril previsoka (oddajnik)" msgid "Warning level too high (receiver)" -msgstr "" - -#, fuzzy +msgstr "Raven opozoril previsoka (sprejemnik)" + msgid "User temporarily unavailable" -msgstr "Storitev trenutno ni na voljo" - -#, fuzzy +msgstr "Uporabnik trenutno ni na voljo" + msgid "No match" msgstr "Ni zadetkov" -#, fuzzy msgid "List overflow" msgstr "Seznam poln" -#, fuzzy msgid "Request ambiguous" -msgstr "Zahteva v teku" +msgstr "Zahteva je dvoumna" msgid "Queue full" -msgstr "" +msgstr "Vrsta polna" msgid "Not while on AOL" -msgstr "" +msgstr "Ne medtem ko na AOL" msgid "Aquarius" msgstr "Vodnar" @@ -10241,9 +10222,8 @@ msgid "Ignore conference and chatroom invitations" msgstr "Prezri povabila na konference in v klepetalnice" -#, fuzzy msgid "Use account proxy for HTTP and HTTPS connections" -msgstr "Pri povezavah SSL uporabi posredovalni stre転nik za ra�une" +msgstr "Pri povezavah HTTP in HTTPS uporabi posredovalni stre転nik za ra�une" msgid "Chat room list URL" msgstr "URL seznama sob pomenkov" @@ -13126,13 +13106,11 @@ msgid "Exiting because another libpurple client is already running.\n" msgstr "Program se bo zaprl, ker je 転e zagnan drug odjemalec libpurple.\n" -#, fuzzy msgid "_Media" -msgstr "/_Mediji" - -#, fuzzy +msgstr "_Mediji" + msgid "_Hangup" -msgstr "Odlo転i" +msgstr "Odlo_転i" #, c-format msgid "%s wishes to start an audio/video session with you." @@ -15300,7 +15278,7 @@ #. Installer Subsection Detailed Description msgid "A multi-platform GUI toolkit, used by Pidgin" -msgstr "" +msgstr "Ve�-platformsko orodje za vmesnike, ki ga uporablja Pidgin" msgid "" "An instance of Pidgin is currently running. Please exit Pidgin and try " @@ -15433,6 +15411,9 @@ msgid "You do not have permission to uninstall this application." msgstr "Za odstranitev programa nimate ustreznih pravic." +#~ msgid "The name you entered is invalid." +#~ msgstr "Vneseno ime ni veljavno." + #~ msgid "The certificate is not valid yet." #~ msgstr "Digitalno potrdilo 邸e ni veljavno."
--- a/po/uk.po Fri Jul 30 12:56:42 2010 +0000 +++ b/po/uk.po Wed Aug 11 07:36:56 2010 +0000 @@ -9,16 +9,16 @@ msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 01:18-0400\n" -"PO-Revision-Date: 2010-05-24 22:50+0300\n" +"POT-Creation-Date: 2010-08-09 21:57-0700\n" +"PO-Revision-Date: 2010-08-09 00:28+0300\n" "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n" "Language-Team: Ukrainian <uk@li.org>\n" -"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: uk\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Translators may want to transliterate the name. #. It is not to be translated. @@ -63,9 +63,8 @@ msgid "Error" msgstr "�仂仄亳仍从舒" -#, fuzzy msgid "Account was not modified" -msgstr "�弍仍�从仂于亳亶 亰舒仗亳� 仆亠 弍�于 亟仂亟舒仆亳亶" +msgstr "�弍仍�从仂于亳亶 亰舒仗亳� 仆亠 弍�于 亰仄�仆亠仆亳亶" msgid "Account was not added" msgstr "�弍仍�从仂于亳亶 亰舒仗亳� 仆亠 弍�于 亟仂亟舒仆亳亶" @@ -76,10 +75,14 @@ msgid "" "The account's protocol cannot be changed while it is connected to the server." msgstr "" +"��仂�仂从仂仍 仂弍仍�从仂于仂亞仂 亰舒仗亳�� 仆亠 仄仂亢亠 弍��亳 亰仄�仆亠仆亳亶 从仂仍亳 于�仆 仗�亟从仍��亠仆亳亶 亟仂 " +"�亠�于亠�舒." msgid "" "The account's username cannot be changed while it is connected to the server." msgstr "" +"�仄'� 从仂�亳���于舒�舒 仂弍仍�从仂于仂亞仂 亰舒仗亳�� 仆亠 仄仂亢亠 弍��亳 亰仄�仆亠仆亠 从仂仍亳 于�仆 仗�亟从仍��亠仆亳亶 " +"亟仂 �亠�于亠�舒." msgid "New mail notifications" msgstr "弌仗仂于��亠仆仆� 仗�仂 仆仂于� 仗仂���" @@ -91,7 +94,7 @@ msgstr "�亠 于��舒仆仂于仍亠仆亳亶 亢仂亟仆亳亶 亰 亟仂亟舒�从�于 仗�仂�仂从仂仍�于." msgid "(You probably forgot to 'make install'.)" -msgstr "(�仂亢仍亳于仂, 于亳 亰舒弍�仍亳 于亳从仂仆舒�亳 'make install'.)" +msgstr "(�仂亢仍亳于仂, 于亳 亰舒弍�仍亳 于亳从仂仆舒�亳 \"make install\".)" msgid "Modify Account" msgstr "�仄�仆亳�亳 仂弍仍�从仂于亳亶 亰舒仗亳�" @@ -442,13 +445,13 @@ msgstr "�舒 ��舒仆仂仄" msgid "Alphabetically" -msgstr "�舒 舒仍�舒于��仂仄" +msgstr "�舒 舒弍亠�从仂�" msgid "By Log Size" msgstr "�舒 �仂亰仄��仂仄 亢��仆舒仍�" msgid "Buddy" -msgstr "��亳��亠仍�" +msgstr "�仂仆�舒从�" msgid "Chat" msgstr "�舒仍舒�从舒" @@ -460,10 +463,10 @@ msgstr "�仄仗仂�� �亠��亳��从舒��" msgid "Specify a hostname" -msgstr "�亳亰仆舒�亳�亳 仆舒亰于� 于�亰仍舒" +msgstr "�从舒亰舒�亳 仆舒亰于� 于�亰仍舒" msgid "Type the host name this certificate is for." -msgstr "�舒仗亳���� 仆舒亰于� 于�亰仍舒, 从仂仄� 仆舒仍亠亢亳�� �亠亶 �亠��亳��从舒�." +msgstr "�舒仗亳���� 仆舒亰于� 于�亰仍舒, �从仂仄� 仆舒仍亠亢亳�� �亠亶 �亠��亳��从舒�." #, c-format msgid "" @@ -477,7 +480,7 @@ msgstr "�仂仄亳仍从舒 �仄仗仂���于舒仆仆� �亠��亳��从舒��" msgid "X.509 certificate import failed" -msgstr "�仂仄亳仍从舒 �仄仗仂��� �亠��亳��从舒�� X.509" +msgstr "�仂仄亳仍从舒 �仄仗仂���于舒仆仆� �亠��亳��从舒�� X.509" msgid "Select a PEM certificate" msgstr "�亳弍�舒�亳 �亠��亳��从舒� PEM" @@ -497,7 +500,7 @@ msgstr "�仂仄亳仍从舒 亠从�仗仂��� �亠��亳��从舒�� X.509" msgid "PEM X.509 Certificate Export" -msgstr "�从�仗仂�� �亠��亳��从舒�� PEM X.509" +msgstr "�从�仗仂���于舒仆仆� �亠��亳��从舒�� PEM X.509" #, c-format msgid "Certificate for %s" @@ -1694,6 +1697,8 @@ "The certificate is not valid yet. Check that your computer's date and time " "are accurate." msgstr "" +"弌亠��亳��从舒� �亠 仆亠 亟�亶�仆亳亶. �亠�亠于���亠, �亳 亟舒�舒 �舒 �舒� 于舒�仂亞仂 从仂仄仗'��亠�舒 " +"仗�舒于亳仍�仆�." msgid "The certificate has expired and should not be considered valid." msgstr "丐亠�仄�仆 亟�� �亠��亳��从舒�� 亰舒从�仆�亳于�� � 亶仂亞仂 仆亠 �仍�亟 于于舒亢舒�亳 亟�亶�仆亳仄." @@ -3851,18 +3856,18 @@ msgid "Server thinks authentication is complete, but client does not" msgstr "弌亠�于亠� 于于舒亢舒�, �仂 舒于�亠仆�亳��从舒��� 亰舒于亠��亠仆舒, 舒仍亠 从仍��仆� 仆�" -#, fuzzy msgid "Server may require plaintext authentication over an unencrypted stream" msgstr "" -"弌亠�于亠� 于亳仄舒亞舒� 舒于�亠仆�亳��从舒��� 亰于亳�舒亶仆亳仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆亳亶 仗仂��从" - -#, fuzzy, c-format +"弌亠�于亠� 仄仂亢亠 仗仂��亠弍�于舒�亳 舒于�亠仆�亳��从舒��� 亰于亳�舒亶仆亳仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆亳亶 " +"仗仂��从" + +#, c-format msgid "" "%s may require plaintext authentication over an unencrypted connection. " "Allow this and continue authentication?" msgstr "" -"%s 仗仂��亠弍�� 舒于�亠仆�亳��从舒��� 于�亟从�亳�亳仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆亠 亰'�亟仆舒仆仆�. " -"�仂亰于仂仍亳�亳 �亠 �舒 仗�仂亟仂于亢亳�亳 舒于�亠仆�亳��从舒���?" +"%s 仄仂亢亠 仗仂��亠弍�于舒�亳 舒于�亠仆�亳��从舒��� 于�亟从�亳�亳仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆亠 " +"亰'�亟仆舒仆仆�. �仂亰于仂仍亳�亳 �亠 �舒 仗�仂亟仂于亢亳�亳 舒于�亠仆�亳��从舒���?" msgid "SASL authentication failed" msgstr "�仂仄亳仍从舒 舒于�亠仆�亳��从舒��� SASL" @@ -5937,8 +5942,8 @@ msgid "The two PINs you entered do not match." msgstr "�于亠亟亠仆� 亟于舒 PIN'亳 仆亠 亰弍�亞舒�����." -msgid "The name you entered is invalid." -msgstr "�于亠亟亠仆亠 �仄'� 仆亠仗�舒于亳仍�仆亠." +msgid "The Display Name you entered is invalid." +msgstr "�于亠亟亠仆亠 于�亟仂弍�舒亢�于舒仆亠 �仄'� 仆亠仗�舒于亳仍�仆亠." msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -5957,9 +5962,8 @@ msgid "Your profile information is not yet retrieved. Please try again later." msgstr "��亟仂仄仂��� 仗�仂 仗�仂��仍� �亠 仆亠 仂��亳仄舒仆�. ��亟� 仍舒�从舒, �仗�仂弍�亶�亠 仗�亰仆��亠." -#, fuzzy msgid "Your UID" -msgstr "�舒� MXitId" +msgstr "�舒� UID" #. pin #. pin (required) @@ -6031,16 +6035,12 @@ msgid "Connecting..." msgstr "�'�亟仆舒仆仆�..." -#, fuzzy -msgid "The Display Name you entered is invalid." -msgstr "�于亠亟亠仆亠 �仄'� 仆亠仗�舒于亳仍�仆亠." - msgid "The PIN you entered has an invalid length [7-10]." msgstr "�于亠亟亠仆亳亶 PIN 仄舒� 仆亠仗�舒于亳仍�仆� 亟仂于亢亳仆� [7-10]." #. mxit login name msgid "MXit ID" -msgstr "" +msgstr "MXit ID" #. show the form to the user to complete msgid "Register New MXit Account" @@ -6068,13 +6068,11 @@ msgid "Invalid country selected. Please try again." msgstr "�亳弍�舒仆舒 仆亠仗�舒于亳仍�仆舒 从�舒�仆舒. ��亟� 仍舒�从舒, �仗�仂弍�亶�亠 �亠 �舒亰." -#, fuzzy msgid "The MXit ID you entered is not registered. Please register first." -msgstr "�仄'� 从仂�亳���于舒�舒 仆亠 亰舒�亠����仂于舒仆亠. ��亟� 仍舒�从舒, �仗亠��� 亰舒�亠�����亶�亠��." - -#, fuzzy +msgstr "�于亠亟亠仆亳亶 MXit ID 仆亠 亰舒�亠����仂于舒仆亳亶. ��亟� 仍舒�从舒, �仗亠��� 亰舒�亠�����亶�亠��." + msgid "The MXit ID you entered is already registered. Please choose another." -msgstr "�仄'� 从仂�亳���于舒�舒 于亢亠 亰舒�亠����仂于舒仆亠. ��亟� 仍舒�从舒, 于亳弍亠���� �仆�亠." +msgstr "�于亠亟亠仆亳亶 MXit ID 于亢亠 亰舒�亠����仂于舒仆亠. ��亟� 仍舒�从舒, 于亳弍亠���� �仆�亳亶." msgid "Internal error. Please try again later." msgstr "�仆�����仆� 仗仂仄亳仍从舒. ��亟� 仍舒�从舒, �仗�仂弍�亶�亠 仗�亰仆��亠." @@ -6118,9 +6116,8 @@ msgid "Hidden Number" msgstr "弌�仂于舒仆亳亶 仆仂仄亠�" -#, fuzzy msgid "Your MXit ID..." -msgstr "�舒� MXitId" +msgstr "�舒� MXit ID..." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -6134,26 +6131,21 @@ msgstr "丕于�仄从仆��亳 于亳�亳仆舒��� 亠从�舒仆仆� 亰舒��舒于从�" #. you were kicked -#, fuzzy msgid "You have been kicked from this MultiMX." -msgstr "�舒� 于亳从亳仆�仍亳: (%s)" - -#, fuzzy +msgstr "�舒� 于亳从亳仆�仍亳 亰 ��仂亞仂 MultiMX." + msgid "was kicked" -msgstr "�亠仗�舒于亳仍�仆亳亶 弍�仍亠�" - -#, fuzzy +msgstr "弍�于 于亳从亳仆��亳亶" + msgid "_Room Name:" -msgstr "_��仄仆舒�舒:" +msgstr "_�舒亰于舒 从�仄仆舒�亳:" #. Display system message in chat window -#, fuzzy msgid "You have invited" -msgstr "�亳 仄舒��亠 仍亳��!" - -#, fuzzy +msgstr "�舒� 亰舒仗�仂�亳仍亳" + msgid "Last Online" -msgstr "丕 仄亠�亠亢�" +msgstr "�仂��舒仆仆� 于 仄亠�亠亢�" #. we must have lost the connection, so terminate it so that we can reconnect msgid "We have lost the connection to MXit. Please reconnect." @@ -7948,85 +7940,74 @@ "�舒 � 仆亠仂弍��亟仆亳仄 亟仍� 仗亠�亠亟舒于舒仆仆� 亰仂弍�舒亢亠仆�. 丐舒从 �从 于舒�舒 �� 舒亟�亠�舒 弍�亟亠 " "�仂亰从�亳�舒, �亠 仄仂亢亠 于于舒亢舒�亳�� 亰舒亞�仂亰仂� 弍亠亰仗亠��." -#, fuzzy msgid "Invalid SNAC" -msgstr "�亠仗�舒于亳仍�仆亳亶 ID" +msgstr "�亠仗�舒于亳仍�仆亳亶 SNAC" msgid "Server rate limit exceeded" -msgstr "" +msgstr "�仂��亞仆��仂 仂弍仄亠亢亠仆仆� �于亳亟从仂��� �亠�于亠�舒" msgid "Client rate limit exceeded" -msgstr "" - -#, fuzzy +msgstr "�仂��亞仆��仂 仂弍仄亠亢亠仆仆� �于亳亟从仂��� 从仍��仆�舒" + msgid "Service unavailable" -msgstr "弌仍�亢弍舒 仆亠亟仂���仗仆舒" - -#, fuzzy +msgstr "�仂�仍�亞舒 仆亠亟仂���仗仆舒" + msgid "Service not defined" -msgstr "�仂仆�亠�亠仆��� 仆亠 亰仆舒亶亟亠仆舒" +msgstr "�仂�仍�亞舒 仆亠 于亳亰仆舒�亠仆舒" msgid "Obsolete SNAC" -msgstr "" - -#, fuzzy +msgstr "�舒��舒��仍亳亶 SNAC" + msgid "Not supported by host" -msgstr "�亠 仗�亟��亳仄������" - -#, fuzzy +msgstr "�亠 仗�亟��亳仄������ 于�亰仍仂仄" + msgid "Not supported by client" -msgstr "�亠 仗�亟��亳仄������" +msgstr "�亠 仗�亟��亳仄������ 从仍��仆�仂仄" msgid "Refused by client" -msgstr "" +msgstr "��亟从亳仆��舒 从仍��仆�仂仄" msgid "Reply too big" -msgstr "" - -#, fuzzy +msgstr "��亟仗仂于�亟� 亰舒于亠仍亳从舒" + msgid "Responses lost" -msgstr "�仂亢仍亳于���� 于�亟仗仂于�亟�:" - -#, fuzzy +msgstr "��亟仗仂于�亟� 于��舒�亠仆�" + msgid "Request denied" -msgstr "�舒仗亳�������" +msgstr "�舒仗亳� 于�亟�亳仍亠仆亳亶" msgid "Busted SNAC payload" -msgstr "" +msgstr "��仗�仂于舒仆� 亟舒仆� SNAC" msgid "Insufficient rights" -msgstr "" +msgstr "�亠亟仂��舒�仆�仂 仗�舒于" msgid "In local permit/deny" -msgstr "" +msgstr "� 仄���亠于仂仄� 仗亠�亠仍�从� 亟仂亰于仂仍亠仆亳�/亰舒弍仂�仂仆亠仆亳�" msgid "Warning level too high (sender)" -msgstr "" +msgstr "��于亠仆� 仗仂仗亠�亠亟亢亠仆仆� 亟�亢亠 于亳�仂从亳亶 (于�亟仗�舒于仆亳从)" msgid "Warning level too high (receiver)" -msgstr "" - -#, fuzzy +msgstr "��于亠仆� 仗仂仗亠�亠亟亢亠仆仆� 亟�亢亠 于亳�仂从亳亶 (仂��亳仄�于舒�)" + msgid "User temporarily unavailable" -msgstr "�仂�仍�亞舒 �亳仄�舒�仂于仂 仆亠亟仂���仗仆舒" - -#, fuzzy +msgstr "�仂�亳���于舒� �亳仄�舒�仂于仂 仆亠亟仂���仗仆亳亶" + msgid "No match" msgstr "�亠仄舒� 亰弍�亞�于" -#, fuzzy msgid "List overflow" msgstr "�亠�亠仍�从 仗亠�亠仗仂于仆亠仆亳亶" -#, fuzzy msgid "Request ambiguous" -msgstr "�舒仗亳�������" +msgstr "�舒仗亳� 仆亠亰�仂亰�仄�仍亳亶" msgid "Queue full" -msgstr "" +msgstr "丼亠�亞舒 仗亠�亠仗仂于仆亠仆舒" msgid "Not while on AOL" -msgstr "" +msgstr "�亠 �仂亟�, 从仂仍亳 � AOL" msgid "Aquarius" msgstr "�仂亟仂仍�亶" @@ -8883,8 +8864,8 @@ "No host or IP address has been configured for the Meanwhile account %s. " "Please enter one below to continue logging in." msgstr "" -"�� 于�亰仂仍, 仆� 舒亟�亠�舒 IP 仆亠 弍�仍亳 仆舒仍舒��仂于舒仆� 亟仍� 仂弍仍�从仂于仂亞仂 亰舒仗亳�� Meanwhile " -"%s. ��亟� 仍舒�从舒, 于于亠亟��� �从�亶��, �仂弍 仆舒仍舒���于舒�亳 于��亟." +"�� 于�亰仂仍, 仆� 舒亟�亠�舒 IP 仆亠 弍�仍亳 仆舒仍舒��仂于舒仆� 亟仍� 仂弍仍�从仂于仂亞仂 亰舒仗亳�� Meanwhile %" +"s. ��亟� 仍舒�从舒, 于于亠亟��� �从�亶��, �仂弍 仆舒仍舒���于舒�亳 于��亟." msgid "Meanwhile Connection Setup" msgstr "���舒仆仂于仍亠仆仆� 亰'�亟仆舒仆仆� Meanwhile" @@ -10236,9 +10217,8 @@ msgid "Ignore conference and chatroom invitations" msgstr "�亠���于舒�亳 亰舒仗�仂�亠仆仆�仄亳 � 从仂仆�亠�亠仆��� �舒 从�仄仆舒�亳 弍舒仍舒�仂从" -#, fuzzy msgid "Use account proxy for HTTP and HTTPS connections" -msgstr "�亳从仂�亳��仂于�于舒�亳 仗�仂从�� 仂弍仍�从仂于仂亞仂 亰舒仗亳�� 亟仍� 亰'�亟仆舒仆� SSL" +msgstr "�亳从仂�亳��仂于�于舒�亳 仗�仂从�� 仂弍仍�从仂于仂亞仂 亰舒仗亳�� 亟仍� 亰'�亟仆舒仆� HTTP �舒 HTTPS" msgid "Chat room list URL" msgstr "URL 仗亠�亠仍�从� 弍舒仍舒�仂从" @@ -10278,8 +10258,8 @@ "%s has (retroactively) denied your request to add them to your list for the " "following reason: %s." msgstr "" -"%s (仗仂于�仂�仆仂) 亰舒弍仂�仂仆亳于 于舒仄 亟仂亟舒�亳 �亠弍亠 � 于舒� 仗亠�亠仍�从 亰 仆舒���仗仆仂� 仗�亳�亳仆亳: " -"%s." +"%s (仗仂于�仂�仆仂) 亰舒弍仂�仂仆亳于 于舒仄 亟仂亟舒�亳 �亠弍亠 � 于舒� 仗亠�亠仍�从 亰 仆舒���仗仆仂� 仗�亳�亳仆亳: %" +"s." #, c-format msgid "%s has (retroactively) denied your request to add them to your list." @@ -12450,12 +12430,12 @@ "to multiple messaging services at once. %s is written in C using GTK+. %s " "is released, and may be modified and redistributed, under the terms of the " "GPL version 2 (or later). A copy of the GPL is distributed with %s. %s is " -"copyrighted by its contributors, a list of whom is also distributed with " -"%s. There is no warranty for %s.<BR><BR>" +"copyrighted by its contributors, a list of whom is also distributed with %" +"s. There is no warranty for %s.<BR><BR>" msgstr "" "%s - �亠 从仍��仆� 仂弍仄�仆� 仄亳���于亳仄亳 仗仂于�亟仂仄仍亠仆仆�仄亳, �从亳亶 仂�仆仂于舒仆亳亶 仆舒 libpurple, " -"�仂 亰亟舒�仆舒 亰'�亟仆�于舒�亳�� 亰 弍舒亞舒��仄舒 仗仂�仍�亞舒仄亳 仄亳���于亳� 仗仂于�亟仂仄仍亠仆� 仂亟仆仂�舒�仆仂. " -"%s 仆舒仗亳�舒仆亳亶 仆舒 C, 亰舒��仂�仂于���亳 GTK+. %s 于亳亟舒仆亳亶 �舒 仄仂亢亠 亰仄�仆�于舒�亳�� � " +"�仂 亰亟舒�仆舒 亰'�亟仆�于舒�亳�� 亰 弍舒亞舒��仄舒 仗仂�仍�亞舒仄亳 仄亳���于亳� 仗仂于�亟仂仄仍亠仆� 仂亟仆仂�舒�仆仂. %" +"s 仆舒仗亳�舒仆亳亶 仆舒 C, 亰舒��仂�仂于���亳 GTK+. %s 于亳亟舒仆亳亶 �舒 仄仂亢亠 亰仄�仆�于舒�亳�� � " "�仂亰仗仂于��亟亢�于舒�亳�� � 于�亟仗仂于�亟仆仂��� 亰 仍��亠仆亰��� GPL 于亠���� 2 (舒弍仂 仆仂于��舒). " "�仂仗�� GPL 仗仂��舒�舒����� 亰 %s. �于�仂���从亠 仗�舒于仂 仆舒 %s 仆舒仍亠亢亳�� 亶仂亞仂 " "�仂亰�仂弍仆亳从舒仄, 仗亠�亠仍�从 �从亳� �亠亢 仗仂��舒�舒����� 亰 %s. ��亟�-�从� 亞舒�舒仆��� 仆舒 %s 仆亠 " @@ -12998,15 +12978,15 @@ #, c-format msgid "" -"Are you sure you want to permanently delete the log of the conversation in " -"%s which started at %s?" +"Are you sure you want to permanently delete the log of the conversation in %" +"s which started at %s?" msgstr "" "�亳 亟�亶�仆仂 �仂�亠�亠 仆舒亰舒于亢亟亳 于亳亟舒仍亳�亳 亢��仆舒仍 �仂亰仄仂于 � %s, �仂 �仂亰仗仂�舒仍亳�� 仂 %s?" #, c-format msgid "" -"Are you sure you want to permanently delete the system log which started at " -"%s?" +"Are you sure you want to permanently delete the system log which started at %" +"s?" msgstr "" "丼亳 亟�亶�仆仂 �仂�亠�亠 仆舒亰舒于亢亟亳 于亳亟舒仍亳�亳 �亳��亠仄仆亳亶 亢��仆舒仍, �仂 �仂亰仗仂�舒�亳亶 仂 %s?" @@ -13112,13 +13092,11 @@ msgstr "" "�亳��亟, �仂仄� �仂 于亢亠 亰舒仗��亠仆亳亶 �仆�亳亶 从仍��仆�, �从亳亶 于亳从仂�亳��仂于�� libpurple.\n" -#, fuzzy msgid "_Media" -msgstr "/_�亠亟�舒" - -#, fuzzy +msgstr "_�亠亟�舒" + msgid "_Hangup" -msgstr "�舒于亠��亳�亳" +msgstr "_�舒于亠��亳�亳" #, c-format msgid "%s wishes to start an audio/video session with you." @@ -15291,7 +15269,7 @@ #. Installer Subsection Detailed Description msgid "Create a Start Menu entry for Pidgin" -msgstr "弌�于仂�亳�亳 亰舒仗亳� � 仄亠仆� '���从' 亟仍� Pidgin" +msgstr "弌�于仂�亳�亳 亰舒仗亳� � 仄亠仆� \"���从\" 亟仍� Pidgin" #. Installer Subsection Detailed Description msgid "Create a shortcut to Pidgin on the Desktop" @@ -15328,8 +15306,8 @@ #, no-c-format msgid "" "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual " -"installation instructions are at: http://developer.pidgin.im/wiki/Installing" -"%20Pidgin#manual_win32_spellcheck_installation" +"installation instructions are at: http://developer.pidgin.im/wiki/Installing%" +"20Pidgin#manual_win32_spellcheck_installation" msgstr "" "�仂仄亳仍从舒 于��舒仆仂于仍亠仆仆� 仗亠�亠于��从亳 仗�舒于仂仗亳�� ($R3).$\\r亊从�仂 �仗�仂弍亳 弍�亟��� " "仄舒�仆亳仄亳, 亟亳于����� 亟仂于�亟从� 仗仂 ���仆仂仄� 于��舒仆仂于仍亠仆仆� 仆舒 http://developer.pidgin." @@ -15409,29 +15387,3 @@ msgid "You do not have permission to uninstall this application." msgstr "�亳 仆亠 仄舒��亠 仗�舒于舒 仆舒 于亳亟舒仍亠仆仆� ���� 仗�仂亞�舒仄亳." - -#~ msgid "The certificate is not valid yet." -#~ msgstr "弌亠��亳��从舒� �亠 仆亠 亟�亶�仆亳亶." - -#~ msgid "The nick name you entered is invalid." -#~ msgstr "�于亠亟亠仆亠 仗��亰于亳��从仂 仆亠仗�舒于亳仍�仆亠." - -#~ msgid "MXit Login Name" -#~ msgstr "�仄'� 于�仂亟� MXit" - -#~ msgid "Nick Name" -#~ msgstr "���亰于亳��从仂" - -#~ msgid "Your Mobile Number..." -#~ msgstr "�仂仄亠� 仄仂弍�仍�仆仂亞仂 �亠仍亠�仂仆�..." - -#, fuzzy -#~ msgid "Rate to host" -#~ msgstr "�舒仗�仂�亳�亳 亟仂 弍舒仍舒�从亳" - -#, fuzzy -#~ msgid "Rate to client" -#~ msgstr "���舒仆仆�亶 于�亟仂仄亳亶 从仍��仆�" - -#~ msgid "/Media/_Hangup" -#~ msgstr "/�亠亟�舒/_�舒于亠��亳�亳"
--- a/share/ca-certs/Makefile.am Fri Jul 30 12:56:42 2010 +0000 +++ b/share/ca-certs/Makefile.am Wed Aug 11 07:36:56 2010 +0000 @@ -9,6 +9,7 @@ StartCom_Certification_Authority.pem \ StartCom_Free_SSL_CA.pem \ Thawte_Premium_Server_CA.pem \ + ValiCert_Class_2_VA.pem \ Verisign_RSA_Secure_Server_CA.pem \ Verisign_Class3_Primary_CA.pem \ VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/ca-certs/ValiCert_Class_2_VA.pem Wed Aug 11 07:36:56 2010 +0000 @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlD +ZXJ0IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIElu +Yy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRp +b24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNv +bS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYy +NjAwMTk1NFoXDTE5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 +IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4x +NTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24g +QXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8x +IDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3 +DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vYdA757tn2VUdZZUcOBVXc +65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9WlmpZdRJEy0kTRxQ +b7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QSv4dk+NoS/zcn +wbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9vUJSZSWI4 +OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTuIYEZ +oDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC +W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd +-----END CERTIFICATE-----