Translations:KDiff3/3/zh-cn: Difference between revisions

Latest revision as of 15:18, 12 November 2010

Information about message (contribute)

This message has no documentation. If you know where or how this message is used, you can help other translators by adding documentation to this message.

Message definition (KDiff3)

*compares and merges two or three text input files or directories,
*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]],
*has options to highlight or hide changes in white-space or comments,
*supports Unicode, UTF-8 and other file encodings,
*prints differences,
*supports version control keyword and history merging.

比较和合并2个或3个文本输入文件或是目录。
按行和字符显示差异
提供自动合并功能
有一个编辑器用于舒适的解决合并冲突。
通过KIO提供网络透明传输。
有选项可以高亮或隐藏在空留部分或注释中的更改。
支持Unicode, UTF-8和其他文件编码。
打印差异
支持版本控制关键字和历史合并。