Resync translation files

1 files changed, 185 insertions, 173 deletions

diff --git a/po/quilt.pot b/po/quilt.pot
index 4465ff3..7612d28 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -29,11 +29,11 @@ msgid ""
 "\tPrint the version number and exit immediately.\\n"
 msgstr ""
 
-#: quilt/add.in:22
+#: quilt/add.in:11
 msgid "Usage: quilt add [-P patch] {file} ...\\n"
 msgstr ""
 
-#: quilt/add.in:25
+#: quilt/add.in:14
 msgid ""
 "\n"
 "Add one or more files to the topmost or named patch.  Files must be\n"
@@ -44,35 +44,35 @@ msgid ""
 "\tPatch to add files to.\n"
 msgstr ""
 
-#: quilt/add.in:48 quilt/add.in:54
+#: quilt/add.in:37 quilt/add.in:43
 msgid "File %s is located below %s\\n"
 msgstr ""
 
-#: quilt/add.in:103
+#: quilt/add.in:100
 msgid "File %s is already in patch %s\\n"
 msgstr ""
 
-#: quilt/add.in:111 quilt/remove.in:82 quilt/revert.in:84
+#: quilt/add.in:108 quilt/remove.in:79 quilt/revert.in:81
 msgid "File %s modified by patch %s\\n"
 msgstr ""
 
-#: quilt/add.in:119
+#: quilt/add.in:116
 msgid "Cannot add symbolic link %s\\n"
 msgstr ""
 
-#: quilt/add.in:126
+#: quilt/add.in:123
 msgid "Failed to back up file %s\\n"
 msgstr ""
 
-#: quilt/add.in:137
+#: quilt/add.in:134
 msgid "File %s added to patch %s\\n"
 msgstr ""
 
-#: quilt/annotate.in:22
+#: quilt/annotate.in:11
 msgid "Usage: quilt annotate [-P patch] {file}\\n"
 msgstr ""
 
-#: quilt/annotate.in:25
+#: quilt/annotate.in:14
 msgid ""
 "\n"
 "Print an annotated listing of the specified file showing which\n"
@@ -83,22 +83,22 @@ msgid ""
 "\ttopmost patch.\n"
 msgstr ""
 
-#: quilt/applied.in:22
+#: quilt/applied.in:11
 msgid "Usage: quilt applied [patch]\\n"
 msgstr ""
 
-#: quilt/applied.in:25
+#: quilt/applied.in:14
 msgid ""
 "\n"
 "Print a list of applied patches, or all patches up to and including the\n"
 "specified patch in the file series.\n"
 msgstr ""
 
-#: quilt/delete.in:22
+#: quilt/delete.in:11
 msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n"
 msgstr ""
 
-#: quilt/delete.in:25
+#: quilt/delete.in:14
 msgid ""
 "\n"
 "Remove the specified or topmost patch from the series file.  If the\n"
@@ -115,38 +115,38 @@ msgid ""
 "\tIgnored if not used with \\`-r'.\n"
 msgstr ""
 
-#: quilt/delete.in:89
+#: quilt/delete.in:86
 msgid "No next patch\\n"
 msgstr ""
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:618
+#: quilt/delete.in:99 quilt/scripts/patchfns.in:602
 msgid "Patch %s is currently applied\\n"
 msgstr ""
 
-#: quilt/delete.in:114
+#: quilt/delete.in:111
 msgid "Removed patch %s\\n"
 msgstr ""
 
-#: quilt/delete.in:116
+#: quilt/delete.in:113
 msgid "Failed to remove patch %s\\n"
 msgstr ""
 
-#: quilt/delete.in:127
+#: quilt/delete.in:124
 msgid "Failed to backup patch file %s\\n"
 msgstr ""
 
-#: quilt/delete.in:134
+#: quilt/delete.in:131
 msgid "Failed to remove patch file %s\\n"
 msgstr ""
 
-#: quilt/diff.in:24
+#: quilt/diff.in:11
 msgid ""
 "Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-"
 "R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] "
 "[--sort] [--color[=always|auto|never]] [file ...]\\n"
 msgstr ""
 
-#: quilt/diff.in:28
+#: quilt/diff.in:15
 msgid ""
 "\n"
 "Produces a diff of the specified file(s) in the topmost or specified\n"
@@ -197,52 +197,52 @@ msgid ""
 "--sort\tSort files by their name instead of preserving the original order.\n"
 msgstr ""
 
