comparison po/zh.po @ 759:f7add9f718a8

Update Chinese translation

758:8d130de70ebe

# Simplified Chinese translation for hgbook
# This file is distributed under the same license as the hgbook.
#
# Authors:
# Dongsheng Song <[e-mail]>, 2009
#
# Update to new pot:
#    msgmerge --update zh.po hgbook.pot
#
# Check translation:
#    msgfmt --statistics -c -o zh.mo zh.po
#
# Please format your translation before commit:

# changes           修改
# changeset         修改集
# checkout          检出
# remove            移除(从版本库删除)
# delete            删除(只从文件系统删除)
# patchset          补丁集
# pushing to        推到
# pulling from      拉自，抓取
# rename            改名
# repository        版本库
# revert            恢复
# revision          版本
# tag               标签
# tip               顶点
# undo              撤销
# unversioned       未版本控制
# versioned         受版本控制
# working copy      工作副本
# ...
#
msgid ""
msgstr ""
"Project-Id-Version: hgbook 1.2\n"
"POT-Creation-Date: 2009-03-30 21:36+0800\n"
"PO-Revision-Date: 2009-03-20 17:12+0800\n"
"Last-Translator: \n"
"Language-Team: Simplified Chinese <[e-mail] >\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

msgstr ""

#. type: Content of: <book><preface><sect1><sect2><sect3><title>
#: ../en/ch00-preface.xml:276
msgid "The forking non-problem"
msgstr ""

#. type: Content of: <book><preface><sect1><sect2><sect3><para>
#: ../en/ch00-preface.xml:278
msgid ""
"It has been suggested that distributed revision control tools pose some sort "

#. type: Content of: <book><chapter><sect1><figure><title>
#: ../en/ch01-tour-basic.xml:258
msgid ""
"Graphical history of the <filename class=\"directory\">hello</filename> "
"repository"
msgstr ""

#. type: Content of: <book><chapter><sect1><figure>
#: ../en/ch01-tour-basic.xml:260 ../en/ch02-tour-merge.xml:50
#: ../en/ch02-tour-merge.xml:181 ../en/ch03-concepts.xml:293
msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"

msgid ""
"Divergent recent histories of the <filename class=\"directory\">my-hello</"
"filename> and <filename class=\"directory\">my-new-hello</filename> "
"repositories"
msgstr ""

#. type: Content of: <book><chapter><sect1><figure><mediaobject>
#: ../en/ch02-tour-merge.xml:51
msgid ""
"<imageobject><imagedata fileref=\"figs/tour-merge-sep-repos.png\"/></"

#: ../en/ch02-tour-merge.xml:75
msgid ""
"Repository contents after pulling from <filename class=\"directory\">my-"
"hello</filename> into <filename class=\"directory\">my-new-hello</filename>"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure>
#: ../en/ch02-tour-merge.xml:78 ../en/ch02-tour-merge.xml:125
#: ../en/ch02-tour-merge.xml:250 ../en/ch03-concepts.xml:55
#: ../en/ch03-concepts.xml:104 ../en/ch03-concepts.xml:189

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch02-tour-merge.xml:123
msgid "Working directory and repository during merge, and following commit"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch02-tour-merge.xml:126
msgid ""
"<imageobject> <imagedata fileref=\"figs/tour-merge-merge.png\"/> </"

msgstr ""

#. type: Content of: <book><chapter><sect1><figure><title>
#: ../en/ch02-tour-merge.xml:180
msgid "Conflicting changes to a document"
msgstr ""

#. type: Content of: <book><chapter><sect1><figure><mediaobject>
#: ../en/ch02-tour-merge.xml:182
msgid ""
"<imageobject><imagedata fileref=\"figs/tour-merge-conflict.png\"/></"

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch02-tour-merge.xml:248
msgid "Using <command>kdiff3</command> to merge versions of a file"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch02-tour-merge.xml:251
msgid ""
"<imageobject> <imagedata width=\"100%\" fileref=\"figs/kdiff3.png\"/></"

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:53
msgid ""
"Relationships between files in working directory and filelogs in repository"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:56
msgid "<imageobject><imagedata fileref=\"figs/filelog.png\"/></imageobject>"
msgstr ""

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:103
msgid "Metadata relationships"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:105
msgid "<imageobject><imagedata fileref=\"figs/metadata.png\"/></imageobject>"
msgstr ""

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:188
msgid "Snapshot of a revlog, with incremental deltas"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:190
msgid "<imageobject><imagedata fileref=\"figs/snapshot.png\"/></imageobject>"
msgstr ""

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
#: ../en/ch03-concepts.xml:210
msgid "Aside: the influence of video compression"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
#: ../en/ch03-concepts.xml:212
msgid ""
"If you're familiar with video compression or have ever watched a TV feed "

