merge from HEAD branch

1 files changed, 132 insertions, 75 deletions

diff --git a/po/de.po b/po/de.po
index 5e13d23..31be957 100644
--- a/po/de.po
+++ b/po/de.po
@@ -45,11 +45,12 @@ msgstr ""
 "\tDer Patch, zu dem die Dateien hinzugefügt werden sollen."
 
 #: ../quilt/add.in:75 ../quilt/delete.in:69 ../quilt/files.in:74
-#: ../quilt/push.in:175 ../quilt/remove.in:75
+#: ../quilt/push.in:176 ../quilt/remove.in:75
 msgid "No patch applied"
 msgstr "Kein Patch angewandt"
 
-#: ../quilt/add.in:80 ../quilt/refresh.in:113 ../quilt/remove.in:80
+#: ../quilt/add.in:80 ../quilt/applied.in:71 ../quilt/refresh.in:182
+#: ../quilt/remove.in:80
 msgid "Patch $patch is not applied"
 msgstr "Patch $patch ist nicht angewandt"
 
@@ -70,17 +71,20 @@ msgid "File $file added to patch $patch"
 msgstr "Datei $file zu Patch $patch hinzugefügt"
 
 #: ../quilt/applied.in:22
-msgid "Usage: quilt applied [patch]"
+#, fuzzy
+msgid "Usage: quilt applied [-n] [patch]"
 msgstr "Verwendung: quilt applied [patch]"
 
 #: ../quilt/applied.in:25
+#, fuzzy
 msgid ""
 "\n"
 "\n"
 "Print a list of applied patches, or all patches up to and including the\n"
 "specified patch in the file series.\n"
 "\n"
-"-n\tPrint patch file names instead of patch names."
+"-n\tPrint patch file names instead of patch names.\n"
+"\n"
 msgstr ""
 "\n"
 "\n"
@@ -125,6 +129,7 @@ msgstr ""
 "Verwendung: quilt diff [-p n] [-c patch|-z] [-R] [-P patch] [datei ...]"
 
 #: ../quilt/diff.in:31
+#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -140,7 +145,8 @@ msgid ""
 "\n"
 "-c patch\n"
 "\tCreate a combined diff for all patches between this patch and\n"
-"\tthe patch specified with -P.\n"
+"\tthe patch specified with -P. A patch name of \\\"-\\\" is equivalent\n"
+"\tto specifying the first applied patch.\n"
 "\n"
 "-R\tCreate a reverse diff.\n"
 "\n"
@@ -169,62 +175,60 @@ msgstr ""
 "-z\tÄnderungen relativ zum angewandten Patch ausgeben.\n"
 "\n"
 
-#: ../quilt/diff.in:131
-msgid "Options \\`-c patch' and \\`-z' cannot be combined."
+#: ../quilt/diff.in:138
+#, fuzzy
+msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined."
 msgstr "Die Optionen \\`-c patch' and \\`-z' können nicht kombiniert werden."
 
-#: ../quilt/diff.in:140 ../quilt/refresh.in:106
+#: ../quilt/diff.in:147 ../quilt/refresh.in:175
 msgid "No patch seem to be applied"
 msgstr "Es ist kein Patch angewandt"
 
-#: ../quilt/diff.in:147
+#: ../quilt/diff.in:154
 msgid "Patch $last_patch is not applied"
 msgstr "Patch $last_patch ist nicht angewandt"
 
-#: ../quilt/diff.in:157
+#: ../quilt/diff.in:164
 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:165
-msgid "refresh_patches_per_file failed."
-msgstr "Fehler in refresh_patches_per_file."
-
-#: ../quilt/diff.in:178
-msgid "Patch $opt_combine not applied before $last_patch."
+#: ../quilt/diff.in:198
+#, fuzzy
+msgid "Patch $first_patch not applied before $last_patch."
 msgstr "Patch $opt_combine ist nicht vor Patch $last_patch angewandt."
 
-#: ../quilt/diff.in:212
-msgid "File $file is not being modified."
-msgstr "Datei $file wird nicht verändert."
-
-#: ../quilt/diff.in:229
+#: ../quilt/diff.in:233
 msgid "Cannot change into .pc/$last_patch"
 msgstr "Kann nicht in Verzeichnis .pc/$last_patch wechseln."
 
-#: ../quilt/diff.in:234
+#: ../quilt/diff.in:238
 msgid "Failed to copy files to temporary directory"
 msgstr "Konnte Dateien nicht in ein temporäres Verzeichnis kopieren"
 
