- Add add-filename-check.test and trailing-ws.test test cases.

1 files changed, 49 insertions, 26 deletions

diff --git a/po/de.po b/po/de.po
index d2bf281..0ca04c4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -20,6 +20,7 @@ msgid "Commands are:"
 msgstr "Vorhandene Befehle:"
 
 #: ../bin/quilt.in:30
+#, fuzzy
 msgid ""
 "\n"
 "Common options to all commands:\n"
@@ -29,8 +30,8 @@ msgid ""
 "\n"
 "--quiltrc file\n"
 "\tUse the specified configuration file instead of ~/.quiltrc (or\n"
-"\t/etc/quilt.quiltrc if ~/.quiltrc is missing).  See the pdf\n"
-"\tdocumentation for details about its possible content."
+"\t/etc/quilt.quiltrc if ~/.quiltrc does not exist).  See the pdf\n"
+"\tdocumentation for details about its possible contents."
 msgstr ""
 "\n"
 "Gemeinsame Optionen für alle Befehle:\n"
@@ -73,20 +74,20 @@ 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/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62
-#: ../quilt/push.in:311 ../quilt/refresh.in:134 ../quilt/remove.in:53
+#: ../quilt/push.in:311 ../quilt/refresh.in:141 ../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:140 ../quilt/remove.in:74
+#: ../quilt/pop.in:254 ../quilt/refresh.in:147 ../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/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65
+#: ../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:148 ../quilt/remove.in:81
+#: ../quilt/refresh.in:155 ../quilt/remove.in:81
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
 
@@ -283,7 +284,7 @@ msgstr "Kann nicht in Quellverzeichnis wechseln\\n"
 msgid "File %s is not being modified\\n"
 msgstr "Datei %s wird nicht verändert.\\n"
 
-#: ../quilt/diff.in:415 ../quilt/refresh.in:187
+#: ../quilt/diff.in:415 ../quilt/refresh.in:194
 msgid "Diff failed, aborting\\n"
 msgstr "Diff fehlgeschlagen, Abbruch.\\n"
 
@@ -383,27 +384,28 @@ msgstr "Verwendung: quilt fork [neuer_name]\\n"
 #: ../quilt/fork.in:25
 msgid ""
 "\n"
-"Fork the topmost patch. If new_name is missing, the name of the\n"
-"forked patch will be the current patch name, followed by \\\"-2\\\".\n"
-"If the patch name already ends in a dash-and-number, the number is\n"
-"further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff).\n"
+"Fork the topmost patch.  Forking a patch means creating a verbatim copy\n"
+"of it under a new name, and use that new name instead of the original\n"
+"one in the current series.  This is useful when a patch has to be\n"
+"modified, but the original version of it should be preserved, e.g.\n"
+"because it is used in another series, or for the history.  A typical\n"
+"sequence of commands would be: fork, edit, refresh.\n"
+"\n"
+"If new_name is missing, the name of the forked patch will be the current\n"
+"patch name, followed by \\\"-2\\\".  If the patch name already ends in a\n"
+"dash-and-number, the number is further incremented (e.g., patch.diff,\n"
+"patch-2.diff, patch-3.diff).\n"
 msgstr ""
-"\n"
-"Spalte vom nächsten Patch eine neue Version ab. Falls neuer_name nicht\n"
-"angegeben ist, bekommt der neue Patch den selben Namen, gefolgt von \\\"-2\\"
-"\".\n"
-"Falls der Name bereits mit Bindestrich-Nummer endet, wird die Nummer\n"
-"erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n"
 
-#: ../quilt/fork.in:92
+#: ../quilt/fork.in:99
 msgid "Patch %s exists already, please choose a new name\\n"
 msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n"
 
-#: ../quilt/fork.in:104
+#: ../quilt/fork.in:111
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "Fehler beim Aufspalten von %s auf %s\\n"
 
-#: ../quilt/fork.in:110
+#: ../quilt/fork.in:117
 msgid "Fork of patch %s created as %s\\n"
 msgstr "Neue Version von %s erstellt als %s\\n"
 
@@ -849,7 +851,7 @@ msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
 #, fuzzy
 msgid ""
 "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--"
-"backup] [patch]\\n"
+"backup] [--strip-trailing-whitespace] [patch]\\n"
 msgstr ""
 "Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--"
 "backup] [patch]\\n"
@@ -890,6 +892,9 @@ msgid ""
 "\tCreate a backup copy of the old version of a patch as patch~.\n"
 "\n"
 "--sort\tSort files by their name instead of preserving the original order.\n"
+"\n"
+"--strip-trailing-whitespace\n"
+"\tStrip trailing whitespace at the end of lines of the generated patch.\n"
 msgstr ""
 "\n"
 "Frischt den obersten oder angegebenen Patch auf. Dokumentation in der\n"
@@ -926,28 +931,32 @@ msgstr ""
 "--backup\n"
 "\tErzeuge ein Backup der alten Version von patch als patch~.\n"
 
-#: ../quilt/refresh.in:159
+#: ../quilt/refresh.in:166
 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:193
+#: ../quilt/refresh.in:200
 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:200
+#: ../quilt/refresh.in:207
 msgid "Nothing in patch %s\\n"
 msgstr "Patch %s is leer\\n"
 
-#: ../quilt/refresh.in:261
+#: ../quilt/refresh.in:221
+msgid "Warning: %s adds trailing whitespace\\n"
+msgstr ""
+
+#: ../quilt/refresh.in:283
 msgid "Patch %s is unchanged\\n"
 msgstr "Patch %s ist unverändert\\n"
 
-#: ../quilt/refresh.in:275
+#: ../quilt/refresh.in:297
 msgid "Refreshed patch %s\\n"
 msgstr "Patch %s aufgefrischt\\n"
 
@@ -1164,3 +1173,17 @@ msgid ""
 msgstr ""
 "Das Arbeitsverzeichnis wurde von einer älteren Version von quilt erstellt. "
 "Bitte führen Sie \\`quilt upgrade' aus.\\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Fork the topmost patch. If new_name is missing, the name of the\n"
+#~ "forked patch will be the current patch name, followed by \\\"-2\\\".\n"
+#~ "If the patch name already ends in a dash-and-number, the number is\n"
+#~ "further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Spalte vom nächsten Patch eine neue Version ab. Falls neuer_name nicht\n"
+#~ "angegeben ist, bekommt der neue Patch den selben Namen, gefolgt von \\\"-2"
+#~ "\\\".\n"
+#~ "Falls der Name bereits mit Bindestrich-Nummer endet, wird die Nummer\n"
+#~ "erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n"