Commits

Dongsheng Song  committed 364d2ce

Update Chinese translation

* po/zh.po:
408 translated messages, 1620 untranslated messages.

  • Participants
  • Parent commits 8613844

Comments (0)

Files changed (1)

 msgstr ""
 "Project-Id-Version: hgbook 1.2\n"
 "POT-Creation-Date: 2009-04-18 10:05+0800\n"
-"PO-Revision-Date: 2009-04-05 12:10+0800\n"
+"PO-Revision-Date: 2009-04-18 11:50+0800\n"
 "Last-Translator: 宋冬生 <songdonogsheng@live.cn>\n"
 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n"
 "MIME-Version: 1.0\n"
 "If you are using a Unix-like system that has a sufficiently recent version of "
 "Python (2.3 or newer) available, it is easy to install Mercurial from source."
 msgstr ""
+"如果你使用类 Unix 系统,并且有足够新的 Python (2.3 更新),从源代码安装 "
+"Mercurial 就很容易了。"
 
 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
 #: ../en/appC-srcinstall.xml:14
 "Download a recent source tarball from <ulink url=\"http://www.selenic.com/"
 "mercurial/download\">http://www.selenic.com/mercurial/download</ulink>."
 msgstr ""
+"从 <ulink url=\"http://www.selenic.com/mercurial/download\">http://www."
+"selenic.com/mercurial/download</ulink> 下载最新的源代码。"
 
 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
 #: ../en/appC-srcinstall.xml:17
 msgid "Unpack the tarball:"
-msgstr ""
+msgstr "解压:"
 
 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para>
 #: ../en/appC-srcinstall.xml:20
 msgid ""
 "Go into the source directory and run the installer script.  This will build "
 "Mercurial and install it in your home directory."
-msgstr ""
+msgstr "进入源代码目录,执行安装教本。这会构建 Mercurial,安装到你的家目录。"
 
 #. type: Content of: <book><appendix><sect1><para>
 #: ../en/appC-srcinstall.xml:27
 "subdirectory of your home directory.  Don't forget to make sure that this "
 "directory is present in your shell's search path."
 msgstr ""
+"安装完成后,Mercurial 就位于家目录的 <literal>bin</literal> 子目录。不要忘记将"
+"这个目录加入到你的可执行文件搜索路径中。"
 
 #. type: Content of: <book><appendix><sect1><para>
 #: ../en/appC-srcinstall.xml:32
 "see where the contents of the <literal>mercurial</literal> directory were "
 "installed to."
 msgstr ""
+"你可能需要设置环境变量 <envar>PYTHONPATH</envar>,以便 Mercurial 可执行文件能"
+"找到 Mercurial 包。例如,在我的笔记本电脑中,必须设置为 <literal>/home/bos/"
+"lib/python</literal>。你需要使用的路径依赖于 Python 的构建方式,这很容易找出"
+"来。如果你不确定,仔细察看上面的安装脚本输出,检查包含 <literal>mercurial</"
+"literal> 目录的内容的安装位置。"
 
 #. type: Content of: <book><appendix><sect1><title>
 #: ../en/appC-srcinstall.xml:44
 "user</quote>.  Unless you intend to hack on Mercurial, I strongly suggest "
 "that you use a binary package instead."
 msgstr ""
+"在 Windows 中构建和安装 Mercurial 需要各种工具,相当多的技术背景,以及足够的耐"
+"心。如果你是一个<quote>初级用户</quote>,我<emphasis>很不赞成</emphasis>这个方"
+"法。我强烈建议你使用二进制安装包,除非你想深入研究 Mercurial 本身。"
 
 #. type: Content of: <book><appendix><sect1><para>
 #: ../en/appC-srcinstall.xml:53
 "selenic.com/mercurial/wiki/index.cgi/WindowsInstall</ulink>, and expect the "
 "process to involve a lot of fiddly work."
 msgstr ""
+"If you are intent on building Mercurial from source on Windows, follow the "
+"<quote>hard way</quote> directions on the Mercurial wiki at <ulink url="
+"\"http://www.selenic.com/mercurial/wiki/index.cgi/WindowsInstall\">http://www."
+"selenic.com/mercurial/wiki/index.cgi/WindowsInstall</ulink>, and expect the "
+"process to involve a lot of fiddly work."
 
 #. type: Content of: <book><appendix><title>
 #: ../en/appD-license.xml:5
 msgid "Open Publication License"
-msgstr ""
+msgstr "开放出版协议"
 
 #. type: Content of: <book><appendix><para>
 #: ../en/appD-license.xml:7
 msgid "Version 1.0, 8 June 1999"