-#: ../quilt/diff.in:239
+#: ../quilt/diff.in:243
 msgid "Cannot change to temporary directory"
 msgstr "Kann nicht in temporäres Verzeichnis wechseln"
 
-#: ../quilt/diff.in:256
+#: ../quilt/diff.in:260
 msgid "Failed to patch temporary files"
 msgstr "Konnte temporäre Dateien nicht patchen"
 
-#: ../quilt/diff.in:263
+#: ../quilt/diff.in:267
 msgid "Cannot change to source directory"
 msgstr "Kann nicht in Quellverzeichnis wechseln"
 
-#: ../quilt/diff.in:292 ../quilt/refresh.in:144
+#: ../quilt/diff.in:285
+msgid "File $file is not being modified."
+msgstr "Datei $file wird nicht verändert."
+
+#: ../quilt/diff.in:304 ../quilt/refresh.in:215
 msgid "Diff failed, aborting."
 msgstr "Diff fehlgeschlagen, Abbruch."
 
-#: ../quilt/diff.in:299
+#: ../quilt/diff.in:311
 msgid "More recent patches modify files in $last_patch."
 msgstr "Später angewandte Patches verändern Dateien von $last_patch."
 
@@ -408,10 +412,13 @@ msgid "Usage: quilt patches {file}"
 msgstr "Verwendung: quilt patches {file}"
 
 #: ../quilt/patches.in:25
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"Print the list of patches that modify the specified file.\n"
+"Print the list of patches that modify the specified file. (Uses a\n"
+"heuristic to determine which files are modified by unapplied patches.\n"
+"Note that this heuristic is much slower than scanning applied patches.)\n"
 "\n"
 "-n\tPrint the patch file names instead of the patch names.\n"
 "\n"
@@ -474,32 +481,29 @@ msgstr ""
 "-v\tViele Meldungen ausgeben.\n"
 "\n"
 
-#: ../quilt/pop.in:83 ../quilt/push.in:86
-msgid "Patch $stop_at_patch not found in file series"
-msgstr "Patch $stop_at_patch in series-Datei nicht gefunden"
-
-#: ../quilt/pop.in:156
+#: ../quilt/pop.in:146
 msgid "Patch $stop_at_patch is not applied."
 msgstr "Patch $stop_at_patch ist nicht angewandt."
 
-#: ../quilt/pop.in:166
+#: ../quilt/pop.in:156
 msgid "No patch removed"
 msgstr "Kein Patch entfernt"
 
-#: ../quilt/pop.in:180 ../quilt/push.in:192
+#: ../quilt/pop.in:170 ../quilt/push.in:201
 msgid "Interrupted by user"
 msgstr "Unterbrechung durch Benutzer"
 
-#: ../quilt/pop.in:189 ../quilt/push.in:201
+#: ../quilt/pop.in:179 ../quilt/push.in:210
 msgid "No patches applied"
 msgstr "Keine Patches angewandt"
 
-#: ../quilt/pop.in:191 ../quilt/push.in:203
+#: ../quilt/pop.in:181 ../quilt/push.in:212
 msgid "Now at patch $patch"
 msgstr "Jetzt in Patch $patch"
 
 #: ../quilt/previous.in:22
-msgid "Usage: quilt previous [patch]"
+#, fuzzy
+msgid "Usage: quilt previous [-n] [patch]"
 msgstr "Verwendung: quilt previous [patch]"
 
 #: ../quilt/previous.in:25
@@ -547,8 +551,9 @@ msgid ""
 "\tis not actually applied.\n"
 "\n"
 "--interactive\n"
-"\tAllow the patch utility to ask hwo to deal with conflicts. If\n"
-"\tthis option is not given, the -f patch optionch will be used.\n"
+"\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"
 msgstr ""
 "\n"
@@ -572,19 +577,32 @@ msgstr ""
 "\tnicht sauber angewandt werden kann.\n"
 "\t\n"
 
-#: ../quilt/push.in:162
+#: ../quilt/push.in:87
+msgid "Patch $stop_at_patch not found in file series"
+msgstr "Patch $stop_at_patch in series-Datei nicht gefunden"
+
+#: ../quilt/push.in:163
 msgid "Patch $stop_at_patch is already applied."
 msgstr "Patch $stop_at_patch ist bereits angewandt."
 
