diff options
Diffstat (limited to 'po/quilt.pot')
| -rw-r--r-- | po/quilt.pot | 54 |
1 files changed, 34 insertions, 20 deletions
diff --git a/po/quilt.pot b/po/quilt.pot index 8159997..52edb17 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -16,8 +16,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 "" #: ../quilt/add.in:22 @@ -42,20 +42,20 @@ 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/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 "" #: ../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 "" #: ../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 "" @@ -200,7 +200,7 @@ msgstr "" msgid "File %s is not being modified\\n" msgstr "" -#: ../quilt/diff.in:415 ../quilt/refresh.in:187 +#: ../quilt/diff.in:415 ../quilt/refresh.in:194 msgid "Diff failed, aborting\\n" msgstr "" @@ -273,21 +273,28 @@ msgstr "" #: ../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 "" -#: ../quilt/fork.in:92 +#: ../quilt/fork.in:99 msgid "Patch %s exists already, please choose a new name\\n" msgstr "" -#: ../quilt/fork.in:104 +#: ../quilt/fork.in:111 msgid "Fork of patch %s to patch %s failed\\n" msgstr "" -#: ../quilt/fork.in:110 +#: ../quilt/fork.in:117 msgid "Fork of patch %s created as %s\\n" msgstr "" @@ -603,7 +610,7 @@ msgstr "" #: ../quilt/refresh.in:22 msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--" -"backup] [patch]\\n" +"backup] [--strip-trailing-whitespace] [patch]\\n" msgstr "" #: ../quilt/refresh.in:26 @@ -641,26 +648,33 @@ 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 "" -#: ../quilt/refresh.in:159 +#: ../quilt/refresh.in:166 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: ../quilt/refresh.in:193 +#: ../quilt/refresh.in:200 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: ../quilt/refresh.in:200 +#: ../quilt/refresh.in:207 msgid "Nothing in patch %s\\n" msgstr "" -#: ../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 "" -#: ../quilt/refresh.in:275 +#: ../quilt/refresh.in:297 msgid "Refreshed patch %s\\n" msgstr "" |