Merge branch 'maint'

Conflicts:
	scripts/makepkg.sh.in

1 files changed, 79 insertions, 18 deletions

diff --git a/scripts/po/de.po b/scripts/po/de.po
index bfe1d02c..2d9510c9 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <pierre@archlinux.de>, 2011.
 # Simon Schneider <SPAM.schneida@gmail.com>, 2011.
+# Thomas Scholzen <thomasdodo@arcor.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-05 16:57-0600\n"
-"PO-Revision-Date: 2011-11-15 19:52+0000\n"
-"Last-Translator: pierres <pierre@archlinux.de>\n"
+"POT-Creation-Date: 2012-01-30 21:40-0600\n"
+"PO-Revision-Date: 2012-01-25 19:36+0000\n"
+"Last-Translator: Thomas Scholzen <thomasdodo@arcor.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/de/)\n"
 "Language: de\n"
@@ -507,8 +508,9 @@ msgstr ""
 msgid "If %s is not specified, %s will look for '%s'"
 msgstr "Falls %s nicht angegeben, wird %s nach '%s' suchen"
 
+#, fuzzy
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\n"
@@ -667,8 +669,9 @@ msgstr "Beendete make: %s"
 msgid "Usage: %s [pacman_db_root]"
 msgstr "Verwendung: %s [pacman_db_root]"
 
+#, fuzzy
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
@@ -802,6 +805,10 @@ msgstr ""
 "  --refresh-keys [keyid(s)] Aktualisiert angegebene oder alle Schlüssel von "
 "einen Schlüsselserver"
 
+#, fuzzy
+msgid "The key identified by %s could not be found locally."
+msgstr "Der von %s identifizerte Schlüssel existiert nicht."
+
 msgid "You do not have sufficient permissions to read the %s keyring."
 msgstr ""
 "Sie haben nicht genügend Berechtigungen, um den Schlüsselbund %s zu lesen."
@@ -856,9 +863,58 @@ msgstr "Mache widerrufene Schlüssel im Schlüsselbund unbrauchbar ..."
 msgid "Disabling key %s..."
 msgstr "Mache  Schlüssel %s unbrauchbar ..."
 
-msgid "The key identified by %s does not exist."
+msgid "A specified keyfile could not be added to the gpg keychain."
+msgstr ""
+
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr ""
+
+#, fuzzy
+msgid "The key identified by %s could not be edited."
+msgstr "Der von %s identifizerte Schlüssel existiert nicht."
+
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr ""
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr ""
+
+#, fuzzy
+msgid "%s could not be imported."
+msgstr "Delta konnte nicht erstellt werden."
+
+#, fuzzy
+msgid "File %s does not exist and could not be imported."
+msgstr "%s existiert nicht oder ist kein Verzeichnis"
+
+#, fuzzy
+msgid "A specified key could not be listed."
+msgstr "Repositorien-Datei '%s' konnte nicht erstellt werden."
+
+#, fuzzy
+msgid "A specified signature could not be listed."
+msgstr "Eine oder mehrere PGP-Signaturen konnten nicht überprüft werden."
+
+msgid "A specified key could not be locally signed."
+msgstr ""
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr ""
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr ""
+
+#, fuzzy
+msgid "The signature identified by %s could not be verified."
 msgstr "Der von %s identifizerte Schlüssel existiert nicht."
 
+msgid "Updating trust database..."
+msgstr "Aktualisiere Trust-Datenbank"
+
+#, fuzzy
+msgid "Trust database could not be updated."
+msgstr "Delta konnte nicht erstellt werden."
+
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr ""
 "Kann das Programm %s nicht finden, das für alle %s Operationen benötigt wird."
@@ -878,9 +934,6 @@ msgstr "Mehrfache Operationen spezifiziert."
 msgid "Please run %s with each operation separately."
 msgstr "Bitte rufen Sie %s für jede Operation getrennt auf."
 
-msgid "Updating trust database..."
-msgstr "Aktualisiere Trust-Datenbank"
-
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
@@ -997,9 +1050,10 @@ msgstr "Kann die xdelta3-Binär-Datei nicht finden! Ist xdelta3 installiert?"
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
 msgstr "Aufruf: repo-add [Optionen] <Pfad-zur-Datenbank> <Paket|Delta> ...\\n"
 
+#, fuzzy
 msgid ""
 "repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 "repo-add wird eine Paket-DB aktualisieren, indem es eine Paket-Datei liest."
 "\\nMehrere Pakete zum Hinzufügen können über Kommandozeile spezifiziert "
@@ -1015,19 +1069,24 @@ msgstr ""
 msgid "  -f, --files       update database's file list\\n"
 msgstr "  -f, --files       aktualisiere die Dateiliste der Datenbank"
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+#, fuzzy
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
 "Verwendung: repo-remove [Optionen] <Pfad-zur-DB> <Paketname|Delta> ...\\n\\n"
 
+#, fuzzy
 msgid ""
 "repo-remove will update a package database by removing the package name"
 "\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n\\n"
+"\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
 "repo-remove wird eine Paket-DB aktualisieren, indem es den auf der Kommando-"
 "\\nzeile der jeweiligen Repo-DB angegebenen Paket-Namen entfernt. Mehrere"
 "\\nPakete zum Entfernen können auf der Kommandozeile angegeben werden.\\n\\n"
 
+msgid "Please move along, there is nothing to see here.\\n"
+msgstr ""
+
 msgid "  -q, --quiet       minimize output\\n"
 msgstr "  -q, --quiet       minimiere Ausgaben\\n"
 
@@ -1043,23 +1102,26 @@ msgid "  -v, --verify      verify database's signature before update\\n"
 msgstr ""
 "  -v, --verify      überprüfe die Signatur der Datenbank vor dem Update\\n"
 
+#, fuzzy
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
 msgstr ""
 "\\nSiehe %s(8) für mehr Details und Beschreibungen der verfügbaren Optionen."
 "\\n\\n"
 
+#, fuzzy
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
 "Beispiel:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
 
-msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
+#, fuzzy
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 msgstr "Beispiel: repo-remove /Pfad/zum/Repo.db.tar.gz kernel26"
 
+#, fuzzy
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>\\n"
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
@@ -1103,9 +1165,8 @@ msgstr "'%s' hat keine gültige Archiv-Endung."
 msgid "An entry for '%s' already existed"
 msgstr "Ein Eintrag für '%s' existierte bereits"
 
-#, fuzzy
 msgid "Invalid package signature file '%s'."
-msgstr "Ungültige Paket-Datei '%s'."
+msgstr "Ungültige Paket-Signaturdatei '%s'"
 
 msgid "Adding package signature..."
 msgstr "Füge Paket-Signatur hinzu..."