Commits

Dongsheng Song committed 39297bc

Update Chinese translation

Comments (0)

Files changed (2)

contrib/hg-package

     exit 1
   fi
 
-  for l in en zh; do
+  for l in en fr it zh; do
     if [ -f "hgbook-${l}-${rev_id}.epub.gz" ] ; then
       python googlecode_upload.py --user="${upload_user}" --password="${upload_pass}" \
           -p "i18n-zh" -l "Type-Docs,book,hgbook,hg,mercurial,ebook" \
 # This file is distributed under the same license as the hgbook.
 #
 # Authors:
-# Dongsheng Song <dongsheng.song@gmail.com>, 2009
-# Zhaoping Sun <zhaopingsun@gmail.com>, 2009
+# Dongsheng Song <dongsheng.song@gmail.com>, 2009, 2010, 2011
+# Zhaoping Sun <zhaopingsun@gmail.com>, 2009, 2010
 #
 # Check translation:
 #    msgfmt --statistics -c -o zh.mo zh.po
 # patchset          补丁集
 # pushing to        推到
 # pulling from      拉自,抓取
-# rename            重命名 
+# rename            重命名
 # repository        版本库
 # revert            恢复
 # revision          版本
 # versioned         受版本控制
 # working copy      工作副本
 # identifiers	    标识符
-# head revision	    领头版本 
+# head revision	    领头版本
 # ...
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: hgbook 1.2\n"
-"POT-Creation-Date: 2011-03-17 09:52+0800\n"
-"PO-Revision-Date: 2009-10-21 16:42+0800\n"
+"POT-Creation-Date: 2011-03-17 14:01+0800\n"
+"PO-Revision-Date: 2011-03-17 13:31+0800\n"
 "Last-Translator: 宋冬生 <songdonogsheng@live.cn>\n"
 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n"
 "Language: \n"
 "Sargent, Gokberk Hamurcu, Matthijs van der Vleuten, Michael Chermside, John "
 "Mulligan, Jordi Fita, Jon Parise."
 msgstr ""
+"Martin Geisler,Damien Cassou,Alexey Bakhirkin,Till Plewe,Dan Himes,Paul "
+"Sargent,Gokberk Hamurcu,Matthijs van der Vleuten,Michael Chermside,John "
+"Mulligan,Jordi Fita,Jon Parise。"
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:80
 msgstr ""
 "本书的目的是帮助你完成工作。基本上,你可以将书中的代码用于你的程序或文档。无需"
 "取得我们的许可,除非你直接复制大量的代码。举例来说,在程序中使用几段书中的代码"
-"无需许可。出售或发布含有O'Reilly书中示例的CD-ROM则需经许可。引用本书中的叙述或"
-"示例代码来回答问题无需许可。将书中的大量代码合并到你的产品文档中则需经许可。"
+"无需许可。出售或发布含有 O'Reilly 书中示例的 CD-ROM 则需经许可。引用本书中的叙"
+"述或示例代码来回答问题无需许可。将书中的大量代码合并到你的产品文档中则需经许"
+"可。"
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:181
 "978-0-596-xxxx-x.”"
 msgstr ""
 "虽然我们并不要求在引用本书的时候做版权归属声明,但如果你这样做了,我们将非常感"
-"激。版权归属声明通常包含标题,作者,发行者和ISBN。例如: “<emphasis>书名</"
-"emphasis> 某人著。 版权所有 2008 O’Reilly Media,Inc., 978-0-596-xxxx-x。”"
+"激。版权归属声明通常包含标题,作者,发行者和 ISBN。例如:“<emphasis>书名</"
+"emphasis>,某人著。 版权所有 2008 O’Reilly Media,Inc., 978-0-596-xxxx-x。”"
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:187
 "technology book, that means the book is available online through the O’Reilly "
 "Network Safari Bookshelf."
 msgstr ""
-"如果你在喜欢的技术图书的封面上看见Safari® Books Online的图标,这表示你你可以通"
-"过O'Reilly Network Safari Bookshelf在网上使用此书。"
+"如果你在喜欢的技术图书的封面上看见 Safari® Books Online 的图标,这表示你可以通"
+"过 O'Reilly Network Safari Bookshelf 在网上使用此书。"
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:202
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:17
-#, fuzzy
 msgid ""
 "The best version of Mercurial for Windows is TortoiseHg, which can be found "
 "at <ulink url=\"http://tortoisehg.org\">http://tortoisehg.org</ulink>.  This "
 "package has no external dependencies; it <quote>just works</quote>.  It "
 "provides both command line and graphical user interfaces."
 msgstr ""
