hgbook
changeset 660:f7add9f718a8
Update Chinese translation
author | Dongsheng Song <dongsheng.song@gmail.com> |
---|---|
date | Tue Mar 31 10:02:16 2009 +0800 (2009-03-31) |
parents | 8d130de70ebe |
children | 65b82a891cf7 |
files | po/zh.po |
line diff
1.1 --- a/po/zh.po Tue Mar 31 09:25:14 2009 +0800 1.2 +++ b/po/zh.po Tue Mar 31 10:02:16 2009 +0800 1.3 @@ -5,9 +5,6 @@ 1.4 # Authors: 1.5 # Dongsheng Song <dongsheng.song@gmail.com>, 2009 1.6 # 1.7 -# Update to new pot: 1.8 -# msgmerge --update zh.po hgbook.pot 1.9 -# 1.10 # Check translation: 1.11 # msgfmt --statistics -c -o zh.mo zh.po 1.12 # 1.13 @@ -23,6 +20,7 @@ 1.14 # checkout 检出 1.15 # remove 移除(从版本库删除) 1.16 # delete 删除(只从文件系统删除) 1.17 +# filelog 文件日志 1.18 # patchset 补丁集 1.19 # pushing to 推到 1.20 # pulling from 拉自,抓取 1.21 @@ -30,10 +28,12 @@ 1.22 # repository 版本库 1.23 # revert 恢复 1.24 # revision 版本 1.25 +# revlog 版本日志 1.26 # tag 标签 1.27 # tip 顶点 1.28 # undo 撤销 1.29 # unversioned 未版本控制 1.30 +# updated 更新到,同步到(适用于旧版本) 1.31 # versioned 受版本控制 1.32 # working copy 工作副本 1.33 # ... 1.34 @@ -42,7 +42,7 @@ 1.35 msgstr "" 1.36 "Project-Id-Version: hgbook 1.2\n" 1.37 "POT-Creation-Date: 2009-03-30 21:36+0800\n" 1.38 -"PO-Revision-Date: 2009-03-20 17:12+0800\n" 1.39 +"PO-Revision-Date: 2009-03-31 10:12+0800\n" 1.40 "Last-Translator: \n" 1.41 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n" 1.42 "MIME-Version: 1.0\n" 1.43 @@ -1909,7 +1909,7 @@ 1.44 #. type: Content of: <book><preface><sect1><sect2><sect3><title> 1.45 #: ../en/ch00-preface.xml:276 1.46 msgid "The forking non-problem" 1.47 -msgstr "" 1.48 +msgstr "分叉不是问题" 1.49 1.50 #. type: Content of: <book><preface><sect1><sect2><sect3><para> 1.51 #: ../en/ch00-preface.xml:278 1.52 @@ -2919,7 +2919,7 @@ 1.53 msgid "" 1.54 "Graphical history of the <filename class=\"directory\">hello</filename> " 1.55 "repository" 1.56 -msgstr "" 1.57 +msgstr "版本库 <filename class=\"directory\">hello</filename> 的历史图" 1.58 1.59 #. type: Content of: <book><chapter><sect1><figure> 1.60 #: ../en/ch01-tour-basic.xml:260 ../en/ch02-tour-merge.xml:50 1.61 @@ -3760,6 +3760,8 @@ 1.62 "filename> and <filename class=\"directory\">my-new-hello</filename> " 1.63 "repositories" 1.64 msgstr "" 1.65 +"<filename class=\"directory\">my-hello</filename> 与 <filename class=" 1.66 +"\"directory\">my-new-hello</filename> 最新的历史分叉" 1.67 1.68 #. type: Content of: <book><chapter><sect1><figure><mediaobject> 1.69 #: ../en/ch02-tour-merge.xml:51 1.70 @@ -3803,6 +3805,8 @@ 1.71 "Repository contents after pulling from <filename class=\"directory\">my-" 1.72 "hello</filename> into <filename class=\"directory\">my-new-hello</filename>" 1.73 msgstr "" 1.74 +"从 <filename class=\"directory\">my-hello</filename> 拉到 <filename class=" 1.75 +"\"directory\">my-new-hello</filename> 之后版本库的内容" 1.76 1.77 #. type: Content of: <book><chapter><sect1><sect2><figure> 1.78 #: ../en/ch02-tour-merge.xml:78 ../en/ch02-tour-merge.xml:125 1.79 @@ -3863,7 +3867,7 @@ 1.80 #. type: Content of: <book><chapter><sect1><sect2><figure><title> 1.81 #: ../en/ch02-tour-merge.xml:123 1.82 msgid "Working directory and repository during merge, and following commit" 1.83 -msgstr "" 1.84 +msgstr "在合并期间,以及提交之后的工作目录与版本库" 1.85 1.86 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.87 #: ../en/ch02-tour-merge.xml:126 1.88 @@ -3930,7 +3934,7 @@ 1.89 #. type: Content of: <book><chapter><sect1><figure><title> 1.90 #: ../en/ch02-tour-merge.xml:180 1.91 msgid "Conflicting changes to a document" 1.92 -msgstr "" 1.93 +msgstr "冲突的修改" 1.94 1.95 #. type: Content of: <book><chapter><sect1><figure><mediaobject> 1.96 #: ../en/ch02-tour-merge.xml:182 1.97 @@ -4029,7 +4033,7 @@ 1.98 #. type: Content of: <book><chapter><sect1><sect2><figure><title> 1.99 #: ../en/ch02-tour-merge.xml:248 1.100 msgid "Using <command>kdiff3</command> to merge versions of a file" 1.101 -msgstr "" 1.102 +msgstr "使用 <command>kdiff3</command> 合并文件的不同版本" 1.103 1.104 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.105 #: ../en/ch02-tour-merge.xml:251 1.106 @@ -4276,7 +4280,7 @@ 1.107 #: ../en/ch03-concepts.xml:53 1.108 msgid "" 1.109 "Relationships between files in working directory and filelogs in repository" 1.110 -msgstr "" 1.111 +msgstr "工作目录中的文件与版本库中的文件日志之间的关系" 1.112 1.113 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.114 #: ../en/ch03-concepts.xml:56 1.115 @@ -4341,7 +4345,7 @@ 1.116 #. type: Content of: <book><chapter><sect1><sect2><figure><title> 1.117 #: ../en/ch03-concepts.xml:103 1.118 msgid "Metadata relationships" 1.119 -msgstr "" 1.120 +msgstr "元数据之间的关系" 1.121 1.122 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.123 #: ../en/ch03-concepts.xml:105 1.124 @@ -4452,7 +4456,7 @@ 1.125 #. type: Content of: <book><chapter><sect1><sect2><figure><title> 1.126 #: ../en/ch03-concepts.xml:188 1.127 msgid "Snapshot of a revlog, with incremental deltas" 1.128 -msgstr "" 1.129 +msgstr "版本日志的快照,以及增量差异" 1.130 1.131 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.132 #: ../en/ch03-concepts.xml:190 1.133 @@ -4482,7 +4486,7 @@ 1.134 #. type: Content of: <book><chapter><sect1><sect2><sect3><title> 1.135 #: ../en/ch03-concepts.xml:210 1.136 msgid "Aside: the influence of video compression" 1.137 -msgstr "" 1.138 +msgstr "旁白: 视频压缩的影响" 1.139 1.140 #. type: Content of: <book><chapter><sect1><sect2><sect3><para> 1.141 #: ../en/ch03-concepts.xml:212 1.142 @@ -4589,7 +4593,7 @@ 1.143 #. type: Content of: <book><chapter><sect1><figure><title> 1.144 #: ../en/ch03-concepts.xml:292 1.145 msgid "The conceptual structure of a revlog" 1.146 -msgstr "" 1.147 +msgstr "版本日志的设计结构" 1.148 1.149 #. type: Content of: <book><chapter><sect1><figure><mediaobject> 1.150 #: ../en/ch03-concepts.xml:294 1.151 @@ -4659,7 +4663,7 @@ 1.152 #. type: Content of: <book><chapter><sect1><sect2><figure><title> 1.153 #: ../en/ch03-concepts.xml:343 1.154 msgid "The working directory can have two parents" 1.155 -msgstr "" 1.156 +msgstr "工作目录可以有两个父亲" 1.157 1.158 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.159 #: ../en/ch03-concepts.xml:345 1.160 @@ -4678,7 +4682,7 @@ 1.161 #. type: Content of: <book><chapter><sect1><sect2><figure><title> 1.162 #: ../en/ch03-concepts.xml:357 1.163 msgid "The working directory gains new parents after a commit" 1.164 -msgstr "" 1.165 +msgstr "提交之后,工作目录的父亲就改变了" 1.166 1.167 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.168 #: ../en/ch03-concepts.xml:360 1.169 @@ -4727,7 +4731,7 @@ 1.170 #. type: Content of: <book><chapter><sect1><sect2><figure><title> 1.171 #: ../en/ch03-concepts.xml:398 1.172 msgid "The working directory, updated to an older changeset" 1.173 -msgstr "" 1.174 +msgstr "同步到旧修改集的工作目录" 1.175 1.176 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.177 #: ../en/ch03-concepts.xml:401 1.178 @@ -4750,7 +4754,7 @@ 1.179 #. type: Content of: <book><chapter><sect1><sect2><figure><title> 1.180 #: ../en/ch03-concepts.xml:418 1.181 msgid "After a commit made while synced to an older changeset" 1.182 -msgstr "" 1.183 +msgstr "对同步到旧修改集的工作目录提交之后" 1.184 1.185 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.186 #: ../en/ch03-concepts.xml:421 1.187 @@ -4799,7 +4803,7 @@ 1.188 #. type: Content of: <book><chapter><sect1><sect2><figure><title> 1.189 #: ../en/ch03-concepts.xml:460 1.190 msgid "Merging two heads" 1.191 -msgstr "" 1.192 +msgstr "合并两个顶点" 1.193 1.194 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.195 #: ../en/ch03-concepts.xml:462 1.196 @@ -9384,7 +9388,7 @@ 1.197 msgid "" 1.198 "Backing out a change using the <command role=\"hg-cmd\">hg backout</command> " 1.199 "command" 1.200 -msgstr "" 1.201 +msgstr "使用 <command role=\"hg-cmd\">hg backout</command> 恢复一个修改" 1.202 1.203 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.204 #: ../en/ch08-undo.xml:364 1.205 @@ -9444,7 +9448,7 @@ 1.206 msgid "" 1.207 "Automated backout of a non-tip change using the <command role=\"hg-cmd\">hg " 1.208 "backout</command> command" 1.209 -msgstr "" 1.210 +msgstr "使用 <command role=\"hg-cmd\">hg backout</command> 自动恢复非顶点的修改" 1.211 1.212 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.213 #: ../en/ch08-undo.xml:411 1.214 @@ -9565,7 +9569,7 @@ 1.215 #. type: Content of: <book><chapter><sect1><sect2><figure><title> 1.216 #: ../en/ch08-undo.xml:512 1.217 msgid "Manually merging a backout change" 1.218 -msgstr "" 1.219 +msgstr "手工合并恢复修改" 1.220 1.221 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.222 #: ../en/ch08-undo.xml:514 1.223 @@ -12519,11 +12523,12 @@ 1.224 1.225 #. type: Content of: <book><chapter><sect1><sect2><para> 1.226 #: ../en/ch09-hook.xml:1922 1.227 -#, fuzzy 1.228 msgid "" 1.229 "See also: <literal role=\"hook\">precommit</literal> (<xref linkend=\"sec:" 1.230 "hook:precommit\"/>)" 1.231 -msgstr "<literal role=\"hook\">precommit</literal>&emdash;提交修改集之前" 1.232 +msgstr "" 1.233 +"参见: <literal role=\"hook\">precommit</literal> (<xref linkend=\"sec:hook:" 1.234 +"precommit\"/>)" 1.235 1.236 #. type: Content of: <book><chapter><sect1><sect2><title> 1.237 #: ../en/ch09-hook.xml:1929 1.238 @@ -12606,11 +12611,12 @@ 1.239 1.240 #. type: Content of: <book><chapter><sect1><sect2><para> 1.241 #: ../en/ch09-hook.xml:1992 1.242 -#, fuzzy 1.243 msgid "" 1.244 "See also: <literal role=\"hook\">pretag</literal> (<xref linkend=\"sec:hook:" 1.245 "pretag\"/>)" 1.246 -msgstr "<literal role=\"hook\">pretag</literal>&emdash;创建标签之前" 1.247 +msgstr "" 1.248 +"参见: <literal role=\"hook\">pretag</literal> (<xref linkend=\"sec:hook:pretag" 1.249 +"\"/>)" 1.250 1.251 #. type: Content of: <book><chapter><sect1><sect2><title> 1.252 #: ../en/ch09-hook.xml:1998 1.253 @@ -14091,7 +14097,7 @@ 1.254 #. type: Content of: <book><chapter><sect1><sect2><figure><title> 1.255 #: ../en/ch11-mq.xml:408 1.256 msgid "Applied and unapplied patches in the MQ patch stack" 1.257 -msgstr "" 1.258 +msgstr "在 MQ 补丁堆栈中应用和撤销补丁" 1.259 1.260 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> 1.261 #: ../en/ch11-mq.xml:411