-#: quilt/diff.in:226
+#: quilt/diff.in:221
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 
-#: quilt/diff.in:240
+#: quilt/diff.in:235
 msgid ""
 "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n"
 msgstr ""
 
-#: quilt/diff.in:249
+#: quilt/diff.in:244
 msgid "No snapshot to diff against\\n"
 msgstr ""
 
-#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:432
+#: quilt/diff.in:278 quilt/files.in:107 quilt/mail.in:429
 msgid "Patch %s not applied before patch %s\\n"
 msgstr ""
 
-#: quilt/diff.in:351
+#: quilt/diff.in:346
 msgid "File %s is not being modified\\n"
 msgstr ""
 
-#: quilt/diff.in:370
+#: quilt/diff.in:365
 msgid "Diff failed, aborting\\n"
 msgstr ""
 
-#: quilt/diff.in:377
+#: quilt/diff.in:372
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr ""
 
-#: quilt/edit.in:24
+#: quilt/edit.in:13
 msgid "Usage: quilt edit file ...\\n"
 msgstr ""
 
-#: quilt/edit.in:27
+#: quilt/edit.in:16
 msgid ""
 "\n"
 "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n"
 "the topmost patch.\n"
 msgstr ""
 
-#: quilt/files.in:22
+#: quilt/files.in:11
 msgid "Usage: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n"
 msgstr ""
 
-#: quilt/files.in:25
+#: quilt/files.in:14
 msgid ""
 "\n"
 "Print the list of files that the topmost or specified patch changes.\n"
@@ -260,11 +260,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: quilt/fold.in:22
+#: quilt/fold.in:11
 msgid "Usage: quilt fold [-R] [-q] [-f] [-p strip-level]\\n"
 msgstr ""
 
-#: quilt/fold.in:25
+#: quilt/fold.in:14
 msgid ""
 "\n"
 "Integrate the patch read from standard input into the topmost patch:\n"
@@ -284,15 +284,15 @@ msgid ""
 "\twhen applying patchfile.\n"
 msgstr ""
 
-#: quilt/fold.in:131
+#: quilt/fold.in:128
 msgid "File %s may be corrupted\\n"
 msgstr ""
 
-#: quilt/fork.in:22
+#: quilt/fork.in:11
 msgid "Usage: quilt fork [new_name]\\n"
 msgstr ""
 
-#: quilt/fork.in:25
+#: quilt/fork.in:14
 msgid ""
 "\n"
 "Fork the topmost patch.  Forking a patch means creating a verbatim copy\n"
@@ -308,25 +308,25 @@ msgid ""
 "patch-2.diff, patch-3.diff).\n"
 msgstr ""
 
-#: quilt/fork.in:84
+#: quilt/fork.in:81
 msgid "Patch %s exists already, please choose a new name\\n"
 msgstr ""
 
-#: quilt/fork.in:96
+#: quilt/fork.in:93
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr ""
 
-#: quilt/fork.in:102 quilt/refresh.in:344
+#: quilt/fork.in:99 quilt/refresh.in:341
 msgid "Fork of patch %s created as %s\\n"
 msgstr ""
 
-#: quilt/graph.in:22
+#: quilt/graph.in:11
 msgid ""
 "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] "
 "[-T ps] [patch]\\n"
 msgstr ""
 
-#: quilt/graph.in:26
+#: quilt/graph.in:15
 msgid ""
 "\n"
 "Generate a dot(1) directed graph showing the dependencies between\n"
@@ -357,11 +357,11 @@ msgid ""
 "-T ps\tDirectly produce a PostScript output file.\n"
 msgstr ""
 
-#: quilt/grep.in:22
+#: quilt/grep.in:11
 msgid "Usage: quilt grep [-h|options] {pattern}\\n"
 msgstr ""
 
-#: quilt/grep.in:25
+#: quilt/grep.in:14
 msgid ""
 "\n"
 "Grep through the source files, recursively, skipping patches and quilt\n"
@@ -373,13 +373,13 @@ msgid ""
 "\tcan be passed after a second double-dash (-- --).\n"
 msgstr ""
 
-#: quilt/header.in:24
+#: quilt/header.in:13
 msgid ""
 "Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-"
 "trailing-whitespace] [patch]\\n"
 msgstr ""
 
-#: quilt/header.in:28
+#: quilt/header.in:17
 msgid ""
 "\n"
 "Print or change the header of the topmost or specified patch.\n"
