# HG changeset patch # User Richard Laager # Date 1227737504 0 # Node ID 9a5d98ddca8d624655ac15a2d0a70aa41fffcfa0 # Parent a6a6a6c1905812b26bd2d05ed5171e9fa590b8e0# Parent 2a3c7e11970092cfb075d1e07adf38da4f1caeff propagate from branch 'im.pidgin.pidgin' (head 2ee32f4f1f50a3e3c9038487554b4cfa22507df0) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head a9b19faa48d45e5536c6c2f66dd309f37f52bcce) diff -r 2a3c7e119700 -r 9a5d98ddca8d finch/gntblist.c --- a/finch/gntblist.c Tue Nov 25 18:24:45 2008 +0000 +++ b/finch/gntblist.c Wed Nov 26 22:11:44 2008 +0000 @@ -2207,6 +2207,7 @@ { PurpleSavedStatus *current; const char *message, *newmessage; + char *escnewmessage; PurpleStatusPrimitive prim, newprim; StatusBoxItem *item; @@ -2216,6 +2217,7 @@ newmessage = gnt_entry_get_text(GNT_ENTRY(ggblist->statustext)); item = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(ggblist->status)); + escnewmessage = newmessage ? g_markup_escape_text(newmessage, -1) : NULL; switch (item->type) { case STATUS_PRIMITIVE: @@ -2228,16 +2230,16 @@ goto end; /* 'New' or 'Saved' is selected, but this should never happen. */ } - if (newprim != prim || ((message && !newmessage) || - (!message && newmessage) || - (message && newmessage && g_utf8_collate(message, newmessage) != 0))) + if (newprim != prim || ((message && !escnewmessage) || + (!message && escnewmessage) || + (message && escnewmessage && g_utf8_collate(message, escnewmessage) != 0))) { - PurpleSavedStatus *status = purple_savedstatus_find_transient_by_type_and_message(newprim, newmessage); + PurpleSavedStatus *status = purple_savedstatus_find_transient_by_type_and_message(newprim, escnewmessage); /* Holy Crap! That's a LAWNG function name */ if (status == NULL) { status = purple_savedstatus_new(NULL, newprim); - purple_savedstatus_set_message(status, newmessage); + purple_savedstatus_set_message(status, escnewmessage); } purple_savedstatus_activate(status); @@ -2245,6 +2247,7 @@ gnt_box_give_focus_to_child(GNT_BOX(ggblist->window), ggblist->tree); end: + g_free(escnewmessage); if (ggblist->typing) g_source_remove(ggblist->typing); ggblist->typing = 0; diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/account.c diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/dnssrv.c diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/ft.c diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/protocols/jabber/message.c --- a/libpurple/protocols/jabber/message.c Tue Nov 25 18:24:45 2008 +0000 +++ b/libpurple/protocols/jabber/message.c Wed Nov 26 22:11:44 2008 +0000 @@ -920,7 +920,7 @@ if (jb) { return jabber_buddy_has_capability(jb, XEP_0231_NAMESPACE); } else { - return NULL; + return FALSE; } break; default: diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/protocols/jabber/roster.c diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/protocols/msn/contact.c diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/protocols/msn/soap.c --- a/libpurple/protocols/msn/soap.c Tue Nov 25 18:24:45 2008 +0000 +++ b/libpurple/protocols/msn/soap.c Wed Nov 26 22:11:44 2008 +0000 @@ -190,13 +190,12 @@ g_hash_table_foreach_remove(sess->soap_table, msn_soap_cleanup_each, &t); - if (g_hash_table_size(sess->soap_table) == 0) { - sess->soap_cleanup_handle = 0; - return FALSE; - } + if (g_hash_table_size(sess->soap_table) != 0) + return TRUE; } - return TRUE; + sess->soap_cleanup_handle = 0; + return FALSE; } static MsnSoapConnection * diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/protocols/msn/switchboard.c --- a/libpurple/protocols/msn/switchboard.c Tue Nov 25 18:24:45 2008 +0000 +++ b/libpurple/protocols/msn/switchboard.c Wed Nov 26 22:11:44 2008 +0000 @@ -81,6 +81,9 @@ swboard->destroying = TRUE; + if (swboard->reconn_timeout_h > 0) + purple_timeout_remove(swboard->reconn_timeout_h); + /* If it linked us is because its looking for trouble */ while (swboard->slplinks != NULL) msn_slplink_destroy(swboard->slplinks->data); diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/protocols/myspace/session.c diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/protocols/myspace/session.h diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/protocols/myspace/zap.c diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/protocols/zephyr/zephyr.c --- a/libpurple/protocols/zephyr/zephyr.c Tue Nov 25 18:24:45 2008 +0000 +++ b/libpurple/protocols/zephyr/zephyr.c Wed Nov 26 22:11:44 2008 +0000 @@ -343,7 +343,7 @@ Converts strings to utf-8 if necessary using user specified encoding */ -static gchar *zephyr_recv_convert(PurpleConnection *gc,gchar *string, int len) +static gchar *zephyr_recv_convert(PurpleConnection *gc, gchar *string) { gchar *utf8; GError *err = NULL; @@ -351,7 +351,7 @@ if (g_utf8_validate(string, len, NULL)) { return g_strdup(string); } else { - utf8 = g_convert(string, len, "UTF-8", zephyr->encoding, NULL, NULL, &err); + utf8 = g_convert(string, -1, "UTF-8", zephyr->encoding, NULL, NULL, &err); if (err) { purple_debug_error("zephyr", "recv conversion error: %s\n", err->message); utf8 = g_strdup(_("(There was an error converting this message. Check the 'Encoding' option in the Account Editor)")); @@ -820,7 +820,7 @@ PurpleConvChat *gcc; char *ptr = (char *) notice.z_message + (strlen(notice.z_message) + 1); int len; - char *sendertmp = g_strdup_printf("%s", zephyr->username); + char *stripped_sender; int signature_length = strlen(notice.z_message); int message_has_no_body = 0; PurpleMessageFlags flags = 0; @@ -843,24 +843,23 @@ tmpescape = g_markup_escape_text(buf, -1); g_free(buf); buf2 = zephyr_to_html(tmpescape); - buf3 = zephyr_recv_convert(gc,buf2, strlen(buf2)); + buf3 = zephyr_recv_convert(gc, buf2); g_free(buf2); g_free(tmpescape); } + stripped_sender = zephyr_strip_local_realm(zephyr,notice.z_sender); + if (!g_ascii_strcasecmp(notice.z_class, "MESSAGE") && !g_ascii_strcasecmp(notice.z_class_inst, "PERSONAL") && !g_ascii_strcasecmp(notice.z_recipient,zephyr->username)) { - gchar* stripped_sender; if (!g_ascii_strcasecmp(notice.z_message, "Automated reply:")) flags |= PURPLE_MESSAGE_AUTO_RESP; - stripped_sender = zephyr_strip_local_realm(zephyr,notice.z_sender); if (!g_ascii_strcasecmp(notice.z_opcode,"PING")) serv_got_typing(gc,stripped_sender,ZEPHYR_TYPING_RECV_TIMEOUT, PURPLE_TYPING); else serv_got_im(gc, stripped_sender, buf3, flags, time(NULL)); - g_free(stripped_sender); } else { zephyr_triple *zt1, *zt2; gchar *send_inst_utf8; @@ -878,15 +877,17 @@ serv_got_joined_chat(gc, zt2->id, zt2->name); zephyr_chat_set_topic(gc,zt2->id,notice.z_class_inst); } - g_free(sendertmp); /* fix memory leak? */ - /* If the person is in the default Realm, then strip the - Realm from the sender field */ - sendertmp = zephyr_strip_local_realm(zephyr,notice.z_sender); - send_inst = g_strdup_printf("%s %s",sendertmp,notice.z_class_inst); - send_inst_utf8 = zephyr_recv_convert(gc,send_inst, strlen(send_inst)); - if (!send_inst_utf8) { - purple_debug_error("zephyr","send_inst %s became null\n", send_inst); - send_inst_utf8 = "malformed instance"; + + if (!g_ascii_strcasecmp(notice.z_class_inst,"PERSONAL")) + send_inst_utf8 = g_strdup(stripped_sender); + else { + send_inst = g_strdup_printf("[%s] %s",notice.z_class_inst,stripped_sender); + send_inst_utf8 = zephyr_recv_convert(gc,send_inst); + g_free(send_inst); + if (!send_inst_utf8) { + purple_debug_error("zephyr","Failed to convert instance for sender %s.\n", stripped_sender); + send_inst_utf8 = g_strdup(stripped_sender); + } } gconv1 = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, @@ -906,13 +907,12 @@ } g_free(sendertmp); serv_got_chat_in(gc, zt2->id, send_inst_utf8, 0, buf3, time(NULL)); - g_free(send_inst); g_free(send_inst_utf8); - + free_triple(zt1); } + g_free(stripped_sender); g_free(buf3); - } } @@ -2580,7 +2580,7 @@ gc->account); gcc = purple_conversation_get_chat_data(gconv); - topic_utf8 = zephyr_recv_convert(gc,(gchar *)topic,strlen(topic)); + topic_utf8 = zephyr_recv_convert(gc,(gchar *)topic); purple_conv_chat_set_topic(gcc,sender,topic_utf8); g_free(topic_utf8); return; diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/tests/test_cipher.c diff -r 2a3c7e119700 -r 9a5d98ddca8d libpurple/upnp.c diff -r 2a3c7e119700 -r 9a5d98ddca8d pidgin/gtkutils.c diff -r 2a3c7e119700 -r 9a5d98ddca8d po/ChangeLog diff -r 2a3c7e119700 -r 9a5d98ddca8d po/de.po --- a/po/de.po Tue Nov 25 18:24:45 2008 +0000 +++ b/po/de.po Wed Nov 26 22:11:44 2008 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-28 17:46+0100\n" +"POT-Creation-Date: 2008-11-25 22:03+0100\n" "PO-Revision-Date: 2008-10-28 17:46+0100\n" "Last-Translator: Jochen Kemnade \n" "Language-Team: Deutsch \n" @@ -273,7 +273,6 @@ msgid "Add Buddy Pounce" msgstr "Buddy-Alarm hinzufügen" -#. if (q_bud && is_online(q_bud->status)) { msgid "Send File" msgstr "Datei versenden" @@ -1340,7 +1339,7 @@ #. PurpleStatusPrimitive #. id - use default #. name - use default -#. savable +#. saveable #. user_settable #. not independent #. Attributes - each status can have a message. @@ -4977,7 +4976,7 @@ #. primitive #. ID #. name - use default -#. savable +#. saveable #. should be user_settable some day #. independent msgid "Artist" @@ -5190,8 +5189,7 @@ #. *< id #. *< name #. *< version -#. * summary -#. * description +#. *< summary msgid "Windows Live Messenger Protocol Plugin" msgstr "Windows Live Messenger Protokoll-Plugin" @@ -6217,7 +6215,7 @@ msgstr "Bewertung zum Client" msgid "Service unavailable" -msgstr "Dienst nicht unerreichbar" +msgstr "Dienst nicht verfügbar" msgid "Service not defined" msgstr "Dienst nicht definiert" @@ -6425,6 +6423,7 @@ "Leerzeichen enthalten oder nur aus Ziffern bestehen." #. Unregistered screen name +#. uid is not exist msgid "Invalid username." msgstr "Ungültiger Benutzername." @@ -6858,10 +6857,12 @@ "beginnen und nur Buchstaben, Ziffern und Leerzeichen enthalten oder nur aus " "Ziffern bestehen." -msgid "Unable To Add" +#, fuzzy +msgid "Unable to Add" msgstr "Kann nicht hinzufügen" -msgid "Unable To Retrieve Buddy List" +#, fuzzy +msgid "Unable to Retrieve Buddy List" msgstr "Konnte Buddy-Liste nicht laden" msgid "" @@ -7086,42 +7087,6 @@ "ist notwendig für IM-Bilder. Da Ihre IP-Adresse verwendet wird, kann dies " "eine Verletzung der Privatsphäre bedeuten." -msgid "Primary Information" -msgstr "Primäre Informationen" - -msgid "Personal Introduction" -msgstr "Persönliche Vorstellung" - -msgid "QQ Number" -msgstr "QQ-Nummer" - -msgid "Country/Region" -msgstr "Land/Region" - -msgid "Province/State" -msgstr "Provinz/Staat" - -msgid "Horoscope Symbol" -msgstr "Horoskopsymbol" - -msgid "Zodiac Sign" -msgstr "Sternzeichen" - -msgid "Blood Type" -msgstr "Blutgruppe" - -msgid "College" -msgstr "College" - -msgid "Zipcode" -msgstr "PLZ" - -msgid "Cellphone Number" -msgstr "Handy-Telefonnummer" - -msgid "Phone Number" -msgstr "Telefonnummer" - msgid "Aquarius" msgstr "Wassermann" @@ -7197,100 +7162,189 @@ msgid "Other" msgstr "Andere" -msgid "Modify information" +#, fuzzy +msgid "Visible" +msgstr "Unsichtbar" + +msgid "Firend Only" +msgstr "" + +#, fuzzy +msgid "Private" +msgstr "Privatsphäre" + +msgid "QQ Number" +msgstr "QQ-Nummer" + +msgid "Country/Region" +msgstr "Land/Region" + +msgid "Province/State" +msgstr "Provinz/Staat" + +msgid "Zipcode" +msgstr "PLZ" + +msgid "Phone Number" +msgstr "Telefonnummer" + +#, fuzzy +msgid "Authorize adding" +msgstr "Buddy autorisieren?" + +msgid "Cellphone Number" +msgstr "Handy-Telefonnummer" + +msgid "Personal Introduction" +msgstr "Persönliche Vorstellung" + +#, fuzzy +msgid "City/Area" +msgstr "Stadt" + +#, fuzzy +msgid "Publish Mobile" +msgstr "Handy (privat)" + +#, fuzzy +msgid "Publish Contact" +msgstr "Kontakt-Alias" + +msgid "College" +msgstr "College" + +#, fuzzy +msgid "Horoscope" +msgstr "Horoskopsymbol" + +#, fuzzy +msgid "Zodiac" +msgstr "Sternzeichen" + +#, fuzzy +msgid "Blood" +msgstr "Blockiert" + +#, fuzzy +msgid "True" +msgstr "Stier" + +#, fuzzy +msgid "False" +msgstr "Gescheitert" + +#, fuzzy +msgid "Modify Contact" +msgstr "Konto bearbeiten" + +#, fuzzy +msgid "Modify Address" +msgstr "Privatadresse" + +#, fuzzy +msgid "Modify Extended Information" msgstr "Informationen bearbeiten" -msgid "Update information" -msgstr "Informationen aktualisieren" - -#. TODO: We don't really need to notify the user about this, do we? -#. TODO: Does the user really need to be notified about this? -msgid "QQ Buddy" -msgstr "QQ-Buddy" - -msgid "Successed:" -msgstr "Erfolgreich:" - -msgid "Change buddy information." +#, fuzzy +msgid "Modify Information" +msgstr "Informationen bearbeiten" + +#, fuzzy +msgid "Update" +msgstr "Letzte Aktualisierung" + +#, fuzzy +msgid "Could not change buddy information." msgstr "Buddy-Informationen bearbeiten" #, c-format -msgid "" -"Setting custom faces is not currently supported. Please choose an image from " -"%s." -msgstr "" -"Das Setzen von benutzerdefinierten Gesichtern wird momentan nicht " -"unterstützt. Bitte wählen Sie ein Bild von %s." - -msgid "Invalid QQ Face" -msgstr "Ungültiges QQ-Gesicht" - -# c-format -#, c-format -msgid "You rejected %d's request" -msgstr "Sie haben die Anfrage von %d abgelehnt" - -msgid "Reject request" -msgstr "Anfrage ablehnen" - -#. title -msgid "Sorry, you are not my style..." +msgid "%d needs Q&A" +msgstr "" + +#, fuzzy +msgid "Add buddy Q&A" +msgstr "Buddy hinzufügen" + +#, fuzzy +msgid "Input answer here" +msgstr "Anfrage hier eingeben" + +msgid "Send" +msgstr "Senden" + +#, fuzzy +msgid "Invalid answer." +msgstr "Ungültiger Benutzername." + +msgid "Authorization denied message:" +msgstr "Nachricht für die Ablehnung der Autorisierung:" + +#, fuzzy +msgid "Sorry, You are not my style." msgstr "Tut mir Leid, du bist nicht mein Typ..." -msgid "Add buddy with auth request failed" -msgstr "Benutzer hinzufügen, wenn Autorisierungsanfrage fehlschlug" - -msgid "Failed:" -msgstr "Gescheitert:" - -msgid "Remove buddy" -msgstr "Buddy entfernen" - -msgid "Remove from other's buddy list" -msgstr "Von der Liste des Buddys entfernen" - #, c-format msgid "%d needs authentication" msgstr "%d benötigt Authentifizierung" +#, fuzzy +msgid "Add buddy authorize" +msgstr "Benutzer zu Ihrer Buddy-Liste hinzufügen?" + msgid "Input request here" msgstr "Anfrage hier eingeben" -#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands msgid "Would you be my friend?" msgstr "Möchten Sie mein Freund sein?" -#. multiline -#. masked -#. hint -msgid "Send" -msgstr "Senden" - -#, c-format -msgid "Add into %d's buddy list" -msgstr "Zu %ds Buddy-Liste hinzufügen" - -msgid "QQ Number Error" -msgstr "Fehler in QQ-Nummer" +msgid "QQ Buddy" +msgstr "QQ-Buddy" + +#, fuzzy +msgid "Add buddy" +msgstr "Buddy hinzufügen" msgid "Invalid QQ Number" msgstr "Ungültige QQ-Nummer" +#, fuzzy +msgid "Failed sending authorize" +msgstr "Bitte autorisiere mich!" + +#, fuzzy, c-format +msgid "Failed removing buddy %d" +msgstr "Kontakt konnte nicht entfernt werden" + +#, fuzzy, c-format +msgid "Failed removing me from %d's buddy list" +msgstr "Von der Liste des Buddys entfernen" + +#, fuzzy +msgid "No reason given" +msgstr "Kein Grund angegeben." + +#. only need to get value +#, c-format +msgid "You have been added by %s" +msgstr "Sie wurden von %s hinzugefügt" + +msgid "Would you like to add him?" +msgstr "Möchten Sie ihn hinzufügen?" + +#, fuzzy, c-format +msgid "Rejected by %s" +msgstr "Anfrage abgelehnt von %s" + +#, c-format +msgid "Message: %s" +msgstr "Nachricht: %s" + msgid "ID: " msgstr "ID: " msgid "Group ID" msgstr "Gruppen-ID" -msgid "Creator" -msgstr "Ersteller" - -msgid "Group Description" -msgstr "Gruppenbeschreibung" - -msgid "Auth" -msgstr "Autorisieren" - msgid "QQ Qun" msgstr "QQ-Qun" @@ -7300,75 +7354,71 @@ msgid "You can only search for permanent Qun\n" msgstr "Sie können nur nach permanenten Qun suchen\n" -#, c-format -msgid "%d request to join Qun %d" -msgstr "%d möchte dem Qun %d beitreten" - -#, c-format -msgid "Message: %s" -msgstr "Nachricht: %s" - -msgid "QQ Qun Operation" -msgstr "QQ-Qun-Operation" - -msgid "Approve" -msgstr "Akzeptieren" - -#, c-format -msgid "Failed to join Qun %d, operated by admin %d" -msgstr "Dem Qun %d, moderiert von admin %d, konnte nicht beigetreten werden" - -#, c-format -msgid "Successed to join Qun %d, operated by admin %d" -msgstr "Erfolgreicher Beitritt in den Qun %d, moderiert vom Admin %d" - -#, c-format -msgid "[%d] removed from Qun \"%d\"" -msgstr "[%d] vom Qun „%d“ entfernt" - -msgid "Notice:" +#, fuzzy +msgid "Not member" +msgstr "Ich bin kein Mitglied" + +msgid "Member" +msgstr "Mitglied" + +#, fuzzy +msgid "Requesting" +msgstr "Anfrage-Dialog" + +#, fuzzy +msgid "Admin" +msgstr "Adium" + +#, fuzzy +msgid "Notice" msgstr "Bemerkung:" -#, c-format -msgid "[%d] added to Qun \"%d\"" -msgstr "[%d] zum Qun „%d“ hinzugefügt" - -msgid "I am not a member" -msgstr "Ich bin kein Mitglied" - -msgid "I am a member" -msgstr "Ich bin Mitglied" - -msgid "I am requesting" -msgstr "Ich frage an" - -msgid "I am the admin" -msgstr "Ich bin der Admin" - -msgid "Unknown status" -msgstr "Unbekannter Status" +#, fuzzy +msgid "Detail" +msgstr "Standard" + +msgid "Creator" +msgstr "Ersteller" + +#, fuzzy +msgid "About me" +msgstr "Über %s" + +#, fuzzy +msgid "Category" +msgstr "Chatfehler" msgid "The Qun does not allow others to join" msgstr "Diesen Qun können andere nicht beitreten" -msgid "Remove from Qun" -msgstr "vom Qun entfernen" - -msgid "Join to Qun" +#, fuzzy +msgid "Join QQ Qun" msgstr "Qun betreten" #, c-format +msgid "Successfully joined Qun %s (%d)" +msgstr "" + +#, fuzzy +msgid "Successfully joined Qun" +msgstr "Sie haben einen Qun angelegt" + +#, c-format msgid "Qun %d denied to join" msgstr "Qun %d hat Ihren Beitritt abgelehnt" +msgid "QQ Qun Operation" +msgstr "QQ-Qun-Operation" + +msgid "Failed:" +msgstr "Gescheitert:" + msgid "Join Qun, Unknow Reply" msgstr "Qun-Beitritt, Unbekannte Antwort" -msgid "You entered a group ID outside the acceptable range" -msgstr "Sie haben eine Gruppen-ID außerhalb des erlaubten Bereichs angegeben" - -msgid "Are you sure you want to leave this Qun?" -msgstr "Wollen Sie dieses Qun wirklich verlassen?" +#, fuzzy +msgid "Quit Qun" +msgstr "QQ-Qun" msgid "" "Note, if you are the creator, \n" @@ -7377,43 +7427,51 @@ "Beachten Sie, dass diese Operation den Qun entfernen könnte, \n" "wenn Sie der Ersteller sind." -#. we want to see window -msgid "Do you want to approve the request?" -msgstr "Wollen sie die Anfrage akzeptieren?" - -msgid "Change Qun member" +#, fuzzy +msgid "Sorry, you are not our style ..." +msgstr "Tut mir Leid, du bist nicht mein Typ..." + +#, fuzzy +msgid "Successfully changed Qun member" msgstr "Qun-Mitglied ändern" -msgid "Change Qun information" +#, fuzzy +msgid "Successfully changed Qun information" msgstr "Qun-Informationen bearbeiten" msgid "You have successfully created a Qun" msgstr "Sie haben einen Qun angelegt" -msgid "Would you like to set up the detail information now?" +#, fuzzy +msgid "Would you like to set detailed information now?" msgstr "Möchten Sie jetzt Detail-Informationen einstellen?" msgid "Setup" msgstr "Setup" -#, c-format -msgid "" -"%s\n" -"\n" -"%s" -msgstr "" -"%s\n" -"\n" -"%s" - -msgid "QQ Server News" -msgstr "QQ-Server-News" - -msgid "System Message" -msgstr "Systemnachricht" - -msgid "Failed to send IM." -msgstr "Senden der Nachricht fehlgeschlagen." +#, fuzzy, c-format +msgid "%d requested to join Qun %d for %s" +msgstr "%d möchte dem Qun %d beitreten" + +#, c-format +msgid "%d request to join Qun %d" +msgstr "%d möchte dem Qun %d beitreten" + +#, c-format +msgid "Failed to join Qun %d, operated by admin %d" +msgstr "Dem Qun %d, moderiert von admin %d, konnte nicht beigetreten werden" + +#, c-format +msgid "Joining Qun %d is approved by admin %d for %s" +msgstr "" + +#, fuzzy, c-format +msgid "Removed buddy %d." +msgstr "Buddy entfernen" + +#, c-format +msgid "New buddy %d joined." +msgstr "" #, c-format msgid "Unknown-%d" @@ -7422,9 +7480,6 @@ msgid "Level" msgstr "Stufe" -msgid "Member" -msgstr "Mitglied" - msgid " VIP" msgstr " VIP" @@ -7452,24 +7507,36 @@ msgid "Invalid name" msgstr "QQ: Ungültiger Name" -#, c-format -msgid "Current Online: %d
\n" +#, fuzzy +msgid "Select icon..." +msgstr "Ordner auswählen..." + +#, fuzzy, c-format +msgid "Login time: %d-%d-%d, %d:%d:%d
\n" +msgstr "Anmeldezeit: %s
\n" + +#, fuzzy, c-format +msgid "Total Online Buddies: %d
\n" msgstr "Aktuell online: %d
\n" -#, c-format -msgid "Last Refresh: %s
\n" +#, fuzzy, c-format +msgid "Last Refresh: %d-%d-%d, %d:%d:%d
\n" msgstr "Letzte Aktualisierung: %s
\n" #, c-format msgid "Server: %s
\n" msgstr "Server: %s
\n" +#, fuzzy, c-format +msgid "Client Tag: %s
\n" +msgstr "Anmeldezeit: %s
\n" + #, c-format msgid "Connection Mode: %s
\n" msgstr "Verbindungsmodus: %s
\n" -#, c-format -msgid "My Internet Address: %s
\n" +#, fuzzy, c-format +msgid "My Internet IP: %s:%d
\n" msgstr "Meine Internet-Adresse: %s
\n" #, c-format @@ -7492,23 +7559,44 @@ msgid "Received Duplicate: %lu
\n" msgstr "Duplikat empfangen: %lu
\n" -#, c-format -msgid "Login Time: %s
\n" +#, fuzzy, c-format +msgid "Time: %d-%d-%d, %d:%d:%d
\n" msgstr "Anmeldezeit: %s
\n" -#, c-format -msgid "Last Login IP: %s
\n" -msgstr "Letzte Anmelde-IP: %s
\n" - -#, c-format -msgid "Last Login Time: %s\n" -msgstr "Letzte Anmeldezeit: %s\n" +#, fuzzy, c-format +msgid "IP: %s
\n" +msgstr "Server: %s
\n" msgid "Login Information" msgstr "Login-Informationen" -msgid "Set My Information" -msgstr "Meine Informationen festlegen" +msgid "

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

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

