#: ../en/appA-svn.xml:16 msgid "Importing history from another system" -msgstr "" +msgstr "从其它版本控制系统导入历史" #. type: Content of: <book><appendix><sect1><para> #: ../en/appA-svn.xml:18 @@ -293,7 +293,7 @@ #. type: Content of: <book><appendix><sect1><sect2><title> #: ../en/appA-svn.xml:141 msgid "Tidying up the tree" -msgstr "" +msgstr "清理目录树" #. type: Content of: <book><appendix><sect1><sect2><para> #: ../en/appA-svn.xml:143 @@ -342,7 +342,7 @@ #. type: Content of: <book><appendix><sect1><sect2><title> #: ../en/appA-svn.xml:184 msgid "Improving Subversion conversion performance" -msgstr "" +msgstr "改进 Subversion 的转换性能" #. type: Content of: <book><appendix><sect1><sect2><para> #: ../en/appA-svn.xml:186 @@ -466,7 +466,7 @@ #. type: Content of: <book><appendix><sect1><sect2><title> #: ../en/appA-svn.xml:259 msgid "Philosophical differences" -msgstr "" +msgstr "哲学的差别" #. type: Content of: <book><appendix><sect1><sect2><para> #: ../en/appA-svn.xml:261 @@ -525,7 +525,7 @@ #. type: Content of: <book><appendix><sect1><sect2><sect3><title> #: ../en/appA-svn.xml:301 msgid "Multi-user operation and safety" -msgstr "" +msgstr "多用户操作与安全" #. type: Content of: <book><appendix><sect1><sect2><sect3><para> #: ../en/appA-svn.xml:303 @@ -563,7 +563,7 @@ #. type: Content of: <book><appendix><sect1><sect2><sect3><title> #: ../en/appA-svn.xml:331 msgid "Published vs local changes" -msgstr "" +msgstr "已发布的修改与本地修改" #. type: Content of: <book><appendix><sect1><sect2><sect3><para> #: ../en/appA-svn.xml:333 @@ -2058,7 +2058,7 @@ #. type: Content of: <book><preface><sect1><title> #: ../en/ch00-preface.xml:31 msgid "Thank you for supporting Mercurial" -msgstr "" +msgstr "谢谢你支持 Mercurial" #. type: Content of: <book><preface><sect1><para> #: ../en/ch00-preface.xml:33 @@ -2075,7 +2075,7 @@ #. type: Content of: <book><preface><sect1><title> #: ../en/ch00-preface.xml:45 msgid "Acknowledgments" -msgstr "" +msgstr "致谢" #. type: Content of: <book><preface><sect1><para> #: ../en/ch00-preface.xml:47 @@ -2163,28 +2163,28 @@ #. type: Content of: <book><preface><sect1><title> #: ../en/ch00-preface.xml:111 msgid "Conventions Used in This Book" -msgstr "" +msgstr "本书的约定" #. type: Content of: <book><preface><sect1><para> #: ../en/ch00-preface.xml:113 msgid "The following typographical conventions are used in this book:" -msgstr "" +msgstr "本书使用如下的印刷约定：" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><term> #: ../en/ch00-preface.xml:118 msgid "Italic" -msgstr "" +msgstr "斜体" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/ch00-preface.xml:121 msgid "" "Indicates new terms, URLs, email addresses, filenames, and file extensions." -msgstr "" +msgstr "标识新术语，URL，电子邮件地址，文件名称与扩展名。" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><term> #: ../en/ch00-preface.xml:127 msgid "<literal>Constant width</literal>" -msgstr "" +msgstr "<literal>等宽</literal>" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/ch00-preface.xml:130 @@ -2193,43 +2193,45 @@ "elements such as variable or function names, databases, data types, " "environment variables, statements, and keywords." msgstr "" +"用于程序列表，以及段内引用的程序元素，例如变量、函数名称、数据库、数据类型、环" +"境变量、声明和关键字。" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><term> #: ../en/ch00-preface.xml:138 msgid "<userinput>Constant width bold</userinput>" -msgstr "" +msgstr "<userinput>等宽粗体</userinput>" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/ch00-preface.xml:141 msgid "Shows commands or other text that should be typed literally by the user." -msgstr "" +msgstr "标识命令或者其它用户应该逐字输入的文本。" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><term> #: ../en/ch00-preface.xml:147 msgid "<replaceable>Constant width italic</replaceable>" -msgstr "" +msgstr "<replaceable>等宽斜体</replaceable>" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/ch00-preface.xml:150 msgid "" "Shows text that should be replaced with user-supplied values or by values " "determined by context." -msgstr "" +msgstr "标识应该被用户提供的值或者取决于上下文的值替换的文本。" #. type: Content of: <book><preface><sect1><tip><para> #: ../en/ch00-preface.xml:157 msgid "This icon signifies a tip, suggestion, or general note." -msgstr "" +msgstr "此图标表示提示，建议或者一般的的注释。" #. type: Content of: <book><preface><sect1><caution><para> #: ../en/ch00-preface.xml:162 msgid "This icon indicates a warning or caution." -msgstr "" +msgstr "此图标表示警告。" #. type: Content of: <book><preface><sect1><title> #: ../en/ch00-preface.xml:167 msgid "Using Code Examples" -msgstr "" +msgstr "使用样例代码" #. type: Content of: <book><preface><sect1><para> #: ../en/ch00-preface.xml:169 @@ -2265,7 +2267,7 @@ #. type: Content of: <book><preface><sect1><title> #: ../en/ch00-preface.xml:193 msgid "Safari® Books Online" -msgstr "" +msgstr "Safari® 在线书库" #. type: Content of: <book><preface><sect1><note><para> #: ../en/ch00-preface.xml:196 @@ -2289,7 +2291,7 @@ #. type: Content of: <book><preface><sect1><title> #: ../en/ch00-preface.xml:211 msgid "How to Contact Us" -msgstr "" +msgstr "联系我们" #. type: Content of: <book><preface><sect1><para> #: ../en/ch00-preface.xml:213 @@ -4612,7 +4614,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch02-tour-basic.xml:942 msgid "Default locations" -msgstr "" +msgstr "默认位置" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch02-tour-basic.xml:944 @@ -7086,7 +7088,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch05-daily.xml:618 msgid "File resolution states" -msgstr "" +msgstr "文件的解决状态" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch05-daily.xml:620 @@ -7166,7 +7168,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch05-daily.xml:680 msgid "More useful diffs" -msgstr "" +msgstr "更有用的差异" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch05-daily.xml:682 @@ -7215,7 +7217,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch05-daily.xml:720 msgid "Which files to manage, and which to avoid" -msgstr "" +msgstr "需要管理哪些文件，应该避免的事情" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch05-daily.xml:722 @@ -11486,7 +11488,7 @@ #. type: Content of: <book><chapter><sect1><sect2><figure><title> #: ../en/ch09-undo.xml:655 msgid "A bad merge" -msgstr "" +msgstr "错误的合并" #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> #: ../en/ch09-undo.xml:657 @@ -11617,7 +11619,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:762 msgid "What to do about sensitive changes that escape" -msgstr "" +msgstr "处理敏感信息泄漏的方法" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:764 @@ -15235,7 +15237,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch11-template.xml:611 msgid "Listing files on multiple lines" -msgstr "" +msgstr "每行列出一个文件" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch11-template.xml:613 @@ -16295,7 +16297,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:767 msgid "Converting to and from permanent revisions" -msgstr "" +msgstr "与持久版本的相互转换" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:769