@@ -399,21 +399,21 @@ msgid ""
 "\tCreate a backup copy of the old version of a patch as patch~.\n"
 msgstr ""
 
-#: quilt/header.in:170
+#: quilt/header.in:167
 msgid "Replaced header of patch %s\\n"
 msgstr ""
 
-#: quilt/header.in:173
+#: quilt/header.in:170
 msgid "Appended text to header of patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:22
+#: quilt/import.in:14
 msgid ""
 "Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..."
 "\\n"
 msgstr ""
 
-#: quilt/import.in:25
+#: quilt/import.in:17
 msgid ""
 "\n"
 "Import external patches.  The patches will be inserted following the\n"
@@ -437,55 +437,55 @@ msgid ""
 "\tmust be specified. This option is only effective when -f is used.\n"
 msgstr ""
 
-#: quilt/import.in:73 quilt/mail.in:463
+#: quilt/import.in:65 quilt/mail.in:460
 msgid "Patch %s does not exist\\n"
 msgstr ""
 
-#: quilt/import.in:96
+#: quilt/import.in:88
 msgid "Patch headers differ:\\n"
 msgstr ""
 
-#: quilt/import.in:99
+#: quilt/import.in:91
 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
 msgstr ""
 
-#: quilt/import.in:164
+#: quilt/import.in:156
 msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr ""
 
-#: quilt/import.in:194
+#: quilt/import.in:195
 msgid "Patch %s is applied\\n"
 msgstr ""
 
-#: quilt/import.in:203
+#: quilt/import.in:204
 msgid "Patch %s already exists in series.\\n"
 msgstr ""
 
-#: quilt/import.in:209
+#: quilt/import.in:210
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr ""
 
-#: quilt/import.in:220
+#: quilt/import.in:221
 msgid "Replacing patch %s with new version\\n"
 msgstr ""
 
-#: quilt/import.in:224
+#: quilt/import.in:225
 msgid "Importing patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:226
+#: quilt/import.in:227
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr ""
 
-#: quilt/import.in:239
+#: quilt/import.in:240
 msgid "Failed to import patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:248 quilt/refresh.in:331
+#: quilt/import.in:249 quilt/refresh.in:328
 msgid "Failed to insert patch %s into file series\\n"
 msgstr ""
 
-#: quilt/mail.in:24
+#: quilt/mail.in:13
 msgid ""
 "Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] "
 "[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
@@ -493,7 +493,7 @@ msgid ""
 "[first_patch [last_patch]]\\n"
 msgstr ""
 
-#: quilt/mail.in:27
+#: quilt/mail.in:16
 msgid ""
 "\n"
 "Create mail messages from a specified range of patches, or all patches in\n"
@@ -546,43 +546,43 @@ msgid ""
 "\tAdd the appropriate headers to reply to the specified message.\n"
 msgstr ""
 
-#: quilt/mail.in:209 quilt/mail.in:217
+#: quilt/mail.in:198 quilt/mail.in:206
 msgid "Introduction message already specified"
 msgstr ""
 
-#: quilt/mail.in:315
+#: quilt/mail.in:312
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 
-#: quilt/mail.in:466
+#: quilt/mail.in:463
 msgid "Unable to extract a subject header from %s\\n"
 msgstr ""
 
-#: quilt/mail.in:492
+#: quilt/mail.in:489
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr ""
 
-#: quilt/mail.in:501
+#: quilt/mail.in:498
 msgid "File %s does not exist\\n"
 msgstr ""
 
-#: quilt/mail.in:561
+#: quilt/mail.in:558
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr ""
 
-#: quilt/mail.in:564
+#: quilt/mail.in:561
 msgid "Introduction has no subject header\\n"
 msgstr ""
 
-#: quilt/mail.in:677
+#: quilt/mail.in:674
 msgid "Introduction saved as %s\\n"
 msgstr ""
 
-#: quilt/new.in:22
+#: quilt/new.in:14
 msgid "Usage: quilt new [-p n|-p ab] {patchname}\\n"
 msgstr ""
 
-#: quilt/new.in:25
+#: quilt/new.in:17
 msgid ""
 "\n"
 "Create a new patch with the specified file name, and insert it after the\n"
@@ -602,7 +602,7 @@ msgid ""
 "in the directory tree.\n"
 msgstr ""
 
