Mercurial > pidgin
changeset 31005:b91cd8c4e6e5
propagate from branch 'im.pidgin.cpw.qulogic.cairo' (head 2efef3c76346222c20254255e83de8bb572d0ed8)
to branch 'im.pidgin.pidgin' (head 81efd2846f4ee48f9ae027245d9a725a093e279c)
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 05 Dec 2010 02:43:54 +0000 (2010-12-05) |
| parents | 1c660ba17ba1 (current diff) 3cff7a5e0351 (diff) |
| children | e9afcbec8f20 |
| files | pidgin/gtkimhtml.c |
| diffstat | 71 files changed, 2545 insertions(+), 1555 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Nov 21 20:30:12 2010 +0000 +++ b/ChangeLog Sun Dec 05 02:43:54 2010 +0000 @@ -1,18 +1,96 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.7.6 (??/??/????): +version 2.7.8 (??/??/????): + General: + * Fix the exceptions in purple-remote on Python 2.6+. (Ari Pollak) + (#12151) + + Pidgin: + * When a conversation has reached the maximum limit on the number + of smileys, display the text representation of the smiley properly + when it contains HTML-escapable characters (e.g. "<3" was previously + displayed as "<3"). + + libpurple: + * Fix multipart parsing when '=' is included in the boundary for + purple_mime_document_parse. (Jakub Adam) (#11598) + + AIM and ICQ: + * Buddies who unset their status message will now be correctly shown + without a message in your buddy list. (#12988) + + Gadu-Gadu: + * Updated our bundled libgadu and minimum requirement for external + libgadu to 1.9.0. (#12789) + + MSN: + * Stop showing ourselves in the list of endpoints that can be + disconnected. + * Allow full-size display names, by not escaping (most) non-English + characters. (#8508) + * Fix receiving messages from users on Yahoo and other federated + services. (#13022) + * Correctly remove old endpoints when they sign out. + +version 2.7.7 (11/23/2010): + General: + * Allow multiple CA certificates to share the same Distinguished Name + (DN). Partially fixes remaining MSN issues from #12906. + * The GNUTLS SSL plugin now discards any certificate (and all subsequent + certificates) in a chain if it did not sign the previous certificate. + Partially fixes remaining MSN issues from #12906. + * Open requests related to a file transfer are now closed when the request + is cancelled locally. (#11666) + + AIM and ICQ: + * AIM should now connect if "Use clientLogin" is turned off and the + "Server" field is set to anything other than "login.oscar.aol.com" or + "slogin.oscar.aol.com". (#12948) + * Fix a crash on connection loss. (#5927) + +version 2.7.6 (11/21/2010): + General: + * Included Microsoft Internet Authority 2010 and Microsoft Secure Server + Authority 2010 intermediate CA certificates to our bundle. This fixes + the "Unable to validate certificate" error for omega.contacts.msn.com. + (#12906) + + Pidgin: + * Avoid a use-after-free race condition in the media code (when + there's an error reported by GStreamer). (#12806, Jakub Adam) + + AIM and ICQ: + * SSL option has been changed to a tri-state menu with choices for + "Don't Use Encryption", "Use Encryption if Available", and "Require + Encryption". + * Fix some possible clientLogin URL issues introduced in version 2.7.5. + * Don't show a "<URL>: Ok" connection error when using clientLogin. + * Cleaned up some debug output for improved readability. + MSN: * Added support for MSNP16, including Multiple Points of Presence (MPOP) - which allows multiple simultaneous sign-ins. + which allows multiple simultaneous sign-ins. (#8247) * Added extended capabilities support (none implemented). * Merged the work done on the Google SoC (major rewrite of SLP code) * Reworked the data transfer architecture. (http://developer.pidgin.im/wiki/SlpArchitecture) * Lots of little changes. + * Don't process zero-length DC messages. (#12660) + * Fixed a bunch of memory leaks. + * Prevent a use-after-free condition. XMPP: * Avoid a double-free in the Google Relay (V/V) code. * Avoid double error message when failing a file transfer. (#12757) + * Password-related information is printed out for SASL authentication + when the PURPLE_UNSAFE_DEBUG environment variable is set. + * Authentication mechanisms can now be added by UI's or other plugins + with some work. This is outside the API/ABI rules! (#12715) + * Fixed a few printf("%s", NULL) crashes for broken OSes. + + Windows-Specific Changes: + * Build the Pidgin Theme Editor plugin (finally). + * Untarring (for themes) now works for non-ASCII destination paths. version 2.7.5 (10/31/2010): General:
--- a/ChangeLog.API Sun Nov 21 20:30:12 2010 +0000 +++ b/ChangeLog.API Sun Dec 05 02:43:54 2010 +0000 @@ -1,6 +1,13 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.7.6 (??/??/????): +version 2.7.8 (??/??/????): + * No changes + +version 2.7.7 (11/23/2010): + * No changes + +version 2.7.6 (11/21/2010): + * No changes version 2.7.5 (10/31/2010): * No changes
--- a/NEWS Sun Nov 21 20:30:12 2010 +0000 +++ b/NEWS Sun Dec 05 02:43:54 2010 +0000 @@ -2,7 +2,16 @@ Our development blog is available at: http://planet.pidgin.im -2.7.6 (??/??/????): +2.7.8 (??/??/????): + +2.7.7 (11/23/2010): + John: Well, this time around, we should finally have the certificate + issue really and fully fixed for all of you MSN users. Also, we have + a few AIM-related fixes in this release, most notably the fix for the + new "SSL Handshake Failure" message some of you got after upgrading. + That one was an oversight on our part. Enjoy the fixes! + +2.7.6 (11/21/2010): Jorge: In this release I have merged two branches where I have spent most of my time in the last months, the MSNP16 and SLP-rewrite. I hope you all will enjoy the hability to be connected on multiple @@ -11,6 +20,10 @@ happy with this rewrite because there was untoched code from almost 5 years ago. I hope you like this release! + John: In this release, we give you some new features and a bunch of + bug fixes. This includes shipping intermediate certificates to fix + certificate validation for MSN's servers. Upgrade and enjoy! + 2.7.5 (10/31/2010): John: A bugfix release for all of you! This time we fixed a bunch of bugs ranging from annoying regressions to long-standing bugs we didn't
--- a/configure.ac Sun Nov 21 20:30:12 2010 +0000 +++ b/configure.ac Sun Dec 05 02:43:54 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], [6]) +m4_define([purple_micro_version], [8]) 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], [3]) +m4_define([gnt_micro_version], [5]) m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) @@ -1046,7 +1046,7 @@ gadu_manual_check="no" fi if test "x$gadu_manual_check" = "xno"; then - PKG_CHECK_MODULES(GADU, [libgadu >= 1.9.0-rc2], [ + PKG_CHECK_MODULES(GADU, [libgadu >= 1.9.0], [ gadu_includes="yes" gadu_libs="yes" ], [
--- a/libpurple/account.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/account.c Sun Dec 05 02:43:54 2010 +0000 @@ -1087,6 +1087,9 @@ g_hash_table_destroy(account->settings); g_hash_table_destroy(account->ui_settings); + if (account->proxy_info) + purple_proxy_info_destroy(account->proxy_info); + purple_account_set_status_types(account, NULL); purple_presence_destroy(account->presence);
--- a/libpurple/certificate.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/certificate.c Sun Dec 05 02:43:54 2010 +0000 @@ -947,6 +947,22 @@ return NULL; } +static GSList * +x509_ca_locate_certs(GList *lst, const gchar *dn) +{ + GList *cur; + GSList *crts = NULL; + + for (cur = lst; cur; cur = cur->next) { + x509_ca_element *el = cur->data; + if (purple_strequal(dn, el->dn)) { + crts = g_slist_prepend(crts, el); + } + } + return crts; +} + + static gboolean x509_ca_cert_in_pool(const gchar *id) { @@ -985,6 +1001,31 @@ return crt; } +static GSList * +x509_ca_get_certs(const gchar *id) +{ + GSList *crts = NULL, *els = NULL; + + g_return_val_if_fail(x509_ca_lazy_init(), NULL); + g_return_val_if_fail(id, NULL); + + /* Search the memory-cached pool */ + els = x509_ca_locate_certs(x509_ca_certs, id); + + if (els != NULL) { + GSList *cur; + /* Make a copy of the memcached ones for the function caller + to play with */ + for (cur = els; cur; cur = cur->next) { + x509_ca_element *el = cur->data; + crts = g_slist_prepend(crts, purple_certificate_copy(el->crt)); + } + g_slist_free(els); + } + + return crts; +} + static gboolean x509_ca_put_cert(const gchar *id, PurpleCertificate *crt) { @@ -1558,7 +1599,9 @@ PurpleCertificate *ca_crt, *end_crt; PurpleCertificate *failing_crt; GList *chain = vrq->cert_chain; + GSList *ca_crts, *cur; GByteArray *last_fpr, *ca_fpr; + gboolean valid = FALSE; gchar *ca_id; peer_crt = (PurpleCertificate *) chain->data; @@ -1646,8 +1689,8 @@ purple_debug_info("certificate/x509/tls_cached", "Checking for a CA with DN=%s\n", ca_id); - ca_crt = purple_certificate_pool_retrieve(ca, ca_id); - if ( NULL == ca_crt ) { + ca_crts = x509_ca_get_certs(ca_id); + if ( NULL == ca_crts ) { flags |= PURPLE_CERTIFICATE_CA_UNKNOWN; purple_debug_warning("certificate/x509/tls_cached", @@ -1677,24 +1720,33 @@ * the list, so here we are. */ last_fpr = purple_certificate_get_fingerprint_sha1(end_crt); - ca_fpr = purple_certificate_get_fingerprint_sha1(ca_crt); + for (cur = ca_crts; cur; cur = cur->next) { + ca_crt = cur->data; + ca_fpr = purple_certificate_get_fingerprint_sha1(ca_crt); - if ( !byte_arrays_equal(last_fpr, ca_fpr) && - !purple_certificate_signed_by(end_crt, ca_crt) ) - { - /* TODO: If signed_by ever returns a reason, maybe mention - that, too. */ - /* TODO: Also mention the CA involved. While I could do this - now, a full DN is a little much with which to assault the - user's poor, leaky eyes. */ - flags |= PURPLE_CERTIFICATE_INVALID_CHAIN; + if ( byte_arrays_equal(last_fpr, ca_fpr) || + purple_certificate_signed_by(end_crt, ca_crt) ) + { + /* TODO: If signed_by ever returns a reason, maybe mention + that, too. */ + /* TODO: Also mention the CA involved. While I could do this + now, a full DN is a little much with which to assault the + user's poor, leaky eyes. */ + valid = TRUE; + g_byte_array_free(ca_fpr, TRUE); + break; + } + + g_byte_array_free(ca_fpr, TRUE); } - g_byte_array_free(ca_fpr, TRUE); + if (valid == FALSE) + flags |= PURPLE_CERTIFICATE_INVALID_CHAIN; + + g_slist_foreach(ca_crts, (GFunc)purple_certificate_destroy, NULL); + g_slist_free(ca_crts); g_byte_array_free(last_fpr, TRUE); - purple_certificate_destroy(ca_crt); - x509_tls_cached_check_subject_name(vrq, flags); }
--- a/libpurple/ft.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/ft.c Sun Dec 05 02:43:54 2010 +0000 @@ -1488,6 +1488,20 @@ g_return_if_fail(xfer != NULL); + /* TODO: We definitely want to close any open request dialogs associated + with this transfer. However, in some cases the request dialog might + own a reference on the xfer. This happens at least with the "%s wants + to send you %s" dialog from purple_xfer_ask_recv(). In these cases + the ref count will not be decremented when the request dialog is + closed, so the ref count will never reach 0 and the xfer will never + be freed. This is a memleak and should be fixed. It's not clear what + the correct fix is. Probably requests should have a destroy function + that is called when the request is destroyed. But also, ref counting + xfer objects makes this code REALLY complicated. An alternate fix is + to not ref count and instead just make sure the object still exists + when we try to use it. */ + purple_request_close_with_handle(xfer); + purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_LOCAL); xfer->end_time = time(NULL);
--- a/libpurple/mime.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/mime.c Sun Dec 05 02:43:54 2010 +0000 @@ -436,6 +436,34 @@ g_free(bnd); } +#define BOUNDARY "boundary=" +static char * +parse_boundary(const char *ct) +{ + char *boundary_begin = g_strstr_len(ct, -1, BOUNDARY); + char *boundary_end; + + if (!boundary_begin) + return NULL; + + boundary_begin += sizeof(BOUNDARY) - 1; + + if (*boundary_begin == '"') { + boundary_end = strchr(++boundary_begin, '"'); + if (!boundary_end) + return NULL; + } else { + boundary_end = strchr(boundary_begin, ' '); + if (!boundary_end) { + boundary_end = strchr(boundary_begin, ';'); + if (!boundary_end) + boundary_end = boundary_begin + strlen(boundary_begin); + } + } + + return g_strndup(boundary_begin, boundary_end - boundary_begin); +} +#undef BOUNDARY PurpleMimeDocument * purple_mime_document_parsen(const char *buf, gsize len) @@ -456,10 +484,11 @@ { const char *ct = fields_get(&doc->fields, "content-type"); - if(ct && purple_str_has_prefix(ct, "multipart")) { - char *bd = strrchr(ct, '='); - if(bd++) { + if (ct && purple_str_has_prefix(ct, "multipart")) { + char *bd = parse_boundary(ct); + if (bd) { doc_parts_load(doc, bd, b, n); + g_free(bd); } } }
--- a/libpurple/network.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/network.c Sun Dec 05 02:43:54 2010 +0000 @@ -350,17 +350,15 @@ if (success) { /* add port mapping to hash table */ - gint *key = g_new(gint, 1); - gint *value = g_new(gint, 1); - *key = purple_network_get_port_from_fd(listen_data->listenfd); - *value = listen_data->socket_type; - g_hash_table_insert(upnp_port_mappings, key, value); + gint key = purple_network_get_port_from_fd(listen_data->listenfd); + gint value = listen_data->socket_type; + g_hash_table_insert(upnp_port_mappings, GINT_TO_POINTER(key), GINT_TO_POINTER(value)); } if (listen_data->cb) listen_data->cb(listen_data->listenfd, listen_data->cb_data); - /* Clear the UPnP mapping data, since it's complete and purple_netweork_listen_cancel() will try to cancel + /* Clear the UPnP mapping data, since it's complete and purple_network_listen_cancel() will try to cancel * it otherwise. */ listen_data->mapping_data = NULL; purple_network_listen_cancel(listen_data); @@ -370,16 +368,16 @@ purple_network_finish_pmp_map_cb(gpointer data) { PurpleNetworkListenData *listen_data; - gint *key = g_new(gint, 1); - gint *value = g_new(gint, 1); + gint key; + gint value; listen_data = data; listen_data->timer = 0; /* add port mapping to hash table */ - *key = purple_network_get_port_from_fd(listen_data->listenfd); - *value = listen_data->socket_type; - g_hash_table_insert(nat_pmp_port_mappings, key, value); + key = purple_network_get_port_from_fd(listen_data->listenfd); + value = listen_data->socket_type; + g_hash_table_insert(nat_pmp_port_mappings, GINT_TO_POINTER(key), GINT_TO_POINTER(value)); if (listen_data->cb) listen_data->cb(listen_data->listenfd, listen_data->cb_data); @@ -1045,42 +1043,42 @@ purple_network_upnp_mapping_remove(gpointer key, gpointer value, gpointer user_data) { - gint port = (gint) *((gint *) key); - gint protocol = (gint) *((gint *) value); + gint port = GPOINTER_TO_INT(key); + gint protocol = GPOINTER_TO_INT(value); purple_debug_info("network", "removing UPnP port mapping for port %d\n", port); - purple_upnp_remove_port_mapping(port, - protocol == SOCK_STREAM ? "TCP" : "UDP", + purple_upnp_remove_port_mapping(port, + protocol == SOCK_STREAM ? "TCP" : "UDP", purple_network_upnp_mapping_remove_cb, NULL); - g_hash_table_remove(upnp_port_mappings, key); + g_hash_table_remove(upnp_port_mappings, GINT_TO_POINTER(port)); } static void purple_network_nat_pmp_mapping_remove(gpointer key, gpointer value, gpointer user_data) { - gint port = (gint) *((gint *) key); - gint protocol = (gint) *((gint *) value); + gint port = GPOINTER_TO_INT(key); + gint protocol = GPOINTER_TO_INT(value); purple_debug_info("network", "removing NAT-PMP port mapping for port %d\n", port); purple_pmp_destroy_map( - protocol == SOCK_STREAM ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP, + protocol == SOCK_STREAM ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP, port); - g_hash_table_remove(nat_pmp_port_mappings, key); + g_hash_table_remove(nat_pmp_port_mappings, GINT_TO_POINTER(port)); } void purple_network_remove_port_mapping(gint fd) { int port = purple_network_get_port_from_fd(fd); - gint *protocol = g_hash_table_lookup(upnp_port_mappings, &port); + gint protocol = GPOINTER_TO_INT(g_hash_table_lookup(upnp_port_mappings, GINT_TO_POINTER(port))); if (protocol) { - purple_network_upnp_mapping_remove(&port, protocol, NULL); + purple_network_upnp_mapping_remove(GINT_TO_POINTER(port), GINT_TO_POINTER(protocol), NULL); } else { - protocol = g_hash_table_lookup(nat_pmp_port_mappings, &port); + protocol = GPOINTER_TO_INT(g_hash_table_lookup(nat_pmp_port_mappings, GINT_TO_POINTER(port))); if (protocol) { - purple_network_nat_pmp_mapping_remove(&port, protocol, NULL); + purple_network_nat_pmp_mapping_remove(GINT_TO_POINTER(port), GINT_TO_POINTER(protocol), NULL); } } } @@ -1178,16 +1176,14 @@ purple_pmp_init(); purple_upnp_init(); - + purple_network_set_stun_server( purple_prefs_get_string("/purple/network/stun_server")); purple_network_set_turn_server( purple_prefs_get_string("/purple/network/turn_server")); - upnp_port_mappings = - g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); - nat_pmp_port_mappings = - g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); + upnp_port_mappings = g_hash_table_new(g_direct_hash, g_direct_equal); + nat_pmp_port_mappings = g_hash_table_new(g_direct_hash, g_direct_equal); } @@ -1231,13 +1227,13 @@ #endif purple_signal_unregister(purple_network_get_handle(), "network-configuration-changed"); - + if (stun_ip) g_free(stun_ip); g_hash_table_destroy(upnp_port_mappings); g_hash_table_destroy(nat_pmp_port_mappings); - /* TODO: clean up remaining port mappings, note calling + /* TODO: clean up remaining port mappings, note calling purple_upnp_remove_port_mapping from here doesn't quite work... */ }
--- a/libpurple/plugins/ssl/ssl-gnutls.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/plugins/ssl/ssl-gnutls.c Sun Dec 05 02:43:54 2010 +0000 @@ -520,11 +520,18 @@ /* Forward declarations are fun! */ static PurpleCertificate * x509_import_from_datum(const gnutls_datum dt, gnutls_x509_crt_fmt mode); +/* indeed! */ +static gboolean +x509_certificate_signed_by(PurpleCertificate * crt, + PurpleCertificate * issuer); +static void +x509_destroy_certificate(PurpleCertificate * crt); static GList * ssl_gnutls_get_peer_certificates(PurpleSslConnection * gsc) { PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc); + PurpleCertificate *prvcrt = NULL; /* List of Certificate instances to return */ GList * peer_certs = NULL; @@ -550,7 +557,17 @@ /* Append is somewhat inefficient on linked lists, but is easy to read. If someone complains, I'll change it. TODO: Is anyone complaining? (Maybe elb?) */ - peer_certs = g_list_append(peer_certs, newcrt); + /* only append if previous cert was actually signed by this one. + * Thanks Microsoft. */ + if ((prvcrt == NULL) || x509_certificate_signed_by(prvcrt, newcrt)) { + peer_certs = g_list_append(peer_certs, newcrt); + prvcrt = newcrt; + } else { + x509_destroy_certificate(newcrt); + purple_debug_error("gnutls", "Dropping further peer certificates " + "because the chain is broken!\n"); + break; + } } /* cert_list doesn't need free()-ing */
--- a/libpurple/protocols/gg/lib/dcc7.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/gg/lib/dcc7.c Sun Dec 05 02:43:54 2010 +0000 @@ -731,6 +731,7 @@ e->event.dcc7_accept.remote_port = dcc->remote_port; } else { e->type = GG_EVENT_DCC7_PENDING; + e->event.dcc7_pending.dcc7 = dcc; } if (gg_dcc7_connect(sess, dcc) == -1) { @@ -1004,6 +1005,7 @@ if (gg_dcc7_reverse_connect(dcc) != -1) { e->type = GG_EVENT_DCC7_PENDING; + e->event.dcc7_pending.dcc7 = dcc; } else { e->type = GG_EVENT_DCC7_ERROR; e->event.dcc_error = GG_ERROR_DCC7_NET;
--- a/libpurple/protocols/gg/lib/events.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/gg/lib/events.c Sun Dec 05 02:43:54 2010 +0000 @@ -1149,6 +1149,7 @@ e->type = GG_EVENT_NOTIFY60; e->event.notify60 = malloc(sizeof(*e->event.notify60)); + if (!e->event.notify60) { gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n"); goto fail; @@ -1159,7 +1160,7 @@ while (length >= sizeof(struct gg_notify_reply80)) { uint32_t descr_len; char *tmp; - + e->event.notify60[i].uin = gg_fix32(n->uin); e->event.notify60[i].status = gg_fix32(n->status); e->event.notify60[i].remote_ip = n->remote_ip; @@ -1169,7 +1170,6 @@ e->event.notify60[i].version = 0x00; /* not-supported */ e->event.notify60[i].time = 0; /* not-supported */ - descr_len = gg_fix32(n->descr_len); length -= sizeof(struct gg_notify_reply80);
--- a/libpurple/protocols/gg/lib/libgadu.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/gg/lib/libgadu.c Sun Dec 05 02:43:54 2010 +0000 @@ -69,7 +69,7 @@ # include <openssl/rand.h> #endif -#define GG_LIBGADU_VERSION "1.9.0-rc2" +#define GG_LIBGADU_VERSION "1.9.0" /** * Poziom rejestracji informacji odpluskwiaj�cych. Zmienna jest mask� bitow� @@ -180,7 +180,7 @@ #ifdef __GNUC__ __attribute__ ((unused)) #endif -= "$Id: libgadu.c 878 2009-11-16 23:48:19Z wojtekka $"; += "$Id: libgadu.c 923 2010-03-09 20:03:29Z wojtekka $"; #endif #endif /* DOXYGEN */ @@ -1316,41 +1316,65 @@ * \internal Zamienia tekst z formatowaniem Gadu-Gadu na HTML. * * \param dst Bufor wynikowy (mo甜e by� \c NULL) - * \param utf_msg Tekst 添r坦d�owy + * \param src Tekst 添r坦d�owy w UTF-8 * \param format Atrybuty tekstu 添r坦d�owego * \param format_len D�ugo�� bloku atrybut坦w tekstu 添r坦d�owego * + * \note Wynikowy tekst nie jest idealnym kodem HTML, poniewa甜 ma jak + * dok�adniej odzwierciedla� to, co wygenerowa�by oryginalny klient. + * * \note Dokleja \c \\0 na ko�cu bufora wynikowego. * * \return D�ugo�� tekstu wynikowego bez \c \\0 (nawet je�li \c dst to \c NULL). */ -static int gg_convert_to_html(char *dst, const char *utf_msg, const unsigned char *format, int format_len) +static int gg_convert_to_html(char *dst, const char *src, const unsigned char *format, int format_len) { const char span_fmt[] = "<span style=\"color:#%02x%02x%02x; font-family:'MS Shell Dlg 2'; font-size:9pt; \">"; const int span_len = 75; - const char img_fmt[] = "<img src=\"%02x%02x%02x%02x%02x%02x%02x%02x\">"; - const int img_len = 28; + const char img_fmt[] = "<img name=\"%02x%02x%02x%02x%02x%02x%02x%02x\">"; + const int img_len = 29; int char_pos = 0; - int format_idx = 3; + int format_idx = 0; unsigned char old_attr = 0; const unsigned char *color = (const unsigned char*) "\x00\x00\x00"; int len, i; len = 0; - for (i = 0; utf_msg[i] != 0; i++) { - unsigned char attr; - int attr_pos; + /* Nie mamy atrybut坦w dla pierwsze znaku, a tekst nie jest pusty, wi�c + * tak czy inaczej trzeba otworzy� <span>. */ + + if (src[0] != 0 && (format_idx + 3 > format_len || (format[format_idx] | (format[format_idx + 1] << 8)) != 0)) { + if (dst != NULL) + sprintf(&dst[len], span_fmt, 0, 0, 0); + + len += span_len; + } + + /* P�tla przechodzi te甜 przez ko�cz�ce \0, 甜eby m坦c doklei� obrazek + * na ko�cu tekstu. */ - if (format_idx + 3 <= format_len) { + for (i = 0; ; i++) { + /* Analizuj atrybuty tak d�ugo jak dotycz� aktualnego znaku. */ + for (;;) { + unsigned char attr; + int attr_pos; + + if (format_idx + 3 > format_len) + break; + attr_pos = format[format_idx] | (format[format_idx + 1] << 8); + + if (attr_pos != char_pos) + break; + attr = format[format_idx + 2]; - } else { - attr_pos = -1; - attr = 0; - } + + /* Nie doklejaj atrybut坦w na ko�cu, co najwy甜ej obrazki. */ - if (attr_pos == char_pos) { + if (src[i] == 0) + attr &= ~(GG_FONT_BOLD | GG_FONT_ITALIC | GG_FONT_UNDERLINE | GG_FONT_COLOR); + format_idx += 3; if ((attr & (GG_FONT_BOLD | GG_FONT_ITALIC | GG_FONT_UNDERLINE | GG_FONT_COLOR)) != 0) { @@ -1377,7 +1401,7 @@ if (dst != NULL) sprintf(&dst[len], span_fmt, color[0], color[1], color[2]); len += span_len; - } else if (char_pos == 0) { + } else if (char_pos == 0 && src[0] != 0) { if (dst != NULL) sprintf(&dst[len], span_fmt, 0, 0, 0); len += span_len; @@ -1410,14 +1434,11 @@ } old_attr = attr; - } else if (i == 0) { - if (dst != NULL) - sprintf(&dst[len], span_fmt, 0, 0, 0); - - len += span_len; } - switch (utf_msg[i]) { + /* Doklej znak zachowuj�c htmlowe escapowanie. */ + + switch (src[i]) { case '&': gg_append(dst, &len, "&", 5); break; @@ -1437,19 +1458,25 @@ gg_append(dst, &len, "<br>", 4); break; case '\r': + case 0: break; default: if (dst != NULL) - dst[len] = utf_msg[i]; + dst[len] = src[i]; len++; } /* Sprawd添, czy bajt nie jest kontynuacj� znaku unikodowego. */ - if ((utf_msg[i] & 0xc0) != 0xc0) + if ((src[i] & 0xc0) != 0xc0) char_pos++; + + if (src[i] == 0) + break; } + /* Zamknij tagi. */ + if ((old_attr & GG_FONT_UNDERLINE) != 0) gg_append(dst, &len, "</u>", 4); @@ -1459,16 +1486,8 @@ if ((old_attr & GG_FONT_BOLD) != 0) gg_append(dst, &len, "</b>", 4); - /* Dla pustych tekst坦w dodaj pusty <span>. */ - - if (i == 0) { - if (dst != NULL) - sprintf(&dst[len], span_fmt, 0, 0, 0); - - len += span_len; - } - - gg_append(dst, &len, "</span>", 7); + if (src[0] != 0) + gg_append(dst, &len, "</span>", 7); if (dst != NULL) dst[len] = 0; @@ -1564,7 +1583,7 @@ formatlen = 9; } - len = gg_convert_to_html(NULL, utf_msg, format, formatlen); + len = gg_convert_to_html(NULL, utf_msg, format + 3, formatlen - 3); html_msg = malloc(len + 1); @@ -1573,7 +1592,7 @@ goto cleanup; } - gg_convert_to_html(html_msg, utf_msg, format, formatlen); + gg_convert_to_html(html_msg, utf_msg, format + 3, formatlen - 3); s80.seq = gg_fix32(seq_no); s80.msgclass = gg_fix32(msgclass);
--- a/libpurple/protocols/gg/lib/libgadu.h Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/gg/lib/libgadu.h Sun Dec 05 02:43:54 2010 +0000 @@ -865,6 +865,13 @@ }; /** + * Opis zdarzenia \c GG_EVENT_DCC7_PENDING. + */ +struct gg_event_dcc7_pending { + struct gg_dcc7 *dcc7; /**< Struktura po��czenia */ +}; + +/** * Opis zdarzenia \c GG_EVENT_DCC7_REJECT. */ struct gg_event_dcc7_reject { @@ -908,6 +915,7 @@ struct gg_dcc7 *dcc7_new; /**< Nowe po��czenie bezpo�rednie (\c GG_EVENT_DCC7_NEW) */ enum gg_error_t dcc7_error; /**< B��d po��czenia bezpo�redniego (\c GG_EVENT_DCC7_ERROR) */ struct gg_event_dcc7_connected dcc7_connected; /**< Informacja o zestawieniu po��czenia bezpo�redniego (\c GG_EVENT_DCC7_CONNECTED) */ + struct gg_event_dcc7_pending dcc7_pending; /**< Trwa pr坦ba po��czenia bezpo�redniego (\c GG_EVENT_DCC7_PENDING) */ struct gg_event_dcc7_reject dcc7_reject; /**< Odrzucono po��czenia bezpo�redniego (\c GG_EVENT_DCC7_REJECT) */ struct gg_event_dcc7_accept dcc7_accept; /**< Zaakceptowano po��czenie bezpo�rednie (\c GG_EVENT_DCC7_ACCEPT) */ };
--- a/libpurple/protocols/jabber/jabber.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sun Dec 05 02:43:54 2010 +0000 @@ -477,7 +477,7 @@ char *text = NULL, *last_part = NULL, *tag_start = NULL; /* Because debug logs with plaintext passwords make me sad */ - if(js->state != JABBER_STREAM_CONNECTED && + if (!purple_debug_is_unsafe() && js->state != JABBER_STREAM_CONNECTED && /* Either <auth> or <query><password>... */ (((tag_start = strstr(data, "<auth ")) && strstr(data, "xmlns='" NS_XMPP_SASL "'")) ||
--- a/libpurple/protocols/msn/cmdproc.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/cmdproc.c Sun Dec 05 02:43:54 2010 +0000 @@ -122,7 +122,7 @@ servconn = cmdproc->servconn; if (!servconn->connected) { - /* TODO: Need to free trans */ + msn_transaction_destroy(trans); return; } @@ -156,6 +156,8 @@ msn_servconn_write(servconn, data, len); + if (!trans->saveable) + msn_transaction_destroy(trans); g_free(data); }
--- a/libpurple/protocols/msn/contact.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/contact.c Sun Dec 05 02:43:54 2010 +0000 @@ -41,7 +41,8 @@ "ContactSave", "MessengerPendingList", "ContactMsgrAPI", - "BlockUnblock" + "BlockUnblock", + "Timer" }; const char *MsnMemberRole[] = @@ -189,6 +190,8 @@ strcat(buf, "Renaming Group,"); if (action & MSN_UPDATE_INFO) strcat(buf, "Updating Contact Info,"); + if (action & MSN_ANNOTATE_USER) + strcat(buf, "Annotating Contact,"); return buf; } @@ -709,8 +712,9 @@ uid = xmlnode_get_data(contactId); type = xmlnode_get_data(contactType); - /*setup the Display Name*/ + /* Find out our settings */ if (type && !strcmp(type, "Me")) { + /* setup the Display Name */ if (purple_connection_get_display_name(pc) == NULL) { char *friendly = NULL; if ((displayName = xmlnode_get_child(contactInfo, "displayName"))) @@ -719,6 +723,23 @@ friendly ? purple_url_decode(friendly) : NULL); g_free(friendly); } + + for (annotation = xmlnode_get_child(contactInfo, "annotations/Annotation"); + annotation; + annotation = xmlnode_get_next_twin(annotation)) { + char *name, *value; + name = xmlnode_get_data(xmlnode_get_child(annotation, "Name")); + value = xmlnode_get_data(xmlnode_get_child(annotation, "Value")); + if (!strcmp(name, "MSN.IM.MPOP")) { + if (!value || atoi(value) != 0) + purple_account_set_bool(session->account, "mpop", TRUE); + else + purple_account_set_bool(session->account, "mpop", FALSE); + } + g_free(name); + g_free(value); + } + continue; /* Not adding own account as buddy to buddylist */ } @@ -1497,6 +1518,100 @@ xmlnode_insert_child(contact, contact_info); xmlnode_insert_child(contact, changes); + xmlnode_insert_data(xmlnode_get_child(state->body, + "Header/ABApplicationHeader/PartnerScenario"), + MsnSoapPartnerScenarioText[MSN_PS_SAVE_CONTACT], -1); + + if (user) { + xmlnode *contactId = xmlnode_new_child(contact, "contactId"); + msn_callback_state_set_uid(state, user->uid); + xmlnode_insert_data(contactId, state->uid, -1); + } else { + xmlnode *contactType = xmlnode_new_child(contact_info, "contactType"); + xmlnode_insert_data(contactType, "Me", -1); + } + + msn_contact_request(state); +} + +static void +msn_annotate_contact_read_cb(MsnSoapMessage *req, MsnSoapMessage *resp, + gpointer data) +{ + MsnCallbackState *state = (MsnCallbackState *)data; + xmlnode *fault; + + /* We don't know how to respond to this faultcode, so log it */ + fault = xmlnode_get_child(resp->xml, "Body/Fault"); + if (fault != NULL) { + char *fault_str = xmlnode_to_str(fault, NULL); + purple_debug_error("msn", "Operation {%s} Failed, SOAP Fault was: %s\n", + msn_contact_operation_str(state->action), fault_str); + g_free(fault_str); + return; + } + + purple_debug_info("msn", "Contact annotated successfully\n"); +} + +/* Update a contact's annotations */ +void +msn_annotate_contact(MsnSession *session, const char *passport, ...) +{ + va_list params; + MsnCallbackState *state; + xmlnode *contact; + xmlnode *contact_info; + xmlnode *annotations; + MsnUser *user = NULL; + + g_return_if_fail(passport != NULL); + + if (strcmp(passport, "Me") != 0) { + user = msn_userlist_find_user(session->userlist, passport); + if (!user) + return; + } + + contact_info = xmlnode_new("contactInfo"); + annotations = xmlnode_new_child(contact_info, "annotations"); + + va_start(params, passport); + while (TRUE) { + const char *name; + const char *value; + xmlnode *a, *n, *v; + + name = va_arg(params, const char *); + if (!name) + break; + + value = va_arg(params, const char *); + if (!value) + break; + + a = xmlnode_new_child(annotations, "Annotation"); + n = xmlnode_new_child(a, "Name"); + xmlnode_insert_data(n, name, -1); + v = xmlnode_new_child(a, "Value"); + xmlnode_insert_data(v, value, -1); + } + va_end(params); + + state = msn_callback_state_new(session); + + state->body = xmlnode_from_str(MSN_CONTACT_ANNOTATE_TEMPLATE, -1); + state->action = MSN_ANNOTATE_USER; + state->post_action = MSN_CONTACT_ANNOTATE_SOAP_ACTION; + state->post_url = MSN_ADDRESS_BOOK_POST_URL; + state->cb = msn_annotate_contact_read_cb; + + xmlnode_insert_data(xmlnode_get_child(state->body, + "Header/ABApplicationHeader/PartnerScenario"), + MsnSoapPartnerScenarioText[MSN_PS_SAVE_CONTACT], -1); + + contact = xmlnode_get_child(state->body, "Body/ABContactUpdate/contacts/Contact"); + if (user) { xmlnode *contactId = xmlnode_new_child(contact, "contactId"); msn_callback_state_set_uid(state, user->uid);
--- a/libpurple/protocols/msn/contact.h Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/contact.h Sun Dec 05 02:43:54 2010 +0000 @@ -36,7 +36,8 @@ MSN_ADD_GROUP = 0x10, MSN_DEL_GROUP = 0x20, MSN_RENAME_GROUP = 0x40, - MSN_UPDATE_INFO = 0x80 + MSN_UPDATE_INFO = 0x80, + MSN_ANNOTATE_USER = 0x100 } MsnCallbackAction; typedef enum @@ -52,7 +53,8 @@ MSN_PS_SAVE_CONTACT, MSN_PS_PENDING_LIST, MSN_PS_CONTACT_API, - MSN_PS_BLOCK_UNBLOCK + MSN_PS_BLOCK_UNBLOCK, + MSN_PS_TIMER } MsnSoapPartnerScenario; #include "session.h" @@ -408,7 +410,7 @@ "<ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\ "<ApplicationId>" MSN_APPLICATION_ID "</ApplicationId>"\ "<IsMigration>false</IsMigration>"\ - "<PartnerScenario>Timer</PartnerScenario>"\ + "<PartnerScenario></PartnerScenario>"\ "</ABApplicationHeader>"\ "<ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\ "<ManagedGroupRequest>false</ManagedGroupRequest>"\ @@ -427,6 +429,37 @@ "</soap:Body>"\ "</soap:Envelope>" +/* Update Contact Annotations */ +#define MSN_CONTACT_ANNOTATE_SOAP_ACTION "http://www.msn.com/webservices/AddressBook/ABContactUpdate" +#define MSN_CONTACT_ANNOTATE_TEMPLATE "<?xml version=\"1.0\" encoding=\"utf-8\"?>"\ +"<soap:Envelope"\ + " xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\""\ + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""\ + " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""\ + " xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\">"\ + "<soap:Header>"\ + "<ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\ + "<ApplicationId>" MSN_APPLICATION_ID "</ApplicationId>"\ + "<IsMigration>false</IsMigration>"\ + "<PartnerScenario></PartnerScenario>"\ + "</ABApplicationHeader>"\ + "<ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\ + "<ManagedGroupRequest>false</ManagedGroupRequest>"\ + "<TicketToken>EMPTY</TicketToken>"\ + "</ABAuthHeader>"\ + "</soap:Header>"\ + "<soap:Body>"\ + "<ABContactUpdate xmlns=\"http://www.msn.com/webservices/AddressBook\">"\ + "<abId>00000000-0000-0000-0000-000000000000</abId>"\ + "<contacts>"\ + "<Contact xmlns=\"http://www.msn.com/webservices/AddressBook\">"\ + "<propertiesChanged>Annotation</propertiesChanged>"\ + "</Contact>"\ + "</contacts>"\ + "</ABContactUpdate>"\ + "</soap:Body>"\ +"</soap:Envelope>" + /******************************************************* * Add/Delete contact from lists SOAP actions *******************************************************/ @@ -686,6 +719,8 @@ /* contact SOAP operations */ void msn_update_contact(MsnSession *session, const char *passport, MsnContactUpdateType type, const char* value); +void msn_annotate_contact(MsnSession *session, const char *passport, ...) G_GNUC_NULL_TERMINATED; + void msn_add_contact(MsnSession *session, MsnCallbackState *state, const char *passport); void msn_delete_contact(MsnSession *session, MsnUser *user);
--- a/libpurple/protocols/msn/directconn.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/directconn.c Sun Dec 05 02:43:54 2010 +0000 @@ -630,8 +630,11 @@ case DC_STATE_ESTABLISHED: - part = msn_slpmsgpart_new_from_data(dc->in_buffer + 4, dc->header.length); - msn_slplink_process_msg(dc->slplink, part); + if (dc->header.length) { + part = msn_slpmsgpart_new_from_data(dc->in_buffer + 4, dc->header.length); + msn_slplink_process_msg(dc->slplink, part); + msn_slpmsgpart_destroy(part); + } /* if (dc->num_calls == 0) {
--- a/libpurple/protocols/msn/httpconn.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/httpconn.c Sun Dec 05 02:43:54 2010 +0000 @@ -1,5 +1,5 @@ /** - * @file httpmethod.c HTTP connection method + * @file httpconn.c HTTP connection method * * purple *
--- a/libpurple/protocols/msn/msg.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/msg.c Sun Dec 05 02:43:54 2010 +0000 @@ -50,18 +50,16 @@ return msg; } -void +/** + * Destroys a message. + * + * @param msg The message to destroy. + */ +static void msn_message_destroy(MsnMessage *msg) { g_return_if_fail(msg != NULL); - if (msg->ref_count > 0) - { - msn_message_unref(msg); - - return; - } - if (purple_debug_is_verbose()) purple_debug_info("msn", "message destroy (%p)\n", msg); @@ -90,11 +88,11 @@ return msg; } -MsnMessage * +void msn_message_unref(MsnMessage *msg) { - g_return_val_if_fail(msg != NULL, NULL); - g_return_val_if_fail(msg->ref_count > 0, NULL); + g_return_if_fail(msg != NULL); + g_return_if_fail(msg->ref_count > 0); msg->ref_count--; @@ -102,13 +100,7 @@ purple_debug_info("msn", "message unref (%p)[%" G_GSIZE_FORMAT "]\n", msg, msg->ref_count); if (msg->ref_count == 0) - { msn_message_destroy(msg); - - return NULL; - } - - return msg; } MsnMessage * @@ -368,6 +360,8 @@ memcpy(n, body, siz); n += siz; + + g_free(body); } else { @@ -1222,7 +1216,7 @@ g_free(text); msn_switchboard_send_msg(swboard, cancel, TRUE); - msn_message_destroy(cancel); + msn_message_unref(cancel); } } else if (!strcmp(command, "CANCEL")) {
--- a/libpurple/protocols/msn/msg.h Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/msg.h Sun Dec 05 02:43:54 2010 +0000 @@ -171,13 +171,6 @@ const char *line_dem,const char *body_dem); /** - * Destroys a message. - * - * @param msg The message to destroy. - */ -void msn_message_destroy(MsnMessage *msg); - -/** * Increments the reference count on a message. * * @param msg The message. @@ -195,7 +188,7 @@ * * @return @a msg, or @c NULL if the new count is 0. */ -MsnMessage *msn_message_unref(MsnMessage *msg); +void msn_message_unref(MsnMessage *msg); /** * Generates the payload data of a message.
--- a/libpurple/protocols/msn/msn.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/msn.c Sun Dec 05 02:43:54 2010 +0000 @@ -132,7 +132,7 @@ swboard = msn_session_get_swboard(session, username, MSN_SB_FLAG_IM); msn_switchboard_send_msg(swboard, msg, TRUE); - msn_message_destroy(msg); + msn_message_unref(msg); return TRUE; } @@ -250,41 +250,33 @@ MsnSession *session; MsnTransaction *trans; PurpleAccount *account; - const char *real_alias; + char real_alias[BUDDY_ALIAS_MAXLEN + 1]; struct public_alias_closure *closure; session = purple_connection_get_protocol_data(pc); cmdproc = session->notification->cmdproc; account = purple_connection_get_account(pc); - if (alias && *alias) - { - char *tmp = g_strdup(alias); - real_alias = purple_url_encode(g_strstrip(tmp)); - g_free(tmp); - } - else - real_alias = ""; - - if (strlen(real_alias) > BUDDY_ALIAS_MAXLEN) - { - if (failure_cb) { - struct public_alias_closure *closure = - g_new0(struct public_alias_closure, 1); - closure->account = account; - closure->failure_cb = failure_cb; - purple_timeout_add(0, set_public_alias_length_error, closure); - } else { - purple_notify_error(pc, NULL, - _("Your new MSN friendly name is too long."), - NULL); + if (alias && *alias) { + if (!msn_encode_spaces(alias, real_alias, BUDDY_ALIAS_MAXLEN + 1)) { + if (failure_cb) { + struct public_alias_closure *closure = + g_new0(struct public_alias_closure, 1); + closure->account = account; + closure->failure_cb = failure_cb; + purple_timeout_add(0, set_public_alias_length_error, closure); + } else { + purple_notify_error(pc, NULL, + _("Your new MSN friendly name is too long."), + NULL); + } + return; } - return; - } - - if (*real_alias == '\0') { - real_alias = purple_url_encode(purple_account_get_username(account)); - } + + if (real_alias[0] == '\0') + strcpy(real_alias, purple_account_get_username(account)); + } else + strcpy(real_alias, purple_account_get_username(account)); closure = g_new0(struct public_alias_closure, 1); closure->account = account; @@ -528,6 +520,7 @@ PurpleRequestFields *fields; PurpleRequestFieldGroup *group; PurpleRequestField *field; + gboolean have_other_endpoints; GSList *l; MsnLocationData *data; @@ -550,19 +543,37 @@ group = purple_request_field_group_new(_("Other Locations")); purple_request_fields_add_group(fields, group); - field = purple_request_field_label_new("others-label", _("You can sign out from other locations here")); - purple_request_field_group_add_field(group, field); - + + have_other_endpoints = FALSE; for (l = session->user->endpoints; l; l = l->next) { MsnUserEndpoint *ep = l->data; - if (g_str_equal(ep->id, session->guid)) + if (ep->id[0] != '\0' && strncasecmp(ep->id + 1, session->guid, 36) == 0) /* Don't add myself to the list */ continue; + if (!have_other_endpoints) { + /* We do in fact have an endpoint other than ourselves... let's + add a label */ + field = purple_request_field_label_new("others-label", + _("You can sign out from other locations here")); + purple_request_field_group_add_field(group, field); + } + + have_other_endpoints = TRUE; field = purple_request_field_bool_new(ep->id, ep->name, FALSE); purple_request_field_group_add_field(group, field); } + if (!have_other_endpoints) { + /* TODO: Due to limitations in our current request field API, the + following string will show up with a trailing colon. This should + be fixed either by adding an "include_colon" boolean, or creating + a separate purple_request_field_label_new_without_colon function, + or by never automatically adding the colon and requiring that + callers add the colon themselves. */ + field = purple_request_field_label_new("others-label", _("You are not signed in from any other locations.")); + purple_request_field_group_add_field(group, field); + } data = g_new0(MsnLocationData, 1); data->account = account; @@ -1149,18 +1160,27 @@ static GList * msn_actions(PurplePlugin *plugin, gpointer context) { + PurpleConnection *gc; + MsnSession *session; GList *m = NULL; PurplePluginAction *act; + gc = (PurpleConnection *) context; + session = gc->proto_data; + act = purple_plugin_action_new(_("Set Friendly Name..."), msn_show_set_friendly_name); m = g_list_append(m, act); m = g_list_append(m, NULL); - act = purple_plugin_action_new(_("View Locations..."), - msn_show_locations); - m = g_list_append(m, act); - m = g_list_append(m, NULL); + if (purple_account_get_bool(session->account, "mpop", TRUE) + && session->protocol_ver >= 16) + { + act = purple_plugin_action_new(_("View Locations..."), + msn_show_locations); + m = g_list_append(m, act); + m = g_list_append(m, NULL); + } act = purple_plugin_action_new(_("Set Home Phone Number..."), msn_show_set_home_phone); @@ -1374,7 +1394,7 @@ msn_message_set_bin_data(msg, body->str, body->len); msn_switchboard_send_msg(swboard, msg, TRUE); - msn_message_destroy(msg); + msn_message_unref(msg); } static void msn_emoticon_destroy(MsnEmoticon *emoticon) @@ -1563,7 +1583,7 @@ purple_timeout_add(0, msn_send_me_im, imdata); } - msn_message_destroy(msg); + msn_message_unref(msg); } else { /*send Offline Instant Message,only to MSN Passport User*/ char *friendname; @@ -1627,7 +1647,7 @@ msn_switchboard_send_msg(swboard, msg, FALSE); - msn_message_destroy(msg); + msn_message_unref(msg); return MSN_TYPING_SEND_TIMEOUT; } @@ -2053,7 +2073,7 @@ } msn_switchboard_send_msg(swboard, msg, FALSE); - msn_message_destroy(msg); + msn_message_unref(msg); g_free(msgformat); g_free(msgtext); @@ -3038,6 +3058,11 @@ prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); + option = purple_account_option_bool_new(_("Allow connecting from multiple locations"), + "mpop", TRUE); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, + option); + purple_cmd_register("nudge", "", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY, "prpl-msn", msn_cmd_nudge,
--- a/libpurple/protocols/msn/msnutils.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/msnutils.c Sun Dec 05 02:43:54 2010 +0000 @@ -182,29 +182,40 @@ * We need this because we're only supposed to encode spaces in the font * names. purple_url_encode() isn't acceptable. */ -static const char * -encode_spaces(const char *str) +gboolean +msn_encode_spaces(const char *str, char *buf, size_t len) { - static char buf[BUF_LEN]; - const char *c; - char *d; + char *nonspace = buf; - g_return_val_if_fail(str != NULL, NULL); + while (isspace(*str)) + str++; - for (c = str, d = buf; *c != '\0'; c++) - { - if (*c == ' ') - { - *d++ = '%'; - *d++ = '2'; - *d++ = '0'; + for (; *str && len > 1; str++) { + if (*str == '%') { + if (len < 4) + break; + *buf++ = '%'; + *buf++ = '2'; + *buf++ = '5'; + len -= 3; + nonspace = buf; + } else if (*str == ' ') { + if (len < 4) + break; + *buf++ = '%'; + *buf++ = '2'; + *buf++ = '0'; + len -= 3; + } else { + *buf++ = *str; + len--; + nonspace = buf; } - else - *d++ = *c; } - *d = '\0'; - return buf; + *nonspace = '\0'; + + return (*str == '\0'); } /* @@ -223,6 +234,7 @@ const char *c; char *msg; char *fontface = NULL; + char fontface_encoded[BUF_LEN]; char fonteffect[5]; char fontcolor[7]; char direction = '0'; @@ -449,8 +461,9 @@ if (fontface == NULL) fontface = g_strdup("Segoe UI"); + msn_encode_spaces(fontface, fontface_encoded, BUF_LEN); *attributes = g_strdup_printf("FN=%s; EF=%s; CO=%s; PF=0; RL=%c", - encode_spaces(fontface), + fontface_encoded, fonteffect, fontcolor, direction); *message = msg;
--- a/libpurple/protocols/msn/msnutils.h Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/msnutils.h Sun Dec 05 02:43:54 2010 +0000 @@ -33,6 +33,18 @@ char *rand_guid(void); /** + * Encodes the spaces in a string + * + * @param str The string to be encoded. + * @param buf The buffer to hold the encoded string. + * @param len The maximum length (including NUL) to put in @buf. + * + * @return Whether @str was able to fit in @buf. + */ +gboolean +msn_encode_spaces(const char *str, char *buf, size_t len); + +/** * Parses the MSN message formatting into a format compatible with Purple. * * @param mime The mime header with the formatting.
--- a/libpurple/protocols/msn/notification.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/notification.c Sun Dec 05 02:43:54 2010 +0000 @@ -331,7 +331,7 @@ msn_cmdproc_process_msg(cmdproc, msg); - msn_message_destroy(msg); + msn_message_unref(msg); } static void @@ -387,7 +387,10 @@ * command and we are processing it */ if (cmd->payload == NULL) { cmdproc->last_cmd->payload_cb = msg_cmd_post; - cmd->payload_len = atoi(cmd->params[3]); + if (cmdproc->session->protocol_ver >= 16) + cmd->payload_len = atoi(cmd->params[5]); + else + cmd->payload_len = atoi(cmd->params[3]); } else { g_return_if_fail(cmd->payload_cb != NULL); @@ -1209,7 +1212,7 @@ g_free(body_str); g_free(body_enc); - msn_message_destroy(msg); + msn_message_unref(msg); trans->data = NULL; } } @@ -1548,40 +1551,55 @@ static void parse_user_endpoints(MsnUser *user, xmlnode *payloadNode) { + MsnSession *session; xmlnode *epNode, *capsNode; MsnUserEndpoint data; const char *id; char *caps, *tmp; + gboolean is_me; purple_debug_info("msn", "Get EndpointData\n"); + session = user->userlist->session; + is_me = (user == session->user); + + msn_user_clear_endpoints(user); for (epNode = xmlnode_get_child(payloadNode, "EndpointData"); epNode; epNode = xmlnode_get_next_twin(epNode)) { id = xmlnode_get_attrib(epNode, "id"); capsNode = xmlnode_get_child(epNode, "Capabilities"); - if (capsNode != NULL) { - caps = xmlnode_get_data(capsNode); - - data.clientid = strtoul(caps, &tmp, 10); - if (tmp && *tmp) - data.extcaps = strtoul(tmp + 1, NULL, 10); - else + /* Disconnect others, if MPOP is disabled */ + if (is_me + && !purple_account_get_bool(session->account, "mpop", TRUE) + && strncasecmp(id + 1, session->guid, 36) != 0) { + purple_debug_info("msn", "Disconnecting Endpoint %s\n", id); + + tmp = g_strdup_printf("%s;%s", user->passport, id); + msn_notification_send_uun(session, tmp, MSN_UNIFIED_NOTIFICATION_MPOP, "goawyplzthxbye"); + g_free(tmp); + } else { + if (capsNode != NULL) { + caps = xmlnode_get_data(capsNode); + + data.clientid = strtoul(caps, &tmp, 10); + if (tmp && *tmp) + data.extcaps = strtoul(tmp + 1, NULL, 10); + else + data.extcaps = 0; + + g_free(caps); + } else { + data.clientid = 0; data.extcaps = 0; - - g_free(caps); - - } else { - data.clientid = 0; - data.extcaps = 0; + } + + msn_user_set_endpoint_data(user, id, &data); } - - msn_user_set_endpoint_data(user, id, &data); } - /* Need to shortcut this check, probably... */ - if (user == user->userlist->session->user) { + if (is_me && purple_account_get_bool(session->account, "mpop", TRUE)) { for (epNode = xmlnode_get_child(payloadNode, "PrivateEndpointData"); epNode; epNode = xmlnode_get_next_twin(epNode)) { @@ -1939,12 +1957,6 @@ /* This isn't an official message. */ return; - if ((value = msn_message_get_header_value(msg, "kv")) != NULL) - { - g_free(session->passport_info.kv); - session->passport_info.kv = g_strdup(value); - } - if ((value = msn_message_get_header_value(msg, "sid")) != NULL) { g_free(session->passport_info.sid);
--- a/libpurple/protocols/msn/object.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/object.c Sun Dec 05 02:43:54 2010 +0000 @@ -202,6 +202,8 @@ g_free(obj->friendly); g_free(obj->sha1d); g_free(obj->sha1c); + g_free(obj->url); + g_free(obj->url1); purple_imgstore_unref(obj->img);
--- a/libpurple/protocols/msn/oim.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/oim.c Sun Dec 05 02:43:54 2010 +0000 @@ -641,10 +641,10 @@ type = msn_message_get_content_type(multipart); if (type && !strcmp(type, "text/plain")) { decode_msg = (char *)purple_base64_decode(multipart->body, &body_len); - msn_message_destroy(multipart); + msn_message_unref(multipart); break; } - msn_message_destroy(multipart); + msn_message_unref(multipart); } g_strfreev(tokens); @@ -652,7 +652,7 @@ if (decode_msg == NULL) { purple_debug_error("msn", "Couldn't find text/plain OIM message.\n"); - msn_message_destroy(message); + msn_message_unref(message); return; } } else { @@ -708,7 +708,7 @@ g_free(passport); g_free(decode_msg); - msn_message_destroy(message); + msn_message_unref(message); } /* Parse the XML data,
--- a/libpurple/protocols/msn/p2p.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/p2p.c Sun Dec 05 02:43:54 2010 +0000 @@ -1,3 +1,27 @@ +/** + * @file p2p.c MSN P2P functions + * + * purple + * + * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + */ + #include "internal.h" #include "p2p.h" @@ -71,6 +95,6 @@ msn_p2p_msg_is_data(const MsnP2PHeaderFlag flags) { return (flags == P2P_MSN_OBJ_DATA || - flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) || + flags == (P2P_WLM2009_COMP | P2P_MSN_OBJ_DATA) || flags == P2P_FILE_DATA); }
--- a/libpurple/protocols/msn/p2p.h Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/p2p.h Sun Dec 05 02:43:54 2010 +0000 @@ -1,3 +1,27 @@ +/** + * @file p2p.h MSN P2P functions + * + * purple + * + * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + */ + #ifndef MSN_P2P_H #define MSN_P2P_H @@ -49,7 +73,7 @@ P2P_CLOSE = 0x40, /**< Close session */ P2P_TLP_ERROR = 0x80, /**< Error at transport layer protocol */ P2P_DC_HANDSHAKE = 0x100, /**< Direct Handshake */ - P2P_WML2009_COMP = 0x1000000, /**< Compatibility with WLM 2009 */ + P2P_WLM2009_COMP = 0x1000000, /**< Compatibility with WLM 2009 */ P2P_FILE_DATA = 0x1000030 /**< File transfer data */ } MsnP2PHeaderFlag; /* Info From:
--- a/libpurple/protocols/msn/sbconn.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/sbconn.c Sun Dec 05 02:43:54 2010 +0000 @@ -1,3 +1,27 @@ +/** + * @file sbconn.c MSN Switchboard Connection + * + * purple + * + * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + */ + #include "internal.h" #include "debug.h" @@ -16,10 +40,10 @@ passport = purple_normalize(slplink->session->account, slplink->remote_user); msn_message_set_header(msg, "P2P-Dest", passport); + msg->part = msn_slpmsgpart_ref(part); data = msn_slpmsgpart_serialize(part, &size); - msg->part = msn_slpmsgpart_ref(part); - msn_message_set_bin_data(msg, data, size); + g_free(data); if (slplink->swboard == NULL) { @@ -33,6 +57,7 @@ } msn_switchboard_send_msg(slplink->swboard, msg, TRUE); + msn_message_unref(msg); } /** Called when a message times out. */
--- a/libpurple/protocols/msn/sbconn.h Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/sbconn.h Sun Dec 05 02:43:54 2010 +0000 @@ -1,3 +1,27 @@ +/** + * @file sbconn.h MSN Switchboard Connection + * + * purple + * + * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + */ + #ifndef MSN_SBCONN_H #define MSN_SBCONN_H
--- a/libpurple/protocols/msn/session.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/session.c Sun Dec 05 02:43:54 2010 +0000 @@ -103,7 +103,6 @@ g_free(session->blocked_text); #endif - g_free(session->passport_info.kv); g_free(session->passport_info.sid); g_free(session->passport_info.mspauth); g_free(session->passport_info.client_ip);
--- a/libpurple/protocols/msn/session.h Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/session.h Sun Dec 05 02:43:54 2010 +0000 @@ -79,12 +79,12 @@ MsnLoginStep login_step; /**< The current step in the login process. */ - gboolean connected; - gboolean logged_in; /**< A temporal flag to ignore local buddy list adds. */ + gboolean connected:1; + gboolean logged_in:1; /**< A temporal flag to ignore local buddy list adds. */ + gboolean destroying:1; /**< A flag that states if the session is being destroyed. */ + gboolean http_method:1; int adl_fqy; /**< A count of ADL/FQY so status is only changed once. */ guint login_timeout; /**< Timeout to force status change if ADL/FQY fail. */ - gboolean destroying; /**< A flag that states if the session is being destroyed. */ - gboolean http_method; MsnNotification *notification; MsnNexus *nexus; @@ -105,7 +105,6 @@ struct { - char *kv; char *sid; char *mspauth; unsigned long sl;
--- a/libpurple/protocols/msn/slpcall.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/slpcall.c Sun Dec 05 02:43:54 2010 +0000 @@ -826,6 +826,7 @@ /* Try direct file transfer by sending a second INVITE */ dc = msn_dc_new(slpcall); + g_free(slpcall->branch); slpcall->branch = rand_guid(); dc->listen_data = purple_network_listen_range( @@ -1060,7 +1061,7 @@ body = slpmsg->buffer; body_len = slpmsg->header->offset; - if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WML2009_COMP) + if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WLM2009_COMP) { char *body_str;
--- a/libpurple/protocols/msn/slplink.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/slplink.c Sun Dec 05 02:43:54 2010 +0000 @@ -518,7 +518,7 @@ msn_directconn_send_handshake(directconn); #endif } - else if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WML2009_COMP || + else if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WLM2009_COMP || msn_p2p_msg_is_data(slpmsg->header->flags)) { /* Release all the messages and send the ACK */ @@ -625,6 +625,10 @@ /* All the pieces of the slpmsg have been received */ if (header->offset + header->length >= header->total_size) process_complete_msg(slplink, slpmsg, header); + + /* NOTE: The slpmsg will be destroyed in process_complete_msg or left in + the slplink until fully received. Don't free it here! + */ } void
--- a/libpurple/protocols/msn/slpmsg.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/slpmsg.c Sun Dec 05 02:43:54 2010 +0000 @@ -1,5 +1,5 @@ /** - * @file slpmsg.h SLP Message functions + * @file slpmsg.c SLP Message functions * * purple * @@ -54,41 +54,6 @@ return slpmsg; } -MsnSlpMessage *msn_slpmsg_new_from_data(const char *data, size_t data_len) -{ - MsnSlpMessage *slpmsg; - MsnP2PHeader *header; - const char *tmp; - int body_len; - - tmp = data; - slpmsg = msn_slpmsg_new(NULL); - - if (data_len < sizeof(*header)) { - return NULL; - } - - /* Extract the binary SLP header */ - slpmsg->header = msn_p2p_header_from_wire((MsnP2PHeader*)tmp); - - /* Extract the body */ - body_len = data_len - (tmp - data); - /* msg->body_len = msg->msnslp_header.length; */ - - if (body_len > 0) { - slpmsg->size = body_len; - slpmsg->buffer = g_malloc(body_len); - memcpy(slpmsg->buffer, tmp, body_len); - tmp += body_len; - } - - /* Extract the footer */ - if (body_len >= 0) - slpmsg->footer = msn_p2p_footer_from_wire((MsnP2PFooter*)tmp); - - return slpmsg; -} - void msn_slpmsg_destroy(MsnSlpMessage *slpmsg) { @@ -326,6 +291,9 @@ *ret_size = tmp - base; + g_free(header); + g_free(footer); + return base; }
--- a/libpurple/protocols/msn/slpmsg.h Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/slpmsg.h Sun Dec 05 02:43:54 2010 +0000 @@ -78,16 +78,6 @@ MsnSlpMessage *msn_slpmsg_new(MsnSlpLink *slplink); /** - * Creates a MsnSlpMessage without a MsnSlpLink by parsing the raw data. - * - * @param data The raw data with the slp message. - * @param data_len The len of the data - * - * @return The createed slp message. - */ -MsnSlpMessage *msn_slpmsg_new_from_data(const char *data, size_t data_len); - -/** * Destroys a slp message * * @param slpmsg The slp message to destory.
--- a/libpurple/protocols/msn/slpmsg_part.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/slpmsg_part.c Sun Dec 05 02:43:54 2010 +0000 @@ -1,3 +1,27 @@ +/** + * @file slpmsg_part.c MSNSLP Parts + * + * purple + * + * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + */ + #include "internal.h" #include "debug.h" @@ -28,13 +52,13 @@ const char *tmp; int body_len; - tmp = data; - part = msn_slpmsgpart_new(NULL, NULL); - if (data_len < sizeof(*header)) { return NULL; } + part = msn_slpmsgpart_new(NULL, NULL); + tmp = data; + /* Extract the binary SLP header */ part->header = msn_p2p_header_from_wire((MsnP2PHeader*)tmp); tmp += P2P_PACKET_HEADER_SIZE; @@ -109,8 +133,7 @@ { g_return_if_fail(part != NULL); - if (part->buffer != NULL) - g_free(part->buffer); + g_free(part->buffer); if (data != NULL && len > 0) { part->buffer = g_malloc(len + 1); @@ -154,6 +177,9 @@ *ret_size = tmp - base; + g_free(header); + g_free(footer); + return base; } /* We have received the message ack */
--- a/libpurple/protocols/msn/slpmsg_part.h Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/slpmsg_part.h Sun Dec 05 02:43:54 2010 +0000 @@ -1,3 +1,27 @@ +/** + * @file slpmsg_part.h MSNSLP Parts + * + * purple + * + * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + */ + #ifndef MSN_SLPMSG_PART_H #define MSN_SLPMSG_PART_H
--- a/libpurple/protocols/msn/switchboard.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/switchboard.c Sun Dec 05 02:43:54 2010 +0000 @@ -225,7 +225,7 @@ msn_switchboard_send_msg(swboard, msg, TRUE); - msn_message_destroy(msg); + msn_message_unref(msg); } static void @@ -743,7 +743,10 @@ ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) { purple_debug_misc("msn", "get UBM...\n"); - cmd->payload_len = atoi(cmd->params[3]); + if (cmdproc->session->protocol_ver >= 16) + cmd->payload_len = atoi(cmd->params[5]); + else + cmd->payload_len = atoi(cmd->params[3]); cmdproc->last_cmd->payload_cb = msg_cmd_post; }
--- a/libpurple/protocols/msn/transaction.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/transaction.c Sun Dec 05 02:43:54 2010 +0000 @@ -220,10 +220,11 @@ purple_debug_info("msn", "timed out: %s %d %s\n", trans->command, trans->trId, trans->params); #endif + trans->timer = 0; + if (trans->timeout_cb != NULL) trans->timeout_cb(trans->cmdproc, trans); - trans->timer = 0; return FALSE; }
--- a/libpurple/protocols/msn/user.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/user.c Sun Dec 05 02:43:54 2010 +0000 @@ -203,6 +203,8 @@ status = "phone"; else if (!g_ascii_strcasecmp(state, "LUN")) status = "lunch"; + else if (!g_ascii_strcasecmp(state, "HDN")) + status = NULL; else status = "available"; @@ -303,6 +305,22 @@ } void +msn_user_clear_endpoints(MsnUser *user) +{ + MsnUserEndpoint *ep; + GSList *l; + + g_return_if_fail(user != NULL); + + for (l = user->endpoints; l; l = g_slist_delete_link(l, l)) { + ep = l->data; + free_user_endpoint(ep); + } + + user->endpoints = NULL; +} + +void msn_user_set_op(MsnUser *user, MsnListOp list_op) { g_return_if_fail(user != NULL);
--- a/libpurple/protocols/msn/user.h Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/user.h Sun Dec 05 02:43:54 2010 +0000 @@ -286,6 +286,14 @@ msn_user_set_endpoint_data(MsnUser *user, const char *endpoint, MsnUserEndpoint *data); /** + * Clears all endpoint data for a user. + * + * @param user The user. + */ +void +msn_user_clear_endpoints(MsnUser *user); + +/** * Sets the client id for a user. * * @param user The user.
--- a/libpurple/protocols/msn/xfer.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/xfer.c Sun Dec 05 02:43:54 2010 +0000 @@ -1,3 +1,27 @@ +/** + * @file xfer.c MSN File Transfer functions + * + * purple + * + * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + */ + #include "internal.h" #include "debug.h"
--- a/libpurple/protocols/msn/xfer.h Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/msn/xfer.h Sun Dec 05 02:43:54 2010 +0000 @@ -1,3 +1,27 @@ +/** + * @file xfer.h MSN File Transfer functions + * + * purple + * + * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + */ + #include "slpcall.h"
--- a/libpurple/protocols/oscar/clientlogin.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/oscar/clientlogin.c Sun Dec 05 02:43:54 2010 +0000 @@ -335,7 +335,8 @@ /* Note to translators: The first %s is a URL, the second is an error message. */ tmp = g_strdup_printf(_("Error requesting %s: %s"), - get_start_oscar_session_url(od), error_message); + get_start_oscar_session_url(od), error_message ? + error_message : _("The server returned an empty response")); purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp); g_free(tmp); @@ -568,12 +569,9 @@ if (error_message != NULL || len == 0) { gchar *tmp; - if (error_message != NULL) - tmp = g_strdup_printf(_("Error requesting %s: %s"), - get_client_login_url(od), error_message); - else - tmp = g_strdup_printf(_("Error requesting %s"), - get_client_login_url(od)); + tmp = g_strdup_printf(_("Error requesting %s: %s"), + get_client_login_url(od), error_message ? + error_message : _("The server returned an empty response")); purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp); g_free(tmp);
--- a/libpurple/protocols/oscar/family_locate.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Sun Dec 05 02:43:54 2010 +0000 @@ -1043,7 +1043,7 @@ } else { byte_stream_advance(bs, length2); outinfo->status_len = 0; - outinfo->status = g_strdup(""); + outinfo->status = NULL; outinfo->status_encoding = NULL; } } break;
--- a/libpurple/protocols/oscar/oscar.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sun Dec 05 02:43:54 2010 +0000 @@ -283,7 +283,6 @@ /* Destroy the chat_connection */ od->oscar_chats = g_slist_remove(od->oscar_chats, cc); - flap_connection_schedule_destroy(cc->conn, OSCAR_DISCONNECT_DONE, NULL); oscar_chat_destroy(cc); } @@ -793,7 +792,7 @@ * do what we know is best for them and change the setting out * from under them to the SSL login server. */ - if (!strcmp(server, get_login_server(od->icq, FALSE))) { + if (!strcmp(server, get_login_server(od->icq, FALSE)) || !strcmp(server, AIM_ALT_LOGIN_SERVER)) { purple_debug_info("oscar", "Account uses SSL, so changing server to default SSL server\n"); purple_account_set_string(account, "server", get_login_server(od->icq, TRUE)); server = get_login_server(od->icq, TRUE); @@ -1367,7 +1366,7 @@ const char *status_id; va_list ap; aim_userinfo_t *info; - char *message = NULL; + char *message; char *itmsurl = NULL; gc = od->gc; @@ -1454,16 +1453,13 @@ purple_prpl_got_user_status_deactive(account, info->bn, OSCAR_STATUS_ID_MOBILE); } - /* Empty status means we should unset the status message. NULL status means we should keep it from the previous active status. - * Same goes for itmsurl (which is available only for the "available" status). - */ - if (info->status != NULL) { - message = (info->status_len > 0) ? oscar_encoding_to_utf8(info->status_encoding, info->status, info->status_len) : NULL; - } else if (previous_status != NULL) { - message = g_strdup(purple_status_get_attr_string(previous_status, "message")); - } + message = (info->status && info->status_len > 0) + ? oscar_encoding_to_utf8(info->status_encoding, info->status, info->status_len) + : NULL; if (strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE) == 0) { + /* TODO: If itmsurl is NULL, does that mean the URL has been + cleared? Or does it mean the URL should remain unchanged? */ if (info->itmsurl != NULL) { itmsurl = (info->itmsurl_len > 0) ? oscar_encoding_to_utf8(info->itmsurl_encoding, info->itmsurl, info->itmsurl_len) : NULL; } else if (previous_status != NULL && purple_status_is_available(previous_status)) { @@ -4451,6 +4447,7 @@ purple_conversation_get_name(conv)); cc = find_oscar_chat(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv))); + flap_connection_schedule_destroy(cc->conn, OSCAR_DISCONNECT_DONE, NULL); oscar_chat_kill(gc, cc); }
--- a/libpurple/protocols/oscar/oscarcommon.h Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/oscar/oscarcommon.h Sun Dec 05 02:43:54 2010 +0000 @@ -33,6 +33,7 @@ #include "status.h" #define AIM_DEFAULT_LOGIN_SERVER "login.oscar.aol.com" +#define AIM_ALT_LOGIN_SERVER "login.messaging.aol.com" #define AIM_DEFAULT_SSL_LOGIN_SERVER "slogin.oscar.aol.com" #define ICQ_DEFAULT_LOGIN_SERVER "login.icq.com" #define ICQ_DEFAULT_SSL_LOGIN_SERVER "slogin.icq.com"
--- a/libpurple/protocols/oscar/visibility.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/protocols/oscar/visibility.c Sun Dec 05 02:43:54 2010 +0000 @@ -20,10 +20,25 @@ #include "visibility.h" -/* 4 separate strings are needed in order to ease translators' job */ +/* Translators: This string is a menu option that, if selected, will cause + you to appear online to the chosen user even when your status is set to + Invisible. */ #define APPEAR_ONLINE N_("Appear Online") + +/* Translators: This string is a menu option that, if selected, will cause + you to appear offline to the chosen user when your status is set to + Invisible (this is the default). */ #define DONT_APPEAR_ONLINE N_("Don't Appear Online") + +/* Translators: This string is a menu option that, if selected, will cause + you to always appear offline to the chosen user (even when your status + isn't Invisible). */ #define APPEAR_OFFLINE N_("Appear Offline") + +/* Translators: This string is a menu option that, if selected, will cause + you to appear offline to the chosen user if you are invisible, and + appear online to the chosen user if you are not invisible (this is the + default). */ #define DONT_APPEAR_OFFLINE N_("Don't Appear Offline") static guint16
--- a/libpurple/purple-remote Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/purple-remote Sun Dec 05 02:43:54 2010 +0000 @@ -36,7 +36,8 @@ def __call__(self, *args): result = self.cobj.obj.__getattr__(self.attr)(*args) if result == 0: - raise "Error: " + self.attr + " " + str(args) + " returned " + str(result) + raise Exception("Error: %s %s returned %s" % + (self.attr, args, result)) return result def show_help(requested=False): @@ -223,7 +224,7 @@ elif type == "i": methodparams.append(int(value)) else: - raise "Don't know how to handle type \"%s\"" % type + raise Exception("Don't know how to handle type \"%s\"" % type) return purple.__getattr__(command)(*methodparams) show_help()
--- a/libpurple/upnp.c Sun Nov 21 20:30:12 2010 +0000 +++ b/libpurple/upnp.c Sun Dec 05 02:43:54 2010 +0000 @@ -162,9 +162,9 @@ while(discovery_callbacks) { gpointer data; PurpleUPnPCallback cb = discovery_callbacks->data; - discovery_callbacks = g_slist_remove(discovery_callbacks, cb); + discovery_callbacks = g_slist_delete_link(discovery_callbacks, discovery_callbacks); data = discovery_callbacks->data; - discovery_callbacks = g_slist_remove(discovery_callbacks, data); + discovery_callbacks = g_slist_delete_link(discovery_callbacks, discovery_callbacks); cb(success, data); } }
--- a/pidgin.spec.in Sun Nov 21 20:30:12 2010 +0000 +++ b/pidgin.spec.in Sun Dec 05 02:43:54 2010 +0000 @@ -46,14 +46,14 @@ %if "%{_vendor}" == "suse" # For SuSE: BuildRequires: gnutls-devel -%define sslopts "--enable-gnutls=yes --enable-nss=no" +%define sslopts --enable-gnutls=yes --enable-nss=no %{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35} %{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10} Requires(pre): gconf2 Requires(post): gconf2 Requires(preun): gconf2 %else -%define sslopts "--enable-gnutls=no --enable-nss=yes" +%define sslopts --enable-gnutls=no --enable-nss=yes %{?_with_dbus:BuildRequires: dbus-devel >= 0.35} %{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10} Requires(pre): GConf2
--- a/pidgin/gtkdialogs.c Sun Nov 21 20:30:12 2010 +0000 +++ b/pidgin/gtkdialogs.c Sun Dec 05 02:43:54 2010 +0000 @@ -168,7 +168,6 @@ {N_("Greek"), "el", "Bouklis Panos", "panos@echidna-band.com"}, {N_("Australian English"), "en_AU", "Peter Lawler", "trans@six-by-nine.com.au"}, {N_("Canadian English"), "en_CA", "Adam Weinberger", "adamw@gnome.org"}, - {N_("British English"), "en_GB", "Luke Ross", "lukeross@sys3175.co.uk"}, {N_("Esperanto"), "eo", "St辿phane Fillod", "fillods@users.sourceforge.net"}, {N_("Spanish"), "es", "Javier Fern叩ndez-Sanguino Pe単a", "jfs@debian.org"}, {N_("Estonian"), "et", "Ivar Smolin", "okul@linux.ee"}, @@ -260,6 +259,7 @@ {N_("Czech"), "cs", "Honza Kr叩l", NULL}, {N_("Czech"), "cs", "Miloslav Trmac", "mitr@volny.cz"}, {N_("German"), "de", "Daniel Seifert, Karsten Weiss", NULL}, + {N_("British English"), "en_GB", "Luke Ross", "luke@lukeross.name"}, {N_("Spanish"), "es", "JM P辿rez C叩ncer", NULL}, {N_("Spanish"), "es", "Nicol叩s Lichtmaier", NULL}, {N_("Spanish"), "es", "Amaya Rodrigo", NULL},
--- a/pidgin/gtkimhtml.c Sun Nov 21 20:30:12 2010 +0000 +++ b/pidgin/gtkimhtml.c Sun Dec 05 02:43:54 2010 +0000 @@ -4905,18 +4905,20 @@ * are apparently pretty inefficient. Hopefully we can remove this * restriction when we're using a better HTML widget. */ + unescaped = purple_unescape_html(smiley); numsmileys_thismsg = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(imhtml), "gtkimhtml_numsmileys_thismsg")); if (numsmileys_thismsg >= 30) { - gtk_text_buffer_insert(imhtml->text_buffer, iter, smiley, -1); + gtk_text_buffer_insert(imhtml->text_buffer, iter, unescaped, -1); + g_free(unescaped); return; } numsmileys_total = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(imhtml), "gtkimhtml_numsmileys_total")); if (numsmileys_total >= 300) { - gtk_text_buffer_insert(imhtml->text_buffer, iter, smiley, -1); + gtk_text_buffer_insert(imhtml->text_buffer, iter, unescaped, -1); + g_free(unescaped); return; } - unescaped = purple_unescape_html(smiley); imhtml_smiley = gtk_imhtml_smiley_get(imhtml, sml, unescaped); if (imhtml->format_functions & GTK_IMHTML_SMILEY) { @@ -4991,7 +4993,7 @@ g_object_set_data(G_OBJECT(imhtml), "gtkimhtml_numsmileys_thismsg", GINT_TO_POINTER(numsmileys_thismsg + 1)); g_object_set_data(G_OBJECT(imhtml), "gtkimhtml_numsmileys_total", GINT_TO_POINTER(numsmileys_total + 1)); } else { - gtk_text_buffer_insert(imhtml->text_buffer, iter, smiley, -1); + gtk_text_buffer_insert(imhtml->text_buffer, iter, unescaped, -1); } if (ebox) {
--- a/pidgin/gtkmedia.c Sun Nov 21 20:30:12 2010 +0000 +++ b/pidgin/gtkmedia.c Sun Dec 05 02:43:54 2010 +0000 @@ -399,6 +399,9 @@ gtkmedia->priv->ui = NULL; } + if (gtkmedia->priv->timeout_id != 0) + g_source_remove(gtkmedia->priv->timeout_id); + G_OBJECT_CLASS(parent_class)->dispose(media); }
--- a/pidgin/gtkscrollbook.c Sun Nov 21 20:30:12 2010 +0000 +++ b/pidgin/gtkscrollbook.c Sun Dec 05 02:43:54 2010 +0000 @@ -65,9 +65,13 @@ } static gboolean -scroll_left_cb(PidginScrollBook *scroll_book) +scroll_left_cb(PidginScrollBook *scroll_book, GdkEventButton *event) { int index; + + if (event->type != GDK_BUTTON_PRESS) + return FALSE; + index = gtk_notebook_get_current_page(GTK_NOTEBOOK(scroll_book->notebook)); if (index > 0) @@ -76,9 +80,13 @@ } static gboolean -scroll_right_cb(PidginScrollBook *scroll_book) +scroll_right_cb(PidginScrollBook *scroll_book, GdkEventButton *event) { int index, count; + + if (event->type != GDK_BUTTON_PRESS) + return FALSE; + index = gtk_notebook_get_current_page(GTK_NOTEBOOK(scroll_book->notebook)); count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(scroll_book->notebook)); @@ -131,9 +139,10 @@ } static gboolean -scroll_close_cb(PidginScrollBook *scroll_book) +scroll_close_cb(PidginScrollBook *scroll_book, GdkEventButton *event) { - gtk_widget_destroy(gtk_notebook_get_nth_page(GTK_NOTEBOOK(scroll_book->notebook), gtk_notebook_get_current_page(GTK_NOTEBOOK(scroll_book->notebook)))); + if (event->type == GDK_BUTTON_PRESS) + gtk_widget_destroy(gtk_notebook_get_nth_page(GTK_NOTEBOOK(scroll_book->notebook), gtk_notebook_get_current_page(GTK_NOTEBOOK(scroll_book->notebook)))); return FALSE; }
--- a/po/ChangeLog Sun Nov 21 20:30:12 2010 +0000 +++ b/po/ChangeLog Sun Dec 05 02:43:54 2010 +0000 @@ -1,6 +1,21 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul version 2.7.6 + * Albanian translation updated (Besnik Bleta) + * Bengali translation updated (Jamil Ahmed) + * Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R. + Liu) + * Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R. + Liu) + * Czech translation updated (David Vachulka) + * Dutch translation updated (Gideon van Melle) + * German translation updated (Bj旦rn Voigt, Jochen Kemnade) + * Hebrew translation updated (Shalom Craimer) + * Norwegian Nynorsk translation updated (Yngve Spjeld Landro) + * Polish translation updated (Piotr Dr�g) + * Romanian translation updated (Mi�u Moldovan) + * Spanish translation updated (Javier Fern叩ndez-Sanguino Pe単a) + * Ukrainian translation updated (Oleksandr Kovalenko) version 2.7.5 * German translation updated (Bj旦rn Voigt, Jochen Kemnade)
--- a/po/bn.po Sun Nov 21 20:30:12 2010 +0000 +++ b/po/bn.po Sun Dec 05 02:43:54 2010 +0000 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: bn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 00:11-0400\n" -"PO-Revision-Date: 2010-08-17 13:37+0600\n" +"POT-Creation-Date: 2010-11-21 13:55-0500\n" +"PO-Revision-Date: 2010-11-08 13:37+0600\n" "Last-Translator: israt <israt@ankur.org.bd>\n" "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n" "Language: bn\n" @@ -810,9 +810,8 @@ msgid "Waiting for transfer to begin" msgstr "爨伍�爨ム�爨��爨��爨むΠ 爨謹�爨萎� 爨�爨萎�爨� 爨�爨��爨� 爨�爨��爨�爭�爨劇� 爨�爨萎� 爨項�爭�爨�爭�" -#, fuzzy msgid "Cancelled" -msgstr "爨��爨む�爨� 爨�爨萎� 爨項Ο爨酌�爨�爭�" +msgstr "爨��爨む�爨迦�爭�爨�" # mark6 msgid "Failed" @@ -1750,13 +1749,12 @@ "爨伍�爨萎�爨�爨逗Λ爨逗�爭�爨�爨�爨� 爨踶�爨�� 爨�爨鉦Π爭�爨��爨� 爨��爛� 爨�爨�Θ爨鉦Π 爨�爨��爨��爨�爨�爨鉦Π爭�爨� 爨伍Ξ爭� 爨踶�� 爨む�爨萎�爨� 爨�爨逗� 爨�爨�爭� 爨�爨逗Θ爨� " "爨�Π爭�爨�爭�爨劇� 爨�爨萎�爨�イ" -#, fuzzy msgid "" "The certificate has expired and should not be considered valid. Check that " "your computer's date and time are accurate." msgstr "" -"爨伍�爨萎�爨�爨逗Λ爨逗�爭�爨�爨�爨� 爨踶�爨�� 爨�爨鉦Π爭�爨��爨� 爨��爛� 爨�爨�Θ爨鉦Π 爨�爨��爨��爨�爨�爨鉦Π爭�爨� 爨伍Ξ爭� 爨踶�� 爨む�爨萎�爨� 爨�爨逗� 爨�爨�爭� 爨�爨逗Θ爨� " -"爨�Π爭�爨�爭�爨劇� 爨�爨萎�爨�イ" +"爨伍�爨萎�爨�爨逗Λ爨逗�爭�爨�爨�爨� 爨��爭�爨鉦Ζ爭�爨む�爨む�爨萎�爨� 爨踶�� 爨踶�爭� 爨�爨鉦Π爭�爨��爨� 爨оΠ爨� 爨項Μ爭� 爨��爛� 爨�爨�Θ爨鉦Π 爨�爨��爨��爨�爨�爨鉦Π爭�爨� 爨伍Ξ爭� " +"爨踶�� 爨む�爨萎�爨� 爨�爨逗� 爨�爨�爭� 爨�爨逗Θ爨� 爨�Π爭�爨�爭�爨劇� 爨�爨萎�爨�イ" # Translated by sadia #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com) @@ -4974,20 +4972,17 @@ msgstr "爨÷�爨��爨�爨�" # tithi -#, fuzzy msgid "Require encryption" -msgstr "爨�爨��爨��爨�Θ 爨��爨萎�爭�爨�爨�" - -#, fuzzy +msgstr "爨��爨萎�爭�爨�爨��爭� 爨踶��爭�爨萎�爨�Χ爨�" + msgid "Use encryption if available" -msgstr "爨��爨�Μ爨項�爨萎�爨鉦Π爭�爨� 爨むΕ爭�爨� 爨��爨�爭�爨� 爨��爨�爭�爨�爭� 爨��: %s" +msgstr "爨�Ζ爨� 爨��爨�爭�爨� 爨��爭� 爨むΜ爭� 爨踶��爭�爨萎�爨�Χ爨� 爨��爨�Μ爨項�爨�" msgid "Use old-style SSL" -msgstr "" - -#, fuzzy +msgstr "爨��爨萎�爨むΘ 爨謹�爨迦�爨� SSL 爨��爨�Μ爨項�爨�" + msgid "Connection security" -msgstr "爨伍�爨��爨� 爨伍Ξ爭�爨�爨鉦Σ 爨�爨む�爨む�爨萎�爨�" +msgstr "爨伍�爨��爨�爭�爨� 爨��爨萎�爨�Δ爭�爨む�" # tithi msgid "Allow plaintext auth over unencrypted streams" @@ -5102,15 +5097,6 @@ msgid "Unknown Error in presence" msgstr "爨�爨�Ω爭�爨ム�爨む�爨む� 爨�爨�爨鉦Θ爨� 爨む�爨萎�爨�爨�" -msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "爨�爨�-爨��爨��爨��爨� 爨��爨�爨�爨伍�爨�爭�爨萎�爨� 爨��爨��爨��爭� 爨む�爨萎�爨�爨� 爨項�爭�爨�爭�\n" - -msgid "Transfer was closed." -msgstr "爨伍�爨ム�爨��爨��爨むΠ 爨�Θ爭�爨� 爨�爨萎� 爨��爭�爨� 爨項�爭�爨�爭�爛�" - -msgid "Failed to open in-band bytestream" -msgstr "爨�爨�-爨��爨��爨��爨� 爨��爨�爨�爨伍�爨�爭�爨萎�爨� 爨�爭�爨迦Δ爭� 爨��爨�Π爭�爨�" - #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "%s 爨� 爨��爨�爨� 爨��爨�爨鉦Δ爭� 爨��爨�Π爭�爨�, 爨��爨�Μ爨項�爨�爨鉦Π爭� 爨��爨�爨� 爨伍�爨ム�爨��爨��爨むΠ 爨伍Ξ爨萎�爨ムΘ 爨�爨萎� 爨��" @@ -5499,30 +5485,6 @@ msgid "The username specified does not exist." msgstr "爨�爨迦�爨迦�爨�爨逗Δ 爨��爨�Μ爨項�爨萎�爨鉦Π爭�爨� 爨��爨��爨� 爨��爨��爨�Ξ爨鉦Θ 爨��爛�" -# fix me tithi -#, c-format -msgid "Buddy list synchronization issue in %s (%s)" -msgstr "%1$s (%2$s) 爨� 爨�Θ爭�爨о� 爨む�爨迦�爨�爨鉦Π 爨�爨〝�爨��爨��爨萎Γ 爨�爨伍�爨��" - -# tithi -#, c-format -msgid "" -"%s on the local list is inside the group \"%s\" but not on the server list. " -"Do you want this buddy to be added?" -msgstr "" -"%1$s 爨伍�爨ム�爨��爨�� 爨む�爨迦�爨�爨鉦� 爨踶�� \"%2$s\" 爨�Σ爭� 爨�爨��爨むΠ爭�爨〝�爨�爭�爨� 爨�爨逗Θ爭�爨む� 爨伍�爨萎�爨〝�爨� 爨む�爨迦�爨�爨鉦Ο爨� 爨��爨�爛� 爨�爨�Θ爨� " -"爨�爨� 爨踶� 爨�Θ爭�爨о�爨�爨� 爨��爨� 爨�爨萎Δ爭� 爨�爨鉦Θ?" - -# msgstr "" -# "爨伍�爨ム�爨��爨�� 爨む�爨迦�爨�爨鉦Π %s 爨�爭�爨萎�爨� 爨� 爨�爨�爭�爨� 爨�爨逗Θ爭�爨む� 爨伍�爨萎�爨〝�爨� 爨む�爨迦�爨�爨鉦Ο爨� 爨��爨�爛む�爨�Θ爨� 爨�爨� 爨踶� 爨�Θ爭�爨о�爨�爨逗�爭� 爨��爨� " -# "爨�爨萎Δ爭� 爨�爨鉦Θ?" -#, c-format -msgid "" -"%s is on the local list but not on the server list. Do you want this buddy " -"to be added?" -msgstr "" -"%s 爨伍�爨ム�爨��爭� 爨む�爨迦�爨�爨鉦� 爨�爨�爭� 爨�爨逗Θ爭�爨む� 爨伍�爨萎�爨〝�爨� 爨む�爨迦�爨�爨鉦Ο爨� 爨��爨�爛� 爨�爨�Θ爨� 爨�爨� 爨踶� 爨�Θ爭�爨о�爨�爭� 爨��爨� 爨�爨萎Δ爭� 爨�爨鉦Θ?" - msgid "Unable to parse message" msgstr "爨��爨萎�爨む� 爨��爨萎�爨� 爨�爨萎� 爨伍Ξ爭�爨〝Μ 爨項Ο爨酌Θ爨�" @@ -5719,6 +5681,30 @@ msgid "MSN Error: %s\n" msgstr "MSN 爨む�爨萎�爨�爨�: %s\n" +# fix me tithi +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "%1$s (%2$s) 爨� 爨�Θ爭�爨о� 爨む�爨迦�爨�爨鉦Π 爨�爨〝�爨��爨��爨萎Γ 爨�爨伍�爨��" + +# tithi +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"%1$s 爨伍�爨ム�爨��爨�� 爨む�爨迦�爨�爨鉦� 爨踶�� \"%2$s\" 爨�Σ爭� 爨�爨��爨むΠ爭�爨〝�爨�爭�爨� 爨�爨逗Θ爭�爨む� 爨伍�爨萎�爨〝�爨� 爨む�爨迦�爨�爨鉦Ο爨� 爨��爨�爛� 爨�爨�Θ爨� " +"爨�爨� 爨踶� 爨�Θ爭�爨о�爨�爨� 爨��爨� 爨�爨萎Δ爭� 爨�爨鉦Θ?" + +# msgstr "" +# "爨伍�爨ム�爨��爨�� 爨む�爨迦�爨�爨鉦Π %s 爨�爭�爨萎�爨� 爨� 爨�爨�爭�爨� 爨�爨逗Θ爭�爨む� 爨伍�爨萎�爨〝�爨� 爨む�爨迦�爨�爨鉦Ο爨� 爨��爨�爛む�爨�Θ爨� 爨�爨� 爨踶� 爨�Θ爭�爨о�爨�爨逗�爭� 爨��爨� " +# "爨�爨萎Δ爭� 爨�爨鉦Θ?" +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"%s 爨伍�爨ム�爨��爭� 爨む�爨迦�爨�爨鉦� 爨�爨�爭� 爨�爨逗Θ爭�爨む� 爨伍�爨萎�爨〝�爨� 爨む�爨迦�爨�爨鉦Ο爨� 爨��爨�爛� 爨�爨�Θ爨� 爨�爨� 爨踶� 爨�Θ爭�爨о�爨�爭� 爨��爨� 爨�爨萎Δ爭� 爨�爨鉦Θ?" + msgid "Other Contacts" msgstr "爨�爨��爨��爨��爨� 爨�Π爨逗�爨逗Δ爨�" @@ -5775,14 +5761,26 @@ msgid "Set friendly name for %s." msgstr "%s 爨踶� 爨�爨��爨� 爨�Θ爭�爨о�爨伍�爨迦Ν 爨��爨� 爨��爨萎�爨о�爨萎Γ 爨�爨萎�爨�イ" -# tithi -msgid "Set your friendly name." -msgstr "爨�爨�Θ爨鉦Π 爨�Θ爭�爨о�爨伍�爨迦Ν 爨��爨� 爨��爨萎�爨о�爨萎Γ爛�" +msgid "Set Friendly Name" +msgstr "爨�Θ爭�爨о�爨伍�爨迦Ν 爨��爨� 爨��爨萎�爨о�爨萎Γ" # tithi msgid "This is the name that other MSN buddies will see you as." msgstr "爨�爨��爨��爨��爨� MSN 爨�Θ爭�爨о�爨萎� 爨�爨�Θ爨鉦�爭� 爨踶� 爨��爨�� 爨��爨�爨��" +msgid "This Location" +msgstr "爨踶� 爨�爨�Ω爭�爨ム�爨�" + +# tithi +msgid "This is the name that identifies this location" +msgstr "爨�爨�Ω爭�爨ム�爨��爨� 爨��爨萎�爨��爨� 爨�爨萎� 爨踶�Θ 爨��爨�" + +msgid "Other Locations" +msgstr "爨�爨��爨��爨��爨� 爨�爨�Ω爭�爨ム�爨�" + +msgid "You can sign out from other locations here" +msgstr "爨�爨�Θ爨� 爨踶�爨鉦Θ爭� 爨�爨��爨��爨��爨� 爨�爨�Ω爭�爨ム�爨� 爨ム�爨�爭� 爨伍�爨�爨� 爨�爨�爨� 爨�爨萎Δ爭� 爨��爨萎�爨�" + # tithi msgid "Set your home phone number." msgstr "爨�爨�Θ爨鉦Π 爨��爨伍�爨� 爨��爨� 爨��爨��爨��爨� 爨��爨�イ" @@ -5878,6 +5876,9 @@ msgid "Set Friendly Name..." msgstr "爨�Θ爭�爨о�爨伍�爨迦Ν 爨��爨� 爨��爨萎�爨о�爨萎Γ..." +msgid "View Locations..." +msgstr "爨�爨�Ω爭�爨ム�爨� 爨��爨萎Ζ爨萎�爨謹Θ..." + msgid "Set Home Phone Number..." msgstr "爨��爨伍�爨� 爨��爨� 爨�Ξ爭�爨�Π 爨��爨萎�爨о�爨萎Γ..." @@ -7483,6 +7484,12 @@ "爨�爨�Θ爨� 爨�爭�爨� 爨�爨��爨� 爨伍�爨��爨� 爨伍�爨ム�爨�Θ 爨踶�� 爨��爨�爭�爨�爨逗Θ爭�爨� 爨�爨萎�爭�爨�イ 爨�Χ 爨��爨��爨� 爨�爨��爨�爭�爨劇� 爨�爨萎� 爨��爨�Π爨鉦Ο爨� 爨�爭�爨劇�爨�爨� " "爨�爨萎�爨�イ 爨�爨�Θ爨� 爨�Ζ爨� 爨�爭�爨劇�爨�爨� 爨�爨��爨��爨項Δ 爨萎�爨�爨む� 爨�爨鉦Θ, 爨�爨�Θ爨鉦�爭� 爨�爨萎� 爨��爨謹� 爨�爨��爨�爭�爨劇� 爨�爨萎Δ爭� 爨項Μ爭�爛�" +msgid "" +"You required encryption in your account settings, but one of the servers " +"doesn't support it." +msgstr "" +"爨�爨�Θ爨鉦Π 爨�爭�爨��爨�爨鉦�爨��爨� 爨伍�爨�爨逗� 爨� 爨踶��爭�爨萎�爨�Χ爨� 爨��爨萎�爭�爨�爨�, 爨�爨逗Θ爭�爨む� 爨踶�爨�爨� 爨伍�爨萎�爨〝�爨� 爨踶�爨� 爨伍Ξ爨萎�爨ムΘ 爨�爨萎� 爨��爛�" + # Translated by sadia #. Note to translators: The first %s is a URL, the second is an #. error message. @@ -7856,6 +7863,12 @@ "爨項Σ爭�, 爨謹�爨о�爨��爨む�爨� 爨�Π爭�爨�, 爨伍�爨�爭�爨�� 爨踶�� 爨伍�爨��爨� 爨��爨��爨萎� 爨�爨�爨逗Δ 爨項Μ爭�, 爨�� 爨謹�爨о�爨��爨む�爨� 爨伍�爨�爭�爨�� 爨��爨��爨萎� 爨�爨�爨逗Δ " "爨項Μ爭�爛�" +msgid "" +"You required encryption in your account settings, but encryption is not " +"supported by your system." +msgstr "" +"爨�爨�Θ爨鉦Π 爨�爭�爨��爨�爨鉦�爨��爨� 爨伍�爨�爨逗� 爨� 爨踶��爭�爨萎�爨�Χ爨� 爨��爨萎�爭�爨�爨�, 爨�爨逗Θ爭�爨む� 爨�爨�Θ爨鉦Π 爨伍�爨伍�爨�爭�爨� 爨踶�爨� 爨伍Ξ爨萎�爨ムΘ 爨�爨萎� 爨��爛�" + #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "爨�爨�Θ爨� 爨伍�爨��爨逗�爨〝�爨�� 爨��爨�爭�爨�爨逗Θ爭�爨� 爨項Δ爭� 爨��爨萎�爨�イ 爨項�爨迦�爨��爨�爨鉦Ζ爭�爨� 爨�爨��爨� %s 爨�Π爭�爨�爭�爨劇� 爨�爨萎�爨�." @@ -8430,13 +8443,11 @@ msgid "Set Privacy Options..." msgstr "爨�爭�爨�Θ爭�爭�爨む�爨� 爨�爨�Χ爨� 爨��爨萎�爨о�爨萎Γ ..." -#, fuzzy msgid "Show Visible List" -msgstr "爨�Θ爭�爨о� 爨む�爨迦�爨�爨� 爨��爨萎Ζ爨萎�爨謹Θ (_L)" - -#, fuzzy +msgstr "爨��爨謹�爨�Ξ爨鉦Θ爨��爨� 爨む�爨迦�爨�爨� 爨��爨萎Ζ爨萎�爨謹Θ" + msgid "Show Invisible List" -msgstr "爨�爨�Θ爭�爨む�爨萎Θ 爨む�爨迦�爨�爨�" +msgstr "爨�爨��爨謹�爨�Ζ爭�爨� 爨む�爨迦�爨�爨� 爨��爨萎Ζ爨萎�爨謹Θ" #. AIM actions msgid "Confirm Account" @@ -8458,6 +8469,9 @@ msgid "Search for Buddy by Email Address..." msgstr "爨�爨��爨�爨� 爨�爨逗�爨鉦Θ爨鉦Π 爨��爨о�爨�Ξ爭� 爨�Θ爭�爨о� 爨�爨��爨伍Θ爭�爨о�爨�..." +msgid "Don't use encryption" +msgstr "爨踶��爭�爨萎�爨�Χ爨� 爨��爨�Μ爨項�爨� 爨�爨萎� 爨項Μ爭� 爨��" + msgid "Use clientLogin" msgstr "clientLogin 爨��爨�Μ爨項�爨�" @@ -8677,7 +8691,7 @@ msgid "Buddy Comment" msgstr "爨�Θ爭�爨о�爨� 爨�Θ爭�爨むΜ爭�爨�" -#, fuzzy, c-format +#, c-format msgid "User information not available: %s" msgstr "爨��爨�Μ爨項�爨萎�爨鉦Π爭�爨� 爨むΕ爭�爨� 爨��爨�爭�爨� 爨��爨�爭�爨�爭� 爨��: %s" @@ -8690,7 +8704,7 @@ msgstr "爨��爨��爭�爨む�爨�爨� 爨�爨��爭�爨� 爨��爨�爨�" #. aim_userinfo_t -#. strip_html_tags +#. use_html_status msgid "Additional Information" msgstr "爨�爨む�爨萎�爨�爭�爨� 爨むΕ爭�爨�" @@ -8724,50 +8738,55 @@ msgstr "爨�爭�爨劇Ξ爨む�" # tithi -#. 4 separate strings are needed in order to ease translators' job +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear online to the chosen user even when your status is set to +#. Invisible. msgid "Appear Online" msgstr "爨�爨�Σ爨鉦�爨�� 爨��爨�爨鉦Θ" # tithi -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user when your status is set to +#. Invisible (this is the default). msgid "Don't Appear Online" -msgstr "爨�爨�Σ爨鉦�爨�� 爨��爨�爨鉦Θ" - +msgstr "爨�爨�Σ爨鉦�爨�� 爨��爨�爨�� 爨項Μ爭� 爨��" + +#. Translators: This string is a menu option that, if selected, will cause +#. you to always appear offline to the chosen user (even when your status +#. isn't Invisible). msgid "Appear Offline" msgstr "爨�爨�Σ爨鉦�爨�� 爨��爨�爨鉦Θ" -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user if you are invisible, and +#. appear online to the chosen user if you are not invisible (this is the +#. default). msgid "Don't Appear Offline" -msgstr "爨�爨�Σ爨鉦�爨�� 爨��爨�爨鉦Θ" +msgstr "爨�爨�Σ爨鉦�爨�� 爨��爨�爨鉦Θ爭� 爨項Μ爭� 爨��" # Kick = 爨む�爨萎Ω爭�爨�爨鉦Π # OR 爨�Ζ爨鉦�爨鉦Δ -#, fuzzy msgid "you have no buddies on this list" -msgstr "MultiMX 爨項Δ爭� 爨�爨�Θ爨鉦�爭� 爨む�爨萎Ω爭�爨�爨鉦Π 爨�爨萎� 爨項�爭�爨�爭�爛�" - -# tithi -#, fuzzy, c-format +msgstr "爨踶� 爨む�爨迦�爨�爨鉦� 爨�爨�Θ爨鉦Π 爨�爭�爨�� 爨�Θ爭�爨о� 爨��爨�" + +# tithi +#, c-format msgid "" "You can add a buddy to this list by right-clicking on them and selecting \"%s" "\"" -msgstr "" -"爨�爨�Θ爨� 爨�Θ爭�爨о� 爨むΣ爨逗�爨鉦� 爨÷�爨� 爨�爭�爨迦�爨� 爨�爨萎� 爨踶���� \"爨�爨��爨��爨�Θ爭�爨� 爨�爨��爨� 爨��爨�Π爨鉦� 爨�爨��爨萎�爨�\" 爨��爨萎�爨��爨�爨� 爨�爨萎� " -"爨む�爨��爨� 爨ム�爨�爭� 爨�爨��爨� 爨�爨��爨��爨�Θ 爨�爨鉦�爨む� 爨��爨萎�爨�イ" - -#, fuzzy +msgstr "爨�爨�Θ爨� \"%s\" 爨��爨萎�爨��爨�爨� 爨�爨萎� 爨�� 爨÷�爨� 爨�爭�爨迦�爨� 爨�爨萎� 爨�Θ爭�爨о� 爨��爨� 爨�爨萎Δ爭� 爨��爨萎�爨�" + msgid "Visible List" -msgstr "爨��爨謹�爨�Ξ爨鉦Θ" +msgstr "爨��爨謹�爨�Ξ爨鉦Θ 爨む�爨迦�爨�爨�" msgid "These buddies will see your status when you switch to \"Invisible\"" -msgstr "" - -#, fuzzy +msgstr "爨�爨�Θ爨� \"爨�爨��爨謹�爨�\" 爨項Σ爭� 爨踶� 爨�Θ爭�爨о�爨萎� 爨�爨�Θ爨鉦Π 爨伍�爨�爭�爨��爨�爨鉦Ω 爨��爨�爨む� 爨��爨��爨�" + msgid "Invisible List" -msgstr "爨�爨�Θ爭�爨む�爨萎Θ 爨む�爨迦�爨�爨�" +msgstr "爨�爨��爨謹�爨�Ζ爭�爨� 爨む�爨迦�爨�爨�" msgid "These buddies will always see you as offline" -msgstr "" +msgstr "爨踶� 爨�Θ爭�爨о�爨萎� 爨�爨�Θ爨鉦�爭� 爨伍Μ爨伍Ξ爭� 爨�爨�Σ爨鉦�爨� 爨項�爨伍�爨�� 爨��爨�爨む� 爨��爨��爨�" # tithi msgid "Aquarius" @@ -8967,9 +8986,9 @@ msgstr "爨�爨�Θ爨鉦Π 爨�爨��爨萎�爨о�爨� 爨�爨��爨��爨�Θ 爨�爨萎� 爨��爭�爨��爛�" # tithi -#, fuzzy, c-format +#, c-format msgid "%u requires verification: %s" -msgstr "%u 爨踶� 爨伍Δ爭�爨�Δ爨� 爨��爨�爨鉦� 爨�爨萎� 爨��爨萎�爭�爨�爨�" +msgstr "%u 爨踶� 爨伍Δ爭�爨�Δ爨� 爨��爨�爨鉦� 爨�爨萎� 爨��爨萎�爭�爨�爨�: %s" msgid "Add buddy question" msgstr "爨�Θ爭�爨о�爨� 爨��爨萎Χ爭�爨� 爨��爨�" @@ -12210,7 +12229,7 @@ msgstr "" "<span size='larger' weight='bold'>%s 爨� 爨伍�爨��爨�爨むΞ!</span>\n" "\n" -"爨�爨�Θ爨鉦Π 爨む�爭��爭�爨劇Θ爨逗� 爨��爨萎�爨む� 爨�爭�爨��爨�爨鉦�爨��爨� 爨�爨�Λ爨逗�爨鉦Π 爨�爨萎� 爨��爨�爛� %s 爨踶� 爨伍�爨ム� 爨伍�爨��爨� 爨��爨む� <b>" +"爨�爨�Θ爨鉦Π 爨む�爭��爭�爨劇Γ爨逗� 爨��爨萎�爨む� 爨�爭�爨��爨�爨鉦�爨��爨� 爨�爨�Λ爨逗�爨鉦Π 爨�爨萎� 爨��爨�爛� %s 爨踶� 爨伍�爨ム� 爨伍�爨��爨� 爨��爨む� <b>" "\"爨��爨�...\"</b> 爨��爨む�爨� 爨�爨鉦Κ爭�爨� 爨踶�� 爨�爨�Θ爨鉦Π 爨��爨萎Ε爨� 爨�爭�爨��爨�爨鉦�爨��爨�爨�爨� 爨�爨�Λ爨逗�爨鉦Π 爨�爨萎�爨�イ 爨�Ζ爨� 爨�爨�Θ爨� %s " "爨踶� 爨��爨о�爨�Ξ爭� 爨踶�爨鉦Η爨逗� IM 爨�爭�爨��爨�爨鉦�爨��爨�爭� 爨伍�爨��爨�爭�爨� 爨項Δ爭� 爨�爨鉦Θ 爨むΜ爭� 爨伍�爨�爭�爨迦�爨�爭� 爨�爨�Λ爨逗�爨鉦Π 爨�爨萎Δ爭� 爨��爨�Π爨鉦� " "<b>\"爨��爨�...\"</b> 爨��爨む�爨� 爨�爨鉦Κ爭�爨�イ\n" @@ -12491,7 +12510,7 @@ msgstr "/爨�Θ爭�爨о�爨�爨� (_B)" msgid "/Buddies/New Instant _Message..." -msgstr "/爨�Θ爭�爨о�爨�爨�/爨�Δ爭�爨� 爨む�爭��爭�爨劇Θ爨逗� 爨��爨萎�爨む�... (_M)" +msgstr "/爨�Θ爭�爨о�爨�爨�/爨�Δ爭�爨� 爨む�爭��爭�爨劇Γ爨逗� 爨��爨萎�爨む�... (_M)" msgid "/Buddies/Join a _Chat..." msgstr "/爨�Θ爭�爨о�爨�爨�/爨�爨÷�爨÷�爨�� 爨��爨�爨��爨�... (_C)" @@ -12567,7 +12586,7 @@ # snigdha msgid "/Tools/Set _Mood" -msgstr "/爨�爭�爨�/爨��爨� 爨伍�爨� (_M)" +msgstr "/爨�爭�爨�/爨��爨� 爨��爨萎�爨о�爨萎Γ (_M)" msgid "/Tools/_File Transfers" msgstr "/爨�爭�爨�/爨��爨�爨� 爨伍�爨ム�爨��爨��爨むΠ (_F)" @@ -12590,7 +12609,7 @@ # snigdha msgid "/Help/_Build Information" -msgstr "/爨伍�爨鉦�爨� /爨むΕ爭�爨� 爨�爭�爭�爨� (_B)" +msgstr "/爨伍�爨鉦�爨� /爨��爨迦�爨� 爨伍�爨�爭�爨萎�爨��爨� 爨むΕ爭�爨� (_B)" msgid "/Help/_Debug Window" msgstr "/爨伍�爨鉦Ο爨酌Δ爨�/爨÷�爨��爨� 爨�爨�爨��爨÷� (_D)" @@ -12820,7 +12839,7 @@ msgstr "爨�爨��爨�爭�爨萎� 爨�爨萎� 爨�� 爨�Σ爨�爨� 爨��爨�爭�爨� 爨�爨萎Δ爭� 爨項Μ爭� 爨む�爨� 爨��爨� 爨��爨�イ" msgid "Enable Account" -msgstr "爨�爭�爨��爨�爨鉦�爨��爨� 爨伍�爭�爨萎�爨�� 爨�爨萎� 爨項Μ爭�" +msgstr "爨�爭�爨��爨�爨鉦�爨��爨� 爨伍�爭�爨萎�爭�" msgid "<PurpleMain>/Accounts/Enable Account" msgstr "<PurpleMain>/爨�爭�爨��爨�爨鉦�爨��爨�/爨�爭�爨��爨�爨鉦�爨��爨� 爨伍�爭�爨萎�爨��爨�爨萎Γ" @@ -13420,6 +13439,9 @@ msgid "Lao" msgstr "爨迦�爨�" +msgid "Maithili" +msgstr "爨��爨ム�爨迦�" + msgid "Macedonian" msgstr "爨��爨��爨伍�爨÷Θ爨逗Ο爨�" @@ -14733,9 +14755,8 @@ msgid "_TURN server:" msgstr "TURN 爨伍�爨萎�爨〝�爨�: (_T)" -#, fuzzy msgid "_UDP Port:" -msgstr "爨��爨萎�爨� (_P):" +msgstr "UDP 爨��爨萎�爨� (_U):" # Translated by sadia msgid "Use_rname:" @@ -14762,7 +14783,7 @@ msgstr "爨�爨��爭�爨��爭�爨萎�爨�" msgid "Google Chrome" -msgstr "" +msgstr "爨�爭�爨�爨� 爨�爭�爨萎�爨�" #. Do not move the line below. Code below expects gnome-open to be in #. * this list immediately after xdg-open! @@ -14786,11 +14807,11 @@ #. Translators: please do not translate "chromium-browser" here! msgid "Chromium (chromium-browser)" -msgstr "" +msgstr "爨�爭�爨萎�爨��爭�爨鉦Ξ (chromium-browser)" #. Translators: please do not translate "chrome" here! msgid "Chromium (chrome)" -msgstr "" +msgstr "爨�爭�爨萎�爨��爭�爨鉦Ξ (chrome)" msgid "Manual" msgstr "爨伍�爨鉦�爨逗�爨�" @@ -15365,7 +15386,6 @@ msgid "Small" msgstr "爨�爭�爨�" -#, fuzzy msgid "Smaller versions of the default smileys" msgstr "爨÷�爨�Σ爭�爨� 爨伍�爨��爨�爨迦�爨�爭�爨迦�爨� 爨�爭�爨� 爨伍�爨伍�爨�爨萎Γ" @@ -16453,9 +16473,8 @@ msgstr "爨〝�爭�爨�/爨〝�爨÷�爨� 爨伍�爨�爨逗�爨伍Ξ爭�爨� " # Translated by sadia -#, fuzzy msgid "Voice and Video Settings" -msgstr "爨〝�爭�爨�/爨〝�爨÷�爨� 爨伍�爨�爨逗�爨伍Ξ爭�爨� " +msgstr "爨〝�爭�爨� 爨踶�� 爨〝�爨÷�爨� 爨伍�爨�爨逗�" # Translated by sadia #. *< name @@ -16756,6 +16775,15 @@ msgid "You do not have permission to uninstall this application." msgstr "爨�爨�Θ爨鉦Π 爨踶� 爨�爭�爨��爨��爨迦�爨�爭�爨謹Θ爨�爨� 爨�爨��爨��爨伍�爨� 爨�爨萎�爨� 爨�爨��爨�Δ爨� 爨��爨�爛�" +#~ msgid "An error occurred on the in-band bytestream transfer\n" +#~ msgstr "爨�爨�-爨��爨��爨��爨� 爨��爨�爨�爨伍�爨�爭�爨萎�爨� 爨��爨��爨��爭� 爨む�爨萎�爨�爨� 爨項�爭�爨�爭�\n" + +#~ msgid "Transfer was closed." +#~ msgstr "爨伍�爨ム�爨��爨��爨むΠ 爨�Θ爭�爨� 爨�爨萎� 爨��爭�爨� 爨項�爭�爨�爭�爛�" + +#~ msgid "Failed to open in-band bytestream" +#~ msgstr "爨�爨�-爨��爨��爨��爨� 爨��爨�爨�爨伍�爨�爭�爨萎�爨� 爨�爭�爨迦Δ爭� 爨��爨�Π爭�爨�" + # Translated by sadia #~ msgid "The certificate has expired and should not be considered valid." #~ msgstr "爨伍�爨萎�爨�爨逗Λ爨逗�爭�爨�爨�爨� 爨��爭�爨鉦Ζ爨�爨む�爨む�爨萎�爨� 爨踶�� 爨��爨� 爨項�爨伍�爨�� 爨��爨��爨�爨�� 爨�爨萎� 爨�爨�爨逗Δ 爨��爛� " @@ -16769,6 +16797,10 @@ #~ msgstr "爨��爨萎�爨むΘ (爨��爨萎�爨� 5223) SSL 爨��爨萎�爭�爨� 爨��爨о�爨� 爨�爨萎� 爨項Μ爭�" # tithi +#~ msgid "Set your friendly name." +#~ msgstr "爨�爨�Θ爨鉦Π 爨�Θ爭�爨о�爨伍�爨迦Ν 爨��爨� 爨��爨萎�爨о�爨萎Γ爛�" + +# tithi # # # Translated by sadia
--- a/po/cs.po Sun Nov 21 20:30:12 2010 +0000 +++ b/po/cs.po Sun Dec 05 02:43:54 2010 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: pidgin VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 00:11-0400\n" -"PO-Revision-Date: 2010-10-15 17:26+0100\n" +"POT-Creation-Date: 2010-11-21 13:55-0500\n" +"PO-Revision-Date: 2010-11-21 11:47+0100\n" "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n" "Language-Team: Czech <cs@li.org>\n" "Language: cs\n" @@ -251,7 +251,7 @@ msgstr "Chyba p�i p�id叩v叩n鱈 skupiny" msgid "You must give a name for the group to add." -msgstr "Mus鱈te zadat n叩zev skupiny, kterou p�idat." +msgstr "Mus鱈te zadat n叩zev skupiny, kterou chcete p�idat." msgid "Add Group" msgstr "P�idat skupinu" @@ -639,7 +639,7 @@ msgstr "Povolit zvuky" msgid "You are not connected." -msgstr "Nejsi p�ipojen." +msgstr "Nejste p�ipojen." msgid "<AUTO-REPLY> " msgstr "<AUTO-ODPOV��> " @@ -904,7 +904,7 @@ msgstr "%s se pokou邸鱈 spustit multimedi叩ln鱈 sezen鱈 s nepodporovan箪m typem." msgid "You have rejected the call." -msgstr "Odm鱈tnul jste vol叩n鱈." +msgstr "Odm鱈tli jste vol叩n鱈." msgid "call: Make an audio call." msgstr "call: Vytvo�it audio hovor." @@ -1254,7 +1254,7 @@ msgstr "Osoba opust鱈 chat" msgid "You talk in chat" -msgstr "Vy mluv鱈te v chatu" +msgstr "Mluv鱈te v chatu" msgid "Others talk in chat" msgstr "Jin鱈 mluv鱈 v chatu" @@ -1694,7 +1694,7 @@ msgid "" "You have no database of root certificates, so this certificate cannot be " "validated." -msgstr "Nem叩te datab叩zi certifik叩t哲, tak転e certifik叩ty nemohou ov��eny." +msgstr "Nem叩te datab叩zi certifik叩t哲, tak転e certifik叩ty nemohou b箪t ov��eny." msgid "The certificate chain presented is invalid." msgstr "Certifika�n鱈 �et�z je neplatn箪." @@ -4805,15 +4805,6 @@ msgid "Unknown Error in presence" msgstr "Nezn叩m叩 chyba v p�鱈tomnosti" -msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "Chyba p�i in-band bytestream p�enosu\n" - -msgid "Transfer was closed." -msgstr "P�enos byl ukon�en." - -msgid "Failed to open in-band bytestream" -msgstr "Selhalo otev�en鱈 in-band bytestreamu" - #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "Nemohu odeslat soubor %s, u転ivatel nepodporuje p�enosy soubor哲" @@ -5127,26 +5118,6 @@ msgid "The username specified does not exist." msgstr "Zadan辿 jm辿no u転ivatele neexistuje." -#, c-format -msgid "Buddy list synchronization issue in %s (%s)" -msgstr "Probl辿m se synchronizac鱈 seznamu kamar叩d哲 v %s (%s)" - -#, c-format -msgid "" -"%s on the local list is inside the group \"%s\" but not on the server list. " -"Do you want this buddy to be added?" -msgstr "" -"%s na m鱈stn鱈m seznamu je ve skupin� \"%s\", ale ne v seznamu na serveru. " -"Chcete p�idat tohoto kamar叩da?" - -#, c-format -msgid "" -"%s is on the local list but not on the server list. Do you want this buddy " -"to be added?" -msgstr "" -"%s je na m鱈stn鱈m seznamu, ale ne v seznamu na serveru. Chcete p�idat tohoto " -"kamar叩da?" - msgid "Unable to parse message" msgstr "Nemohu zpracovat zpr叩vu" @@ -5317,6 +5288,26 @@ msgid "MSN Error: %s\n" msgstr "Chyba MSN: %s\n" +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "Probl辿m se synchronizac鱈 seznamu kamar叩d哲 v %s (%s)" + +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"%s na m鱈stn鱈m seznamu je ve skupin� \"%s\", ale ne v seznamu na serveru. " +"Chcete p�idat tohoto kamar叩da?" + +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"%s je na m鱈stn鱈m seznamu, ale ne v seznamu na serveru. Chcete p�idat tohoto " +"kamar叩da?" + msgid "Other Contacts" msgstr "Jin辿 kontakty" @@ -5341,7 +5332,7 @@ #, c-format msgid "%s sent you a voice chat invite, which is not yet supported." -msgstr "%s v叩m poslal pozv叩nku k hlasov辿mu chatu, kter箪 nen鱈 podporov叩no." +msgstr "%s v叩m poslal pozv叩nku k hlasov辿mu chatu, kter箪 nen鱈 podporov叩n." msgid "Nudge" msgstr "�泥ouchnut鱈" @@ -5364,12 +5355,24 @@ msgid "Set friendly name for %s." msgstr "Nastavit p�叩telsk辿 jm辿no pro %s." -msgid "Set your friendly name." -msgstr "Nastavit va邸e p�叩telsk辿 jm辿no" +msgid "Set Friendly Name" +msgstr "Nastavit p�叩telsk辿 jm辿no" msgid "This is the name that other MSN buddies will see you as." msgstr "Toto je jm辿no, pod kter箪m v叩s budou vid�t ostatn鱈 kamar叩di MSN." +msgid "This Location" +msgstr "Toto um鱈st�n鱈" + +msgid "This is the name that identifies this location" +msgstr "Toto je jm辿no, kter辿 identifikuje toto um鱈st�n鱈" + +msgid "Other Locations" +msgstr "Dal邸鱈 um鱈st�n鱈" + +msgid "You can sign out from other locations here" +msgstr "M哲転ete se p�ihl叩sit z jin辿ho um鱈st�n鱈" + msgid "Set your home phone number." msgstr "Nastavte sv辿 dom叩c鱈 telefonn鱈 �鱈slo." @@ -5455,6 +5458,9 @@ msgid "Set Friendly Name..." msgstr "Nastavit p�叩telsk辿 jm辿no..." +msgid "View Locations..." +msgstr "Zobrazit um鱈st�n鱈..." + msgid "Set Home Phone Number..." msgstr "Nastavit dom叩c鱈 telefonn鱈 �鱈slo..." @@ -5890,7 +5896,7 @@ msgstr "PINy nesouhlas鱈." msgid "The Display Name you entered is invalid." -msgstr "Zadan箪 jm辿no pro zobrazen鱈 nen鱈 platn辿" +msgstr "Zadan辿 jm辿no pro zobrazen鱈 nen鱈 platn辿" msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -5909,7 +5915,7 @@ msgstr "Informace z profilu nebyly z鱈sk叩ny, zkuste to pros鱈m pozd�ji." msgid "Your UID" -msgstr "Tvoje UID" +msgstr "Va邸e UID" #. pin #. pin (required) @@ -6059,7 +6065,7 @@ msgstr "Skryt辿 �鱈slo" msgid "Your MXit ID..." -msgstr "Tvoje MXit ID..." +msgstr "Va邸e MXit ID..." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -6840,6 +6846,13 @@ "P�ipojovali a odpojovali jste se p�鱈li邸 �asto. Po�kejte deset minut a zkuste " "to znovu. Pokud to budete d叩le zkou邸e, budete muset �ekat je邸t� d辿le." +msgid "" +"You required encryption in your account settings, but one of the servers " +"doesn't support it." +msgstr "" +"Vy転adujete 邸ifrov叩n鱈 v nastaven鱈 炭�t哲, ale jeden ze server哲 邸ifrov叩n鱈 " +"nepodporuje." + #. Note to translators: The first %s is a URL, the second is an #. error message. #, c-format @@ -7149,6 +7162,12 @@ "u転ivatele mus鱈 b箪t platn叩 emailov叩 adresa nebo za�鱈nat p鱈smenem a obsahovat " "jen �鱈slice, p鱈smena a mezery, nebo obsahovat jen �鱈slice." +msgid "" +"You required encryption in your account settings, but encryption is not " +"supported by your system." +msgstr "" +"Vy転adujete 邸ifrov叩n鱈 v nastaven鱈 炭�t哲, ale v叩邸 syst辿m 邸ifrov叩n鱈 nepodporuje." + #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "" @@ -7276,7 +7295,7 @@ msgstr "U転ivatel ICQ %u v叩m poslal kamar叩da: %s (%s)" msgid "Do you want to add this buddy to your buddy list?" -msgstr "Chcete p�idat tohoto kamar叩da do sv辿ho seznamu kamar叩d哲?" +msgstr "Chcete p�idat tohoto kamar叩da do va邸eho seznamu kamar叩d哲?" msgid "_Add" msgstr "_P�idat" @@ -7671,13 +7690,11 @@ msgid "Set Privacy Options..." msgstr "Nastavit mo転nosti soukrom鱈..." -#, fuzzy msgid "Show Visible List" -msgstr "Zobrazit seznam _kamar叩d哲" - -#, fuzzy +msgstr "Zobrazit seznam viditeln箪ch kamar叩d哲" + msgid "Show Invisible List" -msgstr "Seznam pozvan箪ch" +msgstr "Zobrazit seznam neviditeln箪ch kamar叩d哲" #. AIM actions msgid "Confirm Account" @@ -7695,6 +7712,9 @@ msgid "Search for Buddy by Email Address..." msgstr "Hledat kamar叩da podle emailov辿 adresy..." +msgid "Don't use encryption" +msgstr "Nepou転鱈vat 邸ifrov叩n鱈" + msgid "Use clientLogin" msgstr "Pou転鱈t clientLogin" @@ -7893,7 +7913,7 @@ msgstr "Osobn鱈 WWW str叩nka" #. aim_userinfo_t -#. strip_html_tags +#. use_html_status msgid "Additional Information" msgstr "P�鱈davn辿 informace" @@ -7921,46 +7941,51 @@ msgid "Capabilities" msgstr "Schopnosti" -#. 4 separate strings are needed in order to ease translators' job +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear online to the chosen user even when your status is set to +#. Invisible. msgid "Appear Online" msgstr "Vypadat p�ipojen" -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user when your status is set to +#. Invisible (this is the default). msgid "Don't Appear Online" -msgstr "Vypadat p�ipojen" - +msgstr "Nevypadat p�ipojen" + +#. Translators: This string is a menu option that, if selected, will cause +#. you to always appear offline to the chosen user (even when your status +#. isn't Invisible). msgid "Appear Offline" msgstr "Vypadat odpojen" -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user if you are invisible, and +#. appear online to the chosen user if you are not invisible (this is the +#. default). msgid "Don't Appear Offline" -msgstr "Vypadat odpojen" - -#, fuzzy +msgstr "Nevypadat odpojen" + msgid "you have no buddies on this list" -msgstr "Byl jste vykopnut z MultiMX." - -#, fuzzy, c-format +msgstr "nem叩te kamar叩dy v tomto seznamu" + +#, c-format msgid "" "You can add a buddy to this list by right-clicking on them and selecting \"%s" "\"" -msgstr "" -"M哲転ete znovu po転叩dat o autorizaci od t�chto kamar叩d哲 kliknut鱈m na n� prav箪m " -"tla�鱈tkem a zvolen鱈m \"Znovu po転叩dat o autorizaci.\"" - -#, fuzzy +msgstr "M哲転ete p�idat kamar叩da prav箪m kliknut鱈m a vybr叩n鱈m \"%s\"" + msgid "Visible List" -msgstr "Viditeln箪" +msgstr "Seznam viditeln箪ch" msgid "These buddies will see your status when you switch to \"Invisible\"" -msgstr "" - -#, fuzzy +msgstr "Tyto kamar叩di uvid鱈 v叩邸 stav p�i p�epnut鱈 na \"Neviditeln箪\"" + msgid "Invisible List" -msgstr "Seznam pozvan箪ch" +msgstr "Seznam neviditeln箪ch" msgid "These buddies will always see you as offline" -msgstr "" +msgstr "Tyto kamar叩di v叩s v転dy uvid鱈 jako odpojen辿ho" msgid "Aquarius" msgstr "Vodn叩�" @@ -8123,7 +8148,7 @@ msgstr "Pozn叩mka kamar叩da" msgid "Change his/her memo as you like" -msgstr "Zm��te jeho/jej鱈 pozn叩mku podle sebe" +msgstr "Zm��te jeho/jej鱈 pozn叩mku podle v叩s" msgid "_Modify" msgstr "_Zm�nit" @@ -8227,7 +8252,7 @@ msgstr "Zadejte pros鱈m Qun �鱈slo" msgid "You can only search for permanent Qun\n" -msgstr "You can only search for permanent Qun\n" +msgstr "M哲転ete vyhled叩vat jen permanentn鱈 Qun\n" msgid "(Invalid UTF-8 string)" msgstr "(Neplatn箪 UTF-8 �et�zec)" @@ -9415,7 +9440,7 @@ #, c-format msgid "You have been killed by %s (%s)" -msgstr "Byli jste zabiti v %s: (%s)" +msgstr "Byli jste zabiti %s (%s)" #, c-format msgid "Killed by %s (%s)" @@ -10179,7 +10204,7 @@ #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." -msgstr "%s v叩m poslal pozv叩nku k WWW kame�e, co転 je邸t� nen鱈 podporov叩no." +msgstr "%s v叩m poslal pozv叩nku k webov辿 kame�e, co転 je邸t� nen鱈 podporov叩no." msgid "Your SMS was not delivered" msgstr "Va邸e SMS nebyla doru�ena" @@ -10268,7 +10293,7 @@ "Your account has been locked due to too many failed login attempts. Please " "try logging into the Yahoo! website." msgstr "" -"��et uzam�en pro p�鱈li邸 mnoho pokus哲 o p�ihl叩邸en鱈. P�ihl叩邸te se na str叩nku " +"��et uzam�en pro p�鱈li邸 mnoho pokus哲 o p�ihl叩邸en鱈. P�ihlaste se na str叩nku " "Yahoo!." #, c-format @@ -10393,7 +10418,7 @@ #, c-format msgid "%s is trying to send you a group of %d files.\n" -msgstr "%s zkou邸鱈 v叩m poslat %d soubor哲.\n" +msgstr "%s v叩m zkou邸鱈 poslat %d soubor哲.\n" msgid "Write Error" msgstr "Chyba p�i z叩pisu" @@ -10462,7 +10487,7 @@ msgstr "" "Nemohu z鱈skat profil u転ivatele. To pravd�podobn� znamen叩, 転e u転ivatel " "neexistuje; n�kdy ale Yahoo! opravdu nem哲転e naj鱈t profil u転ivatele. Pokud " -"v鱈ce, 転e u転ivatel existuje, zkuste to pros鱈m znovu pozd�ji." +"v鱈te, 転e u転ivatel existuje, zkuste to pros鱈m znovu pozd�ji." msgid "The user's profile is empty." msgstr "Profil u転ivatele je pr叩zdn箪." @@ -11057,7 +11082,7 @@ #, c-format msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s" -msgstr "%s%s%s%s chce t� (%s) p�idat do sv辿ho seznamu kamar叩d哲%s%s" +msgstr "%s%s%s%s chce v叩s (%s) p�idat do sv辿ho seznamu kamar叩d哲%s%s" #. Buddy List msgid "Background Color" @@ -11170,7 +11195,7 @@ msgid "" "The text information for when a chat has an unread message that mentions " "your nickname" -msgstr "Text informace, kdy転 je v chatu zpr叩va s tvoj鱈 p�ezd鱈vkou" +msgstr "Text informace, kdy転 je v chatu zpr叩va s va邸鱈 p�ezd鱈vkou" msgid "The text information for a buddy's status" msgstr "Text informace pro stav kamar叩da" @@ -12220,6 +12245,9 @@ msgid "Lao" msgstr "Laon邸tina" +msgid "Maithili" +msgstr "Maithili" + msgid "Macedonian" msgstr "Makedon邸tina" @@ -12884,16 +12912,14 @@ "Are you sure you want to permanently delete the log of the conversation with " "%s which started at %s?" msgstr "" -"Opravdu 転e chcete natrvalo odstranit z叩znam konverzace s %s, kter箪 za�al v " -"%s?" +"Opravdu chcete natrvalo odstranit z叩znam konverzace s %s, kter箪 za�al v %s?" #, c-format msgid "" "Are you sure you want to permanently delete the log of the conversation in " "%s which started at %s?" msgstr "" -"Opravdu 転e chcete natrvalo odstranit z叩znam konverzace v %s, kter箪 za�al v " -"%s?" +"Opravdu chcete natrvalo odstranit z叩znam konverzace v %s, kter箪 za�al v %s?" #, c-format msgid "" @@ -13010,11 +13036,11 @@ #, c-format msgid "%s wishes to start an audio/video session with you." -msgstr "%s chce za�鱈t audio/video rozhovor s tebou." +msgstr "%s chce za�鱈t audio/video rozhovor s v叩mi." #, c-format msgid "%s wishes to start a video session with you." -msgstr "%s chce za�鱈t video rozhovor s tebou." +msgstr "%s chce za�鱈t video rozhovor s v叩mi." msgid "Incoming Call" msgstr "P�鱈choz鱈 hovor" @@ -13756,7 +13782,7 @@ msgstr "_P�idat chat" msgid "Are you sure you want to delete the selected saved statuses?" -msgstr "Opravdu 転e chcete odstranit zvolen辿 ulo転en辿 stavy?" +msgstr "Opravdu chcete odstranit zvolen辿 ulo転en辿 stavy?" #. Use button msgid "_Use" @@ -15299,6 +15325,18 @@ msgid "You do not have permission to uninstall this application." msgstr "Nem叩te opr叩vn�n鱈 k odinstalaci t辿to aplikace." +#~ msgid "An error occurred on the in-band bytestream transfer\n" +#~ msgstr "Chyba p�i in-band bytestream p�enosu\n" + +#~ msgid "Transfer was closed." +#~ msgstr "P�enos byl ukon�en." + +#~ msgid "Failed to open in-band bytestream" +#~ msgstr "Selhalo otev�en鱈 in-band bytestreamu" + +#~ msgid "Set your friendly name." +#~ msgstr "Nastavit va邸e p�叩telsk辿 jm辿no" + #~ 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箪." @@ -15759,9 +15797,6 @@ #~ msgid "In-Band Registration" #~ msgstr "In-Band registrace" -#~ msgid "User Location" -#~ msgstr "Um鱈st�n鱈 u転ivatele" - #~ msgid "User Avatar" #~ msgstr "Avatar u転ivatele"
--- a/po/es.po Sun Nov 21 20:30:12 2010 +0000 +++ b/po/es.po Sun Dec 05 02:43:54 2010 +0000 @@ -53,8 +53,8 @@ msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 00:11-0400\n" -"PO-Revision-Date: 2010-08-02 23:10+0200\n" +"POT-Creation-Date: 2010-11-21 13:55-0500\n" +"PO-Revision-Date: 2010-11-17 03:10+0100\n" "Last-Translator: Javier Fern叩ndez-Sanguino <jfs@debian.org>\n" "Language-Team: Spanish team <es@li.org>\n" "Language: \n" @@ -1808,13 +1808,12 @@ "El certificado no es v叩lido a炭n. Compruebe que la fecha y hora de su " "ordenador son correctas." -#, fuzzy msgid "" "The certificate has expired and should not be considered valid. Check that " "your computer's date and time are accurate." msgstr "" -"El certificado no es v叩lido a炭n. Compruebe que la fecha y hora de su " -"ordenador son correctas." +"El certificado ha expirado y no se considera ya v叩lido. Compruebe que la " +"fecha y hora de su ordenador son correctas." #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com) msgid "The certificate presented is not issued to this domain." @@ -4870,20 +4869,17 @@ msgid "Domain" msgstr "Dominio" -#, fuzzy msgid "Require encryption" -msgstr "Solicitar autorizaci坦n" - -#, fuzzy +msgstr "Solicitar cifrado" + msgid "Use encryption if available" -msgstr "Informaci坦n de usuario de no disponible: %s" +msgstr "Utilizar cifrado si es posible" msgid "Use old-style SSL" -msgstr "" - -#, fuzzy +msgstr "Utilizar SSL antiguo" + msgid "Connection security" -msgstr "Expir坦 la conexi坦n" +msgstr "Seguridad de la conexi坦n" msgid "Allow plaintext auth over unencrypted streams" msgstr "Permitir autenticaci坦n en claro sobre canales no cifrados" @@ -4989,15 +4985,6 @@ msgid "Unknown Error in presence" msgstr "Error desconocido en presencia" -msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "Se produjo un error en la transferencia de flujos de bytes en banda\n" - -msgid "Transfer was closed." -msgstr "Se cerr坦 la transferencia." - -msgid "Failed to open in-band bytestream" -msgstr "Fallo al abrir un flujo de bytes en banda" - #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "" @@ -5317,26 +5304,6 @@ msgid "The username specified does not exist." msgstr "El nombre de usuario especificado no existe." -#, c-format -msgid "Buddy list synchronization issue in %s (%s)" -msgstr "Problema de sincronizaci坦n de la lista de amigos en %s (%s)" - -#, c-format -msgid "" -"%s on the local list is inside the group \"%s\" but not on the server list. " -"Do you want this buddy to be added?" -msgstr "" -"%s est叩 en la lista local dentro del grupo 束%s損 pero no est叩 en la lista del " -"servidor. 多Desea a単adir a este amigo?" - -#, c-format -msgid "" -"%s is on the local list but not on the server list. Do you want this buddy " -"to be added?" -msgstr "" -"%s est叩 en la lista local pero no est叩 en la lista del servidor. 多Desea " -"a単adir a este amigo?" - msgid "Unable to parse message" msgstr "No se pudo interpretar el mensaje" @@ -5511,6 +5478,26 @@ msgid "MSN Error: %s\n" msgstr "Error MSN: %s\n" +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "Problema de sincronizaci坦n de la lista de amigos en %s (%s)" + +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"%s est叩 en la lista local dentro del grupo 束%s損 pero no est叩 en la lista del " +"servidor. 多Desea a単adir a este amigo?" + +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"%s est叩 en la lista local pero no est叩 en la lista del servidor. 多Desea " +"a単adir a este amigo?" + msgid "Other Contacts" msgstr "Otros contactos" @@ -5564,12 +5551,24 @@ msgid "Set friendly name for %s." msgstr "Establecer nombre de amigo para %s." -msgid "Set your friendly name." -msgstr "Establecer su nombre de amigo." +msgid "Set Friendly Name" +msgstr "Establecer nombre de amigo" msgid "This is the name that other MSN buddies will see you as." msgstr "�ste es el nombre bajo el que otros amigos MSN le ver叩n." +msgid "This Location" +msgstr "Esta ubicaci坦n" + +msgid "This is the name that identifies this location" +msgstr "�ste es el nombre que identifica a esta ubicaci坦n" + +msgid "Other Locations" +msgstr "Otras ubicaciones" + +msgid "You can sign out from other locations here" +msgstr "Puede desconectarse de otras ubicaciones aqu鱈" + msgid "Set your home phone number." msgstr "Establezca el n炭mero de tel辿fono de su domicilio." @@ -5657,6 +5656,9 @@ msgid "Set Friendly Name..." msgstr "Establecer su nombre de amigo..." +msgid "View Locations..." +msgstr "Ver ubicaciones..." + msgid "Set Home Phone Number..." msgstr "Establecer el n炭mero de tel辿fono de su domicilio..." @@ -7073,6 +7075,13 @@ "int辿ntelo de nuevo. Si sigue intent叩ndolo, necesitar叩 esperar incluso m叩s " "tiempo." +msgid "" +"You required encryption in your account settings, but one of the servers " +"doesn't support it." +msgstr "" +"En su configuraci坦n de cuenta indic坦 que era necesario utilizar cifrado, " +"pero ninguno de los servidores lo soporta." + #. Note to translators: The first %s is a URL, the second is an #. error message. #, c-format @@ -7387,6 +7396,13 @@ "una letra y s坦lo pueden contener letras, n炭meros y espacios, o contener s坦lo " "n炭meros." +msgid "" +"You required encryption in your account settings, but encryption is not " +"supported by your system." +msgstr "" +"Solicit坦 cifrado en su configuraci坦n de cuenta, pero su sistema no soporta " +"el uso de cifrado." + #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "" @@ -7862,9 +7878,8 @@ msgid "Change Address To:" msgstr "Cambiar direcci坦n a:" -#, fuzzy msgid "you are not waiting for authorization" -msgstr "<i>usted no est叩 esperando autorizaci坦n</i>" +msgstr "usted no est叩 esperando autorizaci坦n" msgid "You are awaiting authorization from the following buddies" msgstr "En espera de la autorizaci坦n de los siguientes amigos" @@ -7903,13 +7918,11 @@ msgid "Set Privacy Options..." msgstr "Configurar las opciones de privacidad..." -#, fuzzy msgid "Show Visible List" -msgstr "Mostrar la _lista de amigos" - -#, fuzzy +msgstr "Mostrar lista visible" + msgid "Show Invisible List" -msgstr "Lista de invitados" +msgstr "Mostrar lista invisible" #. AIM actions msgid "Confirm Account" @@ -7927,6 +7940,9 @@ msgid "Search for Buddy by Email Address..." msgstr "Buscar un amigo por correo electr坦nico..." +msgid "Don't use encryption" +msgstr "No utilizar cifrado" + msgid "Use clientLogin" msgstr "Utilizar 束clientLogin損" @@ -8126,7 +8142,7 @@ msgstr "P叩gina web personal" #. aim_userinfo_t -#. strip_html_tags +#. use_html_status msgid "Additional Information" msgstr "Informaci坦n adicional" @@ -8154,46 +8170,53 @@ msgid "Capabilities" msgstr "Capacidades" -#. 4 separate strings are needed in order to ease translators' job +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear online to the chosen user even when your status is set to +#. Invisible. msgid "Appear Online" msgstr "Parecer conectado" -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user when your status is set to +#. Invisible (this is the default). msgid "Don't Appear Online" -msgstr "Parecer conectado" - +msgstr "No aparecer conectado" + +#. Translators: This string is a menu option that, if selected, will cause +#. you to always appear offline to the chosen user (even when your status +#. isn't Invisible). msgid "Appear Offline" msgstr "Parecer desconectado" -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user if you are invisible, and +#. appear online to the chosen user if you are not invisible (this is the +#. default). msgid "Don't Appear Offline" -msgstr "Parecer desconectado" - -#, fuzzy +msgstr "No aparecer desconectado" + msgid "you have no buddies on this list" -msgstr "Ha sido expulsado de este MultiMX." - -#, fuzzy, c-format +msgstr "no tiene amigos en esta lista" + +#, c-format msgid "" "You can add a buddy to this list by right-clicking on them and selecting \"%s" "\"" msgstr "" -"Puede volver a pedir autorizaci坦n a estos amigos apretando el bot坦n derecho " -"del rat坦n sobre ellos y escogiendo 束Solicitar autorizaci坦n otra vez.損" - -#, fuzzy +"Puede a単adir a un amigo a esta lista pulsando con el bot坦n derecho del rat坦n " +"sobre 辿l y escogiendo 束%s損" + msgid "Visible List" -msgstr "Visible" +msgstr "Lista visible" msgid "These buddies will see your status when you switch to \"Invisible\"" -msgstr "" - -#, fuzzy +msgstr "Estos amigos ver叩n su estado cuando pase a estado 束Invisible損" + msgid "Invisible List" -msgstr "Lista de invitados" +msgstr "Lista invisible" msgid "These buddies will always see you as offline" -msgstr "" +msgstr "Estos amigos siempre le ver叩n como desconectado" msgid "Aquarius" msgstr "Acuario" @@ -8373,9 +8396,9 @@ msgid "Your request was rejected." msgstr "Su solicitud fu辿 rechazada." -#, fuzzy, c-format +#, c-format msgid "%u requires verification: %s" -msgstr "%u solicita verificaci坦n" +msgstr "%u solicita verificaci坦n: %s" msgid "Add buddy question" msgstr "A単adir una pregunta para el amigo" @@ -11320,9 +11343,9 @@ "Puede volver a esta ventana para a単adir, editar o eliminar cuentas desde la " "ventana de lista de amigos seleccionando <b>Cuentas->Gestionar Cuentas</b>" -#, fuzzy, c-format +#, c-format msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s" -msgstr "%s%s%s%s quiere a単adir a %s a su lista de amigos%s%s." +msgstr "%s%s%s%s quiere a単adirle (%s) a su lista de amigos%s%s." #. Buddy List msgid "Background Color" @@ -12486,6 +12509,9 @@ msgid "Lao" msgstr "Laosiano" +msgid "Maithili" +msgstr "Maithili" + msgid "Macedonian" msgstr "Macedonio" @@ -13708,9 +13734,8 @@ msgid "_TURN server:" msgstr "Servidor _TURN:" -#, fuzzy msgid "_UDP Port:" -msgstr "_Puerto:" +msgstr "Puerto _UDP:" msgid "Use_rname:" msgstr "Nombre de usua_rio:" @@ -13734,7 +13759,7 @@ msgstr "Konqueror" msgid "Google Chrome" -msgstr "" +msgstr "Google Chrome" #. Do not move the line below. Code below expects gnome-open to be in #. * this list immediately after xdg-open! @@ -13758,11 +13783,11 @@ #. Translators: please do not translate "chromium-browser" here! msgid "Chromium (chromium-browser)" -msgstr "" +msgstr "Chromium (chromium-browser)" #. Translators: please do not translate "chrome" here! msgid "Chromium (chrome)" -msgstr "" +msgstr "Chromium (chrome)" msgid "Manual" msgstr "Manual" @@ -14304,7 +14329,6 @@ msgid "Small" msgstr "Peque単a" -#, fuzzy msgid "Smaller versions of the default smileys" msgstr "Versiones m叩s peque単as de los emoticonos por omisi坦n" @@ -15354,9 +15378,8 @@ msgid "Voice/Video Settings" msgstr "Configuraci坦n de voz/v鱈deo" -#, fuzzy msgid "Voice and Video Settings" -msgstr "Configuraci坦n de voz/v鱈deo" +msgstr "Configuraci坦n de voz y v鱈deo" #. *< name #. *< version @@ -15635,6 +15658,19 @@ msgid "You do not have permission to uninstall this application." msgstr "No tiene permisos para desinstalar esta aplicaci坦n." +#~ msgid "An error occurred on the in-band bytestream transfer\n" +#~ msgstr "" +#~ "Se produjo un error en la transferencia de flujos de bytes en banda\n" + +#~ msgid "Transfer was closed." +#~ msgstr "Se cerr坦 la transferencia." + +#~ msgid "Failed to open in-band bytestream" +#~ msgstr "Fallo al abrir un flujo de bytes en banda" + +#~ msgid "Set your friendly name." +#~ msgstr "Establecer su nombre de amigo." + #~ msgid "The certificate has expired and should not be considered valid." #~ msgstr "El certificado ha expirado y no ser鱈a considerado v叩lido."
--- a/po/hu.po Sun Nov 21 20:30:12 2010 +0000 +++ b/po/hu.po Sun Dec 05 02:43:54 2010 +0000 @@ -9,14 +9,14 @@ msgstr "" "Project-Id-Version: pidgin 2.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 00:12-0400\n" -"PO-Revision-Date: 2010-10-10 12:33+0200\n" +"POT-Creation-Date: 2010-11-21 03:11+0100\n" +"PO-Revision-Date: 2010-11-21 03:10+0100\n" "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n" "Language-Team: Hungarian <gnome at fsf dot hu>\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" "X-Generator: KBabel 1.11.4\n" @@ -4854,15 +4854,6 @@ msgid "Unknown Error in presence" msgstr "Ismeretlen hiba a jelenl辿tben" -msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "Hiba t旦rt辿nt a bej旦v� adatfolyam 叩tvitel辿ben\n" - -msgid "Transfer was closed." -msgstr "Az 叩tvitel lez叩rva." - -msgid "Failed to open in-band bytestream" -msgstr "A bej旦v� adatfolyam megnyit叩sa meghi炭sult" - #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "" @@ -5182,26 +5173,6 @@ msgid "The username specified does not exist." msgstr "A megadott felhaszn叩l坦n辿v nem l辿tezik." -#, c-format -msgid "Buddy list synchronization issue in %s (%s)" -msgstr "Partnerlista-szinkroniz叩ci坦s probl辿ma itt: %s (%s)" - -#, c-format -msgid "" -"%s on the local list is inside the group \"%s\" but not on the server list. " -"Do you want this buddy to be added?" -msgstr "" -"%s a helyi list叩n a(z) %s csoport tagja, de a kiszolg叩l坦 list叩j叩n nem az. " -"Szeretn辿 ezt a partnert felvenni?" - -#, c-format -msgid "" -"%s is on the local list but not on the server list. Do you want this buddy " -"to be added?" -msgstr "" -"%s rajta van a helyi list叩n, de a kiszolg叩l坦 list叩j叩n nincs. Szeretn辿 ezt a " -"partnert felvenni?" - msgid "Unable to parse message" msgstr "Az 端zenetet nem siker端lt 辿rtelmezni" @@ -5372,6 +5343,26 @@ msgid "MSN Error: %s\n" msgstr "MSN hiba: %s\n" +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "Partnerlista-szinkroniz叩ci坦s probl辿ma itt: %s (%s)" + +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"%s a helyi list叩n a(z) %s csoport tagja, de a kiszolg叩l坦 list叩j叩n nem az. " +"Szeretn辿 ezt a partnert felvenni?" + +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"%s rajta van a helyi list叩n, de a kiszolg叩l坦 list叩j叩n nincs. Szeretn辿 ezt a " +"partnert felvenni?" + msgid "Other Contacts" msgstr "Egy辿b partnerek" @@ -5423,12 +5414,24 @@ msgid "Set friendly name for %s." msgstr "Becen辿v be叩ll鱈t叩sa %s sz叩m叩ra." -msgid "Set your friendly name." -msgstr "Becen辿v be叩ll鱈t叩sa." +msgid "Set Friendly Name" +msgstr "Becen辿v be叩ll鱈t叩sa" msgid "This is the name that other MSN buddies will see you as." msgstr "Ezen a n辿ven fogj叩k l叩tni az MSN partnerei." +msgid "This Location" +msgstr "Ez a hely" + +msgid "This is the name that identifies this location" +msgstr "A helyet azonos鱈t坦 n辿v" + +msgid "Other Locations" +msgstr "Egy辿b helyek" + +msgid "You can sign out from other locations here" +msgstr "Itt kijelentkezhet m叩s helyekr�l" + msgid "Set your home phone number." msgstr "Otthoni telefonsz叩m be叩ll鱈t叩sa." @@ -5517,6 +5520,9 @@ msgid "Set Friendly Name..." msgstr "Becen辿v be叩ll鱈t叩sa��" +msgid "View Locations..." +msgstr "Helyek megjelen鱈t辿se��" + msgid "Set Home Phone Number..." msgstr "Otthoni telefonsz叩m be叩ll鱈t叩sa��" @@ -5847,8 +5853,8 @@ msgid "The MSN servers are temporarily unavailable. Please wait and try again." msgstr "" -"Az MSN kiszolg叩l坦k 叩tmenetileg nem 辿rhet�k el. K辿rem v叩rjon 辿s pr坦b叩lja 炭jra " -"k辿s�bb." +"Az MSN kiszolg叩l坦k 叩tmenetileg nem 辿rhet�k el. K辿rem v叩rjon, 辿s pr坦b叩lja " +"炭jra k辿s�bb." msgid "The MSN servers are going down temporarily" msgstr "Az MSN kiszolg叩l坦k 叩tmenetileg le叩llnak" @@ -5860,8 +5866,8 @@ msgid "" "Your MSN buddy list is temporarily unavailable. Please wait and try again." msgstr "" -"Az �n MSN partnerlist叩ja 叩tmenetileg nem 辿rhet� el. K辿rem v叩rjon 辿s pr坦b叩lja " -"炭jra k辿s�bb." +"Az �n MSN partnerlist叩ja 叩tmenetileg nem 辿rhet� el. K辿rem v叩rjon, 辿s " +"pr坦b叩lja 炭jra k辿s�bb." msgid "Handshaking" msgstr "K辿zfog叩s" @@ -6728,8 +6734,8 @@ #, c-format msgid "Unable to send message. Could not get details for user (%s)." msgstr "" -"Az 端zenetet nem lehet elk端ldeni. A felhaszn叩l坦 r辿szletei nem k辿rhet�ek le " -"(%s)." +"Az 端zenetet nem lehet elk端ldeni. A felhaszn叩l坦 r辿szletei nem k辿rhet�ek le (%" +"s)." #, c-format msgid "Unable to add %s to your buddy list (%s)." @@ -6889,14 +6895,13 @@ msgstr "Kiszolg叩l坦 portja" msgid "Please authorize me so I can add you to my buddy list." -msgstr "" +msgstr "Engedje meg, hogy felvegyem partnerlist叩mra." msgid "No reason given." msgstr "Nincs ok megadva." -#, fuzzy msgid "Authorization Denied Message:" -msgstr "Hozz叩f辿r辿s elutas鱈tva 端zenet:" +msgstr "Felhatalmaz叩s elutas鱈tva 端zenet:" #, c-format msgid "Received unexpected response from %s: %s" @@ -6913,6 +6918,13 @@ "�n t炭l gyakran jelentkezik ki/be. V叩rjon t鱈z percet 辿s pr坦b叩lja meg 炭jra. Ha " "tov叩bb folytatja, m辿g t旦bbet kell majd v叩rnia." +msgid "" +"You required encryption in your account settings, but one of the servers " +"doesn't support it." +msgstr "" +"Fi坦kbe叩ll鱈t叩saiban titkos鱈t叩st k旦vetelt meg, de az egyik kiszolg叩l坦 nem " +"t叩mogatja azt." + #. Note to translators: The first %s is a URL, the second is an #. error message. #, c-format @@ -6939,12 +6951,17 @@ "encoding he is using, you can specify it in the advanced account options for " "your AIM/ICQ account.)" msgstr "" +"(Hiba t旦rt辿nt ezen 端zenet fogad叩sakor. A partner val坦sz鱈n撤leg a v叩rtt坦l " +"elt辿r� k坦dol叩st haszn叩l. Ha tudja, milyen k坦dol叩st haszn叩l a partner, akkor " +"megadhatja az AIM/ICQ fi坦k speci叩lis be叩ll鱈t叩sai k旦zt.)" #, c-format msgid "" "(There was an error receiving this message. Either you and %s have " "different encodings selected, or %s has a buggy client.)" msgstr "" +"(Hiba t旦rt辿nt ezen 端zenet fogad叩sakor. �n vagy %s elt辿r� k坦dol叩st v叩lasztott " +"ki, vagy %s hib叩s klienst haszn叩l.)" msgid "Could not join chat room" msgstr "Nem siker端lt kapcsol坦dni a cseveg�szob叩hoz" @@ -7152,8 +7169,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 egy %s f叩jlt pr坦b叩lt k端ldeni, de k旦zvetlen kapcsolatban legfeljebb csak " -"%s m辿ret撤 f叩jl k端ldhet�. Pr坦b叩lkozzon ink叩bb a f叩jl叩tvitellel.\n" +"%s egy %s f叩jlt pr坦b叩lt k端ldeni, de k旦zvetlen kapcsolatban legfeljebb csak %" +"s m辿ret撤 f叩jl k端ldhet�. Pr坦b叩lkozzon ink叩bb a f叩jl叩tvitellel.\n" #, c-format msgid "File %s is %s, which is larger than the maximum size of %s." @@ -7218,6 +7235,12 @@ "kezd�dni端k 辿s bet撤ket, sz叩mokat, sz坦k旦z旦ket, vagy csak sz叩mokat " "tartalmazhatnak." +msgid "" +"You required encryption in your account settings, but encryption is not " +"supported by your system." +msgstr "" +"Fi坦kbe叩ll鱈t叩saiban titkos鱈t叩st k旦vetelt meg, de rendszere nem t叩mogatja azt." + #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "" @@ -7711,7 +7734,7 @@ "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" msgstr "" -"�jra k辿rheti enged辿lyez辿st ezekt�l a partnerekt�l a jobb eg辿rgombbal " +"�jra k辿rheti az enged辿lyez辿st ezekt�l a partnerekt�l a jobb eg辿rgombbal " "kattintva a nev端k旦n, 辿s az ��Enged辿lyez辿s 炭jra k辿r辿se�� v叩laszt叩s叩val" msgid "Find Buddy by Email" @@ -7740,13 +7763,11 @@ msgid "Set Privacy Options..." msgstr "Mag叩nszf辿ra-be叩ll鱈t叩sok��" -#, fuzzy msgid "Show Visible List" -msgstr "P_artnerlista megjelen鱈t辿se" - -#, fuzzy +msgstr "L叩that坦k list叩ja" + msgid "Show Invisible List" -msgstr "Megh鱈v叩si lista" +msgstr "L叩thatatlanok list叩ja" #. AIM actions msgid "Confirm Account" @@ -7764,6 +7785,9 @@ msgid "Search for Buddy by Email Address..." msgstr "Partner keres辿se e-mail c鱈m szerint��" +msgid "Don't use encryption" +msgstr "Ne haszn叩ljon titkos鱈t叩st" + msgid "Use clientLogin" msgstr "Kliensbejelentkez辿s haszn叩lata" @@ -7880,128 +7904,108 @@ msgid "Voice" msgstr "Hang" -#, fuzzy msgid "AIM Direct IM" -msgstr "K旦zvetlen IM" - -#, fuzzy +msgstr "AIM k旦zvetlen IM" + msgid "Get File" -msgstr "F叩jl k端ld辿se" - -#, fuzzy +msgstr "F叩jl k辿r辿se" + msgid "Games" -msgstr "Assz叩mi" +msgstr "J叩t辿kok" msgid "ICQ Xtraz" -msgstr "" +msgstr "ICQ Xtraz" msgid "Add-Ins" -msgstr "" - -#, fuzzy +msgstr "B�v鱈tm辿nyek" + msgid "Send Buddy List" -msgstr "Partnerlista" - -#, fuzzy +msgstr "Partnerlista k端ld辿se" + msgid "ICQ Direct Connect" -msgstr "K旦zvetlen kapcsolatok enged辿lyez辿se" - -#, fuzzy +msgstr "ICQ k旦zvetlen kapcsolat" + msgid "AP User" -msgstr "Felhaszn叩l坦 hiteles鱈t辿se" +msgstr "AP felhaszn叩l坦" msgid "ICQ RTF" -msgstr "" +msgstr "ICQ RTF" msgid "Nihilist" -msgstr "" - -#, fuzzy +msgstr "Nihilist" + msgid "ICQ Server Relay" -msgstr "A kiszolg叩l坦 v叩lasza:" +msgstr "ICQ kiszolg叩l坦tov叩bb鱈t叩s" msgid "Old ICQ UTF8" -msgstr "" +msgstr "R辿gi ICQ UTF8" msgid "Trillian Encryption" -msgstr "" +msgstr "Trillian titkos鱈t叩s" msgid "ICQ UTF8" -msgstr "" +msgstr "ICQ UTF8" msgid "Hiptop" -msgstr "" - -#, fuzzy +msgstr "Hiptop" + msgid "Security Enabled" -msgstr "Biztons叩gi k坦d" - -#, fuzzy +msgstr "Biztons叩g enged辿lyezve" + msgid "Video Chat" -msgstr "_Vide坦h鱈v叩s" - -#, fuzzy +msgstr "Videocseveg辿s" + msgid "iChat AV" -msgstr "Cseveg辿s" - -#, fuzzy +msgstr "iChat AV" + msgid "Live Video" -msgstr " Vide坦" - -#, fuzzy +msgstr "�l� vide坦" + msgid "Camera" -msgstr "Videokamera" +msgstr "Kamera" msgid "Screen Sharing" -msgstr "" +msgstr "K辿perny�megoszt叩s" msgid "IP Address" msgstr "IP c鱈m" -#, fuzzy msgid "Warning Level" -msgstr "Figyelmeztet辿s" - -#, fuzzy +msgstr "Figyelmeztet辿si szint" + msgid "Buddy Comment" -msgstr "Partnermegjegyz辿s:" - -#, fuzzy, c-format +msgstr "Partnermegjegyz辿s" + +#, c-format msgid "User information not available: %s" -msgstr "Titkos鱈t叩s haszn叩lata, ha el辿rhet�" +msgstr "A felhaszn叩l坦inform叩ci坦k nem 辿rhet�k el: %s" msgid "Mobile Phone" msgstr "Mobiltelefon" -#, fuzzy msgid "Personal Web Page" -msgstr "Szem辿lyes mobil" +msgstr "Szem辿lyes weboldal" #. aim_userinfo_t -#. strip_html_tags -#, fuzzy +#. use_html_status msgid "Additional Information" -msgstr "Opcion叩lis inform叩ci坦k:" +msgstr "Tov叩bbi inform叩ci坦k" msgid "Zip Code" -msgstr "" - -#, fuzzy +msgstr "Ir叩ny鱈t坦sz叩m" + msgid "Work Information" -msgstr "Tov叩bbi inform叩ci坦k" +msgstr "Munkahely-inform叩ci坦k" msgid "Division" -msgstr "" - -#, fuzzy +msgstr "R辿szleg" + msgid "Position" -msgstr "Le鱈r叩s" - -#, fuzzy +msgstr "Poz鱈ci坦" + msgid "Web Page" -msgstr "Honlap" - -#, fuzzy +msgstr "Weboldal" + msgid "Online Since" msgstr "Kapcsol坦dva ez坦ta" @@ -8009,48 +8013,43 @@ msgstr "Tags叩g kezdete" msgid "Capabilities" -msgstr "" +msgstr "K辿pess辿gek" #. 4 separate strings are needed in order to ease translators' job msgid "Appear Online" msgstr "Bel辿pettk辿nt l叩tszik" -#, fuzzy msgid "Don't Appear Online" -msgstr "Bel辿pettk辿nt l叩tszik" +msgstr "Ne l叩tsszon bel辿pettk辿nt" msgid "Appear Offline" msgstr "Kil辿pettk辿nt l叩tszik" -#, fuzzy msgid "Don't Appear Offline" -msgstr "Kil辿pettk辿nt l叩tszik" - -#, fuzzy +msgstr "Ne l叩tsszon kil辿pettk辿nt" + msgid "you have no buddies on this list" -msgstr "Kir炭gt叩k ebb�l a MultiMX-b�l." - -#, fuzzy, c-format +msgstr "nincsenek partnerei ezen a list叩n" + +#, c-format msgid "" "You can add a buddy to this list by right-clicking on them and selecting \"%s" "\"" msgstr "" -"�jra k辿rheti enged辿lyez辿st ezekt�l a partnerekt�l a jobb eg辿rgombbal " -"kattintva a nev端k旦n, 辿s az ��Enged辿lyez辿s 炭jra k辿r辿se�� v叩laszt叩s叩val" - -#, fuzzy +"Felveheti a partnert a list叩ra a jobb eg辿rgombbal kattintva a nev辿n, 辿s a(z) " +"��%s�� kiv叩laszt叩s叩val" + msgid "Visible List" -msgstr "L叩that坦" +msgstr "L叩that坦 sz叩mukra" msgid "These buddies will see your status when you switch to \"Invisible\"" -msgstr "" - -#, fuzzy +msgstr "Ezek a partnerek l叩tni fogj叩k 叩llapot叩t amikor ��L叩thatatlanra�� v叩lt" + msgid "Invisible List" -msgstr "Megh鱈v叩si lista" +msgstr "L叩thatatlan sz叩mukra" msgid "These buddies will always see you as offline" -msgstr "" +msgstr "Ezek a partnerek mindig kil辿pettk辿nt fogj叩k l叩tni" msgid "Aquarius" msgstr "V鱈z旦nt�" @@ -10798,8 +10797,8 @@ #, c-format msgid "Access denied: HTTP proxy server forbids port %d tunneling" msgstr "" -"Hozz叩f辿r辿s megtagadva: a HTTP proxy kiszolg叩l坦 tiltja az alagutaz叩st a(z) " -"%d. porton" +"Hozz叩f辿r辿s megtagadva: a HTTP proxy kiszolg叩l坦 tiltja az alagutaz叩st a(z) %" +"d. porton" #, c-format msgid "Error resolving %s" @@ -11047,8 +11046,8 @@ "An error was encountered reading your %s. The file has not been loaded, and " "the old file has been renamed to %s~." msgstr "" -"Hiba t旦rt辿nt a(z) %s olvas叩sakor. Ez a f叩jl nem lett bet旦ltve, a r辿gi f叩jl " -"%s~ n辿ven lett elmentve." +"Hiba t旦rt辿nt a(z) %s olvas叩sakor. Ez a f叩jl nem lett bet旦ltve, a r辿gi f叩jl %" +"s~ n辿ven lett elmentve." msgid "" "Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more" @@ -12354,6 +12353,9 @@ msgid "Lao" msgstr "lao" +msgid "Maithili" +msgstr "Maithili" + msgid "Macedonian" msgstr "maced坦n" @@ -12474,8 +12476,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 "" "A %s egy libpurple alap炭 modul叩ris 端zenetk端ld� kliens, amely egyszerre t旦bb " "端zenetk端ld� szolg叩ltat叩shoz is k辿pes csatlakozni. A %s GTK+ haszn叩lat叩val, C " @@ -13025,16 +13027,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 "" "Biztos, hogy t旦r旦lni akarja a(z) %s csatorn叩n folytatott, %s id�pontban " "kezd�d旦tt besz辿lget辿s napl坦j叩t?" #, 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 "" "Biztos, hogy t旦r旦lni akarja a(z) %s id�pontban kezd�d旦tt rendszernapl坦t?" @@ -15382,8 +15384,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 "" "Hiba a helyes鱈r叩s-ellen�rz� telep鱈t辿sekor. ($R3).$\\rHa az 炭jrapr坦b叩lkoz叩s " "meghi炭sul, akkor saj叩t kez撤leg is telep鱈theti a http://developer.pidgin.im/"
--- a/po/nl.po Sun Nov 21 20:30:12 2010 +0000 +++ b/po/nl.po Sun Dec 05 02:43:54 2010 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: pidgin 2.7.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 00:12-0400\n" -"PO-Revision-Date: 2010-10-10 10:55+0100\n" +"POT-Creation-Date: 2010-11-21 13:55-0500\n" +"PO-Revision-Date: 2010-11-18 17:03+0100\n" "Last-Translator: Gideon van Melle <translations@gvmelle.com>\n" "Language-Team: Dutch <translations@gvmelle.com>\n" "Language: nl\n" @@ -1777,7 +1777,7 @@ msgstr "SSL certificaatfout" msgid "Unable to validate certificate" -msgstr "Kan certificaat valideren" +msgstr "Kan certificaat niet valideren" #, c-format msgid "" @@ -4887,15 +4887,6 @@ msgid "Unknown Error in presence" msgstr "Onbekende fout in aanwezigheid" -msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "Er is een fout op de in-band bytestream overdracht\n" - -msgid "Transfer was closed." -msgstr "Bestandsoverdracht gesloten." - -msgid "Failed to open in-band bytestream" -msgstr "Kan geen in-band bytestream openen" - #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "" @@ -5214,25 +5205,6 @@ msgid "The username specified does not exist." msgstr "Ingevoerde gebruikersnaam bestaat niet." -#, c-format -msgid "Buddy list synchronization issue in %s (%s)" -msgstr "Synchronisatieprobleem in vriendenlijst van %s (%s)" - -#, c-format -msgid "" -"%s on the local list is inside the group \"%s\" but not on the server list. " -"Do you want this buddy to be added?" -msgstr "" -"%s is op de lokale lijst in de groep \"%s\", maar niet op de serverlijst. " -"Wilt u deze toevoegen?" - -#, c-format -msgid "" -"%s is on the local list but not on the server list. Do you want this buddy " -"to be added?" -msgstr "" -"%s is op de lokale lijst, maar niet op de serverlijst. Wilt u deze toevoegen?" - msgid "Unable to parse message" msgstr "Kan het bericht niet ontleden" @@ -5403,6 +5375,25 @@ msgid "MSN Error: %s\n" msgstr "MSN-fout: %s\n" +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "Synchronisatieprobleem in vriendenlijst van %s (%s)" + +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"%s is op de lokale lijst in de groep \"%s\", maar niet op de serverlijst. " +"Wilt u deze toevoegen?" + +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"%s is op de lokale lijst, maar niet op de serverlijst. Wilt u deze toevoegen?" + msgid "Other Contacts" msgstr "Andere Contactpersonen" @@ -5454,12 +5445,24 @@ msgid "Set friendly name for %s." msgstr "Geef een bijnaam voor %s." -msgid "Set your friendly name." -msgstr "Bijnaam instellen." +msgid "Set Friendly Name" +msgstr "Geef Bijnaam" msgid "This is the name that other MSN buddies will see you as." msgstr "Dit is de naam die andere MSN vrienden van u zullen zien." +msgid "This Location" +msgstr "Deze Locatie" + +msgid "This is the name that identifies this location" +msgstr "Dit is de naam die deze locatie indentificeert." + +msgid "Other Locations" +msgstr "andere Locaties" + +msgid "You can sign out from other locations here" +msgstr "U kunt u hier bij andere locaties afmelden." + msgid "Set your home phone number." msgstr "Telefoonnummer voor thuis instellen." @@ -5546,6 +5549,9 @@ msgid "Set Friendly Name..." msgstr "Bijnaam instellen..." +msgid "View Locations..." +msgstr "Bekijk Locaties..." + msgid "Set Home Phone Number..." msgstr "Telefoon thuis instellen..." @@ -6953,6 +6959,13 @@ "U heeft u te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een " "keer. Als u verder gaat moet u nog langer wachten." +msgid "" +"You required encryption in your account settings, but one of the servers " +"doesn't support it." +msgstr "" +"U heeft encryptie nodig volgens uw account instellingen, maar 辿辿n van de " +"servers ondersteunt dit niet." + #. Note to translators: The first %s is a URL, the second is an #. error message. #, c-format @@ -7266,6 +7279,13 @@ "met een letter en slechts cijfers, letters en spaties bevatten, of slechts " "nummers bevatten." +msgid "" +"You required encryption in your account settings, but encryption is not " +"supported by your system." +msgstr "" +"U heeft encryptie nodig volgens uw account instellingen, maar encryptie " +"wordt niet door uw systeem ondersteund." + #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "" @@ -7783,13 +7803,11 @@ msgid "Set Privacy Options..." msgstr "Privacy-opties instellen..." -#, fuzzy msgid "Show Visible List" -msgstr "Vriendenlijst _weergeven" - -#, fuzzy +msgstr "Toon Zichtbaren Lijst" + msgid "Show Invisible List" -msgstr "Uitnodigingslijst" +msgstr "Toon Onzichtbaren Lijst" #. AIM actions msgid "Confirm Account" @@ -7807,6 +7825,9 @@ msgid "Search for Buddy by Email Address..." msgstr "Vriend zoeken door middel van e-mail..." +msgid "Don't use encryption" +msgstr "Gebruik geen encryptie" + msgid "Use clientLogin" msgstr "Gebruik clientLogin" @@ -7999,9 +8020,9 @@ msgid "Buddy Comment" msgstr "Opmerking bij Vriend" -#, fuzzy, c-format +#, c-format msgid "User information not available: %s" -msgstr "Gebruik encryptie indien aanwezig" +msgstr "Gebruikersinformatie niet beschikbaar: %s" msgid "Mobile Phone" msgstr "Mobiel nummer" @@ -8010,7 +8031,7 @@ msgstr "Persoonlijke webpagina" #. aim_userinfo_t -#. strip_html_tags +#. use_html_status msgid "Additional Information" msgstr "Extra informatie" @@ -8038,46 +8059,54 @@ msgid "Capabilities" msgstr "Mogelijkheden" -#. 4 separate strings are needed in order to ease translators' job +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear online to the chosen user even when your status is set to +#. Invisible. msgid "Appear Online" msgstr "Online weergeven" -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user when your status is set to +#. Invisible (this is the default). msgid "Don't Appear Online" -msgstr "Online weergeven" - +msgstr "Niet Online weergeven" + +#. Translators: This string is a menu option that, if selected, will cause +#. you to always appear offline to the chosen user (even when your status +#. isn't Invisible). msgid "Appear Offline" msgstr "offline weergeven" -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user if you are invisible, and +#. appear online to the chosen user if you are not invisible (this is the +#. default). msgid "Don't Appear Offline" -msgstr "offline weergeven" - -#, fuzzy +msgstr "Niet Offline weergeven" + msgid "you have no buddies on this list" -msgstr "U bent uit deze MultiMX gegooid." - -#, fuzzy, c-format +msgstr "U heeft geen vrienden op deze lijst" + +#, c-format msgid "" "You can add a buddy to this list by right-clicking on them and selecting \"%s" "\"" msgstr "" -"U kunt opnieuw toestemming aanvragen door met de rechter muisknop op de " -"vrienden te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen." - -#, fuzzy +"U kunt een vriend toevoegen aan deze lijst door rechts op een van hern te " +"klikken en dan \"%s\" te selecteren" + msgid "Visible List" -msgstr "Beschikbaar" +msgstr "Zichtbaren Lijst" msgid "These buddies will see your status when you switch to \"Invisible\"" msgstr "" - -#, fuzzy +"Deze vrienden kunnen uw status zien als u overschakelt naar \"Onzichtbaar\"" + msgid "Invisible List" -msgstr "Uitnodigingslijst" +msgstr "Onzichtbaren Lijst" msgid "These buddies will always see you as offline" -msgstr "" +msgstr "Deze vrienden zullen u altijd als Offline zien" msgid "Aquarius" msgstr "Waterman" @@ -12382,6 +12411,9 @@ msgid "Lao" msgstr "Laotiaans" +msgid "Maithili" +msgstr "Maithili" + msgid "Macedonian" msgstr "Macedonisch" @@ -15525,6 +15557,18 @@ msgid "You do not have permission to uninstall this application." msgstr "U mag dit programma niet verwijderen." +#~ msgid "An error occurred on the in-band bytestream transfer\n" +#~ msgstr "Er is een fout op de in-band bytestream overdracht\n" + +#~ msgid "Transfer was closed." +#~ msgstr "Bestandsoverdracht gesloten." + +#~ msgid "Failed to open in-band bytestream" +#~ msgstr "Kan geen in-band bytestream openen" + +#~ msgid "Set your friendly name." +#~ msgstr "Bijnaam instellen." + #~ msgid "The certificate has expired and should not be considered valid." #~ msgstr "" #~ "Het certificaat is verlopen en moet niet als geldig worden beschouwd."
--- a/po/nn.po Sun Nov 21 20:30:12 2010 +0000 +++ b/po/nn.po Sun Dec 05 02:43:54 2010 +0000 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: gtranslator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 00:12-0400\n" -"PO-Revision-Date: 2010-10-11 01:26+0100\n" +"POT-Creation-Date: 2010-11-21 13:55-0500\n" +"PO-Revision-Date: 2010-11-15 21:27+0100\n" "Last-Translator: Yngve Spjeld Landro <l10n@landro.net>\n" "Language-Team: Norwegian Nynorsk <l10n@landro.net>\n" "Language: nn\n" @@ -3841,7 +3841,7 @@ msgstr "Autentisering i klartekst" msgid "You require encryption, but it is not available on this server." -msgstr "Du krev kryptering som ikkje er tilgjengeleg p奪 denne tenaren." +msgstr "Du krev kryptering, men han finst ikkje p奪 denne tenaren." msgid "Invalid challenge from server" msgstr "Ugyldig utfordring fr奪 tenaren" @@ -4843,15 +4843,6 @@ msgid "Unknown Error in presence" msgstr "Ukjend feil til stades" -msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "Overf淡ringa av samtidsdatastraumen feila\n" - -msgid "Transfer was closed." -msgstr "Overf淡ringa blei lukka." - -msgid "Failed to open in-band bytestream" -msgstr "Klarte ikkje 奪 opna samtidsdatastraum" - #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "" @@ -5169,26 +5160,6 @@ msgid "The username specified does not exist." msgstr "Brukarnamnet finst ikkje" -#, c-format -msgid "Buddy list synchronization issue in %s (%s)" -msgstr "Problem med synkroniseringa av vennelista i %s (%s)" - -#, c-format -msgid "" -"%s on the local list is inside the group \"%s\" but not on the server list. " -"Do you want this buddy to be added?" -msgstr "" -"%s p奪 den lokale lista er med i gruppa \"%s\", men ikkje p奪 tenarlista. " -"�nskjer du 奪 leggja ho/han til?" - -#, c-format -msgid "" -"%s is on the local list but not on the server list. Do you want this buddy " -"to be added?" -msgstr "" -"%s er i den lokale lista, men ikkje p奪 tenarlista. �nskjer du 奪 leggja ho/" -"han til?" - msgid "Unable to parse message" msgstr "Klarte ikkje 奪 tyda meldinga" @@ -5359,6 +5330,26 @@ msgid "MSN Error: %s\n" msgstr "MSN-feil: %s\n" +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "Problem med synkroniseringa av vennelista i %s (%s)" + +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"%s p奪 den lokale lista er med i gruppa \"%s\", men ikkje p奪 tenarlista. " +"�nskjer du 奪 leggja ho/han til?" + +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"%s er i den lokale lista, men ikkje p奪 tenarlista. �nskjer du 奪 leggja ho/" +"han til?" + msgid "Other Contacts" msgstr "Andre kontaktar" @@ -5411,12 +5402,24 @@ msgid "Set friendly name for %s." msgstr "Vel visingsnamnet til %s." -msgid "Set your friendly name." -msgstr "Vel visingsnamn." +msgid "Set Friendly Name" +msgstr "Vel visingsnamn" msgid "This is the name that other MSN buddies will see you as." msgstr "Dette er namnet som vil synast hos andre MSN-venner." +msgid "This Location" +msgstr "Denne staden" + +msgid "This is the name that identifies this location" +msgstr "Dette er namnet som identifiserer denne staden" + +msgid "Other Locations" +msgstr "Andre stader" + +msgid "You can sign out from other locations here" +msgstr "Du kan logga ut fr奪 andre stader her" + msgid "Set your home phone number." msgstr "Skriv inn heimetelefonnummeret ditt." @@ -5502,6 +5505,9 @@ msgid "Set Friendly Name..." msgstr "Vel visingsnamn��" +msgid "View Locations..." +msgstr "Vel stader��" + msgid "Set Home Phone Number..." msgstr "Skriv inn heimetelefonnummer��" @@ -5862,17 +5868,16 @@ msgid "Retrieving buddy list" msgstr "Hentar vennelista" -# d奪rleg formulering? #, c-format msgid "%s requests to view your webcam, but this request is not yet supported." msgstr "" -"%s sp淡r om 奪 f奪 sj奪 nettkameraet ditt. Denne funksjonen er enno ikkje st淡tta." - -# d奪rleg formulering? +"%s sp淡r om l淡yve til 奪 sj奪 nettkameraet ditt, men f淡respurnaden er enno " +"ikkje st淡tta." + #, c-format msgid "%s invited you to view his/her webcam, but this is not yet supported." msgstr "" -"%s har invitert deg til 奪 f奪 sj奪 nettkameraet hans/hennar, men funksjonen er " +"%s har gjeve deg l淡yve til 奪 sj奪 nettkameraet sitt, men denne funksjonen er " "enno ikkje st淡tta." msgid "Away From Computer" @@ -6889,6 +6894,13 @@ "Du har kopla til og blitt fr奪kopla for ofte. Vent i ti minutt og pr淡v igjen. " "Held du fram med 奪 pr淡va, vil du m奪tta venta end奪 lenger." +msgid "" +"You required encryption in your account settings, but one of the servers " +"doesn't support it." +msgstr "" +"Du krev kryptering i kontoinnstillingane dine, men ein av tenarane kan ikkje " +"gje deg det." + #. Note to translators: The first %s is a URL, the second is an #. error message. #, c-format @@ -7200,6 +7212,13 @@ "vera ei gyldig e-postadresse, eller begynna med ein bokstav og berre " "innehalda bokstavar, tal og mellomrom, eller berre innehalda tal." +msgid "" +"You required encryption in your account settings, but encryption is not " +"supported by your system." +msgstr "" +"Du krev kryptering i kontoinnstillingane dine, men systemet ditt kan ikkje " +"gje deg det." + #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "" @@ -7704,13 +7723,11 @@ msgid "Set Privacy Options..." msgstr "Personvernval��" -#, fuzzy msgid "Show Visible List" -msgstr "Vis venne_liste" - -#, fuzzy +msgstr "Vis synleg liste" + msgid "Show Invisible List" -msgstr "Invitasjonsliste" +msgstr "Vis usynleg liste" #. AIM actions msgid "Confirm Account" @@ -7728,6 +7745,9 @@ msgid "Search for Buddy by Email Address..." msgstr "Finn venn utfr奪 e-postadressa��" +msgid "Don't use encryption" +msgstr "Bruk ikkje kryptering" + msgid "Use clientLogin" msgstr "Bruk klientp奪logging" @@ -7916,9 +7936,9 @@ msgstr "Vennenotat" # 20101010 ylan meiner "mogleg" er betre enn "tilgjengeleg" -#, fuzzy, c-format +#, c-format msgid "User information not available: %s" -msgstr "Bruk kryptering om mogleg" +msgstr "Brukaropplysningar er ikkje tilgengelege: %s" msgid "Mobile Phone" msgstr "Mobiltelefon" @@ -7927,7 +7947,7 @@ msgstr "Personelg nettside" #. aim_userinfo_t -#. strip_html_tags +#. use_html_status msgid "Additional Information" msgstr "Tilleggsinformasjon" @@ -7955,46 +7975,53 @@ msgid "Capabilities" msgstr "Evner" -#. 4 separate strings are needed in order to ease translators' job +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear online to the chosen user even when your status is set to +#. Invisible. msgid "Appear Online" msgstr "Framst奪 som tilkopla" -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user when your status is set to +#. Invisible (this is the default). msgid "Don't Appear Online" -msgstr "Framst奪 som tilkopla" - +msgstr "Framst奪 som fr奪kopla" + +#. Translators: This string is a menu option that, if selected, will cause +#. you to always appear offline to the chosen user (even when your status +#. isn't Invisible). msgid "Appear Offline" -msgstr "Verkar vera fr奪kopla" - -#, fuzzy +msgstr "Framst奪 som fr奪kopla" + +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user if you are invisible, and +#. appear online to the chosen user if you are not invisible (this is the +#. default). msgid "Don't Appear Offline" -msgstr "Verkar vera fr奪kopla" - -#, fuzzy +msgstr "Framst奪 som tilkopla" + msgid "you have no buddies on this list" -msgstr "Du er blitt sparka ut fr奪 denne MultiMX-en." - -#, fuzzy, c-format +msgstr "du har ingen venner p奪 denne lista" + +#, c-format msgid "" "You can add a buddy to this list by right-clicking on them and selecting \"%s" "\"" msgstr "" -"Du kan be om godkjenning fr奪 desse vennene igjen ved 奪 h淡greklikka dei og " -"velja \"Sp淡r om ny godkjenning.\"" - -#, fuzzy +"Du kan leggja til ein venn i denne lista ved 奪 h淡greklikka han og velja \"%s" +"\"" + msgid "Visible List" -msgstr "Synleg" +msgstr "Synleg liste" msgid "These buddies will see your status when you switch to \"Invisible\"" -msgstr "" - -#, fuzzy +msgstr "Desse vennene vil sj奪 statusen din om du byter til \"Usynleg\" " + msgid "Invisible List" -msgstr "Invitasjonsliste" +msgstr "Usynleg liste" msgid "These buddies will always see you as offline" -msgstr "" +msgstr "Desse vennene vil alltid sj奪 deg som fr奪kopla" msgid "Aquarius" msgstr "Vassmannen" @@ -12280,6 +12307,9 @@ msgid "Lao" msgstr "Lao" +msgid "Maithili" +msgstr "Maithili" + msgid "Macedonian" msgstr "Makedonsk" @@ -15386,84 +15416,14 @@ msgid "You do not have permission to uninstall this application." msgstr "Du har ikkje rettar til 奪 avinstallera dette programmet." -#~ msgid "The certificate has expired and should not be considered valid." -#~ msgstr "Sertifikatet har g奪tt ut og kan ikkje reknast for 奪 vera gyldig." - -#~ msgid "Require SSL/TLS" -#~ msgstr "Krev SSL/TLS" - -#~ msgid "Force old (port 5223) SSL" -#~ msgstr "Overstyr med gammal SSL (port 5223)" - -#~ msgid "" -#~ "[Unable to display a message from this user because it contained invalid " -#~ "characters.]" -#~ msgstr "" -#~ "Klarer ikkje visa ei melding fr奪 denne brukaren: ho inneheldt ulovlege " -#~ "teikn.]" - -#~ msgid "Search for Buddy by Information" -#~ msgstr "S淡k etter venn utfr奪 opplysningar" - -#~ msgid "The nick name you entered is invalid." -#~ msgstr "Kallenamnet du skreiv er ugyldig." - -#~ msgid "MXit Login Name" -#~ msgstr "P奪loggingsnamn MXit" - -#~ msgid "Nick Name" -#~ msgstr "Kallenamn" - -#~ msgid "Your Mobile Number..." -#~ msgstr "Mobiltelefonnummeret ditt��" - -#~ msgid "/Media/_Hangup" -#~ msgstr "/Media/_Legg p奪" - -#~ msgid "The certificate is not valid yet." -#~ msgstr "Sertifikatet er ikkje gyldig enno." - -#~ msgid "Rate to host" -#~ msgstr "Fart mot vert" - -#~ msgid "Rate to client" -#~ msgstr "Fart mot klient" - -#~ msgid "Unknown reason." -#~ msgstr "Ukjend 奪rsak." - -#~ msgid "Current Mood" -#~ msgstr "Sinnsstemninga no" - -#~ msgid "New Mood" -#~ msgstr "Ny sinnsstemning" - -#~ msgid "Change your Mood" -#~ msgstr "Endra sinnsstemninga di" - -#~ msgid "How do you feel right now?" -#~ msgstr "Korleis kjenner du deg nett no?" - -#~ msgid "Change Mood..." -#~ msgstr "Endra sinnsstemninga��" - -#~ msgid "Orientation" -#~ msgstr "Orientering" - -#~ msgid "The orientation of the tray." -#~ msgstr "Panelorienteringa." - -#~ msgid "Artist" -#~ msgstr "Kunstnar" - -#~ msgid "Album" -#~ msgstr "Album" - -#~ msgid "Pager server" -#~ msgstr "S淡kjetenestetenar" - -#~ msgid "Yahoo Chat server" -#~ msgstr "Yahoo pratetenar" - -#~ msgid "Yahoo Chat port" -#~ msgstr "Yahoo prateport" +#~ msgid "An error occurred on the in-band bytestream transfer\n" +#~ msgstr "Overf淡ringa av samtidsdatastraumen feila\n" + +#~ msgid "Transfer was closed." +#~ msgstr "Overf淡ringa blei lukka." + +#~ msgid "Failed to open in-band bytestream" +#~ msgstr "Klarte ikkje 奪 opna samtidsdatastraum" + +#~ msgid "Set your friendly name." +#~ msgstr "Vel visingsnamn."
--- a/po/pl.po Sun Nov 21 20:30:12 2010 +0000 +++ b/po/pl.po Sun Dec 05 02:43:54 2010 +0000 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Pidgin Polish translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 00:12-0400\n" -"PO-Revision-Date: 2010-10-20 12:58+0200\n" +"POT-Creation-Date: 2010-11-21 13:55-0500\n" +"PO-Revision-Date: 2010-11-16 22:28+0100\n" "Last-Translator: Piotr Dr�g <piotrdrag@gmail.com>\n" "Language-Team: Polish <pl@li.org>\n" "Language: pl\n" @@ -4883,15 +4883,6 @@ msgid "Unknown Error in presence" msgstr "Nieznany b��d obecno�ci" -msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "Wyst�pi� b��d przesy�ania strumienia bit坦w w pa�mie\n" - -msgid "Transfer was closed." -msgstr "Przesy�anie zosta�o zamkni�te." - -msgid "Failed to open in-band bytestream" -msgstr "Otwarcie strumienia bit坦w w pa�mie si� nie powiod�o" - #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "" @@ -5209,26 +5200,6 @@ msgid "The username specified does not exist." msgstr "Podana nazwa u甜ytkownika nie istnieje." -#, c-format -msgid "Buddy list synchronization issue in %s (%s)" -msgstr "Problem synchronizacji listy znajomych w %s (%s)" - -#, c-format -msgid "" -"%s on the local list is inside the group \"%s\" but not on the server list. " -"Do you want this buddy to be added?" -msgstr "" -"U甜ytkownik %s na lokalnej li�cie jest w grupie \"%s\", ale nie ma go na " -"serwerze. Doda� tego znajomego?" - -#, c-format -msgid "" -"%s is on the local list but not on the server list. Do you want this buddy " -"to be added?" -msgstr "" -"U甜ytkownik %s znajduje si� na lokalnej li�cie, ale nie ma go na serwerze. " -"Doda� tego u甜ytkownika?" - msgid "Unable to parse message" msgstr "Nie mo甜na przetworzy� wiadomo�ci" @@ -5399,6 +5370,26 @@ msgid "MSN Error: %s\n" msgstr "B��d MSN: %s\n" +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "Problem synchronizacji listy znajomych w %s (%s)" + +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"U甜ytkownik %s na lokalnej li�cie jest w grupie \"%s\", ale nie ma go na " +"serwerze. Doda� tego znajomego?" + +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"U甜ytkownik %s znajduje si� na lokalnej li�cie, ale nie ma go na serwerze. " +"Doda� tego u甜ytkownika?" + msgid "Other Contacts" msgstr "Inne kontakty" @@ -5452,12 +5443,24 @@ msgid "Set friendly name for %s." msgstr "Ustawienie pseudonimu dla %s." -msgid "Set your friendly name." -msgstr "Ustawienie pseudonimu." +msgid "Set Friendly Name" +msgstr "Ustaw pseudonim" msgid "This is the name that other MSN buddies will see you as." msgstr "Ta nazwa b�dzie widoczna dla innych znajomych MSN." +msgid "This Location" +msgstr "To po�o甜enie" + +msgid "This is the name that identifies this location" +msgstr "Ta nazwa identyfikuje to po�o甜enie." + +msgid "Other Locations" +msgstr "Inne po�o甜enia" + +msgid "You can sign out from other locations here" +msgstr "Tutaj mo甜na wylogowa� si� z innych po�o甜e�" + msgid "Set your home phone number." msgstr "Ustawienie numeru telefonu domowego." @@ -5543,6 +5546,9 @@ msgid "Set Friendly Name..." msgstr "Ustaw pseudonim..." +msgid "View Locations..." +msgstr "Wy�wietl po�o甜enia..." + msgid "Set Home Phone Number..." msgstr "Ustaw domowy numer telefonu..." @@ -6953,6 +6959,13 @@ "spr坦bowa� ponownie. Je�li pr坦ba zostanie podj�ta teraz, czas oczekiwania " "jeszcze si� wyd�u甜y." +msgid "" +"You required encryption in your account settings, but one of the servers " +"doesn't support it." +msgstr "" +"Szyfrowanie jest wymagane w ustawieniach konta, ale jeden z serwer坦w go nie " +"obs�uguje." + #. Note to translators: The first %s is a URL, the second is an #. error message. #, c-format @@ -7263,6 +7276,13 @@ "Nazwy u甜ytkownik坦w musz� by� prawid�owymi adresami e-mail lub zaczyna� si� " "od litery i zawiera� tylko litery, liczby i spacje lub zawiera� tylko liczby." +msgid "" +"You required encryption in your account settings, but encryption is not " +"supported by your system." +msgstr "" +"Wymagane jest szyfrowanie w ustawieniach konta, ale nie jest ono obs�ugiwane " +"przez system." + #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "" @@ -7802,13 +7822,11 @@ msgid "Set Privacy Options..." msgstr "Ustaw opcje prywatno�ci..." -#, fuzzy msgid "Show Visible List" -msgstr "Lista widocznych" - -#, fuzzy +msgstr "Wy�wietl lista widocznych" + msgid "Show Invisible List" -msgstr "Lista niewidocznych" +msgstr "Wy�wietl list� niewidocznych" #. AIM actions msgid "Confirm Account" @@ -7826,6 +7844,9 @@ msgid "Search for Buddy by Email Address..." msgstr "Wyszukaj znajomych wed�ug adresu e-mail..." +msgid "Don't use encryption" +msgstr "Bez u甜ycia szyfrowania" + msgid "Use clientLogin" msgstr "U甜ycie logowania klienta" @@ -8026,7 +8047,7 @@ msgstr "Osobista strona WWW" #. aim_userinfo_t -#. strip_html_tags +#. use_html_status msgid "Additional Information" msgstr "Dodatkowe informacje" @@ -8054,16 +8075,28 @@ msgid "Capabilities" msgstr "Mo甜liwo�ci" -#. 4 separate strings are needed in order to ease translators' job +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear online to the chosen user even when your status is set to +#. Invisible. msgid "Appear Online" msgstr "Wygl�da na tryb online" +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user when your status is set to +#. Invisible (this is the default). msgid "Don't Appear Online" msgstr "Nie wygl�da na tryb online" +#. Translators: This string is a menu option that, if selected, will cause +#. you to always appear offline to the chosen user (even when your status +#. isn't Invisible). msgid "Appear Offline" msgstr "Wygl�da na tryb offline" +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user if you are invisible, and +#. appear online to the chosen user if you are not invisible (this is the +#. default). msgid "Don't Appear Offline" msgstr "Nie wygl�da na tryb offline" @@ -12376,6 +12409,9 @@ msgid "Lao" msgstr "laota�ski" +msgid "Maithili" +msgstr "maithili" + msgid "Macedonian" msgstr "macedo�ski"
--- a/po/ro.po Sun Nov 21 20:30:12 2010 +0000 +++ b/po/ro.po Sun Dec 05 02:43:54 2010 +0000 @@ -5,11 +5,11 @@ # Contributions: 2007, Alexandru Szasz <alexxed@gmail.com> msgid "" msgstr "" -"Project-Id-Version: pidgin-2.7.4\n" +"Project-Id-Version: pidgin-2.7.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 00:12-0400\n" -"PO-Revision-Date: 2010-10-20 23:11+0300\n" -"Last-Translator: Mi�u Moldovan <dumol@gnome.org>\n" +"POT-Creation-Date: 2010-11-21 13:55-0500\n" +"PO-Revision-Date: 2010-11-20 18:36+0200\n" +"Last-Translator: Mi�u Moldovan <dumol@l10n.ro>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -4861,15 +4861,6 @@ msgid "Unknown Error in presence" msgstr "Eroare necunoscut� 樽n starea de prezen��" -msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "A ap�rut o eroare la transferul de octe�i 樽n-band�\n" - -msgid "Transfer was closed." -msgstr "Transferul a fost 樽nchis" - -msgid "Failed to open in-band bytestream" -msgstr "Nu s-a putut deschide fluxul de octe�i 樽n-band�" - #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "" @@ -5186,26 +5177,6 @@ msgid "The username specified does not exist." msgstr "Numele de utilizator specificat nu exist�." -#, c-format -msgid "Buddy list synchronization issue in %s (%s)" -msgstr "Probleme de sincronizare a liste de contacte 樽n %s (%s)" - -#, c-format -msgid "" -"%s on the local list is inside the group \"%s\" but not on the server list. " -"Do you want this buddy to be added?" -msgstr "" -"%s din grupul ��%s�� e 樽n lista contactelor, dar nu este 樽n lista de pe " -"server. Dori�i s� ad�uga�i acest contact?" - -#, c-format -msgid "" -"%s is on the local list but not on the server list. Do you want this buddy " -"to be added?" -msgstr "" -"%s este 樽n lista contactelor, dar nu �i 樽n lista de pe server. Dori�i s� " -"ad�uga�i acest contact?" - msgid "Unable to parse message" msgstr "Nu se poate prelucra mesajul" @@ -5376,6 +5347,26 @@ msgid "MSN Error: %s\n" msgstr "Eroare MSN: %s\n" +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "Probleme de sincronizare a liste de contacte 樽n %s (%s)" + +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"%s din grupul ��%s�� e 樽n lista contactelor, dar nu este 樽n lista de pe " +"server. Dori�i s� ad�uga�i acest contact?" + +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"%s este 樽n lista contactelor, dar nu �i 樽n lista de pe server. Dori�i s� " +"ad�uga�i acest contact?" + msgid "Other Contacts" msgstr "Alte contacte" @@ -5428,12 +5419,24 @@ msgid "Set friendly name for %s." msgstr "Alege�i un pseudonim pentru %s." -msgid "Set your friendly name." -msgstr "Alege�i-v� un pseudonim propriu." +msgid "Set Friendly Name" +msgstr "Introducere pseudonim" msgid "This is the name that other MSN buddies will see you as." msgstr "Acesta este numele sub care ve�i fi cunoscu�i de contactele MSN." +msgid "This Location" +msgstr "Acest loc" + +msgid "This is the name that identifies this location" +msgstr "Aceasta este denumirea pentru acest loc" + +msgid "Other Locations" +msgstr "Alte locuri" + +msgid "You can sign out from other locations here" +msgstr "Aici pute�i s� anula�i alte autentific�ri curente" + msgid "Set your home phone number." msgstr "Introduce�i num�rul telefonului de acas�." @@ -5520,6 +5523,9 @@ msgid "Set Friendly Name..." msgstr "Introducere pseudonim..." +msgid "View Locations..." +msgstr "Vizualizare locuri..." + msgid "Set Home Phone Number..." msgstr "Introducere num�r telefon acas�..." @@ -6926,6 +6932,12 @@ "V-a�i conectat �i deconectat prea des. A�tepta�i zece minute �i 樽ncerca�i " "din nou. Dac� continua�i s� 樽ncerca�i, va trebui s� a�tepta�i mai mult." +msgid "" +"You required encryption in your account settings, but one of the servers " +"doesn't support it." +msgstr "" +"Se cere criptare 樽n op�iunile contului, dar unul dintre servere nu o suport�." + #. Note to translators: The first %s is a URL, the second is an #. error message. #, c-format @@ -7238,6 +7250,13 @@ "cu o liter� �i s� con�in� doar litere, numere �i spa�ii sau s� con�in� doar " "numere." +msgid "" +"You required encryption in your account settings, but encryption is not " +"supported by your system." +msgstr "" +"Se cere criptare 樽n op�iunile contului, dar acest sistem de operare nu o " +"suport�." + #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "" @@ -7769,13 +7788,11 @@ msgid "Set Privacy Options..." msgstr "Op�iuni de securitate..." -#, fuzzy msgid "Show Visible List" -msgstr "List� de vizibilitate" - -#, fuzzy +msgstr "Lista celor ce v� v�d" + msgid "Show Invisible List" -msgstr "List� de invizibilitate" +msgstr "Lista celor ce nu v� v�d" #. AIM actions msgid "Confirm Account" @@ -7793,6 +7810,9 @@ msgid "Search for Buddy by Email Address..." msgstr "C�utare contact dup� adresa de mail..." +msgid "Don't use encryption" +msgstr "Nu utiliza criptare" + msgid "Use clientLogin" msgstr "Utiliza�i clientLogin" @@ -7992,7 +8012,7 @@ msgstr "Pagin� personal�" #. aim_userinfo_t -#. strip_html_tags +#. use_html_status msgid "Additional Information" msgstr "Alte informa�ii" @@ -8020,16 +8040,28 @@ msgid "Capabilities" msgstr "Facilit��i" -#. 4 separate strings are needed in order to ease translators' job +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear online to the chosen user even when your status is set to +#. Invisible. msgid "Appear Online" msgstr "Apar online" +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user when your status is set to +#. Invisible (this is the default). msgid "Don't Appear Online" msgstr "Nu apar online" +#. Translators: This string is a menu option that, if selected, will cause +#. you to always appear offline to the chosen user (even when your status +#. isn't Invisible). msgid "Appear Offline" msgstr "Apar offline" +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user if you are invisible, and +#. appear online to the chosen user if you are not invisible (this is the +#. default). msgid "Don't Appear Offline" msgstr "Nu apar offline" @@ -12354,6 +12386,9 @@ msgid "Lao" msgstr "Lao" +msgid "Maithili" +msgstr "Maithili" + msgid "Macedonian" msgstr "Macedonean�" @@ -15458,3 +15493,15 @@ msgid "You do not have permission to uninstall this application." msgstr "Nu ave釘i drepturile de acces necesare dezinstal�rii acestei aplica釘ii." + +#~ msgid "An error occurred on the in-band bytestream transfer\n" +#~ msgstr "A ap�rut o eroare la transferul de octe�i 樽n-band�\n" + +#~ msgid "Transfer was closed." +#~ msgstr "Transferul a fost 樽nchis" + +#~ msgid "Failed to open in-band bytestream" +#~ msgstr "Nu s-a putut deschide fluxul de octe�i 樽n-band�" + +#~ msgid "Set your friendly name." +#~ msgstr "Alege�i-v� un pseudonim propriu."
--- a/po/sq.po Sun Nov 21 20:30:12 2010 +0000 +++ b/po/sq.po Sun Dec 05 02:43:54 2010 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 00:12-0400\n" -"PO-Revision-Date: 2010-05-03 11:41+0200\n" +"POT-Creation-Date: 2010-11-21 13:55-0500\n" +"PO-Revision-Date: 2010-11-16 20:58+0200\n" "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n" "Language-Team: Albanian <besnik@programeshqip.org>\n" "Language: sq\n" @@ -65,9 +65,8 @@ msgid "Error" msgstr "Gabim" -#, fuzzy msgid "Account was not modified" -msgstr "Nuk u shtua llogaria" +msgstr "Llogaria nuk u ndryshua" msgid "Account was not added" msgstr "Nuk u shtua llogaria" @@ -78,10 +77,14 @@ msgid "" "The account's protocol cannot be changed while it is connected to the server." msgstr "" +"Protokolli i llogaris谷 nuk mund t谷 ndryshohet kur 谷sht谷 i lidhur te " +"sh谷rbyesi." msgid "" "The account's username cannot be changed while it is connected to the server." msgstr "" +"Emri i p谷rdoruesit p谷r llogarin谷 nuk mund t谷 ndryshohet kur 谷sht谷 i lidhur " +"te sh谷rbyesi." msgid "New mail notifications" msgstr "Njoftime poste t谷 re" @@ -814,7 +817,7 @@ msgstr "Po pritet t谷 filloj谷 shp谷rngulja" msgid "Cancelled" -msgstr "Anuluar" +msgstr "U anulua" msgid "Failed" msgstr "D谷shtova" @@ -1299,7 +1302,7 @@ msgstr "Dikush thot谷 emrin tuaj n谷 fjalosje" msgid "Attention received" -msgstr "" +msgstr "U mor v谷mendje" msgid "GStreamer Failure" msgstr "D谷shtim i GStreamer-it" @@ -1726,12 +1729,15 @@ "The certificate is not valid yet. Check that your computer's date and time " "are accurate." msgstr "" - -#, fuzzy +"D谷shmia nuk 谷sht谷 ende e vlefshme. Kontrolloni q谷 data dhe koha e " +"kompjuterit tuaj jan谷 t谷 sakta." + msgid "" "The certificate has expired and should not be considered valid. Check that " "your computer's date and time are accurate." -msgstr "D谷shmia ka skaduar dhe nuk duhet marr谷 si e vlefshme." +msgstr "" +"D谷shmia ka skaduar dhe nuk duhet marr谷 si e vlefshme. Kontrolloni n谷 jan谷 t谷 " +"sakta data dhe ora e kompjuterit." #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com) msgid "The certificate presented is not issued to this domain." @@ -4073,19 +4079,18 @@ "Sh谷rbyesi mendon se mir谷fillt谷simi 谷sht谷 i plot谷, por klienti nuk mendon " "k谷shtu." -#, fuzzy msgid "Server may require plaintext authentication over an unencrypted stream" msgstr "" -"karshi nj谷 rrjedhe t谷 pakoduar sh谷rbyesi lyp mir谷fillt谷sim me baz谷 tekst t谷 " -"thjesht谷" - -#, fuzzy, c-format +"Sh谷rbyesi mund t谷 k谷rkoj谷 mir谷fillt谷sim n谷 trajt谷 teksti t谷 thjesht谷 p谷rmes " +"nj谷 lidhjeje t谷 pakoduar." + +#, c-format msgid "" "%s may require plaintext authentication over an unencrypted connection. " "Allow this and continue authentication?" msgstr "" -"%s lyp mir谷fillt谷sim n谷 trajt谷 teksti t谷 thjesht谷 p谷rmes nj谷 lidhjeje t谷 " -"pakoduar. Ta lejoj谷 k谷t谷 dhe t谷 vazhdoj谷 me mir谷fillt谷simin? " +"%s mund t谷 k谷rkoj谷 mir谷fillt谷sim n谷 trajt谷 teksti t谷 thjesht谷 p谷rmes nj谷 " +"lidhjeje t谷 pakoduar. T谷 lejohet kjo dhe t谷 vazhdohet me mir谷fillt谷simin? " msgid "SASL authentication failed" msgstr "Mir谷fillt谷simi SASL d谷shtoi" @@ -4984,20 +4989,17 @@ msgid "Domain" msgstr "P谷rkat谷si" -#, fuzzy msgid "Require encryption" -msgstr "K谷rko autorizim" - -#, fuzzy +msgstr "Lyp kodim" + msgid "Use encryption if available" -msgstr "T谷 dh谷na p谷rdoruesi jo t谷 mundshme: %s" +msgstr "P谷rdor kodim n谷 qoft谷 e mundur" msgid "Use old-style SSL" -msgstr "" - -#, fuzzy +msgstr "P谷rdor SSL t谷 vjet谷r" + msgid "Connection security" -msgstr "Rivendosje lidhjeje" +msgstr "Siguri Lidhjeje" msgid "Allow plaintext auth over unencrypted streams" msgstr "Lejo autorizim n谷 form谷 teksti t谷 thjesht谷 n谷 rrjedha t谷 pakoduara" @@ -5104,15 +5106,6 @@ msgid "Unknown Error in presence" msgstr "Gabim i Panjohur te prania" -msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "Ndodhi nj谷 gabim n谷 shp谷rnguljen \"in-band bytestream\"\n" - -msgid "Transfer was closed." -msgstr "Shp谷rngulja u mbyll." - -msgid "Failed to open in-band bytestream" -msgstr "D谷shtoi n谷 hapjen e \"in-band bytestream\"" - #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "" @@ -5436,26 +5429,6 @@ msgid "The username specified does not exist." msgstr "Emri i dh谷n谷 i p谷rdoruesit nuk ekziston." -#, c-format -msgid "Buddy list synchronization issue in %s (%s)" -msgstr "Problem nj谷koh谷simi liste shok谷sh n谷 %s (%s)" - -#, c-format -msgid "" -"%s on the local list is inside the group \"%s\" but not on the server list. " -"Do you want this buddy to be added?" -msgstr "" -"%s i list谷s vendore 谷sht谷 brenda grupit \"%s\" por jo n谷 list谷n e " -"sh谷rbyesit. Doni t谷 shtohet ky shok?" - -#, c-format -msgid "" -"%s is on the local list but not on the server list. Do you want this buddy " -"to be added?" -msgstr "" -"%s 谷sht谷 n谷 list谷n vendore por jo n谷 list谷n e sh谷rbyesit. Doni t谷 shtohet ky " -"shok?" - msgid "Unable to parse message" msgstr "I pazoti t谷 p谷rtyp谷 mesazh" @@ -5626,6 +5599,26 @@ msgid "MSN Error: %s\n" msgstr "Gabim MSN: %s\n" +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "Problem nj谷koh谷simi liste shok谷sh n谷 %s (%s)" + +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"%s i list谷s vendore 谷sht谷 brenda grupit \"%s\" por jo n谷 list谷n e " +"sh谷rbyesit. Doni t谷 shtohet ky shok?" + +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"%s 谷sht谷 n谷 list谷n vendore por jo n谷 list谷n e sh谷rbyesit. Doni t谷 shtohet ky " +"shok?" + msgid "Other Contacts" msgstr "Kontakte t谷 Tjera" @@ -5678,12 +5671,24 @@ msgid "Set friendly name for %s." msgstr "Caktoni em谷r miq谷sor p谷r %s." -msgid "Set your friendly name." -msgstr "Caktoni ermin tuaj miq谷sor." +msgid "Set Friendly Name" +msgstr "Caktoni Em谷r Miq谷sor" msgid "This is the name that other MSN buddies will see you as." msgstr "Ky 谷sht谷 emri me t谷 cilin do t'ju shohin shok谷 t谷 tjer谷 MSN-s谷." +msgid "This Location" +msgstr "K谷t谷 Vend" + +msgid "This is the name that identifies this location" +msgstr "Ky 谷sht谷 emri q谷 identifikon k谷t谷 vend" + +msgid "Other Locations" +msgstr "Vende t谷 Tjera" + +msgid "You can sign out from other locations here" +msgstr "K谷tu mund t谷 dilni prej vendesh t谷 tjera" + msgid "Set your home phone number." msgstr "Vini numrin tuaj t谷 telefonit." @@ -5770,6 +5775,9 @@ msgid "Set Friendly Name..." msgstr "Caktoni Em谷r Miq谷sor..." +msgid "View Locations..." +msgstr "Shihni Vendet..." + msgid "Set Home Phone Number..." msgstr "Vini Num谷r Telefoni t谷 Sht谷pis谷..." @@ -6019,9 +6027,8 @@ msgid "Show custom smileys" msgstr "Shfaq emotikone vetjake" -#, fuzzy msgid "Allow direct connections" -msgstr "I pazoti t谷 krijoj谷 lidhje" +msgstr "Lejo lidhje t谷 drejtp谷rdrejta" msgid "nudge: nudge a user to get their attention" msgstr "nudge: preke nj谷 p谷rdorues me b谷rryl p谷r t'i t谷rhequr v谷mendjen" @@ -6226,9 +6233,8 @@ msgid "The two PINs you entered do not match." msgstr "Dy PIN-et q谷 dhat谷 nuk p谷rputhen." -#, fuzzy msgid "The Display Name you entered is invalid." -msgstr "Emri q谷 dhat谷 谷sht谷 i pavlefsh谷m." +msgstr "Emri p谷r n谷 Ekran q谷 dhat谷 谷sht谷 e mang谷t." msgid "" "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." @@ -6249,7 +6255,7 @@ "T谷 dh谷nat e profilit tuaj nuk jan谷 marr谷 ende. Ju lutem,, riprovoni m谷 von谷." msgid "Your UID" -msgstr "" +msgstr "UID-ja juaj" #. pin #. pin (required) @@ -6333,7 +6339,7 @@ #. mxit login name msgid "MXit ID" -msgstr "" +msgstr "ID MXit" #. show the form to the user to complete msgid "Register New MXit Account" @@ -6363,17 +6369,15 @@ msgid "Invalid country selected. Please try again." msgstr "U p谷rzgjodh vend i pavlefsh谷m. Ju lutem,, riprovoni." -#, fuzzy msgid "The MXit ID you entered is not registered. Please register first." msgstr "" -"Emri i p谷rdoruesit nuk 谷sht谷 i regjistruar. Ju lutem,, s谷 pari " +"ID-ja MXit q谷 dhat谷 nuk 谷sht谷 e regjistruar. Ju lutem, s谷 pari " "regjistrohuni." -#, fuzzy msgid "The MXit ID you entered is already registered. Please choose another." msgstr "" -"Ky em谷r p谷rdoruesi 谷sht谷 i regjistruar tashm谷. Ju lutem,, zgjidhni nj谷 em谷r " -"tjet谷r p谷rdoruesi." +"ID-ja MXit q谷 dhat谷 谷sht谷 tashm谷 e regjistruar. Ju lutem, zgjidhni nj谷 " +"tjet谷r." msgid "Internal error. Please try again later." msgstr "Gabim i brendsh谷m. Ju lutem,, riprovoni m谷 von谷." @@ -6412,17 +6416,15 @@ msgid "Status Message" msgstr "Mesazh Gjendjeje" -#, fuzzy msgid "Rejection Message" -msgstr "Mesazhe t谷 Marr谷" +msgstr "Mesazh Mospranimi" #. hidden number msgid "Hidden Number" msgstr "Num谷r i Fshehur" -#, fuzzy msgid "Your MXit ID..." -msgstr "ID Yahoo..." +msgstr "ID-ja Juaj MXit..." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") @@ -6437,26 +6439,21 @@ msgstr "Aktivizo fllusk谷n e sigl谷s" #. you were kicked -#, fuzzy msgid "You have been kicked from this MultiMX." -msgstr "Jeni p谷rz谷n谷: (%s)" - -#, fuzzy +msgstr "Jepni p谷rz谷n谷 nga ky MultiMX." + msgid "was kicked" -msgstr "Bilet谷 e pavlefshme" - -#, fuzzy +msgstr "u p谷rzu" + msgid "_Room Name:" -msgstr "_Dhom谷:" +msgstr "_Em谷r Dhome:" #. Display system message in chat window -#, fuzzy msgid "You have invited" -msgstr "Ju ka ardhur post谷!" - -#, fuzzy +msgstr "Keni ftuar" + msgid "Last Online" -msgstr "I lidhur" +msgstr "S谷 fundi 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." @@ -7234,6 +7231,13 @@ "Jeni lidhur e shk谷putur shum谷 shpesh. Prisni dhjet谷 minuta dhe riprovoni. " "n谷se vazhdoni t谷 provoni, do t'ju duhet t谷 prisni edhe m谷." +msgid "" +"You required encryption in your account settings, but one of the servers " +"doesn't support it." +msgstr "" +"Te rregullimet tuaja p谷r llogarin谷 k谷rkuat kodim, por nj谷 nga sh谷rbyesat nuk " +"e mbulon at谷. " + #. Note to translators: The first %s is a URL, the second is an #. error message. #, c-format @@ -7528,7 +7532,7 @@ msgstr "I paduksh谷m" msgid "Evil" -msgstr "" +msgstr "Goxha i keq" msgid "Depression" msgstr "Depresion" @@ -7571,6 +7575,13 @@ "t谷 fillojn谷 me nj谷 g谷rm谷 dhe t谷 p谷rmbajn谷 vet谷m g谷rma, numra dhe hap谷sira, " "ose t谷 p谷rmbajn谷 vet谷m numra." +msgid "" +"You required encryption in your account settings, but encryption is not " +"supported by your system." +msgstr "" +"Te rregullimet tuaja p谷r llogarin谷 k谷rkuat kodim, por kodimi nuk mbulohet " +"nga sistemi juaj. " + #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "" @@ -8053,9 +8064,8 @@ msgid "Change Address To:" msgstr "Ndrysho Vendndodhje Si:" -#, fuzzy msgid "you are not waiting for authorization" -msgstr "<i>nuk po prisni p谷r autorizim</i>" +msgstr "nuk po prisni p谷r autorizim" msgid "You are awaiting authorization from the following buddies" msgstr "Po prisni autorizim prej shok谷ve vijues" @@ -8093,13 +8103,11 @@ msgid "Set Privacy Options..." msgstr "Caktoni Mund谷si Vet谷sie..." -#, fuzzy msgid "Show Visible List" -msgstr "Shfaq _List谷 Shok谷sh" - -#, fuzzy +msgstr "Shfaq List谷 t谷 Dukshme" + msgid "Show Invisible List" -msgstr "List谷 Ftesash" +msgstr "Shfaq List谷 t谷 Padukshme" #. AIM actions msgid "Confirm Account" @@ -8117,6 +8125,9 @@ msgid "Search for Buddy by Email Address..." msgstr "K谷rkoni nj谷 Shok p谷rmes Vendndodhjes Email..." +msgid "Don't use encryption" +msgstr "Mos p谷rdor kodim" + msgid "Use clientLogin" msgstr "P谷rdor \"clientLogin\"" @@ -8315,7 +8326,7 @@ msgstr "Faqe Web Personale" #. aim_userinfo_t -#. strip_html_tags +#. use_html_status msgid "Additional Information" msgstr "T谷 dh谷na Shtes谷" @@ -8343,46 +8354,53 @@ msgid "Capabilities" msgstr "Aft谷si" -#. 4 separate strings are needed in order to ease translators' job +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear online to the chosen user even when your status is set to +#. Invisible. msgid "Appear Online" msgstr "Shfaqu I lidhur" -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user when your status is set to +#. Invisible (this is the default). msgid "Don't Appear Online" -msgstr "Shfaqu I lidhur" - +msgstr "Mos u Shfaq Online" + +#. Translators: This string is a menu option that, if selected, will cause +#. you to always appear offline to the chosen user (even when your status +#. isn't Invisible). msgid "Appear Offline" msgstr "Shfaqet Jo i lidhur" -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user if you are invisible, and +#. appear online to the chosen user if you are not invisible (this is the +#. default). msgid "Don't Appear Offline" -msgstr "Shfaqet Jo i lidhur" - -#, fuzzy +msgstr "Mos Shfaq Offline" + msgid "you have no buddies on this list" -msgstr "Jeni p谷rz谷n谷: (%s)" - -#, fuzzy, c-format +msgstr "nuk keni shok谷 n谷 k谷t谷 list谷" + +#, c-format msgid "" "You can add a buddy to this list by right-clicking on them and selecting \"%s" "\"" msgstr "" -"Mund t谷 rik谷rkoni autorizim prej k谷tyre shok谷ve duke djathtas klikuar mbi ta " -"dhe p谷rzgjedhur \"Rik谷rko Autorizim.\"" - -#, fuzzy +"Nj谷 shok mund ta shtoni n谷 k谷t谷 list谷 duke djathtasklikuar mbi t谷 dhe " +"p谷rzgjedhur \"%s\"" + msgid "Visible List" -msgstr "I duksh谷m" +msgstr "List谷 e Dukshme" msgid "These buddies will see your status when you switch to \"Invisible\"" -msgstr "" - -#, fuzzy +msgstr "K谷ta shok谷 do ta shohin gjendjen tuaj kur kaloni si \"I paduksh谷m\"" + msgid "Invisible List" -msgstr "List谷 Ftesash" +msgstr "List谷 e Padukshme" msgid "These buddies will always see you as offline" -msgstr "" +msgstr "K谷ta shok谷 do t'ju shohin p谷rher谷 si offline" msgid "Aquarius" msgstr "Ujori" @@ -8567,9 +8585,9 @@ msgid "Your request was rejected." msgstr "K谷rkesa juaj u hodh posht谷." -#, fuzzy, c-format +#, c-format msgid "%u requires verification: %s" -msgstr "%u lyp verifikim" +msgstr "%u lyp verifikim: %s" msgid "Add buddy question" msgstr "Pyetje shtimi shoku" @@ -10002,7 +10020,7 @@ msgstr "Nuk mundi t谷 asgj谷soj谷 p谷rdorues" msgid "WATCH" -msgstr "" +msgstr "MBIKQYRE" msgid "Cannot watch user" msgstr "S'ndjek dot p谷rdoruesin" @@ -10653,9 +10671,8 @@ msgid "Ignore conference and chatroom invitations" msgstr "Shp谷rfill ftesa konferencash dhe dhomash fjalosjeje" -#, fuzzy msgid "Use account proxy for HTTP and HTTPS connections" -msgstr "P谷rdor nd谷rmjet谷s llogarie p谷r lidhje SSL" +msgstr "P谷r lidhjet HTTP dhe HTTPS p谷rdor nd谷rmjet谷s llogarie " msgid "Chat room list URL" msgstr "Url liste dhome fjalosjeje" @@ -11597,9 +11614,9 @@ "Mund t'i riktheheni k谷saj dritareje p谷r shtim, p谷rpunim apo heqje llogarish " "nga <b>Llogari->Administroni Llogarira</b> te dritarja e Listave t谷 Shok谷ve" -#, fuzzy, c-format +#, c-format msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s" -msgstr "%s%s%s%s don t谷 shtoj谷 %s te list谷 e tij ose e saj shok谷sh%s%s" +msgstr "%s%s%s%s don t'ju shtoj谷 (%s) te lista e tij e shok谷ve %s%s" #. Buddy List msgid "Background Color" @@ -12653,9 +12670,8 @@ msgid "Arabic" msgstr "Arabe" -#, fuzzy msgid "Assamese" -msgstr "I turp谷ruar" +msgstr "Asameze" msgid "Belarusian Latin" msgstr "Bjelloruse Latine" @@ -12780,12 +12796,14 @@ msgid "Lao" msgstr "Lao" +msgid "Maithili" +msgstr "Maithili" + msgid "Macedonian" msgstr "Maqedone" -#, fuzzy msgid "Malayalam" -msgstr "Malaje" +msgstr "Malajalame" msgid "Mongolian" msgstr "Mongole" @@ -13508,7 +13526,7 @@ "\n" msgid "DIR" -msgstr "" +msgstr "DIR" msgid "use DIR for config files" msgstr "p谷r kartela form谷simi p谷rdor DIR" @@ -13530,7 +13548,7 @@ msgstr "mos hyr vetvetiu" msgid "NAME" -msgstr "" +msgstr "EM�R" msgid "" "enable specified account(s) (optional argument NAME\n" @@ -13578,9 +13596,8 @@ msgid "Exiting because another libpurple client is already running.\n" msgstr "Po dilet, ngaq谷 ka nj谷 tjet谷r klient libpurple n谷 xhirim e sip谷r.\n" -#, fuzzy msgid "_Media" -msgstr "/_Media" +msgstr "_Media" msgid "_Hangup" msgstr "" @@ -14007,9 +14024,8 @@ msgid "_TURN server:" msgstr "Sh谷rbyes _TURN:" -#, fuzzy msgid "_UDP Port:" -msgstr "_Port谷:" +msgstr "Port谷 _UDP:" msgid "Use_rname:" msgstr "_Em谷r p谷rdoruesi:" @@ -14033,7 +14049,7 @@ msgstr "Konqueror" msgid "Google Chrome" -msgstr "" +msgstr "Google Chrome" #. Do not move the line below. Code below expects gnome-open to be in #. * this list immediately after xdg-open! @@ -14057,11 +14073,11 @@ #. Translators: please do not translate "chromium-browser" here! msgid "Chromium (chromium-browser)" -msgstr "" +msgstr "Chromium (chromium-browser)" #. Translators: please do not translate "chrome" here! msgid "Chromium (chrome)" -msgstr "" +msgstr "Chromium (chrome)" msgid "Manual" msgstr "Dorazi" @@ -14605,7 +14621,6 @@ msgid "Small" msgstr "E vog谷l" -#, fuzzy msgid "Smaller versions of the default smileys" msgstr "Versione m谷 t谷 vegj谷l t谷 emotikoneve parazgjedhje" @@ -15798,9 +15813,8 @@ msgid "Voice/Video Settings" msgstr "Rregullime Z谷/Figur谷" -#, fuzzy msgid "Voice and Video Settings" -msgstr "Rregullime Z谷/Figur谷" +msgstr "Rregullime p谷r Z谷 dhe Video" #. *< name #. *< version @@ -15950,35 +15964,39 @@ "$(^Name) is released under the GNU General Public License (GPL). The license " "is provided here for information purposes only. $_CLICK" msgstr "" +"$(^Name) qarkullon n谷n lejen GNU General Public License (GPL). Leja k谷tu " +"jepet vet谷m p谷r q谷llime informimi. $_CLICK" #. Installer Subsection Detailed Description msgid "A multi-platform GUI toolkit, used by Pidgin" -msgstr "Nj谷 grup mjetesh shum谷platform谷sh p谷r GUI, p谷rdorur nga Pidgin-i" +msgstr "Nj谷 grupmjetesh nd谷rplatform谷sh GUI, i p谷rdorur nga Pidgin" msgid "" "An instance of Pidgin is currently running. Please exit Pidgin and try " "again." msgstr "" +"Ka nj谷 instanc谷 t谷 Pidgin-it n谷 xhirim e sip谷r. Ju lutem, dilni prej Pidgin-" +"it dhe riprovoni." #. Installer Subsection Detailed Description msgid "Core Pidgin files and dlls" -msgstr "Kartela dhe dll baz谷 t谷 Pidgin-it" +msgstr "Kartelat dhe dll-t谷 baz谷 t谷 Pidgin-it" #. Installer Subsection Detailed Description msgid "Create a Start Menu entry for Pidgin" -msgstr "" +msgstr "Krijo nj谷 z谷 Menuje Nisjeje p谷r Pidgin-n" #. Installer Subsection Detailed Description msgid "Create a shortcut to Pidgin on the Desktop" -msgstr "" +msgstr "Krijo n谷 Desktop nj谷 shkurtire p谷r Pidgin-in" #. Installer Subsection Text msgid "Debug Symbols (for reporting crashes)" -msgstr "" +msgstr "Simbole Diagnostikimi (p谷r raportim vithisjesh)" #. Installer Subsection Text msgid "Desktop" -msgstr "" +msgstr "Desktop" #. $R2 will display the URL that the GTK+ Runtime failed to download from msgid "" @@ -15986,12 +16004,18 @@ "function; if retrying fails, you may need to use the 'Offline Installer' " "from http://pidgin.im/download/windows/ ." msgstr "" +"Gabim n谷 shkarkimin e GTK+ Runtime ($R2).$\\rE domosdoshme q谷 t谷 funksionoj谷 " +"Pidgin-i; n谷se riprovoni dhe prap谷 d谷shton, mund t'ju duhet t谷 p谷rdorni " +"'Instaluesin Offline' prej 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 "" +"Gabim gjat谷 Instalimit t谷 Simboleve t谷 Diagnostikimit ($R2).$\\rN谷se " +"riprovoni dhe prap谷 d谷shton, mund t'ju duhet t谷 p谷rdorni 'Instaluesin " +"Offline' prej http://pidgin.im/download/windows/ ." #. $R3 will display the URL that the Dictionary failed to download from #, no-c-format @@ -16000,74 +16024,78 @@ "installation instructions are at: http://developer.pidgin.im/wiki/Installing" "%20Pidgin#manual_win32_spellcheck_installation" msgstr "" +"Gabim gjat谷 Instalimit t谷 Kontrollit t谷 Drejtshkrimit ($R3).$\\rN谷se " +"riprovoni dhe prap谷 d谷shton, udh谷zimet p谷r instalimin dorazi gjenden te: " +"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 Environment (i nevojsh谷m)" +msgstr "GTK+ Runtime (i domosdosh谷m, n谷se nuk 谷sht谷 i pranish谷m)" #. Installer Subsection Text -#, fuzzy msgid "Localizations" -msgstr "Vendndodhje" +msgstr "P谷rkthime" #. "Next >" appears on a button on the License Page of the Installer msgid "Next >" -msgstr "M谷 tej >" +msgstr "Pasuesi >" #. Installer Subsection Text msgid "Pidgin Instant Messaging Client (required)" -msgstr "Klient Shk谷mbimi Mesazhesh t谷 Atyp谷ratysh谷m Pidgin (i nevojsh谷m)" +msgstr "Klienti Pidgin p谷r ShK谷mbim Mesazhesh t谷 Atyp谷ratysh谷m (i domosdosh谷m)" 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 "" +"Pidgin-i lyp nj谷 GTK+ Runtime (q谷 nuk duket se e keni).$\\rJeni i sigurt q谷 " +"d谷shironi t谷 anashkaloni instalimin e GTK+ Runtime?" #. Installer Subsection Text -#, fuzzy msgid "Shortcuts" msgstr "Shkurtore" #. Installer Subsection Detailed Description msgid "Shortcuts for starting Pidgin" -msgstr "" +msgstr "Shkurtore p谷r nisjen e Pidgin-it" #. Installer Subsection Text msgid "Spellchecking Support" -msgstr "" +msgstr "Mbulim Kontrolli Drejtshkrimi" # Autostart #. Installer Subsection Text -#, fuzzy msgid "Start Menu" -msgstr "Nisje" +msgstr "Menu Nisjeje" #. Installer Subsection Detailed Description msgid "" "Support for Spellchecking. (Internet connection required for installation)" msgstr "" +"Mbulim i Kontrollit t谷 Drejtshkrimit. (Lyp lidhje n谷 Internet p谷r instalimin)" msgid "The installer is already running." -msgstr "" +msgstr "Instaluesi 谷sht谷 n谷 xhirim e sip谷r." msgid "" "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely " "that another user installed this application." msgstr "" -"�instaluesi nuk gjeti dot z谷ra regjistri p谷r Pidgin-in.$\\rKa mund谷si q谷 " -"k谷t谷 zbatim ta ket谷 instaluar nj谷 tjet谷r p谷rdorues." +"instaluesi nuk gjeti dot z谷rat e regjistrit p谷r Pidgin-in.$\\rKa gjasa q谷 " +"k谷t谷 zbatim ta ket谷 instaluar nj谷 p谷rdorues tjet谷r." #. Installer Subsection Text -#, fuzzy msgid "URI Handlers" -msgstr "Trajtues URL-je myim" +msgstr "Trajtuesa URI" msgid "" "Unable to uninstall the currently installed version of Pidgin. The new " "version will be installed without removing the currently installed version." msgstr "" +"I pazoti t谷 巽instaloj versionin e tanish谷m t谷 Pidgin-it. Versioni i ri do t谷 " +"instalohet pa hequr versionin e tanish谷m." #. Text displayed on Installer Finish Page msgid "Visit the Pidgin Web Page" @@ -16076,28 +16104,42 @@ msgid "You do not have permission to uninstall this application." msgstr "Nuk keni leje t谷 巽instaloni k谷t谷 zbatim." +#~ msgid "The certificate is not valid yet." +#~ msgstr "D谷shmia nuk 谷sht谷 ende e vlefshme." + #~ msgid "Require SSL/TLS" #~ msgstr "Lyp SSL/TLS" #~ msgid "Force old (port 5223) SSL" #~ msgstr "Detyro SSL t谷 vjet谷r (porta 5223)" -#~ msgid "The name you entered is invalid." -#~ msgstr "Emri q谷 dhat谷 谷sht谷 i pavlefsh谷m." - -# The conversion failed! -#~ msgid "" -#~ "[Unable to display a message from this user because it contained invalid " -#~ "characters.]" -#~ msgstr "" -#~ "[I pazoti t谷 shfaq谷 mesazh prej k谷tij p谷rdoruesi sepse p谷rmbante shenja " -#~ "t谷 pavlefshme.]" - -#~ msgid "Search for Buddy by Information" -#~ msgstr "K谷rko p谷r Shok谷 sipas T谷 dh谷nash" - -#~ msgid "The certificate is not valid yet." -#~ msgstr "D谷shmia nuk 谷sht谷 ende e vlefshme." +#~ msgid "An error occurred on the in-band bytestream transfer\n" +#~ msgstr "Ndodhi nj谷 gabim n谷 shp谷rnguljen \"in-band bytestream\"\n" + +#~ msgid "Transfer was closed." +#~ msgstr "Shp谷rngulja u mbyll." + +#~ msgid "Failed to open in-band bytestream" +#~ msgstr "D谷shtoi n谷 hapjen e \"in-band bytestream\"" + +#~ msgid "Set your friendly name." +#~ msgstr "Caktoni ermin tuaj miq谷sor." + +#~ msgid "Current Mood" +#~ msgstr "Humori i �astit" + +#~ msgid "New Mood" +#~ msgstr "Humori i Ri" + +# if (js->protocol_options & CHANGE_PASSWORD) { +#~ msgid "Change your Mood" +#~ msgstr "Ndryshoni Humorin tuaj" + +#~ msgid "How do you feel right now?" +#~ msgstr "Si ndjeheni tani?" + +#~ msgid "Change Mood..." +#~ msgstr "Ndryshoni Humor..." #~ msgid "The nick name you entered is invalid." #~ msgstr "Nofka q谷 dhat谷 谷sht谷 e mang谷t." @@ -16120,21 +16162,16 @@ #~ msgid "Unknown reason." #~ msgstr "Arsye e panjohur." -#~ msgid "Current Mood" -#~ msgstr "Humori i �astit" - -#~ msgid "New Mood" -#~ msgstr "Humori i Ri" - -# if (js->protocol_options & CHANGE_PASSWORD) { -#~ msgid "Change your Mood" -#~ msgstr "Ndryshoni Humorin tuaj" - -#~ msgid "How do you feel right now?" -#~ msgstr "Si ndjeheni tani?" - -#~ msgid "Change Mood..." -#~ msgstr "Ndryshoni Humor..." +# The conversion failed! +#~ msgid "" +#~ "[Unable to display a message from this user because it contained invalid " +#~ "characters.]" +#~ msgstr "" +#~ "[I pazoti t谷 shfaq谷 mesazh prej k谷tij p谷rdoruesi sepse p谷rmbante shenja " +#~ "t谷 pavlefshme.]" + +#~ msgid "Search for Buddy by Information" +#~ msgstr "K谷rko p谷r Shok谷 sipas T谷 dh谷nash" #~ msgid "Error creating conference." #~ msgstr "Gabim n谷 krijimin e konferenc谷s." @@ -16440,9 +16477,6 @@ #~ msgid "XHTML-IM" #~ msgstr "XHTML-IM" -#~ msgid "User Location" -#~ msgstr "Vendndodhje P谷rdoruesi" - #~ msgid "User Avatar" #~ msgstr "Avatar P谷rdoruesi"
--- a/po/uk.po Sun Nov 21 20:30:12 2010 +0000 +++ b/po/uk.po Sun Dec 05 02:43:54 2010 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 00:12-0400\n" -"PO-Revision-Date: 2010-10-10 21:42+0300\n" +"POT-Creation-Date: 2010-11-21 13:55-0500\n" +"PO-Revision-Date: 2010-11-17 22:25+0300\n" "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n" "Language-Team: Ukrainian <uk@li.org>\n" "Language: uk\n" @@ -4852,17 +4852,6 @@ msgid "Unknown Error in presence" msgstr "�亠于�亟仂仄舒 仗仂仄亳仍从舒 ��舒仆� 仗�亳���仆仂���" -# http://xmpp.org/extensions/xep-0047.html -msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "弌�舒仍舒�� 仗仂仄亳仍从舒 仗亠�亠亟舒于舒仆仆� 于仆�����仆�仂亞仂 仗仂�仂从� 亟舒仆亳� (IBB)\n" - -msgid "Transfer was closed." -msgstr "�亠�亠亟舒于舒仆仆� 弍�仍仂 亰舒从�亳�仂." - -# http://xmpp.org/extensions/xep-0047.html -msgid "Failed to open in-band bytestream" -msgstr "�仂仄亳仍从舒 于�亟从�亳于舒仆仆� 于仆�����仆�仂亞仂 仗仂�仂从� 亟舒仆亳� (IBB)" - #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "" @@ -5178,26 +5167,6 @@ msgid "The username specified does not exist." msgstr "�亳亰仆舒�亠仆亠 �仄'� 从仂�亳���于舒�舒 仆亠 ��仆��." -#, c-format -msgid "Buddy list synchronization issue in %s (%s)" -msgstr "��仂弍仍亠仄舒 �亳仆��仂仆�亰舒��� 仗亠�亠仍�从� 从仂仆�舒从��于 � %s (%s)" - -#, c-format -msgid "" -"%s on the local list is inside the group \"%s\" but not on the server list. " -"Do you want this buddy to be added?" -msgstr "" -"%s � � 仍仂从舒仍�仆仂仄� 仗亠�亠仍�从� � 亞��仗� \"%s\", 舒仍亠 于�亟���仆�亶 � 仗亠�亠仍�从� �亠�于亠�舒. " -"丱仂�亠�亠 亟仂亟舒�亳 �亠亶 从仂仆�舒从�?" - -#, c-format -msgid "" -"%s is on the local list but not on the server list. Do you want this buddy " -"to be added?" -msgstr "" -"%s � � 仍仂从舒仍�仆仂仄� 仗亠�亠仍�从�, 舒仍亠 于�亟���仆�亶 � 仗亠�亠仍�从� �亠�于亠�舒. 丱仂�亠�亠 亟仂亟舒�亳 " -"�亠亶 从仂仆�舒从�?" - msgid "Unable to parse message" msgstr "�亠 于亟舒����� �仂亰�弍�舒�亳 仗仂于�亟仂仄仍亠仆仆�" @@ -5368,6 +5337,26 @@ msgid "MSN Error: %s\n" msgstr "�仂仄亳仍从舒 MSN: %s\n" +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "��仂弍仍亠仄舒 �亳仆��仂仆�亰舒��� 仗亠�亠仍�从� 从仂仆�舒从��于 � %s (%s)" + +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"%s � � 仍仂从舒仍�仆仂仄� 仗亠�亠仍�从� � 亞��仗� \"%s\", 舒仍亠 于�亟���仆�亶 � 仗亠�亠仍�从� �亠�于亠�舒. " +"丱仂�亠�亠 亟仂亟舒�亳 �亠亶 从仂仆�舒从�?" + +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"%s � � 仍仂从舒仍�仆仂仄� 仗亠�亠仍�从�, 舒仍亠 于�亟���仆�亶 � 仗亠�亠仍�从� �亠�于亠�舒. 丱仂�亠�亠 亟仂亟舒�亳 " +"�亠亶 从仂仆�舒从�?" + msgid "Other Contacts" msgstr "�仆�� 从仂仆�舒从�亳" @@ -5420,12 +5409,24 @@ msgid "Set friendly name for %s." msgstr "���舒仆仂于亳�亳 亟��亢仆� �仄'� 亟仍� %s." -msgid "Set your friendly name." -msgstr "�于亠亟��� 于舒�亠 亟��亢仆� �仄'�." +msgid "Set Friendly Name" +msgstr "���舒仆仂于亳�亳 亟��亢仆� �仄'�" msgid "This is the name that other MSN buddies will see you as." msgstr "�仄'�, 仗�亟 �从亳仄 于舒� 弍�亟��� 弍舒�亳�亳 �仆�� 从仂�亳���于舒�� MSN." +msgid "This Location" +msgstr "丶亠 仄���亠亰仆舒�仂亟亢亠仆仆�" + +msgid "This is the name that identifies this location" +msgstr "丶� 仆舒亰于舒 于亳亰仆舒�舒� 仄���亠亰仆舒�仂亟亢亠仆仆�" + +msgid "Other Locations" +msgstr "�仆�亠 仄���亠亰仆舒�仂亟亢亠仆仆�" + +msgid "You can sign out from other locations here" +msgstr "丐�� 于亳 仄仂亢亠�亠 于亳亶�亳 亰 �仆�仂亞仂 仄���亠亰仆舒�仂亟亢亠仆仆�" + msgid "Set your home phone number." msgstr "�于亠亟��� 仆仂仄亠� 于舒�仂亞仂 亟仂仄舒�仆�仂亞仂 �亠仍亠�仂仆�." @@ -5512,6 +5513,9 @@ msgid "Set Friendly Name..." msgstr "���舒仆仂于亳�亳 亟��亢仆� �仄'�..." +msgid "View Locations..." +msgstr "�亠�亠亞仍�仆��亳 仄���亠亰仆舒�仂亟亢亠仆仆�..." + msgid "Set Home Phone Number..." msgstr "���舒仆仂于亳�亳 仆仂仄亠� 亟仂仄舒�仆�仂亞仂 �亠仍亠�仂仆�..." @@ -6898,13 +6902,13 @@ msgid "Please authorize me so I can add you to my buddy list." msgstr "" +"��亟� 仍舒�从舒, 舒于�仂�亳亰�亶�亠 仄亠仆亠 � � 亰仄仂亢� 亟仂亟舒�亳 �舒� 亟仂 仄仂亞仂 仗亠�亠仍�从� 从仂仆�舒从��于." msgid "No reason given." msgstr "��亳�亳仆舒 仆亠 于从舒亰舒仆舒." -#, fuzzy msgid "Authorization Denied Message:" -msgstr "�仂于�亟仂仄仍亠仆仆� 于�亟仄仂于亳 � 舒于�仂�亳亰舒���:" +msgstr "�仂于�亟仂仄仍亠仆仆� 于�亟仄仂于亳 于 舒于�仂�亳亰舒���:" #, c-format msgid "Received unexpected response from %s: %s" @@ -6921,6 +6925,13 @@ "�亳 亰舒仆舒亟�仂 �舒��仂 亰'�亟仆���亠�� �舒 于�亟'�亟仆���亠��. �舒�亠从舒亶�亠 10 �于亳仍亳仆 �舒 " "�仗�仂弍�亶�亠 亰仆仂于�. 亊从�仂 于亳 仗�仂亟仂于亢亳�亠 �仗�仂弍亳, 于舒仄 亟仂于亠亟亠���� �亠从舒�亳 �亠 亟仂于�亠." +msgid "" +"You required encryption in your account settings, but one of the servers " +"doesn't support it." +msgstr "" +"�亳 �于�仄从仆�仍亳 仆亠仂弍��亟仆���� �亳���于舒仆仆� 于 仆舒仍舒���于舒仆仆�� 仂弍仍�从仂于仂亞仂 亰舒仗亳��, 舒仍亠 " +"仂亟亳仆 亰 �亠�于亠��于 仆亠 仗�亟��亳仄�� 亶仂亞仂." + #. Note to translators: The first %s is a URL, the second is an #. error message. #, c-format @@ -6947,12 +6958,18 @@ "encoding he is using, you can specify it in the advanced account options for " "your AIM/ICQ account.)" msgstr "" +"(弌�舒仍舒�� 仗仂仄亳仍从舒 仂��亳仄舒仆仆� ��仂亞仂 仗仂于�亟仂仄仍亠仆仆�. �仂仆�舒从�, 亰 �从亳仄 于亳 " +"�仗�仍从���亠��, 仄仂亢仍亳于仂 于亳从仂�亳��仂于�� �仆�亠 从仂亟�于舒仆仆�, 仆�亢 仂��从������. 亊从�仂 于亳 " +"亰仆舒��亠, �从亠 从仂亟�于舒仆仆� 于�仆 于亳从仂�亳��仂于��, 于亳 仄仂亢亠�亠 于亳亰仆舒�亳�亳 亶仂亞仂 于 " +"�仂亰�亳�亠仆亳� 仆舒仍舒���于舒仆仆�� 仂弍仍�从仂于仂亞仂 亰舒仗亳�� AIM/ICQ.) " #, c-format msgid "" "(There was an error receiving this message. Either you and %s have " "different encodings selected, or %s has a buggy client.)" msgstr "" +"(弌�舒仍舒�� 仗仂仄亳仍从舒 仂��亳仄舒仆仆� ��仂亞仂 仗仂于�亟仂仄仍亠仆仆�. �弍仂 于亳 �舒 %s 仂弍�舒仍亳 ��亰仆� " +"从仂亟�于舒仆仆�, 舒弍仂 %s 从仂�亳�������� 从仍��仆�仂仄 亰 仗仂仄亳仍从舒仄亳.)" msgid "Could not join chat room" msgstr "�亠 于亟舒仍仂�� 仗�亳�亟仆舒�亳�� 亟仂 从�仄仆舒�亳 弍舒仍舒�从亳" @@ -7230,6 +7247,13 @@ "从仂�亳���于舒��于 仄舒��� 弍��亳 仗�舒于亳仍�仆亳仄亳 舒亟�亠�舒仄亳 亠仍. 仗仂��亳 舒弍仂 仗仂�亳仆舒�亳�� 亰 " "仍��亠�亳 �舒 仄���亳�亳 ��仍�从亳 仍��亠�亳, �亳��亳 �舒 仗�仂弍�仍亳, 舒弍仂 ��仍�从亳 �亳��亳." +msgid "" +"You required encryption in your account settings, but encryption is not " +"supported by your system." +msgstr "" +"�亳 �于�仄从仆�仍亳 仆亠仂弍��亟仆���� �亳���于舒仆仆� 于 仆舒仍舒���于舒仆仆�� 仂弍仍�从仂于仂亞仂 亰舒仗亳��, 舒仍亠 " +"�亳���于舒仆仆� 仆亠 仗�亟��亳仄������ 于舒�仂� �亳��亠仄仂�." + #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "�亠亰舒弍舒�仂仄 于舒� 仄仂亢��� 于�亟'�亟仆舒�亳. 亊从�仂 �舒从, 仗亠�亠于���亠 %s 仆舒 仂仆仂于仍亠仆仆�." @@ -7758,13 +7782,11 @@ msgid "Set Privacy Options..." msgstr "���舒仆仂于亳�亳 仂仗��� 仗�亳于舒�仆仂���..." -#, fuzzy msgid "Show Visible List" -msgstr "�仂从舒亰舒�亳 _仗亠�亠仍�从 从仂仆�舒从��于" - -#, fuzzy +msgstr "�仂从舒亰舒�亳 仗亠�亠仍�从 于亳亟亳仄亳�" + msgid "Show Invisible List" -msgstr "�亠�亠仍�从 亰舒仗�仂�亠仆�" +msgstr "�仂从舒亰舒�亳 仗亠�亠仍�从 仆亠于亳亟亳仄亳�" #. AIM actions msgid "Confirm Account" @@ -7782,6 +7804,9 @@ msgid "Search for Buddy by Email Address..." msgstr "丿�从舒�亳 从仂�亳���于舒�舒 亰舒 舒亟�亠�仂� 亠仍.仗仂��亳..." +msgid "Don't use encryption" +msgstr "�亠 于亳从仂�亳��仂于�于舒�亳 �亳���于舒仆仆�" + msgid "Use clientLogin" msgstr "�亳从仂�亳��仂于�于舒�亳 clientLogin" @@ -7897,177 +7922,164 @@ msgid "Voice" msgstr "�仂仍仂�" -#, fuzzy msgid "AIM Direct IM" -msgstr "���仄亠 仄亳���于亠 仗仂于�亟仂仄仍亠仆仆�" - -#, fuzzy +msgstr "AIM Direct IM" + msgid "Get File" -msgstr "�舒亟�亳仍舒仆仆� �舒亶仍�" - -#, fuzzy +msgstr "���亳仄舒�亳 �舒亶仍" + msgid "Games" -msgstr "��舒仄��从舒" +msgstr "�亞�亳" msgid "ICQ Xtraz" -msgstr "" +msgstr "ICQ Xtraz" msgid "Add-Ins" -msgstr "" - -#, fuzzy +msgstr "�仂亟舒�从亳" + msgid "Send Buddy List" -msgstr "�亠�亠仍�从 从仂仆�舒从��于" - -#, fuzzy +msgstr "�舒亟��仍舒�亳 仗亠�亠仍�从 从仂仆�舒从��于" + msgid "ICQ Direct Connect" -msgstr "�仂亰于仂仍亳�亳 仗��仄� 亰'�亟仆舒仆仆�" - -#, fuzzy +msgstr "���仄亠 亰'�亟仆舒仆仆� ICQ" + msgid "AP User" -msgstr "�仂�亳���于舒�" +msgstr "�仂�亳���于舒� AP" msgid "ICQ RTF" -msgstr "" +msgstr "ICQ RTF" msgid "Nihilist" -msgstr "" - -#, fuzzy +msgstr "��亞�仍���" + msgid "ICQ Server Relay" -msgstr "弌亠�于亠� 从舒亢亠:" +msgstr "丐�舒仆亰亳�仆亳亶 �亠�于亠� ICQ" msgid "Old ICQ UTF8" -msgstr "" +msgstr "弌�舒�亳亶 ICQ UTF8" msgid "Trillian Encryption" -msgstr "" +msgstr "丿亳���于舒仆仆� Trillian" msgid "ICQ UTF8" -msgstr "" +msgstr "ICQ UTF8" msgid "Hiptop" -msgstr "" - -#, fuzzy +msgstr "丱�仗-�仂仗" + msgid "Security Enabled" -msgstr "�仂亟 弍亠亰仗亠从亳" - -#, fuzzy +msgstr "�亠亰仗亠从舒 �于�仄从仆亠仆舒" + msgid "Video Chat" -msgstr "_��亟亠仂于亳从仍亳从" - -#, fuzzy +msgstr "��亟亠仂弍舒仍舒�从舒" + msgid "iChat AV" -msgstr "�舒仍舒�从舒" - -#, fuzzy +msgstr "iChat AV" + msgid "Live Video" -msgstr " ��亟亠仂" - -#, fuzzy +msgstr "��亟亠仂 仆舒亢亳于仂" + msgid "Camera" -msgstr "��亟亠仂从舒仄亠�舒" +msgstr "�舒仄亠�舒" msgid "Screen Sharing" -msgstr "" +msgstr "弌仗�仍�仆亳亶 亠从�舒仆" msgid "IP Address" msgstr "IP �亟�亠�舒" -#, fuzzy msgid "Warning Level" -msgstr "�舒��亠�亠亢亠仆仆�" - -#, fuzzy +msgstr "��于亠仆� 亰舒��亠�亠亢亠仆仆�" + msgid "Buddy Comment" -msgstr "�仂仄亠仆�舒� 从仂�亳���于舒�舒:" - -#, fuzzy, c-format +msgstr "�仂仄亠仆�舒� 从仂�亳���于舒�舒" + +#, c-format msgid "User information not available: %s" -msgstr "�亳从仂�亳��仂于�于舒�亳 �亳���于舒仆仆�, 从仂仍亳 �亠 仄仂亢仍亳于仂" +msgstr "��亟仂仄仂��� 仗�仂 从仂�亳���于舒�舒 仆亠亟仂���仗仆�: %s" msgid "Mobile Phone" msgstr "�仂弍�仍�仆亳亶 �亠仍亠�仂仆" -#, fuzzy msgid "Personal Web Page" -msgstr "��仂弍亳��亳亶 仄仂弍�仍�仆亳亶" +msgstr "��仂弍亳��舒 ��仂��仆从舒 �亠仆亠�" #. aim_userinfo_t -#. strip_html_tags -#, fuzzy +#. use_html_status msgid "Additional Information" -msgstr "�亠仂弍仂于'�亰从仂于� 于�亟仂仄仂���:" +msgstr "�仂亟舒�从仂于� 于�亟仂仄仂���" msgid "Zip Code" -msgstr "" - -#, fuzzy +msgstr "�仂��仂于亳亶 从仂亟" + msgid "Work Information" -msgstr "��仍��亠 于�亟仂仄仂��亠亶" +msgstr "��亟仂仄仂��� 仗�仂 �仂弍仂��" msgid "Division" -msgstr "" - -#, fuzzy +msgstr "��亟亟�仍" + msgid "Position" -msgstr "�仗亳�" - -#, fuzzy +msgstr "�仂�舒亟舒" + msgid "Web Page" -msgstr "�仂仄舒�仆� ��仂��仆从舒" - -#, fuzzy +msgstr "弌�仂��仆从舒 �亠仆亠�" + msgid "Online Since" -msgstr "丕 仄亠�亠亢� 亰" +msgstr "� 仄亠�亠亢� 亰" msgid "Member Since" msgstr "丼仍亠仆 亰" msgid "Capabilities" -msgstr "" - -#. 4 separate strings are needed in order to ease translators' job +msgstr "�仂亢仍亳于仂���" + +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear online to the chosen user even when your status is set to +#. Invisible. msgid "Appear Online" msgstr "�'�于亳于�� 于 仄亠�亠亢�" -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user when your status is set to +#. Invisible (this is the default). msgid "Don't Appear Online" -msgstr "�'�于亳于�� 于 仄亠�亠亢�" - +msgstr "�亠 亰'�于仍�于�� 于 仄亠�亠亢�" + +#. Translators: This string is a menu option that, if selected, will cause +#. you to always appear offline to the chosen user (even when your status +#. isn't Invisible). msgid "Appear Offline" msgstr "�'�于亳于�� 仗仂亰舒 仄亠�亠亢亠�" -#, fuzzy +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user if you are invisible, and +#. appear online to the chosen user if you are not invisible (this is the +#. default). msgid "Don't Appear Offline" -msgstr "�'�于亳于�� 仗仂亰舒 仄亠�亠亢亠�" - -#, fuzzy +msgstr "�亠 亰'�于仍�于�� 仗仂亰舒 仄亠�亠亢亠�" + msgid "you have no buddies on this list" -msgstr "�舒� 于亳从亳仆�仍亳 亰 ��仂亞仂 MultiMX." - -#, fuzzy, c-format +msgstr "仆亠仄舒� 从仂仆�舒从��于 于 ��仂仄� 仗亠�亠仍�从�" + +#, c-format msgid "" "You can add a buddy to this list by right-clicking on them and selecting \"%s" "\"" msgstr "" -"�亳 仄仂亢亠�亠 仗仂于�仂�仆仂 亰舒仗亳�舒�亳 舒于�仂�亳亰舒��� 于�亟 �亳� 从仂�亳���于舒��于, 从仍舒�仆�于�亳 仆舒 " -"仆亳� 仗�舒于仂� 从仆仂仗从仂� 仄亳�� �舒 于亳弍�舒于�亳 \"�仂于�仂�仆亳亶 亰舒仗亳� 舒于�仂�亳亰舒���\"." - -#, fuzzy +"�亳 仄仂亢亠�亠 亟仂亟舒�亳 从仂仆�舒从� 亟仂 ��仂亞仂 仗亠�亠仍�从� 仆舒�亳�仆�于�亳 仆舒 仆�仂仄� 仗�舒于仂� " +"从仆仂仗从仂� 仄亳�� 仆舒 于亳弍�舒于�亳 \"%s" + msgid "Visible List" -msgstr "�亳亟亳仄亳亶" +msgstr "�亠�亠仍�从 于亳亟亳仄亳�" msgid "These buddies will see your status when you switch to \"Invisible\"" -msgstr "" - -#, fuzzy +msgstr "丶� 从仂仆�舒从�亳 弍舒�亳�亳仄��� 于舒� ��舒仆, 从仂仍亳 于亳 仗亠�亠仄从仆亠�亠�� 仆舒 \"�亠于亳亟亳仄亳亶\"" + msgid "Invisible List" -msgstr "�亠�亠仍�从 亰舒仗�仂�亠仆�" +msgstr "�亠�亠仍�从 仆亠于亳亟亳仄亳�" msgid "These buddies will always see you as offline" -msgstr "" +msgstr "丶� 从仂仆�舒从�亳 亰舒于亢亟亳 弍�亟��� 弍舒�亳�亳, �仂 于亳 仗仂亰舒 仄亠�亠亢亠�" msgid "Aquarius" msgstr "�仂亟仂仍�亶" @@ -12365,6 +12377,9 @@ msgid "Lao" msgstr "�舒仂" +msgid "Maithili" +msgstr "�舒亶���仍�" + msgid "Macedonian" msgstr "�舒从亠亟仂仆��从舒" @@ -15461,21 +15476,3 @@ msgid "You do not have permission to uninstall this application." msgstr "�亳 仆亠 仄舒��亠 仗�舒于舒 仆舒 于亳亟舒仍亠仆仆� ���� 仗�仂亞�舒仄亳." - -#~ msgid "The certificate has expired and should not be considered valid." -#~ msgstr "丐亠�仄�仆 亟�� �亠��亳��从舒�� 亰舒从�仆�亳于�� � 亶仂亞仂 仆亠 �仍�亟 于于舒亢舒�亳 亟�亶�仆亳仄." - -#~ msgid "_UDP:" -#~ msgstr "_UDP:" - -#~ msgid "_TCP:" -#~ msgstr "_TCP:" - -#~ msgid "_TLS:" -#~ msgstr "_TLS:" - -#~ msgid "Require SSL/TLS" -#~ msgstr "�仂��亠弍�� SSL/TLS" - -#~ msgid "Force old (port 5223) SSL" -#~ msgstr "��亳仄��仂于仂 ��舒�亳亶 (仗仂�� 5223) SSL"
--- a/po/zh_HK.po Sun Nov 21 20:30:12 2010 +0000 +++ b/po/zh_HK.po Sun Dec 05 02:43:54 2010 +0000 @@ -8,7 +8,7 @@ # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE. # # This file is distributed under the same license as the "Pidgin" package. -# $InternalId: zh_TW.po,v 1.650 2010/10/17 14:56:33 acli Exp $ +# $InternalId: zh_TW.po,v 1.655 2010/11/18 06:05:50 acli Exp $ # # ---------------------------------------------------------- # For internal use only: @@ -60,11 +60,11 @@ # msgid "" msgstr "" -"Project-Id-Version: Pidgin 2.7.4\n" +"Project-Id-Version: Pidgin 2.7.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 00:12-0400\n" -"PO-Revision-Date: 2010-10-17 10:55-0400\n" -"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n" +"POT-Creation-Date: 2010-11-21 13:55-0500\n" +"PO-Revision-Date: 2010-11-15 16:24-0500\n" +"Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n" "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n" "Language: zh_HK\n" "MIME-Version: 1.0\n" @@ -5036,16 +5036,6 @@ msgid "Unknown Error in presence" msgstr "筝���������莖�荐����" -msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "絽九�т���腟�羌��活叱��筝㊦�主�����\n" - -# XXX �����頑⑮��茴�������鐚� 20090305 acli -msgid "Transfer was closed." -msgstr "�活叱綏画←筝㊥②��" - -msgid "Failed to open in-band bytestream" -msgstr "�≧�����絽九�т���腟�羌�" - #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "�≧��渇��罟�罅��� %s鐚����阪��剛���吚�罅��活叱" @@ -5465,28 +5455,6 @@ msgid "The username specified does not exist." msgstr "篏���莠後�ョ��絽活��筝��絖�����" -# XXX ��⑮ -#, c-format -msgid "Buddy list synchronization issue in %s (%s)" -msgstr "�� %s (%s) ��絅遵�羝����画���罩ュ����筝㊤�榊憜�馹�" - -# XXX ��⑮ -#, c-format -msgid "" -"%s on the local list is inside the group \"%s\" but not on the server list. " -"Do you want this buddy to be added?" -msgstr "" -"%s �����亥���絅遵�羝�������%s��臂ｇ�茖���私���失�����鐚�篏�荀��医�����絅遵��割失����" -"��絅遵�羝������" - -# XXX ��⑮ -#, c-format -msgid "" -"%s is on the local list but not on the server list. Do you want this buddy " -"to be added?" -msgstr "" -"%s �����亥���絅遵�羝�����や���失�����鐚�篏�荀��医�����絅遵��割失������絅遵�羝������" - msgid "Unable to parse message" msgstr "�≧�茹ｆ��荐���" @@ -5665,6 +5633,28 @@ msgid "MSN Error: %s\n" msgstr "MSN ���鐚�%s\n" +# XXX ��⑮ +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "�� %s (%s) ��絅遵�羝����画���罩ュ����筝㊤�榊憜�馹�" + +# XXX ��⑮ +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"%s �����亥���絅遵�羝�������%s��臂ｇ�茖���私���失�����鐚�篏�荀��医�����絅遵��割失����" +"��絅遵�羝������" + +# XXX ��⑮ +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"%s �����亥���絅遵�羝�����や���失�����鐚�篏�荀��医�����絅遵��割失������絅遵�羝������" + # XXX ��⑮鐚���緇��拷�� - 20090226 acli # NOTE: (09��14��13腱� EST) wing: what does "Other Contacts" (msn/group.h:36) actually mean? .. # NOTE: (09��24��18腱� EST) khc: I'd probably just translate to �銀�篋�, hehe @@ -5720,8 +5710,8 @@ msgid "Set friendly name for %s." msgstr "荐㊤� %s ��膓峨����" -msgid "Set your friendly name." -msgstr "荐㊤�篏���膓峨����" +msgid "Set Friendly Name" +msgstr "荐㊤�膓峨��" # NOTE MSN���援┗筝���Yahoo鐚�篏睡������札莠後�ヤ算篏����井�援┗鐚� # NOTE �割戎��篏睡������絽活��罸��♂��篆�鐚�篌寂�箙��������� @@ -5729,6 +5719,18 @@ msgid "This is the name that other MSN buddies will see you as." msgstr "�ヤ査�� MSN �ラ�延�����篋肴�����蕁�ず����膓峨����" +msgid "This Location" +msgstr "���������臀�" + +msgid "This is the name that identifies this location" +msgstr "�����������臀��篁ラ������腮延撮茵�" + +msgid "Other Locations" +msgstr "�銀������臀�" + +msgid "You can sign out from other locations here" +msgstr "篏�������茖�嶃�阪�銀������臀�" + msgid "Set your home phone number." msgstr "荐㊤�篏���絎句���肢���腆若��" @@ -5815,6 +5817,9 @@ msgid "Set Friendly Name..." msgstr "荐㊤�膓峨��..." +msgid "View Locations..." +msgstr "罟∵������臀�..." + msgid "Set Home Phone Number..." msgstr "荐㊤�絎句���肢���腆�..." @@ -7195,7 +7200,7 @@ msgstr "篌堺������荐���" msgid "Please authorize me so I can add you to my buddy list." -msgstr "茫���������茯�茘�荀�羆�鐚�絅処�����札絨������ユ����絅遵�羝���賢��" +msgstr "茫���������茯�茘�荀�羆�鐚�絅処�����札絨�篏����ユ����絅遵�羝���賢��" msgid "No reason given." msgstr "羃���腟��������" @@ -7220,6 +7225,11 @@ "篏����ｇ�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋���篏�箴��句梗膾���荅��ｇ�鐚�" "�ｉ瑳篏���膈�緇�����絨����翫����綮狗�激��" +msgid "" +"You required encryption in your account settings, but one of the servers " +"doesn't support it." +msgstr "篏���験��荐㊤�筝㊥��絎�篋�篏睡����絲�鐚�篏��銀賢筝���篌堺�������吓��絲����純��" + # NOTE �����荀�羆� %s��絅遵���鋋��� - acli 20090902 #. Note to translators: The first %s is a URL, the second is an #. error message. @@ -7246,8 +7256,8 @@ "encoding he is using, you can specify it in the advanced account options for " "your AIM/ICQ account.)" msgstr "" -"鐚��ユ�狗����荐������主��篋������罩ｅ�����困茫���絅遵�緇����遵��戎�������喝�鋇�箙���絖���" -"膩�⊆鐚�絋������ラ���ｆ���藝主隈腆種�茫������� AIM/ICQ 絽活�������臥��┃絎���筝㊦����膩�⊆��" +"鐚��ユ�狗����荐������主��篋������罩ｅ���篏�篋よ���絅遵�緇����遵��戎����篏��喝�鋇�箙���絖�膃�" +"膩�⊆鐚�絋���篏��ラ���ｆ���藝主隈腆種�茫������ AIM/ICQ 絽活�������臥��┃絎���筝㊦����膩�⊆��" "罨�篏���絎���鐚�" #, c-format @@ -7255,7 +7265,7 @@ "(There was an error receiving this message. Either you and %s have " "different encodings selected, or %s has a buggy client.)" msgstr "" -"鐚��ユ�狗����荐������主��篋���������醇���� %s �悟���筝�����膩�⊆鐚�箙������醇�� %s ��戎" +"鐚��ユ�狗����荐������主��篋���������巡��� %s �悟���筝�����膩�⊆鐚�箙������醇�� %s ��戎" "�����馹������句�腮�綣����" msgid "Could not join chat room" @@ -7538,6 +7548,11 @@ "�≧�篁� %s 荳�蚕�糸�ワ����咲����絽活�����≧������絽活��綽����堺�����脂�球�医��鐚�����篁ヨ�掩��" "絖�罸�莎桁�鐚�筝�Û���掩��絖�罸����後���腥榊�緒��������掩�後�腟�����" +msgid "" +"You required encryption in your account settings, but encryption is not " +"supported by your system." +msgstr "篏���験��荐㊤�筝㊥��絎�篋�篏睡����絲�鐚�篏�篏���膤紫輝筝���吓��絲����純��" + #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "篏����醇�����㊥�����т賢�潔�ｇ���絋���絮��鐚�茫��� %s ������羃����贋�違��" @@ -8027,13 +8042,11 @@ msgid "Set Privacy Options..." msgstr "荐㊤�腱��演�檎��..." -#, fuzzy msgid "Show Visible List" -msgstr "����" - -#, fuzzy +msgstr "蕁�ず���援┗筝�膩���羝���" + msgid "Show Invisible List" -msgstr "��茫�羝���" +msgstr "蕁�ず���援┗�∝���羝���" #. AIM actions msgid "Confirm Account" @@ -8051,6 +8064,9 @@ msgid "Search for Buddy by Email Address..." msgstr "篏睡���糸��灸散�医����絨�絅遵�..." +msgid "Don't use encryption" +msgstr "筝�篏睡����絲�" + msgid "Use clientLogin" msgstr "篏睡�� clientLogin" @@ -8247,7 +8263,7 @@ msgstr "iChat 荀����鎀�" msgid "Live Video" -msgstr "����荀�荐�" +msgstr "����荀���" # NOTE AIM_CAPS_CAMERA鐚��恰���藝弱��(^^;) msgid "Camera" @@ -8266,10 +8282,9 @@ msgid "Buddy Comment" msgstr "絅遵���荐�" -# NOTE Connection security �檎��鐚�����失������吡����羈�筝�篏睡�� TLS, 絋�篌堺�������� TLS ��鋌ヤ���絲����劫�膵主��画��ｇ� -#, fuzzy, c-format +#, c-format msgid "User information not available: %s" -msgstr "�銀失������吚��鐚�篏睡����絲�����" +msgstr "�鞘��遺戎����莖�荐�鐚�%s" msgid "Mobile Phone" msgstr "羌����肢�" @@ -8278,12 +8293,12 @@ msgstr "��篋榊恐��" #. aim_userinfo_t -#. strip_html_tags +#. use_html_status msgid "Additional Information" msgstr "�銀�莖�荐�" msgid "Zip Code" -msgstr "�級������" +msgstr "�級��膩���" msgid "Work Information" msgstr "綏ヤ�莖�荐�" @@ -8305,50 +8320,63 @@ msgstr "���堺���∞������" msgid "Capabilities" -msgstr "�後���" - -#. 4 separate strings are needed in order to ease translators' job +msgstr "�弱���" + +# NOTE ������絖�筝峨�� Oscar (ICQ) ��茹ｉ����④鐚�http://pidgin.im/pipermail/translators/2010-November/000554.html +# NOTE Oscar: ��絅遵��医��� Visible List �� +# NOTE Yahoo: �����冴���沿昆����鐚�絨�����絎���絅遵��援┗筝�膩� +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear online to the chosen user even when your status is set to +#. Invisible. msgid "Appear Online" msgstr "�援┗筝�膩�" -#, fuzzy +# NOTE ��絅遵�緇� Visible List �хЩ�� +# NOTE ���� "Don't Appear Permanently Offline" +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user when your status is set to +#. Invisible (this is the default). msgid "Don't Appear Online" -msgstr "�援┗筝�膩�" - -# NOTE 筝�罨∞�糸�ユ��筝��援┗�∝�鐚���篁ュ����������絖��� +msgstr "��罩√�援┗筝�膩�" + +# NOTE Oscar: ��絅遵��医��� Invisible List �� +# NOTE Yahoo: �����冴���沿昆����鐚�絨�����絎���絅遵��援┗�∝� +#. Translators: This string is a menu option that, if selected, will cause +#. you to always appear offline to the chosen user (even when your status +#. isn't Invisible). msgid "Appear Offline" -msgstr "�����援┗�∝�" - -# NOTE 筝�罨∞�糸�ユ��筝��援┗�∝�鐚���篁ュ����������絖��� -#, fuzzy +msgstr "�援┗�∝�" + +# NOTE ��絅遵�緇� Invisible List �хЩ�� +# NOTE ���� "Don't Appear Permanently Offline" +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user if you are invisible, and +#. appear online to the chosen user if you are not invisible (this is the +#. default). msgid "Don't Appear Offline" -msgstr "�����援┗�∝�" - -#, fuzzy +msgstr "��罩√�援┗�∝�" + msgid "you have no buddies on this list" -msgstr "篏�綏牙�緇�MultiMX筝㊧←荼√�冴��" - -#, fuzzy, c-format +msgstr "��羝����ф���絅遵�" + +#, c-format msgid "" "You can add a buddy to this list by right-clicking on them and selecting \"%s" "\"" msgstr "" -"篏���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御��" -"��荀�羆����域�茘�����" - -#, fuzzy +"��絅遵��医�����羝����э������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御����%s��" + msgid "Visible List" -msgstr "����" +msgstr "���援┗筝�膩���羝���" msgid "These buddies will see your status when you switch to \"Invisible\"" -msgstr "" - -#, fuzzy +msgstr "��篋�絅遵�����沿昆��篁��順��荀�篏���筝�膩�����" + msgid "Invisible List" -msgstr "��茫�羝���" +msgstr "���援┗�∝���羝���" msgid "These buddies will always see you as offline" -msgstr "" +msgstr "�傑��������篋�絅遵��沿昆" msgid "Aquarius" msgstr "羂雁Г綺�" @@ -8426,7 +8454,7 @@ msgstr "�銀�" msgid "Visible" -msgstr "����" +msgstr "筝��沿昆" # XXX ��⑮ - 20090226 msgid "Friend Only" @@ -10798,6 +10826,7 @@ msgstr "筝���失�������羝���賢" # NOTE Yahoo 絎��壕⑮��羂檎��蕁�ず�∝���鐚�茯��巡�藥��九��恰�����絨���篋削����傑����荳��� +# NOTE ���� "Appear Offline" msgid "Appear Permanently Offline" msgstr "�傑���援┗�∝�" @@ -10805,6 +10834,7 @@ msgstr "�丞��" # NOTE ��������х��筝�����篁� +# NOTE ���� "Don't Appear Offline" msgid "Don't Appear Permanently Offline" msgstr "��罩∫�傑���援┗�∝�" @@ -12779,6 +12809,11 @@ msgid "Lao" msgstr "絲�����" +# NOTE 篁ｇ⊆ mai鐚��医墾��筝�腮��壕�鐚�膓㊤�榊�丞�茘������������ +# XXX �鞘��井③綣���佂�ｈ⑮��鐚����� http://zh.wikipedia.org/zh/菴������, http://tc.wangchao.net.cn/baike/detail_2071696.html +msgid "Maithili" +msgstr "��������" + # NOTE��薤��狗���������腮��掩�茯���鐚�莊�絽�����薤��狗��筝��♂��篆� msgid "Macedonian" msgstr "薤��狗����" @@ -15969,6 +16004,19 @@ msgid "You do not have permission to uninstall this application." msgstr "篏�羃���罨���腱脂�ょ�綣��" +#~ msgid "An error occurred on the in-band bytestream transfer\n" +#~ msgstr "鎵九�т���腟�羌��活叱��筝㊦�主�����\n" + +# XXX �����頑⑮��茴�������鐚� 20090305 acli +#~ msgid "Transfer was closed." +#~ msgstr "�活叱綏画←筝㊥②��" + +#~ msgid "Failed to open in-band bytestream" +#~ msgstr "�≧�����絽九�т���腟�羌�" + +#~ msgid "Set your friendly name." +#~ msgstr "荐㊤������援┗��" + #~ msgid "The certificate has expired and should not be considered valid." #~ msgstr "��綣究��茘�綏臥�丈��鐚���荀�篏��≧����"
--- a/po/zh_TW.po Sun Nov 21 20:30:12 2010 +0000 +++ b/po/zh_TW.po Sun Dec 05 02:43:54 2010 +0000 @@ -6,7 +6,7 @@ # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE. # # This file is distributed under the same license as the "Pidgin" package. -# $InternalId: zh_TW.po,v 1.650 2010/10/17 14:56:33 acli Exp $ +# $InternalId: zh_TW.po,v 1.655 2010/11/18 06:05:50 acli Exp $ # # ---------------------------------------------------------- # For internal use only: @@ -58,11 +58,11 @@ # msgid "" msgstr "" -"Project-Id-Version: Pidgin 2.7.4\n" +"Project-Id-Version: Pidgin 2.7.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 00:12-0400\n" -"PO-Revision-Date: 2010-10-17 10:55-0400\n" -"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n" +"POT-Creation-Date: 2010-11-21 13:55-0500\n" +"PO-Revision-Date: 2010-11-15 16:24-0500\n" +"Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n" "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" @@ -373,10 +373,10 @@ msgstr "絋���荀���臀���腮縁�茫�莠後�ョ��遵�筝蚊��" msgid "Removing this contact will also remove all the buddies in the contact" -msgstr "腱脂�ら��腟�絅遵�������腱脂�よ��∝������絅遵�" +msgstr "腱脂�ら��腟�絅遵�������腱脂�よ��∝������絅遵�" msgid "Removing this group will also remove all the buddies in the group" -msgstr "腱脂�ら����臂ょ�������腱脂�よ��∝������絅遵�" +msgstr "腱脂�ら����臂ょ�������腱脂�よ��∝������絅遵�" #, c-format msgid "Are you sure you want to remove %s?" @@ -728,14 +728,14 @@ msgstr "��吡���ら���檎����鐚�plugins version" msgid "No such command (in this context)." -msgstr "羃���������篁わ�������茖鋎睡���" +msgstr "羃���������篁わ�������茖＞戎���" msgid "" "Use \"/help <command>\" for help on a specific command.\n" "The following commands are available in this context:\n" msgstr "" "荀��峨���筝���篁ょ��茯����莠後�ャ��/help <��篁�>���喝���\n" -"����茖����������篁ゆ��鐚�\n" +"����茖￥���������篁ゆ��鐚�\n" #, c-format msgid "" @@ -5034,16 +5034,6 @@ msgid "Unknown Error in presence" msgstr "筝���������莖�荐����" -msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "絽九�т���腟�羌��活叱��筝㊦�主�����\n" - -# XXX �����頑⑮��茴�������鐚� 20090305 acli -msgid "Transfer was closed." -msgstr "�活叱綏画←筝㊥②��" - -msgid "Failed to open in-band bytestream" -msgstr "�≧�����絽九�т���腟�羌�" - #, c-format msgid "Unable to send file to %s, user does not support file transfers" msgstr "�≧��渇��罟�罅��� %s鐚����阪��剛���吚�罅��活叱" @@ -5463,28 +5453,6 @@ msgid "The username specified does not exist." msgstr "����莠後�ョ��絽活��筝��絖�����" -# XXX ��⑮ -#, c-format -msgid "Buddy list synchronization issue in %s (%s)" -msgstr "�� %s (%s) ��絅遵�羝����画���罩ュ����筝㊤�榊憜�馹�" - -# XXX ��⑮ -#, c-format -msgid "" -"%s on the local list is inside the group \"%s\" but not on the server list. " -"Do you want this buddy to be added?" -msgstr "" -"%s �����亥���絅遵�羝�������%s��臂ょ�茖���私���失�����鐚�����医�����絅遵��割失����" -"��絅遵�羝������" - -# XXX ��⑮ -#, c-format -msgid "" -"%s is on the local list but not on the server list. Do you want this buddy " -"to be added?" -msgstr "" -"%s �����亥���絅遵�羝�����や���失�����鐚�����医�����絅遵��割失������絅遵�羝������" - msgid "Unable to parse message" msgstr "�≧�茹ｆ��荐���" @@ -5663,6 +5631,28 @@ msgid "MSN Error: %s\n" msgstr "MSN ���鐚�%s\n" +# XXX ��⑮ +#, c-format +msgid "Buddy list synchronization issue in %s (%s)" +msgstr "�� %s (%s) ��絅遵�羝����画���罩ュ����筝㊤�榊憜�馹�" + +# XXX ��⑮ +#, c-format +msgid "" +"%s on the local list is inside the group \"%s\" but not on the server list. " +"Do you want this buddy to be added?" +msgstr "" +"%s �����亥���絅遵�羝�������%s��臂ょ�茖￥��私���失�����鐚�����医�����絅遵��割失����" +"��絅遵�羝������" + +# XXX ��⑮ +#, c-format +msgid "" +"%s is on the local list but not on the server list. Do you want this buddy " +"to be added?" +msgstr "" +"%s �����亥���絅遵�羝�����や���失�����鐚�����医�����絅遵��割失������絅遵�羝������" + # XXX ��⑮鐚���緇��拷�� - 20090226 acli # NOTE: (09��14��13腱� EST) wing: what does "Other Contacts" (msn/group.h:36) actually mean? .. # NOTE: (09��24��18腱� EST) khc: I'd probably just translate to �銀�篋�, hehe @@ -5679,7 +5669,7 @@ #, c-format msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>" -msgstr "%s 絨������種�<a href='msn-wink://%s'>茫�藥�����茖���冗������篏�</a>" +msgstr "%s 絨������種�<a href='msn-wink://%s'>茫�藥�����茖≧�㊥�冗������篏�</a>" #, c-format msgid "%s sent a wink, but it could not be saved" @@ -5687,7 +5677,7 @@ #, 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 msgid "%s sent a voice clip, but it could not be saved" @@ -5718,8 +5708,8 @@ msgid "Set friendly name for %s." msgstr "荐㊤� %s ���援┗��" -msgid "Set your friendly name." -msgstr "荐㊤������援┗��" +msgid "Set Friendly Name" +msgstr "荐㊤��援┗" # NOTE MSN���援┗筝���Yahoo鐚�篏睡������札莠後�ヤ算篏����井�援┗鐚� # NOTE �割戎��篏睡������絽活��罸��♂��篆�鐚�篌寂�箙��������� @@ -5727,6 +5717,18 @@ msgid "This is the name that other MSN buddies will see you as." msgstr "�ヤ査�� MSN �ラ�掩������篋肴�����蕁�ず�����援┗��" +msgid "This Location" +msgstr "���������臀�" + +msgid "This is the name that identifies this location" +msgstr "�����������臀��篁ラ������腮延撮茵�" + +msgid "Other Locations" +msgstr "�銀������臀�" + +msgid "You can sign out from other locations here" +msgstr "�������茖∞�糸�阪�銀������臀�" + msgid "Set your home phone number." msgstr "荐㊤�����篏鎘狗�肢���腆若��" @@ -5780,7 +5782,7 @@ msgstr "罩ｅ��轡篏�" msgid "Has you" -msgstr "篏����鐚�絅刻���絅遵�羝����" +msgstr "篏����鐚�絅刻���絅遵�羝����" msgid "Home Phone Number" msgstr "篏鎘狗�肢���腆�" @@ -5813,6 +5815,9 @@ msgid "Set Friendly Name..." msgstr "荐㊤��援┗..." +msgid "View Locations..." +msgstr "罟∵������臀�..." + msgid "Set Home Phone Number..." msgstr "荐㊤�篏鎘狗�肢���腆�..." @@ -6293,7 +6298,7 @@ msgstr "�贋�医��篋肴���" msgid "Here you can update your MXit profile" -msgstr "���札����茖�吚�井���� MXit ����篋肴���" +msgstr "���札����茖≧�贋�井���� MXit ����篋肴���" msgid "View Splash" msgstr "罟∵���������" @@ -7218,6 +7223,11 @@ "�����ｇ�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����" "膩�鐚��ｉ瑳����膈�緇�����絨����翫����綮狗�激��" +msgid "" +"You required encryption in your account settings, but one of the servers " +"doesn't support it." +msgstr "����験��荐㊤�筝㊥��絎�篋�篏睡����絲�鐚�篏��銀賢筝���篌堺�������吓��絲����純��" + # NOTE �����荀�羆� %s��絅遵���鋋��� - acli 20090902 #. Note to translators: The first %s is a URL, the second is an #. error message. @@ -7231,7 +7241,7 @@ msgstr "篌堺����；腓榊�糸�ュ��綽���絎�������薊�茘�鐚�篏������句�絨�����吓����薊�茘���" msgid "AOL does not allow your screen name to authenticate here" -msgstr "AOL 筝���荐掩����絽活������茖�嶃��" +msgstr "AOL 筝���荐掩����絽活������茖∞�糸��" # NOTE �����荀�羆� %s��絅遵���鋋��� - acli 20090902 #, c-format @@ -7536,6 +7546,11 @@ "�≧�篁� %s 荳�蚕�糸�ワ����咲����絽活�����≧������絽活��綽����堺�����脂�球�医��鐚�����篁ヨ�掩��" "絖�罸�莎桁�鐚�筝�Û���掩��絖�罸����後���腥榊�緒��������掩�後�腟�����" +msgid "" +"You required encryption in your account settings, but encryption is not " +"supported by your system." +msgstr "����験��荐㊤�筝㊥��絎�篋�篏睡����絲�鐚�篏�����膤紫輝筝���吓��絲����純��" + #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "����醇�����㊥�����т賢�潔�ｇ���絋���絮��鐚�茫��� %s ������羃����贋�違��" @@ -8025,13 +8040,11 @@ msgid "Set Privacy Options..." msgstr "荐㊤��援��檎��..." -#, fuzzy msgid "Show Visible List" -msgstr "����" - -#, fuzzy +msgstr "蕁�ず���援┗筝�膩���羝���" + msgid "Show Invisible List" -msgstr "��茫�羝���" +msgstr "蕁�ず���援┗�∝���羝���" #. AIM actions msgid "Confirm Account" @@ -8049,6 +8062,9 @@ msgid "Search for Buddy by Email Address..." msgstr "篏睡���糸��灸散�医����絨�絅遵�..." +msgid "Don't use encryption" +msgstr "筝�篏睡����絲�" + msgid "Use clientLogin" msgstr "篏睡�� clientLogin" @@ -8264,10 +8280,9 @@ msgid "Buddy Comment" msgstr "絅遵���荐�" -# NOTE Connection security �檎��鐚�����失������吡����羈�筝�篏睡�� TLS, 絋�篌堺�������� TLS ��鋌ヤ���絲����劫�膵主��画��ｇ� -#, fuzzy, c-format +#, c-format msgid "User information not available: %s" -msgstr "�銀失������吚��鐚�篏睡����絲�����" +msgstr "�鞘��遺戎����莖�荐�鐚�%s" msgid "Mobile Phone" msgstr "茵����肢�" @@ -8276,7 +8291,7 @@ msgstr "��篋榊恐��" #. aim_userinfo_t -#. strip_html_tags +#. use_html_status msgid "Additional Information" msgstr "�銀�莖�荐�" @@ -8305,48 +8320,61 @@ msgid "Capabilities" msgstr "�後���" -#. 4 separate strings are needed in order to ease translators' job +# NOTE ������絖�筝峨�� Oscar (ICQ) ��茹ｉ����④鐚�http://pidgin.im/pipermail/translators/2010-November/000554.html +# NOTE Oscar: ��絅遵��医��� Visible List �� +# NOTE Yahoo: �����冴���沿昆����鐚�絨�����絎���絅遵��援┗筝�膩� +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear online to the chosen user even when your status is set to +#. Invisible. msgid "Appear Online" msgstr "�援┗筝�膩�" -#, fuzzy +# NOTE ��絅遵�緇� Visible List �хЩ�� +# NOTE ���� "Don't Appear Permanently Offline" +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user when your status is set to +#. Invisible (this is the default). msgid "Don't Appear Online" -msgstr "�援┗筝�膩�" - -# NOTE 筝�罨∞�糸�ユ��筝��援┗�∝�鐚���篁ュ����������絖��� +msgstr "��罩√�援┗筝�膩�" + +# NOTE Oscar: ��絅遵��医��� Invisible List �� +# NOTE Yahoo: �����冴���沿昆����鐚�絨�����絎���絅遵��援┗�∝� +#. Translators: This string is a menu option that, if selected, will cause +#. you to always appear offline to the chosen user (even when your status +#. isn't Invisible). msgid "Appear Offline" -msgstr "�����援┗�∝�" - -# NOTE 筝�罨∞�糸�ユ��筝��援┗�∝�鐚���篁ュ����������絖��� -#, fuzzy +msgstr "�援┗�∝�" + +# NOTE ��絅遵�緇� Invisible List �хЩ�� +# NOTE ���� "Don't Appear Permanently Offline" +#. Translators: This string is a menu option that, if selected, will cause +#. you to appear offline to the chosen user if you are invisible, and +#. appear online to the chosen user if you are not invisible (this is the +#. default). msgid "Don't Appear Offline" -msgstr "�����援┗�∝�" - -#, fuzzy +msgstr "��罩√�援┗�∝�" + msgid "you have no buddies on this list" -msgstr "��群膓�緇�MultiMX筝㊧←荼√�冴��" - -#, fuzzy, c-format +msgstr "��羝����ф���絅遵�" + +#, c-format msgid "" "You can add a buddy to this list by right-clicking on them and selecting \"%s" "\"" msgstr "" -"���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御��" -"��荀�羆����域�茘�����" - -#, fuzzy +"��絅遵��医�����羝����э������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御����%s��" + msgid "Visible List" -msgstr "����" +msgstr "���援┗筝�膩���羝���" msgid "These buddies will see your status when you switch to \"Invisible\"" -msgstr "" - -#, fuzzy +msgstr "��篋�絅遵������沿昆��篁��順��荀�����筝�膩�����" + msgid "Invisible List" -msgstr "��茫�羝���" +msgstr "���援┗�∝���羝���" msgid "These buddies will always see you as offline" -msgstr "" +msgstr "�傑��������篋�絅遵��沿昆" msgid "Aquarius" msgstr "羂雁Г綺�" @@ -8424,7 +8452,7 @@ msgstr "�銀�" msgid "Visible" -msgstr "����" +msgstr "筝��沿昆" # XXX ��⑮ - 20090226 msgid "Friend Only" @@ -10792,6 +10820,7 @@ msgstr "筝���失�������羝���賢" # NOTE Yahoo 絎��壕⑮��羂檎��蕁�ず�∝���鐚�茯��巡�藥��九��恰�����絨���篋削����傑����荳��� +# NOTE ���� "Appear Offline" msgid "Appear Permanently Offline" msgstr "�傑���援┗�∝�" @@ -10799,6 +10828,7 @@ msgstr "�丞��" # NOTE ��������х��筝�����篁� +# NOTE ���� "Don't Appear Offline" msgid "Don't Appear Permanently Offline" msgstr "��罩∫�傑���援┗�∝�" @@ -12773,6 +12803,11 @@ msgid "Lao" msgstr "絲�����" +# NOTE 篁ｇ⊆ mai鐚��医墾��筝�腮��壕�鐚�膓㊤�榊�丞�茘������������ +# XXX �鞘��井③綣���佂�ｈ⑮��鐚����� http://zh.wikipedia.org/zh/菴������, http://tc.wangchao.net.cn/baike/detail_2071696.html +msgid "Maithili" +msgstr "��������" + # NOTE��薤��狗���������腮��掩�茯���鐚�莊�絽�����薤��狗��筝��♂��篆� msgid "Macedonian" msgstr "薤��狗����" @@ -12951,7 +12986,7 @@ "絋���絽����峨�<font size=\"4\">�銀� Pidgin 篏睡������箴������</font>�����脂�笈��<a " "href=\"mailto:support@pidgin.im\">support@pidgin.im</a>��<br/>������<b>������" "</b>�灸散茫�紕�鐚�鐚�<a href=\"http://pidgin.im/pipermail/support/\">茫�紕�絖�罟�茫�藥�" -"����茖�</a>鐚�<br/>���紕���筝��榊�筝������主��罔∞�鐚�������荐���絎�罔∞�鐚���箴�篁私���" +"����茖�</a>鐚�<br/>���紕���筝��榊�筝������主��罔∞�鐚�������荐���絎�罔∞�鐚���箴�篁私���" "�器�<br/>�弱�茫�篁�<b>�掩��</b>�坂源鐚�篁ヤ賢�����銀�茯����弱�篋���篏��九�亥����荀����" "������<br/>" @@ -14685,7 +14720,7 @@ "The buddy with the <i>largest score</i> is the buddy who will have priority " "in the contact.\n" msgstr "" -"�ユ��筝���絅遵��九�网����絅遵江��絅遵�絽活��鐚���荐���箴炊�号����茖�\n" +"�ユ��筝���絅遵��九�网����絅遵江��絅遵�絽活��鐚���荐���箴炊�号����茖�\n" "��腟����緇����取���鐚�腥�����紊����冴��������鐚����榊�倶��絲���\n" "篏睡����絅遵�絽活����\n" @@ -15963,6 +15998,19 @@ msgid "You do not have permission to uninstall this application." msgstr "�����罨���腱脂�ょ�綣��" +#~ msgid "An error occurred on the in-band bytestream transfer\n" +#~ msgstr "鎵九�т���腟�羌��活叱��筝㊦�主�����\n" + +# XXX �����頑⑮��茴�������鐚� 20090305 acli +#~ msgid "Transfer was closed." +#~ msgstr "�活叱綏画←筝㊥②��" + +#~ msgid "Failed to open in-band bytestream" +#~ msgstr "�≧�����絽九�т���腟�羌�" + +#~ msgid "Set your friendly name." +#~ msgstr "荐㊤������援┗��" + #~ msgid "The certificate has expired and should not be considered valid." #~ msgstr "��綣究��茘�綏臥�丈��鐚���荀�篏��≧����"