msgstr ""

#. type: Content of: <book><chapter><sect1><figure><title>
#: ../en/ch03-concepts.xml:292
msgid "The conceptual structure of a revlog"
msgstr ""

#. type: Content of: <book><chapter><sect1><figure><mediaobject>
#: ../en/ch03-concepts.xml:294
msgid "<imageobject><imagedata fileref=\"figs/revlog.png\"/></imageobject>"
msgstr ""

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:343
msgid "The working directory can have two parents"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:345
msgid "<imageobject><imagedata fileref=\"figs/wdir.png\"/></imageobject>"
msgstr ""

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:357
msgid "The working directory gains new parents after a commit"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:360
msgid ""
"<imageobject><imagedata fileref=\"figs/wdir-after-commit.png\"/></imageobject>"

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:398
msgid "The working directory, updated to an older changeset"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:401
msgid ""
"<imageobject><imagedata fileref=\"figs/wdir-pre-branch.png\"/></imageobject>"

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:418
msgid "After a commit made while synced to an older changeset"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:421
msgid "<imageobject><imagedata fileref=\"figs/wdir-branch.png\"/></imageobject>"
msgstr ""

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:460
msgid "Merging two heads"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:462
msgid ""
"<imageobject> <imagedata fileref=\"figs/wdir-merge.png\"/> </imageobject>"

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch08-undo.xml:361 ../en/ch08-undo.xml:473
msgid ""
"Backing out a change using the <command role=\"hg-cmd\">hg backout</command> "
"command"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch08-undo.xml:364
msgid "<imageobject><imagedata fileref=\"figs/undo-simple.png\"/></imageobject>"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch08-undo.xml:408
msgid ""
"Automated backout of a non-tip change using the <command role=\"hg-cmd\">hg "
"backout</command> command"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch08-undo.xml:411
msgid ""
"<imageobject><imagedata fileref=\"figs/undo-non-tip.png\"/></imageobject>"

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch08-undo.xml:512
msgid "Manually merging a backout change"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch08-undo.xml:514
msgid ""
"<imageobject><imagedata fileref=\"figs/undo-manual-merge.png\"/></imageobject>"

"avoid them."
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../en/ch09-hook.xml:1922
#, fuzzy
msgid ""
"See also: <literal role=\"hook\">precommit</literal> (<xref linkend=\"sec:"
"hook:precommit\"/>)"
msgstr "<literal role=\"hook\">precommit</literal>&emdash;提交修改集之前"

#. type: Content of: <book><chapter><sect1><sect2><title>
#: ../en/ch09-hook.xml:1929
msgid ""
"<literal role=\"hook\">preupdate</literal>&emdash;before updating or merging "

"this hook."
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../en/ch09-hook.xml:1992
#, fuzzy
msgid ""
"See also: <literal role=\"hook\">pretag</literal> (<xref linkend=\"sec:hook:"
"pretag\"/>)"
msgstr "<literal role=\"hook\">pretag</literal>&emdash;创建标签之前"

#. type: Content of: <book><chapter><sect1><sect2><title>
#: ../en/ch09-hook.xml:1998
msgid ""
"<literal role=\"hook\">update</literal>&emdash;after updating or merging "

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch11-mq.xml:408
msgid "Applied and unapplied patches in the MQ patch stack"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch11-mq.xml:411
msgid "<imageobject><imagedata fileref=\"figs/mq-stack.png\"/></imageobject>"
msgstr ""

759:f7add9f718a8

# Simplified Chinese translation for hgbook
# This file is distributed under the same license as the hgbook.
#
# Authors:
# Dongsheng Song <[e-mail]>, 2009
#
# Check translation:
#    msgfmt --statistics -c -o zh.mo zh.po
#
# Please format your translation before commit:

# changes           修改
# changeset         修改集
# checkout          检出
# remove            移除(从版本库删除)
# delete            删除(只从文件系统删除)
# filelog           文件日志
# patchset          补丁集
# pushing to        推到
# pulling from      拉自，抓取
# rename            改名
# repository        版本库
# revert            恢复
# revision          版本
# revlog            版本日志
# tag               标签
# tip               顶点
# undo              撤销
# unversioned       未版本控制
# updated           更新到，同步到(适用于旧版本)
# versioned         受版本控制
# working copy      工作副本
# ...
#
msgid ""
msgstr ""
"Project-Id-Version: hgbook 1.2\n"
"POT-Creation-Date: 2009-03-30 21:36+0800\n"
"PO-Revision-Date: 2009-03-31 10:12+0800\n"
"Last-Translator: \n"
"Language-Team: Simplified Chinese <[e-mail] >\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

