- Several Fixes from Joe Green <jgreen@mvista.com>:

  + Another sed \t\r problem, in Makefile.in
  + Bad error message on "quilt delete" of non-existent patch
  + "import" doesn't remove all leading components on patch file
  + Misspelling in "import" help text
- With using the GNU diff --label option, file timestamps
  disappeared. Specify the timestamps in --label by hand: This
  gives us added flexibility when generating patches; we may
  some day want to support diff styles other than unified.
  Also reported by Joe Green.
- Add --backup option to quilt refresh.
- Update documentation to QUILT_${COMMAND}_ARGS in .quiltrc.
  (The old settings still work but they are no longer documented.)
- Update German translation.

1 files changed, 30 insertions, 26 deletions

diff --git a/po/de.po b/po/de.po
index 0c688cb..2884279 100644
--- a/po/de.po
+++ b/po/de.po
@@ -65,12 +65,12 @@ msgstr ""
 "-p patch\n"
 "\tDer Patch, zu dem die Dateien hinzugefügt werden sollen."
 
-#: ../quilt/add.in:54 ../quilt/diff.in:140 ../quilt/diff.in:151
+#: ../quilt/add.in:54 ../quilt/diff.in:139 ../quilt/diff.in:150
 #: ../quilt/remove.in:52
 msgid "Patch $2 is not in series"
 msgstr "Patch $2 ist in der series-Datei nicht enthalten"
 
-#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:106
+#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:112
 #: ../quilt/remove.in:73
 msgid "Patch $patch is not applied"
 msgstr "Patch $patch ist nicht angewandt"
@@ -78,7 +78,7 @@ msgstr "Patch $patch ist nicht angewandt"
 #: ../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
+#: ../quilt/refresh.in:119 ../quilt/remove.in:80
 msgid "No patches applied"
 msgstr "Keine Patches angewandt"
 
@@ -138,15 +138,15 @@ msgstr ""
 "dieser Patch angewandt ist, entfernt quilt ihn zuerst. (Momentan kann \n"
 "nur der oberste Patch entfernt werden.)"
 
-#: ../quilt/delete.in:73
+#: ../quilt/delete.in:75
 msgid "Patch $patch is not in series"
 msgstr "Patch $patch ist in der series-Datei nicht enthalten"
 
-#: ../quilt/delete.in:82
+#: ../quilt/delete.in:84
 msgid "Patch $patch is currently applied"
 msgstr "Patch $patch ist momentan angewandt"
 
-#: ../quilt/delete.in:88
+#: ../quilt/delete.in:90
 msgid "Failed to remove patch $patch"
 msgstr "Konnte Patch $patch nicht entfernen"
 
@@ -189,11 +189,10 @@ msgid ""
 "\tis invoked with the original and new file name as arguments.\n"
 "\n"
 "--no-timestamps\n"
-"\tDo not include file timestamps in patch headers (as if\n"
-"        QUILT_DIFF_NO_TIMESTAMPS were set to yes).\n"
+"\tDo not include file timestamps in patch headers.\n"
 "\t\n"
 "--color[=always|auto|never]\n"
-"\tUse ANSI escape sequences to colorize the result."
+"\tUse syntax coloring."
 msgstr ""
 "\n"
 "Erzeugt ein Diff der angegebenen Dateien im obersten oder angegebenen\n"
@@ -223,10 +222,10 @@ msgstr ""
 "aufgerufen.\n"
 "\n"
 "--no-timestamps\n"
-"\tKeine Zeitstempel in Patches angeben (wie QUILT_DIFF_NO_TIMESTAMPS in~/."
-"quiltrc).\t\n"
+"\tKeine Zeitstempel in Patches angeben.\n"
+"\n"
 "--color[=always|auto|never]\n"
-"\tVerwende ANSI Escapesequenzen, und färbe das Ergebnis ein."
+"\tSyntaxeinfärbung verwenden (immer, nur für Terminals, nie)."
 
 #: ../quilt/diff.in:196
 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined."
@@ -273,7 +272,7 @@ msgstr "Kann nicht in Quellverzeichnis wechseln"
 msgid "File $file is not being modified."
 msgstr "Datei $file wird nicht verändert."
 
