diff options
Diffstat (limited to 'po/quilt.pot')
| -rw-r--r-- | po/quilt.pot | 63 |
1 files changed, 35 insertions, 28 deletions
diff --git a/po/quilt.pot b/po/quilt.pot index 52edb17..57613a8 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -40,22 +40,22 @@ msgid "File \\`%s' is located below \\`%s'\\n" msgstr "" #: ../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/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116 #: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62 -#: ../quilt/push.in:311 ../quilt/refresh.in:141 ../quilt/remove.in:53 +#: ../quilt/push.in:311 ../quilt/refresh.in:148 ../quilt/remove.in:53 #: ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "" -#: ../quilt/add.in:99 ../quilt/diff.in:231 ../quilt/graph.in:121 -#: ../quilt/pop.in:254 ../quilt/refresh.in:147 ../quilt/remove.in:74 +#: ../quilt/add.in:99 ../quilt/diff.in:239 ../quilt/graph.in:121 +#: ../quilt/pop.in:254 ../quilt/refresh.in:154 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "" -#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:239 +#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247 #: ../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:155 ../quilt/remove.in:81 +#: ../quilt/refresh.in:162 ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "" @@ -117,7 +117,8 @@ msgstr "" #: ../quilt/diff.in:24 msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " -"patch] [--snapshot] [--diff=utility] [--sort] [--color] [file ...]\\n" +"patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] " +"[--color] [file ...]\\n" msgstr "" #: ../quilt/diff.in:28 @@ -137,6 +138,9 @@ msgid "" "--no-timestamps\n" "\tDo not include file timestamps in patch headers.\n" "\n" +"--no-index\n" +"\tDo not output Index: lines.\n" +"\n" "-z\tWrite to standard output the changes that have been made\n" "\trelative to the topmost or specified patch.\n" "\n" @@ -164,47 +168,47 @@ msgid "" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" -#: ../quilt/diff.in:223 +#: ../quilt/diff.in:231 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -#: ../quilt/diff.in:250 +#: ../quilt/diff.in:258 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: ../quilt/diff.in:285 ../quilt/files.in:122 +#: ../quilt/diff.in:293 ../quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: ../quilt/diff.in:334 +#: ../quilt/diff.in:342 msgid "Cannot change into directory %s\\n" msgstr "" -#: ../quilt/diff.in:341 ../quilt/pop.in:114 +#: ../quilt/diff.in:349 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: ../quilt/diff.in:352 +#: ../quilt/diff.in:360 msgid "Cannot change to temporary directory\\n" msgstr "" -#: ../quilt/diff.in:371 ../quilt/pop.in:138 +#: ../quilt/diff.in:379 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "" -#: ../quilt/diff.in:377 +#: ../quilt/diff.in:385 msgid "Cannot change to source directory\\n" msgstr "" -#: ../quilt/diff.in:395 +#: ../quilt/diff.in:403 msgid "File %s is not being modified\\n" msgstr "" -#: ../quilt/diff.in:415 ../quilt/refresh.in:194 +#: ../quilt/diff.in:423 ../quilt/refresh.in:201 msgid "Diff failed, aborting\\n" msgstr "" -#: ../quilt/diff.in:422 +#: ../quilt/diff.in:430 msgid "More recent patches modify files in patch %s\\n" msgstr "" @@ -609,8 +613,8 @@ msgstr "" #: ../quilt/refresh.in:22 msgid "" -"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--" -"backup] [--strip-trailing-whitespace] [patch]\\n" +"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] " +"[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n" msgstr "" #: ../quilt/refresh.in:26 @@ -638,6 +642,9 @@ msgid "" "--no-timestamps\n" "\tDo not include file timestamps in patch headers.\n" "\t\n" +"--no-index\n" +"\tDo not output Index: lines.\n" +"\n" "--diffstat\n" "\tAdd a diffstat section to the patch header, or replace the\n" "\texisting diffstat section.\n" @@ -653,28 +660,28 @@ msgid "" "\tStrip trailing whitespace at the end of lines of the generated patch.\n" msgstr "" -#: ../quilt/refresh.in:166 +#: ../quilt/refresh.in:173 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: ../quilt/refresh.in:200 +#: ../quilt/refresh.in:207 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: ../quilt/refresh.in:207 +#: ../quilt/refresh.in:214 msgid "Nothing in patch %s\\n" msgstr "" -#: ../quilt/refresh.in:221 +#: ../quilt/refresh.in:228 msgid "Warning: %s adds trailing whitespace\\n" msgstr "" -#: ../quilt/refresh.in:283 +#: ../quilt/refresh.in:290 msgid "Patch %s is unchanged\\n" msgstr "" -#: ../quilt/refresh.in:297 +#: ../quilt/refresh.in:304 msgid "Refreshed patch %s\\n" msgstr "" @@ -824,7 +831,7 @@ msgid "" "patches from scratch.\\n" msgstr "" -#: ../scripts/patchfns.in:738 +#: ../scripts/patchfns.in:741 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 " @@ -832,7 +839,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: ../scripts/patchfns.in:815 +#: ../scripts/patchfns.in:818 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" |