# HG changeset patch # User Zhaoping Sun # Date 1258599495 18000 # Node ID 02a588f8933a8fe6b81340a465deb79851f9c5a3 # Parent 2673789284c7a50c4f2501bbc33fd0a36cb0f106 2.4.1 first para zh translated diff -r 2673789284c7 -r 02a588f8933a po/zh.po --- a/po/zh.po Wed Nov 18 21:33:52 2009 -0500 +++ b/po/zh.po Wed Nov 18 21:58:15 2009 -0500 @@ -4116,7 +4116,7 @@ #. type: Content of: #: ../en/ch02-tour-basic.xml:267 msgid "Changesets, revisions, and talking to other people" -msgstr "修改集,版本,与其它用户交互" +msgstr "变更集,版本,与其它用户交互" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch02-tour-basic.xml:270 @@ -4128,7 +4128,10 @@ "will find that the word <quote>changeset</quote> is often compressed to " "<quote>change</quote> or (when written) <quote>cset</quote>, and sometimes a " "changeset is referred to as a <quote>revision</quote> or a <quote>rev</quote>." -msgstr "" +msgstr "英语是一种非常随便的语言,计算机史上也向来以混乱的术语为荣(如能用四个词" +"为什么要用一个呢?),就版本控制而言,有很多词和短语有相同的意思。如果你和别人讨论" +"Mercurial版本库的历史,你会发现<quote>变更集</quote>这个词常常被简化成<quote>变更</quote>" +"或者(写的时候)<quote>cset</quote>,有时候变更集也指一个<quote>版本</quote>或者<quote>rev</quote>。" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch02-tour-basic.xml:280