-#: ../quilt/push.in:177
+#: ../quilt/push.in:180
+msgid ""
+"The topmost patch $top is not in the series file anymore;\n"
+"cannot determine the next patch from the series file.\n"
+"Please pop -f the top patch and check your series file."
+msgstr ""
+
+#: ../quilt/push.in:186
 msgid "File series fully applied, ends at patch $top"
 msgstr "series-Datei vollständig angewandt, endet in Patch $top"
 
-#: ../quilt/refresh.in:27
-msgid "Usage: quilt refresh [-p n] [-f] [patch]"
+#: ../quilt/refresh.in:26
+#, fuzzy
+msgid "Usage: quilt refresh [-p n] [-f] [k|o] [patch]"
 msgstr "Verwendung: quilt refresh [-p n] [-f] [patch]"
 
-#: ../quilt/refresh.in:31
+#: ../quilt/refresh.in:30
+#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -604,7 +622,10 @@ msgid ""
 "\t\n"
 "-f\tForce refresh, even if more recent patches modify\n"
 "\tsome of the same files.\n"
+"-O \tOverwrite the quilt save patches (for gendiff)\n"
+"-K\tKeep the quilt save patches unchanged (for gendiff)\n"
 "\n"
+"\t\n"
 msgstr ""
 "\n"
 "\n"
@@ -627,7 +648,7 @@ msgstr ""
 "\teinige der selben Dateien verändern.\n"
 "\n"
 
-#: ../quilt/refresh.in:123
+#: ../quilt/refresh.in:192
 msgid ""
 "Cannot refresh patches with -p$opt_strip_level, please specify -p0 or -p1 "
 "instead"
@@ -635,17 +656,17 @@ msgstr ""
 "Kann Patches mit Level -p$opt_strip_level nicht auffrischen, bitte -p0 oder -"
 "p1 angeben"
 
-#: ../quilt/refresh.in:150
+#: ../quilt/refresh.in:221
 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:157
+#: ../quilt/refresh.in:228
 msgid "Nothing in patch $patch"
 msgstr "Patch $patch is leer"
 
-#: ../quilt/refresh.in:197
+#: ../quilt/refresh.in:268
 msgid "Refreshed patch $patch"
 msgstr "Patch $patch aufgefrischt."
 
@@ -710,11 +731,13 @@ msgstr ""
 "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n"
 "\n"
 
-#: ../quilt/setup.in:22
-msgid "Usage: quilt setup [-d sourcedir] {seriesfile|specfile}"
+#: ../quilt/setup.in:21
+#, fuzzy
+msgid ""
+"Usage: quilt setup [-d sourcedir] [-l seriesfile]  {seriesfile|specfile}"
 msgstr "Verwendung: quilt setup [-d quellvz.] {seriesdatei|specdatei}"
 
-#: ../quilt/setup.in:25
+#: ../quilt/setup.in:24
 msgid ""
 "\n"
 "\n"
@@ -722,43 +745,59 @@ msgid ""
 "file must contain the name of the relevant tar archive, in addition to\n"
 "the list of patches.\n"
 "\n"
-msgstr ""
-"\n"
-"\n"
-"Baut einen Quellen-Baum aus einer series-Datei auf. Die series-Datei\n"
-"muß neben der Liste der Patches auch den Namen der entsprechenden\n"
-"Tar-Datei enthalten.\n"
+"-d\tThe directory that contains the archives and patches. Defaults\n"
+"\tto the directory of the series/spec file.\n"
 "\n"
+"-l\tMake the patches directory a symbolic link. If a series file is\n"
+"\tspecified, also create a symlink to the series file.\n"
+msgstr ""
 
-#: ../quilt/setup.in:100
+#: ../quilt/setup.in:126
 msgid "Series file $series_file not found"
 msgstr "Seriendatei $series_file nicht gefunden"
 
-#: ../quilt/setup.in:125
+#: ../quilt/setup.in:152
 msgid "Reading sources from $arg"
 msgstr "Quellen werden von $arg gelesen"
 
-#: ../quilt/setup.in:128
+#: ../quilt/setup.in:156
 msgid "Unpacking archive $source/$arg"
 msgstr "Entpacke Archiv source/$arg"
 
-#: ../quilt/setup.in:138
+#: ../quilt/setup.in:166
 msgid "Directory $packagedir exists already."
 msgstr "Verzeichnis $packagedir existiert bereits."
 
-#: ../quilt/setup.in:143
+#: ../quilt/setup.in:171
 msgid "File $packagedir exists."
 msgstr "Datei $packagedir existiert."
 
