Mercurial > pidgin.yaz
changeset 27742:2443ea74b0f4
propagate from branch 'im.pidgin.pidgin' (head 41b4d75b70555daf78b3c5701a59453027ca57e7)
to branch 'im.pidgin.pidgin.yaz' (head 0d6d6e7dd6548358cd5bd956883e70dab02fef79)
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Wed, 28 Nov 2007 14:21:51 +0000 |
| parents | 6befd211e707 (current diff) c6487d5385f9 (diff) |
| children | 2961a316058c |
| files | |
| diffstat | 2 files changed, 22 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msnp9/nexus.c Wed Nov 28 08:44:35 2007 +0000 +++ b/libpurple/protocols/msnp9/nexus.c Wed Nov 28 14:21:51 2007 +0000 @@ -338,7 +338,7 @@ g_strdup(purple_url_encode(purple_account_get_username(session->account))); password = - g_strndup(purple_url_encode(purple_connection_get_password(session->account->gc)), 16); + g_strdup(purple_url_encode(purple_connection_get_password(session->account->gc))); ctint = strtoul((char *)g_hash_table_lookup(nexus->challenge_data, "ct"), NULL, 10) + 200;
--- a/po/de.po Wed Nov 28 08:44:35 2007 +0000 +++ b/po/de.po Wed Nov 28 14:21:51 2007 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-27 10:57+0100\n" -"PO-Revision-Date: 2007-11-27 10:57+0100\n" +"POT-Creation-Date: 2007-11-28 10:03+0100\n" +"PO-Revision-Date: 2007-11-28 10:03+0100\n" "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n" "Language-Team: Deutsch <de@li.org>\n" "MIME-Version: 1.0\n" @@ -21,6 +21,8 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" +#. Translators may want to transliterate the name. +#. It is not to be translated. msgid "Finch" msgstr "Finch" @@ -9793,6 +9795,9 @@ msgid "_Merge" msgstr "_Zusammenführen" +msgid "Room _List" +msgstr "Ra_umliste" + msgid "" "Please enter the appropriate information about the chat you would like to " "join.\n" @@ -10163,11 +10168,11 @@ "Bitte geben Sie einen Alias und geeignete Informationen über den Chat ein, " "den Sie in Ihre Buddy-Liste aufnehmen wollen.\n" -msgid "Autojoin when account becomes online." -msgstr "Automatisch beitreten, wenn das Konto online geht." - -msgid "Hide chat when the window is closed." -msgstr "Chat verstecken, wenn das Fenster geschlossen wird." +msgid "Auto_join when account becomes online." +msgstr "Automatisch _beitreten, wenn das Konto online geht." + +msgid "_Hide chat when the window is closed." +msgstr "_Chat verstecken, wenn das Fenster geschlossen wird." msgid "Please enter the name of the group to be added." msgstr "Bitte geben Sie den Namen der Gruppe ein, die hinzugefügt werden soll." @@ -11044,6 +11049,15 @@ msgid "_Reset formatting" msgstr "Formatierung _zurücksetzen" +msgid "_Smile!" +msgstr "_Lächeln!" + +msgid "_Insert" +msgstr "_Einfügen" + +msgid "_Font" +msgstr "_Schrift" + msgid "Hyperlink color" msgstr "Hyperlink-Farbe" @@ -11138,9 +11152,6 @@ msgid "Insert Link" msgstr "Link einfügen" -msgid "_Insert" -msgstr "_Einfügen" - #, c-format msgid "Failed to store image: %s\n" msgstr "Speichern des Bildes fehlgeschlagen: %s\n" @@ -11155,9 +11166,6 @@ msgid "Smile!" msgstr "Lächeln!" -msgid "_Font" -msgstr "_Schrift" - msgid "Group Items" msgstr "Elemente gruppieren" @@ -11242,9 +11250,6 @@ msgid "_Horizontal rule" msgstr "_Horizontale Linie" -msgid "_Smile!" -msgstr "_Lächeln!" - #, c-format msgid "" "Are you sure you want to permanently delete the log of the conversation with " @@ -11624,9 +11629,6 @@ msgid "Show _formatting on incoming messages" msgstr "Zeige _Formatierung bei ankommenden Nachrichten" -msgid "Close IMs immediately when the tab is closed" -msgstr "Schließe IMs sofort, wenn der Reiter geschlossen wird" - msgid "Show _detailed information" msgstr "_Detaillierte Informationen anzeigen"