changeset 21319:85fbadb8b8fd

merge of '2fb075583d4e52527a1045112f38c7a76f2c7e80' and '69e2383bb3023269544a242c2538d711fd64d416'

--- a/po/de.po	Sun Nov 11 14:12:51 2007 +0000
+++ b/po/de.po	Sun Nov 11 14:18:23 2007 +0000
@@ -12,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-09 20:52+0100\n"
-"PO-Revision-Date: 2007-11-09 21:57+0100\n"
+"POT-Creation-Date: 2007-11-11 14:59+0100\n"
+"PO-Revision-Date: 2007-11-11 14:58+0100\n"
 "Last-Translator: Jochen Kemnade <[e-mail]>\n"
 "Language-Team: Deutsch <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -1948,11 +1948,8 @@
 msgstr "Konnte Ihr Plugin nicht laden."
 
 #, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "Das erforderliche Plugin %s konnte nicht entladen werden."
-
-msgid "There were errors unloading the plugin."
-msgstr "Beim Entladen des Plugins traten Fehler auf."
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s hängt von %s ab, konnte aber nicht entladen werden."
 
 msgid "Autoaccept"
 msgstr "Auto-Akzeptieren"
@@ -3959,9 +3956,15 @@
 msgid "Mood"
 msgstr "Stimmung"
 
+msgid "Current media"
+msgstr "Aktuelles Medium"
+
 msgid "Mood Text"
 msgstr "Stimmungstext"
 
+msgid "Allow Buzz"
+msgstr "Anklopfen erlauben"
+
 msgid "Tune Artist"
 msgstr "Künstler anpassen"
 
@@ -3989,9 +3992,6 @@
 msgid "Tune URL"
 msgstr "URL anpassen"
 
-msgid "Allow Buzz"
-msgstr "Anklopfen erlauben"
-
 msgid "Password Changed"
 msgstr "Passwort geändert"
 
@@ -4674,9 +4674,6 @@
 msgid "Page"
 msgstr "Nachricht"
 
-msgid "Current media"
-msgstr "Aktuelles Medium"
-
 msgid "Be Right Back"
 msgstr "Bin gleich zurück"
 
@@ -4689,6 +4686,12 @@
 msgid "Out to Lunch"
 msgstr "Zur Mittagspause"
 
+msgid "Artist"
+msgstr "Interpret"
+
+msgid "Album"
+msgstr "Album"
+
 msgid "Set Friendly Name..."
 msgstr "Setze Spitzname..."
 
@@ -5128,6 +5131,23 @@
 msgid "The screen name specified is invalid."
 msgstr "Der angegebene Benutzername ist ungültig."
 
+#, fuzzy
+msgid "Has you"
+msgstr "Hat Sie"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "MSN Protocol Plugin"
+msgstr "MSN-Protokoll-Plugin"
+
 msgid "Missing Cipher"
 msgstr "Verschlüsselung fehlt"
 
@@ -5706,7 +5726,7 @@
 "haben, nicht empfangen."
 
 #. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
+#. *  purple_request_fields_with_hint(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
 msgid ""
@@ -6086,6 +6106,13 @@
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @since 2.3.0
+#.
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
 #.
 msgid "_OK"
 msgstr "_OK"
@@ -9021,7 +9048,7 @@
 msgid "Activate which ID?"
 msgstr "Welche ID aktivieren?"
 
-msgid "Join whom in chat?"
+msgid "Join who in chat?"
 msgstr "Wen wollen Sie zum Chat einladen?"
 
 msgid "Activate ID..."
@@ -9406,6 +9433,13 @@
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @since 2.3.0
+#.
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @deprecated Please use purple_request_yes_no_with_hint instead.
 #.
 msgid "_Yes"
 msgstr "_Ja"
@@ -9415,6 +9449,13 @@
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @since 2.3.0
+#.
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
 #.
 msgid "_Accept"
 msgstr "_Akzeptieren"
@@ -9479,6 +9520,9 @@
 msgid "Mobile"
 msgstr "Mobil"
 
+msgid "Listening to music"
+msgstr ""
+
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s hat den Status von %s zu %s geändert"
@@ -10800,6 +10844,9 @@
 msgid "_Name"
 msgstr "_Name"
 
+msgid "Buddy"
+msgstr "Buddy"
+
 msgid "_Account"
 msgstr "_Konto"
 
@@ -11407,6 +11454,16 @@
 msgid "Unload Plugins"
 msgstr "Plugins entladen"
 
+msgid "Could not unload plugin"
+msgstr "Konnte das Plugin nicht entladen"
+
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"Das Plugin kann im Moment nicht entladen werden, wird aber beim nächsten "
+"Start deaktiviert."
+
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13086,9 +13143,3 @@
 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 "Unable to connect to contact server"
-#~ msgstr "Verbindung zum Kontaktserver nicht möglich"
-
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Verbindung zum OIM-Server nicht möglich"