# HG changeset patch # User Dongsheng Song # Date 1242895330 -28800 # Node ID acfeda9d8a2ab96123da1fc8a7472168dbc7dd24 # Parent c03f7ff6069c3e1688a378814f46962c0e3c0cc6 Update Chinese translation diff -r c03f7ff6069c -r acfeda9d8a2a po/zh.po --- a/po/zh.po Thu May 21 14:57:15 2009 +0800 +++ b/po/zh.po Thu May 21 16:42:10 2009 +0800 @@ -42,7 +42,7 @@ msgstr "" "Project-Id-Version: hgbook 1.2\n" "POT-Creation-Date: 2009-05-21 14:26+0800\n" -"PO-Revision-Date: 2009-05-21 14:55+0800\n" +"PO-Revision-Date: 2009-05-21 16:42+0800\n" "Last-Translator: 宋冬生 \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" @@ -112,7 +112,7 @@ #. type: Content of: #: ../en/appA-svn.xml:16 msgid "Importing history from another system" -msgstr "" +msgstr "从其它版本控制系统导入历史" #. type: Content of: <book><appendix><sect1><para> #: ../en/appA-svn.xml:18 @@ -293,7 +293,7 @@ #. type: Content of: <book><appendix><sect1><sect2><title> #: ../en/appA-svn.xml:141 msgid "Tidying up the tree" -msgstr "" +msgstr "清理目录树" #. type: Content of: <book><appendix><sect1><sect2><para> #: ../en/appA-svn.xml:143 @@ -342,7 +342,7 @@ #. type: Content of: <book><appendix><sect1><sect2><title> #: ../en/appA-svn.xml:184 msgid "Improving Subversion conversion performance" -msgstr "" +msgstr "改进 Subversion 的转换性能" #. type: Content of: <book><appendix><sect1><sect2><para> #: ../en/appA-svn.xml:186 @@ -466,7 +466,7 @@ #. type: Content of: <book><appendix><sect1><sect2><title> #: ../en/appA-svn.xml:259 msgid "Philosophical differences" -msgstr "" +msgstr "哲学的差别" #. type: Content of: <book><appendix><sect1><sect2><para> #: ../en/appA-svn.xml:261 @@ -525,7 +525,7 @@ #. type: Content of: <book><appendix><sect1><sect2><sect3><title> #: ../en/appA-svn.xml:301 msgid "Multi-user operation and safety" -msgstr "" +msgstr "多用户操作与安全" #. type: Content of: <book><appendix><sect1><sect2><sect3><para> #: ../en/appA-svn.xml:303 @@ -563,7 +563,7 @@ #. type: Content of: <book><appendix><sect1><sect2><sect3><title> #: ../en/appA-svn.xml:331 msgid "Published vs local changes" -msgstr "" +msgstr "已发布的修改与本地修改" #. type: Content of: <book><appendix><sect1><sect2><sect3><para> #: ../en/appA-svn.xml:333 @@ -2058,7 +2058,7 @@ #. type: Content of: <book><preface><sect1><title> #: ../en/ch00-preface.xml:31 msgid "Thank you for supporting Mercurial" -msgstr "" +msgstr "谢谢你支持 Mercurial" #. type: Content of: <book><preface><sect1><para> #: ../en/ch00-preface.xml:33 @@ -2075,7 +2075,7 @@ #. type: Content of: <book><preface><sect1><title> #: ../en/ch00-preface.xml:45 msgid "Acknowledgments" -msgstr "" +msgstr "致谢" #. type: Content of: <book><preface><sect1><para> #: ../en/ch00-preface.xml:47 @@ -2163,28 +2163,28 @@ #. type: Content of: <book><preface><sect1><title> #: ../en/ch00-preface.xml:111 msgid "Conventions Used in This Book" -msgstr "" +msgstr "本书的约定" #. type: Content of: <book><preface><sect1><para> #: ../en/ch00-preface.xml:113 msgid "The following typographical conventions are used in this book:" -msgstr "" +msgstr "本书使用如下的印刷约定：" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><term> #: ../en/ch00-preface.xml:118 msgid "Italic" -msgstr "" +msgstr "斜体" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/ch00-preface.xml:121 msgid "" "Indicates new terms, URLs, email addresses, filenames, and file extensions." -msgstr "" +msgstr "标识新术语，URL，电子邮件地址，文件名称与扩展名。" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><term> #: ../en/ch00-preface.xml:127 msgid "<literal>Constant width</literal>" -msgstr "" +msgstr "<literal>等宽</literal>" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/ch00-preface.xml:130 @@ -2193,43 +2193,45 @@ "elements such as variable or function names, databases, data types, " "environment variables, statements, and keywords." msgstr "" +"用于程序列表，以及段内引用的程序元素，例如变量、函数名称、数据库、数据类型、环" +"境变量、声明和关键字。" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><term> #: ../en/ch00-preface.xml:138 msgid "<userinput>Constant width bold</userinput>" -msgstr "" +msgstr "<userinput>等宽粗体</userinput>" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/ch00-preface.xml:141 msgid "Shows commands or other text that should be typed literally by the user." -msgstr "" +msgstr "标识命令或者其它用户应该逐字输入的文本。" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><term> #: ../en/ch00-preface.xml:147 msgid "<replaceable>Constant width italic</replaceable>" -msgstr "" +msgstr "<replaceable>等宽斜体</replaceable>" #. type: Content of: <book><preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/ch00-preface.xml:150 msgid "" "Shows text that should be replaced with user-supplied values or by values " "determined by context." -msgstr "" +msgstr "标识应该被用户提供的值或者取决于上下文的值替换的文本。" #. type: Content of: <book><preface><sect1><tip><para> #: ../en/ch00-preface.xml:157 msgid "This icon signifies a tip, suggestion, or general note." -msgstr "" +msgstr "此图标表示提示，建议或者一般的的注释。" #. type: Content of: <book><preface><sect1><caution><para> #: ../en/ch00-preface.xml:162 msgid "This icon indicates a warning or caution." -msgstr "" +msgstr "此图标表示警告。" #. type: Content of: <book><preface><sect1><title> #: ../en/ch00-preface.xml:167 msgid "Using Code Examples" -msgstr "" +msgstr "使用样例代码" #. type: Content of: <book><preface><sect1><para> #: ../en/ch00-preface.xml:169 @@ -2265,7 +2267,7 @@ #. type: Content of: <book><preface><sect1><title> #: ../en/ch00-preface.xml:193 msgid "Safari® Books Online" -msgstr "" +msgstr "Safari® 在线书库" #. type: Content of: <book><preface><sect1><note><para> #: ../en/ch00-preface.xml:196 @@ -2289,7 +2291,7 @@ #. type: Content of: <book><preface><sect1><title> #: ../en/ch00-preface.xml:211 msgid "How to Contact Us" -msgstr "" +msgstr "联系我们" #. type: Content of: <book><preface><sect1><para> #: ../en/ch00-preface.xml:213 @@ -4612,7 +4614,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch02-tour-basic.xml:942 msgid "Default locations" -msgstr "" +msgstr "默认位置" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch02-tour-basic.xml:944 @@ -7086,7 +7088,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch05-daily.xml:618 msgid "File resolution states" -msgstr "" +msgstr "文件的解决状态" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch05-daily.xml:620 @@ -7166,7 +7168,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch05-daily.xml:680 msgid "More useful diffs" -msgstr "" +msgstr "更有用的差异" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch05-daily.xml:682 @@ -7215,7 +7217,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch05-daily.xml:720 msgid "Which files to manage, and which to avoid" -msgstr "" +msgstr "需要管理哪些文件，应该避免的事情" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch05-daily.xml:722 @@ -11486,7 +11488,7 @@ #. type: Content of: <book><chapter><sect1><sect2><figure><title> #: ../en/ch09-undo.xml:655 msgid "A bad merge" -msgstr "" +msgstr "错误的合并" #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject> #: ../en/ch09-undo.xml:657 @@ -11617,7 +11619,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:762 msgid "What to do about sensitive changes that escape" -msgstr "" +msgstr "处理敏感信息泄漏的方法" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:764 @@ -15235,7 +15237,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch11-template.xml:611 msgid "Listing files on multiple lines" -msgstr "" +msgstr "每行列出一个文件" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch11-template.xml:613 @@ -16295,7 +16297,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:767 msgid "Converting to and from permanent revisions" -msgstr "" +msgstr "与持久版本的相互转换" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:769