zhaopingsun avatar zhaopingsun committed a729ab2

3.1 first 5 paras zh transated

Comments (0)

Files changed (1)

 #
 # Authors:
 # Dongsheng Song <dongsheng.song@gmail.com>, 2009
+# Zhaoping Sun <zhaopingsun@gmail.com>, 2009
 #
 # Check translation:
 #    msgfmt --statistics -c -o zh.mo zh.po
 "pulling or pushing changes from one repository into another.  Our next step "
 "is <emphasis>merging</emphasis> changes from separate repositories."
 msgstr ""
+"我们已经介绍了如何克隆版本库,如何进行修改,从一个版本库向另外一个版本库拉或者"
+"推送变更。下面我们要介绍的是如何从不同的版本库<emphasis>合并</emphasis>变更。"
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch03-tour-merge.xml:13
 "Merging is a fundamental part of working with a distributed revision control "
 "tool.  Here are a few cases in which the need to merge work arises."
 msgstr ""
+"在使用分布式版本控制工具中,合并是非常重要的。以下是几种需要进行合并的情形。"
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
 #: ../en/ch03-tour-merge.xml:20
 "feature in his.  They want the shared repository to contain both the bug fix "
 "and the new feature."
 msgstr ""
+"在一个合作的项目中,Alice和Bob都有一个项目版本库的私有拷贝。Alice修复了在她的"
+"库中的一个bug;Bob则在他的版本库中增加了一个新功能。他们希望分享版本库,每个人"
+"都得到新的功能,同时又修复了bug。"
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
 #: ../en/ch03-tour-merge.xml:27
 "once, each safely isolated in its own repository. Working this way means that "
 "she often needs to merge one piece of her own work with another."
 msgstr ""
+"Cynthia同时在一个项目上进行几个不同的任务,每个任务都是孤立的。以这种方式工作"
+"意味着她经常需要将不同部分的工作进行合并。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:35
 "through a merge.  We'll begin by cloning yet another repository (see how "
 "often they spring up?)  and making a change in it."
 msgstr ""
+"因为我们经常需要合并,Mercurial使得这个过程很简单。下面我们演示一下合并的过"
+"程。我们仍然从克隆另外一个版本库开始(看看它出现的多么频繁),并在它上面作更"
+"改。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:42
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.