KDiff3/zh-cn: Difference between revisions

Revision as of 15:18, 12 November 2010

一个用来检查，编辑，合并 2个或3个文件差异的工具

Screenshots showing merge operations are available on the project's home pages

The KDiff3 Handbook gives a detailed description of activities, in html form.

@@ Line 7: / Line 7: @@
 ==特性==
-*compares and merges two or three text input files or directories,
+*比较和合并2个或3个文本输入文件或是目录。
-*shows the differences line by line and character by character(!),
+*按行和字符显示差异
-*provides an automatic merge-facility,
+*提供自动合并功能
-*has an editor for comfortable solving of merge-conflicts,
+*有一个编辑器用于舒适的解决合并冲突。
-*provides networktransparency via [[Special:myLanguage/Glossary#KIO|KIO]],
+*通过[[Special:myLanguage/Glossary#KIO|KIO]]提供网络透明传输。
-*has options to highlight or hide changes in white-space or comments,
+*有选项可以高亮或隐藏在空留部分或注释中的更改。
-*supports Unicode, UTF-8 and other file encodings,
+*支持Unicode, UTF-8和其他文件编码。
-*prints differences,
+*打印差异
-*supports version control keyword and history merging.
+*支持版本控制关键字和历史合并。
 Screenshots showing merge operations are available on [http://kdiff3.sourceforge.net/doc/screenshots.html the project's home pages]