diff options
author | Dan McGee <dan@archlinux.org> | 2009-09-20 12:09:10 -0500 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2009-09-20 12:09:10 -0500 |
commit | 6bfca2fd14d07a18d7000d1f9dd998428036656f (patch) | |
tree | c766b1ea0071f17857a975b15f53a8f77909f46d /lib/libalpm/po/de.po | |
parent | ef3716877032941f7882c11c5a091abef95ef983 (diff) | |
parent | 338c6546ff86acbb25c1508439adfb89c3dea952 (diff) | |
download | pacman-6bfca2fd14d07a18d7000d1f9dd998428036656f.tar.xz |
Merge branch 'maint'
Message updates made this one a bit messy, but nothing too bad.
Conflicts:
lib/libalpm/add.c
lib/libalpm/remove.c
Diffstat (limited to 'lib/libalpm/po/de.po')
-rw-r--r-- | lib/libalpm/po/de.po | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index 0a339164..4a08eaac 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2009-07-27 21:15-0500\n" -"PO-Revision-Date: 2009-07-29 16:09+0100\n" +"POT-Creation-Date: 2009-09-17 02:04+0200\n" +"PO-Revision-Date: 2009-09-17 16:47+0100\n" "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n" "Language-Team: German <archlinux.de>\n" "MIME-Version: 1.0\n" @@ -26,12 +26,13 @@ msgid "replacing older version %s-%s by %s in target list\n" msgstr "Ersetze ältere Version %s-%s durch %s in der Ziel-Liste\n" #, c-format -msgid "skipping %s-%s because newer version %s is in the target list\n" -msgstr "Überspringe %s-%s, da die Ziel-Liste die neuere Version %s enthält\n" +msgid "skipping %s-%s because newer version %s is in target list\n" +msgstr "" +"Überspringe %s-%s, da sich die neuere Version %s in der Ziel-Liste befindet\n" #, c-format -msgid "conflicting packages were found in the target list\n" -msgstr "In Konflikt stehende Pakete wurden in Ziel-Liste gefunden\n" +msgid "conflicting packages were found in target list\n" +msgstr "In Konflikt stehende Pakete wurden in der Ziel-Liste gefunden\n" #, c-format msgid "you cannot install two conflicting packages at the same time\n" @@ -108,6 +109,10 @@ msgid "could not add entry '%s' in cache\n" msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen\n" #, c-format +msgid "removing invalid database: %s\n" +msgstr "Entferne die ungültige Datenbank: %s\n" + +#, c-format msgid "could not remove database %s\n" msgstr "Konnte Datenbank %s nicht entfernen\n" @@ -405,6 +410,10 @@ msgid "could not find %s in database -- skipping\n" msgstr "Konnte %s nicht in Datenbank finden -- Überspringe\n" #, c-format +msgid "removing %s from target list\n" +msgstr "Entferne '%s' aus der Ziel-Liste\n" + +#, c-format msgid "cannot remove file '%s': %s\n" msgstr "Kann Datei '%s' nicht entfernen: %s\n" @@ -533,8 +542,8 @@ msgid "could not change directory to / (%s)\n" msgstr "Konnte nicht zu Verzeichnis / (%s) wechseln\n" #, c-format -msgid "call to popen failed (%s)" -msgstr "Aufruf von 'popen' fehlgeschlagen (%s)" +msgid "call to popen failed (%s)\n" +msgstr "Aufruf von 'popen' fehlgeschlagen (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" |