reupdate the translation files (no manual change)

1 files changed, 89 insertions, 79 deletions

diff --git a/po/quilt.pot b/po/quilt.pot
index 26633e0..b1d2889 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -1,16 +1,16 @@
-#: bin/quilt.in:36
+#: bin/quilt.in:40
 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 msgstr ""
 
-#: bin/quilt.in:37
+#: bin/quilt.in:41
 msgid "       quilt --version"
 msgstr ""
 
-#: bin/quilt.in:39
+#: bin/quilt.in:43
 msgid "Commands are:"
 msgstr ""
 
-#: bin/quilt.in:44
+#: bin/quilt.in:48
 msgid ""
 "\n"
 "Global options:\n"
@@ -119,7 +119,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr ""
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:589
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:604
 msgid "Patch %s is currently applied\\n"
 msgstr ""
 
@@ -143,7 +143,7 @@ msgstr ""
 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] [file ...]\\n"
+"[--sort] [--color[=always|auto|never]] [file ...]\\n"
 msgstr ""
 
 #: quilt/diff.in:28
@@ -197,33 +197,33 @@ msgid ""
 "--sort\tSort files by their name instead of preserving the original order.\n"
 msgstr ""
 
-#: quilt/diff.in:218
+#: quilt/diff.in:226
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 
-#: quilt/diff.in:232
+#: quilt/diff.in:240
 msgid ""
 "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n"
 msgstr ""
 
-#: quilt/diff.in:241
+#: quilt/diff.in:249
 msgid "No snapshot to diff against\\n"
 msgstr ""
 
-#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:418
+#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422
 msgid "Patch %s not applied before patch %s\\n"
 msgstr ""
 
-#: quilt/diff.in:341
+#: quilt/diff.in:351
 msgid "File %s is not being modified\\n"
 msgstr ""
 
-#: quilt/diff.in:360 quilt/refresh.in:234
+#: quilt/diff.in:370
 msgid "Diff failed, aborting\\n"
 msgstr ""
 
-#: quilt/diff.in:367
+#: quilt/diff.in:377
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr ""
 
@@ -316,7 +316,7 @@ msgstr ""
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr ""
 
-#: quilt/fork.in:102 quilt/refresh.in:346
+#: quilt/fork.in:102 quilt/refresh.in:347
 msgid "Fork of patch %s created as %s\\n"
 msgstr ""
 
@@ -437,47 +437,51 @@ msgid ""
 "\tmust be specified. This option is only effective when -f is used.\n"
 msgstr ""
 
-#: quilt/import.in:71
+#: quilt/import.in:73
+msgid "Patch %s does not exist\\n"
+msgstr ""
+
+#: quilt/import.in:96
 msgid "Patch headers differ:\\n"
 msgstr ""
 
-#: quilt/import.in:74
+#: quilt/import.in:99
 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n"
 msgstr ""
 
-#: quilt/import.in:139
+#: quilt/import.in:164
 msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr ""
 
-#: quilt/import.in:169
+#: quilt/import.in:194
 msgid "Patch %s is applied\\n"
 msgstr ""
 
-#: quilt/import.in:178
+#: quilt/import.in:203
 msgid "Patch %s already exists in series.\\n"
 msgstr ""
 
-#: quilt/import.in:184
+#: quilt/import.in:209
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr ""
 
-#: quilt/import.in:195
+#: quilt/import.in:220
 msgid "Replacing patch %s with new version\\n"
 msgstr ""
 
-#: quilt/import.in:199
+#: quilt/import.in:224
 msgid "Importing patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:201
+#: quilt/import.in:226
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr ""
 
-#: quilt/import.in:214
+#: quilt/import.in:239
 msgid "Failed to import patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:223 quilt/refresh.in:333
+#: quilt/import.in:248 quilt/refresh.in:334
 msgid "Failed to insert patch %s into file series\\n"
 msgstr ""
 
@@ -536,39 +540,39 @@ msgid ""
 "\tAdd the appropriate headers to reply to the specified message.\n"
 msgstr ""
 