-#: quilt/new.in:76
+#: quilt/new.in:68
 msgid ""
 "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n"
 msgstr ""
@@ -611,7 +611,7 @@ msgstr ""
 msgid "QUILT_PATCHES(%s) must differ from QUILT_PC(%s)\\n"
 msgstr ""
 
-#: quilt/new.in:97 quilt/refresh.in:185
+#: quilt/new.in:97 quilt/refresh.in:182
 msgid "Patch %s exists already\\n"
 msgstr ""
 
@@ -619,27 +619,27 @@ msgstr ""
 msgid "Patch %s is now on top\\n"
 msgstr ""
 
-#: quilt/new.in:110 quilt/refresh.in:340
+#: quilt/new.in:110 quilt/refresh.in:337
 msgid "Failed to create patch %s\\n"
 msgstr ""
 
-#: quilt/next.in:22
+#: quilt/next.in:11
 msgid "Usage: quilt next [patch]\\n"
 msgstr ""
 
-#: quilt/next.in:25
+#: quilt/next.in:14
 msgid ""
 "\n"
 "Print the name of the next patch after the specified or topmost patch in\n"
 "the series file.\n"
 msgstr ""
 
-#: quilt/patches.in:24
+#: quilt/patches.in:13
 msgid ""
 "Usage: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n"
 msgstr ""
 
-#: quilt/patches.in:27
+#: quilt/patches.in:16
 msgid ""
 "\n"
 "Print the list of patches that modify any of the specified files. (Uses a\n"
@@ -652,11 +652,11 @@ msgid ""
 "\tUse syntax coloring (auto activates it only if the output is a tty).\n"
 msgstr ""
 
-#: quilt/pop.in:22
+#: quilt/pop.in:11
 msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n"
 msgstr ""
 
-#: quilt/pop.in:25
+#: quilt/pop.in:14
 msgid ""
 "\n"
 "Remove patch(es) from the stack of applied patches.  Without options,\n"
@@ -682,60 +682,64 @@ msgid ""
 "\tAutomatically refresh every patch before it gets unapplied.\n"
 msgstr ""
 
-#: quilt/pop.in:103 quilt/scripts/patchfns.in:930
+#: quilt/pop.in:92 quilt/scripts/patchfns.in:977
 msgid "Failed to copy files to temporary directory\\n"
 msgstr ""
 
-#: quilt/pop.in:128
+#: quilt/pop.in:117
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
 
-#: quilt/pop.in:153
+#: quilt/pop.in:119
+msgid "Hint: \\`quilt diff -z' will show the pending changes.\\n"
+msgstr ""
+
+#: quilt/pop.in:143
 msgid "Patch %s appears to be empty, removing\\n"
 msgstr ""
 
-#: quilt/pop.in:158
+#: quilt/pop.in:148
 msgid "Removing patch %s\\n"
 msgstr ""
 
-#: quilt/pop.in:216 quilt/push.in:376
+#: quilt/pop.in:214 quilt/push.in:376
 msgid "Options %s and %s are mutually exclusive\\n"
 msgstr ""
 
-#: quilt/pop.in:238
+#: quilt/pop.in:236
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr ""
 
-#: quilt/pop.in:248
+#: quilt/pop.in:246
 msgid "No patch removed\\n"
 msgstr ""
 
-#: quilt/pop.in:272 quilt/scripts/patchfns.in:527
+#: quilt/pop.in:270 quilt/scripts/patchfns.in:511
 msgid "No patches applied\\n"
 msgstr ""
 
-#: quilt/pop.in:279 quilt/push.in:440
+#: quilt/pop.in:277 quilt/push.in:440
 msgid "Now at patch %s\\n"
 msgstr ""
 
-#: quilt/previous.in:22
+#: quilt/previous.in:11
 msgid "Usage: quilt previous [patch]\\n"
 msgstr ""
 
-#: quilt/previous.in:25
+#: quilt/previous.in:14
 msgid ""
 "\n"
 "Print the name of the previous patch before the specified or topmost\n"
 "patch in the series file.\n"
 msgstr ""
 
-#: quilt/push.in:24
+#: quilt/push.in:11
 msgid ""
 "Usage: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-"
 "rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n"
 msgstr ""
 
-#: quilt/push.in:27
+#: quilt/push.in:14
 msgid ""
 "\n"
 "Apply patch(es) from the series file.  Without options, the next patch\n"
