From 9090e9b67f52ae9b11358639b7a5d82da777aba6 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 30 Jun 2004 22:54:15 +0000 Subject: - Quilt diff: add --color option for optionally colorizing the output. --- po/de.po | 60 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 27 deletions(-) (limited to 'po/de.po') diff --git a/po/de.po b/po/de.po index dbe8b40..0d3bce9 100644 --- a/po/de.po +++ b/po/de.po @@ -65,7 +65,7 @@ msgstr "" "-p patch\n" "\tDer Patch, zu dem die Dateien hinzugefügt werden sollen." -#: ../quilt/add.in:54 ../quilt/diff.in:116 ../quilt/diff.in:127 +#: ../quilt/add.in:54 ../quilt/diff.in:140 ../quilt/diff.in:151 #: ../quilt/remove.in:52 msgid "Patch $2 is not in series" msgstr "Patch $2 ist in der series-Datei nicht enthalten" @@ -75,7 +75,7 @@ msgstr "Patch $2 ist in der series-Datei nicht enthalten" msgid "Patch $patch is not applied" msgstr "Patch $patch ist nicht angewandt" -#: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:174 +#: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:211 #: ../quilt/files.in:75 ../quilt/fold.in:78 ../quilt/fork.in:64 #: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:215 #: ../quilt/refresh.in:113 ../quilt/remove.in:80 @@ -153,10 +153,10 @@ msgstr "Konnte Patch $patch nicht entfernen" #: ../quilt/diff.in:22 msgid "" "Usage: quilt diff [-p n] [-c patch|-z] [-R] [-P patch] [--snapshot] [--" -"diff=utility] [file ...]" +"diff=utility] [--color] [file ...]" msgstr "" "Verwendung: quilt diff [-p n] [-c patch|-z] [-R] [-P patch] [--snapshot] [--" -"diff=programm] [datei ...]" +"diff=programm] [--color] [datei ...]" #: ../quilt/diff.in:26 msgid "" @@ -190,7 +190,10 @@ msgid "" "\n" "--no-timestamps\n" "\tDo not include file timestamps in patch headers (as if\n" -" QUILT_DIFF_NO_TIMESTAMPS were set to yes)." +" QUILT_DIFF_NO_TIMESTAMPS were set to yes).\n" +"\t\n" +"--color[=always|auto|never]\n" +"\tUse ANSI escape sequences to colorize the result." msgstr "" "\n" "Erzeugt ein Diff der angegebenen Dateien im obersten oder angegebenen\n" @@ -220,59 +223,62 @@ msgstr "" "aufgerufen.\n" "\n" "--no-timestamps\n" -"\tKeine Zeitstempel in Patches angeben (wie QUILT_DIFF_NO_TIMESTAMPS in" -"~/.quiltrc)." +"\tKeine Zeitstempel in Patches angeben (wie QUILT_DIFF_NO_TIMESTAMPS in~/." +"quiltrc)." +"\t\n" +"--color[=always|auto|never]\n" +"\tVerwende ANSI Escapesequenzen, und färbe das Ergebnis ein." -#: ../quilt/diff.in:159 +#: ../quilt/diff.in:196 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined." msgstr "" "Die Optionen \\`-c patch', \\`--snapshot', und \\`-z' können nicht " "kombiniert werden." -#: ../quilt/diff.in:167 +#: ../quilt/diff.in:204 msgid "Patch $last_patch is not applied" msgstr "Patch $last_patch ist nicht angewandt" -#: ../quilt/diff.in:185 +#: ../quilt/diff.in:222 msgid "" "Cannot diff patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" msgstr "" "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." -#: ../quilt/diff.in:219 +#: ../quilt/diff.in:256 msgid "Patch $first_patch not applied before $last_patch." msgstr "Patch $first_patch ist nicht vor Patch $last_patch angewandt." -#: ../quilt/diff.in:253 +#: ../quilt/diff.in:290 msgid "Cannot change into $QUILT_PC/$last_patch" msgstr "Kann nicht in Verzeichnis $QUILT_PC/$last_patch wechseln." -#: ../quilt/diff.in:259 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:296 ../scripts/rpatch.in:62 msgid "Failed to copy files to temporary directory" msgstr "Konnte Dateien nicht in ein temporäres Verzeichnis kopieren" -#: ../quilt/diff.in:270 +#: ../quilt/diff.in:307 msgid "Cannot change to temporary directory" msgstr "Kann nicht in temporäres Verzeichnis wechseln" -#: ../quilt/diff.in:289 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:326 ../scripts/rpatch.in:85 msgid "Failed to patch temporary files" msgstr "Konnte temporäre Dateien nicht patchen" -#: ../quilt/diff.in:295 +#: ../quilt/diff.in:332 msgid "Cannot change to source directory" msgstr "Kann nicht in Quellverzeichnis wechseln" -#: ../quilt/diff.in:313 +#: ../quilt/diff.in:350 msgid "File $file is not being modified." msgstr "Datei $file wird nicht verändert." -#: ../quilt/diff.in:332 ../quilt/refresh.in:145 +#: ../quilt/diff.in:370 ../quilt/refresh.in:145 msgid "Diff failed, aborting." msgstr "Diff fehlgeschlagen, Abbruch." -#: ../quilt/diff.in:339 +#: ../quilt/diff.in:377 msgid "More recent patches modify files in $last_patch." msgstr "Später angewandte Patches verändern Dateien von $last_patch." @@ -412,27 +418,27 @@ msgstr "" "Die Option \\`-n' kann nur beim Importieren eines einzelnen Patches " "verwendet werden" -#: ../quilt/import.in:94 +#: ../quilt/import.in:90 msgid "Patch $patch is applied." msgstr "Patch $patch ist angewandt." -#: ../quilt/import.in:102 +#: ../quilt/import.in:98 msgid "Patch $patch exists. Replace with -f." msgstr "Patch $patch existiert bereits. Ersetzen mit -f." -#: ../quilt/import.in:105 +#: ../quilt/import.in:101 msgid "Replacing patch $patch with new version" msgstr "Ersetze Patch $patch durch neuere Version" -#: ../quilt/import.in:107 +#: ../quilt/import.in:103 msgid "Importing patch $patch_file (stored as $patch)" msgstr "Importiere Patch $patch_file (abgelegt als $patch)" -#: ../quilt/import.in:113 +#: ../quilt/import.in:109 msgid "Failed to import patch $patch" msgstr "Konnte Patch $patch nicht importieren" -#: ../quilt/import.in:120 +#: ../quilt/import.in:116 msgid "Failed to insert $patch in file series." msgstr "Konnte Patch $patch nicht in die series-Datei einfügen." @@ -713,8 +719,8 @@ msgstr "" "-f\tAuffrischen erzwingen, selbst wenn Patches über dem angegebenen Patch\n" "\teinige der selben Dateien verändern.\n" "--no-timestamps\n" -"\tKeine Zeitstempel in Patches angeben (wie QUILT_DIFF_NO_TIMESTAMPS in" -"~/.quiltrc)." +"\tKeine Zeitstempel in Patches angeben (wie QUILT_DIFF_NO_TIMESTAMPS in~/." +"quiltrc)." #: ../quilt/refresh.in:101 msgid "Patch $opt_patch is not in series" -- cgit