msgstr ""

#. type: Content of: <book><preface><sect1><sect2><sect3><title>
#: ../en/ch00-preface.xml:276
msgid "The forking non-problem"
msgstr "分叉不是问题"

#. type: Content of: <book><preface><sect1><sect2><sect3><para>
#: ../en/ch00-preface.xml:278
msgid ""
"It has been suggested that distributed revision control tools pose some sort "

#. type: Content of: <book><chapter><sect1><figure><title>
#: ../en/ch01-tour-basic.xml:258
msgid ""
"Graphical history of the <filename class=\"directory\">hello</filename> "
"repository"
msgstr "版本库 <filename class=\"directory\">hello</filename> 的历史图"

#. type: Content of: <book><chapter><sect1><figure>
#: ../en/ch01-tour-basic.xml:260 ../en/ch02-tour-merge.xml:50
#: ../en/ch02-tour-merge.xml:181 ../en/ch03-concepts.xml:293
msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"

msgid ""
"Divergent recent histories of the <filename class=\"directory\">my-hello</"
"filename> and <filename class=\"directory\">my-new-hello</filename> "
"repositories"
msgstr ""
"<filename class=\"directory\">my-hello</filename> 与 <filename class="
"\"directory\">my-new-hello</filename> 最新的历史分叉"

#. type: Content of: <book><chapter><sect1><figure><mediaobject>
#: ../en/ch02-tour-merge.xml:51
msgid ""
"<imageobject><imagedata fileref=\"figs/tour-merge-sep-repos.png\"/></"

#: ../en/ch02-tour-merge.xml:75
msgid ""
"Repository contents after pulling from <filename class=\"directory\">my-"
"hello</filename> into <filename class=\"directory\">my-new-hello</filename>"
msgstr ""
"从 <filename class=\"directory\">my-hello</filename> 拉到 <filename class="
"\"directory\">my-new-hello</filename> 之后版本库的内容"

#. type: Content of: <book><chapter><sect1><sect2><figure>
#: ../en/ch02-tour-merge.xml:78 ../en/ch02-tour-merge.xml:125
#: ../en/ch02-tour-merge.xml:250 ../en/ch03-concepts.xml:55
#: ../en/ch03-concepts.xml:104 ../en/ch03-concepts.xml:189

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch02-tour-merge.xml:123
msgid "Working directory and repository during merge, and following commit"
msgstr "在合并期间，以及提交之后的工作目录与版本库"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch02-tour-merge.xml:126
msgid ""
"<imageobject> <imagedata fileref=\"figs/tour-merge-merge.png\"/> </"

msgstr ""

#. type: Content of: <book><chapter><sect1><figure><title>
#: ../en/ch02-tour-merge.xml:180
msgid "Conflicting changes to a document"
msgstr "冲突的修改"

#. type: Content of: <book><chapter><sect1><figure><mediaobject>
#: ../en/ch02-tour-merge.xml:182
msgid ""
"<imageobject><imagedata fileref=\"figs/tour-merge-conflict.png\"/></"

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch02-tour-merge.xml:248
msgid "Using <command>kdiff3</command> to merge versions of a file"
msgstr "使用 <command>kdiff3</command> 合并文件的不同版本"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch02-tour-merge.xml:251
msgid ""
"<imageobject> <imagedata width=\"100%\" fileref=\"figs/kdiff3.png\"/></"

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:53
msgid ""
"Relationships between files in working directory and filelogs in repository"
msgstr "工作目录中的文件与版本库中的文件日志之间的关系"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:56
msgid "<imageobject><imagedata fileref=\"figs/filelog.png\"/></imageobject>"
msgstr ""

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:103
msgid "Metadata relationships"
msgstr "元数据之间的关系"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:105
msgid "<imageobject><imagedata fileref=\"figs/metadata.png\"/></imageobject>"
msgstr ""

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:188
msgid "Snapshot of a revlog, with incremental deltas"
msgstr "版本日志的快照，以及增量差异"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:190
msgid "<imageobject><imagedata fileref=\"figs/snapshot.png\"/></imageobject>"
msgstr ""

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
#: ../en/ch03-concepts.xml:210
msgid "Aside: the influence of video compression"
msgstr "旁白: 视频压缩的影响"