@@ -770,35 +774,35 @@ msgid ""
 "\tAutomatically refresh every patch after it was successfully applied.\n"
 msgstr ""
 
-#: quilt/push.in:70
+#: quilt/push.in:57
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr ""
 
-#: quilt/push.in:186
+#: quilt/push.in:176
 msgid "Applying patch %s\\n"
 msgstr ""
 
-#: quilt/push.in:220
+#: quilt/push.in:210
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr ""
 
-#: quilt/push.in:224
+#: quilt/push.in:214
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr ""
 
-#: quilt/push.in:228
+#: quilt/push.in:218
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 
-#: quilt/push.in:238
+#: quilt/push.in:228
 msgid "Patch %s can be reverse-applied\\n"
 msgstr ""
 
-#: quilt/push.in:241
+#: quilt/push.in:231
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 
-#: quilt/push.in:296
+#: quilt/push.in:286
 msgid "Patch %s is already applied; check your series file\\n"
 msgstr ""
 
@@ -810,14 +814,14 @@ msgstr ""
 msgid "No patch applied\\n"
 msgstr ""
 
-#: quilt/refresh.in:22
+#: quilt/refresh.in:11
 msgid ""
 "Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
 "[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-"
 "trailing-whitespace] [patch]\\n"
 msgstr ""
 
-#: quilt/refresh.in:26
+#: quilt/refresh.in:15
 msgid ""
 "\n"
 "Refreshes the specified patch, or the topmost patch by default.\n"
@@ -869,42 +873,42 @@ msgid ""
 "\tStrip trailing whitespace at the end of lines.\n"
 msgstr ""
 
-#: quilt/refresh.in:171
+#: quilt/refresh.in:168
 msgid "Can only refresh the topmost patch with -z currently\\n"
 msgstr ""
 
-#: quilt/refresh.in:202
+#: quilt/refresh.in:199
 msgid ""
 "Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n"
 msgstr ""
 
-#: quilt/refresh.in:240
+#: quilt/refresh.in:237
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 
-#: quilt/refresh.in:246
+#: quilt/refresh.in:243
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 
-#: quilt/refresh.in:252 quilt/refresh.in:352
+#: quilt/refresh.in:249 quilt/refresh.in:349
 msgid "Nothing in patch %s\\n"
 msgstr ""
 
-#: quilt/refresh.in:324
+#: quilt/refresh.in:321
 msgid "Patch %s is unchanged\\n"
 msgstr ""
 
-#: quilt/refresh.in:350
+#: quilt/refresh.in:347
 msgid "Refreshed patch %s\\n"
 msgstr ""
 
-#: quilt/remove.in:22
+#: quilt/remove.in:11
 msgid "Usage: quilt remove [-P patch] {file} ...\\n"
 msgstr ""
 
-#: quilt/remove.in:25
+#: quilt/remove.in:14
 msgid ""
 "\n"
 "Remove one or more files from the topmost or named patch.  Files that\n"
@@ -914,23 +918,23 @@ msgid ""
 "\tRemove named files from the named patch.\n"
 msgstr ""
 
-#: quilt/remove.in:73 quilt/revert.in:75
+#: quilt/remove.in:70 quilt/revert.in:72
 msgid "File %s is not in patch %s\\n"
 msgstr ""
 
-#: quilt/remove.in:91
+#: quilt/remove.in:88
 msgid "Failed to remove file %s from patch %s\\n"
 msgstr ""
 
-#: quilt/remove.in:105
+#: quilt/remove.in:102
 msgid "File %s removed from patch %s\\n"
 msgstr ""
 
-#: quilt/rename.in:22
+#: quilt/rename.in:11
 msgid "Usage: quilt rename [-P patch] new_name\\n"
 msgstr ""
 
-#: quilt/rename.in:25
+#: quilt/rename.in:14
 msgid ""
 "\n"
 "Rename the topmost or named patch.\n"
@@ -939,23 +943,23 @@ msgid ""
 "\tPatch to rename.\n"
 msgstr ""
 
-#: quilt/rename.in:84
+#: quilt/rename.in:81
 msgid "Patch %s exists already, please choose a different name\\n"
 msgstr ""
 
-#: quilt/rename.in:98
+#: quilt/rename.in:95
 msgid "Renaming of patch %s to %s failed\\n"
 msgstr ""
 
