|
|
@@ -23,8 +23,7 @@
|
|
|
<sect2 role="package">
|
|
|
<title/>
|
|
|
|
|
|
- <para>The Diffutils package contains programs that show the differences
|
|
|
- between files or directories.</para>
|
|
|
+ <para>Diffutils 软件包包含显示文件或目录之间差异的程序。</para>
|
|
|
|
|
|
<segmentedlist>
|
|
|
<segtitle>&buildtime;</segtitle>
|
|
|
@@ -39,7 +38,7 @@
|
|
|
</sect2>
|
|
|
|
|
|
<sect2 role="installation">
|
|
|
- <title>安装Diffutils</title>
|
|
|
+ <title>安装 Diffutils</title>
|
|
|
|
|
|
<para>准备安装 Diffutils：</para>
|
|
|
|
|
|
@@ -79,8 +78,8 @@
|
|
|
<varlistentry id="cmp">
|
|
|
<term><command>cmp</command></term>
|
|
|
<listitem>
|
|
|
- <para>Compares two files and reports whether or in which bytes they
|
|
|
- differ</para>
|
|
|
+ <para>比较两个文件并报告它们是否相同，或哪些字节不同
|
|
|
+ </para>
|
|
|
<indexterm zone="ch-system-diffutils cmp">
|
|
|
<primary sortas="b-cmp">cmp</primary>
|
|
|
</indexterm>
|
|
|
@@ -90,8 +89,7 @@
|
|
|
<varlistentry id="diff">
|
|
|
<term><command>diff</command></term>
|
|
|
<listitem>
|
|
|
- <para>Compares two files or directories and reports which lines in
|
|
|
- the files differ</para>
|
|
|
+ <para>比较两个文件或目录，并报告文件中哪些行不同</para>
|
|
|
<indexterm zone="ch-system-diffutils diff">
|
|
|
<primary sortas="b-diff">diff</primary>
|
|
|
</indexterm>
|
|
|
@@ -101,7 +99,7 @@
|
|
|
<varlistentry id="diff3">
|
|
|
<term><command>diff3</command></term>
|
|
|
<listitem>
|
|
|
- <para>Compares three files line by line</para>
|
|
|
+ <para>逐行比较三个文件</para>
|
|
|
<indexterm zone="ch-system-diffutils diff3">
|
|
|
<primary sortas="b-diff3">diff3</primary>
|
|
|
</indexterm>
|
|
|
@@ -111,7 +109,7 @@
|
|
|
<varlistentry id="sdiff">
|
|
|
<term><command>sdiff</command></term>
|
|
|
<listitem>
|
|
|
- <para>Merges two files and interactively outputs the results</para>
|
|
|
+ <para>合并两个文件，并交互地输出结果</para>
|
|
|
<indexterm zone="ch-system-diffutils sdiff">
|
|
|
<primary sortas="b-sdiff">sdiff</primary>
|
|
|
</indexterm>
|
Xi Ruoyao