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