-#: ../quilt/setup.in:149
+#: ../quilt/setup.in:186
+msgid "Creating link to patches directory $arg"
+msgstr ""
+
+#: ../quilt/setup.in:190
+msgid "$packagedir/patches exist, but not symlink"
+msgstr ""
+
+#: ../quilt/setup.in:195
 msgid "Copying patch $source/$arg"
 msgstr "Kopiere Patch $source/$arg"
 
-#: ../quilt/setup.in:154
+#: ../quilt/setup.in:208
+#, fuzzy
+msgid "File $packagedir/series exists; will not override."
+msgstr "Datei $packagedir existiert."
+
+#: ../quilt/setup.in:215 ../quilt/setup.in:229
 msgid "Copying series file"
 msgstr "Kopiere Seriendatei"
 
-#: ../quilt/setup.in:178
+#: ../quilt/setup.in:225
+msgid "Creatig link to series file $arg"
+msgstr ""
+
+#: ../quilt/setup.in:259
 msgid "Directory $packagedir set up."
 msgstr "Verzeichnis $packagedir aufgebaut."
 
@@ -808,7 +847,7 @@ msgstr "Verwendung: $0 [-fqv] patchname"
 msgid "Interrupted by user; patch $patch was not applied."
 msgstr "Unterbrechung durch Benutzer; Patch $patch wurde nicht angewandt."
 
-#: ../scripts/apatch.in:51 ../scripts/rpatch.in:113
+#: ../scripts/apatch.in:51 ../scripts/rpatch.in:128
 msgid "Patch file $patch_file appears to be empty"
 msgstr "Patch-Datei $patch_file scheint leer zu sein"
 
@@ -836,38 +875,56 @@ msgstr "Patch $patch angewandt (erzwungen, muß aufgefrischt werden (Refresh))"
 msgid "Patch $patch does not apply (enforce with -f)"
 msgstr "Patch $patch läßt sich nicht anwenden (erzwingen mit -f)"
 
-#: ../scripts/apatch.in:186 ../scripts/rpatch.in:238
+#: ../scripts/apatch.in:186 ../scripts/rpatch.in:257
 msgid "The topmost patch $top needs to be refreshed first."
 msgstr "Der oberste Patch $top muss zuerst aufgefrischt werden (Refresh)."
 
-#: ../scripts/rpatch.in:22
+#: ../scripts/rpatch.in:21
 msgid "Usage: $0 [-fRq] patchname"
 msgstr "Verwendung: $0 [-fRq] patchname"
 
-#: ../scripts/rpatch.in:44
+#: ../scripts/rpatch.in:43
 msgid "Patch does not remove changes:"
 msgstr "Patch entfernt folgende Änderungen nicht:"
 
-#: ../scripts/rpatch.in:102
+#: ../scripts/rpatch.in:117
 msgid "Interrupted by user; patch $patch was not removed."
 msgstr "Unterbrechung durch Benutzer; Patch $patch wurde nicht entfernt."
 
-#: ../scripts/rpatch.in:139
+#: ../scripts/rpatch.in:153
 msgid "Patch $patch appears to be empty, removed"
 msgstr "Patch $patch scheint leer zu sein, entfernt"
 
-#: ../scripts/rpatch.in:144
+#: ../scripts/rpatch.in:158
 msgid "Removing $patch"
 msgstr "Entferne $patch"
 
-#: ../scripts/rpatch.in:165
+#: ../scripts/rpatch.in:183
 msgid "Failed to create temporary files"
 msgstr "Konnte temporäres Verzeichnis nicht erstellen"
 
-#: ../scripts/rpatch.in:186
+#: ../scripts/rpatch.in:204
 msgid "Patch $patch does not remove (enforce with -f)"
 msgstr "Patch $patch kann nicht entfernt werden (erzwingen mit -f)"
 
 #: ../scripts/spec2series.in:100 ../scripts/spec2series.in:192
 msgid " done"
 msgstr " fertig"
+
+#~ msgid "refresh_patches_per_file failed."
+#~ msgstr "Fehler in refresh_patches_per_file."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Initializes a source tree from a patch series file.  The patch series\n"
+#~ "file must contain the name of the relevant tar archive, in addition to\n"
+#~ "the list of patches.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Baut einen Quellen-Baum aus einer series-Datei auf. Die series-Datei\n"
+#~ "muß neben der Liste der Patches auch den Namen der entsprechenden\n"
+#~ "Tar-Datei enthalten.\n"
+#~ "\n"