|
|
21.
|
|
|
Usage: quilt delete [patch | -n]\n
|
|
|
|
|
Usage: quilt delete [patch | -n]\n
|
|
Translated and reviewed by
Malcolm Parsons
|
|
|
|
Located in
quilt/delete.in:22
|
|
|
22.
|
|
|
Remove the specified or topmost patch from the series file. If the
patch is applied, quilt will attempt to remove it first. (Only the
topmost patch can be removed right now.)
-n [tab]Delete the next patch after topmost, rather than the specified
[tab]or topmost patch.
|
|
|
[tab] represents a tab character.
Please write it exactly the same way, [tab], in your
translation.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Remove the specified or topmost patch from the series file. If the
patch is applied, quilt will attempt to remove it first. (Only the
topmost patch can be removed right now.)
-n [tab]Delete the next patch after topmost, rather than the specified
[tab]or topmost patch.
|
|
Translated and reviewed by
Malcolm Parsons
|
|
|
|
Located in
quilt/delete.in:25
|
|
|
23.
|
|
|
No next patch\n
|
|
|
|
|
No next patch\n
|
|
Translated and reviewed by
Malcolm Parsons
|
|
|
|
Located in
quilt/delete.in:88
|
|
|
24.
|
|
|
Patch %s is currently applied\n
|
|
|
|
|
Patch %s is currently applied\n
|
|
Translated and reviewed by
Malcolm Parsons
|
|
|
|
Located in
quilt/delete.in:106
|
|
|
25.
|
|
|
Removed patch %s\n
|
|
|
|
|
Removed patch %s\n
|
|
Translated and reviewed by
Malcolm Parsons
|
|
|
|
Located in
quilt/delete.in:113
|
|
|
26.
|
|
|
Failed to remove patch %s\n
|
|
|
|
|
Failed to remove patch %s\n
|
|
Translated and reviewed by
Malcolm Parsons
|
|
|
|
Located in
quilt/delete.in:115
|
|
|
27.
|
|
|
Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] [--color] [file ...]\n
|
|
|
|
|
Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] [--color] [file ...]\n
|
|
Translated and reviewed by
Malcolm Parsons
|
|
|
|
Located in
quilt/diff.in:24
|
|
|
28.
|
|
|
Produces a diff of the specified file(s) in the topmost or specified
patch. If no files are specified, all files that are modified are
included.
-p n [tab]Create a -p n style patch (-p0 or -p1 are supported).
-u, -U num, -c, -C num
[tab]Create a unified diff (-u, -U) with num lines of context. Create
[tab]a context diff (-c, -C) with num lines of context. The number of
[tab]context lines defaults to 3.
--no-timestamps
[tab]Do not include file timestamps in patch headers.
--no-index
[tab]Do not output Index: lines.
-z [tab]Write to standard output the changes that have been made
[tab]relative to the topmost or specified patch.
-R [tab]Create a reverse diff.
-P patch
[tab]Create a diff for the specified patch. (Defaults to the topmost
[tab]patch.)
--combine patch
[tab]Create a combined diff for all patches between this patch and
[tab]the patch specified with -P. A patch name of \"-\" is equivalent
[tab]to specifying the first applied patch.
--snapshot
[tab]Diff against snapshot (see \`quilt snapshot -h').
--diff=utility
[tab]Use the specified utility for generating the diff. The utility
[tab]is invoked with the original and new file name as arguments.
--color[=always|auto|never]
[tab]Use syntax coloring.
--sort [tab]Sort files by their name instead of preserving the original order.
|
|
|
[tab] represents a tab character.
Please write it exactly the same way, [tab], in your
translation.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Produces a diff of the specified file(s) in the topmost or specified
patch. If no files are specified, all files that are modified are
included.
-p n [tab]Create a -p n style patch (-p0 or -p1 are supported).
-u, -U num, -c, -C num
[tab]Create a unified diff (-u, -U) with num lines of context. Create
[tab]a context diff (-c, -C) with num lines of context. The number of
[tab]context lines defaults to 3.
--no-timestamps
[tab]Do not include file timestamps in patch headers.
--no-index
[tab]Do not output Index: lines.
-z [tab]Write to standard output the changes that have been made
[tab]relative to the topmost or specified patch.
-R [tab]Create a reverse diff.
-P patch
[tab]Create a diff for the specified patch. (Defaults to the topmost
[tab]patch.)
--combine patch
[tab]Create a combined diff for all patches between this patch and
[tab]the patch specified with -P. A patch name of \"-\" is equivalent
[tab]to specifying the first applied patch.
--snapshot
[tab]Diff against snapshot (see \`quilt snapshot -h').
--diff=utility
[tab]Use the specified utility for generating the diff. The utility
[tab]is invoked with the original and new file name as arguments.
--color[=always|auto|never]
[tab]Use syntax colouring.
--sort [tab]Sort files by their name instead of preserving the original order.
|
|
Translated and reviewed by
Malcolm Parsons
|
|
|
|
Located in
quilt/diff.in:28
|
|
|
29.
|
|
|
Options \`-c patch', \`--snapshot', and \`-z' cannot be combined.\n
|
|
|
|
|
Options \`-c patch', \`--snapshot', and \`-z' cannot be combined.\n
|
|
Translated and reviewed by
Malcolm Parsons
|
|
|
|
Located in
quilt/diff.in:231
|
|
|
30.
|
|
|
Cannot diff patches with -p%s, please specify -p0 or -p1 instead\n
|
|
|
|
|
Cannot diff patches with -p%s, please specify -p0 or -p1 instead\n
|
|
Translated and reviewed by
Malcolm Parsons
|
|
|
|
Located in
quilt/diff.in:258
|