-#: ../quilt/diff.in:370 ../quilt/refresh.in:145
+#: ../quilt/diff.in:370 ../quilt/refresh.in:151
 msgid "Diff failed, aborting."
 msgstr "Diff fehlgeschlagen, Abbruch."
 
@@ -391,7 +390,7 @@ msgid ""
 "Import external patches.\n"
 "\n"
 "-p num\n"
-"\tNumber of directory levels to strip when aplying (default=1)\n"
+"\tNumber of directory levels to strip when applying (default=1)\n"
 "\n"
 "-n patch\n"
 "\tPatch filename to use inside quilt. This option can only be\n"
@@ -672,8 +671,8 @@ msgid "File series fully applied, ends at patch $top"
 msgstr "series-Datei vollständig angewandt, endet in Patch $top"
 
 #: ../quilt/refresh.in:22
-msgid "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [patch]"
-msgstr "Verwendung: quilt refresh [-p n] [-f] --no-timestamps] [patch]"
+msgid "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--backup] [patch]"
+msgstr "Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--backup] [patch]"
 
 #: ../quilt/refresh.in:26
 msgid ""
@@ -696,8 +695,10 @@ msgid ""
 "\tsome of the same files.\n"
 "\n"
 "--no-timestamps\n"
-"\tDo not include file timestamps in patch headers (as if\n"
-"        QUILT_DIFF_NO_TIMESTAMPS were set to yes)."
+"\tDo not include file timestamps in patch headers.\n"
+"\t\n"
+"--backup\n"
+"\tCreate a backup copy of the old version of a patch as patch~."
 msgstr ""
 "\n"
 "Frischt den obersten oder angegebenen Patch auf. Dokumentation in der\n"
@@ -720,12 +721,15 @@ msgstr ""
 "--no-timestamps\n"
 "\tKeine Zeitstempel in Patches angeben (wie QUILT_DIFF_NO_TIMESTAMPS in~/."
 "quiltrc)."
+"\t\n"
+"--backup\n"
+"\tErzeuge ein Backup der alten Version von patch als patch~."
 
-#: ../quilt/refresh.in:101
+#: ../quilt/refresh.in:107
 msgid "Patch $opt_patch is not in series"
 msgstr "Patch $opt_patch in series-Datei nicht gefunden"
 
-#: ../quilt/refresh.in:124
+#: ../quilt/refresh.in:130
 msgid ""
 "Cannot refresh patches with -p$opt_strip_level, please specify -p0 or -p1 "
 "instead"
@@ -733,21 +737,21 @@ msgstr ""
 "Kann Patches mit Level -p$opt_strip_level nicht auffrischen, bitte -p0 oder -"
 "p1 angeben"
 
-#: ../quilt/refresh.in:151
+#: ../quilt/refresh.in:157
 msgid "More recent patches modify files in $patch. Enforce refresh with -f."
 msgstr ""
 "Später angewandte Patches verändern Dateien von $patch. Auffrischen mit -f "
 "erzwingen."
 
-#: ../quilt/refresh.in:158
+#: ../quilt/refresh.in:164
 msgid "Nothing in patch $patch"
 msgstr "Patch $patch is leer"
 
-#: ../quilt/refresh.in:183
+#: ../quilt/refresh.in:189
 msgid "Patch $patch is unchanged"
 msgstr "Patch $patch ist unverändert."
 
-#: ../quilt/refresh.in:197
+#: ../quilt/refresh.in:203
 msgid "Refreshed patch $patch"
 msgstr "Patch $patch aufgefrischt."
 
@@ -974,7 +978,7 @@ msgstr "Patch $patch läßt sich nicht anwenden (erzwingen mit -f)"
 msgid "The topmost patch $top needs to be refreshed first."
 msgstr "Der oberste Patch $top muss zuerst aufgefrischt werden (Refresh)."
 
-#: ../scripts/patchfns.in:697
+#: ../scripts/patchfns.in:698
 msgid ""
 "The quilt meta-data in this tree has version $version, but this version of "
 "quilt can only handle meta-data formats up to and including version "
@@ -987,7 +991,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde."
 
-#: ../scripts/patchfns.in:759
+#: ../scripts/patchfns.in:760
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'."