Lovely Patch Writers:
\n" +msgstr "Letzte Aktualisierung: %s
\n" + +#, fuzzy +msgid "

Acknowledgement:
\n" +msgstr "Gesendet: %lu
\n" + +msgid "

And, all the boys in the backroom...
\n" +msgstr "" + +msgid "Feel free to join us! :)" +msgstr "" + +#, fuzzy, c-format +msgid "About OpenQ r%s" +msgstr "Über %s" + +#, fuzzy +msgid "Change Icon" +msgstr "Icon speichern" msgid "Change Password" msgstr "Passwort ändern" @@ -7516,11 +7604,12 @@ msgid "Account Information" msgstr "Kontoinformationen" -msgid "Leave the QQ Qun" -msgstr "Diesen QQ-Qun verlassen" - -msgid "Block this buddy" -msgstr "Diesen Buddy blockieren" +msgid "Update all QQ Quns" +msgstr "" + +#, fuzzy +msgid "About OpenQ" +msgstr "Über %s" #. *< type #. *< ui_requirement @@ -7532,12 +7621,27 @@ #. *< version #. * summary #. * description -msgid "QQ Protocol\tPlugin" +#, fuzzy +msgid "QQ Protocol Plugin" msgstr "QQ-Protokoll-Plugin" msgid "Auto" msgstr "Auto" +#, fuzzy +msgid "Select Server" +msgstr "Benutzer wählen" + +msgid "QQ2005" +msgstr "" + +msgid "QQ2007" +msgstr "" + +msgid "QQ2008" +msgstr "" + +#. #endif msgid "Connect by TCP" msgstr "Über TCP verbinden" @@ -7547,40 +7651,82 @@ msgid "Show server news" msgstr "Server-News anzeigen" -msgid "Keep alive interval(s)" +#, fuzzy +msgid "Keep alive interval (seconds)" msgstr "Intervall(e) zum Aufrechterhalten der Verbindung (Keep alive)" -msgid "Update interval(s)" +#, fuzzy +msgid "Update interval (seconds)" msgstr "Aktualisierungsintervall(e)" -#, c-format -msgid "Invalid token reply code, 0x%02X" -msgstr "Ungültiger Token-Antwort-Code, 0x%02X" +#, fuzzy +msgid "Can not decrypt server reply" +msgstr "Kann die Antwort der Anmeldung nicht entschlüsseln" + +#, fuzzy +msgid "Can not decrypt get server reply" +msgstr "Kann die Antwort der Anmeldung nicht entschlüsseln" + +#, c-format +msgid "Failed requesting token, 0x%02X" +msgstr "" #, c-format msgid "Invalid token len, %d" msgstr "Ungültige Länge des Tokens, %d" -msgid "Unable login for not support Redirect_EX now" -msgstr "Anmeldung nicht möglich, Redirect_EX wird noch nicht unterstützt" - -#, c-format -msgid "Error password: %s" -msgstr "Passwort-Fehler: %s" - -#, c-format -msgid "Need active: %s" -msgstr "Brauche aktiv: %s" - -#, c-format -msgid "Unable login for unknow reply code 0x%02X" +#. extend redirect used in QQ2006 +msgid "Redirect_EX is not currently supported" +msgstr "" + +#. need activation +#. need activation +#. need activation +#, fuzzy +msgid "Activation required" +msgstr "Registrierung erforderlich" + +#, fuzzy, c-format +msgid "Unknow reply code when login (0x%02X)" msgstr "Anmeldung nicht möglich, unbekannter Antwort-Code 0x%02X" msgid "Keep alive error" msgstr "Fehler beim Aufrechterhalten der Verbindung (Keep alive)" -msgid "Failed to connect all servers" -msgstr "Konnte nicht alle Server verbinden" +#, fuzzy +msgid "Requesting captcha ..." +msgstr "Bitte um %ss Aufmerksamkeit..." + +msgid "Checking code of captcha ..." +msgstr "" + +msgid "Failed captcha verify" +msgstr "" + +#, fuzzy +msgid "Captcha Image" +msgstr "Bild speichern" + +#, fuzzy +msgid "Enter code" +msgstr "Geben Sie ein Passwort ein" + +msgid "QQ Captcha Verifing" +msgstr "" + +#, fuzzy +msgid "Enter the text from the image" +msgstr "Bitte geben Sie den Namen der Gruppe ein" + +#, c-format +msgid "Unknow reply code when checking password (0x%02X)" +msgstr "" + +#, c-format +msgid "" +"Unknow reply code when login (0x%02X):\n" +"%s" +msgstr "" #. we didn't successfully connect. tdt->toc_fd is valid here msgid "Unable to connect." @@ -7606,7 +7752,10 @@ msgid "Connection lost" msgstr "Verbindung verloren" -#. Update the login progress status display +#, fuzzy +msgid "Get server ..." +msgstr "Benutzer-Info setzen..." + msgid "Request token" msgstr "Anfragekürzel" @@ -7616,13 +7765,34 @@ msgid "Invalid server or port" msgstr "Ungültiger Server oder Port" -#, c-format -msgid "Connecting server %s, retries %d" -msgstr "Verbinde zu Server %s, %d Wiederholungen" +#, fuzzy +msgid "Connecting server ..." +msgstr "Verbindungsserver" msgid "QQ Error" msgstr "QQ-Fehler" +msgid "Failed to send IM." +msgstr "Senden der Nachricht fehlgeschlagen." + +#, fuzzy, c-format +msgid "" +"Server News:\n" +"%s\n" +"%s\n" +"%s" +msgstr "QQ-Server-News" + +#, c-format +msgid "From %s:" +msgstr "Von %s:" + +#, fuzzy, c-format +msgid "" +"Server notice From %s: \n" +"%s" +msgstr "Anleitung vom Server: %s" + msgid "Unknow SERVER CMD" msgstr "Unbekanntes SERVER-CMD" @@ -7637,16 +7807,21 @@ msgid "QQ Qun Command" msgstr "QQ-Qun-Kommando" -#, c-format -msgid "You are not a member of QQ Qun \"%s\"\n" +#, fuzzy, c-format +msgid "Not a member of room \"%s\"\n" msgstr "Sie sind kein Mitglied des Qun „%s“\n" msgid "Can not decrypt login reply" msgstr "Kann die Antwort der Anmeldung nicht entschlüsseln" -msgid "Unknow reply CMD" +#, fuzzy +msgid "Unknow LOGIN CMD" msgstr "Unbekanntes Antwort-CMD" +#, fuzzy +msgid "Unknow CLIENT CMD" +msgstr "Unbekanntes SERVER-CMD" + #, c-format msgid "%d has declined the file %s" msgstr "%d hat die Datei %s abgelehnt" @@ -7658,58 +7833,6 @@ msgid "%d canceled the transfer of %s" msgstr "%d hat die Übertragung von %s abgebrochen" -msgid "Do you approve the requestion?" -msgstr "Wollen sie die Anfrage akzeptieren?" - -msgid "Do you add the buddy?" -msgstr "Möchten Sie diesen Buddy hinzufügen?" - -#. only need to get value -#, c-format -msgid "You have been added by %s" -msgstr "Sie wurden von %s hinzugefügt" - -msgid "Would you like to add him?" -msgstr "Möchten Sie ihn hinzufügen?" - -#, c-format -msgid "%s added you [%s] to buddy list" -msgstr "%s hat Sie [%s] zur Buddy-Liste hinzugefügt" - -msgid "QQ Budy" -msgstr "QQ-Buddy" - -#, c-format -msgid "Requestion rejected by %s" -msgstr "Anfrage abgelehnt von %s" - -#, c-format -msgid "Requestion approved by %s" -msgstr "Anfrage akzeptiert von %s" - -#. TODO: this should go through purple_account_request_authorization() -#, c-format -msgid "%s wants to add you [%s] as a friend" -msgstr "%s möchte Sie [%s] als Freund hinzufügen" - -#, c-format -msgid "%s is not in buddy list" -msgstr "%s ist nicht in der Buddy-Liste" - -msgid "Would you add?" -msgstr "Möchten Sie ihn hinzufügen?" - -#, c-format -msgid "From %s:" -msgstr "Von %s:" - -#, c-format -msgid "%s" -msgstr "%s" - -msgid "QQ Server Notice" -msgstr "QQ-Server-Nachricht" - msgid "Connection closed (writing)" msgstr "Verbindung geschlossen (schreibend)" @@ -9408,9 +9531,6 @@ msgid "Yahoo! system message for %s:" msgstr "Yahoo!-Systemnachricht für %s:" -msgid "Authorization denied message:" -msgstr "Nachricht für die Ablehnung der Autorisierung:" - #, c-format msgid "" "%s has (retroactively) denied your request to add them to your list for the " @@ -10297,14 +10417,14 @@ msgid "Protocol" msgstr "Protokoll" -#, c-format +#, fuzzy, c-format msgid "" "Welcome to %s!\n" "\n" "You have no IM accounts configured. To start connecting with %s press the " -"Add button below and configure your first account. If you want %s to " -"connect to multiple IM accounts, press Add again to configure them " -"all.\n" +"Add... button below and configure your first account. If you want %s " +"to connect to multiple IM accounts, press Add... again to configure " +"them all.\n" "\n" "You can come back to this window to add, edit, or remove accounts from " "Accounts->Manage Accounts in the Buddy List window" @@ -10745,7 +10865,8 @@ msgid "Auto_join when account becomes online." msgstr "Automatisch _beitreten, wenn das Konto online geht." -msgid "_Hide chat when the window is closed." +#, fuzzy +msgid "_Remain in chat after window is closed." msgstr "_Chat verstecken, wenn das Fenster geschlossen wird." msgid "Please enter the name of the group to be added." @@ -12035,7 +12156,7 @@ " nur das erste Konto aktiviert).\n" " -v, --version zeigt aktuelle Version und beendet das Programm\n" -#, c-format +#, fuzzy, 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" @@ -12049,11 +12170,6 @@ "and post the backtrace from the core file. If you do not know\n" "how to get the backtrace, please read the instructions at\n" "%swiki/GetABacktrace\n" -"\n" -"If you need further assistance, please IM either SeanEgn or \n" -"LSchiere (via AIM). Contact information for Sean and Luke \n" -"on other protocols is at\n" -"%swiki/DeveloperPages\n" msgstr "" "%s %s hat einen Speicherzugriffsfehler festgestellt und \n" "versucht, eine Core-Datei zu schreiben. Dies ist ein \n" @@ -12913,9 +13029,14 @@ msgid "_Invite" msgstr "_Einladen" -msgid "_Modify" +#, fuzzy +msgid "_Modify..." msgstr "_Bearbeiten" +#, fuzzy +msgid "_Add..." +msgstr "_Hinzufügen" + msgid "_Open Mail" msgstr "Mail ö_ffnen" @@ -12937,6 +13058,13 @@ msgid "none" msgstr "keine" +#, fuzzy +msgid "Small" +msgstr "E-Mail" + +msgid "Smaller versions of the default smilies" +msgstr "" + msgid "Response Probability:" msgstr "Antwortwahrscheinlichkeit:" @@ -13595,20 +13723,20 @@ "Sie das Debug-Fenster." #, c-format -msgid "" -"You are using %s version %s. The current version is %s. You can get it " -"from %s

