|
|
211.
|
|
|
-H --speed-large-files Assume large files and many scattered small changes.
|
|
|
|
|
-H --speed-large-files 假设文件十分大而且文件中含有许多微小的差异。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/sdiff.c:212
|
|
|
212.
|
|
|
Usage: %s [OPTION]... FILE1 FILE2 
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
用法： %s [选项]... 文件1 文件2
|
|
Translated and reviewed by
Tao Wei
|
|
|
|
Located in
src/sdiff.c:206
|
|
|
213.
|
|
|
Side-by-side merge of file differences.
|
|
|
|
|
以并排方式合并文件之间的差异。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/sdiff.c:226
|
|
|
214.
|
|
|
cannot interactively merge standard input
|
|
|
|
|
不允许交互式合并标准输入的内容
|
|
Translated by
Wenbin Lv
|
|
|
|
Located in
src/sdiff.c:328
|
|
|
215.
|
|
|
both files to be compared are directories
|
|
|
|
|
两个要比较的文件都是目录
|
|
Translated and reviewed by
Tao Wei
|
|
|
|
Located in
src/sdiff.c:594
|
|
|
216.
|
|
|
ed: [tab]Edit then use both versions, each decorated with a header.
eb: [tab]Edit then use both versions.
el or e1: [tab]Edit then use the left version.
er or e2: [tab]Edit then use the right version.
e: [tab]Discard both versions then edit a new one.
l or 1: [tab]Use the left version.
r or 2: [tab]Use the right version.
s: [tab]Silently include common lines.
v: [tab]Verbosely include common lines.
q: [tab]Quit.
|
|
|
[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.
|
|
|
|
|
ed: [tab]编辑两个版本的内容，然后使用。两个版本分别加上头部以便识别。
eb: [tab]编辑两个版本的内容，然后使用。
el 或 e1: [tab]编辑左边的版本，然后使用。
er 或 e2: [tab]编辑右边的版本，然后使用。
e: [tab]丢弃两个版本的内容，然后编辑一个新的版本。
l 或 1: [tab]使用左边的版本。
r 或 2: [tab]使用右边的版本。
s: [tab]复制共有的行，且不显示输出
v: [tab]复制共有的行，且显示详细输出
q: [tab]退出。
|
|
Translated by
Wenbin Lv
|
|
|
|
Located in
src/sdiff.c:817
|
