Commits

zhaopingsun  committed 458f603

3.3 zh transated

  • Participants
  • Parent commits bf5325b

Comments (0)

Files changed (1)

 "line, while others work <quote>behind the scenes,</quote> for example adding "
 "capabilities to Mercurial's built-in server mode."
 msgstr ""
+"Mercurial提供了灵活的扩展机制,人们可以利用它扩展它的功能,同时保持Mercurial的"
+"核心很小并且容易管理。有些扩展增加了新的命令,你可以通过命令行使用它们,而其它"
+"的都是<quote>幕后工作</quote>,比如增加了Mercurial内建服务器模式的能力。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:395
 "automatically-generated commit message.  If no new heads were added, it "
 "updates the working directory to the new tip changeset."
 msgstr ""
+"<literal role=\"hg-ext\">fetch</literal>扩展增加了一个新的命令,毫无疑问,它叫"
+"做<command role=\"hg-cmd\">hg fetch</command>。这个扩展的功能像<command role="
+"\"hg-cmd\">hg pull -u</command>, <command role=\"hg-cmd\">hg merge</command>和"
+"<command role=\"hg-cmd\">hg commit</command>的组合。 它首先从其他版本库将变更"
+"拖入当前版本库。如果它发现变更向版本库添加了新的领头版本,它会更新到新的领头版"
+"本,开始合并然后(如果合并成功)提交合并的结果和一条自动产生的提交信息。如果没"
+"有新的领头版本,它仅仅会将当前目录更新到新的顶点。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:409
 "literal> section. Then add a line that simply reads <quote><literal>fetch=</"
 "literal></quote>."
 msgstr ""
+"使用<literal role=\"hg-ext\">fetch</literal>扩展非常容易。编辑你的家目录的"
+"<filename role=\"special\">.hgrc</filename>文件,找到<literal role=\"rc-"
+"extensions\">扩展</literal>段或者创建一个<literal role=\"rc-extensions\">扩展"
+"</literal>段。然后增加一行<quote><literal>fetch=</literal></quote>。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:421
 "ext\">fetch</literal> extension is in the standard distribution, Mercurial "
 "knows where to search for it.)"
 msgstr ""
+"(一般情况下,<quote><literal>=</literal></quote>的右边应该表示如何找到扩展,"
+"但是因为<literal role=\"hg-ext\">fetch</literal>扩展是在标准的发布版中, "
+"Mercurial知道哪里能找到它。)"
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch03-tour-merge.xml:429