" -msgstr "" -"Sie verwenden gerade %s Version %s. Die aktuelle Version ist %s. Sie " -"können Pidgin von %s herunterladen.
" - -#, c-format -msgid "ChangeLog:
%s" -msgstr "Änderungen:
%s" +msgid "You can upgrade to %s %s today." +msgstr "" msgid "New Version Available" msgstr "Neue Version verfügbar" +#, fuzzy +msgid "Later" +msgstr "Datum" + +#, fuzzy +msgid "Download Now" +msgstr "Download %s: %s" + #. *< type #. *< ui_requirement #. *< flags @@ -13918,3 +14046,169 @@ msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "" "Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients." + +#~ msgid "Primary Information" +#~ msgstr "Primäre Informationen" + +#~ msgid "Blood Type" +#~ msgstr "Blutgruppe" + +#~ msgid "Update information" +#~ msgstr "Informationen aktualisieren" + +#~ msgid "Successed:" +#~ msgstr "Erfolgreich:" + +#~ msgid "" +#~ "Setting custom faces is not currently supported. Please choose an image " +#~ "from %s." +#~ msgstr "" +#~ "Das Setzen von benutzerdefinierten Gesichtern wird momentan nicht " +#~ "unterstützt. Bitte wählen Sie ein Bild von %s." + +#~ msgid "Invalid QQ Face" +#~ msgstr "Ungültiges QQ-Gesicht" + +# c-format +#~ msgid "You rejected %d's request" +#~ msgstr "Sie haben die Anfrage von %d abgelehnt" + +#~ msgid "Reject request" +#~ msgstr "Anfrage ablehnen" + +#~ msgid "Add buddy with auth request failed" +#~ msgstr "Benutzer hinzufügen, wenn Autorisierungsanfrage fehlschlug" + +#~ msgid "Add into %d's buddy list" +#~ msgstr "Zu %ds Buddy-Liste hinzufügen" + +#~ msgid "QQ Number Error" +#~ msgstr "Fehler in QQ-Nummer" + +#~ msgid "Group Description" +#~ msgstr "Gruppenbeschreibung" + +#~ msgid "Auth" +#~ msgstr "Autorisieren" + +#~ msgid "Approve" +#~ msgstr "Akzeptieren" + +#~ msgid "Successed to join Qun %d, operated by admin %d" +#~ msgstr "Erfolgreicher Beitritt in den Qun %d, moderiert vom Admin %d" + +#~ msgid "[%d] removed from Qun \"%d\"" +#~ msgstr "[%d] vom Qun „%d“ entfernt" + +#~ msgid "[%d] added to Qun \"%d\"" +#~ msgstr "[%d] zum Qun „%d“ hinzugefügt" + +#~ msgid "I am a member" +#~ msgstr "Ich bin Mitglied" + +#~ msgid "I am requesting" +#~ msgstr "Ich frage an" + +#~ msgid "I am the admin" +#~ msgstr "Ich bin der Admin" + +#~ msgid "Unknown status" +#~ msgstr "Unbekannter Status" + +#~ msgid "Remove from Qun" +#~ msgstr "vom Qun entfernen" + +#~ msgid "You entered a group ID outside the acceptable range" +#~ msgstr "" +#~ "Sie haben eine Gruppen-ID außerhalb des erlaubten Bereichs angegeben" + +#~ msgid "Are you sure you want to leave this Qun?" +#~ msgstr "Wollen Sie dieses Qun wirklich verlassen?" + +#~ msgid "Do you want to approve the request?" +#~ msgstr "Wollen sie die Anfrage akzeptieren?" + +#~ msgid "" +#~ "%s\n" +#~ "\n" +#~ "%s" +#~ msgstr "" +#~ "%s\n" +#~ "\n" +#~ "%s" + +#~ msgid "System Message" +#~ msgstr "Systemnachricht" + +#~ msgid "Last Login IP: %s
\n" +#~ msgstr "Letzte Anmelde-IP: %s
\n" + +#~ msgid "Last Login Time: %s\n" +#~ msgstr "Letzte Anmeldezeit: %s\n" + +#~ msgid "Set My Information" +#~ msgstr "Meine Informationen festlegen" + +#~ msgid "Leave the QQ Qun" +#~ msgstr "Diesen QQ-Qun verlassen" + +#~ msgid "Block this buddy" +#~ msgstr "Diesen Buddy blockieren" + +#~ msgid "Invalid token reply code, 0x%02X" +#~ msgstr "Ungültiger Token-Antwort-Code, 0x%02X" + +#~ msgid "Unable login for not support Redirect_EX now" +#~ msgstr "Anmeldung nicht möglich, Redirect_EX wird noch nicht unterstützt" + +#~ msgid "Error password: %s" +#~ msgstr "Passwort-Fehler: %s" + +#~ msgid "Need active: %s" +#~ msgstr "Brauche aktiv: %s" + +#~ msgid "Failed to connect all servers" +#~ msgstr "Konnte nicht alle Server verbinden" + +#~ msgid "Connecting server %s, retries %d" +#~ msgstr "Verbinde zu Server %s, %d Wiederholungen" + +#~ msgid "Do you approve the requestion?" +#~ msgstr "Wollen sie die Anfrage akzeptieren?" + +#~ msgid "Do you add the buddy?" +#~ msgstr "Möchten Sie diesen Buddy hinzufügen?" + +#~ msgid "%s added you [%s] to buddy list" +#~ msgstr "%s hat Sie [%s] zur Buddy-Liste hinzugefügt" + +#~ msgid "QQ Budy" +#~ msgstr "QQ-Buddy" + +#~ msgid "Requestion approved by %s" +#~ msgstr "Anfrage akzeptiert von %s" + +#~ msgid "%s wants to add you [%s] as a friend" +#~ msgstr "%s möchte Sie [%s] als Freund hinzufügen" + +#~ msgid "%s is not in buddy list" +#~ msgstr "%s ist nicht in der Buddy-Liste" + +#~ msgid "Would you add?" +#~ msgstr "Möchten Sie ihn hinzufügen?" + +#~ msgid "%s" +#~ msgstr "%s" + +#~ msgid "QQ Server Notice" +#~ msgstr "QQ-Server-Nachricht" + +#~ msgid "" +#~ "You are using %s version %s. The current version is %s. You can get it " +#~ "from %s
" +#~ msgstr "" +#~ "Sie verwenden gerade %s Version %s. Die aktuelle Version ist %s. Sie " +#~ "können Pidgin von %s herunterladen.
" + +#~ msgid "ChangeLog:
%s" +#~ msgstr "Änderungen:
%s"