diff options
Diffstat (limited to 'po/de.po')
| -rw-r--r-- | po/de.po | 78 |
1 files changed, 41 insertions, 37 deletions
@@ -67,20 +67,20 @@ msgstr "" "\tPatch, zu dem die Dateien hinzugefügt werden sollen.\n" #: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76 -#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62 -#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:272 +#: ../quilt/diff.in:153 ../quilt/diff.in:164 ../quilt/next.in:62 +#: ../quilt/pop.in:239 ../quilt/previous.in:62 ../quilt/push.in:311 #: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei enthalten\\n" -#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:252 +#: ../quilt/add.in:75 ../quilt/diff.in:226 ../quilt/pop.in:254 #: ../quilt/refresh.in:135 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229 +#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:234 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 -#: ../quilt/pop.in:286 ../quilt/push.in:310 ../quilt/refresh.in:143 +#: ../quilt/pop.in:288 ../quilt/push.in:349 ../quilt/refresh.in:143 #: ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" @@ -143,7 +143,7 @@ msgstr "Patch %s ist momentan angewandt\\n" msgid "Failed to remove patch %s\\n" msgstr "Konnte Patch %s nicht entfernen\\n" -#: ../quilt/diff.in:22 +#: ../quilt/diff.in:24 msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " "patch] [--snapshot] [--diff=utility] [--color] [file ...]\\n" @@ -151,7 +151,7 @@ msgstr "" "Verwendung: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-" "R] [-P patch] [--snapshot] [--diff=programm] [--color] [datei ...]\\n" -#: ../quilt/diff.in:26 +#: ../quilt/diff.in:28 msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -230,51 +230,51 @@ msgstr "" "--color[=always|auto|never]\n" "\tSyntaxeinfärbung verwenden (immer, nur für Terminals, nie).\n" -#: ../quilt/diff.in:213 +#: ../quilt/diff.in:218 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Die Optionen \\`-c patch', \\`--snapshot', und \\`-z' können nicht " "kombiniert werden.\\n" -#: ../quilt/diff.in:240 +#: ../quilt/diff.in:245 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." "\\n" -#: ../quilt/diff.in:275 ../quilt/files.in:122 +#: ../quilt/diff.in:280 ../quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: ../quilt/diff.in:311 +#: ../quilt/diff.in:316 msgid "Cannot change into directory %s\\n" msgstr "Kann nicht in Verzeichnis %s wechseln\\n" -#: ../quilt/diff.in:318 ../quilt/pop.in:115 +#: ../quilt/diff.in:323 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" -#: ../quilt/diff.in:329 +#: ../quilt/diff.in:334 msgid "Cannot change to temporary directory\\n" msgstr "Kann nicht in temporäres Verzeichnis wechseln\\n" -#: ../quilt/diff.in:348 ../quilt/pop.in:138 +#: ../quilt/diff.in:353 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" -#: ../quilt/diff.in:354 +#: ../quilt/diff.in:359 msgid "Cannot change to source directory\\n" msgstr "Kann nicht in Quellverzeichnis wechseln\\n" -#: ../quilt/diff.in:372 +#: ../quilt/diff.in:377 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: ../quilt/diff.in:392 ../quilt/refresh.in:175 +#: ../quilt/diff.in:397 ../quilt/refresh.in:175 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: ../quilt/diff.in:399 +#: ../quilt/diff.in:404 msgid "More recent patches modify files in patch %s\\n" msgstr "Später angewandte Patches verändern Dateien von %s\\n" @@ -559,25 +559,25 @@ msgstr "" "\n" "-v\tViele Meldungen ausgeben.\n" -#: ../quilt/pop.in:153 +#: ../quilt/pop.in:156 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Patch %s kann nicht entfernt werden (Patch auffrischen oder Entfernen " "erzwingen mit -f)\\n" -#: ../quilt/pop.in:176 +#: ../quilt/pop.in:178 msgid "Removing patch %s\\n" msgstr "Entferne patch %s\\n" -#: ../quilt/pop.in:260 +#: ../quilt/pop.in:262 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" -#: ../quilt/pop.in:270 +#: ../quilt/pop.in:272 msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: ../quilt/pop.in:293 ../quilt/push.in:328 +#: ../quilt/pop.in:295 ../quilt/push.in:371 msgid "Now at patch %s\\n" msgstr "Jetzt in Patch %s\\n" @@ -595,11 +595,12 @@ msgstr "" "Gibt den Namen des Patches vor dem obersten oder angegebenen\n" "Patch in der series-Datei aus.\n" -#: ../quilt/push.in:22 +#: ../quilt/push.in:24 msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" msgstr "Verwendung: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" -#: ../quilt/push.in:25 +#: ../quilt/push.in:27 +#, fuzzy msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -625,6 +626,9 @@ msgid "" "\tAllow the patch utility to ask how to deal with conflicts. If\n" "\tthis option is not given, the option -f will be passed to the \n" "\tpatch program.\n" +"\n" +"--color[=always|auto|never]\n" +" Use syntax coloring.\n" msgstr "" "\n" "Patches in der series-Datei anwenden. Es kann eine Anzahl von Patches,\n" @@ -649,43 +653,43 @@ msgstr "" "\tErlaubt GNU patch, interaktiv Fragen zu stellen. Wenn diese Option\n" "\tnicht angegeben wird, wird die Option -f an GNU patch übergeben.\n" -#: ../quilt/push.in:59 +#: ../quilt/push.in:64 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n" -#: ../quilt/push.in:71 +#: ../quilt/push.in:96 msgid "Patch %s appears to be empty\\n" msgstr "Patch %s scheint leer zu sein\\n" -#: ../quilt/push.in:135 +#: ../quilt/push.in:160 msgid "Applying patch %s\\n" msgstr "Wende Patch %s an\\n" -#: ../quilt/push.in:166 +#: ../quilt/push.in:192 msgid "Patch %s appears to be empty, applied\\n" msgstr "Patch %s scheint leer zu sein, angewandt\\n" -#: ../quilt/push.in:170 +#: ../quilt/push.in:196 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Patch %s angewandt (erzwungen, muß aufgefrischt werden (Refresh))\\n" -#: ../quilt/push.in:175 +#: ../quilt/push.in:201 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "Patch %s läßt sich nicht anwenden (erzwingen mit -f)\\n" -#: ../quilt/push.in:214 +#: ../quilt/push.in:240 msgid "Patch %s not found in file series\\n" msgstr "Patch %s nicht in series-Datei gefunden\\n" -#: ../quilt/push.in:289 +#: ../quilt/push.in:328 msgid "Patch %s is already applied\\n" msgstr "Patch %s ist bereits angewandt\\n" -#: ../quilt/push.in:298 +#: ../quilt/push.in:337 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" -#: ../quilt/push.in:312 +#: ../quilt/push.in:351 msgid "File series fully applied, ends at patch %s\\n" msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" @@ -984,7 +988,7 @@ msgstr "" "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie " "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n" -#: ../scripts/patchfns.in:750 +#: ../scripts/patchfns.in:732 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 " @@ -997,7 +1001,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: ../scripts/patchfns.in:817 +#: ../scripts/patchfns.in:809 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" |