-"Windows 中最好的 Mercurial 版本是TortoiseHg,它的主页地址是 <ulink url="
-"\"http://bitbucket.org/tortoisehg/stable/wiki/Home\">http://bitbucket.org/"
-"tortoisehg/stable/wiki/Home</ulink>。这个软件没有外部依赖,它可以<quote>独立工"
-"作</quote>,同时提供了命令行和图形用户界面。"
+"Windows 中最好的 Mercurial 版本是 TortoiseHg,它的主页地址是 <ulink url="
+"\"http://tortoisehg.org\">http://tortoisehg.org</ulink>。这个软件没有外部依赖"
+"关系,它可以<quote>独立工作</quote>。它同时提供了命令行和图形用户界面。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch02-tour-basic.xml:27
 "option>), while short options start with one (e.g. <option role=\"hg-opt-log"
 "\">-r</option>)."
 msgstr ""
+"长选项的前缀是两个破折号(例如 <option role=\"hg-opt-log\">--rev</option>),而"
+"短选项的前缀是一个破折号(例如 <option role=\"hg-opt-log\">-r</option>)。"
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:407
 "<option role=\"hg-opt-log\">-r</option> and <option role=\"hg-opt-log\">--"
 "rev</option> arguments."
 msgstr ""
+"选项的名称与用法在所有命令中始终一致。例如每个让你指定修改集标识或版本号的命令"
+"都接受 <option role=\"hg-opt-log\">-r</option> 和 <option role=\"hg-opt-log"
+"\">--rev</option> 参数。"
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:414
 "global\">--verbose</option>) option, and less when passed <option role=\"hg-"
 "opt-global\">-q</option> (or <option role=\"hg-opt-global\">--quiet</option>)."
 msgstr ""
+"对于大多数有打印输出的命令,当使用 <option role=\"hg-opt-global\">-v</option> "
+"(或 <option role=\"hg-opt-global\">--verbose</option>) 选项时输出更多,而使用 "
+"<option role=\"hg-opt-global\">-q</option> (或 <option role=\"hg-opt-global"
+"\">--quiet</option>) 选项时输出更少。"
 
 #. type: Content of: <book><chapter><sect1><note><title>
 #: ../en/ch02-tour-basic.xml:432
 "<option role=\"hg-opt-log\">-r</option>.  This consistent use of option names "
 "makes it easier to remember what options a particular command takes."
 msgstr ""
+"Mercurial 命令几乎总是使用一致的选项引用同样的概念。例如,对于处理修改集的命"
+"令,你总是可以用 <option role=\"hg-opt-log\">--rev</option> 或 <option role="
+"\"hg-opt-log\">-r</option> 来标识。这种一致性让你更容易记着命令接受的参数。"
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch02-tour-basic.xml:445
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:10
-#, fuzzy
 msgid ""
 "Mercurial does not work with files in your repository unless you tell it to "
 "manage them.  The <command role=\"hg-cmd\">hg status</command> command will "
 "tell you which files Mercurial doesn't know about; it uses a <quote><literal>?"
 "</literal></quote> to display such files."
 msgstr ""
-"Mercurial并不会管理你的版本库中的文件,除非你命令它去做。<command role=\"hg-"
-"cmd\">hg status</command>命令会告诉你哪些文件Mercurial没有跟踪;它用"
-"<quote><literal>?</literal></quote>来标识这样的文件"
+"Mercurial 并不会管理你的版本库中的文件,除非你命令它去做。<command role=\"hg-"
+"cmd\">hg status</command> 命令会告诉你哪些文件 Mercurial 没有跟踪;它用 "
+"<quote><literal>?</literal></quote> 来标识这样的文件"
 
 #
 #. type: Content of: <book><chapter><sect1><para>
 msgstr ""
 
 #
-#. 	&example.hg-interdiff; 
+#. 	&example.hg-interdiff;
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch13-mq-collab.xml:473
 msgid ""
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.