-#: quilt/mail.in:189 quilt/mail.in:197
+#: quilt/mail.in:192 quilt/mail.in:200
 msgid "Introduction message already specified"
 msgstr ""
 
-#: quilt/mail.in:259
+#: quilt/mail.in:262
 msgid "You have to install 'formail' to use 'quilt mail'"
 msgstr ""
 
-#: quilt/mail.in:302
+#: quilt/mail.in:305
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 
-#: quilt/mail.in:446
+#: quilt/mail.in:450
 msgid "Unable to extract a subject header from %s\\n"
 msgstr ""
 
-#: quilt/mail.in:470
+#: quilt/mail.in:474
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr ""
 
-#: quilt/mail.in:479
+#: quilt/mail.in:483
 msgid "File %s does not exist\\n"
 msgstr ""
 
-#: quilt/mail.in:539
+#: quilt/mail.in:543
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr ""
 
-#: quilt/mail.in:542
+#: quilt/mail.in:546
 msgid "Introduction has no subject header\\n"
 msgstr ""
 
-#: quilt/mail.in:656
+#: quilt/mail.in:660
 msgid "Introduction saved as %s\\n"
 msgstr ""
 
@@ -609,12 +613,12 @@ msgstr ""
 msgid "Patch %s exists already\\n"
 msgstr ""
 
-#: quilt/new.in:108 quilt/refresh.in:342
-msgid "Failed to create patch %s\\n"
+#: quilt/new.in:108
+msgid "Patch %s is now on top\\n"
 msgstr ""
 
-#: quilt/new.in:111
-msgid "Patch %s is now on top\\n"
+#: quilt/new.in:110 quilt/refresh.in:343
+msgid "Failed to create patch %s\\n"
 msgstr ""
 
 #: quilt/next.in:22
@@ -629,7 +633,8 @@ msgid ""
 msgstr ""
 
 #: quilt/patches.in:24
-msgid "Usage: quilt patches [-v] {file} [files...]\\n"
+msgid ""
+"Usage: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n"
 msgstr ""
 
 #: quilt/patches.in:27
@@ -672,7 +677,7 @@ msgid ""
 "-v\tVerbose operation.\n"
 msgstr ""
 
-#: quilt/pop.in:100 quilt/scripts/patchfns.in:892
+#: quilt/pop.in:100 quilt/scripts/patchfns.in:880
 msgid "Failed to copy files to temporary directory\\n"
 msgstr ""
 
@@ -696,11 +701,11 @@ msgstr ""
 msgid "No patch removed\\n"
 msgstr ""
 
-#: quilt/pop.in:252 quilt/scripts/patchfns.in:498
+#: quilt/pop.in:252 quilt/scripts/patchfns.in:513
 msgid "No patches applied\\n"
 msgstr ""
 
-#: quilt/pop.in:259 quilt/push.in:397
+#: quilt/pop.in:259 quilt/push.in:422
 msgid "Now at patch %s\\n"
 msgstr ""
 
@@ -758,31 +763,35 @@ msgstr ""
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr ""
 
-#: quilt/push.in:180
+#: quilt/push.in:181
 msgid "Applying patch %s\\n"
 msgstr ""
 
-#: quilt/push.in:214
+#: quilt/push.in:215
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr ""
 
-#: quilt/push.in:218
+#: quilt/push.in:219
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr ""
 
-#: quilt/push.in:222
+#: quilt/push.in:223
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 
-#: quilt/push.in:232
+#: quilt/push.in:233
 msgid "Patch %s can be reverse-applied\\n"
 msgstr ""
 
-#: quilt/push.in:235
+#: quilt/push.in:236
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 
-#: quilt/push.in:377
+#: quilt/push.in:291
+msgid "Patch %s is already applied; check your series file\\n"
+msgstr ""
+
+#: quilt/push.in:396
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr ""
 
@@ -850,28 +859,33 @@ msgid "Can only refresh the topmost patch with -z currently\\n"
 msgstr ""
 
 #: quilt/refresh.in:202
-msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
+msgid ""
+"Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n"
 msgstr ""
 
-#: quilt/refresh.in:240
+#: quilt/refresh.in:235
+msgid "Diff failed on file '%s', aborting\\n"
+msgstr ""
+
+#: quilt/refresh.in:241
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 
-#: quilt/refresh.in:246
+#: quilt/refresh.in:247
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 
-#: quilt/refresh.in:252 quilt/refresh.in:354
+#: quilt/refresh.in:253 quilt/refresh.in:355
 msgid "Nothing in patch %s\\n"
 msgstr ""
 
-#: quilt/refresh.in:324
+#: quilt/refresh.in:325
 msgid "Patch %s is unchanged\\n"
 msgstr ""
 
-#: quilt/refresh.in:352
+#: quilt/refresh.in:353
 msgid "Refreshed patch %s\\n"
 msgstr ""
 
@@ -966,39 +980,35 @@ msgstr ""
 msgid "Delivery address `%s' is invalid\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:217 quilt/scripts/patchfns.in:511
+#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526
 msgid "%s is not a regular file\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:465 quilt/scripts/patchfns.in:482
+#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497
 msgid "No patches in series\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:467 quilt/scripts/patchfns.in:484
+#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499
 msgid "No series file found\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:540
+#: quilt/scripts/patchfns.in:555
 msgid "Patch %s is not in series\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:568
+#: quilt/scripts/patchfns.in:583
 msgid "Patch %s is not applied\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:605
+#: quilt/scripts/patchfns.in:620
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:638
-msgid "Patch %s does not exist\\n"
-msgstr ""
-
-#: quilt/scripts/patchfns.in:910
+#: quilt/scripts/patchfns.in:898
 msgid "Failed to patch temporary files\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:951
+#: quilt/scripts/patchfns.in:941
 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 "
@@ -1006,7 +1016,7 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:1095
+#: quilt/scripts/patchfns.in:1094
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1048,7 +1058,7 @@ msgid "Renaming %s to %s: %s\n"
 msgstr ""
 
 #: quilt/series.in:22
-msgid "Usage: quilt series [-v]\\n"
+msgid "Usage: quilt series [--color[=always|auto|never]] [-v]\\n"
 msgstr ""
 
 #: quilt/series.in:25
@@ -1058,25 +1068,25 @@ msgid ""
 "\n"
 "--color[=always|auto|never]\n"
 "\tUse syntax coloring (auto activates it only if the output is a tty).\n"
-"\t\n"
+"\n"
 "-v\tVerbose, more user friendly output.\n"
 msgstr ""
 
-#: quilt/setup.in:34 quilt/setup.in:53
+#: quilt/setup.in:35 quilt/setup.in:55
 msgid "Directory %s exists\\n"
 msgstr ""
 
-#: quilt/setup.in:59
+#: quilt/setup.in:61
 msgid "File %s exists\\n"
 msgstr ""
 
-#: quilt/setup.in:99
+#: quilt/setup.in:102
 msgid ""
 "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] "
 "{specfile|seriesfile}\\n"
 msgstr ""
 
-#: quilt/setup.in:102
+#: quilt/setup.in:105
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1092,23 +1102,23 @@ msgid ""
 "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
 msgstr ""
 
-#: quilt/setup.in:173
+#: quilt/setup.in:176
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 
-#: quilt/setup.in:176
+#: quilt/setup.in:179
 msgid "The -v option will show rpm's output\\n"
 msgstr ""
 
-#: quilt/setup.in:228 quilt/setup.in:240
+#: quilt/setup.in:231 quilt/setup.in:243
 msgid "File %s not found\\n"
 msgstr ""
 
-#: quilt/setup.in:231 quilt/setup.in:243
+#: quilt/setup.in:234 quilt/setup.in:246
 msgid "Unpacking archive %s\\n"
 msgstr ""
 
-#: quilt/setup.in:252
+#: quilt/setup.in:255
 msgid "Trying alternative patches and series names..."
 msgstr ""