#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
#: ../en/ch03-concepts.xml:212
msgid ""
"If you're familiar with video compression or have ever watched a TV feed "

msgstr ""

#. type: Content of: <book><chapter><sect1><figure><title>
#: ../en/ch03-concepts.xml:292
msgid "The conceptual structure of a revlog"
msgstr "版本日志的设计结构"

#. type: Content of: <book><chapter><sect1><figure><mediaobject>
#: ../en/ch03-concepts.xml:294
msgid "<imageobject><imagedata fileref=\"figs/revlog.png\"/></imageobject>"
msgstr ""

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:343
msgid "The working directory can have two parents"
msgstr "工作目录可以有两个父亲"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:345
msgid "<imageobject><imagedata fileref=\"figs/wdir.png\"/></imageobject>"
msgstr ""

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:357
msgid "The working directory gains new parents after a commit"
msgstr "提交之后，工作目录的父亲就改变了"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:360
msgid ""
"<imageobject><imagedata fileref=\"figs/wdir-after-commit.png\"/></imageobject>"

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:398
msgid "The working directory, updated to an older changeset"
msgstr "同步到旧修改集的工作目录"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:401
msgid ""
"<imageobject><imagedata fileref=\"figs/wdir-pre-branch.png\"/></imageobject>"

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:418
msgid "After a commit made while synced to an older changeset"
msgstr "对同步到旧修改集的工作目录提交之后"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:421
msgid "<imageobject><imagedata fileref=\"figs/wdir-branch.png\"/></imageobject>"
msgstr ""

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch03-concepts.xml:460
msgid "Merging two heads"
msgstr "合并两个顶点"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch03-concepts.xml:462
msgid ""
"<imageobject> <imagedata fileref=\"figs/wdir-merge.png\"/> </imageobject>"

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch08-undo.xml:361 ../en/ch08-undo.xml:473
msgid ""
"Backing out a change using the <command role=\"hg-cmd\">hg backout</command> "
"command"
msgstr "使用 <command role=\"hg-cmd\">hg backout</command> 恢复一个修改"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch08-undo.xml:364
msgid "<imageobject><imagedata fileref=\"figs/undo-simple.png\"/></imageobject>"
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch08-undo.xml:408
msgid ""
"Automated backout of a non-tip change using the <command role=\"hg-cmd\">hg "
"backout</command> command"
msgstr "使用 <command role=\"hg-cmd\">hg backout</command> 自动恢复非顶点的修改"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch08-undo.xml:411
msgid ""
"<imageobject><imagedata fileref=\"figs/undo-non-tip.png\"/></imageobject>"

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch08-undo.xml:512
msgid "Manually merging a backout change"
msgstr "手工合并恢复修改"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch08-undo.xml:514
msgid ""
"<imageobject><imagedata fileref=\"figs/undo-manual-merge.png\"/></imageobject>"

"avoid them."
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../en/ch09-hook.xml:1922
msgid ""
"See also: <literal role=\"hook\">precommit</literal> (<xref linkend=\"sec:"
"hook:precommit\"/>)"
msgstr ""
"参见: <literal role=\"hook\">precommit</literal> (<xref linkend=\"sec:hook:"
"precommit\"/>)"

#. type: Content of: <book><chapter><sect1><sect2><title>
#: ../en/ch09-hook.xml:1929
msgid ""
"<literal role=\"hook\">preupdate</literal>&emdash;before updating or merging "

"this hook."
msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../en/ch09-hook.xml:1992
msgid ""
"See also: <literal role=\"hook\">pretag</literal> (<xref linkend=\"sec:hook:"
"pretag\"/>)"
msgstr ""
"参见: <literal role=\"hook\">pretag</literal> (<xref linkend=\"sec:hook:pretag"
"\"/>)"

#. type: Content of: <book><chapter><sect1><sect2><title>
#: ../en/ch09-hook.xml:1998
msgid ""
"<literal role=\"hook\">update</literal>&emdash;after updating or merging "

msgstr ""

#. type: Content of: <book><chapter><sect1><sect2><figure><title>
#: ../en/ch11-mq.xml:408
msgid "Applied and unapplied patches in the MQ patch stack"
msgstr "在 MQ 补丁堆栈中应用和撤销补丁"

#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
#: ../en/ch11-mq.xml:411
msgid "<imageobject><imagedata fileref=\"figs/mq-stack.png\"/></imageobject>"
msgstr ""