|
21.
|
|
|
Usage: quilt delete [patch | -n]\n
|
|
|
|
Синтаксис: quilt delete [патч | -n]\n
|
|
Translated by
Sergey Basalaev
|
|
|
|
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.
|
|
|
|
Удалить указанный или верхний патч из файла series. Если патч применён,
то quilt попытается его отменить. (В настоящий момент можно удалить
лишь верхний патч).
-n [tab] Удалить патч, предшествующий верхнему, вместо указанного
[tab] или верхнего.
|
|
Translated and reviewed by
Sergey Basalaev
|
|
|
|
Located in
quilt/delete.in:25
|
|
23.
|
|
|
No next patch\n
|
|
|
|
Отсутствует следующий патч\n
|
|
Translated and reviewed by
AsstZD
|
|
|
|
Located in
quilt/delete.in:88
|
|
24.
|
|
|
Patch %s is currently applied\n
|
|
|
|
Патч %s применён\n
|
|
Translated by
Sergey Basalaev
|
|
|
|
Located in
quilt/delete.in:106
|
|
25.
|
|
|
Removed patch %s\n
|
|
|
|
Удалён патч %s\n
|
|
Translated by
Sergey Basalaev
|
|
|
|
Located in
quilt/delete.in:113
|
|
26.
|
|
|
Failed to remove patch %s\n
|
|
|
|
Не удалось отменить патч %s\n
|
|
Translated and reviewed by
Sergey Basalaev
|
|
|
|
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
|
|
|
|
Синтаксис: quilt diff [-p n] [-u|-U число|-c|-C число] [--combine патч|-z] [-R] [-P патч] [--snapshot] [--diff=утилита] [--no-timestamps] [--no-index] [--sort] [--color] [файл ...]\n
|
|
Translated by
Sergey Basalaev
|
|
|
|
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.
|
|
|
|
Создаёт diff указанных файлов в верхнем или указанном патче. Если не
указано файлов, то в diff включаются все изменённые файлы.
-p n [tab] Создать патч в стиле -p n (поддерживаются -p0 и -p1).
-u, -U число, -c, -C число
[tab] Создать универсальный diff (-u, -U) с заданным числом строк
[tab] контекста. Создать контекстный diff (-c, -C) с заданным числом
[tab] строк контекста. По умолчанию число строк контекста равно 3.
--no-timestamps
[tab] Не включать отметки времени в заголовки патчей.
--no-index
[tab] Не выводить строки Index:
-z [tab] Вывести на стандартный вывод изменения, сделанные
[tab] относительно самого верхнего или указанного патча.
-R [tab] Создать обратный diff.
-P патч
[tab] Создать diff для указанного патча. (По умолчанию для верхнего.)
--combine патч
[tab] Создать объединённый diff для всех патчей между этим патчем и
[tab] указанным в опции -P. Имя патча «-» эквивалентно первому
[tab] применённому патчу.
--snapshot
[tab] diff относительно снимка (см. \`quilt snapshot -h').
--diff=утилита
[tab] Использовать указанную утилиту для создания diff. Утилита вызывается
[tab] с именами оригинального файла и нового файла в качестве аргументов.
--color[=always|auto|never]
[tab] Использовать подсветку синтаксиса.
--sort [tab] Сортировать файлы по имени, не сохраняя их исходного порядка.
|
|
Translated and reviewed by
Sergey Basalaev
|
|
|
|
Located in
quilt/diff.in:28
|
|
29.
|
|
|
Options \`-c patch', \`--snapshot', and \`-z' cannot be combined.\n
|
|
|
|
Опции \`-c patch', \`--snapshot' и \`-z' не могут использоваться совместно.\n
|
|
Translated by
Valery Skochilov
|
|
Reviewed by
AsstZD
|
|
|
|
Located in
quilt/diff.in:231
|
|
30.
|
|
|
Cannot diff patches with -p%s, please specify -p0 or -p1 instead\n
|
|
|
|
Невозможно сравнить патчи с -p%s, используйте -p0 либо -p1\n
|
|
Translated and reviewed by
AsstZD
|
|
|
|
Located in
quilt/diff.in:258
|