# HG changeset patch # User tdrhq@soc.pidgin.im # Date 1249068006 0 # Node ID 0907b0c775bb45067a7c6e27a72604a4d0a32bc6 # Parent 9d43d9d33477b2a4b05cc13f1597373c8d489898# Parent 67143ecbddb108e0d330691a56d825dfb7128a60 propagate from branch 'im.pidgin.pidgin' (head 20e16d28b924016a1310911f9b12376bba9a9859) to branch 'im.pidgin.soc.2009.webkitmessageview' (head caf26362b3e2cf1b68af44d07d8b62d6486c29b2) diff -r 67143ecbddb1 -r 0907b0c775bb COPYRIGHT --- a/COPYRIGHT Mon Jul 27 03:14:08 2009 +0000 +++ b/COPYRIGHT Fri Jul 31 19:20:06 2009 +0000 @@ -1,8 +1,21 @@ Pidgin, Finch, and libpurple -Copyright (C) 1998-2009 by the following: + +This file is intended to be a comprehensive list of contributors to +this project. If you have contributed to this project then you deserve +to be on this list. Contact us (see: AUTHORS) and we'll add you. -If you have contributed to this project then you deserve to be on this -list. Contact us (see: AUTHORS) and we'll add you. +Many open source projects list contributor names at the top of each +source file containing their contribution. However, we've found +that it is difficult to keep this list accurate, especially when old +code is removed or existing code is moved to a different file. So +instead we chose to list a generic message at the top of each source +file that points here. + +If concerns are raised as to the copyright holder of a particular +piece of code, then that code should be traced through our version +control system to see from where it came and who has modified it. + +Copyright (C) 1998-2009 by the following: Saleem Abdulrasool Dave Ahlswede diff -r 67143ecbddb1 -r 0907b0c775bb ChangeLog --- a/ChangeLog Mon Jul 27 03:14:08 2009 +0000 +++ b/ChangeLog Fri Jul 31 19:20:06 2009 +0000 @@ -10,7 +10,8 @@ in a group on the buddy list. * Removed the unmaintained and unneeded toc protocol plugin. * Fixed NTLM authentication on big-endian systems. - * Various memory cleanups when unloading libpurple. (Nick Hebner) + * Various memory cleanups when unloading libpurple. (Nick Hebner and + Stefan Becker) * Report idle time 'From last message sent' should work properly. * DNS servers are re-read when DNS queries fail in case the system has moved to a new network and the old servers are not accessible. @@ -36,7 +37,7 @@ (Aman Gupta) * Don't fork a DNS resolver process to resolve IP addresses. (Aman Gupta) * Better handling of corrupt certificates in the TLS Peers cache. - * More efficient purple_find_buddies() and purple_find_group() functions. + * More efficient buddy list and conversation search functions. (Jan Kaluza and Aman Gupta) * Internationalized Domain Names are supported when libpurple is compiled against the GNU IDN library. diff -r 67143ecbddb1 -r 0907b0c775bb ChangeLog.API --- a/ChangeLog.API Mon Jul 27 03:14:08 2009 +0000 +++ b/ChangeLog.API Fri Jul 31 19:20:06 2009 +0000 @@ -15,6 +15,9 @@ * account-destroying * blist-node-added and blist-node-removed signals (see blist-signals.dox) + * Three Blist UI ops used to overload libpurple's built-in saving + of the buddy list to blist.xml. If a UI implements these, it probably + wants to add the buddies itself and not call purple_blist_load. * Jabber plugin signals (see jabber-signals.dox) * purple_account_remove_setting * purple_buddy_destroy @@ -85,6 +88,8 @@ * purple_find_buddies is now more efficient in the case where it is enumerating all the buddies for an account. * purple_find_group is now more efficient for large numbers of groups. + * purple_find_conversation_with_account is more efficient for large + numbers of concurrent conversations. * All DNS routines support internationalized domain names (IDNs) when libpurple is compiled with GNU libidn. * status is set before emitting signals in purple_xfer_set_status. diff -r 67143ecbddb1 -r 0907b0c775bb Makefile.mingw --- a/Makefile.mingw Mon Jul 27 03:14:08 2009 +0000 +++ b/Makefile.mingw Fri Jul 31 19:20:06 2009 +0000 @@ -73,7 +73,7 @@ .PHONY: all docs install installer installer_nogtk installer_debug installers clean uninstall create_release_install_dir -all: $(PIDGIN_CONFIG_H) +all: $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H) $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) ifndef DISABLE_NLS @@ -125,7 +125,7 @@ $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean $(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) clean - rm -f $(PIDGIN_CONFIG_H) ./VERSION pidgin-$(PIDGIN_VERSION)*.exe pidgin-$(PIDGIN_VERSION)-win32-bin.zip + rm -f $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) ./VERSION pidgin-$(PIDGIN_VERSION)*.exe pidgin-$(PIDGIN_VERSION)-win32-bin.zip rm -rf doc/html Doxyfile.mingw uninstall: @@ -133,3 +133,5 @@ rm -f ./VERSION include $(PIDGIN_COMMON_TARGETS) + +.PHONY: $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/Makefile.am --- a/libpurple/Makefile.am Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/Makefile.am Fri Jul 31 19:20:06 2009 +0000 @@ -151,6 +151,7 @@ theme-manager.h \ upnp.h \ util.h \ + valgrind.h \ value.h \ xmlnode.h \ whiteboard.h @@ -273,7 +274,8 @@ $(dbus_sources) noinst_HEADERS= \ - internal.h + internal.h \ + valgrind.h libpurpleincludedir=$(includedir)/libpurple libpurpleinclude_HEADERS = \ diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/account.c --- a/libpurple/account.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/account.c Fri Jul 31 19:20:06 2009 +0000 @@ -1534,6 +1534,8 @@ void purple_account_set_username(PurpleAccount *account, const char *username) { + PurpleBlistUiOps *blist_ops; + g_return_if_fail(account != NULL); g_free(account->username); @@ -1543,7 +1545,9 @@ /* if the name changes, we should re-write the buddy list * to disk with the new name */ - purple_blist_schedule_save(); + blist_ops = purple_blist_get_ui_ops(); + if (blist_ops != NULL && blist_ops->save_account != NULL) + blist_ops->save_account(account); } void diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/accountopt.c --- a/libpurple/accountopt.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/accountopt.c Fri Jul 31 19:20:06 2009 +0000 @@ -111,6 +111,16 @@ return option; } +static void +purple_account_option_list_free(gpointer data, gpointer user_data) +{ + PurpleKeyValuePair *kvp = data; + + g_free(kvp->value); + g_free(kvp->key); + g_free(kvp); +} + void purple_account_option_destroy(PurpleAccountOption *option) { @@ -127,7 +137,7 @@ { if (option->default_value.list != NULL) { - g_list_foreach(option->default_value.list, (GFunc)g_free, NULL); + g_list_foreach(option->default_value.list, purple_account_option_list_free, NULL); g_list_free(option->default_value.list); } } @@ -183,7 +193,7 @@ if (option->default_value.list != NULL) { - g_list_foreach(option->default_value.list, (GFunc)g_free, NULL); + g_list_foreach(option->default_value.list, purple_account_option_list_free, NULL); g_list_free(option->default_value.list); } diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/blist.c --- a/libpurple/blist.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/blist.c Fri Jul 31 19:20:06 2009 +0000 @@ -393,13 +393,42 @@ return FALSE; } -void -purple_blist_schedule_save() +static void +_purple_blist_schedule_save() { if (save_timer == 0) save_timer = purple_timeout_add_seconds(5, save_cb, NULL); } +static void +purple_blist_save_account(PurpleAccount *account) +{ +#if 1 + _purple_blist_schedule_save(); +#else + if (account != NULL) { + /* Save the buddies and privacy data for this account */ + } else { + /* Save all buddies and privacy data */ + } +#endif +} + +static void +purple_blist_save_node(PurpleBlistNode *node) +{ + _purple_blist_schedule_save(); +} + +void purple_blist_schedule_save() +{ + PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); + + /* Save everything */ + if (ops && ops->save_account) + ops->save_account(NULL); +} + /********************************************************************* * Reading from disk * @@ -971,7 +1000,8 @@ g_free(buddy->name); buddy->name = g_strdup(name); - purple_blist_schedule_save(); + if (ops && ops->save_node) + ops->save_node((PurpleBlistNode *) buddy); if (ops && ops->update) ops->update(purplebuddylist, (PurpleBlistNode *)buddy); @@ -1011,7 +1041,8 @@ g_free(new_alias); /* could be "\0" */ } - purple_blist_schedule_save(); + if (ops && ops->save_node) + ops->save_node((PurpleBlistNode*) contact); if (ops && ops->update) ops->update(purplebuddylist, (PurpleBlistNode *)contact); @@ -1056,7 +1087,8 @@ g_free(new_alias); /* could be "\0" */ } - purple_blist_schedule_save(); + if (ops && ops->save_node) + ops->save_node((PurpleBlistNode*) chat); if (ops && ops->update) ops->update(purplebuddylist, (PurpleBlistNode *)chat); @@ -1092,7 +1124,8 @@ g_free(new_alias); /* could be "\0" */ } - purple_blist_schedule_save(); + if (ops && ops->save_node) + ops->save_node((PurpleBlistNode*) buddy); if (ops && ops->update) ops->update(purplebuddylist, (PurpleBlistNode *)buddy); @@ -1133,7 +1166,8 @@ g_free(new_alias); /* could be "\0"; */ } - purple_blist_schedule_save(); + if (ops && ops->save_node) + ops->save_node((PurpleBlistNode*) buddy); if (ops && ops->update) ops->update(purplebuddylist, (PurpleBlistNode *)buddy); @@ -1235,7 +1269,8 @@ } /* Save our changes */ - purple_blist_schedule_save(); + if (ops && ops->save_node) + ops->save_node((PurpleBlistNode*) source); /* Update the UI */ if (ops && ops->update) @@ -1493,8 +1528,6 @@ * reinitialize it */ if (ops && ops->new_node) ops->new_node(cnode); - - purple_blist_schedule_save(); } if (node != NULL) { @@ -1523,7 +1556,8 @@ } } - purple_blist_schedule_save(); + if (ops && ops->save_node) + ops->save_node(cnode); if (ops && ops->update) ops->update(purplebuddylist, (PurpleBlistNode *)cnode); @@ -1601,8 +1635,6 @@ if (ops && ops->remove) ops->remove(purplebuddylist, bnode); - purple_blist_schedule_save(); - if (bnode->parent->parent != (PurpleBlistNode*)g) { struct _purple_hbuddy hb; hb.name = (gchar *)purple_normalize(buddy->account, buddy->name); @@ -1667,7 +1699,8 @@ purple_contact_invalidate_priority_buddy(purple_buddy_get_contact(buddy)); - purple_blist_schedule_save(); + if (ops && ops->save_node) + ops->save_node((PurpleBlistNode*) buddy); if (ops && ops->update) ops->update(purplebuddylist, (PurpleBlistNode*)buddy); @@ -1886,7 +1919,8 @@ if (ops && ops->remove) ops->remove(purplebuddylist, cnode); - purple_blist_schedule_save(); + if (ops && ops->remove_node) + ops->remove_node(cnode); } if (node && (PURPLE_BLIST_NODE_IS_CONTACT(node) || @@ -1912,7 +1946,13 @@ g->currentsize++; g->totalsize++; - purple_blist_schedule_save(); + if (ops && ops->save_node) + { + if (cnode->child) + ops->save_node(cnode); + for (bnode = cnode->child; bnode; bnode = bnode->next) + ops->save_node(bnode); + } if (ops && ops->update) { @@ -2012,7 +2052,11 @@ purplebuddylist->root = gnode; } - purple_blist_schedule_save(); + if (ops && ops->save_node) { + ops->save_node(gnode); + for (node = gnode->child; node; node = node->next) + ops->save_node(node); + } if (ops && ops->update) { ops->update(purplebuddylist, gnode); @@ -2058,12 +2102,13 @@ if (node->next) node->next->prev = node->prev; - purple_blist_schedule_save(); - /* Update the UI */ if (ops && ops->remove) ops->remove(purplebuddylist, node); + if (ops && ops->remove_node) + ops->remove_node(node); + purple_signal_emit(purple_blist_get_handle(), "blist-node-removed", PURPLE_BLIST_NODE(contact)); @@ -2119,8 +2164,6 @@ } } - purple_blist_schedule_save(); - /* Remove this buddy from the buddies hash table */ hb.name = (gchar *)purple_normalize(buddy->account, buddy->name); hb.account = buddy->account; @@ -2134,6 +2177,9 @@ if (ops && ops->remove) ops->remove(purplebuddylist, node); + if (ops && ops->remove_node) + ops->remove_node(node); + /* Signal that the buddy has been removed before freeing the memory for it */ purple_signal_emit(purple_blist_get_handle(), "buddy-removed", buddy); @@ -2176,13 +2222,15 @@ } group->totalsize--; - purple_blist_schedule_save(); } /* Update the UI */ if (ops && ops->remove) ops->remove(purplebuddylist, node); + if (ops && ops->remove_node) + ops->remove_node(node); + purple_signal_emit(purple_blist_get_handle(), "blist-node-removed", PURPLE_BLIST_NODE(chat)); @@ -2217,12 +2265,13 @@ g_hash_table_remove(groups_cache, key); g_free(key); - purple_blist_schedule_save(); - /* Update the UI */ if (ops && ops->remove) ops->remove(purplebuddylist, node); + if (ops && ops->remove_node) + ops->remove_node(node); + purple_signal_emit(purple_blist_get_handle(), "blist-node-removed", PURPLE_BLIST_NODE(group)); @@ -2383,6 +2432,9 @@ hb.name = (gchar *)purple_normalize(account, name); for (group = purplebuddylist->root; group; group = group->next) { + if (!group->child) + continue; + hb.group = group; if ((buddy = g_hash_table_lookup(purplebuddylist->buddies, &hb))) { return buddy; @@ -2432,6 +2484,9 @@ hb.account = account; for (node = purplebuddylist->root; node != NULL; node = node->next) { + if (!node->child) + continue; + hb.group = node; if ((buddy = g_hash_table_lookup(purplebuddylist->buddies, &hb)) != NULL) ret = g_slist_prepend(ret, buddy); @@ -2827,13 +2882,16 @@ void purple_blist_node_remove_setting(PurpleBlistNode *node, const char *key) { + PurpleBlistUiOps *ops; g_return_if_fail(node != NULL); g_return_if_fail(node->settings != NULL); g_return_if_fail(key != NULL); g_hash_table_remove(node->settings, key); - purple_blist_schedule_save(); + ops = purple_blist_get_ui_ops(); + if (ops && ops->save_node) + ops->save_node(node); } void @@ -2863,6 +2921,7 @@ purple_blist_node_set_bool(PurpleBlistNode* node, const char *key, gboolean data) { PurpleValue *value; + PurpleBlistUiOps *ops; g_return_if_fail(node != NULL); g_return_if_fail(node->settings != NULL); @@ -2873,7 +2932,9 @@ g_hash_table_replace(node->settings, g_strdup(key), value); - purple_blist_schedule_save(); + ops = purple_blist_get_ui_ops(); + if (ops && ops->save_node) + ops->save_node(node); } gboolean @@ -2899,6 +2960,7 @@ purple_blist_node_set_int(PurpleBlistNode* node, const char *key, int data) { PurpleValue *value; + PurpleBlistUiOps *ops; g_return_if_fail(node != NULL); g_return_if_fail(node->settings != NULL); @@ -2909,7 +2971,9 @@ g_hash_table_replace(node->settings, g_strdup(key), value); - purple_blist_schedule_save(); + ops = purple_blist_get_ui_ops(); + if (ops && ops->save_node) + ops->save_node(node); } int @@ -2935,6 +2999,7 @@ purple_blist_node_set_string(PurpleBlistNode* node, const char *key, const char *data) { PurpleValue *value; + PurpleBlistUiOps *ops; g_return_if_fail(node != NULL); g_return_if_fail(node->settings != NULL); @@ -2945,7 +3010,9 @@ g_hash_table_replace(node->settings, g_strdup(key), value); - purple_blist_schedule_save(); + ops = purple_blist_get_ui_ops(); + if (ops && ops->save_node) + ops->save_node(node); } const char * @@ -2999,7 +3066,31 @@ void purple_blist_set_ui_ops(PurpleBlistUiOps *ops) { + gboolean overrode = FALSE; blist_ui_ops = ops; + + if (!ops) + return; + + if (!ops->save_node) { + ops->save_node = purple_blist_save_node; + overrode = TRUE; + } + if (!ops->remove_node) { + ops->remove_node = purple_blist_save_node; + overrode = TRUE; + } + if (!ops->save_account) { + ops->save_account = purple_blist_save_account; + overrode = TRUE; + } + + if (overrode && (ops->save_node != purple_blist_save_node || + ops->remove_node != purple_blist_save_node || + ops->save_account != purple_blist_save_account)) { + purple_debug_warning("blist", "Only some of the blist saving UI ops " + "were overridden. This probably is not what you want!\n"); + } } PurpleBlistUiOps * diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/blist.h --- a/libpurple/blist.h Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/blist.h Fri Jul 31 19:20:06 2009 +0000 @@ -216,10 +216,49 @@ const char *alias, const char *name); void (*request_add_group)(void); + /** + * This is called when a node has been modified and should be saved. + * + * Implementation of this UI op is OPTIONAL. If not implemented, it will + * be set to a fallback function that saves data to blist.xml like in + * previous libpurple versions. + * + * @attrib node The node which has been modified. + * + * @since 2.6.0. + */ + void (*save_node)(PurpleBlistNode *node); + + /** + * Called when a node is about to be removed from the buddy list. + * The UI op should update the relevant data structures to remove this + * node (for example, removing a buddy from the group this node is in). + * + * Implementation of this UI op is OPTIONAL. If not implemented, it will + * be set to a fallback function that saves data to blist.xml like in + * previous libpurple versions. + * + * @attrib node The node which has been modified. + * @since 2.6.0. + */ + void (*remove_node)(PurpleBlistNode *node); + + /** + * Called to save all the data for an account. If the UI sets this, + * the callback must save the privacy and buddy list data for an account. + * If the account is NULL, save the data for all accounts. + * + * Implementation of this UI op is OPTIONAL. If not implemented, it will + * be set to a fallback function that saves data to blist.xml like in + * previous libpurple versions. + * + * @attrib account The account whose data to save. If NULL, save all data + * for all accounts. + * @since 2.6.0. + */ + void (*save_account)(PurpleAccount *account); + void (*_purple_reserved1)(void); - void (*_purple_reserved2)(void); - void (*_purple_reserved3)(void); - void (*_purple_reserved4)(void); }; #ifdef __cplusplus diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/certificate.c --- a/libpurple/certificate.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/certificate.c Fri Jul 31 19:20:06 2009 +0000 @@ -1318,20 +1318,113 @@ g_byte_array_free(cached_fpr, TRUE); } +/* + * This is called from two points in x509_tls_cached_unknown_peer below + * once we've verified the signature chain is valid. Now we need to verify + * the subject name of the certificate. + */ +static void +x509_tls_cached_check_subject_name(PurpleCertificateVerificationRequest *vrq, + gboolean had_ca_pool) +{ + PurpleCertificatePool *tls_peers; + PurpleCertificate *peer_crt; + GList *chain = vrq->cert_chain; + + peer_crt = (PurpleCertificate *) chain->data; + + /* Last, check that the hostname matches */ + if ( ! purple_certificate_check_subject_name(peer_crt, + vrq->subject_name) ) { + gchar *sn = purple_certificate_get_subject_name(peer_crt); + + purple_debug_error("certificate/x509/tls_cached", + "Name mismatch: Certificate given for %s " + "has a name of %s\n", + vrq->subject_name, sn); + + if (had_ca_pool) { + /* Prompt the user to authenticate the certificate */ + /* TODO: Provide the user with more guidance about why he is + being prompted */ + /* vrq will be completed by user_auth */ + gchar *msg; + msg = g_strdup_printf(_("The certificate presented by \"%s\" " + "claims to be from \"%s\" instead. " + "This could mean that you are not " + "connecting to the service you " + "believe you are."), + vrq->subject_name, sn); + + x509_tls_cached_user_auth(vrq, msg); + g_free(msg); + } else { + /* Had no CA pool, so couldn't verify the chain *and* + * the subject name isn't valid. + * I think this is bad enough to warrant a fatal error. It's + * not likely anyway... + */ + purple_notify_error(NULL, /* TODO: Probably wrong. */ + _("SSL Certificate Error"), + _("Invalid certificate chain"), + _("You have no database of root certificates, so " + "this certificate cannot be validated.")); + } + + g_free(sn); + return; + } /* if (name mismatch) */ + + if (had_ca_pool) { + /* The subject name is correct, but we weren't able to verify the + * chain because there was no pool of root CAs found. Prompt the user + * to validate it. + */ + + /* vrq will be completed by user_auth */ + x509_tls_cached_user_auth(vrq,_("You have no database of root " + "certificates, so this " + "certificate cannot be " + "validated.")); + return; + } + + /* If we reach this point, the certificate is good. */ + /* Look up the local cache and store it there for future use */ + tls_peers = purple_certificate_find_pool(x509_tls_cached.scheme_name, + "tls_peers"); + + if (tls_peers) { + if (!purple_certificate_pool_store(tls_peers,vrq->subject_name, + peer_crt) ) { + purple_debug_error("certificate/x509/tls_cached", + "FAILED to cache peer certificate\n"); + } + } else { + purple_debug_error("certificate/x509/tls_cached", + "Unable to locate tls_peers certificate " + "cache.\n"); + } + + /* Whew! Done! */ + purple_certificate_verify_complete(vrq, PURPLE_CERTIFICATE_VALID); + +} + /* For when we've never communicated with this party before */ /* TODO: Need ways to specify possibly multiple problems with a cert, or at - least reprioritize them. For example, maybe the signature ought to be - checked BEFORE the hostname checking? - Stu thinks we should check the signature before the name, so we do now. - The above TODO still stands. */ + least reprioritize them. + */ static void x509_tls_cached_unknown_peer(PurpleCertificateVerificationRequest *vrq) { - PurpleCertificatePool *ca, *tls_peers; + PurpleCertificatePool *ca; PurpleCertificate *peer_crt; + PurpleCertificate *ca_crt, *end_crt; PurpleCertificate *failing_crt; GList *chain = vrq->cert_chain; - gboolean chain_validated = FALSE; + GByteArray *last_fpr, *ca_fpr; + gchar *ca_id; peer_crt = (PurpleCertificate *) chain->data; @@ -1361,10 +1454,10 @@ ca = purple_certificate_find_pool(x509_tls_cached.scheme_name, "ca"); /* Next, check that the certificate chain is valid */ - if (purple_certificate_check_signature_chain_with_failing(chain, - &failing_crt)) - chain_validated = TRUE; - else { + if (!purple_certificate_check_signature_chain_with_failing(chain, + &failing_crt)) + { + gboolean chain_validated = FALSE; /* * Check if the failing certificate is in the CA store. If it is, then * consider this fully validated. This works around issues with some @@ -1399,7 +1492,9 @@ * If we get here, either the cert matched the stuff right above * or it didn't, in which case we give up and complain to the user. */ - if (!chain_validated) { + if (chain_validated) { + x509_tls_cached_check_subject_name(vrq, TRUE); + } else { /* TODO: Tell the user where the chain broke? */ /* TODO: This error will hopelessly confuse any non-elite user. */ @@ -1421,156 +1516,100 @@ /* Okay, we're done here */ purple_certificate_verify_complete(vrq, PURPLE_CERTIFICATE_INVALID); - return; } + + return; } /* if (signature chain not good) */ /* If, for whatever reason, there is no Certificate Authority pool - loaded, we will simply present it to the user for checking. */ + loaded, we'll verify the subject name and then warn about thsi. */ if ( !ca ) { purple_debug_error("certificate/x509/tls_cached", "No X.509 Certificate Authority pool " "could be found!\n"); + x509_tls_cached_check_subject_name(vrq, FALSE); + return; + } + + end_crt = g_list_last(chain)->data; + + /* Attempt to look up the last certificate's issuer */ + ca_id = purple_certificate_get_issuer_unique_id(end_crt); + purple_debug_info("certificate/x509/tls_cached", + "Checking for a CA with DN=%s\n", + ca_id); + ca_crt = purple_certificate_pool_retrieve(ca, ca_id); + if ( NULL == ca_crt ) { + purple_debug_warning("certificate/x509/tls_cached", + "Certificate Authority with DN='%s' not " + "found. I'll prompt the user, I guess.\n", + ca_id); + g_free(ca_id); /* vrq will be completed by user_auth */ - x509_tls_cached_user_auth(vrq,_("You have no database of root " - "certificates, so this " - "certificate cannot be " - "validated.")); + x509_tls_cached_user_auth(vrq,_("The root certificate this " + "one claims to be issued by " + "is unknown to Pidgin.")); return; } - if (!chain_validated) { - GByteArray *last_fpr, *ca_fpr; - PurpleCertificate *ca_crt, *end_crt; - gchar *ca_id; - - end_crt = g_list_last(chain)->data; + g_free(ca_id); - /* Attempt to look up the last certificate's issuer */ - ca_id = purple_certificate_get_issuer_unique_id(end_crt); - purple_debug_info("certificate/x509/tls_cached", - "Checking for a CA with DN=%s\n", - ca_id); - ca_crt = purple_certificate_pool_retrieve(ca, ca_id); - if ( NULL == ca_crt ) { - purple_debug_warning("certificate/x509/tls_cached", - "Certificate Authority with DN='%s' not " - "found. I'll prompt the user, I guess.\n", - ca_id); - g_free(ca_id); - /* vrq will be completed by user_auth */ - x509_tls_cached_user_auth(vrq,_("The root certificate this " - "one claims to be issued by " - "is unknown to Pidgin.")); - return; - } - - g_free(ca_id); + /* + * Check the fingerprints; if they match, then this certificate *is* one + * of the designated "trusted roots", and we don't need to verify the + * signature. This is good because some of the older roots are self-signed + * with bad hash algorithms that we don't want to allow in any other + * circumstances (one of Verisign's root CAs is self-signed with MD2). + * + * If the fingerprints don't match, we'll fall back to checking the + * signature. + * + * GnuTLS doesn't seem to include the final root in the verification + * list, so this check will never succeed. NSS *does* include it in + * the list, so here we are. + */ + last_fpr = purple_certificate_get_fingerprint_sha1(end_crt); + ca_fpr = purple_certificate_get_fingerprint_sha1(ca_crt); - /* - * Check the fingerprints; if they match, then this certificate *is* one - * of the designated "trusted roots", and we don't need to verify the - * signature. This is good because some of the older roots are self-signed - * with bad hash algorithms that we don't want to allow in any other - * circumstances (one of Verisign's root CAs is self-signed with MD2). - * - * If the fingerprints don't match, we'll fall back to checking the - * signature. - * - * GnuTLS doesn't seem to include the final root in the verification - * list, so this check will never succeed. NSS *does* include it in - * the list, so here we are. - */ - last_fpr = purple_certificate_get_fingerprint_sha1(end_crt); - ca_fpr = purple_certificate_get_fingerprint_sha1(ca_crt); + if ( !byte_arrays_equal(last_fpr, ca_fpr) && + !purple_certificate_signed_by(end_crt, ca_crt) ) + { + /* TODO: If signed_by ever returns a reason, maybe mention + that, too. */ + /* TODO: Also mention the CA involved. While I could do this + now, a full DN is a little much with which to assault the + user's poor, leaky eyes. */ + /* TODO: This error message makes my eyes cross, and I wrote it */ + gchar * secondary = + g_strdup_printf(_("The certificate chain presented by " + "%s does not have a valid digital " + "signature from the Certificate " + "Authority from which it claims to " + "have a signature."), + vrq->subject_name); - if ( !byte_arrays_equal(last_fpr, ca_fpr) && - !purple_certificate_signed_by(end_crt, ca_crt) ) - { - /* TODO: If signed_by ever returns a reason, maybe mention - that, too. */ - /* TODO: Also mention the CA involved. While I could do this - now, a full DN is a little much with which to assault the - user's poor, leaky eyes. */ - /* TODO: This error message makes my eyes cross, and I wrote it */ - gchar * secondary = - g_strdup_printf(_("The certificate chain presented by " - "%s does not have a valid digital " - "signature from the Certificate " - "Authority from which it claims to " - "have a signature."), - vrq->subject_name); + purple_notify_error(NULL, /* TODO: Probably wrong */ + _("SSL Certificate Error"), + _("Invalid certificate authority" + " signature"), + secondary); + g_free(secondary); - purple_notify_error(NULL, /* TODO: Probably wrong */ - _("SSL Certificate Error"), - _("Invalid certificate authority" - " signature"), - secondary); - g_free(secondary); + /* Signal "bad cert" */ + purple_certificate_verify_complete(vrq, + PURPLE_CERTIFICATE_INVALID); - /* Signal "bad cert" */ - purple_certificate_verify_complete(vrq, - PURPLE_CERTIFICATE_INVALID); - - purple_certificate_destroy(ca_crt); - g_byte_array_free(ca_fpr, TRUE); - g_byte_array_free(last_fpr, TRUE); - return; - } /* if (CA signature not good) */ - + purple_certificate_destroy(ca_crt); g_byte_array_free(ca_fpr, TRUE); g_byte_array_free(last_fpr, TRUE); - } - - /* Last, check that the hostname matches */ - if ( ! purple_certificate_check_subject_name(peer_crt, - vrq->subject_name) ) { - gchar *sn = purple_certificate_get_subject_name(peer_crt); - gchar *msg; - - purple_debug_error("certificate/x509/tls_cached", - "Name mismatch: Certificate given for %s " - "has a name of %s\n", - vrq->subject_name, sn); - - /* Prompt the user to authenticate the certificate */ - /* TODO: Provide the user with more guidance about why he is - being prompted */ - /* vrq will be completed by user_auth */ - msg = g_strdup_printf(_("The certificate presented by \"%s\" " - "claims to be from \"%s\" instead. " - "This could mean that you are not " - "connecting to the service you " - "believe you are."), - vrq->subject_name, sn); + return; + } /* if (CA signature not good) */ - x509_tls_cached_user_auth(vrq,msg); - - g_free(sn); - g_free(msg); - return; - } /* if (name mismatch) */ - - /* If we reach this point, the certificate is good. */ - /* Look up the local cache and store it there for future use */ - tls_peers = purple_certificate_find_pool(x509_tls_cached.scheme_name, - "tls_peers"); + g_byte_array_free(ca_fpr, TRUE); + g_byte_array_free(last_fpr, TRUE); - if (tls_peers) { - if (!purple_certificate_pool_store(tls_peers,vrq->subject_name, - peer_crt) ) { - purple_debug_error("certificate/x509/tls_cached", - "FAILED to cache peer certificate\n"); - } - } else { - purple_debug_error("certificate/x509/tls_cached", - "Unable to locate tls_peers certificate " - "cache.\n"); - } - - /* Whew! Done! */ - purple_certificate_verify_complete(vrq, PURPLE_CERTIFICATE_VALID); + x509_tls_cached_check_subject_name(vrq, TRUE); } static void diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/conversation.c --- a/libpurple/conversation.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/conversation.c Fri Jul 31 19:20:06 2009 +0000 @@ -40,6 +40,36 @@ static GList *chats = NULL; static PurpleConversationUiOps *default_ops = NULL; +/** + * A hash table used for efficient lookups of conversations by name. + * struct _purple_hconv => PurpleConversation* + */ +static GHashTable *conversation_cache = NULL; + +struct _purple_hconv { + PurpleConversationType type; + char *name; + const PurpleAccount *account; +}; + +static guint _purple_conversations_hconv_hash(struct _purple_hconv *hc) +{ + return g_str_hash(hc->name) ^ hc->type ^ g_direct_hash(hc->account); +} + +static guint _purple_conversations_hconv_equal(struct _purple_hconv *hc1, struct _purple_hconv *hc2) +{ + return (hc1->type == hc2->type && + hc1->account == hc2->account && + g_str_equal(hc1->name, hc2->name)); +} + +static void _purple_conversations_hconv_free_key(struct _purple_hconv *hc) +{ + g_free(hc->name); + g_free(hc); +} + void purple_conversations_set_ui_ops(PurpleConversationUiOps *ops) { @@ -287,6 +317,7 @@ PurpleConversation *conv; PurpleConnection *gc; PurpleConversationUiOps *ops; + struct _purple_hconv *hc; g_return_val_if_fail(type != PURPLE_CONV_TYPE_UNKNOWN, NULL); g_return_val_if_fail(account != NULL, NULL); @@ -342,7 +373,7 @@ conv->u.im->conv = conv; PURPLE_DBUS_REGISTER_POINTER(conv->u.im, PurpleConvIm); - ims = g_list_append(ims, conv); + ims = g_list_prepend(ims, conv); if ((icon = purple_buddy_icons_find(account, name))) { purple_conv_im_set_icon(conv->u.im, icon); @@ -364,7 +395,7 @@ conv->u.chat->conv = conv; PURPLE_DBUS_REGISTER_POINTER(conv->u.chat, PurpleConvChat); - chats = g_list_append(chats, conv); + chats = g_list_prepend(chats, conv); if ((disp = purple_connection_get_display_name(account->gc))) purple_conv_chat_set_nick(conv->u.chat, disp); @@ -379,7 +410,14 @@ } } - conversations = g_list_append(conversations, conv); + conversations = g_list_prepend(conversations, conv); + + hc = g_new(struct _purple_hconv, 1); + hc->name = g_strdup(purple_normalize(account, conv->name)); + hc->account = account; + hc->type = type; + + g_hash_table_insert(conversation_cache, hc, conv); /* Auto-set the title. */ purple_conversation_autoset_title(conv); @@ -405,6 +443,7 @@ PurpleConversationUiOps *ops; PurpleConnection *gc; const char *name; + struct _purple_hconv hc; g_return_if_fail(conv != NULL); @@ -481,6 +520,12 @@ else if(conv->type==PURPLE_CONV_TYPE_CHAT) chats = g_list_remove(chats, conv); + hc.name = (gchar *)purple_normalize(conv->account, conv->name); + hc.account = conv->account; + hc.type = conv->type; + + g_hash_table_remove(conversation_cache, &hc); + purple_signal_emit(purple_conversations_get_handle(), "deleting-conversation", conv); @@ -707,10 +752,20 @@ void purple_conversation_set_name(PurpleConversation *conv, const char *name) { + struct _purple_hconv *hc; g_return_if_fail(conv != NULL); + hc = g_new(struct _purple_hconv, 1); + hc->type = conv->type; + hc->account = conv->account; + hc->name = (gchar *)purple_normalize(conv->account, conv->name); + + g_hash_table_remove(conversation_cache, hc); g_free(conv->name); + conv->name = g_strdup(name); + hc->name = g_strdup(purple_normalize(conv->account, conv->name)); + g_hash_table_insert(conversation_cache, hc, conv); purple_conversation_autoset_title(conv); } @@ -819,43 +874,31 @@ const PurpleAccount *account) { PurpleConversation *c = NULL; - gchar *name1; - const gchar *name2; - GList *cnv; + struct _purple_hconv hc; g_return_val_if_fail(name != NULL, NULL); + hc.name = (gchar *)purple_normalize(account, name); + hc.account = account; + hc.type = type; + switch (type) { case PURPLE_CONV_TYPE_IM: - cnv = purple_get_ims(); - break; case PURPLE_CONV_TYPE_CHAT: - cnv = purple_get_chats(); + c = g_hash_table_lookup(conversation_cache, &hc); break; case PURPLE_CONV_TYPE_ANY: - cnv = purple_get_conversations(); + hc.type = PURPLE_CONV_TYPE_IM; + c = g_hash_table_lookup(conversation_cache, &hc); + if (!c) { + hc.type = PURPLE_CONV_TYPE_CHAT; + c = g_hash_table_lookup(conversation_cache, &hc); + } break; default: g_return_val_if_reached(NULL); } - name1 = g_strdup(purple_normalize(account, name)); - - for (; cnv != NULL; cnv = cnv->next) { - c = (PurpleConversation *)cnv->data; - name2 = purple_normalize(account, purple_conversation_get_name(c)); - - if ((account == purple_conversation_get_account(c)) && - !purple_utf8_strcasecmp(name1, name2)) { - - break; - } - - c = NULL; - } - - g_free(name1); - return c; } @@ -2215,6 +2258,10 @@ { void *handle = purple_conversations_get_handle(); + conversation_cache = g_hash_table_new_full((GHashFunc)_purple_conversations_hconv_hash, + (GEqualFunc)_purple_conversations_hconv_equal, + (GDestroyNotify)_purple_conversations_hconv_free_key, NULL); + /********************************************************************** * Register preferences **********************************************************************/ @@ -2504,6 +2551,7 @@ { while (conversations) purple_conversation_destroy((PurpleConversation*)conversations->data); + g_hash_table_destroy(conversation_cache); purple_signals_unregister_by_instance(purple_conversations_get_handle()); } diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/ft.c --- a/libpurple/ft.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/ft.c Fri Jul 31 19:20:06 2009 +0000 @@ -132,6 +132,9 @@ { g_return_if_fail(xfer != NULL); + if (xfer->status == status) + return; + xfer->status = status; if(xfer->type == PURPLE_XFER_SEND) { diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/media.c --- a/libpurple/media.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/media.c Fri Jul 31 19:20:06 2009 +0000 @@ -156,7 +156,7 @@ enum { - ERROR, + S_ERROR, ACCEPTED, CANDIDATES_PREPARED, CODECS_CHANGED, @@ -328,7 +328,7 @@ "Data the prpl plugin set on the media session.", G_PARAM_READWRITE)); - purple_media_signals[ERROR] = g_signal_new("error", G_TYPE_FROM_CLASS(klass), + purple_media_signals[S_ERROR] = g_signal_new("error", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); @@ -2110,7 +2110,7 @@ va_end(args); purple_debug_error("media", "%s\n", message); - g_signal_emit(media, purple_media_signals[ERROR], 0, message); + g_signal_emit(media, purple_media_signals[S_ERROR], 0, message); g_free(message); #endif @@ -2729,7 +2729,8 @@ purple_debug_error("media", "purple_media_add_remote_candidates: " "couldn't find stream %s %s.\n", - sess_id, participant); + sess_id ? sess_id : "(null)", + participant ? participant : "(null)"); return; } diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/network.h --- a/libpurple/network.h Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/network.h Fri Jul 31 19:20:06 2009 +0000 @@ -246,7 +246,7 @@ * Update the TURN server IP given the host name * Will result in a DNS query being executed asynchronous * - * @param turn_server The host name of the STUN server to set + * @param turn_server The host name of the TURN server to set * @since 2.6.0 */ void purple_network_set_turn_server(const gchar *turn_server); diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/plugin.c --- a/libpurple/plugin.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/plugin.c Fri Jul 31 19:20:06 2009 +0000 @@ -33,6 +33,7 @@ #include "request.h" #include "signals.h" #include "util.h" +#include "valgrind.h" #include "version.h" typedef struct @@ -875,7 +876,7 @@ * it keeps all the plugins open, meaning that valgrind is able to * resolve symbol names in leak traces from plugins. */ - if (!g_getenv("PURPLE_LEAKCHECK_HELP")) + if (!g_getenv("PURPLE_LEAKCHECK_HELP") && !RUNNING_ON_VALGRIND) { if (plugin->handle != NULL) g_module_close(plugin->handle); diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/privacy.c --- a/libpurple/privacy.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/privacy.c Fri Jul 31 19:20:06 2009 +0000 @@ -35,6 +35,7 @@ GSList *l; char *name; PurpleBuddy *buddy; + PurpleBlistUiOps *blist_ops; g_return_val_if_fail(account != NULL, FALSE); g_return_val_if_fail(who != NULL, FALSE); @@ -62,7 +63,9 @@ if (privacy_ops != NULL && privacy_ops->permit_added != NULL) privacy_ops->permit_added(account, who); - purple_blist_schedule_save(); + blist_ops = purple_blist_get_ui_ops(); + if (blist_ops != NULL && blist_ops->save_account != NULL) + blist_ops->save_account(account); /* This lets the UI know a buddy has had its privacy setting changed */ buddy = purple_find_buddy(account, name); @@ -81,6 +84,7 @@ const char *name; PurpleBuddy *buddy; char *del; + PurpleBlistUiOps *blist_ops; g_return_val_if_fail(account != NULL, FALSE); g_return_val_if_fail(who != NULL, FALSE); @@ -109,7 +113,9 @@ if (privacy_ops != NULL && privacy_ops->permit_removed != NULL) privacy_ops->permit_removed(account, who); - purple_blist_schedule_save(); + blist_ops = purple_blist_get_ui_ops(); + if (blist_ops != NULL && blist_ops->save_account != NULL) + blist_ops->save_account(account); buddy = purple_find_buddy(account, name); if (buddy != NULL) { @@ -127,6 +133,7 @@ GSList *l; char *name; PurpleBuddy *buddy; + PurpleBlistUiOps *blist_ops; g_return_val_if_fail(account != NULL, FALSE); g_return_val_if_fail(who != NULL, FALSE); @@ -154,7 +161,9 @@ if (privacy_ops != NULL && privacy_ops->deny_added != NULL) privacy_ops->deny_added(account, who); - purple_blist_schedule_save(); + blist_ops = purple_blist_get_ui_ops(); + if (blist_ops != NULL && blist_ops->save_account != NULL) + blist_ops->save_account(account); buddy = purple_find_buddy(account, name); if (buddy != NULL) { @@ -172,6 +181,7 @@ const char *normalized; char *name; PurpleBuddy *buddy; + PurpleBlistUiOps *blist_ops; g_return_val_if_fail(account != NULL, FALSE); g_return_val_if_fail(who != NULL, FALSE); @@ -205,7 +215,10 @@ } g_free(name); - purple_blist_schedule_save(); + + blist_ops = purple_blist_get_ui_ops(); + if (blist_ops != NULL && blist_ops->save_account != NULL) + blist_ops->save_account(account); return TRUE; } diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/jabber/buddy.c --- a/libpurple/protocols/jabber/buddy.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/jabber/buddy.c Fri Jul 31 19:20:06 2009 +0000 @@ -88,6 +88,83 @@ return jb; } +static gint resource_compare_cb(gconstpointer a, gconstpointer b) +{ + const JabberBuddyResource *jbra = a; + const JabberBuddyResource *jbrb = b; + JabberBuddyState state_a, state_b; + + if (jbra->priority != jbrb->priority) + return jbra->priority > jbrb->priority ? 1 : -1; + + /* Fold the states for easier comparison */ + switch (jbra->state) { + case JABBER_BUDDY_STATE_ONLINE: + case JABBER_BUDDY_STATE_CHAT: + state_a = JABBER_BUDDY_STATE_ONLINE; + break; + case JABBER_BUDDY_STATE_AWAY: + case JABBER_BUDDY_STATE_DND: + state_a = JABBER_BUDDY_STATE_AWAY; + break; + case JABBER_BUDDY_STATE_XA: + state_a = JABBER_BUDDY_STATE_XA; + break; + case JABBER_BUDDY_STATE_UNAVAILABLE: + state_a = JABBER_BUDDY_STATE_UNAVAILABLE; + break; + default: + state_a = JABBER_BUDDY_STATE_UNKNOWN; + break; + } + + switch (jbrb->state) { + case JABBER_BUDDY_STATE_ONLINE: + case JABBER_BUDDY_STATE_CHAT: + state_b = JABBER_BUDDY_STATE_ONLINE; + break; + case JABBER_BUDDY_STATE_AWAY: + case JABBER_BUDDY_STATE_DND: + state_b = JABBER_BUDDY_STATE_AWAY; + break; + case JABBER_BUDDY_STATE_XA: + state_b = JABBER_BUDDY_STATE_XA; + break; + case JABBER_BUDDY_STATE_UNAVAILABLE: + state_b = JABBER_BUDDY_STATE_UNAVAILABLE; + break; + default: + state_b = JABBER_BUDDY_STATE_UNKNOWN; + break; + } + + if (state_a == state_b) { + if (jbra->idle == jbrb->idle) + return 0; + else if ((jbra->idle && !jbrb->idle) || + (jbra->idle && jbrb->idle && jbra->idle < jbrb->idle)) + return -1; + else + return 1; + } + + if (state_a == JABBER_BUDDY_STATE_ONLINE) + return 1; + else if (state_a == JABBER_BUDDY_STATE_AWAY && + (state_b == JABBER_BUDDY_STATE_XA || + state_b == JABBER_BUDDY_STATE_UNAVAILABLE || + state_b == JABBER_BUDDY_STATE_UNKNOWN)) + return 1; + else if (state_a == JABBER_BUDDY_STATE_XA && + (state_b == JABBER_BUDDY_STATE_UNAVAILABLE || + state_b == JABBER_BUDDY_STATE_UNKNOWN)) + return 1; + else if (state_a == JABBER_BUDDY_STATE_UNAVAILABLE && + state_b == JABBER_BUDDY_STATE_UNKNOWN) + return 1; + + return -1; +} JabberBuddyResource *jabber_buddy_find_resource(JabberBuddy *jb, const char *resource) @@ -104,44 +181,8 @@ if (!jbr && !resource) { jbr = tmp; } else if (!resource) { - if (tmp->priority > jbr->priority) + if (resource_compare_cb(tmp, jbr) > 0) jbr = tmp; - else if (tmp->priority == jbr->priority) { - /* Determine if this resource is more available than the one we've currently chosen */ - switch(tmp->state) { - case JABBER_BUDDY_STATE_ONLINE: - case JABBER_BUDDY_STATE_CHAT: - /* This resource is online/chatty. Prefer to one which isn't either. */ - if (((jbr->state != JABBER_BUDDY_STATE_ONLINE) && (jbr->state != JABBER_BUDDY_STATE_CHAT)) - || (jbr->idle && !tmp->idle) - || (jbr->idle && tmp->idle && tmp->idle > jbr->idle)) - jbr = tmp; - break; - case JABBER_BUDDY_STATE_AWAY: - case JABBER_BUDDY_STATE_DND: - /* This resource is away/dnd. Prefer to one which is extended away, unavailable, or unknown. */ - if (((jbr->state == JABBER_BUDDY_STATE_XA) || (jbr->state == JABBER_BUDDY_STATE_UNAVAILABLE) || - (jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR)) - || (jbr->idle && !tmp->idle) - || (jbr->idle && tmp->idle && tmp->idle > jbr->idle)) - jbr = tmp; - break; - case JABBER_BUDDY_STATE_XA: - /* This resource is extended away. That's better than unavailable or unknown. */ - if ((jbr->state == JABBER_BUDDY_STATE_UNAVAILABLE) || (jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR)) - jbr = tmp; - break; - case JABBER_BUDDY_STATE_UNAVAILABLE: - /* This resource is unavailable. That's better than unknown. */ - if ((jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR)) - jbr = tmp; - break; - case JABBER_BUDDY_STATE_UNKNOWN: - case JABBER_BUDDY_STATE_ERROR: - /* These are never preferable. */ - break; - } - } } else if(tmp->name) { if(!strcmp(tmp->name, resource)) { jbr = tmp; @@ -977,7 +1018,12 @@ if(!strcmp(child2->name, "POBOX")) { purple_notify_user_info_add_pair(user_info, _("P.O. Box"), text2); - } else if(!strcmp(child2->name, "EXTADR")) { + } else if (g_str_equal(child2->name, "EXTADD") || g_str_equal(child2->name, "EXTADR")) { + /* + * EXTADD is correct, EXTADR is generated by other + * clients. The next time someone reads this, remove + * EXTADR. + */ purple_notify_user_info_add_pair(user_info, _("Extended Address"), text2); } else if(!strcmp(child2->name, "STREET")) { purple_notify_user_info_add_pair(user_info, _("Street Address"), text2); diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/jabber/disco.c --- a/libpurple/protocols/jabber/disco.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/jabber/disco.c Fri Jul 31 19:20:06 2009 +0000 @@ -166,6 +166,18 @@ */ xmlnode *feature = xmlnode_new_child(query, "feature"); xmlnode_set_attrib(feature, "var", "http://www.google.com/xmpp/protocol/video/v1"); + } else if (g_str_equal(node, CAPS0115_NODE "#" "camera-v1")) { + /* + * HUGE HACK! We advertise this ext (see jabber_presence_create_js + * where we add to the ) for the Google Talk + * clients that don't actually check disco#info features. + * + * This specific feature is redundant but is what + * node='http://mail.google.com/xmpp/client/caps', ver='1.1' + * advertises as 'camera-v1'. + */ + xmlnode *feature = xmlnode_new_child(query, "feature"); + xmlnode_set_attrib(feature, "var", "http://www.google.com/xmpp/protocol/camera/v1"); #endif } else { xmlnode *error, *inf; diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/jabber/jingle/rtp.c --- a/libpurple/protocols/jabber/jingle/rtp.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/jabber/jingle/rtp.c Fri Jul 31 19:20:06 2009 +0000 @@ -457,7 +457,8 @@ gchar *sid, gchar *name, JingleSession *session) { purple_debug_info("jingle-rtp", "state-changed: state %d " - "id: %s name: %s\n", state, sid, name); + "id: %s name: %s\n", state, sid ? sid : "(null)", + name ? name : "(null)"); } static void @@ -466,7 +467,8 @@ JingleSession *session) { purple_debug_info("jingle-rtp", "stream-info: type %d " - "id: %s name: %s\n", type, sid, name); + "id: %s name: %s\n", type, sid ? sid : "(null)", + name ? name : "(null)"); g_return_if_fail(JINGLE_IS_SESSION(session)); diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/jabber/presence.c --- a/libpurple/protocols/jabber/presence.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/jabber/presence.c Fri Jul 31 19:20:06 2009 +0000 @@ -62,14 +62,16 @@ void jabber_presence_fake_to_self(JabberStream *js, PurpleStatus *status) { PurpleAccount *account; + PurplePresence *presence; const char *username; g_return_if_fail(js->user != NULL); account = purple_connection_get_account(js->gc); username = purple_connection_get_display_name(js->gc); + presence = purple_account_get_presence(account); if (status == NULL) - status = purple_account_get_active_status(account); + status = purple_presence_get_active_status(presence); if (purple_find_buddy(account, username)) { JabberBuddy *jb = jabber_buddy_find(js, username, TRUE); @@ -86,14 +88,23 @@ state == JABBER_BUDDY_STATE_UNKNOWN) { jabber_buddy_remove_resource(jb, js->user->resource); } else { - jabber_buddy_track_resource(jb, js->user->resource, priority, - state, msg); + jbr = jabber_buddy_track_resource(jb, js->user->resource, priority, + state, msg); + jbr->idle = purple_presence_is_idle(presence) ? + purple_presence_get_idle_time(presence) : 0; } if ((jbr = jabber_buddy_find_resource(jb, NULL))) { - purple_prpl_got_user_status(account, username, jabber_buddy_state_get_status_id(jbr->state), "priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL); + purple_prpl_got_user_status(account, username, + jabber_buddy_state_get_status_id(jbr->state), + "priority", jbr->priority, + jbr->status ? "message" : NULL, jbr->status, + NULL); + purple_prpl_got_user_idle(account, username, jbr->idle, jbr->idle); } else { - purple_prpl_got_user_status(account, username, "offline", msg ? "message" : NULL, msg, NULL); + purple_prpl_got_user_status(account, username, "offline", + msg ? "message" : NULL, msg, + NULL); } g_free(msg); } @@ -313,11 +324,11 @@ video_enabled = jabber_video_enabled(js, NULL /* unused */); if (audio_enabled && video_enabled) - xmlnode_set_attrib(c, "ext", "voice-v1 video-v1"); + xmlnode_set_attrib(c, "ext", "voice-v1 camera-v1 video-v1"); else if (audio_enabled) xmlnode_set_attrib(c, "ext", "voice-v1"); else if (video_enabled) - xmlnode_set_attrib(c, "ext", "video-v1"); + xmlnode_set_attrib(c, "ext", "camera-v1 video-v1"); #endif return presence; diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/msn/slp.c --- a/libpurple/protocols/msn/slp.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/msn/slp.c Fri Jul 31 19:20:06 2009 +0000 @@ -324,7 +324,6 @@ gsize bin_len; guint32 file_size; char *file_name; - gunichar2 *uni_name; account = slpcall->slplink->session->account; @@ -342,14 +341,8 @@ bin = (char *)purple_base64_decode(context, &bin_len); file_size = GUINT32_FROM_LE(*(gsize *)(bin + 8)); - uni_name = (gunichar2 *)(bin + 20); - while(*uni_name != 0 && ((char *)uni_name - (bin + 20)) < MAX_FILE_NAME_LEN) { - *uni_name = GUINT16_FROM_LE(*uni_name); - uni_name++; - } - - file_name = g_utf16_to_utf8((const gunichar2 *)(bin + 20), -1, - NULL, NULL, NULL); + file_name = g_convert(bin + 20, -1, "UTF-8", "UTF-16LE", + NULL, NULL, NULL); g_free(bin); diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/msn/slpcall.c --- a/libpurple/protocols/msn/slpcall.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/msn/slpcall.c Fri Jul 31 19:20:06 2009 +0000 @@ -206,20 +206,23 @@ { /* This is for handwritten messages (Ink) */ GError *error; - glong items_read, items_written; + gsize bytes_read, bytes_written; - body_str = g_utf16_to_utf8((gunichar2 *)body, body_len / 2, - &items_read, &items_written, &error); - body_len -= items_read * 2 + 2; - body += items_read * 2 + 2; + body_str = g_convert((const gchar *)body, body_len / 2, + "UTF-8", "UTF16-LE", + &bytes_read, &bytes_written, &error); + body_len -= bytes_read + 2; + body += bytes_read + 2; if (body_str == NULL || body_len <= 0 || strstr(body_str, "image/gif") == NULL) { - if (error != NULL) + if (error != NULL) { purple_debug_error("msn", "Unable to convert Ink header from UTF-16 to UTF-8: %s\n", error->message); + g_error_free(error); + } else purple_debug_error("msn", "Received Ink in unknown format\n"); @@ -228,13 +231,20 @@ } g_free(body_str); - body_str = g_utf16_to_utf8((gunichar2 *)body, body_len / 2, - &items_read, &items_written, &error); + body_str = g_convert((const gchar *)body, body_len / 2, + "UTF-8", "UTF16-LE", + &bytes_read, &bytes_written, &error); if (!body_str) { - purple_debug_error("msn", - "Unable to convert Ink body from UTF-16 to UTF-8: %s\n", - error->message); + if (error != NULL) { + purple_debug_error("msn", + "Unable to convert Ink body from UTF-16 to UTF-8: %s\n", + error->message); + g_error_free(error); + } + else + purple_debug_error("msn", + "Received Ink in unknown format\n"); return NULL; } diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/msn/slplink.c --- a/libpurple/protocols/msn/slplink.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/msn/slplink.c Fri Jul 31 19:20:06 2009 +0000 @@ -541,7 +541,8 @@ if (xfer->data == NULL) { purple_xfer_unref(xfer); - return; + msn_slpmsg_destroy(slpmsg); + g_return_if_reached(); } else { purple_xfer_unref(xfer); slpmsg->fp = xfer->dest_fp; diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/msn/soap.c --- a/libpurple/protocols/msn/soap.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/msn/soap.c Fri Jul 31 19:20:06 2009 +0000 @@ -385,7 +385,7 @@ msn_soap_connection_handle_next(conn); handled = TRUE; break; - } else if (conn->response_code == 503) { + } else if (conn->response_code == 503 && conn->session->login_step < MSN_LOGIN_STEP_END) { msn_soap_connection_sanitize(conn, TRUE); msn_session_set_error(conn->session, MSN_ERROR_SERV_UNAVAILABLE, NULL); return; diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/oscar/family_icq.c --- a/libpurple/protocols/oscar/family_icq.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/oscar/family_icq.c Fri Jul 31 19:20:06 2009 +0000 @@ -246,7 +246,7 @@ if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICQ))) return -EINVAL; - purple_debug_info("oscar", "Requesting ICQ alias for %s", uin); + purple_debug_info("oscar", "Requesting ICQ alias for %s\n", uin); bslen = 2 + 4 + 2 + 2 + 2 + 4; diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/oscar/family_locate.c --- a/libpurple/protocols/oscar/family_locate.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Fri Jul 31 19:20:06 2009 +0000 @@ -615,13 +615,15 @@ * User flags * * Specified as any of the following ORed together: - * 0x0001 Trial (user less than 60days) + * 0x0001 Unconfirmed account * 0x0002 Unknown bit 2 * 0x0004 AOL Main Service user * 0x0008 Unknown bit 4 * 0x0010 Free (AIM) user * 0x0020 Away - * 0x0400 ActiveBuddy + * 0x0040 ICQ user (AIM bit also set) + * 0x0080 Mobile device + * 0x0400 Bot (like ActiveBuddy) */ outinfo->flags = byte_stream_get16(bs); outinfo->present |= AIM_USERINFO_PRESENT_FLAGS; diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/yahoo/libymsg.c --- a/libpurple/protocols/yahoo/libymsg.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Fri Jul 31 19:20:06 2009 +0000 @@ -976,7 +976,7 @@ return; } - /** TODO: It seems that this check should be per IM, not global */ + /* TODO: It seems that this check should be per IM, not global */ /* Check for the Doodle IMV */ if (im != NULL && imv!= NULL && im->from != NULL) { @@ -3767,7 +3767,7 @@ if (presence != NULL) purple_notify_user_info_add_pair(user_info, _("Presence"), presence); - if (full) { + if (f && full) { YahooPersonalDetails *ypd = &f->ypd; int i; struct { diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/yahoo/util.c --- a/libpurple/protocols/yahoo/util.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/yahoo/util.c Fri Jul 31 19:20:06 2009 +0000 @@ -172,7 +172,6 @@ char *yahoo_convert_to_numeric(const char *str) { GString *gstr = NULL; - char *retstr; const unsigned char *p; gstr = g_string_sized_new(strlen(str) * 6 + 1); @@ -181,11 +180,7 @@ g_string_append_printf(gstr, "&#%u;", *p); } - retstr = gstr->str; - - g_string_free(gstr, FALSE); - - return retstr; + return g_string_free(gstr, FALSE); } /* @@ -220,23 +215,23 @@ ht = g_hash_table_new(g_str_hash, g_str_equal); /* the numbers in comments are what gyach uses, but i think they're incorrect */ - g_hash_table_insert(ht, "30", ""); /* black */ - g_hash_table_insert(ht, "31", ""); /* blue */ - g_hash_table_insert(ht, "32", ""); /* cyan */ /* 00b2b2 */ - g_hash_table_insert(ht, "33", ""); /* gray */ /* 808080 */ - g_hash_table_insert(ht, "34", ""); /* green */ /* 00c200 */ - g_hash_table_insert(ht, "35", ""); /* pink */ /* ffafaf */ - g_hash_table_insert(ht, "36", ""); /* purple */ /* b200b2 */ - g_hash_table_insert(ht, "37", ""); /* orange */ /* ffff00 */ - g_hash_table_insert(ht, "38", ""); /* red */ - g_hash_table_insert(ht, "39", ""); /* olive */ /* 546b50 */ + g_hash_table_insert(ht, "30", ""); /* black */ + g_hash_table_insert(ht, "31", ""); /* blue */ + g_hash_table_insert(ht, "32", ""); /* cyan */ /* 00b2b2 */ + g_hash_table_insert(ht, "33", ""); /* gray */ /* 808080 */ + g_hash_table_insert(ht, "34", ""); /* green */ /* 00c200 */ + g_hash_table_insert(ht, "35", ""); /* pink */ /* ffafaf */ + g_hash_table_insert(ht, "36", ""); /* purple */ /* b200b2 */ + g_hash_table_insert(ht, "37", ""); /* orange */ /* ffff00 */ + g_hash_table_insert(ht, "38", ""); /* red */ + g_hash_table_insert(ht, "39", ""); /* olive */ /* 546b50 */ - g_hash_table_insert(ht, "1", ""); - g_hash_table_insert(ht, "x1", ""); - g_hash_table_insert(ht, "2", ""); - g_hash_table_insert(ht, "x2", ""); - g_hash_table_insert(ht, "4", ""); - g_hash_table_insert(ht, "x4", ""); + g_hash_table_insert(ht, "1", ""); + g_hash_table_insert(ht, "x1", ""); + g_hash_table_insert(ht, "2", ""); + g_hash_table_insert(ht, "x2", ""); + g_hash_table_insert(ht, "4", ""); + g_hash_table_insert(ht, "x4", ""); /* these just tell us the text they surround is supposed * to be a link. purple figures that out on its own so we @@ -245,27 +240,27 @@ g_hash_table_insert(ht, "l", ""); /* link start */ g_hash_table_insert(ht, "xl", ""); /* link end */ - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); - g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); + g_hash_table_insert(ht, "", ""); /* remove these once we have proper support for and */ g_hash_table_insert(ht, "", ""); @@ -314,12 +309,12 @@ } /* The Yahoo size tag is actually an absz tag; convert it to an HTML size, and include both tags */ -static void _font_tags_fix_size(GString *tag, GString *dest) +static void _font_tags_fix_size(const char *tag, GString *dest) { char *x, *end; int size; - if (((x = strstr(tag->str, "size"))) && ((x = strchr(x, '=')))) { + if (((x = strstr(tag, "size"))) && ((x = strchr(x, '=')))) { while (*x && !g_ascii_isdigit(*x)) x++; if (*x) { @@ -327,90 +322,98 @@ size = strtol(x, &end, 10); htmlsize = point_to_html(size); - g_string_append_len(dest, tag->str, x - tag->str); + g_string_append_len(dest, tag, x - tag); g_string_append_printf(dest, "%d", htmlsize); g_string_append_printf(dest, "\" absz=\"%d", size); g_string_append(dest, end); } else { - g_string_append(dest, tag->str); + g_string_append(dest, tag); return; } } else { - g_string_append(dest, tag->str); + g_string_append(dest, tag); return; } } char *yahoo_codes_to_html(const char *x) { - GString *s, *tmp; - int i, j, xs, nomoreendtags = 0; /* s/endtags/closinganglebrackets */ - char *match, *ret; + size_t x_len; + GString *s; + int i, j; + gchar *tmp; + gboolean no_more_gt_brackets = FALSE; + const char *match; - s = g_string_sized_new(strlen(x)); + x_len = strlen(x); + s = g_string_sized_new(x_len); - for (i = 0, xs = strlen(x); i < xs; i++) { + for (i = 0; i < x_len; i++) { if ((x[i] == 0x1b) && (x[i+1] == '[')) { + /* This escape sequence signifies the beginning of some + * text formatting code */ j = i + 1; - while (j++ < xs) { + while (j++ < x_len) { if (x[j] != 'm') continue; else { - tmp = g_string_new_len(x + i + 2, j - i - 2); - if (tmp->str[0] == '#') - g_string_append_printf(s, "", tmp->str); - else if ((match = (char *) g_hash_table_lookup(ht, tmp->str))) + /* We've reached the end of the formatting code, yay */ + tmp = g_strndup(x + i + 2, j - i - 2); + if (tmp[0] == '#') + g_string_append_printf(s, "", tmp); + else if ((match = g_hash_table_lookup(ht, tmp))) g_string_append(s, match); else { purple_debug_error("yahoo", - "Unknown ansi code 'ESC[%sm'.\n", tmp->str); - g_string_free(tmp, TRUE); + "Unknown ansi code 'ESC[%sm'.\n", tmp); + g_free(tmp); break; } i = j; - g_string_free(tmp, TRUE); + g_free(tmp); break; } } - } else if (!nomoreendtags && (x[i] == '<')) { + } else if (!no_more_gt_brackets && (x[i] == '<')) { + /* The start of an HTML tag */ j = i; - while (j++ < xs) { + while (j++ < x_len) { if (x[j] != '>') - if (j == xs) { + if (j == x_len) { g_string_append(s, "<"); - nomoreendtags = 1; + no_more_gt_brackets = TRUE; } else continue; else { - tmp = g_string_new_len(x + i, j - i + 1); - g_string_ascii_down(tmp); + tmp = g_strndup(x + i, j - i + 1); + g_ascii_strdown(tmp, -1); - if ((match = (char *) g_hash_table_lookup(ht, tmp->str))) + if ((match = g_hash_table_lookup(ht, tmp))) g_string_append(s, match); - else if (!strncmp(tmp->str, "str, "str, "str, "str; - g_string_free(s, FALSE); - purple_debug_misc("yahoo", "yahoo_codes_to_html: Returning string: '%s'.\n", ret); - return ret; + purple_debug_misc("yahoo", "yahoo_codes_to_html: Returning string: '%s'.\n", s->str); + return g_string_free(s, FALSE); } /* borrowed from gtkimhtml */ @@ -640,18 +641,20 @@ char *yahoo_html_to_codes(const char *src) { - int i, j, len; + GQueue *colors, *tags; + size_t src_len; + int i, j; GString *dest; - char *ret, *esc; - GQueue *colors, *tags; + char *esc; GQueue *ftattr = NULL; gboolean no_more_specials = FALSE; colors = g_queue_new(); tags = g_queue_new(); - dest = g_string_sized_new(strlen(src)); + src_len = strlen(src); + dest = g_string_sized_new(src_len); - for (i = 0, len = strlen(src); i < len; i++) { + for (i = 0; i < src_len; i++) { if (!no_more_specials && src[i] == '<') { j = i; @@ -659,7 +662,7 @@ while (1) { j++; - if (j >= len) { /* no '>' */ + if (j >= src_len) { /* no '>' */ g_string_append_c(dest, src[i]); no_more_specials = TRUE; break; @@ -688,7 +691,7 @@ char *t = strchr(&src[j], '>'); if (!t) { g_string_append(dest, &src[i]); - i = len; + i = src_len; break; } else { i = t - src; @@ -699,15 +702,15 @@ g_string_append(dest, "\033[lm"); while (1) { g_string_append_c(dest, src[j]); - if (++j >= len) { - i = len; + if (++j >= src_len) { + i = src_len; break; } if (src[j] == '"') { g_string_append(dest, "\033[xlm"); while (1) { - if (++j >= len) { - i = len; + if (++j >= src_len) { + i = src_len; break; } if (!g_ascii_strncasecmp(&src[j], "", 4)) { @@ -721,9 +724,9 @@ } } else if (!g_ascii_strncasecmp(&src[i+1], "SPAN", j - i - 1)) { /* drop span tags */ while (1) { - if (++j >= len) { + if (++j >= src_len) { g_string_append(dest, &src[i]); - i = len; + i = src_len; break; } if (src[j] == '>') { @@ -733,9 +736,9 @@ } } else if (g_ascii_strncasecmp(&src[i+1], "FONT", j - i - 1)) { /* not interested! */ while (1) { - if (++j >= len) { + if (++j >= src_len) { g_string_append(dest, &src[i]); - i = len; + i = src_len; break; } if (src[j] == '>') { @@ -745,7 +748,7 @@ } } } else { /* yay we have a font tag */ - _parse_font_tag(src, dest, &i, &j, len, colors, tags, ftattr); + _parse_font_tag(src, dest, &i, &j, src_len, colors, tags, ftattr); } break; @@ -806,19 +809,19 @@ } } else { - if (((len - i) >= 4) && !strncmp(&src[i], "<", 4)) { + if (((src_len - i) >= 4) && !strncmp(&src[i], "<", 4)) { g_string_append_c(dest, '<'); i += 3; - } else if (((len - i) >= 4) && !strncmp(&src[i], ">", 4)) { + } else if (((src_len - i) >= 4) && !strncmp(&src[i], ">", 4)) { g_string_append_c(dest, '>'); i += 3; - } else if (((len - i) >= 5) && !strncmp(&src[i], "&", 5)) { + } else if (((src_len - i) >= 5) && !strncmp(&src[i], "&", 5)) { g_string_append_c(dest, '&'); i += 4; - } else if (((len - i) >= 6) && !strncmp(&src[i], """, 6)) { + } else if (((src_len - i) >= 6) && !strncmp(&src[i], """, 6)) { g_string_append_c(dest, '"'); i += 5; - } else if (((len - i) >= 6) && !strncmp(&src[i], "'", 6)) { + } else if (((src_len - i) >= 6) && !strncmp(&src[i], "'", 6)) { g_string_append_c(dest, '\''); i += 5; } else { @@ -827,15 +830,12 @@ } } - ret = dest->str; - g_string_free(dest, FALSE); - - esc = g_strescape(ret, NULL); + esc = g_strescape(dest->str, NULL); purple_debug_misc("yahoo", "yahoo_html_to_codes: Returning string: '%s'.\n", esc); g_free(esc); yahoo_htc_queue_cleanup(colors); yahoo_htc_queue_cleanup(tags); - return ret; + return g_string_free(dest, FALSE); } diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/protocols/zephyr/ZVariables.c --- a/libpurple/protocols/zephyr/ZVariables.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/protocols/zephyr/ZVariables.c Fri Jul 31 19:20:06 2009 +0000 @@ -18,27 +18,32 @@ #include #endif -static int get_localvarfile __P((char *bfr)); +static char *get_localvarfile __P((void)); static char *get_varval __P((char *fn, char *val)); static int varline __P((char *bfr, char *var)); char *ZGetVariable(var) char *var; { - char varfile[128], *ret; + char *varfile, *ret; + + if ((varfile = get_localvarfile()) == NULL) + return ((char *)0); - if (get_localvarfile(varfile)) - return ((char *)0); - - if ((ret = get_varval(varfile, var)) != ZERR_NONE) - return (ret); + if ((ret = get_varval(varfile, var)) != ZERR_NONE) { + g_free(varfile); + return ret; + } #ifdef WIN32 - sprintf(varfile, "C:\\zephyr\\zephyr.var"); + varfile = g_strdup("C:\\zephyr\\zephyr.var"); #else - sprintf(varfile, "%s/zephyr.vars", CONFDIR); + varfile = g_strdup_printf("%s/zephyr.vars", CONFDIR); #endif - return (get_varval(varfile, var)); + ret = get_varval(varfile, var); + g_free(varfile); + + return ret; } Code_t ZSetVariable(var, value) @@ -47,18 +52,20 @@ { int written; FILE *fpin, *fpout; - char varfile[128], varfilebackup[128], varbfr[512]; + char *varfile, *varfilebackup, varbfr[512]; written = 0; - if (get_localvarfile(varfile)) + if ((varfile = get_localvarfile()) == NULL) return (ZERR_INTERNAL); - (void) strcpy(varfilebackup, varfile); - (void) strcat(varfilebackup, ".backup"); + varfilebackup = g_strconcat(varfile, ".backup", NULL); - if (!(fpout = fopen(varfilebackup, "w"))) + if (!(fpout = fopen(varfilebackup, "w"))) { + g_free(varfile); + g_free(varfilebackup); return (errno); + } if ((fpin = fopen(varfile, "r")) != NULL) { while (fgets(varbfr, sizeof varbfr, fpin) != (char *) 0) { if (varbfr[strlen(varbfr)-1] < ' ') @@ -74,10 +81,18 @@ } if (!written) fprintf(fpout, "%s = %s\n", var, value); - if (fclose(fpout) == EOF) - return(EIO); /* can't rely on errno */ - if (rename(varfilebackup, varfile)) + if (fclose(fpout) == EOF) { + g_free(varfilebackup); + g_free(varfile); + return(EIO); /* can't rely on errno */ + } + if (rename(varfilebackup, varfile)) { + g_free(varfilebackup); + g_free(varfile); return (errno); + } + g_free(varfilebackup); + g_free(varfile); return (ZERR_NONE); } @@ -85,16 +100,18 @@ char *var; { FILE *fpin, *fpout; - char varfile[128], varfilebackup[128], varbfr[512]; + char *varfile, *varfilebackup, varbfr[512]; - if (get_localvarfile(varfile)) + if ((varfile = get_localvarfile()) == NULL) return (ZERR_INTERNAL); - (void) strcpy(varfilebackup, varfile); - (void) strcat(varfilebackup, ".backup"); + varfilebackup = g_strconcat(varfile, ".backup", NULL); - if (!(fpout = fopen(varfilebackup, "w"))) + if (!(fpout = fopen(varfilebackup, "w"))) { + g_free(varfile); + g_free(varfilebackup); return (errno); + } if ((fpin = fopen(varfile, "r")) != NULL) { while (fgets(varbfr, sizeof varbfr, fpin) != (char *) 0) { if (varbfr[strlen(varbfr)-1] < ' ') @@ -104,42 +121,45 @@ } (void) fclose(fpin); /* don't care about read close errs */ } - if (fclose(fpout) == EOF) - return(EIO); /* errno isn't reliable */ - if (rename(varfilebackup, varfile)) + if (fclose(fpout) == EOF) { + g_free(varfilebackup); + g_free(varfile); + return(EIO); /* errno isn't reliable */ + } + if (rename(varfilebackup, varfile)) { + g_free(varfilebackup); + g_free(varfile); return (errno); + } + g_free(varfilebackup); + g_free(varfile); return (ZERR_NONE); } -static int get_localvarfile(bfr) - char *bfr; +static char *get_localvarfile(void) { - const char *envptr; + const char *base; #ifndef WIN32 struct passwd *pwd; - envptr = purple_home_dir(); + base = purple_home_dir(); #else - envptr = getenv("HOME"); - if (!envptr) - envptr = getenv("HOMEPATH"); - if (!envptr) - envptr = "C:\\"; + base = getenv("HOME"); + if (!base) + base = getenv("HOMEPATH"); + if (!base) + base = "C:\\"; #endif - if (envptr) - (void) strcpy(bfr, envptr); - else { + if (!base) { #ifndef WIN32 if (!(pwd = getpwuid((int) getuid()))) { fprintf(stderr, "Zephyr internal failure: Can't find your entry in /etc/passwd\n"); - return (1); + return NULL; } - (void) strcpy(bfr, pwd->pw_dir); + base = pwd->pw_dir; #endif } - (void) strcat(bfr, "/"); - (void) strcat(bfr, ".zephyr.vars"); - return (0); + return g_strconcat(base, "/.zephyr.vars", NULL); } static char *get_varval(fn, var) diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/tests/Makefile.am --- a/libpurple/tests/Makefile.am Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/tests/Makefile.am Fri Jul 31 19:20:06 2009 +0000 @@ -11,6 +11,7 @@ tests.h \ test_cipher.c \ test_jabber_jutil.c \ + test_yahoo_util.c \ test_util.c \ $(top_builddir)/libpurple/util.h @@ -27,6 +28,7 @@ @CHECK_LIBS@ \ $(GLIB_LIBS) \ $(top_builddir)/libpurple/protocols/jabber/libjabber.la \ + $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \ $(top_builddir)/libpurple/libpurple.la endif diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/tests/check_libpurple.c --- a/libpurple/tests/check_libpurple.c Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/tests/check_libpurple.c Fri Jul 31 19:20:06 2009 +0000 @@ -76,6 +76,7 @@ srunner_add_suite(sr, cipher_suite()); srunner_add_suite(sr, jabber_jutil_suite()); + srunner_add_suite(sr, yahoo_util_suite()); srunner_add_suite(sr, util_suite()); /* make this a libpurple "ui" */ diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/tests/test_yahoo_util.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/tests/test_yahoo_util.c Fri Jul 31 19:20:06 2009 +0000 @@ -0,0 +1,53 @@ +#include + +#include "tests.h" +#include "../protocols/yahoo/libymsg.h" + +static void setup_codes_to_html(void) +{ + yahoo_init_colorht(); +} + +static void teardown_codes_to_html(void) +{ + yahoo_dest_colorht(); +} + +START_TEST(test_codes_to_html) +{ + assert_string_equal_free("plain", yahoo_codes_to_html("plain")); + + /* bold/italic/underline */ + assert_string_equal_free("bold", + yahoo_codes_to_html("\x1B[1mbold")); + assert_string_equal_free("italic", + yahoo_codes_to_html("\x1B[2mitalic")); + assert_string_equal_free("underline", + yahoo_codes_to_html("\x1B[4munderline")); + assert_string_equal_free("bold italic underline", + yahoo_codes_to_html("\x1B[1mbold\x1B[x1m \x1B[2mitalic\x1B[x2m \x1B[4munderline")); + + /* font color and size */ + assert_string_equal_free("blue", + yahoo_codes_to_html("\x1B[31mblue")); + assert_string_equal_free("test", + yahoo_codes_to_html("\x1B[#70ea15mtest")); + assert_string_equal_free("test", + yahoo_codes_to_html("test")); + assert_string_equal_free("test", + yahoo_codes_to_html("\x1B[35mtest")); +} +END_TEST + +Suite * +yahoo_util_suite(void) +{ + Suite *s = suite_create("Yahoo Utility Functions"); + + TCase *tc = tcase_create("Convert to Numeric"); + tcase_add_unchecked_fixture(tc, setup_codes_to_html, teardown_codes_to_html); + tcase_add_test(tc, test_codes_to_html); + suite_add_tcase(s, tc); + + return s; +} diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/tests/tests.h --- a/libpurple/tests/tests.h Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/tests/tests.h Fri Jul 31 19:20:06 2009 +0000 @@ -10,6 +10,7 @@ Suite * master_suite(void); Suite * cipher_suite(void); Suite * jabber_jutil_suite(void); +Suite * yahoo_util_suite(void); Suite * util_suite(void); /* helper macros */ diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/valgrind.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/valgrind.h Fri Jul 31 19:20:06 2009 +0000 @@ -0,0 +1,3924 @@ +/* -*- c -*- + ---------------------------------------------------------------- + + Notice that the following BSD-style license applies to this one + file (valgrind.h) only. The rest of Valgrind is licensed under the + terms of the GNU General Public License, version 2, unless + otherwise indicated. See the COPYING file in the source + distribution for details. + + ---------------------------------------------------------------- + + This file is part of Valgrind, a dynamic binary instrumentation + framework. + + Copyright (C) 2000-2008 Julian Seward. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + + 3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + ---------------------------------------------------------------- + + Notice that the above BSD-style license applies to this one file + (valgrind.h) only. The entire rest of Valgrind is licensed under + the terms of the GNU General Public License, version 2. See the + COPYING file in the source distribution for details. + + ---------------------------------------------------------------- +*/ + + +/* This file is for inclusion into client (your!) code. + + You can use these macros to manipulate and query Valgrind's + execution inside your own programs. + + The resulting executables will still run without Valgrind, just a + little bit more slowly than they otherwise would, but otherwise + unchanged. When not running on valgrind, each client request + consumes very few (eg. 7) instructions, so the resulting performance + loss is negligible unless you plan to execute client requests + millions of times per second. Nevertheless, if that is still a + problem, you can compile with the NVALGRIND symbol defined (gcc + -DNVALGRIND) so that client requests are not even compiled in. */ + +#ifndef __VALGRIND_H +#define __VALGRIND_H + +#include + +/* Nb: this file might be included in a file compiled with -ansi. So + we can't use C++ style "//" comments nor the "asm" keyword (instead + use "__asm__"). */ + +/* Derive some tags indicating what the target platform is. Note + that in this file we're using the compiler's CPP symbols for + identifying architectures, which are different to the ones we use + within the rest of Valgrind. Note, __powerpc__ is active for both + 32 and 64-bit PPC, whereas __powerpc64__ is only active for the + latter (on Linux, that is). */ +#undef PLAT_x86_linux +#undef PLAT_amd64_linux +#undef PLAT_ppc32_linux +#undef PLAT_ppc64_linux +#undef PLAT_ppc32_aix5 +#undef PLAT_ppc64_aix5 + +#if !defined(_AIX) && defined(__i386__) +# define PLAT_x86_linux 1 +#elif !defined(_AIX) && defined(__x86_64__) +# define PLAT_amd64_linux 1 +#elif !defined(_AIX) && defined(__powerpc__) && !defined(__powerpc64__) +# define PLAT_ppc32_linux 1 +#elif !defined(_AIX) && defined(__powerpc__) && defined(__powerpc64__) +# define PLAT_ppc64_linux 1 +#elif defined(_AIX) && defined(__64BIT__) +# define PLAT_ppc64_aix5 1 +#elif defined(_AIX) && !defined(__64BIT__) +# define PLAT_ppc32_aix5 1 +#endif + + +/* If we're not compiling for our target platform, don't generate + any inline asms. */ +#if !defined(PLAT_x86_linux) && !defined(PLAT_amd64_linux) \ + && !defined(PLAT_ppc32_linux) && !defined(PLAT_ppc64_linux) \ + && !defined(PLAT_ppc32_aix5) && !defined(PLAT_ppc64_aix5) +# if !defined(NVALGRIND) +# define NVALGRIND 1 +# endif +#endif + + +/* ------------------------------------------------------------------ */ +/* ARCHITECTURE SPECIFICS for SPECIAL INSTRUCTIONS. There is nothing */ +/* in here of use to end-users -- skip to the next section. */ +/* ------------------------------------------------------------------ */ + +#if defined(NVALGRIND) + +/* Define NVALGRIND to completely remove the Valgrind magic sequence + from the compiled code (analogous to NDEBUG's effects on + assert()) */ +#define VALGRIND_DO_CLIENT_REQUEST( \ + _zzq_rlval, _zzq_default, _zzq_request, \ + _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5) \ + { \ + (_zzq_rlval) = (_zzq_default); \ + } + +#else /* ! NVALGRIND */ + +/* The following defines the magic code sequences which the JITter + spots and handles magically. Don't look too closely at them as + they will rot your brain. + + The assembly code sequences for all architectures is in this one + file. This is because this file must be stand-alone, and we don't + want to have multiple files. + + For VALGRIND_DO_CLIENT_REQUEST, we must ensure that the default + value gets put in the return slot, so that everything works when + this is executed not under Valgrind. Args are passed in a memory + block, and so there's no intrinsic limit to the number that could + be passed, but it's currently five. + + The macro args are: + _zzq_rlval result lvalue + _zzq_default default value (result returned when running on real CPU) + _zzq_request request code + _zzq_arg1..5 request params + + The other two macros are used to support function wrapping, and are + a lot simpler. VALGRIND_GET_NR_CONTEXT returns the value of the + guest's NRADDR pseudo-register and whatever other information is + needed to safely run the call original from the wrapper: on + ppc64-linux, the R2 value at the divert point is also needed. This + information is abstracted into a user-visible type, OrigFn. + + VALGRIND_CALL_NOREDIR_* behaves the same as the following on the + guest, but guarantees that the branch instruction will not be + redirected: x86: call *%eax, amd64: call *%rax, ppc32/ppc64: + branch-and-link-to-r11. VALGRIND_CALL_NOREDIR is just text, not a + complete inline asm, since it needs to be combined with more magic + inline asm stuff to be useful. +*/ + +/* ------------------------- x86-linux ------------------------- */ + +#if defined(PLAT_x86_linux) + +typedef + struct { + unsigned int nraddr; /* where's the code? */ + } + OrigFn; + +#define __SPECIAL_INSTRUCTION_PREAMBLE \ + "roll $3, %%edi ; roll $13, %%edi\n\t" \ + "roll $29, %%edi ; roll $19, %%edi\n\t" + +#define VALGRIND_DO_CLIENT_REQUEST( \ + _zzq_rlval, _zzq_default, _zzq_request, \ + _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5) \ + { volatile unsigned int _zzq_args[6]; \ + volatile unsigned int _zzq_result; \ + _zzq_args[0] = (unsigned int)(_zzq_request); \ + _zzq_args[1] = (unsigned int)(_zzq_arg1); \ + _zzq_args[2] = (unsigned int)(_zzq_arg2); \ + _zzq_args[3] = (unsigned int)(_zzq_arg3); \ + _zzq_args[4] = (unsigned int)(_zzq_arg4); \ + _zzq_args[5] = (unsigned int)(_zzq_arg5); \ + __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE \ + /* %EDX = client_request ( %EAX ) */ \ + "xchgl %%ebx,%%ebx" \ + : "=d" (_zzq_result) \ + : "a" (&_zzq_args[0]), "0" (_zzq_default) \ + : "cc", "memory" \ + ); \ + _zzq_rlval = _zzq_result; \ + } + +#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval) \ + { volatile OrigFn* _zzq_orig = &(_zzq_rlval); \ + volatile unsigned int __addr; \ + __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE \ + /* %EAX = guest_NRADDR */ \ + "xchgl %%ecx,%%ecx" \ + : "=a" (__addr) \ + : \ + : "cc", "memory" \ + ); \ + _zzq_orig->nraddr = __addr; \ + } + +#define VALGRIND_CALL_NOREDIR_EAX \ + __SPECIAL_INSTRUCTION_PREAMBLE \ + /* call-noredir *%EAX */ \ + "xchgl %%edx,%%edx\n\t" +#endif /* PLAT_x86_linux */ + +/* ------------------------ amd64-linux ------------------------ */ + +#if defined(PLAT_amd64_linux) + +typedef + struct { + unsigned long long int nraddr; /* where's the code? */ + } + OrigFn; + +#define __SPECIAL_INSTRUCTION_PREAMBLE \ + "rolq $3, %%rdi ; rolq $13, %%rdi\n\t" \ + "rolq $61, %%rdi ; rolq $51, %%rdi\n\t" + +#define VALGRIND_DO_CLIENT_REQUEST( \ + _zzq_rlval, _zzq_default, _zzq_request, \ + _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5) \ + { volatile unsigned long long int _zzq_args[6]; \ + volatile unsigned long long int _zzq_result; \ + _zzq_args[0] = (unsigned long long int)(_zzq_request); \ + _zzq_args[1] = (unsigned long long int)(_zzq_arg1); \ + _zzq_args[2] = (unsigned long long int)(_zzq_arg2); \ + _zzq_args[3] = (unsigned long long int)(_zzq_arg3); \ + _zzq_args[4] = (unsigned long long int)(_zzq_arg4); \ + _zzq_args[5] = (unsigned long long int)(_zzq_arg5); \ + __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE \ + /* %RDX = client_request ( %RAX ) */ \ + "xchgq %%rbx,%%rbx" \ + : "=d" (_zzq_result) \ + : "a" (&_zzq_args[0]), "0" (_zzq_default) \ + : "cc", "memory" \ + ); \ + _zzq_rlval = _zzq_result; \ + } + +#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval) \ + { volatile OrigFn* _zzq_orig = &(_zzq_rlval); \ + volatile unsigned long long int __addr; \ + __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE \ + /* %RAX = guest_NRADDR */ \ + "xchgq %%rcx,%%rcx" \ + : "=a" (__addr) \ + : \ + : "cc", "memory" \ + ); \ + _zzq_orig->nraddr = __addr; \ + } + +#define VALGRIND_CALL_NOREDIR_RAX \ + __SPECIAL_INSTRUCTION_PREAMBLE \ + /* call-noredir *%RAX */ \ + "xchgq %%rdx,%%rdx\n\t" +#endif /* PLAT_amd64_linux */ + +/* ------------------------ ppc32-linux ------------------------ */ + +#if defined(PLAT_ppc32_linux) + +typedef + struct { + unsigned int nraddr; /* where's the code? */ + } + OrigFn; + +#define __SPECIAL_INSTRUCTION_PREAMBLE \ + "rlwinm 0,0,3,0,0 ; rlwinm 0,0,13,0,0\n\t" \ + "rlwinm 0,0,29,0,0 ; rlwinm 0,0,19,0,0\n\t" + +#define VALGRIND_DO_CLIENT_REQUEST( \ + _zzq_rlval, _zzq_default, _zzq_request, \ + _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5) \ + \ + { unsigned int _zzq_args[6]; \ + unsigned int _zzq_result; \ + unsigned int* _zzq_ptr; \ + _zzq_args[0] = (unsigned int)(_zzq_request); \ + _zzq_args[1] = (unsigned int)(_zzq_arg1); \ + _zzq_args[2] = (unsigned int)(_zzq_arg2); \ + _zzq_args[3] = (unsigned int)(_zzq_arg3); \ + _zzq_args[4] = (unsigned int)(_zzq_arg4); \ + _zzq_args[5] = (unsigned int)(_zzq_arg5); \ + _zzq_ptr = _zzq_args; \ + __asm__ volatile("mr 3,%1\n\t" /*default*/ \ + "mr 4,%2\n\t" /*ptr*/ \ + __SPECIAL_INSTRUCTION_PREAMBLE \ + /* %R3 = client_request ( %R4 ) */ \ + "or 1,1,1\n\t" \ + "mr %0,3" /*result*/ \ + : "=b" (_zzq_result) \ + : "b" (_zzq_default), "b" (_zzq_ptr) \ + : "cc", "memory", "r3", "r4"); \ + _zzq_rlval = _zzq_result; \ + } + +#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval) \ + { volatile OrigFn* _zzq_orig = &(_zzq_rlval); \ + unsigned int __addr; \ + __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE \ + /* %R3 = guest_NRADDR */ \ + "or 2,2,2\n\t" \ + "mr %0,3" \ + : "=b" (__addr) \ + : \ + : "cc", "memory", "r3" \ + ); \ + _zzq_orig->nraddr = __addr; \ + } + +#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + __SPECIAL_INSTRUCTION_PREAMBLE \ + /* branch-and-link-to-noredir *%R11 */ \ + "or 3,3,3\n\t" +#endif /* PLAT_ppc32_linux */ + +/* ------------------------ ppc64-linux ------------------------ */ + +#if defined(PLAT_ppc64_linux) + +typedef + struct { + unsigned long long int nraddr; /* where's the code? */ + unsigned long long int r2; /* what tocptr do we need? */ + } + OrigFn; + +#define __SPECIAL_INSTRUCTION_PREAMBLE \ + "rotldi 0,0,3 ; rotldi 0,0,13\n\t" \ + "rotldi 0,0,61 ; rotldi 0,0,51\n\t" + +#define VALGRIND_DO_CLIENT_REQUEST( \ + _zzq_rlval, _zzq_default, _zzq_request, \ + _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5) \ + \ + { unsigned long long int _zzq_args[6]; \ + register unsigned long long int _zzq_result __asm__("r3"); \ + register unsigned long long int* _zzq_ptr __asm__("r4"); \ + _zzq_args[0] = (unsigned long long int)(_zzq_request); \ + _zzq_args[1] = (unsigned long long int)(_zzq_arg1); \ + _zzq_args[2] = (unsigned long long int)(_zzq_arg2); \ + _zzq_args[3] = (unsigned long long int)(_zzq_arg3); \ + _zzq_args[4] = (unsigned long long int)(_zzq_arg4); \ + _zzq_args[5] = (unsigned long long int)(_zzq_arg5); \ + _zzq_ptr = _zzq_args; \ + __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE \ + /* %R3 = client_request ( %R4 ) */ \ + "or 1,1,1" \ + : "=r" (_zzq_result) \ + : "0" (_zzq_default), "r" (_zzq_ptr) \ + : "cc", "memory"); \ + _zzq_rlval = _zzq_result; \ + } + +#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval) \ + { volatile OrigFn* _zzq_orig = &(_zzq_rlval); \ + register unsigned long long int __addr __asm__("r3"); \ + __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE \ + /* %R3 = guest_NRADDR */ \ + "or 2,2,2" \ + : "=r" (__addr) \ + : \ + : "cc", "memory" \ + ); \ + _zzq_orig->nraddr = __addr; \ + __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE \ + /* %R3 = guest_NRADDR_GPR2 */ \ + "or 4,4,4" \ + : "=r" (__addr) \ + : \ + : "cc", "memory" \ + ); \ + _zzq_orig->r2 = __addr; \ + } + +#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + __SPECIAL_INSTRUCTION_PREAMBLE \ + /* branch-and-link-to-noredir *%R11 */ \ + "or 3,3,3\n\t" + +#endif /* PLAT_ppc64_linux */ + +/* ------------------------ ppc32-aix5 ------------------------- */ + +#if defined(PLAT_ppc32_aix5) + +typedef + struct { + unsigned int nraddr; /* where's the code? */ + unsigned int r2; /* what tocptr do we need? */ + } + OrigFn; + +#define __SPECIAL_INSTRUCTION_PREAMBLE \ + "rlwinm 0,0,3,0,0 ; rlwinm 0,0,13,0,0\n\t" \ + "rlwinm 0,0,29,0,0 ; rlwinm 0,0,19,0,0\n\t" + +#define VALGRIND_DO_CLIENT_REQUEST( \ + _zzq_rlval, _zzq_default, _zzq_request, \ + _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5) \ + \ + { unsigned int _zzq_args[7]; \ + register unsigned int _zzq_result; \ + register unsigned int* _zzq_ptr; \ + _zzq_args[0] = (unsigned int)(_zzq_request); \ + _zzq_args[1] = (unsigned int)(_zzq_arg1); \ + _zzq_args[2] = (unsigned int)(_zzq_arg2); \ + _zzq_args[3] = (unsigned int)(_zzq_arg3); \ + _zzq_args[4] = (unsigned int)(_zzq_arg4); \ + _zzq_args[5] = (unsigned int)(_zzq_arg5); \ + _zzq_args[6] = (unsigned int)(_zzq_default); \ + _zzq_ptr = _zzq_args; \ + __asm__ volatile("mr 4,%1\n\t" \ + "lwz 3, 24(4)\n\t" \ + __SPECIAL_INSTRUCTION_PREAMBLE \ + /* %R3 = client_request ( %R4 ) */ \ + "or 1,1,1\n\t" \ + "mr %0,3" \ + : "=b" (_zzq_result) \ + : "b" (_zzq_ptr) \ + : "r3", "r4", "cc", "memory"); \ + _zzq_rlval = _zzq_result; \ + } + +#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval) \ + { volatile OrigFn* _zzq_orig = &(_zzq_rlval); \ + register unsigned int __addr; \ + __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE \ + /* %R3 = guest_NRADDR */ \ + "or 2,2,2\n\t" \ + "mr %0,3" \ + : "=b" (__addr) \ + : \ + : "r3", "cc", "memory" \ + ); \ + _zzq_orig->nraddr = __addr; \ + __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE \ + /* %R3 = guest_NRADDR_GPR2 */ \ + "or 4,4,4\n\t" \ + "mr %0,3" \ + : "=b" (__addr) \ + : \ + : "r3", "cc", "memory" \ + ); \ + _zzq_orig->r2 = __addr; \ + } + +#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + __SPECIAL_INSTRUCTION_PREAMBLE \ + /* branch-and-link-to-noredir *%R11 */ \ + "or 3,3,3\n\t" + +#endif /* PLAT_ppc32_aix5 */ + +/* ------------------------ ppc64-aix5 ------------------------- */ + +#if defined(PLAT_ppc64_aix5) + +typedef + struct { + unsigned long long int nraddr; /* where's the code? */ + unsigned long long int r2; /* what tocptr do we need? */ + } + OrigFn; + +#define __SPECIAL_INSTRUCTION_PREAMBLE \ + "rotldi 0,0,3 ; rotldi 0,0,13\n\t" \ + "rotldi 0,0,61 ; rotldi 0,0,51\n\t" + +#define VALGRIND_DO_CLIENT_REQUEST( \ + _zzq_rlval, _zzq_default, _zzq_request, \ + _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5) \ + \ + { unsigned long long int _zzq_args[7]; \ + register unsigned long long int _zzq_result; \ + register unsigned long long int* _zzq_ptr; \ + _zzq_args[0] = (unsigned int long long)(_zzq_request); \ + _zzq_args[1] = (unsigned int long long)(_zzq_arg1); \ + _zzq_args[2] = (unsigned int long long)(_zzq_arg2); \ + _zzq_args[3] = (unsigned int long long)(_zzq_arg3); \ + _zzq_args[4] = (unsigned int long long)(_zzq_arg4); \ + _zzq_args[5] = (unsigned int long long)(_zzq_arg5); \ + _zzq_args[6] = (unsigned int long long)(_zzq_default); \ + _zzq_ptr = _zzq_args; \ + __asm__ volatile("mr 4,%1\n\t" \ + "ld 3, 48(4)\n\t" \ + __SPECIAL_INSTRUCTION_PREAMBLE \ + /* %R3 = client_request ( %R4 ) */ \ + "or 1,1,1\n\t" \ + "mr %0,3" \ + : "=b" (_zzq_result) \ + : "b" (_zzq_ptr) \ + : "r3", "r4", "cc", "memory"); \ + _zzq_rlval = _zzq_result; \ + } + +#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval) \ + { volatile OrigFn* _zzq_orig = &(_zzq_rlval); \ + register unsigned long long int __addr; \ + __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE \ + /* %R3 = guest_NRADDR */ \ + "or 2,2,2\n\t" \ + "mr %0,3" \ + : "=b" (__addr) \ + : \ + : "r3", "cc", "memory" \ + ); \ + _zzq_orig->nraddr = __addr; \ + __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE \ + /* %R3 = guest_NRADDR_GPR2 */ \ + "or 4,4,4\n\t" \ + "mr %0,3" \ + : "=b" (__addr) \ + : \ + : "r3", "cc", "memory" \ + ); \ + _zzq_orig->r2 = __addr; \ + } + +#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + __SPECIAL_INSTRUCTION_PREAMBLE \ + /* branch-and-link-to-noredir *%R11 */ \ + "or 3,3,3\n\t" + +#endif /* PLAT_ppc64_aix5 */ + +/* Insert assembly code for other platforms here... */ + +#endif /* NVALGRIND */ + + +/* ------------------------------------------------------------------ */ +/* PLATFORM SPECIFICS for FUNCTION WRAPPING. This is all very */ +/* ugly. It's the least-worst tradeoff I can think of. */ +/* ------------------------------------------------------------------ */ + +/* This section defines magic (a.k.a appalling-hack) macros for doing + guaranteed-no-redirection macros, so as to get from function + wrappers to the functions they are wrapping. The whole point is to + construct standard call sequences, but to do the call itself with a + special no-redirect call pseudo-instruction that the JIT + understands and handles specially. This section is long and + repetitious, and I can't see a way to make it shorter. + + The naming scheme is as follows: + + CALL_FN_{W,v}_{v,W,WW,WWW,WWWW,5W,6W,7W,etc} + + 'W' stands for "word" and 'v' for "void". Hence there are + different macros for calling arity 0, 1, 2, 3, 4, etc, functions, + and for each, the possibility of returning a word-typed result, or + no result. +*/ + +/* Use these to write the name of your wrapper. NOTE: duplicates + VG_WRAP_FUNCTION_Z{U,Z} in pub_tool_redir.h. */ + +#define I_WRAP_SONAME_FNNAME_ZU(soname,fnname) \ + _vgwZU_##soname##_##fnname + +#define I_WRAP_SONAME_FNNAME_ZZ(soname,fnname) \ + _vgwZZ_##soname##_##fnname + +/* Use this macro from within a wrapper function to collect the + context (address and possibly other info) of the original function. + Once you have that you can then use it in one of the CALL_FN_ + macros. The type of the argument _lval is OrigFn. */ +#define VALGRIND_GET_ORIG_FN(_lval) VALGRIND_GET_NR_CONTEXT(_lval) + +/* Derivatives of the main macros below, for calling functions + returning void. */ + +#define CALL_FN_v_v(fnptr) \ + do { volatile unsigned long _junk; \ + CALL_FN_W_v(_junk,fnptr); } while (0) + +#define CALL_FN_v_W(fnptr, arg1) \ + do { volatile unsigned long _junk; \ + CALL_FN_W_W(_junk,fnptr,arg1); } while (0) + +#define CALL_FN_v_WW(fnptr, arg1,arg2) \ + do { volatile unsigned long _junk; \ + CALL_FN_W_WW(_junk,fnptr,arg1,arg2); } while (0) + +#define CALL_FN_v_WWW(fnptr, arg1,arg2,arg3) \ + do { volatile unsigned long _junk; \ + CALL_FN_W_WWW(_junk,fnptr,arg1,arg2,arg3); } while (0) + +/* ------------------------- x86-linux ------------------------- */ + +#if defined(PLAT_x86_linux) + +/* These regs are trashed by the hidden call. No need to mention eax + as gcc can already see that, plus causes gcc to bomb. */ +#define __CALLER_SAVED_REGS /*"eax"*/ "ecx", "edx" + +/* These CALL_FN_ macros assume that on x86-linux, sizeof(unsigned + long) == 4. */ + +#define CALL_FN_W_v(lval, orig) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[1]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + __asm__ volatile( \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_W(lval, orig, arg1) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[2]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + __asm__ volatile( \ + "pushl 4(%%eax)\n\t" \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + "addl $4, %%esp\n" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WW(lval, orig, arg1,arg2) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + __asm__ volatile( \ + "pushl 8(%%eax)\n\t" \ + "pushl 4(%%eax)\n\t" \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + "addl $8, %%esp\n" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[4]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + __asm__ volatile( \ + "pushl 12(%%eax)\n\t" \ + "pushl 8(%%eax)\n\t" \ + "pushl 4(%%eax)\n\t" \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + "addl $12, %%esp\n" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[5]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + __asm__ volatile( \ + "pushl 16(%%eax)\n\t" \ + "pushl 12(%%eax)\n\t" \ + "pushl 8(%%eax)\n\t" \ + "pushl 4(%%eax)\n\t" \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + "addl $16, %%esp\n" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[6]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + __asm__ volatile( \ + "pushl 20(%%eax)\n\t" \ + "pushl 16(%%eax)\n\t" \ + "pushl 12(%%eax)\n\t" \ + "pushl 8(%%eax)\n\t" \ + "pushl 4(%%eax)\n\t" \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + "addl $20, %%esp\n" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[7]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + __asm__ volatile( \ + "pushl 24(%%eax)\n\t" \ + "pushl 20(%%eax)\n\t" \ + "pushl 16(%%eax)\n\t" \ + "pushl 12(%%eax)\n\t" \ + "pushl 8(%%eax)\n\t" \ + "pushl 4(%%eax)\n\t" \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + "addl $24, %%esp\n" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[8]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + _argvec[7] = (unsigned long)(arg7); \ + __asm__ volatile( \ + "pushl 28(%%eax)\n\t" \ + "pushl 24(%%eax)\n\t" \ + "pushl 20(%%eax)\n\t" \ + "pushl 16(%%eax)\n\t" \ + "pushl 12(%%eax)\n\t" \ + "pushl 8(%%eax)\n\t" \ + "pushl 4(%%eax)\n\t" \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + "addl $28, %%esp\n" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[9]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + _argvec[7] = (unsigned long)(arg7); \ + _argvec[8] = (unsigned long)(arg8); \ + __asm__ volatile( \ + "pushl 32(%%eax)\n\t" \ + "pushl 28(%%eax)\n\t" \ + "pushl 24(%%eax)\n\t" \ + "pushl 20(%%eax)\n\t" \ + "pushl 16(%%eax)\n\t" \ + "pushl 12(%%eax)\n\t" \ + "pushl 8(%%eax)\n\t" \ + "pushl 4(%%eax)\n\t" \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + "addl $32, %%esp\n" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[10]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + _argvec[7] = (unsigned long)(arg7); \ + _argvec[8] = (unsigned long)(arg8); \ + _argvec[9] = (unsigned long)(arg9); \ + __asm__ volatile( \ + "pushl 36(%%eax)\n\t" \ + "pushl 32(%%eax)\n\t" \ + "pushl 28(%%eax)\n\t" \ + "pushl 24(%%eax)\n\t" \ + "pushl 20(%%eax)\n\t" \ + "pushl 16(%%eax)\n\t" \ + "pushl 12(%%eax)\n\t" \ + "pushl 8(%%eax)\n\t" \ + "pushl 4(%%eax)\n\t" \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + "addl $36, %%esp\n" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[11]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + _argvec[7] = (unsigned long)(arg7); \ + _argvec[8] = (unsigned long)(arg8); \ + _argvec[9] = (unsigned long)(arg9); \ + _argvec[10] = (unsigned long)(arg10); \ + __asm__ volatile( \ + "pushl 40(%%eax)\n\t" \ + "pushl 36(%%eax)\n\t" \ + "pushl 32(%%eax)\n\t" \ + "pushl 28(%%eax)\n\t" \ + "pushl 24(%%eax)\n\t" \ + "pushl 20(%%eax)\n\t" \ + "pushl 16(%%eax)\n\t" \ + "pushl 12(%%eax)\n\t" \ + "pushl 8(%%eax)\n\t" \ + "pushl 4(%%eax)\n\t" \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + "addl $40, %%esp\n" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5, \ + arg6,arg7,arg8,arg9,arg10, \ + arg11) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[12]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + _argvec[7] = (unsigned long)(arg7); \ + _argvec[8] = (unsigned long)(arg8); \ + _argvec[9] = (unsigned long)(arg9); \ + _argvec[10] = (unsigned long)(arg10); \ + _argvec[11] = (unsigned long)(arg11); \ + __asm__ volatile( \ + "pushl 44(%%eax)\n\t" \ + "pushl 40(%%eax)\n\t" \ + "pushl 36(%%eax)\n\t" \ + "pushl 32(%%eax)\n\t" \ + "pushl 28(%%eax)\n\t" \ + "pushl 24(%%eax)\n\t" \ + "pushl 20(%%eax)\n\t" \ + "pushl 16(%%eax)\n\t" \ + "pushl 12(%%eax)\n\t" \ + "pushl 8(%%eax)\n\t" \ + "pushl 4(%%eax)\n\t" \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + "addl $44, %%esp\n" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5, \ + arg6,arg7,arg8,arg9,arg10, \ + arg11,arg12) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[13]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + _argvec[7] = (unsigned long)(arg7); \ + _argvec[8] = (unsigned long)(arg8); \ + _argvec[9] = (unsigned long)(arg9); \ + _argvec[10] = (unsigned long)(arg10); \ + _argvec[11] = (unsigned long)(arg11); \ + _argvec[12] = (unsigned long)(arg12); \ + __asm__ volatile( \ + "pushl 48(%%eax)\n\t" \ + "pushl 44(%%eax)\n\t" \ + "pushl 40(%%eax)\n\t" \ + "pushl 36(%%eax)\n\t" \ + "pushl 32(%%eax)\n\t" \ + "pushl 28(%%eax)\n\t" \ + "pushl 24(%%eax)\n\t" \ + "pushl 20(%%eax)\n\t" \ + "pushl 16(%%eax)\n\t" \ + "pushl 12(%%eax)\n\t" \ + "pushl 8(%%eax)\n\t" \ + "pushl 4(%%eax)\n\t" \ + "movl (%%eax), %%eax\n\t" /* target->%eax */ \ + VALGRIND_CALL_NOREDIR_EAX \ + "addl $48, %%esp\n" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#endif /* PLAT_x86_linux */ + +/* ------------------------ amd64-linux ------------------------ */ + +#if defined(PLAT_amd64_linux) + +/* ARGREGS: rdi rsi rdx rcx r8 r9 (the rest on stack in R-to-L order) */ + +/* These regs are trashed by the hidden call. */ +#define __CALLER_SAVED_REGS /*"rax",*/ "rcx", "rdx", "rsi", \ + "rdi", "r8", "r9", "r10", "r11" + +/* These CALL_FN_ macros assume that on amd64-linux, sizeof(unsigned + long) == 8. */ + +/* NB 9 Sept 07. There is a nasty kludge here in all these CALL_FN_ + macros. In order not to trash the stack redzone, we need to drop + %rsp by 128 before the hidden call, and restore afterwards. The + nastyness is that it is only by luck that the stack still appears + to be unwindable during the hidden call - since then the behaviour + of any routine using this macro does not match what the CFI data + says. Sigh. + + Why is this important? Imagine that a wrapper has a stack + allocated local, and passes to the hidden call, a pointer to it. + Because gcc does not know about the hidden call, it may allocate + that local in the redzone. Unfortunately the hidden call may then + trash it before it comes to use it. So we must step clear of the + redzone, for the duration of the hidden call, to make it safe. + + Probably the same problem afflicts the other redzone-style ABIs too + (ppc64-linux, ppc32-aix5, ppc64-aix5); but for those, the stack is + self describing (none of this CFI nonsense) so at least messing + with the stack pointer doesn't give a danger of non-unwindable + stack. */ + +#define CALL_FN_W_v(lval, orig) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[1]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + VALGRIND_CALL_NOREDIR_RAX \ + "addq $128,%%rsp\n\t" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_W(lval, orig, arg1) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[2]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "movq 8(%%rax), %%rdi\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + VALGRIND_CALL_NOREDIR_RAX \ + "addq $128,%%rsp\n\t" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WW(lval, orig, arg1,arg2) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "movq 16(%%rax), %%rsi\n\t" \ + "movq 8(%%rax), %%rdi\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + VALGRIND_CALL_NOREDIR_RAX \ + "addq $128,%%rsp\n\t" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[4]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "movq 24(%%rax), %%rdx\n\t" \ + "movq 16(%%rax), %%rsi\n\t" \ + "movq 8(%%rax), %%rdi\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + VALGRIND_CALL_NOREDIR_RAX \ + "addq $128,%%rsp\n\t" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[5]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "movq 32(%%rax), %%rcx\n\t" \ + "movq 24(%%rax), %%rdx\n\t" \ + "movq 16(%%rax), %%rsi\n\t" \ + "movq 8(%%rax), %%rdi\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + VALGRIND_CALL_NOREDIR_RAX \ + "addq $128,%%rsp\n\t" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[6]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "movq 40(%%rax), %%r8\n\t" \ + "movq 32(%%rax), %%rcx\n\t" \ + "movq 24(%%rax), %%rdx\n\t" \ + "movq 16(%%rax), %%rsi\n\t" \ + "movq 8(%%rax), %%rdi\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + VALGRIND_CALL_NOREDIR_RAX \ + "addq $128,%%rsp\n\t" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[7]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "movq 48(%%rax), %%r9\n\t" \ + "movq 40(%%rax), %%r8\n\t" \ + "movq 32(%%rax), %%rcx\n\t" \ + "movq 24(%%rax), %%rdx\n\t" \ + "movq 16(%%rax), %%rsi\n\t" \ + "movq 8(%%rax), %%rdi\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + "addq $128,%%rsp\n\t" \ + VALGRIND_CALL_NOREDIR_RAX \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[8]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + _argvec[7] = (unsigned long)(arg7); \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "pushq 56(%%rax)\n\t" \ + "movq 48(%%rax), %%r9\n\t" \ + "movq 40(%%rax), %%r8\n\t" \ + "movq 32(%%rax), %%rcx\n\t" \ + "movq 24(%%rax), %%rdx\n\t" \ + "movq 16(%%rax), %%rsi\n\t" \ + "movq 8(%%rax), %%rdi\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + VALGRIND_CALL_NOREDIR_RAX \ + "addq $8, %%rsp\n" \ + "addq $128,%%rsp\n\t" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[9]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + _argvec[7] = (unsigned long)(arg7); \ + _argvec[8] = (unsigned long)(arg8); \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "pushq 64(%%rax)\n\t" \ + "pushq 56(%%rax)\n\t" \ + "movq 48(%%rax), %%r9\n\t" \ + "movq 40(%%rax), %%r8\n\t" \ + "movq 32(%%rax), %%rcx\n\t" \ + "movq 24(%%rax), %%rdx\n\t" \ + "movq 16(%%rax), %%rsi\n\t" \ + "movq 8(%%rax), %%rdi\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + VALGRIND_CALL_NOREDIR_RAX \ + "addq $16, %%rsp\n" \ + "addq $128,%%rsp\n\t" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[10]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + _argvec[7] = (unsigned long)(arg7); \ + _argvec[8] = (unsigned long)(arg8); \ + _argvec[9] = (unsigned long)(arg9); \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "pushq 72(%%rax)\n\t" \ + "pushq 64(%%rax)\n\t" \ + "pushq 56(%%rax)\n\t" \ + "movq 48(%%rax), %%r9\n\t" \ + "movq 40(%%rax), %%r8\n\t" \ + "movq 32(%%rax), %%rcx\n\t" \ + "movq 24(%%rax), %%rdx\n\t" \ + "movq 16(%%rax), %%rsi\n\t" \ + "movq 8(%%rax), %%rdi\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + VALGRIND_CALL_NOREDIR_RAX \ + "addq $24, %%rsp\n" \ + "addq $128,%%rsp\n\t" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[11]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + _argvec[7] = (unsigned long)(arg7); \ + _argvec[8] = (unsigned long)(arg8); \ + _argvec[9] = (unsigned long)(arg9); \ + _argvec[10] = (unsigned long)(arg10); \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "pushq 80(%%rax)\n\t" \ + "pushq 72(%%rax)\n\t" \ + "pushq 64(%%rax)\n\t" \ + "pushq 56(%%rax)\n\t" \ + "movq 48(%%rax), %%r9\n\t" \ + "movq 40(%%rax), %%r8\n\t" \ + "movq 32(%%rax), %%rcx\n\t" \ + "movq 24(%%rax), %%rdx\n\t" \ + "movq 16(%%rax), %%rsi\n\t" \ + "movq 8(%%rax), %%rdi\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + VALGRIND_CALL_NOREDIR_RAX \ + "addq $32, %%rsp\n" \ + "addq $128,%%rsp\n\t" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10,arg11) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[12]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + _argvec[7] = (unsigned long)(arg7); \ + _argvec[8] = (unsigned long)(arg8); \ + _argvec[9] = (unsigned long)(arg9); \ + _argvec[10] = (unsigned long)(arg10); \ + _argvec[11] = (unsigned long)(arg11); \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "pushq 88(%%rax)\n\t" \ + "pushq 80(%%rax)\n\t" \ + "pushq 72(%%rax)\n\t" \ + "pushq 64(%%rax)\n\t" \ + "pushq 56(%%rax)\n\t" \ + "movq 48(%%rax), %%r9\n\t" \ + "movq 40(%%rax), %%r8\n\t" \ + "movq 32(%%rax), %%rcx\n\t" \ + "movq 24(%%rax), %%rdx\n\t" \ + "movq 16(%%rax), %%rsi\n\t" \ + "movq 8(%%rax), %%rdi\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + VALGRIND_CALL_NOREDIR_RAX \ + "addq $40, %%rsp\n" \ + "addq $128,%%rsp\n\t" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10,arg11,arg12) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[13]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)(arg1); \ + _argvec[2] = (unsigned long)(arg2); \ + _argvec[3] = (unsigned long)(arg3); \ + _argvec[4] = (unsigned long)(arg4); \ + _argvec[5] = (unsigned long)(arg5); \ + _argvec[6] = (unsigned long)(arg6); \ + _argvec[7] = (unsigned long)(arg7); \ + _argvec[8] = (unsigned long)(arg8); \ + _argvec[9] = (unsigned long)(arg9); \ + _argvec[10] = (unsigned long)(arg10); \ + _argvec[11] = (unsigned long)(arg11); \ + _argvec[12] = (unsigned long)(arg12); \ + __asm__ volatile( \ + "subq $128,%%rsp\n\t" \ + "pushq 96(%%rax)\n\t" \ + "pushq 88(%%rax)\n\t" \ + "pushq 80(%%rax)\n\t" \ + "pushq 72(%%rax)\n\t" \ + "pushq 64(%%rax)\n\t" \ + "pushq 56(%%rax)\n\t" \ + "movq 48(%%rax), %%r9\n\t" \ + "movq 40(%%rax), %%r8\n\t" \ + "movq 32(%%rax), %%rcx\n\t" \ + "movq 24(%%rax), %%rdx\n\t" \ + "movq 16(%%rax), %%rsi\n\t" \ + "movq 8(%%rax), %%rdi\n\t" \ + "movq (%%rax), %%rax\n\t" /* target->%rax */ \ + VALGRIND_CALL_NOREDIR_RAX \ + "addq $48, %%rsp\n" \ + "addq $128,%%rsp\n\t" \ + : /*out*/ "=a" (_res) \ + : /*in*/ "a" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#endif /* PLAT_amd64_linux */ + +/* ------------------------ ppc32-linux ------------------------ */ + +#if defined(PLAT_ppc32_linux) + +/* This is useful for finding out about the on-stack stuff: + + extern int f9 ( int,int,int,int,int,int,int,int,int ); + extern int f10 ( int,int,int,int,int,int,int,int,int,int ); + extern int f11 ( int,int,int,int,int,int,int,int,int,int,int ); + extern int f12 ( int,int,int,int,int,int,int,int,int,int,int,int ); + + int g9 ( void ) { + return f9(11,22,33,44,55,66,77,88,99); + } + int g10 ( void ) { + return f10(11,22,33,44,55,66,77,88,99,110); + } + int g11 ( void ) { + return f11(11,22,33,44,55,66,77,88,99,110,121); + } + int g12 ( void ) { + return f12(11,22,33,44,55,66,77,88,99,110,121,132); + } +*/ + +/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */ + +/* These regs are trashed by the hidden call. */ +#define __CALLER_SAVED_REGS \ + "lr", "ctr", "xer", \ + "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7", \ + "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", \ + "r11", "r12", "r13" + +/* These CALL_FN_ macros assume that on ppc32-linux, + sizeof(unsigned long) == 4. */ + +#define CALL_FN_W_v(lval, orig) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[1]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_W(lval, orig, arg1) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[2]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)arg1; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "lwz 3,4(11)\n\t" /* arg1->r3 */ \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WW(lval, orig, arg1,arg2) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)arg1; \ + _argvec[2] = (unsigned long)arg2; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "lwz 3,4(11)\n\t" /* arg1->r3 */ \ + "lwz 4,8(11)\n\t" \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[4]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)arg1; \ + _argvec[2] = (unsigned long)arg2; \ + _argvec[3] = (unsigned long)arg3; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "lwz 3,4(11)\n\t" /* arg1->r3 */ \ + "lwz 4,8(11)\n\t" \ + "lwz 5,12(11)\n\t" \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[5]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)arg1; \ + _argvec[2] = (unsigned long)arg2; \ + _argvec[3] = (unsigned long)arg3; \ + _argvec[4] = (unsigned long)arg4; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "lwz 3,4(11)\n\t" /* arg1->r3 */ \ + "lwz 4,8(11)\n\t" \ + "lwz 5,12(11)\n\t" \ + "lwz 6,16(11)\n\t" /* arg4->r6 */ \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[6]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)arg1; \ + _argvec[2] = (unsigned long)arg2; \ + _argvec[3] = (unsigned long)arg3; \ + _argvec[4] = (unsigned long)arg4; \ + _argvec[5] = (unsigned long)arg5; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "lwz 3,4(11)\n\t" /* arg1->r3 */ \ + "lwz 4,8(11)\n\t" \ + "lwz 5,12(11)\n\t" \ + "lwz 6,16(11)\n\t" /* arg4->r6 */ \ + "lwz 7,20(11)\n\t" \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[7]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)arg1; \ + _argvec[2] = (unsigned long)arg2; \ + _argvec[3] = (unsigned long)arg3; \ + _argvec[4] = (unsigned long)arg4; \ + _argvec[5] = (unsigned long)arg5; \ + _argvec[6] = (unsigned long)arg6; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "lwz 3,4(11)\n\t" /* arg1->r3 */ \ + "lwz 4,8(11)\n\t" \ + "lwz 5,12(11)\n\t" \ + "lwz 6,16(11)\n\t" /* arg4->r6 */ \ + "lwz 7,20(11)\n\t" \ + "lwz 8,24(11)\n\t" \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[8]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)arg1; \ + _argvec[2] = (unsigned long)arg2; \ + _argvec[3] = (unsigned long)arg3; \ + _argvec[4] = (unsigned long)arg4; \ + _argvec[5] = (unsigned long)arg5; \ + _argvec[6] = (unsigned long)arg6; \ + _argvec[7] = (unsigned long)arg7; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "lwz 3,4(11)\n\t" /* arg1->r3 */ \ + "lwz 4,8(11)\n\t" \ + "lwz 5,12(11)\n\t" \ + "lwz 6,16(11)\n\t" /* arg4->r6 */ \ + "lwz 7,20(11)\n\t" \ + "lwz 8,24(11)\n\t" \ + "lwz 9,28(11)\n\t" \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[9]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)arg1; \ + _argvec[2] = (unsigned long)arg2; \ + _argvec[3] = (unsigned long)arg3; \ + _argvec[4] = (unsigned long)arg4; \ + _argvec[5] = (unsigned long)arg5; \ + _argvec[6] = (unsigned long)arg6; \ + _argvec[7] = (unsigned long)arg7; \ + _argvec[8] = (unsigned long)arg8; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "lwz 3,4(11)\n\t" /* arg1->r3 */ \ + "lwz 4,8(11)\n\t" \ + "lwz 5,12(11)\n\t" \ + "lwz 6,16(11)\n\t" /* arg4->r6 */ \ + "lwz 7,20(11)\n\t" \ + "lwz 8,24(11)\n\t" \ + "lwz 9,28(11)\n\t" \ + "lwz 10,32(11)\n\t" /* arg8->r10 */ \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[10]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)arg1; \ + _argvec[2] = (unsigned long)arg2; \ + _argvec[3] = (unsigned long)arg3; \ + _argvec[4] = (unsigned long)arg4; \ + _argvec[5] = (unsigned long)arg5; \ + _argvec[6] = (unsigned long)arg6; \ + _argvec[7] = (unsigned long)arg7; \ + _argvec[8] = (unsigned long)arg8; \ + _argvec[9] = (unsigned long)arg9; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "addi 1,1,-16\n\t" \ + /* arg9 */ \ + "lwz 3,36(11)\n\t" \ + "stw 3,8(1)\n\t" \ + /* args1-8 */ \ + "lwz 3,4(11)\n\t" /* arg1->r3 */ \ + "lwz 4,8(11)\n\t" \ + "lwz 5,12(11)\n\t" \ + "lwz 6,16(11)\n\t" /* arg4->r6 */ \ + "lwz 7,20(11)\n\t" \ + "lwz 8,24(11)\n\t" \ + "lwz 9,28(11)\n\t" \ + "lwz 10,32(11)\n\t" /* arg8->r10 */ \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "addi 1,1,16\n\t" \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[11]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)arg1; \ + _argvec[2] = (unsigned long)arg2; \ + _argvec[3] = (unsigned long)arg3; \ + _argvec[4] = (unsigned long)arg4; \ + _argvec[5] = (unsigned long)arg5; \ + _argvec[6] = (unsigned long)arg6; \ + _argvec[7] = (unsigned long)arg7; \ + _argvec[8] = (unsigned long)arg8; \ + _argvec[9] = (unsigned long)arg9; \ + _argvec[10] = (unsigned long)arg10; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "addi 1,1,-16\n\t" \ + /* arg10 */ \ + "lwz 3,40(11)\n\t" \ + "stw 3,12(1)\n\t" \ + /* arg9 */ \ + "lwz 3,36(11)\n\t" \ + "stw 3,8(1)\n\t" \ + /* args1-8 */ \ + "lwz 3,4(11)\n\t" /* arg1->r3 */ \ + "lwz 4,8(11)\n\t" \ + "lwz 5,12(11)\n\t" \ + "lwz 6,16(11)\n\t" /* arg4->r6 */ \ + "lwz 7,20(11)\n\t" \ + "lwz 8,24(11)\n\t" \ + "lwz 9,28(11)\n\t" \ + "lwz 10,32(11)\n\t" /* arg8->r10 */ \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "addi 1,1,16\n\t" \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10,arg11) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[12]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)arg1; \ + _argvec[2] = (unsigned long)arg2; \ + _argvec[3] = (unsigned long)arg3; \ + _argvec[4] = (unsigned long)arg4; \ + _argvec[5] = (unsigned long)arg5; \ + _argvec[6] = (unsigned long)arg6; \ + _argvec[7] = (unsigned long)arg7; \ + _argvec[8] = (unsigned long)arg8; \ + _argvec[9] = (unsigned long)arg9; \ + _argvec[10] = (unsigned long)arg10; \ + _argvec[11] = (unsigned long)arg11; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "addi 1,1,-32\n\t" \ + /* arg11 */ \ + "lwz 3,44(11)\n\t" \ + "stw 3,16(1)\n\t" \ + /* arg10 */ \ + "lwz 3,40(11)\n\t" \ + "stw 3,12(1)\n\t" \ + /* arg9 */ \ + "lwz 3,36(11)\n\t" \ + "stw 3,8(1)\n\t" \ + /* args1-8 */ \ + "lwz 3,4(11)\n\t" /* arg1->r3 */ \ + "lwz 4,8(11)\n\t" \ + "lwz 5,12(11)\n\t" \ + "lwz 6,16(11)\n\t" /* arg4->r6 */ \ + "lwz 7,20(11)\n\t" \ + "lwz 8,24(11)\n\t" \ + "lwz 9,28(11)\n\t" \ + "lwz 10,32(11)\n\t" /* arg8->r10 */ \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "addi 1,1,32\n\t" \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10,arg11,arg12) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[13]; \ + volatile unsigned long _res; \ + _argvec[0] = (unsigned long)_orig.nraddr; \ + _argvec[1] = (unsigned long)arg1; \ + _argvec[2] = (unsigned long)arg2; \ + _argvec[3] = (unsigned long)arg3; \ + _argvec[4] = (unsigned long)arg4; \ + _argvec[5] = (unsigned long)arg5; \ + _argvec[6] = (unsigned long)arg6; \ + _argvec[7] = (unsigned long)arg7; \ + _argvec[8] = (unsigned long)arg8; \ + _argvec[9] = (unsigned long)arg9; \ + _argvec[10] = (unsigned long)arg10; \ + _argvec[11] = (unsigned long)arg11; \ + _argvec[12] = (unsigned long)arg12; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "addi 1,1,-32\n\t" \ + /* arg12 */ \ + "lwz 3,48(11)\n\t" \ + "stw 3,20(1)\n\t" \ + /* arg11 */ \ + "lwz 3,44(11)\n\t" \ + "stw 3,16(1)\n\t" \ + /* arg10 */ \ + "lwz 3,40(11)\n\t" \ + "stw 3,12(1)\n\t" \ + /* arg9 */ \ + "lwz 3,36(11)\n\t" \ + "stw 3,8(1)\n\t" \ + /* args1-8 */ \ + "lwz 3,4(11)\n\t" /* arg1->r3 */ \ + "lwz 4,8(11)\n\t" \ + "lwz 5,12(11)\n\t" \ + "lwz 6,16(11)\n\t" /* arg4->r6 */ \ + "lwz 7,20(11)\n\t" \ + "lwz 8,24(11)\n\t" \ + "lwz 9,28(11)\n\t" \ + "lwz 10,32(11)\n\t" /* arg8->r10 */ \ + "lwz 11,0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "addi 1,1,32\n\t" \ + "mr %0,3" \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[0]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#endif /* PLAT_ppc32_linux */ + +/* ------------------------ ppc64-linux ------------------------ */ + +#if defined(PLAT_ppc64_linux) + +/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */ + +/* These regs are trashed by the hidden call. */ +#define __CALLER_SAVED_REGS \ + "lr", "ctr", "xer", \ + "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7", \ + "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", \ + "r11", "r12", "r13" + +/* These CALL_FN_ macros assume that on ppc64-linux, sizeof(unsigned + long) == 8. */ + +#define CALL_FN_W_v(lval, orig) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+0]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)" /* restore tocptr */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_W(lval, orig, arg1) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+1]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)" /* restore tocptr */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WW(lval, orig, arg1,arg2) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+2]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)" /* restore tocptr */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+3]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)" /* restore tocptr */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+4]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)" /* restore tocptr */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+5]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)" /* restore tocptr */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+6]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)" /* restore tocptr */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+7]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 9, 56(11)\n\t" /* arg7->r9 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)" /* restore tocptr */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+8]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 9, 56(11)\n\t" /* arg7->r9 */ \ + "ld 10, 64(11)\n\t" /* arg8->r10 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)" /* restore tocptr */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+9]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + _argvec[2+9] = (unsigned long)arg9; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "addi 1,1,-128\n\t" /* expand stack frame */ \ + /* arg9 */ \ + "ld 3,72(11)\n\t" \ + "std 3,112(1)\n\t" \ + /* args1-8 */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 9, 56(11)\n\t" /* arg7->r9 */ \ + "ld 10, 64(11)\n\t" /* arg8->r10 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + "addi 1,1,128" /* restore frame */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+10]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + _argvec[2+9] = (unsigned long)arg9; \ + _argvec[2+10] = (unsigned long)arg10; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "addi 1,1,-128\n\t" /* expand stack frame */ \ + /* arg10 */ \ + "ld 3,80(11)\n\t" \ + "std 3,120(1)\n\t" \ + /* arg9 */ \ + "ld 3,72(11)\n\t" \ + "std 3,112(1)\n\t" \ + /* args1-8 */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 9, 56(11)\n\t" /* arg7->r9 */ \ + "ld 10, 64(11)\n\t" /* arg8->r10 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + "addi 1,1,128" /* restore frame */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10,arg11) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+11]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + _argvec[2+9] = (unsigned long)arg9; \ + _argvec[2+10] = (unsigned long)arg10; \ + _argvec[2+11] = (unsigned long)arg11; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "addi 1,1,-144\n\t" /* expand stack frame */ \ + /* arg11 */ \ + "ld 3,88(11)\n\t" \ + "std 3,128(1)\n\t" \ + /* arg10 */ \ + "ld 3,80(11)\n\t" \ + "std 3,120(1)\n\t" \ + /* arg9 */ \ + "ld 3,72(11)\n\t" \ + "std 3,112(1)\n\t" \ + /* args1-8 */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 9, 56(11)\n\t" /* arg7->r9 */ \ + "ld 10, 64(11)\n\t" /* arg8->r10 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + "addi 1,1,144" /* restore frame */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10,arg11,arg12) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+12]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + _argvec[2+9] = (unsigned long)arg9; \ + _argvec[2+10] = (unsigned long)arg10; \ + _argvec[2+11] = (unsigned long)arg11; \ + _argvec[2+12] = (unsigned long)arg12; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "addi 1,1,-144\n\t" /* expand stack frame */ \ + /* arg12 */ \ + "ld 3,96(11)\n\t" \ + "std 3,136(1)\n\t" \ + /* arg11 */ \ + "ld 3,88(11)\n\t" \ + "std 3,128(1)\n\t" \ + /* arg10 */ \ + "ld 3,80(11)\n\t" \ + "std 3,120(1)\n\t" \ + /* arg9 */ \ + "ld 3,72(11)\n\t" \ + "std 3,112(1)\n\t" \ + /* args1-8 */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 9, 56(11)\n\t" /* arg7->r9 */ \ + "ld 10, 64(11)\n\t" /* arg8->r10 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + "addi 1,1,144" /* restore frame */ \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#endif /* PLAT_ppc64_linux */ + +/* ------------------------ ppc32-aix5 ------------------------- */ + +#if defined(PLAT_ppc32_aix5) + +/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */ + +/* These regs are trashed by the hidden call. */ +#define __CALLER_SAVED_REGS \ + "lr", "ctr", "xer", \ + "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7", \ + "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", \ + "r11", "r12", "r13" + +/* Expand the stack frame, copying enough info that unwinding + still works. Trashes r3. */ + +#define VG_EXPAND_FRAME_BY_trashes_r3(_n_fr) \ + "addi 1,1,-" #_n_fr "\n\t" \ + "lwz 3," #_n_fr "(1)\n\t" \ + "stw 3,0(1)\n\t" + +#define VG_CONTRACT_FRAME_BY(_n_fr) \ + "addi 1,1," #_n_fr "\n\t" + +/* These CALL_FN_ macros assume that on ppc32-aix5, sizeof(unsigned + long) == 4. */ + +#define CALL_FN_W_v(lval, orig) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+0]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_W(lval, orig, arg1) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+1]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + "lwz 3, 4(11)\n\t" /* arg1->r3 */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WW(lval, orig, arg1,arg2) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+2]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + "lwz 3, 4(11)\n\t" /* arg1->r3 */ \ + "lwz 4, 8(11)\n\t" /* arg2->r4 */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+3]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + "lwz 3, 4(11)\n\t" /* arg1->r3 */ \ + "lwz 4, 8(11)\n\t" /* arg2->r4 */ \ + "lwz 5, 12(11)\n\t" /* arg3->r5 */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+4]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + "lwz 3, 4(11)\n\t" /* arg1->r3 */ \ + "lwz 4, 8(11)\n\t" /* arg2->r4 */ \ + "lwz 5, 12(11)\n\t" /* arg3->r5 */ \ + "lwz 6, 16(11)\n\t" /* arg4->r6 */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+5]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + "lwz 3, 4(11)\n\t" /* arg1->r3 */ \ + "lwz 4, 8(11)\n\t" /* arg2->r4 */ \ + "lwz 5, 12(11)\n\t" /* arg3->r5 */ \ + "lwz 6, 16(11)\n\t" /* arg4->r6 */ \ + "lwz 7, 20(11)\n\t" /* arg5->r7 */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+6]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + "lwz 3, 4(11)\n\t" /* arg1->r3 */ \ + "lwz 4, 8(11)\n\t" /* arg2->r4 */ \ + "lwz 5, 12(11)\n\t" /* arg3->r5 */ \ + "lwz 6, 16(11)\n\t" /* arg4->r6 */ \ + "lwz 7, 20(11)\n\t" /* arg5->r7 */ \ + "lwz 8, 24(11)\n\t" /* arg6->r8 */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+7]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + "lwz 3, 4(11)\n\t" /* arg1->r3 */ \ + "lwz 4, 8(11)\n\t" /* arg2->r4 */ \ + "lwz 5, 12(11)\n\t" /* arg3->r5 */ \ + "lwz 6, 16(11)\n\t" /* arg4->r6 */ \ + "lwz 7, 20(11)\n\t" /* arg5->r7 */ \ + "lwz 8, 24(11)\n\t" /* arg6->r8 */ \ + "lwz 9, 28(11)\n\t" /* arg7->r9 */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+8]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + "lwz 3, 4(11)\n\t" /* arg1->r3 */ \ + "lwz 4, 8(11)\n\t" /* arg2->r4 */ \ + "lwz 5, 12(11)\n\t" /* arg3->r5 */ \ + "lwz 6, 16(11)\n\t" /* arg4->r6 */ \ + "lwz 7, 20(11)\n\t" /* arg5->r7 */ \ + "lwz 8, 24(11)\n\t" /* arg6->r8 */ \ + "lwz 9, 28(11)\n\t" /* arg7->r9 */ \ + "lwz 10, 32(11)\n\t" /* arg8->r10 */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+9]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + _argvec[2+9] = (unsigned long)arg9; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + VG_EXPAND_FRAME_BY_trashes_r3(64) \ + /* arg9 */ \ + "lwz 3,36(11)\n\t" \ + "stw 3,56(1)\n\t" \ + /* args1-8 */ \ + "lwz 3, 4(11)\n\t" /* arg1->r3 */ \ + "lwz 4, 8(11)\n\t" /* arg2->r4 */ \ + "lwz 5, 12(11)\n\t" /* arg3->r5 */ \ + "lwz 6, 16(11)\n\t" /* arg4->r6 */ \ + "lwz 7, 20(11)\n\t" /* arg5->r7 */ \ + "lwz 8, 24(11)\n\t" /* arg6->r8 */ \ + "lwz 9, 28(11)\n\t" /* arg7->r9 */ \ + "lwz 10, 32(11)\n\t" /* arg8->r10 */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(64) \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+10]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + _argvec[2+9] = (unsigned long)arg9; \ + _argvec[2+10] = (unsigned long)arg10; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + VG_EXPAND_FRAME_BY_trashes_r3(64) \ + /* arg10 */ \ + "lwz 3,40(11)\n\t" \ + "stw 3,60(1)\n\t" \ + /* arg9 */ \ + "lwz 3,36(11)\n\t" \ + "stw 3,56(1)\n\t" \ + /* args1-8 */ \ + "lwz 3, 4(11)\n\t" /* arg1->r3 */ \ + "lwz 4, 8(11)\n\t" /* arg2->r4 */ \ + "lwz 5, 12(11)\n\t" /* arg3->r5 */ \ + "lwz 6, 16(11)\n\t" /* arg4->r6 */ \ + "lwz 7, 20(11)\n\t" /* arg5->r7 */ \ + "lwz 8, 24(11)\n\t" /* arg6->r8 */ \ + "lwz 9, 28(11)\n\t" /* arg7->r9 */ \ + "lwz 10, 32(11)\n\t" /* arg8->r10 */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(64) \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10,arg11) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+11]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + _argvec[2+9] = (unsigned long)arg9; \ + _argvec[2+10] = (unsigned long)arg10; \ + _argvec[2+11] = (unsigned long)arg11; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + VG_EXPAND_FRAME_BY_trashes_r3(72) \ + /* arg11 */ \ + "lwz 3,44(11)\n\t" \ + "stw 3,64(1)\n\t" \ + /* arg10 */ \ + "lwz 3,40(11)\n\t" \ + "stw 3,60(1)\n\t" \ + /* arg9 */ \ + "lwz 3,36(11)\n\t" \ + "stw 3,56(1)\n\t" \ + /* args1-8 */ \ + "lwz 3, 4(11)\n\t" /* arg1->r3 */ \ + "lwz 4, 8(11)\n\t" /* arg2->r4 */ \ + "lwz 5, 12(11)\n\t" /* arg3->r5 */ \ + "lwz 6, 16(11)\n\t" /* arg4->r6 */ \ + "lwz 7, 20(11)\n\t" /* arg5->r7 */ \ + "lwz 8, 24(11)\n\t" /* arg6->r8 */ \ + "lwz 9, 28(11)\n\t" /* arg7->r9 */ \ + "lwz 10, 32(11)\n\t" /* arg8->r10 */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(72) \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10,arg11,arg12) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+12]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + _argvec[2+9] = (unsigned long)arg9; \ + _argvec[2+10] = (unsigned long)arg10; \ + _argvec[2+11] = (unsigned long)arg11; \ + _argvec[2+12] = (unsigned long)arg12; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "stw 2,-8(11)\n\t" /* save tocptr */ \ + "lwz 2,-4(11)\n\t" /* use nraddr's tocptr */ \ + VG_EXPAND_FRAME_BY_trashes_r3(72) \ + /* arg12 */ \ + "lwz 3,48(11)\n\t" \ + "stw 3,68(1)\n\t" \ + /* arg11 */ \ + "lwz 3,44(11)\n\t" \ + "stw 3,64(1)\n\t" \ + /* arg10 */ \ + "lwz 3,40(11)\n\t" \ + "stw 3,60(1)\n\t" \ + /* arg9 */ \ + "lwz 3,36(11)\n\t" \ + "stw 3,56(1)\n\t" \ + /* args1-8 */ \ + "lwz 3, 4(11)\n\t" /* arg1->r3 */ \ + "lwz 4, 8(11)\n\t" /* arg2->r4 */ \ + "lwz 5, 12(11)\n\t" /* arg3->r5 */ \ + "lwz 6, 16(11)\n\t" /* arg4->r6 */ \ + "lwz 7, 20(11)\n\t" /* arg5->r7 */ \ + "lwz 8, 24(11)\n\t" /* arg6->r8 */ \ + "lwz 9, 28(11)\n\t" /* arg7->r9 */ \ + "lwz 10, 32(11)\n\t" /* arg8->r10 */ \ + "lwz 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "lwz 2,-8(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(72) \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#endif /* PLAT_ppc32_aix5 */ + +/* ------------------------ ppc64-aix5 ------------------------- */ + +#if defined(PLAT_ppc64_aix5) + +/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */ + +/* These regs are trashed by the hidden call. */ +#define __CALLER_SAVED_REGS \ + "lr", "ctr", "xer", \ + "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7", \ + "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", \ + "r11", "r12", "r13" + +/* Expand the stack frame, copying enough info that unwinding + still works. Trashes r3. */ + +#define VG_EXPAND_FRAME_BY_trashes_r3(_n_fr) \ + "addi 1,1,-" #_n_fr "\n\t" \ + "ld 3," #_n_fr "(1)\n\t" \ + "std 3,0(1)\n\t" + +#define VG_CONTRACT_FRAME_BY(_n_fr) \ + "addi 1,1," #_n_fr "\n\t" + +/* These CALL_FN_ macros assume that on ppc64-aix5, sizeof(unsigned + long) == 8. */ + +#define CALL_FN_W_v(lval, orig) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+0]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_W(lval, orig, arg1) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+1]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WW(lval, orig, arg1,arg2) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+2]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+3]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+4]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+5]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+6]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+7]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 9, 56(11)\n\t" /* arg7->r9 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+8]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 9, 56(11)\n\t" /* arg7->r9 */ \ + "ld 10, 64(11)\n\t" /* arg8->r10 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+9]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + _argvec[2+9] = (unsigned long)arg9; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + VG_EXPAND_FRAME_BY_trashes_r3(128) \ + /* arg9 */ \ + "ld 3,72(11)\n\t" \ + "std 3,112(1)\n\t" \ + /* args1-8 */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 9, 56(11)\n\t" /* arg7->r9 */ \ + "ld 10, 64(11)\n\t" /* arg8->r10 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(128) \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+10]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + _argvec[2+9] = (unsigned long)arg9; \ + _argvec[2+10] = (unsigned long)arg10; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + VG_EXPAND_FRAME_BY_trashes_r3(128) \ + /* arg10 */ \ + "ld 3,80(11)\n\t" \ + "std 3,120(1)\n\t" \ + /* arg9 */ \ + "ld 3,72(11)\n\t" \ + "std 3,112(1)\n\t" \ + /* args1-8 */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 9, 56(11)\n\t" /* arg7->r9 */ \ + "ld 10, 64(11)\n\t" /* arg8->r10 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(128) \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10,arg11) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+11]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + _argvec[2+9] = (unsigned long)arg9; \ + _argvec[2+10] = (unsigned long)arg10; \ + _argvec[2+11] = (unsigned long)arg11; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + VG_EXPAND_FRAME_BY_trashes_r3(144) \ + /* arg11 */ \ + "ld 3,88(11)\n\t" \ + "std 3,128(1)\n\t" \ + /* arg10 */ \ + "ld 3,80(11)\n\t" \ + "std 3,120(1)\n\t" \ + /* arg9 */ \ + "ld 3,72(11)\n\t" \ + "std 3,112(1)\n\t" \ + /* args1-8 */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 9, 56(11)\n\t" /* arg7->r9 */ \ + "ld 10, 64(11)\n\t" /* arg8->r10 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(144) \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6, \ + arg7,arg8,arg9,arg10,arg11,arg12) \ + do { \ + volatile OrigFn _orig = (orig); \ + volatile unsigned long _argvec[3+12]; \ + volatile unsigned long _res; \ + /* _argvec[0] holds current r2 across the call */ \ + _argvec[1] = (unsigned long)_orig.r2; \ + _argvec[2] = (unsigned long)_orig.nraddr; \ + _argvec[2+1] = (unsigned long)arg1; \ + _argvec[2+2] = (unsigned long)arg2; \ + _argvec[2+3] = (unsigned long)arg3; \ + _argvec[2+4] = (unsigned long)arg4; \ + _argvec[2+5] = (unsigned long)arg5; \ + _argvec[2+6] = (unsigned long)arg6; \ + _argvec[2+7] = (unsigned long)arg7; \ + _argvec[2+8] = (unsigned long)arg8; \ + _argvec[2+9] = (unsigned long)arg9; \ + _argvec[2+10] = (unsigned long)arg10; \ + _argvec[2+11] = (unsigned long)arg11; \ + _argvec[2+12] = (unsigned long)arg12; \ + __asm__ volatile( \ + "mr 11,%1\n\t" \ + VG_EXPAND_FRAME_BY_trashes_r3(512) \ + "std 2,-16(11)\n\t" /* save tocptr */ \ + "ld 2,-8(11)\n\t" /* use nraddr's tocptr */ \ + VG_EXPAND_FRAME_BY_trashes_r3(144) \ + /* arg12 */ \ + "ld 3,96(11)\n\t" \ + "std 3,136(1)\n\t" \ + /* arg11 */ \ + "ld 3,88(11)\n\t" \ + "std 3,128(1)\n\t" \ + /* arg10 */ \ + "ld 3,80(11)\n\t" \ + "std 3,120(1)\n\t" \ + /* arg9 */ \ + "ld 3,72(11)\n\t" \ + "std 3,112(1)\n\t" \ + /* args1-8 */ \ + "ld 3, 8(11)\n\t" /* arg1->r3 */ \ + "ld 4, 16(11)\n\t" /* arg2->r4 */ \ + "ld 5, 24(11)\n\t" /* arg3->r5 */ \ + "ld 6, 32(11)\n\t" /* arg4->r6 */ \ + "ld 7, 40(11)\n\t" /* arg5->r7 */ \ + "ld 8, 48(11)\n\t" /* arg6->r8 */ \ + "ld 9, 56(11)\n\t" /* arg7->r9 */ \ + "ld 10, 64(11)\n\t" /* arg8->r10 */ \ + "ld 11, 0(11)\n\t" /* target->r11 */ \ + VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11 \ + "mr 11,%1\n\t" \ + "mr %0,3\n\t" \ + "ld 2,-16(11)\n\t" /* restore tocptr */ \ + VG_CONTRACT_FRAME_BY(144) \ + VG_CONTRACT_FRAME_BY(512) \ + : /*out*/ "=r" (_res) \ + : /*in*/ "r" (&_argvec[2]) \ + : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS \ + ); \ + lval = (__typeof__(lval)) _res; \ + } while (0) + +#endif /* PLAT_ppc64_aix5 */ + + +/* ------------------------------------------------------------------ */ +/* ARCHITECTURE INDEPENDENT MACROS for CLIENT REQUESTS. */ +/* */ +/* ------------------------------------------------------------------ */ + +/* Some request codes. There are many more of these, but most are not + exposed to end-user view. These are the public ones, all of the + form 0x1000 + small_number. + + Core ones are in the range 0x00000000--0x0000ffff. The non-public + ones start at 0x2000. +*/ + +/* These macros are used by tools -- they must be public, but don't + embed them into other programs. */ +#define VG_USERREQ_TOOL_BASE(a,b) \ + ((unsigned int)(((a)&0xff) << 24 | ((b)&0xff) << 16)) +#define VG_IS_TOOL_USERREQ(a, b, v) \ + (VG_USERREQ_TOOL_BASE(a,b) == ((v) & 0xffff0000)) + +/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !! + This enum comprises an ABI exported by Valgrind to programs + which use client requests. DO NOT CHANGE THE ORDER OF THESE + ENTRIES, NOR DELETE ANY -- add new ones at the end. */ +typedef + enum { VG_USERREQ__RUNNING_ON_VALGRIND = 0x1001, + VG_USERREQ__DISCARD_TRANSLATIONS = 0x1002, + + /* These allow any function to be called from the simulated + CPU but run on the real CPU. Nb: the first arg passed to + the function is always the ThreadId of the running + thread! So CLIENT_CALL0 actually requires a 1 arg + function, etc. */ + VG_USERREQ__CLIENT_CALL0 = 0x1101, + VG_USERREQ__CLIENT_CALL1 = 0x1102, + VG_USERREQ__CLIENT_CALL2 = 0x1103, + VG_USERREQ__CLIENT_CALL3 = 0x1104, + + /* Can be useful in regression testing suites -- eg. can + send Valgrind's output to /dev/null and still count + errors. */ + VG_USERREQ__COUNT_ERRORS = 0x1201, + + /* These are useful and can be interpreted by any tool that + tracks malloc() et al, by using vg_replace_malloc.c. */ + VG_USERREQ__MALLOCLIKE_BLOCK = 0x1301, + VG_USERREQ__FREELIKE_BLOCK = 0x1302, + /* Memory pool support. */ + VG_USERREQ__CREATE_MEMPOOL = 0x1303, + VG_USERREQ__DESTROY_MEMPOOL = 0x1304, + VG_USERREQ__MEMPOOL_ALLOC = 0x1305, + VG_USERREQ__MEMPOOL_FREE = 0x1306, + VG_USERREQ__MEMPOOL_TRIM = 0x1307, + VG_USERREQ__MOVE_MEMPOOL = 0x1308, + VG_USERREQ__MEMPOOL_CHANGE = 0x1309, + VG_USERREQ__MEMPOOL_EXISTS = 0x130a, + + /* Allow printfs to valgrind log. */ + VG_USERREQ__PRINTF = 0x1401, + VG_USERREQ__PRINTF_BACKTRACE = 0x1402, + + /* Stack support. */ + VG_USERREQ__STACK_REGISTER = 0x1501, + VG_USERREQ__STACK_DEREGISTER = 0x1502, + VG_USERREQ__STACK_CHANGE = 0x1503 + } Vg_ClientRequest; + +#if !defined(__GNUC__) +# define __extension__ /* */ +#endif + +/* Returns the number of Valgrinds this code is running under. That + is, 0 if running natively, 1 if running under Valgrind, 2 if + running under Valgrind which is running under another Valgrind, + etc. */ +#define RUNNING_ON_VALGRIND __extension__ \ + ({unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* if not */, \ + VG_USERREQ__RUNNING_ON_VALGRIND, \ + 0, 0, 0, 0, 0); \ + _qzz_res; \ + }) + + +/* Discard translation of code in the range [_qzz_addr .. _qzz_addr + + _qzz_len - 1]. Useful if you are debugging a JITter or some such, + since it provides a way to make sure valgrind will retranslate the + invalidated area. Returns no value. */ +#define VALGRIND_DISCARD_TRANSLATIONS(_qzz_addr,_qzz_len) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__DISCARD_TRANSLATIONS, \ + _qzz_addr, _qzz_len, 0, 0, 0); \ + } + + +/* These requests are for getting Valgrind itself to print something. + Possibly with a backtrace. This is a really ugly hack. */ + +#if defined(NVALGRIND) + +# define VALGRIND_PRINTF(...) +# define VALGRIND_PRINTF_BACKTRACE(...) + +#else /* NVALGRIND */ + +/* Modern GCC will optimize the static routine out if unused, + and unused attribute will shut down warnings about it. */ +static int VALGRIND_PRINTF(const char *format, ...) + __attribute__((format(__printf__, 1, 2), __unused__)); +static int +VALGRIND_PRINTF(const char *format, ...) +{ + unsigned long _qzz_res; + va_list vargs; + va_start(vargs, format); + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, VG_USERREQ__PRINTF, + (unsigned long)format, (unsigned long)vargs, + 0, 0, 0); + va_end(vargs); + return (int)_qzz_res; +} + +static int VALGRIND_PRINTF_BACKTRACE(const char *format, ...) + __attribute__((format(__printf__, 1, 2), __unused__)); +static int +VALGRIND_PRINTF_BACKTRACE(const char *format, ...) +{ + unsigned long _qzz_res; + va_list vargs; + va_start(vargs, format); + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, VG_USERREQ__PRINTF_BACKTRACE, + (unsigned long)format, (unsigned long)vargs, + 0, 0, 0); + va_end(vargs); + return (int)_qzz_res; +} + +#endif /* NVALGRIND */ + + +/* These requests allow control to move from the simulated CPU to the + real CPU, calling an arbitary function. + + Note that the current ThreadId is inserted as the first argument. + So this call: + + VALGRIND_NON_SIMD_CALL2(f, arg1, arg2) + + requires f to have this signature: + + Word f(Word tid, Word arg1, Word arg2) + + where "Word" is a word-sized type. + + Note that these client requests are not entirely reliable. For example, + if you call a function with them that subsequently calls printf(), + there's a high chance Valgrind will crash. Generally, your prospects of + these working are made higher if the called function does not refer to + any global variables, and does not refer to any libc or other functions + (printf et al). Any kind of entanglement with libc or dynamic linking is + likely to have a bad outcome, for tricky reasons which we've grappled + with a lot in the past. +*/ +#define VALGRIND_NON_SIMD_CALL0(_qyy_fn) \ + __extension__ \ + ({unsigned long _qyy_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */, \ + VG_USERREQ__CLIENT_CALL0, \ + _qyy_fn, \ + 0, 0, 0, 0); \ + _qyy_res; \ + }) + +#define VALGRIND_NON_SIMD_CALL1(_qyy_fn, _qyy_arg1) \ + __extension__ \ + ({unsigned long _qyy_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */, \ + VG_USERREQ__CLIENT_CALL1, \ + _qyy_fn, \ + _qyy_arg1, 0, 0, 0); \ + _qyy_res; \ + }) + +#define VALGRIND_NON_SIMD_CALL2(_qyy_fn, _qyy_arg1, _qyy_arg2) \ + __extension__ \ + ({unsigned long _qyy_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */, \ + VG_USERREQ__CLIENT_CALL2, \ + _qyy_fn, \ + _qyy_arg1, _qyy_arg2, 0, 0); \ + _qyy_res; \ + }) + +#define VALGRIND_NON_SIMD_CALL3(_qyy_fn, _qyy_arg1, _qyy_arg2, _qyy_arg3) \ + __extension__ \ + ({unsigned long _qyy_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */, \ + VG_USERREQ__CLIENT_CALL3, \ + _qyy_fn, \ + _qyy_arg1, _qyy_arg2, \ + _qyy_arg3, 0); \ + _qyy_res; \ + }) + + +/* Counts the number of errors that have been recorded by a tool. Nb: + the tool must record the errors with VG_(maybe_record_error)() or + VG_(unique_error)() for them to be counted. */ +#define VALGRIND_COUNT_ERRORS \ + __extension__ \ + ({unsigned int _qyy_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qyy_res, 0 /* default return */, \ + VG_USERREQ__COUNT_ERRORS, \ + 0, 0, 0, 0, 0); \ + _qyy_res; \ + }) + +/* Mark a block of memory as having been allocated by a malloc()-like + function. `addr' is the start of the usable block (ie. after any + redzone) `rzB' is redzone size if the allocator can apply redzones; + use '0' if not. Adding redzones makes it more likely Valgrind will spot + block overruns. `is_zeroed' indicates if the memory is zeroed, as it is + for calloc(). Put it immediately after the point where a block is + allocated. + + If you're using Memcheck: If you're allocating memory via superblocks, + and then handing out small chunks of each superblock, if you don't have + redzones on your small blocks, it's worth marking the superblock with + VALGRIND_MAKE_MEM_NOACCESS when it's created, so that block overruns are + detected. But if you can put redzones on, it's probably better to not do + this, so that messages for small overruns are described in terms of the + small block rather than the superblock (but if you have a big overrun + that skips over a redzone, you could miss an error this way). See + memcheck/tests/custom_alloc.c for an example. + + WARNING: if your allocator uses malloc() or 'new' to allocate + superblocks, rather than mmap() or brk(), this will not work properly -- + you'll likely get assertion failures during leak detection. This is + because Valgrind doesn't like seeing overlapping heap blocks. Sorry. + + Nb: block must be freed via a free()-like function specified + with VALGRIND_FREELIKE_BLOCK or mismatch errors will occur. */ +#define VALGRIND_MALLOCLIKE_BLOCK(addr, sizeB, rzB, is_zeroed) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__MALLOCLIKE_BLOCK, \ + addr, sizeB, rzB, is_zeroed, 0); \ + } + +/* Mark a block of memory as having been freed by a free()-like function. + `rzB' is redzone size; it must match that given to + VALGRIND_MALLOCLIKE_BLOCK. Memory not freed will be detected by the leak + checker. Put it immediately after the point where the block is freed. */ +#define VALGRIND_FREELIKE_BLOCK(addr, rzB) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__FREELIKE_BLOCK, \ + addr, rzB, 0, 0, 0); \ + } + +/* Create a memory pool. */ +#define VALGRIND_CREATE_MEMPOOL(pool, rzB, is_zeroed) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__CREATE_MEMPOOL, \ + pool, rzB, is_zeroed, 0, 0); \ + } + +/* Destroy a memory pool. */ +#define VALGRIND_DESTROY_MEMPOOL(pool) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__DESTROY_MEMPOOL, \ + pool, 0, 0, 0, 0); \ + } + +/* Associate a piece of memory with a memory pool. */ +#define VALGRIND_MEMPOOL_ALLOC(pool, addr, size) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__MEMPOOL_ALLOC, \ + pool, addr, size, 0, 0); \ + } + +/* Disassociate a piece of memory from a memory pool. */ +#define VALGRIND_MEMPOOL_FREE(pool, addr) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__MEMPOOL_FREE, \ + pool, addr, 0, 0, 0); \ + } + +/* Disassociate any pieces outside a particular range. */ +#define VALGRIND_MEMPOOL_TRIM(pool, addr, size) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__MEMPOOL_TRIM, \ + pool, addr, size, 0, 0); \ + } + +/* Resize and/or move a piece associated with a memory pool. */ +#define VALGRIND_MOVE_MEMPOOL(poolA, poolB) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__MOVE_MEMPOOL, \ + poolA, poolB, 0, 0, 0); \ + } + +/* Resize and/or move a piece associated with a memory pool. */ +#define VALGRIND_MEMPOOL_CHANGE(pool, addrA, addrB, size) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__MEMPOOL_CHANGE, \ + pool, addrA, addrB, size, 0); \ + } + +/* Return 1 if a mempool exists, else 0. */ +#define VALGRIND_MEMPOOL_EXISTS(pool) \ + ({unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__MEMPOOL_EXISTS, \ + pool, 0, 0, 0, 0); \ + _qzz_res; \ + }) + +/* Mark a piece of memory as being a stack. Returns a stack id. */ +#define VALGRIND_STACK_REGISTER(start, end) \ + ({unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__STACK_REGISTER, \ + start, end, 0, 0, 0); \ + _qzz_res; \ + }) + +/* Unmark the piece of memory associated with a stack id as being a + stack. */ +#define VALGRIND_STACK_DEREGISTER(id) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__STACK_DEREGISTER, \ + id, 0, 0, 0, 0); \ + } + +/* Change the start and end address of the stack id. */ +#define VALGRIND_STACK_CHANGE(id, start, end) \ + {unsigned int _qzz_res; \ + VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ + VG_USERREQ__STACK_CHANGE, \ + id, start, end, 0, 0); \ + } + + +#undef PLAT_x86_linux +#undef PLAT_amd64_linux +#undef PLAT_ppc32_linux +#undef PLAT_ppc64_linux +#undef PLAT_ppc32_aix5 +#undef PLAT_ppc64_aix5 + +#endif /* __VALGRIND_H */ diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/win32/global.mak --- a/libpurple/win32/global.mak Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/win32/global.mak Fri Jul 31 19:20:06 2009 +0000 @@ -47,6 +47,8 @@ # Locations of important (in-tree) build targets PIDGIN_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h PURPLE_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h +PIDGIN_REVISION_H := $(PIDGIN_TREE_TOP)/package_revision.h +PIDGIN_REVISION_RAW_TXT := $(PIDGIN_TREE_TOP)/package_revision_raw.txt PIDGIN_IDLETRACK_DLL := $(PIDGIN_IDLETRACK_TOP)/idletrack.dll PURPLE_PURPLE_H := $(PURPLE_TOP)/purple.h PURPLE_VERSION_H := $(PURPLE_TOP)/version.h diff -r 67143ecbddb1 -r 0907b0c775bb libpurple/win32/targets.mak --- a/libpurple/win32/targets.mak Mon Jul 27 03:14:08 2009 +0000 +++ b/libpurple/win32/targets.mak Fri Jul 31 19:20:06 2009 +0000 @@ -17,6 +17,16 @@ /^m4_define..purple_minor_version/ {system("sed -e s/@PURPLE_MINOR_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@");} \ /^m4_define..purple_micro_version/ {system("sed -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac +$(PIDGIN_REVISION_RAW_TXT): + (cd $(PIDGIN_TREE_TOP) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \ + || rm -f $@ + +$(PIDGIN_REVISION_H): $(PIDGIN_REVISION_RAW_TXT) + if [ -f $< ]; then \ + sed 's/^\(.\+\)$$/#define REVISION "\1"/' $< > $@; \ + fi + [ -f $@ ] || echo "#define REVISION \"unknown\"" > $@ + $(PURPLE_DLL) $(PURPLE_DLL).a: $(PURPLE_VERSION_H) $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) libpurple.dll diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/gtkft.c --- a/pidgin/gtkft.c Mon Jul 27 03:14:08 2009 +0000 +++ b/pidgin/gtkft.c Fri Jul 31 19:20:06 2009 +0000 @@ -75,8 +75,6 @@ /* Buttons */ GtkWidget *open_button; - GtkWidget *pause_button; - GtkWidget *resume_button; GtkWidget *remove_button; GtkWidget *stop_button; GtkWidget *close_button; @@ -330,8 +328,6 @@ if (dialog->selected_xfer == NULL) { gtk_widget_set_sensitive(dialog->expander, FALSE); gtk_widget_set_sensitive(dialog->open_button, FALSE); - gtk_widget_set_sensitive(dialog->pause_button, FALSE); - gtk_widget_set_sensitive(dialog->resume_button, FALSE); gtk_widget_set_sensitive(dialog->stop_button, FALSE); gtk_widget_show(dialog->stop_button); @@ -361,8 +357,6 @@ gtk_widget_set_sensitive (dialog->open_button, FALSE); } #endif - gtk_widget_set_sensitive(dialog->pause_button, FALSE); - gtk_widget_set_sensitive(dialog->resume_button, FALSE); gtk_widget_set_sensitive(dialog->remove_button, TRUE); } else if (purple_xfer_is_canceled(xfer)) { @@ -370,8 +364,6 @@ gtk_widget_show(dialog->remove_button); gtk_widget_set_sensitive(dialog->open_button, FALSE); - gtk_widget_set_sensitive(dialog->pause_button, FALSE); - gtk_widget_set_sensitive(dialog->resume_button, FALSE); gtk_widget_set_sensitive(dialog->remove_button, TRUE); } else { @@ -379,10 +371,6 @@ gtk_widget_hide(dialog->remove_button); gtk_widget_set_sensitive(dialog->open_button, FALSE); - - /* TODO: If the transfer can pause, blah blah */ - gtk_widget_set_sensitive(dialog->pause_button, FALSE); - gtk_widget_set_sensitive(dialog->resume_button, FALSE); gtk_widget_set_sensitive(dialog->stop_button, TRUE); } } @@ -559,16 +547,6 @@ } static void -pause_button_cb(GtkButton *button, PidginXferDialog *dialog) -{ -} - -static void -resume_button_cb(GtkButton *button, PidginXferDialog *dialog) -{ -} - -static void remove_button_cb(GtkButton *button, PidginXferDialog *dialog) { pidgin_xfer_dialog_remove_xfer(dialog, dialog->selected_xfer); @@ -763,6 +741,7 @@ /* Create the window. */ dialog->window = window = pidgin_create_dialog(_("File Transfers"), PIDGIN_HIG_BORDER, "file transfer", TRUE); + gtk_window_set_default_size(GTK_WINDOW(window), 450, 250); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_win_cb), dialog); @@ -818,16 +797,6 @@ gtk_widget_set_sensitive(button, FALSE); dialog->open_button = button; - /* Pause button */ - button = pidgin_dialog_add_button(GTK_DIALOG(window), _("_Pause"), G_CALLBACK(pause_button_cb), dialog); - gtk_widget_set_sensitive(button, FALSE); - dialog->pause_button = button; - - /* Resume button */ - button = pidgin_dialog_add_button(GTK_DIALOG(window), _("_Resume"), G_CALLBACK(resume_button_cb), dialog); - gtk_widget_set_sensitive(button, FALSE); - dialog->resume_button = button; - /* Remove button */ button = pidgin_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_REMOVE, G_CALLBACK(remove_button_cb), dialog); gtk_widget_hide(button); diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/gtkmedia.c --- a/pidgin/gtkmedia.c Mon Jul 27 03:14:08 2009 +0000 +++ b/pidgin/gtkmedia.c Fri Jul 31 19:20:06 2009 +0000 @@ -38,6 +38,10 @@ #ifdef USE_VV #include "media-gst.h" +#ifdef _WIN32 +#include +#endif + #include #define PIDGIN_TYPE_MEDIA (pidgin_media_get_type()) @@ -213,6 +217,7 @@ return FALSE; } +#ifdef HAVE_X11 static int pidgin_x_error_handler(Display *display, XErrorEvent *event) { @@ -246,6 +251,7 @@ error_type); return 0; } +#endif static void menu_hangup(gpointer data, guint action, GtkWidget *item) @@ -303,7 +309,9 @@ GtkWidget *vbox; media->priv = PIDGIN_MEDIA_GET_PRIVATE(media); +#ifdef HAVE_X11 XSetErrorHandler(pidgin_x_error_handler); +#endif vbox = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(media), vbox); @@ -450,10 +458,19 @@ PidginMediaPrivate *priv = data->gtkmedia->priv; gulong window_id; +#ifdef _WIN32 + if (data->participant == NULL) + window_id = GDK_WINDOW_HWND(priv->local_video->window); + else + window_id = GDK_WINDOW_HWND(priv->remote_video->window); +#elif defined(HAVE_X11) if (data->participant == NULL) window_id = GDK_WINDOW_XWINDOW(priv->local_video->window); else window_id = GDK_WINDOW_XWINDOW(priv->remote_video->window); +#else +# error "Unsupported windowing system" +#endif purple_media_set_output_window(priv->media, data->session_id, data->participant, window_id); @@ -786,7 +803,7 @@ gchar *sid, gchar *name, PidginMedia *gtkmedia) { purple_debug_info("gtkmedia", "state: %d sid: %s name: %s\n", - state, sid, name); + state, sid ? sid : "(null)", name ? name : "(null)"); if (sid == NULL && name == NULL) { if (state == PURPLE_MEDIA_STATE_END) { pidgin_media_emit_message(gtkmedia, diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/pixmaps/status/11/invisible.png Binary file pidgin/pixmaps/status/11/invisible.png has changed diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/pixmaps/status/16/invisible.png Binary file pidgin/pixmaps/status/16/invisible.png has changed diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/pixmaps/status/16/offline.png Binary file pidgin/pixmaps/status/16/offline.png has changed diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/pixmaps/status/22/invisible.png Binary file pidgin/pixmaps/status/22/invisible.png has changed diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/pixmaps/status/22/offline.png Binary file pidgin/pixmaps/status/22/offline.png has changed diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/pixmaps/status/32/invisible.png Binary file pidgin/pixmaps/status/32/invisible.png has changed diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/pixmaps/status/32/offline.png Binary file pidgin/pixmaps/status/32/offline.png has changed diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/pixmaps/status/48/invisible.png Binary file pidgin/pixmaps/status/48/invisible.png has changed diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/pixmaps/status/48/offline.png Binary file pidgin/pixmaps/status/48/offline.png has changed diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/plugins/cap/cap.c --- a/pidgin/plugins/cap/cap.c Mon Jul 27 03:14:08 2009 +0000 +++ b/pidgin/plugins/cap/cap.c Fri Jul 31 19:20:06 2009 +0000 @@ -373,6 +373,9 @@ CapStatistics *stats; /* guint words = word_count(message); */ + if (flags & PURPLE_MESSAGE_AUTO_RESP) + return; + buddy = purple_find_buddy(account, sender); if (buddy == NULL) diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/plugins/themeedit-icon.c --- a/pidgin/plugins/themeedit-icon.c Mon Jul 27 03:14:08 2009 +0000 +++ b/pidgin/plugins/themeedit-icon.c Fri Jul 31 19:20:06 2009 +0000 @@ -73,7 +73,10 @@ }, chatemblems[] = { {PIDGIN_STOCK_STATUS_IGNORED, N_("Ignored")}, {PIDGIN_STOCK_STATUS_FOUNDER, N_("Founder")}, + /* A user in a chat room who has special privileges. */ {PIDGIN_STOCK_STATUS_OPERATOR, N_("Operator")}, + /* A half operator is someone who has a subset of the privileges + that an operator has. */ {PIDGIN_STOCK_STATUS_HALFOP, N_("Half Operator")}, {PIDGIN_STOCK_STATUS_VOICE, N_("Voice")}, {NULL, NULL} diff -r 67143ecbddb1 -r 0907b0c775bb pidgin/win32/nsis/pidgin-installer.nsi --- a/pidgin/win32/nsis/pidgin-installer.nsi Mon Jul 27 03:14:08 2009 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Fri Jul 31 19:20:06 2009 +0000 @@ -720,10 +720,11 @@ Delete "$INSTDIR\ca-certs\Microsoft_Secure_Server_Authority.pem" Delete "$INSTDIR\ca-certs\StartCom_Certification_Authority.pem" Delete "$INSTDIR\ca-certs\StartCom_Free_SSL_CA.pem" - Delete "$INSTDIR\ca-certs\VeriSign_Class3_Extended_Validation_CA.pem" + Delete "$INSTDIR\ca-certs\Thawte_Premium_Server_CA.pem" + 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" - Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem" + Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem" Delete "$INSTDIR\ca-certs\VeriSign_International_Server_Class_3_CA.pem" Delete "$INSTDIR\ca-certs\Verisign_RSA_Secure_Server_CA.pem" RMDir "$INSTDIR\ca-certs" diff -r 67143ecbddb1 -r 0907b0c775bb po/ChangeLog --- a/po/ChangeLog Mon Jul 27 03:14:08 2009 +0000 +++ b/po/ChangeLog Fri Jul 31 19:20:06 2009 +0000 @@ -1,6 +1,7 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul version 2.6.0 + * Afrikaans translation updated (Friedel Wolff) * Armenian translation added (David Avsharyan) * Bengali translation updated (Samia Niamatullah) * Catalan translation updated (Josep Puigdemont) @@ -13,6 +14,7 @@ * Galician translation updated (Frco. Javier Rial Rodríguez) * German translation updated (Jochen Kemnade and Björn Voigt) * Greek translation updated (Bouklis Panos) + * Hebrew translation updated (Shalom Craimer) * Khmer translation added (Khoem Sokhem) * Lao translation updated (Anousak Souphavah) * Norwegian Nynorsk translation updated (Yngve Spjeld Landro) @@ -20,6 +22,7 @@ Marques Flores) * Punjabi translation updated (Amanpreet Singh Alam) * Russian translation updated (Антон Самохвалов) + * Slovak translation updated (loptosko) * Slovenian translation updated (Martin Srebotnjak) * Swahili translation added (Paul Msegeya) * Swedish translation updated (Peter Hjalmarsson) diff -r 67143ecbddb1 -r 0907b0c775bb po/af.po --- a/po/af.po Mon Jul 27 03:14:08 2009 +0000 +++ b/po/af.po Fri Jul 31 19:20:06 2009 +0000 @@ -1,15 +1,14 @@ # Afrikaans translations for pidgin # Copyright (C) 2006-2008 # This file is distributed under the same license as the pidgin package. -# Friedel Wolff , 2006-2008. # Samuel Murray , 2007 -# F Wolff , 2009 +# F Wolff , 2006-2009 msgid "" msgstr "" "Project-Id-Version: 2.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-06 15:04-0700\n" -"PO-Revision-Date: 2009-02-23 19:54+0200\n" +"POT-Creation-Date: 2009-07-28 19:30-0700\n" +"PO-Revision-Date: 2009-07-28 22:48+0200\n" "Last-Translator: F Wolff \n" "Language-Team: translate-discuss-af@lists.sourceforge.net\n" "MIME-Version: 1.0\n" @@ -17,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Language: af\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.3.1\n" +"X-Generator: Virtaal 0.4.0-rc1\n" #. Translators may want to transliterate the name. #. It is not to be translated. @@ -869,12 +868,11 @@ msgid "System Log" msgstr "Stelselstaaflêer" -#, fuzzy msgid "Calling ... " -msgstr "Bereken..." +msgstr "Bel tans ... " msgid "Hangup" -msgstr "" +msgstr "Sit neer" #. Number of actions msgid "Accept" @@ -884,22 +882,21 @@ msgstr "Weier" msgid "Call in progress." -msgstr "" +msgstr "Oproep onderweg." msgid "The call has been terminated." -msgstr "" +msgstr "Die oproep is beëindig." #, c-format msgid "%s wishes to start an audio session with you." -msgstr "" +msgstr "%s wil 'n oudiosessie met u begin." #, c-format msgid "%s is trying to start an unsupported media session type with you." -msgstr "" - -#, fuzzy +msgstr "%s probeer om 'n niegesteunde mediasessietipe met u te begin." + msgid "You have rejected the call." -msgstr "U het die kanaal%s%s verlaat" +msgstr "U het die oproep geweier." msgid "call: Make an audio call." msgstr "" @@ -1559,22 +1556,25 @@ "\n" "Fetching TinyURL..." msgstr "" +"\n" +"Kry tans TinyURL..." msgid "Only create TinyURL for urls of this length or greater" -msgstr "" +msgstr "Skep 'n TinyURL slegs vir URL'e van dié lengte of langer" msgid "TinyURL (or other) address prefix" -msgstr "" - -#, fuzzy +msgstr "TinyURL (of ander) adresvoorvoegsel" + msgid "TinyURL" -msgstr "Deuntjie-URL" +msgstr "TinyURL" msgid "TinyURL plugin" -msgstr "" +msgstr "TinyURL-inprop" msgid "When receiving a message with URL(s), TinyURL for easier copying" msgstr "" +"By ontvangs van 'n boodskap met URL(e), gebruik TinyURL vir makliker " +"kopiëring" msgid "accounts" msgstr "rekeninge" @@ -1689,6 +1689,7 @@ "Die sertifikaat wat voorgelê word deur \"%s\", is selfonderteken. Dit kan " "nie outomaties gekontroleer word nie." +#. FIXME 2.6.1 #, c-format msgid "The certificate chain presented for %s is not valid." msgstr "Die sertifikaatketting wat vir %s voorgelê word, is nie geldig nie." @@ -1698,6 +1699,7 @@ #. stifle it. #. TODO: Probably wrong. #. TODO: Probably wrong +#. TODO: Probably wrong. msgid "SSL Certificate Error" msgstr "SSL-sertifikaatfout" @@ -1781,7 +1783,6 @@ msgstr "+++ %s het afgemeld" #. Unknown error -#. Unknown error! msgid "Unknown error" msgstr "Onbekende fout" @@ -1828,9 +1829,8 @@ msgid "%s left the room (%s)." msgstr "%s het die kamer verlaat (%s)." -#, fuzzy msgid "Invite to chat" -msgstr "Nooi na konferensie" +msgstr "Nooi na geselsie" #. Put our happy label in it. msgid "" @@ -1972,6 +1972,10 @@ msgstr "Begin nou met oordrag van %s vanaf %s" #, c-format +msgid "Transfer of file %s complete" +msgstr "Oordrag van lêer %s voltooi" + +#, c-format msgid "Transfer of file %s complete" msgstr "Oordrag van lêer %s voltooi" @@ -2192,9 +2196,8 @@ msgid "(%s) %s : %s\n" msgstr "(%s) %s : %s\n" -#, fuzzy msgid "Error creating conference." -msgstr "Kon nie verbinding daarstel nie" +msgstr "Fout met skep van konferensie." #, c-format msgid "You are using %s, but this plugin requires %s." @@ -2594,7 +2597,6 @@ msgstr "Sluit ander kitsboodskappers se staaflêers in in die staaflêerleser." #. * description -#, fuzzy msgid "" "When viewing logs, this plugin will include logs from other IM clients. " "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n" @@ -2603,11 +2605,11 @@ "at your own risk!" msgstr "" "Wanneer staaflêers bekyk word, sal hierdie inprop staaflêers uit ander " -"kitsboodskappers insluit. Dit sluit tans Adium, MSN Messenger en Trillian " -"in.\n" -"\n" -"LET WEL: Hierdie inprop is nog in alfakode en kan dalk gereeld omval. " -"Gebruik op eie risiko!" +"kitsboodskappers insluit. Dit sluit tans Adium, MSN Messenger, aMSN en " +"Trillian in.\n" +"\n" +"LET WEL: Hierdie inprop is nog alfakode en kan dalk gereeld omval. Gebruik " +"op eie risiko!" msgid "Mono Plugin Loader" msgstr "Laaier vir Mono-inproppe" @@ -2652,12 +2654,11 @@ msgid "Save messages sent to an offline user as pounce." msgstr "Stoor boodskappe gestuur aan 'n vanlynvriend as 'n vriendwag." -#, fuzzy msgid "" "The rest of the messages will be saved as pounces. You can edit/delete the " "pounce from the `Buddy Pounce' dialog." msgstr "" -"Die res van die boodskappe sal as 'n vriendwag gestoor word. Dié wag kan " +"Die res van die boodskappe sal as vriendwagte gestoor word. Dié wagte kan " "gewysig/verwyder word vanuit die `Vriendwag'-dialoog." #, c-format @@ -2686,9 +2687,8 @@ msgid "Do not ask. Always save in pounce." msgstr "Moenie vra nie. Stoor altyd in vriendwag." -#, fuzzy msgid "One Time Password" -msgstr "Tik wagwoord" +msgstr "Eenmalige wagwoord" #. *< type #. *< ui_requirement @@ -2697,7 +2697,7 @@ #. *< priority #. *< id msgid "One Time Password Support" -msgstr "" +msgstr "Steun vir eenmalige wagwoorde" #. *< name #. *< version @@ -2904,17 +2904,15 @@ "Kon nie ActiveTCL-installasie bespeur nie. Indien u TCL-inproppe wil " "gebruik, installeerActiveTCL vanaf http://www.activestate.com\n" -#, fuzzy msgid "" "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin." "im/BonjourWindows for more information." msgstr "" -"Die Apple Bonjour For Windows-nutspak kon nie gevind word nie; kyk kwelvrae " -"by: http://d.pidgin.im/wiki/BonjourWindows vir meer inligting." - -#, fuzzy +"Kan nie Apple se \"Bonjour vir Windows\"-nutspak vind nie; sien http://d." +"pidgin.im/wiki/BonjourWindows vir meer inligting." + msgid "Unable to listen for incoming IM connections" -msgstr "Kon nie vir inkomende kitsboodskap-verbindings luister nie\n" +msgstr "Kan nie vir inkomende kitsboodskap-verbindings luister nie" msgid "" "Unable to establish connection with the local mDNS server. Is it running?" @@ -2954,7 +2952,6 @@ msgstr "Pers persoon" #. Creating the options for the protocol -#, fuzzy msgid "Local Port" msgstr "Plaaslike poort" @@ -2968,21 +2965,17 @@ msgid "Unable to send the message, the conversation couldn't be started." msgstr "Kon nie die boodskap stuur nie, die gesprek kon nie begin word nie." -#, fuzzy, c-format +#, c-format msgid "Unable to create socket: %s" -msgstr "" -"Kan nie sok skep nie:\n" -"%s" - -#, fuzzy, c-format +msgstr "Kan nie sok skep nie: %s" + +#, c-format msgid "Unable to bind socket to port: %s" -msgstr "Kon nie sok aan poort verbind nie" - -#, fuzzy, c-format +msgstr "Kan nie sok aan poort verbind nie: %s" + +#, c-format msgid "Unable to listen on socket: %s" -msgstr "" -"Kan nie sok skep nie:\n" -"%s" +msgstr "Kan nie op sok luister nie: %s" msgid "Error communicating with local mDNSResponder." msgstr "Kon nie met plaaslike mDNSResponder kommunikeer nie." @@ -3031,17 +3024,15 @@ msgid "Load buddylist from file..." msgstr "Laai vriendelys van lêer..." -#, fuzzy msgid "You must fill in all registration fields" -msgstr "Vul die registrasievelde in." - -#, fuzzy +msgstr "Alle registrasievelde moet ingevul word" + msgid "Passwords do not match" -msgstr "Wagwoorde stem nie ooreen nie." - -#, fuzzy +msgstr "Wagwoorde stem nie ooreen nie" + msgid "Unable to register new account. An unknown error occurred." -msgstr "Kan nie nuwe rekening registreer nie. 'n Fout het voorgekom.\n" +msgstr "" +"Kan nie nuwe rekening registreer nie. 'n Onbekende fout het voorgekom." msgid "New Gadu-Gadu Account Registered" msgstr "Nuwe Gadu-Gadu-rekening geregistreer" @@ -3058,9 +3049,8 @@ msgid "Enter captcha text" msgstr "" -#, fuzzy msgid "Captcha" -msgstr "Stoor prent" +msgstr "" msgid "Register New Gadu-Gadu Account" msgstr "Registreer nuwe Gadu-Gadu-rekening" @@ -3199,9 +3189,9 @@ msgid "Chat _name:" msgstr "Geselsie_naam:" -#, fuzzy, c-format +#, c-format msgid "Unable to resolve hostname '%s': %s" -msgstr "Kan nie aan bediener koppel nie." +msgstr "Kon nie gasheernaam '%s' vasstel nie: %s" #. 1. connect to server #. connect to the server @@ -3214,9 +3204,8 @@ msgid "This chat name is already in use" msgstr "Hierdie geselsienaam word reeds gebruik" -#, fuzzy msgid "Not connected to the server" -msgstr "Nie aan die bediener koppel nie." +msgstr "Nie aan die bediener gekoppel nie" msgid "Find buddies..." msgstr "Vind vriende..." @@ -3257,9 +3246,8 @@ msgid "Gadu-Gadu User" msgstr "Gadu-Gadu-gebruiker" -#, fuzzy msgid "GG server" -msgstr "Stel gebruikerinligting..." +msgstr "GG-bediener" #, c-format msgid "Unknown command: %s" @@ -3275,9 +3263,8 @@ msgid "File Transfer Failed" msgstr "Lêeroordrag het misluk" -#, fuzzy msgid "Unable to open a listening port." -msgstr "Kon nie 'n luisterpoort open nie." +msgstr "Kan nie 'n luisterpoort open nie." msgid "Error displaying MOTD" msgstr "Kon nie dagboodskap wys nie" @@ -3299,11 +3286,9 @@ #. #. TODO: what to do here - do we really have to disconnect? #. TODO: do we really want to disconnect on a failure to write? -#, fuzzy, c-format +#, c-format msgid "Lost connection with server: %s" -msgstr "" -"Verbinding met bediener verloor:\n" -"%s" +msgstr "Verbinding met bediener verloor: %s" msgid "View MOTD" msgstr "Bekyk dagboodskap" @@ -3314,9 +3299,8 @@ msgid "_Password:" msgstr "_Wagwoord:" -#, fuzzy msgid "IRC nick and server may not contain whitespace" -msgstr "IRC-byname kan nie spasies bevat nie" +msgstr "IRC-bynaam en bediener mag nie spasies bevat nie" msgid "SSL support unavailable" msgstr "SSL-steun nie beskikbaar nie" @@ -3325,13 +3309,13 @@ msgstr "Kon nie koppel nie" #. this is a regular connect, error out -#, fuzzy, c-format +#, c-format msgid "Unable to connect: %s" -msgstr "Kan nie koppel aan %s nie" - -#, fuzzy, c-format +msgstr "Kan nie koppel nie: %s" + +#, c-format msgid "Server closed the connection" -msgstr "Bediener het die verbinding toegemaak." +msgstr "Bediener het die verbinding toegemaak" msgid "Users" msgstr "Gebruikers" @@ -3387,7 +3371,7 @@ #, c-format msgid "Ban on %s" -msgstr "Kan nie by %s aansluit nie:" +msgstr "Ban op %s" msgid "End of ban list" msgstr "Einde van banlys" @@ -3515,13 +3499,12 @@ #. We only want to do the following dance if the connection #. has not been successfully completed. If it has, just #. notify the user that their /nick command didn't go. -#, fuzzy, c-format +#, c-format msgid "The nickname \"%s\" is already being used." -msgstr "Hierdie geselsienaam word reeds gebruik" - -#, fuzzy +msgstr "Die bynaam \"%s\" is reeds in gebruik." + msgid "Nickname in use" -msgstr "Bynaam" +msgstr "Bynaam in gebruik" msgid "Cannot change nick" msgstr "Kan nie bynaam verander nie" @@ -3762,12 +3745,9 @@ msgid "execute" msgstr "uitvoer" -#, fuzzy msgid "Server requires TLS/SSL, but no TLS/SSL support was found." -msgstr "" -"Bediener vereis TLS/SSL vir aanmelding. Geen TLS/SSL-steun gevind nie." - -#, fuzzy +msgstr "Bediener vereis TLS/SSL, maar geen TLS/SSL-steun is gevind nie." + msgid "You require encryption, but no TLS/SSL support was found." msgstr "U vereis enkripsie, maar geen TLS/SSL-steun is gevind nie." @@ -3785,13 +3765,11 @@ msgid "Plaintext Authentication" msgstr "Skoonteksstawing" -#, fuzzy msgid "SASL authentication failed" -msgstr "Stawing het misluk" - -#, fuzzy +msgstr "SASL-stawing het misluk" + msgid "Invalid response from server" -msgstr "Ongeldige respons van die bediener." +msgstr "Ongeldige respons van die bediener" msgid "Server does not use any supported authentication method" msgstr "Bediener gebruik nie enige gesteunde stawingmetode nie" @@ -3802,36 +3780,28 @@ msgid "Invalid challenge from server" msgstr "Ongeldige uitdaging vanaf bediener" -#, fuzzy, c-format +#, c-format msgid "SASL error: %s" -msgstr "SASL-fout" +msgstr "SASL-fout: %s" msgid "The BOSH connection manager terminated your session." -msgstr "" - -#, fuzzy +msgstr "Die BOSH-verbindingbestuurder het u sessie beëindig." + msgid "No session ID given" -msgstr "Geen rede gegee nie" - -#, fuzzy +msgstr "Geen sessie-ID is gegee nie" + msgid "Unsupported version of BOSH protocol" -msgstr "Niegesteunde weergawe" - -#, fuzzy +msgstr "Niegesteunde weergawe van die BOSH-protokol" + msgid "Unable to establish a connection with the server" -msgstr "" -"Kon nie 'n verbinding met die bediener bewerkstellig nie:\n" -"%s" - -#, fuzzy, c-format +msgstr "Kan nie 'n verbinding met die bediener bewerkstellig nie" + +#, c-format msgid "Unable to establish a connection with the server: %s" -msgstr "" -"Kon nie 'n verbinding met die bediener bewerkstellig nie:\n" -"%s" - -#, fuzzy +msgstr "Kan nie 'n verbinding met die bediener bewerkstellig nie: %s" + msgid "Unable to establish SSL connection" -msgstr "Kan nie verbinding inisialiseer nie" +msgstr "Kan nie SSL-verbinding bewerkstellig nie" msgid "Full Name" msgstr "Volle name" @@ -3899,9 +3869,8 @@ msgid "Operating System" msgstr "Bedryfstelsel" -#, fuzzy msgid "Local Time" -msgstr "Plaaslike lêer:" +msgstr "Plaaslike tyd" msgid "Priority" msgstr "Prioriteit" @@ -3911,11 +3880,10 @@ #, c-format msgid "%s ago" -msgstr "" - -#, fuzzy +msgstr "%s gelede" + msgid "Logged Off" -msgstr "Aangemeld" +msgstr "Afgemeld" msgid "Middle Name" msgstr "Tweede naam" @@ -4083,26 +4051,24 @@ msgid "Find Rooms" msgstr "Vind kamers" -#, fuzzy msgid "Affiliations:" -msgstr "Alias:" - -#, fuzzy +msgstr "Affiliasies:" + msgid "No users found" -msgstr "Geen passende gebruikers gevind nie" - -#, fuzzy +msgstr "Geen gebruikers gevind nie" + msgid "Roles:" -msgstr "Rol" - -#, fuzzy +msgstr "Rolle:" + msgid "Ping timed out" -msgstr "Pieng-uittelling" +msgstr "Pieng het uitgetel" msgid "" "Unable to find alternative XMPP connection methods after failing to connect " "directly." msgstr "" +"Kan nie alternatiewe metodes vind vir XMPP-verbinding nadat direkte " +"verbinding gefaal het nie." msgid "Invalid XMPP ID" msgstr "Ongeldige XMPP-ID" @@ -4110,9 +4076,8 @@ msgid "Invalid XMPP ID. Domain must be set." msgstr "Ongeldige XMPP-ID. Domein moet ingestel word." -#, fuzzy msgid "Malformed BOSH URL" -msgstr "Verbind aan bediener het misluk." +msgstr "Wanvormde BOSH-URL" #, c-format msgid "Registration of %s@%s successful" @@ -4182,10 +4147,6 @@ msgid "Change Registration" msgstr "Verander registrasie" -#, fuzzy -msgid "Malformed BOSH Connect Server" -msgstr "Verbind aan bediener het misluk." - msgid "Error unregistering account" msgstr "Kon nie rekening deregistreer nie" @@ -4471,21 +4432,21 @@ msgid "Unable to ping user %s" msgstr "Kan nie gebruiker %s pieng nie" -#, fuzzy, c-format +#, c-format msgid "Unable to buzz, because there is nothing known about %s." -msgstr "" -"Kon nie zoempie stuur nie omdat daar niks oor gebruiker %s bekend is nie." - -#, fuzzy, c-format +msgstr "Kan nie zoempie stuur nie omdat daar niks oor %s bekend is nie." + +#, c-format msgid "Unable to buzz, because %s might be offline." -msgstr "Kon nie zoempie stuur nie omdat gebruiker %s dalk vanlyn is." - -#, fuzzy, c-format +msgstr "Kan nie zoempie stuur nie omdat %s dalk vanlyn is." + +#, c-format msgid "" "Unable to buzz, because %s does not support it or does not wish to receive " "buzzes now." msgstr "" -"Kon nie zoempie stuur nie omdat die gebruiker %s dit nie ondersteun nie." +"Kan nie zoempie stuur nie omdat %s dit nie ondersteun nie of nie nou zoepies " +"wil ontvang nie." #, c-format msgid "Buzzing %s..." @@ -4500,35 +4461,34 @@ msgid "%s has buzzed you!" msgstr "%s het u 'n zoempie gestuur!" -#, fuzzy, c-format +#, c-format msgid "Unable to initiate media with %s: invalid JID" -msgstr "Kan nie lêer aan %s stuur nie, ongeldige JID" - -#, fuzzy, c-format +msgstr "Kan nie media inisieer met %s nie: ongeldige JID" + +#, c-format msgid "Unable to initiate media with %s: user is not online" -msgstr "Kan nie lêer stuur aan %s nie, gebruiker nie aanlyn nie" - -#, fuzzy, c-format +msgstr "Kan nie media inisieer met %s nie: gebruiker is nie aanlyn nie" + +#, c-format msgid "Unable to initiate media with %s: not subscribed to user presence" msgstr "" -"Kan nie lêer stuur aan %s nie, nie by gebruikerteenwoordigheid ingeteken nie" - -#, fuzzy +"Kan nie media inisieer met %s nie: nie by gebruikerteenwoordigheid ingeteken " +"nie" + msgid "Media Initiation Failed" -msgstr "Registrasie het misluk" - -#, fuzzy, c-format +msgstr "Mediainisialisering het misluk" + +#, c-format msgid "" "Please select the resource of %s with which you would like to start a media " "session." -msgstr "Kies gerus aan watter hulpbron van %s u 'n lêer wil stuur" +msgstr "Kies gerus die hulpbron van %s waarmee u 'n mediasessie wil begin." msgid "Select a Resource" msgstr "Kies 'n hulpbron" -#, fuzzy msgid "Initiate Media" -msgstr "Inisieer _geselsie" +msgstr "Inisieer media" msgid "config: Configure a chat room." msgstr "config: Konfigureer 'n geselsiekamer." @@ -4548,21 +4508,20 @@ msgid "ban <user> [reason]: Ban a user from the room." msgstr "ban <gebruiker> [rede]: Verban 'n gebruiker uit die kamer." -#, fuzzy msgid "" "affiliate <owner|admin|member|outcast|none> [nick1] [nick2] ...: Get " "the users with an affiliation or set users' affiliation with the room." msgstr "" -"affiliate <gebruiker> <eienaar|admin|lid|verworpene|geen>: Stel " -"'n gebruiker se affiliasie met die kamer in." - -#, fuzzy +"affiliate <eienaar|admin|lid|verworpene|geen> [bynaam1] [bynaam2] ...: " +"Kry die gebruikers met 'n affiliasie of stel gebruikers se affiliasie met " +"die kamer in." + msgid "" "role <moderator|participant|visitor|none> [nick1] [nick2] ...: Get the " "users with an role or set users' role with the room." msgstr "" -"role <gebruiker> <moderator|deelnemer|besoeker|geen>: Stel 'n " -"gebruiker se rol in die kamer in." +"role <moderator|deelnemer|besoeker|geen> [bynaam1] [bynaam2] ...: Kry " +"die gebruikers met 'n rol of stel gebruikers se rol in die kamer in." msgid "invite <user> [message]: Invite a user to the room." msgstr "" @@ -4627,7 +4586,7 @@ msgstr "Lêeroordraginstaanbediener" msgid "BOSH URL" -msgstr "" +msgstr "BOSH-URL" #. this should probably be part of global smiley theme settings later on, #. shared with MSN @@ -4690,29 +4649,26 @@ msgid "_Accept Defaults" msgstr "_Aanvaar verstek" -#, fuzzy msgid "No reason" -msgstr "Geen rede gegee nie" - -#, fuzzy, c-format +msgstr "Geen rede nie" + +#, c-format msgid "You have been kicked: (%s)" -msgstr "U is geskop deur %s: (%s)" - -#, fuzzy, c-format +msgstr "U is geskop: (%s)" + +#, c-format msgid "Kicked (%s)" -msgstr "Geskop deur %s (%s)" +msgstr "Geskop (%s)" #, fuzzy msgid "An error occurred on the in-band bytestream transfer\n" msgstr "Kon nie die lêer open nie." -#, fuzzy msgid "Transfer was closed." -msgstr "Lêeroordrag het misluk" - -#, fuzzy +msgstr "Oordrag is gesluit." + msgid "Failed to open the file" -msgstr "Open van lêer '%s' het misluk: %s" +msgstr "Kon nie die lêer open nie" msgid "Failed to open in-band bytestream" msgstr "" @@ -5037,10 +4993,28 @@ msgid "Non-IM Contacts" msgstr "" -#, fuzzy, c-format +#, c-format +msgid "%s sent a wink. Click here to play it" +msgstr "" + +#, c-format +msgid "%s sent a wink, but it could not be saved" +msgstr "" + +#, c-format +msgid "%s sent a voice clip. Click here to play it" +msgstr "" +"%s het 'n stemopname gestuur. Klik hier om dit te " +"speel" + +#, c-format +msgid "%s sent a voice clip, but it could not be saved" +msgstr "%s het 'n stemopname gestuur, maar dit kon nie gestoor word nie" + +#, c-format msgid "%s sent you a voice chat invite, which is not yet supported." msgstr "" -"%s het u 'n webkamera-uitnodiging gestuur, wat nog nie ondersteun word nie." +"%s het 'n stemgesels-uitnodiging gestuur, wat nog nie ondersteun word nie." msgid "Nudge" msgstr "Stootjie" @@ -5193,6 +5167,29 @@ msgstr "" "SSL-steun is nodig vir MSN. Installeer gerus 'n gesteunde SSL-programmateek." +#, c-format +msgid "" +"Unable to add the buddy %s because the username is invalid. Usernames must " +"be a valid email address." +msgstr "" +"Kon nie die vriend %s byvoeg nie omdat die gebruikernaam ongeldig is. 'n " +"Gebruikernaam moet 'n geldige e-posadres wees." + +msgid "Unable to Add" +msgstr "Kan nie byvoeg nie" + +msgid "Authorization Request Message:" +msgstr "Magtigingversoek:" + +msgid "Please authorize me!" +msgstr "Magtig my asseblief!" + +#. * +#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. +#. +msgid "_OK" +msgstr "Regs_o" + msgid "Error retrieving profile" msgstr "Kon nie profiel haal nie" @@ -5385,19 +5382,20 @@ msgid "%s just sent you a Nudge!" msgstr "%s het u so pas 'n stootjie gestuur!" -#, fuzzy, c-format +#, c-format msgid "Unknown error (%d): %s" -msgstr "Onbekende fout (%d)" +msgstr "Onbekende fout (%d): %s" msgid "Unable to add user" msgstr "Kan nie gebruiker byvoeg nie" +#. Unknown error! #, c-format msgid "Unknown error (%d)" msgstr "Onbekende fout (%d)" msgid "The following users are missing from your addressbook" -msgstr "Die volgende gebruikers is nie in die adresboek nie." +msgstr "Die volgende gebruikers is nie in die adresboek nie" msgid "Mobile message was not sent because it was too long." msgstr "Mobiele boodskap is nie gestuur nie omdat dit te lank was." @@ -5459,25 +5457,21 @@ "Verbindingfout vanaf %s bediener:\n" "%s" -#, fuzzy msgid "Our protocol is not supported by the server" -msgstr "Ons protokol word nie deur die bediener ondersteun nie." - -#, fuzzy +msgstr "Ons protokol word nie deur die bediener ondersteun nie" + msgid "Error parsing HTTP" -msgstr "Kon nie HTTP ontleed nie." - -#, fuzzy +msgstr "Kon nie HTTP ontleed nie" + msgid "You have signed on from another location" -msgstr "U het van 'n ander plek aangemeld." +msgstr "U het van 'n ander plek aangemeld" msgid "The MSN servers are temporarily unavailable. Please wait and try again." msgstr "" "Die MSN-bedieners is tydelik nie beskikbaar nie. Wag gerus en probeer weer." -#, fuzzy msgid "The MSN servers are going down temporarily" -msgstr "Die MSN-bedieners sal tydelik afskakel." +msgstr "Die MSN-bedieners gaan tydelik afskakel" #, c-format msgid "Unable to authenticate: %s" @@ -5506,10 +5500,9 @@ msgid "Retrieving buddy list" msgstr "Kry tans vriendelys" -#, fuzzy, c-format +#, c-format msgid "%s requests to view your webcam, but this request is not yet supported." -msgstr "" -"%s het u 'n webkamera-uitnodiging gestuur, wat nog nie ondersteun word nie." +msgstr "%s vra om u webkamera te sien, wat nog nie ondersteun word nie." #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -5708,15 +5701,15 @@ msgid "Protocol error, code %d: %s" msgstr "Protokolfout, kode %d: %s" -#, fuzzy, c-format +#, c-format msgid "" "%s Your password is %zu characters, which is longer than the maximum length " "of %d. Please shorten your password at http://profileedit.myspace.com/index." "cfm?fuseaction=accountSettings.changePassword and try again." msgstr "" -"%s U wagwoord is %d karakters, meer as die verwagte maksimum lengte van %d " -"vir MySpaceIM. Maak u wagwoord korter by http://profileedit.myspace.com/" -"index.cfm?fuseaction=accountSettings.changePassword en probeer weer." +"%s U wagwoord is %zu karakters; meer as die verwagte maksimum lengte van %" +"d. Maak u wagwoord korter by http://profileedit.myspace.com/index.cfm?" +"fuseaction=accountSettings.changePassword en probeer weer." msgid "Incorrect username or password" msgstr "Verkeerde gebruikernaam of wagwoord" @@ -5817,6 +5810,9 @@ "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username " "to set your username." msgstr "" +"'n Fout het voorgekom met die poging om die gebruikernaam te stel. Probeer " +"asb. weer, of besoek http://editprofile.myspace.com/index.cfm?" +"fuseaction=profile.username om u gebruikernaam te stel." msgid "MySpaceIM - Username Available" msgstr "MySpaceIM - Gebruikernaam beskikbaar" @@ -6074,9 +6070,9 @@ msgid "Unknown error: 0x%X" msgstr "Onbekende fout: 0x%X" -#, fuzzy, c-format +#, c-format msgid "Unable to login: %s" -msgstr "Kan nie aanmeld nie" +msgstr "Kan nie aanmeld nie: %s" #, c-format msgid "Unable to send message. Could not get details for user (%s)." @@ -6210,7 +6206,6 @@ "%s blyk vanlyn te wees, en nie die boodskap ontvang het wat u nou net " "gestuur het nie." -#, fuzzy msgid "" "Unable to connect to server. Please enter the address of the server to which " "you wish to connect." @@ -6241,9 +6236,8 @@ msgid "Server port" msgstr "Bedienerpoort" -#, fuzzy msgid "Received unexpected response from " -msgstr "Onverwagte HTTP-respons van die bediener ontvang." +msgstr "" #. username connecting too frequently msgid "" @@ -6266,9 +6260,8 @@ msgid "Invalid chat room name" msgstr "Ongeldige kletskamernaam" -#, fuzzy msgid "Received invalid data on connection with server" -msgstr "Het ongeldige data ontvang tydens verbinding met bediener." +msgstr "Het ongeldige data ontvang tydens verbinding met bediener" #. *< type #. *< ui_requirement @@ -6315,9 +6308,8 @@ msgid "Received invalid data on connection with remote user." msgstr "Het ongeldige data ontvang tydens verbinding met afgeleë gebruiker." -#, fuzzy msgid "Unable to establish a connection with the remote user." -msgstr "Kon nie 'n verbinding met die afgeleë gebruiker bewerkstellig nie." +msgstr "Kan nie 'n verbinding met die afgeleë gebruiker bewerkstellig nie." msgid "Direct IM established" msgstr "Direkte kitsboodskap bewerkstellig" @@ -6516,15 +6508,13 @@ msgid "Buddy Comment" msgstr "Vriendkommentaar" -#, fuzzy, c-format +#, c-format msgid "Unable to connect to authentication server: %s" -msgstr "" -"Kon nie aan stawingbediener koppel nie:\n" -"%s" - -#, fuzzy, c-format +msgstr "Kan nie aan stawingbediener koppel nie: %s" + +#, c-format msgid "Unable to connect to BOS server: %s" -msgstr "Kan nie aan bediener koppel nie." +msgstr "Kan nie aan BOS-bediener koppel nie: %s" msgid "Username sent" msgstr "Gebruikernaam gestuur" @@ -6536,17 +6526,17 @@ msgid "Finalizing connection" msgstr "Finaliseer verbinding" -#, fuzzy, c-format +#, c-format msgid "" "Unable to sign on as %s because the username is invalid. Usernames must be " "a valid email address, or start with a letter and contain only letters, " "numbers and spaces, or contain only numbers." msgstr "" -"Kan nie aanmeld nie: Kon nie op %s aanmeld nie omdat die skermnaam ongeldig " -"is. Skermname moet geldige e-posadresse wees, of met 'n letter begin en net " +"Kan nie as %s aanmeld nie omdat die gebruikernaam ongeldig is. " +"Gebruikername moet geldige e-posadresse wees, of met 'n letter begin en net " "letters, syfers en spasies bevat, of net syfers bevat." -#, fuzzy, c-format +#, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "" "U kan dalk binnekort ontkoppel word. As dit gebeur, kontroleer %s vir " @@ -6564,35 +6554,32 @@ #. Unregistered username #. uid is not exist #. the username does not exist -#, fuzzy msgid "Username does not exist" -msgstr "Gebruiker bestaan nie" +msgstr "Gebruikernaam bestaan nie" #. Suspended account -#, fuzzy msgid "Your account is currently suspended" -msgstr "U rekening is tans opgeskort." +msgstr "U rekening is tans opgeskort" #. service temporarily unavailable msgid "The AOL Instant Messenger service is temporarily unavailable." msgstr "Die AOL-kitsboodskapdiens is tydelik nie beskikbaar nie." +#. client too old #, c-format msgid "The client version you are using is too old. Please upgrade at %s" msgstr "Die kliëntweergawe wat u gebruik, is te oud. Gradeer gerus op by %s" #. IP address connecting too frequently -#, fuzzy msgid "" "You have been connecting and disconnecting too frequently. Wait a minute and " "try again. If you continue to try, you will need to wait even longer." msgstr "" -"U het nou te gereeld gekoppel en ontkoppel. Wag tien minute en probeer weer. " +"U het nou te gereeld gekoppel en ontkoppel. Wag 'n minuut en probeer weer. " "Indien u voortgaan om te probeer sal u selfs nog langer moet wag." -#, fuzzy msgid "The SecurID key entered is invalid" -msgstr "Die SecurID-sleutel wat getik is, is ongeldig." +msgstr "Die SecurID-sleutel wat getik is, is ongeldig" msgid "Enter SecurID" msgstr "Tik SecurID" @@ -6600,12 +6587,6 @@ msgid "Enter the 6 digit number from the digital display." msgstr "Tik die 6-syfer-nommer vanaf die digitale skerm." -#. * -#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. -#. -msgid "_OK" -msgstr "_Regso" - msgid "Password sent" msgstr "Wagwoord gestuur" @@ -6615,12 +6596,6 @@ msgid "Please authorize me so I can add you to my buddy list." msgstr "Magtig my gerus sodat ek u by my vriendelys kan voeg." -msgid "Authorization Request Message:" -msgstr "Magtigingversoek:" - -msgid "Please authorize me!" -msgstr "Magtig my asseblief!" - msgid "No reason given." msgstr "Geen rede gegee nie." @@ -6949,18 +6924,15 @@ msgid "Away message too long." msgstr "Weg-boodskap te lank." -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because the username is invalid. Usernames must " "be a valid email address, or start with a letter and contain only letters, " "numbers and spaces, or contain only numbers." msgstr "" -"Kon nie die vriend %s byvoeg nie omdat die skermnaam ongeldig is. Skermname " -"moet geldige e-posadresse wees, of met 'n letter begin en net letters, " -"syfers en spasies bevat, of net syfers bevat." - -msgid "Unable to Add" -msgstr "Kan nie byvoeg nie" +"Kon nie die vriend %s byvoeg nie omdat die gebruikernaam ongeldig is. " +"Gebruikername moet geldige e-posadresse wees, of met 'n letter begin en net " +"letters, syfers en spasies bevat, of net syfers bevat." msgid "Unable to Retrieve Buddy List" msgstr "Kan nie vriendelys haal nie" @@ -6975,20 +6947,20 @@ msgid "Orphans" msgstr "Wesies" -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because you have too many buddies in your buddy " "list. Please remove one and try again." msgstr "" -"Kon nie die vriend %s byvoeg nie omdat u te veel vriende in u vriendelys " +"Kan nie die vriend %s byvoeg nie omdat u te veel vriende in u vriendelys " "het. Verwyder gerus een en probeer weer." msgid "(no name)" msgstr "(geen naam)" -#, fuzzy, c-format +#, c-format msgid "Unable to add the buddy %s for an unknown reason." -msgstr "Kon nie die vriend %s byvoeg nie, om 'n onbekende rede." +msgstr "Kan nie die vriend %s byvoeg nie, om 'n onbekende rede." #, c-format msgid "" @@ -7865,9 +7837,8 @@ msgid "Invalid server or port" msgstr "Ongeldige fout" -#, fuzzy msgid "Connecting to server" -msgstr "Koppel tans aan SILC-bediener" +msgstr "Koppel tans bediener" msgid "QQ Error" msgstr "QQ-fout" @@ -8900,9 +8871,8 @@ msgid "Disconnected by server" msgstr "Ontkoppel van bediener" -#, fuzzy msgid "Error connecting to SILC Server" -msgstr "Kon nie volledig aan SILC-bediener koppel nie" +msgstr "Fout tydens verbinding aan SILC-bediener" msgid "Key Exchange failed" msgstr "Sleutelruiling het misluk" @@ -8916,24 +8886,18 @@ msgid "Performing key exchange" msgstr "Verrig tans sleutelruiling" -#, fuzzy msgid "Unable to load SILC key pair" -msgstr "Kon nie SILC-sleutelpaar laai nie" +msgstr "Kan nie SILC-sleutelpaar laai nie" #. Progress msgid "Connecting to SILC Server" -msgstr "Koppel tans aan SILC-bediener" - -#, fuzzy -msgid "Unable to not load SILC key pair" -msgstr "Kon nie SILC-sleutelpaar laai nie" +msgstr "Verbind tans aan SILC-bediener" msgid "Out of memory" msgstr "Onvoldoende geheue" -#, fuzzy msgid "Unable to initialize SILC protocol" -msgstr "Kon nie SILC-protokol inisialiseer nie" +msgstr "Kan nie SILC-protokol inisialiseer nie" msgid "Error loading SILC key pair" msgstr "Kon nie SILC-sleutelpaar volledig laai nie" @@ -9230,9 +9194,8 @@ msgid "Creating SILC key pair..." msgstr "Skep tans SILC-sleutelpaar..." -#, fuzzy msgid "Unable to create SILC key pair" -msgstr "Kan nie SILC-sleutelpaar skep nie\n" +msgstr "Kan nie SILC-sleutelpaar skep nie" #. Hint for translators: Please check the tabulator width here and in #. the next strings (short strings: 2 tabs, longer strings 1 tab, @@ -9370,27 +9333,24 @@ msgid "Failure: Authentication failed" msgstr "Mislukking: Stawing het misluk" -#, fuzzy msgid "Unable to initialize SILC Client connection" -msgstr "Kon nie SILC-kliëntverbinding inisialiseer nie" +msgstr "Kan nie SILC-kliëntverbinding inisialiseer nie" msgid "John Noname" msgstr "Naamloos Niemand" -#, fuzzy, c-format +#, c-format msgid "Unable to load SILC key pair: %s" -msgstr "Kon nie SILC-sleutelpaar laai nie: %s" +msgstr "Kan nie SILC-sleutelpaar laai nie: %s" msgid "Unable to create connection" msgstr "Kon nie verbinding skep nie" -#, fuzzy msgid "Unknown server response" -msgstr "Onbekende bedienerrespons." - -#, fuzzy +msgstr "Onbekende bedienerrespons" + msgid "Unable to create listen socket" -msgstr "Kan nie sok skep nie" +msgstr "Kan nie luistersok skep nie" msgid "SIP usernames may not contain whitespaces or @ symbols" msgstr "SIP-gebruikername mag nie spasies of @-simbole bevat nie" @@ -9454,9 +9414,8 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! Protocol Plugin" -msgstr "Inprop vir die Yahoo-protokol" +msgstr "Inprop vir die Yahoo!-protokol" msgid "Pager server" msgstr "Roeper-bediener" @@ -9485,9 +9444,8 @@ msgid "Yahoo Chat port" msgstr "Yahoo-geselsiepoort" -#, fuzzy msgid "Yahoo JAPAN ID..." -msgstr "Yahoo-ID..." +msgstr "Yahoo JAPAN-ID..." #. *< type #. *< ui_requirement @@ -9499,12 +9457,11 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "Inprop vir die Yahoo-protokol" +msgstr "Inprop vir die Yahoo! JAPAN-protokol" msgid "Your SMS was not delivered" -msgstr "" +msgstr "U SMS is nie afgelewer nie" msgid "Your Yahoo! message did not get sent." msgstr "U Yahoo!-boodskap is nie gestuur nie." @@ -9529,32 +9486,28 @@ msgstr "Vriend byvoeg geweier" #. Some error in the received stream -#, fuzzy msgid "Received invalid data" -msgstr "Het ongeldige data ontvang tydens verbinding met bediener." +msgstr "Het ongeldige data ontvang" #. security lock from too many failed login attempts -#, fuzzy msgid "" "Account locked: Too many failed login attempts. Logging into the Yahoo! " "website may fix this." msgstr "" -"Onbekende fout, nommer %d. As u by die Yahoo!-webwerf aanmeld, kan dit dalk " -"die probleem oplos." +"Rekening gesluit: te veel mislukte aanmeldpogings. As u by die Yahoo!-" +"webwerf aanmeld, kan dit dalk die probleem oplos." #. indicates a lock of some description -#, fuzzy msgid "" "Account locked: Unknown reason. Logging into the Yahoo! website may fix " "this." msgstr "" -"Onbekende fout, nommer %d. As u by die Yahoo!-webwerf aanmeld, kan dit dalk " -"die probleem oplos." +"Rekening gesluit: onbekende rede. As u by die Yahoo!-webwerf aanmeld, kan " +"dit dalk die probleem oplos." #. username or password missing -#, fuzzy msgid "Username or password missing" -msgstr "Verkeerde gebruikernaam of wagwoord" +msgstr "Gebruikernaam of wagwoord ontbreek" #, c-format msgid "" @@ -9589,34 +9542,28 @@ "Onbekende fout, nommer %d. As u by die Yahoo!-webwerf aanmeld, kan dit dalk " "die probleem oplos." -#, fuzzy, c-format +#, c-format msgid "Unable to add buddy %s to group %s to the server list on account %s." msgstr "" -"Kon nie vriend %s by groep %s op die bedienerlys op rekening %s voeg nie." - -#, fuzzy +"Kan nie vriend %s by groep %s op die bedienerlys op rekening %s voeg nie." + msgid "Unable to add buddy to server list" -msgstr "Kon nie vriend by bedienerlys voeg nie" +msgstr "Kan nie vriend by bedienerlys voeg nie" #, c-format msgid "[ Audible %s/%s/%s.swf ] %s" msgstr "[ Hoorbaar %s/%s/%s.swf ] %s" -#, fuzzy msgid "Received unexpected HTTP response from server" -msgstr "Onverwagte HTTP-respons van die bediener ontvang." - -#, fuzzy, c-format +msgstr "Onverwagte HTTP-respons van die bediener ontvang" + +#, c-format msgid "Lost connection with %s: %s" -msgstr "" -"Verbinding met %s verloor:\n" -"%s" - -#, fuzzy, c-format +msgstr "Verbinding met %s verloor: %s" + +#, c-format msgid "Unable to establish a connection with %s: %s" -msgstr "" -"Kon nie 'n verbinding met die bediener bewerkstellig nie:\n" -"%s" +msgstr "Kan nie 'n verbinding met die %s bewerkstellig nie: %s" msgid "Not at Home" msgstr "Nie tuis nie" @@ -9664,7 +9611,7 @@ msgstr "Begin krabbel" msgid "Select the ID you want to activate" -msgstr "" +msgstr "Kies die ID wat u wil aktiveer" msgid "Join whom in chat?" msgstr "Sluit by wie in geselsie aan?" @@ -9764,14 +9711,9 @@ msgid "The user's profile is empty." msgstr "Die gebruiker se profiel is leeg." -#, c-format -msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." -msgstr "" -"%s het u konferensie-uitnodiging na kamer \"%s\" van die hand gewys omdat \"%" -"s\"." - -msgid "Invitation Rejected" -msgstr "Uitnodiging geweier" +#, fuzzy, c-format +msgid "%s has declined to join." +msgstr "%s het aangemeld." msgid "Failed to join chat" msgstr "Aansluit by geselsie het misluk" @@ -9823,9 +9765,8 @@ msgid "User Rooms" msgstr "Gebruikerkamers" -#, fuzzy msgid "Connection problem with the YCHT server" -msgstr "Verbindingprobleem met die YCHT-bediener." +msgstr "Verbindingprobleem met die YCHT-bediener" msgid "" "(There was an error converting this message.\t Check the 'Encoding' option " @@ -9956,17 +9897,17 @@ msgid "Exposure" msgstr "Blootstelling" -#, fuzzy, c-format +#, c-format msgid "Unable to parse response from HTTP proxy: %s" -msgstr "Kon nie respons van HTTP-instaanbediener ontleed nie: %s\n" +msgstr "Kon nie respons van HTTP-instaanbediener ontleed nie: %s" #, c-format msgid "HTTP proxy connection error %d" msgstr "HTTP-instaanverbinding-fout %d" -#, fuzzy, c-format +#, c-format msgid "Access denied: HTTP proxy server forbids port %d tunneling" -msgstr "Toegang geweier: HTTP-instaanbediener verbied poort %d om te tonnel." +msgstr "Toegang geweier: HTTP-instaanbediener verbied poort %d om te tonnel" #, c-format msgid "Error resolving %s" @@ -10210,13 +10151,13 @@ msgid "Error Reading %s" msgstr "Kon nie %s lees nie" -#, fuzzy, c-format +#, c-format msgid "" "An error was encountered reading your %s. The file has not been loaded, and " "the old file has been renamed to %s~." msgstr "" -"Kon nie volledig u %s lees nie. Dit is nie gelaai nie, en die ou lêer is " -"hernoem na %s~." +"Kon nie volledig u %s lees nie. Die lêer is nie gelaai nie, en die ou lêer " +"is hernoem na %s~." msgid "Internet Messenger" msgstr "Internetboodskapper" @@ -10260,8 +10201,8 @@ msgid "Use this buddy _icon for this account:" msgstr "Gebruik hierdie vriend_ikoon vir hierdie rekening:" -msgid "_Advanced" -msgstr "_Gevorderd" +msgid "Ad_vanced" +msgstr "Ge_vorderd" msgid "Use GNOME Proxy Settings" msgstr "Gebruik GNOME se instaaninstellings" @@ -10323,9 +10264,8 @@ msgid "Create _this new account on the server" msgstr "Skep _hierdie nuwe rekening op die bediener" -#, fuzzy -msgid "_Proxy" -msgstr "Instaanbediener" +msgid "P_roxy" +msgstr "I_nstaanbediener" msgid "Enabled" msgstr "Geaktiveer" @@ -10369,14 +10309,13 @@ msgstr "" "As u hierdie kontakte saamvoeg, sal hulle 'n enkele inskrywing in die " "vriendelys hê en 'n enkele gespreksvenster gebruik. U kan hulle weer skei " -"met 'Uitbrei' op die kontak-kontekskielys" +"met 'Vou oop' op die kontak-kontekskielys" msgid "Please update the necessary fields." msgstr "Werk gerus die nodige velde by." -#, fuzzy msgid "A_ccount" -msgstr "Rekening" +msgstr "_Rekening" msgid "" "Please enter the appropriate information about the chat you would like to " @@ -10402,16 +10341,14 @@ msgid "I_M" msgstr "_Kitsklets" -#, fuzzy msgid "_Audio Call" -msgstr "_Voeg geselsie by" +msgstr "_Stemoproep" msgid "Audio/_Video Call" -msgstr "" - -#, fuzzy +msgstr "Oudio/_Video-oproep" + msgid "_Video Call" -msgstr "Videogeselsies" +msgstr "_Video-oproep" msgid "_Send File..." msgstr "_Stuur lêer..." @@ -10422,11 +10359,9 @@ msgid "View _Log" msgstr "Bekyk _staaflêer" -#, fuzzy msgid "Hide When Offline" msgstr "Versteek terwyl vanlyn" -#, fuzzy msgid "Show When Offline" msgstr "Wys terwyl aanlyn" @@ -10552,9 +10487,8 @@ msgid "/Tools/_Certificates" msgstr "_Sertifikate" -#, fuzzy msgid "/Tools/Custom Smile_ys" -msgstr "_Gesiggie" +msgstr "_Eie gesiggies" msgid "/Tools/Plu_gins" msgstr "_Inproppe" @@ -10683,7 +10617,7 @@ msgstr "Volgens status" msgid "By recent log activity" -msgstr "" +msgstr "Volgens onlangse staaflêeraktiwiteit" #, c-format msgid "%s disconnected" @@ -10700,7 +10634,7 @@ msgstr "Heraktiveer" msgid "SSL FAQs" -msgstr "" +msgstr "SSL-vrae" msgid "Welcome back!" msgstr "Welkom terug!" @@ -10760,10 +10694,10 @@ msgstr "Protokolikone" msgid "Add a buddy.\n" -msgstr "Voeg 'n _vriend by.\n" +msgstr "Voeg 'n vriend by.\n" msgid "Buddy's _username:" -msgstr "Vriend se gebruikernaam:" +msgstr "Vriend se gebr_uikernaam:" msgid "(Optional) A_lias:" msgstr "(Opsionele) a_lias:" @@ -10829,95 +10763,82 @@ msgid "Background Color" msgstr "Agtergrondkleur" -#, fuzzy msgid "The background color for the buddy list" -msgstr "Hierdie groep is by u vriendelys gevoeg" - -#, fuzzy +msgstr "Die agtergrondkleur van die vriendelys" + msgid "Layout" -msgstr "Lao" +msgstr "Uitleg" msgid "The layout of icons, name, and status of the blist" -msgstr "" +msgstr "Die uitleg van ikone, name en status van die vriendelys" #. Group -#, fuzzy msgid "Expanded Background Color" -msgstr "Agtergrondkleur" +msgstr "Oopgevoude agtergrondkleur" msgid "The background color of an expanded group" -msgstr "" - -#, fuzzy +msgstr "Die agtergrondkleur van 'n oopgevoude groep" + msgid "Expanded Text" -msgstr "_Vou oop" +msgstr "Oopgevoude teks" msgid "The text information for when a group is expanded" -msgstr "" - -#, fuzzy +msgstr "Die teksinligting vir wanneer 'n groep oopgevou is" + msgid "Collapsed Background Color" -msgstr "Kies agtergrondkleur" +msgstr "Toegevoude agtergrondkleur" msgid "The background color of a collapsed group" -msgstr "" - -#, fuzzy +msgstr "Die agtergrondkleur van 'n toegevoude groep" + msgid "Collapsed Text" -msgstr "_Vou toe" +msgstr "Toegevoude teks" msgid "The text information for when a group is collapsed" -msgstr "" +msgstr "Die teksinligting vir wanneer 'n groep toegevou is" #. Buddy -#, fuzzy msgid "Contact/Chat Background Color" -msgstr "Kies agtergrondkleur" +msgstr "Geselsie se agtergrondkleur" msgid "The background color of a contact or chat" -msgstr "" - -#, fuzzy +msgstr "Die agtergrondkleur van 'n kontak of geselsie" + msgid "Contact Text" -msgstr "Kortpad" +msgstr "Kontakteks" msgid "The text information for when a contact is expanded" -msgstr "" - -#, fuzzy +msgstr "Die teksinligting vir wanneer 'n kontak oopgevou is" + msgid "On-line Text" -msgstr "Aanlyn" +msgstr "Aanlynteks" msgid "The text information for when a buddy is online" -msgstr "" - -#, fuzzy +msgstr "Die teksinligting vir wanneer 'n vriend aanlyn is" + msgid "Away Text" -msgstr "Weg" +msgstr "Wegteks" msgid "The text information for when a buddy is away" -msgstr "" - -#, fuzzy +msgstr "Die teksinligting vir wanneer 'n vriend weg is" + msgid "Off-line Text" -msgstr "Vanlyn" +msgstr "Vanlynteks" msgid "The text information for when a buddy is off-line" -msgstr "" - -#, fuzzy +msgstr "Die teksinligting vir wanneer 'n vriend vanlyn is" + msgid "Idle Text" -msgstr "Stemmingteks" +msgstr "Ledige teks" msgid "The text information for when a buddy is idle" -msgstr "" - -#, fuzzy +msgstr "Die teksinligting vir wanneer 'n vriend ledig is" + msgid "Message Text" -msgstr "Boodskap gestuur" +msgstr "Boodskapteks" msgid "The text information for when a buddy has an unread message" -msgstr "" +msgstr "Die teksinligting vir wanneer 'n vriend 'n ongelese boodskap het" msgid "Message (Nick Said) Text" msgstr "" @@ -10927,11 +10848,9 @@ "your nick" msgstr "" -#, fuzzy msgid "The text information for a buddy's status" -msgstr "Verander gebruikerinligting vir %s" - -#, fuzzy +msgstr "Die teksinligting vir 'n vriend se status" + msgid "Type the host name for this certificate." msgstr "Tik die gasheernaam vir hierdie sertifikaat in." @@ -10981,7 +10900,6 @@ msgid "Get Away Message" msgstr "Kry Weg-boodskap" -#, fuzzy msgid "Last Said" msgstr "Laaste gesê" @@ -11028,21 +10946,17 @@ msgid "/Conversation/Clea_r Scrollback" msgstr "Maak gesprekvenster skoo_n" -#, fuzzy msgid "/Conversation/M_edia" -msgstr "_Meer" - -#, fuzzy +msgstr "M_edia" + msgid "/Conversation/Media/_Audio Call" -msgstr "_Meer" - -#, fuzzy +msgstr "_Oudio-oproep" + msgid "/Conversation/Media/_Video Call" -msgstr "_Meer" - -#, fuzzy +msgstr "_Video-oproep" + msgid "/Conversation/Media/Audio\\/Video _Call" -msgstr "Bekyk staaf_lêer" +msgstr "Oudio/Video-_oproep" msgid "/Conversation/Se_nd File..." msgstr "S_tuur lêer..." @@ -11116,17 +11030,14 @@ msgid "/Conversation/View Log" msgstr "Bekyk staaflêer" -#, fuzzy msgid "/Conversation/Media/Audio Call" -msgstr "Meer" - -#, fuzzy +msgstr "Oudio-oproep" + msgid "/Conversation/Media/Video Call" -msgstr "Bekyk staaflêer" - -#, fuzzy +msgstr "Video-oproep" + msgid "/Conversation/Media/Audio\\/Video Call" -msgstr "Meer" +msgstr "Oudio/Video-oproep" msgid "/Conversation/Send File..." msgstr "Stuur lêer..." @@ -11301,7 +11212,7 @@ msgstr "Fatale fout" msgid "bug master" -msgstr "" +msgstr "goggameester" msgid "artist" msgstr "kunstenaar" @@ -11311,7 +11222,7 @@ msgstr "Ka-Hing Cheung" msgid "voice and video" -msgstr "" +msgstr "stem en video" msgid "support" msgstr "steun" @@ -11437,9 +11348,8 @@ msgid "Hungarian" msgstr "Hongaars" -#, fuzzy msgid "Armenian" -msgstr "Romeens" +msgstr "Armeens" msgid "Indonesian" msgstr "Indonesies" @@ -11456,9 +11366,8 @@ msgid "Ubuntu Georgian Translators" msgstr "Ubuntu- Georgiese vertalers" -#, fuzzy msgid "Khmer" -msgstr "Ander" +msgstr "Khmer" msgid "Kannada" msgstr "Kannada" @@ -11481,7 +11390,6 @@ msgid "Macedonian" msgstr "Masedonies" -#, fuzzy msgid "Mongolian" msgstr "Mongools" @@ -11540,7 +11448,7 @@ msgstr "Sweeds" msgid "Swahili" -msgstr "" +msgstr "Swahili" msgid "Tamil" msgstr "Tamil" @@ -11850,14 +11758,6 @@ msgid "File transfer _details" msgstr "_Details oor lêeroordrag" -#. Pause button -msgid "_Pause" -msgstr "_Pouseer" - -#. Resume button -msgid "_Resume" -msgstr "_Hervat" - msgid "Paste as Plain _Text" msgstr "Plak as gewone _teks" @@ -11876,7 +11776,6 @@ msgid "Hyperlink visited color" msgstr "Besoekte hiperskakelkleur" -#, fuzzy msgid "Color to draw hyperlink after it has been visited (or activated)." msgstr "" "Kleur om hiperskakels mee te teken ná dit besoek is (of geaktiveer is)." @@ -12184,7 +12083,7 @@ msgid "%s %s. Try `%s -h' for more information.\n" msgstr "%s %s. Probeer `%s -h' vir meer inligting.\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -12206,17 +12105,19 @@ "\n" " -c, --config=GIDS gebruik GIDS vir konfigurasielêers\n" " -d, --debug skryf ontfoutboodskappe na stdout\n" +" -f, --force-online forseer aanlyn, ongeag die netwerkstatus\n" " -h, --help wys hierdie hulp, en sluit af\n" -" -m, --multiple moenie enkele uittrekking verseker nie\n" +" -m, --multiple moenie enkele instansie verseker nie\n" " -n, --nologin moenie outomaties aanmeld nie\n" -" -l, --login[=NAAM] aktiveer spesifieke rekening(e) (opsionele NAAM-" +" -l, --login[=NAAM] aktiveer spesifieke rekening(e) (Opsionele NAAM-" "argument\n" -" spesifiseer rekening(e) om te gebruik, geskei met kommas).\n" -" Hiersonder word net die eerste rekening geaktiveer).\n" -" --display=VERTOON X vertoon om te gebruik\n" +" spesifiseer rekening(e) om te gebruik, geskei met " +"kommas.\n" +" Hiersonder word net die eerste rekening geaktiveer).\n" +" --display=VERTOON X-vertoon om te gebruik\n" " -v, --version wys die huidige weergawe, en sluit af\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -12237,13 +12138,15 @@ "\n" " -c, --config=GIDS gebruik GIDS vir konfigurasielêers\n" " -d, --debug skryf ontfoutboodskappe na stdout\n" +" -f, --force-online forseer aanlyn, ongeag die netwerkstatus\n" " -h, --help wys hierdie hulp, en sluit af\n" " -m, --multiple moenie enkele uittrekking verseker nie\n" " -n, --nologin moenie outomaties aanmeld nie\n" -" -l, --login[=NAAM] aktiveer spesifieke rekening(e) (opsionele NAAM-" +" -l, --login[=NAAM] aktiveer spesifieke rekening(e) (Opsionele NAAM-" "argument\n" -" spesifiseer rekening(e) om te gebruik, geskei met kommas).\n" -" Hiersonder word net die eerste rekening geaktiveer).\n" +" spesifiseer rekening(e) om te gebruik, geskei met " +"kommas.\n" +" Hiersonder word net die eerste rekening geaktiveer).\n" " -v, --version wys die huidige weergawe, en sluit af\n" #, c-format @@ -12283,22 +12186,21 @@ msgstr "Sluit af omdat 'n ander libpurple-kliënt reeds loop.\n" msgid "/_Media" -msgstr "" +msgstr "_Media" msgid "/Media/_Hangup" -msgstr "" - -#, fuzzy +msgstr "Sit _neer" + msgid "Calling..." -msgstr "Bereken..." +msgstr "Bel tans..." #, c-format msgid "%s wishes to start an audio/video session with you." -msgstr "" +msgstr "%s wil 'n oudio-/videosessie met u begin." #, c-format msgid "%s wishes to start a video session with you." -msgstr "" +msgstr "%s wil 'n videosessie met u begin." #, c-format msgid "%s has %d new message." @@ -12328,9 +12230,8 @@ msgstr "" "Die 'Handmatige' blaaier-bevel is gekies, maar geen bevel is gestel nie." -#, fuzzy msgid "No message" -msgstr "Onbekende boodskap" +msgstr "Geen boodskap" msgid "Open All Messages" msgstr "Open alle boodskappe" @@ -12338,9 +12239,8 @@ msgid "You have mail!" msgstr "U het pos!" -#, fuzzy msgid "New Pounces" -msgstr "Nuwe vriendwag" +msgstr "Nuwe vriendwagte" msgid "Dismiss" msgstr "" @@ -12397,7 +12297,6 @@ msgid "Select a file" msgstr "Kies 'n lêer" -#, fuzzy msgid "Modify Buddy Pounce" msgstr "Wysig vriendwag" @@ -12514,9 +12413,9 @@ msgid "Sent a message" msgstr "Stuur 'n boodskap" -#, fuzzy, c-format +#, c-format msgid "Unknown.... Please report this!" -msgstr "Onbekende vriendwag-gebeurtenis. Rapporteer dit, asseblief!" +msgstr "Onbekende... Rapporteer dit, asseblief!" #, fuzzy msgid "Theme failed to unpack." @@ -12550,9 +12449,8 @@ msgstr "Sl_uit gesprekke met die Escape-sleutel" #. Buddy List Themes -#, fuzzy msgid "Buddy List Theme" -msgstr "Vriendelys" +msgstr "Vriendelystema" #. System Tray msgid "System Tray Icon" @@ -12564,9 +12462,8 @@ msgid "On unread messages" msgstr "Met ongelese boodskappe" -#, fuzzy msgid "Conversation Window" -msgstr "Kitsboodskap-gesprekvensters" +msgstr "Gesprekvenster" msgid "_Hide new IM conversations:" msgstr "_Versteek nuwe kitsboodskappe:" @@ -12669,9 +12566,9 @@ msgid "Example: stunserver.org" msgstr "Voorbeeld: stunserver.org" -#, fuzzy, c-format +#, c-format msgid "Use _automatically detected IP address: %s" -msgstr "_Outospeur IP-adres" +msgstr "Gebruik _outomaties bespeurde IP-adres: %s" msgid "Public _IP:" msgstr "Publieke _IP:" @@ -13038,12 +12935,11 @@ msgid "Status for %s" msgstr "Status vir %s" -#, fuzzy, c-format +#, c-format msgid "" "A custom smiley for '%s' already exists. Please use a different shortcut." msgstr "" -"'n Eie gesiggie vir die gekose kortpad bestaan reeds. Gee asseblief 'n ander " -"kortpad." +"'n Eie gesiggie vir '%s' bestaan reeds. Gee asseblief 'n ander kortpad." msgid "Custom Smiley" msgstr "Eie gesiggie" @@ -13057,28 +12953,24 @@ msgid "Add Smiley" msgstr "Voeg gesiggie by" -#, fuzzy msgid "_Image:" -msgstr "_Prent" +msgstr "_Prent:" #. Shortcut text -#, fuzzy msgid "S_hortcut text:" -msgstr "Kortpad" +msgstr "_Kortpadteks:" msgid "Smiley" msgstr "Gesiggie" -#, fuzzy msgid "Shortcut Text" -msgstr "Kortpad" +msgstr "Kortpadteks" msgid "Custom Smiley Manager" msgstr "Bestuurder van eie gesiggies" -#, fuzzy msgid "Select Buddy Icon" -msgstr "Kies vriend" +msgstr "Kies vriendikoon" msgid "Click to change your buddyicon for this account." msgstr "Klik hier om die vriend_ikoon vir hierdie rekening te verander." @@ -13164,13 +13056,12 @@ msgid "Cannot send launcher" msgstr "Kan nie laaier stuur nie" -#, fuzzy msgid "" "You dragged a desktop launcher. Most likely you wanted to send the target of " "this launcher instead of this launcher itself." msgstr "" -"U het 'n werkskermlaaier gesleep. U wou waarskynlik dit stuur waarna die " -"laaier wys, in plaas van die laaier sélf." +"U het 'n werkskermlaaier gesleep. U wou waarskynlik die teiken van die " +"laaier stuur in plaas van die laaier sélf." #, c-format msgid "" @@ -13202,9 +13093,8 @@ msgstr "" "Kon nie prent '%s' laai nie: rede onbekend, waarskynlik 'n korrupte prentlêer" -#, fuzzy msgid "_Open Link" -msgstr "_Open skakel in:" +msgstr "_Open skakel" msgid "_Copy Link Location" msgstr "_Kopieer skakelligging" @@ -13212,9 +13102,21 @@ msgid "_Copy Email Address" msgstr "_Kopieer e-posadres" +msgid "_Open File" +msgstr "_Open lêer" + +msgid "Open _Containing Directory" +msgstr "Open houer_gids" + msgid "Save File" msgstr "Stoor lêer" +msgid "_Play Sound" +msgstr "S_peel 'n klank" + +msgid "_Save File" +msgstr "_Stoor lêer" + msgid "Select color" msgstr "Kies kleur" @@ -13239,6 +13141,9 @@ msgid "_Open Mail" msgstr "_Open pos" +msgid "_Pause" +msgstr "_Pouseer" + msgid "_Edit" msgstr "_Wysig" @@ -13306,29 +13211,23 @@ msgid "Server name request" msgstr "Bedieneradres" -#, fuzzy msgid "Enter an XMPP Server" -msgstr "Tik 'n konferensiebediener" - -#, fuzzy +msgstr "Gee 'n XMPP-bediener" + msgid "Select an XMPP server to query" -msgstr "Kies 'n konferensiebediener om te vra" - -#, fuzzy +msgstr "Kies 'n XMPP-bediener om te vra" + msgid "Find Services" -msgstr "Aanlyndienste" - -#, fuzzy +msgstr "Vind dienste" + msgid "Add to Buddy List" -msgstr "Stuur vriendelys" - -#, fuzzy +msgstr "Voeg by vriendelys" + msgid "Gateway" -msgstr "Weggaan" - -#, fuzzy +msgstr "Deurgang" + msgid "Directory" -msgstr "Staaflêergids" +msgstr "Gids" #, fuzzy msgid "PubSub Collection" @@ -13338,35 +13237,31 @@ msgid "PubSub Leaf" msgstr "PubSub-diens" -#, fuzzy msgid "" "\n" "Description: " -msgstr "Beskrywing" +msgstr "" +"\n" +"Beskrywing: " #. Create the window. -#, fuzzy msgid "Service Discovery" -msgstr "Diensbespeuring-inligting" - -#, fuzzy +msgstr "Diensbespeuring" + msgid "_Browse" -msgstr "_Blaaier:" - -#, fuzzy +msgstr "_Blaai" + msgid "Server does not exist" -msgstr "Gebruiker bestaan nie" - -#, fuzzy +msgstr "Bediener bestaan nie" + msgid "Server does not support service discovery" -msgstr "Bediener ondersteun nie blokkering nie" - -#, fuzzy +msgstr "Bediener ondersteun nie diensbespeuring nie" + msgid "XMPP Service Discovery" -msgstr "Diensbespeuring-inligting" +msgstr "XMPP-diensbespeuring" msgid "Allows browsing and registering services." -msgstr "" +msgstr "Laat die blaai en registrasie van dienste toe." #, fuzzy msgid "" @@ -13761,7 +13656,6 @@ msgstr "Musiekboodskap-inprop vir saamwerk-komponering." #. * summary -#, fuzzy msgid "" "The Music Messaging Plugin allows a number of users to simultaneously work " "on a piece of music by editing a common score in real-time." @@ -13886,7 +13780,6 @@ msgid "Highlighted Message Name Color" msgstr "Kleur van gemerkte boodskapnaam" -#, fuzzy msgid "Typing Notification Color" msgstr "Kleur van tikkennisgewing" @@ -13919,23 +13812,20 @@ msgid "GTK+ Text Shortcut Theme" msgstr "GTK+-tekskortpadtema" -#, fuzzy msgid "Disable Typing Notification Text" -msgstr "Aktiveer tikkennisgewings" - -#, fuzzy +msgstr "Deaktiveer tikkennisgewingsteks" + msgid "GTK+ Theme Control Settings" -msgstr "Pidgin GTK+-temabeheer" - -#, fuzzy +msgstr "Instellings vir GTK+-temabeheer" + msgid "Colors" -msgstr "Sluit" +msgstr "Kleure" msgid "Fonts" msgstr "Fonte" msgid "Miscellaneous" -msgstr "" +msgstr "Allerlei" msgid "Gtkrc File Tools" msgstr "Gtkrc-lêernutsgoed" @@ -14019,7 +13909,6 @@ msgstr "Knoppie om gesprekvenster te stuur." #. *< summary -#, fuzzy msgid "" "Adds a Send button to the entry area of the conversation window. Intended " "for use when no physical keyboard is present." @@ -14079,35 +13968,34 @@ msgstr "" "Vervang teks in uitgaande boodskappe volgens gebruikergespesifiseerde reëls." -#, fuzzy msgid "Just logged in" -msgstr "Nie aangemeld nie" - -#, fuzzy +msgstr "Pas aangemeld" + msgid "Just logged out" -msgstr "Nie aangemeld nie" +msgstr "Pas afgemeld" msgid "" "Icon for Contact/\n" "Icon for Unknown person" msgstr "" -#, fuzzy msgid "Icon for Chat" -msgstr "Sluit by geselsie aan" - -#, fuzzy +msgstr "Ikoon vir geselsie" + msgid "Ignored" -msgstr "Ignoreer" +msgstr "Geïgnoreer" #, fuzzy msgid "Founder" msgstr "Harder" +#. A user in a chat room who has special privileges. #, fuzzy msgid "Operator" msgstr "Opera" +#. A half operator is someone who has a subset of the privileges +#. that an operator has. msgid "Half Operator" msgstr "" @@ -14166,7 +14054,7 @@ msgstr "Vriendelys" msgid "Edit Icon Theme" -msgstr "" +msgstr "Wysig ikoontema" #. *< type #. *< ui_requirement @@ -14175,16 +14063,14 @@ #. *< priority #. *< id #. * description -#, fuzzy msgid "Pidgin Theme Editor" -msgstr "Pidgin GTK+-temabeheer" +msgstr "Pidgin se temaredigeerder" #. *< name #. *< version #. * summary -#, fuzzy msgid "Pidgin Theme Editor." -msgstr "Pidgin GTK+-temabeheer" +msgstr "Pidgin se temaredigeerder." #. *< type #. *< ui_requirement @@ -14353,7 +14239,6 @@ msgid "Options specific to Pidgin for Windows." msgstr "Opsies spesifiek aan Pidgin vir Windows." -#, fuzzy msgid "" "Provides options specific to Pidgin for Windows, such as buddy list docking." msgstr "" @@ -14396,6 +14281,25 @@ msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout." +#~ msgid "Unable to not load SILC key pair" +#~ msgstr "Kan nie SILC-sleutelpaar laai nie" + +#~ msgid "" +#~ "%s declined your conference invitation to room \"%s\" because \"%s\"." +#~ msgstr "" +#~ "%s het u konferensie-uitnodiging na kamer \"%s\" van die hand gewys omdat " +#~ "\"%s\"." + +#~ msgid "Invitation Rejected" +#~ msgstr "Uitnodiging geweier" + +#~ msgid "_Resume" +#~ msgstr "_Hervat" + +#, fuzzy +#~ msgid "_Proxy" +#~ msgstr "Instaanbediener" + #~ msgid "Cannot open socket" #~ msgstr "Kan nie sok open nie" diff -r 67143ecbddb1 -r 0907b0c775bb po/ca@valencia.po --- a/po/ca@valencia.po Mon Jul 27 03:14:08 2009 +0000 +++ b/po/ca@valencia.po Fri Jul 31 19:20:06 2009 +0000 @@ -1,9 +1,9 @@ -# Pidgin Valencian (southern Catalan) translation +# Pidgin Catalan (Valencian) translation # Copyright (C) 2003, JM Pérez Cáncer # Copyright (C) unknown, Robert Millan # Copyright (C) December 2003 (from 2003-12-12 until 2003-12-18), # January (2004-01-07,12), Xan -# Copyright (c) 2004, 2005, 2006, 2007, 2008 +# Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 # Josep Puigdemont i Casamajó # # This file is distributed under the same license as the Pidgin package. @@ -25,16 +25,16 @@ # preferència en cas de contradicció amb el recull de Softcatalà): # http://www.termcat.net/cercaterm/ # -# NOTE: adjectives in valencian (southern catalan) go [almost] always to the end, for instance: -# NOTA: els adjectius en valencià (català meridional) acostumen a anar al final, per exemple: +# NOTE: adjectives in catalan go [almost] always to the end, for instance: +# NOTA: els adjectius en català acostumen a anar al final, per exemple: # "New file" --> "Fitxer nou" # msgid "" msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-06 15:04-0700\n" -"PO-Revision-Date: 2009-01-05 20:36+0100\n" +"POT-Creation-Date: 2009-07-28 09:57-0400\n" +"PO-Revision-Date: 2009-07-26 17:23+0200\n" "Last-Translator: Josep Puigdemont i Casamajó \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgid "%s. Try `%s -h' for more information.\n" msgstr "%s. Proveu «%s -h» per a més informació.\n" -#, fuzzy, c-format +#, c-format msgid "" "%s\n" "Usage: %s [OPTION]...\n" @@ -66,7 +66,8 @@ "Forma d'ús: %s [OPCIÓ]...\n" "\n" " -c, --config=DIR utilitza DIR per als fitxers de configuració\n" -" -d, --debug mostra missatges de depuració a la eixida estàndard\n" +" -d, --debug mostra missatges de depuració a la eixida d'error\n" +" estàndard \n" " -h, --help mostra esta ajuda i ix\n" " -n, --nologin no entra automàticament\n" " -v, --version mostra la versió actual i ix\n" @@ -100,7 +101,7 @@ msgstr "No hi ha connectors de protocol instal·lats." msgid "(You probably forgot to 'make install'.)" -msgstr "(Segurament us heu oblidat de fer un «make install».)" +msgstr "(Segurament vos heu oblidat de fer un «make install».)" msgid "Modify Account" msgstr "Modifica el compte" @@ -139,11 +140,11 @@ msgstr "Esteu segur que voleu suprimir %s?" msgid "Delete Account" -msgstr "Suprimix el compte" +msgstr "Suprimeix el compte" #. Delete button msgid "Delete" -msgstr "Suprimix" +msgstr "Suprimeix" msgid "Accounts" msgstr "Comptes" @@ -288,7 +289,7 @@ msgstr "S'està recuperant..." msgid "Get Info" -msgstr "Aconseguix informació" +msgstr "Aconsegueix informació" msgid "Add Buddy Pounce" msgstr "Afig un avís per a l'amic" @@ -310,7 +311,7 @@ msgstr "Reanomena" msgid "Set Alias" -msgstr "Establix un àlies" +msgstr "Estableix un àlies" msgid "Enter empty string to reset the name." msgstr "Introduïu una cadena buida per a reinicialitzar el nom." @@ -320,7 +321,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?" @@ -331,7 +333,7 @@ msgstr "Confirmeu que voleu suprimir" msgid "Remove" -msgstr "Suprimix" +msgstr "Suprimeix" #. Buddy List msgid "Buddy List" @@ -453,7 +455,7 @@ msgstr "Alfabèticament" msgid "By Log Size" -msgstr "Per la grandària del registre" +msgstr "Per la mida del registre" msgid "Buddy" msgstr "Amic" @@ -582,11 +584,12 @@ "compte entrareu de nou automàticament al xat." msgid "No such command." -msgstr "No existix l'orde." +msgstr "No existeix l'orde." 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." @@ -671,7 +674,7 @@ msgstr "Les opcions de depuració disponibles són: version" msgid "No such command (in this context)." -msgstr "L'orde no existix (en este context)." +msgstr "L'orde no existeix (en este context)." msgid "" "Use \"/help <command>\" for help on a specific command.\n" @@ -698,7 +701,7 @@ "say <message>: Send a message normally as if you weren't using a " "command." msgstr "" -"say <missatge>: envia un missatge normalment com si no féssiu servir " +"say <missatge>: envia un missatge normalment com si no féreu servir " "cap orde." msgid "me <action>: Send an IRC style action to a buddy or chat." @@ -745,12 +748,12 @@ "background>: black, red, green, blue, white, gray, darkgray, magenta, " "cyan, default

EXAMPLE:
msgcolor send cyan default" msgstr "" -"msgcolor <classe> <primer pla> <fons>: establix el color " +"msgcolor <classe> <primer pla> <fons>: estableix el color " "de les diferents classes de missatge en les finestres de conversa.
" "<classe>: receive (rep), send (envia), highlight (ressalta), action " "(acció), timestamp (marca de temps)
<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)" "

EXEMPLE:
msgcolor send cyan default" msgid "Unable to open file." @@ -789,7 +792,7 @@ msgstr "Nom del fitxer" msgid "Size" -msgstr "Grandària" +msgstr "Mida" msgid "Speed" msgstr "Velocitat" @@ -879,7 +882,7 @@ msgstr "No s'ha trobat cap registre" msgid "Total log size:" -msgstr "Grandària total del registre:" +msgstr "Mida total del registre:" #. Search box ********* msgid "Scroll/Search: " @@ -899,12 +902,11 @@ msgid "System Log" msgstr "Registre del sistema" -#, fuzzy msgid "Calling ... " -msgstr "S'està calculant..." +msgstr "S'està trucant..." msgid "Hangup" -msgstr "" +msgstr "Penja" #. Number of actions msgid "Accept" @@ -914,25 +916,26 @@ msgstr "Rebutja" msgid "Call in progress." -msgstr "" +msgstr "S'està fent una trucada." msgid "The call has been terminated." -msgstr "" +msgstr "Ha finalitzat la trucada." #, c-format msgid "%s wishes to start an audio session with you." -msgstr "" +msgstr "%s vol iniciar una sessió d'àudio." #, c-format msgid "%s is trying to start an unsupported media session type with you." msgstr "" - -#, fuzzy +"%s està intentant iniciar una sessió amb medi d'un tipus que no està " +"implementat." + msgid "You have rejected the call." -msgstr "Heu eixit del canal%s%s" +msgstr "Heu rebutjat la trucada." msgid "call: Make an audio call." -msgstr "" +msgstr "call: fa una trucada d'àudio." msgid "Emails" msgstr "Correus electrònics" @@ -1111,7 +1114,7 @@ msgstr "Executa una orde" msgid "Play a sound" -msgstr "Reproduix un so" +msgstr "Reprodueix un so" msgid "Pounce only when my status is not Available" msgstr "Avisa només quan el meu estat no siga Disponible" @@ -1137,11 +1140,11 @@ #, c-format msgid "%s has started typing to you (%s)" -msgstr "%s us ha començat a escriure (%s)" +msgstr "%s vos ha començat a escriure (%s)" #, c-format msgid "%s has paused while typing to you (%s)" -msgstr "%s s'ha aturat mentre us escrivia (%s)" +msgstr "%s s'ha aturat mentre vos escrivia (%s)" #, c-format msgid "%s has signed on (%s)" @@ -1157,7 +1160,7 @@ #, c-format msgid "%s has stopped typing to you (%s)" -msgstr "%s ha deixat d'escriure-us (%s)" +msgstr "%s ha deixat d'escriure-vos (%s)" #, c-format msgid "%s has signed off (%s)" @@ -1173,7 +1176,7 @@ #, c-format msgid "%s has sent you a message. (%s)" -msgstr "%s us ha enviat un missatge. (%s)" +msgstr "%s vos ha enviat un missatge. (%s)" msgid "Unknown pounce event. Please report this!" msgstr "Esdeveniment d'avís desconegut, informeu-nos-en." @@ -1473,7 +1476,7 @@ #, c-format msgid "%s sent you a message" -msgstr "%s us ha enviat un missatge" +msgstr "%s vos ha enviat un missatge" #, c-format msgid "%s said your nick in %s" @@ -1481,10 +1484,10 @@ #, c-format msgid "%s sent a message in %s" -msgstr "%s us ha enviat un missatge a %s" +msgstr "%s vos ha enviat un missatge a %s" msgid "Buddy signs on/off" -msgstr "Un amic es connecte/desconnecti" +msgstr "Un amic es connecte/desconnecte" msgid "You receive an IM" msgstr "Rebeu un MI" @@ -1503,7 +1506,7 @@ # FIXME msgid "Set URGENT for the terminal window." -msgstr "Establix URGENT per a la finestra del terminal." +msgstr "Estableix URGENT per a la finestra del terminal." msgid "GntGf" msgstr "GntGf" @@ -1516,7 +1519,7 @@ msgstr "Converses amb %s a %s:
" msgid "History Plugin Requires Logging" -msgstr "El connector per a l'historial requerix que s'habiliti el registre" +msgstr "El connector per a l'historial requereix que s'habiliti el registre" msgid "" "Logging can be enabled from Tools -> Preferences -> Logging.\n" @@ -1591,22 +1594,24 @@ "\n" "Fetching TinyURL..." msgstr "" +"\n" +"S'està aconseguint un TinyURL..." msgid "Only create TinyURL for urls of this length or greater" -msgstr "" +msgstr "Crea TinyURL per a URL així de llargues o més" msgid "TinyURL (or other) address prefix" -msgstr "" - -#, fuzzy +msgstr "Prefix de l'adreça TinyURL (o altra)" + msgid "TinyURL" -msgstr "URL de la melodia" +msgstr "TinyURL" msgid "TinyURL plugin" -msgstr "" +msgstr "Connector TinyURL" msgid "When receiving a message with URL(s), TinyURL for easier copying" msgstr "" +"Quan rebeu missagtes amb URL, feu servir TinyURL per a copiar més fàcilment" msgid "accounts" msgstr "comptes" @@ -1658,7 +1663,7 @@ msgstr "Canvia la informació d'usuari de %s" msgid "Set User Info" -msgstr "Establix les dades d'usuari" +msgstr "Estableix les dades d'usuari" msgid "Unknown" msgstr "Desconegut" @@ -1721,6 +1726,7 @@ msgstr "" "No es pot comprovar el certificat que presenta «%s» atès que està auto-signat." +#. FIXME 2.6.1 #, c-format msgid "The certificate chain presented for %s is not valid." msgstr "La cadena de certificació que presenta %s no és vàlida." @@ -1731,6 +1737,7 @@ #. stifle it. #. TODO: Probably wrong. #. TODO: Probably wrong +#. TODO: Probably wrong. msgid "SSL Certificate Error" msgstr "Error en el certificat SSL" @@ -1757,8 +1764,8 @@ "signature." msgstr "" "El certificat %s afirma tindre una signatura d'una entitat certificadora, " -"però la cadena de certificació no conté cap signatura digital vàlida d'esta " -"entitat." +"però la cadena de certificació no conté cap signatura digital vàlida " +"d'esta entitat." msgid "Invalid certificate authority signature" msgstr "La signatura de l'entitat certificadora no és vàlida" @@ -1772,8 +1779,8 @@ "The certificate presented by \"%s\" claims to be from \"%s\" instead. This " "could mean that you are not connecting to the service you believe you are." msgstr "" -"El certificat de «%s» sembla indicar que és de «%s». Això podria voler dir que " -"us esteu connectant a un servici diferent del que us penseu." +"El certificat de «%s» pareix indicar que és de «%s». Això podria voler dir que " +"vos esteu connectant a un servei diferent del que vos penseu." #. Make messages #, c-format @@ -1812,7 +1819,6 @@ msgstr "+++ %s se n'ha anat" #. Unknown error -#. Unknown error! msgid "Unknown error" msgstr "Error desconegut" @@ -1845,7 +1851,7 @@ #, c-format msgid "You are now known as %s" -msgstr "Ara us feu dir %s" +msgstr "Ara vos feu dir %s" #, c-format msgid "%s is now known as %s" @@ -1859,9 +1865,8 @@ msgid "%s left the room (%s)." msgstr "%s ha eixit de la sala (%s)." -#, fuzzy msgid "Invite to chat" -msgstr "Convida a la conferència" +msgstr "Convida al xat" #. Put our happy label in it. msgid "" @@ -1968,11 +1973,11 @@ #, c-format msgid "%s wants to send you %s (%s)" -msgstr "%s us vol enviar %s (%s)" +msgstr "%s vos vol enviar %s (%s)" #, c-format msgid "%s wants to send you a file" -msgstr "%s us vol enviar un fitxer" +msgstr "%s vos vol enviar un fitxer" #, c-format msgid "Accept file transfer request from %s?" @@ -1990,7 +1995,7 @@ #, c-format msgid "%s is offering to send file %s" -msgstr "%s us oferix enviar el fitxer %s" +msgstr "%s vos ofereix enviar el fitxer %s" #, c-format msgid "%s is not a valid filename.\n" @@ -2005,6 +2010,11 @@ msgstr "S'està iniciant la transferència de %s de %s?" #, c-format +msgid "Transfer of file %s complete" +msgstr "" +"S'ha completat la transferència del fitxer %s" + +#, c-format msgid "Transfer of file %s complete" msgstr "S'ha completat la transferència del fitxer %s" @@ -2137,7 +2147,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»" @@ -2210,20 +2221,19 @@ msgid "(%s) %s : %s\n" msgstr "(%s) %s : %s\n" -#, fuzzy msgid "Error creating conference." -msgstr "S'ha produït un error en crear la connexió" +msgstr "S'ha produït un error en crear la conferència." #, c-format msgid "You are using %s, but this plugin requires %s." -msgstr "Esteu emprant %s, però este connector requerix %s." +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." #, c-format msgid "Plugin magic mismatch %d (need %d)" -msgstr "La versió %d del connector no coincidix (cal %d)" +msgstr "La versió %d del connector no coincideix (cal %d)" #, c-format msgid "ABI version mismatch %d.%d.x (need %d.%d.x)" @@ -2255,7 +2265,7 @@ #, c-format msgid "%s requires %s, but it failed to unload." -msgstr "%s requerix %s, però no s'ha pogut carregar." +msgstr "%s requereix %s, però no s'ha pogut carregar." msgid "Autoaccept" msgstr "Accepta automàticament" @@ -2279,7 +2289,7 @@ msgstr "Quan arribe una sol·licitud de transferència d'un fitxer de %s" msgid "Set Autoaccept Setting" -msgstr "Establix el paràmetre d'acceptació automàtica" +msgstr "Estableix el paràmetre d'acceptació automàtica" msgid "_Save" msgstr "De_sa" @@ -2397,7 +2407,7 @@ #. * summary #. * description msgid "Allows control by entering commands in a file." -msgstr "Us permet controlar introduint ordes en un fitxer." +msgstr "Vos permet controlar introduint ordes en un fitxer." msgid "Minutes" msgstr "Minuts" @@ -2418,20 +2428,20 @@ # FIXME msgid "Unset Account Idle Time" -msgstr "Desestablix el temps d'inactivitat del compte" +msgstr "Desestableix el temps d'inactivitat del compte" # FIXME msgid "_Unset" -msgstr "_Desestablix" +msgstr "_Desestableix" msgid "Set Idle Time for All Accounts" -msgstr "Establix el temps d'inactivitat de tots els comptes" +msgstr "Estableix el temps d'inactivitat de tots els comptes" msgid "Unset Idle Time for All Idled Accounts" -msgstr "Desestablix el temps d'inactivitat de tots els comptes inactius" +msgstr "Desestableix el temps d'inactivitat de tots els comptes inactius" msgid "Allows you to hand-configure how long you've been idle" -msgstr "Us permet configurar a mà durant quant de temps heu estat inactiu" +msgstr "Vos permet configurar a mà durant quant de temps heu estat inactiu" #. *< type #. *< ui_requirement @@ -2479,7 +2489,7 @@ msgstr "Configuració de l'ocultació de les entrades i eixides" msgid "Minimum Room Size" -msgstr "Grandària mínima de la sala" +msgstr "Mida mínima de la sala" msgid "User Inactivity Timeout (in minutes)" msgstr "Temps d'espera d'inactivitat del usuaris (en minuts)" @@ -2536,11 +2546,10 @@ msgid "" "You are currently disconnected. Messages will not be received unless you are " "logged in." -msgstr "Esteu desconnectat. No rebreu missatges a no ser que us connecteu." +msgstr "Esteu desconnectat. No rebreu missatges a no ser que vos connecteu." msgid "Message could not be sent because the maximum length was exceeded." -msgstr "" -"El missatge no s'ha pogut enviar perquè s'ha superat la grandària màxima." +msgstr "El missatge no s'ha pogut enviar perquè s'ha superat la mida màxima." msgid "Message could not be sent." msgstr "No s'ha pogut enviar el missatge." @@ -2592,7 +2601,7 @@ msgstr "Configuració general de la lectura de registres" msgid "Fast size calculations" -msgstr "Càlculs de grandària ràpids" +msgstr "Càlculs de mida ràpids" msgid "Use name heuristics" msgstr "Utilitza heurístiques de noms" @@ -2618,7 +2627,6 @@ "Inclou registres d'altres clients de MI en el visualitzador de registres." #. * description -#, fuzzy msgid "" "When viewing logs, this plugin will include logs from other IM clients. " "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n" @@ -2628,7 +2636,7 @@ msgstr "" "Quan es visualitzin els registres, este connector inclourà registres " "d'altres clients de MI. De moment, es poden incloure els d'Adium, MSN " -"Messenger, i Trillian.\n" +"Messenger, aMSN, i Trillian.\n" "\n" "Avís: este connector encara està en desenvolupament i pot ser que es pengi." @@ -2666,8 +2674,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" @@ -2676,7 +2684,6 @@ msgstr "" "Alça els missatges que s'hagen enviat a un usuari fora de línia com a avís" -#, fuzzy msgid "" "The rest of the messages will be saved as pounces. You can edit/delete the " "pounce from the `Buddy Pounce' dialog." @@ -2710,10 +2717,10 @@ msgid "Do not ask. Always save in pounce." msgstr "No ho demanes, alça-ho sempre en un avís." -#, fuzzy msgid "One Time Password" -msgstr "Introduïu la contrasenya" - +msgstr "Contrasenya d'un sol ús" + +# FIXME ? #. *< type #. *< ui_requirement #. *< flags @@ -2721,13 +2728,13 @@ #. *< priority #. *< id msgid "One Time Password Support" -msgstr "" +msgstr "Contrasenyes d'un sol ús" #. *< name #. *< version #. * summary msgid "Enforce that passwords are used only once." -msgstr "" +msgstr "Força que les contrasenyes només s'emprin una vegada." #. * description msgid "" @@ -2735,6 +2742,10 @@ "are only used in a single successful connection.\n" "Note: The account password must not be saved for this to work." 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." #. *< type #. *< ui_requirement @@ -2761,7 +2772,7 @@ "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 us comencen a " +"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..." @@ -2894,7 +2905,7 @@ msgstr "Un amic passe a _inactiu" msgid "Buddy _Signs On/Off" -msgstr "Un amic e_s connecte/desconnecti" +msgstr "Un amic e_s connecte/desconnecte" #. *< type #. *< ui_requirement @@ -2927,18 +2938,17 @@ "No s'ha pogut detectar la instal·lació d'ActiveTCL. Si voleu emprar " "connectors TCL, instal·leu l'ActiveTCL de http://www.activestate.com\n" -#, fuzzy msgid "" "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin." "im/BonjourWindows for more information." msgstr "" -"No s'ha pogut trobar el joc d'eines per a Windows de l'Apple Bonjour, " -"consulteu les preguntes més freqüents a http://developer.pidgin.im/" -"BonjourWindows per a més informació." - -#, fuzzy +"No s'ha pogut trobar el joc d'eines «Bonjour per a Windows» d'Apple, " +"consulteu les preguntes més freqüents a http://d.pidgin.im/BonjourWindows " +"per a més informació." + +# FIXME msgid "Unable to listen for incoming IM connections" -msgstr "No es poden escoltar connexions entrants de MI\n" +msgstr "No s'ha pogut escoltar connexions entrants de MI" msgid "" "Unable to establish connection with the local mDNS server. Is it running?" @@ -2979,9 +2989,8 @@ msgstr "Persona porpra" #. Creating the options for the protocol -#, fuzzy msgid "Local Port" -msgstr "Ubicació" +msgstr "Port local" msgid "Bonjour" msgstr "Bonjour" @@ -2993,21 +3002,17 @@ msgid "Unable to send the message, the conversation couldn't be started." msgstr "No s'ha pogut enviar el missatge, no s'ha pogut iniciar la conversa." -#, fuzzy, c-format +#, c-format msgid "Unable to create socket: %s" -msgstr "" -"No s'ha pogut crear el sòcol:\n" -"%s" - -#, fuzzy, c-format +msgstr "No s'ha pogut crear el sòcol: %s" + +#, c-format msgid "Unable to bind socket to port: %s" -msgstr "No s'ha pogut vincular el sòcol al port" - -#, fuzzy, c-format +msgstr "No s'ha pogut vincular el sòcol al port: %s" + +#, c-format msgid "Unable to listen on socket: %s" -msgstr "" -"No s'ha pogut crear el sòcol:\n" -"%s" +msgstr "No s'ha pogut crear el sòcol: %s" msgid "Error communicating with local mDNSResponder." msgstr "" @@ -3057,17 +3062,14 @@ msgid "Load buddylist from file..." msgstr "Carrega la llista d'amics d'un fitxer..." -#, fuzzy msgid "You must fill in all registration fields" -msgstr "Empleneu els camps de registre." - -#, fuzzy +msgstr "Heu d'emplenar tots els camps de registre" + msgid "Passwords do not match" -msgstr "Les contrasenyes no coincideixen." - -#, fuzzy +msgstr "Les contrasenyes no coincideixen" + msgid "Unable to register new account. An unknown error occurred." -msgstr "No s'ha pogut registrar el nou compte. S'ha produït un error.\n" +msgstr "No s'ha pogut registrar el nou compte. S'ha produït un error." msgid "New Gadu-Gadu Account Registered" msgstr "S'ha registrat el nou compte Gadu-Gadu" @@ -3082,11 +3084,10 @@ msgstr "Contrasenya (repetiu-la)" msgid "Enter captcha text" -msgstr "" - -#, fuzzy +msgstr "Introduïu el text captcha" + msgid "Captcha" -msgstr "Imatge captcha" +msgstr "Captcha" msgid "Register New Gadu-Gadu Account" msgstr "Registra un compte Gadu-Gadu nou" @@ -3225,9 +3226,9 @@ msgid "Chat _name:" msgstr "_Nom del xat:" -#, fuzzy, c-format +#, c-format msgid "Unable to resolve hostname '%s': %s" -msgstr "No s'ha pogut resoldre el nom de l'ordinador." +msgstr "No s'ha pogut resoldre el nom «%s»: %s" #. 1. connect to server #. connect to the server @@ -3238,11 +3239,10 @@ msgstr "Error en el xat" msgid "This chat name is already in use" -msgstr "Este nom de xat ja existix" - -#, fuzzy +msgstr "Este nom de xat ja existeix" + msgid "Not connected to the server" -msgstr "No esteu connectat al servidor." +msgstr "No esteu connectat al servidor" msgid "Find buddies..." msgstr "Cerca amics..." @@ -3257,7 +3257,7 @@ msgstr "Baixa la llista d'amics del servidor" msgid "Delete buddylist from Server" -msgstr "Suprimix la llista d'amics del servidor" +msgstr "Suprimeix la llista d'amics del servidor" msgid "Save buddylist to file..." msgstr "Alça la llista d'amics a un fitxer..." @@ -3283,9 +3283,8 @@ msgid "Gadu-Gadu User" msgstr "Usuari Gadu-Gadu" -#, fuzzy msgid "GG server" -msgstr "S'està obtenint el servidor" +msgstr "Servidor GG" #, c-format msgid "Unknown command: %s" @@ -3301,7 +3300,6 @@ msgid "File Transfer Failed" msgstr "Ha fallat la transferència del fitxer" -#, fuzzy msgid "Unable to open a listening port." msgstr "No s'ha pogut obrir cap port on escoltar." @@ -3325,11 +3323,9 @@ #. #. TODO: what to do here - do we really have to disconnect? #. TODO: do we really want to disconnect on a failure to write? -#, fuzzy, c-format +#, c-format msgid "Lost connection with server: %s" -msgstr "" -"S'ha perdut la connexió amb el servidor:\n" -"%s" +msgstr "S'ha perdut la connexió amb el servidor: %s" msgid "View MOTD" msgstr "Mostra la frase del dia" @@ -3340,9 +3336,9 @@ msgid "_Password:" msgstr "_Contrasenya:" -#, fuzzy msgid "IRC nick and server may not contain whitespace" -msgstr "Els sobrenoms d'IRC no poden contindre espais en blanc" +msgstr "" +"Els sobrenoms i els noms de servidor d'IRC no poden contindre espais en blanc" msgid "SSL support unavailable" msgstr "El suport per a SSL no està disponible" @@ -3351,13 +3347,13 @@ msgstr "No s'ha pogut connectar" #. this is a regular connect, error out -#, fuzzy, c-format +#, c-format msgid "Unable to connect: %s" -msgstr "No s'ha pogut connectar a %s" - -#, fuzzy, c-format +msgstr "No s'ha pogut connectar: %s" + +#, c-format msgid "Server closed the connection" -msgstr "El servidor ha tancat la connexió." +msgstr "El servidor ha tancat la connexió" msgid "Users" msgstr "Usuaris" @@ -3420,7 +3416,7 @@ #, c-format msgid "You are banned from %s." -msgstr "Us han bandejat de %s" +msgstr "Vos han bandejat de %s" msgid "Banned" msgstr "Bandejat" @@ -3486,11 +3482,11 @@ msgstr "L'hora local del servidor d'IRC és:" msgid "No such channel" -msgstr "Este canal no existix" +msgstr "Este canal no existeix" #. does this happen? msgid "no such channel" -msgstr "este canal no existix" +msgstr "este canal no existeix" msgid "User is not logged in" msgstr "L'usuari no està connectat" @@ -3510,12 +3506,12 @@ #, c-format msgid "You have been kicked by %s: (%s)" -msgstr "%s us ha fet fora: (%s)" +msgstr "%s vos ha fet fora: (%s)" #. Remove user from channel #, c-format msgid "Kicked by %s (%s)" -msgstr "%s us ha fet fora (%s)" +msgstr "%s vos ha fet fora (%s)" #, c-format msgid "mode (%s %s) by %s" @@ -3541,13 +3537,12 @@ #. We only want to do the following dance if the connection #. has not been successfully completed. If it has, just #. notify the user that their /nick command didn't go. -#, fuzzy, c-format +#, c-format msgid "The nickname \"%s\" is already being used." -msgstr "Este nom de xat ja existix" - -#, fuzzy +msgstr "Ja hi ha algú amb el sobrenom «%s»." + msgid "Nickname in use" -msgstr "Sobrenom: %s\n" +msgstr "El sobrenom ja s'està fent servir" msgid "Cannot change nick" msgstr "No es pot canviar el sobrenom" @@ -3609,8 +3604,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 " @@ -3657,7 +3652,7 @@ "mode <+|-><A-Za-z> <nick|channel>: Set or unset a channel " "or user mode." msgstr "" -"mode <+|-><A-Za-z> <sobrenom|canal>: establix o no el " +"mode <+|-><A-Za-z> <sobrenom|canal>: estableix o no el " "mode del canal o d'usuari." msgid "" @@ -3727,7 +3722,7 @@ "remove <nick> [message]: Remove someone from a room. You must be a " "channel operator to do this." msgstr "" -"remove <sobrenom> [missatge]: suprimix algú de la sala. Heu de ser " +"remove <sobrenom> [missatge]: suprimeix algú de la sala. Heu de ser " "operador del canal per poder fer això." msgid "time: Displays the current local time at the IRC server." @@ -3786,37 +3781,34 @@ msgid "execute" msgstr "executa" -#, fuzzy msgid "Server requires TLS/SSL, but no TLS/SSL support was found." msgstr "" -"El servidor requerix TLS/SSL per entrar. No s'ha trobat suport per a TLS/SSL." - -#, fuzzy +"El servidor requereix TLS/SSL per entrar, però no s'ha trobat cap " +"implementació de TLS/SSL." + msgid "You require encryption, but no TLS/SSL support was found." msgstr "" "Heu requerit que es xifri, però no s'ha trobat cap implementació de TLS/SSL." msgid "Server requires plaintext authentication over an unencrypted stream" -msgstr "El servidor requerix autenticació de text sobre un flux no xifrat" +msgstr "El servidor requereix autenticació de text sobre un flux no xifrat" #, c-format msgid "" "%s requires plaintext authentication over an unencrypted connection. Allow " "this and continue authentication?" msgstr "" -"%s requerix autenticació de text sobre un flux no xifrat. Voleu permetre-ho " +"%s requereix autenticació de text sobre un flux no xifrat. Voleu permetre-ho " "i continuar amb l'autenticació?" msgid "Plaintext Authentication" msgstr "Autenticació de text" -#, fuzzy msgid "SASL authentication failed" -msgstr "Ha fallat l'autenticació" - -#, fuzzy +msgstr "Ha fallat l'autenticació SASL" + msgid "Invalid response from server" -msgstr "La resposta del servidor no és vàlida." +msgstr "La resposta del servidor no és vàlida" msgid "Server does not use any supported authentication method" msgstr "No hi ha cap mètode d'autenticació compatible amb este servidor" @@ -3827,36 +3819,28 @@ msgid "Invalid challenge from server" msgstr "Repte del servidor invàlid" -#, fuzzy, c-format +#, c-format msgid "SASL error: %s" -msgstr "Error en el SASL" +msgstr "Error SASL: %s" msgid "The BOSH connection manager terminated your session." -msgstr "" - -#, fuzzy +msgstr "El gestor de connexions BOSH ha tancat la connexió." + msgid "No session ID given" -msgstr "No s'ha indicat cap motiu" - -#, fuzzy +msgstr "No s'ha indicat cap ID" + msgid "Unsupported version of BOSH protocol" -msgstr "Esta versió no està implementada" - -#, fuzzy +msgstr "Esta versió del protocol BOSH no està implementada" + msgid "Unable to establish a connection with the server" -msgstr "" -"No s'ha pogut establir una connexió amb al servidor:\n" -"%s" - -#, fuzzy, c-format +msgstr "No s'ha pogut establir una connexió amb el servidor" + +#, c-format msgid "Unable to establish a connection with the server: %s" -msgstr "" -"No s'ha pogut establir una connexió amb al servidor:\n" -"%s" - -#, fuzzy +msgstr "No s'ha pogut establir una connexió amb el servidor: %s" + msgid "Unable to establish SSL connection" -msgstr "No s'ha pogut inicialitzar la connexió" +msgstr "No s'ha pogut establir una connexió SSL" msgid "Full Name" msgstr "Nom" @@ -3915,8 +3899,8 @@ "All items below are optional. Enter only the information with which you feel " "comfortable." msgstr "" -"Les dades següents són opcionals. Introduïu només la informació que us " -"sembli." +"Les dades següents són opcionals. Introduïu només la informació que vos " +"parega." msgid "Client" msgstr "Client" @@ -3924,9 +3908,8 @@ msgid "Operating System" msgstr "Sistema operatiu" -#, fuzzy msgid "Local Time" -msgstr "Fitxer local:" +msgstr "Hora local" msgid "Priority" msgstr "Prioritat" @@ -3936,11 +3919,10 @@ #, c-format msgid "%s ago" -msgstr "" - -#, fuzzy +msgstr "fa %s" + msgid "Logged Off" -msgstr "Connectat" +msgstr "Desconnectat" # Segons la viquipèdia msgid "Middle Name" @@ -3999,7 +3981,7 @@ msgstr "Cognoms" msgid "The following are the results of your search" -msgstr "El que seguix són els resultats de la vostra cerca" +msgstr "El que segueix són els resultats de la vostra cerca" #. current comment from Jabber User Directory users.jabber.org msgid "" @@ -4110,26 +4092,24 @@ msgid "Find Rooms" msgstr "Cerca sales" -#, fuzzy msgid "Affiliations:" -msgstr "Àlies:" - -#, fuzzy +msgstr "Afiliacions:" + msgid "No users found" -msgstr "No s'ha trobat cap usuari que coincidisca" - -#, fuzzy +msgstr "No s'ha trobat cap usuari" + msgid "Roles:" -msgstr "Rol" - -#, fuzzy +msgstr "Rols:" + msgid "Ping timed out" -msgstr "Temps d'espera del ping" +msgstr "S'ha esgitat el temps d'espera (ping)" msgid "" "Unable to find alternative XMPP connection methods after failing to connect " "directly." msgstr "" +"No s'ha pogut trobar cap mètode alternatiu de connexió XMPP després de no " +"haver pogut connectar directament." msgid "Invalid XMPP ID" msgstr "ID de l'XMPP invàlid" @@ -4137,9 +4117,9 @@ msgid "Invalid XMPP ID. Domain must be set." msgstr "L'ID de l'XMPP no és vàlid. Cal especificar un domini." -#, fuzzy +# FIX msgid "Malformed BOSH URL" -msgstr "No s'ha pogut connectar al servidor." +msgstr "L'URL BOSH està malmés" #, c-format msgid "Registration of %s@%s successful" @@ -4207,10 +4187,6 @@ msgid "Change Registration" msgstr "Canvia el registre" -#, fuzzy -msgid "Malformed BOSH Connect Server" -msgstr "No s'ha pogut connectar al servidor." - msgid "Error unregistering account" msgstr "S'ha produït un error en cancel·lar el registre" @@ -4230,7 +4206,7 @@ msgstr "S'està reinicialitzant el flux" msgid "Server doesn't support blocking" -msgstr "" +msgstr "El servidor no permet blocar" msgid "Not Authorized" msgstr "No autoritzat" @@ -4312,7 +4288,7 @@ msgstr "Introduïu la nova contrasenya" msgid "Set User Info..." -msgstr "Establix informació d'usuari..." +msgstr "Estableix informació d'usuari..." #. if (js->protocol_options & CHANGE_PASSWORD) { msgid "Change Password..." @@ -4345,7 +4321,7 @@ # FIX msgid "Malformed XMPP ID" -msgstr "l'ID de l'XMPP està malmés" +msgstr "L'ID de l'XMPP està malmés" msgid "Not Acceptable" msgstr "No és acceptable" @@ -4372,7 +4348,7 @@ msgstr "El servidor està sobrecarregat" msgid "Service Unavailable" -msgstr "El servici no està disponible" +msgstr "El servei no està disponible" msgid "Subscription Required" msgstr "Cal subscripció" @@ -4500,20 +4476,22 @@ msgid "Unable to ping user %s" msgstr "No s'ha pogut fer ping a l'usuari %s" -#, fuzzy, c-format +#, c-format msgid "Unable to buzz, because there is nothing known about %s." msgstr "No s'ha pogut botzinar perquè no es coneix res de l'usuari %s." -#, fuzzy, c-format +#, c-format msgid "Unable to buzz, because %s might be offline." msgstr "" "No s'ha pogut botzinar possiblement perquè l'usuari %s està desconnectat." -#, fuzzy, c-format +#, c-format msgid "" "Unable to buzz, because %s does not support it or does not wish to receive " "buzzes now." -msgstr "No s'ha pogut botzinar perquè l'usuari %s no ho permet." +msgstr "" +"No s'ha pogut botzinar l'usuari %s perquè no ho implementa, o bé ara mateix " +"no ho permet." #, c-format msgid "Buzzing %s..." @@ -4526,39 +4504,38 @@ #, c-format msgid "%s has buzzed you!" -msgstr "%s us ha botzinat!" - -#, fuzzy, c-format +msgstr "%s vos ha botzinat!" + +#, c-format msgid "Unable to initiate media with %s: invalid JID" -msgstr "No s'ha pogut enviar el fitxer a %s, el JID no és vàlid" - -#, fuzzy, c-format +msgstr "No s'ha pogut iniciar el medi amb %s: el JID no és vàlid" + +#, c-format msgid "Unable to initiate media with %s: user is not online" -msgstr "No s'ha pogut enviar el fitxer a %s, l'usuari no està connectat" - -# FIXME: uh? -#, fuzzy, c-format +msgstr "No s'ha pogut iniciar el medi amb %s: l'usuari no està connectat" + +#, c-format msgid "Unable to initiate media with %s: not subscribed to user presence" msgstr "" -"No s'ha pogut enviar el fitxer a %s, no esteu subscrit a la presència de " +"No s'ha pogut iniciar el medi amb %s: no esteu subscrit a la presència de " "l'usuari" -#, fuzzy msgid "Media Initiation Failed" -msgstr "Ha fallat el registre" - -#, fuzzy, c-format +msgstr "Ha fallat la iniciació del medi" + +# FIXME: "media session" -> "sessió amb medi"? +#, c-format msgid "" "Please select the resource of %s with which you would like to start a media " "session." -msgstr "Escolliu a quin recurs de %s voleu enviar un fitxer" +msgstr "" +"Escolliu el recurs de %s amb el qual voleu iniciar una sessió amb medi." msgid "Select a Resource" msgstr "Seleccioneu un recurs" -#, fuzzy msgid "Initiate Media" -msgstr "Inicia un _xat" +msgstr "Inicia el medi" msgid "config: Configure a chat room." msgstr "config: configura la sala de xat." @@ -4578,21 +4555,19 @@ msgid "ban <user> [reason]: Ban a user from the room." msgstr "ban <user> [motiu]: bandeja de la sala un usuari." -#, fuzzy msgid "" "affiliate <owner|admin|member|outcast|none> [nick1] [nick2] ...: Get " "the users with an affiliation or set users' affiliation with the room." msgstr "" -"affiliate <usuari> <owner|admin|member|outcast|none>: establix " -"l'afiliació de l'usuari a la sala." - -#, fuzzy +"affiliate <owner|admin|member|outcast|none> [sobrenom1] " +"[sobrenom2] ...: obtén els usuaris amb una afiliació, o els l'estableix." + msgid "" "role <moderator|participant|visitor|none> [nick1] [nick2] ...: Get the " "users with an role or set users' role with the room." msgstr "" -"role <usuari> <moderator|participant|visitor|none>: establix el " -"rol d'un usuari en una sala." +"role <usuari> <moderator|participant|visitor|none> [sobrenom1] " +"[sobrenom2] ...: obtén els usuaris amb el rol especificat, o els l'estableix." msgid "invite <user> [message]: Invite a user to the room." msgstr "invite <usuari> [sala]: convida un usuari a la sala." @@ -4613,7 +4588,7 @@ msgstr "ping <jid>:\tfa ping a un usuari/component/servidor." msgid "buzz: Buzz a user to get their attention" -msgstr "buzz: fa sonar una botzina a un usuari per tal de que us pare atenció" +msgstr "buzz: fa sonar una botzina a un usuari per tal de que vos pare atenció" #. *< type #. *< ui_requirement @@ -4633,7 +4608,7 @@ msgstr "Domini" msgid "Require SSL/TLS" -msgstr "Requerix SSL/TLS" +msgstr "Requereix SSL/TLS" msgid "Force old (port 5223) SSL" msgstr "Força l'antic port SSL (5223)" @@ -4654,7 +4629,7 @@ msgstr "Servidors intermediari per a la transferència de fitxers" msgid "BOSH URL" -msgstr "" +msgstr "URL BOSH" #. this should probably be part of global smiley theme settings later on, #. shared with MSN @@ -4718,29 +4693,25 @@ msgid "_Accept Defaults" msgstr "_Accepta els valors predeterminats" -#, fuzzy msgid "No reason" msgstr "No s'ha indicat cap motiu" -#, fuzzy, c-format +#, c-format msgid "You have been kicked: (%s)" -msgstr "%s us ha fet fora: (%s)" - -#, fuzzy, c-format +msgstr "Vos han fet fora: (%s)" + +#, c-format msgid "Kicked (%s)" -msgstr "%s us ha fet fora (%s)" - -#, fuzzy +msgstr "Vos han fet fora (%s)" + msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "S'ha produït un error en obrir el fitxer." - -#, fuzzy +msgstr "" + msgid "Transfer was closed." -msgstr "Ha fallat la transferència del fitxer" - -#, fuzzy +msgstr "La transferència s'ha tancat." + msgid "Failed to open the file" -msgstr "No s'ha pogut obrir el fitxer «%s»: %s" +msgstr "No s'ha pogut obrir el fitxer" msgid "Failed to open in-band bytestream" msgstr "" @@ -4780,13 +4751,13 @@ msgstr "Seleccioneu l'estat d'ànim de la llista." msgid "Set" -msgstr "Establix" +msgstr "Estableix" msgid "Set Mood..." -msgstr "Establix l'estat d'ànim..." +msgstr "Estableix l'estat d'ànim..." msgid "Set User Nickname" -msgstr "Establix el sobrenom de l'usuari" +msgstr "Estableix el sobrenom de l'usuari" msgid "Please specify a new nickname for you." msgstr "Introduïu el nou sobrenom." @@ -4799,7 +4770,7 @@ "d'amics, escolliu quelcom apropiat." msgid "Set Nickname..." -msgstr "Establix el sobrenom..." +msgstr "Estableix el sobrenom..." msgid "Actions" msgstr "Accions" @@ -4818,7 +4789,7 @@ msgstr "Error en afegir un amic" msgid "The username specified does not exist." -msgstr "El nom d'usuari especificat no existix." +msgstr "El nom d'usuari especificat no existeix." #, c-format msgid "Buddy list synchronization issue in %s (%s)" @@ -4853,7 +4824,7 @@ #, c-format msgid "User does not exist" -msgstr "L'usuari no existix." +msgstr "L'usuari no existeix." #, c-format msgid "Fully qualified domain name missing" @@ -4917,7 +4888,7 @@ #, c-format msgid "Tried to add a user to a group that doesn't exist" -msgstr "S'ha intentat afegir un usuari a un grup que no existix" +msgstr "S'ha intentat afegir un usuari a un grup que no existeix" #, c-format msgid "Switchboard failed" @@ -4941,7 +4912,7 @@ #, c-format msgid "Service temporarily unavailable" -msgstr "El servici està temporalment fora de servici" +msgstr "El servei està temporalment fora de servei" #, c-format msgid "Database server error" @@ -5068,18 +5039,38 @@ msgid "Non-IM Contacts" msgstr "Contactes que no són de MI" -#, fuzzy, c-format +#, c-format +msgid "%s sent a wink. Click here to play it" +msgstr "" +"%s vos ha enviat un wink. Feu clic ací per escoltar-" +"lo" + +#, c-format +msgid "%s sent a wink, but it could not be saved" +msgstr "%s vos ha envia un wink, però no s'ha pogut alçar" + +#, c-format +msgid "%s sent a voice clip. Click here to play it" +msgstr "" +"%s vos ha enviat un clip de veu. Feu clic ací per " +"escoltar-lo" + +#, c-format +msgid "%s sent a voice clip, but it could not be saved" +msgstr "%s vos han enviat un clip de música, però no s'ha pogut alçar" + +#, c-format msgid "%s sent you a voice chat invite, which is not yet supported." msgstr "" -"%s us ha enviat una invitació a la seua càmera web, però això encara no està " -"implementat." +"%s vos ha enviat una invitació per fer una conversa de veu, però això encara " +"no està implementat." msgid "Nudge" msgstr "Donar un cop de colze" #, c-format msgid "%s has nudged you!" -msgstr "%s us ha donat un cop de colze!" +msgstr "%s vos ha donat un cop de colze!" #, c-format msgid "Nudging %s..." @@ -5095,16 +5086,16 @@ msgstr "Establiu el vostre nom amistós." msgid "This is the name that other MSN buddies will see you as." -msgstr "Este és el nom amb el que els amics de l'MSN us veuran." +msgstr "Este és el nom amb el que els amics de l'MSN vos veuran." msgid "Set your home phone number." -msgstr "Establix el número de telèfon de casa." +msgstr "Estableix el número de telèfon de casa." msgid "Set your work phone number." -msgstr "Establix el número de telèfon de la faena." +msgstr "Estableix el número de telèfon de la faena." msgid "Set your mobile phone number." -msgstr "Establix el número de telèfon del mòbil." +msgstr "Estableix el número de telèfon del mòbil." msgid "Allow MSN Mobile pages?" msgstr "Voleu permetre pàgines de mòbil d'MSN?" @@ -5132,7 +5123,8 @@ #, c-format msgid "" "MSN servers are currently blocking the following regular expressions:
%s" -msgstr "Actualment, servidors MSN bloquen estes expressions regulars:
%s" +msgstr "" +"Actualment, servidors MSN bloquen estes expressions regulars:
%s" msgid "This account does not have email enabled." msgstr "Este compte no té el correu habilitat." @@ -5150,7 +5142,7 @@ msgstr "Treballant" msgid "Has you" -msgstr "Us té" +msgstr "Vos té" msgid "Home Phone Number" msgstr "Número de telèfon de casa" @@ -5192,16 +5184,16 @@ msgstr "Títol oficial" msgid "Set Friendly Name..." -msgstr "Establix el nom amistós..." +msgstr "Estableix el nom amistós..." msgid "Set Home Phone Number..." -msgstr "Establix el número de telèfon de casa..." +msgstr "Estableix el número de telèfon de casa..." msgid "Set Work Phone Number..." -msgstr "Establix el número de telèfon de la faena..." +msgstr "Estableix el número de telèfon de la faena..." msgid "Set Mobile Phone Number..." -msgstr "Establix el número del telèfon mòbil..." +msgstr "Estableix el número del telèfon mòbil..." msgid "Enable/Disable Mobile Devices..." msgstr "Habilita/inhabilita dispositius mòbils..." @@ -5224,6 +5216,29 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library." msgstr "L'MSN necessita SSL, instal·leu alguna biblioteca d'SSL permesa." +#, c-format +msgid "" +"Unable to add the buddy %s because the username is invalid. Usernames must " +"be a valid email address." +msgstr "" +"No s'ha pogut afegir l'amic %s perquè el nom d'usuari no és vàlid. Els noms " +"d'usuari han de ser adreces de correu vàlides." + +msgid "Unable to Add" +msgstr "No s'ha pogut afegir" + +msgid "Authorization Request Message:" +msgstr "Missatge de petició d'autorització:" + +msgid "Please authorize me!" +msgstr "Autoritzeu-me, per favor." + +#. * +#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. +#. +msgid "_OK" +msgstr "_D'acord" + msgid "Error retrieving profile" msgstr "S'ha produït un error en recuperar el perfil" @@ -5370,7 +5385,7 @@ "public profile." msgstr "" "L'MSN no ha pogut trobar el perfil de l'usuari. Això pot voler dir que o bé " -"l'usuari no existix, o que existix però el seu perfil no és públic." +"l'usuari no existeix, o que existeix però el seu perfil no és públic." msgid "" "Could not find any information in the user's profile. The user most likely " @@ -5404,7 +5419,7 @@ msgstr "Mostra emoticones personalitzades" msgid "nudge: nudge a user to get their attention" -msgstr "nudge: doneu un cop de colze a un usuari perquè us pare atenció" +msgstr "nudge: doneu un cop de colze a un usuari perquè vos pare atenció" msgid "Windows Live ID authentication:Unable to connect" msgstr "Autenticació amb el Windows Live ID: no s'ha pogut connectar" @@ -5414,15 +5429,16 @@ #, c-format msgid "%s just sent you a Nudge!" -msgstr "%s us ha donat un cop de colze!" - -#, fuzzy, c-format +msgstr "%s vos ha donat un cop de colze!" + +#, c-format msgid "Unknown error (%d): %s" -msgstr "Error desconegut (%d)" +msgstr "Error desconegut (%d): %s" msgid "Unable to add user" msgstr "No s'ha pogut afegir l'usuari" +#. Unknown error! #, c-format msgid "Unknown error (%d)" msgstr "Error desconegut (%d)" @@ -5450,23 +5466,23 @@ "sign in." msgstr[0] "" "El servidor d'MSN es reiniciarà per raons de manteniment d'ací a %d minut. " -"Se us desconnectarà automàticament al cap d'este temps. Finalitzeu qualsevol " -"conversa en actiu.\n" -"\n" -"Després que el manteniment s'haja completat, us podreu tornar a connectar." +"Se vos desconnectarà automàticament al cap d'este temps. Finalitzeu " +"qualsevol conversa en actiu.\n" +"\n" +"Després que el manteniment s'haja completat, vos podreu tornar a connectar." msgstr[1] "" "El servidor d'MSN es reiniciarà per raons de manteniment d'ací a %d minuts. " -"Se us desconnectarà automàticament al cap d'este temps. Finalitzeu qualsevol " -"conversa en actiu.\n" -"\n" -"Després que el manteniment s'haja completat, us podreu tornar a connectar." +"Se vos desconnectarà automàticament al cap d'este temps. Finalitzeu " +"qualsevol conversa en actiu.\n" +"\n" +"Després que el manteniment s'haja completat, vos podreu tornar a connectar." msgid "" "Message was not sent because the system is unavailable. This normally " "happens when the user is blocked or does not exist." msgstr "" "No s'ha pogut enviar el missatge perquè el sistema no està disponible. Això " -"normalment passa quan l'usuari està blocat o no existix." +"normalment passa quan l'usuari està blocat o no existeix." msgid "Message was not sent because messages are being sent too quickly." msgstr "" @@ -5495,26 +5511,22 @@ "S'ha produït un error de connexió del servidor %s:\n" "%s" -#, fuzzy msgid "Our protocol is not supported by the server" -msgstr "El servidor no implementa el nostre protocol." - -#, fuzzy +msgstr "El servidor no implementa este protocol" + msgid "Error parsing HTTP" -msgstr "S'ha produït un error en analitzar HTTP." - -#, fuzzy +msgstr "S'ha produït un error en analitzar HTTP" + msgid "You have signed on from another location" -msgstr "Us heu connectat des d'un altre lloc." +msgstr "Vos heu connectat des d'un altre lloc" msgid "The MSN servers are temporarily unavailable. Please wait and try again." msgstr "" "Els servidors MSN estan temporalment no disponibles. Espereu i proveu-ho més " "tard." -#, fuzzy msgid "The MSN servers are going down temporarily" -msgstr "Els servidors MSN no seran accessibles temporalment." +msgstr "Els servidors MSN no seran accessibles temporalment" #, c-format msgid "Unable to authenticate: %s" @@ -5544,16 +5556,16 @@ msgid "Retrieving buddy list" msgstr "S'està recuperant la llista d'amics" -#, fuzzy, c-format +#, c-format msgid "%s requests to view your webcam, but this request is not yet supported." msgstr "" -"%s us ha enviat una invitació a la seua càmera web, però això encara no està " +"%s ha sol·licitat poder veure la vostra càmera web, però això encara no està " "implementat." #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." msgstr "" -"%s us ha enviat una invitació a la seua càmera web, però això encara no està " +"%s vos ha enviat una invitació a la seua càmera web, però això encara no està " "implementat." msgid "Away From Computer" @@ -5663,7 +5675,7 @@ msgstr "%s no és un compte de passaport vàlid." msgid "Service Temporarily Unavailable." -msgstr "El servici no està disponible temporalment." +msgstr "El servei no està disponible temporalment." msgid "Unable to rename group" msgstr "No s'ha pogut canviar el nom del grup" @@ -5673,15 +5685,15 @@ #, c-format msgid "%s has added you to his or her buddy list." -msgstr "%s us ha afegit a la seua llista d'amics." +msgstr "%s vos ha afegit a la seua llista d'amics." #, c-format msgid "%s has removed you from his or her buddy list." -msgstr "%s us ha suprimit de la seua llista d'amics." +msgstr "%s vos ha suprimit de la seua llista d'amics." #, c-format msgid "No such user: %s" -msgstr "Este usuari no existix: %s" +msgstr "Este usuari no existeix: %s" msgid "User lookup" msgstr "Cerca d'usuaris" @@ -5691,7 +5703,7 @@ msgstr "Repte de lectura" msgid "Unexpected challenge length from server" -msgstr "El repte del servidor té una grandària inesperada" +msgstr "El repte del servidor té una mida inesperada" msgid "Logging in" msgstr "S'està entrant" @@ -5700,7 +5712,7 @@ msgstr "MySpaceIM - No s'ha establer cap nom d'usuari" msgid "You appear to have no MySpace username." -msgstr "No sembla que tingueu cap nom d'usuari del MySpace." +msgstr "No pareix que tingueu cap nom d'usuari del MySpace." msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)" msgstr "Voleu establir-ne un ara? (Nota: no es podrà canviar)" @@ -5754,15 +5766,15 @@ msgid "Protocol error, code %d: %s" msgstr "S'ha produït un error en el protocol amb codi %d: %s" -#, fuzzy, c-format +#, c-format msgid "" "%s Your password is %zu characters, which is longer than the maximum length " "of %d. Please shorten your password at http://profileedit.myspace.com/index." "cfm?fuseaction=accountSettings.changePassword and try again." msgstr "" -"%s La vostra contrasenya conté %d caràcters, més del màxim de %d que permet " -"MySpaceIM. Escolliu una contrasenya més curta a http://profileedit.myspace." -"com/index.cfm?fuseaction=accountSettings.changePassword i proveu-ho de nou." +"%s La vostra contrasenya conté %zu caràcters, més %d que és el màxim permés. " +"Escolliu una contrasenya més curta a http://profileedit.myspace.com/index." +"cfm?fuseaction=accountSettings.changePassword i proveu-ho de nou." msgid "Incorrect username or password" msgstr "El sobrenom o la contrasenya no són correctes" @@ -5823,8 +5835,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." @@ -5845,7 +5857,7 @@ # FIXME: base... (josep) msgid "Base font size (points)" -msgstr "Grandària del tipus de lletra base (punts)" +msgstr "Mida del tipus de lletra base (punts)" msgid "User" msgstr "Usuari" @@ -5862,14 +5874,14 @@ msgid "Client Version" msgstr "Versió del client" -#, fuzzy msgid "" "An error occurred while trying to set the username. Please try again, or " "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username " "to set your username." msgstr "" -"Aneu a http://editprofile.myspace.com/index.cfm?fuseaction=profile.username " -"escolliu un nom d'usuari i torneu a provar d'entrar." +"S'ha produït un error en intentar establir el nom d'usuari. Intenteu-ho de " +"nou, o aneu a http://editprofile.myspace.com/index.cfm?fuseaction=profile." +"username per establir el vostre nom d'usuari." msgid "MySpaceIM - Username Available" msgstr "MySpaceIM - El nom d'usuari està disponible" @@ -5903,28 +5915,27 @@ #. * connotation, for example, "he was zapped by electricity when #. * he put a fork in the toaster." msgid "Zap" -msgstr "" - -#, fuzzy, c-format +msgstr "Enrampar" + +#, c-format msgid "%s has zapped you!" -msgstr "%s us ha afegit [%s]" - -#, fuzzy, c-format +msgstr "%s vos ha enrampat!" + +#, c-format msgid "Zapping %s..." -msgstr "S'està trucant a %s" +msgstr "S'està enrampant %s..." #. Whack means "to hit or strike someone with a sharp blow" -#, fuzzy msgid "Whack" msgstr "bufetejar" -#, fuzzy, c-format +#, c-format msgid "%s has whacked you!" -msgstr "%s us ha afegit [%s]" - -#, fuzzy, c-format +msgstr "%s vos ha bufetejat!" + +#, c-format msgid "Whacking %s..." -msgstr "Bufetejant" +msgstr "S'està bufetejant %s..." #. Torch means "to set on fire." Don't worry, this doesn't #. * make a whole lot of sense in English, either. Feel free @@ -5934,7 +5945,7 @@ #, c-format msgid "%s has torched you!" -msgstr "%s us ha calat foc!" +msgstr "%s vos ha calat foc!" #, c-format msgid "Torching %s..." @@ -5947,7 +5958,7 @@ # Sí, sembla que siguem a l'època victoriana... (josep) #, c-format msgid "%s has smooched you!" -msgstr "%s us ha morrejat!" +msgstr "%s vos ha morrejat!" #, c-format msgid "Smooching %s..." @@ -5959,7 +5970,7 @@ #, c-format msgid "%s has hugged you!" -msgstr "%s us ha abraçat!" +msgstr "%s vos ha abraçat!" #, c-format msgid "Hugging %s..." @@ -5971,7 +5982,7 @@ #, c-format msgid "%s has slapped you!" -msgstr "%s us ha bufetejat!" +msgstr "%s vos ha bufetejat!" #, c-format msgid "Slapping %s..." @@ -5983,7 +5994,7 @@ #, c-format msgid "%s has goosed you!" -msgstr "%s us ha pessigat el cul!" +msgstr "%s vos ha pessigat el cul!" #, c-format msgid "Goosing %s..." @@ -6006,17 +6017,16 @@ #. We're not entirely sure what the MySpace people mean by #. * this... but we think it's the equivalent of "prank." Or, for #. * someone to perform a mischievous trick or practical joke. -#, fuzzy msgid "Punk" -msgstr "Ping" - -#, fuzzy, c-format +msgstr "Pren el pèl" + +#, c-format msgid "%s has punk'd you!" -msgstr "%s s'ha connectat." - -#, fuzzy, c-format +msgstr "%s vos ha prés el pèl!" + +#, c-format msgid "Punking %s..." -msgstr "Ping" +msgstr "S'està prenent el pèl a %s..." #. Raspberry is a slang term for the vibrating sound made #. * when you stick your tongue out of your mouth with your @@ -6025,17 +6035,16 @@ #. * gesture, so it does not carry a harsh negative #. * connotation. It is generally used in a playful tone #. * with friends. -#, fuzzy msgid "Raspberry" msgstr "Llengoteja" -#, fuzzy, c-format +#, c-format msgid "%s has raspberried you!" -msgstr "%s s'ha connectat." - -#, fuzzy, c-format +msgstr "%s vos ha fet una llengota!" + +#, c-format msgid "Raspberrying %s..." -msgstr "Morrejant" +msgstr "S'està fent una llengota a %s..." msgid "Required parameters not passed in" msgstr "No s'han passat tots els paràmetres requerits" @@ -6053,10 +6062,10 @@ msgstr "No s'ha trobat la conferència" msgid "Conference does not exist" -msgstr "La conferència no existix." +msgstr "La conferència no existeix." msgid "A folder with that name already exists" -msgstr "Ja existix una carpeta amb este nom" +msgstr "Ja existeix una carpeta amb este nom" msgid "Not supported" msgstr "No està implementat" @@ -6117,13 +6126,14 @@ msgstr "La versió del protocol no és compatible" msgid "The user has blocked you" -msgstr "L'usuari us ha blocat" +msgstr "L'usuari vos ha blocat" msgid "" "This evaluation version does not allow more than ten users to log in at one " "time" msgstr "" -"Esta versió d'avaluació no permet que entrin més de deu usuaris a la vegada" +"Esta versió d'avaluació no permet que entrin 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" @@ -6132,15 +6142,15 @@ msgid "Unknown error: 0x%X" msgstr "Error desconegut: 0x%X" -#, fuzzy, c-format +#, c-format msgid "Unable to login: %s" -msgstr "No s'ha pogut fer ping a l'usuari %s" +msgstr "No s'ha pogut entrar: %s" #, 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)." @@ -6275,13 +6285,12 @@ "És possible que %s no estiga en línia, i no haja rebut el missatge que li " "acabeu d'enviar." -#, fuzzy msgid "" "Unable to connect to server. Please enter the address of the server to which " "you wish to connect." msgstr "" "No s'ha pogut connectar al servidor. Introduïu l'adreça del servidor al qual " -"us vulgueu connectar." +"vos vulgueu connectar." msgid "This conference has been closed. No more messages can be sent." msgstr "S'ha tancat esta conferència. No s'hi poden enviar més missatges." @@ -6305,9 +6314,8 @@ msgid "Server port" msgstr "Port en el servidor" -#, fuzzy msgid "Received unexpected response from " -msgstr "S'ha rebut una resposta HTTP inesperada del servidor." +msgstr "S'ha rebut una resposta inesperada de " #. username connecting too frequently msgid "" @@ -6318,12 +6326,12 @@ "deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar " "encara més temps." -#, fuzzy, c-format +#, c-format msgid "Error requesting " -msgstr "S'ha produït un error en resoldre %s" +msgstr "S'ha produït en sol·licitar " msgid "AOL does not allow your screen name to authenticate here" -msgstr "" +msgstr "AOL no permet que vos autentiqueu amb este nom d'usuari ací" msgid "Could not join chat room" msgstr "No s'ha pogut entrar a la sala de xat" @@ -6331,9 +6339,8 @@ msgid "Invalid chat room name" msgstr "El nom de sala de xat no és vàlid" -#, fuzzy msgid "Received invalid data on connection with server" -msgstr "S'han rebut dades invàlides a la connexió amb el servidor." +msgstr "S'han rebut dades invàlides a la connexió amb el servidor" #. *< type #. *< ui_requirement @@ -6380,9 +6387,8 @@ msgid "Received invalid data on connection with remote user." msgstr "S'han rebut dades invàlides a la connexió amb l'usuari remot." -#, fuzzy msgid "Unable to establish a connection with the remote user." -msgstr "No s'ha pogut establir una connexió amb l'usuari remot." +msgstr "No s'ha pogut establir una connexió amb el servidor remot." msgid "Direct IM established" msgstr "S'ha establit una connexió directa de MI" @@ -6392,14 +6398,14 @@ "%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 us ha intentat enviar un fitxer %s, però ara mateix només permetem enviar " +"%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 #, c-format msgid "File %s is %s, which is larger than the maximum size of %s." -msgstr "El fitxer %s és %s, que és més gran que la grandària màxima de %s." +msgstr "El fitxer %s és %s, que és més gran que la mida màxima de %s." msgid "Invalid error" msgstr "Error invàlid" @@ -6414,10 +6420,10 @@ msgstr "Velocitat cap al client" msgid "Service unavailable" -msgstr "Servici no disponible" +msgstr "Servei no disponible" msgid "Service not defined" -msgstr "Servici no definit" +msgstr "Servei no definit" msgid "Obsolete SNAC" msgstr "SNAC obsolet" @@ -6489,8 +6495,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" @@ -6503,7 +6510,7 @@ msgstr "MI AIM directes" msgid "Get File" -msgstr "Aconseguix el fitxer" +msgstr "Aconsegueix el fitxer" msgid "Games" msgstr "Jocs" @@ -6583,15 +6590,13 @@ msgid "Buddy Comment" msgstr "Comentari de l'amic" -#, fuzzy, c-format +#, c-format msgid "Unable to connect to authentication server: %s" -msgstr "" -"No s'ha pogut connectar al servidor d'autenticació:\n" -"%s" - -#, fuzzy, c-format +msgstr "No s'ha pogut connectar al servidor d'autenticació: %s" + +#, c-format msgid "Unable to connect to BOS server: %s" -msgstr "No s'ha pogut connectar al servidor." +msgstr "No s'ha pogut connectar al servidor BOS: %s" msgid "Username sent" msgstr "S'ha enviat el nom d'usuari" @@ -6603,22 +6608,21 @@ msgid "Finalizing connection" msgstr "S'està finalitzant la connexió" -#, fuzzy, c-format +#, c-format msgid "" "Unable to sign on as %s because the username is invalid. Usernames must be " "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: no s'ha pogut entrar com a %s perquè el 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." - -#, fuzzy, c-format +"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." msgstr "" -"Se us pot desconnectar d'ací a poc temps. Comproveu si hi ha actualitzacions " -"a %s." +"Pot ser que es desconnecte d'ací a poc. Si això passés, comproveu si hi ha " +"actualitzacions a %s." # FIXME: hash (josep) msgid "Unable to get a valid AIM login hash." @@ -6633,37 +6637,34 @@ #. Unregistered username #. uid is not exist #. the username does not exist -#, fuzzy msgid "Username does not exist" -msgstr "L'usuari no existix." +msgstr "L'usuari no existeix" #. Suspended account -#, fuzzy msgid "Your account is currently suspended" -msgstr "El vostre compte està actualment suspès." +msgstr "El vostre compte està actualment suspès" #. service temporarily unavailable msgid "The AOL Instant Messenger service is temporarily unavailable." msgstr "" -"El servici de missatges instantanis d'AOL no està disponible temporalment." - +"El servei de missatges instantanis d'AOL no està disponible temporalment." + +#. client too old #, c-format msgid "The client version you are using is too old. Please upgrade at %s" msgstr "La versió del client que useu és massa antiga, actualitzeu-la a %s" #. IP address connecting too frequently -#, fuzzy msgid "" "You have been connecting and disconnecting too frequently. Wait a minute and " "try again. If you continue to try, you will need to wait even longer." msgstr "" -"Heu estat connectant-vos i desconnectat-vos amb massa freqüència. Espereu " -"deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar " +"Heu estat connectant-vos i desconnectat-vos amb massa freqüència. Espereu un " +"minut i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar " "encara més temps." -#, fuzzy msgid "The SecurID key entered is invalid" -msgstr "La clau SecurID que heu entrat no és vàlida." +msgstr "La clau SecurID que heu entrat no és vàlida" msgid "Enter SecurID" msgstr "Introduïu el SecureID" @@ -6671,12 +6672,6 @@ msgid "Enter the 6 digit number from the digital display." msgstr "Introduïu el nombre de 6 dígits de la pantalla digital." -#. * -#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. -#. -msgid "_OK" -msgstr "_D'acord" - msgid "Password sent" msgstr "S'ha enviat la contrasenya" @@ -6684,13 +6679,7 @@ msgstr "No s'ha pogut inicialitzar la connexió" msgid "Please authorize me so I can add you to my buddy list." -msgstr "Autoritzeu-me perquè us puga afegir a la meua llista d'amics." - -msgid "Authorization Request Message:" -msgstr "Missatge de petició d'autorització:" - -msgid "Please authorize me!" -msgstr "Autoritzeu-me, per favor." +msgstr "Autoritzeu-me perquè vos puga afegir a la meua llista d'amics." msgid "No reason given." msgstr "No s'ha indicat cap motiu." @@ -6704,7 +6693,7 @@ "following reason:\n" "%s" msgstr "" -"L'usuari %u us ha denegat la vostra sol·licitud d'afegir-lo a la vostra " +"L'usuari %u vos ha denegat la vostra sol·licitud d'afegir-lo a la vostra " "llista d'amics pel següent motiu:\n" "%s" @@ -6714,7 +6703,7 @@ #. Someone has granted you authorization #, c-format msgid "The user %u has granted your request to add them to your buddy list." -msgstr "L'usuari %u us ha permés afegir-lo a la vostra llista d'amics." +msgstr "L'usuari %u vos ha permés afegir-lo a la vostra llista d'amics." #, c-format msgid "" @@ -6754,7 +6743,7 @@ #, c-format msgid "ICQ user %u has sent you a buddy: %s (%s)" -msgstr "L'usuari %u d'ICQ us ha enviat un amic: %s (%s)" +msgstr "L'usuari %u d'ICQ vos ha enviat un amic: %s (%s)" msgid "Do you want to add this buddy to your buddy list?" msgstr "Voleu afegir este amic a la vostra llista d'amics?" @@ -6858,7 +6847,7 @@ #, c-format msgid "You have been disconnected from chat room %s." -msgstr "Se us ha desconnectat de la conversa %s." +msgstr "Se vos ha desconnectat de la conversa %s." msgid "Mobile Phone" msgstr "Telèfon mòbil" @@ -6912,7 +6901,7 @@ "from the original." msgstr "" "Error 0x%04x: no s'ha pogut formatar el nom d'usuari perquè el nom demanat " -"diferix de l'original." +"difereix de l'original." #, c-format msgid "Error 0x%04x: Unable to format username because it is invalid." @@ -6980,7 +6969,7 @@ "fully connected." msgstr "" "Probablement heu demanat establir el vostre perfil abans d'acabar amb el " -"procés de connexió. El vostre perfil seguix sense estar establit; intenteu " +"procés de connexió. El vostre perfil segueix sense estar establit; intenteu " "establir-lo de nou quan el procés de connexió haja finalitzat." #, c-format @@ -6991,11 +6980,11 @@ "The maximum profile length of %d bytes has been exceeded. It has been " "truncated for you." msgstr[0] "" -"S'ha excedit el límit màxim de la grandària del perfil, que és d'%d byte. " -"S'ha retallat." +"S'ha excedit el límit màxim de la mida del perfil, que és d'%d byte. S'ha " +"retallat." msgstr[1] "" -"S'ha excedit el límit màxim de la grandària del perfil, que és de %d octets. " -"S'ha retallat." +"S'ha excedit el límit màxim de la mida del perfil, que és de %d octets. S'ha " +"retallat." msgid "Profile too long." msgstr "Perfil massa llarg." @@ -7015,7 +7004,7 @@ msgid "Away message too long." msgstr "El missatge d'absència és massa llarg." -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because the username is invalid. Usernames must " "be a valid email address, or start with a letter and contain only letters, " @@ -7025,9 +7014,6 @@ "d'usuari han de ser adreces de correu vàlides, o començar amb una lletra i " "contindre només lletres, nombres i espais, o només nombres." -msgid "Unable to Add" -msgstr "No s'ha pogut afegir" - msgid "Unable to Retrieve Buddy List" msgstr "No s'ha pogut obtindre la llista d'amics" @@ -7041,18 +7027,18 @@ msgid "Orphans" msgstr "Orfes" -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because you have too many buddies in your buddy " "list. Please remove one and try again." msgstr "" -"No s'ha pogut afegir l'amic %s perquè hi ha massa entrades a la llista " -"d'amics. Suprimiu-ne algun i torneu-ho a intentar." +"No s'ha pogut afegir l'amic %s perquè hi ha massa amics a la llista d'amics. " +"Suprimiu-ne algun i torneu-ho a intentar." msgid "(no name)" msgstr "(sense nom)" -#, fuzzy, c-format +#, c-format msgid "Unable to add the buddy %s for an unknown reason." msgstr "Per motius desconeguts no s'ha pogut afegir l'amic %s." @@ -7061,7 +7047,7 @@ "The user %s has given you permission to add him or her to your buddy list. " "Do you want to add this user?" msgstr "" -"L'usuari %s us ha donat permís perquè l'afegiu a la vostra llista d'amics. " +"L'usuari %s vos ha donat permís perquè l'afegiu a la vostra llista d'amics. " "Voleu afegir-lo?" msgid "Authorization Given" @@ -7070,7 +7056,7 @@ #. Granted #, c-format msgid "The user %s has granted your request to add them to your buddy list." -msgstr "L'usuari %s us ha permés afegir-lo a la vostra llista d'amics." +msgstr "L'usuari %s vos ha permés afegir-lo a la vostra llista d'amics." msgid "Authorization Granted" msgstr "S'ha concedit l'autorització" @@ -7082,7 +7068,7 @@ "following reason:\n" "%s" msgstr "" -"L'usuari %s us ha denegat la petició d'afegir-lo a la vostra llista d'amics " +"L'usuari %s vos ha denegat la petició d'afegir-lo a la vostra llista d'amics " "pels motius següents:\n" "%s" @@ -7128,7 +7114,7 @@ msgstr "Edita el comentari sobre l'amic" msgid "Get Status Msg" -msgstr "Aconseguix el missatge d'estat" +msgstr "Aconsegueix el missatge d'estat" msgid "Direct IM" msgstr "MI directa" @@ -7137,7 +7123,7 @@ msgstr "Torna a demanar l'autorització" msgid "Require authorization" -msgstr "Requerix autorització" +msgstr "Requereix autorització" msgid "Web aware (enabling this will cause you to receive SPAM!)" msgstr "Atent al web (si ho habiliteu, farà que comenceu a rebre'n brossa)" @@ -7166,8 +7152,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" @@ -7182,7 +7168,7 @@ msgstr "C_erca" msgid "Set User Info (web)..." -msgstr "Establix informació d'usuari (web)..." +msgstr "Estableix informació d'usuari (web)..." #. This only happens when connecting with the old-style BUCP login msgid "Change Password (web)" @@ -7193,7 +7179,7 @@ #. ICQ actions msgid "Set Privacy Options..." -msgstr "Establix les opcions de privadesa..." +msgstr "Estableix les opcions de privadesa..." #. AIM actions msgid "Confirm Account" @@ -7214,9 +7200,8 @@ msgid "Search for Buddy by Information" msgstr "Cerca un amic per la informació" -#, fuzzy msgid "Use clientLogin" -msgstr "L'usuari no està connectat" +msgstr "Empra clientLogin" msgid "" "Always use AIM/ICQ proxy server for\n" @@ -7252,7 +7237,7 @@ "for IM Images. Because your IP address will be revealed, this may be " "considered a privacy risk." msgstr "" -"Això requerix la connexió directa entre els dos ordinadors, ja que és " +"Això requereix la connexió directa entre els dos ordinadors, ja que és " "necessari per poder enviar imatges instantànies. Atès que es revelarà la " "vostra adreça IP, això es pot considerar un risc de privadesa." @@ -7356,7 +7341,7 @@ msgstr "Número de telèfon" msgid "Authorize adding" -msgstr "Autoritzar que us afegisquen" +msgstr "Autoritzar que vos afegisquen" msgid "Cellphone Number" msgstr "Número de mòbil" @@ -7415,31 +7400,28 @@ msgid "Note" msgstr "Nota" +# FIXME: "memo", el qq té una terminologia molt peculiar #. callback -#, fuzzy msgid "Buddy Memo" -msgstr "Icona de l'amic" +msgstr "Memo de l'amic" msgid "Change his/her memo as you like" -msgstr "" - -#, fuzzy +msgstr "Canvieu-ne el memo" + msgid "_Modify" -msgstr "Modifica" - -#, fuzzy +msgstr "_Modifica" + msgid "Memo Modify" -msgstr "Modifica" - -#, fuzzy +msgstr "Modifica el memo" + msgid "Server says:" -msgstr "El servidor està ocupat" +msgstr "El servidor diu:" msgid "Your request was accepted." -msgstr "" +msgstr "S'ha acceptat la vostra sol·licitud." msgid "Your request was rejected." -msgstr "" +msgstr "S'ha rebutjat la vostra sol·licitud." #, c-format msgid "%u requires verification" @@ -7496,7 +7478,7 @@ #, c-format msgid "Failed removing me from %d's buddy list" -msgstr "No us heu pogut suprimir de la llista d'amics de %d" +msgstr "No vos heu pogut suprimir de la llista d'amics de %d" msgid "No reason given" msgstr "No s'ha indicat cap motiu" @@ -7504,7 +7486,7 @@ #. only need to get value #, c-format msgid "You have been added by %s" -msgstr "%s us ha afegit" +msgstr "%s vos ha afegit" msgid "Would you like to add him?" msgstr "Voleu afegir-lo?" @@ -7580,7 +7562,7 @@ #, c-format msgid "Qun %u denied from joining" -msgstr "No se us ha permés entrar al Qun %u" +msgstr "No se vos ha permés entrar al Qun %u" msgid "QQ Qun Operation" msgstr "Operació Qun QQ" @@ -7633,7 +7615,7 @@ #, c-format msgid "Joining Qun %u is approved by admin %u for %s" -msgstr "L'administrador %2$u us ha permés unir-vos al Qun %1$u per %3$s" +msgstr "L'administrador %2$u vos ha permés unir-vos al Qun %1$u per %3$s" #, c-format msgid "Removed buddy %u." @@ -7656,13 +7638,11 @@ msgid " TCP" msgstr " TCP" -#, fuzzy msgid " FromMobile" -msgstr "Mòbil" - -#, fuzzy +msgstr " FromMobile" + msgid " BindMobile" -msgstr "Mòbil" +msgstr " BindMobile" msgid " Video" msgstr " Vídeo" @@ -7755,18 +7735,17 @@ msgid "

Acknowledgement:
\n" msgstr "

Reconeixement:
\n" -#, fuzzy msgid "

Scrupulous Testers:
\n" -msgstr "

Autor original:
\n" +msgstr "

Comprovadors del codi:
\n" msgid "and more, please let me know... thank you!))" -msgstr "" +msgstr "i més, per favor feu-m'ho saber... gràcies!!!))" # FIXME: ush... traducció lliure... msgid "

And, all the boys in the backroom...
\n" msgstr "

I tothom que ho ha fet possible...
\n" -msgid "Feel free to join us! :)" +msgid "Feel free to join vos! :)" msgstr "No dubteu a col·laborar amb nosaltres! :)" #, c-format @@ -7788,9 +7767,8 @@ msgid "About OpenQ" msgstr "Quant a l'OpenQ" -#, fuzzy msgid "Modify Buddy Memo" -msgstr "Modifica l'adreça" +msgstr "Modifica el memo de l'amic" #. *< type #. *< ui_requirement @@ -7830,7 +7808,7 @@ msgstr "Mostra les notícies del servidor" msgid "Show chat room when msg comes" -msgstr "" +msgstr "Mostra la sala de xat quan hi arriben missatges" # FIXME: keep alive -> permanència msgid "Keep alive interval (seconds)" @@ -7839,7 +7817,6 @@ msgid "Update interval (seconds)" msgstr "Interval d'actualització (en segons)" -#, fuzzy msgid "Unable to decrypt server reply" msgstr "No es pot desxifrar la resposta del servidor" @@ -7909,9 +7886,8 @@ msgid "Requesting token" msgstr "S'està sol·licitant un testimoni" -#, fuzzy msgid "Unable to resolve hostname" -msgstr "No s'ha pogut resoldre el nom de l'ordinador." +msgstr "No s'ha pogut resoldre el nom de l'ordinador" msgid "Invalid server or port" msgstr "El servidor o el port no són vàlids" @@ -7964,7 +7940,6 @@ msgid "QQ Qun Command" msgstr "Orde QQ Qun" -#, fuzzy msgid "Unable to decrypt login reply" msgstr "No s'ha pogut desxifrar la resposta d'entrada" @@ -8102,8 +8077,8 @@ "\"Create New Conference\" if you'd like to create a new conference to invite " "this user to." msgstr "" -"Seleccioneu a quina conferència, de les d'ací sota, voleu convidar l'usuari %" -"s. Seleccioneu «Crea una nova conferència» si voleu crear-ne una de nova on " +"Seleccioneu a quina conferència, de les d'ací sota, voleu convidar l'usuari " +"%s. Seleccioneu «Crea una nova conferència» si voleu crear-ne una de nova on " "convidar-hi l'usuari." msgid "Invite to Conference" @@ -8174,7 +8149,7 @@ "The identifier '%s' did not match any users in your Sametime community. This " "entry has been removed from your buddy list." msgstr "" -"L'identificador «%s» no coincidix amb cap usuari de la vostra comunitat " +"L'identificador «%s» no coincideix amb cap usuari de la vostra comunitat " "Sametime. S'ha suprimit esta entrada de la vostra llista d'amics." #, c-format @@ -8212,11 +8187,11 @@ msgstr "Exporta la llista Sametime del compte %s" msgid "Unable to add group: group exists" -msgstr "No s'ha pogut afegir el grup: ja existix" +msgstr "No s'ha pogut afegir el grup: ja existeix" #, c-format msgid "A group named '%s' already exists in your buddy list." -msgstr "Ja existix un grup anomenat «%s» a la vostra llista d'amics." +msgstr "Ja existeix un grup anomenat «%s» a la vostra llista d'amics." msgid "Unable to add group" msgstr "No s'ha pogut afegir el grup" @@ -8248,7 +8223,7 @@ "The identifier '%s' did not match any Notes Address Book groups in your " "Sametime community." msgstr "" -"L'identificador «%s» no coincidix amb cap dels grups de llibretes d'adreces " +"L'identificador «%s» no coincideix amb cap dels grups de llibretes d'adreces " "Notes de la vostra comunitat Sametime." msgid "Notes Address Book Group" @@ -8285,8 +8260,8 @@ #, c-format msgid "The identifier '%s' did not match any users in your Sametime community." msgstr "" -"L'identificador «%s» no coincidix amb cap dels usuaris de la vostra comunitat " -"Sametime." +"L'identificador «%s» no coincideix amb cap dels usuaris de la vostra " +"comunitat Sametime." msgid "No Matches" msgstr "Cap coincidència" @@ -8383,7 +8358,7 @@ msgstr "Especifica la contrasenya de MI" msgid "Get Public Key" -msgstr "Aconseguix la clau pública" +msgstr "Aconsegueix la clau pública" msgid "Cannot fetch the public key" msgstr "No s'ha pogut obtindre la clau pública" @@ -8409,7 +8384,7 @@ "You can use the Get Public Key command to get the public key." msgstr "" "No podeu rebre notificacions d'amic fins que no hàgeu importat la seua clau " -"pública. Podeu fer servir l'orde 'Aconseguix la clau pública' per obtindre-" +"pública. Podeu fer servir l'orde 'Aconsegueix la clau pública' per obtindre-" "la." #. Open file selector to select the public key. @@ -8523,7 +8498,7 @@ msgstr "MI amb contrasenya" msgid "Get Public Key..." -msgstr "Aconseguix la clau pública..." +msgstr "Aconsegueix la clau pública..." msgid "Kill User" msgstr "Mata l'usuari" @@ -8536,7 +8511,7 @@ #, c-format msgid "Channel %s does not exist in the network" -msgstr "No existix el canal %s a la xarxa" +msgstr "No existeix el canal %s a la xarxa" msgid "Channel Information" msgstr "Informació del canal" @@ -8612,7 +8587,7 @@ msgstr "Autenticació del canal" msgid "Add / Remove" -msgstr "Afig / Suprimix" +msgstr "Afig / Suprimeix" msgid "Group Name" msgstr "Nom del grup" @@ -8632,7 +8607,7 @@ msgid "Set user limit on channel. Set to zero to reset user limit." msgstr "" -"Establix el límit d'usuaris del canal. Poseu-lo a zero per reiniciar el " +"Estableix el límit d'usuaris del canal. Poseu-lo a zero per reiniciar el " "límit." msgid "Invite List" @@ -8648,28 +8623,28 @@ msgstr "Reiniciació permanent" msgid "Set Permanent" -msgstr "Establix a permanent" +msgstr "Estableix a permanent" msgid "Set User Limit" -msgstr "Establix el límit d'usuaris" +msgstr "Estableix el límit d'usuaris" msgid "Reset Topic Restriction" msgstr "Reinicia la restricció del tema" msgid "Set Topic Restriction" -msgstr "Establix restricció del tema" +msgstr "Estableix restricció del tema" msgid "Reset Private Channel" msgstr "Reinicia el canal privat" msgid "Set Private Channel" -msgstr "Establix canal privat" +msgstr "Estableix canal privat" msgid "Reset Secret Channel" msgstr "Reinicia canal secret" msgid "Set Secret Channel" -msgstr "Establix canal secret" +msgstr "Estableix canal secret" #, c-format msgid "" @@ -8714,7 +8689,7 @@ msgstr "No s'ha pogut crear la connexió" msgid "File transfer session does not exist" -msgstr "La sessió de transferència de fitxers no existix" +msgstr "La sessió de transferència de fitxers no existeix" msgid "No file transfer session active" msgstr "No hi ha cap sessió activa per a la transferència de fitxers" @@ -8756,15 +8731,15 @@ #, c-format msgid "You have been kicked off %s by %s (%s)" -msgstr "%2$s us ha fet fora de %1$s (%3$s)" +msgstr "%2$s vos ha fet fora de %1$s (%3$s)" #, c-format msgid "You have been killed by %s (%s)" -msgstr "%s us ha matat (%s)" +msgstr "%s vos ha matat (%s)" #, c-format msgid "Killed by %s (%s)" -msgstr "%s us ha matat (%s)" +msgstr "%s vos ha matat (%s)" msgid "Server signoff" msgstr "Desconnexió del servidor" @@ -8918,7 +8893,7 @@ "Received %s's public key. Your local copy does not match this key. Would you " "still like to accept this public key?" msgstr "" -"S'ha rebut la clau pública de %s. La còpia local de la clau no coincidix. " +"S'ha rebut la clau pública de %s. La còpia local de la clau no coincideix. " "Voleu acceptar esta clau pública, de tota manera?" #, c-format @@ -8947,9 +8922,8 @@ msgstr "El tipus de la clau pública no està suportat" msgid "Disconnected by server" -msgstr "El servidor us ha desconnectat" - -#, fuzzy +msgstr "El servidor vos ha desconnectat" + msgid "Error connecting to SILC Server" msgstr "S'ha produït un error en connectar al servidor SILC" @@ -8965,7 +8939,6 @@ msgid "Performing key exchange" msgstr "S'estan intercanviant les claus" -#, fuzzy msgid "Unable to load SILC key pair" msgstr "No s'ha pogut carregar el parell de claus SILC" @@ -8973,14 +8946,9 @@ msgid "Connecting to SILC Server" msgstr "S'està connectant al servidor SILC" -#, fuzzy -msgid "Unable to not load SILC key pair" -msgstr "No s'ha pogut carregar el parell de claus SILC" - msgid "Out of memory" msgstr "Sense memòria" -#, fuzzy msgid "Unable to initialize SILC protocol" msgstr "No s'ha pogut inicialitzar el protocol SILC" @@ -9129,7 +9097,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" @@ -9193,7 +9162,7 @@ "channel invite list" msgstr "" "invite <canal> [-|+]<sobrenom>: convida el sobrenom o afig/" -"suprimix de la llista de convidats al canal" +"suprimeix de la llista de convidats al canal" msgid "kick <channel> <nick> [comment]: Kick client from channel" msgstr "" @@ -9279,9 +9248,8 @@ msgid "Creating SILC key pair..." msgstr "S'està creant el parell de claus SILC..." -#, fuzzy msgid "Unable to create SILC key pair" -msgstr "No s'ha pogut crear el parell de claus SILC\n" +msgstr "No s'ha pogut crear el parell de claus SILC" #. Hint for translators: Please check the tabulator width here and in #. the next strings (short strings: 2 tabs, longer strings 1 tab, @@ -9422,34 +9390,30 @@ msgid "Failure: Authentication failed" msgstr "Error: ha fallat l'autenticació" -#, fuzzy msgid "Unable to initialize SILC Client connection" msgstr "No s'ha pogut inicialitzar la connexió per al client SILC" msgid "John Noname" msgstr "Pepet Sensenom" -#, fuzzy, c-format +#, c-format msgid "Unable to load SILC key pair: %s" msgstr "No s'ha pogut carregar la parella de claus SILC: %s" msgid "Unable to create connection" msgstr "No s'ha pogut crear la connexió" -#, fuzzy msgid "Unknown server response" -msgstr "Resposta desconeguda del servidor." - -#, fuzzy +msgstr "Resposta desconeguda del servidor" + msgid "Unable to create listen socket" -msgstr "No s'ha pogut crear el sòcol" +msgstr "No s'ha pogut crear el sòcol on escoltar" msgid "SIP usernames may not contain whitespaces or @ symbols" msgstr "Els noms d'usuari SIP no poden contindre espais en blanc ni @" -#, fuzzy msgid "SIP connect server not specified" -msgstr "Mostra els avisos del servidor" +msgstr "No s'ha especificat el servidor SIP al qual connectar-se" #. *< type #. *< ui_requirement @@ -9467,7 +9431,7 @@ msgstr "El connector per al protocol SIP/SIMPLE" msgid "Publish status (note: everyone may watch you)" -msgstr "Publica l'estat (nota: tothom us pot estar observant)" +msgstr "Publica l'estat (nota: tothom vos pot estar observant)" msgid "Use UDP" msgstr "Utilitza UDP" @@ -9506,9 +9470,8 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! Protocol Plugin" -msgstr "Connector per al protocol Yahoo" +msgstr "Connector per al protocol Yahoo!" msgid "Pager server" msgstr "Servidor de cercapersones" @@ -9539,9 +9502,8 @@ msgid "Yahoo Chat port" msgstr "Port del xat de Yahoo" -#, fuzzy msgid "Yahoo JAPAN ID..." -msgstr "ID de Yahoo..." +msgstr "ID de Yahoo del Japó..." #. *< type #. *< ui_requirement @@ -9553,12 +9515,11 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "Connector per al protocol Yahoo" +msgstr "Connector per al protocol Yahoo! del Japó" msgid "Your SMS was not delivered" -msgstr "" +msgstr "No s'ha enviat l'SMS" msgid "Your Yahoo! message did not get sent." msgstr "No s'ha pogut enviar el vostre missatge de Yahoo!" @@ -9572,45 +9533,41 @@ "%s has (retroactively) denied your request to add them to your list for the " "following reason: %s." msgstr "" -"%s us 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 " "pel següent motiu:\n" "%s" #, c-format msgid "%s has (retroactively) denied your request to add them to your list." msgstr "" -"%s us 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" #. Some error in the received stream -#, fuzzy msgid "Received invalid data" -msgstr "S'han rebut dades invàlides a la connexió amb el servidor." +msgstr "S'han rebut dades invàlides" #. security lock from too many failed login attempts -#, fuzzy msgid "" "Account locked: Too many failed login attempts. Logging into the Yahoo! " "website may fix this." msgstr "" -"S'ha produït un error desconegut, número %d. Això es pot solucionar entrant " -"al web de Yahoo!" +"El compte està blocat perquè s'ha intentat entrar massa cops. Això es pot " +"solucionar entrant al web de Yahoo!" #. indicates a lock of some description -#, fuzzy msgid "" "Account locked: Unknown reason. Logging into the Yahoo! website may fix " "this." msgstr "" -"S'ha produït un error desconegut, número %d. Això es pot solucionar entrant " -"al web de Yahoo!" +"El compte està blocat, però no se'n coneix el motiu. Això es pot solucionar " +"entrant al web de Yahoo!" #. username or password missing -#, fuzzy msgid "Username or password missing" -msgstr "El sobrenom o la contrasenya no són correctes" +msgstr "Manquen el nom d'uruari o la contrasenya" #, c-format msgid "" @@ -9619,7 +9576,7 @@ "Check %s for updates." msgstr "" "El servidor Yahoo ha demanat l'ús d'un mètode d'autenticació que no és " -"reconegut. Probablement no us podreu connectar al Yahoo. Comproveu si hi ha " +"reconegut. Probablement no vos podreu connectar al Yahoo. Comproveu si hi ha " "actualitzacions a %s." msgid "Failed Yahoo! Authentication" @@ -9645,13 +9602,12 @@ "S'ha produït un error desconegut, número %d. Això es pot solucionar entrant " "al web de Yahoo!" -#, fuzzy, c-format +#, c-format msgid "Unable to add buddy %s to group %s to the server list on account %s." msgstr "" "No s'ha pogut afegir l'amic %s al grup %s a la llista del servidor del " "compte %s." -#, fuzzy msgid "Unable to add buddy to server list" msgstr "No s'ha pogut afegir l'amic a la llista del servidor" @@ -9659,21 +9615,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s" msgstr "[ Audible %s/%s/%s.swf ] %s" -#, fuzzy msgid "Received unexpected HTTP response from server" -msgstr "S'ha rebut una resposta HTTP inesperada del servidor." - -#, fuzzy, c-format +msgstr "S'ha rebut una resposta HTTP inesperada del servidor" + +#, c-format msgid "Lost connection with %s: %s" -msgstr "" -"S'ha perdut la connexió amb %s:\n" -"%s" - -#, fuzzy, c-format +msgstr "S'ha perdut la connexió amb %s: %s" + +#, c-format msgid "Unable to establish a connection with %s: %s" -msgstr "" -"No s'ha pogut establir una connexió amb al servidor:\n" -"%s" +msgstr "No s'ha pogut establir una connexió amb %s: %s" msgid "Not at Home" msgstr "Fora de casa" @@ -9721,10 +9672,10 @@ msgstr "Comença a dibuixar" msgid "Select the ID you want to activate" -msgstr "" +msgstr "Seleccioneu l'ID que vulgueu activar" msgid "Join whom in chat?" -msgstr "A qui us voleu unir al xat?" +msgstr "A qui vos voleu unir al xat?" msgid "Activate ID..." msgstr "Activa l'ID..." @@ -9771,7 +9722,8 @@ "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!" @@ -9813,20 +9765,16 @@ "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 existix, 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." #, c-format -msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." -msgstr "" -"%s no ha acceptat la vostra invitació d'entrar a la sala «%s» perquè «%s»." - -msgid "Invitation Rejected" -msgstr "S'ha rebutjat la invitació" +msgid "%s has declined to join." +msgstr "%s no ha volgut connectar-se." msgid "Failed to join chat" msgstr "No s'ha pogut unir al xat" @@ -9847,8 +9795,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." @@ -9878,9 +9826,8 @@ msgid "User Rooms" msgstr "Sales d'usuari" -#, fuzzy msgid "Connection problem with the YCHT server" -msgstr "Problema de connexió amb el servidor YCHT." +msgstr "Hi ha un problema de connexió amb el servidor YCHT" msgid "" "(There was an error converting this message.\t Check the 'Encoding' option " @@ -9929,11 +9876,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 "" @@ -10013,20 +9962,20 @@ msgid "Exposure" msgstr "Exposició" -#, fuzzy, c-format +#, c-format msgid "Unable to parse response from HTTP proxy: %s" msgstr "" -"No s'ha pogut analitzar la resposta del servidor intermediari d'HTTP: %s\n" +"No s'ha pogut analitzar la resposta del servidor intermediari d'HTTP: %s" #, c-format msgid "HTTP proxy connection error %d" msgstr "Error en la connexió al servidor intermediari d'HTTP %d" # FIXME: tunelitzar... tunelar? fer un túnel? -#, fuzzy, c-format +#, c-format msgid "Access denied: HTTP proxy server forbids port %d tunneling" msgstr "" -"S'ha denegat l'accés: el servidor intermediari d'HTTP prohibix la " +"S'ha denegat l'accés: el servidor intermediari d'HTTP prohibeix la " "tunelització del port %d" #, c-format @@ -10039,7 +9988,7 @@ #, c-format msgid "%s has requested your attention!" -msgstr "%s us ha demanat l'atenció!" +msgstr "%s vos ha demanat l'atenció!" #. * #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons. @@ -10274,13 +10223,13 @@ msgid "Error Reading %s" msgstr "S'ha produït un error en llegir %s" -#, fuzzy, c-format +#, c-format msgid "" "An error was encountered reading your %s. The file has not been loaded, and " "the old file has been renamed to %s~." msgstr "" -"S'ha produït un error en llegir el vostre %s. No s'han carregat, i s'ha " -"canviat el nom del fitxer per %s~." +"S'ha produït un error en llegir el vostre %s. No s'ha carregat el fitxer, i " +"s'ha canviat el nom per %s~." msgid "Internet Messenger" msgstr "Missatger d'Internet" @@ -10324,7 +10273,7 @@ msgid "Use this buddy _icon for this account:" msgstr "Utilitza esta _icona d'amic per a este compte:" -msgid "_Advanced" +msgid "Ad_vanced" msgstr "_Avançat" msgid "Use GNOME Proxy Settings" @@ -10376,7 +10325,7 @@ msgstr "No s'ha pogut alçar el compte nou" msgid "An account already exists with the specified criteria." -msgstr "Ja existix un altre compte amb estos criteris." +msgstr "Ja existeix un altre compte amb estos criteris." msgid "Add Account" msgstr "Afig un compte" @@ -10387,9 +10336,8 @@ msgid "Create _this new account on the server" msgstr "Crea _aquest compte nou al servidor" -#, fuzzy -msgid "_Proxy" -msgstr "Servidor intermediari" +msgid "P_roxy" +msgstr "Servidor _intermediari" msgid "Enabled" msgstr "Habilitat" @@ -10416,8 +10364,8 @@ "voleu que el %s es connecte amb més comptes de missatgeria instantània (MI), " "torneu a prémer Afig fins a configurar-los tots.\n" "\n" -"Podeu tornar a esta finestra per afegir, editar o suprimir comptes, a partir " -"del menú Comptes->Gestiona els comptes a finestra de la llista " +"Podeu tornar a esta finestra per afegir, editar o suprimir comptes, a " +"partir del menú Comptes->Gestiona els comptes a finestra de la llista " "d'amics." #, c-format @@ -10434,15 +10382,14 @@ "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ó 'Expandix' 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." -#, fuzzy msgid "A_ccount" -msgstr "_Compte:" +msgstr "_Compte" msgid "" "Please enter the appropriate information about the chat you would like to " @@ -10469,16 +10416,14 @@ msgid "I_M" msgstr "_MI" -#, fuzzy msgid "_Audio Call" -msgstr "Finalitza la trucada" +msgstr "_Trucada amb àudio" msgid "Audio/_Video Call" -msgstr "" - -#, fuzzy +msgstr "Trucada d'àudio i _vídeo" + msgid "_Video Call" -msgstr "Xat de vídeo" +msgstr "Trucada de _vídeo" msgid "_Send File..." msgstr "_Envia un fitxer..." @@ -10489,11 +10434,9 @@ msgid "View _Log" msgstr "_Visualitza el registre" -#, fuzzy msgid "Hide When Offline" msgstr "Amaga quan estiga fora de línia" -#, fuzzy msgid "Show When Offline" msgstr "Mostra quan estiga fora de línia" @@ -10501,13 +10444,13 @@ msgstr "À_lies..." msgid "_Remove" -msgstr "Sup_rimix" +msgstr "Sup_rimeix" msgid "Set Custom Icon" -msgstr "Establix una icona personalitzada" +msgstr "Estableix una icona personalitzada" msgid "Remove Custom Icon" -msgstr "Suprimix la icona personalitzada" +msgstr "Suprimeix la icona personalitzada" msgid "Add _Buddy..." msgstr "Afig un _amic..." @@ -10516,7 +10459,7 @@ msgstr "Afig un _xat..." msgid "_Delete Group" -msgstr "_Suprimix el grup" +msgstr "_Suprimeix el grup" msgid "_Rename" msgstr "_Canvia el nom" @@ -10535,7 +10478,7 @@ msgstr "_Edita els paràmetres..." msgid "_Collapse" -msgstr "_Reduïx" +msgstr "_Redueix" msgid "_Expand" msgstr "_Amplia" @@ -10564,7 +10507,7 @@ msgstr "/Amics/_Entra a un xat..." msgid "/Buddies/Get User _Info..." -msgstr "/Amics/Aconseguix informació de l'_usuari..." +msgstr "/Amics/Aconsegueix informació de l'_usuari..." msgid "/Buddies/View User _Log..." msgstr "/Amics/_Visualitza el registre de l'usuari..." @@ -10620,9 +10563,8 @@ msgid "/Tools/_Certificates" msgstr "/Eines/C_ertificats" -#, fuzzy msgid "/Tools/Custom Smile_ys" -msgstr "/Eines/Em_oticona" +msgstr "/Eines/Em_oticones personalitzades" msgid "/Tools/Plu_gins" msgstr "/Eines/_Connectors" @@ -10721,7 +10663,7 @@ msgstr "/Amics/Entra a un xat..." msgid "/Buddies/Get User Info..." -msgstr "/Amics/Aconseguix informació de l'usuari..." +msgstr "/Amics/Aconsegueix informació de l'usuari..." msgid "/Buddies/Add Buddy..." msgstr "/Amics/Afig un amic..." @@ -10751,7 +10693,7 @@ msgstr "Per estat" msgid "By recent log activity" -msgstr "" +msgstr "Per activitat recent en el registre" #, c-format msgid "%s disconnected" @@ -10768,7 +10710,7 @@ msgstr "Rehabilita" msgid "SSL FAQs" -msgstr "" +msgstr "PMF sobre SSL" msgid "Welcome back!" msgstr "Ben tornat!" @@ -10778,9 +10720,9 @@ msgid_plural "" "%d accounts were disabled because you signed on from another location:" msgstr[0] "" -"S'ha inhabilitat %d compte perquè us heu connectat des d'un altre lloc:" +"S'ha inhabilitat %d compte perquè vos heu connectat des d'un altre lloc:" msgstr[1] "" -"S'han inhabilitat %d comptes perquè us heu connectat des d'un altre lloc:" +"S'han inhabilitat %d comptes perquè vos heu connectat des d'un altre lloc:" msgid "Username:" msgstr "Nom d'usuari:" @@ -10899,114 +10841,96 @@ msgstr "Color de fons" msgid "The background color for the buddy list" -msgstr "" - -#, fuzzy +msgstr "El color de fons de la llista d'amics" + msgid "Layout" -msgstr "Lasià" +msgstr "Format" msgid "The layout of icons, name, and status of the blist" -msgstr "" - +msgstr "El format de les icones, el nom, i l'estat de la llista d'amics" + +# Color de fons quan la blist està expandida #. Group -#, fuzzy msgid "Expanded Background Color" -msgstr "Color de fons" - -#, fuzzy +msgstr "Color de fons expandit" + msgid "The background color of an expanded group" -msgstr "Nom del color de fons" - -#, fuzzy +msgstr "El color de fons d'un grup expandit" + msgid "Expanded Text" -msgstr "Mida de l'expansor" +msgstr "Text expandit" msgid "The text information for when a group is expanded" -msgstr "" - -#, fuzzy +msgstr "Text informatiu d'un grup expandit" + msgid "Collapsed Background Color" -msgstr "Selecciona el color de fons" - -#, fuzzy +msgstr "Color de fons col·lapsat" + msgid "The background color of a collapsed group" -msgstr "El color de fons com a GdkColor" - -#, fuzzy +msgstr "El color de fons d'un grup col·lapsat" + msgid "Collapsed Text" -msgstr "_Reduïx" +msgstr "Text col·lapsat" msgid "The text information for when a group is collapsed" -msgstr "" +msgstr "Text informatiu d'un grup col·lapsat" #. Buddy -#, fuzzy msgid "Contact/Chat Background Color" -msgstr "Selecciona el color de fons" - -#, fuzzy +msgstr "Color de fons dels contactes i xats" + msgid "The background color of a contact or chat" -msgstr "El color de fons com a GdkColor" - -#, fuzzy +msgstr "El color de fons d'un contacte o un xat" + msgid "Contact Text" -msgstr "Drecera" +msgstr "Text del contacte" msgid "The text information for when a contact is expanded" -msgstr "" - -#, fuzzy +msgstr "Text informatiu quan un contacte s'expandeix" + msgid "On-line Text" -msgstr "En línia" - -#, fuzzy +msgstr "Text en línia" + msgid "The text information for when a buddy is online" -msgstr "Aconsegueix dades sobre l'amic seleccionat" - -#, fuzzy +msgstr "Text informatiu per quan un amic estiga en línia" + msgid "Away Text" -msgstr "Absent" - -#, fuzzy +msgstr "Text d'absència" + msgid "The text information for when a buddy is away" -msgstr "Aconsegueix dades sobre l'amic seleccionat" - -#, fuzzy +msgstr "Text informatiu per quan un amic estiga absent" + msgid "Off-line Text" -msgstr "Fora de línia" - -#, fuzzy +msgstr "Text de fora de línia" + msgid "The text information for when a buddy is off-line" -msgstr "Aconsegueix dades sobre l'amic seleccionat" - -#, fuzzy +msgstr "Text informatiu per quan un amic estiga fora de línia" + msgid "Idle Text" -msgstr "Text sobre l'estat d'ànim" - -#, fuzzy +msgstr "Text d'inactivitat" + msgid "The text information for when a buddy is idle" -msgstr "Aconsegueix dades sobre l'amic seleccionat" +msgstr "Text informatiu per quan un amic estiga inactiu" msgid "Message Text" msgstr "Text del missatge" msgid "The text information for when a buddy has an unread message" -msgstr "" - -#, fuzzy +msgstr "Text informatiu per quan un amic tinga un missatge per llegir" + msgid "Message (Nick Said) Text" -msgstr "Text del missatge" +msgstr "Text del missatge (on s'hi ha dit el sobrenom)" msgid "" "The text information for when a chat has an unread message that mentions " "your nick" msgstr "" - -#, fuzzy +"Text informatiu quan hi ha un missatge per llegir que conté el vostre " +"sobrenom en un xat" + msgid "The text information for a buddy's status" -msgstr "Canvia la informació d'usuari de %s" - -#, fuzzy +msgstr "Text informatiu per l'estat d'un amic" + msgid "Type the host name for this certificate." msgstr "Entreu el nom de l'ordinador al qual pertany este certificat." @@ -11053,9 +10977,8 @@ msgstr "Ignora" msgid "Get Away Message" -msgstr "Aconseguix el missatge d'absència" - -#, fuzzy +msgstr "Aconsegueix el missatge d'absència" + msgid "Last Said" msgstr "El darrer que es digué" @@ -11075,10 +10998,10 @@ msgstr "Anomena i alça la icona..." msgid "Set Custom Icon..." -msgstr "Establix una icona personalitzada..." +msgstr "Estableix una icona personalitzada..." msgid "Change Size" -msgstr "Canvia la grandària" +msgstr "Canvia la mida" msgid "Show All" msgstr "Mostra-ho tot" @@ -11103,21 +11026,17 @@ msgid "/Conversation/Clea_r Scrollback" msgstr "/Conversa/_Neteja la finestra" -#, fuzzy msgid "/Conversation/M_edia" -msgstr "/Conversa/_Més" - -#, fuzzy +msgstr "/Conversa/M_edi" + msgid "/Conversation/Media/_Audio Call" -msgstr "/Conversa/_Més" - -#, fuzzy +msgstr "/Conversa/Medi/_Trucada d'àudio" + msgid "/Conversation/Media/_Video Call" -msgstr "/Conversa/_Més" - -#, fuzzy +msgstr "/Conversa/Medi/Trucada de _vídeo" + msgid "/Conversation/Media/Audio\\/Video _Call" -msgstr "/Conversa/Visualitza el _registre" +msgstr "/Conversa/Medi/Tru_cada d'àudio i vídeo" msgid "/Conversation/Se_nd File..." msgstr "/Conversa/Envia un _fitxer..." @@ -11126,7 +11045,7 @@ msgstr "/Conversa/Afig un a_vís per a l'amic..." msgid "/Conversation/_Get Info" -msgstr "/Conversa/_Aconseguix informació" +msgstr "/Conversa/_Aconsegueix informació" msgid "/Conversation/In_vite..." msgstr "/Conversa/Con_vida..." @@ -11147,13 +11066,13 @@ msgstr "/Conversa/_Afig..." msgid "/Conversation/_Remove..." -msgstr "/Conversa/Sup_rimix..." +msgstr "/Conversa/Sup_rimeix..." msgid "/Conversation/Insert Lin_k..." -msgstr "/Conversa/Inserix un _enllaç..." +msgstr "/Conversa/Insereix un _enllaç..." msgid "/Conversation/Insert Imag_e..." -msgstr "/Conversa/Inserix una _imatge..." +msgstr "/Conversa/Insereix una _imatge..." msgid "/Conversation/_Close" msgstr "/Conversa/_Tanca" @@ -11191,17 +11110,14 @@ msgid "/Conversation/View Log" msgstr "/Conversa/Visualitza el registre" -#, fuzzy msgid "/Conversation/Media/Audio Call" -msgstr "/Conversa/Més" - -#, fuzzy +msgstr "/Conversa/Medi/Trucada d'àudio" + msgid "/Conversation/Media/Video Call" -msgstr "/Conversa/Visualitza el registre" - -#, fuzzy +msgstr "/Conversa/Medi/Trucada de vídeo" + msgid "/Conversation/Media/Audio\\/Video Call" -msgstr "/Conversa/Més" +msgstr "/Conversa/Medi/Trucada d'àudio i vídeo" msgid "/Conversation/Send File..." msgstr "/Conversa/Envia un fitxer..." @@ -11210,7 +11126,7 @@ msgstr "/Conversa/Afig avís per a l'amic..." msgid "/Conversation/Get Info" -msgstr "/Conversa/Aconseguix informació" +msgstr "/Conversa/Aconsegueix informació" msgid "/Conversation/Invite..." msgstr "/Conversa/Convida..." @@ -11228,13 +11144,13 @@ msgstr "/Conversa/Afig..." msgid "/Conversation/Remove..." -msgstr "/Conversa/Suprimix..." +msgstr "/Conversa/Suprimeix..." msgid "/Conversation/Insert Link..." -msgstr "/Conversa/Inserix un enllaç..." +msgstr "/Conversa/Insereix un enllaç..." msgid "/Conversation/Insert Image..." -msgstr "/Conversa/Inserix una imatge..." +msgstr "/Conversa/Insereix una imatge..." msgid "/Options/Enable Logging" msgstr "/Opcions/Habilita el registre" @@ -11334,7 +11250,7 @@ msgstr "Alça el registre de depuració" msgid "Invert" -msgstr "Invertix" +msgstr "Inverteix" msgid "Highlight matches" msgstr "Ressalta les coincidències" @@ -11390,7 +11306,7 @@ msgstr "Ka-Hing Cheung" msgid "voice and video" -msgstr "" +msgstr "veu i vídeo" msgid "support" msgstr "suport" @@ -11449,7 +11365,7 @@ msgstr "Català" msgid "Valencian-Catalan" -msgstr "Valencià (català meridional)" +msgstr "Valencià-català" msgid "Czech" msgstr "Txec" @@ -11519,9 +11435,8 @@ msgid "Hungarian" msgstr "Hongarés" -#, fuzzy msgid "Armenian" -msgstr "Romanés" +msgstr "Armeni" msgid "Indonesian" msgstr "Indonesi" @@ -11538,9 +11453,8 @@ msgid "Ubuntu Georgian Translators" msgstr "Traductors al georgià de l'Ubuntu" -#, fuzzy msgid "Khmer" -msgstr "Altres" +msgstr "Khmer" msgid "Kannada" msgstr "Kannada" @@ -11563,9 +11477,8 @@ msgid "Macedonian" msgstr "Macedoni" -#, fuzzy msgid "Mongolian" -msgstr "Macedoni" +msgstr "Mongol" msgid "Bokmål Norwegian" msgstr "Noruec bokmål" @@ -11623,7 +11536,7 @@ msgstr "Suec" msgid "Swahili" -msgstr "" +msgstr " Suahili" msgid "Tamil" msgstr "Tàmil" @@ -11682,9 +11595,9 @@ "Gadu-Gadu, i QQ, tots alhora. Utilitza la biblioteca de programació GTK+." "

Podeu modificar i redistribuir el programa sota els termes de la GPL " "(versió 2 o posterior). Hi ha una còpia de la GPL dins del fitxer «COPYING» " -"que es distribuix amb el %s. Els drets d'autor del %s pertanyen als seus " +"que es distribueix amb el %s. Els drets d'autor del %s pertanyen als seus " "col·laboradors. El fitxer «COPYRIGHT» conté una llista completa de tots els " -"contribuïdors. No us proporcionem cap mena de garantia amb este programa." +"contribuïdors. No vos proporcionem cap mena de garantia amb este programa." "

" #, c-format @@ -11692,21 +11605,26 @@ "FAQ: http://developer.pidgin.im/wiki/FAQ

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

" #, c-format msgid "" "Help via e-mail: support@pidgin.im

" msgstr "" - -#, fuzzy, c-format +"Ajuda per correu electrònic: support@pidgin.im

" + +#, c-format msgid "" "IRC Channel: #pidgin on irc.freenode.net

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

" - -#, fuzzy, c-format +msgstr "" +"Canal d'IRC: #pidgin a irc.freenode.net

" + +#, c-format msgid "XMPP MUC: devel@conference.pidgin.im

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

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

" msgid "Current Developers" msgstr "Desenvolupadors actuals" @@ -11736,7 +11654,7 @@ msgstr "_Compte" msgid "Get User Info" -msgstr "Aconseguix dades de l'usuari" +msgstr "Aconsegueix dades de l'usuari" msgid "" "Please enter the username or alias of the person whose info you would like " @@ -11782,10 +11700,10 @@ "d'amics. Voleu continuar?" msgid "Remove Contact" -msgstr "Suprimix el contacte" +msgstr "Suprimeix el contacte" msgid "_Remove Contact" -msgstr "_Suprimix el contacte" +msgstr "_Suprimeix el contacte" #, c-format msgid "" @@ -11809,10 +11727,10 @@ "Voleu continuar?" msgid "Remove Group" -msgstr "Suprimix el grup" +msgstr "Suprimeix el grup" msgid "_Remove Group" -msgstr "_Suprimix el grup" +msgstr "_Suprimeix el grup" #, c-format msgid "" @@ -11820,10 +11738,10 @@ msgstr "Esteu segur que voleu suprimir %s de la llista d'amics?" msgid "Remove Buddy" -msgstr "Suprimix l'amic" +msgstr "Suprimeix l'amic" msgid "_Remove Buddy" -msgstr "Sup_rimix un amic" +msgstr "Sup_rimeix un amic" #, c-format msgid "" @@ -11832,10 +11750,10 @@ msgstr "Esteu segur que voleu suprimir el xat %s de la llista d'amics?" msgid "Remove Chat" -msgstr "Suprimix el Xat" +msgstr "Suprimeix el Xat" msgid "_Remove Chat" -msgstr "_Suprimix el Xat" +msgstr "_Suprimeix el Xat" # FIXME: Do not use "Right click", as left-handed people would use left click. # Instead it might be better to use "primary button" (josep) @@ -11930,19 +11848,11 @@ msgid "File transfer _details" msgstr "_Detalls de la transferència de fitxers" -#. Pause button -msgid "_Pause" -msgstr "_Pausa" - -#. Resume button -msgid "_Resume" -msgstr "_Continua" - msgid "Paste as Plain _Text" msgstr "Enganxa com a _text" msgid "_Reset formatting" -msgstr "_Restablix el format" +msgstr "_Restableix el format" msgid "Disable _smileys in selected text" msgstr "Inhabilita les emoticones en el text _seleccionat" @@ -11956,7 +11866,6 @@ msgid "Hyperlink visited color" msgstr "Color dels enllaços visitats" -#, fuzzy msgid "Color to draw hyperlink after it has been visited (or activated)." msgstr "" "El color amb el qual es pintaran els enllaços que ja s'hagen visitat (o " @@ -11999,24 +11908,21 @@ msgid "Action Message Name Color for Whispered Message" msgstr "Color del nom del missatge d'acció per a missatges xiuxiuejats" -#, fuzzy msgid "Color to draw the name of a whispered action message." -msgstr "Color amb el qual es pintaran els missatges d'acció." +msgstr "Color amb el qual es pintaran els missatges d'acció xiuxiuejats." msgid "Whisper Message Name Color" msgstr "Color dels missatges xiuxiuejats enviats" -#, fuzzy msgid "Color to draw the name of a whispered message." -msgstr "Color amb el qual es pintaran els missatges d'acció." +msgstr "Color amb el qual es pintaran els missatges xiuxiuejats." msgid "Typing notification color" msgstr "Color per a les notificacions de quan s'escriu" -#, fuzzy msgid "The color to use for the typing notification" msgstr "" -"El color que s'emprarà per a les notificacions indicant que s'està escrivint" +"El color que s'emprarà per a les notificacions indicant que s'està teclejant" msgid "Typing notification font" msgstr "Tipus de lletra de les notificacions quan s'escriu" @@ -12104,25 +12010,25 @@ msgstr "Introduïu l'URL i la descripció de l'enllaç que vulgueu inserir." msgid "Insert Link" -msgstr "Inserix un enllaç" +msgstr "Insereix un enllaç" msgid "_Insert" -msgstr "_Inserix" +msgstr "_Insereix" #, c-format msgid "Failed to store image: %s\n" msgstr "No s'ha pogut emmagatzemar la imatge: %s\n" msgid "Insert Image" -msgstr "Inserix una imatge" +msgstr "Insereix una imatge" #, c-format msgid "" "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!" @@ -12156,10 +12062,10 @@ msgstr "Ratlla" msgid "Increase Font Size" -msgstr "Augmenta grandària de la lletra" +msgstr "Augmenta mida de la lletra" msgid "Decrease Font Size" -msgstr "Disminuix la grandària de la lletra" +msgstr "Disminueix la mida de la lletra" # FIXME? msgid "Font Face" @@ -12169,13 +12075,13 @@ msgstr "Color del text" msgid "Reset Formatting" -msgstr "Restablix el format" +msgstr "Restableix el format" msgid "Insert IM Image" -msgstr "Inserix una imatge de MI" +msgstr "Insereix una imatge de MI" msgid "Insert Smiley" -msgstr "Inserix una emoticona" +msgstr "Insereix una emoticona" msgid "_Bold" msgstr "_Negreta" @@ -12257,7 +12163,7 @@ msgstr "Voleu suprimir el registre?" msgid "Delete Log..." -msgstr "Suprimix el registre..." +msgstr "Suprimeix el registre..." #, c-format msgid "Conversation in %s on %s" @@ -12275,7 +12181,7 @@ msgid "%s %s. Try `%s -h' for more information.\n" msgstr "%s %s. Proveu «%s -h» per a més informació.\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -12297,8 +12203,11 @@ "\n" " -c, --config=DIR utilitza DIR per als fitxers de configuració\n" " -d, --debug mostra missatges de depuració a la eixida estàndard\n" +" -f, --force-online força que s'estiga en línia, independent de l'estat " +"de\n" +" la xarxa\n" " -h, --help mostra esta ajuda i ix\n" -" -m, --multiple permet que hi haja més d'una instància\n" +" -m, --multiple no controla que només hi haja una instància\n" " -n, --nologin no entra automàticament\n" " -l, --login[=NOM] habilita el compte especificat (l'argument opcional " "NOM\n" @@ -12308,7 +12217,7 @@ " --display=PANTALLA pantalla X a utilitzar\n" " -v, --version mostra la versió actual i ix\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -12329,8 +12238,11 @@ "\n" " -c, --config=DIR utilitza DIR per als fitxers de configuració\n" " -d, --debug mostra missatges de depuració a la eixida estàndard\n" +" -f, --force-online força que s'estiga en línia, independent de l'estat " +"de\n" +" la xarxa\n" " -h, --help mostra esta ajuda i ix\n" -" -m, --multiple permet que hi haja més d'una instància\n" +" -m, --multiple no controla que només hi haja una instància\n" " -n, --nologin no entra automàticament\n" " -l, --login[=NOM] habilita el compte especificat (l'argument opcional " "NOM\n" @@ -12376,24 +12288,25 @@ #, c-format msgid "Exiting because another libpurple client is already running.\n" msgstr "" +"Ara se eixirà atès que ja hi ha un altre client del libpurple executant-" +"se.\n" msgid "/_Media" -msgstr "" +msgstr "/_Medi" msgid "/Media/_Hangup" -msgstr "" - -#, fuzzy +msgstr "/Medi/_Penja" + msgid "Calling..." -msgstr "S'està calculant..." +msgstr "S'està trucant..." #, c-format msgid "%s wishes to start an audio/video session with you." -msgstr "" +msgstr "%s vol iniciar una sessió d'àudio/vídeo." #, c-format msgid "%s wishes to start a video session with you." -msgstr "" +msgstr "%s vol iniciar una sessió de vídeo." #, c-format msgid "%s has %d new message." @@ -12423,9 +12336,8 @@ msgstr "" "S'ha triat l'orde per al navegador «manualment», però no se n'ha indicat cap." -#, fuzzy msgid "No message" -msgstr "(1 missatge)" +msgstr "Cap missatge" msgid "Open All Messages" msgstr "Obri tots els missatges" @@ -12433,16 +12345,16 @@ msgid "You have mail!" msgstr "Teniu correu electrònic." -#, fuzzy msgid "New Pounces" -msgstr "Avís nou per a l'amic" - +msgstr "Avisos nous" + +# FIXME: Cancel·la? msgid "Dismiss" -msgstr "" - -#, fuzzy +msgstr "Rebutja" + +# FIXME: pounced -> envestir? msgid "You have pounced!" -msgstr "Teniu correu electrònic." +msgstr "Vos han envestit!" msgid "The following plugins will be unloaded." msgstr "Es descarregaran els connectors següents." @@ -12492,9 +12404,8 @@ msgid "Select a file" msgstr "Seleccioneu un fitxer" -#, fuzzy msgid "Modify Buddy Pounce" -msgstr "Edita l'avís per a l'amic" +msgstr "Modifica l'avís per a l'amic" # FIXME #. Create the "Pounce on Whom" frame. @@ -12574,61 +12485,58 @@ msgid "Pounce Target" msgstr "Objectiu de l'avís" -#, fuzzy, c-format +#, c-format msgid "Started typing" -msgstr "Comence a escriure" - -#, fuzzy, c-format +msgstr "Haja començat a escriure" + +#, c-format msgid "Paused while typing" msgstr "S'ature mentre tecleja" -#, fuzzy, c-format +#, c-format msgid "Signed on" msgstr "Es connecte" -#, fuzzy, c-format +#, c-format msgid "Returned from being idle" -msgstr "Tor_na a estar actiu" - -#, fuzzy, c-format +msgstr "Torna a estar actiu" + +#, c-format msgid "Returned from being away" msgstr "Torne a estar present" -#, fuzzy, c-format +#, c-format msgid "Stopped typing" msgstr "Pare d'escriure" -#, fuzzy, c-format +#, c-format msgid "Signed off" msgstr "Es desconnecte" -#, fuzzy, c-format +#, c-format msgid "Became idle" msgstr "Passe a inactiu" -#, fuzzy, c-format +#, c-format msgid "Went away" msgstr "En estar absent" -#, fuzzy, c-format +#, c-format msgid "Sent a message" msgstr "Envia un missatge" -#, fuzzy, c-format +#, c-format msgid "Unknown.... Please report this!" msgstr "Esdeveniment d'avís desconegut, informeu-nos-en." -#, fuzzy msgid "Theme failed to unpack." -msgstr "No s'ha pogut desempaquetar el tema d'emoticones." - -#, fuzzy +msgstr "No s'ha pogut desempaquetar el tema." + msgid "Theme failed to load." -msgstr "No s'ha pogut desempaquetar el tema d'emoticones." - -#, fuzzy +msgstr "No s'ha pogut carregar el tema." + msgid "Theme failed to copy." -msgstr "No s'ha pogut desempaquetar el tema d'emoticones." +msgstr "No s'ha pogut copiar el tema." msgid "Install Theme" msgstr "Instal·la el tema" @@ -12650,9 +12558,8 @@ msgstr "Tanca les converses amb la tecla d'_escapament" #. Buddy List Themes -#, fuzzy msgid "Buddy List Theme" -msgstr "Llista d'amics" +msgstr "Tema de la llista d'amics" #. System Tray msgid "System Tray Icon" @@ -12664,9 +12571,8 @@ msgid "On unread messages" msgstr "Si hi ha missatges sense llegir" -#, fuzzy msgid "Conversation Window" -msgstr "Finestres de MI" +msgstr "Finestra de conversa" msgid "_Hide new IM conversations:" msgstr "_Amaga noves converses de MI:" @@ -12733,7 +12639,7 @@ msgstr "Empra el desplaçament suau" msgid "F_lash window when IMs are received" -msgstr "_Fes que la finestra faci un flaix quan hi arriben missatges" +msgstr "_Fes que la finestra faça un flaix quan hi arriben missatges" msgid "Minimum input area height in lines:" msgstr "Alçada mínima en línies de l'àrea d'entrada:" @@ -12770,9 +12676,9 @@ msgid "Example: stunserver.org" msgstr "Exemple: stunserver.org" -#, fuzzy, c-format +#, c-format msgid "Use _automatically detected IP address: %s" -msgstr "Detecta l'_adreça IP automàticament" +msgstr "Empra l'_adreça IP detectada automàticament: %s" msgid "Public _IP:" msgstr "IP _pública:" @@ -12794,7 +12700,7 @@ #. TURN server msgid "Relay Server (TURN)" -msgstr "" +msgstr "Servidor repetidor (TURN)" msgid "Proxy Server & Browser" msgstr "Servidor intermediari i navegador" @@ -12828,7 +12734,7 @@ #. This is a global option that affects SOCKS4 usage even with account-specific proxy settings msgid "Use remote DNS with SOCKS4 proxies" -msgstr "" +msgstr "Empra DNS remot amb servidors intermediàris SOCKS4" msgid "_User:" msgstr "_Usuari:" @@ -12964,7 +12870,7 @@ msgstr "V_olum:" msgid "Play" -msgstr "Reproduix" +msgstr "Reprodueix" msgid "_Browse..." msgstr "_Navega..." @@ -13041,31 +12947,31 @@ msgstr "Els canvis en les opcions de privadesa es realitzen immediatament." msgid "Set privacy for:" -msgstr "Establix la privadesa de:" +msgstr "Estableix la privadesa de:" #. Remove All button msgid "Remove Al_l" -msgstr "S_uprimix-ho tot" +msgstr "S_uprimeix-ho tot" msgid "Permit User" msgstr "Permet l'usuari" msgid "Type a user you permit to contact you." -msgstr "Escriviu quin usuari permeteu que us contacti." +msgstr "Escriviu quin usuari permeteu que vos contacti." msgid "Please enter the name of the user you wish to be able to contact you." -msgstr "Introduïu el nom de l'usuari que vulgueu que us puga contactar." +msgstr "Introduïu el nom de l'usuari que vulgueu que vos puga contactar." msgid "_Permit" msgstr "_Permet" #, c-format msgid "Allow %s to contact you?" -msgstr "Voleu permetre que %s us puga contactar?" +msgstr "Voleu permetre que %s vos puga contactar?" #, c-format msgid "Are you sure you wish to allow %s to contact you?" -msgstr "Esteu segur que voleu permetre que %s us puga contactar?" +msgstr "Esteu segur que voleu permetre que %s vos puga contactar?" msgid "Block User" msgstr "Bloca un usuari" @@ -13088,7 +12994,7 @@ msgstr "Aplica" msgid "That file already exists" -msgstr "Este fitxer ja existix" +msgstr "Este fitxer ja existeix" msgid "Would you like to overwrite it?" msgstr "El voleu sobreescriure?" @@ -13104,7 +13010,7 @@ #. list button msgid "_Get List" -msgstr "Aconseguix la _llista" +msgstr "Aconsegueix la _llista" #. add button msgid "_Add Chat" @@ -13142,12 +13048,11 @@ msgid "Status for %s" msgstr "Estat per a %s" -#, fuzzy, c-format +#, c-format msgid "" "A custom smiley for '%s' already exists. Please use a different shortcut." msgstr "" -"Hi ha una emoticona personalitzada per la drecera que heu seleccionat. " -"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" @@ -13161,28 +13066,24 @@ msgid "Add Smiley" msgstr "Afig una emoticona" -#, fuzzy msgid "_Image:" -msgstr "_Imatge" +msgstr "_Imatge:" #. Shortcut text -#, fuzzy msgid "S_hortcut text:" -msgstr "Drecera" +msgstr "_Drecera:" msgid "Smiley" msgstr "Emoticona" -#, fuzzy msgid "Shortcut Text" msgstr "Drecera" msgid "Custom Smiley Manager" msgstr "Gestor d'emoticones personalitzades" -#, fuzzy msgid "Select Buddy Icon" -msgstr "Selecciona" +msgstr "Seleccioneu una icona per a l'amic" msgid "Click to change your buddyicon for this account." msgstr "Feu clic per canviar la icona d'amic d'este compte." @@ -13231,17 +13132,17 @@ "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 "Establix com a icona de l'amic" +msgstr "Estableix com a icona de l'amic" msgid "Send image file" msgstr "Envia un fitxer d'imatge" msgid "Insert in message" -msgstr "Inserix en el missatge" +msgstr "Insereix en el missatge" msgid "Would you like to set it as the buddy icon for this user?" msgstr "Voleu establir-la com la icona per a este amic?" @@ -13250,15 +13151,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 clue how that would be a desktop item) and "Comment"... nothing we can really @@ -13268,7 +13169,6 @@ msgid "Cannot send launcher" msgstr "No es pot enviar el llançador" -#, fuzzy msgid "" "You dragged a desktop launcher. Most likely you wanted to send the target of " "this launcher instead of this launcher itself." @@ -13283,8 +13183,8 @@ "Image size: %dx%d" msgstr "" "Fitxer: %s\n" -"Grandària del fitxer: %s\n" -"Grandària de la imatge: %dx%d" +"Mida del fitxer: %s\n" +"Mida de la imatge: %dx%d" #, c-format msgid "The file '%s' is too large for %s. Please try a smaller image.\n" @@ -13309,18 +13209,29 @@ "No s'ha pogut carregar la imatge «%s»: no se'n coneix el motiu, possiblement " "la imatge estiga corrompuda" -#, fuzzy msgid "_Open Link" -msgstr "_Obri la ubicació de l'enllaç a:" +msgstr "_Obri l'enllaç" msgid "_Copy Link Location" -msgstr "_Copia la ubicació de l'enllaç" +msgstr "_Copia l'enllaç" msgid "_Copy Email Address" msgstr "_Copia l'adreça de correu" +msgid "_Open File" +msgstr "_Obri un fitxer" + +msgid "Open _Containing Directory" +msgstr "Obri el directori on es _troba" + msgid "Save File" -msgstr "Alça un fitxer" +msgstr "Alça el fitxer" + +msgid "_Play Sound" +msgstr "_Reprodueix un so" + +msgid "_Save File" +msgstr "Al_ça el fitxer" msgid "Select color" msgstr "Seleccioneu un color" @@ -13332,7 +13243,7 @@ msgstr "Tanca les _pestanyes" msgid "_Get Info" -msgstr "Aconseguix _informació" +msgstr "Aconsegueix _informació" msgid "_Invite" msgstr "Conv_ida" @@ -13346,6 +13257,9 @@ msgid "_Open Mail" msgstr "_Obri el correu" +msgid "_Pause" +msgstr "_Pausa" + msgid "_Edit" msgstr "_Edita" @@ -13413,79 +13327,67 @@ msgstr "" "Mostra informació estadística sobre la disponibilitat dels vostres amics" -#, fuzzy msgid "Server name request" -msgstr "Adreça del servidor" - -#, fuzzy +msgstr "Sol·licitud del nom del servidor" + msgid "Enter an XMPP Server" -msgstr "Introduïu un servidor de conferències" - -#, fuzzy +msgstr "Introduïu un servidor XMPP" + msgid "Select an XMPP server to query" -msgstr "Seleccioneu a quin servidor de conferències consultar" - -#, fuzzy +msgstr "Seleccioneu el servidor XMPP a consultar" + msgid "Find Services" -msgstr "Serveis en línia" - -#, fuzzy +msgstr "Cerca serveis" + msgid "Add to Buddy List" -msgstr "Envia la llista d'amics" - -#, fuzzy +msgstr "Afig a la llista d'amics" + msgid "Gateway" -msgstr "Passe a absent" - -#, fuzzy +msgstr "Passarel·la" + msgid "Directory" -msgstr "Directori dels registres" - -#, fuzzy +msgstr "Directori" + msgid "PubSub Collection" -msgstr "Selecció de sons" - -#, fuzzy +msgstr "Col·lecció PubSub" + +# Mes info a xep-0060 msgid "PubSub Leaf" -msgstr "Servici PubSub" - -#, fuzzy +msgstr "Fulla PubSub" + msgid "" "\n" "Description: " msgstr "" "\n" -"Descripció: Xerraire" +"Descripció: " #. Create the window. -#, fuzzy msgid "Service Discovery" -msgstr "Informació del servici de descoberta" - -#, fuzzy +msgstr "Servei de descoberta" + msgid "_Browse" -msgstr "_Navegador:" - -#, fuzzy +msgstr "_Navega" + msgid "Server does not exist" -msgstr "L'usuari no existix." - -#, fuzzy +msgstr "El servidor no existeix" + msgid "Server does not support service discovery" -msgstr "No hi ha cap mètode d'autenticació compatible amb este servidor" - -#, fuzzy +msgstr "El servidor no permet la descoberta de serveis" + +# xep-0060 msgid "XMPP Service Discovery" -msgstr "Informació del servici de descoberta" +msgstr "Servei de descoberta XMPP" msgid "Allows browsing and registering services." -msgstr "" - -#, fuzzy +msgstr "Permet navegar i registrar-se a serveis." + msgid "" "This plugin is useful for registering with legacy transports or other XMPP " "services." -msgstr "Este connector és útil per a depurar servidors i clients XMPP." +msgstr "" +"Este servei és útil per registrar-vos a transports antics o altres serveis " +"XMPP." msgid "Buddy is idle" msgstr "L'amic està inactiu" @@ -13534,14 +13436,14 @@ msgid "" "Allows for controlling the values associated with different buddy states." msgstr "" -"Us permet canviar els valors associats als diferents estats dels amics." +"Vos permet canviar els valors associats als diferents estats dels amics." #. *< description msgid "" "Allows for changing the point values of idle/away/offline states for buddies " "in contact priority computations." msgstr "" -"Us permet canviar els valors dels estats inactiu, absent i desconnectat pel " +"Vos permet canviar els valors dels estats inactiu, absent i desconnectat pel " "càlcul de la prioritat dels amics." msgid "Conversation Colors" @@ -13618,7 +13520,7 @@ "Restrict the number of conversations per windows, optionally separating IMs " "and Chats" msgstr "" -"Restringix el nombre de converses per finestra, separant opcionalment la MI " +"Restringeix el nombre de converses per finestra, separant opcionalment la MI " "dels xats" #. Configuration frame @@ -13880,7 +13782,6 @@ msgstr "Connector de missatgeria de música per a composar conjuntament." #. * summary -#, fuzzy msgid "" "The Music Messaging Plugin allows a number of users to simultaneously work " "on a piece of music by editing a common score in real-time." @@ -13908,11 +13809,11 @@ #. Count method button msgid "Insert c_ount of new messages into window title" -msgstr "Inserix el _nombre de missatges nous al títol de la finestra" +msgstr "Insereix el _nombre de missatges nous al títol de la finestra" #. Count xprop method button msgid "Insert count of new message into _X property" -msgstr "Inserix el compte de missatges nous a la propietat _X" +msgstr "Insereix el compte de missatges nous a la propietat _X" #. Urgent method button msgid "Set window manager \"_URGENT\" hint" @@ -13936,23 +13837,23 @@ #. Remove on focus button msgid "Remove when conversation window _gains focus" -msgstr "Suprimix quan la finestra de la conversa esti_gui activada" +msgstr "Suprimeix quan la finestra de la conversa esti_gui activada" #. Remove on click button msgid "Remove when conversation window _receives click" -msgstr "Suprimix quan es faci clic a la finestra de la conve_rsa" +msgstr "Suprimeix quan es faça clic a la finestra de la conve_rsa" #. Remove on type button msgid "Remove when _typing in conversation window" -msgstr "Suprimix quan s'escriga a la fines_tra de la conversa" +msgstr "Suprimeix quan s'escriga a la fines_tra de la conversa" #. Remove on message send button msgid "Remove when a _message gets sent" -msgstr "Suprimix quan s'envie un _missatge" +msgstr "Suprimeix quan s'envie un _missatge" #. Remove on conversation switch button msgid "Remove on switch to conversation ta_b" -msgstr "Suprimix en canviar a la _pestanya de la conversa" +msgstr "Suprimeix en canviar a la _pestanya de la conversa" #. *< type #. *< ui_requirement @@ -13969,7 +13870,7 @@ #. * description msgid "Provides a variety of ways of notifying you of unread messages." msgstr "" -"Us proporciona diferents maneres de notificar-vos la presència de missatges " +"Vos proporciona diferents maneres de notificar-vos la presència de missatges " "sense llegir." #. *< type @@ -13995,7 +13896,7 @@ "- It sends a message to people on your list immediately when they sign on" msgstr "" "Este és un connector realment interessant que fa moltes coses:\n" -"- mostra qui ha escrit el programa quan us connecteu\n" +"- mostra qui ha escrit el programa quan vos connecteu\n" "- escriu a l'inrevés tots els missatges rebuts\n" "- envia un missatge a tots els amics immediatament després que es connecten" @@ -14008,7 +13909,6 @@ msgid "Highlighted Message Name Color" msgstr "Nom del color per als missatges ressaltats" -#, fuzzy msgid "Typing Notification Color" msgstr "Color per a les notificacions de quan s'escriu" @@ -14041,24 +13941,20 @@ msgid "GTK+ Text Shortcut Theme" msgstr "Tema de la drecera de text de GTK+" -#, fuzzy msgid "Disable Typing Notification Text" -msgstr "Habilita les notificacions de que s'està escrivint" - -#, fuzzy +msgstr "Inhabilita les notificacions de que s'està escrivint" + msgid "GTK+ Theme Control Settings" -msgstr "Control de temes GTK+ del Pidgin" - -#, fuzzy +msgstr "Configuració dels temes GTK+" + msgid "Colors" -msgstr "Tanca" +msgstr "Colors" msgid "Fonts" msgstr "Tipus de lletra" -#, fuzzy msgid "Miscellaneous" -msgstr "Error miscel·lani" +msgstr "Miscel·lània" msgid "Gtkrc File Tools" msgstr "Eines de fitxer Gtkrc" @@ -14080,13 +13976,13 @@ msgstr "En brut" msgid "Lets you send raw input to text-based protocols." -msgstr "Us permet enviar dades en brut als protocols en mode text." +msgstr "Vos permet enviar dades en brut als protocols en mode text." msgid "" "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit " "'Enter' in the entry box to send. Watch the debug window." msgstr "" -"Us permet enviar dades en brut als protocols en mode text (XMPP, MSN, IRC, " +"Vos permet enviar dades en brut als protocols en mode text (XMPP, MSN, IRC, " "TOC). Premeu la tecla de retorn del quadre d'entrada per enviar-les. " "Observeu la finestra de depuració." @@ -14123,7 +14019,7 @@ "Checks periodically for new releases and notifies the user with the " "ChangeLog." msgstr "" -"Comprova periòdicament si hi ha versions noves i us ho notifica juntament " +"Comprova periòdicament si hi ha versions noves i vos ho notifica juntament " "amb el seu registre de canvis." #. *< major version @@ -14144,7 +14040,6 @@ msgstr "Botó d'enviar de la finestra de conversa." #. *< summary -#, fuzzy msgid "" "Adds a Send button to the entry area of the conversation window. Intended " "for use when no physical keyboard is present." @@ -14156,7 +14051,7 @@ msgstr "Duplicació de la correcció" msgid "The specified word already exists in the correction list." -msgstr "La paraula especificada ja existix a la llista de correccions." +msgstr "La paraula especificada ja existeix a la llista de correccions." msgid "Text Replacements" msgstr "Substitució de text" @@ -14171,7 +14066,7 @@ msgstr "Només paraules completes" msgid "Case sensitive" -msgstr "Distingix majúscules i minúscules" +msgstr "Distingeix majúscules i minúscules" msgid "Add a new text replacement" msgstr "Afig una altra substitució de text" @@ -14184,10 +14079,10 @@ #. Created here so it can be passed to whole_words_button_toggled. msgid "_Exact case match (uncheck for automatic case handling)" -msgstr "Coincidix _majúscules i minúscules (desactiveu per a automàtic)" +msgstr "Coincideix _majúscules i minúscules (desactiveu per a automàtic)" msgid "Only replace _whole words" -msgstr "Substituix només paraules _completes" +msgstr "Substitueix només paraules _completes" msgid "General Text Replacement Options" msgstr "Opcions generals de la substitució de text" @@ -14200,99 +14095,81 @@ msgid "Replaces text in outgoing messages according to user-defined rules." msgstr "" -"Substituix el text dels missatges que s'envien emprant les regles que hàgeu " +"Substitueix el text dels missatges que s'envien emprant les regles que hàgeu " "establit." -#, fuzzy msgid "Just logged in" -msgstr "No està connectat" - -#, fuzzy +msgstr "Acabat de connectar" + msgid "Just logged out" -msgstr "%s ha sortit." +msgstr "Acabat de desconnectar" msgid "" "Icon for Contact/\n" "Icon for Unknown person" msgstr "" - -#, fuzzy +"Icona per a un contacte/\n" +"Icona per a una persona desconeguda" + msgid "Icon for Chat" -msgstr "Entra a un xat" - -#, fuzzy +msgstr "Icona per un xat" + msgid "Ignored" -msgstr "Ignora" - -#, fuzzy +msgstr "Ignorat" + msgid "Founder" -msgstr "Més alt" - -#, fuzzy +msgstr "Fundador" + msgid "Operator" -msgstr "Opera" +msgstr "Operador" msgid "Half Operator" -msgstr "" - -#, fuzzy +msgstr "Mig operador" + msgid "Authorization dialog" -msgstr "S'ha donat l'autorització" - -#, fuzzy +msgstr "Diàleg d'autorització" + msgid "Error dialog" -msgstr "Error" - -#, fuzzy +msgstr "Diàleg d'error" + msgid "Information dialog" -msgstr "Informació" +msgstr "Diàleg d'informació" msgid "Mail dialog" -msgstr "" - -#, fuzzy +msgstr "Diàleg del correu" + msgid "Question dialog" -msgstr "Diàleg de sol·licitud" - -#, fuzzy +msgstr "Diàleg de pregunta" + msgid "Warning dialog" -msgstr "Nivell d'avís" +msgstr "Diàleg d'avís" msgid "What kind of dialog is this?" -msgstr "" - -#, fuzzy +msgstr "Quin tipus de diàleg és este?" + msgid "Status Icons" -msgstr "Estat per a %s" - -# FIXME: no poso localització perquè l'usuari ho podria -# confondre amb "ubicació" (josep) -#, fuzzy +msgstr "Icona d'estat" + msgid "Chatroom Emblems" -msgstr "Característiques locals de la sala de xat" - -#, fuzzy +msgstr "Distintius de les sales de xat" + msgid "Dialog Icons" -msgstr "Canvia la icona" - -#, fuzzy +msgstr "Icones dels quadres de diàleg" + msgid "Pidgin Icon Theme Editor" -msgstr "Control de temes GTK+ del Pidgin" - -#, fuzzy +msgstr "Editor de temes d'icona del Pidgin" + msgid "Contact" -msgstr "Informació del contacte" - -#, fuzzy +msgstr "Contacte" + msgid "Pidgin Buddylist Theme Editor" -msgstr "Llista d'amics" - -#, fuzzy +msgstr "Editor de temes per a la llista d'amics del Pidgin" + msgid "Edit Buddylist Theme" -msgstr "Llista d'amics" +msgstr "Edita el tema de la llista d'amics" msgid "Edit Icon Theme" -msgstr "" +msgstr "Edita el tema d'icones" #. *< type #. *< ui_requirement @@ -14301,16 +14178,14 @@ #. *< priority #. *< id #. * description -#, fuzzy msgid "Pidgin Theme Editor" -msgstr "Control de temes GTK+ del Pidgin" +msgstr "Editor de temes del Pidgin" #. *< name #. *< version #. * summary -#, fuzzy msgid "Pidgin Theme Editor." -msgstr "Control de temes GTK+ del Pidgin" +msgstr "Editor de temes del Pidgin" # FIXME (josep) #. *< type @@ -14424,8 +14299,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 @@ -14449,10 +14323,10 @@ "\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" -"\n" -"* Nota: este connector requerix Windows 2000 o superior." +"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." msgid "GTK+ Runtime Version" msgstr "Versió del mòdul d'execució de GTK+" @@ -14482,7 +14356,6 @@ msgid "Options specific to Pidgin for Windows." msgstr "Opcions específiques de la versió del Pidgin per al Windows" -#, fuzzy msgid "" "Provides options specific to Pidgin for Windows, such as buddy list docking." msgstr "" @@ -14509,13 +14382,13 @@ # FIXME: stanza -> estrofa (literal) (Josep) msgid "Insert an stanza." -msgstr "Inserix un bloc ." +msgstr "Insereix un bloc ." msgid "Insert a stanza." -msgstr "Inserix un bloc ." +msgstr "Insereix un bloc ." msgid "Insert a stanza." -msgstr "Inserix un bloc ." +msgstr "Insereix un bloc ." #. *< name #. *< version @@ -14527,6 +14400,23 @@ msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "Este connector és útil per a depurar servidors i clients XMPP." +#~ msgid "_Resume" +#~ msgstr "_Continua" + +#~ msgid "" +#~ "%s declined your conference invitation to room \"%s\" because \"%s\"." +#~ msgstr "" +#~ "%s no ha acceptat la vostra invitació d'entrar a la sala «%s» perquè «%s»." + +#~ msgid "Invitation Rejected" +#~ msgstr "S'ha rebutjat la invitació" + +#~ msgid "Malformed BOSH Connect Server" +#~ msgstr "La connexió al servidor BOSH està malmesa" + +#~ msgid "_Proxy" +#~ msgstr "Servidor _intermediari" + #~ msgid "Cannot open socket" #~ msgstr "No s'ha pogut obrir el sòcol" @@ -14555,24 +14445,141 @@ #~ "Could not establish a connection with the server:\n" #~ "%s" #~ msgstr "" -#~ "No s'ha pogut establir una connexió amb al servidor:\n" +#~ "No s'ha pogut establir una connexió amb el servidor:\n" #~ "%s" #~ msgid "Write error" #~ msgstr "Error d'escriptura" +#~ msgid "Read Error" +#~ msgstr "Error de lectura" + +#~ msgid "Failed to connect to server." +#~ msgstr "No s'ha pogut connectar al servidor." + +#~ msgid "Read buffer full (2)" +#~ msgstr "La memòria intermèdia de lectura és plena (2)" + +#~ msgid "Unparseable message" +#~ msgstr "No es pot analitzar el missatge" + +#~ msgid "Couldn't connect to host: %s (%d)" +#~ msgstr "No s'ha pogut connectar a l'ordinador: %s (%d)" + +#~ msgid "Login failed (%s)." +#~ msgstr "Ha fallat l'entrada (%s)." + +#~ msgid "" +#~ "You have been logged out because you logged in at another workstation." +#~ msgstr "" +#~ "Se us ha desconnectat perquè heu entrat a través d'una altra estació de " +#~ "treball." + +#~ msgid "Error. SSL support is not installed." +#~ msgstr "Error. No hi ha instal·lades les biblioteques per a SSL." + +#~ msgid "Incorrect password." +#~ msgstr "La contrasenya no és correcta." + +#~ msgid "" +#~ "Could not connect to BOS server:\n" +#~ "%s" +#~ msgstr "" +#~ "No s'ha pogut connectar al servidor BOS:\n" +#~ "%s" + +#~ msgid "You may be disconnected shortly. Check %s for updates." +#~ msgstr "" +#~ "Se us pot desconnectar d'aquí a poc temps. Comproveu si hi ha " +#~ "actualitzacions a %s." + +#~ msgid "Could Not Connect" +#~ msgstr "No s'ha pogut connectar" + +#~ msgid "Could not decrypt server reply" +#~ msgstr "No s'ha pogut desxifrar la resposta del servidor" + +#~ msgid "Invalid username." +#~ msgstr "El nom d'usuari no és vàlid" + +#~ msgid "Connection lost" +#~ msgstr "S'ha perdut la connexió" + +#~ msgid "Couldn't resolve host" +#~ msgstr "No s'ha pogut obtenir l'adreça de l'ordinador" + +#~ msgid "Connection closed (writing)" +#~ msgstr "S'ha tancat la connexió (escrivint)" + +#~ msgid "Connection reset" +#~ msgstr "S'ha reiniciat la connexió" + +#~ msgid "Error reading from socket: %s" +#~ msgstr "S'ha produït un error en llegir del sòcol: %s" + +#~ msgid "Unable to connect to host" +#~ msgstr "No s'ha pogut connectar a l'ordinador" + +#~ msgid "Could not write" +#~ msgstr "No s'ha pogut escriure" + +#~ msgid "Could not connect" +#~ msgstr "No s'ha pogut connectar" + +#~ msgid "Could not create listen socket" +#~ msgstr "No s'ha pogut crear el sòcol per a escoltar" + +#~ msgid "Could not resolve hostname" +#~ msgstr "No s'ha pogut resoltre el nom de l'ordinador" + +#~ msgid "Incorrect Password" +#~ msgstr "La contrasenya no és correcta" + +#~ msgid "" +#~ "Could not establish a connection with %s:\n" +#~ "%s" +#~ msgstr "" +#~ "No s'ha pogut establir la connexió amb %s:\n" +#~ "%s" + +#~ msgid "Yahoo Japan" +#~ msgstr "Yahoo Japó" + +#~ msgid "Japan Pager server" +#~ msgstr "Servidor de cercapersones del Japó" + +#~ msgid "Japan file transfer server" +#~ msgstr "Servidor de transferència de fitxers del Japó" + +#~ msgid "" +#~ "Lost connection with server\n" +#~ "%s" +#~ msgstr "" +#~ "S'ha perdut la connexió al servidor\n" +#~ "%s" + +#~ msgid "Could not resolve host name" +#~ msgstr "No s'ha pogut resoldre el nom de l'ordinador" + +#~ msgid "" +#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support " +#~ "was found." +#~ msgstr "" +#~ "No s'ha pogut connectar a %s: el servidor requereix TLS/SSL, però no s'ha " +#~ "trobat cap implementació de TLS/SSL." + #~ msgid "Last Activity" #~ msgstr "Darrera activitat" #~ msgid "Service Discovery Info" -#~ msgstr "Informació del servici de descoberta" +#~ msgstr "Informació del servei de descoberta" #~ msgid "Service Discovery Items" -#~ msgstr "Elements del servici de descoberta" +#~ msgstr "Elements del servei de descoberta" # http://xmpp.org/extensions/xep-0033.html #~ msgid "Extended Stanza Addressing" -#~ msgstr "Bloc d'adreçament estés" +#~ msgstr "Bloc d'adreçament estès" #~ msgid "Multi-User Chat" #~ msgstr "Xat multi-usuari" @@ -14581,10 +14588,10 @@ #~ msgstr "Informació de presència estesa per a xats multi-usuari" #~ msgid "Ad-Hoc Commands" -#~ msgstr "Ordes Ad-Hoc" +#~ msgstr "Ordres Ad-Hoc" #~ msgid "PubSub Service" -#~ msgstr "Servici PubSub" +#~ msgstr "Servei PubSub" #~ msgid "SOCKS5 Bytestreams" #~ msgstr "Flux de bits SOCK5" @@ -14700,7 +14707,7 @@ #~ msgstr "Dipòsit de fitxers i compartició" #~ msgid "STUN Service Discovery for Jingle" -#~ msgstr "Servici de descoberta STUN per al Jingle" +#~ msgstr "Servei de descoberta STUN per al Jingle" #~ msgid "Simplified Encrypted Session Negotiation" #~ msgstr "Negociació simple del xifratge de la sessió" @@ -14709,125 +14716,6 @@ #~ msgid "Hop Check" #~ msgstr "Comprovació dels salts" -#~ msgid "Read Error" -#~ msgstr "Error de lectura" - -#~ msgid "Failed to connect to server." -#~ msgstr "No s'ha pogut connectar al servidor." - -#~ msgid "Read buffer full (2)" -#~ msgstr "La memòria intermèdia de lectura és plena (2)" - -#~ msgid "Unparseable message" -#~ msgstr "No es pot analitzar el missatge" - -#~ msgid "Couldn't connect to host: %s (%d)" -#~ msgstr "No s'ha pogut connectar a l'ordinador: %s (%d)" - -#~ msgid "Login failed (%s)." -#~ msgstr "Ha fallat l'entrada (%s)." - -#~ msgid "" -#~ "You have been logged out because you logged in at another workstation." -#~ msgstr "" -#~ "Se us ha desconnectat perquè heu entrat a través d'una altra estació de " -#~ "treball." - -#~ msgid "Error. SSL support is not installed." -#~ msgstr "Error. No hi ha instal·lades les biblioteques per a SSL." - -#~ msgid "Incorrect password." -#~ msgstr "La contrasenya no és correcta." - -#~ msgid "" -#~ "Could not connect to BOS server:\n" -#~ "%s" -#~ msgstr "" -#~ "No s'ha pogut connectar al servidor BOS:\n" -#~ "%s" - -#~ msgid "You may be disconnected shortly. Check %s for updates." -#~ msgstr "" -#~ "Se us pot desconnectar d'ací a poc temps. Comproveu si hi ha " -#~ "actualitzacions a %s." - -#~ msgid "Could Not Connect" -#~ msgstr "No s'ha pogut connectar" - -#~ msgid "Invalid username." -#~ msgstr "El nom d'usuari no és vàlid" - -#~ msgid "Could not decrypt server reply" -#~ msgstr "No s'ha pogut desxifrar la resposta del servidor" - -#~ msgid "Connection lost" -#~ msgstr "S'ha perdut la connexió" - -#~ msgid "Couldn't resolve host" -#~ msgstr "No s'ha pogut obtindre l'adreça de l'ordinador" - -#~ msgid "Connection closed (writing)" -#~ msgstr "S'ha tancat la connexió (escrivint)" - -#~ msgid "Connection reset" -#~ msgstr "S'ha reiniciat la connexió" - -#~ msgid "Error reading from socket: %s" -#~ msgstr "S'ha produït un error en llegir del sòcol: %s" - -#~ msgid "Unable to connect to host" -#~ msgstr "No s'ha pogut connectar a l'ordinador" - -#~ msgid "Could not write" -#~ msgstr "No s'ha pogut escriure" - -#~ msgid "Could not connect" -#~ msgstr "No s'ha pogut connectar" - -#~ msgid "Could not create listen socket" -#~ msgstr "No s'ha pogut crear el sòcol per a escoltar" - -#~ msgid "Could not resolve hostname" -#~ msgstr "No s'ha pogut resoltre el nom de l'ordinador" - -#, fuzzy -#~ msgid "Incorrect Password" -#~ msgstr "La contrasenya no és correcta" - -#~ msgid "" -#~ "Could not establish a connection with %s:\n" -#~ "%s" -#~ msgstr "" -#~ "No s'ha pogut establir la connexió amb %s:\n" -#~ "%s" - -#~ msgid "Yahoo Japan" -#~ msgstr "Yahoo Japó" - -#~ msgid "Japan Pager server" -#~ msgstr "Servidor de cercapersones del Japó" - -#~ msgid "Japan file transfer server" -#~ msgstr "Servidor de transferència de fitxers del Japó" - -#~ msgid "" -#~ "Lost connection with server\n" -#~ "%s" -#~ msgstr "" -#~ "S'ha perdut la connexió al servidor\n" -#~ "%s" - -#~ msgid "Could not resolve host name" -#~ msgstr "No s'ha pogut resoldre el nom de l'ordinador" - -#, fuzzy -#~ msgid "" -#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support " -#~ "was found." -#~ msgstr "" -#~ "El servidor requerix TLS/SSL per entrar. No s'ha trobat suport per a TLS/" -#~ "SSL." - # REVIEW #~ msgid "Conversation Window Hiding" #~ msgstr "Ocultació de les finestres" @@ -14844,6 +14732,12 @@ #~ msgid "Activate which ID?" #~ msgstr "Quin ID voleu activar?" +#~ msgid "Account locked: Too many failed login attempts" +#~ msgstr "S'ha blocat el compte: s'ha intentat entrar massa vegades" + +#~ msgid "Account locked: See the debug log" +#~ msgstr "El compte està blocat: vegeu el registre de depuració" + #~ msgid "Cursor Color" #~ msgstr "Color del cursor" @@ -14854,7 +14748,7 @@ #~ msgstr "Colors de la interfície" #~ msgid "Widget Sizes" -#~ msgstr "Grandàries del giny" +#~ msgstr "Mides del giny" #~ msgid "Invite message" #~ msgstr "Missatge d'invitació" @@ -14866,16 +14760,6 @@ #~ "Introduïu el nom de l'usuari que vulgueu convidar,\n" #~ "així com un missatge d'invitació opcional." -#~ msgid "Unable to retrieve MSN Address Book" -#~ msgstr "No s'ha pogut obtindre la llibreta d'adreces MSN" - -#~ msgid "" -#~ "You may be disconnected shortly. You may want to use TOC until this is " -#~ "fixed. Check %s for updates." -#~ msgstr "" -#~ "Se us pot desconnectar d'ací a poc temps. Si voleu, podeu emprar TOC fins " -#~ "que això es resolgui. Comproveu si hi ha actualitzacions a %s." - #~ msgid "Looking up %s" #~ msgstr "S'està cercant %s" @@ -14898,7 +14782,7 @@ #~ msgstr "%s no està connectat." #~ msgid "Warning of %s not allowed." -#~ msgstr "Avís de %s no permés." +#~ msgstr "Avís de %s no permès." #~ msgid "" #~ "A message has been dropped, you are exceeding the server speed limit." @@ -14930,7 +14814,7 @@ #~ msgstr "Es necessiten més qualificadors." #~ msgid "Dir service temporarily unavailable." -#~ msgstr "Servici de directori no disponible temporalment." +#~ msgstr "Servei de directori no disponible temporalment." #~ msgid "Email lookup restricted." #~ msgstr "Recerca per adreça de correu electrònic restringida." @@ -14946,7 +14830,7 @@ # FIXME #~ msgid "Country not supported." -#~ msgstr "Este país no està disponible." +#~ msgstr "Aquest país no està disponible." #~ msgid "Failure unknown: %s." #~ msgstr "Fallada desconeguda: %s." @@ -14955,7 +14839,7 @@ #~ msgstr "El nom d'usuari o la contrasenya no són correctes." #~ msgid "The service is temporarily unavailable." -#~ msgstr "El servici està temporalment no disponible." +#~ msgstr "El servei està temporalment no disponible." #~ msgid "Your warning level is currently too high to log in." #~ msgstr "El vostre nivell d'avisos és massa alt per a connectar-se." @@ -14991,10 +14875,10 @@ #~ msgstr "S'ha canviat la contrasenya amb èxit" #~ msgid "Get Dir Info" -#~ msgstr "Aconseguix informació del directori" +#~ msgstr "Aconsegueix informació del directori" #~ msgid "Set Dir Info" -#~ msgstr "Establix informació del directori" +#~ msgstr "Estableix informació del directori" #~ msgid "Could not open %s for writing!" #~ msgstr "No s'ha pogut obrir %s per a escriure-hi." @@ -15011,7 +14895,7 @@ #~ msgstr "No s'ha pogut escriure la capçalera del fitxer. No s'enviarà." #~ msgid "Save As..." -#~ msgstr "Anomena i alça..." +#~ msgstr "Anomena i desa..." #~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s" #~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s" @@ -15030,14 +14914,14 @@ #~ msgid "Proxy Options" #~ msgstr "Opcions del servidor intermediari" +#~ msgid "ST_UN server:" +#~ msgstr "Servidor ST_UN:" + #~ msgid "By log size" -#~ msgstr "Per la grandària del registre" +#~ msgstr "Per la mida del registre" #~ msgid "_Open Link in Browser" -#~ msgstr "_Obri l'enllaç en el navegador" - -#~ msgid "ST_UN server:" -#~ msgstr "Servidor ST_UN:" +#~ msgstr "_Obre l'enllaç en el navegador" #~ msgid "Smiley _Image" #~ msgstr "_Imatge de l'emoticona" @@ -15045,8 +14929,18 @@ #~ msgid "Smiley S_hortcut" #~ msgstr "_Dreceres de l'emoticona" +#~ msgid "Unable to retrieve MSN Address Book" +#~ msgstr "No s'ha pogut obtenir la llibreta d'adreces MSN" + #~ msgid "_Flash window when chat messages are received" -#~ msgstr "_Fes que la finestra parpellege quan arriben missatges de xat" +#~ msgstr "_Fes que la finestra parpellegi quan arribin missatges de xat" + +#~ msgid "" +#~ "You may be disconnected shortly. You may want to use TOC until this is " +#~ "fixed. Check %s for updates." +#~ msgstr "" +#~ "Se us pot desconnectar d'aquí a poc temps. Si voleu, podeu emprar TOC " +#~ "fins que això es resolgui. Comproveu si hi ha actualitzacions a %s." #~ msgid "Connection to server lost (no data received within %d second)" #~ msgid_plural "" diff -r 67143ecbddb1 -r 0907b0c775bb po/de.po --- a/po/de.po Mon Jul 27 03:14:08 2009 +0000 +++ b/po/de.po Fri Jul 31 19:20:06 2009 +0000 @@ -11,9 +11,9 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-24 18:05+0200\n" -"PO-Revision-Date: 2009-07-24 18:05+0200\n" -"Last-Translator: Jochen Kemnade \n" +"POT-Creation-Date: 2009-07-29 09:47+0200\n" +"PO-Revision-Date: 2009-07-29 09:51+0200\n" +"Last-Translator: Bjoern Voigt \n" "Language-Team: Deutsch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2197,7 +2197,7 @@ msgstr "(%s) %s : %s\n" msgid "Error creating conference." -msgstr "Fehler beim Erstellen der Konferenz" +msgstr "Fehler beim Erstellen der Konferenz." #, c-format msgid "You are using %s, but this plugin requires %s." @@ -4538,10 +4538,7 @@ msgid "" "affiliate <owner|admin|member|outcast|none> [nick1] [nick2] ...: Get " "the users with an affiliation or set users' affiliation with the room." -msgstr "" -"affiliate <owner|admin|member|outcast|none> [Benutzer1] " -"[Benutzer2] ...: Benutzer mit einer Mitgliedschaft für den Raum erfragen " -"oder setzen" +msgstr "affiliate <owner|admin|member|outcast|none> [Benutzer1] [Benutzer2] ...: Benutzer mit einer Mitgliedschaft für den Raum erfragen oder setzen." msgid "" "role <moderator|participant|visitor|none> [nick1] [nick2] ...: Get the " @@ -4549,7 +4546,7 @@ msgstr "" "role <owner|admin|member|outcast|none> [Benutzer1] [Benutzer2] ...: " "Benutzer mit einer Rolle für den Raum erfragen oder Benutzern eine Rolle " -"zuweisen" +"zuweisen." msgid "invite <user> [message]: Invite a user to the room." msgstr "" @@ -11792,14 +11789,6 @@ msgid "File transfer _details" msgstr "Dateiübertragungs-_Details" -#. Pause button -msgid "_Pause" -msgstr "_Pause" - -#. Resume button -msgid "_Resume" -msgstr "Fo_rtsetzen" - msgid "Paste as Plain _Text" msgstr "Einfügen als normaler _Text" @@ -11820,7 +11809,8 @@ msgid "Color to draw hyperlink after it has been visited (or activated)." msgstr "" -"Farbe zum Darstellen von Hyperlinks, wenn sie besucht (oder aktiviert) wurden" +"Farbe zum Darstellen von Hyperlinks, wenn sie besucht (oder aktiviert) " +"wurden." msgid "Hyperlink prelight color" msgstr "Hyperlink-Farbe" @@ -11863,14 +11853,14 @@ msgid "Color to draw the name of a whispered action message." msgstr "" "Farbe, mit der der Name in einer geflüsterten Aktions-Nachricht dargestellt " -"wird" +"wird." msgid "Whisper Message Name Color" msgstr "Farbe des Absendernamens für Flüster-Nachrichten" msgid "Color to draw the name of a whispered message." msgstr "" -"Farbe, mit der der Name in einer geflüsterten Nachricht dargestellt wird" +"Farbe, mit der der Name in einer geflüsterten Nachricht dargestellt wird." msgid "Typing notification color" msgstr "Farbe der Tipp-Benachrichtigung" @@ -13178,6 +13168,9 @@ msgid "_Open Mail" msgstr "Mail ö_ffnen" +msgid "_Pause" +msgstr "_Pause" + msgid "_Edit" msgstr "_Bearbeiten" @@ -13292,7 +13285,7 @@ msgstr "XMPP-Dienstsuche" msgid "Allows browsing and registering services." -msgstr "Erlaubt das Durchsuchen und Registrieren von Diensten" +msgstr "Erlaubt das Durchsuchen und Registrieren von Diensten." msgid "" "This plugin is useful for registering with legacy transports or other XMPP " @@ -14100,7 +14093,7 @@ #. *< version #. * summary msgid "Pidgin Theme Editor." -msgstr "Pidgin Themen-Editor" +msgstr "Pidgin Themen-Editor." #. *< type #. *< ui_requirement diff -r 67143ecbddb1 -r 0907b0c775bb po/he.po --- a/po/he.po Mon Jul 27 03:14:08 2009 +0000 +++ b/po/he.po Fri Jul 31 19:20:06 2009 +0000 @@ -1,5 +1,5 @@ # Pidgin Hebrew translation -# Copyright (C) 2005-2007, Shalom Craimer +# Copyright (C) 2005-2009, Shalom Craimer # 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: 2009-07-06 15:04-0700\n" -"PO-Revision-Date: 2008-08-27 21:03+0200\n" +"POT-Creation-Date: 2009-07-27 19:57-0700\n" +"PO-Revision-Date: 2009-07-27 16:21+0200\n" "Last-Translator: Shalom Craimer \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgid "%s. Try `%s -h' for more information.\n" msgstr "%s. יש לנסות את '%s –h' למידע נוסף.\n" -#, fuzzy, c-format +#, c-format msgid "" "%s\n" "Usage: %s [OPTION]...\n" @@ -41,7 +41,7 @@ "שימוש: %s [אפשרות]...\n" "\n" " -c, --config=ספריה השתמש בספרייה לקבצי הגדרות\n" -" -d, --debug שלח הודעות ניפוי באגים ל-stdout\n" +" -d, --debug שלח הודעות ניפוי באגים ל-stderr\n" " -h, --help הצג הודעה זו וצא\n" " -n, --nologin אל תתחבר אוטומטית\n" " -v, --version הצג את הגירסא של התוכנה וצא\n" @@ -70,7 +70,6 @@ msgid "Remember password" msgstr "זכור סיסמה" -#, fuzzy msgid "There are no protocol plugins installed." msgstr "לא מותקנים תוספים לפרוטוקולים." @@ -843,12 +842,11 @@ msgid "System Log" msgstr "דו\"ח מערכת" -#, fuzzy msgid "Calling ... " -msgstr "מחשב..." +msgstr "מתקשר ..." msgid "Hangup" -msgstr "" +msgstr "התנתק" #. Number of actions msgid "Accept" @@ -858,25 +856,24 @@ msgstr "דחה" msgid "Call in progress." -msgstr "" +msgstr "באמצע שיחה." msgid "The call has been terminated." -msgstr "" +msgstr "השיחה נותקה." #, c-format msgid "%s wishes to start an audio session with you." -msgstr "" +msgstr "נתקבלה בקשה מאת %s לבצע התקשרות קולית." #, c-format msgid "%s is trying to start an unsupported media session type with you." -msgstr "" - -#, fuzzy +msgstr "נקבלה בקשה מאת %s לביצוע התקשרות שאינה נתמכת." + msgid "You have rejected the call." -msgstr "עזבת את הערוץ%s%s" +msgstr "דחית את השיחה." msgid "call: Make an audio call." -msgstr "" +msgstr "call: בצע התקשרות קולית." msgid "Emails" msgstr "דוא\"ל" @@ -1500,10 +1497,10 @@ msgstr "ללא קיבוץ" msgid "Nested Subgroup" -msgstr "" +msgstr "קבוצה בתוך קבוצה" msgid "Nested Grouping (experimental)" -msgstr "" +msgstr "קבוצות בתוך קבוצות (נסיוני)" msgid "Provides alternate buddylist grouping options." msgstr "מאפשר אפשרויות נוספות לחלוקת רשימת אנשי הקשר לקבוצות." @@ -1526,22 +1523,23 @@ "\n" "Fetching TinyURL..." msgstr "" +"\n" +"מביא TinyURL..." msgid "Only create TinyURL for urls of this length or greater" -msgstr "" +msgstr "רק ייצר TinyURL עבור כתובות באורך הזה ומעלה" msgid "TinyURL (or other) address prefix" -msgstr "" - -#, fuzzy +msgstr "ראשית כתובת עבור TinyURL (או אחר)" + msgid "TinyURL" -msgstr "כתובת השיר" +msgstr "TinyURL" msgid "TinyURL plugin" -msgstr "" +msgstr "תוסף TinyURL" msgid "When receiving a message with URL(s), TinyURL for easier copying" -msgstr "" +msgstr "בעת קבלת הודעה עם כתובת, השתמש ב-TinyURL להעתקה קלה יותר" msgid "accounts" msgstr "חשבונות" @@ -1655,6 +1653,7 @@ msgstr "" "התעודה שהוצגה על ידי \"%s\" נחתמה על ידי עצמה. לא ניתן לבצע בדיקה אוטומטית." +#. FIXME 2.6.1 #, c-format msgid "The certificate chain presented for %s is not valid." msgstr "שרשרת רשויות הנפקת התעודה עבור %s אינה תקפה." @@ -1664,6 +1663,7 @@ #. stifle it. #. TODO: Probably wrong. #. TODO: Probably wrong +#. TODO: Probably wrong. msgid "SSL Certificate Error" msgstr "שגיאת תעודת SSL" @@ -1741,7 +1741,6 @@ msgstr "+++ %s התנתק" #. Unknown error -#. Unknown error! msgid "Unknown error" msgstr "שגיאה לא מוכרת" @@ -1788,9 +1787,8 @@ msgid "%s left the room (%s)." msgstr "%s עזב את החדר (%s)." -#, fuzzy msgid "Invite to chat" -msgstr "הזמן לועידה" +msgstr "הזמן לצ'אט" #. Put our happy label in it. msgid "" @@ -1844,7 +1842,7 @@ #, c-format msgid "Resolver process exited without answering our request" -msgstr "" +msgstr "שירות תרגום הכתובת סיים ללא תשובה לבקשתנו" #, c-format msgid "Thread creation failure: %s" @@ -1929,6 +1927,10 @@ msgstr "מתחיל את ההעברה של %s מ-%s" #, c-format +msgid "Transfer of file %s complete" +msgstr "העברה של הקובץ %s הושלמה" + +#, c-format msgid "Transfer of file %s complete" msgstr "העברה של קובץ %s הושלמה" @@ -2123,9 +2125,8 @@ msgid "(%s) %s : %s\n" msgstr "(%s) %s <מענה-אוטומטי>: %s\n" -#, fuzzy msgid "Error creating conference." -msgstr "שגיאה ביצירת החיבור" +msgstr "שגיאה ביצירת שיחת הועידה." #, c-format msgid "You are using %s, but this plugin requires %s." @@ -2517,7 +2518,6 @@ msgstr "כלול יומנים של תוכנות צ'אט אחרות בצופה-היומנים." #. * description -#, fuzzy msgid "" "When viewing logs, this plugin will include logs from other IM clients. " "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n" @@ -2526,7 +2526,7 @@ "at your own risk!" msgstr "" "בעת צפייה ביומני-שיחה, תוסף זה יכלול יומנים מתוכנות צ'אט אחרות. כרגע, זה " -"כולל Adium, MSN Messenger, Trillian.\n" +"כולל Adium, MSN Messenger, aMSN, Trillian.\n" "\n" "אזהרה: תוסף זה עדיין בשלבי פיתוח מוקדמים וייתכן ויקרוס לעיתים קרובות. יש " "להשתמש בו על חשבון סיכונך האישי בלבד!" @@ -2574,7 +2574,6 @@ msgid "Save messages sent to an offline user as pounce." msgstr "שמור הודעות שנשלחו למשתמש לא-מחובר בתור תגובת-פעילות." -#, fuzzy msgid "" "The rest of the messages will be saved as pounces. You can edit/delete the " "pounce from the `Buddy Pounce' dialog." @@ -2608,9 +2607,8 @@ msgid "Do not ask. Always save in pounce." msgstr "אל תשאל. תמיד שמור בתגובת פעילות." -#, fuzzy msgid "One Time Password" -msgstr "הזן סיסמא" +msgstr "One Time Password" #. *< type #. *< ui_requirement @@ -2619,13 +2617,13 @@ #. *< priority #. *< id msgid "One Time Password Support" -msgstr "" +msgstr "תמיכת One Time Password" #. *< name #. *< version #. * summary msgid "Enforce that passwords are used only once." -msgstr "" +msgstr "אכוף שימוש בסיסמאות חד-פעמיות" #. * description msgid "" @@ -2633,6 +2631,9 @@ "are only used in a single successful connection.\n" "Note: The account password must not be saved for this to work." msgstr "" +"מאפשר לך לאכוף לכל חשבון משתמש שסיסמאות שאינן נשמרות ישומשו רק לחיבור יחיד " +"שמצליח.\n" +"הערה: על מנת שזה יעבוד אין לשמור את סיסמת החשבון." #. *< type #. *< ui_requirement @@ -2826,17 +2827,15 @@ "לא היה ניתן לזהות ActiveTCL מתוקן. אם ברצונך להשתמש בתוספי TCL, יש להתקין " "ActiveTCL מתוך http://www.activestate.com\n" -#, fuzzy msgid "" "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin." "im/BonjourWindows for more information." msgstr "" -"חבילת בונג'ור של אפל עבור חלונות לא נמצאה, ראה את השו\"ת באתר: http://d." +"חבילת \"בונג'ור\" של אפל עבור חלונות לא נמצאה, ראה את השו\"ת באתר: http://d." "pidgin.im/BonjourWindows למידע נוסף." -#, fuzzy msgid "Unable to listen for incoming IM connections" -msgstr "לא ניתן להקשיב לתקשורת-הודעות נכנסת.\n" +msgstr "לא ניתן להקשיב לחיבורי הודעות נכנסת" msgid "" "Unable to establish connection with the local mDNS server. Is it running?" @@ -2874,9 +2873,8 @@ msgstr "אדם סגול" #. Creating the options for the protocol -#, fuzzy msgid "Local Port" -msgstr "מיקום" +msgstr "חיבור מקומי" msgid "Bonjour" msgstr "Bonjour" @@ -2888,21 +2886,17 @@ msgid "Unable to send the message, the conversation couldn't be started." msgstr "לא ניתן לשלוח את ההודעה, לא היה אפשר להתחיל את השיחה." -#, fuzzy, c-format +#, c-format msgid "Unable to create socket: %s" -msgstr "" -"אין אפשרות ליצור שקע:\n" -"%s" - -#, fuzzy, c-format +msgstr "אין אפשרות ליצור שקע: %s" + +#, c-format msgid "Unable to bind socket to port: %s" -msgstr "לא ניתן לקבע את השקע ליציאה" - -#, fuzzy, c-format +msgstr "לא ניתן לקבע את השקע ליציאה: %s" + +#, c-format msgid "Unable to listen on socket: %s" -msgstr "" -"אין אפשרות ליצור שקע:\n" -"%s" +msgstr "אין אפשרות ליצור שקע: %s" msgid "Error communicating with local mDNSResponder." msgstr "שגיאה בתקשורת עם mDNSResponder מקומי." @@ -2949,17 +2943,14 @@ msgid "Load buddylist from file..." msgstr "טען את רשימת אנשי הקשר מקובץ..." -#, fuzzy msgid "You must fill in all registration fields" -msgstr "יש למלא את שדות ההרשמה." - -#, fuzzy +msgstr "יש למלא את כל שדות ההרשמה" + msgid "Passwords do not match" -msgstr "הסיסמאות אינן תואמות." - -#, fuzzy +msgstr "הסיסמאות אינן תואמות" + msgid "Unable to register new account. An unknown error occurred." -msgstr "לא ניתן לבצע הרשמה לחשבון חדש. אירעה שגיאה.\n" +msgstr "לא ניתן לבצע הרשמה לחשבון חדש. אירעה שגיאה לא-מוכרת." msgid "New Gadu-Gadu Account Registered" msgstr "הושלמה ההרשמה לחשבון החדש של Gadu-Gadu" @@ -2974,11 +2965,10 @@ msgstr "סיסמא (שנית)" msgid "Enter captcha text" -msgstr "" - -#, fuzzy +msgstr "יש להזין את טקסט ב-caphtca" + msgid "Captcha" -msgstr "שמור תמונה" +msgstr "Captcha" msgid "Register New Gadu-Gadu Account" msgstr "בצע רישום לחשבון חדש של Gadu-Gadu" @@ -3117,9 +3107,9 @@ msgid "Chat _name:" msgstr "שם _צ'אט:" -#, fuzzy, c-format +#, c-format msgid "Unable to resolve hostname '%s': %s" -msgstr "לא ניתן להתחבר לשרת" +msgstr "לא ניתן לתרגם לכתובת את שם השרת '%s': %s" #. 1. connect to server #. connect to the server @@ -3132,9 +3122,8 @@ msgid "This chat name is already in use" msgstr "שם הצ'אט הזה כבר בשימוש" -#, fuzzy msgid "Not connected to the server" -msgstr "לא מחובר לשרת." +msgstr "לא מחובר אל השרת" msgid "Find buddies..." msgstr "חפש אנשי קשר..." @@ -3175,9 +3164,8 @@ msgid "Gadu-Gadu User" msgstr "משתמש Gadu-Gadu" -#, fuzzy msgid "GG server" -msgstr "קבע את המידע על המשתמש..." +msgstr "שרת GG" #, c-format msgid "Unknown command: %s" @@ -3193,7 +3181,6 @@ msgid "File Transfer Failed" msgstr "העברת הקובץ נכשלה" -#, fuzzy msgid "Unable to open a listening port." msgstr "לא ניתן לפתוח שקע-קשב." @@ -3217,11 +3204,9 @@ #. #. TODO: what to do here - do we really have to disconnect? #. TODO: do we really want to disconnect on a failure to write? -#, fuzzy, c-format +#, c-format msgid "Lost connection with server: %s" -msgstr "" -"אבדה התקשורת עם השרת:\n" -"%s" +msgstr "אבדה התקשורת עם השרת: %s" msgid "View MOTD" msgstr "הצג את הודעת היום" @@ -3232,9 +3217,8 @@ msgid "_Password:" msgstr "_סיסמא:" -#, fuzzy msgid "IRC nick and server may not contain whitespace" -msgstr "אסור לשמות ב-IRC להכיל רווחים" +msgstr "אסור לשמות ולשרתים ב-IRC להכיל רווחים" msgid "SSL support unavailable" msgstr "אין תמיכה ב-SSL." @@ -3243,13 +3227,13 @@ msgstr "לא ניתן להתחבר" #. this is a regular connect, error out -#, fuzzy, c-format +#, c-format msgid "Unable to connect: %s" -msgstr "לא ניתן להתחבר אל %s" - -#, fuzzy, c-format +msgstr "לא ניתן להתחבר: %s" + +#, c-format msgid "Server closed the connection" -msgstr "השרת סגר את החיבור." +msgstr "השרת סגר את החיבור" msgid "Users" msgstr "משתמשים" @@ -3429,13 +3413,12 @@ #. We only want to do the following dance if the connection #. has not been successfully completed. If it has, just #. notify the user that their /nick command didn't go. -#, fuzzy, c-format +#, c-format msgid "The nickname \"%s\" is already being used." -msgstr "שם הצ'אט הזה כבר בשימוש" - -#, fuzzy +msgstr "הכינו \"%s\" כבר בשימוש." + msgid "Nickname in use" -msgstr "כינוי" +msgstr "שם-הכינוי בשימוש" msgid "Cannot change nick" msgstr "כשל בשינוי הכינוי" @@ -3667,11 +3650,9 @@ msgid "execute" msgstr "הפעל" -#, fuzzy msgid "Server requires TLS/SSL, but no TLS/SSL support was found." -msgstr "השרת דורש TLS/SSL להתחברות. לא נמצאה תמיכה ל-TLS/SSL." - -#, fuzzy +msgstr "השרת דורש TLS/SSL להתחברות, אך לא נמצאה תמיכה ל-TLS/SSL." + msgid "You require encryption, but no TLS/SSL support was found." msgstr "הגדרת דרישה להצפנה, אך לא נמצאה תמיכה ב-TLS/SSL." @@ -3687,13 +3668,11 @@ msgid "Plaintext Authentication" msgstr "אימות לא מוצפן" -#, fuzzy msgid "SASL authentication failed" -msgstr "האימות נכשל" - -#, fuzzy +msgstr "אימות SASL נכשל" + msgid "Invalid response from server" -msgstr "שגיעה בתגובה מהשרת" +msgstr "תגובה לא תקפה מהשרת" msgid "Server does not use any supported authentication method" msgstr "השרת לא תומך באימות באף תצורה" @@ -3704,36 +3683,28 @@ msgid "Invalid challenge from server" msgstr "תשובת אימות לא תקפה מהשרת" -#, fuzzy, c-format +#, c-format msgid "SASL error: %s" -msgstr "שגיאת SASL" +msgstr "שגיאת SASL: %s" msgid "The BOSH connection manager terminated your session." -msgstr "" - -#, fuzzy +msgstr "מנהל התקשורת BOSH ניתק את חיבורך." + msgid "No session ID given" -msgstr "לא ניתנה סיבה." - -#, fuzzy +msgstr "לא ניתן מזהה לחיבור" + msgid "Unsupported version of BOSH protocol" -msgstr "גירסא ללא תמיכה" - -#, fuzzy +msgstr "גירסת פרוטוקול BOSH שאינה נתמכת" + msgid "Unable to establish a connection with the server" -msgstr "" -"לא ניתן ליצור חיבור עם השרת:\n" -"%s" - -#, fuzzy, c-format +msgstr "לא ניתן ליצור חיבור עם השרת" + +#, c-format msgid "Unable to establish a connection with the server: %s" -msgstr "" -"לא ניתן ליצור חיבור עם השרת:\n" -"%s" - -#, fuzzy +msgstr "לא ניתן ליצור חיבור עם השרת: %s" + msgid "Unable to establish SSL connection" -msgstr "לא ניתן לאתחל חיבור" +msgstr "לא ניתן ליצור חיבור SSL" msgid "Full Name" msgstr "שם מלא" @@ -3799,9 +3770,8 @@ msgid "Operating System" msgstr "מערכת הפעלה" -#, fuzzy msgid "Local Time" -msgstr "קובץ מקומי:" +msgstr "שעה מקומית" msgid "Priority" msgstr "עדיפות" @@ -3811,11 +3781,10 @@ #, c-format msgid "%s ago" -msgstr "" - -#, fuzzy +msgstr "לפני %s" + msgid "Logged Off" -msgstr "מחובר" +msgstr "התנתק/ה" msgid "Middle Name" msgstr "שם אמצעי" @@ -3983,26 +3952,22 @@ msgid "Find Rooms" msgstr "חפש חדרים" -#, fuzzy msgid "Affiliations:" -msgstr "תיאור:" - -#, fuzzy +msgstr "שיוכים:" + msgid "No users found" -msgstr "לא נמצאו משתמשים תואמים" - -#, fuzzy +msgstr "לא נמצאו משתמשים" + msgid "Roles:" -msgstr "תפקיד" - -#, fuzzy +msgstr "תפקידים:" + msgid "Ping timed out" msgstr "פינג לא חזר בזמן" msgid "" "Unable to find alternative XMPP connection methods after failing to connect " "directly." -msgstr "" +msgstr "לא יכול למצוא צורות חיבור XMPP חלופיות אחרי כישלון בחיבור ישירות." msgid "Invalid XMPP ID" msgstr "מזהה XMPP לא תקין" @@ -4010,9 +3975,8 @@ msgid "Invalid XMPP ID. Domain must be set." msgstr "מזהה XMPP שגוי. יש להגדיר את הדומיין." -#, fuzzy msgid "Malformed BOSH URL" -msgstr "כשל בהתחברות לשרת" +msgstr "כתובת BOTH משובשת" #, c-format msgid "Registration of %s@%s successful" @@ -4080,10 +4044,6 @@ msgid "Change Registration" msgstr "שנה רישום" -#, fuzzy -msgid "Malformed BOSH Connect Server" -msgstr "כשל בהתחברות לשרת" - msgid "Error unregistering account" msgstr "שגיאה ברישום חשבון" @@ -4103,7 +4063,7 @@ msgstr "מאתחל את הזרם מחדש" msgid "Server doesn't support blocking" -msgstr "" +msgstr "השרת לא תומך בחסימה" msgid "Not Authorized" msgstr "לא מורשה" @@ -4369,19 +4329,19 @@ msgid "Unable to ping user %s" msgstr "לא ניתן לעשות פינג למשתמש %s" -#, fuzzy, c-format +#, c-format msgid "Unable to buzz, because there is nothing known about %s." -msgstr "לא ניתן לזמזם, מכיוון שלא ידוע כלום על המשתמש %s." - -#, fuzzy, c-format +msgstr "לא ניתן לזמזם, מכיוון שלא ידוע כלום על %s." + +#, c-format msgid "Unable to buzz, because %s might be offline." -msgstr "לא ניתן לזמזם, מכיוון שייתכן והמשתמש %s לא מחובר." - -#, fuzzy, c-format +msgstr "לא ניתן לזמזם, מכיוון שייתכן כי%s לא מחובר." + +#, c-format msgid "" "Unable to buzz, because %s does not support it or does not wish to receive " "buzzes now." -msgstr "לא ניתן לזמזם, כי המשתמש %s לא תומך בזה." +msgstr "לא ניתן לזמזם, כי %s לא תומך בזה או לא רוצה לקבל זימזומים כרגע." #, c-format msgid "Buzzing %s..." @@ -4396,34 +4356,32 @@ msgid "%s has buzzed you!" msgstr "%s זימזם אותך!" -#, fuzzy, c-format +#, c-format msgid "Unable to initiate media with %s: invalid JID" -msgstr "לא ניתן לשלוח את הקובץ ל %s, JID לא-תקף" - -#, fuzzy, c-format +msgstr "לא ניתן ליזום מדיה עם %s: JID לא תקף" + +#, c-format msgid "Unable to initiate media with %s: user is not online" -msgstr "לא ניתן לשלוח את הקובץ אל %s, המשתמש לא מחובר" - -#, fuzzy, c-format +msgstr "לא ניתן ליזום מדיה עם %s: המשתמש לא מחובר" + +#, c-format msgid "Unable to initiate media with %s: not subscribed to user presence" -msgstr "לא ניתן לשלוח את הקובץ אל %s, אינך רשומ/ה להודעת קיום המשתמש" - -#, fuzzy +msgstr "לא ניתן ליזום מדיה עם %s: לא רשום להודעות-נוכחות המשתמש" + msgid "Media Initiation Failed" -msgstr "הרישום נכשל" - -#, fuzzy, c-format +msgstr "ייזום מדיה נכשל" + +#, c-format msgid "" "Please select the resource of %s with which you would like to start a media " "session." -msgstr "יש לבחור את המשאב של %s אליו ברצונך לשלוח קובץ" +msgstr "יש לבחור את המשאב של %s איתו ברצונך להתחיל תקשורת מדיה." msgid "Select a Resource" msgstr "יש לבחור משאב" -#, fuzzy msgid "Initiate Media" -msgstr "יז_ום שיחה" +msgstr "יזום מדיה" msgid "config: Configure a chat room." msgstr "config: קבע הגדרות חדר צ'אט." @@ -4443,21 +4401,19 @@ msgid "ban <user> [reason]: Ban a user from the room." msgstr "ban <משתמש> [סיבה]: חסום משתמש מן החדר." -#, fuzzy msgid "" "affiliate <owner|admin|member|outcast|none> [nick1] [nick2] ...: Get " "the users with an affiliation or set users' affiliation with the room." msgstr "" -"affiliate <משתמש> <בעלים|מפעיל|חבר|בגלות|ללא>: קביעת ייחוס משתמש " -"עם החדר." - -#, fuzzy +"affiliate <משתמש> <בעלים|מפעיל|חבר|בגלות|ללא> [שם1][שם2]...: " +"שלוף או קבע את ייחוסם של משתמשים עם החדר." + msgid "" "role <moderator|participant|visitor|none> [nick1] [nick2] ...: Get the " "users with an role or set users' role with the room." msgstr "" -"role <משתמש> <בעלים|מפעיל|חבר|בגלות|ללא>: קביעת ייחוס משתמש עם " -"החדר." +"role <משתמש> <בעלים|מפעיל|חבר|בגלות|ללא> [שם1][שם2]...: שלוף או " +"קבע את ייחוסם של משתמשים עם החדר." msgid "invite <user> [message]: Invite a user to the room." msgstr "invite <משתמש> [חדר]: הזמן משתמש לחדר." @@ -4517,13 +4473,12 @@ msgstr "שרתי תיווך להעברת קבצים" msgid "BOSH URL" -msgstr "" +msgstr "כתובת BOSH" #. this should probably be part of global smiley theme settings later on, #. shared with MSN -#, fuzzy msgid "Show Custom Smileys" -msgstr "הצג סמייליים שלי" +msgstr "הצג חייכנים שלי" #, c-format msgid "%s has left the conversation." @@ -4581,32 +4536,28 @@ msgid "_Accept Defaults" msgstr "קבל את ברירות המחדל" -#, fuzzy msgid "No reason" -msgstr "לא ניתנה סיבה." - -#, fuzzy, c-format +msgstr "לא ניתנה סיבה" + +#, c-format msgid "You have been kicked: (%s)" -msgstr "נבעטת ע\"י: %s (%s)" - -#, fuzzy, c-format +msgstr "נבעטת: (%s)" + +#, c-format msgid "Kicked (%s)" -msgstr "נבעט ע\"י %s (%s)" - -#, fuzzy +msgstr "נבעט (%s)" + msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "ארעה שגיאה בעת פתיחת הקובץ." - -#, fuzzy +msgstr "ארעה שגיאה בעת ההעברה בזרם בתווך\n" + msgid "Transfer was closed." -msgstr "העברת הקובץ נכשלה" - -#, fuzzy +msgstr "העברת הקובץ נסגרה." + msgid "Failed to open the file" -msgstr "כישלון בעת פתיחת הקובץ '%s': %s" +msgstr "כישלון בעת פתיחת הקובץ" msgid "Failed to open in-band bytestream" -msgstr "" +msgstr "כישלון בפתיחת תזרים מידע בתווך" #, c-format msgid "Unable to send file to %s, user does not support file transfers" @@ -4672,11 +4623,10 @@ msgstr "אין אפשרות להוסיף \"%s\"." msgid "Buddy Add error" -msgstr "" - -#, fuzzy +msgstr "שגיאת הוספת חבר" + msgid "The username specified does not exist." -msgstr "שם המשתמש שהוזן אינו חוקי." +msgstr "שם המשתמש שהוזן אינו קיים." #, c-format msgid "Buddy list synchronization issue in %s (%s)" @@ -4904,9 +4854,8 @@ msgid "Passport account not yet verified" msgstr "חשבון הפספורט לא אומת עדיין" -#, fuzzy msgid "Passport account suspended" -msgstr "חשבון הפספורט לא אומת עדיין" +msgstr "חשבון הפספורט מושעה" #, c-format msgid "Bad ticket" @@ -4920,17 +4869,31 @@ msgid "MSN Error: %s\n" msgstr "שגיאת MSN: %s\n" -#, fuzzy msgid "Other Contacts" -msgstr "איש קשר מועדף" - -#, fuzzy +msgstr "אנשי-קשר אחרים" + msgid "Non-IM Contacts" -msgstr "הסר איש קשר" - -#, fuzzy, c-format +msgstr "אנשי-קשר שאינם להודעות" + +#, c-format +msgid "%s sent a wink. Click here to play it" +msgstr "נשלח קריצה מאת %s. יש ללחוץ כאן להפעלתה" + +#, c-format +msgid "%s sent a wink, but it could not be saved" +msgstr "נשלח קריצה מאת %s, אבל לא ניתן היה לשמור אותה" + +#, c-format +msgid "%s sent a voice clip. Click here to play it" +msgstr "נשלח קטע קולי מאת %s. יש ללחוץ כאן להשמיעה" + +#, c-format +msgid "%s sent a voice clip, but it could not be saved" +msgstr "נשלח אליך קטע קולי מאת %s, אבל היה ניתן לשמור אותו" + +#, c-format msgid "%s sent you a voice chat invite, which is not yet supported." -msgstr "%s שלח לך" +msgstr "נשלחה אליך הזמנה לשיחה קולית מאת %s, אשר אינה נתמכת כעת." msgid "Nudge" msgstr "נו כבר!" @@ -5002,11 +4965,10 @@ msgstr "דף" msgid "Playing a game" -msgstr "" - -#, fuzzy +msgstr "באמצע משחק" + msgid "Working" -msgstr "בעבודה" +msgstr "עובד" msgid "Has you" msgstr "יש אותך" @@ -5044,13 +5006,11 @@ msgid "Album" msgstr "אלבום" -#, fuzzy msgid "Game Title" -msgstr "שם השיר" - -#, fuzzy +msgstr "שם המשחק" + msgid "Office Title" -msgstr "שם השיר" +msgstr "שם המשרד" msgid "Set Friendly Name..." msgstr "קבע/י שם ידידותי..." @@ -5085,6 +5045,29 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library." msgstr "נדרשת תמיכה ב-SSL עבור MSN. נא להתקין ספריית SSL נתמכת." +#, c-format +msgid "" +"Unable to add the buddy %s because the username is invalid. Usernames must " +"be a valid email address." +msgstr "" +"לא ניתן להוסיף את החבר %s מכיוון ששם המשתמש אינו חוקי. שמות משתמשים מוכרחים " +"להיות כתובות אימייל תקפות." + +msgid "Unable to Add" +msgstr "לא ניתן להוסיף" + +msgid "Authorization Request Message:" +msgstr "הודעת בקשה להרשאה:" + +msgid "Please authorize me!" +msgstr "בבקשה, אני רוצה הרשאה!" + +#. * +#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. +#. +msgid "_OK" +msgstr "אישור" + msgid "Error retrieving profile" msgstr "שגיאה בשליפת הפרופיל" @@ -5237,9 +5220,8 @@ "does not exist." msgstr "לא יכול למצוא מידע בתוך פרופיל המשתמש. ככל הנראה המשתמש לא קיים." -#, fuzzy msgid "View web profile" -msgstr "החבא כאשר לא-מקוון" +msgstr "הצג פרופיל ווב" #. *< type #. *< ui_requirement @@ -5275,20 +5257,20 @@ msgid "%s just sent you a Nudge!" msgstr "%s שלח לך הרגע דחיפה קלה!" -#, fuzzy, c-format +#, c-format msgid "Unknown error (%d): %s" -msgstr "שגיאה לא מוכרת (%d)" +msgstr "שגיאה לא מוכרת (%d): %s" msgid "Unable to add user" msgstr "לא ניתן להוסיף משתמש" +#. Unknown error! #, c-format msgid "Unknown error (%d)" msgstr "שגיאה לא מוכרת (%d)" -#, fuzzy msgid "The following users are missing from your addressbook" -msgstr "להלן תוצאות החיפוש שלך" +msgstr "המשתמשים להלן אינם נמצאים בפנקס הכתובות שלך" msgid "Mobile message was not sent because it was too long." msgstr "הודעת לנייד לא נשלחה מכיוון שהיא ארוכה מדי." @@ -5349,24 +5331,20 @@ "שגיאת תקשורת משרת %s:\n" "%s" -#, fuzzy msgid "Our protocol is not supported by the server" -msgstr "הפרוטוקול שלנו לא נתמך ע\"י השרת." - -#, fuzzy +msgstr "הפרוטוקול שלנו לא נתמך ע\"י השרת" + msgid "Error parsing HTTP" -msgstr "שגיאה בפיענוח HTTP." - -#, fuzzy +msgstr "שגיאה בפיענוח HTTP" + msgid "You have signed on from another location" -msgstr "אתה התחברת ממיקום נוסף." +msgstr "אתה התחברת ממיקום נוסף" msgid "The MSN servers are temporarily unavailable. Please wait and try again." msgstr "שרתי ה-MSN לא זמינים כרגע. אנא נסו מאוחר יותר." -#, fuzzy msgid "The MSN servers are going down temporarily" -msgstr "שרתי ב-MSN זמנית מפסיקים לפעול." +msgstr "שרתי ה-MSN זמנית מפסיקים לפעול." #, c-format msgid "Unable to authenticate: %s" @@ -5394,9 +5372,10 @@ msgid "Retrieving buddy list" msgstr "מקבל רשימת אנשי הקשר" -#, fuzzy, c-format +#, c-format msgid "%s requests to view your webcam, but this request is not yet supported." -msgstr "%s שלח לך" +msgstr "" +"נשלחה בקשה מאת %s לצפות במצלמת האינטרנט שלך, אבל בקשה זו אינה נתמכת כרגע." #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -5440,13 +5419,11 @@ msgid "Message may have not been sent because an unknown error occurred:" msgstr "ההודעה אולי לא נשלחה מכיוון שאירעה שגיאה לא מוכרת:" -#, fuzzy msgid "Delete Buddy from Address Book?" -msgstr "הוסף לפנקס הכתובות" - -#, fuzzy +msgstr "מחק חבר מפנקס הכתובות?" + msgid "Do you want to delete this buddy from your address book as well?" -msgstr "האם ברצונך להוסיף את המשתמש הזה לרשימת אנשי הקשר שלך?" +msgstr "האם ברצונך גם למחוק את המשתמש הזה מפנקס הכתובות שלך?" msgid "The username specified is invalid." msgstr "שם המשתמש שהוזן אינו חוקי." @@ -5543,11 +5520,8 @@ msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)" msgstr "האם ברצונך לקבוע אחד כעת? (הערה: לא ניתן לשינוי!)" -#, fuzzy msgid "Lost connection with server" -msgstr "" -"אבד החיבור עם השרת\n" -"%s" +msgstr "אבד החיבור עם השרת" #. Can't write _()'d strings in array initializers. Workaround. #. khc: then use N_() in the array initializer and use _() when they are @@ -5592,15 +5566,15 @@ msgid "Protocol error, code %d: %s" msgstr "שגיאת פרוטוקול, קוד %d: %s" -#, fuzzy, c-format +#, c-format msgid "" "%s Your password is %zu characters, which is longer than the maximum length " "of %d. Please shorten your password at http://profileedit.myspace.com/index." "cfm?fuseaction=accountSettings.changePassword and try again." msgstr "" -"%s סיסמתך הינה באורך %d תוים, יותר מהאורך המצופה של %d עבור MySpaceIM (מערכת " -"הודעות מיידיות במייספייס).יש לקצר את הסיסמא בדףhttp://profileedit.myspace." -"com/index.cfm?fuseaction=accountSettings.changePassword ולנסות שנית." +"%s סיסמתך הינה באורך %zu תוים, יותר מהאורך המצופה של %d. יש לקצר את הסיסמא " +"באתר http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings." +"changePassword ולנסות שנית." msgid "Incorrect username or password" msgstr "שם משתמש או סיסמה שגויים" @@ -5698,6 +5672,9 @@ "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username " "to set your username." msgstr "" +"קרתה שגיאה בעת קביעת שם המשתמש. יש לנסות שנית, או לגשת אל http://editprofile." +"myspace.com/index.cfm?fuseaction=profile.username על מנת לקבוע את שם המשתמש " +"שלך." msgid "MySpaceIM - Username Available" msgstr "MySpaceIM - שם המשתמש זמין" @@ -5953,9 +5930,9 @@ msgid "Unknown error: 0x%X" msgstr "שגיאה לא מוכרת: 0x%X" -#, fuzzy, c-format +#, c-format msgid "Unable to login: %s" -msgstr "לא ניתן להתחבר" +msgstr "לא ניתן להתחבר: %s" #, c-format msgid "Unable to send message. Could not get details for user (%s)." @@ -6085,11 +6062,10 @@ "%s appears to be offline and did not receive the message that you just sent." msgstr "ככל הנראה, %s אינו מחובר ולא קיבל את ההודעה ששלחת הרגע." -#, fuzzy msgid "" "Unable to connect to server. Please enter the address of the server to which " "you wish to connect." -msgstr "לא ניתן להתחבר לשרת. יש להזין את כתובת השרת שברצונך להתחבר אליו." +msgstr "לא ניתן להתחבר לשרת. יש להזין את כתובת השרת אליו ברצונך להתחבר." msgid "This conference has been closed. No more messages can be sent." msgstr "ועידה זו נסגרה. לא ניתן לשלוח עוד הודעות." @@ -6113,9 +6089,8 @@ msgid "Server port" msgstr "פורט השרת" -#, fuzzy msgid "Received unexpected response from " -msgstr "התקבלה תגובת HTTP לא-צפויה מן השרת." +msgstr "התקבלה תגובה לא-צפויה מאת" #. username connecting too frequently msgid "" @@ -6125,12 +6100,12 @@ "התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, " "תיאלץ להמתין אפילו יותר." -#, fuzzy, c-format +#, c-format msgid "Error requesting " -msgstr "שגיאה בבקשת אסימון כניסה" +msgstr "שגיאה בבקשה" msgid "AOL does not allow your screen name to authenticate here" -msgstr "" +msgstr "AOL אינם מאפשרים לאמת את שם המשתמש שלך כאן" msgid "Could not join chat room" msgstr "לא ניתן להתחבר אל חדר הצ'אט" @@ -6138,9 +6113,8 @@ msgid "Invalid chat room name" msgstr "שם החדר אינו תקף" -#, fuzzy msgid "Received invalid data on connection with server" -msgstr "התקבל מידע שגוי בחיבור עם השרת." +msgstr "התקבל מידע שגוי בעת חיבור עם השרת." #. *< type #. *< ui_requirement @@ -6156,7 +6130,7 @@ msgstr "תוסף פרוטוקולים AIM" msgid "ICQ UIN..." -msgstr "" +msgstr "ICQ UIN..." #. *< type #. *< ui_requirement @@ -6187,7 +6161,6 @@ msgid "Received invalid data on connection with remote user." msgstr "התקבל מידע שגוי בחיבור עם המשתמש המרוחק." -#, fuzzy msgid "Unable to establish a connection with the remote user." msgstr "לא ניתן ליצור חיבור עם המשתמש המרוחק." @@ -6387,15 +6360,13 @@ msgid "Buddy Comment" msgstr "הערת איש קשר" -#, fuzzy, c-format +#, c-format msgid "Unable to connect to authentication server: %s" -msgstr "" -"לא ניתן להתחבר לשרת האימות:\n" -"%s" - -#, fuzzy, c-format +msgstr "לא ניתן להתחבר לשרת האימות: %s" + +#, c-format msgid "Unable to connect to BOS server: %s" -msgstr "לא ניתן להתחבר לשרת" +msgstr "לא ניתן להתחבר לשרת ה-BOS: %s" msgid "Username sent" msgstr "שם משתמש נשלח" @@ -6407,19 +6378,19 @@ msgid "Finalizing connection" msgstr "מבצע גימור לחיבור" -#, fuzzy, c-format +#, c-format msgid "" "Unable to sign on as %s because the username is invalid. Usernames must be " "a valid email address, or start with a letter and contain only letters, " "numbers and spaces, or contain only numbers." msgstr "" -"לא ניתן להתחבר: לא היה ניתן להתחבר בתור %s כיוון ששם-תצוגה זה אינו תקף. שמות-" -"תצוגה חייבים להיות כתובות אימייל חוקיות, או להתחיל באות ולהכיל רק אותיות " -"מספרים ורווחים, או לחלופין להכיל אך ורק מספרים." - -#, fuzzy, c-format +"לא ניתן להתחבר בתור %s כיוון ששם משתמש זה אינו תקף. שמות משתמשים חייבים " +"להיות כתובות אימייל חוקיות, או לחילופין להתחיל באות ולהכיל רק אותיות מספרים " +"ורווחים, או לחילופין להכיל אך ורק מספרים." + +#, c-format msgid "You may be disconnected shortly. If so, check %s for updates." -msgstr "ייתכן ותנותק/י בקרוב. יש לבדוק את %s לעידכונים." +msgstr "ייתכן ותנותק/י בקרוב. במידה וכך יש לבדוק %s לעידכונים." msgid "Unable to get a valid AIM login hash." msgstr "לא מצליח להשיג קוד התחברות תקף של AIM." @@ -6433,35 +6404,32 @@ #. Unregistered username #. uid is not exist #. the username does not exist -#, fuzzy msgid "Username does not exist" -msgstr "המשתמש לא קיים" +msgstr "שם המשתמש אינו קיים" #. Suspended account -#, fuzzy msgid "Your account is currently suspended" -msgstr "חשבונך מושעה כרגע." +msgstr "חשבונך מושעה כרגע" #. service temporarily unavailable msgid "The AOL Instant Messenger service is temporarily unavailable." msgstr "שירות ההודעות של AOL לא זמין כרגע." +#. client too old #, c-format msgid "The client version you are using is too old. Please upgrade at %s" msgstr "גירסת תוכנת הלקוח בה את/ה משתמש/ת ישנה מדי. אנא שדרג/י ב-%s" #. IP address connecting too frequently -#, fuzzy msgid "" "You have been connecting and disconnecting too frequently. Wait a minute and " "try again. If you continue to try, you will need to wait even longer." msgstr "" -"התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, " -"תיאלץ להמתין אפילו יותר." - -#, fuzzy +"התחברת והתנתקת בתדירות גבוהה מדיי. יש להמתין דקה ולנסות שנית. אם תמשיכ/י " +"לנסות, תיאלצ/י להמתין אפילו יותר." + msgid "The SecurID key entered is invalid" -msgstr "המפתח עבור SecurID אינו תקף." +msgstr "המפתח SecurID שהוזן אינו תקף." msgid "Enter SecurID" msgstr "יש להזין SecurID" @@ -6469,12 +6437,6 @@ msgid "Enter the 6 digit number from the digital display." msgstr "יש להזין את קוד 6 הספרות מהתצוגה הדיגיטלית." -#. * -#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. -#. -msgid "_OK" -msgstr "אישור" - msgid "Password sent" msgstr "הסיסמא נשלחה" @@ -6484,12 +6446,6 @@ msgid "Please authorize me so I can add you to my buddy list." msgstr "בבקשה, תנ/י לי אישור כדי להוסיף אותך לרשימת אנשי הקשר שלי." -msgid "Authorization Request Message:" -msgstr "הודעת בקשה להרשאה:" - -msgid "Please authorize me!" -msgstr "בבקשה, אני רוצה הרשאה!" - msgid "No reason given." msgstr "לא ניתנה סיבה." @@ -6792,22 +6748,18 @@ msgid "Away message too long." msgstr "הודעת הריחוק מהמחשב ארוכה מדי." -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because the username is invalid. Usernames must " "be a valid email address, or start with a letter and contain only letters, " "numbers and spaces, or contain only numbers." msgstr "" -"לא ניתן להוסיף את איש הקשר %s מכיוון ששם-התצוגה שלו לא חוקי. שמות-תצוגה " -"חייבים להתחיל באות ולהכיל רק אותיות, מספרים ורווחים, או רק להכיל מספרים." - -#, fuzzy -msgid "Unable to Add" -msgstr "לא ניתן להוסיף" - -#, fuzzy +"לא ניתן להוסיף את החבר %s מכיוון ששם המשתמש שלו לא חוקי. שמות-משתמשים " +"מוכרחים להיות כתובות אימייל תקפות, או לחילופין להתחיל באות ולהכיל רק אותיות, " +"מספרים ורווחים, או לחילופין להכיל רק מספרים." + msgid "Unable to Retrieve Buddy List" -msgstr "כשלון בשליפת רשימת אנשי הקשר" +msgstr "לא ניתן לשלוף את רשימת החברים" msgid "" "The AIM servers were temporarily unable to send your buddy list. Your buddy " @@ -6819,20 +6771,20 @@ msgid "Orphans" msgstr "יתומים" -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because you have too many buddies in your buddy " "list. Please remove one and try again." msgstr "" -"לא ניתן להוסיף את %s לרשימת אנשי הקשר שלך, כיוון שיש יותר מדי אנשי קשר " -"ברשימה. יש להסיר אחד ולנסות שנית." +"לא ניתן להוסיף את %s לרשימת החברים שלך, כיוון שיש יותר מדי חברים ברשימה. יש " +"להסיר אחד ולנסות שנית." msgid "(no name)" msgstr "(ללא שם)" -#, fuzzy, c-format +#, c-format msgid "Unable to add the buddy %s for an unknown reason." -msgstr "לא היה ניתן להוסיף את איש הקשר %s מסיבה לא ידועה." +msgstr "לא ניתן להוסיף את החבר%s מסיבה לא ידועה." #, c-format msgid "" @@ -6987,9 +6939,8 @@ msgid "Search for Buddy by Information" msgstr "חפש איש-קשר עפ\"י מידע" -#, fuzzy msgid "Use clientLogin" -msgstr "המשתמש לא מחובר" +msgstr "השתמש ב-clientLogin" msgid "" "Always use AIM/ICQ proxy server for\n" @@ -7102,16 +7053,14 @@ msgid "Other" msgstr "אחר" -#, fuzzy msgid "Visible" -msgstr "בלתי נראה" +msgstr "נראה" msgid "Friend Only" -msgstr "" - -#, fuzzy +msgstr "חבר בלבד" + msgid "Private" -msgstr "פרטיות" +msgstr "פרטי" msgid "QQ Number" msgstr "מספר QQ" @@ -7128,9 +7077,8 @@ msgid "Phone Number" msgstr "מםפר טלפון" -#, fuzzy msgid "Authorize adding" -msgstr "לתת אישור לחבר?" +msgstr "אישור הוספה" msgid "Cellphone Number" msgstr "מםפר פלאפון" @@ -7138,64 +7086,50 @@ msgid "Personal Introduction" msgstr "הצגה אישית" -#, fuzzy msgid "City/Area" -msgstr "עיר" - -#, fuzzy +msgstr "עיר/איזור" + msgid "Publish Mobile" -msgstr "טלפון נייד" - -#, fuzzy +msgstr "פרסם טל. נייד" + msgid "Publish Contact" -msgstr "שם נוסף לאיש קשר" +msgstr "פרסם איש-קשר" msgid "College" msgstr "מכללה" -#, fuzzy msgid "Horoscope" -msgstr "סמל הורוסקופ" - -#, fuzzy +msgstr "הורוסקופ" + msgid "Zodiac" -msgstr "סמל מן המזלות" - -#, fuzzy +msgstr "גלגל המזלות" + msgid "Blood" -msgstr "חסום" - -#, fuzzy +msgstr "סוג דם" + msgid "True" -msgstr "שור" - -#, fuzzy +msgstr "אמת" + msgid "False" -msgstr "נכשל" - -#, fuzzy +msgstr "שקר" + msgid "Modify Contact" -msgstr "עריכת החשבון" - -#, fuzzy +msgstr "ערוך איש-קשר" + msgid "Modify Address" -msgstr "כתובת בבית" - -#, fuzzy +msgstr "ערוך כתובת" + msgid "Modify Extended Information" -msgstr "ערוך את המידע שלי" - -#, fuzzy +msgstr "ערוך מידע נוסף" + msgid "Modify Information" -msgstr "ערוך את המידע שלי" - -#, fuzzy +msgstr "ערוך מידע" + msgid "Update" -msgstr "עודכן לאחרונה" - -#, fuzzy +msgstr "עדכן" + msgid "Could not change buddy information." -msgstr "יש להזין מידע על איש הקשר." +msgstr "לא ניתן לשנות מידע של החבר." msgid "Mobile" msgstr "נייד" @@ -7204,99 +7138,84 @@ msgstr "הערה" #. callback -#, fuzzy msgid "Buddy Memo" -msgstr "סמל איש הקשר" +msgstr "מזכר חבר" msgid "Change his/her memo as you like" -msgstr "" - -#, fuzzy +msgstr "ניתן לערוך את הטקסט של החבר כרצונך" + msgid "_Modify" -msgstr "ערוך" - -#, fuzzy +msgstr "_ערוך" + msgid "Memo Modify" -msgstr "ערוך" - -#, fuzzy +msgstr "עריכת מזכר" + msgid "Server says:" -msgstr "שרת עסוק" +msgstr "השרת אומר:" msgid "Your request was accepted." -msgstr "" +msgstr "בקשתך נתקבלה." msgid "Your request was rejected." -msgstr "" - -#, fuzzy, c-format +msgstr "בקשתך נדחתה." + +#, c-format msgid "%u requires verification" -msgstr "דרוש הרשאה" - -#, fuzzy +msgstr "נדרש אימות מאת %u" + msgid "Add buddy question" -msgstr "להוסיף את איש הקשר לרשימה שלך?" - -#, fuzzy +msgstr "הוסף שאלת חבר" + msgid "Enter answer here" -msgstr "יש להזין את הבקשה כאו" +msgstr "יש להזין את התשובה כאן" msgid "Send" msgstr "שלח" -#, fuzzy msgid "Invalid answer." -msgstr "שם משתמש לא תקף." +msgstr "תשובה לא תקפה." msgid "Authorization denied message:" msgstr "הודעת סירוב הרשאה:" -#, fuzzy msgid "Sorry, you're not my style." -msgstr "סליחה, את/ה לא הטיפוס שלי..." - -#, fuzzy, c-format +msgstr "סליחה, את/ה לא הטיפוס שלי." + +#, c-format msgid "%u needs authorization" -msgstr "משתמש %d דורש אימות" - -#, fuzzy +msgstr "%u דורש אימות" + msgid "Add buddy authorize" -msgstr "להוסיף את איש הקשר לרשימה שלך?" - -#, fuzzy +msgstr "הוסף אימות חבר" + msgid "Enter request here" -msgstr "יש להזין את הבקשה כאו" +msgstr "יש להזין את הבקשה כאן" msgid "Would you be my friend?" msgstr "התרצ/י להיות ידיד/ה שלי?" -#, fuzzy msgid "QQ Buddy" -msgstr "איש הקשר" - -#, fuzzy +msgstr "חבר QQ" + msgid "Add buddy" -msgstr "הוסף איש קשר" - -#, fuzzy +msgstr "הוסף חבר" + msgid "Invalid QQ Number" -msgstr "פרצוף QQ לא תקף" - -#, fuzzy +msgstr "מספר QQ לא תקף" + msgid "Failed sending authorize" -msgstr "בבקשה, אני רוצה הרשאה!" - -#, fuzzy, c-format +msgstr "כשל בשליחת אישור" + +#, c-format msgid "Failed removing buddy %u" -msgstr "כשל בהסרת איש-קשר" - -#, fuzzy, c-format +msgstr "כשל בהסרת חבר %u" + +#, c-format msgid "Failed removing me from %d's buddy list" -msgstr "%s הסיר/ה אותך מרשימת אנשי הקשר שלו או שלה." - -#, fuzzy +msgstr "כשל בהסרתי מרשימת החברים של %d" + msgid "No reason given" -msgstr "לא ניתנה סיבה." +msgstr "לא ניתנה סיבה" #. only need to get value #, c-format @@ -7306,9 +7225,9 @@ msgid "Would you like to add him?" msgstr "האם ברצונך להוסיף אותו?" -#, fuzzy, c-format +#, c-format msgid "Rejected by %s" -msgstr "דחה" +msgstr "נדחה על ידי %s" #, c-format msgid "Message: %s" @@ -7323,88 +7242,73 @@ msgid "QQ Qun" msgstr "QQ Qun" -#, fuzzy msgid "Please enter Qun number" -msgstr "אנא הזן את השם חדש עבור %s" - -#, fuzzy +msgstr "יש להזין מספר Qun" + msgid "You can only search for permanent Qun\n" -msgstr "ניתן לחפש רק קבוצות QQ קבועות\n" - -#, fuzzy +msgstr "ניתן לחפש רק Qun קבועות\n" + msgid "(Invalid UTF-8 string)" -msgstr "הגדרות לא תקפות של מתווכים" - -#, fuzzy +msgstr "(מחרוזת UTF-8 שגויה)" + msgid "Not member" -msgstr "אני אינני חבר/ה" +msgstr "לא חבר בקבוצה" msgid "Member" msgstr "חבר" -#, fuzzy msgid "Requesting" -msgstr "חלון בקשה" - -#, fuzzy +msgstr "מבקש" + msgid "Admin" -msgstr "Adium" - -#, fuzzy +msgstr "מנהל" + msgid "Notice" -msgstr "הערה" - -#, fuzzy +msgstr "הודעה" + msgid "Detail" -msgstr "ברירת המחדל" +msgstr "פרטים" msgid "Creator" msgstr "יוצר" -#, fuzzy msgid "About me" -msgstr "אודות %s" - -#, fuzzy +msgstr "אודותי" + msgid "Category" -msgstr "שגיאה בצ'אט" - -#, fuzzy +msgstr "קטגוריה" + msgid "The Qun does not allow others to join" -msgstr "קבוצה זו לא מאשרת לאחרים להצטרף" - -#, fuzzy +msgstr "ה-Qnn הזו לא מאשרת לאחרים להצטרף" + msgid "Join QQ Qun" -msgstr "הצטרף לצ'אט" +msgstr "הצטרף אל QQ Qun" msgid "Input request here" msgstr "יש להזין את הבקשה כאו" -#, fuzzy, c-format +#, c-format msgid "Successfully joined Qun %s (%u)" -msgstr "שינית בהצלחה את החבר-Qun" - -#, fuzzy +msgstr "צורף בהצלחה אל Qun %s (%u)" + msgid "Successfully joined Qun" -msgstr "שינית בהצלחה את החבר-Qun" +msgstr "צורף בהצלחה אל Qun" #, c-format msgid "Qun %u denied from joining" -msgstr "" +msgstr "Qun %u נאסר מלהצטרף" msgid "QQ Qun Operation" msgstr "פעולת QQ Qun" -#, fuzzy msgid "Failed:" -msgstr "נכשל" +msgstr "נכשל:" msgid "Join Qun, Unknown Reply" -msgstr "" - -#, fuzzy +msgstr "תשובה לא מוכרת, Join Qun" + msgid "Quit Qun" -msgstr "QQ Qun" +msgstr "יציאה מה-Qun" msgid "" "Note, if you are the creator, \n" @@ -7413,51 +7317,47 @@ "יש לשים לב, כי אם את/ה היוצר/ת, \n" "פעולה זו תביא בסופו של דבר להסרת ה-Qun." -#, fuzzy msgid "Sorry, you are not our style" -msgstr "סליחה, את/ה לא הטיפוס שלי..." - -#, fuzzy +msgstr "סליחה, את/ה לא הטיפוס שלנו" + msgid "Successfully changed Qun members" -msgstr "שינית בהצלחה את החבר-Qun" - -#, fuzzy +msgstr "שינית בהצלחה את חברי ה-Qun" + msgid "Successfully changed Qun information" msgstr "שינית בהצלחה מידע של ה-Qun" msgid "You have successfully created a Qun" msgstr "יצרת בהצלחה Qun" -#, fuzzy msgid "Would you like to set up detailed information now?" -msgstr "האם ברצונך לקבוע את פרטי ה-Qun כעת?" +msgstr "האם ברצונך כעת לקבוע את הפרטים?" msgid "Setup" msgstr "הגדרות" -#, fuzzy, c-format +#, c-format msgid "%u requested to join Qun %u for %s" -msgstr "המשתמש %d ביקש להצטרף לקבוצה %d" - -#, fuzzy, c-format +msgstr "%u ביקש להצטרף אל Qun %u בשביל %s" + +#, c-format msgid "%u request to join Qun %u" -msgstr "המשתמש %d ביקש להצטרף לקבוצה %d" - -#, fuzzy, c-format +msgstr "%u ביקש להצטרף אל Qun %u" + +#, c-format msgid "Failed to join Qun %u, operated by admin %u" -msgstr "כישלון בהצטרפות לאיש קשר בצ'אט" +msgstr "כשל בצטרפות אל Qun %u, המופעל על ידי המנהל %u" #, c-format msgid "Joining Qun %u is approved by admin %u for %s" -msgstr "" - -#, fuzzy, c-format +msgstr "הצטרפות אל Qun %u מאושרת על ידי המנהל %u עבור %s" + +#, c-format msgid "Removed buddy %u." -msgstr "הסר איש קשר" - -#, fuzzy, c-format +msgstr "הוסר חבר %u." + +#, c-format msgid "New buddy %u joined." -msgstr "הסר איש קשר" +msgstr "חבר חדש %u הצטרף." #, c-format msgid "Unknown-%d" @@ -7481,9 +7381,8 @@ msgid " Video" msgstr " וידאו" -#, fuzzy msgid " Zone" -msgstr "ללא" +msgstr "איזור" msgid "Flag" msgstr "דגל" @@ -7494,121 +7393,113 @@ msgid "Invalid name" msgstr "שם משתמש שגוי" -#, fuzzy msgid "Select icon..." -msgstr "בחירת תיקיה..." - -#, fuzzy, c-format +msgstr "בחירת סמל..." + +#, c-format msgid "Login time: %d-%d-%d, %d:%d:%d
\n" -msgstr "זמן כניסה: %s
\n" - -#, fuzzy, c-format +msgstr "זמן כניסה: %d-%d-%d, %d:%d:%d
\n" + +#, c-format msgid "Total Online Buddies: %d
\n" -msgstr "כרגע מחוברים: %d
\n" - -#, fuzzy, c-format +msgstr "סך-הכל חברים מחוברים: %d
\n" + +#, c-format msgid "Last Refresh: %d-%d-%d, %d:%d:%d
\n" -msgstr "עידכון אחרון: %s
\n" - -#, fuzzy, c-format +msgstr "עידכון אחרון: %d-%d-%d, %d:%d:%d
\n" + +#, c-format msgid "Server: %s
\n" -msgstr "שרת: %s: %d
\n" - -#, fuzzy, c-format +msgstr "שרת: %s
\n" + +#, c-format msgid "Client Tag: %s
\n" -msgstr "זמן כניסה: %s
\n" +msgstr "תגית לקוח: %s
\n" #, c-format msgid "Connection Mode: %s
\n" msgstr "סוג החיבור: %s
\n" -#, fuzzy, c-format +#, c-format msgid "My Internet IP: %s:%d
\n" -msgstr "סוג החיבור: %s
\n" - -#, fuzzy, c-format +msgstr "כתובתי באינטרנט: %s:%d
\n" + +#, c-format msgid "Sent: %lu
\n" -msgstr "שרת: %s: %d
\n" - -#, fuzzy, c-format +msgstr "נשלח: %lu
\n" + +#, c-format msgid "Resend: %lu
\n" -msgstr "עידכון אחרון: %s
\n" - -#, fuzzy, c-format +msgstr "נשלח שוב: %lu
\n" + +#, c-format msgid "Lost: %lu
\n" -msgstr "עידכון אחרון: %s
\n" - -#, fuzzy, c-format +msgstr "אבד: %lu
\n" + +#, c-format msgid "Received: %lu
\n" -msgstr "שרת: %s: %d
\n" - -#, fuzzy, c-format +msgstr "התקבל: %lu
\n" + +#, c-format msgid "Received Duplicate: %lu
\n" -msgstr "כתובתי המפורסמת: %s
\n" - -#, fuzzy, c-format +msgstr "התקבל במכופל: %lu
\n" + +#, c-format msgid "Time: %d-%d-%d, %d:%d:%d
\n" -msgstr "זמן כניסה: %s
\n" - -#, fuzzy, c-format +msgstr "זמן: %d-%d-%d, %d:%d:%d
\n" + +#, c-format msgid "IP: %s
\n" -msgstr "שרת: %s: %d
\n" +msgstr "IP: %s
\n" msgid "Login Information" msgstr "מידע על הכניסה" msgid "

Original Author:
\n" -msgstr "" +msgstr "

מחבר מקורי:
\n" msgid "

Code Contributors:
\n" -msgstr "" - -#, fuzzy +msgstr "

תורמי קוד:
\n" + msgid "

Lovely Patch Writers:
\n" -msgstr "עידכון אחרון: %s
\n" - -#, fuzzy +msgstr "

כותבי-טלאי נפלאים:
\n" + msgid "

Acknowledgement:
\n" -msgstr "שרת: %s: %d
\n" - -#, fuzzy +msgstr "

הכרת-תודה:
\n" + msgid "

Scrupulous Testers:
\n" -msgstr "עידכון אחרון: %s
\n" +msgstr "

בודקי-תוכנה קפדניים:
\n" msgid "and more, please let me know... thank you!))" -msgstr "" +msgstr "ועוד, אנא הודיעו לי... תודה!))" msgid "

And, all the boys in the backroom...
\n" -msgstr "" +msgstr "

וכן, כל החבר'ה בחדר האחורי...
\n" msgid "Feel free to join us! :)" -msgstr "" - -#, fuzzy, c-format +msgstr "הרגישו חופשי להצטרף אלינו! :)" + +#, c-format msgid "About OpenQ %s" -msgstr "אודות %s" - -#, fuzzy +msgstr "אודות OpenQ %s" + msgid "Change Icon" -msgstr "שמירת סמל" +msgstr "שנה סמל" msgid "Change Password" msgstr "שנה סיסמא" -#, fuzzy msgid "Account Information" -msgstr "מידע על הכניסה" +msgstr "מידע על החשבון" msgid "Update all QQ Quns" -msgstr "" - -#, fuzzy +msgstr "עדכן את כל QQ Quns" + msgid "About OpenQ" -msgstr "אודות %s" - -#, fuzzy +msgstr "אודות OpenQ" + msgid "Modify Buddy Memo" -msgstr "כתובת בבית" +msgstr "ערוך מזכר על החבר" #. *< type #. *< ui_requirement @@ -7620,57 +7511,48 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "QQ Protocol Plugin" -msgstr "פרוטוקול QQ\tתוסף" - -#, fuzzy +msgstr "פרוטוקול תוסף QQ" + msgid "Auto" -msgstr "מחבר" - -#, fuzzy +msgstr "אוטומטי" + msgid "Select Server" -msgstr "בחר משתמש" +msgstr "בחר שרת" msgid "QQ2005" -msgstr "" +msgstr "QQ2005" msgid "QQ2007" -msgstr "" +msgstr "QQ2007" msgid "QQ2008" -msgstr "" - -#, fuzzy +msgstr "QQ2008" + msgid "Connect by TCP" -msgstr "מתחבר בעזרת TCP" - -#, fuzzy +msgstr "התחבר בעזרת TCP" + msgid "Show server notice" -msgstr "פורט השרת" - -#, fuzzy +msgstr "הצג הודעת שרת" + msgid "Show server news" -msgstr "כתובת שרת" +msgstr "הצג חדשות שרת" msgid "Show chat room when msg comes" -msgstr "" - -#, fuzzy +msgstr "הצג חדר-צ'אט כשמתקבלת הודעה" + msgid "Keep alive interval (seconds)" -msgstr "פרקי-זמן להודעות הישאר-בחיים" - -#, fuzzy +msgstr "פרקי-זמן להודעות הישאר-בחיים (בשניות)" + msgid "Update interval (seconds)" -msgstr "פרק זמן בין עידכונים" - -#, fuzzy +msgstr "פרק זמן בין עידכונים (שניות)" + msgid "Unable to decrypt server reply" -msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש" +msgstr "אין אפשרות לפענוח המשוב מהשרת" #, c-format msgid "Failed requesting token, 0x%02X" -msgstr "" +msgstr "כישלון בבקשת token, 0x%02X" #, c-format msgid "Invalid token len, %d" @@ -7678,135 +7560,122 @@ #. extend redirect used in QQ2006 msgid "Redirect_EX is not currently supported" -msgstr "" +msgstr "Redirect_EX אינו נתמך כרגע" #. need activation #. need activation #. need activation -#, fuzzy msgid "Activation required" -msgstr "נדרשת הרשמה" - -#, fuzzy, c-format +msgstr "נדרשת הפעלה" + +#, c-format msgid "Unknown reply code when logging in (0x%02X)" -msgstr "קוד-תגובה שגוי, 0x%02X" - -#, fuzzy +msgstr "משוב לא מוכר בעת התחברות (0x%02X)" + msgid "Requesting captcha" -msgstr "מבקש/ת את תשומת-הלב של %s..." - -#, fuzzy +msgstr "מבקש וידוא-אדם" + msgid "Checking captcha" -msgstr "מבקש/ת את תשומת-הלב של %s..." - -#, fuzzy +msgstr "בודק וידוא-אדם" + msgid "Failed captcha verification" -msgstr "כישלון באימות מול Yahoo!" - -#, fuzzy +msgstr "כישלון וידוא-אדם" + msgid "Captcha Image" -msgstr "שמור תמונה" - -#, fuzzy +msgstr "תמונת captcha" + msgid "Enter code" -msgstr "הזן סיסמא" - -#, fuzzy +msgstr "הזן קוד" + msgid "QQ Captcha Verification" -msgstr "וידוא תעודת SSL" - -#, fuzzy +msgstr "וידוא-אדם של QQ" + msgid "Enter the text from the image" -msgstr "יש להזין את שם הקבוצה" - -#, fuzzy, c-format +msgstr "יש להזין את הטקסט מהתמונה" + +#, c-format msgid "Unknown reply when checking password (0x%02X)" -msgstr "קוד-תגובה שגוי, 0x%02X" - -#, fuzzy, c-format +msgstr "משוב לא מוכר בעת בדיקת סיסמא (0x%02X)" + +#, c-format msgid "" "Unknown reply code when logging in (0x%02X):\n" "%s" -msgstr "קוד-תגובה שגוי, 0x%02X" +msgstr "" +"קוד-משוב לא מוכר בעת התחברות (0x%02X):\n" +"%s" msgid "Socket error" msgstr "שגיאת שקע" -#, fuzzy msgid "Getting server" -msgstr "קבע את המידע על המשתמש..." - -#, fuzzy +msgstr "שולף שרת" + msgid "Requesting token" -msgstr "הבקשה נדחית" - -#, fuzzy +msgstr "מבקש סמלון" + msgid "Unable to resolve hostname" -msgstr "לא ניתן להתחבר לשרת" - -#, fuzzy +msgstr "לא ניתן לתרגם את שם השרת לכתובת" + msgid "Invalid server or port" -msgstr "מספר שגיאה לא תקף." - -#, fuzzy +msgstr "שרת או יציאה לא-חוקיים" + msgid "Connecting to server" -msgstr "מתחבר לשרת ה-SILC" - -#, fuzzy +msgstr "מתחבר לשרת" + msgid "QQ Error" -msgstr "שגיאת QQid" - -#, fuzzy, c-format +msgstr "שגיאת QQ" + +#, c-format msgid "" "Server News:\n" "%s\n" "%s\n" "%s" -msgstr "ניתוב שרת ICQ" - -#, fuzzy, c-format +msgstr "" +"חדשות שרת:\n" +"%s\n" +"%s\n" +"%s" + +#, c-format msgid "%s:%s" -msgstr "%s (%s)" - -#, fuzzy, c-format +msgstr "%s:%s" + +#, c-format msgid "From %s:" -msgstr "מאת" - -#, fuzzy, c-format +msgstr "מאת %s:" + +#, c-format msgid "" "Server notice From %s: \n" "%s" -msgstr "הנחיות שרת: %s" - -#, fuzzy +msgstr "" +"הודעת שרת מאת %s: \n" +"%s" + msgid "Unknown SERVER CMD" -msgstr "סיבה לא ידועה" - -#, fuzzy, c-format +msgstr "SERVER CMD לא מוכר" + +#, c-format msgid "" "Error reply of %s(0x%02X)\n" "Room %u, reply 0x%02X" msgstr "" -"משוב %s(0x%02X )\n" -"נשלח %s(0x%02X )\n" -"מזהה חדר %d, משוב [0x%02X]: \n" -"%s" - -#, fuzzy +"משוב שגיאה של %s(0x%02X)\n" +"חדר %u, משוב 0x%02X" + msgid "QQ Qun Command" -msgstr "פקודה" - -#, fuzzy +msgstr "פקודת QQ Qun" + msgid "Unable to decrypt login reply" -msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש" - -#, fuzzy +msgstr "אין אפשרות לפענוח המשוב לניסיון ההתחברות" + msgid "Unknown LOGIN CMD" -msgstr "סיבה לא ידועה" - -#, fuzzy +msgstr "LOGIN CMD לא מוכר" + msgid "Unknown CLIENT CMD" -msgstr "סיבה לא ידועה" +msgstr "CLIENT CMD לא מוכר" #, c-format msgid "%d has declined the file %s" @@ -8767,7 +8636,6 @@ msgid "Disconnected by server" msgstr "נותק ע\"י השרת" -#, fuzzy msgid "Error connecting to SILC Server" msgstr "שגיאה בעת התחברות לשרת ה-SILC" @@ -8781,7 +8649,6 @@ msgid "Performing key exchange" msgstr "מבצע החלפת מפתחות" -#, fuzzy msgid "Unable to load SILC key pair" msgstr "לא ניתן לטעון את זוג מפתחות ה-SILC" @@ -8789,14 +8656,9 @@ msgid "Connecting to SILC Server" msgstr "מתחבר לשרת ה-SILC" -#, fuzzy -msgid "Unable to not load SILC key pair" -msgstr "לא ניתן לטעון את זוג מפתחות ה-SILC" - msgid "Out of memory" msgstr "אזל הזיכרון" -#, fuzzy msgid "Unable to initialize SILC protocol" msgstr "לא ניתן לאתחל את פרוטוקול SILC" @@ -9084,9 +8946,8 @@ msgid "Creating SILC key pair..." msgstr "יוצר זוג מפתחות SILC..." -#, fuzzy msgid "Unable to create SILC key pair" -msgstr "לא יכול ליצור זוג מפתחות SILC\n" +msgstr "לא ניתן ליצור זוג מפתחות SILC" #. Hint for translators: Please check the tabulator width here and in #. the next strings (short strings: 2 tabs, longer strings 1 tab, @@ -9222,34 +9083,30 @@ msgid "Failure: Authentication failed" msgstr "שגיאה: האימות נכשל" -#, fuzzy msgid "Unable to initialize SILC Client connection" msgstr "לא ניתן לאתחל חיבור לקוח של SILC" msgid "John Noname" msgstr "פלוני אלמוני" -#, fuzzy, c-format +#, c-format msgid "Unable to load SILC key pair: %s" msgstr "לא ניתן לטעון את זוג מפתחות ה-SILC: %s" msgid "Unable to create connection" msgstr "לא ניתן ליצור חיבור" -#, fuzzy msgid "Unknown server response" -msgstr "תגובת שרת לא ידועה." - -#, fuzzy +msgstr "תגובת שרת לא מוכרת" + msgid "Unable to create listen socket" -msgstr "אין אפשרות ליצור שקע" +msgstr "אין אפשרות ליצור שקע-קשב" msgid "SIP usernames may not contain whitespaces or @ symbols" msgstr "אסור לשמות משתמשים של SIP להכיל רווחים או סמלי @" -#, fuzzy msgid "SIP connect server not specified" -msgstr "פורט השרת" +msgstr "לא הוגדר שרת חיבור SIP" #. *< type #. *< ui_requirement @@ -9293,9 +9150,8 @@ msgid "doodle: Request user to start a Doodle session" msgstr "doodle: לבקש מהמשתמש להתחיל ב- Doodle" -#, fuzzy msgid "Yahoo ID..." -msgstr "Yahoo! ID" +msgstr "Yahoo ID..." #. *< type #. *< ui_requirement @@ -9307,9 +9163,8 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! Protocol Plugin" -msgstr "תוסף פרוטוקול Yahoo" +msgstr "תוסף פרוטוקול Yahoo!" msgid "Pager server" msgstr "שרת ה-Pager" @@ -9338,9 +9193,8 @@ msgid "Yahoo Chat port" msgstr "כניסת שרת Yahoo" -#, fuzzy msgid "Yahoo JAPAN ID..." -msgstr "Yahoo! ID" +msgstr "Yahoo יפן ID" #. *< type #. *< ui_requirement @@ -9352,12 +9206,11 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "תוסף פרוטוקול Yahoo" +msgstr "תוסף פרוטוקול Yahoo! יפן" msgid "Your SMS was not delivered" -msgstr "" +msgstr "הסמס שלך לא הגיע ליעדו" msgid "Your Yahoo! message did not get sent." msgstr "הודעת ה Yahoo שלך לא נשלחה." @@ -9382,28 +9235,26 @@ msgstr "הוספת איש קשר נדחתה" #. Some error in the received stream -#, fuzzy msgid "Received invalid data" -msgstr "התקבל מידע שגוי בחיבור עם השרת." +msgstr "התקבל מידע שגוי" #. security lock from too many failed login attempts -#, fuzzy msgid "" "Account locked: Too many failed login attempts. Logging into the Yahoo! " "website may fix this." -msgstr "שגיאה לא מוכרת מספר %d. התחברות באתר Yahoo! אולי יתקן את זה." +msgstr "" +"החשבון נעול: יותר מדי ניסיון התחברות כושלים. התחברות באתר Yahoo! אולי תתקן " +"את זה." #. indicates a lock of some description -#, fuzzy msgid "" "Account locked: Unknown reason. Logging into the Yahoo! website may fix " "this." -msgstr "שגיאה לא מוכרת מספר %d. התחברות באתר Yahoo! אולי יתקן את זה." +msgstr "החשבון נעול: סיבה לא ידועה. התחברות באתר Yahoo! אולי תתקן את זה." #. username or password missing -#, fuzzy msgid "Username or password missing" -msgstr "שם משתמש או סיסמה שגויים" +msgstr "שם משתמש או סיסמה חסרים" #, c-format msgid "" @@ -9435,33 +9286,27 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this." msgstr "שגיאה לא מוכרת מספר %d. התחברות באתר Yahoo! אולי יתקן את זה." -#, fuzzy, c-format +#, c-format msgid "Unable to add buddy %s to group %s to the server list on account %s." -msgstr "לא ניתן להוסיף את איש הקשר %s לקבוצה %s ברשימה על השרת בחשבון %s." - -#, fuzzy +msgstr "לא ניתן להוסיף את החבר %s לקבוצה %s ברשימה בשרת בחשבון %s." + msgid "Unable to add buddy to server list" -msgstr "לא ניתן להוסיף את איש הקשר לרשימה בשרת" +msgstr "לא ניתן להוסיף את החבר לרשימה בשרת" #, c-format msgid "[ Audible %s/%s/%s.swf ] %s" msgstr "[ בר-שמיעה %s/%s/%s.swf ] %s" -#, fuzzy msgid "Received unexpected HTTP response from server" -msgstr "התקבלה תגובת HTTP לא-צפויה מן השרת." - -#, fuzzy, c-format +msgstr "התקבלה תגובת HTTP לא-צפויה מן השרת" + +#, c-format msgid "Lost connection with %s: %s" -msgstr "" -"אבד החיבור עם %s:\n" -"%s" - -#, fuzzy, c-format +msgstr "אבד החיבור עם %s: %s" + +#, c-format msgid "Unable to establish a connection with %s: %s" -msgstr "" -"לא ניתן ליצור חיבור עם השרת:\n" -"%s" +msgstr "לא ניתן ליצור חיבור עם %s: %s" msgid "Not at Home" msgstr "לא נמצא בבית" @@ -9509,7 +9354,7 @@ msgstr "התחל לקשקש" msgid "Select the ID you want to activate" -msgstr "" +msgstr "יש לבחור את המזהה ברצונך להפעיל" msgid "Join whom in chat?" msgstr "להצטרף למי בצ'אט?" @@ -9582,10 +9427,9 @@ msgid "Last Update" msgstr "עודכן לאחרונה" -#, fuzzy msgid "" "This profile is in a language or format that is not supported at this time." -msgstr "סליחה, אך נראה כי פרופיל זה הוא בשפה או פורמט שלא נתמכים כרגע." +msgstr "פרופיל זה אינו בשפה או פורמט אשר אינם נתמכים כרגע." msgid "" "Could not retrieve the user's profile. This most likely is a temporary " @@ -9606,12 +9450,9 @@ msgid "The user's profile is empty." msgstr "פרופיל המשתמש ריק." -#, c-format -msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." -msgstr "%s סרב את ההזמנה שלך לועידה בחדר \"%s\" כיוון ש-\"%s\"." - -msgid "Invitation Rejected" -msgstr "ההזמנה נדחתה" +#, fuzzy, c-format +msgid "%s has declined to join." +msgstr "%s התחבר." msgid "Failed to join chat" msgstr "לא ניתן להצטרף לשיחה" @@ -9663,9 +9504,8 @@ msgid "User Rooms" msgstr "חדרים של משתמשים" -#, fuzzy msgid "Connection problem with the YCHT server" -msgstr "שגיאה בתקשורת עם שרת ה-YCHT." +msgstr "שגיאה עם החיבור אל שרת ה-YCHT." msgid "" "(There was an error converting this message.\t Check the 'Encoding' option " @@ -9787,17 +9627,17 @@ msgid "Exposure" msgstr "חשיפה" -#, fuzzy, c-format +#, c-format msgid "Unable to parse response from HTTP proxy: %s" -msgstr "לא ניתן לעכל את תשובת שרת התיווך של HTTP: %s\n" +msgstr "לא ניתן לעבד את משוב שרת התיווך של HTTP: %s" #, c-format msgid "HTTP proxy connection error %d" msgstr "שגיאה בשרת התיווך של HTTP %d" -#, fuzzy, c-format +#, c-format msgid "Access denied: HTTP proxy server forbids port %d tunneling" -msgstr "אין הרשאה: שרת התיווך אוסר על תיעול ליציאה %d." +msgstr "אין הרשאה: שרת התיווך אוסר על תיעול ליציאה %d" #, c-format msgid "Error resolving %s" @@ -9980,9 +9820,9 @@ msgid "Unable to connect to %s" msgstr "לא ניתן להתחבר אל %s" -#, fuzzy, c-format +#, c-format msgid "Error reading from %s: response too long (%d bytes limit)" -msgstr "שגיאה בקריאה מתוך %s: %s" +msgstr "שגיאה בקריאה מתוך %s: אורך המשוב ארוך מדי (מוגבל עד %d בייט)" #, c-format msgid "" @@ -10041,12 +9881,12 @@ msgid "Error Reading %s" msgstr "שגיאה בקריאת %s" -#, fuzzy, c-format +#, c-format msgid "" "An error was encountered reading your %s. The file has not been loaded, and " "the old file has been renamed to %s~." msgstr "" -"חלה שגיאה בעת קריאת ה-%s שלך. הם לא נטענו, ושם הקובץ הישן הוחלף ל-%s~." +"חלה שגיאה בעת קריאת ה-%s שלך. הקובץ לא נטען, ושם ההובץ הישן שונה ל-%s~." msgid "Internet Messenger" msgstr "למסרים באינטרנט" @@ -10090,7 +9930,7 @@ msgid "Use this buddy _icon for this account:" msgstr "השתמש בתמונה זו לחשבון זה:" -msgid "_Advanced" +msgid "Ad_vanced" msgstr "_מתקדם" msgid "Use GNOME Proxy Settings" @@ -10153,9 +9993,8 @@ msgid "Create _this new account on the server" msgstr "צור חשבון חדש זה על השרת" -#, fuzzy -msgid "_Proxy" -msgstr "מתווך" +msgid "P_roxy" +msgstr "מת_ווך" msgid "Enabled" msgstr "פעיל" @@ -10163,7 +10002,7 @@ msgid "Protocol" msgstr "פרוטוקול" -#, fuzzy, c-format +#, c-format msgid "" "Welcome to %s!\n" "\n" @@ -10175,14 +10014,14 @@ "You can come back to this window to add, edit, or remove accounts from " "Accounts->Manage Accounts in the Buddy List window" msgstr "" -"ברוכים הבאים ל-%s!\n" -"\n" -"אין ברשותך שם חשבונות מוגדרים. להתחיל התחברות עם %s יש ללחוץ על הכפתור " -"הוסף שלמטה ולהגדיר את החשבון הראשון שלך. אם ברצונך ש-%s יתחבר לכמה " -"חשבונות, יש ללחוץ על הוסף שוב על-מנת להגדיר את כולם.\n" +"ברוכים הבאים אל%s!\n" +"\n" +"אין ברשותך שם חשבונות מוגדרים. על מנת להתחבר עם %s יש ללחוץ על הכפתור " +"הוסף... שלהלן להגדיר את חשבונך הראשון. אם ברצונך ש-%s יתחבר לכמה " +"חשבונות, יש ללחוץ על הוסף... שוב על מנת להגדיר את כולם.\n" "\n" "ניתן גם לחזור לחלון זה על מנת להוסיף, לערוך, או להסיר חשבונות על-ידי " -"חשבונות->הוסף/ערוך שבחלון רשימת אנשי-הקשר" +"חשבונות->נהל חשבונות שבחלון רשימת החברים" #, c-format msgid "You have %d contact named %s. Would you like to merge them?" @@ -10203,9 +10042,8 @@ msgid "Please update the necessary fields." msgstr "יש לעדכן את השדות הנחוצים." -#, fuzzy msgid "A_ccount" -msgstr "חשבון" +msgstr "ח_שבון" msgid "" "Please enter the appropriate information about the chat you would like to " @@ -10230,16 +10068,14 @@ msgid "I_M" msgstr "הודעה" -#, fuzzy msgid "_Audio Call" -msgstr "הוסף שיחה" +msgstr "שיחה _קולית" msgid "Audio/_Video Call" -msgstr "" - -#, fuzzy +msgstr "שיחה קולית או שיחת וידאו" + msgid "_Video Call" -msgstr "שיחת וידאו" +msgstr "שיחת וי_דאו" msgid "_Send File..." msgstr "שלח קובץ..." @@ -10250,11 +10086,9 @@ msgid "View _Log" msgstr "הצ_ג רישום" -#, fuzzy msgid "Hide When Offline" msgstr "החבא כאשר לא-מקוון" -#, fuzzy msgid "Show When Offline" msgstr "הצג כאשר לא-מקוון" @@ -10380,9 +10214,8 @@ msgid "/Tools/_Certificates" msgstr "/כלים/תעודות" -#, fuzzy msgid "/Tools/Custom Smile_ys" -msgstr "/כלים/_חייכן" +msgstr "/כלים/_חייכן שלי" msgid "/Tools/Plu_gins" msgstr "/כלים/תו_ספים" @@ -10511,7 +10344,7 @@ msgstr "לפי מצב" msgid "By recent log activity" -msgstr "" +msgstr "על פי פעילות אחרונה ביומן הרישום" #, c-format msgid "%s disconnected" @@ -10528,7 +10361,7 @@ msgstr "הפעל מחדש" msgid "SSL FAQs" -msgstr "" +msgstr "שו\"ת SSL" msgid "Welcome back!" msgstr "ברוך שובך!" @@ -10620,9 +10453,8 @@ msgid "Auto_join when account becomes online." msgstr "הצטרפות אוטומטית כאשר החשבון נעשה מקוון." -#, fuzzy msgid "_Remain in chat after window is closed." -msgstr "ה_סתר צ'אט כאשר החלון נסגר." +msgstr "הש_אר בצ'אט אחרי שהחלון נסגר." msgid "Please enter the name of the group to be added." msgstr "יש להזין את שם הקבוצה החדשה." @@ -10655,111 +10487,96 @@ msgid "Background Color" msgstr "צבע הרקע" -#, fuzzy msgid "The background color for the buddy list" -msgstr "קבוצה זו נוספה לרשימת אנשי הקשר שלך" - -#, fuzzy +msgstr "צבע הרקע עבור רשימת החברים" + msgid "Layout" -msgstr "לאית" +msgstr "מתווה" msgid "The layout of icons, name, and status of the blist" -msgstr "" +msgstr "מיקומי הסמלים, השמות והמצבים ברשימת אנשי-הקשר" #. Group -#, fuzzy msgid "Expanded Background Color" -msgstr "צבע הרקע" +msgstr "צבע רקע עבור מורחב" msgid "The background color of an expanded group" -msgstr "" - -#, fuzzy +msgstr "צבע-הרקע של קבוצה שהורחבה" + msgid "Expanded Text" -msgstr "ה_רחב" +msgstr "טקסט מורחב" msgid "The text information for when a group is expanded" -msgstr "" - -#, fuzzy +msgstr "טקסט למידע כשקבוצה מורחבת" + msgid "Collapsed Background Color" -msgstr "בחירת צבע רקע" +msgstr "צבע רקע עבור עבור מקופל" msgid "The background color of a collapsed group" -msgstr "" - -#, fuzzy +msgstr "צבע-הרקע של קבוצה שצומצמה" + msgid "Collapsed Text" -msgstr "_קפל" +msgstr "טקסט מקופל" msgid "The text information for when a group is collapsed" -msgstr "" +msgstr "טקסט למידע כשקבוצה מצומצמת" #. Buddy -#, fuzzy msgid "Contact/Chat Background Color" -msgstr "בחירת צבע רקע" +msgstr "צבע רקע עבור צ'אט/איש-קשר" msgid "The background color of a contact or chat" -msgstr "" - -#, fuzzy +msgstr "צבע-הרקע של איש-קשר או צ'אט" + msgid "Contact Text" -msgstr "קיצור-דרך" +msgstr "טקסט איש-קשר" msgid "The text information for when a contact is expanded" -msgstr "" - -#, fuzzy +msgstr "טקסט למידע כשאיש-קשר מורחב" + msgid "On-line Text" -msgstr "מחובר" +msgstr "טקסט כשמחובר" msgid "The text information for when a buddy is online" -msgstr "" - -#, fuzzy +msgstr "טקסט למידע כשאיש-קשר מחובר" + msgid "Away Text" -msgstr "רחוק מהמחשב" +msgstr "טקסט כשרחוק מהמחשב" msgid "The text information for when a buddy is away" -msgstr "" - -#, fuzzy +msgstr "טקסט למידע כשאיש-קשר מרוחק מהמחשב" + msgid "Off-line Text" -msgstr "מנותק" +msgstr "טקסט כשמנותק" msgid "The text information for when a buddy is off-line" -msgstr "" - -#, fuzzy +msgstr "טקסט למידע כשאיש-קשר מנותק" + msgid "Idle Text" -msgstr "טקסט מצב-רוח" +msgstr "טקסט כשחסר-פעילות" msgid "The text information for when a buddy is idle" -msgstr "" - -#, fuzzy +msgstr "טקסט למידע כשאיש-קשר חסר-פעילות" + msgid "Message Text" -msgstr "הודעה נשלחה" +msgstr "טקסט הודעת" msgid "The text information for when a buddy has an unread message" -msgstr "" +msgstr "טקסט למידע כשלאיש-קשר יש הודעות שלא נקראו" msgid "Message (Nick Said) Text" -msgstr "" +msgstr "טקסט הודעות (מישהו אמר)" msgid "" "The text information for when a chat has an unread message that mentions " "your nick" -msgstr "" - -#, fuzzy +msgstr "טקסט להציג כשצ'אט מכיל הודעה שלא-נקראה שמזכירה את הכינוי שלך" + msgid "The text information for a buddy's status" -msgstr "שנה פרטי משתמש עבור %s" - -#, fuzzy +msgstr "הטקסט עבור מצבו של חבר" + msgid "Type the host name for this certificate." -msgstr "יש להקליד את שם השרת שעבורו נועדה התעודה" +msgstr "יש להקליד את שם השרת שעבורו נועדה תעודה זו" #. Widget creation function msgid "SSL Servers" @@ -10806,7 +10623,6 @@ msgid "Get Away Message" msgstr "השג את הודעת ההתרחקות" -#, fuzzy msgid "Last Said" msgstr "נאמר לאחרונה" @@ -10853,21 +10669,17 @@ msgid "/Conversation/Clea_r Scrollback" msgstr "/שיחה/נ_קה גלילה לאחור" -#, fuzzy msgid "/Conversation/M_edia" -msgstr "/שיחה/_עוד" - -#, fuzzy +msgstr "/שיחה/_מדיה" + msgid "/Conversation/Media/_Audio Call" -msgstr "/שיחה/_עוד" - -#, fuzzy +msgstr "/שיחה _קולית/שיחה/מדיה" + msgid "/Conversation/Media/_Video Call" -msgstr "/שיחה/_עוד" - -#, fuzzy +msgstr "/שיחת _וידאו/שיחה/מדיה" + msgid "/Conversation/Media/Audio\\/Video _Call" -msgstr "/שיחה/ה_צג יומן שיחות" +msgstr "/שיחת ו_ידאו/\\קול/שיחה/מדיה" msgid "/Conversation/Se_nd File..." msgstr "/שיחה/ש_לח קובץ..." @@ -10941,17 +10753,14 @@ msgid "/Conversation/View Log" msgstr "/שיחה/הצג יומן שיחות" -#, fuzzy msgid "/Conversation/Media/Audio Call" -msgstr "/שיחה/עוד" - -#, fuzzy +msgstr "/שיחת קול/שיחה/מדיה" + msgid "/Conversation/Media/Video Call" -msgstr "/שיחה/הצג יומן שיחות" - -#, fuzzy +msgstr "/שיחת וידאו/שיחה/מדיה" + msgid "/Conversation/Media/Audio\\/Video Call" -msgstr "/שיחה/עוד" +msgstr "/שיחת וידאו/\\קול/שיחה/מדיה" msgid "/Conversation/Send File..." msgstr "/שיחה/שלח קובץ..." @@ -11126,9 +10935,8 @@ msgstr "שגיאה קטלנית" msgid "bug master" -msgstr "" - -#, fuzzy +msgstr "שר-הבאגים" + msgid "artist" msgstr "אמן" @@ -11137,14 +10945,13 @@ msgstr "קא-הינג צ'אונג" msgid "voice and video" -msgstr "" +msgstr "קול ווידאו" msgid "support" msgstr "תמיכה" -#, fuzzy msgid "webmaster" -msgstr "מפתח ומנהל אתר" +msgstr "מנהל אתר" msgid "Senior Contributor/QA" msgstr "תורם בכיר/QA" @@ -11166,7 +10973,7 @@ msgstr "תמיכה/QA" msgid "XMPP" -msgstr "" +msgstr "XMPP" msgid "original author" msgstr "מתכנת מקורי" @@ -11243,9 +11050,8 @@ msgid "French" msgstr "צרפתית" -#, fuzzy msgid "Irish" -msgstr "כורדית" +msgstr "אירית" msgid "Galician" msgstr "גליסיאנית" @@ -11265,9 +11071,8 @@ msgid "Hungarian" msgstr "הונגרית" -#, fuzzy msgid "Armenian" -msgstr "רומנית" +msgstr "ארמנית" msgid "Indonesian" msgstr "אינדונזית" @@ -11284,9 +11089,8 @@ msgid "Ubuntu Georgian Translators" msgstr "מתרגמי הגרוזינית של אובונטו" -#, fuzzy msgid "Khmer" -msgstr "אחר" +msgstr "קמבודית" msgid "Kannada" msgstr "קאנאדית" @@ -11309,9 +11113,8 @@ msgid "Macedonian" msgstr "מקדונית" -#, fuzzy msgid "Mongolian" -msgstr "מקדונית" +msgstr "מונגולית" msgid "Bokmål Norwegian" msgstr "נורבגית ספרותית" @@ -11368,7 +11171,7 @@ msgstr "שוודית" msgid "Swahili" -msgstr "" +msgstr "סוואהילי" msgid "Tamil" msgstr "תמיל" @@ -11433,21 +11236,25 @@ "FAQ: http://developer.pidgin.im/wiki/FAQ

" msgstr "" +"שו\"ת: http://developer.pidgin.im/wiki/FAQ

" #, c-format msgid "" "Help via e-mail: support@pidgin.im

" msgstr "" - -#, fuzzy, c-format +"עזרה דרך האימייל: support@pidgin.im

" + +#, c-format msgid "" "IRC Channel: #pidgin on irc.freenode.net

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

" - -#, fuzzy, c-format +msgstr "ערוץ IRC: #pidgin על irc.freenode.net

" + +#, c-format msgid "XMPP MUC: devel@conference.pidgin.im

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

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

" msgid "Current Developers" msgstr "מפתחים" @@ -11687,13 +11494,11 @@ msgid "Color to draw hyperlinks." msgstr "צבע לצבוע בו קישורים." -#, fuzzy msgid "Hyperlink visited color" -msgstr "צבע קישורים" - -#, fuzzy +msgstr "צבע קישור שביקרת" + msgid "Color to draw hyperlink after it has been visited (or activated)." -msgstr "הצבע לצבוע בו קישורים כאשר העכבר מעליהם." +msgstr "הצבע עבור קישורים שכבר בוקרו (או הופעלו)." msgid "Hyperlink prelight color" msgstr "צבע קישורים לפני לחיצה" @@ -11728,23 +11533,20 @@ msgid "Action Message Name Color for Whispered Message" msgstr "צבע עבור שמות הודעות-פעולה להודעות שנלחשות" -#, fuzzy msgid "Color to draw the name of a whispered action message." -msgstr "הצבע עבור שם של הודעות-פעולה." +msgstr "הצבע עבור השם של הודעת פעולה שנלחשה." msgid "Whisper Message Name Color" msgstr "צבע עבור שם הודעה שנלחשה" -#, fuzzy msgid "Color to draw the name of a whispered message." -msgstr "הצבע עבור שם של הודעות-פעולה." +msgstr "הצבע עבור השם של הודעה שנלחשה." msgid "Typing notification color" msgstr "צבע התרעת-הקלדה" -#, fuzzy msgid "The color to use for the typing notification" -msgstr "הצבע בו תוצג התרעת ההקלדה" +msgstr "הצבע עבור התרעת ההקלדה." msgid "Typing notification font" msgstr "גופן התרעת-הקלדה" @@ -11988,7 +11790,7 @@ msgid "%s %s. Try `%s -h' for more information.\n" msgstr "%s %s. יש לנסות את '%s –h' למידע נוסף.\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -12010,6 +11812,7 @@ "\n" " -c, --config=ספריה השתמש בספרייה לקבצי הגדרות\n" " -d, --debug שלח הודעות ניפוי באגים ל-stdout\n" +" -f, --force-online אלץ מצב מקוון, בלי להתחשב במצב הרשת\n" " -h, --help הצג הודעה זו וצא\n" " -m, --multiple אל תוודא שרק עותק אחד רץ\n" " -n, --nologin אל תתחבר אוטומטית\n" @@ -12018,7 +11821,7 @@ " --display=DISPLAY מספר התצוגה להשתמש בו בחלונות X\n" " -v, --version הצג את הגירסאשל התוכנה וצא\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -12039,6 +11842,7 @@ "\n" " -c, --config=ספריה השתמש בספרייה לקבצי הגדרות\n" " -d, --debug שלח הודעות ניפוי באגים ל-stdout\n" +" -f, --force-online אלץ מצב מקוון, בלי להתחשב במצב הרשת\n" " -h, --help הצג הודעה זו וצא\n" " -m, --multiple אל תוודא שרק עותק אחד רץ\n" " -n, --nologin אל תתחבר אוטומטית\n" @@ -12047,7 +11851,7 @@ " --display=DISPLAY מספר התצוגה להשתמש בו בחלונות X\n" " -v, --version הצג את הגרסה של התוכנה וצא\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s has segfaulted and attempted to dump a core file.\n" "This is a bug in the software and has happened through\n" @@ -12065,17 +11869,14 @@ "%s %s נפל וניסה לכתוב קובץ של הזיכרון לקובץ.\n" "זהו באג בתוכנה, שקרה ללא שום אשמה מצידך.\n" "\n" -"אם באפשרותך לגרום לנפילה לקרות שוב, אנא הודע על כך למפתחים דרך:\n" +"אם באפשרותך לגרום לנפילה לקרות שוב, אנא הודע על כך למפתחים\n" +"על ידי דיווח באג באתר:\n" "%ssimpleticket/\n" "\n" "יש לפרט בדיוק מה עשית בזמן הנפילה, ולשלוח את הודעות ה-backtrace מהקובץ " "core.\n" "אם אינך יודע/ת להוציא את ה-backtrace, אנא קרא את ההוראות ב:\n" "%swiki/GetABacktrace\n" -"\n" -"אם יש צורך בעזרה נוספת, אנא פנה בהודעה אל SeanEgn או LSchiere דרך AIM.\n" -"מידע ליצור קשר עם שון ולוק בפרוטוקולים אחרים נמצא ב:\n" -"%swiki/DeveloperPages\n" #. Translators may want to transliterate the name. #. It is not to be translated. @@ -12084,25 +11885,24 @@ #, c-format msgid "Exiting because another libpurple client is already running.\n" -msgstr "" +msgstr "מסיים מכיוון שכבר רצה תוכנה אחרת שהמשתמש בספריית libpurple.\n" msgid "/_Media" -msgstr "" +msgstr "/_מדיה" msgid "/Media/_Hangup" -msgstr "" - -#, fuzzy +msgstr "/מדיה/_ניתוק" + msgid "Calling..." -msgstr "מחשב..." +msgstr "מתקשר..." #, c-format msgid "%s wishes to start an audio/video session with you." -msgstr "" +msgstr "נתקבלה בקשה מאת %s להתחיל התקשרות קול/וידאו איתך." #, c-format msgid "%s wishes to start a video session with you." -msgstr "" +msgstr "נתקבלה בקשה מאת %s להתחיל התקשרות וידאו איתך." #, c-format msgid "%s has %d new message." @@ -12131,9 +11931,8 @@ "The 'Manual' browser command has been chosen, but no command has been set." msgstr "נבחרה לביצוע הפקודה 'הידנית' של הדפדפן, אבל לא נקבעה הוראה לביצוע." -#, fuzzy msgid "No message" -msgstr "הודעת לא מוכרת" +msgstr "ללא הודעה" msgid "Open All Messages" msgstr "פתח את כל ההודעות" @@ -12141,16 +11940,14 @@ msgid "You have mail!" msgstr "דואר חדש נכנס!" -#, fuzzy msgid "New Pounces" -msgstr "צור תגובת פעילות חדשה" +msgstr "צור תגובות פעילות חדשות" msgid "Dismiss" -msgstr "" - -#, fuzzy +msgstr "סגור" + msgid "You have pounced!" -msgstr "דואר חדש נכנס!" +msgstr "הפעלת פעולת-תגובה!" msgid "The following plugins will be unloaded." msgstr "התוספים שלהלן ייפרקו מן הזיכרון." @@ -12198,7 +11995,6 @@ msgid "Select a file" msgstr "בחר קובץ" -#, fuzzy msgid "Modify Buddy Pounce" msgstr "ערוך שינויים בתגובת פעילות" @@ -12275,61 +12071,58 @@ msgid "Pounce Target" msgstr "מטרת התגובה" -#, fuzzy, c-format +#, c-format msgid "Started typing" -msgstr "מתחיל/ה להקליד" - -#, fuzzy, c-format +msgstr "התחיל/ה להקליד" + +#, c-format msgid "Paused while typing" -msgstr "עוצר בעת הקלדה" - -#, fuzzy, c-format +msgstr "עצר/ה בעת הקלדה" + +#, c-format msgid "Signed on" -msgstr "מתחבר" - -#, fuzzy, c-format +msgstr "התחבר/ה" + +#, c-format msgid "Returned from being idle" -msgstr "%s חזר לפעילות (%s)" - -#, fuzzy, c-format +msgstr "חזר/ה מחוסר-פעילות" + +#, c-format msgid "Returned from being away" -msgstr "חוזר/ת למחשב" - -#, fuzzy, c-format +msgstr "חזר/ה למחשב" + +#, c-format msgid "Stopped typing" -msgstr "הפסיק/ה להקליד" - -#, fuzzy, c-format +msgstr "כבר לא מקליד/ה" + +#, c-format msgid "Signed off" -msgstr "מתנתק" - -#, fuzzy, c-format +msgstr "התנתק/ה" + +#, c-format msgid "Became idle" -msgstr "חסר/ת פעילות" - -#, fuzzy, c-format +msgstr "הפכ/ה לחסרת-פעילות" + +#, c-format msgid "Went away" -msgstr "כאשר מרוחק" - -#, fuzzy, c-format +msgstr "נעשה מרוחק" + +#, c-format msgid "Sent a message" msgstr "שלח הודעה" -#, fuzzy, c-format +#, c-format msgid "Unknown.... Please report this!" -msgstr "אירעה פעילות לא מוכרת. אנא דווח על כך!" - -#, fuzzy +msgstr "לא מוכר. אנא דווח על כך!" + msgid "Theme failed to unpack." -msgstr "כישלון בעת פתיחת ערכת סמייליים" - -#, fuzzy +msgstr "כישלון בעת פתיחת ערכת מוטיב." + msgid "Theme failed to load." -msgstr "כישלון בעת פתיחת ערכת סמייליים" - -#, fuzzy +msgstr "כישלון בעת טעינת ערכת מוטיב." + msgid "Theme failed to copy." -msgstr "כישלון בעת פתיחת ערכת סמייליים" +msgstr "כישלון בעת העתקת ערכת מוטיב." msgid "Install Theme" msgstr "התקן עיצוב" @@ -12351,9 +12144,8 @@ msgstr "_סגור חלונות שיחה עם כפתור האסקייפ" #. Buddy List Themes -#, fuzzy msgid "Buddy List Theme" -msgstr "רשימת אנשי קשר" +msgstr "מוטיבי תצוגה עבור רשימת החברים" #. System Tray msgid "System Tray Icon" @@ -12365,9 +12157,8 @@ msgid "On unread messages" msgstr "בהגעת הודעות שלא נקראו" -#, fuzzy msgid "Conversation Window" -msgstr "חלונות שיחה להודעות" +msgstr "חלון שיחה" msgid "_Hide new IM conversations:" msgstr "ה_סתר שיחות חדשות" @@ -12470,9 +12261,9 @@ msgid "Example: stunserver.org" msgstr "לדוגמא: stunserver.org" -#, fuzzy, c-format +#, c-format msgid "Use _automatically detected IP address: %s" -msgstr "מצ_א כתובת IP אוטומטית" +msgstr "התשמש ב_כתובת ה-IP שזוההתה אוטומטית: %s" msgid "Public _IP:" msgstr "כתובת IP חיצונית:" @@ -12494,7 +12285,7 @@ #. TURN server msgid "Relay Server (TURN)" -msgstr "" +msgstr "שרת העברה (TURN)" msgid "Proxy Server & Browser" msgstr "שרת תיווך ודפדפן" @@ -12526,7 +12317,7 @@ #. This is a global option that affects SOCKS4 usage even with account-specific proxy settings msgid "Use remote DNS with SOCKS4 proxies" -msgstr "" +msgstr "השתמש בשירות DNS מרוחק עם שרתי-תיווך SOCKS" msgid "_User:" msgstr "_משתמש:" @@ -12649,20 +12440,17 @@ "צליל לפקו_דה:\n" "(%s עבור קובץ)" -#, fuzzy msgid "M_ute sounds" msgstr "ה_שתק צלילים" msgid "Sounds when conversation has _focus" msgstr "צלילים כאשר יש לחלון השיחה מי_קוד" -#, fuzzy msgid "_Enable sounds:" -msgstr "הפעל צלילים:" - -#, fuzzy +msgstr "ה_פעל צלילים" + msgid "V_olume:" -msgstr "עוצמת-שמע:" +msgstr "עו_צמת-שמע" msgid "Play" msgstr "נגן" @@ -12842,10 +12630,10 @@ msgid "Status for %s" msgstr "מצב עבור %s" -#, fuzzy, c-format +#, c-format msgid "" "A custom smiley for '%s' already exists. Please use a different shortcut." -msgstr "חייכן שלך כבר קיים לקיצור-הדרך שנבחר. יש לבחור קיצור-דרך אחר." +msgstr "כבר קיים חייכן משלך עבור '%s'. יש לנסות קיצור-דרך אחר." msgid "Custom Smiley" msgstr "חייכן שלך" @@ -12859,36 +12647,30 @@ msgid "Add Smiley" msgstr "הוס_ף חייכן" -#, fuzzy msgid "_Image:" -msgstr "תמונה" +msgstr "ת_מונה" #. Shortcut text -#, fuzzy msgid "S_hortcut text:" -msgstr "קיצור-דרך" +msgstr "טקסט לק_יצור-דרך:" msgid "Smiley" msgstr "חייכן" -#, fuzzy msgid "Shortcut Text" -msgstr "קיצור-דרך" +msgstr "טקסט לקיצור-דרך" msgid "Custom Smiley Manager" msgstr "מנהל החייכנים שלך" -#, fuzzy msgid "Select Buddy Icon" -msgstr "בחר איש קשר" - -#, fuzzy +msgstr "בחירת תמונה עבור חבר" + msgid "Click to change your buddyicon for this account." -msgstr "השתמש בתמונה זו לחשבון זה:" - -#, fuzzy +msgstr "ניתן ללחוץ על מנת להחליף את תמונת החבר של חשבון זה." + msgid "Click to change your buddyicon for all accounts." -msgstr "השתמש בתמונה זו לחשבון זה:" +msgstr "ניתן ללחוץ על מנת להחליף את תמונת החבר של כל החשבונות." msgid "Waiting for network connection" msgstr "ממתין לחיבור לרשת" @@ -12962,13 +12744,12 @@ msgid "Cannot send launcher" msgstr "לא ניתן לשלוח את קובץ המפעיל" -#, fuzzy msgid "" "You dragged a desktop launcher. Most likely you wanted to send the target of " "this launcher instead of this launcher itself." msgstr "" -"גררת קובץ מפעיל של שולחן העבודה. קרוב לודאי שרצית לשלוח את מה שהמפעיל " -"מצביעעליו, ולא את המפעיל עצמו." +"גררת קובץ מפעיל של שולחן העבודה. קרוב לודאי שרצית לשלוח את מה שהמפעיל מצביע " +"עליו, ולא את המפעיל עצמו." #, c-format msgid "" @@ -12999,9 +12780,8 @@ "Failed to load image '%s': reason not known, probably a corrupt image file" msgstr "כישלון בעת טעינת התמונה '%s': סיבה לא ידועה, כנראה קובץ תמונה פגום" -#, fuzzy msgid "_Open Link" -msgstr "_פתח את הקישור בדפדפן הבא:" +msgstr "_פתח קישור" msgid "_Copy Link Location" msgstr "ה_עתק מיקום הקישור" @@ -13009,9 +12789,21 @@ msgid "_Copy Email Address" msgstr "העתק _כתובת הדוא\"ל" +msgid "_Open File" +msgstr "פתח קוב_ץ" + +msgid "Open _Containing Directory" +msgstr "פתח ספרייה _מכילה" + msgid "Save File" msgstr "שמור קובץ" +msgid "_Play Sound" +msgstr "_נגן צליל" + +msgid "_Save File" +msgstr "_שמור קובץ" + msgid "Select color" msgstr "בחר צבע" @@ -13027,13 +12819,11 @@ msgid "_Invite" msgstr "הזמן" -#, fuzzy msgid "_Modify..." -msgstr "_ערוך" - -#, fuzzy +msgstr "_ערוך..." + msgid "_Add..." -msgstr "הוסף" +msgstr "_הוסף..." msgid "_Open Mail" msgstr "_פתח דואר" @@ -13056,12 +12846,11 @@ msgid "none" msgstr "ללא" -#, fuzzy msgid "Small" -msgstr "דואר" +msgstr "קטן" msgid "Smaller versions of the default smilies" -msgstr "" +msgstr "גירסאות מוקטנות של חייכני ברירת המחדל" msgid "Response Probability:" msgstr "התסברות תגובה:" @@ -13102,77 +12891,64 @@ msgid "Displays statistical information about your buddies' availability" msgstr "מציג מידע סטטיסטי על זמינות אנשי-הקשר שלך" -#, fuzzy msgid "Server name request" -msgstr "כתובת שרת" - -#, fuzzy +msgstr "בקשת שם שרת" + msgid "Enter an XMPP Server" -msgstr "יש להזין שרת ועידה" - -#, fuzzy +msgstr "יש להזין שרת XMPP" + msgid "Select an XMPP server to query" -msgstr "יש לבחור שרת ועידה לתישאול" - -#, fuzzy +msgstr "יש לבחור שרת XMPP לתישאול" + msgid "Find Services" -msgstr "שירותים מקוונים" - -#, fuzzy +msgstr "מצא שירות" + msgid "Add to Buddy List" -msgstr "שלח רשימת אנשי הקשר" - -#, fuzzy +msgstr "הוסף לרשימת אנשי-הקשר" + msgid "Gateway" -msgstr "מתרחק/ת מהמחשב" - -#, fuzzy +msgstr "שער" + msgid "Directory" -msgstr "ספריית יומן אירועים" - -#, fuzzy +msgstr "ספרייה" + msgid "PubSub Collection" -msgstr "בחירת הצליל" - -#, fuzzy +msgstr "אוסף PubSub" + msgid "PubSub Leaf" -msgstr "שירות PubSub" - -#, fuzzy +msgstr "עלה PubSub" + msgid "" "\n" "Description: " -msgstr "תיאור" +msgstr "" +"\n" +"תיאור: " #. Create the window. -#, fuzzy msgid "Service Discovery" -msgstr "מידע של שירות תגלית" - -#, fuzzy +msgstr "גילוי שרותים" + msgid "_Browse" -msgstr "_דפדפן:" - -#, fuzzy +msgstr "_עיין" + msgid "Server does not exist" -msgstr "המשתמש לא קיים" - -#, fuzzy +msgstr "השרת אינו קיים" + msgid "Server does not support service discovery" -msgstr "השרת לא תומך באימות באף תצורה" - -#, fuzzy +msgstr "השרת לא תומך בגילוי שירותים" + msgid "XMPP Service Discovery" -msgstr "מידע של שירות תגלית" +msgstr "גילוי שירות XMPP" msgid "Allows browsing and registering services." -msgstr "" - -#, fuzzy +msgstr "מאפשר רישום ועיון ברשימת השירותים" + msgid "" "This plugin is useful for registering with legacy transports or other XMPP " "services." -msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP." +msgstr "" +"תוסף זה שימושי לטובת רישום עם פרוטוקולי תקשורת ישנים או שירותי XMPP אחרים." msgid "Buddy is idle" msgstr "איש הקשר במנוחה" @@ -13553,12 +13329,12 @@ msgstr "תוסף להודעות מוזיקה להלחנה משותפת." #. * summary -#, fuzzy msgid "" "The Music Messaging Plugin allows a number of users to simultaneously work " "on a piece of music by editing a common score in real-time." msgstr "" -"התוסף להודעות מוזיקה מאפשר למספר משתמשים לעבוד יחד על הלחנת יצירה בזמן אמת." +"התוסף להודעות מוזיקה מאפשר למספר משתמשים לעבוד יחד על יצירה מוזיקלית על ידי " +"עריכה של לחן משותף בזמן אמת." #. ---------- "Notify For" ---------- msgid "Notify For" @@ -13589,9 +13365,8 @@ msgid "Set window manager \"_URGENT\" hint" msgstr "קבע את רמז ה-\"URGENT\" של מנהל החלונות" -#, fuzzy msgid "_Flash window" -msgstr "חלונות _שיחה" +msgstr "הבהב ח_לון" #. Raise window method button msgid "R_aise conversation window" @@ -13671,14 +13446,12 @@ msgid "Hyperlink Color" msgstr "צבע קישורים" -#, fuzzy msgid "Visited Hyperlink Color" -msgstr "צבע קישורים" +msgstr "צבע קישורים שביקרת" msgid "Highlighted Message Name Color" msgstr "צבע לסימון שמות בהודעות" -#, fuzzy msgid "Typing Notification Color" msgstr "צבע התרעת-הקלדה" @@ -13711,23 +13484,20 @@ msgid "GTK+ Text Shortcut Theme" msgstr "מוטיב קיצור הדרך הטקסטואלי של GTK+" -#, fuzzy msgid "Disable Typing Notification Text" -msgstr "הפעל התרעת הקלדה" - -#, fuzzy +msgstr "כבה טקסט התרעת הקלדה" + msgid "GTK+ Theme Control Settings" -msgstr "בקרת מוטיבים של GTK+ בפידג'ין" - -#, fuzzy +msgstr "בקרת מוטיבים של GTK+" + msgid "Colors" -msgstr "סגור" +msgstr "צבעים" msgid "Fonts" msgstr "גופנים" msgid "Miscellaneous" -msgstr "" +msgstr "שונות" msgid "Gtkrc File Tools" msgstr "כלים לקובץ Gtkrc" @@ -13760,18 +13530,16 @@ #, c-format msgid "You can upgrade to %s %s today." -msgstr "" +msgstr "ניתן לשדרג אל %s %s היום." msgid "New Version Available" msgstr "קיימת גירסה חדשה" -#, fuzzy msgid "Later" -msgstr "תאריך" - -#, fuzzy +msgstr "מאוחר יותר" + msgid "Download Now" -msgstr "הורדת %s: %s" +msgstr "הורד כעת" #. *< type #. *< ui_requirement @@ -13812,12 +13580,11 @@ msgstr "כפתור שליחה בחלון שיחה." #. *< summary -#, fuzzy msgid "" "Adds a Send button to the entry area of the conversation window. Intended " "for use when no physical keyboard is present." msgstr "" -"מוסיף כפתור שליחה לאיזור הקלט של חלון השיחה. נועד לשימוש כאשר אין מקלדת " +"מוסיף כפתור שליחה לאיזור הקלט של חלון השיחה. נועד לתרחיש שאין בנמצא מקלדת " "פיזית." msgid "Duplicate Correction" @@ -13869,94 +13636,78 @@ msgid "Replaces text in outgoing messages according to user-defined rules." msgstr "מחליף טקסט בהודעות יוצאות עפ\"י חוקים שנקבעים ע\"י המשתמש." -#, fuzzy msgid "Just logged in" -msgstr "לא מחובר" - -#, fuzzy +msgstr "רק התחבר" + msgid "Just logged out" -msgstr "לא מחובר" +msgstr "רק התנתק" msgid "" "Icon for Contact/\n" "Icon for Unknown person" msgstr "" - -#, fuzzy +"סמל עבור איש-קשר\n" +"סמל עבור אדם לא מוכר" + msgid "Icon for Chat" -msgstr "הצטרף לשיחה" - -#, fuzzy +msgstr "סמל לשיחה" + msgid "Ignored" msgstr "התעלם" -#, fuzzy msgid "Founder" -msgstr "יותר רועש" - -#, fuzzy +msgstr "מייסד" + msgid "Operator" -msgstr "אופרה" +msgstr "מפעיל" msgid "Half Operator" -msgstr "" - -#, fuzzy +msgstr "חצי-מפעיל" + msgid "Authorization dialog" -msgstr "ההרשאה ניתנה" - -#, fuzzy +msgstr "חלון הרשאה" + msgid "Error dialog" -msgstr "שגיאה " - -#, fuzzy +msgstr "חלון שגיאה " + msgid "Information dialog" -msgstr "מידע" +msgstr "חלון מידע" msgid "Mail dialog" -msgstr "" - -#, fuzzy +msgstr "חלון דואר" + msgid "Question dialog" -msgstr "חלון בקשה" - -#, fuzzy +msgstr "חלון שאלה" + msgid "Warning dialog" -msgstr "רמת אזהרה" +msgstr "חלון אזהרה" msgid "What kind of dialog is this?" -msgstr "" - -#, fuzzy +msgstr "איזה סוג חלון זה?" + msgid "Status Icons" -msgstr "מצב עבור %s" - -#, fuzzy +msgstr "סמלי מצב" + msgid "Chatroom Emblems" -msgstr "הגדרה איזורית לחדר צ'אט" - -#, fuzzy +msgstr "תגיות חדרי-צ'אט" + msgid "Dialog Icons" -msgstr "שמירת סמל" - -#, fuzzy +msgstr "סמלי חלונות דו-שיח" + msgid "Pidgin Icon Theme Editor" -msgstr "בקרת מוטיבים של GTK+ בפידג'ין" - -#, fuzzy +msgstr "עורך מוטיבים של סמלים בפידג'ין" + msgid "Contact" -msgstr "מידע על איש הקשר" - -#, fuzzy +msgstr "איש הקשר" + msgid "Pidgin Buddylist Theme Editor" -msgstr "רשימת אנשי קשר" - -#, fuzzy +msgstr "עורך המוטיבים של רשימת החברים בפידג'ין" + msgid "Edit Buddylist Theme" -msgstr "רשימת אנשי קשר" +msgstr "ערוך מוטיבים של רשימת החברים" msgid "Edit Icon Theme" -msgstr "" +msgstr "ערוך מוטיב-סמלים" #. *< type #. *< ui_requirement @@ -13965,16 +13716,14 @@ #. *< priority #. *< id #. * description -#, fuzzy msgid "Pidgin Theme Editor" -msgstr "בקרת מוטיבים של GTK+ בפידג'ין" +msgstr "עורך מוטיבים בפידג'ין" #. *< name #. *< version #. * summary -#, fuzzy msgid "Pidgin Theme Editor." -msgstr "בקרת מוטיבים של GTK+ בפידג'ין" +msgstr "עורך מוטיבים בפידג'ין." #. *< type #. *< ui_requirement @@ -14140,7 +13889,6 @@ msgid "Options specific to Pidgin for Windows." msgstr "אפשרויות לפידג'ין היחודיות לחלונות." -#, fuzzy msgid "" "Provides options specific to Pidgin for Windows, such as buddy list docking." msgstr "" @@ -14184,6 +13932,23 @@ msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP." +#~ msgid "Malformed BOSH Connect Server" +#~ msgstr "שרת חיבור BOSH משובש" + +#~ msgid "Unable to not load SILC key pair" +#~ msgstr "לא ניתן שלא לטעון את זוג מפתחות ה-SILC" + +#~ msgid "" +#~ "%s declined your conference invitation to room \"%s\" because \"%s\"." +#~ msgstr "%s סרב את ההזמנה שלך לועידה בחדר \"%s\" כיוון ש-\"%s\"." + +#~ msgid "Invitation Rejected" +#~ msgstr "ההזמנה נדחתה" + +#, fuzzy +#~ msgid "_Proxy" +#~ msgstr "מתווך" + #~ msgid "Cannot open socket" #~ msgstr "אין אפשרות לפתוח שקע" diff -r 67143ecbddb1 -r 0907b0c775bb po/hu.po --- a/po/hu.po Mon Jul 27 03:14:08 2009 +0000 +++ b/po/hu.po Fri Jul 31 19:20:06 2009 +0000 @@ -5,14 +5,15 @@ # # Zoltan Sutto , 2003. # Gabor Kelemen , 2005, 2006, 2007, 2008, 2009. +# Gabor Kelemen , 2009. msgid "" msgstr "" "Project-Id-Version: pidgin 2.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-06 15:04-0700\n" -"PO-Revision-Date: 2009-02-25 03:21+0100\n" -"Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" +"POT-Creation-Date: 2009-07-31 12:01+0200\n" +"PO-Revision-Date: 2009-07-31 11:58+0200\n" +"Last-Translator: Gabor Kelemen \n" +"Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -868,12 +869,11 @@ msgid "System Log" msgstr "Rendszernapló" -#, fuzzy msgid "Calling ... " -msgstr "Számítás…" +msgstr "Hívás…" msgid "Hangup" -msgstr "" +msgstr "Lerakás" #. Number of actions msgid "Accept" @@ -883,25 +883,24 @@ msgstr "Visszautasítás" msgid "Call in progress." -msgstr "" +msgstr "Hívás folyamatban." msgid "The call has been terminated." -msgstr "" +msgstr "A hívás befejezve." #, c-format msgid "%s wishes to start an audio session with you." -msgstr "" +msgstr "%s beszélni szeretne Önnel." #, c-format msgid "%s is trying to start an unsupported media session type with you." -msgstr "" - -#, fuzzy +msgstr "%s nem támogatott típusú médiaátvitelt próbál indítani." + msgid "You have rejected the call." -msgstr "Elhagyta a(z) %s%s csatornát" +msgstr "Visszautasította a hívást." msgid "call: Make an audio call." -msgstr "" +msgstr "call: Hanghívás kezdeményezése." msgid "Emails" msgstr "E-mailek" @@ -1557,22 +1556,25 @@ "\n" "Fetching TinyURL..." msgstr "" +"\n" +"TinyURL lekérése…" msgid "Only create TinyURL for urls of this length or greater" -msgstr "" +msgstr "TinyURL készítése csak a legalább ilyen hosszú URL-címekhez" msgid "TinyURL (or other) address prefix" -msgstr "" - -#, fuzzy +msgstr "TinyURL (vagy más) címelőtag" + msgid "TinyURL" -msgstr "Dal URL" +msgstr "TinyURL" msgid "TinyURL plugin" -msgstr "" +msgstr "TinyURL bővítmény" msgid "When receiving a message with URL(s), TinyURL for easier copying" msgstr "" +"URL-címeket tartalmazó üzenetek fogadásakor URL-rövidítés a másolás " +"megkönnyítéséhez" msgid "accounts" msgstr "fiókok" @@ -1677,6 +1679,45 @@ msgid "_View Certificate..." msgstr "_Tanúsítvány megjelenítése…" +#, c-format +msgid "" +"The certificate presented by \"%s\" claims to be from \"%s\" instead. This " +"could mean that you are not connecting to the service you believe you are." +msgstr "" +"A(z) „%s” által bemutatott tanúsítvány a következőtől származónak mondja " +"magát: „%s”. Ez azt jelentheti, hogy a kívánttól eltérő szolgáltatáshoz " +"kapcsolódik." + +#. Had no CA pool, so couldn't verify the chain *and* +#. * the subject name isn't valid. +#. * I think this is bad enough to warrant a fatal error. It's +#. * not likely anyway... +#. +#. TODO: Probably wrong. +#. TODO: Make this error either block the ensuing SSL +#. connection error until the user dismisses this one, or +#. stifle it. +#. TODO: Probably wrong. +#. TODO: Probably wrong +#. TODO: Probably wrong. +msgid "SSL Certificate Error" +msgstr "SSL tanúsítványhiba" + +msgid "Invalid certificate chain" +msgstr "Érvénytelen tanúsítványlánc" + +#. The subject name is correct, but we weren't able to verify the +#. * chain because there was no pool of root CAs found. Prompt the user +#. * to validate it. +#. +#. vrq will be completed by user_auth +msgid "" +"You have no database of root certificates, so this certificate cannot be " +"validated." +msgstr "" +"A gyökértanúsítványok adatbázisa nem érhető el, így ez a tanúsítvány nem " +"ellenőrizhető." + #. Prompt the user to authenticate the certificate #. vrq will be completed by user_auth #, c-format @@ -1687,29 +1728,11 @@ "A(z) „%s” által bemutatott tanúsítvány saját aláírású. Nem ellenőrizhető " "automatikusan." +#. FIXME 2.6.1 #, c-format msgid "The certificate chain presented for %s is not valid." msgstr "A következőhöz bemutatott tanúsítványlánc nem érvényes: %s." -#. TODO: Make this error either block the ensuing SSL -#. connection error until the user dismisses this one, or -#. stifle it. -#. TODO: Probably wrong. -#. TODO: Probably wrong -msgid "SSL Certificate Error" -msgstr "SSL tanúsítványhiba" - -msgid "Invalid certificate chain" -msgstr "Érvénytelen tanúsítványlánc" - -#. vrq will be completed by user_auth -msgid "" -"You have no database of root certificates, so this certificate cannot be " -"validated." -msgstr "" -"A gyökértanúsítványok adatbázisa nem érhető el, így ez a tanúsítvány nem " -"ellenőrizhető." - #. vrq will be completed by user_auth msgid "" "The root certificate this one claims to be issued by is unknown to Pidgin." @@ -1728,19 +1751,6 @@ msgid "Invalid certificate authority signature" msgstr "A hitelesítésszolgáltató aláírása érvénytelen" -#. Prompt the user to authenticate the certificate -#. TODO: Provide the user with more guidance about why he is -#. being prompted -#. vrq will be completed by user_auth -#, c-format -msgid "" -"The certificate presented by \"%s\" claims to be from \"%s\" instead. This " -"could mean that you are not connecting to the service you believe you are." -msgstr "" -"A(z) „%s” által bemutatott tanúsítvány a következőtől származónak mondja " -"magát: „%s”. Ez azt jelentheti, hogy a kívánttól eltérő szolgáltatáshoz " -"kapcsolódik." - #. Make messages #, c-format msgid "" @@ -1777,7 +1787,6 @@ msgstr "+++ %s kilépett" #. Unknown error -#. Unknown error! msgid "Unknown error" msgstr "Ismeretlen hiba" @@ -1824,9 +1833,8 @@ msgid "%s left the room (%s)." msgstr "%s elhagyta a szobát (%s)." -#, fuzzy msgid "Invite to chat" -msgstr "Meghívás konferenciára" +msgstr "Meghívás csevegésre" #. Put our happy label in it. msgid "" @@ -1967,6 +1975,10 @@ msgstr "%s átvitelének megkezdése a következőtől: %s" #, c-format +msgid "Transfer of file %s complete" +msgstr "%s fájl átvitele befejeződött" + +#, c-format msgid "Transfer of file %s complete" msgstr "%s fájl átvitele befejeződött" @@ -2180,9 +2192,8 @@ msgid "(%s) %s : %s\n" msgstr "(%s) %s : %s\n" -#, fuzzy msgid "Error creating conference." -msgstr "Hiba a kapcsolat létrehozásakor" +msgstr "Hiba a konferencia létrehozásakor." #, c-format msgid "You are using %s, but this plugin requires %s." @@ -2586,7 +2597,6 @@ msgstr "Felveszi más azonnaliüzenő-kliensek naplóit a naplómegjelenítőbe." #. * description -#, fuzzy msgid "" "When viewing logs, this plugin will include logs from other IM clients. " "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n" @@ -2595,7 +2605,7 @@ "at your own risk!" msgstr "" "Naplók megjelenítésekor ez a bővítmény felveszi más azonnali üzenők naplóit. " -"Jelenleg a következők támogatottak: Adium, MSN Messenger és Trillian.\n" +"Jelenleg a következők támogatottak: Adium, MSN Messenger, aMSN és Trillian.\n" "\n" "FIGYELMEZTETÉS: Ez a bővítmény még alfa minőségű kód és gyakran " "összeomolhat. Csak saját felelősségére használja!" @@ -2643,13 +2653,12 @@ msgid "Save messages sent to an offline user as pounce." msgstr "A kilépett felhasználónak küldött üzenetek mentése figyelmeztetésként." -#, fuzzy msgid "" "The rest of the messages will be saved as pounces. You can edit/delete the " "pounce from the `Buddy Pounce' dialog." msgstr "" "A további üzenetek figyelmeztetésként kerülnek mentésre. A figyelmeztetést a " -"Partnerfigyelmeztetés párbeszédablakban szerkesztheti/törölheti." +"„Partnerfigyelmeztetés” párbeszédablakban szerkesztheti/törölheti." #, c-format msgid "" @@ -2679,9 +2688,8 @@ msgid "Do not ask. Always save in pounce." msgstr "Ne kérdezzen. Mindig mentsen figyelmeztetésben." -#, fuzzy msgid "One Time Password" -msgstr "Adja meg a jelszót" +msgstr "Eldobható jelszó" #. *< type #. *< ui_requirement @@ -2690,13 +2698,13 @@ #. *< priority #. *< id msgid "One Time Password Support" -msgstr "" +msgstr "Eldobható jelszó támogatása" #. *< name #. *< version #. * summary msgid "Enforce that passwords are used only once." -msgstr "" +msgstr "A jelszavak egyszeri használatának kikényszerítése." #. * description msgid "" @@ -2704,6 +2712,9 @@ "are only used in a single successful connection.\n" "Note: The account password must not be saved for this to work." msgstr "" +"Lehetővé teszi fiókonként kikényszeríteni, hogy a nem mentett jelszavak csak " +"egy sikeres csatlakozáshoz legyenek felhasználva.\n" +"Megjegyzés: a fiókjelszavakat ennek működéséhez nem szabad menteni." #. *< type #. *< ui_requirement @@ -2898,17 +2909,15 @@ "Az ActiveTCL telepítés nem észlelhető. Ha TCL bővítményeket kíván használni, " "akkor telepítse az ActiveTCL-t a http://www.activestate.com címről\n" -#, fuzzy msgid "" "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin." "im/BonjourWindows for more information." msgstr "" -"Az Apple Bonjour For Windows eszközkészlet nem található, további " +"Az Apple „Bonjour For Windows” eszközkészlet nem található, további " "információkat a http://d.pidgin.im/BonjourWindows oldalon találhat." -#, fuzzy msgid "Unable to listen for incoming IM connections" -msgstr "Nem lehetséges a bejövő azonnali üzenő kapcsolatokat figyelni\n" +msgstr "A bejövő azonnaliüzenő-kapcsolatok figyelése nem lehetséges" msgid "" "Unable to establish connection with the local mDNS server. Is it running?" @@ -2960,21 +2969,17 @@ msgid "Unable to send the message, the conversation couldn't be started." msgstr "Nem küldhető el az üzenet, a társalgás nem kezdhető el." -#, fuzzy, c-format +#, c-format msgid "Unable to create socket: %s" -msgstr "" -"Nem lehet létrehozni a foglalatot:\n" -"%s" - -#, fuzzy, c-format +msgstr "Nem lehet létrehozni a foglalatot: %s" + +#, c-format msgid "Unable to bind socket to port: %s" -msgstr "Nem köthető a foglalat a porthoz" - -#, fuzzy, c-format +msgstr "Nem köthető a foglalat a porthoz: %s" + +#, c-format msgid "Unable to listen on socket: %s" -msgstr "" -"Nem lehet létrehozni a foglalatot:\n" -"%s" +msgstr "Nem lehet figyelni a foglalaton: %s" msgid "Error communicating with local mDNSResponder." msgstr "Hiba a helyi mDNSResponderrel végzett kommunikációban." @@ -3023,17 +3028,14 @@ msgid "Load buddylist from file..." msgstr "Partnerlista betöltése fájlból…" -#, fuzzy msgid "You must fill in all registration fields" -msgstr "Töltse ki a regisztrációs mezőket." - -#, fuzzy +msgstr "Az összes regisztrációs mezőt ki kell töltenie" + msgid "Passwords do not match" -msgstr "A jelszavak nem egyeznek." - -#, fuzzy +msgstr "A jelszavak nem egyeznek" + msgid "Unable to register new account. An unknown error occurred." -msgstr "Nem regisztrálható új fiók. Hiba történt.\n" +msgstr "Nem regisztrálható új fiók. Ismeretlen hiba történt." msgid "New Gadu-Gadu Account Registered" msgstr "Az új Gadu-Gadu fiók regisztrálva" @@ -3048,11 +3050,10 @@ msgstr "Jelszó (még egyszer)" msgid "Enter captcha text" -msgstr "" - -#, fuzzy +msgstr "Adja meg a captcha szövegét" + msgid "Captcha" -msgstr "Captcha kép" +msgstr "Captcha" msgid "Register New Gadu-Gadu Account" msgstr "Új Gadu-Gadu fiók regisztrálása" @@ -3191,9 +3192,9 @@ msgid "Chat _name:" msgstr "Csevegés _neve:" -#, fuzzy, c-format +#, c-format msgid "Unable to resolve hostname '%s': %s" -msgstr "Nem lehet a kiszolgálóhoz kapcsolódni." +msgstr "Nem oldható fel a gépnév („%s”): %s" #. 1. connect to server #. connect to the server @@ -3206,9 +3207,8 @@ msgid "This chat name is already in use" msgstr "Ez a csevegésnév már használatban van" -#, fuzzy msgid "Not connected to the server" -msgstr "Nincs kapcsolat a kiszolgálóval." +msgstr "Nincs kapcsolat a kiszolgálóval" msgid "Find buddies..." msgstr "Partnerek keresése…" @@ -3249,9 +3249,8 @@ msgid "Gadu-Gadu User" msgstr "Gadu-Gadu felhasználó" -#, fuzzy msgid "GG server" -msgstr "Kiszolgáló lekérdezése" +msgstr "GG kiszolgáló" #, c-format msgid "Unknown command: %s" @@ -3267,7 +3266,6 @@ msgid "File Transfer Failed" msgstr "A fájlátvitel meghiúsult" -#, fuzzy msgid "Unable to open a listening port." msgstr "Nem nyitható meg figyelőport." @@ -3291,11 +3289,9 @@ #. #. TODO: what to do here - do we really have to disconnect? #. TODO: do we really want to disconnect on a failure to write? -#, fuzzy, c-format +#, c-format msgid "Lost connection with server: %s" -msgstr "" -"Elveszett a kapcsolat a kiszolgálóhoz:\n" -"%s" +msgstr "Elveszett a kapcsolat a kiszolgálóhoz: %s" msgid "View MOTD" msgstr "MOTD megjelenítése" @@ -3306,9 +3302,8 @@ msgid "_Password:" msgstr "_Jelszó:" -#, fuzzy msgid "IRC nick and server may not contain whitespace" -msgstr "Az IRC becenevek nem tartalmazhatnak szóközt" +msgstr "Az IRC becenevek és a kiszolgálónév nem tartalmazhatnak szóközt" msgid "SSL support unavailable" msgstr "Az SSL támogatás nem érhető el" @@ -3317,13 +3312,13 @@ msgstr "Nem lehet kapcsolódni" #. this is a regular connect, error out -#, fuzzy, c-format +#, c-format msgid "Unable to connect: %s" -msgstr "Nem lehet csatlakozni a következőhöz: %s" - -#, fuzzy, c-format +msgstr "Nem lehet csatlakozni: %s" + +#, c-format msgid "Server closed the connection" -msgstr "A kiszolgáló lezárta a kapcsolatot." +msgstr "A kiszolgáló lezárta a kapcsolatot" msgid "Users" msgstr "Felhasználók" @@ -3481,7 +3476,7 @@ #. Remove user from channel #, c-format msgid "Kicked by %s (%s)" -msgstr "%s kizárta (%s)" +msgstr "%s kirúgta (%s)" #, c-format msgid "mode (%s %s) by %s" @@ -3507,13 +3502,12 @@ #. We only want to do the following dance if the connection #. has not been successfully completed. If it has, just #. notify the user that their /nick command didn't go. -#, fuzzy, c-format +#, c-format msgid "The nickname \"%s\" is already being used." -msgstr "Ez a csevegésnév már használatban van" - -#, fuzzy +msgstr "A becenév („%s”) már használatban van." + msgid "Nickname in use" -msgstr "Becenév" +msgstr "A becenév használatban van" msgid "Cannot change nick" msgstr "A becenév nem változtatható meg" @@ -3759,15 +3753,13 @@ msgid "execute" msgstr "végrehajtás" -#, fuzzy msgid "Server requires TLS/SSL, but no TLS/SSL support was found." msgstr "" -"A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek " -"támogatása nem található." - -#, fuzzy +"A kiszolgáló megköveteli a TLS/SSL használatát, de ezek támogatása nem " +"található." + msgid "You require encryption, but no TLS/SSL support was found." -msgstr "Titkosítást kér, de a TLS/SSL támogatása nem található." +msgstr "Megköveteli a titkosítást, de a TLS/SSL támogatás nem található." msgid "Server requires plaintext authentication over an unencrypted stream" msgstr "" @@ -3784,13 +3776,11 @@ msgid "Plaintext Authentication" msgstr "Egyszerű szöveges hitelesítés" -#, fuzzy msgid "SASL authentication failed" -msgstr "Hitelesítés sikertelen" - -#, fuzzy +msgstr "A SASL hitelesítés meghiúsult" + msgid "Invalid response from server" -msgstr "Érvénytelen válasz a kiszolgálótól." +msgstr "Érvénytelen válasz a kiszolgálótól" msgid "Server does not use any supported authentication method" msgstr "A kiszolgáló nem használ egyetlen támogatott hitelesítési eljárást sem" @@ -3801,36 +3791,28 @@ msgid "Invalid challenge from server" msgstr "Érvénytelen hívás a kiszolgálótól" -#, fuzzy, c-format +#, c-format msgid "SASL error: %s" -msgstr "SASL hiba" +msgstr "SASL hiba: %s" msgid "The BOSH connection manager terminated your session." -msgstr "" - -#, fuzzy +msgstr "A BOSH kapcsolatkezelő megszakította a munkamenetét." + msgid "No session ID given" -msgstr "Nincs ok megadva" - -#, fuzzy +msgstr "Nincs megadva munkamenet-azonosító" + msgid "Unsupported version of BOSH protocol" -msgstr "Nem támogatott verzió" - -#, fuzzy +msgstr "A BOSH protokoll verziója nem támogatott" + msgid "Unable to establish a connection with the server" -msgstr "" -"Nem hozható létre kapcsolat a következő kiszolgálóval:\n" -"%s" - -#, fuzzy, c-format +msgstr "Nem hozható létre kapcsolat a kiszolgálóval" + +#, c-format msgid "Unable to establish a connection with the server: %s" -msgstr "" -"Nem hozható létre kapcsolat a következő kiszolgálóval:\n" -"%s" - -#, fuzzy +msgstr "Nem hozható létre kapcsolat a következő kiszolgálóval: %s" + msgid "Unable to establish SSL connection" -msgstr "A kapcsolat nem inicializálható" +msgstr "Az SSL kapcsolat hozható létre" msgid "Full Name" msgstr "Teljes név" @@ -3847,6 +3829,11 @@ msgid "Street Address" msgstr "Utca" +#. +#. * EXTADD is correct, EXTADR is generated by other +#. * clients. The next time someone reads this, remove +#. * EXTADR. +#. msgid "Extended Address" msgstr "További cím" @@ -3898,9 +3885,8 @@ msgid "Operating System" msgstr "Operációs rendszer" -#, fuzzy msgid "Local Time" -msgstr "Helyi fájl:" +msgstr "Helyi idő" msgid "Priority" msgstr "Prioritás" @@ -3910,11 +3896,10 @@ #, c-format msgid "%s ago" -msgstr "" - -#, fuzzy +msgstr "ennyi ideje: %s" + msgid "Logged Off" -msgstr "Bejelentkezve" +msgstr "Kijelentkezett" msgid "Middle Name" msgstr "Középső név" @@ -4083,26 +4068,24 @@ msgid "Find Rooms" msgstr "Szobák keresése" -#, fuzzy msgid "Affiliations:" -msgstr "Álnév:" - -#, fuzzy +msgstr "Kapcsolatok:" + msgid "No users found" -msgstr "Nem találhatók megfelelő felhasználók" - -#, fuzzy +msgstr "Nem találhatók felhasználók" + msgid "Roles:" -msgstr "Funkció" - -#, fuzzy +msgstr "Szerepek:" + msgid "Ping timed out" -msgstr "Ping időtúllépése" +msgstr "A ping túllépte az időkorlátot" msgid "" "Unable to find alternative XMPP connection methods after failing to connect " "directly." msgstr "" +"Nem található alternatív XMPP kapcsolódási módszer, miután a közvetlen " +"kapcsolódás meghiúsult." msgid "Invalid XMPP ID" msgstr "Érvénytelen XMPP azonosító" @@ -4110,9 +4093,8 @@ msgid "Invalid XMPP ID. Domain must be set." msgstr "Érvénytelen XMPP azonosító. A tartományt be kell állítani." -#, fuzzy msgid "Malformed BOSH URL" -msgstr "Nem sikerült a kiszolgálóhoz kapcsolódni." +msgstr "Rosszul formázott BOSH URL" #, c-format msgid "Registration of %s@%s successful" @@ -4180,10 +4162,6 @@ msgid "Change Registration" msgstr "Regisztráció módosítása" -#, fuzzy -msgid "Malformed BOSH Connect Server" -msgstr "Nem sikerült a kiszolgálóhoz kapcsolódni." - msgid "Error unregistering account" msgstr "Hiba a fiók regisztrációjának megszüntetése közben" @@ -4469,19 +4447,21 @@ msgid "Unable to ping user %s" msgstr "%s felhasználó nem pingelhető" -#, fuzzy, c-format +#, c-format msgid "Unable to buzz, because there is nothing known about %s." msgstr "Nem lehet csörgetni, mivel nem érhető el információ %s felhasználóról." -#, fuzzy, c-format +#, c-format msgid "Unable to buzz, because %s might be offline." msgstr "Nem lehet csörgetni, mivel %s felhasználó kiléphetett." -#, fuzzy, c-format +#, c-format msgid "" "Unable to buzz, because %s does not support it or does not wish to receive " "buzzes now." -msgstr "Nem lehet csörgetni, mivel %s felhasználó nem támogatja azt." +msgstr "" +"Nem lehet csörgetni, mivel %s felhasználó nem támogatja azt, vagy most nem " +"kívánja fogadni a csörgetéseket." #, c-format msgid "Buzzing %s..." @@ -4496,36 +4476,39 @@ msgid "%s has buzzed you!" msgstr "%s megcsörgette!" -#, fuzzy, c-format +#, c-format msgid "Unable to initiate media with %s: invalid JID" -msgstr "Nem küldhető fájl a következőnek: %s, a JID érvénytelen" - -#, fuzzy, c-format +msgstr "" +"Nem indítható multimédiás kapcsolat a következőhöz: %s, a JID érvénytelen" + +#, c-format msgid "Unable to initiate media with %s: user is not online" -msgstr "Nem küldhető fájl a következőnek: %s, a felhasználó nem érhető el" - -#, fuzzy, c-format +msgstr "" +"Nem indítható multimédiás kapcsolat a következőhöz: %s, a felhasználó nem " +"érhető el" + +#, c-format msgid "Unable to initiate media with %s: not subscribed to user presence" msgstr "" -"Nem küldhető fájl a következőnek: %s, nincs feliratkozva a felhasználó " -"jelenlétére" - -#, fuzzy +"Nem indítható multimédiás kapcsolat a következőhöz: %s, nincs feliratkozva a " +"felhasználó jelenlétére" + msgid "Media Initiation Failed" -msgstr "A regisztráció sikertelen" - -#, fuzzy, c-format +msgstr "A multimédiás kapcsolat indítása sikertelen" + +#, c-format msgid "" "Please select the resource of %s with which you would like to start a media " "session." -msgstr "Válassza ki %s azon erőforrását, ahová fájlt kíván küldeni" +msgstr "" +"Válassza ki %s azon erőforrását, ahová multimédiás kapcsolatot kíván " +"indítani." msgid "Select a Resource" msgstr "Válasszon erőforrást" -#, fuzzy msgid "Initiate Media" -msgstr "Csevegés ke_zdeményezése" +msgstr "Multimédiás kapcsolat indítása" msgid "config: Configure a chat room." msgstr "config: Csevegőszoba beállítása." @@ -4545,21 +4528,21 @@ msgid "ban <user> [reason]: Ban a user from the room." msgstr "ban <felhasználó> [ok]: Felhasználó kitiltása a szobából." -#, fuzzy msgid "" "affiliate <owner|admin|member|outcast|none> [nick1] [nick2] ...: Get " "the users with an affiliation or set users' affiliation with the room." msgstr "" -"affiliate <felhasználó> <owner|admin|member|outcast|none>: Egy " -"felhasználó a szobával fennálló kapcsolatának beállítása." - -#, fuzzy +"affiliate <owner|admin|member|outcast|none> [1. becenév] [2. becenév]" +"… : Adott kapcsolattal rendelkező felhasználók lekérése vagy felhasználók " +"kapcsolatának beállítása a szobával." + msgid "" "role <moderator|participant|visitor|none> [nick1] [nick2] ...: Get the " "users with an role or set users' role with the room." msgstr "" -"role <felhasználó> <moderator|participant|visitor|none>: " -"Beállítja a felhasználó szerepét a szobában." +"role <moderator|participant|visitor|none>: [1. becenév] [2. becenév]" +"… : Adott szereppel rendelkező felhasználók lekérése vagy a felhasználók " +"szerepének beállítása a szobával." msgid "invite <user> [message]: Invite a user to the room." msgstr "invite <felhasználó> [üzenet]: Felhasználó meghívása a szobába." @@ -4621,7 +4604,7 @@ msgstr "Fájlátviteli proxy-k" msgid "BOSH URL" -msgstr "" +msgstr "BOSH URL" #. this should probably be part of global smiley theme settings later on, #. shared with MSN @@ -4685,32 +4668,28 @@ msgid "_Accept Defaults" msgstr "Alapértel_mezések elfogadása" -#, fuzzy msgid "No reason" -msgstr "Nincs ok megadva" - -#, fuzzy, c-format +msgstr "Nincs ok" + +#, c-format msgid "You have been kicked: (%s)" -msgstr "%s kirúgta Önt: (%s)" - -#, fuzzy, c-format +msgstr "Kirúgták Önt: (%s)" + +#, c-format msgid "Kicked (%s)" -msgstr "%s kizárta (%s)" - -#, fuzzy +msgstr "Kirúgva (%s)" + msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "Hiba történt a fájl megnyitása közben." - -#, fuzzy +msgstr "Hiba történt a bejövő adatfolyam átvitelében\n" + msgid "Transfer was closed." -msgstr "A fájlátvitel meghiúsult" - -#, fuzzy +msgstr "Az átvitel lezárva." + msgid "Failed to open the file" -msgstr "Nem sikerült megnyitni a(z) „%s” fájlt: %s" +msgstr "Nem sikerült megnyitni a fájlt" msgid "Failed to open in-band bytestream" -msgstr "" +msgstr "A bejövő adatfolyam megnyitása meghiúsult" #, c-format msgid "Unable to send file to %s, user does not support file transfers" @@ -5035,9 +5014,29 @@ msgid "Non-IM Contacts" msgstr "Nem azonnali üzenetváltási partnerek" -#, fuzzy, c-format +#, c-format +msgid "%s sent a wink. Click here to play it" +msgstr "" +"%s kacsintást küldött. A lejátszásához kattintson " +"ide" + +#, c-format +msgid "%s sent a wink, but it could not be saved" +msgstr "%s kacsintást küldött, de az nem menthető" + +#, c-format +msgid "%s sent a voice clip. Click here to play it" +msgstr "" +"%s hangklipet küldött. A lejátszásához kattintson ide" + +#, c-format +msgid "%s sent a voice clip, but it could not be saved" +msgstr "%s hangklipet küldött, de az nem menthető" + +#, c-format msgid "%s sent you a voice chat invite, which is not yet supported." -msgstr "%s webkamera-meghívást küldött, ami még nem támogatott." +msgstr "%s hangcsevegés-meghívást küldött, ami még nem támogatott." msgid "Nudge" msgstr "Bökés" @@ -5194,6 +5193,29 @@ "Az MSN használatához SSL támogatás szükséges. Telepítsen egy támogatott SSL " "könyvtárat." +#, c-format +msgid "" +"Unable to add the buddy %s because the username is invalid. Usernames must " +"be a valid email address." +msgstr "" +"Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A " +"felhasználóneveknek érvényes e-mail címnek kell lenniük." + +msgid "Unable to Add" +msgstr "Nem sikerült felvenni" + +msgid "Authorization Request Message:" +msgstr "Engedélyezést kérő üzenet:" + +msgid "Please authorize me!" +msgstr "Kérem engedélyezze, hogy felvegyem!" + +#. * +#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. +#. +msgid "_OK" +msgstr "_OK" + msgid "Error retrieving profile" msgstr "Hiba a profil letöltése közben" @@ -5386,13 +5408,14 @@ msgid "%s just sent you a Nudge!" msgstr "%s megbökte!" -#, fuzzy, c-format +#, c-format msgid "Unknown error (%d): %s" -msgstr "Ismeretlen hiba (%d)" +msgstr "Ismeretlen hiba (%d): %s" msgid "Unable to add user" msgstr "Nem vehető fel a felhasználó" +#. Unknown error! #, c-format msgid "Unknown error (%d)" msgstr "Ismeretlen hiba (%d)" @@ -5461,26 +5484,22 @@ "Kapcsolódási hiba a(z) %s kiszolgálótól:\n" "%s" -#, fuzzy msgid "Our protocol is not supported by the server" -msgstr "A protokollt nem támogatja a kiszolgáló." - -#, fuzzy +msgstr "A protokollt nem támogatja a kiszolgáló" + msgid "Error parsing HTTP" -msgstr "Hiba a HTTP feldolgozása közben." - -#, fuzzy +msgstr "Hiba a HTTP feldolgozása közben" + msgid "You have signed on from another location" -msgstr "Bejelentkezett egy másik helyről." +msgstr "Bejelentkezett egy másik helyről" msgid "The MSN servers are temporarily unavailable. Please wait and try again." msgstr "" "Az MSN kiszolgálók átmenetileg nem érhetők el. Kérem várjon és próbálja újra " "később." -#, fuzzy msgid "The MSN servers are going down temporarily" -msgstr "Az MSN kiszolgálók átmenetileg leállnak." +msgstr "Az MSN kiszolgálók átmenetileg leállnak" #, c-format msgid "Unable to authenticate: %s" @@ -5510,9 +5529,10 @@ msgid "Retrieving buddy list" msgstr "Partnerlista fogadása" -#, fuzzy, c-format +#, c-format msgid "%s requests to view your webcam, but this request is not yet supported." -msgstr "%s webkamera-meghívást küldött, ami még nem támogatott." +msgstr "" +"%s meg szeretné tekinteni az Ön webkameráját, de ez még nem támogatott." #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -5707,15 +5727,15 @@ msgid "Protocol error, code %d: %s" msgstr "Protokollhiba, %d. kód: %s" -#, fuzzy, c-format +#, c-format msgid "" "%s Your password is %zu characters, which is longer than the maximum length " "of %d. Please shorten your password at http://profileedit.myspace.com/index." "cfm?fuseaction=accountSettings.changePassword and try again." msgstr "" -"%s A jelszava %d karakter hosszú, ami nagyobb a MySpaceIM esetén várt %d " -"értéknél. Rövidítse jelszavát a következő címen: http://profileedit.myspace." -"com/index.cfm?fuseaction=accountSettings.changePassword és próbálkozzon újra." +"%s A jelszava %zu karakter hosszú, ami hosszabb a maximális %d értéknél. " +"Rövidítse jelszavát a következő címen: http://profileedit.myspace.com/index." +"cfm?fuseaction=accountSettings.changePassword és próbálkozzon újra." msgid "Incorrect username or password" msgstr "Hibás felhasználónév vagy jelszó" @@ -5815,6 +5835,9 @@ "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username " "to set your username." msgstr "" +"Hiba történt a felhasználónév beállításakor. Próbálja újra, vagy a http://" +"editprofile.myspace.com/index.cfm?fuseaction=profile.username oldalon " +"állítsa be a felhasználónevét." msgid "MySpaceIM - Username Available" msgstr "MySpaceIM – A felhasználónév elérhető" @@ -6075,9 +6098,9 @@ msgid "Unknown error: 0x%X" msgstr "Ismeretlen hiba: 0x%X" -#, fuzzy, c-format +#, c-format msgid "Unable to login: %s" -msgstr "%s felhasználó nem pingelhető" +msgstr "Nem lehet bejelentkezni: %s" #, c-format msgid "Unable to send message. Could not get details for user (%s)." @@ -6213,13 +6236,12 @@ "%s appears to be offline and did not receive the message that you just sent." msgstr "Úgy tűnik, %s kilépett, és nem kapta meg az utoljára küldött üzenetet." -#, fuzzy msgid "" "Unable to connect to server. Please enter the address of the server to which " "you wish to connect." msgstr "" -"Nem lehet kapcsolódni a kiszolgálóhoz. Kérem adja meg a kiszolgáló címét, " -"amelyikhez kapcsolódni szeretne." +"Nem lehet kapcsolódni a kiszolgálóhoz. Adja meg a kiszolgáló címét, amelyhez " +"kapcsolódni szeretne." msgid "This conference has been closed. No more messages can be sent." msgstr "Ez a konferencia le lett zárva. További üzenetek már nem küldhetőek." @@ -6243,9 +6265,8 @@ msgid "Server port" msgstr "Kiszolgáló portja" -#, fuzzy msgid "Received unexpected response from " -msgstr "Váratlan HTTP válasz érkezett a kiszolgálótól." +msgstr "Váratlan válasz érkezett a következőtől: " #. username connecting too frequently msgid "" @@ -6255,12 +6276,12 @@ "Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha " "tovább folytatja, még többet kell majd várnia." -#, fuzzy, c-format +#, c-format msgid "Error requesting " -msgstr "Hiba %s feloldásakor" +msgstr "Hiba a kéréskor: " msgid "AOL does not allow your screen name to authenticate here" -msgstr "" +msgstr "Az AOL nem engedélyezi ezen megjelenő név hitelesítését" msgid "Could not join chat room" msgstr "Nem sikerült kapcsolódni a csevegőszobához" @@ -6268,9 +6289,8 @@ msgid "Invalid chat room name" msgstr "Érvénytelen csevegőszobanév" -#, fuzzy msgid "Received invalid data on connection with server" -msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól." +msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól" #. *< type #. *< ui_requirement @@ -6317,7 +6337,6 @@ msgid "Received invalid data on connection with remote user." msgstr "Érvénytelen adatok érkeztek a kapcsolaton a távoli felhasználótól." -#, fuzzy msgid "Unable to establish a connection with the remote user." msgstr "Nem hozható létre kapcsolat a távoli felhasználóval." @@ -6518,15 +6537,13 @@ msgid "Buddy Comment" msgstr "Partnermegjegyzés" -#, fuzzy, c-format +#, c-format msgid "Unable to connect to authentication server: %s" -msgstr "" -"Nem sikerült kapcsolódni a hitelesítési kiszolgálóhoz:\n" -"%s" - -#, fuzzy, c-format +msgstr "Nem lehet kapcsolódni a hitelesítési kiszolgálóhoz: %s" + +#, c-format msgid "Unable to connect to BOS server: %s" -msgstr "Nem lehet a kiszolgálóhoz kapcsolódni." +msgstr "Nem lehet a BOS kiszolgálóhoz kapcsolódni: %s" msgid "Username sent" msgstr "Felhasználónév elküldve" @@ -6538,21 +6555,21 @@ msgid "Finalizing connection" msgstr "Kapcsolódás befejezése" -#, fuzzy, c-format +#, c-format msgid "" "Unable to sign on as %s because the username is invalid. Usernames must be " "a valid email address, or start with a letter and contain only letters, " "numbers and spaces, or contain only numbers." msgstr "" -"Nem lehet belépni: Sikertelen a belépés %s néven, mert a felhasználónév " -"érvénytelen. A felhasználóneveknek érvényes e-mail címnek kell lennie, vagy " -"betűvel kell kezdődniük és betűket, számokat, szóközöket, vagy csak számokat " +"Nem lehet belépni %s néven, mert a felhasználónév érvénytelen. A " +"felhasználóneveknek érvényes e-mail címnek kell lennie, vagy betűvel kell " +"kezdődniük és betűket, számokat, szóközöket, vagy csak számokat " "tartalmazhatnak." #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." msgstr "" -"Hamarosan megszakadhat a kapcsolat. Ebbben az esetben keressen frissítéseket " +"Hamarosan megszakadhat a kapcsolat. Ebben az esetben keressen frissítéseket " "a következő címen: %s." msgid "Unable to get a valid AIM login hash." @@ -6567,19 +6584,18 @@ #. Unregistered username #. uid is not exist #. the username does not exist -#, fuzzy msgid "Username does not exist" -msgstr "A felhasználó nem létezik" +msgstr "A felhasználónév nem létezik" #. Suspended account -#, fuzzy msgid "Your account is currently suspended" -msgstr "A fiókja jelenleg fel van függesztve." +msgstr "A fiókja jelenleg fel van függesztve" #. service temporarily unavailable msgid "The AOL Instant Messenger service is temporarily unavailable." msgstr "Az AOL azonnali üzenő szolgáltatás átmenetileg nem érhető el." +#. client too old #, c-format msgid "The client version you are using is too old. Please upgrade at %s" msgstr "" @@ -6587,17 +6603,15 @@ "következő helyről: %s" #. IP address connecting too frequently -#, fuzzy msgid "" "You have been connecting and disconnecting too frequently. Wait a minute and " "try again. If you continue to try, you will need to wait even longer." msgstr "" -"Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha " +"Ön túl gyakran jelentkezik ki/be. Várjon egy percet és próbálja meg újra. Ha " "tovább folytatja, még többet kell majd várnia." -#, fuzzy msgid "The SecurID key entered is invalid" -msgstr "A megadott SecurID kulcs érvénytelen." +msgstr "A megadott SecurID kulcs érvénytelen" msgid "Enter SecurID" msgstr "Adja meg a SecurID-t" @@ -6605,12 +6619,6 @@ msgid "Enter the 6 digit number from the digital display." msgstr "Írja be a hatjegyű számot a digitális képernyőről." -#. * -#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. -#. -msgid "_OK" -msgstr "_OK" - msgid "Password sent" msgstr "Jelszó elküldve" @@ -6620,12 +6628,6 @@ msgid "Please authorize me so I can add you to my buddy list." msgstr "Kérem engedélyezze, hogy felvehessem a partnereim közé." -msgid "Authorization Request Message:" -msgstr "Engedélyezést kérő üzenet:" - -msgid "Please authorize me!" -msgstr "Kérem engedélyezze, hogy felvegyem!" - msgid "No reason given." msgstr "Nincs ok megadva." @@ -6966,7 +6968,7 @@ msgid "Away message too long." msgstr "A távollét-üzenet túl hosszú." -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because the username is invalid. Usernames must " "be a valid email address, or start with a letter and contain only letters, " @@ -6974,11 +6976,8 @@ msgstr "" "Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A " "felhasználóneveknek érvényes e-mail címnek kell lenniük, vagy betűvel kell " -"kezdődniük, és betűket, számokat és szóközöket, vagy csak számokból " -"állhatnak." - -msgid "Unable to Add" -msgstr "Nem sikerült felvenni" +"kezdődniük, és betűket, számokat és szóközöket tartalmazhatnak, vagy csak " +"számokból állhatnak." msgid "Unable to Retrieve Buddy List" msgstr "Nem lehet lekérni a partnerek listáját" @@ -6994,7 +6993,7 @@ msgid "Orphans" msgstr "Árvák" -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because you have too many buddies in your buddy " "list. Please remove one and try again." @@ -7005,7 +7004,7 @@ msgid "(no name)" msgstr "(nincs név)" -#, fuzzy, c-format +#, c-format msgid "Unable to add the buddy %s for an unknown reason." msgstr "A(z) %s partner ismeretlen ok miatt nem adható hozzá." @@ -7167,9 +7166,8 @@ msgid "Search for Buddy by Information" msgstr "Partner keresése információ alapján" -#, fuzzy msgid "Use clientLogin" -msgstr "A felhasználó nincs bejelentkezve" +msgstr "Kliensbejelentkezés használata" msgid "" "Always use AIM/ICQ proxy server for\n" @@ -7368,30 +7366,26 @@ msgstr "Megjegyzés" #. callback -#, fuzzy msgid "Buddy Memo" -msgstr "Partnerfeljegyzés módosítása" +msgstr "Partnerfeljegyzés" msgid "Change his/her memo as you like" -msgstr "" - -#, fuzzy +msgstr "Módosítsa a megjegyzést" + msgid "_Modify" -msgstr "Módosítás" - -#, fuzzy +msgstr "_Módosítás" + msgid "Memo Modify" -msgstr "Módosítás" - -#, fuzzy +msgstr "Megjegyzés módosítása" + msgid "Server says:" -msgstr "A kiszolgáló foglalt" +msgstr "A kiszolgáló válasza:" msgid "Your request was accepted." -msgstr "" +msgstr "A kérés elfogadva." msgid "Your request was rejected." -msgstr "" +msgstr "A kérés visszautasítva." #, c-format msgid "%u requires verification" @@ -7705,7 +7699,7 @@ msgstr "

Lelkiismeretes tesztelők:
\n" msgid "and more, please let me know... thank you!))" -msgstr "" +msgstr "és sokan mások, köszönjük :)" msgid "

And, all the boys in the backroom...
\n" msgstr "

és a háttéremberek...
\n" @@ -7781,7 +7775,6 @@ msgid "Update interval (seconds)" msgstr "Frissítési időköz (mp)" -#, fuzzy msgid "Unable to decrypt server reply" msgstr "Nem fejthető vissza a kiszolgáló válasza" @@ -7849,9 +7842,8 @@ msgid "Requesting token" msgstr "Jelsor kérése" -#, fuzzy msgid "Unable to resolve hostname" -msgstr "Nem lehet a kiszolgálóhoz kapcsolódni." +msgstr "Nem oldható fel a gépnév" msgid "Invalid server or port" msgstr "Érvénytelen kiszolgáló vagy port" @@ -7904,9 +7896,8 @@ msgid "QQ Qun Command" msgstr "QQ Qun parancs" -#, fuzzy msgid "Unable to decrypt login reply" -msgstr "Nem fejthető vissza a bejelentkezési válas" +msgstr "Nem fejthető vissza a bejelentkezési válasz" msgid "Unknown LOGIN CMD" msgstr "Ismeretlen bejelentkezési parancs" @@ -8895,7 +8886,6 @@ msgid "Disconnected by server" msgstr "A kiszolgáló bontotta a kapcsolatot" -#, fuzzy msgid "Error connecting to SILC Server" msgstr "Hiba a SILC kiszolgálóhoz kapcsolódás közben" @@ -8911,24 +8901,18 @@ msgid "Performing key exchange" msgstr "Kulcscsere elvégzése" -#, fuzzy msgid "Unable to load SILC key pair" -msgstr "Nem sikerült a SILC kulcspárt betölteni" +msgstr "Nem lehet a SILC kulcspárt betölteni" #. Progress msgid "Connecting to SILC Server" msgstr "Kapcsolódás a SILC kiszolgálóhoz" -#, fuzzy -msgid "Unable to not load SILC key pair" -msgstr "Nem sikerült a SILC kulcspárt betölteni" - msgid "Out of memory" msgstr "Elfogyott a memória" -#, fuzzy msgid "Unable to initialize SILC protocol" -msgstr "Nem lehet inicializálni a SILC protokollt" +msgstr "Nem lehet előkészíteni a SILC protokollt" msgid "Error loading SILC key pair" msgstr "Hiba a SILC kulcspár betöltésekor" @@ -9236,9 +9220,8 @@ msgid "Creating SILC key pair..." msgstr "SILC kulcspár létrehozása…" -#, fuzzy msgid "Unable to create SILC key pair" -msgstr "Nem hozható létre SILC kulcspár\n" +msgstr "Nem hozható létre SILC kulcspár" #. Hint for translators: Please check the tabulator width here and in #. the next strings (short strings: 2 tabs, longer strings 1 tab, @@ -9377,27 +9360,24 @@ msgid "Failure: Authentication failed" msgstr "Hiba: Hitelesítés sikertelen" -#, fuzzy msgid "Unable to initialize SILC Client connection" -msgstr "Nem lehet inicializálni a SILC kliens kapcsolatot" +msgstr "Nem lehet előkészíteni a SILC klienskapcsolatot" msgid "John Noname" msgstr "Névtelen" -#, fuzzy, c-format +#, c-format msgid "Unable to load SILC key pair: %s" msgstr "Nem sikerült a SILC kulcspárt betölteni: %s" msgid "Unable to create connection" msgstr "Nem hozható létre kapcsolat" -#, fuzzy msgid "Unknown server response" -msgstr "Ismeretlen kiszolgálóválasz." - -#, fuzzy +msgstr "Ismeretlen kiszolgálóválasz" + msgid "Unable to create listen socket" -msgstr "Nem lehet létrehozni foglalatot" +msgstr "Nem lehet létrehozni figyelőfoglalatot" msgid "SIP usernames may not contain whitespaces or @ symbols" msgstr "" @@ -9462,9 +9442,8 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! Protocol Plugin" -msgstr "Yahoo protokollbővítmény" +msgstr "Yahoo! protokollbővítmény" msgid "Pager server" msgstr "Személyhívó kiszolgáló" @@ -9493,9 +9472,8 @@ msgid "Yahoo Chat port" msgstr "Yahoo csevegőport" -#, fuzzy msgid "Yahoo JAPAN ID..." -msgstr "Yahoo azonosító…" +msgstr "Yahoo Japán azonosító…" #. *< type #. *< ui_requirement @@ -9507,12 +9485,11 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "Yahoo protokollbővítmény" +msgstr "Yahoo! Japán protokollbővítmény" msgid "Your SMS was not delivered" -msgstr "" +msgstr "Az SMS nem lett kézbesítve" msgid "Your Yahoo! message did not get sent." msgstr "Az Ön Yahoo! üzenete nem lett elküldve." @@ -9539,32 +9516,28 @@ msgstr "Partner felvétele megtagadva" #. Some error in the received stream -#, fuzzy msgid "Received invalid data" -msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól." +msgstr "Érvénytelen adatok érkeztek" #. security lock from too many failed login attempts -#, fuzzy msgid "" "Account locked: Too many failed login attempts. Logging into the Yahoo! " "website may fix this." msgstr "" -"Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán " -"megoldhatja ezt a problémát." +"A fiók zárolva: túl sok meghiúsult bejelentkezési kísérlet. A Yahoo! " +"weboldalára bejelentkezés talán megoldhatja ezt a problémát." #. indicates a lock of some description -#, fuzzy msgid "" "Account locked: Unknown reason. Logging into the Yahoo! website may fix " "this." msgstr "" -"Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán " +"A fiók zárolva: Ismeretlen ok. A Yahoo! weboldalára bejelentkezés talán " "megoldhatja ezt a problémát." #. username or password missing -#, fuzzy msgid "Username or password missing" -msgstr "Hibás felhasználónév vagy jelszó" +msgstr "A felhasználónév vagy jelszó hiányzik" #, c-format msgid "" @@ -9600,35 +9573,29 @@ "Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán " "megoldhatja ezt a problémát." -#, fuzzy, c-format +#, c-format msgid "Unable to add buddy %s to group %s to the server list on account %s." msgstr "" -"Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiókhoz " -"tartozó kiszolgálóoldali listán." - -#, fuzzy +"Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiók " +"kiszolgálóoldali listáján." + msgid "Unable to add buddy to server list" -msgstr "Nem sikerült a partnert hozzáadni a kiszolgálóoldali listához" +msgstr "Nem sikerült a partnert hozzáadni a kiszolgáló listájához" #, c-format msgid "[ Audible %s/%s/%s.swf ] %s" msgstr "[ Hallható %s/%s/%s.swf ] %s" -#, fuzzy msgid "Received unexpected HTTP response from server" -msgstr "Váratlan HTTP válasz érkezett a kiszolgálótól." - -#, fuzzy, c-format +msgstr "Váratlan HTTP válasz érkezett a kiszolgálótól" + +#, c-format msgid "Lost connection with %s: %s" -msgstr "" -"Elveszett a kapcsolat a következővel: %s:\n" -"%s" - -#, fuzzy, c-format +msgstr "Elveszett a kapcsolat a következővel: %s: %s" + +#, c-format msgid "Unable to establish a connection with %s: %s" -msgstr "" -"Nem hozható létre kapcsolat a következő kiszolgálóval:\n" -"%s" +msgstr "Nem hozható létre kapcsolat a következővel: %s: %s" msgid "Not at Home" msgstr "Nem vagyok itthon" @@ -9676,7 +9643,7 @@ msgstr "Firkálás megkezdése" msgid "Select the ID you want to activate" -msgstr "" +msgstr "Válassza ki az aktiválandó azonosítót" msgid "Join whom in chat?" msgstr "Kihez csatlakozik a csevegésben?" @@ -9778,12 +9745,8 @@ msgstr "A felhasználó profilja üres." #, c-format -msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." -msgstr "" -"%s visszalépett az Ön meghívásától a(z) „%s” konferenciaszobába, mivel: „%s”." - -msgid "Invitation Rejected" -msgstr "Meghívás visszautasítva" +msgid "%s has declined to join." +msgstr "%s visszautasította a belépést." msgid "Failed to join chat" msgstr "Nem sikerült kapcsolódni a csevegéshez" @@ -9835,9 +9798,8 @@ msgid "User Rooms" msgstr "Felhasználói szobák" -#, fuzzy msgid "Connection problem with the YCHT server" -msgstr "Kapcsolathiba a YCHT kiszolgálóval." +msgstr "Kapcsolathiba a YCHT kiszolgálóval" msgid "" "(There was an error converting this message.\t Check the 'Encoding' option " @@ -9968,19 +9930,19 @@ msgid "Exposure" msgstr "Exportálás" -#, fuzzy, c-format +#, c-format msgid "Unable to parse response from HTTP proxy: %s" -msgstr "A válasz nem dolgozható fel a HTTP proxytól: %s\n" +msgstr "A válasz nem dolgozható fel a HTTP proxytól: %s" #, c-format msgid "HTTP proxy connection error %d" msgstr "%d HTTP proxy kapcsolathiba" -#, fuzzy, c-format +#, c-format msgid "Access denied: HTTP proxy server forbids port %d tunneling" msgstr "" "Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) %" -"d. porton." +"d. porton" #, c-format msgid "Error resolving %s" @@ -10224,13 +10186,13 @@ msgid "Error Reading %s" msgstr "Hiba %s olvasásakor" -#, fuzzy, c-format +#, c-format msgid "" "An error was encountered reading your %s. The file has not been loaded, and " "the old file has been renamed to %s~." msgstr "" -"Hiba lépett fel a(z) %s feldolgozása közben. Ezek nem lettek betöltve, a " -"régi fájl %s~ néven lett elmentve." +"Hiba történt a(z) %s olvasásakor. Ez a fájl nem lett betöltve, a régi fájl %" +"s~ néven lett elmentve." msgid "Internet Messenger" msgstr "Azonnali üzenetküldés" @@ -10274,8 +10236,8 @@ msgid "Use this buddy _icon for this account:" msgstr "Ezen _partnerikon használata a fiókhoz:" -msgid "_Advanced" -msgstr "_Haladó" +msgid "Ad_vanced" +msgstr "Spe_ciális" msgid "Use GNOME Proxy Settings" msgstr "GNOME proxybeállítások használata" @@ -10337,9 +10299,8 @@ msgid "Create _this new account on the server" msgstr "Ezen új fió_k létrehozása a kiszolgálón" -#, fuzzy -msgid "_Proxy" -msgstr "Proxy" +msgid "P_roxy" +msgstr "P_roxy" msgid "Enabled" msgstr "Engedélyezve" @@ -10390,9 +10351,8 @@ msgid "Please update the necessary fields." msgstr "Frissítse a szükséges mezőket." -#, fuzzy msgid "A_ccount" -msgstr "Fiók" +msgstr "_Fiók" msgid "" "Please enter the appropriate information about the chat you would like to " @@ -10419,16 +10379,14 @@ msgid "I_M" msgstr "Ü_zenet" -#, fuzzy msgid "_Audio Call" -msgstr "Cse_vegés hozzáadása" +msgstr "_Hanghívás" msgid "Audio/_Video Call" -msgstr "" - -#, fuzzy +msgstr "Hang/_videóhívás" + msgid "_Video Call" -msgstr "Videócsevegés" +msgstr "_Videóhívás" msgid "_Send File..." msgstr "_Fájl küldése…" @@ -10439,11 +10397,9 @@ msgid "View _Log" msgstr "Nap_ló megtekintése" -#, fuzzy msgid "Hide When Offline" msgstr "Elrejtés, ha nem érhető el" -#, fuzzy msgid "Show When Offline" msgstr "Megjelenítés, ha elérhető" @@ -10571,9 +10527,8 @@ msgid "/Tools/_Certificates" msgstr "/Eszközök/_Tanúsítványok" -#, fuzzy msgid "/Tools/Custom Smile_ys" -msgstr "/Eszközök/Mosol_y" +msgstr "/Eszközök/Egyéni mosol_yok" msgid "/Tools/Plu_gins" msgstr "/Eszközök/Bő_vítmények" @@ -10702,7 +10657,7 @@ msgstr "Állapot szerint" msgid "By recent log activity" -msgstr "" +msgstr "Legutóbbi naplóaktivitás szerint" #, c-format msgid "%s disconnected" @@ -10719,7 +10674,7 @@ msgstr "Újraengedélyezés" msgid "SSL FAQs" -msgstr "" +msgstr "SSL FAQ-ok" msgid "Welcome back!" msgstr "Üdvözöljük újra!" @@ -10850,107 +10805,95 @@ msgstr "Háttérszín" msgid "The background color for the buddy list" -msgstr "" - -#, fuzzy +msgstr "A partnerlista háttérszíne" + msgid "Layout" -msgstr "lao" +msgstr "Elrendezés" msgid "The layout of icons, name, and status of the blist" -msgstr "" +msgstr "A partnerlista ikonjainak, nevének és állapotának elrendezése" #. Group -#, fuzzy msgid "Expanded Background Color" -msgstr "Háttérszín" +msgstr "Kibontott háttérszín" msgid "The background color of an expanded group" -msgstr "" - -#, fuzzy +msgstr "Kibontott csoport háttérszíne" + msgid "Expanded Text" -msgstr "_Kibontás" +msgstr "Kibontott szöveg" msgid "The text information for when a group is expanded" -msgstr "" - -#, fuzzy +msgstr "Szöveges információk kibontott csoport esetén" + msgid "Collapsed Background Color" -msgstr "Háttérszín kiválasztása" +msgstr "Összecsukott háttérszín" msgid "The background color of a collapsed group" -msgstr "" - -#, fuzzy +msgstr "Összecsukott csoport háttérszíne" + msgid "Collapsed Text" -msgstr "Összecs_ukás" +msgstr "Összecsukott szöveg" msgid "The text information for when a group is collapsed" -msgstr "" +msgstr "A szöveges információk összecsukott csoport esetén" #. Buddy -#, fuzzy msgid "Contact/Chat Background Color" -msgstr "Háttérszín kiválasztása" +msgstr "Partner/csevegés háttérszíne" msgid "The background color of a contact or chat" -msgstr "" - -#, fuzzy +msgstr "Partner vagy csevegés háttérszíne" + msgid "Contact Text" -msgstr "Billentyűparancs" +msgstr "Partnerszöveg" msgid "The text information for when a contact is expanded" -msgstr "" - -#, fuzzy +msgstr "Kibontott partner szöveges információi" + msgid "On-line Text" -msgstr "Elérhető" +msgstr "Elérhető szöveg" msgid "The text information for when a buddy is online" -msgstr "" - -#, fuzzy +msgstr "Elérhető partner szöveges információi" + msgid "Away Text" -msgstr "Távol" +msgstr "Távol szöveg" msgid "The text information for when a buddy is away" -msgstr "" - -#, fuzzy +msgstr "Távol lévő partner szöveges információi" + msgid "Off-line Text" -msgstr "Kilépett" +msgstr "Kilépett szöveg" msgid "The text information for when a buddy is off-line" -msgstr "" - -#, fuzzy +msgstr "Kilépett partner szöveges információi" + msgid "Idle Text" -msgstr "Hangulatszöveg" +msgstr "Ráérő szöveg" msgid "The text information for when a buddy is idle" -msgstr "" - -#, fuzzy +msgstr "Ráérő partner szöveges információi" + msgid "Message Text" -msgstr "Üzenet elküldve" +msgstr "Üzenetszöveg" msgid "The text information for when a buddy has an unread message" -msgstr "" +msgstr "Olvasatlan üzenetekkel rendelkező partner szöveges információi" msgid "Message (Nick Said) Text" -msgstr "" +msgstr "Üzenetszöveg (becenév említve)" msgid "" "The text information for when a chat has an unread message that mentions " "your nick" msgstr "" - -#, fuzzy +"Szöveges információk, ha a csevegés olvasatlan üzeneteket tartalmaz, amelyek " +"az Ön becenevét említik" + msgid "The text information for a buddy's status" -msgstr "%s felhasználóinformációinak módosítása" - -#, fuzzy +msgstr "Partner állapotának szöveges információi" + msgid "Type the host name for this certificate." msgstr "Írja be a tanúsítványt birtokló gép nevét." @@ -11001,7 +10944,6 @@ msgid "Get Away Message" msgstr "Távollét üzenet lekérdezése" -#, fuzzy msgid "Last Said" msgstr "Utoljára ezt mondta" @@ -11048,21 +10990,17 @@ msgid "/Conversation/Clea_r Scrollback" msgstr "/Társalgás/Elő_zmények törlése" -#, fuzzy msgid "/Conversation/M_edia" -msgstr "/Társalgás/_Több" - -#, fuzzy +msgstr "/Társalgás/Mé_dia" + msgid "/Conversation/Media/_Audio Call" -msgstr "/Társalgás/_Több" - -#, fuzzy +msgstr "/Társalgás/Média/_Hanghívás" + msgid "/Conversation/Media/_Video Call" -msgstr "/Társalgás/_Több" - -#, fuzzy +msgstr "/Társalgás/Média/_Videohívás" + msgid "/Conversation/Media/Audio\\/Video _Call" -msgstr "/Társalgás/Nap_ló megtekintése" +msgstr "/Társalgás/Média/Hang\\/vi_deóhívás" msgid "/Conversation/Se_nd File..." msgstr "/Társalgás/Fájl kül_dése…" @@ -11136,17 +11074,14 @@ msgid "/Conversation/View Log" msgstr "/Társalgás/Napló megtekintése" -#, fuzzy msgid "/Conversation/Media/Audio Call" -msgstr "/Társalgás/Több" - -#, fuzzy +msgstr "/Társalgás/Média/Hanghívás" + msgid "/Conversation/Media/Video Call" -msgstr "/Társalgás/Napló megtekintése" - -#, fuzzy +msgstr "/Társalgás/Média/Videohívás" + msgid "/Conversation/Media/Audio\\/Video Call" -msgstr "/Társalgás/Több" +msgstr "/Társalgás/Média/Hang\\/videóhívás" msgid "/Conversation/Send File..." msgstr "/Társalgás/Fájl küldése…" @@ -11332,7 +11267,7 @@ msgstr "Ka-Hing Cheung" msgid "voice and video" -msgstr "" +msgstr "hang és videó" msgid "support" msgstr "támogató" @@ -11458,9 +11393,8 @@ msgid "Hungarian" msgstr "magyar" -#, fuzzy msgid "Armenian" -msgstr "román" +msgstr "Örmény" msgid "Indonesian" msgstr "indonéz" @@ -11477,9 +11411,8 @@ msgid "Ubuntu Georgian Translators" msgstr "Grúz Ubuntu fordítók" -#, fuzzy msgid "Khmer" -msgstr "Egyéb" +msgstr "Khmer" msgid "Kannada" msgstr "kannada" @@ -11560,7 +11493,7 @@ msgstr "svéd" msgid "Swahili" -msgstr "" +msgstr "Szuahéli" msgid "Tamil" msgstr "tamil" @@ -11870,14 +11803,6 @@ msgid "File transfer _details" msgstr "Fájlát_vitel részletei" -#. Pause button -msgid "_Pause" -msgstr "_Szünet" - -#. Resume button -msgid "_Resume" -msgstr "_Folytatás" - msgid "Paste as Plain _Text" msgstr "Beillesztés egyszerű szö_vegként" @@ -11896,7 +11821,6 @@ msgid "Hyperlink visited color" msgstr "Meglátogatott hiperhivatkozás színe" -#, fuzzy msgid "Color to draw hyperlink after it has been visited (or activated)." msgstr "Meglátogatott (aktivált) hiperhivatkozások rajzolásához használt szín." @@ -11934,23 +11858,20 @@ msgid "Action Message Name Color for Whispered Message" msgstr "Műveletüzenet névszíne suttogott üzenethez" -#, fuzzy msgid "Color to draw the name of a whispered action message." -msgstr "Műveletüzenet nevének rajzszíne." +msgstr "Suttogott műveletüzenet nevének rajzszíne." msgid "Whisper Message Name Color" msgstr "Suttogott üzenet névszíne" -#, fuzzy msgid "Color to draw the name of a whispered message." -msgstr "Műveletüzenet nevének rajzszíne." +msgstr "Suttogott üzenet nevének rajzszíne." msgid "Typing notification color" msgstr "Gépelésértesítés színe" -#, fuzzy msgid "The color to use for the typing notification" -msgstr "A gépelésértesítés betűkészletének színe" +msgstr "A gépelésértesítés színe" msgid "Typing notification font" msgstr "Gépelésértesítés betűkészlete" @@ -12202,7 +12123,7 @@ msgid "%s %s. Try `%s -h' for more information.\n" msgstr "%s %s. Próbálja a „%s -h” parancsot további információkért.\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -12224,6 +12145,8 @@ "\n" " -c, --config=KÖNYVTÁR A KÖNYVTÁR használata a beállítófájlokhoz\n" " -d, --debug hibakereső üzenetek kiírása a szabványos kimenetre\n" +" -f, --force-online elérhető állapot kényszerítése, a hálózat állapotától\n" +" függetlenül\n" " -h, --help ezen súgó megjelenítése és kilépés\n" " -m, --multiple ne csak egy példány futhasson\n" " -n, --nologin ne jelentkezzen be automatikusan\n" @@ -12232,7 +12155,7 @@ " --display=KÉPERNYŐ a használandó X megjelenítő\n" " -v, --version az aktuális verzió megjelenítése és kilépés\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -12253,6 +12176,8 @@ "\n" " -c, --config=KÖNYVTÁR A KÖNYVTÁR használata a beállítófájlokhoz\n" " -d, --debug hibakereső üzenetek kiírása a szabványos kimenetre\n" +" -f, --force-online elérhető állapot kényszerítése, a hálózat állapotától\n" +" függetlenül\n" " -h, --help ezen súgó megjelenítése és kilépés\n" " -m, --multiple ne csak egy példány futhasson\n" " -n, --nologin ne jelentkezzen be automatikusan\n" @@ -12298,22 +12223,21 @@ msgstr "Kilépés, mert már fut egy másik libpurple kliens.\n" msgid "/_Media" -msgstr "" +msgstr "/_Média" msgid "/Media/_Hangup" -msgstr "" - -#, fuzzy +msgstr "/Média/_Lerakás" + msgid "Calling..." -msgstr "Számítás…" +msgstr "Hívás…" #, c-format msgid "%s wishes to start an audio/video session with you." -msgstr "" +msgstr "%s hang/videókapcsolatot szeretne indítani." #, c-format msgid "%s wishes to start a video session with you." -msgstr "" +msgstr "%s videókapcsolatot szeretne indítani." #, c-format msgid "%s has %d new message." @@ -12342,9 +12266,8 @@ "The 'Manual' browser command has been chosen, but no command has been set." msgstr "A „Kézi” böngészőparancsot választotta, de nem adott meg parancsot." -#, fuzzy msgid "No message" -msgstr "Ismeretlen üzenet" +msgstr "Nincs üzenet" msgid "Open All Messages" msgstr "Összes üzenet megnyitása" @@ -12352,16 +12275,14 @@ msgid "You have mail!" msgstr "Levele érkezett!" -#, fuzzy msgid "New Pounces" -msgstr "Új partnerfigyelmeztetés" +msgstr "Új partnerfigyelmeztetések" msgid "Dismiss" -msgstr "" - -#, fuzzy +msgstr "Rendben" + msgid "You have pounced!" -msgstr "Levele érkezett!" +msgstr "Üzenete érkezett!" msgid "The following plugins will be unloaded." msgstr "A következő bővítmények lesznek eltávolítva." @@ -12411,9 +12332,8 @@ msgid "Select a file" msgstr "Fájl kiválasztása" -#, fuzzy msgid "Modify Buddy Pounce" -msgstr "Partnerfigyelmeztetés szerkesztése" +msgstr "Partnerfigyelmeztetés módosítása" #. Create the "Pounce on Whom" frame. msgid "Pounce on Whom" @@ -12488,61 +12408,58 @@ msgid "Pounce Target" msgstr "Figyelmeztetés címzettje" -#, fuzzy, c-format +#, c-format msgid "Started typing" -msgstr "Elkezd gépelni" - -#, fuzzy, c-format +msgstr "Elkezdett gépelni" + +#, c-format msgid "Paused while typing" -msgstr "Felfüggeszti a gépelést" - -#, fuzzy, c-format +msgstr "Félbehagyta a gépelést" + +#, c-format msgid "Signed on" -msgstr "Bejelentkezik" - -#, fuzzy, c-format +msgstr "Bejelentkezett" + +#, c-format msgid "Returned from being idle" -msgstr "%s inaktív állapota megszűnt (%s)" - -#, fuzzy, c-format +msgstr "Visszatért inaktív állapotból" + +#, c-format msgid "Returned from being away" -msgstr "Visszatér távollétből" - -#, fuzzy, c-format +msgstr "Visszatért távollétből" + +#, c-format msgid "Stopped typing" msgstr "Abbahagyta a gépelést" -#, fuzzy, c-format +#, c-format msgid "Signed off" -msgstr "Kijelentkezik" - -#, fuzzy, c-format +msgstr "Kijelentkezett" + +#, c-format msgid "Became idle" -msgstr "Inaktív lesz" - -#, fuzzy, c-format +msgstr "Inaktív lett" + +#, c-format msgid "Went away" -msgstr "Ha távol vagyok" - -#, fuzzy, c-format +msgstr "Elment" + +#, c-format msgid "Sent a message" -msgstr "Üzenet küldése" - -#, fuzzy, c-format +msgstr "Üzenetet küldött" + +#, c-format msgid "Unknown.... Please report this!" -msgstr "Ismeretlen figyelmeztetési esemény. Kérjük jelentse ezt!" - -#, fuzzy +msgstr "Ismeretlen… Kérjük jelentse ezt!" + msgid "Theme failed to unpack." -msgstr "A hangulatjel-téma kicsomagolása meghiúsult." - -#, fuzzy +msgstr "A téma kicsomagolása meghiúsult." + msgid "Theme failed to load." -msgstr "A hangulatjel-téma kicsomagolása meghiúsult." - -#, fuzzy +msgstr "A téma betöltése meghiúsult." + msgid "Theme failed to copy." -msgstr "A hangulatjel-téma kicsomagolása meghiúsult." +msgstr "A téma másolása meghiúsult." msgid "Install Theme" msgstr "Téma telepítése" @@ -12564,9 +12481,8 @@ msgstr "Társalgások bezárása az _Escape billentyűvel" #. Buddy List Themes -#, fuzzy msgid "Buddy List Theme" -msgstr "Partnerlista" +msgstr "Partnerlista-téma" #. System Tray msgid "System Tray Icon" @@ -12578,9 +12494,8 @@ msgid "On unread messages" msgstr "Olvasatlan üzenetek esetén" -#, fuzzy msgid "Conversation Window" -msgstr "IM társalgási ablakok" +msgstr "Társalgási ablak" msgid "_Hide new IM conversations:" msgstr "Új társal_gások elrejtése:" @@ -12683,9 +12598,9 @@ msgid "Example: stunserver.org" msgstr "Például: stunserver.org" -#, fuzzy, c-format +#, c-format msgid "Use _automatically detected IP address: %s" -msgstr "_IP cím automatikus felismerése" +msgstr "Automatikusan felismert _IP cím használata: %s" msgid "Public _IP:" msgstr "_Nyilvános IP:" @@ -12707,7 +12622,7 @@ #. TURN server msgid "Relay Server (TURN)" -msgstr "" +msgstr "Továbbító kiszolgáló (TURN)" msgid "Proxy Server & Browser" msgstr "Proxy-kiszolgáló és böngésző" @@ -13054,12 +12969,12 @@ msgid "Status for %s" msgstr "%s állapota" -#, fuzzy, c-format +#, c-format msgid "" "A custom smiley for '%s' already exists. Please use a different shortcut." msgstr "" -"Már létezik egyéni hangulatjel a kiválasztott billentyűparancshoz. Adjon meg " -"másik billentyűparancsot." +"Már létezik egyéni hangulatjel ehhez: „%s”. Adjon meg másik " +"billentyűparancsot." msgid "Custom Smiley" msgstr "Egyéni hangulatjel" @@ -13073,28 +12988,24 @@ msgid "Add Smiley" msgstr "Hangulatjel hozzáadása" -#, fuzzy msgid "_Image:" -msgstr "Ké_p" +msgstr "Ké_p:" #. Shortcut text -#, fuzzy msgid "S_hortcut text:" -msgstr "Billentyűparancs" +msgstr "Bille_ntyűparancs szövege:" msgid "Smiley" msgstr "Hangulatjel" -#, fuzzy msgid "Shortcut Text" -msgstr "Billentyűparancs" +msgstr "Billentyűparancs szövege" msgid "Custom Smiley Manager" msgstr "Egyénihangulatjel-kezelő" -#, fuzzy msgid "Select Buddy Icon" -msgstr "Partner kiválasztása" +msgstr "Válasszon partnerikont" msgid "Click to change your buddyicon for this account." msgstr "Kattintson a fiók partnerikonjának módosításához." @@ -13180,13 +13091,12 @@ msgid "Cannot send launcher" msgstr "Az indítóikon nem küldhető el" -#, fuzzy msgid "" "You dragged a desktop launcher. Most likely you wanted to send the target of " "this launcher instead of this launcher itself." msgstr "" -"Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott " -"objektumot akarta elküldeni az indítóikon helyett." +"Egy asztali indítóikont húzott be. Valószínűleg az indítóikon célobjektumát " +"akarta elküldeni az indítóikon helyett." #, c-format msgid "" @@ -13220,9 +13130,8 @@ "A(z) „%s” kép betöltése sikertelen: az ok nem ismert, valószínűleg sérült a " "képfájl" -#, fuzzy msgid "_Open Link" -msgstr "Hivatk_ozás megnyitása:" +msgstr "_Hivatkozás megnyitása" msgid "_Copy Link Location" msgstr "_Hivatkozás helyének másolása" @@ -13230,9 +13139,21 @@ msgid "_Copy Email Address" msgstr "E-mail cím _másolása" +msgid "_Open File" +msgstr "_Fájl megnyitása" + +msgid "Open _Containing Directory" +msgstr "_Tartalmazó könyvtár megnyitása" + msgid "Save File" msgstr "Fájl mentése" +msgid "_Play Sound" +msgstr "H_ang lejátszása" + +msgid "_Save File" +msgstr "Fájl m_entése" + msgid "Select color" msgstr "Szín kiválasztása" @@ -13257,6 +13178,9 @@ msgid "_Open Mail" msgstr "_Levél megnyitása" +msgid "_Pause" +msgstr "_Szünet" + msgid "_Edit" msgstr "S_zerkesztés" @@ -13320,79 +13244,65 @@ msgid "Displays statistical information about your buddies' availability" msgstr "Statisztikai információk megjelenítése a partnerek elérhetőségéről" -#, fuzzy msgid "Server name request" -msgstr "Kiszolgáló címe" - -#, fuzzy +msgstr "Kiszolgálónév-kérés" + msgid "Enter an XMPP Server" -msgstr "Adjon meg egy konferenciakiszolgálót" - -#, fuzzy +msgstr "Adjon meg egy XMPP kiszolgálót" + msgid "Select an XMPP server to query" -msgstr "Válassza ki a lekérdezendő konferenciakiszolgálót" - -#, fuzzy +msgstr "Válassza ki a lekérdezendő XMPP kiszolgálót" + msgid "Find Services" -msgstr "Elérhető szolgáltatások" - -#, fuzzy +msgstr "Szolgáltatások keresése" + msgid "Add to Buddy List" -msgstr "Partnerlista küldése" - -#, fuzzy +msgstr "Felvétel a partnerlistára" + msgid "Gateway" -msgstr "A partner elmegy" - -#, fuzzy +msgstr "Átjáró" + msgid "Directory" -msgstr "Naplókönyvtár" - -#, fuzzy +msgstr "Címtár" + msgid "PubSub Collection" -msgstr "Hang kiválasztása" - -#, fuzzy +msgstr "PubSub gyűjtemény" + msgid "PubSub Leaf" -msgstr "PubSub szolgáltatás" - -#, fuzzy +msgstr "PubSub levél" + msgid "" "\n" "Description: " -msgstr "Leírás" +msgstr "" +"\n" +"Leírás:" #. Create the window. -#, fuzzy msgid "Service Discovery" -msgstr "Szolgáltatásfeltérképezési információk" - -#, fuzzy +msgstr "Szolgáltatásfeltérképezés" + msgid "_Browse" -msgstr "_Böngésző:" - -#, fuzzy +msgstr "_Tallózás" + msgid "Server does not exist" -msgstr "A felhasználó nem létezik" - -#, fuzzy +msgstr "A kiszolgáló nem létezik" + msgid "Server does not support service discovery" -msgstr "A kiszolgáló nem támogatja a blokkolást" - -#, fuzzy +msgstr "A kiszolgáló nem támogatja a szolgáltatásfeltérképezést" + msgid "XMPP Service Discovery" -msgstr "Szolgáltatásfeltérképezési információk" +msgstr "XMPP szolgáltatásfeltérképezés" msgid "Allows browsing and registering services." -msgstr "" - -#, fuzzy +msgstr "Lehetővé teszi szolgáltatások tallózását és regisztrálását." + msgid "" "This plugin is useful for registering with legacy transports or other XMPP " "services." msgstr "" -"Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez " -"hasznos." +"Ez a bővítmény örökölt átvitelekkel történő, vagy más XMPP szolgáltatásokhoz " +"való regisztráláshoz hasznos." msgid "Buddy is idle" msgstr "A partner inaktív" @@ -13789,7 +13699,6 @@ msgstr "Zenei üzenetküldő bővítmény együttműködő zeneszerzéshez." #. * summary -#, fuzzy msgid "" "The Music Messaging Plugin allows a number of users to simultaneously work " "on a piece of music by editing a common score in real-time." @@ -13914,7 +13823,6 @@ msgid "Highlighted Message Name Color" msgstr "Kiemelt üzenet névszíne" -#, fuzzy msgid "Typing Notification Color" msgstr "Gépelésértesítés színe" @@ -13947,23 +13855,20 @@ msgid "GTK+ Text Shortcut Theme" msgstr "GTK+ szöveges gyorsbillentyű téma" -#, fuzzy msgid "Disable Typing Notification Text" -msgstr "Gépelésértesítés engedélyezése" - -#, fuzzy +msgstr "Gépelésértesítés szövegének letiltása" + msgid "GTK+ Theme Control Settings" -msgstr "Pidgin GTK+ témavezérlés" - -#, fuzzy +msgstr "GTK+ témavezérlés beállításai" + msgid "Colors" -msgstr "Bezárás" +msgstr "Színek" msgid "Fonts" msgstr "Betűkészletek" msgid "Miscellaneous" -msgstr "" +msgstr "Egyebek" msgid "Gtkrc File Tools" msgstr "Gtkrc fájleszközök" @@ -14048,7 +13953,6 @@ msgstr "Társalgási ablak küldés gombja." #. *< summary -#, fuzzy msgid "" "Adds a Send button to the entry area of the conversation window. Intended " "for use when no physical keyboard is present." @@ -14109,94 +14013,81 @@ "A felhasználó által megadott szabályoknak megfelelően cseréli a szöveget a " "kimenő üzenetekben." -#, fuzzy msgid "Just logged in" -msgstr "Nincs bejelentkezve" - -#, fuzzy +msgstr "Épp bejelentkezett" + msgid "Just logged out" -msgstr "Nincs bejelentkezve" +msgstr "Épp kijelentkezett" msgid "" "Icon for Contact/\n" "Icon for Unknown person" msgstr "" - -#, fuzzy +"Partner ikonja/\n" +"Ismeretlen ikonja" + msgid "Icon for Chat" -msgstr "Csatlakozás egy csevegéshez" - -#, fuzzy +msgstr "Csevegés ikonja" + msgid "Ignored" -msgstr "Mellőzés" - -#, fuzzy +msgstr "Mellőzve" + msgid "Founder" -msgstr "Hangosabb" - -#, fuzzy +msgstr "Alapító" + +#. A user in a chat room who has special privileges. msgid "Operator" -msgstr "Opera" - +msgstr "Operátor" + +#. A half operator is someone who has a subset of the privileges +#. that an operator has. msgid "Half Operator" -msgstr "" - -#, fuzzy +msgstr "Féloperátor" + msgid "Authorization dialog" -msgstr "Engedély megadva" - -#, fuzzy +msgstr "Hitelesítési ablak" + msgid "Error dialog" -msgstr "Hiba " - -#, fuzzy +msgstr "Hibaablak" + msgid "Information dialog" -msgstr "Információk" +msgstr "Információs ablak" msgid "Mail dialog" -msgstr "" - -#, fuzzy +msgstr "Levél ablak" + msgid "Question dialog" -msgstr "Kérdés párbeszédablak" - -#, fuzzy +msgstr "Kérdező ablak" + msgid "Warning dialog" -msgstr "Figyelmeztetési szint" +msgstr "Figyelmeztető ablak" msgid "What kind of dialog is this?" -msgstr "" - -#, fuzzy +msgstr "Milyen típusú ablak ez?" + msgid "Status Icons" -msgstr "%s állapota" - -#, fuzzy +msgstr "Állapotikonok" + msgid "Chatroom Emblems" -msgstr "Csevegőszoba nyelve" - -#, fuzzy +msgstr "Csevegőszoba matricái" + msgid "Dialog Icons" -msgstr "Ikon módosítása" - -#, fuzzy +msgstr "Ablak ikonjai" + msgid "Pidgin Icon Theme Editor" -msgstr "Pidgin GTK+ témavezérlés" - -#, fuzzy +msgstr "Pidgin ikontéma-szerkesztő" + msgid "Contact" -msgstr "Kapcsolatinformációk" - -#, fuzzy +msgstr "Partner" + msgid "Pidgin Buddylist Theme Editor" -msgstr "Partnerlista" - -#, fuzzy +msgstr "Pidgin partnerlistatéma-szerkesztő" + msgid "Edit Buddylist Theme" -msgstr "Partnerlista" +msgstr "Partnerlista-téma szerkesztése" msgid "Edit Icon Theme" -msgstr "" +msgstr "Ikontéma szerkesztése" #. *< type #. *< ui_requirement @@ -14205,16 +14096,14 @@ #. *< priority #. *< id #. * description -#, fuzzy msgid "Pidgin Theme Editor" -msgstr "Pidgin GTK+ témavezérlés" +msgstr "Pidgin témaszerkesztő" #. *< name #. *< version #. * summary -#, fuzzy msgid "Pidgin Theme Editor." -msgstr "Pidgin GTK+ témavezérlés" +msgstr "Pidgin témaszerkesztő." #. *< type #. *< ui_requirement @@ -14383,7 +14272,6 @@ msgid "Options specific to Pidgin for Windows." msgstr "A windowsos Pidginre jellemző beállítások." -#, fuzzy msgid "" "Provides options specific to Pidgin for Windows, such as buddy list docking." msgstr "" @@ -14429,504 +14317,5 @@ "Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez " "hasznos." -#~ msgid "Cannot open socket" -#~ msgstr "Nem nyitható meg a foglalat" - -#~ msgid "Could not listen on socket" -#~ msgstr "Nem lehet figyelni a foglalatot" - -#~ msgid "Unable to read socket" -#~ msgstr "A foglalatot nem lehet olvasni" - -#~ msgid "Connection failed." -#~ msgstr "A kapcsolódás meghiúsult." - -#~ msgid "Server has disconnected" -#~ msgstr "A kiszolgáló bontotta a kapcsolatot" - -#~ msgid "Couldn't create socket" -#~ msgstr "Nem sikerült létrehozni a foglalatot" - -#~ msgid "Couldn't connect to host" -#~ msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz" - -#~ msgid "Read error" -#~ msgstr "Olvasási hiba" - -#~ msgid "" -#~ "Could not establish a connection with the server:\n" -#~ "%s" -#~ msgstr "" -#~ "Nem hozható létre kapcsolat a következő kiszolgálóval:\n" -#~ "%s" - -#~ msgid "Write error" -#~ msgstr "Írási hiba" - -# fixme: innentől egy jó darabon xmpp protokollkiegészítések nevei vannak, lásd: http://www.xmpp.org/extensions/ -#~ msgid "Last Activity" -#~ msgstr "Utolsó művelet" - -#~ msgid "Service Discovery Info" -#~ msgstr "Szolgáltatásfeltérképezési információk" - -#~ msgid "Service Discovery Items" -#~ msgstr "Szolgáltatásfeltérképezési elemek" - -#~ msgid "Extended Stanza Addressing" -#~ msgstr "Kibővített kifejezéscímzés" - -#~ msgid "Multi-User Chat" -#~ msgstr "Többfelhasználós csevegés" - -#~ msgid "Multi-User Chat Extended Presence Information" -#~ msgstr "Többfelhasználós csevegés kibővített jelenlét-információi" - -#~ msgid "In-Band Bytestreams" -#~ msgstr "Beágyazott bájtsorozat" - -#~ msgid "Ad-Hoc Commands" -#~ msgstr "Eseti parancsok" - -#~ msgid "PubSub Service" -#~ msgstr "PubSub szolgáltatás" - -#~ msgid "SOCKS5 Bytestreams" -#~ msgstr "SOCKS5 bájtsorozat" - -#~ msgid "Out of Band Data" -#~ msgstr "Külső adatok" - -#~ msgid "XHTML-IM" -#~ msgstr "XHTML-IM" - -# fixme: mi a rák ez? -#~ msgid "In-Band Registration" -#~ msgstr "Beágyazott regisztráció" - -#~ msgid "User Location" -#~ msgstr "Felhasználó helye" - -#~ msgid "User Avatar" -#~ msgstr "Felhasználói avatar" - -#~ msgid "Chat State Notifications" -#~ msgstr "Csevegésállapot-értesítések" - -#~ msgid "Software Version" -#~ msgstr "Szoftververzió" - -#~ msgid "Stream Initiation" -#~ msgstr "Adatátvitel kezdeményezése" - -#~ msgid "User Mood" -#~ msgstr "Felhasználó hangulata" - -#~ msgid "User Activity" -#~ msgstr "Felhasználói tevékenység" - -#~ msgid "Entity Capabilities" -#~ msgstr "Egyed képességei" - -#~ msgid "Encrypted Session Negotiations" -#~ msgstr "Titkosított munkamenet-egyeztetések" - -#~ msgid "User Tune" -#~ msgstr "Hallgatott zene" - -#~ msgid "Roster Item Exchange" -#~ msgstr "Partnerlista-elemek cseréje" - -#~ msgid "Reachability Address" -#~ msgstr "Elérhetőségi cím" - -#~ msgid "User Profile" -#~ msgstr "Felhasználói profil" - -#~ msgid "Jingle" -#~ msgstr "Jingle" - -#~ msgid "Jingle Audio" -#~ msgstr "Jingle hang" - -#~ msgid "User Nickname" -#~ msgstr "Felhasználó beceneve" - -#~ msgid "Jingle ICE UDP" -#~ msgstr "Jingle ICE UDP" - -#~ msgid "Jingle ICE TCP" -#~ msgstr "Jingle ICE TCP" - -#~ msgid "Jingle Raw UDP" -#~ msgstr "Jingle Raw UDP" - -#~ msgid "Jingle Video" -#~ msgstr "Jingle videó" - -#~ msgid "Jingle DTMF" -#~ msgstr "Jingle DTMF" - -#~ msgid "Message Receipts" -#~ msgstr "Tértivevények" - -#~ msgid "Public Key Publishing" -#~ msgstr "Nyilvános kulcs közzététele" - -#~ msgid "User Chatting" -#~ msgstr "Csevegőszobák" - -#~ msgid "User Browsing" -#~ msgstr "Böngészett oldalak" - -#~ msgid "User Gaming" -#~ msgstr "Játékok" - -#~ msgid "User Viewing" -#~ msgstr "Videók" - -#~ msgid "Stanza Encryption" -#~ msgstr "Kifejezéstitkosítás" - -#~ msgid "Entity Time" -#~ msgstr "Helyi idő" - -#~ msgid "Delayed Delivery" -#~ msgstr "Késleltetett kézbesítés" - -#~ msgid "Collaborative Data Objects" -#~ msgstr "Együttműködési adatobjektumok" - -#~ msgid "File Repository and Sharing" -#~ msgstr "Fájllerakat és -megosztás" - -#~ msgid "STUN Service Discovery for Jingle" -#~ msgstr "STUN szolgáltatásfeltérképezés a Jingle-höz" - -#~ msgid "Simplified Encrypted Session Negotiation" -#~ msgstr "Egyszerűsített titkosított munkamenet-egyeztetés" - -# fixme: idáig egy jó darabon xmpp protokollkiegészítések nevei voltak, lásd: http://www.xmpp.org/extensions/ -#~ msgid "Hop Check" -#~ msgstr "Ugrásellenőrzés" - -#~ msgid "Read Error" -#~ msgstr "Olvasási hiba" - -#~ msgid "Failed to connect to server." -#~ msgstr "Nem sikerült a kiszolgálóhoz kapcsolódni." - -#~ msgid "Read buffer full (2)" -#~ msgstr "Az olvasási puffer megtelt (2)" - -#~ msgid "Unparseable message" -#~ msgstr "Értelmezhetetlen üzenet" - -#~ msgid "Couldn't connect to host: %s (%d)" -#~ msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz: %s (%d)" - -#~ msgid "Login failed (%s)." -#~ msgstr "A bejelentkezés sikertelen (%s)." - -#~ msgid "" -#~ "You have been logged out because you logged in at another workstation." -#~ msgstr "" -#~ "Ki lett jelentkeztetve, mivel bejelentkezett egy másik munkaállomásról." - -#~ msgid "Error. SSL support is not installed." -#~ msgstr "Hiba: az SSL támogatás nincs telepítve." - -#~ msgid "Incorrect password." -#~ msgstr "Helytelen jelszó." - -#~ msgid "" -#~ "Could not connect to BOS server:\n" -#~ "%s" -#~ msgstr "" -#~ "Nem sikerült kapcsolódni a BOS kiszolgálóhoz:\n" -#~ "%s" - -#~ msgid "You may be disconnected shortly. Check %s for updates." -#~ msgstr "" -#~ "Hamarosan megszakad a kapcsolat. Frissítésekért keresse fel a következő " -#~ "címet: %s." - -#~ msgid "Could Not Connect" -#~ msgstr "Nem sikerült kapcsolódni" - -#~ msgid "Invalid username." -#~ msgstr "Érvénytelen felhasználónév." - -#~ msgid "Could not decrypt server reply" -#~ msgstr "Nem fejthető vissza a kiszolgáló válasza" - -#~ msgid "Connection lost" -#~ msgstr "A kapcsolat elveszett" - -#~ msgid "Couldn't resolve host" -#~ msgstr "Nem sikerült a kiszolgáló feloldása" - -#~ msgid "Connection closed (writing)" -#~ msgstr "Kapcsolat lezárva (írás)" - -#~ msgid "Connection reset" -#~ msgstr "Kapcsolat visszaállítva" - -#~ msgid "Error reading from socket: %s" -#~ msgstr "Hiba a foglalatból olvasás közben: %s" - -#~ msgid "Unable to connect to host" -#~ msgstr "Nem lehet a kiszolgálóhoz kapcsolódni" - -#~ msgid "Could not write" -#~ msgstr "Nem sikerült az írás" - -#~ msgid "Could not connect" -#~ msgstr "Nem sikerült kapcsolódni" - -#~ msgid "Could not create listen socket" -#~ msgstr "Nem sikerült létrehozni a figyelő foglalatot" - -#~ msgid "Could not resolve hostname" -#~ msgstr "A gépnév nem oldható fel" - -#, fuzzy -#~ msgid "Incorrect Password" -#~ msgstr "Hibás jelszó" - -#~ msgid "" -#~ "Could not establish a connection with %s:\n" -#~ "%s" -#~ msgstr "" -#~ "Nem hozható létre kapcsolat a következővel: %s:\n" -#~ "%s" - -#~ msgid "Yahoo Japan" -#~ msgstr "Yahoo Japán" - -#~ msgid "Japan Pager server" -#~ msgstr "Japán személyhívó kiszolgáló" - -#~ msgid "Japan file transfer server" -#~ msgstr "Japán fájlátviteli kiszolgáló" - -#~ msgid "" -#~ "Lost connection with server\n" -#~ "%s" -#~ msgstr "" -#~ "A kapcsolat elveszett a kiszolgálóval\n" -#~ "%s" - -#~ msgid "Could not resolve host name" -#~ msgstr "A gépnév nem oldható fel" - -#, fuzzy -#~ msgid "" -#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support " -#~ "was found." -#~ msgstr "" -#~ "A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de " -#~ "ezek támogatása nem található." - -#~ msgid "Conversation Window Hiding" -#~ msgstr "Társalgási ablak elrejtése" - -#~ msgid "More Data needed" -#~ msgstr "További adatok szükségesek" - -#~ msgid "Please provide a shortcut to associate with the smiley." -#~ msgstr "Adja meg a hangulatjelhez társítandó billentyűparancsot." - -#~ msgid "Please select an image for the smiley." -#~ msgstr "Válassza ki a képet a hangulatjelhez." - -#~ msgid "Activate which ID?" -#~ msgstr "Melyik azonosítót aktiválja?" - -#~ msgid "Cursor Color" -#~ msgstr "Kurzor színe" - -#~ msgid "Secondary Cursor Color" -#~ msgstr "Másodlagos kurzor színe" - -#~ msgid "Interface colors" -#~ msgstr "Felület színei" - -#~ msgid "Widget Sizes" -#~ msgstr "Felületi elemek méretei" - -#~ msgid "Invite message" -#~ msgstr "Meghívóüzenet" - -#~ msgid "" -#~ "Please enter the name of the user you wish to invite,\n" -#~ "along with an optional invite message." -#~ msgstr "" -#~ "Adja meg a meghívandó partner nevét,\n" -#~ "egy elhagyható meghívóüzenettel együtt." - -#~ msgid "Looking up %s" -#~ msgstr "%s keresése" - -#~ msgid "Connect to %s failed" -#~ msgstr "Kapcsolódás sikertelen a következőhöz: %s" - -#~ msgid "Signon: %s" -#~ msgstr "Bejelentkezés: %s" - -#~ msgid "Unable to write file %s." -#~ msgstr "Nem lehet írni a(z) %s fájlba." - -#~ msgid "Unable to read file %s." -#~ msgstr "Nem lehet olvasni a(z) %s fájlt." - -#~ msgid "Message too long, last %s bytes truncated." -#~ msgstr "Az üzenet túl hosszú, az utolsó %s bájt csonkítva." - -#~ msgid "%s not currently logged in." -#~ msgstr "%s jelenleg nincs bejelentkezve." - -#~ msgid "Warning of %s not allowed." -#~ msgstr "%s figyelmeztetése nincs engedélyezve." - -#~ msgid "" -#~ "A message has been dropped, you are exceeding the server speed limit." -#~ msgstr "" -#~ "Egy üzenet el lett dobva, Ön túllépte a kiszolgáló átviteli " -#~ "sebességhatárát." - -#~ msgid "Chat in %s is not available." -#~ msgstr "Nem lehet csevegni a következőben: %s." - -#~ msgid "You are sending messages too fast to %s." -#~ msgstr "Túl gyorsan küld üzeneteket a következőnek: %s." - -#~ msgid "You missed an IM from %s because it was too big." -#~ msgstr "" -#~ "Nem kapott meg egy üzenetet a következőtől: %s, mert az túl nagy volt." - -#~ msgid "You missed an IM from %s because it was sent too fast." -#~ msgstr "" -#~ "Nem kapott meg egy üzenetet a következőtől: %s, mert a feladó túl gyorsan " -#~ "küldte." - -#~ msgid "Failure." -#~ msgstr "Hiba." - -#~ msgid "Too many matches." -#~ msgstr "Túl sok találat." - -#~ msgid "Need more qualifiers." -#~ msgstr "Több feltétel szükséges." - -#~ msgid "Dir service temporarily unavailable." -#~ msgstr "Könyvtárszolgáltatás átmenetileg nem érhető el." - -#~ msgid "Email lookup restricted." -#~ msgstr "E-mail keresés korlátozva." - -#~ msgid "Keyword ignored." -#~ msgstr "Kulcsszó figyelmen kívül hagyva." - -#~ msgid "No keywords." -#~ msgstr "Nincsenek kulcsszavak." - -#~ msgid "User has no directory information." -#~ msgstr "A felhasználó nem rendelkezik címtár-információkkal." - -#~ msgid "Country not supported." -#~ msgstr "Nem támogatott ország." - -#~ msgid "Failure unknown: %s." -#~ msgstr "Ismeretlen hiba: %s." - -#~ msgid "Incorrect username or password." -#~ msgstr "Helytelen felhasználónév vagy jelszó." - -#~ msgid "The service is temporarily unavailable." -#~ msgstr "A szolgáltatás átmenetileg nem érhető el." - -#~ msgid "Your warning level is currently too high to log in." -#~ msgstr "A figyelmeztetési szintje jelenleg túl magas a bejelentkezéshez." - -#~ msgid "" -#~ "You have been connecting and disconnecting too frequently. Wait ten " -#~ "minutes and try again. If you continue to try, you will need to wait " -#~ "even longer." -#~ msgstr "" -#~ "Túl gyakran jelentkezik be/ki. Várjon tíz percet, és próbálja meg újra. " -#~ "Ha tovább folytatja, akkor még tovább kell majd várnia." - -#~ msgid "An unknown signon error has occurred: %s." -#~ msgstr "Ismeretlen bejelentkezési hiba történt: %s." - -#~ msgid "An unknown error, %d, has occurred. Info: %s" -#~ msgstr "Ismeretlen hiba történt: %d. Információ: %s" - -#~ msgid "Invalid Groupname" -#~ msgstr "Érvénytelen csoportnév" - -#~ msgid "Connection Closed" -#~ msgstr "Kapcsolat lezárva" - -#~ msgid "Waiting for reply..." -#~ msgstr "Várakozás válaszra…" - -#~ msgid "TOC has come back from its pause. You may now send messages again." -#~ msgstr "A TOC ismét működőképes. Mostantól újra küldhet üzeneteket." - -#~ msgid "Password Change Successful" -#~ msgstr "Jelszó sikeresen megváltoztatva" - -#~ msgid "Get Dir Info" -#~ msgstr "Könyvtárinformációk lekérése" - -#~ msgid "Set Dir Info" -#~ msgstr "Könyvtárinformációk beállítása" - -#~ msgid "Could not open %s for writing!" -#~ msgstr "%s nem nyitható meg írásra!" - -#~ msgid "File transfer failed; other side probably canceled." -#~ msgstr "A fájlátvitel sikertelen; valószínűleg a másik oldal megszakította." - -#~ msgid "Could not connect for transfer." -#~ msgstr "Az átvitelhez nem sikerült a kapcsolatot létrehozni." - -#~ msgid "Could not write file header. The file will not be transferred." -#~ msgstr "A fájl fejlécét nem sikerült kiírni. A fájl nem lesz elküldve." - -#~ msgid "Save As..." -#~ msgstr "Mentés másként…" - -#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s" -#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s" -#~ msgstr[0] "%s kéri %s partnert %d fájl fogadására: %s (%.2f %s)%s%s" -#~ msgstr[1] "%s kéri %s partnert %d fájl fogadására: %s (%.2f %s)%s%s" - -#~ msgid "%s requests you to send them a file" -#~ msgstr "%s egy fájl elküldésére kéri" - -#~ msgid "TOC Protocol Plugin" -#~ msgstr "TOC protokollbővítmény" - -#~ msgid "%s Options" -#~ msgstr "%s beállításai" - -#~ msgid "Proxy Options" -#~ msgstr "Proxy beállításai" - -#~ msgid "By log size" -#~ msgstr "Napló mérete szerint" - -#~ msgid "_Open Link in Browser" -#~ msgstr "Hivatk_ozás megnyitása böngészőben" - -#~ msgid "ST_UN server:" -#~ msgstr "ST_UN kiszolgáló:" - -#~ msgid "Smiley _Image" -#~ msgstr "Hangulatjel _kép" - -#~ msgid "Smiley S_hortcut" -#~ msgstr "_Hangulatjel billentyűparancsa" +#~ msgid "_Resume" +#~ msgstr "_Folytatás" diff -r 67143ecbddb1 -r 0907b0c775bb po/lt.po --- a/po/lt.po Mon Jul 27 03:14:08 2009 +0000 +++ b/po/lt.po Fri Jul 31 19:20:06 2009 +0000 @@ -1,17 +1,17 @@ -# Pidgin eilučių vertimai į lietuvių kalbą -# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Pidgin authors -# This file is distributed under the same license as the Pidgin package. -# Laurynas Biveinis , 2005, 2006, 2007, 2008, 2009. -# Marius Karnauskas , 2005. -# Gediminas Čičinskas. , 2004, 2005. -# -# +# Pidgin eilučių vertimai į lietuvių kalbą +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Pidgin authors +# This file is distributed under the same license as the Pidgin package. +# Laurynas Biveinis , 2005, 2006, 2007, 2008, 2009. +# Marius Karnauskas , 2005. +# Gediminas Čičinskas. , 2004, 2005. +# +# msgid "" msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-06 15:04-0700\n" -"PO-Revision-Date: 2009-02-24 09:02+0100\n" +"POT-Creation-Date: 2009-07-28 22:02+0200\n" +"PO-Revision-Date: 2009-07-28 22:01+0200\n" "Last-Translator: Laurynas Biveinis \n" "Language-Team:\n" "MIME-Version: 1.0\n" @@ -257,7 +257,7 @@ msgid "Edit" msgstr "Keisti" -# Use Environmental Settings +# Use Environmental Settings msgid "Edit Settings" msgstr "Keisti nuostatas" @@ -273,11 +273,11 @@ msgid "Add Buddy Pounce" msgstr "Sukurti reakciją į bičiulį" -# Send File button +# Send File button msgid "Send File" msgstr "Siųsti failą" -# Block button +# Block button msgid "Blocked" msgstr "Blokuotas" @@ -348,15 +348,15 @@ msgid "Plugins" msgstr "Papildiniai" -# Block button +# Block button msgid "Block/Unblock" msgstr "Blokuoti/nebeblokuoti" -# Block button +# Block button msgid "Block" msgstr "Blokuoti" -# Block button +# Block button msgid "Unblock" msgstr "Nebeblokuoti" @@ -389,7 +389,7 @@ msgid "Please enter the name of the chat you want to join." msgstr "Prašome įvesti vardą pokalbių kambario, prie kurio norite prisijungti." -# join button +# join button msgid "Join" msgstr "Prisijungti" @@ -400,7 +400,7 @@ "Įveskite vardą arba alternatyvųjį vardą asmens, kurio pokalbių žurnalą " "norite peržiūrėti." -# Options +# Options #. Create the "Options" frame. msgid "Options" msgstr "Parinktys" @@ -408,7 +408,7 @@ msgid "Send IM..." msgstr "Rašyti žinutę..." -# Block button +# Block button msgid "Block/Unblock..." msgstr "Blokuoti/nebeblokuoti..." @@ -427,8 +427,8 @@ msgid "Empty groups" msgstr "tuščias grupes" -# set the Show Offline Buddies option. must be done -# * after the treeview or faceprint gets mad. -Robot101 +# set the Show Offline Buddies option. must be done +# * after the treeview or faceprint gets mad. -Robot101 msgid "Offline buddies" msgstr "neprisijungusius bičiulius" @@ -529,7 +529,7 @@ msgid "Hostname" msgstr "Mazgo vardas" -# Info button +# Info button msgid "Info" msgstr "Informacija" @@ -620,7 +620,7 @@ "Žurnalų vedimas išjungtas. Būsimos šio pokalbio žinutės nebus įvestos į " "žurnalą." -# Build the Send As menu +# Build the Send As menu msgid "Send To" msgstr "Siųsti kam" @@ -636,7 +636,7 @@ msgid "Add Buddy Pounce..." msgstr "Sukurti reakciją į bičiulį..." -# Invite +# Invite msgid "Invite..." msgstr "Pakviesti..." @@ -829,7 +829,7 @@ msgid "The file was saved as %s." msgstr "Failas įrašytas vardu %s." -# Build the Send As menu +# Build the Send As menu msgid "Sending" msgstr "Siunčiama" @@ -888,16 +888,15 @@ msgid "All Conversations" msgstr "Visi pokalbiai" -# Window ********** +# Window ********** msgid "System Log" msgstr "Sistemos žurnalas" -#, fuzzy msgid "Calling ... " -msgstr "Skaičiuojama..." +msgstr "Skambinama ..." msgid "Hangup" -msgstr "" +msgstr "Padėti ragelį" #. Number of actions msgid "Accept" @@ -907,25 +906,24 @@ msgstr "Atmesti" msgid "Call in progress." -msgstr "" +msgstr "Vyksta skambutis." msgid "The call has been terminated." -msgstr "" +msgstr "Skambutis buvo baigtas." #, c-format msgid "%s wishes to start an audio session with you." -msgstr "" +msgstr "%s nori pradėti garsinį pokalbį su jumis." #, c-format msgid "%s is trying to start an unsupported media session type with you." -msgstr "" - -#, fuzzy +msgstr "%s nori pradėti nepalaikomo terpės tipo pokalbį su jumis." + msgid "You have rejected the call." -msgstr "Jūs palikote kanalą%s%s" +msgstr "Jūs atmetėte skambutį." msgid "call: Make an audio call." -msgstr "" +msgstr "skambinti: paskambinti garsiniam pokalbiui." msgid "Emails" msgstr "El. laiškai" @@ -962,7 +960,7 @@ msgid "IM" msgstr "Kalbėtis" -# Invite +# Invite msgid "Invite" msgstr "Pakviesti" @@ -1038,18 +1036,18 @@ msgid "Please enter a buddy to pounce." msgstr "Įveskite bičiulį, į kurį reaguoti" -# "New Buddy Pounce" +# "New Buddy Pounce" msgid "New Buddy Pounce" msgstr "Nauja reakcija į bičiulį" msgid "Edit Buddy Pounce" msgstr "Redaguoti reakciją į bičiulį" -# Create the "Pounce Who" frame. +# Create the "Pounce Who" frame. msgid "Pounce Who" msgstr "Į kokį bičiulį reaguoti" -# Set up stuff for the account box +# Set up stuff for the account box #. Account: msgid "Account:" msgstr "Paskyra:" @@ -1057,7 +1055,7 @@ msgid "Buddy name:" msgstr "Bičiulio vardas:" -# Create the "Pounce When" frame. +# Create the "Pounce When" frame. #. Create the "Pounce When Buddy..." frame. msgid "Pounce When Buddy..." msgstr "Reaguoti, kai bičiulis..." @@ -1130,7 +1128,7 @@ msgid "Are you sure you want to delete the pounce on %s for %s?" msgstr "Ar tikrai norite pašalinti reakciją į %s nuo %s?" -# "New Buddy Pounce" +# "New Buddy Pounce" msgid "Buddy Pounces" msgstr "Reakcijos į bičiulius" @@ -1186,13 +1184,13 @@ msgid "Never" msgstr "niekada" -# set the Show Offline Buddies option. must be done -# * after the treeview or faceprint gets mad. -Robot101 +# set the Show Offline Buddies option. must be done +# * after the treeview or faceprint gets mad. -Robot101 msgid "Show Idle Time" msgstr "Rodyti neveiklumo laikus" -# set the Show Offline Buddies option. must be done -# * after the treeview or faceprint gets mad. -Robot101 +# set the Show Offline Buddies option. must be done +# * after the treeview or faceprint gets mad. -Robot101 msgid "Show Offline Buddies" msgstr "Rodyti neprisijungusius bičiulius" @@ -1550,13 +1548,13 @@ msgid "Offline" msgstr "Atsijungęs" -# set the Show Offline Buddies option. must be done -# * after the treeview or faceprint gets mad. -Robot101 +# set the Show Offline Buddies option. must be done +# * after the treeview or faceprint gets mad. -Robot101 msgid "Online Buddies" msgstr "Prisijungusių bičiulių" -# set the Show Offline Buddies option. must be done -# * after the treeview or faceprint gets mad. -Robot101 +# set the Show Offline Buddies option. must be done +# * after the treeview or faceprint gets mad. -Robot101 msgid "Offline Buddies" msgstr "Neprisijungusių bičiulių" @@ -1596,22 +1594,24 @@ "\n" "Fetching TinyURL..." msgstr "" +"\n" +"Gaunamas „TinyURL“..." msgid "Only create TinyURL for urls of this length or greater" msgstr "" +"Kurti „TinyURL“ tik URL adresams, esantiems bent tokio ilgio arba ilgesniems." msgid "TinyURL (or other) address prefix" -msgstr "" - -#, fuzzy +msgstr "„TinyURL“ (ar kitos tarnybos) adreso prefiksas" + msgid "TinyURL" -msgstr "Dainos URL" +msgstr "„TinyURL“" msgid "TinyURL plugin" -msgstr "" +msgstr "„TinyURL“ papildinys" msgid "When receiving a message with URL(s), TinyURL for easier copying" -msgstr "" +msgstr "„TinyURL“ paslauga lengvesniam URL adresų kopijavimui iš gautų žinučių" msgid "accounts" msgstr "paskyros" @@ -1726,6 +1726,7 @@ "Liudijimas, kurį pateikė „%s“, yra paties pasirašytas. Jis negali būti " "automatiškai patikrintas." +#. FIXME 2.6.1 #, c-format msgid "The certificate chain presented for %s is not valid." msgstr "Liudijimų grandinė, pateikta %s, yra neteisinga." @@ -1735,6 +1736,7 @@ #. stifle it. #. TODO: Probably wrong. #. TODO: Probably wrong +#. TODO: Probably wrong. msgid "SSL Certificate Error" msgstr "SSL liudijimo klaida" @@ -1815,7 +1817,6 @@ msgstr "+++ %s atsijungė" #. Unknown error -#. Unknown error! msgid "Unknown error" msgstr "Nežinoma klaida" @@ -1862,11 +1863,10 @@ msgid "%s left the room (%s)." msgstr "%s paliko kambarį (%s)." -#, fuzzy msgid "Invite to chat" -msgstr "Pakviesti į konferenciją" - -# Put our happy label in it. +msgstr "Pakviesti į pokalbį" + +# Put our happy label in it. #. Put our happy label in it. msgid "" "Please enter the name of the user you wish to invite, along with an optional " @@ -2006,6 +2006,10 @@ msgstr "Pradedamas %s gavimas iš %s" #, c-format +msgid "Transfer of file %s complete" +msgstr "Failo %s perdavimas baigtas" + +#, c-format msgid "Transfer of file %s complete" msgstr "Failo %s perdavimas baigtas" @@ -2220,9 +2224,8 @@ msgid "(%s) %s : %s\n" msgstr "(%s) %s : %s\n" -#, fuzzy msgid "Error creating conference." -msgstr "Jungties kūrimo klaida" +msgstr "Konferencijos sukūrimo klaida." #, c-format msgid "You are using %s, but this plugin requires %s." @@ -2335,7 +2338,7 @@ msgid "Edit Notes..." msgstr "Redaguoti pastabas..." -# "New Buddy Pounce" +# "New Buddy Pounce" #. *< major version #. *< minor version #. *< type @@ -2389,13 +2392,13 @@ msgid "DBus Plugin Example" msgstr "DBus papildinio pavyzdys" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id #. *< type #. *< ui_requirement #. *< flags @@ -2405,14 +2408,14 @@ msgid "File Control" msgstr "Valdymas failu" -# *< name -# *< version -# * summary -# * description -# *< name -# *< version -# * summary -# * description +# *< name +# *< version +# * summary +# * description +# *< name +# *< version +# * summary +# * description #. *< name #. *< version #. * summary @@ -2637,7 +2640,6 @@ msgstr "Žurnalų žiūryklėje parodo ir kitų pokalbių programų žurnalus." #. * description -#, fuzzy msgid "" "When viewing logs, this plugin will include logs from other IM clients. " "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n" @@ -2646,8 +2648,8 @@ "at your own risk!" msgstr "" "Į žurnalų žiūryklę papildomai įtraukia žurnalus iš kitų pokalbių programų. " -"Šiuo metu yra galimybė rodyti Adium, MSN Messenger ir Trillian programų " -"žurnalus.<\n" +"Šiuo metu yra galimybė rodyti Adium, MSN Messenger, aMSN ir Trillian " +"programų žurnalus.<\n" "\n" "PERSPĖJIMAS: šis papildinys yra vis dar bandomasis ir gali dažnai lūžti. " "Naudokite jį savo rizika!" @@ -2695,7 +2697,6 @@ msgstr "" "Išsaugo žinutes, išsiųstas atsijungusiems bičiuliams, kaip reakcijas į juos." -#, fuzzy msgid "" "The rest of the messages will be saved as pounces. You can edit/delete the " "pounce from the `Buddy Pounce' dialog." @@ -2717,8 +2718,8 @@ msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog" msgstr "Galite keisti arba ištrinti reakciją dialoge „Reakcijos į bičiulius“." -# * -# * A wrapper for Pidgin_request_action() that uses Yes and No buttons. +# * +# * A wrapper for Pidgin_request_action() that uses Yes and No buttons. msgid "Yes" msgstr "Taip" @@ -2731,9 +2732,8 @@ msgid "Do not ask. Always save in pounce." msgstr "Neklausti. Visada išsaugoti reakcijoje." -#, fuzzy msgid "One Time Password" -msgstr "Įveskite slaptažodį" +msgstr "Vienkartiniai slaptažodžiai" #. *< type #. *< ui_requirement @@ -2742,13 +2742,13 @@ #. *< priority #. *< id msgid "One Time Password Support" -msgstr "" +msgstr "Vienkartinių slaptažodžių palaikymas" #. *< name #. *< version #. * summary msgid "Enforce that passwords are used only once." -msgstr "" +msgstr "Užtikrinti, kad slaptažodžiai yra panaudojami tik po vieną kartą." #. * description msgid "" @@ -2756,6 +2756,9 @@ "are only used in a single successful connection.\n" "Note: The account password must not be saved for this to work." msgstr "" +"Leidžia užtikrinti pasirinktoms paskyroms, kad neįrašyti slaptažodžiai būtų " +"naudojami tik vienam sėkmingam prisijungimui.\n" +"Pastaba: tokios paskyros slaptažodis negali būti įrašytas." #. *< type #. *< ui_requirement @@ -2800,13 +2803,13 @@ msgid "Raise psychic conversations" msgstr "Pakelti nujaučiamų pokalbių langus" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id #. *< type #. *< ui_requirement #. *< flags @@ -2816,10 +2819,10 @@ msgid "Signals Test" msgstr "Signalų testas" -# *< name -# *< version -# * summary -# * description +# *< name +# *< version +# * summary +# * description #. *< name #. *< version #. * summary @@ -2827,13 +2830,13 @@ msgid "Test to see that all signals are working properly." msgstr "Testas, skirtas nustatyti, ar visi signalai veikia teisingai." -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id #. *< type #. *< ui_requirement #. *< flags @@ -2843,10 +2846,10 @@ msgid "Simple Plugin" msgstr "Paprastas papildinys" -# *< name -# *< version -# * summary -# * description +# *< name +# *< version +# * summary +# * description #. *< name #. *< version #. * summary @@ -2867,10 +2870,10 @@ msgid "GNUTLS" msgstr "GNUTLS biblioteka" -# *< name -# *< version -# * summary -# * description +# *< name +# *< version +# * summary +# * description #. *< name #. *< version #. * summary @@ -2942,13 +2945,13 @@ msgid "Buddy _Signs On/Off" msgstr "Bičiulis pradeda arba baigia seansą" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id #. *< type #. *< ui_requirement #. *< flags @@ -2958,10 +2961,10 @@ msgid "Buddy State Notification" msgstr "Pranešimai apie bičiulių būsenas" -# *< name -# *< version -# * summary -# * description +# *< name +# *< version +# * summary +# * description #. *< name #. *< version #. * summary @@ -2986,18 +2989,16 @@ "Nepavyko rasti įdiegto „ActiveTCL“. Jei norite naudoti TCL papildinius, " "įdiekite „ActiveTCL“ iš http://www.activestate.com\n" -#, fuzzy msgid "" "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin." "im/BonjourWindows for more information." msgstr "" -"Apple Bonjour Windows priemonių rinkinys nerastas. Adresu http://d.pidgin." -"im/BonjourWindow rasite daugiau informacijos." - -#, fuzzy +"Apple „Bonjour for Windows“ priemonių rinkinys nerastas. Adresu http://d." +"pidgin.im/BonjourWindow rasite daugiau informacijos." + msgid "Unable to listen for incoming IM connections" msgstr "" -"Nepavyko sukurti klausymo prievado įeinančioms greitųjų žinučių jungtims\n" +"Nepavyko sukurti klausymo prievado įeinančioms greitųjų žinučių jungtims" msgid "" "Unable to establish connection with the local mDNS server. Is it running?" @@ -3048,21 +3049,17 @@ msgid "Unable to send the message, the conversation couldn't be started." msgstr "Negalima išsiųsti žinutės ir pradėti pokalbio." -#, fuzzy, c-format +#, c-format msgid "Unable to create socket: %s" -msgstr "" -"Nepavyko sukurti jungties:\n" -"%s" - -#, fuzzy, c-format +msgstr "Nepavyko sukurti jungties: %s" + +#, c-format msgid "Unable to bind socket to port: %s" -msgstr "Nepavyko susieti jungties su prievadu" - -#, fuzzy, c-format +msgstr "Nepavyko susieti jungties su prievadu: %s" + +#, c-format msgid "Unable to listen on socket: %s" -msgstr "" -"Nepavyko sukurti jungties:\n" -"%s" +msgstr "Nepavyko klausytis jungties: %s" msgid "Error communicating with local mDNSResponder." msgstr "Komunikacijos su vietiniu mDNSResponder klaida" @@ -3111,17 +3108,14 @@ msgid "Load buddylist from file..." msgstr "Įkelti bičiulių sąrašą iš failo..." -#, fuzzy msgid "You must fill in all registration fields" -msgstr "Užpildykite registracijos formos laukus." - -#, fuzzy +msgstr "Privalote užpildyti visus registracijos formos laukus" + msgid "Passwords do not match" -msgstr "Slaptažodžiai nesutampa." - -#, fuzzy +msgstr "Slaptažodžiai nesutampa" + msgid "Unable to register new account. An unknown error occurred." -msgstr "Nepavyko registruoti naujos paskyros, nes įvyko klaida.\n" +msgstr "Nepavyko registruoti naujos paskyros. Įvyko nežinoma klaida." msgid "New Gadu-Gadu Account Registered" msgstr "Užregistruotas naujas Gadu-Gadu abonentas" @@ -3136,11 +3130,10 @@ msgstr "Pakartotas slaptažodis" msgid "Enter captcha text" -msgstr "" - -#, fuzzy +msgstr "Įveskite „captcha“ tekstą:" + msgid "Captcha" -msgstr "„Captcha“ paveiksliukas" +msgstr "„Captcha“" msgid "Register New Gadu-Gadu Account" msgstr "Registruoti naują Gadu-Gadu abonentą" @@ -3252,7 +3245,7 @@ msgid "Unable to read from socket" msgstr "Nepavyko skaityti iš jungties" -# Buddy List trans options +# Buddy List trans options msgid "Buddy list downloaded" msgstr "Bičiulių sąrašas atsisiųstas" @@ -3280,9 +3273,9 @@ msgid "Chat _name:" msgstr "Ka_nalo pavadinimas:" -#, fuzzy, c-format +#, c-format msgid "Unable to resolve hostname '%s': %s" -msgstr "Nepavyko prisijungti prie serverio." +msgstr "Nepavyko nustatyti IP adreso pagal vardą '%s': %s" #. 1. connect to server #. connect to the server @@ -3295,9 +3288,8 @@ msgid "This chat name is already in use" msgstr "Toks pokalbių kambario vardas jau yra vartojamas" -#, fuzzy msgid "Not connected to the server" -msgstr "Neprisijungta prie serverio." +msgstr "Neprisijungta prie serverio" msgid "Find buddies..." msgstr "Ieškoti bičiulių..." @@ -3338,9 +3330,8 @@ msgid "Gadu-Gadu User" msgstr "Gadu-Gadu vartotojas" -#, fuzzy msgid "GG server" -msgstr "Gaunamas serveris" +msgstr "GG serveris" #, c-format msgid "Unknown command: %s" @@ -3356,7 +3347,6 @@ msgid "File Transfer Failed" msgstr "Failo perdavimas nepavyko" -#, fuzzy msgid "Unable to open a listening port." msgstr "Nepavyko atverti prievado klausymui." @@ -3380,11 +3370,9 @@ #. #. TODO: what to do here - do we really have to disconnect? #. TODO: do we really want to disconnect on a failure to write? -#, fuzzy, c-format +#, c-format msgid "Lost connection with server: %s" -msgstr "" -"Dingo jungtis su serveriu:\n" -"%s" +msgstr "Dingo jungtis su serveriu: %s" msgid "View MOTD" msgstr "Žiūrėti MOTD" @@ -3395,9 +3383,8 @@ msgid "_Password:" msgstr "Sla_ptažodis:" -#, fuzzy msgid "IRC nick and server may not contain whitespace" -msgstr "IRC vardai negali turėti matomų tarpų" +msgstr "IRC vardai ir serverio adresas negali turėti tarpų" msgid "SSL support unavailable" msgstr "Nėra SSL palaikymo" @@ -3406,13 +3393,13 @@ msgstr "Negalima prisijungti" #. this is a regular connect, error out -#, fuzzy, c-format +#, c-format msgid "Unable to connect: %s" -msgstr "Nepavyko prisijungti prie %s" - -#, fuzzy, c-format +msgstr "Nepavyko prisijungti: %s" + +#, c-format msgid "Server closed the connection" -msgstr "Serveris uždarė jungtį." +msgstr "Serveris uždarė jungtį" msgid "Users" msgstr "Vartotojai" @@ -3420,15 +3407,15 @@ msgid "Topic" msgstr "Tema" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id -# *< name -# *< version +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id +# *< name +# *< version #. *< type #. *< ui_requirement #. *< flags @@ -3440,7 +3427,7 @@ msgid "IRC Protocol Plugin" msgstr "IRC protokolo papildinys" -# * summary +# * summary #. * summary msgid "The IRC Protocol Plugin that Sucks Less" msgstr "Mažiau knisantis IRC protokolo papildinys" @@ -3554,7 +3541,7 @@ msgid "No such channel" msgstr "Tokio kanalo nėra" -# does this happen? +# does this happen? #. does this happen? msgid "no such channel" msgstr "tokio kanalo nėra" @@ -3608,13 +3595,12 @@ #. We only want to do the following dance if the connection #. has not been successfully completed. If it has, just #. notify the user that their /nick command didn't go. -#, fuzzy, c-format +#, c-format msgid "The nickname \"%s\" is already being used." -msgstr "Toks pokalbių kambario vardas jau yra vartojamas" - -#, fuzzy +msgstr "Pokalbių kambario vardas „%s“ jau užimtas." + msgid "Nickname in use" -msgstr "Vardas" +msgstr "Užimtas vardas" msgid "Cannot change nick" msgstr "Negalima pakeisti vardo" @@ -3837,11 +3823,11 @@ msgid "Reply time from %s: %lu seconds" msgstr "Atsakymo laikas iš %s: %lu sek." -# Būna poroje su „PING“. Nelabai aišku, kaip versti +# Būna poroje su „PING“. Nelabai aišku, kaip versti msgid "PONG" msgstr "PONG" -# CTCP yra akronimas, PING neišversta. +# CTCP yra akronimas, PING neišversta. msgid "CTCP PING reply" msgstr "CTCP PING atsakas" @@ -3857,11 +3843,10 @@ msgid "execute" msgstr "vykdyti" -#, fuzzy msgid "Server requires TLS/SSL, but no TLS/SSL support was found." -msgstr "Serveris reikalauja TLS/SSL prisijungimui. Nėra TLS/SSL palaikymo." - -#, fuzzy +msgstr "" +"Serveris reikalauja TLS/SSL prisijungimui, bet TLS/SSL palaikymas nerastas." + msgid "You require encryption, but no TLS/SSL support was found." msgstr "Jūs reikalaujate šifravimo, bet TLS/SSL palaikymas nerastas." @@ -3881,13 +3866,11 @@ msgid "Plaintext Authentication" msgstr "Tapatybės nustatymas grynu tekstu" -#, fuzzy msgid "SASL authentication failed" -msgstr "Nepavyko nustatyti tapatybę" - -#, fuzzy +msgstr "SASL atpažinimas nepavyko" + msgid "Invalid response from server" -msgstr "Neteisingas atsakas iš serverio." +msgstr "Neteisingas atsakas iš serverio" msgid "Server does not use any supported authentication method" msgstr "Serveris nenaudoja jokio Pidgin palaikomo tapatybės nustatymo metodo" @@ -3898,36 +3881,28 @@ msgid "Invalid challenge from server" msgstr "Neteisingas serverio iššūkis" -#, fuzzy, c-format +#, c-format msgid "SASL error: %s" -msgstr "SASL klaida" +msgstr "SASL klaida: %s" msgid "The BOSH connection manager terminated your session." -msgstr "" - -#, fuzzy +msgstr "BOSH jungčių tvarkytuvė nutraukė jūsų sesiją." + msgid "No session ID given" -msgstr "Priežastis nenurodyta" - -#, fuzzy +msgstr "Neduotas seanso ID" + msgid "Unsupported version of BOSH protocol" -msgstr "Nepalaikoma versija" - -#, fuzzy +msgstr "Nepalaikoma BOSH protokolo versija" + msgid "Unable to establish a connection with the server" -msgstr "" -"Nepavyko prisijungti prie serverio:\n" -"%s" - -#, fuzzy, c-format +msgstr "Nepavyko prisijungti prie serverio" + +#, c-format msgid "Unable to establish a connection with the server: %s" -msgstr "" -"Nepavyko prisijungti prie serverio:\n" -"%s" - -#, fuzzy +msgstr "Nepavyko prisijungti prie serverio: %s" + msgid "Unable to establish SSL connection" -msgstr "Nepavyko sukurti jungties" +msgstr "Nepavyko sukurti SSL jungties" msgid "Full Name" msgstr "Pilnas vardas" @@ -3956,7 +3931,7 @@ msgid "Postal Code" msgstr "Pašto indeksas" -# Country +# Country msgid "Country" msgstr "Šalis" @@ -3996,9 +3971,8 @@ msgid "Operating System" msgstr "Operacinė sistema" -#, fuzzy msgid "Local Time" -msgstr "Vietinis failas:" +msgstr "Vietinis laikas" msgid "Priority" msgstr "Prioritetas" @@ -4008,11 +3982,10 @@ #, c-format msgid "%s ago" -msgstr "" - -#, fuzzy +msgstr "prieš %s" + msgid "Logged Off" -msgstr "Prisijungęs" +msgstr "Atsijungęs" msgid "Middle Name" msgstr "Antras vardas" @@ -4042,9 +4015,9 @@ msgid "(Re-)Request authorization" msgstr "Pareikalauti (iš naujo) prieigos teisės" -# if(NOT ME) -# shouldn't this just happen automatically when the buddy is -# removed? +# if(NOT ME) +# shouldn't this just happen automatically when the buddy is +# removed? #. if(NOT ME) #. shouldn't this just happen automatically when the buddy is #. removed? @@ -4183,19 +4156,15 @@ msgid "Find Rooms" msgstr "Rasti kambarius" -#, fuzzy msgid "Affiliations:" -msgstr "Alternatyvusis vardas:" - -#, fuzzy +msgstr "Narystės:" + msgid "No users found" -msgstr "Ieškotų vartotojų nerasta" - -#, fuzzy +msgstr "Naudotojų nerasta" + msgid "Roles:" -msgstr "Pareigos" - -#, fuzzy +msgstr "Vaidmenys:" + msgid "Ping timed out" msgstr "Baigėsi skimbtelėjimo laukimo laikas" @@ -4203,6 +4172,8 @@ "Unable to find alternative XMPP connection methods after failing to connect " "directly." msgstr "" +"Negalima rasti alternatyvių XMPP prisijungimo būdų nepavykus prisijungti " +"tiesiai." msgid "Invalid XMPP ID" msgstr "Neteisingas XMPP ID" @@ -4210,9 +4181,8 @@ msgid "Invalid XMPP ID. Domain must be set." msgstr "Neteisingas XMPP ID. Sritis privalo būti nustatyta." -#, fuzzy msgid "Malformed BOSH URL" -msgstr "Nepavyko prisijungti prie serverio." +msgstr "Neteisingas BOSH URL adresas" #, c-format msgid "Registration of %s@%s successful" @@ -4281,10 +4251,6 @@ msgid "Change Registration" msgstr "Pakeisti registraciją" -#, fuzzy -msgid "Malformed BOSH Connect Server" -msgstr "Nepavyko prisijungti prie serverio." - msgid "Error unregistering account" msgstr "Paskyros išregistravimo klaida" @@ -4558,7 +4524,7 @@ msgid "Unknown role: \"%s\"" msgstr "Nežinomas vaidmuo: „%s“" -# Data is assumed to be the destination sn +# Data is assumed to be the destination sn #, c-format msgid "Unable to set role \"%s\" for user: %s" msgstr "Nepavyko nustatyti vaidmens „%s“ vartotojui: %s" @@ -4571,19 +4537,19 @@ msgid "Unable to ping user %s" msgstr "Nepavyko skimbtelėti naudotojui %s" -#, fuzzy, c-format +#, c-format msgid "Unable to buzz, because there is nothing known about %s." msgstr "Negalima pazyzti, nes nieko nežinoma apie naudotoją %s." -#, fuzzy, c-format +#, c-format msgid "Unable to buzz, because %s might be offline." -msgstr "Negalima pazyzti, nes naudotojas %s gali būti neprisijungęs." - -#, fuzzy, c-format +msgstr "Negalima pazyzti, nes %s gali būti neprisijungęs/-usi." + +#, c-format msgid "" "Unable to buzz, because %s does not support it or does not wish to receive " "buzzes now." -msgstr "Nepavyko pazyzti, nes naudotojas %s to nepalaiko." +msgstr "Nepavyko pazyzti, nes %s to nepalaiko arba nenori gauti zyzimų." #, c-format msgid "Buzzing %s..." @@ -4598,35 +4564,34 @@ msgid "%s has buzzed you!" msgstr "%s jums pazyzė!" -#, fuzzy, c-format +#, c-format msgid "Unable to initiate media with %s: invalid JID" -msgstr "Negalima nusiųsti failo vartotojui %s, nes neteisingas JID" - -#, fuzzy, c-format +msgstr "Nepavyko pradėti medijos seanso su %s: neteisingas JID" + +#, c-format msgid "Unable to initiate media with %s: user is not online" -msgstr "Negalima nusiųsti failo vartotojui %s, nes jis neprisijungęs" - -#, fuzzy, c-format +msgstr "Nepavyko pradėti medijos seanso su %s, nes jis neprisijungęs" + +#, c-format msgid "Unable to initiate media with %s: not subscribed to user presence" msgstr "" -"Negalima siųsti failo vartotojui %s, nes jis neįtrauktas į bičiulių sąrašą" - -#, fuzzy +"Nepavyko pradėti medijos seanso su %s: nėra registracijos prie šio vartotojo " +"buvimo informacijos" + msgid "Media Initiation Failed" -msgstr "Registracija nepavyko" - -#, fuzzy, c-format +msgstr "Medijos seanso klaida" + +#, c-format msgid "" "Please select the resource of %s with which you would like to start a media " "session." -msgstr "Parinkite %s išteklių, į kurį norite nusiųsti failą" +msgstr "Parinkite %s išteklių, su kuriuo norite pradėti medijos seansą." msgid "Select a Resource" msgstr "Parinkite išteklių" -#, fuzzy msgid "Initiate Media" -msgstr "_Pradėti pokalbį" +msgstr "Pradėti medijos seansą" msgid "config: Configure a chat room." msgstr "config: konfigūruoti pokalbių kambarį." @@ -4647,21 +4612,21 @@ msgstr "" "ban <vartotojas> [priežastis]: uždrausti vartotojui ateiti į kambarį." -#, fuzzy msgid "" "affiliate <owner|admin|member|outcast|none> [nick1] [nick2] ...: Get " "the users with an affiliation or set users' affiliation with the room." msgstr "" -"affilliate <vartotojas;> <owner|admin|member|outcast|none>: " -"nustatyti vartotojo statusą kambaryje." - -#, fuzzy +"affilliate <owner|admin|member|outcast|none> [vardas1] [vardas2] ...: " +"gauti vartotojus su nurodyta naryste arba nustatyti naudotojų narystę " +"kambaryje." + msgid "" "role <moderator|participant|visitor|none> [nick1] [nick2] ...: Get the " "users with an role or set users' role with the room." msgstr "" -"role <vartotojas> <moderator|participant|visitor|none>: " -"nustatyti vartotojo vaidmenį kambaryje." +"role <moderator|participant|visitor|none> [vardas1] [vardas2] ...: " +"Gauti naudotojus su nurodytu vaidmeniu arba nustatyti vartotojų vaidmenį " +"kambaryje." msgid "invite <user> [message]: Invite a user to the room." msgstr "invite <vartotojas> [žinutė]: pakviesti vartotoją į kambarį." @@ -4727,7 +4692,7 @@ msgstr "Failų perdavimo tarpininkaujantys serveriai" msgid "BOSH URL" -msgstr "" +msgstr "BOSH URL adresas" #. this should probably be part of global smiley theme settings later on, #. shared with MSN @@ -4791,32 +4756,30 @@ msgid "_Accept Defaults" msgstr "_Priimti numatytąsias nuostatas" -#, fuzzy msgid "No reason" msgstr "Priežastis nenurodyta" -#, fuzzy, c-format +#, c-format msgid "You have been kicked: (%s)" -msgstr "Tave išspyrė %s: %s" - -#, fuzzy, c-format +msgstr "Tave išspyrė (%s)" + +#, c-format msgid "Kicked (%s)" -msgstr "Išspyrė %s (%s)" - -#, fuzzy +msgstr "Išspyrė (%s)" + msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "Failo atvėrimo metu įvyko klaida." - -#, fuzzy +msgstr "" +"Įvyko klaida perdavime, naudojančiame baitų srautą pagrindiniame XMPP sraute " +"(„in-band“)\n" + msgid "Transfer was closed." -msgstr "Failo perdavimas nepavyko" - -#, fuzzy +msgstr "Perdavimas buvo uždarytas." + msgid "Failed to open the file" -msgstr "Nepavyko atverti failo „%s“: %s" +msgstr "Nepavyko atverti failo" msgid "Failed to open in-band bytestream" -msgstr "" +msgstr "Nepavyko atidaryti baitų srauto pagrindiniame XMPP sraute („in-band“)" #, c-format msgid "Unable to send file to %s, user does not support file transfers" @@ -5043,7 +5006,7 @@ msgid "Server unavailable" msgstr "Serveris neprieinamas" -# Kaip išversti „peer“? +# Kaip išversti „peer“? #, c-format msgid "Peer notification server down" msgstr "Kitų vartotojų informavimo serveris neprieinamas" @@ -5141,11 +5104,29 @@ msgid "Non-IM Contacts" msgstr "Kontaktai ne iš greitųjų žinučių tinklų" -#, fuzzy, c-format +#, c-format +msgid "%s sent a wink. Click here to play it" +msgstr "" +"%s atsiuntė mirksniuką. Paspauskite čia, kad " +"pažiūrėtumėte" + +#, c-format +msgid "%s sent a wink, but it could not be saved" +msgstr "%s atsiuntė mirksniuką, bet nepavyko jo įrašyti" + +#, c-format +msgid "%s sent a voice clip. Click here to play it" +msgstr "" +"%s atsiuntė garso įrašą. Paspauskite čia, kad " +"pasiklausytumėte" + +#, c-format +msgid "%s sent a voice clip, but it could not be saved" +msgstr "%s atsiuntė vaizdo įrašą, bet jo išsaugoti nepavyko" + +#, c-format msgid "%s sent you a voice chat invite, which is not yet supported." -msgstr "" -"%s atsiuntė kvietimą internetinės vaizdo kameros pokalbiui, ko Pidgin dar " -"nepalaiko." +msgstr "%s atsiuntė kvietimą pokalbiui su vaizdu, kas dar nėra palaikoma." msgid "Nudge" msgstr "Bakstelėjimas" @@ -5300,6 +5281,29 @@ "MSN protokolui SSL palaikymas yra būtinas. Prašome įdiegti palaikomą SSL " "biblioteką." +#, c-format +msgid "" +"Unable to add the buddy %s because the username is invalid. Usernames must " +"be a valid email address." +msgstr "" +"Nepavyko pridėti bičiulio %s, nes neteisingas naudotojo vardas. Jis turi " +"būti galiojantis el. pašto adresas." + +msgid "Unable to Add" +msgstr "Negalima pridėti" + +msgid "Authorization Request Message:" +msgstr "Prieigos teisės prašymo žinutė:" + +msgid "Please authorize me!" +msgstr "Prašau suteikti man prieigos teisę!" + +#. * +#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. +#. +msgid "_OK" +msgstr "_Gerai" + msgid "Error retrieving profile" msgstr "Profilio gavimo klaida" @@ -5369,18 +5373,18 @@ msgid "Home Address" msgstr "Namų adresas" -# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ??? +# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ??? msgid "Personal Mobile" msgstr "Asmeninis mobilusis telefonas" msgid "Home Fax" msgstr "Namų faksas" -# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ??? +# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ??? msgid "Personal Email" msgstr "Asmeninis el. pašto adresas" -# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ??? +# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ??? msgid "Personal IM" msgstr "Asmeninis skubiųjų žinučių kontaktas" @@ -5494,13 +5498,14 @@ msgid "%s just sent you a Nudge!" msgstr "%s nori bakstelėjo Jums!" -#, fuzzy, c-format +#, c-format msgid "Unknown error (%d): %s" -msgstr "Nežinoma klaida (%d)" +msgstr "Nežinoma klaida (%d): %s" msgid "Unable to add user" msgstr "Nepavyko pridėti vartotojo" +#. Unknown error! #, c-format msgid "Unknown error (%d)" msgstr "Nežinoma klaida (%d)" @@ -5572,28 +5577,24 @@ "Jungties klaida su severiu %s:\n" "%s" -#, fuzzy msgid "Our protocol is not supported by the server" -msgstr "Mūsų protokolo serveris nepalaiko." - -#, fuzzy +msgstr "Mūsų protokolo nepalaiko serveris" + msgid "Error parsing HTTP" -msgstr "HTTP sintaksinės analizės klaida." - -#, fuzzy +msgstr "HTTP sintaksinės analizės klaida" + msgid "You have signed on from another location" -msgstr "Jūs prisijungėte iš kitur." +msgstr "Jūs prisijungėte iš kitur" msgid "The MSN servers are temporarily unavailable. Please wait and try again." msgstr "" "MSN serveriai yra laikinai neprieinami. Prašome palaukti ir pabandyti iš " "naujo." -#, fuzzy msgid "The MSN servers are going down temporarily" -msgstr "MSN serveriai yra laikinai išjungiami." - -# Data is assumed to be the destination sn +msgstr "MSN serveriai yra laikinai išjungiami" + +# Data is assumed to be the destination sn #, c-format msgid "Unable to authenticate: %s" msgstr "Negalima patikrinti tapatybės: %s" @@ -5622,7 +5623,7 @@ msgid "Retrieving buddy list" msgstr "Gaunamas bičiulių sąrašas" -#, fuzzy, c-format +#, c-format msgid "%s requests to view your webcam, but this request is not yet supported." msgstr "" "%s atsiuntė kvietimą internetinės vaizdo kameros pokalbiui, ko Pidgin dar " @@ -5715,7 +5716,7 @@ msgid "Unable to add user on %s (%s)" msgstr "Negalima pridėti vartotojo paskyroje %s (%s)" -# Data is assumed to be the destination sn +# Data is assumed to be the destination sn #, c-format msgid "Unable to block user on %s (%s)" msgstr "Negalima blokuoti vartotojo paskyroje %s (%s)" @@ -5825,16 +5826,16 @@ msgid "Protocol error, code %d: %s" msgstr "Protokolo klaida, kodas %d: %s" -#, fuzzy, c-format +#, c-format msgid "" "%s Your password is %zu characters, which is longer than the maximum length " "of %d. Please shorten your password at http://profileedit.myspace.com/index." "cfm?fuseaction=accountSettings.changePassword and try again." msgstr "" -"%s Jūsų slaptažodis yra %d simbolių, daugiau negu didžiausias MySpaceIM " -"leidžiamas ilgis %d. Sutrumpinkite savo slaptažodį adresu http://" -"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword " -"ir pabandykite iš naujo." +"%s Jūsų slaptažodis yra %zu simbolių, daugiau negu didžiausias leidžiamas " +"ilgis %d. Sutrumpinkite savo slaptažodį adresu http://profileedit.myspace." +"com/index.cfm?fuseaction=accountSettings.changePassword ir pabandykite iš " +"naujo." msgid "Incorrect username or password" msgstr "Neteisingas naudotojo vardas ar slaptažodis" @@ -5933,6 +5934,9 @@ "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username " "to set your username." msgstr "" +"Vardo nustatymo metu įvyko klaida. Pabandykite iš naujo, arba aplankykite " +"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username ir " +"nustatykite vardą ten." msgid "MySpaceIM - Username Available" msgstr "MySpaceIM – naudotojo vardas laisvas" @@ -6192,9 +6196,9 @@ msgid "Unknown error: 0x%X" msgstr "Nežinoma klaida: 0x%X" -#, fuzzy, c-format +#, c-format msgid "Unable to login: %s" -msgstr "Nepavyko skimbtelėti naudotojui %s" +msgstr "Nepavyko prisijungti: %s" #, c-format msgid "Unable to send message. Could not get details for user (%s)." @@ -6272,7 +6276,7 @@ msgid "Telephone Number" msgstr "Telefonas" -# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ??? +# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ??? msgid "Personal Title" msgstr "Asmens pavadinimas" @@ -6327,7 +6331,6 @@ msgstr "" "Atrodo, kad %s yra atsijungęs ir negavo žinutės, kurią ką tik išsiuntėte." -#, fuzzy msgid "" "Unable to connect to server. Please enter the address of the server to which " "you wish to connect." @@ -6357,9 +6360,8 @@ msgid "Server port" msgstr "Serverio prievadas" -#, fuzzy msgid "Received unexpected response from " -msgstr "Gautas nelauktas HTTP atsakymas iš serverio." +msgstr "Gautas nelauktas atsakymas iš " #. username connecting too frequently msgid "" @@ -6370,12 +6372,12 @@ "ir bandykite vėl. Jei vis tiek bandysite jungtis, Jums reikės laukti dar " "ilgiau." -#, fuzzy, c-format +#, c-format msgid "Error requesting " -msgstr "Klaida nustatant %s" +msgstr "Užklausos klaida: " msgid "AOL does not allow your screen name to authenticate here" -msgstr "" +msgstr "AOL neleidžia jūsų vardui prisijungti" msgid "Could not join chat room" msgstr "Nepavyko prisijungti prie pokalbių kambario" @@ -6383,21 +6385,20 @@ msgid "Invalid chat room name" msgstr "Neteisingas pokalbių kambario pavadinimas" -#, fuzzy msgid "Received invalid data on connection with server" msgstr "Jungtimi su serveriu gauti neteisingi duomenys." -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id -# *< name -# *< version -# * summary -# * description +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id +# *< name +# *< version +# * summary +# * description #. *< type #. *< ui_requirement #. *< flags @@ -6414,15 +6415,15 @@ msgid "ICQ UIN..." msgstr "ICQ UIN..." -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id -# *< name -# *< version +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id +# *< name +# *< version #. *< type #. *< ui_requirement #. *< flags @@ -6452,9 +6453,8 @@ msgid "Received invalid data on connection with remote user." msgstr "Gauti neteisingi duomenys ryšiu su nutolusiu vartotoju." -#, fuzzy msgid "Unable to establish a connection with the remote user." -msgstr "Nepavyko sukurti jungties su nutolusiu vartotoju." +msgstr "Nepavyko užmegzti ryšio su nutolusiu vartotoju." msgid "Direct IM established" msgstr "Sukurtas tiesioginis pokalbių ryšis" @@ -6563,7 +6563,7 @@ "(Šio pranešimo gavimo metu įvyko klaida. Arba Jūs ir %s esate pasirinkę " "skirtingas koduotes, arba %s naudoja kliento programą su riktais.)" -# Label +# Label #. Label msgid "Buddy Icon" msgstr "Vartotojo paveiksliukas" @@ -6655,15 +6655,13 @@ msgid "Buddy Comment" msgstr "Bičiulio komentaras" -#, fuzzy, c-format +#, c-format msgid "Unable to connect to authentication server: %s" -msgstr "" -"Nepavyko prisijungti prie tapatybės nustatymo serverio:\n" -"%s" - -#, fuzzy, c-format +msgstr "Nepavyko prisijungti prie tapatybės nustatymo serverio: %s" + +#, c-format msgid "Unable to connect to BOS server: %s" -msgstr "Nepavyko prisijungti prie serverio." +msgstr "Nepavyko prisijungti prie BOS serverio: %s" msgid "Username sent" msgstr "Vartotojo vardas nusiųstas" @@ -6675,16 +6673,15 @@ msgid "Finalizing connection" msgstr "Pabaigiama jungtis" -#, fuzzy, c-format +#, c-format msgid "" "Unable to sign on as %s because the username is invalid. Usernames must be " "a valid email address, or start with a letter and contain only letters, " "numbers and spaces, or contain only numbers." msgstr "" -"Negalima prisijungti: vardu %s prisijungti nepavyko, nes naudotojo vardas " -"neteisingas. Naudotojo vardas turi būti arba teisingas el. pašto adresas, " -"arba prasidėti raide ir turėti tik raides, skaitmenis ir tarpus, arba turėti " -"tik skaitmenis." +"Nepavyko prisijungti vardu %s, nes jis neteisingas. Naudotojo vardas turi " +"būti arba teisingas el. pašto adresas, arba prasidėti raide ir turėti tik " +"raides, skaitmenis ir tarpus, arba turėti tik skaitmenis." #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." @@ -6704,19 +6701,18 @@ #. Unregistered username #. uid is not exist #. the username does not exist -#, fuzzy msgid "Username does not exist" -msgstr "Vartotojas neegzistuoja" +msgstr "Naudotojas neegzistuoja" #. Suspended account -#, fuzzy msgid "Your account is currently suspended" -msgstr "Jūsų abonentas šiuo metu suspenduotas." +msgstr "Jūsų paskyra šiuo metu suspenduota" #. service temporarily unavailable msgid "The AOL Instant Messenger service is temporarily unavailable." msgstr "AOL IM tarnyba laikinai neprieinama" +#. client too old #, c-format msgid "The client version you are using is too old. Please upgrade at %s" msgstr "" @@ -6724,16 +6720,14 @@ "svetainėje %s" #. IP address connecting too frequently -#, fuzzy msgid "" "You have been connecting and disconnecting too frequently. Wait a minute and " "try again. If you continue to try, you will need to wait even longer." msgstr "" -"Jūs per dažnai prisijunginėjote ir atsijunginėjote. Palaukite dešimt minučių " -"ir bandykite vėl. Jei vis tiek bandysite jungtis, Jums reikės laukti dar " -"ilgiau." - -#, fuzzy +"Jūs per dažnai prisijunginėjote ir atsijunginėjote. Palaukite dešimt minutę " +"ir bandykite vėl. Jeigu nepaisydami bandysite jungtis iškart, gali reikėti " +"palaukti dar ilgiau." + msgid "The SecurID key entered is invalid" msgstr "Įvestas SecurID raktas yra neteisingas." @@ -6743,12 +6737,6 @@ msgid "Enter the 6 digit number from the digital display." msgstr "Įveskite 6 skaitmenų skaičių iš skaitmeninio displėjaus." -#. * -#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. -#. -msgid "_OK" -msgstr "_Gerai" - msgid "Password sent" msgstr "Išsiųstas slaptažodis" @@ -6760,12 +6748,6 @@ "Prašau suteikti man prieigos teisę, kad aš galėčiau įtraukti Jus į savo " "bičiulių sąrašą." -msgid "Authorization Request Message:" -msgstr "Prieigos teisės prašymo žinutė:" - -msgid "Please authorize me!" -msgstr "Prašau suteikti man prieigos teisę!" - msgid "No reason given." msgstr "Nenurodyta priežastis." @@ -6904,7 +6886,7 @@ msgstr[2] "" "Jūs praleidote %hu pranešimų nuo vartotojo %s dėl nežinomos priežasties." -# Data is assumed to be the destination sn +# Data is assumed to be the destination sn #. Data is assumed to be the destination bn #, c-format msgid "Unable to send message: %s" @@ -6936,7 +6918,7 @@ msgid "Your AIM connection may be lost." msgstr "Jūsų AIM jungtis gali būti prarasta." -# The conversion failed! +# The conversion failed! #. The conversion failed! msgid "" "[Unable to display a message from this user because it contained invalid " @@ -7121,19 +7103,16 @@ msgid "Away message too long." msgstr "Pasitraukimo žinutė per ilga." -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because the username is invalid. Usernames must " "be a valid email address, or start with a letter and contain only letters, " "numbers and spaces, or contain only numbers." msgstr "" -"Nepavyko pridėti bičiulio %s, nes šis naudotojo vardas neteisingas. Vardai " -"turi būti arba teisingi el. pašto adresai, arba turi prasidėti raide ir " +"Nepavyko pridėti bičiulio %s, nes toks naudotojo vardas neteisingas. Vardas " +"turi būti arba teisingas el. pašto adresaas, arba turi prasidėti raide ir " "turėti tik raides, skaitmenis ir tarpus, arba turėti tik skaitmenis." -msgid "Unable to Add" -msgstr "Negalima pridėti" - msgid "Unable to Retrieve Buddy List" msgstr "Negalima gauti bičiulių sąrašo" @@ -7147,20 +7126,20 @@ msgid "Orphans" msgstr "Našlaičiai" -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because you have too many buddies in your buddy " "list. Please remove one and try again." msgstr "" -"Nepavyko pridėti bičiulio %s, nes Jūs turite per daug bičiulių savo bičiulių " +"Nepavyko pridėti bičiulio %s, nes turite per daug bičiulių savo bičiulių " "sąraše. Prašome vieną pašalinti ir bandyti iš naujo." msgid "(no name)" msgstr "(nėra vardo)" -#, fuzzy, c-format +#, c-format msgid "Unable to add the buddy %s for an unknown reason." -msgstr "Bičiulio %s pridėti nepavyko dėl nežinamos priežasties." +msgstr "Bičiulio %s pridėti nepavyko dėl nežinomos priežasties." #, c-format msgid "" @@ -7325,9 +7304,8 @@ msgid "Search for Buddy by Information" msgstr "Ieškoti bičiulio pagal informaciją" -#, fuzzy msgid "Use clientLogin" -msgstr "Vartotojas neprisijungęs" +msgstr "Naudoti „clientLogin“" msgid "" "Always use AIM/ICQ proxy server for\n" @@ -7451,7 +7429,7 @@ msgid "QQ Number" msgstr "QQ numeris" -# Country +# Country msgid "Country/Region" msgstr "Šalis ar regionas" @@ -7491,11 +7469,11 @@ msgid "Zodiac" msgstr "Zodiako ženklas" -# Block button +# Block button msgid "Blood" msgstr "Kraujas" -# True ir False išversti buddy_info kontekste +# True ir False išversti buddy_info kontekste msgid "True" msgstr "Taip" @@ -7526,32 +7504,28 @@ msgid "Note" msgstr "Pastabos" -# Label +# Label #. callback -#, fuzzy msgid "Buddy Memo" -msgstr "Vartotojo paveiksliukas" +msgstr "Pastabos apie bičiulį" msgid "Change his/her memo as you like" -msgstr "" - -#, fuzzy +msgstr "Įveskite savo pastabas apie jį" + msgid "_Modify" -msgstr "Keisti" - -#, fuzzy +msgstr "_Keisti" + msgid "Memo Modify" -msgstr "Keisti" - -#, fuzzy +msgstr "Keisti pastabas" + msgid "Server says:" -msgstr "Serveris užimtas" +msgstr "Serveris sako:" msgid "Your request was accepted." -msgstr "" +msgstr "Jūsų užklausta priimta." msgid "Your request was rejected." -msgstr "" +msgstr "Jūsų užklausta atmesta." #, c-format msgid "%u requires verification" @@ -7563,7 +7537,7 @@ msgid "Enter answer here" msgstr "Čia įveskite atsakymą" -# Build the Send As menu +# Build the Send As menu msgid "Send" msgstr "Siųsti" @@ -7865,12 +7839,11 @@ msgid "

Acknowledgement:
\n" msgstr "

Padėkos:
\n" -#, fuzzy msgid "

Scrupulous Testers:
\n" -msgstr "

Pirmasis autorius:
\n" +msgstr "

Kruopštūs testuotojai:
\n" msgid "and more, please let me know... thank you!))" -msgstr "" +msgstr "ir kiti, parašykite man... ačiū!))" msgid "

And, all the boys in the backroom...
\n" msgstr "" @@ -7898,19 +7871,18 @@ msgid "About OpenQ" msgstr "Apie OpenQ" -#, fuzzy msgid "Modify Buddy Memo" -msgstr "Redaguoti adresą" - -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id -# *< name -# *< version +msgstr "Keisti pastabas apie bičiulį" + +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id +# *< name +# *< version #. *< type #. *< ui_requirement #. *< flags @@ -7957,7 +7929,6 @@ msgid "Update interval (seconds)" msgstr "Atnaujinimo intervalas (sekundėmis)" -#, fuzzy msgid "Unable to decrypt server reply" msgstr "Nepavyko iššifruoti serverio atsakymo" @@ -8025,9 +7996,8 @@ msgid "Requesting token" msgstr "Prašoma žymės" -#, fuzzy msgid "Unable to resolve hostname" -msgstr "Nepavyko prisijungti prie serverio." +msgstr "Nepavyko gauti IP adreso pagal mazgo vardą" msgid "Invalid server or port" msgstr "Neteisingas serveris ar prievadas" @@ -8080,7 +8050,6 @@ msgid "QQ Qun Command" msgstr "QQ pokalbių kambario komanda" -#, fuzzy msgid "Unable to decrypt login reply" msgstr "Nepavyko iššifruoti prisijungimo atsakymo" @@ -8161,7 +8130,7 @@ msgid "Conference Closed" msgstr "Konferencija uždaryta" -# Data is assumed to be the destination sn +# Data is assumed to be the destination sn msgid "Unable to send message: " msgstr "Negalima išsiųsti žinutės: " @@ -9064,9 +9033,8 @@ msgid "Disconnected by server" msgstr "Atjungtas serverio" -#, fuzzy msgid "Error connecting to SILC Server" -msgstr "Jungimosi į SILC serverį klaida" +msgstr "Jungimosi prie SILC serverio klaida" msgid "Key Exchange failed" msgstr "Apsikeitimas raktais nepavyko" @@ -9080,7 +9048,6 @@ msgid "Performing key exchange" msgstr "Apsikeičiama raktais" -#, fuzzy msgid "Unable to load SILC key pair" msgstr "Nepavyko įkelti SILC raktų poros" @@ -9088,14 +9055,9 @@ msgid "Connecting to SILC Server" msgstr "Jungiamasi prie SILC serverio" -#, fuzzy -msgid "Unable to not load SILC key pair" -msgstr "Nepavyko įkelti SILC raktų poros" - msgid "Out of memory" msgstr "Trūksta atminties" -#, fuzzy msgid "Unable to initialize SILC protocol" msgstr "Nepavyko inicijuoti SILC protokolo" @@ -9144,7 +9106,7 @@ msgid "Let others see what computer you are using" msgstr "Leisti kitiems pamatyti, kokiu kompiuteriu Jūs naudojatės" -# „vCard“ yra tikrinis žodis +# „vCard“ yra tikrinis žodis msgid "Your VCard File" msgstr "Jūsų vCard failas" @@ -9347,16 +9309,16 @@ "names [-count|-ops|-halfops|-voices|-normal] <kanalas(-ai)>: rodyti " "tam tikrus vartotojus kanale(-uose)" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id -# *< name -# *< version -# * summary +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id +# *< name +# *< version +# * summary #. *< type #. *< ui_requirement #. *< flags @@ -9369,7 +9331,7 @@ msgid "SILC Protocol Plugin" msgstr "SILC protokolo papildinys" -# * description +# * description #. * description msgid "Secure Internet Live Conferencing (SILC) Protocol" msgstr "SILC papildinys" @@ -9410,9 +9372,8 @@ msgid "Creating SILC key pair..." msgstr "Kuriama SILC raktų pora..." -#, fuzzy msgid "Unable to create SILC key pair" -msgstr "Negalima sukurti SILC raktų poros\n" +msgstr "Negalima sukurti SILC raktų poros" #. Hint for translators: Please check the tabulator width here and in #. the next strings (short strings: 2 tabs, longer strings 1 tab, @@ -9550,27 +9511,24 @@ msgid "Failure: Authentication failed" msgstr "Nesekmė: tapatybės nustatymas nepavyko" -#, fuzzy msgid "Unable to initialize SILC Client connection" msgstr "Nepavyko inicijuoti SILC kliento jungties" msgid "John Noname" msgstr "Vardenis Pavardenis" -#, fuzzy, c-format +#, c-format msgid "Unable to load SILC key pair: %s" msgstr "Nepavyko įkelti SILC raktų poros: %s" msgid "Unable to create connection" msgstr "Nepavyko sukurti jungties." -#, fuzzy msgid "Unknown server response" -msgstr "Nežinomas serverio atsakymas." - -#, fuzzy +msgstr "Nežinomas serverio atsakymas" + msgid "Unable to create listen socket" -msgstr "Negalima sukurti jungties" +msgstr "Nepavyko sukurti jungties klausymuisi" msgid "SIP usernames may not contain whitespaces or @ symbols" msgstr "SIP naudotojų vardai negali turėti matomų tarpų arba „@“ simbolių" @@ -9578,16 +9536,16 @@ msgid "SIP connect server not specified" msgstr "Nenurodytas SIP prisijungimo serveris" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id -# *< name -# *< version -# * summary +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id +# *< name +# *< version +# * summary #. *< type #. *< ui_requirement #. *< flags @@ -9599,16 +9557,16 @@ msgid "SIP/SIMPLE Protocol Plugin" msgstr "SIP/SIMPLE protokolo papildinys" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id -# *< name -# *< version -# * summary +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id +# *< name +# *< version +# * summary #. * summary msgid "The SIP/SIMPLE Protocol Plugin" msgstr "SIP/SIMPLE protokolo papildinys" @@ -9654,9 +9612,8 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! Protocol Plugin" -msgstr "Yahoo protokolo papildinys" +msgstr "Yahoo! protokolo papildinys" msgid "Pager server" msgstr "Pranešimų gaviklio serveris" @@ -9685,9 +9642,8 @@ msgid "Yahoo Chat port" msgstr "Yahoo pokalbių serverio prievadas" -#, fuzzy msgid "Yahoo JAPAN ID..." -msgstr "Yahoo ID..." +msgstr "Yahoo Japonija ID..." #. *< type #. *< ui_requirement @@ -9699,12 +9655,11 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "Yahoo protokolo papildinys" +msgstr "Yahoo! Japonija protokolo papildinys" msgid "Your SMS was not delivered" -msgstr "" +msgstr "Jūsų SMS nebuvo pristatyta" msgid "Your Yahoo! message did not get sent." msgstr "Jūsų Yahoo! žinutė nebuvo išsiųsta." @@ -9730,32 +9685,28 @@ msgstr "Bičiulio pridėjimas atmestas" #. Some error in the received stream -#, fuzzy msgid "Received invalid data" -msgstr "Jungtimi su serveriu gauti neteisingi duomenys." +msgstr "Gauti neteisingi duomenys" #. security lock from too many failed login attempts -#, fuzzy msgid "" "Account locked: Too many failed login attempts. Logging into the Yahoo! " "website may fix this." msgstr "" -"Nežinomas klaidos numeris %d. Prisijungimas prie Yahoo! svetainės galbūt " -"tai pataisys." +"Paskyra užblokuota: per daug nepavykusių bandymų prisijungti. Prisijungimas " +"prie Yahoo! svetainės galbūt tai pataisys." #. indicates a lock of some description -#, fuzzy msgid "" "Account locked: Unknown reason. Logging into the Yahoo! website may fix " "this." msgstr "" -"Nežinomas klaidos numeris %d. Prisijungimas prie Yahoo! svetainės galbūt " -"tai pataisys." +"Paskyra užblokuota dėl nežinomos priežasties. Prisijungimas prie Yahoo! " +"svetainės galbūt tai pataisys." #. username or password missing -#, fuzzy msgid "Username or password missing" -msgstr "Neteisingas naudotojo vardas ar slaptažodis" +msgstr "Trūksta naudotojo vardo ar slaptažodžio" #, c-format msgid "" @@ -9790,11 +9741,10 @@ "Nežinomas klaidos numeris %d. Prisijungimas prie Yahoo! svetainės galbūt " "tai pataisys." -#, fuzzy, c-format +#, c-format msgid "Unable to add buddy %s to group %s to the server list on account %s." msgstr "Nepavyko pridėti bičiulio %s į grupę %s serverio sąraše paskyroje %s." -#, fuzzy msgid "Unable to add buddy to server list" msgstr "Nepavyko pridėti bičiulio į serverio sarašą" @@ -9802,21 +9752,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s" msgstr "[ Garsinė žinutė %s/%s/%s.swf ] %s" -#, fuzzy msgid "Received unexpected HTTP response from server" msgstr "Gautas nelauktas HTTP atsakymas iš serverio." -#, fuzzy, c-format +#, c-format msgid "Lost connection with %s: %s" -msgstr "" -"Prarasta jungtis su %s:\n" -"%s" - -#, fuzzy, c-format +msgstr "Prarasta jungtis su %s: %s" + +#, c-format msgid "Unable to establish a connection with %s: %s" -msgstr "" -"Nepavyko prisijungti prie serverio:\n" -"%s" +msgstr "Nepavyko prisijungti prie serverio %s: %s" msgid "Not at Home" msgstr "Ne namie" @@ -9857,7 +9802,7 @@ msgid "Initiate Conference" msgstr "Inicijuoti konferenciją" -# Use Environmental Settings +# Use Environmental Settings msgid "Presence Settings" msgstr "Būsenos nuostatos" @@ -9865,7 +9810,7 @@ msgstr "Pradėti paišinėjimą" msgid "Select the ID you want to activate" -msgstr "" +msgstr "Pasirinkite ID, kurį norite aktyvuoti" msgid "Join whom in chat?" msgstr "Prisijungti prie ko į pokalbį?" @@ -9965,13 +9910,8 @@ msgstr "Tuščias vartotojo profilis." #, c-format -msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." -msgstr "" -"Vartotojas %s atmetė Jūsų konferencijos pakvietimą į kambarį „%s“ dėl " -"priežasties „%s“." - -msgid "Invitation Rejected" -msgstr "Pakvietimas atmestas" +msgid "%s has declined to join." +msgstr "%s atsisakė prisijungti." msgid "Failed to join chat" msgstr "Nepavyko prisijungti prie pokalbio" @@ -10023,9 +9963,8 @@ msgid "User Rooms" msgstr "Vartotojų kambariai" -#, fuzzy msgid "Connection problem with the YCHT server" -msgstr "Jungties su YCHT serveriu problemos." +msgstr "Jungties su YCHT serveriu problema" msgid "" "(There was an error converting this message.\t Check the 'Encoding' option " @@ -10157,20 +10096,19 @@ msgid "Exposure" msgstr "Atskleidimas" -# Data is assumed to be the destination sn -#, fuzzy, c-format +# Data is assumed to be the destination sn +#, c-format msgid "Unable to parse response from HTTP proxy: %s" -msgstr "Nepavyko suprasti HTTP tarpininko serverio atsakymo: %s\n" +msgstr "Nepavyko suprasti HTTP tarpininko serverio atsakymo: %s" #, c-format msgid "HTTP proxy connection error %d" msgstr "HTTP tarpininko serverio jungties klaida %d" -#, fuzzy, c-format +#, c-format msgid "Access denied: HTTP proxy server forbids port %d tunneling" msgstr "" -"Kreiptis atmesta: tarpininkaujantis serveris draudžia prievado %d " -"tuneliavimą." +"Kreiptis atmesta: HTTP serveris tarpininkas draudžia prievado %d tuneliavimą." #, c-format msgid "Error resolving %s" @@ -10184,8 +10122,8 @@ msgid "%s has requested your attention!" msgstr "%s paprašė jūsų dėmesio!" -# * -# * A wrapper for Pidgin_request_action() that uses Yes and No buttons. +# * +# * A wrapper for Pidgin_request_action() that uses Yes and No buttons. #. * #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons. #. @@ -10423,7 +10361,7 @@ msgid "Error Reading %s" msgstr "%s skaitymo klaida" -#, fuzzy, c-format +#, c-format msgid "" "An error was encountered reading your %s. The file has not been loaded, and " "the old file has been renamed to %s~." @@ -10473,16 +10411,16 @@ msgid "Use this buddy _icon for this account:" msgstr "Naudot_i tokį vartotojo paveiksliuką šiai paskyrai:" -msgid "_Advanced" +msgid "Ad_vanced" msgstr "Papildomos _nuostatos" -# Use Global Proxy Settings -# Use Global Proxy Settings +# Use Global Proxy Settings +# Use Global Proxy Settings msgid "Use GNOME Proxy Settings" msgstr "naudoti GNOME tarpininkų nuostatas" -# Use Global Proxy Settings -# Use Global Proxy Settings +# Use Global Proxy Settings +# Use Global Proxy Settings msgid "Use Global Proxy Settings" msgstr "naudoti visuotines tarpininkų nuostatas" @@ -10498,7 +10436,7 @@ msgid "SOCKS 5" msgstr "SOCKS 5" -# Use Environmental Settings +# Use Environmental Settings msgid "Use Environmental Settings" msgstr "naudoti aplinkos nuostatas" @@ -10541,9 +10479,8 @@ msgid "Create _this new account on the server" msgstr "Sukur_ti šią naują paskyrą serveryje" -#, fuzzy -msgid "_Proxy" -msgstr "Tarpininkas" +msgid "P_roxy" +msgstr "Ta_rpininkas" msgid "Enabled" msgstr "Įjungta" @@ -10593,9 +10530,8 @@ msgid "Please update the necessary fields." msgstr "Pataisykite būtinus laukus." -#, fuzzy msgid "A_ccount" -msgstr "Paskyra" +msgstr "_Paskyra" msgid "" "Please enter the appropriate information about the chat you would like to " @@ -10607,11 +10543,11 @@ msgid "Room _List" msgstr "Ka_mbarių sąrašas" -# Block button +# Block button msgid "_Block" msgstr "_Blokuoti" -# Block button +# Block button msgid "Un_block" msgstr "_Nebeblokuoti" @@ -10624,16 +10560,14 @@ msgid "I_M" msgstr "_Kalbėtis" -#, fuzzy msgid "_Audio Call" -msgstr "_Pridėti pokalbių kambarį" +msgstr "Pok_albis su garsu" msgid "Audio/_Video Call" -msgstr "" - -#, fuzzy +msgstr "Audio/_Video skambutis" + msgid "_Video Call" -msgstr "Vaizdinis pokalbis" +msgstr "Pokalbis su _vaizdu" msgid "_Send File..." msgstr "_Siųsti failą..." @@ -10644,11 +10578,9 @@ msgid "View _Log" msgstr "Žiūrėti žurna_lą" -#, fuzzy msgid "Hide When Offline" msgstr "Paslėpti, kai neprisijungęs" -#, fuzzy msgid "Show When Offline" msgstr "Rodyti, kai neprisijungęs" @@ -10676,7 +10608,7 @@ msgid "_Rename" msgstr "P_ervadinti" -# join button +# join button #. join button msgid "_Join" msgstr "Prisi_jungti" @@ -10687,7 +10619,7 @@ msgid "Persistent" msgstr "Pastovus" -# Use Environmental Settings +# Use Environmental Settings msgid "_Edit Settings..." msgstr "K_eisti nuostatas..." @@ -10711,7 +10643,7 @@ msgid "Unknown node type" msgstr "Nežinomas mazgo tipas" -# Buddies menu +# Buddies menu #. Buddies menu msgid "/_Buddies" msgstr "/_Bičiuliai" @@ -10728,7 +10660,7 @@ msgid "/Buddies/View User _Log..." msgstr "/Buddies/_Rodyti vartotojo žurnalus..." -# Buddies menu +# Buddies menu msgid "/Buddies/Sh_ow" msgstr "/Bičiuliai/R_odyti" @@ -10738,21 +10670,21 @@ msgid "/Buddies/Show/_Empty Groups" msgstr "/Bičiuliai/Rodyti/_tuščias grupes" -# set the Show Offline Buddies option. must be done -# * after the treeview or faceprint gets mad. -Robot101 +# set the Show Offline Buddies option. must be done +# * after the treeview or faceprint gets mad. -Robot101 msgid "/Buddies/Show/Buddy _Details" msgstr "/Bičiuliai/Rodyti/_informaciją apie bičiulius" -# set the Show Offline Buddies option. must be done -# * after the treeview or faceprint gets mad. -Robot101 +# set the Show Offline Buddies option. must be done +# * after the treeview or faceprint gets mad. -Robot101 msgid "/Buddies/Show/Idle _Times" msgstr "/Bičiuliai/Rodyti/n_eveiklumo laikus" msgid "/Buddies/Show/_Protocol Icons" msgstr "/Bičiuliai/Rodyti/_protokolų piktogramas" -# set the Show Offline Buddies option. must be done -# * after the treeview or faceprint gets mad. -Robot101 +# set the Show Offline Buddies option. must be done +# * after the treeview or faceprint gets mad. -Robot101 msgid "/Buddies/_Sort Buddies" msgstr "/Bičiuliai/_Surikiuoti bičiulius" @@ -10775,7 +10707,7 @@ msgid "/Accounts/Manage Accounts" msgstr "/Paskyros/Tvarkyti paskyras" -# Tools +# Tools #. Tools msgid "/_Tools" msgstr "/_Įrankiai" @@ -10786,9 +10718,8 @@ msgid "/Tools/_Certificates" msgstr "/Įrankiai/_Liudijimai" -#, fuzzy msgid "/Tools/Custom Smile_ys" -msgstr "/Įrankiai/_Šypsenėlės" +msgstr "/Įrankiai/Indvidualios _šypsenėlės" msgid "/Tools/Plu_gins" msgstr "/Įrankiai/_Papildiniai" @@ -10811,7 +10742,7 @@ msgid "/Tools/Mute _Sounds" msgstr "/Tools/Išjungti _garsus" -# Help +# Help #. Help msgid "/_Help" msgstr "/Pa_galba" @@ -10884,7 +10815,7 @@ msgid "/Buddies/New Instant Message..." msgstr "/Bičiuliai/Nauja žinutė..." -# Make menu items sensitive/insensitive where appropriate +# Make menu items sensitive/insensitive where appropriate msgid "/Buddies/Join a Chat..." msgstr "/Bičiuliai/Prisijungti prie pokalbio..." @@ -10920,7 +10851,7 @@ msgstr "pagal statusą" msgid "By recent log activity" -msgstr "" +msgstr "pagal paskutinius įrašus žurnale" #, c-format msgid "%s disconnected" @@ -10937,7 +10868,7 @@ msgstr "Aktyvuoti vėl" msgid "SSL FAQs" -msgstr "" +msgstr "DUK apie SSL" msgid "Welcome back!" msgstr "Sveiki sugrįžę!" @@ -10978,8 +10909,8 @@ "lange. Aktyvavę paskyras, galėsite prisijungti, nustatyti savo būseną ir " "šnekėtis su draugais." -# set the Show Offline Buddies option. must be done -# * after the treeview or faceprint gets mad. -Robot101 +# set the Show Offline Buddies option. must be done +# * after the treeview or faceprint gets mad. -Robot101 #. set the Show Offline Buddies option. must be done #. * after the treeview or faceprint gets mad. -Robot101 #. @@ -10989,13 +10920,13 @@ msgid "/Buddies/Show/Empty Groups" msgstr "/Bičiuliai/Rodyti/tuščias grupes" -# set the Show Offline Buddies option. must be done -# * after the treeview or faceprint gets mad. -Robot101 +# set the Show Offline Buddies option. must be done +# * after the treeview or faceprint gets mad. -Robot101 msgid "/Buddies/Show/Buddy Details" msgstr "/Bičiuliai/Rodyti/informaciją apie bičiulius" -# set the Show Offline Buddies option. must be done -# * after the treeview or faceprint gets mad. -Robot101 +# set the Show Offline Buddies option. must be done +# * after the treeview or faceprint gets mad. -Robot101 msgid "/Buddies/Show/Idle Times" msgstr "/Bičiuliai/Rodyti/neveiklumo laikus" @@ -11008,7 +10939,7 @@ msgid "Buddy's _username:" msgstr "_Bičiulio naudotojo vardas:" -# Optional Information section +# Optional Information section msgid "(Optional) A_lias:" msgstr "(Neprivaloma) A_lternatyvus vardas:" @@ -11065,12 +10996,12 @@ msgid "_Disable" msgstr "_Deaktyvuoti" -# Tools +# Tools msgid "/Tools" msgstr "/Įrankiai" -# set the Show Offline Buddies option. must be done -# * after the treeview or faceprint gets mad. -Robot101 +# set the Show Offline Buddies option. must be done +# * after the treeview or faceprint gets mad. -Robot101 msgid "/Buddies/Sort Buddies" msgstr "/Bičiuliai/Surikiuoti bičiulius" @@ -11079,107 +11010,93 @@ msgstr "Fono spalva" msgid "The background color for the buddy list" -msgstr "" - -#, fuzzy +msgstr "Bičiulių sąrašo fono spalvo" + msgid "Layout" -msgstr "Laosiečių kalba" +msgstr "Išdėstymas" msgid "The layout of icons, name, and status of the blist" -msgstr "" +msgstr "Piktogramų, vardų ir būklės pranešimų išdėstymas bičiulių sąraše" #. Group -#, fuzzy msgid "Expanded Background Color" -msgstr "Fono spalva" +msgstr "Išskleisto fono spalva" msgid "The background color of an expanded group" -msgstr "" - -#, fuzzy +msgstr "Išskleistos grupės fono spalva" + msgid "Expanded Text" -msgstr "Išskl_eisti" +msgstr "Išskleistas tekstas" msgid "The text information for when a group is expanded" -msgstr "" - -#, fuzzy +msgstr "Tekstas, kai grupė išskleidžiama" + msgid "Collapsed Background Color" -msgstr "Pasirinkti fono spalvą" +msgstr "Suskleisto fono spalva" msgid "The background color of a collapsed group" -msgstr "" - -#, fuzzy +msgstr "Suskleistos grupės fono spalva" + msgid "Collapsed Text" -msgstr "_Suskleisti" +msgstr "Suskleistas tekstas" msgid "The text information for when a group is collapsed" -msgstr "" +msgstr "Tekstas, kai grupė suskleidžiama" #. Buddy -#, fuzzy msgid "Contact/Chat Background Color" -msgstr "Pasirinkti fono spalvą" +msgstr "Kontakto/pokalbio fono spalva" msgid "The background color of a contact or chat" -msgstr "" - -#, fuzzy +msgstr "Fono spalva kontaktui arba pokalbiui" + msgid "Contact Text" -msgstr "Klavišų seka" +msgstr "Kontakto tekstas" msgid "The text information for when a contact is expanded" -msgstr "" - -#, fuzzy +msgstr "Tekstas, kai kontaktas išskleidžiamas" + msgid "On-line Text" -msgstr "Prisijungęs" +msgstr "Prisijungusio bičiulio tekstas" msgid "The text information for when a buddy is online" -msgstr "" - -#, fuzzy +msgstr "Tekstas, kai bičiulis yra prisijungęs" + msgid "Away Text" -msgstr "Pasitraukęs" +msgstr "Pasitraukusio bičiulio tekstas" msgid "The text information for when a buddy is away" -msgstr "" - -#, fuzzy +msgstr "Tekstas, kai bičiulis yra pasišalinęs" + msgid "Off-line Text" -msgstr "Atsijungęs" +msgstr "Atsijungusio bičiulio tekstas" msgid "The text information for when a buddy is off-line" -msgstr "" - -#, fuzzy +msgstr "Tekstas, kai bičiulis yra atsijungęs" + msgid "Idle Text" -msgstr "Nuotaikos tekstas" +msgstr "Neveiklaus bičiulio tekstas" msgid "The text information for when a buddy is idle" -msgstr "" - -#, fuzzy +msgstr "Tekstas, kai bičiulis yra neveiklus" + msgid "Message Text" -msgstr "Išsiųsta žinutė" +msgstr "Žinutės tekstas" msgid "The text information for when a buddy has an unread message" -msgstr "" +msgstr "Tekstas, kai bičiulis yra gavęs neperskaitytą žinutę" msgid "Message (Nick Said) Text" -msgstr "" +msgstr "Žinutės (pasakytas vardas) tekstas" msgid "" "The text information for when a chat has an unread message that mentions " "your nick" -msgstr "" - -#, fuzzy +msgstr "Tekstas, kai pokalbis turi neperskaitytą žinutė, kuri mini jūsų vardą" + msgid "The text information for a buddy's status" -msgstr "Pakeisti vartotojo %s informaciją" - -#, fuzzy +msgstr "Teksto informacija bičiulio būklei" + msgid "Type the host name for this certificate." msgstr "Įveskite mazgo, kuriam skirtas šis liudijimas, vardą" @@ -11230,7 +11147,6 @@ msgid "Get Away Message" msgstr "Gauti pasitraukimo žinutę" -#, fuzzy msgid "Last Said" msgstr "Paskutinė žinutė" @@ -11258,7 +11174,7 @@ msgid "Show All" msgstr "Viską rodyti" -# Conversation menu +# Conversation menu #. Conversation menu msgid "/_Conversation" msgstr "/_Pokalbis" @@ -11278,21 +11194,17 @@ msgid "/Conversation/Clea_r Scrollback" msgstr "/Pokalbis/Iš_valyti langą" -#, fuzzy msgid "/Conversation/M_edia" -msgstr "/Pokalbis/_Daugiau" - -#, fuzzy +msgstr "/Pokalbis/_Terpė" + msgid "/Conversation/Media/_Audio Call" -msgstr "/Pokalbis/_Daugiau" - -#, fuzzy +msgstr "/Pokalbis/Terpė/Sk_ambutis su garsu" + msgid "/Conversation/Media/_Video Call" -msgstr "/Pokalbis/_Daugiau" - -#, fuzzy +msgstr "/Pokalbis/Terpė/Skambutis su _vaizdu" + msgid "/Conversation/Media/Audio\\/Video _Call" -msgstr "/Pokalbis/Žiūrėti žurna_lą" +msgstr "/Pokalbis/Terpė/_Skambutis su garsu ir vaizdu" msgid "/Conversation/Se_nd File..." msgstr "/Pokalbis/Nusiųsti _failą..." @@ -11333,7 +11245,7 @@ msgid "/Conversation/_Close" msgstr "/Pokalbis/U_žverti" -# Options +# Options #. Options msgid "/_Options" msgstr "/P_arinktys" @@ -11353,11 +11265,11 @@ msgid "/Conversation/More" msgstr "/Pokalbis/Daugiau" -# Options +# Options msgid "/Options" msgstr "/Parinktys" -# Conversation menu +# Conversation menu #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time #. * the 'Conversation' menu pops up. #. Make sure the 'Conversation -> More' menuitems are regenerated whenever @@ -11369,17 +11281,14 @@ msgid "/Conversation/View Log" msgstr "/Pokalbis/Rodyti žurnalą" -#, fuzzy msgid "/Conversation/Media/Audio Call" -msgstr "/Pokalbis/Daugiau" - -#, fuzzy +msgstr "/Pokalbis/Terpė/Skambutis su garsu" + msgid "/Conversation/Media/Video Call" -msgstr "/Pokalbis/Rodyti žurnalą" - -#, fuzzy +msgstr "/Pokalbis/Terpė/Skambutis su vaizdu" + msgid "/Conversation/Media/Audio\\/Video Call" -msgstr "/Pokalbis/Daugiau" +msgstr "/Pokalbis/Terpė/Skambutis su garsu ir vaizdu" msgid "/Conversation/Send File..." msgstr "/Pokalbis/Siųsti failą..." @@ -11437,21 +11346,21 @@ "\n" "%s nustojo rašyti" -# Build the Send As menu +# Build the Send As menu #. Build the Send To menu msgid "S_end To" msgstr "_Siųsti paskyrai" -# Build the Send As menu +# Build the Send As menu msgid "_Send" msgstr "_Siųsti" -# Setup the label telling how many people are in the room. +# Setup the label telling how many people are in the room. #. Setup the label telling how many people are in the room. msgid "0 people in room" msgstr "0 žmonių kambaryje" -# Setup the label telling how many people are in the room. +# Setup the label telling how many people are in the room. #, c-format msgid "%d person in room" msgid_plural "%d people in room" @@ -11569,7 +11478,7 @@ msgstr "Ka-Hing Cheung" msgid "voice and video" -msgstr "" +msgstr "garsas ir vaizdas" msgid "support" msgstr "palaikymas" @@ -11695,9 +11604,8 @@ msgid "Hungarian" msgstr "Vengrų kalba" -#, fuzzy msgid "Armenian" -msgstr "Rumunų kalba" +msgstr "Armėnų kalba" msgid "Indonesian" msgstr "Indoneziečių kalba" @@ -11714,9 +11622,8 @@ msgid "Ubuntu Georgian Translators" msgstr "Ubuntu vertėjai į gruzinų kalbą" -#, fuzzy msgid "Khmer" -msgstr "Kitas" +msgstr "Khmerų kalba" msgid "Kannada" msgstr "Kanadų kalba" @@ -11797,7 +11704,7 @@ msgstr "Švedų kalba" msgid "Swahili" -msgstr "" +msgstr "Suahilių kalba" msgid "Tamil" msgstr "Tamilų kalba" @@ -12111,16 +12018,6 @@ msgid "File transfer _details" msgstr "_Informacija apie perdavimą" -# Pause button -#. Pause button -msgid "_Pause" -msgstr "_Sustabdyti" - -# Resume button -#. Resume button -msgid "_Resume" -msgstr "_Tęsti" - msgid "Paste as Plain _Text" msgstr "Įdėti kaip gryną _tekstą" @@ -12139,9 +12036,8 @@ msgid "Hyperlink visited color" msgstr "Aplankyto hipersaito spalva" -#, fuzzy msgid "Color to draw hyperlink after it has been visited (or activated)." -msgstr "Aplankyto ar aktyvuoto hipersaito spalva." +msgstr "Jau aplankyto ar aktyvuoto hipersaito spalva." msgid "Hyperlink prelight color" msgstr "Hipersaito paryškinimo spalva" @@ -12176,22 +12072,19 @@ msgid "Action Message Name Color for Whispered Message" msgstr "Veiksmo žinutės vardo spalva pašnibždėtoms žinutėms" -#, fuzzy msgid "Color to draw the name of a whispered action message." -msgstr "Spalva vardui veiksmo žinutėje." +msgstr "Spalva pažnibždėtos veiksmo žinutės pavadinimui." msgid "Whisper Message Name Color" msgstr "Vardo spalva pašnibždėtose žinutėse" -#, fuzzy msgid "Color to draw the name of a whispered message." -msgstr "Spalva vardui veiksmo žinutėje." - -# ---------- "Notification Removals" ---------- +msgstr "Spalva pažnibždėtos žinutės pavadinimui." + +# ---------- "Notification Removals" ---------- msgid "Typing notification color" msgstr "Pranešimo apie pašnekovo renkamą žinutę spalva" -#, fuzzy msgid "The color to use for the typing notification" msgstr "Spalva pranešimui apie pašnekovo renkamą žinutę" @@ -12297,7 +12190,7 @@ "šypsenelė:\n" "%s" -# show everything +# show everything msgid "Smile!" msgstr "Šypsokis!" @@ -12391,7 +12284,7 @@ msgid "_Horizontal rule" msgstr "_Horizontali linija" -# show everything +# show everything msgid "_Smile!" msgstr "_Šypsokitės!" @@ -12442,7 +12335,7 @@ msgid "%s %s. Try `%s -h' for more information.\n" msgstr "%s %s. Daugiau informacijos suteikia komanda „%s -h“.\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -12464,6 +12357,7 @@ "\n" " -c, --config=KATALOGAS naudoti „KATALOGAS“ konfigūracinių failų paieškai\n" " -d, --debug išvesti derinimo pranešimus į standartinę išvestį\n" +" -f, --force-online priversti prisijungti, nepaisant tinklo būklės\n" " -h, --help parodyti šią pagalbą ir baigti\n" " -m, --multiple netikrinti, ar vienu metu paleista tik viena " "kopija\n" @@ -12474,7 +12368,7 @@ " --display=DISPLAY X displėjus naudojimui\n" " -v, --version parodyti šios programos versiją ir baigti\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -12495,6 +12389,7 @@ "\n" " -c, --config=KATALOGAS naudoti „KATALOGAS“ konfigūracinių failų paieškai\n" " -d, --debug išvesti derinimo pranešimus į standartinę išvestį\n" +" -f, --force-online priversti prisijungti nepaisant tinklo būklės\n" " -h, --help parodyti šią pagalbą ir baigti\n" " -m, --multiple netikrinti, ar vienu metu paleista tik viena " "kopija\n" @@ -12544,22 +12439,21 @@ msgstr "Programa uždaroma, nes jau yra paleistas kitas libpurple klientas.\n" msgid "/_Media" -msgstr "" +msgstr "/_Terpė" msgid "/Media/_Hangup" -msgstr "" - -#, fuzzy +msgstr "/Terpė/_Baigti skambutį" + msgid "Calling..." -msgstr "Skaičiuojama..." +msgstr "Skambinama..." #, c-format msgid "%s wishes to start an audio/video session with you." -msgstr "" +msgstr "%s nori pradėti garso ir vaizdo pokalbį su jumis." #, c-format msgid "%s wishes to start a video session with you." -msgstr "" +msgstr "%s nori pradėti vaizdo pokalbį su jumis." #, c-format msgid "%s has %d new message." @@ -12590,9 +12484,8 @@ "The 'Manual' browser command has been chosen, but no command has been set." msgstr "Pasirinkta 'Rankinė' naršyklės komanda, tačiau komanda nenustatyta." -#, fuzzy msgid "No message" -msgstr "Nežinoma pranešimas" +msgstr "Žinutės nėra" msgid "Open All Messages" msgstr "Atidaryti visas žinutes" @@ -12600,17 +12493,15 @@ msgid "You have mail!" msgstr "Jūs gavote laišką!" -# "New Buddy Pounce" -#, fuzzy +# "New Buddy Pounce" msgid "New Pounces" -msgstr "Nauja reakcija į bičiulį" +msgstr "Naujos reakcijos į bičiulį" msgid "Dismiss" -msgstr "" - -#, fuzzy +msgstr "Uždaryti" + msgid "You have pounced!" -msgstr "Jūs gavote laišką!" +msgstr "Į jus kažkas sureagavo!" msgid "The following plugins will be unloaded." msgstr "Šie papildiniai bus iškelti." @@ -12660,11 +12551,10 @@ msgid "Select a file" msgstr "Pasirinkite failą" -#, fuzzy msgid "Modify Buddy Pounce" msgstr "Redaguoti reakciją į bičiulį" -# Create the "Pounce Who" frame. +# Create the "Pounce Who" frame. #. Create the "Pounce on Whom" frame. msgid "Pounce on Whom" msgstr "Į ką reaguoti" @@ -12735,65 +12625,62 @@ msgid "_Recurring" msgstr "_Reakcija yra pasikartojanti" -# Create the "Pounce When" frame. +# Create the "Pounce When" frame. msgid "Pounce Target" msgstr "Reakcija į" -#, fuzzy, c-format +#, c-format msgid "Started typing" msgstr "pradeda rašyti" -#, fuzzy, c-format +#, c-format msgid "Paused while typing" msgstr "trumpam nustoja rašyti" -#, fuzzy, c-format +#, c-format msgid "Signed on" msgstr "prisijungia" -#, fuzzy, c-format +#, c-format msgid "Returned from being idle" -msgstr "%s tapo veiklus (%s)" - -#, fuzzy, c-format +msgstr "sugrįžta iš neveiklumo" + +#, c-format msgid "Returned from being away" -msgstr "sugrįžta" - -#, fuzzy, c-format +msgstr "sugrįžta iš pasišalinimo" + +#, c-format msgid "Stopped typing" -msgstr "Nustota rinkti tekstą" - -#, fuzzy, c-format +msgstr "nustoja rinkti tekstą" + +#, c-format msgid "Signed off" msgstr "atsijungia" -#, fuzzy, c-format +#, c-format msgid "Became idle" msgstr "tampa neveiklus" -#, fuzzy, c-format +#, c-format msgid "Went away" -msgstr "kai pasitraukęs" - -#, fuzzy, c-format +msgstr "pasišalina" + +#, c-format msgid "Sent a message" -msgstr "Nusiųsti žinutę" - -#, fuzzy, c-format +msgstr "nusiuntė žinutę" + +#, c-format msgid "Unknown.... Please report this!" -msgstr "Nežinomas reakcijos veiksmas. Prašome apie tai pranešti!" - -#, fuzzy +msgstr "Nežinoma... Prašome apie tai pranešti!" + msgid "Theme failed to unpack." -msgstr "Nepavyko išpakuoti šypsenėlių apipavidalinimo failo." - -#, fuzzy +msgstr "Nepavyko išpakuoti apipavidalinimo." + msgid "Theme failed to load." -msgstr "Nepavyko išpakuoti šypsenėlių apipavidalinimo failo." - -#, fuzzy +msgstr "Nepavyko įkelti apipavidalinimo." + msgid "Theme failed to copy." -msgstr "Nepavyko išpakuoti šypsenėlių apipavidalinimo failo." +msgstr "Nepavyko nukopijuoti apipavidalinimo." msgid "Install Theme" msgstr "Įdiegti apipavidalinimą" @@ -12816,38 +12703,36 @@ msgstr "Uždaryti p_okalbius grįžimo („Escape“) klavišu" #. Buddy List Themes -#, fuzzy msgid "Buddy List Theme" -msgstr "Bičiulių sąrašas" - -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +msgstr "Bičiulių sąrašo apipavidalinimas" + +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id #. System Tray msgid "System Tray Icon" msgstr "Piktograma sistemos juostelėje" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id msgid "_Show system tray icon:" msgstr "_Rodyti piktogramą sistemos juostelėje:" msgid "On unread messages" msgstr "kai yra neperskaitytų žinučių" -# IM Convo trans options -#, fuzzy +# IM Convo trans options msgid "Conversation Window" -msgstr "Pokalbių langai" +msgstr "Pokalbių langas" msgid "_Hide new IM conversations:" msgstr "_Slėpti naujus pokalbius" @@ -12855,7 +12740,7 @@ msgid "When away" msgstr "kai pasitraukęs" -# IM Convo trans options +# IM Convo trans options msgid "Minimi_ze new conversation windows" msgstr "_Suskleisti naujus pokalbių langus" @@ -12869,14 +12754,14 @@ msgid "Show close b_utton on tabs" msgstr "Rodyti _uždarymo mygtuką ant kortelių" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id -# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas? +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id +# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas? msgid "_Placement:" msgstr "Tal_pinimas:" @@ -12926,7 +12811,7 @@ msgstr "Mirginti _langą, kai gaunamos žinutės" msgid "Minimum input area height in lines:" -msgstr "Mažiausias įvedimo srities aukštis linijomis:" +msgstr "Mažiausias įvedimo srities aukštis eilutėmis" msgid "Font" msgstr "Šriftas" @@ -12943,7 +12828,7 @@ msgid "Default Formatting" msgstr "Numatytasis formato taikymas" -# Šitaip atrodys Jūsų išsiunčiamų žinučių tekstas su protokolais kurie palaiko formato taikymą. :) +# Šitaip atrodys Jūsų išsiunčiamų žinučių tekstas su protokolais kurie palaiko formato taikymą. :) msgid "" "This is how your outgoing message text will appear when you use protocols " "that support formatting." @@ -12960,9 +12845,9 @@ msgid "Example: stunserver.org" msgstr "Pavyzdžiui: stunserver.org" -#, fuzzy, c-format +#, c-format msgid "Use _automatically detected IP address: %s" -msgstr "_Automatiškai aptikti IP adresą" +msgstr "Naudoti _automatiškai aptiktą IP adresą: %s" msgid "Public _IP:" msgstr "Viešas _IP:" @@ -12984,7 +12869,7 @@ #. TURN server msgid "Relay Server (TURN)" -msgstr "" +msgstr "Perdavimo serveris (TURN)" msgid "Proxy Server & Browser" msgstr "Tarpininkaujantis serveris ir naršyklė" @@ -13200,7 +13085,7 @@ msgid "Smiley Themes" msgstr "Šypsenėlių apipavidalinimai" -# We use the registered default browser in windows +# We use the registered default browser in windows msgid "Browser" msgstr "Naršyklė" @@ -13330,11 +13215,11 @@ msgid "Status for %s" msgstr "Paskyros %s būsena" -#, fuzzy, c-format +#, c-format msgid "" "A custom smiley for '%s' already exists. Please use a different shortcut." msgstr "" -"Šiai klavišų sekai jau priskirta tinkinta šypsenelė. Pasirinkite kitokią " +"Nuosavas šypsniukas kombinacijai „%s“ jau priskirtas. Pasirinkite kitokią " "kombinaciją." msgid "Custom Smiley" @@ -13346,33 +13231,29 @@ msgid "Edit Smiley" msgstr "Keisti šypsenėlę" -# show everything +# show everything msgid "Add Smiley" msgstr "Pridėti šypsenėlę" -#, fuzzy msgid "_Image:" -msgstr "_paveiksliuką" +msgstr "_Paveiksliukas:" #. Shortcut text -#, fuzzy msgid "S_hortcut text:" -msgstr "Klavišų seka" - -# show everything +msgstr "_Sekos klavišų kombinacija:" + +# show everything msgid "Smiley" msgstr "Šypsenėlė" -#, fuzzy msgid "Shortcut Text" -msgstr "Klavišų seka" +msgstr "Sekos klavišų kombinacija" msgid "Custom Smiley Manager" -msgstr "Tinkintų šypsenėlių tvarkytuvė" - -#, fuzzy +msgstr "Nuosavų šypsenėlių tvarkytuvė" + msgid "Select Buddy Icon" -msgstr "Pasirinkti bičiulį" +msgstr "Pasirinkti bičiulio paveiksliuką" msgid "Click to change your buddyicon for this account." msgstr "Paspauskite, kad pakeistumėte savo paveiksliuką šiai paskyrai." @@ -13458,13 +13339,12 @@ msgid "Cannot send launcher" msgstr "Negalima išsiųsti paleidyklės" -#, fuzzy msgid "" "You dragged a desktop launcher. Most likely you wanted to send the target of " "this launcher instead of this launcher itself." msgstr "" "Jūs atitempėte pele darbastalio paleidyklę. Greičiausiai norite siųsti ne " -"pačią paleidyklę, o jos paleidžiamą objektą." +"pačią paleidyklę, o tai, ką ji paleidžia." #, c-format msgid "" @@ -13498,9 +13378,8 @@ "Paveiksliuko „%s“ nepavyko įkelti dėl nežinomos priežasties, turbūt tai yra " "sugadintas paveiksliuko failas" -#, fuzzy msgid "_Open Link" -msgstr "_Atverti saitą kame:" +msgstr "_Atverti saitą" msgid "_Copy Link Location" msgstr "Kopijuoti _saito adresą" @@ -13508,9 +13387,21 @@ msgid "_Copy Email Address" msgstr "Kopijuoti _el. pašto adresą" +msgid "_Open File" +msgstr "_Atverti failą" + +msgid "Open _Containing Directory" +msgstr "Atverti _katalogą" + msgid "Save File" msgstr "Įrašyti failą" +msgid "_Play Sound" +msgstr "_Groti garsą" + +msgid "_Save File" +msgstr "_Įrašyti failą" + msgid "Select color" msgstr "Pasirinkite spalvą" @@ -13523,7 +13414,7 @@ msgid "_Get Info" msgstr "_Gauti informaciją" -# Invite +# Invite msgid "_Invite" msgstr "Pakv_iesti" @@ -13536,6 +13427,10 @@ msgid "_Open Mail" msgstr "_Atverti paštą" +# Pause button +msgid "_Pause" +msgstr "_Sustabdyti" + msgid "_Edit" msgstr "K_eisti" @@ -13599,77 +13494,65 @@ msgid "Displays statistical information about your buddies' availability" msgstr "Rodo statistiką apie bičiulių prieinamumą" -#, fuzzy msgid "Server name request" -msgstr "Serverio adresas" - -#, fuzzy +msgstr "Serverio vardo užklausa" + msgid "Enter an XMPP Server" -msgstr "Įveskite konferencijų serverį" - -#, fuzzy +msgstr "Įveskite XMPP serverį" + msgid "Select an XMPP server to query" -msgstr "Pasirinkite konferencijų serverį užklausai" - -#, fuzzy +msgstr "Pasirinkite XMPP serverį užklausai" + msgid "Find Services" -msgstr "Tiesioginės tarnybos" - -#, fuzzy +msgstr "Rasti servisus" + msgid "Add to Buddy List" -msgstr "Nusiųsti bičiulių sąrašą" - -#, fuzzy +msgstr "Pridėti į bičiulių sąrašą" + msgid "Gateway" -msgstr "pasitraukia" - -#, fuzzy +msgstr "Tinklų sąsaja („Gateway“)" + msgid "Directory" -msgstr "Žurnalų katalogas" - -#, fuzzy +msgstr "Katalogas" + msgid "PubSub Collection" -msgstr "Garso išrinkimas" - -#, fuzzy +msgstr "„PubSub Collection“" + msgid "PubSub Leaf" -msgstr "PubSub paslauga" - -#, fuzzy +msgstr "„PubSub Leaf“" + msgid "" "\n" "Description: " -msgstr "Aprašymas" +msgstr "" +"\n" +"Aprašymas: " #. Create the window. -#, fuzzy msgid "Service Discovery" -msgstr "Paslaugų paieškos informacija" - -#, fuzzy +msgstr "Servisų suradimas" + msgid "_Browse" -msgstr "_Naršyklė:" - -#, fuzzy +msgstr "_Naršyti" + msgid "Server does not exist" -msgstr "Vartotojas neegzistuoja" - -#, fuzzy +msgstr "Serveris neegzistuoja" + msgid "Server does not support service discovery" -msgstr "Serveris nepalaiko blokavimo" - -#, fuzzy +msgstr "Serveris nepalaiko servisų suradimo" + msgid "XMPP Service Discovery" -msgstr "Paslaugų paieškos informacija" +msgstr "XMPP servisų suradimas" msgid "Allows browsing and registering services." -msgstr "" - -#, fuzzy +msgstr "Leidžia naršymo ir registravimo paslaugas." + msgid "" "This plugin is useful for registering with legacy transports or other XMPP " "services." -msgstr "Šis papildinys naudingas XMPP serverių ir klientų derinimui." +msgstr "" +"Šis papildinys naudingas registravimuisi su senais transporto protokolais ar " +"kitais XMPP servisais." msgid "Buddy is idle" msgstr "bičiulis yra neveiklus" @@ -13728,7 +13611,7 @@ msgid "Conversation Colors" msgstr "Pokalbių spalvos" -# IM Convo trans options +# IM Convo trans options msgid "Customize colors in the conversation window" msgstr "Nustatyti pokalbių lango spalvas" @@ -13782,14 +13665,14 @@ "Talpinant pagal skaičių atskirti asmeninių pokalbių ir pokalbių kambarių " "langus" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id -# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas? +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id +# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas? #. *< type #. *< ui_requirement #. *< flags @@ -13799,15 +13682,15 @@ msgid "ExtPlacement" msgstr "ExtPlacement" -# *< name -# *< version +# *< name +# *< version #. *< name #. *< version msgid "Extra conversation placement options." msgstr "Papildomi pokalbių talpinimo į langus nustatymai" -# *< summary -# * description +# *< summary +# * description #. *< summary #. * description msgid "" @@ -13827,7 +13710,7 @@ msgid "Right mouse button" msgstr "Dešinysis pelės klavišas" -# "Visual gesture display" checkbox +# "Visual gesture display" checkbox #. "Visual gesture display" checkbox msgid "_Visual gesture display" msgstr "_Vizualus gesto pavaizdavimas" @@ -13841,16 +13724,16 @@ msgid "Mouse Gestures" msgstr "Pelės gestai" -# *< name -# *< version -# * summary +# *< name +# *< version +# * summary #. *< name #. *< version #. * summary msgid "Provides support for mouse gestures" msgstr "Leidžia naudoti pelės gestus" -# * description +# * description #. * description msgid "" "Allows support for mouse gestures in conversation windows. Drag the middle " @@ -13885,7 +13768,7 @@ msgid "Select Buddy" msgstr "Pasirinkti bičiulį" -# Add the label. +# Add the label. #. Add the label. msgid "" "Select a person from your address book to add this buddy to, or create a new " @@ -13898,7 +13781,7 @@ msgid "User _details" msgstr "Vartotojo _duomenys" -# "Associate Buddy" button +# "Associate Buddy" button #. "Associate Buddy" button msgid "_Associate Buddy" msgstr "_Susieti bičiulį" @@ -13918,25 +13801,25 @@ msgid "Send Email" msgstr "Nusiųsti el. laišką" -# Configuration frame +# Configuration frame #. Configuration frame msgid "Evolution Integration Configuration" msgstr "Evolution integracijos konfigūravimas" -# Label +# Label #. Label msgid "Select all accounts that buddies should be auto-added to." msgstr "" "Pasirinkite visas paskyras, į kurias bičiuliai turėtų būti pridedami " "automatiškai." -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id #. *< type #. *< ui_requirement #. *< flags @@ -13962,7 +13845,7 @@ msgid "Account type:" msgstr "Paskyros tipas:" -# Optional Information section +# Optional Information section #. Optional Information section msgid "Optional information:" msgstr "Nebūtina informacija:" @@ -13976,13 +13859,13 @@ msgid "Email:" msgstr "El. pašto adresas:" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id #. *< type #. *< ui_requirement #. *< flags @@ -13992,10 +13875,10 @@ msgid "GTK Signals Test" msgstr "GTK signalų testas" -# *< name -# *< version -# * summary -# * description +# *< name +# *< version +# * summary +# * description #. *< name #. *< version #. * summary @@ -14003,7 +13886,7 @@ msgid "Test to see that all ui signals are working properly." msgstr "Testas, skirtas nustatyti, ar visi sąsajos signalai veikia teisingai." -# "New Buddy Pounce" +# "New Buddy Pounce" #, c-format msgid "" "\n" @@ -14015,13 +13898,13 @@ msgid "History" msgstr "Istorija" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id #. *< type #. *< ui_requirement #. *< flags @@ -14031,10 +13914,10 @@ msgid "Iconify on Away" msgstr "Suskleisti pasitraukiant" -# *< name -# *< version -# * summary -# * description +# *< name +# *< version +# * summary +# * description #. *< name #. *< version #. * summary @@ -14114,15 +13997,14 @@ msgstr "Muzikinių žinučių papildinys kolektyviniam muzikos kūrimui." #. * summary -#, fuzzy msgid "" "The Music Messaging Plugin allows a number of users to simultaneously work " "on a piece of music by editing a common score in real-time." msgstr "" "Muzikinių žinučių papildinys leidžia keliems vartotojams vienu metu kurti tą " -"patį muzikinį kūrinį." - -# ---------- "Notify For" ---------- +"patį muzikinį kūrinį redaguojant tą pačią partitūrą." + +# ---------- "Notify For" ---------- #. ---------- "Notify For" ---------- msgid "Notify For" msgstr "Pranešti apie:" @@ -14133,7 +14015,7 @@ msgid "_Focused windows" msgstr "_veikiamuosius langus" -# ---------- "Notification Methods" ---------- +# ---------- "Notification Methods" ---------- #. ---------- "Notification Methods" ---------- msgid "Notification Methods" msgstr "Pranešimo būdai:" @@ -14141,17 +14023,17 @@ msgid "Prepend _string into window title:" msgstr "p_ridėti eilutę prieš lango pavadinimą:" -# Count method button +# Count method button #. Count method button msgid "Insert c_ount of new messages into window title" msgstr "į_terpti naujų žinučių skaičių į lango pavadinimą" -# Count method button +# Count method button #. Count xprop method button msgid "Insert count of new message into _X property" msgstr "įterpti naujų žinučių skaičių į _X sąvybę" -# Urgent method button +# Urgent method button #. Urgent method button msgid "Set window manager \"_URGENT\" hint" msgstr "nustatyti langų tvarkytuvės „_URGENT“ patarimą" @@ -14159,55 +14041,55 @@ msgid "_Flash window" msgstr "_Mirginti langą" -# IM Convo trans options +# IM Convo trans options #. Raise window method button msgid "R_aise conversation window" msgstr "P_akelti pokalbių langą" -# IM Convo trans options +# IM Convo trans options #. Present conversation method button msgid "_Present conversation window" msgstr "_Pristatyti pokalbių langą" -# ---------- "Notification Removals" ---------- +# ---------- "Notification Removals" ---------- #. ---------- "Notification Removals" ---------- msgid "Notification Removal" msgstr "Baigti pranešimą, kai:" -# Remove on focus button +# Remove on focus button #. Remove on focus button msgid "Remove when conversation window _gains focus" msgstr "pokalbių _langas tampa veikiamasis" -# Remove on click button +# Remove on click button #. Remove on click button msgid "Remove when conversation window _receives click" msgstr "spragtelėjama ant pokalbių la_ngo" -# Remove on type button +# Remove on type button #. Remove on type button msgid "Remove when _typing in conversation window" msgstr "rašo_ma į pokalbių langą" -# Remove on message send button -# Remove on message send button +# Remove on message send button +# Remove on message send button #. Remove on message send button msgid "Remove when a _message gets sent" msgstr "iš_siunčiama žinutė" -# Remove on conversation switch button -# Remove on conversation switch button +# Remove on conversation switch button +# Remove on conversation switch button #. Remove on conversation switch button msgid "Remove on switch to conversation ta_b" msgstr "kai pers_ijungiama į pokalbio kortelę" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id #. *< type #. *< ui_requirement #. *< flags @@ -14217,10 +14099,10 @@ msgid "Message Notification" msgstr "Pranešimai apie žinutes" -# *< name -# *< version -# * summary -# * description +# *< name +# *< version +# * summary +# * description #. *< name #. *< version #. * summary @@ -14264,10 +14146,9 @@ msgid "Highlighted Message Name Color" msgstr "Vardo paryškintoje žinutėje spalva" -# ---------- "Notification Removals" ---------- -#, fuzzy +# ---------- "Notification Removals" ---------- msgid "Typing Notification Color" -msgstr "Pranešimo apie pašnekovo renkamą žinutę spalva" +msgstr "Pranešimo apie renkamą žinutę spalva" msgid "GtkTreeView Horizontal Separation" msgstr "GtkTreeView horizontalus atskyrimo tarpas" @@ -14278,7 +14159,7 @@ msgid "Request Dialog" msgstr "Užklausos dialogas" -# ---------- "Notify For" ---------- +# ---------- "Notify For" ---------- msgid "Notify Dialog" msgstr "Informacinis dialogas" @@ -14299,30 +14180,27 @@ msgid "GTK+ Text Shortcut Theme" msgstr "GTK+ prieigos klavišų parinktis" -#, fuzzy msgid "Disable Typing Notification Text" -msgstr "Rodyti pranešimus apie pašnekovų renkamas žinutes" - -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id -#, fuzzy +msgstr "Išjungti pranešimų apie renkamą žinutę tekstą" + +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id msgid "GTK+ Theme Control Settings" -msgstr "Pidgin GTK+ apipavidalinimo parinktys" - -#, fuzzy +msgstr "GTK+ apipavidalinimų parinktys" + msgid "Colors" -msgstr "Užverti" +msgstr "Spalvos" msgid "Fonts" msgstr "Šriftai" msgid "Miscellaneous" -msgstr "" +msgstr "Kita" msgid "Gtkrc File Tools" msgstr "Gtkrc failų įrankiai" @@ -14334,13 +14212,13 @@ msgid "Re-read gtkrc files" msgstr "Iš naujo įkelti gtkrc failus" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id msgid "Pidgin GTK+ Theme Control" msgstr "Pidgin GTK+ apipavidalinimo parinktys" @@ -14374,13 +14252,13 @@ msgid "Download Now" msgstr "Atsisiųsti dabar" -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id #. *< type #. *< ui_requirement #. *< flags @@ -14390,16 +14268,16 @@ msgid "Release Notification" msgstr "Pranešimas apie laidą" -# *< name -# *< version -# * summary +# *< name +# *< version +# * summary #. *< name #. *< version #. * summary msgid "Checks periodically for new releases." msgstr "Periodiškai patikrina, ar neišleistos naujos versijos" -# * description +# * description #. * description msgid "" "Checks periodically for new releases and notifies the user with the " @@ -14408,7 +14286,7 @@ "Periodiškai patikrina, ar neišleistos naujos versijos ir praneša apie tai " "vartotojui kartu su pakeitimų sąrašu." -# Build the Send As menu +# Build the Send As menu #. *< major version #. *< minor version #. *< type @@ -14420,20 +14298,19 @@ msgid "Send Button" msgstr "Siuntimo mygtukas" -# IM Convo trans options +# IM Convo trans options #. *< name #. *< version msgid "Conversation Window Send Button." msgstr "Mygtukas „Siųsti“ pokalbių languose" #. *< summary -#, fuzzy msgid "" "Adds a Send button to the entry area of the conversation window. Intended " "for use when no physical keyboard is present." msgstr "" -"Prideda mygtuką „Siųsti“ į pokalbių lango įvedimo sritį. Skirta naudojimui, " -"kai nėra realios klaviatūros." +"Prideda mygtuką „Siųsti“ į pokalbių lango įvedimo sritį. Naudinga, kai nėra " +"fizinės klaviatūros." msgid "Duplicate Correction" msgstr "Pakartoto žodžio pataisymas" @@ -14487,109 +14364,93 @@ msgstr "" "Pakeičia tekstą išsiunčiamose žinutėse pagal vartotojo sukurtas taisykles." -#, fuzzy msgid "Just logged in" -msgstr "Neprisijungęs" - -#, fuzzy +msgstr "Ką tik prisijungė" + msgid "Just logged out" -msgstr "Neprisijungęs" +msgstr "Ką tik atsijungė" msgid "" "Icon for Contact/\n" "Icon for Unknown person" msgstr "" - -#, fuzzy +"Piktograma kontaktui/\n" +"Piktograma nežinomam asmeniui" + msgid "Icon for Chat" -msgstr "Prisijungti prie pokalbio" - -#, fuzzy +msgstr "Piktograma pokalbiui" + msgid "Ignored" -msgstr "Ignoruoti" - -#, fuzzy +msgstr "Ignoruojamas" + msgid "Founder" -msgstr "Garsiau" - -#, fuzzy +msgstr "Steigėjas" + msgid "Operator" -msgstr "Opera" +msgstr "Operatorius" msgid "Half Operator" -msgstr "" - -#, fuzzy +msgstr "Pusiau operatorius" + msgid "Authorization dialog" -msgstr "Suteikta prieigos teisė" - -#, fuzzy +msgstr "Prieigos teisės dialogo langas" + msgid "Error dialog" -msgstr "Klaidos " - -#, fuzzy +msgstr "Klaidos dialogo langas" + msgid "Information dialog" -msgstr "Informacija" +msgstr "Informacijos dialogo langas" msgid "Mail dialog" -msgstr "" - -#, fuzzy +msgstr "Pašto dialogo langas" + msgid "Question dialog" -msgstr "Užklausos dialogas" - -#, fuzzy +msgstr "Klausimo dialogo langas" + msgid "Warning dialog" -msgstr "Perspėjimo lygis" +msgstr "Perspėjimo dialogo langas" msgid "What kind of dialog is this?" -msgstr "" - -#, fuzzy +msgstr "Kokios rūšies dialogo langas tai yra?" + msgid "Status Icons" -msgstr "Paskyros %s būsena" - -#, fuzzy +msgstr "Būsenų piktogramos" + msgid "Chatroom Emblems" -msgstr "Pokalbių kambario lokalė" - -#, fuzzy +msgstr "Pokalbių kambarių emblemos" + msgid "Dialog Icons" -msgstr "Pakeisti paveiksliuką" - -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id -#, fuzzy +msgstr "Dialogų langų piktogramos" + +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id msgid "Pidgin Icon Theme Editor" -msgstr "Pidgin GTK+ apipavidalinimo parinktys" - -#, fuzzy +msgstr "Pidgin piktogramų apipavidalinimo redaktorius" + msgid "Contact" -msgstr "Kontaktinė informacija" - -#, fuzzy +msgstr "Kontaktas" + msgid "Pidgin Buddylist Theme Editor" -msgstr "Bičiulių sąrašas" - -#, fuzzy +msgstr "Pidgin bičiulių sąrašo apipavidalinimo redaktorius" + msgid "Edit Buddylist Theme" -msgstr "Bičiulių sąrašas" +msgstr "Redaguoti bičiulių sąrašo apipavidalinimą" msgid "Edit Icon Theme" -msgstr "" - -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +msgstr "Redaguoti piktogramų apipavidalinimą" + +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id #. *< type #. *< ui_requirement #. *< flags @@ -14597,23 +14458,21 @@ #. *< priority #. *< id #. * description -#, fuzzy msgid "Pidgin Theme Editor" -msgstr "Pidgin GTK+ apipavidalinimo parinktys" - -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id +msgstr "Pidgin apipavidalinimo redaktorius" + +# *< api_version +# *< type +# *< ui_requirement +# *< flags +# *< dependencies +# *< priority +# *< id #. *< name #. *< version #. * summary -#, fuzzy msgid "Pidgin Theme Editor." -msgstr "Pidgin GTK+ apipavidalinimo parinktys" +msgstr "Pidgin apipavidalinimo redaktorius" #. *< type #. *< ui_requirement @@ -14701,7 +14560,7 @@ msgid "Opacity:" msgstr "Nepermatomumas:" -# IM Convo trans options +# IM Convo trans options #. IM Convo trans options msgid "IM Conversation Windows" msgstr "Pokalbių langai" @@ -14718,7 +14577,7 @@ msgid "Always on top" msgstr "Visada viršuje" -# Buddy List trans options +# Buddy List trans options #. Buddy List trans options msgid "Buddy List Window" msgstr "Bičiulių sąrašo langas" @@ -14738,16 +14597,16 @@ msgid "Transparency" msgstr "Permatomumas" -# *< name -# *< version -# * summary +# *< name +# *< version +# * summary #. *< name #. *< version #. * summary msgid "Variable Transparency for the buddy list and conversations." msgstr "Kintamas permatumomas bičiulių sąrašo ir pokalbių langams." -# * description +# * description #. * description msgid "" "This plugin enables variable alpha transparency on conversation windows and " @@ -14763,8 +14622,8 @@ msgid "GTK+ Runtime Version" msgstr "GTK+ vykdymo laiko bibliotekos versija" -# Autostart -# Autostart +# Autostart +# Autostart #. Autostart msgid "Startup" msgstr "Paleidimas" @@ -14776,7 +14635,7 @@ msgid "_Dockable Buddy List" msgstr "_Pritvirtinamas bičiulių langas" -# Blist On Top +# Blist On Top #. Blist On Top msgid "_Keep Buddy List window on top:" msgstr "Lai_kyti bičiulių sąrašo langą viršuje:" @@ -14791,7 +14650,6 @@ msgid "Options specific to Pidgin for Windows." msgstr "Specifinės Pidgin parinktys Windows operacinei sistemai." -#, fuzzy msgid "" "Provides options specific to Pidgin for Windows, such as buddy list docking." msgstr "" @@ -14810,7 +14668,7 @@ msgid "XMPP Console" msgstr "XMPP pultas" -# Set up stuff for the account box +# Set up stuff for the account box msgid "Account: " msgstr "Paskyra:" @@ -14835,507 +14693,3 @@ #. * description msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "Šis papildinys naudingas XMPP serverių ir klientų derinimui." - -#~ msgid "Cannot open socket" -#~ msgstr "Nepavyko atidaryti prievado" - -#~ msgid "Could not listen on socket" -#~ msgstr "Nepavyko nustatyti jungties klausymuisi" - -#~ msgid "Unable to read socket" -#~ msgstr "Nepavyko skaityti iš jungties" - -#~ msgid "Connection failed." -#~ msgstr "Nepavyko prisijungti." - -#~ msgid "Server has disconnected" -#~ msgstr "Serveris atsijungė" - -#~ msgid "Couldn't create socket" -#~ msgstr "Nepavyko sukurti jungties" - -#~ msgid "Couldn't connect to host" -#~ msgstr "Nepavyko prisijungti prie mazgo" - -#~ msgid "Read error" -#~ msgstr "Skaitymo klaida" - -#~ msgid "" -#~ "Could not establish a connection with the server:\n" -#~ "%s" -#~ msgstr "" -#~ "Nepavyko prisijungti prie serverio:\n" -#~ "%s" - -#~ msgid "Write error" -#~ msgstr "Rašymo klaida" - -#~ msgid "Last Activity" -#~ msgstr "Paskutinis veiksmas" - -#~ msgid "Service Discovery Info" -#~ msgstr "Paslaugų paieškos informacija" - -#~ msgid "Service Discovery Items" -#~ msgstr "Paslaugų paieškos elementai" - -#~ msgid "Extended Stanza Addressing" -#~ msgstr "Išplėstinių strofų adresavimas" - -#~ msgid "Multi-User Chat" -#~ msgstr "Pokalbis su keliais vartotojais" - -#~ msgid "Multi-User Chat Extended Presence Information" -#~ msgstr "Išplėstinė buvimo informacija pokalbiuose su keliais vartotojais" - -#~ msgid "In-Band Bytestreams" -#~ msgstr "Kanalo vidaus baitų srautai" - -#~ msgid "Ad-Hoc Commands" -#~ msgstr "Specialios (ad hoc) komandos" - -#~ msgid "PubSub Service" -#~ msgstr "PubSub paslauga" - -#~ msgid "SOCKS5 Bytestreams" -#~ msgstr "SOCKS5 baitų srautai" - -#~ msgid "Out of Band Data" -#~ msgstr "Užkanaliniai duomenys" - -#~ msgid "XHTML-IM" -#~ msgstr "XHTML-IM" - -#~ msgid "In-Band Registration" -#~ msgstr "Registracija kanalo viduje" - -#~ msgid "User Location" -#~ msgstr "Naudotojo vietovė" - -#~ msgid "User Avatar" -#~ msgstr "Naudotojo avataras" - -# *< api_version -# *< type -# *< ui_requirement -# *< flags -# *< dependencies -# *< priority -# *< id -#~ msgid "Chat State Notifications" -#~ msgstr "Pranešimai apie pokalbio būseną" - -#~ msgid "Software Version" -#~ msgstr "Programinės įrangos versija" - -#~ msgid "Stream Initiation" -#~ msgstr "Kanalo inicijavimas" - -#~ msgid "User Mood" -#~ msgstr "Naudotojo nuotaika" - -#~ msgid "User Activity" -#~ msgstr "Naudotojo aktyvumas" - -#~ msgid "Entity Capabilities" -#~ msgstr "Objektų gebos" - -#~ msgid "Encrypted Session Negotiations" -#~ msgstr "Šifruoti seansų susitarimai" - -#~ msgid "User Tune" -#~ msgstr "Naudotojo daina" - -#~ msgid "Roster Item Exchange" -#~ msgstr "Sąrašo objektų apsikeitimas" - -#~ msgid "Reachability Address" -#~ msgstr "Pasiekiamumo adresas" - -#~ msgid "User Profile" -#~ msgstr "Naudotojo profilis" - -# join button -#~ msgid "Jingle" -#~ msgstr "Jingle" - -#~ msgid "Jingle Audio" -#~ msgstr "Jingle Audio" - -#~ msgid "User Nickname" -#~ msgstr "Naudotojo vardas" - -#~ msgid "Jingle ICE UDP" -#~ msgstr "Jingle ICE UDP" - -#~ msgid "Jingle ICE TCP" -#~ msgstr "Jingle ICE TCP" - -#~ msgid "Jingle Raw UDP" -#~ msgstr "Jingle grynu UDP" - -#~ msgid "Jingle Video" -#~ msgstr "Jingle Video" - -#~ msgid "Jingle DTMF" -#~ msgstr "Jingle DTMF" - -#~ msgid "Message Receipts" -#~ msgstr "Pranešimai apie žinučių pristatymą" - -#~ msgid "Public Key Publishing" -#~ msgstr "Viešojo rakto skelbimas" - -#~ msgid "User Chatting" -#~ msgstr "Naudotojas šnekasi" - -#~ msgid "User Browsing" -#~ msgstr "Naudotojas naršo" - -#~ msgid "User Gaming" -#~ msgstr "Naudotojas žaidžia" - -#~ msgid "User Viewing" -#~ msgstr "Naudotojas žiūri" - -#~ msgid "Stanza Encryption" -#~ msgstr "Strofų šifravimas" - -#~ msgid "Entity Time" -#~ msgstr "Objekto laikas" - -#~ msgid "Delayed Delivery" -#~ msgstr "Uždelstinis pristatymas" - -#~ msgid "Collaborative Data Objects" -#~ msgstr "Bendradarbiavimo duomenų objektai" - -#~ msgid "File Repository and Sharing" -#~ msgstr "Failų saugykla ir dalinimasis" - -#~ msgid "STUN Service Discovery for Jingle" -#~ msgstr "STUN paslaugos paieška, skirta Jingle" - -#~ msgid "Simplified Encrypted Session Negotiation" -#~ msgstr "Supaprastintas susitarimas dėl šifruoto seanso" - -#~ msgid "Hop Check" -#~ msgstr "Šuolių patikrinimas" - -#~ msgid "Read Error" -#~ msgstr "Skaitymo klaida" - -#~ msgid "Failed to connect to server." -#~ msgstr "Nepavyko prisijungti prie serverio." - -#~ msgid "Read buffer full (2)" -#~ msgstr "Skaitymo buferis pripildytas (2)" - -#~ msgid "Unparseable message" -#~ msgstr "Nepavyko išanalizuoti pranešimo" - -#~ msgid "Couldn't connect to host: %s (%d)" -#~ msgstr "Nepavyko prisijungti prie mazgo: %s (%d)" - -#~ msgid "Login failed (%s)." -#~ msgstr "Prisijungimas nepavyko (%s)." - -#~ msgid "" -#~ "You have been logged out because you logged in at another workstation." -#~ msgstr "Jūs buvote atjungtas, kadangi prisijungėte kitoje darbo vietoje." - -#~ msgid "Error. SSL support is not installed." -#~ msgstr "Klaida. SSL palaikymas neįdiegtas." - -#~ msgid "Incorrect password." -#~ msgstr "Neteisingas slaptažodis." - -#~ msgid "" -#~ "Could not connect to BOS server:\n" -#~ "%s" -#~ msgstr "" -#~ "Nepavyko prisijungti prie BOS serverio:\n" -#~ "%s" - -#~ msgid "You may be disconnected shortly. Check %s for updates." -#~ msgstr "Jus netrukus gali atjungti. Patikrinkite %s, ar nėra atnaujinimų." - -#~ msgid "Could Not Connect" -#~ msgstr "Nepavyko prisijungti" - -#~ msgid "Invalid username." -#~ msgstr "Neteisingas naudotojo vardas" - -#~ msgid "Could not decrypt server reply" -#~ msgstr "Nepavyko iššifruoti serverio atsakymo" - -#~ msgid "Connection lost" -#~ msgstr "Prisijungimas prarastas" - -#~ msgid "Couldn't resolve host" -#~ msgstr "Nepavyko nustatyti mazgo IP adreso" - -#~ msgid "Connection closed (writing)" -#~ msgstr "Jungtis uždaryta (rašoma)" - -#~ msgid "Connection reset" -#~ msgstr "Jungtis atidaryta iš naujo" - -#~ msgid "Error reading from socket: %s" -#~ msgstr "Skaitymo iš jungties klaida: %s" - -#~ msgid "Unable to connect to host" -#~ msgstr "Nepavyko prisijungti prie mazgo" - -#~ msgid "Could not write" -#~ msgstr "Nepavyko rašyti" - -#~ msgid "Could not connect" -#~ msgstr "Nepavyko prisijungti" - -#~ msgid "Could not create listen socket" -#~ msgstr "Nepavyko sukurti jungties klausymuisi" - -#~ msgid "Could not resolve hostname" -#~ msgstr "Nepavyko nustatyti mazgo IP adreso" - -#, fuzzy -#~ msgid "Incorrect Password" -#~ msgstr "Neteisingas slaptažodis" - -#~ msgid "" -#~ "Could not establish a connection with %s:\n" -#~ "%s" -#~ msgstr "" -#~ "Nepavyko sukurti jungties su %s:\n" -#~ "%s" - -#~ msgid "Yahoo Japan" -#~ msgstr "Yahoo Japonija" - -#~ msgid "Japan Pager server" -#~ msgstr "Japonijos pranešimų gaviklio serveris" - -#~ msgid "Japan file transfer server" -#~ msgstr "Japonijos failų perdavimo serveris" - -#~ msgid "" -#~ "Lost connection with server\n" -#~ "%s" -#~ msgstr "" -#~ "Prarastas prisijungimas prie serverio\n" -#~ "%s" - -#~ msgid "Could not resolve host name" -#~ msgstr "Nepavyko nustatyti mazgo IP adreso" - -#, fuzzy -#~ msgid "" -#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support " -#~ "was found." -#~ msgstr "Serveris reikalauja TLS/SSL prisijungimui. Nėra TLS/SSL palaikymo." - -# IM Convo trans options -#~ msgid "Conversation Window Hiding" -#~ msgstr "Pokalbių langų slėpimas" - -#~ msgid "More Data needed" -#~ msgstr "Reikia daugiau duomenų" - -#~ msgid "Please provide a shortcut to associate with the smiley." -#~ msgstr "Nurodykite klavišų seką susiejimui su šypsenėle." - -#~ msgid "Please select an image for the smiley." -#~ msgstr "Parinkite šypsenėlei paveiksliuką." - -#~ msgid "Activate which ID?" -#~ msgstr "Kurį ID aktyvuoti?" - -#~ msgid "Cursor Color" -#~ msgstr "Žymeklio spalva" - -#~ msgid "Secondary Cursor Color" -#~ msgstr "Antrinė žymeklio spalva" - -#~ msgid "Interface colors" -#~ msgstr "Sąsajos spalvos" - -#~ msgid "Widget Sizes" -#~ msgstr "Sąsajos elementų dydžiai" - -#~ msgid "Invite message" -#~ msgstr "Pakvietimo žinutė" - -# Put our happy label in it. -#~ msgid "" -#~ "Please enter the name of the user you wish to invite,\n" -#~ "along with an optional invite message." -#~ msgstr "" -#~ "Prašom įvesti vartotojo, kurį norite pakviesti, vardą kartu su " -#~ "neprivaloma pakvietimo žinute." - -#~ msgid "Looking up %s" -#~ msgstr "Ieškoma %s" - -#~ msgid "Connect to %s failed" -#~ msgstr "Prisijungimas prie %s nepavyko" - -#~ msgid "Signon: %s" -#~ msgstr "Prisijungiama: %s" - -#~ msgid "Unable to write file %s." -#~ msgstr "Negalima rašyti failo %s." - -#~ msgid "Unable to read file %s." -#~ msgstr "Negalima skaityti failo %s." - -#~ msgid "Message too long, last %s bytes truncated." -#~ msgstr "Žinutė per ilga, paskutiniai %s bitai nukąsti." - -#~ msgid "%s not currently logged in." -#~ msgstr "%s nėra šiuo metu prisijungęs" - -#~ msgid "Warning of %s not allowed." -#~ msgstr "Vartotojo %s perspėjimas neleidžiamas" - -#~ msgid "" -#~ "A message has been dropped, you are exceeding the server speed limit." -#~ msgstr "Žinutė prarasta, Jūs viršijote maksimalią serverio greičio ribą" - -#~ msgid "Chat in %s is not available." -#~ msgstr "Pokalbis %s nepasiekiamas" - -#~ msgid "You are sending messages too fast to %s." -#~ msgstr "Žinutes gavėjui %s Jūs siunčiate per greitai." - -#~ msgid "You missed an IM from %s because it was too big." -#~ msgstr "Jūs praleidote žinutę iš %s, nes ji buvo išsiųsta per didelė" - -#~ msgid "You missed an IM from %s because it was sent too fast." -#~ msgstr "Jūs praleidote žinutę iš %s, nes ji buvo išsiųsta per greitai." - -#~ msgid "Failure." -#~ msgstr "Nesekmė." - -#~ msgid "Too many matches." -#~ msgstr "Per daug atitikimų." - -#~ msgid "Need more qualifiers." -#~ msgstr "Reikia labiau apibrėžti." - -#~ msgid "Dir service temporarily unavailable." -#~ msgstr "Katalogo tarnyba laikinai neprieinama." - -#~ msgid "Email lookup restricted." -#~ msgstr "El. pašto adresų paieška apribota." - -#~ msgid "Keyword ignored." -#~ msgstr "Ignoruotas bazinis žodis" - -#~ msgid "No keywords." -#~ msgstr "Nėra bazinių žodžių" - -#~ msgid "User has no directory information." -#~ msgstr "Vartotojas neturi katalogo informacijos" - -#~ msgid "Country not supported." -#~ msgstr "Nepalaikoma šalis." - -#~ msgid "Failure unknown: %s." -#~ msgstr "Nežinoma nesekmė: %s." - -#~ msgid "Incorrect username or password." -#~ msgstr "Neteisingas naudotojo vardas arba slaptažodis" - -#~ msgid "The service is temporarily unavailable." -#~ msgstr "Paslauga laikinai nepasiekiama" - -#~ msgid "Your warning level is currently too high to log in." -#~ msgstr "" -#~ "Jūsų perspėjimo lygis šiuo metu yra per aukštas, kad galėtumėte " -#~ "prisijungti." - -#~ msgid "" -#~ "You have been connecting and disconnecting too frequently. Wait ten " -#~ "minutes and try again. If you continue to try, you will need to wait " -#~ "even longer." -#~ msgstr "" -#~ "Jūs prisijunginėjote ir atsijunginėjote per dažnai. Palaukite dešimt " -#~ "minučių ir pabandykite iš naujo. Jei ir toliau bandysite, Jums reikės " -#~ "laukti dar ilgiau." - -#~ msgid "An unknown signon error has occurred: %s." -#~ msgstr "Įvyko nežinoma prisijungimo klaida: %s." - -#~ msgid "An unknown error, %d, has occurred. Info: %s" -#~ msgstr "Įvyko nežinoma klaida %d. Informacija: %s" - -#~ msgid "Invalid Groupname" -#~ msgstr "Neteisingas grupės pavadinimas" - -#~ msgid "Connection Closed" -#~ msgstr "Jungtis uždaryta" - -#~ msgid "Waiting for reply..." -#~ msgstr "Laukiama atsako..." - -#~ msgid "TOC has come back from its pause. You may now send messages again." -#~ msgstr "" -#~ "TOC protokolo užlaikymas baigėsi. Dabar Jūs vėl galite siųsti žinutes." - -#~ msgid "Password Change Successful" -#~ msgstr "Slaptažodis pakeistas sėkmingai" - -#~ msgid "Get Dir Info" -#~ msgstr "Gauti katalogo informaciją" - -#~ msgid "Set Dir Info" -#~ msgstr "Nustatyti katalogo informaciją" - -#~ msgid "Could not open %s for writing!" -#~ msgstr "Nepavyko atverti %s rašymui!" - -#~ msgid "File transfer failed; other side probably canceled." -#~ msgstr "Failų perdavimas nepavyko; greičiausiai kita pusė jį nutraukė." - -#~ msgid "Could not connect for transfer." -#~ msgstr "Nepavyko prisijungti perdavimui." - -#~ msgid "Could not write file header. The file will not be transferred." -#~ msgstr "Nepavyko rašyti failo antraštės. Failas nebus perduotas." - -#~ msgid "Save As..." -#~ msgstr "Įrašyti kaip..." - -#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s" -#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s" -#~ msgstr[0] "%s prašo %s priimti %d failą: %s (%.2f %s)%s%s" -#~ msgstr[1] "%s prašo %s priimti %d failus: %s (%.2f %s)%s%s" -#~ msgstr[2] "%s prašo %s priimti %d failų: %s (%.2f %s)%s%s" - -#~ msgid "%s requests you to send them a file" -#~ msgstr "%s prašo nusiųsti jam failą" - -#~ msgid "TOC Protocol Plugin" -#~ msgstr "TOC protokolo papildinys" - -#~ msgid "%s Options" -#~ msgstr "%s parinktys" - -#~ msgid "Proxy Options" -#~ msgstr "Tarpininko parinktys" - -#~ msgid "By log size" -#~ msgstr "pagal žurnalo dydį" - -#~ msgid "_Open Link in Browser" -#~ msgstr "_Atverti saitą naršyklėje" - -#~ msgid "ST_UN server:" -#~ msgstr "ST_UN Serveris:" - -#~ msgid "Smiley _Image" -#~ msgstr "_Šypsenėlės paveiksliukas" - -#~ msgid "Smiley S_hortcut" -#~ msgstr "_Šypsenėlės klavišų seka" diff -r 67143ecbddb1 -r 0907b0c775bb po/sk.po --- a/po/sk.po Mon Jul 27 03:14:08 2009 +0000 +++ b/po/sk.po Fri Jul 31 19:20:06 2009 +0000 @@ -9,10 +9,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Pidgin 2.5.5\n" +"Project-Id-Version: Pidgin 2.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-06 15:04-0700\n" -"PO-Revision-Date: 2009-02-22 21:22+0100\n" +"POT-Creation-Date: 2009-07-28 19:29-0700\n" +"PO-Revision-Date: 2009-07-21 19:44+0100\n" "Last-Translator: loptosko \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" @@ -164,7 +164,7 @@ "Online: %d\n" "Total: %d" msgstr "" -"Pripojený: %d\n" +"Prihlásený: %d\n" "Celkom: %d" #, c-format @@ -192,7 +192,7 @@ msgstr "Musíte vybrať účet." msgid "The selected account is not online." -msgstr "Vybraný účet nie je pripojený." +msgstr "Vybraný účet nie je prihlásený." msgid "Error adding buddy" msgstr "Chyba počas pridávania priateľa" @@ -429,7 +429,7 @@ msgstr "Zoradiť" msgid "By Status" -msgstr "Podľa stavu" +msgstr "Podľa statusu" msgid "Alphabetically" msgstr "Podľa abecedy" @@ -557,7 +557,7 @@ "automatically rejoined in the chat when the account reconnects." msgstr "" "Účet bol odpojený a už sa nenachádzate v chate. Keď sa účet znovu pripojí, " -"budete automaticky pripojený k tomuto chatu." +"budete automaticky prihlásený k tomuto chatu." msgid "No such command." msgstr "Tento príkaz neexistuje." @@ -703,13 +703,13 @@ msgstr "accounts: Zobraziť okno s účtami." msgid "debugwin: Show the debug window." -msgstr "debugwin: Zobraziť ladiace okno" +msgstr "debugwin: Zobraziť ladiace okno." msgid "prefs: Show the preference window." -msgstr "prefs: Zobraziť okno vlastností" +msgstr "prefs: Zobraziť okno vlastností." msgid "statuses: Show the savedstatuses window." -msgstr "statuses: Zobraziť okno stavov." +msgstr "statuses: Zobraziť okno uložených statusov." msgid "" "msgcolor <class> <foreground> <background>: Set the color " @@ -771,7 +771,7 @@ #. XXX: Use of ggp_str_to_uin() is an ugly hack! msgid "Status" -msgstr "Stav" +msgstr "Status" msgid "Close this window when all transfers finish" msgstr "Zatvoriť toto okno po dokončení všetkých prenosov" @@ -869,12 +869,11 @@ msgid "System Log" msgstr "Systémový záznam" -#, fuzzy msgid "Calling ... " -msgstr "Počíta sa..." +msgstr "Volá sa... " msgid "Hangup" -msgstr "" +msgstr "Zložiť" #. Number of actions msgid "Accept" @@ -884,25 +883,24 @@ msgstr "Odmietnuť" msgid "Call in progress." -msgstr "" +msgstr "Prebieha hovor." msgid "The call has been terminated." -msgstr "" +msgstr "Hovor bol prerušený." #, c-format msgid "%s wishes to start an audio session with you." -msgstr "" +msgstr "%s chce s vami začať zvukové sedenie." #, c-format msgid "%s is trying to start an unsupported media session type with you." -msgstr "" - -#, fuzzy +msgstr "%s skúša s vami začať nepodporované multimediálne sedenie." + msgid "You have rejected the call." -msgstr "Opustili ste kanál %s%s" +msgstr "Zrušili ste hovor." msgid "call: Make an audio call." -msgstr "" +msgstr "call: Hlasový hovor." msgid "Emails" msgstr "E-maily" @@ -1161,7 +1159,7 @@ msgstr "Zobraziť čas nečinnosti" msgid "Show Offline Buddies" -msgstr "Zobraziť odpojených priateľov" +msgstr "Zobraziť odhlásených priateľov" msgid "Notify buddies when you are typing" msgstr "Zobrazovať priateľom, kedy im píšete" @@ -1176,19 +1174,19 @@ msgstr "Ukladať rozhovory" msgid "Log status change events" -msgstr "Ukladať zmenu stavu" +msgstr "Ukladať zmenu statusu" msgid "Report Idle time" msgstr "Oznamovať čas nečinnosti:" msgid "Change status when idle" -msgstr "Zmeniť stav pri nečinnosti" +msgstr "Zmeniť status pri nečinnosti" msgid "Minutes before changing status" -msgstr "Počet minút pred zmenou stavu:" +msgstr "Počet minút pred zmenou statusu:" msgid "Change status to" -msgstr "Zmeniť stav na:" +msgstr "Zmeniť status na:" msgid "Conversations" msgstr "Rozhovory" @@ -1258,7 +1256,7 @@ msgstr "Zlyhanie rozhrania GStreamer" msgid "GStreamer failed to initialize." -msgstr "Nepodarilo sa inicializovať rozhranie GStreamer" +msgstr "Nepodarilo sa zapnúť rozhranie GStreamer." msgid "(default)" msgstr "(predvolené)" @@ -1341,10 +1339,10 @@ msgstr "Naozaj chcete odstrániť „%s“" msgid "Delete Status" -msgstr "Odstrániť stav" +msgstr "Odstrániť status" msgid "Saved Statuses" -msgstr "Uložené stavy" +msgstr "Uložené statusy" msgid "Title" msgstr "Nadpis" @@ -1371,28 +1369,28 @@ msgstr "Chybný titulok" msgid "Please enter a non-empty title for the status." -msgstr "Pre stav, prosím, nezadávajte prázdny titulok." +msgstr "Pre status, prosím, nezadávajte prázdny titulok." msgid "Duplicate title" msgstr "Duplicitný titulok" msgid "Please enter a different title for the status." -msgstr "Zadajte, prosím, iný titulok pre tento stav." +msgstr "Zadajte, prosím, iný titulok pre tento status." msgid "Substatus" -msgstr "Podstav" +msgstr "Podstatus" msgid "Status:" -msgstr "Stav:" +msgstr "Status:" msgid "Message:" msgstr "Správa:" msgid "Edit Status" -msgstr "Upraviť stav" +msgstr "Upraviť status" msgid "Use different status for following accounts" -msgstr "Pre nasledujúce účty používať iný stav" +msgstr "Pre nasledujúce účty používať iný status" #. Save & Use msgid "Save & Use" @@ -1405,7 +1403,7 @@ msgstr "Zvuky" msgid "Statuses" -msgstr "Stavy" +msgstr "Statusy" msgid "Error loading the plugin." msgstr "Počas načítavania modulu sa vyskytli chyby." @@ -1510,19 +1508,19 @@ "rozhovoru." msgid "Online" -msgstr "Pripojený" +msgstr "Prihlásený" msgid "Offline" -msgstr "Odpojený" +msgstr "Odhlásený" msgid "Online Buddies" -msgstr "Pripojených priateľov" +msgstr "Prihlásení priatelia" msgid "Offline Buddies" -msgstr "Odpojení priatelia" +msgstr "Neprihlásení priatelia" msgid "Online/Offline" -msgstr "Pripojený/odpojený" +msgstr "Prihlásený/odhlásený" msgid "Meebo" msgstr "Meebo" @@ -1557,22 +1555,23 @@ "\n" "Fetching TinyURL..." msgstr "" +"\n" +"Získava sa TinyURL..." msgid "Only create TinyURL for urls of this length or greater" -msgstr "" +msgstr "Vytvárať TinyURL pre adresy tejto dĺžky alebo dlhšie" msgid "TinyURL (or other) address prefix" -msgstr "" - -#, fuzzy +msgstr "TinyURL (alebo iná) predpona adresy" + msgid "TinyURL" -msgstr "Tune URL" +msgstr "TinyURL" msgid "TinyURL plugin" -msgstr "" +msgstr "Modul TinyURL" msgid "When receiving a message with URL(s), TinyURL for easier copying" -msgstr "" +msgstr "Pri doručovaní správ s adresami, TinyURL pre ľahšie kopírovanie" msgid "accounts" msgstr "účty" @@ -1687,6 +1686,7 @@ "Certifikát od používateľa „%s“ je podpísaný samým sebou. Nie je možné ho " "automaticky overiť." +#. FIXME 2.6.1 #, c-format msgid "The certificate chain presented for %s is not valid." msgstr "Reťaz certifikátu od používateľa %s nie je správna." @@ -1696,6 +1696,7 @@ #. stifle it. #. TODO: Probably wrong. #. TODO: Probably wrong +#. TODO: Probably wrong. msgid "SSL Certificate Error" msgstr "Chyba SSL Certifikátu" @@ -1737,7 +1738,7 @@ "could mean that you are not connecting to the service you believe you are." msgstr "" "Certifikát od používateľa „%s“ tvrdí, že pochádza od používateľa „%s“. To " -"môže znamenať, že sa nepripájate na tú službu, na ktorú sa chcete pripojiť. " +"môže znamenať, že sa nepripájate na tú službu, na ktorú sa chcete pripojiť." #. Make messages #, c-format @@ -1775,7 +1776,6 @@ msgstr "+++ používateľ %s sa odhlásil" #. Unknown error -#. Unknown error! msgid "Unknown error" msgstr "Neznáma chyba" @@ -1822,9 +1822,8 @@ msgid "%s left the room (%s)." msgstr "používateľ %s opustil miestnosť (%s)." -#, fuzzy msgid "Invite to chat" -msgstr "Pozvať na konferenciu" +msgstr "Pozvať na chat" #. Put our happy label in it. msgid "" @@ -1965,6 +1964,10 @@ msgstr "Začína sa prenos %s od používateľa %s" #, c-format +msgid "Transfer of file %s complete" +msgstr "Prenos súboru %s bol dokončený" + +#, c-format msgid "Transfer of file %s complete" msgstr "Prenos súboru %s bol dokončený" @@ -2169,9 +2172,8 @@ msgid "(%s) %s : %s\n" msgstr "(%s) %s : %s\n" -#, fuzzy msgid "Error creating conference." -msgstr "Chyba pri vytváraní spojenia" +msgstr "Chyba pri vytváraní konferencie." #, c-format msgid "You are using %s, but this plugin requires %s." @@ -2471,7 +2473,7 @@ msgstr "(UTC)" msgid "User is offline." -msgstr "Používateľ je odpojený." +msgstr "Používateľ nie je prihlásený." msgid "Auto-response sent:" msgstr "Odoslaná automatická odpoveď:" @@ -2570,7 +2572,6 @@ msgstr "V prehliadači záznamov prehliadať aj záznamy ostatných IM klientov." #. * description -#, fuzzy msgid "" "When viewing logs, this plugin will include logs from other IM clients. " "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n" @@ -2579,10 +2580,10 @@ "at your own risk!" msgstr "" "Tento modul pri prehliadaní záznamov pridáva záznamy z ostatných IM " -"klientov. Momentálne sa to týka klientov Adium, Fire, Messenger Plus!, MSN " -"Messenger a Trillian.\n" -"\n" -"UPOZORNENIE: Tento modul je stále testovací a môže občas padnúť. Používajte " +"klientov. Momentálne sa to týka klientov Adium, MSN Messenger, aMSN a " +"Trillian.\n" +"\n" +"UPOZORNENIE: Tento modul je stále testovací a môže často padať. Používajte " "ho na vlastné riziko!" msgid "Mono Plugin Loader" @@ -2626,22 +2627,21 @@ msgstr "Emulácia offline správ" msgid "Save messages sent to an offline user as pounce." -msgstr "Pridáva správy pre odhlásených používateľov ako sledovanie." - -#, fuzzy +msgstr "Pridáva správy pre neprihlásených používateľov ako sledovanie." + msgid "" "The rest of the messages will be saved as pounces. You can edit/delete the " "pounce from the `Buddy Pounce' dialog." msgstr "" -"Zostatok správ bude uložený ako sledovanie. Sledovanie môžete pridať/" -"odstrániť v dialógu „Sledovanie priateľov“." +"Zvyšok správ bude uložený ako sledovanie. Sledovanie môžete pridať/odstrániť " +"v dialógu „Sledovanie priateľov“." #, c-format msgid "" "\"%s\" is currently offline. Do you want to save the rest of the messages in " "a pounce and automatically send them when \"%s\" logs back in?" msgstr "" -"Používateľ „%s“ je momentálne odhlásený. Chcete uložiť zvyšok správ do " +"Používateľ „%s“ momentálne nie je prihlásený. Chcete uložiť zvyšok správ do " "sledovania, a automaticky ich odoslať hneď, keď sa „%s“ prihlási?" msgid "Offline Message" @@ -2662,9 +2662,8 @@ msgid "Do not ask. Always save in pounce." msgstr "Nepýtať sa. Vždy uložiť do sledovania." -#, fuzzy msgid "One Time Password" -msgstr "Zadajte heslo" +msgstr "Heslo na jedno použitie" #. *< type #. *< ui_requirement @@ -2673,13 +2672,13 @@ #. *< priority #. *< id msgid "One Time Password Support" -msgstr "" +msgstr "Podpora hesla na jedno použitie" #. *< name #. *< version #. * summary msgid "Enforce that passwords are used only once." -msgstr "" +msgstr "Zaručiť že heslá sa použijú iba raz." #. * description msgid "" @@ -2687,6 +2686,9 @@ "are only used in a single successful connection.\n" "Note: The account password must not be saved for this to work." msgstr "" +"Umožňuje zaručiť aby sa heslá ktoré nie sú uložené použili iba na jedno " +"úspešné pripojenie.\n" +"Poznámka: Funguje iba ak heslo nie je uložené." #. *< type #. *< ui_requirement @@ -2854,7 +2856,7 @@ #. *< priority #. *< id msgid "Buddy State Notification" -msgstr "Upozornenie na stav priateľa" +msgstr "Upozornenie na status priateľa" #. *< name #. *< version @@ -2880,17 +2882,15 @@ "Nebol nájdený ActiveTCL. Ak chcete používať moduly TCL, nainštalujťe " "ActiveTCL z http://www.activestate.com\n" -#, fuzzy msgid "" "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin." "im/BonjourWindows for more information." msgstr "" -"Toolkit Apple Bonjour For Windows nebol nájdený, pozrite časté otázky na " -"stránke: http://d.pidgin.im/BonjourWindows" - -#, fuzzy +"Toolkit Apple Bonjour For Windows nebol nájdený, pozrite http://d.pidgin.im/" +"BonjourWindows pre viac informácii." + msgid "Unable to listen for incoming IM connections" -msgstr "Nepodarilo sa spustiť čakanie na prichádzajúce spojenia\n" +msgstr "Nepodarilo sa čakať na prichádzajúce IM spojenia" msgid "" "Unable to establish connection with the local mDNS server. Is it running?" @@ -2941,21 +2941,17 @@ msgid "Unable to send the message, the conversation couldn't be started." msgstr "Nepodarilo sa odoslať správu, rozhovor sa nezačal." -#, fuzzy, c-format +#, c-format msgid "Unable to create socket: %s" -msgstr "" -"Nepodarilo sa vytvoriť socket:\n" -"%s" - -#, fuzzy, c-format +msgstr "Nepodarilo sa vytvoriť socket: %s" + +#, c-format msgid "Unable to bind socket to port: %s" -msgstr "Nepodarilo sa zviazať socket na port" - -#, fuzzy, c-format +msgstr "Nepodarilo sa zviazať socket na port: %s" + +#, c-format msgid "Unable to listen on socket: %s" -msgstr "" -"Nepodarilo sa vytvoriť socket:\n" -"%s" +msgstr "Nepodarilo sa čakať na sockete: %s" msgid "Error communicating with local mDNSResponder." msgstr "Chyba počas komunikácie s lokálnym mDNSResponder." @@ -3002,17 +2998,14 @@ msgid "Load buddylist from file..." msgstr "Otvoriť zoznam priateľov zo súboru..." -#, fuzzy msgid "You must fill in all registration fields" -msgstr "Vyplňte políčka registrácie." - -#, fuzzy +msgstr "Musíte vyplniť všetky políčka registrácie" + msgid "Passwords do not match" -msgstr "Heslá sa nezhodujú." - -#, fuzzy +msgstr "Heslá sa nezhodujú" + msgid "Unable to register new account. An unknown error occurred." -msgstr "Nepodarilo sa vytvoriť nový účet. Vyskytla sa chyba.\n" +msgstr "Nepodarilo sa vytvoriť nový účet. Vyskytla sa neznáma chyba." msgid "New Gadu-Gadu Account Registered" msgstr "Nový Gadu-Gadu účet bol zaregistrovaný" @@ -3027,9 +3020,8 @@ msgstr "Heslo (znovu)" msgid "Enter captcha text" -msgstr "" - -#, fuzzy +msgstr "Zadajte text z obrázku captcha" + msgid "Captcha" msgstr "Obrázok captcha" @@ -3058,7 +3050,7 @@ msgstr "Žena" msgid "Only online" -msgstr "Len pripojený" +msgstr "Len prihlásení" msgid "Find buddies" msgstr "Nájsť priateľov" @@ -3108,7 +3100,7 @@ #. Global msgid "Available" -msgstr "Pripojený" +msgstr "Prihlásený" #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message @@ -3159,7 +3151,7 @@ #. * signedOn signal, so clients can now do anything with msimprpl, and #. * we're ready for it (session key, userid, username all setup). msgid "Connected" -msgstr "Pripojený" +msgstr "Prihlásený" msgid "Connection failed" msgstr "Pripojenie zlyhalo" @@ -3170,9 +3162,9 @@ msgid "Chat _name:" msgstr "Me_no na chate:" -#, fuzzy, c-format +#, c-format msgid "Unable to resolve hostname '%s': %s" -msgstr "Nepodarilo sa pripojiť na server." +msgstr "Nepodarilo sa preložiť meno hostiteľa '%s': %s" #. 1. connect to server #. connect to the server @@ -3185,9 +3177,8 @@ msgid "This chat name is already in use" msgstr "Toto meno už používa niekto iný" -#, fuzzy msgid "Not connected to the server" -msgstr "Nepripojený na server." +msgstr "Neprihásený na server" msgid "Find buddies..." msgstr "Hľadať priateľov..." @@ -3228,9 +3219,8 @@ msgid "Gadu-Gadu User" msgstr "Používateľ Gadu-Gadu" -#, fuzzy msgid "GG server" -msgstr "Získava sa server" +msgstr "GG server" #, c-format msgid "Unknown command: %s" @@ -3246,7 +3236,6 @@ msgid "File Transfer Failed" msgstr "Prenos súboru zlyhal" -#, fuzzy msgid "Unable to open a listening port." msgstr "Nebolo možné otvoriť port na počúvanie." @@ -3270,11 +3259,9 @@ #. #. TODO: what to do here - do we really have to disconnect? #. TODO: do we really want to disconnect on a failure to write? -#, fuzzy, c-format +#, c-format msgid "Lost connection with server: %s" -msgstr "" -"Pripojenie k servera bolo prerušené:\n" -"%s" +msgstr "Pripojenie na server bolo stratené: %s" msgid "View MOTD" msgstr "Zobraziť správu dňa" @@ -3285,9 +3272,8 @@ msgid "_Password:" msgstr "_Heslo:" -#, fuzzy msgid "IRC nick and server may not contain whitespace" -msgstr "Prezývky na IRC nesmú obsahovať medzery" +msgstr "Prezývky a IRC servery nesmú obsahovať medzery" msgid "SSL support unavailable" msgstr "Podpora SSL je nedostupná" @@ -3296,13 +3282,13 @@ msgstr "Nepodarilo sa pripojiť" #. this is a regular connect, error out -#, fuzzy, c-format +#, c-format msgid "Unable to connect: %s" -msgstr "Nepodarilo sa pripojiť na %s" - -#, fuzzy, c-format +msgstr "Nepodarilo sa pripojiť: %s" + +#, c-format msgid "Server closed the connection" -msgstr "Server zrušil pripojenie." +msgstr "Server zrušil pripojenie" msgid "Users" msgstr "Používatelia" @@ -3390,7 +3376,7 @@ msgstr "Nečinný" msgid "Online since" -msgstr "Pripojený od" +msgstr "Prihlásený od" msgid "Defining adjective:" msgstr "Opisné prídavné meno:" @@ -3484,13 +3470,12 @@ #. We only want to do the following dance if the connection #. has not been successfully completed. If it has, just #. notify the user that their /nick command didn't go. -#, fuzzy, c-format +#, c-format msgid "The nickname \"%s\" is already being used." -msgstr "Toto meno už používa niekto iný" - -#, fuzzy +msgstr "Prezývka \"%s\" je už obsadená." + msgid "Nickname in use" -msgstr "Prezývka" +msgstr "Prezývka je obsadená" msgid "Cannot change nick" msgstr "Nepodarilo sa zmeniť prezývku" @@ -3728,18 +3713,14 @@ msgstr "Neznáma chyba" msgid "Ad-Hoc Command Failed" -msgstr "príkaz Ad-Hoc zlyhal" +msgstr "Príkaz Ad-Hoc zlyhal" msgid "execute" msgstr "vykonať" -#, fuzzy msgid "Server requires TLS/SSL, but no TLS/SSL support was found." -msgstr "" -"Server vyžaduje na prihlásenie TLS/SSL, ale podpora pre TLS/SSL nebola " -"nájdená." - -#, fuzzy +msgstr "Server vyžaduje TLS/SSL, ale podpora pre TLS/SSL nebola nájdená." + msgid "You require encryption, but no TLS/SSL support was found." msgstr "Požadujete šifrovanie, ale podpora pre TLS/SSL nebola nájdená." @@ -3757,13 +3738,11 @@ msgid "Plaintext Authentication" msgstr "Čisto textová autentifikácia" -#, fuzzy msgid "SASL authentication failed" -msgstr "Autentifikácia zlyhala" - -#, fuzzy +msgstr "SASL autentifikácia zlyhala" + msgid "Invalid response from server" -msgstr "Chybná odpoveď zo servera." +msgstr "Chybná odpoveď zo servera" msgid "Server does not use any supported authentication method" msgstr "Server nepoužíva žiadny z podporovaných spôsobov autentifikácie" @@ -3774,36 +3753,28 @@ msgid "Invalid challenge from server" msgstr "Chybná výzva zo servera" -#, fuzzy, c-format +#, c-format msgid "SASL error: %s" -msgstr "Chyba SASL" +msgstr "Chyba SASL: %s" msgid "The BOSH connection manager terminated your session." -msgstr "" - -#, fuzzy +msgstr "Manažér pripojení BOSH prerušil vaše sedenie." + msgid "No session ID given" -msgstr "Nebol uvedený dôvod" - -#, fuzzy +msgstr "Nebolo dané ID sedenia" + msgid "Unsupported version of BOSH protocol" -msgstr "Verzia nepodporovaná" - -#, fuzzy +msgstr "Verzia BOSH protokolu nepodporovaná" + msgid "Unable to establish a connection with the server" -msgstr "" -"Nepodarilo sa založiť spojenie so serverom:\n" -"%s" - -#, fuzzy, c-format +msgstr "Nepodarilo sa založiť spojenie so serverom" + +#, c-format msgid "Unable to establish a connection with the server: %s" -msgstr "" -"Nepodarilo sa založiť spojenie so serverom:\n" -"%s" - -#, fuzzy +msgstr "Nepodarilo sa založiť spojenie so serverom: %s" + msgid "Unable to establish SSL connection" -msgstr "Spojenie sa nedá inicializovať" +msgstr "SSL pripojenie sa nepodarilo založiť" msgid "Full Name" msgstr "Celé meno" @@ -3871,9 +3842,8 @@ msgid "Operating System" msgstr "Operačný systém" -#, fuzzy msgid "Local Time" -msgstr "Lokálny súbor:" +msgstr "Miestny čas" msgid "Priority" msgstr "Priorita" @@ -3883,11 +3853,10 @@ #, c-format msgid "%s ago" -msgstr "" - -#, fuzzy +msgstr "%s dozadu" + msgid "Logged Off" -msgstr "Prihlásený" +msgstr "Odhlásený" msgid "Middle Name" msgstr "Prostredné meno" @@ -4056,26 +4025,23 @@ msgid "Find Rooms" msgstr "Hľadať miestnosti" -#, fuzzy msgid "Affiliations:" -msgstr "Prezývka:" - -#, fuzzy +msgstr "Hodnosti:" + msgid "No users found" -msgstr "Neboli nájdení žiadni zodpovedajúci používatelia" - -#, fuzzy +msgstr "Nenájdení žiadni používatelia" + msgid "Roles:" -msgstr "Postavenie" - -#, fuzzy +msgstr "Úlohy:" + msgid "Ping timed out" -msgstr "Interval ping" +msgstr "Ping vypršal" msgid "" "Unable to find alternative XMPP connection methods after failing to connect " "directly." msgstr "" +"Neboli nájdené iné metódy XMPP spojenia po tom čo zlyhalo priame spojenie." msgid "Invalid XMPP ID" msgstr "Chybné XMPP ID" @@ -4083,9 +4049,8 @@ msgid "Invalid XMPP ID. Domain must be set." msgstr "XMPP ID je chybné. Musíte zadať doménu." -#, fuzzy msgid "Malformed BOSH URL" -msgstr "Nepodarilo sa spojiť so serverom." +msgstr "Chybná BOSH adresa" #, c-format msgid "Registration of %s@%s successful" @@ -4156,10 +4121,6 @@ msgid "Change Registration" msgstr "Zmeniť registráciu" -#, fuzzy -msgid "Malformed BOSH Connect Server" -msgstr "Nepodarilo sa spojiť so serverom." - msgid "Error unregistering account" msgstr "Chyba pri rušení účtu" @@ -4423,7 +4384,7 @@ #, c-format msgid "Unknown affiliation: \"%s\"" -msgstr "Neznámy vzťah: „%s“" +msgstr "Neznáma hodnosť: „%s“" #, c-format msgid "Unable to affiliate user %s as \"%s\"" @@ -4445,19 +4406,22 @@ msgid "Unable to ping user %s" msgstr "Nepodarilo sa poslať ping používateľovi %s" -#, fuzzy, c-format +#, c-format msgid "Unable to buzz, because there is nothing known about %s." -msgstr "Nepodarilo sa poslať bzzz, pretože o používateľovi %s nič nevieme." - -#, fuzzy, c-format +msgstr "Nepodarilo sa poslať bzzz, pretože o používateľovi %s sa nič nevie." + +#, c-format msgid "Unable to buzz, because %s might be offline." -msgstr "Nepodarilo sa poslať bzzz, pretože používateľ %s môže byť odpojený." - -#, fuzzy, c-format +msgstr "" +"Nepodarilo sa poslať bzzz, pretože používateľ %s asi nie je prihlásený." + +#, c-format msgid "" "Unable to buzz, because %s does not support it or does not wish to receive " "buzzes now." -msgstr "Nepodarilo sa poslať bzzz, pretože používateľ %s to nepodporuje." +msgstr "" +"Nepodarilo sa poslať bzzz, pretože používateľ %s to nepodporuje alebo si to " +"momentálne neželá." #, c-format msgid "Buzzing %s..." @@ -4472,36 +4436,35 @@ msgid "%s has buzzed you!" msgstr "Používateľ %s vám poslal bzzz!" -#, fuzzy, c-format +#, c-format msgid "Unable to initiate media with %s: invalid JID" -msgstr "Nepodarilo sa odoslať súbor používateľovi %s, chybné JID" - -#, fuzzy, c-format +msgstr "Nepodarilo sa spustenie média s používateľom %s: chybné JID" + +#, c-format msgid "Unable to initiate media with %s: user is not online" -msgstr "Používateľovi %s nie je možné odoslať súbor, práve je odpojený" - -#, fuzzy, c-format +msgstr "Nepodarilo sa spustenie média s používateľom %s: je neprihlásený" + +#, c-format msgid "Unable to initiate media with %s: not subscribed to user presence" msgstr "" -"Používateľovi %s nie je možné odoslať súbor, nie je zapísaný v prítomných " -"používateľoch" - -#, fuzzy +"Nepodarilo sa spustenie média s používateľom %s: nezaznamenaný medzi " +"prítomnými" + msgid "Media Initiation Failed" -msgstr "Registrácia zlyhala" - -#, fuzzy, c-format +msgstr "Zakladanie média zlyhalo" + +#, c-format msgid "" "Please select the resource of %s with which you would like to start a media " "session." -msgstr "Vyberte, prosím, zdroj používateľa %s, na ktorý chcete odoslať súbor" +msgstr "" +"Vyberte, prosím, zdroj používateľa %s ku ktorému začať mediálne sedenie." msgid "Select a Resource" msgstr "Vyberte zdroj" -#, fuzzy msgid "Initiate Media" -msgstr "Začať _chat" +msgstr "Začať médium" msgid "config: Configure a chat room." msgstr "config: Nastavenie miestnosti chatu." @@ -4521,21 +4484,20 @@ msgid "ban <user> [reason]: Ban a user from the room." msgstr "ban <používateľ> [dôvod]: Vykázať používateľa z miestnosti." -#, fuzzy msgid "" "affiliate <owner|admin|member|outcast|none> [nick1] [nick2] ...: Get " "the users with an affiliation or set users' affiliation with the room." msgstr "" -"affiliate <používateľ> <owner|admin|member|outcast|none>: " -"Nastaví používateľové pričlenenie v miestnosti." - -#, fuzzy +"affiliate <owner|admin|member|outcast|none> [prezývka1] " +"[prezývka2] ...: V tejto miestnosti ukáže používateľov s danou hodosťou " +"alebo udelí používateľovi hodnosť." + msgid "" "role <moderator|participant|visitor|none> [nick1] [nick2] ...: Get the " "users with an role or set users' role with the room." msgstr "" -"role <používateľ> <moderator|participant|visitor|none>: Nastaví " -"postavenie používateľa v miestnosti." +"role <moderator|participant|visitor|none> [prezývka1] [prezývka2] ...: " +"Nastaví úlohu používateľa v miestnosti." msgid "invite <user> [message]: Invite a user to the room." msgstr "invite <user> [správa]: Pozve používateľa do miestnosti." @@ -4597,7 +4559,7 @@ msgstr "Proxy prenosu súborov" msgid "BOSH URL" -msgstr "" +msgstr "Adresa BOSH" #. this should probably be part of global smiley theme settings later on, #. shared with MSN @@ -4661,32 +4623,28 @@ msgid "_Accept Defaults" msgstr "_Prijať štandardné" -#, fuzzy msgid "No reason" -msgstr "Nebol uvedený dôvod" - -#, fuzzy, c-format +msgstr "Žiadny dôvod" + +#, c-format msgid "You have been kicked: (%s)" -msgstr "Používateľ %s vás vykopol: (%s)" - -#, fuzzy, c-format +msgstr "Boli ste vykopnutý: (%s)" + +#, c-format msgid "Kicked (%s)" -msgstr "Vykopnutý používateľom %s (%s)" - -#, fuzzy +msgstr "Vykopnutý (%s)" + msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "Pri otváraní súboru sa vyskytla chyba." - -#, fuzzy +msgstr "Na in-band bytestream prenose sa vyskytla chyba\n" + msgid "Transfer was closed." -msgstr "Prenos súboru zlyhal" - -#, fuzzy +msgstr "Zrušil sa prenos." + msgid "Failed to open the file" -msgstr "Nepodarilo sa otvoriť súbor „%s“: %s" +msgstr "Otvoriť súbor sa nepodarilo." msgid "Failed to open in-band bytestream" -msgstr "" +msgstr "Otvoriť in-band bajtový tok sa nepodarilo" #, c-format msgid "Unable to send file to %s, user does not support file transfers" @@ -4701,7 +4659,7 @@ #, c-format msgid "Unable to send file to %s, user is not online" -msgstr "Používateľovi %s nie je možné odoslať súbor, práve je odpojený" +msgstr "Používateľovi %s nie je možné odoslať súbor, je neprihlásený" #, c-format msgid "Unable to send file to %s, not subscribed to user presence" @@ -4762,7 +4720,7 @@ #, c-format msgid "Buddy list synchronization issue in %s (%s)" -msgstr "Problém synchronizácie zoznamu kamarátov v %s (%s)" +msgstr "Problém synchronizácie zoznamu priateľov v %s (%s)" #, c-format msgid "" @@ -4770,7 +4728,7 @@ "Do you want this buddy to be added?" msgstr "" "%s v miestnom zozname je v skupine „%s“, ale nie je v zozname servera. " -"Chcete tohto kamaráta pridať?" +"Chcete tohto priateľa pridať?" #, c-format msgid "" @@ -4778,7 +4736,7 @@ "to be added?" msgstr "" "%s je v miestnom zozname, ale nie je v zozname servera. Chcete tohto " -"kamaráta pridať?" +"priateľa pridať?" #, c-format msgid "Unable to parse message" @@ -4806,7 +4764,7 @@ #, c-format msgid "Invalid username" -msgstr "Chybné používateľské meno." +msgstr "Chybné používateľské meno" #, c-format msgid "Invalid friendly name" @@ -4826,7 +4784,7 @@ #, c-format msgid "User is offline" -msgstr "Používateľ je odpojený" +msgstr "Používateľ nie je prihlásený" #, c-format msgid "Already in the mode" @@ -4974,7 +4932,7 @@ #, c-format msgid "Not allowed when offline" -msgstr "Nepovolené v odpojenom stave" +msgstr "Nepovolené ak odhlásený" #, c-format msgid "Not accepting new users" @@ -5009,9 +4967,26 @@ msgid "Non-IM Contacts" msgstr "Kontakty bez rozhovoru" -#, fuzzy, c-format +#, c-format +msgid "%s sent a wink. Click here to play it" +msgstr "Používateľ %s poslal wink. Prehrať ho" + +#, c-format +msgid "%s sent a wink, but it could not be saved" +msgstr "Používateľ %s poslal wink, ale nedal sa uložiť" + +#, c-format +msgid "%s sent a voice clip. Click here to play it" +msgstr "Používateľ %s poslal hlasový klip. Prehrať ho" + +#, c-format +msgid "%s sent a voice clip, but it could not be saved" +msgstr "Používateľ %s poslal hlasový klip, ale nedal sa uložiť" + +#, c-format msgid "%s sent you a voice chat invite, which is not yet supported." -msgstr "%s vám poslal pozvánku na webkameru, ktorá zatiaľ nie je podporovaná." +msgstr "" +"%s vám poslal pozvánku na hlasový hovor, ktorý zatiaľ nie je podporovaný." msgid "Nudge" msgstr "Štuchanec" @@ -5165,6 +5140,29 @@ "Pre MSN je potrebná podpora SSL. Nainštalujte, prosím, podporovanú SSL " "knižnicu." +#, c-format +msgid "" +"Unable to add the buddy %s because the username is invalid. Usernames must " +"be a valid email address." +msgstr "" +"Nepodarilo sa pridať priateľa %s, pretože používateľské meno je chybné. " +"Používateľské mená musia byť správna e-mailová adresa." + +msgid "Unable to Add" +msgstr "Nepodarilo sa pridať" + +msgid "Authorization Request Message:" +msgstr "Žiadosť o autorizáciu:" + +msgid "Please authorize me!" +msgstr "Autorizujte ma, prosím!" + +#. * +#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. +#. +msgid "_OK" +msgstr "_OK" + msgid "Error retrieving profile" msgstr "Chyba pri získavaní profilu" @@ -5356,13 +5354,14 @@ msgid "%s just sent you a Nudge!" msgstr "%s vám práve poslal „šťuchanec“!" -#, fuzzy, c-format +#, c-format msgid "Unknown error (%d): %s" -msgstr "Neznáma chyba (%d)" +msgstr "Neznáma chyba (%d): %s" msgid "Unable to add user" msgstr "Nebolo možné pridať používateľa" +#. Unknown error! #, c-format msgid "Unknown error (%d)" msgstr "Neznáma chyba (%d)" @@ -5435,25 +5434,21 @@ "Chyba pripojenia %s servera:\n" "%s" -#, fuzzy msgid "Our protocol is not supported by the server" msgstr "Server nepodporuje náš protokol." -#, fuzzy msgid "Error parsing HTTP" -msgstr "Chyba pri spracovávaní HTTP." - -#, fuzzy +msgstr "Chyba pri spracovávaní HTTP" + msgid "You have signed on from another location" -msgstr "Prihlásili ste sa z iného miesta." +msgstr "Prihlásili ste sa z iného miesta" msgid "The MSN servers are temporarily unavailable. Please wait and try again." msgstr "" "MSN servery sú dočasne nedostupné. Počkajte, prosím, a skúste to znovu." -#, fuzzy msgid "The MSN servers are going down temporarily" -msgstr "MSN servery sa dočasne vypínajú." +msgstr "MSN servery sa dočasne vypínajú" #, c-format msgid "Unable to authenticate: %s" @@ -5482,9 +5477,9 @@ msgid "Retrieving buddy list" msgstr "Prijíma sa zoznam priateľov" -#, fuzzy, c-format +#, c-format msgid "%s requests to view your webcam, but this request is not yet supported." -msgstr "%s vám poslal pozvánku na webkameru, ktorá zatiaľ nie je podporovaná." +msgstr "%s žiada o sledovanie vašej webkamery, zatiaľ to nie je podporované." #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -5506,7 +5501,7 @@ msgstr "Správu sa nepodarilo odoslať, pretože ste neviditeľný:" msgid "Message could not be sent because the user is offline:" -msgstr "Správu sa nepodarilo odoslať, pretože používateľ je odpojený:" +msgstr "Správu sa nepodarilo odoslať, pretože používateľ nie je prihlásený:" msgid "Message could not be sent because a connection error occurred:" msgstr "Správu sa nepodarilo odoslať, pretože sa vyskytla chyba spojenia:" @@ -5680,15 +5675,15 @@ msgid "Protocol error, code %d: %s" msgstr "Chyba protokolu, kód %d: %s" -#, fuzzy, c-format +#, c-format msgid "" "%s Your password is %zu characters, which is longer than the maximum length " "of %d. Please shorten your password at http://profileedit.myspace.com/index." "cfm?fuseaction=accountSettings.changePassword and try again." msgstr "" -"%s Vaše heslo má %d znakov, viac než je maximálna dĺžka %d na MySpaceIM. " -"Skráťte, prosím, vaše heslo na adrese http://profileedit.myspace.com/index." -"cfm?fuseaction=accountSettings.changePassword a skúste znovu." +"%s Vaše heslo má %zu znakov, viac než je maximálna dĺžka %d. Skráťte, " +"prosím, vaše heslo na adrese http://profileedit.myspace.com/index.cfm?" +"fuseaction=accountSettings.changePassword a skúste znovu." msgid "Incorrect username or password" msgstr "Nesprávne používateľské meno alebo heslo" @@ -5784,15 +5779,14 @@ msgid "Client Version" msgstr "Verzia klienta" -#, fuzzy msgid "" "An error occurred while trying to set the username. Please try again, or " "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username " "to set your username." msgstr "" -"Prosím, choďte na http://editprofile.myspace.com/index.cfm?" -"fuseaction=profile.username a vyberte si používateľské meno a skúste sa " -"prihlásiť znovu." +"Počas pokusu o nastavenie používateľského mena sa vyskytla chyba. Prosím, " +"skúste to znova alebo navštívte adresu http://editprofile.myspace.com/index." +"cfm?fuseaction=profile.username a nastavte si ho tam." msgid "MySpaceIM - Username Available" msgstr "MySpaceIM - Používateľské meno je dostupné" @@ -6044,15 +6038,15 @@ "Táto demoverzia nedovoľuje prihlásenie viac ako desiatich používateľov naraz" msgid "The user is either offline or you are blocked" -msgstr "Používateľ je buď odpojený, alebo ste zablokovaný" +msgstr "Buď používateľ nie je prihlásený, alebo ste zablokovaný" #, c-format msgid "Unknown error: 0x%X" msgstr "Neznáma chyba: 0x%X" -#, fuzzy, c-format +#, c-format msgid "Unable to login: %s" -msgstr "Nebolo možné sa prihlásiť" +msgstr "Nebolo možné sa prihlásiť: %s" #, c-format msgid "Unable to send message. Could not get details for user (%s)." @@ -6184,15 +6178,15 @@ msgid "" "%s appears to be offline and did not receive the message that you just sent." msgstr "" -"%s je podľa všetkého odpojený a neprijal správu, ktorú ste práve odoslali." - -#, fuzzy +"Používateľ %s podľa všetkého nie je prihlásený a neprijal správu, ktorú ste " +"práve odoslali." + msgid "" "Unable to connect to server. Please enter the address of the server to which " "you wish to connect." msgstr "" -"Nedá sa pripojiť na server. Zadajte, prosím, adresu servera, na ktorý sa " -"chcete pripojiť." +"Nepodarilo sa pripojiť na server. Zadajte, prosím, adresu servera, na ktorý " +"sa chcete pripojiť." msgid "This conference has been closed. No more messages can be sent." msgstr "" @@ -6217,9 +6211,8 @@ msgid "Server port" msgstr "Port servera" -#, fuzzy msgid "Received unexpected response from " -msgstr "Zo servera bola prijatá neočakávaná HTTP odpoveď." +msgstr "Bola prijatá neočakávaná odpoveď z " #. username connecting too frequently msgid "" @@ -6229,12 +6222,12 @@ "Pripájali a odpájali ste sa príliš často. Počkajte desať minút a skúste " "znova. Ak budete i naďalej skúšať, budete musieť čakať este dlhšie." -#, fuzzy, c-format +#, c-format msgid "Error requesting " -msgstr "Chyba pri požadovaní prihlasovacieho tokenu" +msgstr "Chyba pri požadovaní " msgid "AOL does not allow your screen name to authenticate here" -msgstr "" +msgstr "AOL neumožňuje vášmu používateľskému menu sa tu autentifikovať" msgid "Could not join chat room" msgstr "Nepodarilo sa pripojiť do miestnosti" @@ -6242,9 +6235,8 @@ msgid "Invalid chat room name" msgstr "Chybný názov miestnosti" -#, fuzzy msgid "Received invalid data on connection with server" -msgstr "Prijaté neplatné dáta počas spojenia so serverom." +msgstr "Počas spojenia so serverom boli prijaté neplatné dáta" #. *< type #. *< ui_requirement @@ -6291,7 +6283,6 @@ msgid "Received invalid data on connection with remote user." msgstr "Prijaté neplatné dáta pri spojení so vzdialeným používateľom." -#, fuzzy msgid "Unable to establish a connection with the remote user." msgstr "Nepodarilo sa založiť pripojenie so vzdialeným používateľom." @@ -6491,15 +6482,13 @@ msgid "Buddy Comment" msgstr "Komentár priateľa" -#, fuzzy, c-format +#, c-format msgid "Unable to connect to authentication server: %s" -msgstr "" -"Nepodarilo sa pripojiť na autentifikačný server:\n" -"%s" - -#, fuzzy, c-format +msgstr "Nepodarilo sa pripojiť na autentifikačný server: %s" + +#, c-format msgid "Unable to connect to BOS server: %s" -msgstr "Nepodarilo sa pripojiť na OIM server." +msgstr "Nepodarilo sa pripojiť na BOS server: %s" msgid "Username sent" msgstr "Používateľské meno odoslané" @@ -6511,16 +6500,16 @@ msgid "Finalizing connection" msgstr "Dokončuje sa pripojenie" -#, fuzzy, c-format +#, c-format msgid "" "Unable to sign on as %s because the username is invalid. Usernames must be " "a valid email address, or start with a letter and contain only letters, " "numbers and spaces, or contain only numbers." msgstr "" -"Nepodarilo sa prihlásiť: Nepodarilo sa prihlásiť ako %s, pretože " -"používateľské meno je chybné. Používateľské mená musia byť správna e-" -"mailová adresa, alebo musí byť prvý znak písmeno a musí obsahovať len " -"písmená, číslice a medzery, alebo len číslice." +"Nepodarilo sa prihlásiť ako %s, pretože používateľské meno je chybné. " +"Používateľské mená musia byť správna e-mailová adresa, alebo musí byť prvý " +"znak písmeno a musí obsahovať len písmená, číslice a medzery, alebo len " +"číslice." #, c-format msgid "You may be disconnected shortly. If so, check %s for updates." @@ -6539,12 +6528,10 @@ #. Unregistered username #. uid is not exist #. the username does not exist -#, fuzzy msgid "Username does not exist" -msgstr "Používateľ neexistuje" +msgstr "Používateľské meno neexistuje" #. Suspended account -#, fuzzy msgid "Your account is currently suspended" msgstr "Váš účet je momentálne pozastavený" @@ -6552,6 +6539,7 @@ msgid "The AOL Instant Messenger service is temporarily unavailable." msgstr "Služba AOL je dočasne nedostupná." +#. client too old #, c-format msgid "The client version you are using is too old. Please upgrade at %s" msgstr "" @@ -6559,17 +6547,15 @@ "na %s" #. IP address connecting too frequently -#, fuzzy msgid "" "You have been connecting and disconnecting too frequently. Wait a minute and " "try again. If you continue to try, you will need to wait even longer." msgstr "" -"Pripájali a odpájali ste sa príliš často. Počkajte desať minút a skúste " -"znova. Ak budete i naďalej skúšať, budete musieť čakať este dlhšie." - -#, fuzzy +"Pripájali a odpájali ste sa príliš často. Počkajte minútu a skúste to znova. " +"Ak budete pokračovať, budete musieť čakať este dlhšie." + msgid "The SecurID key entered is invalid" -msgstr "Zadaný kľúč SecurID je neplatný." +msgstr "Zadaný kľúč SecurID je neplatný" msgid "Enter SecurID" msgstr "Zadajte SecurID" @@ -6577,12 +6563,6 @@ msgid "Enter the 6 digit number from the digital display." msgstr "Zadajte 6-ciferné číslo z digitálneho displeja." -#. * -#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. -#. -msgid "_OK" -msgstr "_OK" - msgid "Password sent" msgstr "Heslo odoslané" @@ -6594,12 +6574,6 @@ "Prosím, autorizujte ma, aby som si vás mohol pridať do svojho zoznamu " "priateľov." -msgid "Authorization Request Message:" -msgstr "Žiadosť o autorizáciu:" - -msgid "Please authorize me!" -msgstr "Autorizujte ma, prosím!" - msgid "No reason given." msgstr "Nebol uvedený dôvod." @@ -6743,7 +6717,7 @@ msgstr "Informácie o používateľovi sú nedostupné: %s" msgid "Online Since" -msgstr "Pripojený od" +msgstr "Prihlásený od" msgid "Member Since" msgstr "Člen od" @@ -6886,7 +6860,7 @@ "Your IM Image was not sent. You must be Direct Connected to send IM Images." msgstr "" "Váš obrázok nebol odoslaný. Na odosielanie obrázkov v správach musíte byť " -"priamo pripojený." +"priamo prihlásený." msgid "Unable to set AIM profile." msgstr "Nepodarilo sa odoslať AIM profil." @@ -6898,7 +6872,7 @@ msgstr "" "Pravdepodobne ste vyžiadali nastevenie vášho profilu pred dokončením " "procedúry prihlásenia. Váš profil zostáva nenastavený, skúste ho nastaviť " -"znovu, keď budete plne pripojený." +"znovu, keď budete plne prihlásený." #, c-format msgid "" @@ -6940,7 +6914,7 @@ msgid "Away message too long." msgstr "Správa neprítomnosti je príliš dlhá." -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because the username is invalid. Usernames must " "be a valid email address, or start with a letter and contain only letters, " @@ -6951,9 +6925,6 @@ "znak písmeno a musí obsahovať len písmená, číslice a medzery, alebo len " "číslice." -msgid "Unable to Add" -msgstr "Nepodarilo sa pridať" - msgid "Unable to Retrieve Buddy List" msgstr "Nepodarilo sa získať zoznam priateľov" @@ -6967,7 +6938,7 @@ msgid "Orphans" msgstr "Siroty" -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because you have too many buddies in your buddy " "list. Please remove one and try again." @@ -6978,7 +6949,7 @@ msgid "(no name)" msgstr "(bez názvu)" -#, fuzzy, c-format +#, c-format msgid "Unable to add the buddy %s for an unknown reason." msgstr "Nebolo možné pridať priateľa %s z neznámeho dôvodu." @@ -7054,7 +7025,7 @@ msgstr "Upraviť komentár priateľa" msgid "Get Status Msg" -msgstr "Získať správu o stave" +msgstr "Získať správu o statuse" msgid "Direct IM" msgstr "Priama rýchla správa" @@ -7140,9 +7111,8 @@ msgid "Search for Buddy by Information" msgstr "Hľadať priateľa podľa podrobností" -#, fuzzy msgid "Use clientLogin" -msgstr "Používateľ nie je prihlásený" +msgstr "Použiť clientLogin" msgid "" "Always use AIM/ICQ proxy server for\n" @@ -7258,7 +7228,7 @@ msgstr "Viditeľný" msgid "Friend Only" -msgstr "Len kamarát" +msgstr "Len priateľ" msgid "Private" msgstr "Súkromné" @@ -7339,30 +7309,26 @@ msgstr "Poznámka" #. callback -#, fuzzy msgid "Buddy Memo" -msgstr "Ikona priateľa" +msgstr "Popisok priateľa" msgid "Change his/her memo as you like" -msgstr "" - -#, fuzzy +msgstr "Upravte jeho/jej popisok ako si želáte" + msgid "_Modify" -msgstr "Upraviť" - -#, fuzzy +msgstr "_Upraviť" + msgid "Memo Modify" -msgstr "Upraviť" - -#, fuzzy +msgstr "Upraviť popisok" + msgid "Server says:" -msgstr "Server zaneprázdnený" +msgstr "Server vraví:" msgid "Your request was accepted." -msgstr "" +msgstr "Vaša požiadavka bola prijatá." msgid "Your request was rejected." -msgstr "" +msgstr "Vaša požiadavka bola zamietnutá." #, c-format msgid "%u requires verification" @@ -7607,7 +7573,7 @@ #, c-format msgid "Total Online Buddies: %d
\n" -msgstr "Pripojených priateľov: %d
\n" +msgstr "Prihlásených priateľov: %d
\n" #, c-format msgid "Last Refresh: %d-%d-%d, %d:%d:%d
\n" @@ -7672,12 +7638,11 @@ msgid "

Acknowledgement:
\n" msgstr "

Uznanie:
\n" -#, fuzzy msgid "

Scrupulous Testers:
\n" -msgstr "

Pôvodný autor:
\n" +msgstr "

Opatrní testeri:
\n" msgid "and more, please let me know... thank you!))" -msgstr "" +msgstr "a ďalší, prosím dajte mi vedieť... ďakujem!))" msgid "

And, all the boys in the backroom...
\n" msgstr "

A všetci chalani zo zákulisia...
\n" @@ -7704,9 +7669,8 @@ msgid "About OpenQ" msgstr "O OpenQ" -#, fuzzy msgid "Modify Buddy Memo" -msgstr "Upraviť adresu" +msgstr "Upraviť popisok priateľa" #. *< type #. *< ui_requirement @@ -7754,7 +7718,6 @@ msgid "Update interval (seconds)" msgstr "Interval obnovovania (sekúnd)" -#, fuzzy msgid "Unable to decrypt server reply" msgstr "Nedá sa dešifrovať odpoveď serveru" @@ -7822,9 +7785,8 @@ msgid "Requesting token" msgstr "Vyžiadava sa token" -#, fuzzy msgid "Unable to resolve hostname" -msgstr "Nepodarilo sa pripojiť na server." +msgstr "Nepodarilo sa preložiť meno hostiteľa" msgid "Invalid server or port" msgstr "Chybný server alebo port" @@ -7877,7 +7839,6 @@ msgid "QQ Qun Command" msgstr "QQ Qun príkaz" -#, fuzzy msgid "Unable to decrypt login reply" msgstr "Nedá sa dešifrovať odpoveď prihlásenia" @@ -8073,7 +8034,7 @@ msgstr "" "Identifikátor „%s“ môže odkazovať na ktoréhokoľvek z nasledujúcich " "používateľov. Vyberte, prosím, správneho používateľa zo zoznamu nižšie a " -"pridajte ho do svojho zoznamu kamarátov." +"pridajte ho do svojho zoznamu priateľov." msgid "Select User" msgstr "Vyberte používateľa" @@ -8098,13 +8059,13 @@ "%s\n" msgid "Remotely Stored Buddy List" -msgstr "Vzdialene uložený zoznam kamarátov" +msgstr "Vzdialene uložený zoznam priateľov" msgid "Buddy List Storage Mode" msgstr "Umiestnenie zoznamu priateľov" msgid "Local Buddy List Only" -msgstr "Iba miestny zoznam kamarátov" +msgstr "Iba miestny zoznam priateľov" msgid "Merge List from Server" msgstr "Spojiť so zoznamom zo servera" @@ -8147,7 +8108,7 @@ msgstr "" "Identifikátor „%s“ môže odkazovať na ktoréhokoľvek z nasledujúcich skupín " "Notes zoznamu adries. Vyberte, prosím, správneho používateľa zo zoznamu " -"nižšie a pridajte ho do svojho zoznamu kamarátov." +"nižšie a pridajte ho do svojho zoznamu priateľov." msgid "Select Notes Address Book" msgstr "Vyberte Notes zoznam adries" @@ -8710,7 +8671,7 @@ msgstr "Skutočné meno" msgid "Status Text" -msgstr "Text stavu" +msgstr "Text statusu" msgid "Public Key Fingerprint" msgstr "Digitálny odtlačok verejného kľúča" @@ -8860,7 +8821,6 @@ msgid "Disconnected by server" msgstr "Odpojený serverom" -#, fuzzy msgid "Error connecting to SILC Server" msgstr "Chyba počas pripájania sa na SILC server" @@ -8876,7 +8836,6 @@ msgid "Performing key exchange" msgstr "Vykonáva sa výmena kľúčov" -#, fuzzy msgid "Unable to load SILC key pair" msgstr "Nedá sa načítať pár kľúčov SILC" @@ -8884,16 +8843,11 @@ msgid "Connecting to SILC Server" msgstr "Pripája sa na SILC server" -#, fuzzy -msgid "Unable to not load SILC key pair" -msgstr "Nedá sa načítať pár kľúčov SILC" - msgid "Out of memory" msgstr "Nedostatok pamäte" -#, fuzzy msgid "Unable to initialize SILC protocol" -msgstr "Nepodarilo sa inicializovať protokol SILC" +msgstr "Nepodarilo sa zapnúť protokol SILC" msgid "Error loading SILC key pair" msgstr "Chyba pri načítaní SILC páru kľúčov" @@ -8929,7 +8883,7 @@ msgstr "Video konferencia" msgid "Your Current Status" -msgstr "Váš aktuálny stav" +msgstr "Váš aktuálny status" msgid "Online Services" msgstr "Online služby" @@ -8955,7 +8909,7 @@ "about yourself." msgstr "" "Ak chcete, môžete ostatným používateľom umožniť, aby videli, či ste " -"pripojení, a poznalii vaše osobné informácie. Vyplňte, prosím, len tie " +"prihlásený, a poznalii vaše osobné informácie. Vyplňte, prosím, len tie " "informácie, ktoré chcete, aby ich ostatní používatelia o vás videli." msgid "Message of the Day" @@ -8992,7 +8946,7 @@ msgstr "Generovať pár kľúčov" msgid "Online Status" -msgstr "Online stav" +msgstr "Online status" msgid "View Message of the Day" msgstr "Zobraziť správu dňa" @@ -9187,9 +9141,8 @@ msgid "Creating SILC key pair..." msgstr "Vytvára sa pár kľúčov pre SILC..." -#, fuzzy msgid "Unable to create SILC key pair" -msgstr "Nebolo možné vytvoriť pár SILC kľúčov\n" +msgstr "Nebolo možné vytvoriť pár SILC kľúčov" #. Hint for translators: Please check the tabulator width here and in #. the next strings (short strings: 2 tabs, longer strings 1 tab, @@ -9327,25 +9280,22 @@ msgid "Failure: Authentication failed" msgstr "Chyba: Zlyhala autentifikácia" -#, fuzzy msgid "Unable to initialize SILC Client connection" msgstr "Nedá sa inicializovať spojenie s SILC klientom" msgid "John Noname" msgstr "Jožo Bezmena" -#, fuzzy, c-format +#, c-format msgid "Unable to load SILC key pair: %s" -msgstr "Nedá sa načínať pár kľúčov SILC: %s" +msgstr "Nedá sa načítať dvojica kľúčov SILC: %s" msgid "Unable to create connection" msgstr "Nedá sa vytvoriť spojenie" -#, fuzzy msgid "Unknown server response" -msgstr "Neznáma odpoveď serveru." - -#, fuzzy +msgstr "Neznáma odpoveď serveru" + msgid "Unable to create listen socket" msgstr "Nepodarilo sa vytvoriť socket" @@ -9371,7 +9321,7 @@ msgstr "Modul pre protokol SIP/SIMPLE" msgid "Publish status (note: everyone may watch you)" -msgstr "Zverejniť stav (poznámka: ktokoľvek vás môže sledovať)" +msgstr "Zverejniť status (poznámka: ktokoľvek vás môže sledovať)" msgid "Use UDP" msgstr "Používať UDP" @@ -9411,9 +9361,8 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! Protocol Plugin" -msgstr "Modul protokolu Yahoo" +msgstr "Modul protokolu Yahoo!" msgid "Pager server" msgstr "Server záznamníku" @@ -9442,9 +9391,8 @@ msgid "Yahoo Chat port" msgstr "Port Yahoo chatu" -#, fuzzy msgid "Yahoo JAPAN ID..." -msgstr "Yahoo ID..." +msgstr "Yahoo JAPAN ID..." #. *< type #. *< ui_requirement @@ -9456,12 +9404,11 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "Modul protokolu Yahoo" +msgstr "Modul protokolu Yahoo! JAPAN" msgid "Your SMS was not delivered" -msgstr "" +msgstr "Vaša SMS nebola doručená" msgid "Your Yahoo! message did not get sent." msgstr "Vaša Yahoo! správa nebola odoslaná." @@ -9485,33 +9432,31 @@ "zoznamu." msgid "Add buddy rejected" -msgstr "Pridanie kamaráta bolo odmietnuté" +msgstr "Pridanie priateľa bolo odmietnuté" #. Some error in the received stream -#, fuzzy msgid "Received invalid data" -msgstr "Prijaté neplatné dáta počas spojenia so serverom." +msgstr "Prijaté neplatné dáta" #. security lock from too many failed login attempts -#, fuzzy msgid "" "Account locked: Too many failed login attempts. Logging into the Yahoo! " "website may fix this." msgstr "" -"Neznáme číslo chyby %d. Prihlásenie sa na stránke Yahoo! to môže napraviť." +"Účet zamknutý: Veľa neúspešných pokusov o prihlásenie. Prihlásenie sa na " +"stránku Yahoo! môže odblokovať účet." #. indicates a lock of some description -#, fuzzy msgid "" "Account locked: Unknown reason. Logging into the Yahoo! website may fix " "this." msgstr "" -"Neznáme číslo chyby %d. Prihlásenie sa na stránke Yahoo! to môže napraviť." +"Účet sa uzamkol: Neznámy dôvod. Prihlásenie sa na stránku Yahoo! môže " +"odblokovať účet." #. username or password missing -#, fuzzy msgid "Username or password missing" -msgstr "Nesprávne používateľské meno alebo heslo" +msgstr "Chýba používateľské meno alebo heslo" #, c-format msgid "" @@ -9546,13 +9491,12 @@ msgstr "" "Neznáme číslo chyby %d. Prihlásenie sa na stránke Yahoo! to môže napraviť." -#, fuzzy, c-format +#, c-format msgid "Unable to add buddy %s to group %s to the server list on account %s." msgstr "" -"Nepodarilo sa pridať kamaráta %s do skupiny %s do zoznamu na serveri na účte " +"Nepodarilo sa pridať priateľa %s do skupiny %s do zoznamu na serveri na účte " "%s." -#, fuzzy msgid "Unable to add buddy to server list" msgstr "Nepodarilo sa pridať priateľa do zoznamu na serveri" @@ -9560,21 +9504,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s" msgstr "[ Prehrateľné %s/%s/%s.swf ] %s" -#, fuzzy msgid "Received unexpected HTTP response from server" -msgstr "Zo servera bola prijatá neočakávaná HTTP odpoveď." - -#, fuzzy, c-format +msgstr "Zo servera bola prijatá neočakávaná HTTP odpoveď" + +#, c-format msgid "Lost connection with %s: %s" -msgstr "" -"Prerušené pripojenie ku %s:\n" -"%s" - -#, fuzzy, c-format +msgstr "Prerušené pripojenie ku %s: %s" + +#, c-format msgid "Unable to establish a connection with %s: %s" -msgstr "" -"Nepodarilo sa založiť spojenie so serverom:\n" -"%s" +msgstr "Nepodarilo sa založiť spojenie so %s: %s" msgid "Not at Home" msgstr "Nie som doma" @@ -9595,19 +9534,19 @@ msgstr "Nie je na zozname serverov" msgid "Appear Online" -msgstr "Javí sa pripojený" +msgstr "Vyzerať prihlásený" msgid "Appear Permanently Offline" -msgstr "Javí sa trvale odpojený" +msgstr "Vyzerať trvale odhlásený" msgid "Presence" msgstr "Prítomnosť" msgid "Appear Offline" -msgstr "Vyzerať odpojený" +msgstr "Vyzerať odhlásený" msgid "Don't Appear Permanently Offline" -msgstr "Nevyzerať sa trvale odpojený" +msgstr "Nevyzerať trvale odhlásený" msgid "Join in Chat" msgstr "Pripojiť sa k rozhovoru" @@ -9622,7 +9561,7 @@ msgstr "Začať Čmárať" msgid "Select the ID you want to activate" -msgstr "" +msgstr "Vyberte ID ktoré chcete aktivovať" msgid "Join whom in chat?" msgstr "S kým sa spojiť v chate?" @@ -9726,12 +9665,8 @@ msgstr "Profil používateľa je prázdny." #, c-format -msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." -msgstr "" -"%s odmietol vaše pozvanie na konferenciu do miestnosti „%s“, pretože „%s“." - -msgid "Invitation Rejected" -msgstr "Pozvanie zamietnuté" +msgid "%s has declined to join." +msgstr "Používateľ %s sa odmietol pridať." msgid "Failed to join chat" msgstr "Nepodarilo sa pripojiť na chat" @@ -9783,9 +9718,8 @@ msgid "User Rooms" msgstr "Používateľské miestnosti" -#, fuzzy msgid "Connection problem with the YCHT server" -msgstr "Problém počas pripojenia s YCHT serverom." +msgstr "Problém počas pripojenia s YCHT serverom" msgid "" "(There was an error converting this message.\t Check the 'Encoding' option " @@ -9916,17 +9850,17 @@ msgid "Exposure" msgstr "Expozícia" -#, fuzzy, c-format +#, c-format msgid "Unable to parse response from HTTP proxy: %s" -msgstr "Nepodarilo sa spracovať odpoveď od HTTP proxy: %s\n" +msgstr "Nepodarilo sa spracovať odpoveď od HTTP proxy: %s" #, c-format msgid "HTTP proxy connection error %d" msgstr "Chyba pripojenia HTTP proxy %d" -#, fuzzy, c-format +#, c-format msgid "Access denied: HTTP proxy server forbids port %d tunneling" -msgstr "Prístup zamietnutý: HTTP proxy server neumožňuje tunelovanie portu %d." +msgstr "Prístup zamietnutý: HTTP proxy server neumožňuje tunelovanie portu %d" #, c-format msgid "Error resolving %s" @@ -9962,7 +9896,7 @@ msgstr "Momentálne nie som prítomný" msgid "saved statuses" -msgstr "uložené stavy" +msgstr "uložené statusy" #, c-format msgid "%s is now known as %s.\n" @@ -10023,7 +9957,7 @@ #, c-format msgid "%s (%s) changed status from %s to %s" -msgstr "Používateľ %s (%s) zmenil stav z %s na %s" +msgstr "Používateľ %s (%s) zmenil status z %s na %s" #, c-format msgid "%s (%s) is now %s" @@ -10176,12 +10110,12 @@ msgid "Error Reading %s" msgstr "Chyba počas čítania %s" -#, fuzzy, c-format +#, c-format msgid "" "An error was encountered reading your %s. The file has not been loaded, and " "the old file has been renamed to %s~." msgstr "" -"Počas načítavania vášho %s sa vyskytla chyba. Zoznam nebol načítaný a starý " +"Počas načítavania vášho %s sa vyskytla chyba. Súbor nebol načítaný a starý " "súbor bol premenovaný na %s~." msgid "Internet Messenger" @@ -10227,7 +10161,7 @@ msgid "Use this buddy _icon for this account:" msgstr "Používať túto ikonu priateľa pre účet:" -msgid "_Advanced" +msgid "Ad_vanced" msgstr "_Pokročilé" msgid "Use GNOME Proxy Settings" @@ -10290,9 +10224,8 @@ msgid "Create _this new account on the server" msgstr "Vytvoriť _takýto účet na serveri" -#, fuzzy -msgid "_Proxy" -msgstr "Proxy" +msgid "P_roxy" +msgstr "P_roxy" msgid "Enabled" msgstr "Povolený" @@ -10344,9 +10277,8 @@ msgid "Please update the necessary fields." msgstr "Prosím, aktualizujte potrebné políčka." -#, fuzzy msgid "A_ccount" -msgstr "Úče_t:" +msgstr "Úče_t" msgid "" "Please enter the appropriate information about the chat you would like to " @@ -10373,16 +10305,14 @@ msgid "I_M" msgstr "I_M" -#, fuzzy msgid "_Audio Call" -msgstr "Pridať chat" +msgstr "_Hlasový hovor" msgid "Audio/_Video Call" -msgstr "" - -#, fuzzy +msgstr "fHlasový/_Videohovor" + msgid "_Video Call" -msgstr "Video chat" +msgstr "_Videohovor" msgid "_Send File..." msgstr "Poslať _súbor..." @@ -10393,13 +10323,11 @@ msgid "View _Log" msgstr "Zobraziť _záznam" -#, fuzzy msgid "Hide When Offline" -msgstr "Skryť v odpojenom stave" - -#, fuzzy +msgstr "Skryť ak neprihlásený" + msgid "Show When Offline" -msgstr "Zobraziť v odpojenom stave" +msgstr "Zobraziť ak neprihlásený" msgid "_Alias..." msgstr "_Prezývka..." @@ -10479,7 +10407,7 @@ msgstr "/Priatelia/Z_obraziť" msgid "/Buddies/Show/_Offline Buddies" -msgstr "/Priatelia/Zobraziť/_Odpojených priateľov" +msgstr "/Priatelia/Zobraziť/_Odhlásených priateľov" msgid "/Buddies/Show/_Empty Groups" msgstr "/Priatelia/Zobraziť/_Prázdne skupiny" @@ -10525,9 +10453,8 @@ msgid "/Tools/_Certificates" msgstr "/Nástroje/_Certifikáty" -#, fuzzy msgid "/Tools/Custom Smile_ys" -msgstr "/Nástroje/_Smajlík" +msgstr "/Nástroje/_Vlastní smajlíci" msgid "/Tools/Plu_gins" msgstr "/Nástroje/_Moduly" @@ -10654,10 +10581,10 @@ msgstr "Ručne" msgid "By status" -msgstr "Podľa stavu" +msgstr "Podľa statusu" msgid "By recent log activity" -msgstr "" +msgstr "Podľa aktivity záznamu" #, c-format msgid "%s disconnected" @@ -10674,7 +10601,7 @@ msgstr "Povoliť účet" msgid "SSL FAQs" -msgstr "" +msgstr "SSL časté otázky" msgid "Welcome back!" msgstr "Vitajte späť!" @@ -10712,14 +10639,14 @@ "\n" "Zatiaľ nemáte zapnuté žiadne IM účty. Zapnete ich v okne Účty ktoré " "nájdete v ponuke Účty->Spravovať účty. Keď aktivujete váš účet, " -"budete sa môcť prihlásiť, zmeniť svoj stav a písať si so svojimi priateľmi." +"budete sa môcť prihlásiť, zmeniť svoj status a písať si so svojimi priateľmi." # SPRAVNE #. set the Show Offline Buddies option. must be done #. * after the treeview or faceprint gets mad. -Robot101 #. msgid "/Buddies/Show/Offline Buddies" -msgstr "/Priatelia/Zobraziť/Odpojených priateľov" +msgstr "/Priatelia/Zobraziť/Odhlásených priateľov" msgid "/Buddies/Show/Empty Groups" msgstr "/Priatelia/Zobraziť/Prázdne skupiny" @@ -10743,7 +10670,7 @@ msgstr "(Voliteľné) _Prezývka:" msgid "Add buddy to _group:" -msgstr "Pridať priateľa do sk_upiny?" +msgstr "Pridať priateľa do sk_upiny:" msgid "This protocol does not support chat rooms." msgstr "Tento protokol nepodporuje miestnosti chatu." @@ -10751,7 +10678,7 @@ msgid "" "You are not currently signed on with any protocols that have the ability to " "chat." -msgstr "Momentálne nie ste pripojený na protokole, ktorý by podporoval chat." +msgstr "Momentálne nie ste prihlásený na protokole, ktorý by podporoval chat." msgid "" "Please enter an alias, and the appropriate information about the chat you " @@ -10803,109 +10730,95 @@ msgid "Background Color" msgstr "Farba pozadia" -#, fuzzy msgid "The background color for the buddy list" -msgstr "Skupina bola pridaná do vášho zoznamu priateľov" - -#, fuzzy +msgstr "Farba pozadia pre zoznam priateľov" + msgid "Layout" -msgstr "laoština" +msgstr "Rozloženie" msgid "The layout of icons, name, and status of the blist" -msgstr "" +msgstr "Rozloženie ikon, názvu a statusu zoznamu priateľov" #. Group -#, fuzzy msgid "Expanded Background Color" -msgstr "Farba pozadia" +msgstr "Farba pozadia rozbalenia" msgid "The background color of an expanded group" -msgstr "" - -#, fuzzy +msgstr "Farba pozadia rozbalenej skupiny" + msgid "Expanded Text" -msgstr "_Rozbaliť" +msgstr "Rozbalený text" msgid "The text information for when a group is expanded" -msgstr "" - -#, fuzzy +msgstr "Textová informácia ak je skupina rozbalená" + msgid "Collapsed Background Color" -msgstr "Vybrať farbu pozadia" +msgstr "Farba pozadia nerozbalenia" msgid "The background color of a collapsed group" -msgstr "" - -#, fuzzy +msgstr "Farba pozadia nerozbalenej skupiny" + msgid "Collapsed Text" -msgstr "_Zbaliť" +msgstr "Nerozbalený text" msgid "The text information for when a group is collapsed" -msgstr "" +msgstr "Textová informácia ak je skupina nerozbalená" #. Buddy -#, fuzzy msgid "Contact/Chat Background Color" -msgstr "Vybrať farbu pozadia" +msgstr "Farba pozadia kontaktu a chatu" msgid "The background color of a contact or chat" -msgstr "" - -#, fuzzy +msgstr "Farba pozadia kontaktu alebo chatu" + msgid "Contact Text" -msgstr "Skratka" +msgstr "Text kontaktu" msgid "The text information for when a contact is expanded" -msgstr "" - -#, fuzzy +msgstr "Textová informácia ak je kontakt rozbalený" + msgid "On-line Text" -msgstr "Pripojený" +msgstr "Text pripojenia" msgid "The text information for when a buddy is online" -msgstr "" - -#, fuzzy +msgstr "Textová informácia ak je priateľ prihlásený" + msgid "Away Text" -msgstr "Neprítomný" +msgstr "Text neprítomnosti" msgid "The text information for when a buddy is away" -msgstr "" - -#, fuzzy +msgstr "Textová informácia ak je priateľ neprítomný" + msgid "Off-line Text" -msgstr "Odpojený" +msgstr "Text odpojenia" msgid "The text information for when a buddy is off-line" -msgstr "" - -#, fuzzy +msgstr "Textová informácia ak je priateľ odpojený" + msgid "Idle Text" -msgstr "Popis nálady" +msgstr "Text nečinnosti" msgid "The text information for when a buddy is idle" -msgstr "" - -#, fuzzy +msgstr "Textová informácia ak je priateľ nečinný" + msgid "Message Text" -msgstr "Správa odoslaná" +msgstr "Text správy" msgid "The text information for when a buddy has an unread message" -msgstr "" +msgstr "Textová informácia ak má priateľ neprečítanú správu" msgid "Message (Nick Said) Text" -msgstr "" +msgstr "Text správy (s nickom)" msgid "" "The text information for when a chat has an unread message that mentions " "your nick" msgstr "" - -#, fuzzy +"Textová informácia ak chat obsahuje neprečítanú správu s vašou prezývkou" + msgid "The text information for a buddy's status" -msgstr "Zmeniť podrobnosti o používateľovi %s" - -#, fuzzy +msgstr "Textová informácia pre status priateľa" + msgid "Type the host name for this certificate." msgstr "Zadajte názov hostiteľa, ktorému je určený tento certifikát." @@ -10955,7 +10868,6 @@ msgid "Get Away Message" msgstr "Získať správu o neprítomnosti" -#, fuzzy msgid "Last Said" msgstr "Naposledy povedal" @@ -11002,21 +10914,17 @@ msgid "/Conversation/Clea_r Scrollback" msgstr "/Rozhovor/Vymazať" -#, fuzzy msgid "/Conversation/M_edia" -msgstr "/Rozhovor/Via_c" - -#, fuzzy +msgstr "/Rozhovor/Mé_diá" + msgid "/Conversation/Media/_Audio Call" -msgstr "/Rozhovor/Via_c" - -#, fuzzy +msgstr "/Rozhovor/Médiá/_Hlasový hovor" + msgid "/Conversation/Media/_Video Call" -msgstr "/Rozhovor/_Skryť" - -#, fuzzy +msgstr "/Rozhovor/Médiá/_Videohovor" + msgid "/Conversation/Media/Audio\\/Video _Call" -msgstr "/Rozhovor/Zobraziť _záznam" +msgstr "/Rozhovor/Médiá/Hlasový\\/_Videohovor" msgid "/Conversation/Se_nd File..." msgstr "/Rozhovor/Odos_lať súbor..." @@ -11090,17 +10998,14 @@ msgid "/Conversation/View Log" msgstr "/Rozhovor/Zobraziť _záznam" -#, fuzzy msgid "/Conversation/Media/Audio Call" -msgstr "/Rozhovor/Viac" - -#, fuzzy +msgstr "/Rozhovor/Médiá/Hlasový hovor" + msgid "/Conversation/Media/Video Call" -msgstr "/Rozhovor/_Skryť" - -#, fuzzy +msgstr "/Rozhovor/Médiá/Videohovor" + msgid "/Conversation/Media/Audio\\/Video Call" -msgstr "/Rozhovor/Viac" +msgstr "/Rozhovor/Médiá/Hlasový\\/Videohovor" msgid "/Conversation/Send File..." msgstr "/Rozhovor/Odos_lať súbor..." @@ -11286,7 +11191,7 @@ msgstr "Ka-Hing Cheung" msgid "voice and video" -msgstr "" +msgstr "hlas a video" msgid "support" msgstr "podpora" @@ -11412,9 +11317,8 @@ msgid "Hungarian" msgstr "maďarčina" -#, fuzzy msgid "Armenian" -msgstr "rumunčina" +msgstr "arménčina" msgid "Indonesian" msgstr "indonézština" @@ -11431,9 +11335,8 @@ msgid "Ubuntu Georgian Translators" msgstr "Ubuntu gruzínski prekladatelia" -#, fuzzy msgid "Khmer" -msgstr "Iné" +msgstr "kmérčina" msgid "Kannada" msgstr "kannadčina" @@ -11514,7 +11417,7 @@ msgstr "švédčina" msgid "Swahili" -msgstr "" +msgstr "svahilčina" msgid "Tamil" msgstr "tamilčina" @@ -11739,7 +11642,7 @@ "Ďalšie neprečítané správy zobrazíte kliknutím pravým tlačidlom myši...\n" msgid "_Change Status" -msgstr "_Zmeniť stav" +msgstr "_Zmeniť status" msgid "Show Buddy _List" msgstr "Zobraziť z_oznam priateľov" @@ -11826,14 +11729,6 @@ msgid "File transfer _details" msgstr "_Detaily o prenose súboru" -#. Pause button -msgid "_Pause" -msgstr "_Pozastaviť" - -#. Resume button -msgid "_Resume" -msgstr "_Pokračovať" - msgid "Paste as Plain _Text" msgstr "_Vložiť ako čistý text" @@ -11852,9 +11747,8 @@ msgid "Hyperlink visited color" msgstr "Farba navštíveného odkazu" -#, fuzzy msgid "Color to draw hyperlink after it has been visited (or activated)." -msgstr "Farba na vykreslenie odkazu ktorý bol navštívený alebo aktivovaný." +msgstr "Farba na vykreslenie odkazu ktorý bol navštívený (alebo aktivovaný)." msgid "Hyperlink prelight color" msgstr "Farba podsvieteného odkazu" @@ -11889,21 +11783,18 @@ msgid "Action Message Name Color for Whispered Message" msgstr "Farba názvu správy akcie pre šepkanú správu" -#, fuzzy msgid "Color to draw the name of a whispered action message." -msgstr "Farba ktorou zobraziť názov správy akcie." +msgstr "Farba ktorou zobraziť názov zašepkanej správy akcie." msgid "Whisper Message Name Color" msgstr "Farba názvu šepkanej správy" -#, fuzzy msgid "Color to draw the name of a whispered message." -msgstr "Farba ktorou zobraziť názov správy akcie." +msgstr "Farba ktorou zobraziť názov zašepkanej správy." msgid "Typing notification color" -msgstr "Odstránenie upozornenia" - -#, fuzzy +msgstr "Farba upozornenia na písanie" + msgid "The color to use for the typing notification" msgstr "Farba, ktorú použiť pre upozornenie na písanie" @@ -12153,7 +12044,7 @@ msgid "%s %s. Try `%s -h' for more information.\n" msgstr "%s %s. „%s -h“ zobrazí viac informácií.\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -12175,8 +12066,9 @@ "\n" " -c, --config=ADR pre konfiguračné súbory použije ADR\n" " -d, --debug vkladá ladiace informácie do stdout\n" +" -f, --force-online vynútiť prihlásenie bez ohľadu na stav siete\n" " -h, --help zobrazí túto pomoc a skončí\n" -" -m, --multiple umožní viac ako jeden spustený program\n" +" -m, --multiple nevynútiť jeden bežiaci program\n" " -n, --nologin neprihlasovať automaticky\n" " -l, --login[=MENO] povoliť vybrané účty (voliteľný argument MENO\n" " určuje účty, oddeľované čiarkami.\n" @@ -12184,7 +12076,7 @@ " --display=DISPLAY X obrazovka, ktorú použiť\n" " -v, --version zobrazí verziu programu a skončí\n" -#, fuzzy, c-format +#, c-format msgid "" "%s %s\n" "Usage: %s [OPTION]...\n" @@ -12205,6 +12097,7 @@ "\n" " -c, --config=ADR pre konfiguračné súbory použije ADR\n" " -d, --debug vkladá ladiace informácie do stdout\n" +" -f, --force-online vynútiť prihlásenie bez ohľadu na stav siete\n" " -h, --help zobrazí túto pomoc a skončí\n" " -m, --multiple umožní viac ako jeden spustený program\n" " -n, --nologin neprihlasovať automaticky\n" @@ -12251,22 +12144,21 @@ msgstr "Je spustený iný klient libpurple, ukončuje sa.\n" msgid "/_Media" -msgstr "" +msgstr "/_Médiá" msgid "/Media/_Hangup" -msgstr "" - -#, fuzzy +msgstr "/Médiá/_Zložiť" + msgid "Calling..." -msgstr "Počíta sa..." +msgstr "Volá sa..." #, c-format msgid "%s wishes to start an audio/video session with you." -msgstr "" +msgstr "%s si želá s vami založiť video/zvukové sedenie." #, c-format msgid "%s wishes to start a video session with you." -msgstr "" +msgstr "%s si želá s vami založiť video sedenie." #, c-format msgid "%s has %d new message." @@ -12297,9 +12189,8 @@ "The 'Manual' browser command has been chosen, but no command has been set." msgstr "Vybrali ste možnosť „Ručne“, ale nenastavili ste príkaz prehliadača." -#, fuzzy msgid "No message" -msgstr "Neznáma správa" +msgstr "Žiadna správa" msgid "Open All Messages" msgstr "Otvoriť všetky správy" @@ -12307,16 +12198,14 @@ msgid "You have mail!" msgstr "Máte poštu!" -#, fuzzy msgid "New Pounces" -msgstr "Nové sledovanie priateľa" +msgstr "Nové sledovania" msgid "Dismiss" -msgstr "" - -#, fuzzy +msgstr "Odvolať" + msgid "You have pounced!" -msgstr "Máte poštu!" +msgstr "Vysledovali ste!" msgid "The following plugins will be unloaded." msgstr "Nasledujúce moduly budú zastavené." @@ -12364,7 +12253,6 @@ msgid "Select a file" msgstr "Vyberte súbor" -#, fuzzy msgid "Modify Buddy Pounce" msgstr "Upraviť sledovanie priateľa" @@ -12441,61 +12329,58 @@ msgid "Pounce Target" msgstr "Cieľ sledovania" -#, fuzzy, c-format +#, c-format msgid "Started typing" -msgstr "Začne písať" - -#, fuzzy, c-format +msgstr "Začal písať" + +#, c-format msgid "Paused while typing" msgstr "Preruší písanie" -#, fuzzy, c-format +#, c-format msgid "Signed on" -msgstr "Prihlási sa" - -#, fuzzy, c-format +msgstr "Prihlásil sa" + +#, c-format msgid "Returned from being idle" -msgstr "používateľ %s prestal byť nečinný (%s)" - -#, fuzzy, c-format +msgstr "Prestane byť nečinný" + +#, c-format msgid "Returned from being away" msgstr "Prestane byť neprítomný" -#, fuzzy, c-format +#, c-format msgid "Stopped typing" msgstr "Prestal písať" -#, fuzzy, c-format +#, c-format msgid "Signed off" -msgstr "Odhlási sa" - -#, fuzzy, c-format +msgstr "Odhlásil sa" + +#, c-format msgid "Became idle" msgstr "Stane sa nečinný" -#, fuzzy, c-format +#, c-format msgid "Went away" -msgstr "Pri neprítomnosti" - -#, fuzzy, c-format +msgstr "Stane sa neprítomný" + +#, c-format msgid "Sent a message" -msgstr "Odoslať správu" - -#, fuzzy, c-format +msgstr "Odoslal správu" + +#, c-format msgid "Unknown.... Please report this!" -msgstr "Neznáma udalosť sledovania. Oznámte to, prosím!" - -#, fuzzy +msgstr "Neznáme... Oznámte to, prosím!" + msgid "Theme failed to unpack." -msgstr "Nepodarilo sa rozbaliť tému smajlíkov." - -#, fuzzy +msgstr "Nepodarilo sa rozbaliť tému." + msgid "Theme failed to load." -msgstr "Nepodarilo sa rozbaliť tému smajlíkov." - -#, fuzzy +msgstr "Nepodarilo sa načítať tému." + msgid "Theme failed to copy." -msgstr "Nepodarilo sa rozbaliť tému smajlíkov." +msgstr "Nepodarilo sa skopírovať tému." msgid "Install Theme" msgstr "Inštalovať tému" @@ -12518,9 +12403,8 @@ msgstr "Z_avrieť rozhovory klávesom Esc" #. Buddy List Themes -#, fuzzy msgid "Buddy List Theme" -msgstr "Zoznam priateľov" +msgstr "Téma zoznamu priateľov" #. System Tray msgid "System Tray Icon" @@ -12532,9 +12416,8 @@ msgid "On unread messages" msgstr "Pri neprečítaných správach" -#, fuzzy msgid "Conversation Window" -msgstr "Okná rozhovoru" +msgstr "Okno rozhovoru" msgid "_Hide new IM conversations:" msgstr "_Skrývať nové rozhovory:" @@ -12637,9 +12520,9 @@ msgid "Example: stunserver.org" msgstr "Príklad: stunserver.org" -#, fuzzy, c-format +#, c-format msgid "Use _automatically detected IP address: %s" -msgstr "_Automaticky zistiť IP adresu" +msgstr "Použiť _automaticky zistenú IP adresu: %s" msgid "Public _IP:" msgstr "Verejná _IP adresa:" @@ -12661,7 +12544,7 @@ #. TURN server msgid "Relay Server (TURN)" -msgstr "" +msgstr "Relay Server (TURN)" msgid "Proxy Server & Browser" msgstr "Proxy server a prehliadač" @@ -12770,7 +12653,7 @@ msgstr "Zaznamenávať všetky c_haty" msgid "Log all _status changes to system log" -msgstr "Zaznamenávať do systémového záznamu všetky zmeny _stavu" +msgstr "Zaznamenávať do systémového záznamu všetky zmeny _statusu" msgid "Sound Selection" msgstr "Výber zvuku" @@ -12857,20 +12740,20 @@ msgstr "_Počet minút pred nečinnosťou:" msgid "Change status when _idle" -msgstr "Zmeniť stav pri _nečinnosti" +msgstr "Zmeniť status pri _nečinnosti" msgid "Change _status to:" -msgstr "Zmeniť _stav na:" +msgstr "Zmeniť _status na:" #. Signon status stuff msgid "Status at Startup" -msgstr "Stav pri spustení" +msgstr "Status pri spustení" msgid "Use status from last _exit at startup" -msgstr "Po spustení použiť stav ako pred odhlásením" +msgstr "Po spustení použiť status ako pred odhlásením" msgid "Status to a_pply at startup:" -msgstr "Po spustení použiť stav:" +msgstr "Po spustení použiť status:" msgid "Interface" msgstr "Rozhranie" @@ -12882,7 +12765,7 @@ msgstr "Prehliadač" msgid "Status / Idle" -msgstr "Stav / nečinný" +msgstr "Status / nečinný" msgid "Allow all users to contact me" msgstr "Povoliť všetkým používateľom kontaktovať ma" @@ -12977,7 +12860,7 @@ msgstr "Pridať chat" msgid "Are you sure you want to delete the selected saved statuses?" -msgstr "Naozaj chcete odstrániť tieto uložené stavy?" +msgstr "Naozaj chcete odstrániť tieto uložené statusy?" #. Use button msgid "_Use" @@ -12993,11 +12876,11 @@ msgstr "_Titulok:" msgid "_Status:" -msgstr "_Stav:" +msgstr "_Status:" #. Different status message expander msgid "Use a _different status for some accounts" -msgstr "Pre niektoré účty používať odlišný stav" +msgstr "Pre niektoré účty používať odlišný status" #. Save & Use button msgid "Sa_ve & Use" @@ -13005,13 +12888,12 @@ #, c-format msgid "Status for %s" -msgstr "Stav pre %s" - -#, fuzzy, c-format +msgstr "Status pre %s" + +#, c-format msgid "" "A custom smiley for '%s' already exists. Please use a different shortcut." -msgstr "" -"Vlastný smajlík pre vybranú skratku už existuje. Prosím vyberte inú skratku." +msgstr "Vlastný smajlík pre '%s' už existuje. Prosím vyberte inú skratku." msgid "Custom Smiley" msgstr "Vlastný smajlík" @@ -13025,28 +12907,24 @@ msgid "Add Smiley" msgstr "Pridať smajlíka" -#, fuzzy msgid "_Image:" -msgstr "O_brázok" +msgstr "O_brázok:" #. Shortcut text -#, fuzzy msgid "S_hortcut text:" -msgstr "Skratka" +msgstr "Text o_dkazu:" msgid "Smiley" msgstr "Smajlík" -#, fuzzy msgid "Shortcut Text" -msgstr "Skratka" +msgstr "Text odkazu" msgid "Custom Smiley Manager" msgstr "Správca vlastných smajlíkov" -#, fuzzy msgid "Select Buddy Icon" -msgstr "Vybrať priateľa" +msgstr "Vybrať ikonu priateľa" msgid "Click to change your buddyicon for this account." msgstr "Kliknutím zmeníte vašu ikonu pre tento účet." @@ -13058,13 +12936,13 @@ msgstr "Čaká sa na sieťové pripojenie" msgid "New status..." -msgstr "Nový stav..." +msgstr "Nový status..." msgid "Saved statuses..." -msgstr "Uložené stavy..." +msgstr "Uložené statusy..." msgid "Status Selector" -msgstr "Prepínač stavu" +msgstr "Prepínač statusu" msgid "Google Talk" msgstr "Google Talk" @@ -13132,13 +13010,12 @@ msgid "Cannot send launcher" msgstr "Nepodarilo sa odoslať spúšťač" -#, fuzzy msgid "" "You dragged a desktop launcher. Most likely you wanted to send the target of " "this launcher instead of this launcher itself." msgstr "" -"Vložili ste spúšťač. Pravdepodobne ste chceli odoslať súbor, na ktorý tento " -"spúšťač odkazuje, namiesto samotného spúšťača." +"Vložili ste spúšťač. Pravdepodobne ste chceli namiesto samotného spúšťača " +"odoslať súbor, na ktorý tento spúšťač odkazuje." #, c-format msgid "" @@ -13171,9 +13048,8 @@ "Nepodarilo sa načítať obrázok „%s“: dôvod je neznámy, pravdepodobne je " "poškodený súbor" -#, fuzzy msgid "_Open Link" -msgstr "_Otvoriť odkaz:" +msgstr "_Otvoriť odkaz" msgid "_Copy Link Location" msgstr "_Kopírovať adresu odkazu" @@ -13181,9 +13057,21 @@ msgid "_Copy Email Address" msgstr "_Kopírovať e-mailovu adresu" +msgid "_Open File" +msgstr "_Otvoriť súbor" + +msgid "Open _Containing Directory" +msgstr "O_tvoriť priečinok so súborom" + msgid "Save File" msgstr "Uložiť súbor" +msgid "_Play Sound" +msgstr "_Prehrať zvuk" + +msgid "_Save File" +msgstr "_Uložiť súbor" + msgid "Select color" msgstr "Vyberte farbu" @@ -13208,6 +13096,9 @@ msgid "_Open Mail" msgstr "_Otvoriť poštu" +msgid "_Pause" +msgstr "_Pozastaviť" + msgid "_Edit" msgstr "_Upraviť" @@ -13271,77 +13162,65 @@ msgid "Displays statistical information about your buddies' availability" msgstr "Zobrazuje štatistické informácie o prítomnosti vašich priateľov" -#, fuzzy msgid "Server name request" -msgstr "Adresa servera" - -#, fuzzy +msgstr "Požiadavka na meno serveru" + msgid "Enter an XMPP Server" -msgstr "Zadajte konferenčný server" - -#, fuzzy +msgstr "Zadajte XMPP server" + msgid "Select an XMPP server to query" -msgstr "Vyberte konferenčný server, ktorý kontaktovať" - -#, fuzzy +msgstr "Vyberte XMPP server, ktorý kontaktovať" + msgid "Find Services" -msgstr "Online služby" - -#, fuzzy +msgstr "Nájsť služby" + msgid "Add to Buddy List" -msgstr "Odoslať zoznam priateľov" - -#, fuzzy +msgstr "Pridať do zoznamu priateľov" + msgid "Gateway" -msgstr "Stane sa neprítomný" - -#, fuzzy +msgstr "Brána" + msgid "Directory" -msgstr "Priečinok záznamov" - -#, fuzzy +msgstr "Priečinok" + msgid "PubSub Collection" -msgstr "Výber zvuku" - -#, fuzzy +msgstr "PubSub kolekcia" + msgid "PubSub Leaf" -msgstr "PubSub služba" - -#, fuzzy +msgstr "PubSub list" + msgid "" "\n" "Description: " -msgstr "Popis" +msgstr "" +"\n" +"Popis: " #. Create the window. -#, fuzzy msgid "Service Discovery" msgstr "Prieskum služieb" -#, fuzzy msgid "_Browse" -msgstr "_Prehliadač:" - -#, fuzzy +msgstr "_Prehliadať" + msgid "Server does not exist" -msgstr "Používateľ neexistuje" - -#, fuzzy +msgstr "Server neexistuje" + msgid "Server does not support service discovery" -msgstr "Server nepodporuje blokovanie" - -#, fuzzy +msgstr "Server nepodporuje prieskum služieb" + msgid "XMPP Service Discovery" -msgstr "Prieskum služieb" +msgstr "XMPP prieskum služieb" msgid "Allows browsing and registering services." -msgstr "" - -#, fuzzy +msgstr "Umožňuje prehliadanie a registráciu služieb." + msgid "" "This plugin is useful for registering with legacy transports or other XMPP " "services." -msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov." +msgstr "" +"Tento modul je užitočný na registráciu do starších transportov alebo iných " +"XMPP služieb." msgid "Buddy is idle" msgstr "Priateľ je nečinný" @@ -13389,15 +13268,15 @@ #. *< summary msgid "" "Allows for controlling the values associated with different buddy states." -msgstr "Umožnuje kontrolu hodnôt spojených s rôznymi stavmi kamarátov." +msgstr "Umožnuje kontrolu hodnôt spojených s rôznymi statusmi priateľov." #. *< description msgid "" "Allows for changing the point values of idle/away/offline states for buddies " "in contact priority computations." msgstr "" -"Povoľuje zmeny stavov, nečinný/preč/odpojený, podľa dôležitosti kamarátov v " -"zozname." +"Povoľuje zmeny statusov, nečinný/neprítomný/neprihlásený, podľa dôležitosti " +"priateľov v zozname." msgid "Conversation Colors" msgstr "Farby rozhovoru" @@ -13732,7 +13611,6 @@ msgstr "Modul Music Messaging na spoluprácu pri komponovaní." #. * summary -#, fuzzy msgid "" "The Music Messaging Plugin allows a number of users to simultaneously work " "on a piece of music by editing a common score in real-time." @@ -13856,9 +13734,8 @@ msgid "Highlighted Message Name Color" msgstr "Farba zvýraznenia mena v správe" -#, fuzzy msgid "Typing Notification Color" -msgstr "Odstránenie upozornenia" +msgstr "Farba upozornenia na písanie" msgid "GtkTreeView Horizontal Separation" msgstr "Vodorovná medzera v GtkTreeView" @@ -13889,23 +13766,20 @@ msgid "GTK+ Text Shortcut Theme" msgstr "Textová téma odkazov GTK+" -#, fuzzy msgid "Disable Typing Notification Text" -msgstr "Zapnúť upozornenie na písanie" - -#, fuzzy +msgstr "Vypnúť text upozornenia na písanie" + msgid "GTK+ Theme Control Settings" -msgstr "Ovládánie témy GTK+ programu Pidgin" - -#, fuzzy +msgstr "Nastavenia témy GTK+ programu Pidgin" + msgid "Colors" -msgstr "Zavrieť" +msgstr "Farby" msgid "Fonts" msgstr "Písma" msgid "Miscellaneous" -msgstr "" +msgstr "Rôzne" msgid "Gtkrc File Tools" msgstr "Nástroje súboru Gtkrc" @@ -13990,13 +13864,12 @@ msgstr "Tlačidlo odoslať v okne rozhovoru." #. *< summary -#, fuzzy msgid "" "Adds a Send button to the entry area of the conversation window. Intended " "for use when no physical keyboard is present." msgstr "" -"Pridá tlačidlo odoslať do textového poľa v okne rozhovoru. Užitočné ak " -"súčasťou počítača nie je klávesnica." +"V okne rozhovoru pridá do textového poľa tlačidlo odoslať. Určené pre " +"použitie na počítačoch bez klávesnice." msgid "Duplicate Correction" msgstr "Duplicitná oprava" @@ -14050,94 +13923,81 @@ msgstr "" "Nahradzuje text v odosielaných správach podľa používateľom určených pravidiel" -#, fuzzy msgid "Just logged in" -msgstr "Neprihlásený" - -#, fuzzy +msgstr "Práve prihlásený" + msgid "Just logged out" -msgstr "Neprihlásený" +msgstr "Práve odhlásený" msgid "" "Icon for Contact/\n" "Icon for Unknown person" msgstr "" - -#, fuzzy +"Ikona pre kontakt/\n" +"Ikona pre neznámu osobu" + msgid "Icon for Chat" -msgstr "Pripojiť sa k chatu" - -#, fuzzy +msgstr "Ikona pre chat" + msgid "Ignored" -msgstr "Ignorovať" - -#, fuzzy +msgstr "Ignorované" + msgid "Founder" -msgstr "Hlasnejšia" - -#, fuzzy +msgstr "Zakladateľ" + +#. A user in a chat room who has special privileges. msgid "Operator" -msgstr "Opera" - +msgstr "Operátor" + +#. A half operator is someone who has a subset of the privileges +#. that an operator has. msgid "Half Operator" -msgstr "" - -#, fuzzy +msgstr "Polooperátor" + msgid "Authorization dialog" -msgstr "Autorizácia udelená" - -#, fuzzy +msgstr "Dialóg autorizácie" + msgid "Error dialog" -msgstr "Chyba " - -#, fuzzy +msgstr "Chybový dialóg" + msgid "Information dialog" -msgstr "Informácie" +msgstr "Informačný dialóg" msgid "Mail dialog" -msgstr "" - -#, fuzzy +msgstr "Dialóg pošty" + msgid "Question dialog" -msgstr "Dialóg požiadavku" - -#, fuzzy +msgstr "Dialóg otázky" + msgid "Warning dialog" -msgstr "Úroveň upozornenia" +msgstr "Dialóg upozornenia" msgid "What kind of dialog is this?" -msgstr "" - -#, fuzzy +msgstr "Toto je aký druh dialógu?" + msgid "Status Icons" -msgstr "Stav pre %s" - -#, fuzzy +msgstr "Ikony statusu" + msgid "Chatroom Emblems" -msgstr "Jazyk chatovacej miestnosti" - -#, fuzzy +msgstr "Emblémy chatovacej miestnosti" + msgid "Dialog Icons" -msgstr "Zmeniť ikonu" - -#, fuzzy +msgstr "Ikony dialógu" + msgid "Pidgin Icon Theme Editor" -msgstr "Ovládánie témy GTK+ programu Pidgin" - -#, fuzzy +msgstr "Editor témy ikon programu Pidgin" + msgid "Contact" -msgstr "Kontaktné informácie" - -#, fuzzy +msgstr "Kontakt" + msgid "Pidgin Buddylist Theme Editor" -msgstr "Zoznam priateľov" - -#, fuzzy +msgstr "Editor témy zoznamu priateľov programu Pidgin" + msgid "Edit Buddylist Theme" -msgstr "Zoznam priateľov" +msgstr "Upraviť tému zoznamu priateľov" msgid "Edit Icon Theme" -msgstr "" +msgstr "Upraviť tému ikon" #. *< type #. *< ui_requirement @@ -14146,16 +14006,14 @@ #. *< priority #. *< id #. * description -#, fuzzy msgid "Pidgin Theme Editor" -msgstr "Ovládánie témy GTK+ programu Pidgin" +msgstr "Editor témy programu Pidgin" #. *< name #. *< version #. * summary -#, fuzzy msgid "Pidgin Theme Editor." -msgstr "Ovládánie témy GTK+ programu Pidgin" +msgstr "Editor témy programu Pidgin." #. *< type #. *< ui_requirement @@ -14324,7 +14182,6 @@ msgid "Options specific to Pidgin for Windows." msgstr "Špecifické možnosti programu Pidgin pre Windows." -#, fuzzy msgid "" "Provides options specific to Pidgin for Windows, such as buddy list docking." msgstr "" @@ -14347,7 +14204,7 @@ msgstr "Účet: " msgid "Not connected to XMPP" -msgstr "Nepripojený ku XMPP" +msgstr "Neprihlásený ku XMPP" msgid "Insert an stanza." msgstr "Vložiť slohu." @@ -14368,6 +14225,9 @@ msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov." +#~ msgid "_Resume" +#~ msgstr "_Pokračovať" + #~ msgid "Cannot open socket" #~ msgstr "Nepodarilo sa otvoriť socket" @@ -14405,9 +14265,6 @@ #~ msgid "Last Activity" #~ msgstr "Posledná aktivita" -#~ msgid "Service Discovery Info" -#~ msgstr "Prieskum služieb" - #~ msgid "Service Discovery Items" #~ msgstr "Položky prieskumu služieb" @@ -14426,9 +14283,6 @@ #~ msgid "Ad-Hoc Commands" #~ msgstr "Príkaz Ad-Hoc" -#~ msgid "PubSub Service" -#~ msgstr "PubSub služba" - #~ msgid "SOCKS5 Bytestreams" #~ msgstr "SOCKS5 bitové toky" @@ -14448,7 +14302,7 @@ #~ msgstr "Avatar používateľa" #~ msgid "Chat State Notifications" -#~ msgstr "Upozornenie na stav v chate" +#~ msgstr "Upozornenie na status v chate" #~ msgid "Software Version" #~ msgstr "Verzia softvéru" @@ -14575,9 +14429,6 @@ #~ msgid "Error. SSL support is not installed." #~ msgstr "Chyba. SSL podpora nie je nainštalovaná." -#~ msgid "Incorrect password." -#~ msgstr "Nesprávne heslo." - #~ msgid "" #~ "Could not connect to BOS server:\n" #~ "%s" @@ -14585,14 +14436,17 @@ #~ "Nepodarilo sa pripojiť na BOS server:\n" #~ "%s" -#~ msgid "You may be disconnected shortly. Check %s for updates." -#~ msgstr "Zakrátko môžete byť odpojený. Skontrolujte aktualizácie na %s." +#~ msgid "Invalid username." +#~ msgstr "Nesprávne používateľské meno." + +#~ msgid "Incorrect password." +#~ msgstr "Nesprávne heslo." #~ msgid "Could Not Connect" #~ msgstr "Nepodarilo sa pripojiť" -#~ msgid "Invalid username." -#~ msgstr "Nesprávne používateľské meno." +#~ msgid "You may be disconnected shortly. Check %s for updates." +#~ msgstr "Zakrátko môžete byť odpojený. Skontrolujte aktualizácie na %s." #~ msgid "Could not decrypt server reply" #~ msgstr "Nedá sa dešifrovať odpoveď serveru" @@ -14627,7 +14481,6 @@ #~ msgid "Could not resolve hostname" #~ msgstr "Nebolo možné previesť názov hostiteľa na IP" -#, fuzzy #~ msgid "Incorrect Password" #~ msgstr "Nesprávne heslo" @@ -14638,6 +14491,9 @@ #~ "Nebolo možné nadviazať spojenie s %s:\n" #~ "%s" +#~ msgid "Activate which ID?" +#~ msgstr "Aktivovať s ID?" + #~ msgid "Yahoo Japan" #~ msgstr "Yahoo Japonsko" @@ -14648,6 +14504,14 @@ #~ msgstr "Japonský server prenosu súborov" #~ msgid "" +#~ "%s declined your conference invitation to room \"%s\" because \"%s\"." +#~ msgstr "" +#~ "%s odmietol vaše pozvanie na konferenciu do miestnosti „%s“, pretože „%s“." + +#~ msgid "Invitation Rejected" +#~ msgstr "Pozvanie zamietnuté" + +#~ msgid "" #~ "Lost connection with server\n" #~ "%s" #~ msgstr "" @@ -14657,13 +14521,18 @@ #~ msgid "Could not resolve host name" #~ msgstr "Nepodarilo sa previesť názov hostiteľa" -#, fuzzy #~ msgid "" #~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support " #~ "was found." #~ msgstr "" -#~ "Server vyžaduje na prihlásenie TLS/SSL, ale podpora pre TLS/SSL nebola " -#~ "nájdená." +#~ "Nebolo možné sa pripojiť na %s: Server vyžaduje TLS/SSL, ale podpora pre " +#~ "TLS/SSL nebola nájdená." + +#~ msgid "_Proxy" +#~ msgstr "_Proxy" + +#~ msgid "/Conversation/Media/fHlasový/Videohovor" +#~ msgstr "/Rozhovor/Viac" #~ msgid "Conversation Window Hiding" #~ msgstr "Skrývanie okna rozhovoru" @@ -14677,9 +14546,6 @@ #~ msgid "Please select an image for the smiley." #~ msgstr "Prosím, vyberte obrázok pre smajlíka." -#~ msgid "Activate which ID?" -#~ msgstr "Aktivovať s ID?" - #~ msgid "Cursor Color" #~ msgstr "Farba kurzoru" @@ -14995,7 +14861,7 @@ #~ msgstr "Odmietnuť požiadavku" #~ msgid "Add buddy with auth request failed" -#~ msgstr "Pridanie kamaráta s požiadavkou na autentifikáciu zlyhalo" +#~ msgstr "Pridanie priateľa s požiadavkou na autentifikáciu zlyhalo" #~ msgid "Add into %d's buddy list" #~ msgstr "Pridať do zoznamu priateľov používateľa %d" @@ -15028,7 +14894,7 @@ #~ msgstr "Som admin" #~ msgid "Unknown status" -#~ msgstr "Neznámy stav" +#~ msgstr "Neznámy status" #~ msgid "Remove from Qun" #~ msgstr "Odstrániť z Qun" @@ -15183,7 +15049,7 @@ #~ msgstr "Boli ste úspešne odstránený z priateľovho zoznamu kontaktov" #~ msgid "You have added %d to buddy list" -#~ msgstr "Pridali ste používateľa %d do zoznamu kamarátov" +#~ msgstr "Pridali ste používateľa %d do zoznamu priateľov" #~ msgid "Invalid QQid" #~ msgstr "Nesprávne QQid" @@ -15322,7 +15188,7 @@ #~ "sú podporované na MySpace." #~ msgid "Use recent buddies group" -#~ msgstr "Použiť naposledy použitú skupinu kamarátov" +#~ msgstr "Použiť naposledy použitú skupinu priateľov" #~ msgid "Show how long you have been idle" #~ msgstr "Zobrazí ako dlho ste boli nečinní" @@ -15334,7 +15200,7 @@ #~ msgstr "Aktuálne médium" #~ msgid "%s changed status from %s to %s" -#~ msgstr "Používateľ %s zmenil stav z %s na %s" +#~ msgstr "Používateľ %s zmenil status z %s na %s" #~ msgid "%s is now %s" #~ msgstr "Používateľ %s je teraz %s" @@ -15384,7 +15250,7 @@ #~ "znovu nepovolíte tento účet." #~ msgid "Sort by status" -#~ msgstr "Zoradiť podľa stavu" +#~ msgstr "Zoradiť podľa statusu" #~ msgid "Sort alphabetically" #~ msgstr "Zoradiť podľa abecedy" diff -r 67143ecbddb1 -r 0907b0c775bb po/sv.po --- a/po/sv.po Mon Jul 27 03:14:08 2009 +0000 +++ b/po/sv.po Fri Jul 31 19:20:06 2009 +0000 @@ -10930,7 +10930,7 @@ msgstr "/Konversation/Media/_Videosamtal" msgid "/Conversation/Media/Audio\\/Video _Call" -msgstr "/Konversation/Media/Ljud\\/Video _Samtal" +msgstr "/Konversation/Media/Ljud\\/Video_samtal" msgid "/Conversation/Se_nd File..." msgstr "/Konversation/S_kicka fil..." @@ -11930,7 +11930,7 @@ msgstr "Detta tema har inga tillgängliga smileys." msgid "_Font" -msgstr "_Formateríng" +msgstr "_Formatering" msgid "Group Items" msgstr "Gruppera föremål" diff -r 67143ecbddb1 -r 0907b0c775bb share/ca-certs/Makefile.am --- a/share/ca-certs/Makefile.am Mon Jul 27 03:14:08 2009 +0000 +++ b/share/ca-certs/Makefile.am Fri Jul 31 19:20:06 2009 +0000 @@ -7,6 +7,7 @@ GTE_CyberTrust_Global_Root.pem \ StartCom_Certification_Authority.pem \ StartCom_Free_SSL_CA.pem \ + Thawte_Premium_Server_CA.pem \ Verisign_RSA_Secure_Server_CA.pem \ Verisign_Class3_Primary_CA.pem \ VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem \ diff -r 67143ecbddb1 -r 0907b0c775bb share/ca-certs/Thawte_Premium_Server_CA.pem --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/ca-certs/Thawte_Premium_Server_CA.pem Fri Jul 31 19:20:06 2009 +0000 @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx +FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD +VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv +biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy +dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t +MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB +MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG +A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp +b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl +cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv +bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE +VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ +ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR +uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG +9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI +hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM +pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg== +-----END CERTIFICATE-----