-#: quilt/rename.in:104
+#: quilt/rename.in:101
 msgid "Patch %s renamed to %s\\n"
 msgstr ""
 
-#: quilt/revert.in:22
+#: quilt/revert.in:11
 msgid "Usage: quilt revert [-P patch] {file} ...\\n"
 msgstr ""
 
-#: quilt/revert.in:25
+#: quilt/revert.in:14
 msgid ""
 "\n"
 "Revert uncommitted changes to the topmost or named patch for the specified\n"
@@ -969,15 +973,15 @@ msgid ""
 "\tRevert changes in the named patch.\n"
 msgstr ""
 
-#: quilt/revert.in:103 quilt/revert.in:112
+#: quilt/revert.in:100 quilt/revert.in:109
 msgid "File %s is unchanged\\n"
 msgstr ""
 
-#: quilt/revert.in:120
+#: quilt/revert.in:117
 msgid "Failed to revert changes to %s in patch %s\\n"
 msgstr ""
 
-#: quilt/revert.in:124
+#: quilt/revert.in:121
 msgid "Changes to %s in patch %s reverted\\n"
 msgstr ""
 
@@ -991,39 +995,35 @@ msgstr ""
 msgid "Delivery address `%s' is invalid\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:243 quilt/scripts/patchfns.in:540
+#: quilt/scripts/patchfns.in:237 quilt/scripts/patchfns.in:524
 msgid "%s is not a regular file\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:494 quilt/scripts/patchfns.in:511
+#: quilt/scripts/patchfns.in:486 quilt/scripts/patchfns.in:498
 msgid "No patches in series\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:496 quilt/scripts/patchfns.in:513
-msgid "No series file found\\n"
-msgstr ""
-
-#: quilt/scripts/patchfns.in:569
+#: quilt/scripts/patchfns.in:553
 msgid "Patch %s is not in series\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:597
+#: quilt/scripts/patchfns.in:581
 msgid "Patch %s is not applied\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:634
+#: quilt/scripts/patchfns.in:618
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:779
+#: quilt/scripts/patchfns.in:774
 msgid "Diff failed on file '%s', aborting\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:948
+#: quilt/scripts/patchfns.in:995
 msgid "Failed to patch temporary files\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:991
+#: quilt/scripts/patchfns.in:1038
 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 "
@@ -1031,26 +1031,30 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:1064
+#: quilt/scripts/patchfns.in:1113
 msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:1143
+#: quilt/scripts/patchfns.in:1192
 msgid "Cannot change into parent directory %s/\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:1184
+#: quilt/scripts/patchfns.in:1237
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:1192
+#: quilt/scripts/patchfns.in:1245
 msgid ""
 "The series file no longer matches the applied patches. Please run 'quilt pop "
 "-a'.\\n"
 msgstr ""
 
+#: quilt/scripts/patchfns.in:1254
+msgid "No series file found\\n"
+msgstr ""
+
 #: quilt/scripts/remove-trailing-ws.in:43
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
@@ -1086,11 +1090,11 @@ msgstr ""
 msgid "Renaming %s to %s: %s\n"
 msgstr ""
 
-#: quilt/series.in:22
+#: quilt/series.in:11
 msgid "Usage: quilt series [--color[=always|auto|never]] [-v]\\n"
 msgstr ""
 
-#: quilt/series.in:25
+#: quilt/series.in:14
 msgid ""
 "\n"
 "Print the names of all patches in the series file.\n"
@@ -1101,21 +1105,21 @@ msgid ""
 "-v\tVerbose, more user friendly output.\n"
 msgstr ""
 
-#: quilt/setup.in:38 quilt/setup.in:58
+#: quilt/setup.in:23 quilt/setup.in:43
 msgid "Directory %s exists\\n"
 msgstr ""
 
-#: quilt/setup.in:64
+#: quilt/setup.in:49
 msgid "File %s exists\\n"
 msgstr ""
 
-#: quilt/setup.in:274
+#: quilt/setup.in:265
 msgid ""
 "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
 "slow|--fast] {specfile|seriesfile}\\n"
 msgstr ""
 
-#: quilt/setup.in:277
+#: quilt/setup.in:268
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1130,42 +1134,50 @@ msgid ""
 "--fuzz=N\n"
 "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
 "\n"
