|
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
|
|
|
|
Uso: 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 by
Michele Angrisano
|
|
Reviewed by
Michele Angrisano
|
|
|
|
Located in
quilt/diff.in:24
|
|
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.
|
|
|
|
![](/@@/translation-newline)
Produce una diff del file o dei file specificati nella patch al posto più in ![](/@@/translation-newline)
alto o in quella specificata. Se non è specificato nessun file, vengono ![](/@@/translation-newline)
inclusi tutti i file modificati.
![](/@@/translation-newline)
-p n [tab] Crea una patch stile -p n (sono supportati -p0 e -p1).
![](/@@/translation-newline)
-u, -U num, -c, -C num
[tab] Crea una diff unificata (-u, -U) con un numero di righe di contesto. Crea
[tab] una diff di contesto (-c, -C) con un numero di righe di contesto. Il numero
[tab] predefinito di righe di contesto è 3.
![](/@@/translation-newline)
--no-timestamps
[tab] Non include una marca temporale nella testata della patch.
![](/@@/translation-newline)
--no-index
[tab] Non effettua l'output dell'indice: righe.
![](/@@/translation-newline)
-z [tab] Invia all'output standard le modifiche effettuate
[tab] relative alla patch al posto più in alto o a quella specificata.
![](/@@/translation-newline)
-R [tab] Crea una diff inversa.
![](/@@/translation-newline)
-P patch
[tab] Crea una diff per la patch specificata. (Per impostazione predefinita
[tab] la patch al posto più in alto).
![](/@@/translation-newline)
--combine patch
[tab] Crea una diff combinata per tutte le patch tra la presente e
[tab] quella specificata con -P. Un nome di patch di \"-\" è equivalente
[tab] a specificare la prima patch applicata.
![](/@@/translation-newline)
--snapshot
[tab] Diff contro snapshot (consultare \'quilt snapshot -h').
![](/@@/translation-newline)
--diff=utility
[tab] Usa l'utilità specificata per generare la diff. L'utilità
[tab] è invocata con i nomi di file originale e nuovo come argomenti.
![](/@@/translation-newline)
--color[=always|auto|never]
[tab] Usa la colorazione della sintassi.
![](/@@/translation-newline)
--sort [tab] Ordina i file per nome invece di mantenere l'ordine originale.
|
|
Translated and reviewed by
Gianfranco Frisani
|
|
|
|
Located in
quilt/diff.in:28
|
|
29.
|
|
|
Options \`-c patch', \`--snapshot', and \`-z' cannot be combined.\n
|
|
|
|
Le opzioni \ "-c patch", \ "--snapshot", e \ "-z" non possono essere combinate.\n
|
|
Translated by
Michele Angrisano
|
|
Reviewed by
Michele Angrisano
|
|
|
|
Located in
quilt/diff.in:231
|
|
30.
|
|
|
Cannot diff patches with -p%s, please specify -p0 or -p1 instead\n
|
|
|
|
Impossibile controllare le differenze tra le patch utilizzando -p%s, utilizzare -p0 o -p1\n
|
|
Translated and reviewed by
Milo Casagrande
|
|
|
|
Located in
quilt/diff.in:258
|
|
31.
|
|
|
Patch %s not applied before patch %s\n
|
|
|
|
Patch %s non applicata prima della patch %s\n
|
|
Translated by
Michele Angrisano
|
|
Reviewed by
Milo Casagrande
|
|
|
|
Located in
quilt/diff.in:293 quilt/files.in:122
|
|
32.
|
|
|
Failed to copy files to temporary directory\n
|
|
|
|
Copia dei file nella cartella temporanea non riuscita\n
|
|
Translated and reviewed by
Milo Casagrande
|
|
|
|
Located in
quilt/diff.in:343 quilt/pop.in:114
|
|
33.
|
|
|
Failed to patch temporary files\n
|
|
|
|
Impossibile applicare la patch sui file temporanei\n
|
|
Translated and reviewed by
Milo Casagrande
|
|
|
|
Located in
quilt/diff.in:367 quilt/pop.in:138
|
|
34.
|
|
|
File %s is not being modified\n
|
|
|
|
Il file %s non è stato modificato\n
|
|
Translated and reviewed by
Milo Casagrande
|
|
|
|
Located in
quilt/diff.in:386
|
|
35.
|
|
|
Diff failed, aborting\n
|
|
|
|
Controllo delle differenze non riuscito, uscita\n
|
|
Translated and reviewed by
Milo Casagrande
|
|
|
|
Located in
quilt/diff.in:406 quilt/refresh.in:201
|
|
36.
|
|
|
More recent patches modify files in patch %s\n
|
|
|
|
I file nella patch %s sono modificati da altre patch più recenti\n
|
|
Translated and reviewed by
Milo Casagrande
|
|
|
|
Located in
quilt/diff.in:413
|