|
28.
|
|
|
![](/@@/translation-newline)
Produces a diff of the specified file(s) in the topmost or specified ![](/@@/translation-newline)
patch. If no files are specified, all files that are modified are ![](/@@/translation-newline)
included.
![](/@@/translation-newline)
-p n [tab] Create a -p n style patch (-p0 or -p1 are supported).
![](/@@/translation-newline)
-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.
![](/@@/translation-newline)
--no-timestamps
[tab] Do not include file timestamps in patch headers.
![](/@@/translation-newline)
--no-index
[tab] Do not output Index: lines.
![](/@@/translation-newline)
-z [tab] Write to standard output the changes that have been made
[tab] relative to the topmost or specified patch.
![](/@@/translation-newline)
-R [tab] Create a reverse diff.
![](/@@/translation-newline)
-P patch
[tab] Create a diff for the specified patch. (Defaults to the topmost
[tab] patch.)
![](/@@/translation-newline)
--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.
![](/@@/translation-newline)
--snapshot
[tab] Diff against snapshot (see \`quilt snapshot -h').
![](/@@/translation-newline)
--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.
![](/@@/translation-newline)
--color[=always|auto|never]
[tab] Use syntax coloring.
![](/@@/translation-newline)
--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.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
quilt/diff.in:28
|
|
29.
|
|
|
Options \`-c patch', \`--snapshot', and \`-z' cannot be combined.\n
|
|
|
|
Las opciones \«-c patch», \«--snapshot», y \«-z» no pueden ser combinadas.\n
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
quilt/diff.in:231
|
|
30.
|
|
|
Cannot diff patches with -p%s, please specify -p0 or -p1 instead\n
|
|
|
|
No puedo diferenciar parches con -p%s, por favor, especifique -p0 o -p1\n
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
quilt/diff.in:258
|
|
31.
|
|
|
Patch %s not applied before patch %s\n
|
|
|
|
Parche %s no aplicado antes del parche %s\n
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
quilt/diff.in:293 quilt/files.in:122
|
|
32.
|
|
|
Failed to copy files to temporary directory\n
|
|
|
|
Fallo al copiar los archivos al directorio temporal\n
|
|
Translated by
Paco Molinero
|
|
Reviewed by
Paco Molinero
|
|
|
|
Located in
quilt/diff.in:343 quilt/pop.in:114
|
|
33.
|
|
|
Failed to patch temporary files\n
|
|
|
|
Fallo al parchear los achivos temporales\n
|
|
Translated by
Paco Molinero
|
|
Reviewed by
Paco Molinero
|
|
|
|
Located in
quilt/diff.in:367 quilt/pop.in:138
|
|
34.
|
|
|
File %s is not being modified\n
|
|
|
|
El archivo %s no ha sido modificado\n
|
|
Translated by
Paco Molinero
|
|
Reviewed by
Paco Molinero
|
|
|
|
Located in
quilt/diff.in:386
|
|
35.
|
|
|
Diff failed, aborting\n
|
|
|
|
Falló Diff, abortando\n
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
quilt/diff.in:406 quilt/refresh.in:201
|
|
36.
|
|
|
More recent patches modify files in patch %s\n
|
|
|
|
Los parches más recientes modifican los archivos en el parche %s\n
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
quilt/diff.in:413
|
|
37.
|
|
|
Usage: quilt edit file ...\n
|
|
|
|
Uso: quilt edit archivo ...\n
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
quilt/edit.in:13
|