diff options
author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2011-01-10 01:17:34 +0000 |
---|---|---|
committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2011-01-10 01:17:34 +0000 |
commit | 05de0866596363d58cc81030715eada2f0dd5c50 (patch) | |
tree | f7c57630acc6a011ea531e90221ef9c874833bdd | |
parent | d81d62f21fa1d124044da9f648dcfa304196f17f (diff) | |
parent | 342d48014e3c283a7740efff3840996d68afefed (diff) | |
download | pidgin-05de0866596363d58cc81030715eada2f0dd5c50.tar.gz |
merge of '0737699ce312a2672764d3f417a1fb48f9cf07b3'
and '7f6c8c77ead0c7e044f6ed5a2ad28add5c78a708'
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | po/de.po | 48 |
2 files changed, 33 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index b5d499f4f0..078e3bd907 100644 --- a/configure.ac +++ b/configure.ac @@ -329,7 +329,7 @@ AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes") dnl ####################################################################### dnl # Check for GLib 2.12 (required) dnl ####################################################################### -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0 gio-2.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [ +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [ AC_MSG_RESULT(no) AC_MSG_ERROR([ @@ -2,7 +2,7 @@ # Pidgin German translation # Copyright (C) 2001, Daniel Seifert <Pidgin-translation@dseifert.de> # Copyright (C) 2002, Karsten Weiss <knweiss@gmx.de> -# Copyright (C) 2002-2010, Björn Voigt <bjoern@cs.tu-berlin.de>, +# Copyright (C) 2002-2011, Björn Voigt <bjoern@cs.tu-berlin.de>, # Jochen Kemnade <jochenkemnade@web.de> # # This file is distributed under the same license as the Pidgin package. @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-22 10:12+0100\n" -"PO-Revision-Date: 2010-12-22 10:21+0100\n" +"POT-Creation-Date: 2011-01-09 23:42+0100\n" +"PO-Revision-Date: 2011-01-09 23:41+0100\n" "Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n" "Language-Team: German <de@li.org>\n" "Language: de\n" @@ -1064,10 +1064,10 @@ msgid "Pounce When Buddy..." msgstr "Alarm, wenn Buddy..." msgid "Signs on" -msgstr "sich angemeldet" +msgstr "sich anmeldet" msgid "Signs off" -msgstr "sich abgemeldet" +msgstr "sich abmeldet" msgid "Goes away" msgstr "hinausgeht" @@ -2368,8 +2368,12 @@ msgstr "" "Pfad in denen die Dateien gespeichert werden sollen\n" "(Bitte geben Sie den vollständigen Pfad an)" -msgid "Automatically reject from users not in buddy list" -msgstr "Automatisch von Benutzern ablehnen, die nicht in der Buddy-Liste sind" +msgid "" +"When a file-transfer request arrives from a user who is\n" +"*not* on your buddy list:" +msgstr "" +"Wenn eine Dateitransferanfrage von einem Benutzer ankommt, \n" +"der *nicht* in Ihrer Buddy-Liste ist:" msgid "" "Notify with a popup when an autoaccepted file transfer is complete\n" @@ -2382,6 +2386,10 @@ msgstr "" msgid "Create a new directory for each user" msgstr "Für jeden Benutzer ein neues Verzeichnis anlegen" +#, fuzzy +msgid "Escape the filenames" +msgstr "%s hat die Datenübertragung abgebrochen" + msgid "Notes" msgstr "Notizen" @@ -8730,14 +8738,14 @@ msgstr "Auto" msgid "Select Server" msgstr "Server wählen" -msgid "QQ2005" -msgstr "QQ2005" +msgid "QQ2008" +msgstr "QQ2008" msgid "QQ2007" msgstr "QQ2007" -msgid "QQ2008" -msgstr "QQ2008" +msgid "QQ2005" +msgstr "QQ2005" msgid "Connect by TCP" msgstr "Über TCP verbinden" @@ -12328,9 +12336,6 @@ msgstr "Fehler " msgid "Fatal Error" msgstr "Schwerer Fehler" -msgid "bug master" -msgstr "Bug-Master" - msgid "artist" msgstr "Künstler" @@ -12510,6 +12515,10 @@ msgstr "Laotisch" msgid "Maithili" msgstr "Maithili" +#, fuzzy +msgid "Meadow Mari" +msgstr "Neue Mail" + msgid "Macedonian" msgstr "Makedonisch" @@ -13448,10 +13457,10 @@ msgid "_Buddy name:" msgstr "Budd_y-Name:" msgid "Si_gns on" -msgstr "si_ch angemeldet" +msgstr "si_ch anmeldet" msgid "Signs o_ff" -msgstr "sich abgemel_det" +msgstr "sich abmel_det" msgid "Goes a_way" msgstr "hinausgeh_t" @@ -15663,6 +15672,13 @@ msgstr "Besuchen Sie die Pidgin-Webseite" msgid "You do not have permission to uninstall this application." msgstr "Sie haben keine Berechtigung, diese Anwendung zu deinstallieren." +#~ msgid "Automatically reject from users not in buddy list" +#~ msgstr "" +#~ "Automatisch von Benutzern ablehnen, die nicht in der Buddy-Liste sind" + +#~ msgid "bug master" +#~ msgstr "Bug-Master" + #~ msgid "Error requesting %s" #~ msgstr "Fehler beim Anfordern von %s" |