-"--slow\tUse the original, slow method to process the spec file. This is the\n"
-"\tdefault for now, but that might change in the future. In this mode,\n"
+"--slow\tUse the original, slow method to process the spec file. In this "
+"mode,\n"
 "\trpmbuild generates a working tree in a temporary directory while all\n"
 "\tits actions are recorded, and then everything is replayed from scratch\n"
 "\tin the target directory.\n"
 "\n"
-"--fast\tUse an alternative, faster method to process the spec file. In this\n"
-"\tmode, rpmbuild is told to generate a working tree directly in the\n"
-"\ttarget directory.\n"
+"--fast\tUse the new, faster method to process the spec file. In this mode,\n"
+"\trpmbuild is told to generate a working tree directly in the target\n"
+"\tdirectory. This is the default (since quilt version 0.67).\n"
+"\n"
+"The setup command is only guaranteed to work properly on spec files where\n"
+"applying all the patches is the last thing done in the %%prep section. This "
+"is\n"
+"a design limitation due to the fact that quilt can only operate on patches. "
+"If\n"
+"other commands in the %%prep section modify the patched files, this must\n"
+"happen first, otherwise you won't be able to push the patch series.\n"
 msgstr ""
 
-#: quilt/setup.in:380
+#: quilt/setup.in:396
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 
-#: quilt/setup.in:383
+#: quilt/setup.in:399
 msgid "The -v option will show rpm's output\\n"
 msgstr ""
 
-#: quilt/setup.in:444 quilt/setup.in:456 quilt/setup.in:467
+#: quilt/setup.in:460 quilt/setup.in:472 quilt/setup.in:483
 msgid "File %s not found\\n"
 msgstr ""
 
-#: quilt/setup.in:447 quilt/setup.in:459 quilt/setup.in:470
+#: quilt/setup.in:463 quilt/setup.in:475 quilt/setup.in:486
 msgid "Unpacking archive %s\\n"
 msgstr ""
 
-#: quilt/setup.in:480
+#: quilt/setup.in:496
 msgid "Trying alternative patches and series names..."
 msgstr ""
 
-#: quilt/snapshot.in:22
+#: quilt/snapshot.in:11
 msgid "Usage: quilt snapshot [-d]\\n"
 msgstr ""
 
-#: quilt/snapshot.in:25
+#: quilt/snapshot.in:14
 msgid ""
 "\n"
 "Take a snapshot of the current working state.  After taking the snapshot,\n"
@@ -1176,33 +1188,33 @@ msgid ""
 "-d\tOnly remove current snapshot.\n"
 msgstr ""
 
-#: quilt/top.in:22
+#: quilt/top.in:11
 msgid "Usage: quilt top\\n"
 msgstr ""
 
-#: quilt/top.in:25
+#: quilt/top.in:14
 msgid ""
 "\n"
 "Print the name of the topmost patch on the current stack of applied\n"
 "patches.\n"
 msgstr ""
 
-#: quilt/unapplied.in:22
+#: quilt/unapplied.in:11
 msgid "Usage: quilt unapplied [patch]\\n"
 msgstr ""
 
-#: quilt/unapplied.in:25
+#: quilt/unapplied.in:14
 msgid ""
 "\n"
 "Print a list of patches that are not applied, or all patches that follow\n"
 "the specified patch in the series file.\n"
 msgstr ""
 
-#: quilt/upgrade.in:25
+#: quilt/upgrade.in:15
 msgid "Usage: quilt upgrade\\n"
 msgstr ""
 
-#: quilt/upgrade.in:28
+#: quilt/upgrade.in:18
 msgid ""
 "\n"
 "Upgrade the meta-data in a working tree from an old version of quilt to the\n"
@@ -1213,21 +1225,21 @@ msgid ""
 "case, quilt will request to run \\`quilt upgrade'.\n"
 msgstr ""
 
-#: quilt/upgrade.in:67
+#: quilt/upgrade.in:65
 msgid ""
 "The quilt meta-data in %s are already in the version %s format; nothing to do"
 "\\n"
 msgstr ""
 
-#: quilt/upgrade.in:71
+#: quilt/upgrade.in:69
 msgid "Converting meta-data to version %s\\n"
 msgstr ""
 
-#: quilt/upgrade.in:102
+#: quilt/upgrade.in:100
 msgid "Conversion failed\\n"
 msgstr ""
 
-#: quilt/upgrade.in:103
+#: quilt/upgrade.in:101
 msgid ""
 "\n"
 "Please remove all patches using \\`quilt pop -a' from the quilt version used "