Mercurial > pidgin.yaz
changeset 23206:1cc810daf355
merge of '04d1cb7493b8f54f33a413d3a60468704ab4be4b'
and '77546963b893bde7fedfb022b63831b78d3f81e1'
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Mon, 26 May 2008 20:03:40 +0000 |
| parents | 5197256f66b5 (current diff) 04869393b7ef (diff) |
| children | bda7c7c4d4b2 |
| files | |
| diffstat | 2 files changed, 38 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/core.c Mon May 26 17:10:55 2008 +0000 +++ b/libpurple/core.c Mon May 26 20:03:40 2008 +0000 @@ -131,13 +131,14 @@ purple_ciphers_init(); - /* Initialize all static protocols. */ - static_proto_init(); - /* Since plugins get probed so early we should probably initialize their * subsystem right away too. */ purple_plugins_init(); + + /* Initialize all static protocols. */ + static_proto_init(); + purple_plugins_probe(G_MODULE_SUFFIX); /* The buddy icon code uses the imgstore, so init it early. */
--- a/po/de.po Mon May 26 17:10:55 2008 +0000 +++ b/po/de.po Mon May 26 20:03:40 2008 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-24 10:32+0200\n" -"PO-Revision-Date: 2008-05-24 10:31+0200\n" +"POT-Creation-Date: 2008-05-26 21:14+0200\n" +"PO-Revision-Date: 2008-05-26 21:14+0200\n" "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n" "Language-Team: Deutsch <de@li.org>\n" "MIME-Version: 1.0\n" @@ -10813,9 +10813,6 @@ msgid "Fatal Error" msgstr "Schwerer Fehler" -msgid "lead developer" -msgstr "Hauptentwickler" - msgid "developer" msgstr "Entwickler" @@ -10850,6 +10847,9 @@ msgid "original author" msgstr "Originalautor" +msgid "lead developer" +msgstr "Hauptentwickler" + msgid "Afrikaans" msgstr "Afrikaans" @@ -11229,23 +11229,35 @@ msgid "Right-click for more unread messages...\n" msgstr "Rechtsklicken für weitere ungelesene Nachrichten...\n" -msgid "Change Status" -msgstr "Ändere Status" - -msgid "Show Buddy List" -msgstr "Buddy-Liste anzeigen" - -msgid "New Message..." -msgstr "Neue Nachricht..." - -msgid "Mute Sounds" -msgstr "Stummschalten" - -msgid "Blink on New Message" -msgstr "Bei neuen Nachrichten blinken" - -msgid "Quit" -msgstr "Beenden" +msgid "_Change Status" +msgstr "Ändere _Status" + +msgid "Show Buddy _List" +msgstr "Buddy-_Liste anzeigen" + +msgid "_Unread Messages" +msgstr "_Ungelesene Nachrichten" + +msgid "New _Message..." +msgstr "_Neue Nachricht..." + +msgid "_Accounts" +msgstr "_Konten" + +msgid "Plu_gins" +msgstr "_Plugins" + +msgid "Pr_eferences" +msgstr "_Einstellungen" + +msgid "Mute _Sounds" +msgstr "Stu_mmschalten" + +msgid "_Blink on New Message" +msgstr "Be_i neuen Nachrichten blinken" + +msgid "_Quit" +msgstr "_Beenden" msgid "Not started" msgstr "Nicht gestartet"