#: ../en/ch02-tour-basic.xml:973 @@ -5248,8 +5252,8 @@ "repository, but the repository is understandably not set up to let anonymous " "users push to it." msgstr "" -"在本例中，我们可以看到准备向远程版本库推送的变更，但是该版本库并不允许匿名" -"用户推送。" +"在本例中，我们可以看到准备向远程版本库推送的变更，但是该版本库并不允许匿名用户" +"推送。" #. type: Content of: <book><chapter><sect1><title> #: ../en/ch02-tour-basic.xml:993 @@ -5263,6 +5267,8 @@ "exists. The <command>hg init</command> command creates a new, empty " "Mercurial repository." msgstr "" +"开始一个新项目和使用一个已有项目一样简单。<command>hg init</command>命令可以创" +"建一个新的，空的Mercurial版本库。 " #. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:1001 @@ -5270,6 +5276,7 @@ "This simply creates a repository named <filename>myproject</filename> in the " "current directory." msgstr "" +"在当前目录创建一个名为<filename>myproject</filename>的版本库就是这么简单。" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:1006 @@ -5277,6 +5284,8 @@ "We can tell that <filename>myproject</filename> is a Mercurial repository, " "because it contains a <filename>.hg</filename> directory." msgstr "" +"我们可以说<filename>myproject</filename>是一个Mercurial版本库，因为它包含了" +"<filename>.hg</filename>目录。" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:1012 @@ -5285,12 +5294,14 @@ "into place, and tell Mercurial to start tracking them using the <command>hg " "add</command> command." msgstr "" +"如果我们想将一些已经存在的文件加入版本库，我们将它拷贝到目录下，然后执行" +"<command>hg add</command>命令，告诉Mercurial开始管理它们。" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:1018 msgid "" "Once we are satisfied that our project looks right, we commit our changes." -msgstr "" +msgstr "当对项目的状况满意时，我们就提交的变更。" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:1023 @@ -5300,6 +5311,8 @@ "use it on the smallest of projects that we might not have considered with a " "more complicated tool." msgstr "" +"只需要几分钟就可以在一个新的项目上使用Mercurial，这时它的魅力之一。现在版本控" +"制做起来非常方便，我们可以在很小的不需要复杂工具的项目上使用它。" #. type: Content of: <book><chapter><title> #: ../en/ch03-tour-merge.xml:5

# HG changeset patch # User Zhaoping Sun # Date 1262058887 18000 # Node ID 6af721dff19a67f2e709f3b2ce6f9746ef2b1c39 # Parent 8748065086e8e20b40f222c2e4d2cb3adfb3a17b chapter 2 zh translated diff -r 8748065086e8 -r 6af721dff19a po/zh.po --- a/po/zh.po Sat Dec 26 17:58:52 2009 -0500 +++ b/po/zh.po Mon Dec 28 22:54:47 2009 -0500 @@ -4425,6 +4425,9 @@ "you, don't worry: everything happens transparently and automatically, and you " "don't need to understand it." msgstr "" +"如果版本库的源和目标都在同一个文件系统上，将会节省很多空间。这种情况下，" +"Mercurial会使用硬链接的方式来共享内部元数据，并使用写时拷贝的机制。如果你不明" +"白这句话的意思，没有关系：所有的事情都是自动和透明的，你不需要知道它们。" #. type: Content of: #: ../en/ch02-tour-basic.xml:468 @@ -5224,7 +5227,8 @@ "有可能&emdash;并且常常很有用&emdash;hg push和hg " "outgoing的缺省位置与hg pull和hg " "incoming的位置不同。我们可以给.hg/hgrc文件的" -"[paths]节加上default-push条目，如下所示。" +"[paths]节加上default-push条目，如下所" +"示。" #. type: Content of: #: ../en/ch02-tour-basic.xml:973 @@ -5248,8 +5252,8 @@ "repository, but the repository is understandably not set up to let anonymous " "users push to it." msgstr "" -"在本例中，我们可以看到准备向远程版本库推送的变更，但是该版本库并不允许匿名" -"用户推送。" +"在本例中，我们可以看到准备向远程版本库推送的变更，但是该版本库并不允许匿名用户" +"推送。" #. type: Content of: <book><chapter><sect1><title> #: ../en/ch02-tour-basic.xml:993 @@ -5263,6 +5267,8 @@ "exists. The <command>hg init</command> command creates a new, empty " "Mercurial repository." msgstr "" +"开始一个新项目和使用一个已有项目一样简单。<command>hg init</command>命令可以创" +"建一个新的，空的Mercurial版本库。 " #. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:1001 @@ -5270,6 +5276,7 @@ "This simply creates a repository named <filename>myproject</filename> in the " "current directory." msgstr "" +"在当前目录创建一个名为<filename>myproject</filename>的版本库就是这么简单。" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:1006 @@ -5277,6 +5284,8 @@ "We can tell that <filename>myproject</filename> is a Mercurial repository, " "because it contains a <filename>.hg</filename> directory." msgstr "" +"我们可以说<filename>myproject</filename>是一个Mercurial版本库，因为它包含了" +"<filename>.hg</filename>目录。" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:1012 @@ -5285,12 +5294,14 @@ "into place, and tell Mercurial to start tracking them using the <command>hg " "add</command> command." msgstr "" +"如果我们想将一些已经存在的文件加入版本库，我们将它拷贝到目录下，然后执行" +"<command>hg add</command>命令，告诉Mercurial开始管理它们。" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:1018 msgid "" "Once we are satisfied that our project looks right, we commit our changes." -msgstr "" +msgstr "当对项目的状况满意时，我们就提交的变更。" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:1023 @@ -5300,6 +5311,8 @@ "use it on the smallest of projects that we might not have considered with a " "more complicated tool." msgstr "" +"只需要几分钟就可以在一个新的项目上使用Mercurial，这时它的魅力之一。现在版本控" +"制做起来非常方便，我们可以在很小的不需要复杂工具的项目上使用它。" #. type: Content of: <book><chapter><title> #: ../en/ch03-tour-merge.xml:5