#: ../en/ch02-tour-basic.xml:726 @@ -4851,6 +4851,8 @@ "it's editing. This will cause nothing to happen to either the repository or " "the working directory." msgstr "" +"如果你在编辑日志的时候决定不再提交，只要退出编辑器同时不保存文件就可以了。这对" +"版本库和当前目录都没有任何影响。" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch02-tour-basic.xml:736 @@ -4865,6 +4867,9 @@ "produces output that is identical to <command role=\"hg-cmd\">hg log</" "command>, but it only displays the newest revision in the repository." msgstr "" +"提交完成后，我们就可以用<command role=\"hg-cmd\">hg tip</command>命令显示刚刚" +"创建的变更集。这个命令和<command role=\"hg-cmd\">hg log</command>的输出一样，" +"但是只显示版本库中最新的版本。" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch02-tour-basic.xml:746 @@ -4872,6 +4877,8 @@ "We refer to the newest revision in the repository as the <emphasis>tip " "revision</emphasis>, or simply the <emphasis>tip</emphasis>." msgstr "" +"我们通常把版本库中最新的版本称为<emphasis>tip版本</emphasis>或者简称为" +"<emphasis>tip</emphasis>。" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch02-tour-basic.xml:750 @@ -4883,6 +4890,11 @@ "patch</quote>. The use of <option role=\"hg-opt-tip\">-p</option> to print " "patches is another example of the consistent naming we mentioned earlier." msgstr "" +"顺便提一下，<command role=\"hg-cmd\">hg tip</command>命令可以接受很多和" +"<command role=\"hg-cmd\">hg log</command>命令一样的选项。如<option role=\"hg-" +"opt-global\">-v</option>选项的意思是<quote>详细的</quote>。<option role=\"hg-" +"opt-tip\">-p</option>的意思是<quote>输出补丁</quote>。使用<option role=\"hg-" +"opt-tip\">-p</option>输出补丁也是我们前面提到的一致性的另外一个例子。" #. type: Content of: <book><chapter><sect1><title> #: ../en/ch02-tour-basic.xml:762

# HG changeset patch # User Zhaoping Sun # Date 1259203900 18000 # Node ID 77fa81a32f2e3e03470585b9ef6a2c338dc72dd1 # Parent 5b6b0d5fc1b8a3087f9cb138d5268b6e9f71e2e9 2.7.5 zh translated ,1 fuzzy diff -r 5b6b0d5fc1b8 -r 77fa81a32f2e po/zh.po --- a/po/zh.po Wed Nov 25 08:08:20 2009 -0500 +++ b/po/zh.po Wed Nov 25 21:51:40 2009 -0500 @@ -4834,9 +4834,9 @@ "current directory that you happen to be visiting and its subdirectories." msgstr "" "和所有的Mercurial命令一样，如果我们不明确指出hg " -"commit命令要提交的文件名，它会在整个版本库的工作目录上执行。如果你以" -"前使用过CVS或者Subversion，那一定要注意，你可能仅仅希望提交当前目录与其子目录" -"的修改。" +"commit命令要提交的文件名，它会在整个版本库的工作目录上执行操作。如果" +"你以前使用过CVS或者Subversion，那一定要注意，你可能仅仅希望提交当前目录与其子" +"目录的修改。" #. type: Content of: #: ../en/ch02-tour-basic.xml:726 @@ -4851,6 +4851,8 @@ "it's editing. This will cause nothing to happen to either the repository or " "the working directory." msgstr "" +"如果你在编辑日志的时候决定不再提交，只要退出编辑器同时不保存文件就可以了。这对" +"版本库和当前目录都没有任何影响。" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch02-tour-basic.xml:736 @@ -4865,6 +4867,9 @@ "produces output that is identical to <command role=\"hg-cmd\">hg log</" "command>, but it only displays the newest revision in the repository." msgstr "" +"提交完成后，我们就可以用<command role=\"hg-cmd\">hg tip</command>命令显示刚刚" +"创建的变更集。这个命令和<command role=\"hg-cmd\">hg log</command>的输出一样，" +"但是只显示版本库中最新的版本。" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch02-tour-basic.xml:746 @@ -4872,6 +4877,8 @@ "We refer to the newest revision in the repository as the <emphasis>tip " "revision</emphasis>, or simply the <emphasis>tip</emphasis>." msgstr "" +"我们通常把版本库中最新的版本称为<emphasis>tip版本</emphasis>或者简称为" +"<emphasis>tip</emphasis>。" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch02-tour-basic.xml:750 @@ -4883,6 +4890,11 @@ "patch</quote>. The use of <option role=\"hg-opt-tip\">-p</option> to print " "patches is another example of the consistent naming we mentioned earlier." msgstr "" +"顺便提一下，<command role=\"hg-cmd\">hg tip</command>命令可以接受很多和" +"<command role=\"hg-cmd\">hg log</command>命令一样的选项。如<option role=\"hg-" +"opt-global\">-v</option>选项的意思是<quote>详细的</quote>。<option role=\"hg-" +"opt-tip\">-p</option>的意思是<quote>输出补丁</quote>。使用<option role=\"hg-" +"opt-tip\">-p</option>输出补丁也是我们前面提到的一致性的另外一个例子。" #. type: Content of: <book><chapter><sect1><title> #: ../en/ch02-tour-basic.xml:762