-msgstr ""
+msgstr "版本 1.0,1999 年 6 月 8 日。"
 
 #. type: Content of: <book><appendix><sect1><title>
 #: ../en/appD-license.xml:10
 "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>,同时提供了命令行和图形用户界面。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch01-tour-basic.xml:27
 "Lee Cantey publishes an installer of Mercurial for Mac OS X at <ulink url="
 "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>."
 msgstr ""
+"Lee Cantey 为  Mac OS X 在 <ulink url=\"http://mercurial.berkwood.com"
+"\">http://mercurial.berkwood.com</ulink> 发布了 Mercurial 安装程序。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch01-tour-basic.xml:35
 "version information that it prints isn't so important; it's whether it prints "
 "anything at all that we care about."
 msgstr ""
+"首先,我们使用 <command role=\"hg-cmd\">hg version</command> 命令检查 "
+"Mercurial 是否正确安装。它打印出来的实际版本信息并不重要;我们只关心它是否能打"
+"印出我们需要的信息。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch01-tour-basic.xml:84
 "what each does.  If you ask for help on a specific command (as below), it "
 "prints more detailed information."
 msgstr ""
+"Mercurial 内置了帮助系统。当你不记得如何执行一个命令时,它会给你重要的帮助。如"
+"果你完全没有头绪,那就直接运行 <command role=\"hg-cmd\">hg help</command>;它"
+"会给出命令的简短列表,还描述了每个命令的作用。如果你需要具体命令的帮助(下述),"
+"它会给出更详细的信息。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-tour-basic.xml:97
 "<option role=\"hg-opt-global\">--verbose</option>, and tells Mercurial to "
 "print more information than it usually would."
 msgstr ""
+"要获得更多的详细信息(通常不需要),可以执行 <command role=\"hg-cmd\">hg help "
+"<option role=\"hg-opt-global\">-v</option></command>。选项 <option role=\"hg-"
+"opt-global\">-v</option> 是 <option role=\"hg-opt-global\">--verbose</option> "
+"的短格式,告诉 Mercurial 要打印通常不需要的更多信息。"
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch01-tour-basic.xml:108
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch03-concepts.xml:453
-#, fuzzy
 msgid "Merging changes"
-msgstr "共享修改"
+msgstr "合并修改"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-concepts.xml:455
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch03-concepts.xml:525
-#, fuzzy
 msgid "Merging and renames"
-msgstr "合并顶点"
+msgstr "合并与改名"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-concepts.xml:527
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch04-daily.xml:73
-#, fuzzy
 msgid "Mercurial tracks files, not directories"
-msgstr "旁白: Mercurial 只跟踪文件,不跟踪目录"
+msgstr "Mercurial 只跟踪文件,不跟踪目录"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch04-daily.xml:75
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch04-daily.xml:339
-#, fuzzy
 msgid "Behavior of the <command role=\"hg-cmd\">hg copy</command> command"
 msgstr "命令 <command role=\"hg-cmd\">hg copy</command> 的特性"
 
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch04-daily.xml:551
-#, fuzzy
 msgid "Dealing with tricky merges"
-msgstr "处理已经提交的修改"
+msgstr "合并的技巧"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch04-daily.xml:553
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch04-daily.xml:655
-#, fuzzy
 msgid "Resolving a file merge"
-msgstr "执行合并"
+msgstr "合并文件"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch04-daily.xml:657
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-collab.xml:199
-#, fuzzy
 msgid "A hosted central repository"
-msgstr "单一中央版本库"
+msgstr "托管的中央版本库"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-collab.xml:201
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch05-collab.xml:1524
-#, fuzzy
 msgid "System-wide configuration"
-msgstr "基本 CGI 配置"
+msgstr "全局配置"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-collab.xml:1526
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-collab.xml:1540
-#, fuzzy
 msgid "Making Mercurial more trusting"
-msgstr "安装 Mercurial"
+msgstr " Mercurial 更可信"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-collab.xml:1542
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch06-filenames.xml:272
-#, fuzzy
 msgid "Permanently ignoring unwanted files and directories"
-msgstr "忽略不需要的文件和目录"
+msgstr "始终忽略不需要的文件和目录"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch06-filenames.xml:274
 msgstr ""
 
 #
-#. 	&example.hg-interdiff; 
+#. 	&example.hg-interdiff;
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch12-mq-collab.xml:466
 msgid ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch13-hgext.xml:484
-#, fuzzy
 msgid "Changing the behavior of patchbombs"
 msgstr "修改 patchbomb 的行为"