diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2004-07-02 01:14:07 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2004-07-02 01:14:07 +0000 |
commit | 00227c3952cd1618d0bd6a6a2231046b3153c14e (patch) | |
tree | 3e59ec140eca2924e8b2574de83f100a2940109d /po/quilt.pot | |
parent | 162d238c1d40b6e6eace4396f9ac7cf91685fa30 (diff) | |
download | quilt-00227c3952cd1618d0bd6a6a2231046b3153c14e.tar.gz |
- Several Fixes from Joe Green <jgreen@mvista.com>:
+ Another sed \t\r problem, in Makefile.in
+ Bad error message on "quilt delete" of non-existent patch
+ "import" doesn't remove all leading components on patch file
+ Misspelling in "import" help text
- With using the GNU diff --label option, file timestamps
disappeared. Specify the timestamps in --label by hand: This
gives us added flexibility when generating patches; we may
some day want to support diff styles other than unified.
Also reported by Joe Green.
- Add --backup option to quilt refresh.
- Update documentation to QUILT_${COMMAND}_ARGS in .quiltrc.
(The old settings still work but they are no longer documented.)
- Update German translation.
Diffstat (limited to 'po/quilt.pot')
-rw-r--r-- | po/quilt.pot | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/po/quilt.pot b/po/quilt.pot index 113ea2b..cca9d74 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -34,12 +34,12 @@ msgid "" "\tPatch to add files to." msgstr "" -#: ../quilt/add.in:54 ../quilt/diff.in:140 ../quilt/diff.in:151 +#: ../quilt/add.in:54 ../quilt/diff.in:139 ../quilt/diff.in:150 #: ../quilt/remove.in:52 msgid "Patch $2 is not in series" msgstr "" -#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:106 +#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:112 #: ../quilt/remove.in:73 msgid "Patch $patch is not applied" msgstr "" @@ -47,7 +47,7 @@ msgstr "" #: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:211 #: ../quilt/files.in:75 ../quilt/fold.in:78 ../quilt/fork.in:64 #: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:215 -#: ../quilt/refresh.in:113 ../quilt/remove.in:80 +#: ../quilt/refresh.in:119 ../quilt/remove.in:80 msgid "No patches applied" msgstr "" @@ -98,15 +98,15 @@ msgid "" "topmost patch can be removed right now.)" msgstr "" -#: ../quilt/delete.in:73 +#: ../quilt/delete.in:75 msgid "Patch $patch is not in series" msgstr "" -#: ../quilt/delete.in:82 +#: ../quilt/delete.in:84 msgid "Patch $patch is currently applied" msgstr "" -#: ../quilt/delete.in:88 +#: ../quilt/delete.in:90 msgid "Failed to remove patch $patch" msgstr "" @@ -147,11 +147,10 @@ msgid "" "\tis invoked with the original and new file name as arguments.\n" "\n" "--no-timestamps\n" -"\tDo not include file timestamps in patch headers (as if\n" -" QUILT_DIFF_NO_TIMESTAMPS were set to yes).\n" +"\tDo not include file timestamps in patch headers.\n" "\t\n" "--color[=always|auto|never]\n" -"\tUse ANSI escape sequences to colorize the result." +"\tUse syntax coloring." msgstr "" #: ../quilt/diff.in:196 @@ -196,7 +195,7 @@ msgstr "" msgid "File $file is not being modified." msgstr "" -#: ../quilt/diff.in:370 ../quilt/refresh.in:145 +#: ../quilt/diff.in:370 ../quilt/refresh.in:151 msgid "Diff failed, aborting." msgstr "" @@ -291,7 +290,7 @@ msgid "" "Import external patches.\n" "\n" "-p num\n" -"\tNumber of directory levels to strip when aplying (default=1)\n" +"\tNumber of directory levels to strip when applying (default=1)\n" "\n" "-n patch\n" "\tPatch filename to use inside quilt. This option can only be\n" @@ -493,7 +492,7 @@ msgid "File series fully applied, ends at patch $top" msgstr "" #: ../quilt/refresh.in:22 -msgid "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [patch]" +msgid "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--backup] [patch]" msgstr "" #: ../quilt/refresh.in:26 @@ -517,33 +516,35 @@ msgid "" "\tsome of the same files.\n" "\n" "--no-timestamps\n" -"\tDo not include file timestamps in patch headers (as if\n" -" QUILT_DIFF_NO_TIMESTAMPS were set to yes)." +"\tDo not include file timestamps in patch headers.\n" +"\t\n" +"--backup\n" +"\tCreate a backup copy of the old version of a patch as patch~." msgstr "" -#: ../quilt/refresh.in:101 +#: ../quilt/refresh.in:107 msgid "Patch $opt_patch is not in series" msgstr "" -#: ../quilt/refresh.in:124 +#: ../quilt/refresh.in:130 msgid "" "Cannot refresh patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" msgstr "" -#: ../quilt/refresh.in:151 +#: ../quilt/refresh.in:157 msgid "More recent patches modify files in $patch. Enforce refresh with -f." msgstr "" -#: ../quilt/refresh.in:158 +#: ../quilt/refresh.in:164 msgid "Nothing in patch $patch" msgstr "" -#: ../quilt/refresh.in:183 +#: ../quilt/refresh.in:189 msgid "Patch $patch is unchanged" msgstr "" -#: ../quilt/refresh.in:197 +#: ../quilt/refresh.in:203 msgid "Refreshed patch $patch" msgstr "" @@ -721,7 +722,7 @@ msgstr "" msgid "The topmost patch $top needs to be refreshed first." msgstr "" -#: ../scripts/patchfns.in:697 +#: ../scripts/patchfns.in:698 msgid "" "The quilt meta-data in this tree has version $version, but this version of " "quilt can only handle meta-data formats up to and including version " @@ -729,7 +730,7 @@ msgid "" "push them before downgrading." msgstr "" -#: ../scripts/patchfns.in:759 +#: ../scripts/patchfns.in:760 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'." |