Mercurial > pidgin.yaz
changeset 28319:32ef0358b469
propagate from branch 'im.pidgin.pidgin' (head 7c0f8ebeda0f59bd50e8e1692886616f302badcf)
to branch 'im.pidgin.cpw.darkrain42.2.6.1' (head 7313bb3a50bfb81413f4fb007c26df5836a97397)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 22 Jul 2009 04:15:09 +0000 |
| parents | 38f09799476a (current diff) b29eac4769e9 (diff) |
| children | 6dd97a284d65 |
| files | libpurple/protocols/jabber/jabber.c |
| diffstat | 15 files changed, 542 insertions(+), 499 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/blist.c Wed Jul 22 02:34:56 2009 +0000 +++ b/libpurple/blist.c Wed Jul 22 04:15:09 2009 +0000 @@ -1299,8 +1299,8 @@ PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); PurpleChat *chat; - g_return_val_if_fail(account != NULL, FALSE); - g_return_val_if_fail(components != NULL, FALSE); + g_return_val_if_fail(account != NULL, NULL); + g_return_val_if_fail(components != NULL, NULL); chat = g_new0(PurpleChat, 1); chat->account = account;
--- a/libpurple/certificate.c Wed Jul 22 02:34:56 2009 +0000 +++ b/libpurple/certificate.c Wed Jul 22 04:15:09 2009 +0000 @@ -195,6 +195,8 @@ GList *cur; PurpleCertificate *crt, *issuer; gchar *uid; + time_t now, activation, expiration; + gboolean ret; g_return_val_if_fail(chain, FALSE); @@ -211,6 +213,8 @@ return TRUE; } + now = time(NULL); + /* Load crt with the first certificate */ crt = (PurpleCertificate *)(chain->data); /* And start with the second certificate in the chain */ @@ -218,9 +222,29 @@ issuer = (PurpleCertificate *)(cur->data); + uid = purple_certificate_get_unique_id(issuer); + + ret = purple_certificate_get_times(issuer, &activation, &expiration); + if (!ret || now < activation || now > expiration) { + if (!ret) + purple_debug_error("certificate", + "...Failed to get validity times for certificate %s\n" + "Chain is INVALID\n", uid); + else if (now > expiration) + purple_debug_error("certificate", + "...Issuer %s expired at %s\nChain is INVALID\n", + uid, ctime(&expiration)); + else + purple_debug_error("certificate", + "...Not-yet-activated issuer %s will be valid at %s\n" + "Chain is INVALID\n", uid, ctime(&activation)); + + g_free(uid); + return FALSE; + } + /* Check the signature for this link */ if (! purple_certificate_signed_by(crt, issuer) ) { - uid = purple_certificate_get_unique_id(issuer); purple_debug_error("certificate", "...Bad or missing signature by %s\nChain is INVALID\n", uid); @@ -229,7 +253,6 @@ return FALSE; } - uid = purple_certificate_get_unique_id(issuer); purple_debug_info("certificate", "...Good signature by %s\n", uid); @@ -362,7 +385,6 @@ return (scheme->get_times)(crt, activation, expiration); } - gchar * purple_certificate_pool_mkpath(PurpleCertificatePool *pool, const gchar *id) { @@ -1461,6 +1483,8 @@ { const gchar *tls_peers_name = "tls_peers"; /* Name of local cache */ PurpleCertificatePool *tls_peers; + time_t now, activation, expiration; + gboolean ret; g_return_if_fail(vrq); @@ -1468,6 +1492,46 @@ "Starting verify for %s\n", vrq->subject_name); + /* + * Verify the first certificate (the main one) has been activated and + * isn't expired, i.e. activation < now < expiration. + */ + now = time(NULL); + ret = purple_certificate_get_times(vrq->cert_chain->data, &activation, + &expiration); + if (!ret || now > expiration || now < activation) { + gchar *secondary; + + if (!ret) + purple_debug_error("certificate/x509/tls_cached", + "Failed to get validity times for certificate %s\n", + vrq->subject_name); + else if (now > expiration) + purple_debug_error("certificate/x509/tls_cached", + "Certificate %s expired at %s\n", + vrq->subject_name, ctime(&expiration)); + else + purple_debug_error("certificate/x509/tls_cached", + "Certificate %s is not yet valid, will be at %s\n", + vrq->subject_name, ctime(&activation)); + + /* FIXME 2.6.1 */ + secondary = g_strdup_printf(_("The certificate chain presented" + " for %s is not valid."), + vrq->subject_name); + + purple_notify_error(NULL, /* TODO: Probably wrong. */ + _("SSL Certificate Error"), + _("Invalid certificate chain"), + secondary ); + g_free(secondary); + + /* Okay, we're done here */ + purple_certificate_verify_complete(vrq, + PURPLE_CERTIFICATE_INVALID); + return; + } + tls_peers = purple_certificate_find_pool(x509_tls_cached.scheme_name,tls_peers_name); if (!tls_peers) {
--- a/libpurple/mediamanager.c Wed Jul 22 02:34:56 2009 +0000 +++ b/libpurple/mediamanager.c Wed Jul 22 04:15:09 2009 +0000 @@ -780,7 +780,8 @@ pad = gst_element_get_static_pad(queue, "sink"); peer = gst_pad_get_peer(pad); gst_object_unref(pad); - gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer); + if (peer != NULL) + gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer); gst_element_set_locked_state(queue, TRUE); gst_element_set_state(queue, GST_STATE_NULL); gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(queue)), queue);
--- a/libpurple/plugins/ssl/ssl-gnutls.c Wed Jul 22 02:34:56 2009 +0000 +++ b/libpurple/plugins/ssl/ssl-gnutls.c Wed Jul 22 04:15:09 2009 +0000 @@ -668,6 +668,8 @@ gnutls_x509_crt issuer_dat; unsigned int verify; /* used to store result from GnuTLS verifier */ int ret; + gchar *crt_id = NULL; + gchar *issuer_id = NULL; g_return_val_if_fail(crt, FALSE); g_return_val_if_fail(issuer, FALSE); @@ -728,13 +730,29 @@ return FALSE; } + if (verify & GNUTLS_CERT_INSECURE_ALGORITHM) { + /* + * A certificate in the chain is signed with an insecure + * algorithm. Put a warning into the log to make this error + * perfectly clear as soon as someone looks at the debug log is + * generated. + */ + crt_id = purple_certificate_get_unique_id(crt); + issuer_id = purple_certificate_get_issuer_unique_id(crt); + purple_debug_warning("gnutls/x509", + "Insecure hash algorithm used by %s to sign %s\n", + issuer_id, crt_id); + } + if (verify & GNUTLS_CERT_INVALID) { /* Signature didn't check out, but at least there were no errors*/ - gchar *crt_id = purple_certificate_get_unique_id(crt); - gchar *issuer_id = purple_certificate_get_issuer_unique_id(crt); - purple_debug_info("gnutls/x509", - "Bad signature for %s on %s\n", + if (!crt_id) + crt_id = purple_certificate_get_unique_id(crt); + if (!issuer_id) + issuer_id = purple_certificate_get_issuer_unique_id(crt); + purple_debug_error("gnutls/x509", + "Bad signature from %s on %s\n", issuer_id, crt_id); g_free(crt_id); g_free(issuer_id);
--- a/libpurple/protocols/jabber/jabber.c Wed Jul 22 02:34:56 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Wed Jul 22 04:15:09 2009 +0000 @@ -457,14 +457,21 @@ void jabber_send_signal_cb(PurpleConnection *pc, xmlnode **packet, gpointer unused) { + JabberStream *js; char *txt; int len; if (NULL == packet) return; + js = purple_connection_get_protocol_data(pc); + if (js->use_bosh) + if (g_str_equal((*packet)->name, "message") || + g_str_equal((*packet)->name, "iq") || + g_str_equal((*packet)->name, "presence")) + xmlnode_set_namespace(*packet, "jabber:client"); txt = xmlnode_to_str(*packet, &len); - jabber_send_raw(purple_connection_get_protocol_data(pc), txt, len); + jabber_send_raw(js, txt, len); g_free(txt); } @@ -699,6 +706,8 @@ js->gc->inpa = 0; js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd, jabber_login_callback_ssl, jabber_ssl_connect_failure, js->certificate_CN, js->gc); + /* The fd is no longer our concern */ + js->fd = -1; } static gboolean jabber_login_connect(JabberStream *js, const char *domain, const char *host, int port,
--- a/libpurple/protocols/msn/httpconn.c Wed Jul 22 02:34:56 2009 +0000 +++ b/libpurple/protocols/msn/httpconn.c Wed Jul 22 04:15:09 2009 +0000 @@ -293,7 +293,7 @@ purple_debug_error("msn", "HTTP: servconn %03d read error, " "len: %" G_GSSIZE_FORMAT ", errno: %d, error: %s\n", servconn->num, len, error, g_strerror(errno)); - msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ); + msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ, NULL); return; } @@ -309,7 +309,7 @@ { /* Either we must wait for more input, or something went wrong */ if (error) - msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ); + msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ, NULL); return; } @@ -317,7 +317,7 @@ if (error) { purple_debug_error("msn", "HTTP: Special error\n"); - msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ); + msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ, NULL); return; } @@ -368,7 +368,7 @@ return; /* Error! */ - msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_WRITE); + msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_WRITE, NULL); return; } @@ -394,7 +394,7 @@ if ((res <= 0) && ((errno != EAGAIN) && (errno != EWOULDBLOCK))) { - msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_WRITE); + msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_WRITE, NULL); return FALSE; } @@ -672,7 +672,7 @@ { purple_debug_error("msn", "HTTP: Connection error: %s\n", error_message ? error_message : "(null)"); - msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_CONNECT); + msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_CONNECT, error_message); } }
--- a/libpurple/protocols/msn/servconn.c Wed Jul 22 02:34:56 2009 +0000 +++ b/libpurple/protocols/msn/servconn.c Wed Jul 22 04:15:09 2009 +0000 @@ -123,38 +123,35 @@ **************************************************************************/ void -msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error) +msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error, + const char *reason) { - char *tmp; - const char *reason; + MsnSession *session = servconn->session; + MsnServConnType type = servconn->type; const char *names[] = { "Notification", "Switchboard" }; const char *name; - name = names[servconn->type]; + name = names[type]; - switch (error) - { - case MSN_SERVCONN_ERROR_CONNECT: - reason = _("Unable to connect"); break; - case MSN_SERVCONN_ERROR_WRITE: - reason = _("Writing error"); break; - case MSN_SERVCONN_ERROR_READ: - reason = _("Reading error"); break; - default: - reason = _("Unknown error"); break; + if (reason == NULL) { + switch (error) + { + case MSN_SERVCONN_ERROR_CONNECT: + reason = _("Unable to connect"); break; + case MSN_SERVCONN_ERROR_WRITE: + reason = _("Writing error"); break; + case MSN_SERVCONN_ERROR_READ: + reason = _("Reading error"); break; + default: + reason = _("Unknown error"); break; + } } purple_debug_error("msn", "Connection error from %s server (%s): %s\n", name, servconn->host, reason); - tmp = g_strdup_printf(_("Connection error from %s server:\n%s"), - name, reason); - if (servconn->type == MSN_SERVCONN_NS) - { - msn_session_set_error(servconn->session, MSN_ERROR_SERVCONN, tmp); - } - else if (servconn->type == MSN_SERVCONN_SB) + if (type == MSN_SERVCONN_SB) { MsnSwitchBoard *swboard; swboard = servconn->cmdproc->data; @@ -162,9 +159,16 @@ swboard->error = MSN_SB_ERROR_CONNECTION; } + /* servconn->disconnect_cb may destroy servconn, so don't use it again */ msn_servconn_disconnect(servconn); - g_free(tmp); + if (type == MSN_SERVCONN_NS) + { + char *tmp = g_strdup_printf(_("Connection error from %s server:\n%s"), + name, reason); + msn_session_set_error(session, MSN_ERROR_SERVCONN, tmp); + g_free(tmp); + } } /************************************************************************** @@ -194,7 +198,7 @@ else { purple_debug_error("msn", "Connection error: %s\n", error_message); - msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_CONNECT); + msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_CONNECT, error_message); } } @@ -310,7 +314,7 @@ if (servconn->connected && servconn->timeout_sec) { servconn->timeout_handle = purple_timeout_add_seconds( - servconn->timeout_sec, servconn_idle_timeout_cb, servconn); + servconn->timeout_sec, (GSourceFunc)servconn_idle_timeout_cb, servconn); } } @@ -342,7 +346,7 @@ if (ret < 0 && errno == EAGAIN) return; else if (ret <= 0) { - msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_WRITE); + msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_WRITE, NULL); return; } @@ -399,7 +403,7 @@ if (ret == -1) { - msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_WRITE); + msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_WRITE, NULL); } servconn_timeout_renew(servconn); @@ -425,7 +429,7 @@ purple_debug_error("msn", "servconn %03d read error, " "len: %" G_GSSIZE_FORMAT ", errno: %d, error: %s\n", servconn->num, len, errno, g_strerror(errno)); - msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ); + msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ, NULL); return; }
--- a/libpurple/protocols/msn/servconn.h Wed Jul 22 02:34:56 2009 +0000 +++ b/libpurple/protocols/msn/servconn.h Wed Jul 22 04:15:09 2009 +0000 @@ -170,7 +170,8 @@ * @param servconn The servconn. * @param error The error that happened. */ -void msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error); +void msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error, + const char *reason); /** * Process the data in servconn->rx_buf. This is called after reading
--- a/libpurple/protocols/oscar/family_icbm.c Wed Jul 22 02:34:56 2009 +0000 +++ b/libpurple/protocols/oscar/family_icbm.c Wed Jul 22 04:15:09 2009 +0000 @@ -910,6 +910,9 @@ GSList *outer_tlvlist = NULL, *inner_tlvlist = NULL; ByteStream hdrbs; + g_return_if_fail(bn != NULL); + g_return_if_fail(ip != NULL); + conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICBM); if (conn == NULL) return;
--- a/libpurple/protocols/oscar/peer.c Wed Jul 22 02:34:56 2009 +0000 +++ b/libpurple/protocols/oscar/peer.c Wed Jul 22 04:15:09 2009 +0000 @@ -712,10 +712,10 @@ { const guchar *ip_atoi = purple_network_ip_atoi(listener_ip); if (ip_atoi == NULL) { - purple_debug_error("oscar", "Cannot send file. IP %s failed atoi.\n" + purple_debug_error("oscar", "Cannot send file. atoi(%s) failed.\n" "Other possibly useful information: fd = %d, port = %d\n", - listener_ip ? listener_ip : "(null!)", conn->listenerfd, - listener_port); + listener_ip ? listener_ip : "(null!)", conn->listenerfd, + listener_port); purple_xfer_cancel_local(conn->xfer); return; }
--- a/libpurple/win32/targets.mak Wed Jul 22 02:34:56 2009 +0000 +++ b/libpurple/win32/targets.mak Wed Jul 22 04:15:09 2009 +0000 @@ -36,7 +36,7 @@ $(PIDGIN_INSTALL_DIR): mkdir -p $(PIDGIN_INSTALL_DIR) -$(PIDGIN_INSTALL_PERLMOD_DIR): +$(PIDGIN_INSTALL_PERL_DIR): mkdir -p $(PIDGIN_INSTALL_PERL_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR):
--- a/pidgin/gtkblist.c Wed Jul 22 02:34:56 2009 +0000 +++ b/pidgin/gtkblist.c Wed Jul 22 04:15:09 2009 +0000 @@ -6980,12 +6980,9 @@ static void add_chat_cb(GtkWidget *w, PidginAddChatData *data) { - GHashTable *components; GList *tmp; PurpleChat *chat; - PurpleGroup *group; - const char *group_name; - const char *value; + GHashTable *components; components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); @@ -7001,7 +6998,8 @@ } else { - value = gtk_entry_get_text(tmp->data); + const char *value = gtk_entry_get_text(tmp->data); + if (*value != '\0') g_hash_table_replace(components, g_strdup(g_object_get_data(tmp->data, "identifier")), @@ -7010,28 +7008,31 @@ } chat = purple_chat_new(data->chat_data.rq_data.account, - gtk_entry_get_text(GTK_ENTRY(data->alias_entry)), - components); - - group_name = pidgin_text_combo_box_entry_get_text(data->group_combo); - - group = NULL; - if ((group_name != NULL) && (*group_name != '\0') && ((group = purple_find_group(group_name)) == NULL)) - { - group = purple_group_new(group_name); - purple_blist_add_group(group, NULL); - } - - if (chat != NULL) - { + gtk_entry_get_text(GTK_ENTRY(data->alias_entry)), + components); + + if (chat != NULL) { + PurpleGroup *group; + const char *group_name; + + group_name = pidgin_text_combo_box_entry_get_text(data->group_combo); + + group = NULL; + if ((group_name != NULL) && (*group_name != '\0') && + ((group = purple_find_group(group_name)) == NULL)) + { + group = purple_group_new(group_name); + purple_blist_add_group(group, NULL); + } + purple_blist_add_chat(chat, group, NULL); - } - - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->autojoin))) - purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-autojoin", TRUE); - - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->persistent))) - purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-persistent", TRUE); + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->autojoin))) + purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-autojoin", TRUE); + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->persistent))) + purple_blist_node_set_bool((PurpleBlistNode*)chat, "gtk-persistent", TRUE); + } gtk_widget_destroy(data->chat_data.rq_data.window); g_free(data->chat_data.default_chat_name);
--- a/po/ChangeLog Wed Jul 22 02:34:56 2009 +0000 +++ b/po/ChangeLog Wed Jul 22 04:15:09 2009 +0000 @@ -3,6 +3,7 @@ version 2.6.0 * Armenian translation added (David Avsharyan) * Catalan translation updated (Josep Puigdemont) + * Dutch translation updated (Daniël Heres) * Finnish translation updated (Timo Jyrinki) * French translation updated (Éric Boumaour) * Galician translation updated (Frco. Javier Rial Rodríguez)
--- a/po/de.po Wed Jul 22 02:34:56 2009 +0000 +++ b/po/de.po Wed Jul 22 04:15:09 2009 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 19:25+0200\n" -"PO-Revision-Date: 2009-07-19 19:25+0200\n" +"POT-Creation-Date: 2009-07-21 19:08+0200\n" +"PO-Revision-Date: 2009-07-21 19:06+0200\n" "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n" "Language-Team: Deutsch <de@li.org>\n" "MIME-Version: 1.0\n" @@ -1573,7 +1573,7 @@ msgstr "TinyURL nur für URLs mit mindestens dieser Länge generieren" msgid "TinyURL (or other) address prefix" -msgstr "" +msgstr "Adresspräfix für TinyURL (oder andere)" msgid "TinyURL" msgstr "TinyURL" @@ -2715,6 +2715,10 @@ "are only used in a single successful connection.\n" "Note: The account password must not be saved for this to work." msgstr "" +"Erlaubt Ihnen (pro Konto) zu erzwingen, dass nicht gespeicherte Passwörter " +"nur in einer einzigen erfolgreichen Verbindung verwendet werden.\n" +"Hinweis: Damit dies funktioniert, darf das Konto-Passwort nicht gespeichert " +"werden." #. *< type #. *< ui_requirement @@ -4964,13 +4968,13 @@ msgid "Non-IM Contacts" msgstr "Nicht-IM-Kontakte" -#, fuzzy, c-format +#, c-format msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>" msgstr "" "%s hat einen Wink gesendet. <a href='msn-wink://%s'>Zum Abspielen hier " "klicken</a>" -#, fuzzy, c-format +#, c-format msgid "%s sent a wink, but it could not be saved" msgstr "%s hat einen Wink gesendet, er konnte aber nicht gespeichert werden" @@ -6245,7 +6249,7 @@ msgstr "Server-Port" msgid "Received unexpected response from " -msgstr "Unerwartete Antwort erhalten von" +msgstr "Unerwartete Antwort erhalten von " #. username connecting too frequently msgid "" @@ -6256,12 +6260,11 @@ "versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar " "noch länger warten." -#, fuzzy msgid "Error requesting " -msgstr "Fehler beim Auflösen von %s" +msgstr "Fehler beim Anfordern von " msgid "AOL does not allow your screen name to authenticate here" -msgstr "" +msgstr "AOL erlaubt Ihnen nicht, sich hier mit Ihrem Benutzernamen anzumelden" msgid "Could not join chat room" msgstr "Konnte Chatraum nicht betreten" @@ -7361,7 +7364,7 @@ msgstr "Buddy-Notiz" msgid "Change his/her memo as you like" -msgstr "" +msgstr "Ändern Sie seine/ihre Notiz wie sie möchten" msgid "_Modify" msgstr "_Bearbeiten" @@ -7692,7 +7695,7 @@ msgstr "<p><b>Gewissenhafte Tester</b>:<br>\n" msgid "and more, please let me know... thank you!))" -msgstr "" +msgstr "und andere, bitten sagen Sie mir Bescheid... Danke!))" msgid "<p><i>And, all the boys in the backroom...</i><br>\n" msgstr "<p><i>Und all die Jungs im Hinterzimmer...</i><br>\n" @@ -8904,10 +8907,6 @@ msgid "Connecting to SILC Server" msgstr "Verbinde mit SILC-Server" -#, fuzzy -msgid "Unable to not load SILC key pair" -msgstr "SILC-Schlüsselpaar konnte nicht geladen werden" - msgid "Out of memory" msgstr "Kein Speicher verfügbar" @@ -10367,9 +10366,8 @@ msgid "I_M" msgstr "I_M" -#, fuzzy msgid "_Audio Call" -msgstr "Chat _hinzufügen" +msgstr "_Audio-Anruf" msgid "Audio/_Video Call" msgstr "Audio/_Video-Anruf" @@ -11258,7 +11256,7 @@ msgstr "Ka-Hing Cheung" msgid "voice and video" -msgstr "" +msgstr "Sprach- und Videoübertragung" msgid "support" msgstr "Support" @@ -13139,24 +13137,20 @@ msgid "_Copy Email Address" msgstr "Kopiere _E-Mail-Adresse" -#, fuzzy msgid "_Open File" -msgstr "Datei öffnen..." - -#, fuzzy +msgstr "_Datei öffnen" + msgid "Open _Containing Directory" -msgstr "Mitschnittverzeichnis" +msgstr "_Enthaltendes Verzeichnis öffnen" msgid "Save File" msgstr "Datei speichern" -#, fuzzy msgid "_Play Sound" -msgstr "Einen Klang abspielen" - -#, fuzzy +msgstr "Klang _abspielen" + msgid "_Save File" -msgstr "Datei speichern" +msgstr "Datei _speichern" msgid "Select color" msgstr "Farbe auswählen"
--- a/po/nl.po Wed Jul 22 02:34:56 2009 +0000 +++ b/po/nl.po Wed Jul 22 04:15:09 2009 +0000 @@ -10,8 +10,8 @@ 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-06 17:27+0100\n" +"POT-Creation-Date: 2009-07-21 08:28-0700\n" +"PO-Revision-Date: 2009-07-20 12:53+0100\n" "Last-Translator: Daniël Heres <danielheres@gmail.com>\n" "Language-Team: Dutch <nl@li.org>\n" "MIME-Version: 1.0\n" @@ -865,12 +865,11 @@ msgid "System Log" msgstr "Systeemlogboek" -#, fuzzy msgid "Calling ... " -msgstr "Berekenen..." +msgstr "Bellen..." msgid "Hangup" -msgstr "" +msgstr "Ophangen" #. Number of actions msgid "Accept" @@ -880,25 +879,24 @@ msgstr "Weigeren" msgid "Call in progress." -msgstr "" +msgstr "Gesprek bezig" msgid "The call has been terminated." -msgstr "" +msgstr "Het gesprek is stopgezet" #, c-format msgid "%s wishes to start an audio session with you." -msgstr "" +msgstr "%s wil een audiogesprek starten." #, c-format msgid "%s is trying to start an unsupported media session type with you." -msgstr "" - -#, fuzzy +msgstr "%s probeert een niet ondersteund mediagesprek te starten." + msgid "You have rejected the call." -msgstr "Je hebt het kanaal%s%s verlaten" +msgstr "Het telefoontje is genegeerd." msgid "call: Make an audio call." -msgstr "" +msgstr "gesprek: Bel op." msgid "Emails" msgstr "E-mails" @@ -1559,19 +1557,20 @@ "\n" "Fetching TinyURL..." msgstr "" +"\n" +"Ophalen TinyURL..." msgid "Only create TinyURL for urls of this length or greater" -msgstr "" +msgstr "Alleen TinyURL aanmaken voor koppelingen van deze lengte of langer" msgid "TinyURL (or other) address prefix" msgstr "" -#, fuzzy msgid "TinyURL" -msgstr "URL" +msgstr "TinyURL" msgid "TinyURL plugin" -msgstr "" +msgstr "TinyURL plug-in" msgid "When receiving a message with URL(s), TinyURL for easier copying" msgstr "" @@ -1692,6 +1691,7 @@ "Het certificaat van \"%s\" is zelf-gesigneerd. Het kan niet automatisch " "gecontroleerd worden." +#. FIXME 2.6.1 #, c-format msgid "The certificate chain presented for %s is not valid." msgstr "De certificaat-keten van %s is niet geldig." @@ -1701,6 +1701,7 @@ #. stifle it. #. TODO: Probably wrong. #. TODO: Probably wrong +#. TODO: Probably wrong. msgid "SSL Certificate Error" msgstr "SSL-certificaat fout" @@ -1782,7 +1783,6 @@ msgstr "+++ %s heeft zich afgemeld" #. Unknown error -#. Unknown error! msgid "Unknown error" msgstr "Onbekende fout" @@ -1829,9 +1829,8 @@ msgid "%s left the room (%s)." msgstr "%s is weggegaan (%s)." -#, fuzzy msgid "Invite to chat" -msgstr "Uitnodigen voor bijeenkomst" +msgstr "Uitnodigen voor gesprek" #. Put our happy label in it. msgid "" @@ -1975,6 +1974,10 @@ msgid "Starting transfer of %s from %s" msgstr "Overdracht van %s van %s wordt gestart" +#, fuzzy, c-format +msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete" +msgstr "Bestandsoverdracht van %s voltooid" + #, c-format msgid "Transfer of file %s complete" msgstr "Bestandsoverdracht van %s voltooid" @@ -2721,9 +2724,8 @@ msgstr "Vraag niet. Altijd in alarm opslaan." # wachtwoord invoeren -#, fuzzy msgid "One Time Password" -msgstr "Voer wachtwoord in" +msgstr "Eenmalig wachtwoord" #. *< type #. *< ui_requirement @@ -2732,7 +2734,7 @@ #. *< priority #. *< id msgid "One Time Password Support" -msgstr "" +msgstr "Ondersteuning eenmalig wachtwoord" #. *< name #. *< version @@ -2990,9 +2992,8 @@ msgstr "Purple mens" #. Creating the options for the protocol -#, fuzzy msgid "Local Port" -msgstr "Localiteit" +msgstr "Locale poort" msgid "Bonjour" msgstr "Bonjour" @@ -3004,21 +3005,17 @@ msgid "Unable to send the message, the conversation couldn't be started." msgstr "Kan het bericht niet verzenden. Kan geen gesprek starten." -#, fuzzy, c-format +#, c-format msgid "Unable to create socket: %s" -msgstr "" -"Kan geen socket aanmaken:\n" -"%s" - -#, fuzzy, c-format +msgstr "Kan geen socket aanmaken: %s" + +#, c-format msgid "Unable to bind socket to port: %s" -msgstr "Kan socket niet koppelen aan poort" - -#, fuzzy, c-format +msgstr "Kan socket niet koppelen aan poort: %s" + +#, c-format msgid "Unable to listen on socket: %s" -msgstr "" -"Kan geen socket aanmaken:\n" -"%s" +msgstr "Kan niet aan socket luisteren: %s" msgid "Error communicating with local mDNSResponder." msgstr "Fout bij het communiceren met lokale mDNSResponder" @@ -3065,17 +3062,15 @@ msgid "Load buddylist from file..." msgstr "Contactenlijst laden uit bestand..." -#, fuzzy msgid "You must fill in all registration fields" -msgstr "Registratievelden invullen." - -#, fuzzy +msgstr "Alle registratievelden moeten ingevuld worden" + msgid "Passwords do not match" -msgstr "Wachtwoorden komen niet overeen." - -#, fuzzy +msgstr "Wachtwoorden komen niet overeen" + msgid "Unable to register new account. An unknown error occurred." -msgstr "Kan geen nieuw account registreren. Er is een fout opgetreden.\n" +msgstr "" +"Kan geen nieuw account registreren. Er is eenonbekende fout opgetreden." msgid "New Gadu-Gadu Account Registered" msgstr "Nieuw Gadu-Gadu account geregistreerd" @@ -3090,11 +3085,10 @@ msgstr "Nieuw wachtwoord (herhalen)" msgid "Enter captcha text" -msgstr "" - -#, fuzzy +msgstr "Captcha tekst invoeren" + msgid "Captcha" -msgstr "Captcha afbeelding" +msgstr "Captcha" msgid "Register New Gadu-Gadu Account" msgstr "Nieuw Gadu-gadu-account registreren" @@ -3248,9 +3242,8 @@ msgid "This chat name is already in use" msgstr "De naam bestaat reeds" -#, fuzzy msgid "Not connected to the server" -msgstr "Niet verbonden met de server." +msgstr "Niet verbonden met de server" msgid "Find buddies..." msgstr "Contacten zoeken..." @@ -3292,9 +3285,8 @@ msgid "Gadu-Gadu User" msgstr "Gadu-gadu-gebruiker" -#, fuzzy msgid "GG server" -msgstr "Server verkrijgen" +msgstr "GG-server" #, c-format msgid "Unknown command: %s" @@ -3310,7 +3302,6 @@ msgid "File Transfer Failed" msgstr "Bestandsoverdracht mislukt" -#, fuzzy msgid "Unable to open a listening port." msgstr "Kon geen poort openen om te luisteren." @@ -3334,11 +3325,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 verloren met server:\n" -"%s" +msgstr "Verbinding verloren met server: %s" msgid "View MOTD" msgstr "MOTD weergeven" @@ -3550,13 +3539,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 "De naam bestaat reeds" - -#, fuzzy +msgstr "De bijnaam \"%s\" bestaat al" + msgid "Nickname in use" -msgstr "Bijnaam" +msgstr "Bijnaam in gebruik" msgid "Cannot change nick" msgstr "Kan bijnaam niet veranderen" @@ -3831,7 +3819,6 @@ msgid "SASL authentication failed" msgstr "Identificatie mislukt" -#, fuzzy msgid "Invalid response from server" msgstr "Ongeldig antwoord van server" @@ -3844,20 +3831,18 @@ msgid "Invalid challenge from server" msgstr "Ongeldige vraag van server" -#, 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 msgid "No session ID given" -msgstr "Geen reden gegeven" - -#, fuzzy +msgstr "Geen sessie-ID gegeven" + msgid "Unsupported version of BOSH protocol" -msgstr "Versie niet ondersteund" +msgstr "Versie van BOSH niet ondersteund" #, fuzzy msgid "Unable to establish a connection with the server" @@ -3941,9 +3926,8 @@ msgid "Operating System" msgstr "Besturingssysteem" -#, fuzzy msgid "Local Time" -msgstr "Lokaal bestand:" +msgstr "Lokale tijd" msgid "Priority" msgstr "Prioriteit" @@ -3953,11 +3937,10 @@ #, c-format msgid "%s ago" -msgstr "" - -#, fuzzy +msgstr "%s geleden" + msgid "Logged Off" -msgstr "Ingelogd" +msgstr "UItgelogd" msgid "Middle Name" msgstr "Tweede naam" @@ -4125,21 +4108,17 @@ msgid "Find Rooms" msgstr "Ruimtes zoeken" -#, fuzzy msgid "Affiliations:" -msgstr "Alias:" - -#, fuzzy +msgstr "Verbanden:" + msgid "No users found" -msgstr "Niet overeenkomende gebruikers gevonden" - -#, fuzzy +msgstr "Geen gebruikers gevonden" + msgid "Roles:" -msgstr "Rol" - -#, fuzzy +msgstr "Rollen:" + msgid "Ping timed out" -msgstr "Ping Verlopen" +msgstr "Ping verlopen" msgid "" "Unable to find alternative XMPP connection methods after failing to connect " @@ -4222,10 +4201,6 @@ msgid "Change Registration" msgstr "Verander Registratie: " -#, fuzzy -msgid "Malformed BOSH Connect Server" -msgstr "Kan geen verbinding maken met de server." - msgid "Error unregistering account" msgstr "Fout bij het ongedaan maken van de registratie" @@ -4245,7 +4220,7 @@ msgstr "Herstarten van datastroom" msgid "Server doesn't support blocking" -msgstr "" +msgstr "Server ondersteunt blokkeren niet" msgid "Not Authorized" msgstr "Geen toestemming" @@ -4552,9 +4527,8 @@ "Kan bestand niet verzenden naar %s, niet aangemeld bij gebruikers-" "aanwezigheid." -#, fuzzy msgid "Media Initiation Failed" -msgstr "Registratie mislukt" +msgstr "Opstarten media mislukt" #, fuzzy, c-format msgid "" @@ -4565,9 +4539,8 @@ msgid "Select a Resource" msgstr "Kies een bron" -#, fuzzy msgid "Initiate Media" -msgstr "_Chat starten" +msgstr "Media opstarten" msgid "config: Configure a chat room." msgstr "config: Chatruimte instellen" @@ -4667,7 +4640,7 @@ msgstr "Bestandsoverdracht poortnummer" msgid "BOSH URL" -msgstr "" +msgstr "BOSH koppeling" #. this should probably be part of global smiley theme settings later on, #. shared with MSN @@ -4731,29 +4704,26 @@ msgid "_Accept Defaults" msgstr "_Standaardinstellingen gebruiken" -#, fuzzy msgid "No reason" -msgstr "Geen reden gegeven" - -#, fuzzy, c-format +msgstr "Geen reden" + +#, c-format msgid "You have been kicked: (%s)" -msgstr "Je bent weggeschopt door %s: (%s)" - -#, fuzzy, c-format +msgstr "Je bent eruit gegooid:(%s)" + +#, c-format msgid "Kicked (%s)" -msgstr "Weggeschopt door %s (%s)" +msgstr "Eruit gegooid (%s)" #, fuzzy msgid "An error occurred on the in-band bytestream transfer\n" msgstr "Er is een fout opgetreden bij het openen van het bestand." -#, fuzzy msgid "Transfer was closed." -msgstr "Bestandsoverdracht mislukt" - -#, fuzzy +msgstr "Bestandsoverdracht gesloten." + msgid "Failed to open the file" -msgstr "Kan bestand '%s' niet openen: %s" +msgstr "Bestand openen mislukt" msgid "Failed to open in-band bytestream" msgstr "" @@ -5080,6 +5050,26 @@ msgid "Non-IM Contacts" msgstr "Niet-chat contacten" +#, c-format +msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>" +msgstr "" +"%s verzond een wink. <a href='msn-wink://%s'>Klik hier om af te spelen</a>" + +#, c-format +msgid "%s sent a wink, but it could not be saved" +msgstr "%s verzond een wink, maar kon niet worden opgeslagen" + +#, c-format +msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>" +msgstr "" +"%s verzond een voice-clip. <a href='audio://%s'>Klik hier om af te spelen</a>" + +#, fuzzy, c-format +msgid "%s sent a voice clip, but it could not be saved" +msgstr "" +"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt " +"ondersteund." + #, fuzzy, c-format msgid "%s sent you a voice chat invite, which is not yet supported." msgstr "" @@ -5237,6 +5227,30 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library." msgstr "SSL-ondersteuning is vereist voor MSN. Installeer een SSL-bibliotheek." +#, fuzzy, c-format +msgid "" +"Unable to add the buddy %s because the username is invalid. Usernames must " +"be a valid email address." +msgstr "" +"Kan het contact %s niet toevoegen omdat de gebruikersnaam ongeldig is. " +"Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen met een " +"letter en slechts cijfers en letters bevatten, of slechts nummers bevatten." + +msgid "Unable to Add" +msgstr "Kan niet toevoegen" + +msgid "Authorization Request Message:" +msgstr "Tekst van toestemmingsaanvraag" + +msgid "Please authorize me!" +msgstr "Geef mij toestemming, alstublieft!" + +#. * +#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. +#. +msgid "_OK" +msgstr "_OK" + msgid "Error retrieving profile" msgstr "Fout bij ophalen van profiel" @@ -5429,13 +5443,14 @@ msgid "%s just sent you a Nudge!" msgstr "%s heeft u zojuist een duwtje gegeven!" -#, 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 gebruiker niet toevoegen" +#. Unknown error! #, c-format msgid "Unknown error (%d)" msgstr "Onbekende fout (%d)" @@ -5508,9 +5523,8 @@ msgid "Our protocol is not supported by the server" msgstr "Ons protocol wordt niet ondersteund door de server." -#, fuzzy msgid "Error parsing HTTP" -msgstr "Fout bij analyseren HTTP." +msgstr "Fout bij parsen HTTP" #, fuzzy msgid "You have signed on from another location" @@ -5521,9 +5535,8 @@ "De MSN-servers zijn op dit moment niet beschikbaar. Probeer het later nog " "eens." -#, fuzzy msgid "The MSN servers are going down temporarily" -msgstr "De MSN-servers worden tijdelijk uitgeschakeld." +msgstr "De MSN-servers worden tijdelijk uitgeschakeld" #, c-format msgid "Unable to authenticate: %s" @@ -5611,9 +5624,8 @@ msgid "Delete Buddy from Address Book?" msgstr "Contact verwijderen uit adresboek?" -#, fuzzy msgid "Do you want to delete this buddy from your address book as well?" -msgstr "Wilt u deze persoon toevoegen aan uw contactenlijst?" +msgstr "Dit contact ook verwijderen uit adresboek?" msgid "The username specified is invalid." msgstr "Ingevoerde gebruikersnaam is ongeldig." @@ -6132,9 +6144,9 @@ msgid "Unknown error: 0x%X" msgstr "Onbekende fout: 0x%X" -#, fuzzy, c-format +#, c-format msgid "Unable to login: %s" -msgstr "Kan gebruiker %s niet pingen" +msgstr "Kan niet inloggen: %s" #, c-format msgid "Unable to send message. Could not get details for user (%s)." @@ -6641,6 +6653,7 @@ msgid "The AOL Instant Messenger service is temporarily unavailable." msgstr "De AOL service is momenteel niet bereikbaar." +#. client too old #, c-format msgid "The client version you are using is too old. Please upgrade at %s" msgstr "" @@ -6665,12 +6678,6 @@ msgid "Enter the 6 digit number from the digital display." msgstr "Geef het 6-cijferige nummer van het digitale display." -#. * -#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. -#. -msgid "_OK" -msgstr "_OK" - msgid "Password sent" msgstr "Wachtwoord verzonden" @@ -6680,12 +6687,6 @@ msgid "Please authorize me so I can add you to my buddy list." msgstr "Geef mij toestemming zodat ik u kan toevoegen aan mijn contactenlijst." -msgid "Authorization Request Message:" -msgstr "Tekst van toestemmingsaanvraag" - -msgid "Please authorize me!" -msgstr "Geef mij toestemming, alstublieft!" - msgid "No reason given." msgstr "Geen reden gegeven." @@ -7028,9 +7029,6 @@ "Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen met een " "letter en slechts cijfers en letters bevatten, of slechts nummers bevatten." -msgid "Unable to Add" -msgstr "Kan niet toevoegen" - #, fuzzy msgid "Unable to Retrieve Buddy List" msgstr "Kan contactenlijst niet ophalen" @@ -7386,13 +7384,11 @@ msgid "Horoscope" msgstr "Horoscoop" -#, fuzzy msgid "Zodiac" -msgstr "Sterrenbeeld" - -#, fuzzy +msgstr "Dierenriem" + msgid "Blood" -msgstr "Geblokkeerd" +msgstr "Bloed" msgid "True" msgstr "Juist" @@ -7438,23 +7434,20 @@ msgid "Change his/her memo as you like" msgstr "" -#, fuzzy msgid "_Modify" -msgstr "Bewerken" - -#, fuzzy +msgstr "_Bewerken" + msgid "Memo Modify" -msgstr "Bewerken" - -#, fuzzy +msgstr "Memo wijzigen" + msgid "Server says:" -msgstr "Server bezig" +msgstr "Server zegt:" msgid "Your request was accepted." -msgstr "" +msgstr "De aanvraag werd geaccepteerd." msgid "Your request was rejected." -msgstr "" +msgstr "De aanvraag werd afgewezen." #, c-format msgid "%u requires verification" @@ -7589,14 +7582,14 @@ #, c-format msgid "Successfully joined Qun %s (%u)" -msgstr "" +msgstr "Succesvolle deelname Qun %s (%u)" msgid "Successfully joined Qun" msgstr "Succesvol aan Qun deelgenmen" #, c-format msgid "Qun %u denied from joining" -msgstr "" +msgstr "Qun %u afgewezen voor deelname" msgid "QQ Qun Operation" msgstr "QQ Qun operatie" @@ -7689,13 +7682,13 @@ msgstr "Vlag" msgid "Ver" -msgstr "" +msgstr "Versie" msgid "Invalid name" msgstr "Ongeldige bijnaam" msgid "Select icon..." -msgstr "Icoon selecteren..." +msgstr "Pictogram selecteren..." #, c-format msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n" @@ -7789,7 +7782,7 @@ msgstr "Over OpenQ %s" msgid "Change Icon" -msgstr "Icoon veranderen" +msgstr "Pictogram veranderen" msgid "Change Password" msgstr "Wachtwoord veranderen" @@ -7798,14 +7791,13 @@ msgstr "Accountinformatie" msgid "Update all QQ Quns" -msgstr "" +msgstr "Alle QQ Quns vernieuwen" msgid "About OpenQ" msgstr "Over OpenQ" -#, fuzzy msgid "Modify Buddy Memo" -msgstr "Adres bewerken" +msgstr "Contactmemo wijzigen" #. *< type #. *< ui_requirement @@ -8983,10 +8975,6 @@ msgid "Connecting to SILC Server" msgstr "Verbinden met SILC-server" -#, fuzzy -msgid "Unable to not load SILC key pair" -msgstr "Kan SILC sleutelpaar niet laden" - msgid "Out of memory" msgstr "Te weinig geheugen" @@ -9555,9 +9543,8 @@ msgid "Yahoo Chat port" msgstr "Chatpoort Yahoo" -#, fuzzy msgid "Yahoo JAPAN ID..." -msgstr "Yahoo! ID..." +msgstr "Yahoo JAPAN ID..." #. *< type #. *< ui_requirement @@ -9569,12 +9556,11 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "Yahoo-protocol-plug-in" +msgstr "Yahoo! JAPAN protocol-plug-in" msgid "Your SMS was not delivered" -msgstr "" +msgstr "De SMS werd niet afgeleverd" msgid "Your Yahoo! message did not get sent." msgstr "Uw Yahoo! bericht is niet verzonden." @@ -9601,9 +9587,8 @@ msgstr "Contact toevoegen geweigerd" #. Some error in the received stream -#, fuzzy msgid "Received invalid data" -msgstr "Ongeldige data ontvangen van server." +msgstr "Ongeldige data ontvangen" #. security lock from too many failed login attempts #, fuzzy @@ -9841,12 +9826,9 @@ msgid "The user's profile is empty." msgstr "Gebruikersprofiel is leeg." -#, c-format -msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." -msgstr "%s heeft uw uitnodiging voor ruimte \"%s\" afgeslagen omdat \"%s\"." - -msgid "Invitation Rejected" -msgstr "Uitnodiging geweigerd" +#, fuzzy, c-format +msgid "%s has declined to join." +msgstr "%s heeft zich aangemeld." msgid "Failed to join chat" msgstr "Kan niet deelnemen aan chat" @@ -10023,7 +10005,7 @@ msgstr "Importeren van .zephyr.subs" msgid "Realm" -msgstr "" +msgstr "Gebied" msgid "Exposure" msgstr "Ontmaskering" @@ -10332,8 +10314,8 @@ msgid "Use this buddy _icon for this account:" msgstr "Dit contact_plaatje gebruiken voor dit account:" -msgid "_Advanced" -msgstr "_Geavanceerd" +msgid "Ad_vanced" +msgstr "Gea_vanceerd" msgid "Use GNOME Proxy Settings" msgstr "Gebruik GNOME Proxy-instellingen" @@ -10395,9 +10377,8 @@ msgid "Create _this new account on the server" msgstr "_Dit account op de server aanmaken" -#, fuzzy -msgid "_Proxy" -msgstr "Proxy" +msgid "P_roxy" +msgstr "P_roxy" msgid "Enabled" msgstr "Ingeschakeld" @@ -10447,9 +10428,8 @@ msgid "Please update the necessary fields." msgstr "Update de belangrijke velden." -#, fuzzy msgid "A_ccount" -msgstr "Account" +msgstr "A_ccount" msgid "" "Please enter the appropriate information about the chat you would like to " @@ -10466,7 +10446,7 @@ msgstr "De_blokkeren" msgid "Move to" -msgstr "Ga naar" +msgstr "Verplaatsen naar" msgid "Get _Info" msgstr "_Info opzoeken" @@ -10474,16 +10454,14 @@ msgid "I_M" msgstr "_Bericht sturen" -#, fuzzy msgid "_Audio Call" -msgstr "_Chat toevoegen" +msgstr "_Audio-gesprek" msgid "Audio/_Video Call" -msgstr "" - -#, fuzzy +msgstr "Audio/_Videogesprek" + msgid "_Video Call" -msgstr "Video-chat" +msgstr "Video-gesprek" msgid "_Send File..." msgstr "Bestand _sturen" @@ -10494,13 +10472,11 @@ msgid "View _Log" msgstr "_Logboek" -#, fuzzy msgid "Hide When Offline" -msgstr "Verberg tijdens offline zijn" - -#, fuzzy +msgstr "Verbergen indien offline" + msgid "Show When Offline" -msgstr "Weergeven tijdens offline zijn" +msgstr "Weergeven indien offline" msgid "_Alias..." msgstr "_Alias..." @@ -10626,9 +10602,8 @@ msgid "/Tools/_Certificates" msgstr "/Extra/_Certificaten" -#, fuzzy msgid "/Tools/Custom Smile_ys" -msgstr "/Extra/Smile_y" +msgstr "/Extra/Eigen smiley_s" msgid "/Tools/Plu_gins" msgstr "/Extra/_Plug-ins" @@ -10874,7 +10849,7 @@ #, fuzzy msgid "_Remain in chat after window is closed." -msgstr "Verberg c_hat wanneer het venster gesloten is." +msgstr "Verberg c_hat wanneer de verbinding verbroken wordt." msgid "Please enter the name of the group to be added." msgstr "Geef de naam van de toe te voegen groep." @@ -10910,9 +10885,8 @@ msgid "The background color for the buddy list" msgstr "" -#, fuzzy msgid "Layout" -msgstr "Laotiaans" +msgstr "Lay-out" msgid "The layout of icons, name, and status of the blist" msgstr "" @@ -10925,9 +10899,8 @@ msgid "The background color of an expanded group" msgstr "" -#, fuzzy msgid "Expanded Text" -msgstr "_Uitvouwen" +msgstr "Uitgevouwde tekst" msgid "The text information for when a group is expanded" msgstr "" @@ -10939,59 +10912,51 @@ msgid "The background color of a collapsed group" msgstr "" -#, fuzzy msgid "Collapsed Text" -msgstr "_Dichtvouwen" +msgstr "Samengevoegde tekst" msgid "The text information for when a group is collapsed" msgstr "" #. Buddy -#, fuzzy msgid "Contact/Chat Background Color" -msgstr "Achtergrondkleur selecteren" +msgstr "Contact/Achtergrondkleur gesprek" msgid "The background color of a contact or chat" -msgstr "" - -#, fuzzy +msgstr "De achtergrond voor een contact of gesprek" + msgid "Contact Text" -msgstr "Snelkoppeling" +msgstr "Contact tekst" msgid "The text information for when a contact is expanded" msgstr "" -#, fuzzy msgid "On-line Text" -msgstr "Online" +msgstr "" msgid "The text information for when a buddy is online" msgstr "" -#, fuzzy msgid "Away Text" -msgstr "Afwezig" +msgstr "Afwezig tekst" msgid "The text information for when a buddy is away" msgstr "" -#, fuzzy msgid "Off-line Text" -msgstr "Offline " +msgstr "Offline tejst" msgid "The text information for when a buddy is off-line" msgstr "" -#, fuzzy msgid "Idle Text" -msgstr "Humeur-tekst" +msgstr "Tekst inactief" msgid "The text information for when a buddy is idle" msgstr "" -#, fuzzy msgid "Message Text" -msgstr "Bericht verzonden" +msgstr "Berichttekst" msgid "The text information for when a buddy has an unread message" msgstr "" @@ -11060,7 +11025,6 @@ msgid "Get Away Message" msgstr "Afwezigheidsbericht" -#, fuzzy msgid "Last Said" msgstr "Laatst gezegd" @@ -11107,21 +11071,17 @@ msgid "/Conversation/Clea_r Scrollback" msgstr "/Gesprek/_Opschonen" -#, fuzzy msgid "/Conversation/M_edia" -msgstr "/Gesprek/_Meer" - -#, fuzzy +msgstr "/Gesprek/M_edia" + msgid "/Conversation/Media/_Audio Call" -msgstr "/Gesprek/_Meer" - -#, fuzzy +msgstr "/Gesprek/Media/_Audiogesprek" + msgid "/Conversation/Media/_Video Call" -msgstr "/Gesprek/_Meer" - -#, fuzzy +msgstr "/Gesprek/Media/Videogesprek" + msgid "/Conversation/Media/Audio\\/Video _Call" -msgstr "/Gesprek/Logboek _weergeven" +msgstr "/Gesprek/Media/Audio\\/Videogesprek" msgid "/Conversation/Se_nd File..." msgstr "/Gesprek/Bestand ver_zenden..." @@ -11195,17 +11155,14 @@ msgid "/Conversation/View Log" msgstr "/Gesprek/Logboek weergeven" -#, fuzzy msgid "/Conversation/Media/Audio Call" -msgstr "/Gesprek/Meer" - -#, fuzzy +msgstr "/Gesprek/Media/Audiogesprek" + msgid "/Conversation/Media/Video Call" -msgstr "/Gesprek/Logboek weergeven" - -#, fuzzy +msgstr "/Gesprek/Media/Videogesprek" + msgid "/Conversation/Media/Audio\\/Video Call" -msgstr "/Gesprek/Meer" +msgstr "/Gesprek/Media/Audio\\/Videogesprek" msgid "/Conversation/Send File..." msgstr "/Gesprek/Bestand verzenden..." @@ -11394,7 +11351,7 @@ msgstr "Ka-Hing Cheung" msgid "voice and video" -msgstr "" +msgstr "spraak en video" msgid "support" msgstr "ondersteuning" @@ -11520,9 +11477,8 @@ msgid "Hungarian" msgstr "Hongaars" -#, fuzzy msgid "Armenian" -msgstr "Roemeens" +msgstr "Armeens" msgid "Indonesian" msgstr "Indonesisch" @@ -11539,9 +11495,8 @@ msgid "Ubuntu Georgian Translators" msgstr "Georgische vertalers van Ubuntu" -#, fuzzy msgid "Khmer" -msgstr "Anders" +msgstr "Cambodjaans" msgid "Kannada" msgstr "Kannada" @@ -11564,9 +11519,8 @@ msgid "Macedonian" msgstr "Macedonisch" -#, fuzzy msgid "Mongolian" -msgstr "Macedonisch" +msgstr "Mongools" msgid "Bokmål Norwegian" msgstr "Noors" @@ -11623,7 +11577,7 @@ msgstr "Zweeds" msgid "Swahili" -msgstr "" +msgstr "Swahili" # ui/preferences.glade.h:192 msgid "Tamil" @@ -12366,22 +12320,21 @@ msgstr "" msgid "/_Media" -msgstr "" +msgstr "/_Media" msgid "/Media/_Hangup" -msgstr "" - -#, fuzzy +msgstr "/Media/Op_hangen" + msgid "Calling..." -msgstr "Berekenen..." +msgstr "Bellen..." #, c-format msgid "%s wishes to start an audio/video session with you." -msgstr "" +msgstr "%s wil een audio-/videogesprek starten." #, c-format msgid "%s wishes to start a video session with you." -msgstr "" +msgstr "%s wil een videogesprek starten." #, c-format msgid "%s has %d new message." @@ -12412,9 +12365,8 @@ "Kan handmatige browser niet starten omdat er geen correcte opdracht is " "ingesteld." -#, fuzzy msgid "No message" -msgstr "Onbekend bericht" +msgstr "Geen bericht" msgid "Open All Messages" msgstr "Alle berichten openen" @@ -12427,7 +12379,7 @@ msgstr "Nieuw contactalarm" msgid "Dismiss" -msgstr "" +msgstr "Afwijzen" #, fuzzy msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>" @@ -12558,61 +12510,58 @@ msgid "Pounce Target" msgstr "Alarmdoel" -#, fuzzy, c-format +#, c-format msgid "Started typing" -msgstr "...start met typen" - -#, fuzzy, c-format +msgstr "Gestart met typen" + +#, c-format msgid "Paused while typing" -msgstr "...pauzeert tijdens het typen" - -#, fuzzy, c-format +msgstr "Pauzeert tijdens het typen" + +#, c-format msgid "Signed on" -msgstr "...zich aanmeldt" - -#, fuzzy, c-format +msgstr "Aangemeld" + +#, c-format msgid "Returned from being idle" -msgstr "%s is weer actief (%s)" - -#, fuzzy, c-format +msgstr "Is weer terug na inactief geweest te zijn" + +#, c-format msgid "Returned from being away" -msgstr "...van afwezigheid terugkeert " - -#, fuzzy, c-format +msgstr "Is weer terug na weg geweest te zijn" + +#, c-format msgid "Stopped typing" -msgstr "Gestopt met typen" - -#, fuzzy, c-format +msgstr "Stopte met typen" + +#, c-format msgid "Signed off" -msgstr "...zich afmeldt" - -#, fuzzy, c-format +msgstr "Afgemeld" + +#, c-format msgid "Became idle" -msgstr "...inactief wordt" - -#, fuzzy, c-format +msgstr "Werd incatief" + +#, c-format msgid "Went away" -msgstr "Bij afwezigheid" - -#, fuzzy, c-format +msgstr "Ging weg" + +#, c-format msgid "Sent a message" -msgstr "Een bericht versturen" - -#, fuzzy, c-format +msgstr "Verzond een bericht" + +#, c-format msgid "Unknown.... Please report this!" -msgstr "Onbekend contactalarm. Rapporteer dit alstublieft!" - -#, fuzzy +msgstr "Onbekend... Rapporteer dit alsjeblieft!" + msgid "Theme failed to unpack." -msgstr "Kan smileythema niet uitpakken." - -#, fuzzy +msgstr "Kan thema niet uitpakken." + msgid "Theme failed to load." -msgstr "Kan smileythema niet uitpakken." - -#, fuzzy +msgstr "Kan thema niet laden." + msgid "Theme failed to copy." -msgstr "Kan smileythema niet uitpakken." +msgstr "Kan thema niet kopiëren." msgid "Install Theme" msgstr "Installeer thema" @@ -12634,9 +12583,8 @@ msgstr "_Sluit gesprekken af met de Escape toets" #. Buddy List Themes -#, fuzzy msgid "Buddy List Theme" -msgstr "Contactenlijst" +msgstr "Thema contactenlijst" #. System Tray msgid "System Tray Icon" @@ -12648,9 +12596,8 @@ msgid "On unread messages" msgstr "Bij ongelezen berichten" -#, fuzzy msgid "Conversation Window" -msgstr "IM gespreksvensters" +msgstr "Gespreksvenster" msgid "_Hide new IM conversations:" msgstr "_Nieuwe gesprekken verbergen:" @@ -12777,7 +12724,7 @@ #. TURN server msgid "Relay Server (TURN)" -msgstr "" +msgstr "Relay Server (TURN)" msgid "Proxy Server & Browser" msgstr "Proxy-server & browser" @@ -13143,28 +13090,24 @@ msgid "Add Smiley" msgstr "Smiley toevoegen" -#, fuzzy msgid "_Image:" -msgstr "_Afbeelding" +msgstr "_Afbeelding:" #. Shortcut text -#, fuzzy msgid "S_hortcut text:" -msgstr "Snelkoppeling" +msgstr "_Tekst snelkoppeling" msgid "Smiley" msgstr "Eigen smileys" -#, fuzzy msgid "Shortcut Text" -msgstr "Snelkoppeling" +msgstr "Tekst snelkoppeling" msgid "Custom Smiley Manager" msgstr "Eigen smileys beheren" -#, fuzzy msgid "Select Buddy Icon" -msgstr "Contact selecteren" +msgstr "Pictogram contact selecteren" msgid "Click to change your buddyicon for this account." msgstr "Klik om het contactplaatje voor dit account te veranderen." @@ -13250,13 +13193,12 @@ msgid "Cannot send launcher" msgstr "Kan starter niet sturen" -#, fuzzy msgid "" "You dragged a desktop launcher. Most likely you wanted to send the target of " "this launcher instead of this launcher itself." msgstr "" "Je hebt een starter hierheen gesleept. Waarschijnlijk wil je het waar deze " -"starter naar verwijst sturen." +"starter naar verwijst sturen in plaats van de starter zelf." #, c-format msgid "" @@ -13274,7 +13216,7 @@ "Het bestand '%s' is te groot voor %s. Probeer een kleinere afbeelding\n" msgid "Icon Error" -msgstr "Icoonfout" +msgstr "Pictogramfout" msgid "Could not set icon" msgstr "Kan plaatje niet instellen" @@ -13290,9 +13232,8 @@ "kan afbeelding '%s' niet laden: reden onbekend, waarschijnlijk een kapotte " "afbeelding" -#, fuzzy msgid "_Open Link" -msgstr "Verwijzing _openen met:" +msgstr "Koppeling _openen" msgid "_Copy Link Location" msgstr "Verwijzing _kopiëren" @@ -13300,9 +13241,21 @@ msgid "_Copy Email Address" msgstr "E-mailadres _kopiëren" +msgid "_Open File" +msgstr "Bestand _openen" + +msgid "Open _Containing Directory" +msgstr "Ma_p openen" + msgid "Save File" msgstr "Bestand opslaan" +msgid "_Play Sound" +msgstr "Geluid afs_pelen" + +msgid "_Save File" +msgstr "Bestand op_slaan" + msgid "Select color" msgstr "Selecteer kleur" @@ -13402,21 +13355,17 @@ msgid "Select an XMPP server to query" msgstr "Kies een te raadplegen conferentieserver" -#, fuzzy msgid "Find Services" -msgstr "Online diensten" - -#, fuzzy +msgstr "Diensten zoeken" + msgid "Add to Buddy List" -msgstr "Contactenlijst verzenden" - -#, fuzzy +msgstr "Aan contactenlijst toevoegen" + msgid "Gateway" -msgstr "...weggaat" - -#, fuzzy +msgstr "Poort" + msgid "Directory" -msgstr "Map voor logboeken" +msgstr "Map" #, fuzzy msgid "PubSub Collection" @@ -13437,13 +13386,11 @@ msgid "Service Discovery" msgstr "Directory info instellen" -#, fuzzy msgid "_Browse" -msgstr "_Browser:" - -#, fuzzy +msgstr "_Bladeren" + msgid "Server does not exist" -msgstr "Gebruiker bestaat niet" +msgstr "Server bestaat niet" #, fuzzy msgid "Server does not support service discovery" @@ -14033,19 +13980,17 @@ msgid "Disable Typing Notification Text" msgstr "Schakel typmelding in" -#, fuzzy msgid "GTK+ Theme Control Settings" -msgstr "Pidgin GTK+ themabeheer" - -#, fuzzy +msgstr "Instellingen GTK+ themabeheer" + msgid "Colors" -msgstr "Sluiten" +msgstr "Kleuren" msgid "Fonts" msgstr "Lettertypen" msgid "Miscellaneous" -msgstr "" +msgstr "Diversen" msgid "Gtkrc File Tools" msgstr "Gtkrc bestandsbesturing" @@ -14190,34 +14135,30 @@ msgid "Replaces text in outgoing messages according to user-defined rules." msgstr "Vervangt tekst in uitgaande berichten volgens uw eigen regels." -#, fuzzy msgid "Just logged in" -msgstr "Niet aangemeld" - -#, fuzzy +msgstr "Aangemeld" + msgid "Just logged out" -msgstr "Niet aangemeld" +msgstr "Afgemeld" msgid "" "Icon for Contact/\n" "Icon for Unknown person" msgstr "" - -#, fuzzy +"Pictogram voor contact/\n" +"Pictograam voor onbekend persoon" + msgid "Icon for Chat" -msgstr "Chat openen" - -#, fuzzy +msgstr "Pictgram voor gesprek" + msgid "Ignored" -msgstr "Negeren" - -#, fuzzy +msgstr "Genegeerd" + msgid "Founder" -msgstr "Harder" - -#, fuzzy +msgstr "Oprichter" + msgid "Operator" -msgstr "Opera" +msgstr "Operator" msgid "Half Operator" msgstr "" @@ -14226,58 +14167,47 @@ msgid "Authorization dialog" msgstr "Toestemming gegeven" -#, fuzzy msgid "Error dialog" -msgstr "Fout" - -#, fuzzy +msgstr "Foutdialoogvenster" + msgid "Information dialog" -msgstr "Informatie" +msgstr "Informatiedialoogvenster" msgid "Mail dialog" -msgstr "" - -#, fuzzy +msgstr "Maildialoogvenster" + msgid "Question dialog" -msgstr "Vraag" - -#, fuzzy +msgstr "Dialoogvenster voor vragen" + msgid "Warning dialog" -msgstr "Waarschuwingsniveau" +msgstr "Waarschuwingsdialoogvenster" msgid "What kind of dialog is this?" -msgstr "" - -#, fuzzy +msgstr "Wat voor soort dialoogvenster is dit?" + msgid "Status Icons" -msgstr "Status van %s" - -#, fuzzy +msgstr "Status-pictogrammen" + msgid "Chatroom Emblems" -msgstr "Taal van chatruimte" - -#, fuzzy +msgstr "Symbolen gespreksruimte" + msgid "Dialog Icons" -msgstr "Icoon veranderen" - -#, fuzzy +msgstr "Pictogrammen voor dialoogvensters" + msgid "Pidgin Icon Theme Editor" -msgstr "Pidgin GTK+ themabeheer" - -#, fuzzy +msgstr "Pidgin pictogram themabeheer" + msgid "Contact" -msgstr "Accountinformatie" - -#, fuzzy +msgstr "Contact" + msgid "Pidgin Buddylist Theme Editor" -msgstr "Contactenlijst" - -#, fuzzy +msgstr "Thema bewerken contactenlijst Pidgin" + msgid "Edit Buddylist Theme" -msgstr "Contactenlijst" +msgstr "Thema contactenlijst bewerken" msgid "Edit Icon Theme" -msgstr "" +msgstr "Pictogram-thema bewerken" #. *< type #. *< ui_requirement @@ -14286,16 +14216,14 @@ #. *< priority #. *< id #. * description -#, fuzzy msgid "Pidgin Theme Editor" -msgstr "Pidgin GTK+ themabeheer" +msgstr "Pidgin themabewerker" #. *< name #. *< version #. * summary -#, fuzzy msgid "Pidgin Theme Editor." -msgstr "Pidgin GTK+ themabeheer" +msgstr "Pidgin themabewerker" #. *< type #. *< ui_requirement @@ -14517,6 +14445,25 @@ msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "Deze plug-in is handig voor het debuggen van XMPP servers of clienten." +#, fuzzy +#~ msgid "Malformed BOSH Connect Server" +#~ msgstr "Kan geen verbinding maken met de server." + +#, fuzzy +#~ msgid "Unable to not load SILC key pair" +#~ msgstr "Kan SILC sleutelpaar niet laden" + +#~ msgid "" +#~ "%s declined your conference invitation to room \"%s\" because \"%s\"." +#~ msgstr "%s heeft uw uitnodiging voor ruimte \"%s\" afgeslagen omdat \"%s\"." + +#~ msgid "Invitation Rejected" +#~ msgstr "Uitnodiging geweigerd" + +#, fuzzy +#~ msgid "_Proxy" +#~ msgstr "Proxy" + #~ msgid "Cannot open socket" #~ msgstr "Kan socket niet openen"