diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2005-04-13 13:04:06 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2005-04-13 13:04:06 +0000 |
commit | e5cbacaf5622ad6d80bd314984eeed40f62cc08e (patch) | |
tree | 0bfbd5cbefd93757da1d52ed6579849e88fdb9e8 /po/quilt.pot | |
parent | 0979b44e26ec23ab0445e7271932eba04fa604bb (diff) | |
download | quilt-e5cbacaf5622ad6d80bd314984eeed40f62cc08e.tar.gz |
- Add --sort options to the diff and refresh commands which
sorts files by filename. The default is to keep files in their
original order whenever possible.
- refresh command: add new files in sort order instead of the
filesystem order.
- diff command: output files in the order in which they show up
in the patch instead of sorting them alphabetically.
- Add sort testcase.
Diffstat (limited to 'po/quilt.pot')
-rw-r--r-- | po/quilt.pot | 58 |
1 files changed, 31 insertions, 27 deletions
diff --git a/po/quilt.pot b/po/quilt.pot index 3a78f6e..8159997 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:153 ../quilt/diff.in:164 ../quilt/graph.in:116 +#: ../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:129 ../quilt/remove.in:53 +#: ../quilt/push.in:311 ../quilt/refresh.in:134 ../quilt/remove.in:53 #: ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "" -#: ../quilt/add.in:99 ../quilt/diff.in:226 ../quilt/graph.in:121 -#: ../quilt/pop.in:254 ../quilt/refresh.in:135 ../quilt/remove.in:74 +#: ../quilt/add.in:99 ../quilt/diff.in:231 ../quilt/graph.in:121 +#: ../quilt/pop.in:254 ../quilt/refresh.in:140 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "" -#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:234 +#: ../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/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349 -#: ../quilt/refresh.in:143 ../quilt/remove.in:81 +#: ../quilt/refresh.in:148 ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "" @@ -117,7 +117,7 @@ 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] [--color] [file ...]\\n" +"patch] [--snapshot] [--diff=utility] [--sort] [--color] [file ...]\\n" msgstr "" #: ../quilt/diff.in:28 @@ -160,49 +160,51 @@ msgid "" "\n" "--color[=always|auto|never]\n" "\tUse syntax coloring.\n" +"\n" +"--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" -#: ../quilt/diff.in:218 +#: ../quilt/diff.in:223 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -#: ../quilt/diff.in:245 +#: ../quilt/diff.in:250 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: ../quilt/diff.in:280 ../quilt/files.in:122 +#: ../quilt/diff.in:285 ../quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: ../quilt/diff.in:316 +#: ../quilt/diff.in:334 msgid "Cannot change into directory %s\\n" msgstr "" -#: ../quilt/diff.in:323 ../quilt/pop.in:114 +#: ../quilt/diff.in:341 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: ../quilt/diff.in:334 +#: ../quilt/diff.in:352 msgid "Cannot change to temporary directory\\n" msgstr "" -#: ../quilt/diff.in:353 ../quilt/pop.in:138 +#: ../quilt/diff.in:371 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "" -#: ../quilt/diff.in:359 +#: ../quilt/diff.in:377 msgid "Cannot change to source directory\\n" msgstr "" -#: ../quilt/diff.in:377 +#: ../quilt/diff.in:395 msgid "File %s is not being modified\\n" msgstr "" -#: ../quilt/diff.in:397 ../quilt/refresh.in:175 +#: ../quilt/diff.in:415 ../quilt/refresh.in:187 msgid "Diff failed, aborting\\n" msgstr "" -#: ../quilt/diff.in:404 +#: ../quilt/diff.in:422 msgid "More recent patches modify files in patch %s\\n" msgstr "" @@ -600,8 +602,8 @@ msgstr "" #: ../quilt/refresh.in:22 msgid "" -"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] " -"[patch]\\n" +"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--" +"backup] [patch]\\n" msgstr "" #: ../quilt/refresh.in:26 @@ -637,26 +639,28 @@ msgid "" "\n" "--backup\n" "\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" msgstr "" -#: ../quilt/refresh.in:154 +#: ../quilt/refresh.in:159 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: ../quilt/refresh.in:181 +#: ../quilt/refresh.in:193 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: ../quilt/refresh.in:188 +#: ../quilt/refresh.in:200 msgid "Nothing in patch %s\\n" msgstr "" -#: ../quilt/refresh.in:249 +#: ../quilt/refresh.in:261 msgid "Patch %s is unchanged\\n" msgstr "" -#: ../quilt/refresh.in:263 +#: ../quilt/refresh.in:275 msgid "Refreshed patch %s\\n" msgstr "" @@ -806,7 +810,7 @@ msgid "" "patches from scratch.\\n" msgstr "" -#: ../scripts/patchfns.in:732 +#: ../scripts/patchfns.in:738 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 " @@ -814,7 +818,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: ../scripts/patchfns.in:809 +#: ../scripts/patchfns.in:815 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" |