diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2005-06-06 19:34:27 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2005-06-06 19:34:27 +0000 |
commit | af2edcd6525bc73c69d086beb64da8daaed07c1d (patch) | |
tree | 8f86f3039c90a045b792e7a4cfb9406dd399a210 /po/de.po | |
parent | ef7e2b2116af23fd32ae8040737c9ca0a523eb65 (diff) | |
download | quilt-af2edcd6525bc73c69d086beb64da8daaed07c1d.tar.gz |
- Add --no-index option to diff and refresh commands: Suppress
Index: lines in the patch. From Jean Delvare <khali@linux-fr.org>.
Diffstat (limited to 'po/de.po')
-rw-r--r-- | po/de.po | 63 |
1 files changed, 35 insertions, 28 deletions
@@ -72,22 +72,22 @@ msgid "File \\`%s' is located below \\`%s'\\n" msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n" #: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76 -#: ../quilt/diff.in:155 ../quilt/diff.in:166 ../quilt/graph.in:116 +#: ../quilt/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116 #: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62 -#: ../quilt/push.in:311 ../quilt/refresh.in:141 ../quilt/remove.in:53 +#: ../quilt/push.in:311 ../quilt/refresh.in:148 ../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:99 ../quilt/diff.in:231 ../quilt/graph.in:121 -#: ../quilt/pop.in:254 ../quilt/refresh.in:147 ../quilt/remove.in:74 +#: ../quilt/add.in:99 ../quilt/diff.in:239 ../quilt/graph.in:121 +#: ../quilt/pop.in:254 ../quilt/refresh.in:154 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:239 +#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72 #: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349 -#: ../quilt/refresh.in:155 ../quilt/remove.in:81 +#: ../quilt/refresh.in:162 ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" @@ -157,7 +157,8 @@ msgstr "Konnte Patch %s nicht entfernen\\n" #, fuzzy msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " -"patch] [--snapshot] [--diff=utility] [--sort] [--color] [file ...]\\n" +"patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] " +"[--color] [file ...]\\n" msgstr "" "Verwendung: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-" "R] [-P patch] [--snapshot] [--diff=programm] [--color] [datei ...]\\n" @@ -180,6 +181,9 @@ msgid "" "--no-timestamps\n" "\tDo not include file timestamps in patch headers.\n" "\n" +"--no-index\n" +"\tDo not output Index: lines.\n" +"\n" "-z\tWrite to standard output the changes that have been made\n" "\trelative to the topmost or specified patch.\n" "\n" @@ -244,51 +248,51 @@ msgstr "" "--color[=always|auto|never]\n" "\tSyntaxeinfärbung verwenden (immer, nur für Terminals, nie).\n" -#: ../quilt/diff.in:223 +#: ../quilt/diff.in:231 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:250 +#: ../quilt/diff.in:258 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:285 ../quilt/files.in:122 +#: ../quilt/diff.in:293 ../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:334 +#: ../quilt/diff.in:342 msgid "Cannot change into directory %s\\n" msgstr "Kann nicht in Verzeichnis %s wechseln\\n" -#: ../quilt/diff.in:341 ../quilt/pop.in:114 +#: ../quilt/diff.in:349 ../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:352 +#: ../quilt/diff.in:360 msgid "Cannot change to temporary directory\\n" msgstr "Kann nicht in temporäres Verzeichnis wechseln\\n" -#: ../quilt/diff.in:371 ../quilt/pop.in:138 +#: ../quilt/diff.in:379 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" -#: ../quilt/diff.in:377 +#: ../quilt/diff.in:385 msgid "Cannot change to source directory\\n" msgstr "Kann nicht in Quellverzeichnis wechseln\\n" -#: ../quilt/diff.in:395 +#: ../quilt/diff.in:403 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: ../quilt/diff.in:415 ../quilt/refresh.in:194 +#: ../quilt/diff.in:423 ../quilt/refresh.in:201 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: ../quilt/diff.in:422 +#: ../quilt/diff.in:430 msgid "More recent patches modify files in patch %s\\n" msgstr "Später angewandte Patches verändern Dateien von %s\\n" @@ -850,8 +854,8 @@ msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" #: ../quilt/refresh.in:22 #, fuzzy msgid "" -"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--" -"backup] [--strip-trailing-whitespace] [patch]\\n" +"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] " +"[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n" msgstr "" "Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--" "backup] [patch]\\n" @@ -882,6 +886,9 @@ msgid "" "--no-timestamps\n" "\tDo not include file timestamps in patch headers.\n" "\t\n" +"--no-index\n" +"\tDo not output Index: lines.\n" +"\n" "--diffstat\n" "\tAdd a diffstat section to the patch header, or replace the\n" "\texisting diffstat section.\n" @@ -931,32 +938,32 @@ msgstr "" "--backup\n" "\tErzeuge ein Backup der alten Version von patch als patch~.\n" -#: ../quilt/refresh.in:166 +#: ../quilt/refresh.in:173 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Kann Patches mit Level -p$opt_strip_level nicht auffrischen, bitte -p0 oder -" "p1 angeben\\n" -#: ../quilt/refresh.in:200 +#: ../quilt/refresh.in:207 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Später angewandte Patches verändern Dateien von $patch. Auffrischen mit -f " "erzwingen.\\n" -#: ../quilt/refresh.in:207 +#: ../quilt/refresh.in:214 msgid "Nothing in patch %s\\n" msgstr "Patch %s is leer\\n" -#: ../quilt/refresh.in:221 +#: ../quilt/refresh.in:228 msgid "Warning: %s adds trailing whitespace\\n" msgstr "" -#: ../quilt/refresh.in:283 +#: ../quilt/refresh.in:290 msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: ../quilt/refresh.in:297 +#: ../quilt/refresh.in:304 msgid "Refreshed patch %s\\n" msgstr "Patch %s aufgefrischt\\n" @@ -1153,7 +1160,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:738 +#: ../scripts/patchfns.in:741 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 " @@ -1166,7 +1173,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: ../scripts/patchfns.in:815 +#: ../scripts/patchfns.in:818 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" |