From 56a4fc4d0e77ab4ca5e8a78f9fc97017889b423b Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 7 May 2014 19:55:03 +0200 Subject: reupdate the translation files (no manual change) --- po/de.po | 192 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 109 insertions(+), 83 deletions(-) (limited to 'po/de.po') diff --git a/po/de.po b/po/de.po index e5346db..e8d32c8 100644 --- a/po/de.po +++ b/po/de.po @@ -15,19 +15,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: bin/quilt.in:36 +#: bin/quilt.in:40 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "Verwendung: quilt [--trace[=verbose]] [--quiltrc=XX] befehl [-h] ..." -#: bin/quilt.in:37 +#: bin/quilt.in:41 msgid " quilt --version" msgstr " quilt --version" -#: bin/quilt.in:39 +#: bin/quilt.in:43 msgid "Commands are:" msgstr "Vorhandene Befehle:" -#: bin/quilt.in:44 +#: bin/quilt.in:48 msgid "" "\n" "Global options:\n" @@ -183,7 +183,7 @@ msgstr "" msgid "No next patch\\n" msgstr "Kein Patch %s\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:589 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:604 msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" @@ -204,10 +204,11 @@ msgid "Failed to remove patch file %s\\n" msgstr "Konnte Patch %s nicht entfernen\\n" #: quilt/diff.in:24 +#, fuzzy msgid "" "Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-" "R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] " -"[--sort] [--color] [file ...]\\n" +"[--sort] [--color[=always|auto|never]] [file ...]\\n" msgstr "" "Verwendung: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-" "z] [-R] [-P patch] [--snapshot] [--diff=programm] [--no-timestamps] [--no-" @@ -312,36 +313,36 @@ msgstr "" "--sort\tSortiere Dateien im Patch nach ihrem namen, statt die ursprüngliche\n" "\tReihenfolge zu erhalten.\n" -#: quilt/diff.in:218 +#: quilt/diff.in:226 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Die Optionen \\`--combine', \\`--snapshot', und \\`-z' können nicht " "kombiniert werden.\\n" -#: quilt/diff.in:232 +#: quilt/diff.in:240 msgid "" "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" "Kann kein Diff mit -p%s erzeugen, bitte -p0, -p1 oder -pab verwenden.\\n" -#: quilt/diff.in:241 +#: quilt/diff.in:249 msgid "No snapshot to diff against\\n" msgstr "" -#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:418 +#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: quilt/diff.in:341 +#: quilt/diff.in:351 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: quilt/diff.in:360 quilt/refresh.in:234 +#: quilt/diff.in:370 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: quilt/diff.in:367 +#: quilt/diff.in:377 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Warnung: später angewandte Patches verändern Dateien von %s\\n" @@ -482,7 +483,7 @@ msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n" msgid "Fork of patch %s to patch %s failed\\n" msgstr "Fehler beim Aufspalten von %s auf %s\\n" -#: quilt/fork.in:102 quilt/refresh.in:346 +#: quilt/fork.in:102 quilt/refresh.in:347 msgid "Fork of patch %s created as %s\\n" msgstr "Neue Version von %s erstellt als %s\\n" @@ -683,51 +684,55 @@ msgstr "" "\tOption angegeben werden. Diese Option ist nur in Kombination mit -f " "wirksam.\n" -#: quilt/import.in:71 +#: quilt/import.in:73 +msgid "Patch %s does not exist\\n" +msgstr "Patch %s existiert nicht\\n" + +#: quilt/import.in:96 msgid "Patch headers differ:\\n" msgstr "Die Patch-Header unterscheiden sich:\\n" -#: quilt/import.in:74 +#: quilt/import.in:99 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" "Bitte verwenden Sie die Option -d {o|a|n} um anzugeben, welche Patch-Header " "erhalten bleiben sollen.\\n" -#: quilt/import.in:139 +#: quilt/import.in:164 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" "Die Option \\`-P' kann nur beim Importieren eines einzelnen Patches " "verwendet werden\\n" -#: quilt/import.in:169 +#: quilt/import.in:194 msgid "Patch %s is applied\\n" msgstr "Patch %s ist angewandt\\n" -#: quilt/import.in:178 +#: quilt/import.in:203 msgid "Patch %s already exists in series.\\n" msgstr "Patch %s existiert bereits in der series-Datei\\n" -#: quilt/import.in:184 +#: quilt/import.in:209 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n" -#: quilt/import.in:195 +#: quilt/import.in:220 msgid "Replacing patch %s with new version\\n" msgstr "Ersetze Patch %s durch neuere Version\\n" -#: quilt/import.in:199 +#: quilt/import.in:224 msgid "Importing patch %s\\n" msgstr "Importiere patch %s\\n" -#: quilt/import.in:201 +#: quilt/import.in:226 msgid "Importing patch %s (stored as %s)\\n" msgstr "Importiere Patch %s (abgelegt als %s)\\n" -#: quilt/import.in:214 +#: quilt/import.in:239 msgid "Failed to import patch %s\\n" msgstr "Konnte Patch %s nicht importieren\\n" -#: quilt/import.in:223 quilt/refresh.in:333 +#: quilt/import.in:248 quilt/refresh.in:334 msgid "Failed to insert patch %s into file series\\n" msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n" @@ -824,41 +829,41 @@ msgstr "" "--to, --cc, --bcc\n" "\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n" -#: quilt/mail.in:189 quilt/mail.in:197 +#: quilt/mail.in:192 quilt/mail.in:200 #, fuzzy msgid "Introduction message already specified" msgstr "Einleitung gespeichert als %s\\n" -#: quilt/mail.in:259 +#: quilt/mail.in:262 msgid "You have to install 'formail' to use 'quilt mail'" msgstr "" -#: quilt/mail.in:302 +#: quilt/mail.in:305 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender." -#: quilt/mail.in:446 +#: quilt/mail.in:450 msgid "Unable to extract a subject header from %s\\n" msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n" -#: quilt/mail.in:470 +#: quilt/mail.in:474 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n" -#: quilt/mail.in:479 +#: quilt/mail.in:483 msgid "File %s does not exist\\n" msgstr "Datei %s existiert nicht\\n" -#: quilt/mail.in:539 +#: quilt/mail.in:543 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n" -#: quilt/mail.in:542 +#: quilt/mail.in:546 msgid "Introduction has no subject header\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n" -#: quilt/mail.in:656 +#: quilt/mail.in:660 msgid "Introduction saved as %s\\n" msgstr "Einleitung gespeichert als %s\\n" @@ -913,14 +918,14 @@ msgstr "" msgid "Patch %s exists already\\n" msgstr "Patch %s existiert bereits\\n" -#: quilt/new.in:108 quilt/refresh.in:342 -msgid "Failed to create patch %s\\n" -msgstr "Konnte Patch %s nicht erzeugen\\n" - -#: quilt/new.in:111 +#: quilt/new.in:108 msgid "Patch %s is now on top\\n" msgstr "Der oberste Patch ist jetzt %s\\n" +#: quilt/new.in:110 quilt/refresh.in:343 +msgid "Failed to create patch %s\\n" +msgstr "Konnte Patch %s nicht erzeugen\\n" + #: quilt/next.in:22 msgid "Usage: quilt next [patch]\\n" msgstr "Verwendung: quilt next [patch]\\n" @@ -937,7 +942,8 @@ msgstr "" #: quilt/patches.in:24 #, fuzzy -msgid "Usage: quilt patches [-v] {file} [files...]\\n" +msgid "" +"Usage: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n" msgstr "Verwendung: quilt patches [-v] {file}\\n" #: quilt/patches.in:27 @@ -1005,7 +1011,7 @@ msgstr "" "\n" "-v\tViele Meldungen ausgeben.\n" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:892 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:880 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" @@ -1031,11 +1037,11 @@ msgstr "Patch %s muss zuerst aktualisiert werden (Refresh).\\n" msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: quilt/pop.in:252 quilt/scripts/patchfns.in:498 +#: quilt/pop.in:252 quilt/scripts/patchfns.in:513 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" -#: quilt/pop.in:259 quilt/push.in:397 +#: quilt/pop.in:259 quilt/push.in:422 msgid "Now at patch %s\\n" msgstr "Jetzt in Patch %s\\n" @@ -1122,31 +1128,36 @@ msgstr "" msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n" -#: quilt/push.in:180 +#: quilt/push.in:181 msgid "Applying patch %s\\n" msgstr "Wende Patch %s an\\n" -#: quilt/push.in:214 +#: quilt/push.in:215 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "Patch %s existiert nicht; wende leeren patch an\\n" -#: quilt/push.in:218 +#: quilt/push.in:219 msgid "Patch %s appears to be empty; applied\\n" msgstr "Patch %s scheint leer zu sein; angewandt\\n" -#: quilt/push.in:222 +#: quilt/push.in:223 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Patch %s angewandt (erzwungen, muss aktualisiert werden (Refresh))\\n" -#: quilt/push.in:232 +#: quilt/push.in:233 msgid "Patch %s can be reverse-applied\\n" msgstr "Patch %s kann verkehrt angewandt werden\\n" -#: quilt/push.in:235 +#: quilt/push.in:236 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "Patch %s lässt sich nicht anwenden (erzwingen mit -f)\\n" -#: quilt/push.in:377 +#: quilt/push.in:291 +#, fuzzy +msgid "Patch %s is already applied; check your series file\\n" +msgstr "Patch %s existiert bereits, bitte einen anderen Namen wählen\\n" + +#: quilt/push.in:396 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Der oberste Patch %s muss zuerst aktualisiert werden (Refresh).\\n" @@ -1272,34 +1283,41 @@ msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "Kann nur den obersten Patch mit -z aktualisieren\\n" #: quilt/refresh.in:202 -msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" +#, fuzzy +msgid "" +"Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" -"Kann Patches mit Level -p$opt_strip_level nicht aktualisieren, bitte -p0 " -"oder -p1 angeben\\n" +"Kann Patches mit Level -p%s nicht aktualisieren, bitte -p0, -p1 oder -pab " +"angeben\\n" -#: quilt/refresh.in:240 +#: quilt/refresh.in:235 +#, fuzzy +msgid "Diff failed on file '%s', aborting\\n" +msgstr "Diff fehlgeschlagen, Abbruch.\\n" + +#: quilt/refresh.in:241 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Später angewandte Patches verändern Dateien von %s. Aktalisieren mit -f " "erzwingen.\\n" -#: quilt/refresh.in:246 +#: quilt/refresh.in:247 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "Kann --strip-trailing-whitespace nicht für Patches verwenden, die Dateien " "enthalten, die danach von anderen Patches weiter verändert werden.\\n" -#: quilt/refresh.in:252 quilt/refresh.in:354 +#: quilt/refresh.in:253 quilt/refresh.in:355 msgid "Nothing in patch %s\\n" msgstr "Patch %s ist leer\\n" -#: quilt/refresh.in:324 +#: quilt/refresh.in:325 msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: quilt/refresh.in:352 +#: quilt/refresh.in:353 msgid "Refreshed patch %s\\n" msgstr "Patch %s aktualisiert\\n" @@ -1415,40 +1433,36 @@ msgstr "Anzeigename `%s' enthält eine unvollständige Klammerung\n" msgid "Delivery address `%s' is invalid\n" msgstr "Zustelladresse `%s' ist ungültig\n" -#: quilt/scripts/patchfns.in:217 quilt/scripts/patchfns.in:511 +#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526 #, fuzzy msgid "%s is not a regular file\\n" msgstr "Patch %s ist nicht in der series-Datei\\n" -#: quilt/scripts/patchfns.in:465 quilt/scripts/patchfns.in:482 +#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497 msgid "No patches in series\\n" msgstr "Keine Patches in der series-Datei\\n" -#: quilt/scripts/patchfns.in:467 quilt/scripts/patchfns.in:484 +#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499 msgid "No series file found\\n" msgstr "" -#: quilt/scripts/patchfns.in:540 +#: quilt/scripts/patchfns.in:555 msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei\\n" -#: quilt/scripts/patchfns.in:568 +#: quilt/scripts/patchfns.in:583 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: quilt/scripts/patchfns.in:605 +#: quilt/scripts/patchfns.in:620 msgid "File series fully applied, ends at patch %s\\n" msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" -#: quilt/scripts/patchfns.in:638 -msgid "Patch %s does not exist\\n" -msgstr "Patch %s existiert nicht\\n" - -#: quilt/scripts/patchfns.in:910 +#: quilt/scripts/patchfns.in:898 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" -#: quilt/scripts/patchfns.in:951 +#: quilt/scripts/patchfns.in:941 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1461,7 +1475,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:1095 +#: quilt/scripts/patchfns.in:1094 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1505,8 +1519,11 @@ msgid "Renaming %s to %s: %s\n" msgstr "Umbenennen von %s auf %s: %s\n" #: quilt/series.in:22 -msgid "Usage: quilt series [-v]\\n" -msgstr "Verwendung: quilt series [-v]\\n" +#, fuzzy +msgid "Usage: quilt series [--color[=always|auto|never]] [-v]\\n" +msgstr "" +"Verwendung: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--" +"color[=always|auto|never]] [num|patch]\\n" #: quilt/series.in:25 #, fuzzy @@ -1516,7 +1533,7 @@ msgid "" "\n" "--color[=always|auto|never]\n" "\tUse syntax coloring (auto activates it only if the output is a tty).\n" -"\t\n" +"\n" "-v\tVerbose, more user friendly output.\n" msgstr "" "\n" @@ -1524,15 +1541,15 @@ msgstr "" "\n" "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n" -#: quilt/setup.in:34 quilt/setup.in:53 +#: quilt/setup.in:35 quilt/setup.in:55 msgid "Directory %s exists\\n" msgstr "Verzeichnis %s existiert\\n" -#: quilt/setup.in:59 +#: quilt/setup.in:61 msgid "File %s exists\\n" msgstr "Datei %s existiert\\n" -#: quilt/setup.in:99 +#: quilt/setup.in:102 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " "{specfile|seriesfile}\\n" @@ -1540,7 +1557,7 @@ msgstr "" "Verwendung: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] [--" "fuzz=N] {spec-datei|series-datei}\\n" -#: quilt/setup.in:102 +#: quilt/setup.in:105 #, fuzzy msgid "" "\n" @@ -1567,25 +1584,25 @@ msgstr "" "\n" "-v\tAusführliche Ausgabe.\n" -#: quilt/setup.in:173 +#: quilt/setup.in:176 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" "Der %%prep-Abschnitt von %s ist fehlgeschlagen; die Ergebnisse sind " "möglicherweise unvollständig\\n" -#: quilt/setup.in:176 +#: quilt/setup.in:179 msgid "The -v option will show rpm's output\\n" msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n" -#: quilt/setup.in:228 quilt/setup.in:240 +#: quilt/setup.in:231 quilt/setup.in:243 msgid "File %s not found\\n" msgstr "Datei %s nicht gefunden\\n" -#: quilt/setup.in:231 quilt/setup.in:243 +#: quilt/setup.in:234 quilt/setup.in:246 msgid "Unpacking archive %s\\n" msgstr "Entpacke Archiv %s\\n" -#: quilt/setup.in:252 +#: quilt/setup.in:255 msgid "Trying alternative patches and series names..." msgstr "" @@ -1688,3 +1705,12 @@ msgstr "" "Bitte entfernen Sie alle Patches mit \\`quilt pop -a' der quilt-Version, die " "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie " "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n" + +#~ msgid "" +#~ "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" +#~ msgstr "" +#~ "Kann Patches mit Level -p$opt_strip_level nicht aktualisieren, bitte -p0 " +#~ "oder -p1 angeben\\n" + +#~ msgid "Usage: quilt series [-v]\\n" +#~ msgstr "Verwendung: quilt series [-v]\\n" -- cgit