1. Bryan O'Sullivan
  2. hgbook

Commits

zhaopingsun  committed e503c30

3.2.0 second para translated

  • Participants
  • Parent commits 1bf1631
  • Branches default

Comments (0)

Files changed (1)

File po/zh.po

View file
 "the same text.  Our task in resolving the conflicting changes is to decide "
 "what the file should look like."
 msgstr ""
+"<xref linkend=\"fig:tour-merge:conflict\"/>是一个文档变更相互冲突的的实例。我"
+"们从文件的一个版本开始,做了一些修改;但别人也在相同的地方作了不同的修改。我们"
+"解决冲突的目的就是要决定文件到底应该是什么样子。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:220