hgbook
changeset 711:364d2ce9e055
Update Chinese translation
* po/zh.po:
408 translated messages, 1620 untranslated messages.
* po/zh.po:
408 translated messages, 1620 untranslated messages.
author | Dongsheng Song <songdongsheng@live.cn> |
---|---|
date | Sat Apr 18 11:52:33 2009 +0800 (2009-04-18) |
parents | 8613844dd2cf |
children | e8763d4b37b1 |
files | po/zh.po |
line diff
1.1 --- a/po/zh.po Sat Apr 18 10:09:11 2009 +0800 1.2 +++ b/po/zh.po Sat Apr 18 11:52:33 2009 +0800 1.3 @@ -42,7 +42,7 @@ 1.4 msgstr "" 1.5 "Project-Id-Version: hgbook 1.2\n" 1.6 "POT-Creation-Date: 2009-04-18 10:05+0800\n" 1.7 -"PO-Revision-Date: 2009-04-05 12:10+0800\n" 1.8 +"PO-Revision-Date: 2009-04-18 11:50+0800\n" 1.9 "Last-Translator: 宋冬生 <songdonogsheng@live.cn>\n" 1.10 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n" 1.11 "MIME-Version: 1.0\n" 1.12 @@ -875,6 +875,8 @@ 1.13 "If you are using a Unix-like system that has a sufficiently recent version of " 1.14 "Python (2.3 or newer) available, it is easy to install Mercurial from source." 1.15 msgstr "" 1.16 +"如果你使用类 Unix 系统,并且有足够新的 Python (2.3 更新),从源代码安装 " 1.17 +"Mercurial 就很容易了。" 1.18 1.19 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para> 1.20 #: ../en/appC-srcinstall.xml:14 1.21 @@ -882,18 +884,20 @@ 1.22 "Download a recent source tarball from <ulink url=\"http://www.selenic.com/" 1.23 "mercurial/download\">http://www.selenic.com/mercurial/download</ulink>." 1.24 msgstr "" 1.25 +"从 <ulink url=\"http://www.selenic.com/mercurial/download\">http://www." 1.26 +"selenic.com/mercurial/download</ulink> 下载最新的源代码。" 1.27 1.28 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para> 1.29 #: ../en/appC-srcinstall.xml:17 1.30 msgid "Unpack the tarball:" 1.31 -msgstr "" 1.32 +msgstr "解压:" 1.33 1.34 #. type: Content of: <book><appendix><sect1><orderedlist><listitem><para> 1.35 #: ../en/appC-srcinstall.xml:20 1.36 msgid "" 1.37 "Go into the source directory and run the installer script. This will build " 1.38 "Mercurial and install it in your home directory." 1.39 -msgstr "" 1.40 +msgstr "进入源代码目录,执行安装教本。这会构建 Mercurial,安装到你的家目录。" 1.41 1.42 #. type: Content of: <book><appendix><sect1><para> 1.43 #: ../en/appC-srcinstall.xml:27 1.44 @@ -902,6 +906,8 @@ 1.45 "subdirectory of your home directory. Don't forget to make sure that this " 1.46 "directory is present in your shell's search path." 1.47 msgstr "" 1.48 +"安装完成后,Mercurial 就位于家目录的 <literal>bin</literal> 子目录。不要忘记将" 1.49 +"这个目录加入到你的可执行文件搜索路径中。" 1.50 1.51 #. type: Content of: <book><appendix><sect1><para> 1.52 #: ../en/appC-srcinstall.xml:32 1.53 @@ -915,6 +921,11 @@ 1.54 "see where the contents of the <literal>mercurial</literal> directory were " 1.55 "installed to." 1.56 msgstr "" 1.57 +"你可能需要设置环境变量 <envar>PYTHONPATH</envar>,以便 Mercurial 可执行文件能" 1.58 +"找到 Mercurial 包。例如,在我的笔记本电脑中,必须设置为 <literal>/home/bos/" 1.59 +"lib/python</literal>。你需要使用的路径依赖于 Python 的构建方式,这很容易找出" 1.60 +"来。如果你不确定,仔细察看上面的安装脚本输出,检查包含 <literal>mercurial</" 1.61 +"literal> 目录的内容的安装位置。" 1.62 1.63 #. type: Content of: <book><appendix><sect1><title> 1.64 #: ../en/appC-srcinstall.xml:44 1.65 @@ -930,6 +941,9 @@ 1.66 "user</quote>. Unless you intend to hack on Mercurial, I strongly suggest " 1.67 "that you use a binary package instead." 1.68 msgstr "" 1.69 +"在 Windows 中构建和安装 Mercurial 需要各种工具,相当多的技术背景,以及足够的耐" 1.70 +"心。如果你是一个<quote>初级用户</quote>,我<emphasis>很不赞成</emphasis>这个方" 1.71 +"法。我强烈建议你使用二进制安装包,除非你想深入研究 Mercurial 本身。" 1.72 1.73 #. type: Content of: <book><appendix><sect1><para> 1.74 #: ../en/appC-srcinstall.xml:53 1.75 @@ -940,16 +954,21 @@ 1.76 "selenic.com/mercurial/wiki/index.cgi/WindowsInstall</ulink>, and expect the " 1.77 "process to involve a lot of fiddly work." 1.78 msgstr "" 1.79 +"If you are intent on building Mercurial from source on Windows, follow the " 1.80 +"<quote>hard way</quote> directions on the Mercurial wiki at <ulink url=" 1.81 +"\"http://www.selenic.com/mercurial/wiki/index.cgi/WindowsInstall\">http://www." 1.82 +"selenic.com/mercurial/wiki/index.cgi/WindowsInstall</ulink>, and expect the " 1.83 +"process to involve a lot of fiddly work." 1.84 1.85 #. type: Content of: <book><appendix><title> 1.86 #: ../en/appD-license.xml:5 1.87 msgid "Open Publication License" 1.88 -msgstr "" 1.89 +msgstr "开放出版协议" 1.90 1.91 #. type: Content of: <book><appendix><para> 1.92 #: ../en/appD-license.xml:7 1.93 msgid "Version 1.0, 8 June 1999" 1.94 -msgstr "" 1.95 +msgstr "版本 1.0,1999 年 6 月 8 日。" 1.96 1.97 #. type: Content of: <book><appendix><sect1><title> 1.98 #: ../en/appD-license.xml:10 1.99 @@ -2254,6 +2273,10 @@ 1.100 "external dependencies; it <quote>just works</quote>. It provides both " 1.101 "command line and graphical user interfaces." 1.102 msgstr "" 1.103 +"Windows 中最好的 Mercurial 版本是TortoiseHg,它的主页地址是 <ulink url=" 1.104 +"\"http://bitbucket.org/tortoisehg/stable/wiki/Home\">http://bitbucket.org/" 1.105 +"tortoisehg/stable/wiki/Home</ulink>。这个软件没有外部依赖,它可以<quote>独立工" 1.106 +"作</quote>,同时提供了命令行和图形用户界面。" 1.107 1.108 #. type: Content of: <book><chapter><sect1><sect2><title> 1.109 #: ../en/ch01-tour-basic.xml:27 1.110 @@ -2266,6 +2289,8 @@ 1.111 "Lee Cantey publishes an installer of Mercurial for Mac OS X at <ulink url=" 1.112 "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>." 1.113 msgstr "" 1.114 +"Lee Cantey 为 Mac OS X 在 <ulink url=\"http://mercurial.berkwood.com" 1.115 +"\">http://mercurial.berkwood.com</ulink> 发布了 Mercurial 安装程序。" 1.116 1.117 #. type: Content of: <book><chapter><sect1><sect2><title> 1.118 #: ../en/ch01-tour-basic.xml:35 1.119 @@ -2339,6 +2364,9 @@ 1.120 "version information that it prints isn't so important; it's whether it prints " 1.121 "anything at all that we care about." 1.122 msgstr "" 1.123 +"首先,我们使用 <command role=\"hg-cmd\">hg version</command> 命令检查 " 1.124 +"Mercurial 是否正确安装。它打印出来的实际版本信息并不重要;我们只关心它是否能打" 1.125 +"印出我们需要的信息。" 1.126 1.127 #. type: Content of: <book><chapter><sect1><sect2><title> 1.128 #: ../en/ch01-tour-basic.xml:84 1.129 @@ -2355,6 +2383,10 @@ 1.130 "what each does. If you ask for help on a specific command (as below), it " 1.131 "prints more detailed information." 1.132 msgstr "" 1.133 +"Mercurial 内置了帮助系统。当你不记得如何执行一个命令时,它会给你重要的帮助。如" 1.134 +"果你完全没有头绪,那就直接运行 <command role=\"hg-cmd\">hg help</command>;它" 1.135 +"会给出命令的简短列表,还描述了每个命令的作用。如果你需要具体命令的帮助(下述)," 1.136 +"它会给出更详细的信息。" 1.137 1.138 #. type: Content of: <book><chapter><sect1><sect2><para> 1.139 #: ../en/ch01-tour-basic.xml:97 1.140 @@ -2365,6 +2397,10 @@ 1.141 "<option role=\"hg-opt-global\">--verbose</option>, and tells Mercurial to " 1.142 "print more information than it usually would." 1.143 msgstr "" 1.144 +"要获得更多的详细信息(通常不需要),可以执行 <command role=\"hg-cmd\">hg help " 1.145 +"<option role=\"hg-opt-global\">-v</option></command>。选项 <option role=\"hg-" 1.146 +"opt-global\">-v</option> 是 <option role=\"hg-opt-global\">--verbose</option> " 1.147 +"的短格式,告诉 Mercurial 要打印通常不需要的更多信息。" 1.148 1.149 #. type: Content of: <book><chapter><sect1><title> 1.150 #: ../en/ch01-tour-basic.xml:108 1.151 @@ -4524,9 +4560,8 @@ 1.152 1.153 #. type: Content of: <book><chapter><sect1><sect2><title> 1.154 #: ../en/ch03-concepts.xml:453 1.155 -#, fuzzy 1.156 msgid "Merging changes" 1.157 -msgstr "共享修改" 1.158 +msgstr "合并修改" 1.159 1.160 #. type: Content of: <book><chapter><sect1><sect2><para> 1.161 #: ../en/ch03-concepts.xml:455 1.162 @@ -4629,9 +4664,8 @@ 1.163 1.164 #. type: Content of: <book><chapter><sect1><sect2><title> 1.165 #: ../en/ch03-concepts.xml:525 1.166 -#, fuzzy 1.167 msgid "Merging and renames" 1.168 -msgstr "合并顶点" 1.169 +msgstr "合并与改名" 1.170 1.171 #. type: Content of: <book><chapter><sect1><sect2><para> 1.172 #: ../en/ch03-concepts.xml:527 1.173 @@ -5011,9 +5045,8 @@ 1.174 1.175 #. type: Content of: <book><chapter><sect1><sect2><title> 1.176 #: ../en/ch04-daily.xml:73 1.177 -#, fuzzy 1.178 msgid "Mercurial tracks files, not directories" 1.179 -msgstr "旁白: Mercurial 只跟踪文件,不跟踪目录" 1.180 +msgstr "Mercurial 只跟踪文件,不跟踪目录" 1.181 1.182 #. type: Content of: <book><chapter><sect1><sect2><para> 1.183 #: ../en/ch04-daily.xml:75 1.184 @@ -5348,7 +5381,6 @@ 1.185 1.186 #. type: Content of: <book><chapter><sect1><sect2><title> 1.187 #: ../en/ch04-daily.xml:339 1.188 -#, fuzzy 1.189 msgid "Behavior of the <command role=\"hg-cmd\">hg copy</command> command" 1.190 msgstr "命令 <command role=\"hg-cmd\">hg copy</command> 的特性" 1.191 1.192 @@ -5621,9 +5653,8 @@ 1.193 1.194 #. type: Content of: <book><chapter><sect1><title> 1.195 #: ../en/ch04-daily.xml:551 1.196 -#, fuzzy 1.197 msgid "Dealing with tricky merges" 1.198 -msgstr "处理已经提交的修改" 1.199 +msgstr "合并的技巧" 1.200 1.201 #. type: Content of: <book><chapter><sect1><para> 1.202 #: ../en/ch04-daily.xml:553 1.203 @@ -5757,9 +5788,8 @@ 1.204 1.205 #. type: Content of: <book><chapter><sect1><sect2><title> 1.206 #: ../en/ch04-daily.xml:655 1.207 -#, fuzzy 1.208 msgid "Resolving a file merge" 1.209 -msgstr "执行合并" 1.210 +msgstr "合并文件" 1.211 1.212 #. type: Content of: <book><chapter><sect1><sect2><para> 1.213 #: ../en/ch04-daily.xml:657 1.214 @@ -6047,9 +6077,8 @@ 1.215 1.216 #. type: Content of: <book><chapter><sect1><sect2><title> 1.217 #: ../en/ch05-collab.xml:199 1.218 -#, fuzzy 1.219 msgid "A hosted central repository" 1.220 -msgstr "单一中央版本库" 1.221 +msgstr "托管的中央版本库" 1.222 1.223 #. type: Content of: <book><chapter><sect1><sect2><para> 1.224 #: ../en/ch05-collab.xml:201 1.225 @@ -7772,9 +7801,8 @@ 1.226 1.227 #. type: Content of: <book><chapter><sect1><title> 1.228 #: ../en/ch05-collab.xml:1524 1.229 -#, fuzzy 1.230 msgid "System-wide configuration" 1.231 -msgstr "基本 CGI 配置" 1.232 +msgstr "全局配置" 1.233 1.234 #. type: Content of: <book><chapter><sect1><para> 1.235 #: ../en/ch05-collab.xml:1526 1.236 @@ -7796,9 +7824,8 @@ 1.237 1.238 #. type: Content of: <book><chapter><sect1><sect2><title> 1.239 #: ../en/ch05-collab.xml:1540 1.240 -#, fuzzy 1.241 msgid "Making Mercurial more trusting" 1.242 -msgstr "安装 Mercurial" 1.243 +msgstr "让 Mercurial 更可信" 1.244 1.245 #. type: Content of: <book><chapter><sect1><sect2><para> 1.246 #: ../en/ch05-collab.xml:1542 1.247 @@ -8200,9 +8227,8 @@ 1.248 1.249 #. type: Content of: <book><chapter><sect1><title> 1.250 #: ../en/ch06-filenames.xml:272 1.251 -#, fuzzy 1.252 msgid "Permanently ignoring unwanted files and directories" 1.253 -msgstr "忽略不需要的文件和目录" 1.254 +msgstr "始终忽略不需要的文件和目录" 1.255 1.256 #. type: Content of: <book><chapter><sect1><para> 1.257 #: ../en/ch06-filenames.xml:274 1.258 @@ -16036,7 +16062,7 @@ 1.259 msgstr "" 1.260 1.261 # 1.262 -#. &example.hg-interdiff; 1.263 +#. &example.hg-interdiff; 1.264 #. type: Content of: <book><chapter><sect1><sect2><para> 1.265 #: ../en/ch12-mq-collab.xml:466 1.266 msgid "" 1.267 @@ -16721,7 +16747,6 @@ 1.268 1.269 #. type: Content of: <book><chapter><sect1><sect2><title> 1.270 #: ../en/ch13-hgext.xml:484 1.271 -#, fuzzy 1.272 msgid "Changing the behavior of patchbombs" 1.273 msgstr "修改 patchbomb 的行为" 1.274