Commits

Wagner Bruna  committed 970e949

i18n: pull latest zh_CN translations from Launchpad

  • Participants
  • Parent commits aec1bf1
  • Branches stable

Comments (0)

Files changed (1)

File i18n/tortoisehg/zh_CN.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-03-19 21:15-0300\n"
-"PO-Revision-Date: 2012-03-09 08:25+0000\n"
-"Last-Translator: Lionheart <Unknown>\n"
+"PO-Revision-Date: 2012-03-21 01:13+0000\n"
+"Last-Translator: Fang Zhang <zhangfang.thu@gmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2012-03-20 05:04+0000\n"
-"X-Generator: Launchpad (build 14969)\n"
+"X-Launchpad-Export-Date: 2012-03-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 
 #: tortoisehg/hgqt/about.py:80
 msgid "&License"
-msgstr "许可(&L)"
+msgstr "许可协议(&L)"
 
 #: tortoisehg/hgqt/about.py:86 tortoisehg/hgqt/archive.py:108
 #: tortoisehg/hgqt/hgemail_ui.py:286 tortoisehg/hgqt/hginit.py:58
 msgid ""
 "To backout a <b>merge</b> revision you must select which parent to backout "
 "to (i.e. whose changes will be <i>kept</i>)"
-msgstr "要回退<b>合并</b>修订版本,必须选择需要回退到的父版本(即:修订会<i>保留</i>的)"
+msgstr "要回退<b>合并</b>修订版本,必须选择需要回退到的父版本 (修订会<i>保留</i>的)"
 
 #: tortoisehg/hgqt/backout.py:179
 #, python-format
 msgid "First Parent: revision %s (%s)"
-msgstr "第一个父版本%s (%s)"
+msgstr "第一个父版本: %s (%s)"
 
 #: tortoisehg/hgqt/backout.py:185
 msgid "Backout to the first parent of the merge revision"
 #: tortoisehg/hgqt/backout.py:190
 #, python-format
 msgid "Second Parent: revision %s (%s)"
-msgstr "第二个父版本%s (%s)"
+msgstr "第二个父版本: %s (%s)"
 
 #: tortoisehg/hgqt/backout.py:195
 msgid "Backout to the second parent of the merge revision"
 
 #: tortoisehg/hgqt/backout.py:278
 msgid "Clean"
-msgstr "干净"
+msgstr "可以合并"
 
 #: tortoisehg/hgqt/backout.py:299 tortoisehg/hgqt/compress.py:149
 #: tortoisehg/hgqt/merge.py:234 tortoisehg/hgqt/merge.py:311
 
 #: tortoisehg/hgqt/backout.py:466 tortoisehg/hgqt/merge.py:490
 msgid "Working Directory (merged)"
-msgstr "工作目录(已合并)"
+msgstr "工作目录 (已合并)"
 
 #: tortoisehg/hgqt/backout.py:474 tortoisehg/hgqt/merge.py:498
 msgid "Commit message"
 
 #: tortoisehg/hgqt/backout.py:498 tortoisehg/hgqt/merge.py:522
 msgid "Skip final confirmation page, close after commit."
-msgstr "提交后关闭,跳过最后的验证页。"
+msgstr "提交后关闭,跳过最后的确认页"
 
 #: tortoisehg/hgqt/backout.py:509 tortoisehg/hgqt/backout.py:543
 msgid "Backed out merge changeset: "
-msgstr "回退合并后的修订集 "
+msgstr "回退合并后的修订集: "
 
 #: tortoisehg/hgqt/backout.py:511 tortoisehg/hgqt/backout.py:545
 msgid "Backed out changeset: "
-msgstr "回退的修订集 "
+msgstr "回退的修订集: "
 
 #: tortoisehg/hgqt/backout.py:514 tortoisehg/hgqt/commit.py:646
 #: tortoisehg/hgqt/mq.py:821
 #: tortoisehg/hgqt/bisect.py:22
 #, python-format
 msgid "Bisect - %s"
-msgstr "二分 - %s"
+msgstr "二分检测 - %s"
 
 #: tortoisehg/hgqt/bisect.py:34
 msgid "Known good revision:"
-msgstr "已知无bug版"
+msgstr "已知无bug版:"
 
 #: tortoisehg/hgqt/bisect.py:38 tortoisehg/hgqt/bisect.py:48
 #: tortoisehg/hgqt/repowidget.py:450
 
 #: tortoisehg/hgqt/bisect.py:43
 msgid "Known bad revision:"
-msgstr "已知有bug版"
+msgstr "已知有bug版:"
 
 #: tortoisehg/hgqt/bisect.py:59
 msgid "Revision is Good"
 
 #: tortoisehg/hgqt/bisect.py:88
 msgid "Culprit found."
-msgstr "找到元凶"
+msgstr "找到元凶"
 
 #: tortoisehg/hgqt/bisect.py:93 tortoisehg/hgqt/grep.py:64
 msgid "Revision"
 
 #: tortoisehg/hgqt/bookmark.py:62
 msgid "New Name:"
-msgstr "新名称"
+msgstr "新名称:"
 
 #: tortoisehg/hgqt/bookmark.py:67 tortoisehg/hgqt/commit.py:794
 #: tortoisehg/hgqt/tag.py:98 tortoisehg/hgqt/wctxactions.py:56
 
 #: tortoisehg/hgqt/branchop.py:46
 msgid "No branch changes"
-msgstr "分支没有变化"
+msgstr "不变更分支"
 
 #: tortoisehg/hgqt/branchop.py:47
 msgid "Open a new named branch"
 
 #: tortoisehg/hgqt/clone.py:131
 msgid "Use pull protocol to copy metadata"
-msgstr "使用pull协议来拷贝元数据"
+msgstr "使用 pull 协议复制元数据"
 
 #: tortoisehg/hgqt/clone.py:132
 msgid "Use uncompressed transfer"
 
 #: tortoisehg/hgqt/clone.py:154
 msgid "Start revision:"
-msgstr "开始版本"
+msgstr "开始版本:"
 
 #: tortoisehg/hgqt/clone.py:180
 msgid "&Clone"
 #: tortoisehg/hgqt/cmdui.py:612
 #, python-format
 msgid "command parse error: %s"
-msgstr "命令解析错误%s"
+msgstr "命令解析错误: %s"
 
 #: tortoisehg/hgqt/cmdui.py:618
 #, python-format
 msgid "no matches found: %s"
-msgstr "没有匹配:%s"
+msgstr "没有找到匹配项: %s"
 
 #: tortoisehg/hgqt/cmdui.py:773
 msgid "TortoiseHg Command Dialog"
-msgstr "TortoiseHg命令对话"
+msgstr "TortoiseHg 命令对话"
 
 #: tortoisehg/hgqt/cmdui.py:793 tortoisehg/hgqt/merge.py:101
 #: tortoisehg/hgqt/rebase.py:262 tortoisehg/hgqt/resolve.py:357
 "Mercurial command is still running.\n"
 "Are you sure you want to terminate?"
 msgstr ""
-"Mercurial命令正在执行。\n"
+"Mercurial 命令正在执行。\n"
 "是否终止?"
 
 #: tortoisehg/hgqt/cmdui.py:838
 
 #: tortoisehg/hgqt/commit.py:102 tortoisehg/hgqt/commit.py:546
 msgid "Branch: "
-msgstr "分支 "
+msgstr "分支: "
 
 #: tortoisehg/hgqt/commit.py:110
 msgid "Copy message"
-msgstr "复制说明"
+msgstr "复制提交说明"
 
 #: tortoisehg/hgqt/commit.py:112
 msgid "Copy one of the recent commit messages"
-msgstr "复制最近的一个提交说明"
+msgstr "复制最近使用过的一个提交说明"
 
 #: tortoisehg/hgqt/commit.py:124
 msgid "Show Issues"
 #: tortoisehg/hgqt/commit.py:134
 #, python-format
 msgid "Failed to load issue tracker '%s': %s"
-msgstr "加载问题追踪器失败 '%s'%s"
+msgstr "加载问题追踪器失败 '%s': %s"
 
 #: tortoisehg/hgqt/commit.py:137 tortoisehg/hgqt/commit.py:489
 #: tortoisehg/hgqt/settings.py:308
 
 #: tortoisehg/hgqt/commit.py:175 tortoisehg/hgqt/sync.py:191
 msgid "<b>Selected Options:</b>"
-msgstr "<b>选中的选项</b>"
+msgstr "<b>选中的选项:</b>"
 
 #: tortoisehg/hgqt/commit.py:262
 msgid "Commit changes"
 #: tortoisehg/hgqt/commit.py:396
 #, python-format
 msgid "Named branch \"%s\" already exists, last used in revision %d\n"
-msgstr "分支\"%s\"已存在,最后一次在版本%d中使用\n"
+msgstr "分支“%s”已存在,最后一次在版本%d中使用\n"
 
 #: tortoisehg/hgqt/commit.py:400
 msgid "Restart &Branch"
 
 #: tortoisehg/hgqt/commit.py:548
 msgid "Close Branch: "
-msgstr "关闭分支 "
+msgstr "关闭分支: "
 
 #: tortoisehg/hgqt/commit.py:550
 msgid "New Branch: "
-msgstr "新建分支 "
+msgstr "新建分支: "
 
 #: tortoisehg/hgqt/commit.py:576 tortoisehg/hgqt/revpanel.py:24
 #: tortoisehg/hgqt/update.py:87
 
 #: tortoisehg/hgqt/commit.py:577 tortoisehg/hgqt/pbranch.py:878
 msgid "Patch name:"
-msgstr "补丁名称"
+msgstr "补丁名称:"
 
 #: tortoisehg/hgqt/commit.py:604
 #, python-format
 "Consider setting HGENCODING environment variable\n"
 "Replace untranslatable characters with \"?\"?\n"
 msgstr ""
-"无法翻译说明到本地编码\n"
-"考虑设置 HGENCODING 环境变量\n"
+"无法将说明转换到本地编码\n"
+"请考虑设置 HGENCODING 环境变量\n"
 "使用“?”替换不能翻译的字符?\n"
 
 #: tortoisehg/hgqt/commit.py:731
 
 #: tortoisehg/hgqt/commit.py:739 tortoisehg/hgqt/commit.py:752
 msgid "Nothing Commited"
-msgstr "什么也没提交"
+msgstr "提交"
 
 #: tortoisehg/hgqt/commit.py:740
 msgid "Please enter commit message"
-msgstr "请输入改动说明"
+msgstr "请输入提交说明"
 
 #: tortoisehg/hgqt/commit.py:753
 msgid ""
 
 #: tortoisehg/hgqt/commit.py:777
 msgid "No modified files checkmarked for commit"
-msgstr "没有选择修改的文件来提交"
+msgstr "没有修改的文件被选中"
 
 #: tortoisehg/hgqt/commit.py:792 tortoisehg/hgqt/lfprompt.py:16
 msgid "Confirm Add"
-msgstr "确定加入"
+msgstr "确认添加"
 
 #: tortoisehg/hgqt/commit.py:793
 msgid "Add selected untracked files?"
-msgstr "添加这些为跟踪的文件?"
+msgstr "开始跟踪这些文件?"
 
 #: tortoisehg/hgqt/commit.py:816 tortoisehg/hgqt/quickop.py:180
 msgid "Confirm Remove"
 
 #: tortoisehg/hgqt/commit.py:908
 msgid "Set username:"
-msgstr "设置用户名"
+msgstr "设置用户名:"
 
 #: tortoisehg/hgqt/commit.py:935 tortoisehg/hgqt/commit.py:982
 #: tortoisehg/hgqt/commit.py:1005 tortoisehg/hgqt/commit.py:1021
 
 #: tortoisehg/hgqt/commit.py:975
 msgid "Push After Commit:"
-msgstr "提交后推送"
+msgstr "提交后推送:"
 
 #: tortoisehg/hgqt/commit.py:998
 msgid "Auto Includes:"
 
 #: tortoisehg/hgqt/commit.py:1023
 msgid "Recurse into subrepositories (--subrepos)"
-msgstr "递归到子目录(--subrepos)"
+msgstr "递归到子仓库 (--subrepos)"
 
 #: tortoisehg/hgqt/commit.py:1052
 msgid "Unable to save username"
 
 #: tortoisehg/hgqt/csinfo.py:113
 msgid "Converted From:"
-msgstr "转换自"
+msgstr "转换自:"
 
 #: tortoisehg/hgqt/cslist.py:48 tortoisehg/hgqt/cslist.py:130
 msgid "No items to display"
 #: tortoisehg/hgqt/filedata.py:59 tortoisehg/hgqt/filedata.py:370
 #, python-format
 msgid " <i>(renamed from %s)</i>"
-msgstr " <i>(改名自%s)</i>"
+msgstr " <i>(原名 %s)</i>"
 
 #: tortoisehg/hgqt/filedata.py:61 tortoisehg/hgqt/filedata.py:365
 #: tortoisehg/hgqt/filedata.py:375
 
 #: tortoisehg/hgqt/filedata.py:171
 msgid "Subrepo initialized to revision:"
-msgstr "子仓库初始化到版本"
+msgstr "子仓库初始化到版本:"
 
 #: tortoisehg/hgqt/filedata.py:174
 msgid "Subrepo removed from repository."
 
 #: tortoisehg/hgqt/filedata.py:240
 msgid "Not a Mercurial subrepo, not previewable"
-msgstr "不是Mercurial子仓库,无法预览"
+msgstr "不是 Mercurial 子仓库,无法预览"
 
 #: tortoisehg/hgqt/filedata.py:255
 msgid "The subrepository is dirty."
 
 #: tortoisehg/hgqt/filedata.py:255
 msgid "File Status:"
-msgstr "文件状态"
+msgstr "文件状态:"
 
 #: tortoisehg/hgqt/filedata.py:280
 msgid "(is a changed sub-repository)"
 #: tortoisehg/hgqt/filedata.py:294
 #, python-format
 msgid "Error previewing subrepo: %s"
-msgstr "预览子仓库时出错%s"
+msgstr "预览子仓库时出错: %s"
 
 #: tortoisehg/hgqt/filedata.py:301
 #, python-format
 
 #: tortoisehg/hgqt/filedata.py:327
 msgid " <i>(is unversioned)</i>"
-msgstr " <i>(无版本控制的)</i>"
+msgstr " <i>(未跟踪)</i>"
 
 #: tortoisehg/hgqt/filedialogs.py:124
 msgid "File History Log Columns"
 
 #: tortoisehg/hgqt/grep.py:180
 msgid "TortoiseHg Search"
-msgstr "TortoiseHg搜索"
+msgstr "TortoiseHg 搜索"
 
 #: tortoisehg/hgqt/grep.py:211
 #, python-format
 #: tortoisehg/hgqt/grep.py:289
 #, python-format
 msgid "grep: invalid match pattern: %s\n"
-msgstr "grep无效的匹配规则%s\n"
+msgstr "grep: 无效的匹配规则: %s\n"
 
 #: tortoisehg/hgqt/grep.py:318
 #, python-format
 msgid "grep: %s\n"
-msgstr "grep%s\n"
+msgstr "grep: %s\n"
 
 #: tortoisehg/hgqt/grep.py:361 tortoisehg/hgqt/revset.py:387
 #, python-format
 #: tortoisehg/hgqt/guess.py:35
 #, python-format
 msgid "Detect Copies/Renames in %s"
-msgstr "检测拷贝和重命名操作在%s"
+msgstr "在 %s 检测复制和重命名操作"
 
 #: tortoisehg/hgqt/guess.py:61
 msgid "<b>Unrevisioned Files</b>"
-msgstr "<b>未跟踪的文件</b>"
+msgstr "<b>未修订的文件</b>"
 
 #: tortoisehg/hgqt/guess.py:65 tortoisehg/hgqt/status.py:98
 msgid "Refresh file list"
 #: tortoisehg/hgqt/guess.py:83
 #, python-format
 msgid "Min Similarity: %d%%"
-msgstr "最小相似度%d%%"
+msgstr "最小相似度: %d%%"
 
 #: tortoisehg/hgqt/guess.py:92
 msgid "Only consider deleted files"
 
 #: tortoisehg/hgqt/guess.py:141
 msgid "<b>Differences from Source to Dest</b>"
-msgstr ""
+msgstr "<b>源文件与目标文件的差异</b>"
 
 #: tortoisehg/hgqt/guess.py:186
 msgid "Search already in progress"
 "Hg patches (as generated by export command) are compatible with most patch "
 "programs.  They include a header which contains the most important changeset "
 "metadata."
-msgstr "Hg 补丁(通过输出命令产生)与大多数补丁程序相兼容。它们包含了一个包含最重要的修订集元数据的数据头。"
+msgstr "Hg 补丁通过输出命令产生与大多数补丁程序相兼容。它们包含了一个包含最重要的修订集元数据的数据头。"
 
 #: tortoisehg/hgqt/hgemail_ui.py:263
 msgid "Send changesets as Hg patches"
 
 #: tortoisehg/hgqt/hgemail_ui.py:280
 msgid "Select &All"
-msgstr ""
+msgstr "全选(&A)"
 
 #: tortoisehg/hgqt/hgemail_ui.py:281
 msgid "Select &None"
-msgstr ""
+msgstr "全不选(&N)"
 
 #: tortoisehg/hgqt/hgemail_ui.py:282 tortoisehg/hgqt/wctxactions.py:42
 #: tortoisehg/hgqt/webconf.py:256 tortoisehg/hgqt/webconf_ui.py:79
 
 #: tortoisehg/hgqt/hgignore.py:85
 msgid "<b>Ignore Filter</b>"
-msgstr ""
+msgstr "<b>忽略过滤器</b>"
 
 #: tortoisehg/hgqt/hgignore.py:92
 msgid "<b>Untracked Files</b>"
 
 #: tortoisehg/hgqt/hgignore.py:106
 msgid "Backspace or Del to remove row(s)"
-msgstr ""
+msgstr "使用退格或 Del 删除行"
 
 #: tortoisehg/hgqt/hgignore.py:150
 msgid "Add ignore filter..."
-msgstr ""
+msgstr "添加忽略名单..."
 
 #: tortoisehg/hgqt/hgignore.py:168
 msgid "selected files"
-msgstr ""
+msgstr "已选择文件"
 
 #: tortoisehg/hgqt/hgignore.py:169
 msgid "Ignore "
-msgstr ""
+msgstr "忽略 "
 
 #: tortoisehg/hgqt/hgignore.py:221
 msgid "Invalid glob expression"
 msgid ""
 "TortoiseHg has created a new .hgignore file.  Would you like to add this "
 "file to the source code control repository?"
-msgstr ""
+msgstr "TortoiseHg 已创建一个新的 .hgignore 文件。您希望将其纳入版本控制吗?"
 
 #: tortoisehg/hgqt/hgignore.py:303
 msgid "Unable to write .hgignore file"
 
 #: tortoisehg/hgqt/hginit.py:45
 msgid "Add special files (.hgignore, ...)"
-msgstr "添加特殊文件(.hgignore,...)"
+msgstr "添加特殊文件 (.hgignore,...)"
 
 #: tortoisehg/hgqt/hginit.py:47
 msgid "Make repo compatible with Mercurial <1.7"
-msgstr "创建和Mercurial 1.7以前的版本兼容的仓库"
+msgstr "创建和 Mercurial 1.7 以前的版本兼容的仓库"
 
 #: tortoisehg/hgqt/hginit.py:49
 msgid "Show in Workbench after init"
-msgstr ""
+msgstr "初始化完成后在 Workbench 中打开"
 
 #: tortoisehg/hgqt/hginit.py:56
 msgid "Create"
 #: tortoisehg/hgqt/hginit.py:211 tortoisehg/hgqt/hginit.py:217
 #, python-format
 msgid "<p>Repository successfully created at</p><p>%s</p>"
-msgstr ""
+msgstr "<p>已在下列位置成功创建仓库:</p><p>%s</p>"
 
 #: tortoisehg/hgqt/hginit.py:212
 #, python-format
 msgid "<p>But could not run Workbench for it.</p><p>%s</p>"
-msgstr ""
+msgstr "<p>但无法为其运行 Workbench.</p><p>%s</p>"
 
 #: tortoisehg/hgqt/hgrcutil.py:29
 msgid "Unable to create a config file"
 
 #: tortoisehg/hgqt/hgrcutil.py:30
 msgid "Insufficient access rights."
-msgstr ""
+msgstr "访问权限不足。"
 
 #: tortoisehg/hgqt/htmldelegate.py:60
 #, python-format
 msgid "?? Error: %s ??"
-msgstr ""
+msgstr "?? 错误: %s ??"
 
 #: tortoisehg/hgqt/lfprompt.py:17
 msgid ""
 
 #: tortoisehg/hgqt/lfprompt.py:23
 msgid "Add as &Largefiles"
-msgstr ""
+msgstr "作为大文件添加(&L)"
 
 #: tortoisehg/hgqt/lfprompt.py:23
 msgid "Add as &Normal Files"
-msgstr ""
+msgstr "作为普通文件添加(&N)"
 
 #: tortoisehg/hgqt/license.py:29
 msgid "License"
-msgstr ""
+msgstr "许可协议"
 
 #: tortoisehg/hgqt/logcolumns.py:75
 msgid "Drag to change order"
-msgstr ""
+msgstr "拖动以更改顺序"
 
 #: tortoisehg/hgqt/logcolumns.py:100 tortoisehg/hgqt/settings.py:525
 #: tortoisehg/hgqt/workbench.py:712 tortoisehg/util/menuthg.py:46
 #: tortoisehg/hgqt/manifestdialog.py:57
 #, python-format
 msgid "Manifest %s@%s"
-msgstr "文件清单 %s@%s"
+msgstr "修订清单 %s@%s"
 
 #: tortoisehg/hgqt/manifestdialog.py:186 tortoisehg/hgqt/status.py:103
 msgid "### filter text ###"
-msgstr "###过滤文###"
+msgstr "### 过滤文###"
 
 #: tortoisehg/hgqt/manifestdialog.py:188 tortoisehg/hgqt/status.py:105
 msgid "Filter:"
-msgstr "过滤器"
+msgstr "过滤器:"
 
 #: tortoisehg/hgqt/manifestdialog.py:193
 msgid "Status"
 #: tortoisehg/hgqt/merge.py:128 tortoisehg/hgqt/repomodel.py:600
 #: tortoisehg/hgqt/revpanel.py:159
 msgid "Not a head revision!"
-msgstr "不是head版本!"
+msgstr "不是版本!"
 
 #: tortoisehg/hgqt/merge.py:135
 msgid "Merge from (other revision)"
-msgstr "合并自(其他修订版本)"
+msgstr "合并自 (要并入的修订版本)"
 
 #: tortoisehg/hgqt/merge.py:140 tortoisehg/hgqt/merge.py:652
 msgid "Unable to merge"
 
 #: tortoisehg/hgqt/merge.py:147
 msgid "Merge to (working directory)"
-msgstr "合并到(工作目录)"
+msgstr "合并到 (工作目录)"
 
 #: tortoisehg/hgqt/merge.py:170
 msgid ""
 "href=\"skip\"><b>Continue</b></a> or <a href=\"discard\"><b>discard</b></a> "
 "existing merge."
 msgstr ""
+"工作目录已被<b>合并</b>。<a href=\"skip\"><b>继续</b></a>或<a "
+"href=\"discard\"><b>丢弃</b></a>已存在的合并。"
 
 #: tortoisehg/hgqt/merge.py:179
 msgid ""
 "href=\"shelve\"><b>shelve</b></a> to patch, or <a "
 "href=\"discard\"><b>discard</b></a> changes."
 msgstr ""
+"在合并前,您必须<a href=\"commit\"><b>提交</b></a>,将修订<a "
+"href=\"shelve\"><b>剥离</b></a>为补丁,或 <a href=\"discard\"><b>放弃</b></a>所做更改。"
 
 #: tortoisehg/hgqt/merge.py:191
 msgid "Or use:"
-msgstr "或使用"
+msgstr "或使用:"
 
 #: tortoisehg/hgqt/merge.py:194
 msgid "Force a merge with outstanding changes (-f/--force)"
-msgstr ""
+msgstr "强制合并 (-f/--force)"
 
 #: tortoisehg/hgqt/merge.py:208
 msgid "Discard all changes from merge target (other) revision"
-msgstr ""
+msgstr "丢弃目标修订版本所做的全部更改"
 
 #: tortoisehg/hgqt/merge.py:236
 msgid "Confirm Discard Changes"
 "\n"
 "Are you sure this is what you want to do?"
 msgstr ""
+"修订版本 %s 所做更改及其全部未合并的上级修订将被丢弃。\n"
+"\n"
+"您确实是要这样做吗?"
 
 #: tortoisehg/hgqt/merge.py:290
 msgctxt "working dir state"
 msgid "Clean"
-msgstr ""
+msgstr "可以合并"
 
 #: tortoisehg/hgqt/merge.py:341
 msgid "Merging..."
-msgstr ""
+msgstr "正在合并..."
 
 #: tortoisehg/hgqt/merge.py:355
 msgid "Automatically advance to next page when merge is complete."
-msgstr ""
+msgstr "合并完成时自动前进到下一页"
 
 #: tortoisehg/hgqt/merge.py:400
 #, python-format
 msgid ""
 "%d files were modified on both branches and must be <a "
 "href=\"resolve\"><b>resolved</b></a>"
-msgstr ""
+msgstr "%d个文件在两个分支中均被修改,您需要<a href=\"resolve\"><b>解决合并冲突</b></a>"
 
 #: tortoisehg/hgqt/merge.py:439
 msgid "Commit merge results"
-msgstr ""
+msgstr "提交合并结果"
 
 #: tortoisehg/hgqt/merge.py:540
 msgid "Merge"
 #: tortoisehg/hgqt/merge.py:544
 #, python-format
 msgid "Merge with %s"
-msgstr ""
+msgstr "与 %s 合并"
 
 #: tortoisehg/hgqt/merge.py:607
 msgid "Merge changeset"
 
 #: tortoisehg/hgqt/mq.py:35
 msgid "### patch name ###"
-msgstr ""
+msgstr "### 补丁名称 ###"
 
 #: tortoisehg/hgqt/mq.py:57
 msgid "Patch Name Required"
 
 #: tortoisehg/hgqt/pbranch.py:549
 msgid "No editor found"
-msgstr ""
+msgstr "未发现编辑器"
 
 #: tortoisehg/hgqt/pbranch.py:550
 msgid ""
 "Mercurial was unable to find an editor. Please configure Mercurial to use an "
 "editor installed on your system."
-msgstr ""
+msgstr "Mercurial 无法找到编辑器。请配置 Mercurial 使用您系统中已安装的编辑器。"
 
 #: tortoisehg/hgqt/pbranch.py:844
 msgid "New Patch Branch"
 
 #: tortoisehg/hgqt/pbranch.py:879
 msgid "Patch message:"
-msgstr "补丁说明"
+msgstr "补丁说明:"
 
 #: tortoisehg/hgqt/pbranch.py:880
 msgid "Patch date:"
-msgstr "补丁日期"
+msgstr "补丁日期:"
 
 #: tortoisehg/hgqt/pbranch.py:881
 msgid "Patch user:"
 #: tortoisehg/hgqt/purge.py:78
 #, python-format
 msgid "%s - purge"
-msgstr ""
+msgstr "%s - 清理工作目录"
 
 #: tortoisehg/hgqt/purge.py:83 tortoisehg/hgqt/purge.py:118
 msgid "Checking"
-msgstr ""
+msgstr "正在检查"
 
 #: tortoisehg/hgqt/purge.py:122
 msgid "Ready to purge."
-msgstr ""
+msgstr "已准备好清理工作目录"
 
 #: tortoisehg/hgqt/purge.py:126
 #, python-format
 msgid "Delete %d unknown file"
 msgid_plural "Delete %d unknown files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "删除 %d 个未知文件"
 
 #: tortoisehg/hgqt/purge.py:132
 #, python-format
 msgid "Delete %d ignored file"
 msgid_plural "Delete %d ignored files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "删除 %d 个已忽略文件"
 
 #: tortoisehg/hgqt/purge.py:138
 #, python-format
 msgid "Delete %d file in .hg/Trashcan"
 msgid_plural "Delete %d files in .hg/Trashcan"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "删除 .hg/Trashcan 中的 %d 个文件"
 
 #: tortoisehg/hgqt/purge.py:162
 msgid "Confirm file deletions"
-msgstr ""
+msgstr "确认文件删除"
 
 #: tortoisehg/hgqt/purge.py:163
 msgid "Are you sure you want to delete these files and/or folders?"
-msgstr ""
+msgstr "您确认要删除这些文件和文件夹吗?"
 
 #: tortoisehg/hgqt/purge.py:171
 msgid "Deletion failures"
-msgstr ""
+msgstr "删除失败"
 
 #: tortoisehg/hgqt/purge.py:172
 #, python-format
 msgid "Unable to delete %d file or folder"
 msgid_plural "Unable to delete %d files or folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "无法删除 %d 个文件或文件夹"
 
 #: tortoisehg/hgqt/purge.py:211
 msgid "Deleting trash folder..."
-msgstr ""
+msgstr "正在清空垃圾箱..."
 
 #: tortoisehg/hgqt/purge.py:254
 #, python-format
 msgid "Deleted %d files"
-msgstr ""
+msgstr "已删除 %d 个文件"
 
 #: tortoisehg/hgqt/purge.py:264
 #, python-format
 msgid "Deleted %d files and %d folders"
-msgstr ""
+msgstr "已删除 %d 个文件和 %d 个文件夹"
 
 #: tortoisehg/hgqt/qdelete.py:24
 #, python-format
 msgid "Patch remove - %s"
-msgstr ""
+msgstr "移除补丁 - %s"
 
 #: tortoisehg/hgqt/qdelete.py:33
 msgid "Remove patches from queue?"
-msgstr ""
+msgstr "从队列中移除补丁?"
 
 #: tortoisehg/hgqt/qdelete.py:38 tortoisehg/hgqt/qfold.py:42
 msgid "Keep patch files"
-msgstr ""
+msgstr "保留补丁文件"
 
 #: tortoisehg/hgqt/qfold.py:28
 #, python-format
 
 #: tortoisehg/hgqt/qfold.py:36
 msgid "New patch message:"
-msgstr "新补丁说明"
+msgstr "新补丁说明:"
 
 #: tortoisehg/hgqt/qfold.py:68
 msgid "Patches to fold"
 
 #: tortoisehg/hgqt/qscilib.py:345
 msgid "### regular expression ###"
-msgstr ""
+msgstr "### 正则表达式 ###"
 
 #: tortoisehg/hgqt/qscilib.py:348
 msgid "Regular expression search pattern"
 
 #: tortoisehg/hgqt/quickop.py:20
 msgid "Checkmark files to add"
-msgstr ""
+msgstr "选择要添加(开始跟踪)的文件"
 
 #: tortoisehg/hgqt/quickop.py:21
 msgid "Checkmark files to forget"
-msgstr ""
+msgstr "选择要移除(停止跟踪)的文件"
 
 #: tortoisehg/hgqt/quickop.py:21
 msgid "Forget"
-msgstr "遗忘"
+msgstr "移除"
 
 #: tortoisehg/hgqt/quickop.py:22
 msgid "Checkmark files to revert"
-msgstr ""
+msgstr "选择要还原的文件"
 
 #: tortoisehg/hgqt/quickop.py:22
 msgid "Revert"
 
 #: tortoisehg/hgqt/quickop.py:23
 msgid "Checkmark files to remove"
-msgstr ""
+msgstr "选择要删除的文件"
 
 #: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:581
 #: tortoisehg/hgqt/webconf_ui.py:80
 #: tortoisehg/hgqt/quickop.py:44
 #, python-format
 msgid "%s - hg %s"
-msgstr ""
+msgstr "%s - hg %s"
 
 #: tortoisehg/hgqt/quickop.py:90
 msgid "Do not save backup files (*.orig)"
 
 #: tortoisehg/hgqt/quickop.py:93
 msgid "Force removal of modified files (--force)"
-msgstr ""
+msgstr "强行删除已修改的文件 (--force)"
 
 #: tortoisehg/hgqt/quickop.py:121
 msgid "Add &Largefiles"
-msgstr ""
+msgstr "添加大文件(&L)"
 
 #: tortoisehg/hgqt/quickop.py:163 tortoisehg/hgqt/quickop.py:232
 msgid "No files selected"
 
 #: tortoisehg/hgqt/repofilter.py:68
 msgid "### revision set query ###"
-msgstr "###修订版本集查询###"
+msgstr "### 修订版本集查询 ###"
 
 #: tortoisehg/hgqt/repofilter.py:74
 msgid "Clear current query and query text"
 #: tortoisehg/hgqt/repomodel.py:45
 msgctxt "column header"
 msgid "Graph"
-msgstr ""
+msgstr "历史图"
 
 #: tortoisehg/hgqt/repomodel.py:46
 msgctxt "column header"
 msgid "Rev"
-msgstr ""
+msgstr "修订版本"
 
 #: tortoisehg/hgqt/repomodel.py:47
 msgctxt "column header"
 msgid "Branch"
-msgstr ""
+msgstr "分支"
 
 #: tortoisehg/hgqt/repomodel.py:48
 msgctxt "column header"
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #: tortoisehg/hgqt/repomodel.py:49
 msgctxt "column header"
 #: tortoisehg/hgqt/repomodel.py:51
 msgctxt "column header"
 msgid "Node"
-msgstr ""
+msgstr "节点"
 
 #: tortoisehg/hgqt/repomodel.py:52
 msgctxt "column header"
 msgid "Age"
-msgstr ""
+msgstr "时间"
 
 #: tortoisehg/hgqt/repomodel.py:53
 msgctxt "column header"
 msgid "Local Time"
-msgstr ""
+msgstr "本地时间"
 
 #: tortoisehg/hgqt/repomodel.py:54
 msgctxt "column header"
 msgid "UTC Time"
-msgstr ""
+msgstr "UTC时间"
 
 #: tortoisehg/hgqt/repomodel.py:55
 msgctxt "column header"
 msgid "Changes"
-msgstr ""
+msgstr "更改"
 
 #: tortoisehg/hgqt/repomodel.py:56
 msgctxt "column header"
 msgid "Converted From"
-msgstr ""
+msgstr "转换自"
 
 #: tortoisehg/hgqt/repomodel.py:57
 msgctxt "column header"
 msgid "Phase"
-msgstr ""
+msgstr "开发阶段"
 
 #: tortoisehg/hgqt/repomodel.py:212
 #, python-format
 msgid "filling (%d)"
-msgstr ""
+msgstr "正在填充 (%d)"
 
 #: tortoisehg/hgqt/repomodel.py:587
 msgid "Mercurial User"
-msgstr ""
+msgstr "Mercurial 用户"
 
 #: tortoisehg/hgqt/reporegistry.py:175 tortoisehg/hgqt/reporegistry.py:688
 #, python-format
 msgid "Unsupported repository type (%s)"
-msgstr ""
+msgstr "不支持的仓库类型 (%s)"
 
 #: tortoisehg/hgqt/reporegistry.py:176 tortoisehg/hgqt/reporegistry.py:689
 msgid "Cannot open non mercurial repositories or subrepositories"
-msgstr ""
+msgstr "不能打开非 Mercurial 仓库或子仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:207 tortoisehg/hgqt/wctxactions.py:349
 msgid "&Delete"
-msgstr ""
+msgstr "删除(&D)"
 
 #: tortoisehg/hgqt/reporegistry.py:209
 msgid "Confirm Delete"
 #: tortoisehg/hgqt/reporegistry.py:210
 #, python-format
 msgid "Delete Group '%s' and all its entries?"
-msgstr ""
+msgstr "删除分组“%s”及其所有条目?"
 
 #: tortoisehg/hgqt/reporegistry.py:238
 msgid "Repository Registry"
 
 #: tortoisehg/hgqt/reporegistry.py:416
 msgid "Refresh repository list"
-msgstr ""
+msgstr "刷新仓库列表"
 
 #: tortoisehg/hgqt/reporegistry.py:417
 msgid "Refresh the Repository Registry list"
 #: tortoisehg/hgqt/reporegistry.py:418 tortoisehg/hgqt/wctxactions.py:43
 #: tortoisehg/hgqt/webconf_ui.py:76
 msgid "Open"
-msgstr ""
+msgstr "打开"
 
 #: tortoisehg/hgqt/reporegistry.py:419
 msgid "Open the repository in a new tab"
-msgstr ""
+msgstr "在新的标签页打开仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:420
 msgid "Open All"
-msgstr ""
+msgstr "打开所有仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:421
 msgid "Open all repositories in new tabs"
-msgstr ""
+msgstr "在新的标签页打开所有仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:422 tortoisehg/hgqt/reporegistry.py:700
 msgid "New Group"
-msgstr ""
+msgstr "新建分组"
 
 #: tortoisehg/hgqt/reporegistry.py:423
 msgid "Create a new group"
-msgstr ""
+msgstr "创建一个新的分组"
 
 #: tortoisehg/hgqt/reporegistry.py:425
 msgid "Rename the entry"
-msgstr ""
+msgstr "重命名条目"
 
 #: tortoisehg/hgqt/reporegistry.py:426
 msgid "Settings..."
 #: tortoisehg/hgqt/reporegistry.py:429
 msgid ""
 "Remove the node and all its subnodes. Repositories are not deleted from disk."
-msgstr ""
+msgstr "删除节点和所有子结点。仓库不会从磁盘删除。"
 
 #: tortoisehg/hgqt/reporegistry.py:432 tortoisehg/util/menuthg.py:25
 msgid "Clone..."
 
 #: tortoisehg/hgqt/reporegistry.py:433
 msgid "Clone Repository"
-msgstr ""
+msgstr "克隆仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:434 tortoisehg/hgqt/sync.py:579
 #: tortoisehg/hgqt/workbench.py:333
 
 #: tortoisehg/hgqt/reporegistry.py:435
 msgid "Open the repository in a file browser"
-msgstr ""
+msgstr "在文件浏览器打开仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:436 tortoisehg/hgqt/sync.py:580
 #: tortoisehg/hgqt/workbench.py:336
 
 #: tortoisehg/hgqt/reporegistry.py:438
 msgid "Add repository..."
-msgstr "加仓库..."
+msgstr "加仓库..."
 
 #: tortoisehg/hgqt/reporegistry.py:439
 msgid "Add a repository to this group"
-msgstr ""
+msgstr "向分组中添加仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:440
 msgid "Add a subrepository..."
-msgstr "加子仓库..."
+msgstr "加子仓库..."
 
 #: tortoisehg/hgqt/reporegistry.py:441
 msgid "Convert an existing repository into a subrepository"
-msgstr ""
+msgstr "将已存在的仓库转换为子仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:443 tortoisehg/hgqt/wctxactions.py:52
 msgid "Copy path"
-msgstr ""
+msgstr "复制路径"
 
 #: tortoisehg/hgqt/reporegistry.py:444
 msgid "Copy the root path of the repository to the clipboard"
-msgstr ""
+msgstr "将仓库的根目录路径复制到剪贴板"
 
 #: tortoisehg/hgqt/reporegistry.py:446
 msgid "Sort by name"
-msgstr ""
+msgstr "按名称"
 
 #: tortoisehg/hgqt/reporegistry.py:447
 msgid "Sort the group by short name"
-msgstr ""
+msgstr "按名称为分组排序"
 
 #: tortoisehg/hgqt/reporegistry.py:448
 msgid "Sort by path"
-msgstr ""
+msgstr "按路径"
 
 #: tortoisehg/hgqt/reporegistry.py:449
 msgid "Sort the group by full path"
-msgstr ""
+msgstr "按路径为分组排序"
 
 #: tortoisehg/hgqt/reporegistry.py:450
 msgid "Sort by .hgsub"
-msgstr ""
+msgstr "按 .hgsub"
 
 #: tortoisehg/hgqt/reporegistry.py:451
 msgid "Order the subrepos as in .hgsub"
-msgstr ""
+msgstr "按 .hgsub 为子仓库排序"
 
 #: tortoisehg/hgqt/reporegistry.py:512
 msgid "Select repository directory to add"
-msgstr ""
+msgstr "选择要添加的仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:523 tortoisehg/hgqt/reporegistry.py:612
 #: tortoisehg/hgqt/reporegistry.py:640 tortoisehg/hgqt/reporegistry.py:646
 msgid "Failed to add repository"
-msgstr ""
+msgstr "添加仓库失败"
 
 #: tortoisehg/hgqt/reporegistry.py:524 tortoisehg/hgqt/workbench.py:808
 #, python-format
 msgid "%s is not a valid repository"
-msgstr ""
+msgstr "%s 不是有效的仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:530
 msgid "Select an existing repository to add as a subrepo"
-msgstr ""
+msgstr "选择已存在的仓库,将其添加为子仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:541 tortoisehg/hgqt/reporegistry.py:546
 #: tortoisehg/hgqt/reporegistry.py:551
 msgid "Cannot add subrepository"
-msgstr ""
+msgstr "无法添加子仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:542
 #, python-format
 msgid "\"%s\" is not a folder"
-msgstr ""
+msgstr "“%s” 不是一个文件夹"
 
 #: tortoisehg/hgqt/reporegistry.py:547
 msgid "A repository cannot be added as a subrepo of itself"
-msgstr "不能添加自己为子版本库"
+msgstr "不能添加自己为子库"
 
 #: tortoisehg/hgqt/reporegistry.py:552
 #, python-format
 "want to add a non trivial subrepository mapping you must manually edit the "
 "<i>.hgsub</i> file"
 msgstr ""
+"选定的文件夹:<br><br>%s<br><br>并不在目标仓库中。<br><br>这种情况是允许的,但并不推荐使用。<br>如果您想添加子仓库映射,必须"
+"手动编辑 <i>.hgsub</i> 文件"
 
 #: tortoisehg/hgqt/reporegistry.py:570
 msgid "Cannot open repository"
-msgstr ""
+msgstr "无法打开仓库"
 
 #: tortoisehg/hgqt/reporegistry.py:571
 #, python-format
 msgid "The selected repository:<br><br>%s<br><br>cannot be open!"
-msgstr ""
+msgstr "选定的仓库:<br><br>%s<br><br>无法打开!"
 
 #: tortoisehg/hgqt/reporegistry.py:576
 msgid "Subrepository already exists"
-msgstr ""
+msgstr "子仓库已存在"
 
 #: tortoisehg/hgqt/reporegistry.py:577
 #, python-format
 msgid ""
 "The selected repository:<br><br>%s<br><br>is already a subrepository "
 "of:<br><br>%s<br><br>as: \"%s\""
-msgstr ""
+msgstr "选定的仓库:<br><br>%s<br><br>已经是 <br><br>%s<br><br> 的子仓库: \"%s\""
 
 #: tortoisehg/hgqt/reporegistry.py:594
 msgid "Failed to add subrepository"
-msgstr ""
+msgstr "添加子仓库失败"
 
 #: tortoisehg/hgqt/reporegistry.py:595
 #, python-format
 msgid "Cannot open the .hgsub file in:<br><br>%s"
-msgstr ""
+msgstr "无法打开下列位置的 .hgsub 文件<br><br>%s"
 
 #: tortoisehg/hgqt/reporegistry.py:613
 #, python-format
 msgid "The .hgsub file already contains the line:<br><br>%s"
-msgstr ""
+msgstr ".hgsub 文件已包含此行:<br><br>%s"
 
 #: tortoisehg/hgqt/reporegistry.py:630
 msgid "Subrepo added to .hgsub file"
-msgstr "子版本库已添加 .hgsub 文件"
+msgstr "子库已添加 .hgsub 文件"
 
 #: tortoisehg/hgqt/reporegistry.py:631
 #, python-format
 "finish adding the subrepo <i>you must still <u>commit</u></i> the changes to "
 "the .hgsub file in order to confirm the addition of the subrepo."
 msgstr ""
+"选定的子仓库:<br><br><i>%s</i><br><br>已被添加到下列仓库的 .hgsub "
+"文件中:<br><br><i>%s</i><br><br>请注意为完成子仓库添加操作,<i>您仍需<u>提交</u></i> .hgsub "
+"文件的更改以确认子仓库的添加。"
 
 #: tortoisehg/hgqt/reporegistry.py:641
 #, python-format
 msgid "Cannot update the .hgsub file in:<br><br>%s"
-msgstr ""
+msgstr "无法更新下列位置的 .hgsub 文件:<br><br>%s"
 
 #: tortoisehg/hgqt/reporegistry.py:647
 #, python-format
 msgid "\"%s\" is not a valid repository inside \"%s\""
-msgstr ""
+msgstr "\"%s\" 不是 \"%s\" 中的一个有效仓库"
 
 #: tortoisehg/hgqt/repotreeitem.py:236 tortoisehg/hgqt/repotreeitem.py:413
 #: tortoisehg/hgqt/repotreeitem.py:462 tortoisehg/hgqt/repotreeitem.py:517
 msgid "Sort"
-msgstr ""
+msgstr "排序"
 
 #: tortoisehg/hgqt/repotreeitem.py:258
 #, python-format
 msgid "Local Repository %s"
-msgstr ""
+msgstr "本地仓库 %s"
 
 #: tortoisehg/hgqt/repotreeitem.py:329
 #, python-format
 msgid ""
 "An exception happened while loading the subrepos of:<br><br>\"%s\"<br><br>"
-msgstr ""
+msgstr "载入下列位置的子仓库时发生异常:<br><br>\"%s\"<br><br>"
 
 #: tortoisehg/hgqt/repotreeitem.py:331
 #, python-format
 msgid "The exception error message was:<br><br>%s<br><br>"
-msgstr "异常信息是<br><br>%s<br><br>"
+msgstr "异常信息是: <br><br>%s<br><br>"
 
 #: tortoisehg/hgqt/repotreeitem.py:332
 msgid "Click OK to continue or Abort to exit."
 
 #: tortoisehg/hgqt/repotreeitem.py:334
 msgid "Error loading subrepos"
-msgstr ""
+msgstr "载入子仓库错误"
 
 #: tortoisehg/hgqt/repotreeitem.py:352
 msgid "Unable to update repository name"
-msgstr ""
+msgstr "无法更新仓库名"
 
 #: tortoisehg/hgqt/repotreeitem.py:353
 #, python-format
 msgid "An error occurred while updating the repository hgrc file (%s)"
-msgstr ""
+msgstr "更新仓库的 hgrc 文件 (%s) 时发生错误"
 
 #: tortoisehg/hgqt/repotreeitem.py:513
 msgid "default"
-msgstr ""
+msgstr "默认"
 
 #: tortoisehg/hgqt/repotreemodel.py:164 tortoisehg/hgqt/resolve.py:399
 #: tortoisehg/hgqt/sync.py:255 tortoisehg/hgqt/webconf.py:266
 msgid "Path"
-msgstr ""
+msgstr "路径"
 
 #: tortoisehg/hgqt/repotreemodel.py:282
 msgid "Could not get subrepository list"
-msgstr ""
+msgstr "无法获得子仓库列表"
 
 #: tortoisehg/hgqt/repotreemodel.py:283
 #, python-format
 msgid ""
 "It was not possible to get the subrepository list for the repository "
 "in:<br><br><i>%s</i>"
-msgstr ""
+msgstr "无法获取下列位置中仓库的子仓库列表:<br><br><i>%s</i>"
 
 #: tortoisehg/hgqt/repotreemodel.py:286
 msgid "Could not open some subrepositories"
-msgstr ""
+msgstr "无法打开部分子仓库"
 
 #: tortoisehg/hgqt/repotreemodel.py:287
 #, python-format
 "in:<br><br><i>%s</i><br><br>The following subrepositories may be missing, "
 "broken or on an inconsistent state and cannot be accessed:<br><br><i>%s</i>"
 msgstr ""
+"无法全部打开下列位置中仓库的子仓库列表:<br><br><i>%s</i><br><br>下列子仓库可能已丢失、损坏或处于不能访问的状态:<br><br>"
+"<i>%s</i>"
 
 #: tortoisehg/hgqt/repoview.py:95
 msgid "Choose log columns..."
-msgstr ""
+msgstr "选择日志列..."
 
 #: tortoisehg/hgqt/repoview.py:240
 #, python-format
 msgid "Goto ancestor of %s and %s"
-msgstr ""
+msgstr "转到 %s 和 %s 的祖先"
 
 #: tortoisehg/hgqt/repoview.py:276
 #, python-format
 #: tortoisehg/hgqt/repowidget.py:271
 #, python-format
 msgid "%s <incoming>"
-msgstr ""
+msgstr "%s <可拉取>"
 
 #: tortoisehg/hgqt/repowidget.py:448
 msgid "Found incoming changesets"
-msgstr ""
+msgstr "找到可拉取的修订集"
 
 #: tortoisehg/hgqt/repowidget.py:451
 msgid "Pull incoming changesets into your repository"
-msgstr ""
+msgstr "拉取修订集到您的仓库"
 
 #: tortoisehg/hgqt/repowidget.py:453
 msgid "Reject"
 
 #: tortoisehg/hgqt/repowidget.py:454
 msgid "Reject incoming changesets"
-msgstr ""
+msgstr "拒绝拉取修订集"
 
 #: tortoisehg/hgqt/repowidget.py:547 tortoisehg/hgqt/sync.py:1025
 #, python-format
 msgid "%d outgoing changesets"
-msgstr "%d个外发的修订集"
+msgstr "%d个可推送的修订集"
 
 #: tortoisehg/hgqt/repowidget.py:549 tortoisehg/hgqt/repowidget.py:1186
 #: tortoisehg/hgqt/workbench.py:382
 
 #: tortoisehg/hgqt/repowidget.py:708
 msgid "There is no rollback transaction available"
-msgstr ""
+msgstr "没有可用的回滚信息"
 
 #: tortoisehg/hgqt/repowidget.py:711
 msgid "Undo last commit?"
 #: tortoisehg/hgqt/repowidget.py:712
 #, python-format
 msgid "Undo most recent commit (%d), preserving file changes?"
-msgstr ""
+msgstr "撤销最近的提交 (%d) 并保持文件更改?"
 
 #: tortoisehg/hgqt/repowidget.py:716
 msgid "Undo last transaction?"
 
 #: tortoisehg/hgqt/repowidget.py:1216
 msgid "Copy hash"
-msgstr "复制校验码"
+msgstr "复制hash"
 
 #: tortoisehg/hgqt/repowidget.py:1220
 msgid "Export"
 
 #: tortoisehg/hgqt/repowidget.py:1227
 msgid "Bundle rev to tip..."
-msgstr ""
+msgstr "从本修订到tip之间的修订打包..."
 
 #: tortoisehg/hgqt/repowidget.py:1229 tortoisehg/hgqt/wctxactions.py:41
 msgid "Copy patch"
 
 #: tortoisehg/hgqt/repowidget.py:1235
 msgid "Change phase to"
-msgstr ""
+msgstr "更改开发阶段为"
 
 #: tortoisehg/hgqt/repowidget.py:1241
 msgid "Transplant to local"
 "Revision #%d (%s) was exported to:<p><a href=\"file:///%s\">%s</a>%s<a "
 "href=\"file:///%s\">%s</a>"
 msgstr ""
-"修订版本 #%d (%s) 导出到<p><a href=\"file:///%s\">%s</a>%s<a "
+"修订版本 #%d (%s) 导出到:<p><a href=\"file:///%s\">%s</a>%s<a "
 "href=\"file:///%s\">%s</a>"
 
 #: tortoisehg/hgqt/repowidget.py:1588
 #: tortoisehg/hgqt/repowidget.py:1589
 #, python-format
 msgid "%d patches were exported to:<p><a href=\"file:///%s\">%s</a>"
-msgstr "%d 补丁导出到<p><a href=\"file:///%s\">%s</a>"
+msgstr "%d 补丁导出到:<p><a href=\"file:///%s\">%s</a>"
 
 #: tortoisehg/hgqt/repowidget.py:1709
 msgid "Write bundle"
 
 #: tortoisehg/hgqt/resolve.py:64
 msgid "Other revision information"
-msgstr "其他修订版本信息"
+msgstr "并入修订版本信息"
 
 #: tortoisehg/hgqt/resolve.py:77
 msgid "Unresolved conflicts"
 
 #: tortoisehg/hgqt/resolve.py:92
 msgid "Attempt automatic (trivial) merge"
-msgstr "尝试自动合并(试用)"
+msgstr "尝试自动(小的)合并"
 
 #: tortoisehg/hgqt/resolve.py:94
 msgid "Tool Resolve"
 
 #: tortoisehg/hgqt/resolve.py:98
 msgid "Accept the local file version (yours)"
-msgstr "接受本地版本的文件(您的)"
+msgstr "使用本地版本修订中的文件"
 
 #: tortoisehg/hgqt/resolve.py:100
 msgid "Take Other"
-msgstr "采用其他"
+msgstr "采用并入版本"
 
 #: tortoisehg/hgqt/resolve.py:101
 msgid "Accept the other file version (theirs)"
-msgstr "接受其他版本的文件(其他人)"
+msgstr "使用并入修订版本的文件"
 
 #: tortoisehg/hgqt/resolve.py:103
 msgid "Mark as Resolved"
 
 #: tortoisehg/hgqt/resolve.py:104
 msgid "Mark this file as resolved"
-msgstr "标记这个文件为已解决"
+msgstr "这个文件标记为已解决"
 
 #: tortoisehg/hgqt/resolve.py:114
 msgid "Resolved conflicts"
-msgstr "解决冲突"
+msgstr "解决冲突"
 
 #: tortoisehg/hgqt/resolve.py:129
 msgid "Edit resolved file"
 
 #: tortoisehg/hgqt/resolve.py:137
 msgid "Diff to Other"
-msgstr "与其他版本的差异"
+msgstr "与并入版本的差异"
 
 #: tortoisehg/hgqt/resolve.py:138
 msgid "Visual diff between resolved file and second parent"
 
 #: tortoisehg/hgqt/resolve.py:141
 msgid "Mark this file as unresolved"
-msgstr "标记这个文件为已解决"
+msgstr "这个文件标记为已解决"
 
 #: tortoisehg/hgqt/resolve.py:158
 msgid "Detected merge/diff tools:"
-msgstr "检测 合并/差异 工具"
+msgstr "检测 合并/差异 工具:"
 
 #: tortoisehg/hgqt/resolve.py:162
 msgid "Command output"
 
 #: tortoisehg/hgqt/resolve.py:344
 msgid "All conflicts are resolved."
-msgstr "所有冲突文件都被解决。"
+msgstr "所有冲突文件都被解决。"
 
 #: tortoisehg/hgqt/resolve.py:346
 msgid "There are no conflicting file merges."
 
 #: tortoisehg/hgqt/resolve.py:353
 msgid "Exit without finishing resolve?"
-msgstr "不解决冲突退出?"
+msgstr "不解决冲突退出?"
 
 #: tortoisehg/hgqt/resolve.py:354
 msgid "Unresolved conflicts remain. Are you sure?"
 
 #: tortoisehg/hgqt/resolve.py:399
 msgid "Ext"
-msgstr ""
+msgstr "扩展名"
 
 #: tortoisehg/hgqt/resolve.py:399 tortoisehg/hgqt/thgimport.py:86
 msgid "Repository"
 
 #: tortoisehg/hgqt/revpanel.py:164
 msgid "Head is closed!"
-msgstr "head版本已关闭!"
+msgstr "分支头已关闭!"
 
 #: tortoisehg/hgqt/revset.py:28
 msgid "Changesets where username contains string."
 
 #: tortoisehg/hgqt/revset.py:44
 msgid "Changeset is a named branch head."
-msgstr "修订集是命名分支的head。"
+msgstr "修订集是命名分支的。"
 
 #: tortoisehg/hgqt/revset.py:46
 msgid "Changeset is a merge changeset."
 
 #: tortoisehg/hgqt/revset.py:221
 msgid "Searching..."
-msgstr ""
+msgstr "正在搜索..."
 
 #: tortoisehg/hgqt/revset.py:222 tortoisehg/hgqt/revset.py:234
 msgid "Running"
 
 #: tortoisehg/hgqt/revset.py:222
 msgid "query"
-msgstr ""
+msgstr "查询"
 
 #: tortoisehg/hgqt/revset.py:374
 msgid "found revision"
 
 #: tortoisehg/hgqt/revset.py:397
 msgid "Parse Error: "
-msgstr "解析错误 "
+msgstr "解析错误: "
 
 #: tortoisehg/hgqt/revset.py:401
 msgid "Invalid query: "
-msgstr "无效查询 "
+msgstr "无效查询: "
 
 #: tortoisehg/hgqt/run.py:64 tortoisehg/hgqt/run.py:429
 #, python-format
 "Error string \"%(arg0)s\" at %(arg1)s<br>Please <a "
 "href=\"#edit:%(arg1)s\">edit</a> your config"
 msgstr ""
+"错误的字符串 \"%(arg0)s\" 位于 %(arg1)s<br>请 <a href=\"#edit:%(arg1)s\">编辑</a> 您的配置"
 
 #: tortoisehg/hgqt/run.py:82
 msgid ""
 #: tortoisehg/hgqt/run.py:142
 #, python-format
 msgid "can not read file \"%s\". Ignored.\n"
-msgstr "无法读取文件\"%s\". 忽略之.\n"
+msgstr "无法读取文件\"%s\". 忽略\n"
 
 #: tortoisehg/hgqt/run.py:246
 #, python-format
 "thg: command '%s' is ambiguous:\n"
 "    %s\n"
 msgstr ""
+"thg: 命令 '%s' 意义不明:\n"
+"    %s\n"
 
 #: tortoisehg/hgqt/run.py:249
 #, python-format
 msgid "thg: unknown command '%s'\n"
-msgstr ""
+msgstr "thg: 未知的命令 '%s'\n"
 
 #: tortoisehg/hgqt/run.py:253
 #, python-format
 msgid "thg %s: %s\n"
-msgstr ""
+msgstr "thg %s: %s\n"
 
 #: tortoisehg/hgqt/run.py:256
 #, python-format
 msgid "thg: %s\n"
-msgstr ""
+msgstr "thg: %s\n"
 
 #: tortoisehg/hgqt/run.py:259 tortoisehg/hgqt/thread.py:320
 #: tortoisehg/hgqt/thread.py:330 tortoisehg/hgqt/thread.py:332
 
 #: tortoisehg/hgqt/run.py:310
 msgid "There is no Mercurial repository here (.hg not found)"
-msgstr "这里没有Mercurial仓库(未找到.hg目录)"
+msgstr "这里没有 Mercurial 仓库(未找到.hg目录)"
 
 #: tortoisehg/hgqt/run.py:322
 msgid "invalid arguments"
-msgstr "无效参数"
+msgstr "无效参数"
 
 #: tortoisehg/hgqt/run.py:328
 #, python-format
 msgid "unrecognized profiling format '%s' - Ignored\n"
-msgstr "无法识别的配置文件格式 '%s' - 忽略\n"
+msgstr "无法识别的配置文件格式 '%s' - 忽略\n"
 
 #: tortoisehg/hgqt/run.py:344
 msgid ""
 
 #: tortoisehg/hgqt/run.py:427 tortoisehg/hgqt/run.py:428
 msgid "Try refreshing your repository."
-msgstr ""
+msgstr "正在尝试刷新您的仓库。"
 
 #: tortoisehg/hgqt/run.py:431
 #, python-format
 msgid ""
 "Configuration Error: \"%(arg0)s\",<br>Please <a "
 "href=\"#fix:%(arg0)s\">fix</a> your config"
-msgstr ""
+msgstr "配置错误: \"%(arg0)s\",<br>请 <a href=\"#fix:%(arg0)s\">修正</a> 您的配置"
 
 #: tortoisehg/hgqt/run.py:433
 #, python-format
 msgid "Operation aborted:<br><br>%(arg0)s."
-msgstr ""
+msgstr "操作终止:<br><br>%(arg0)s."
 
 #: tortoisehg/hgqt/run.py:434
 msgid "Repository is locked"
-msgstr ""
+msgstr "仓库被锁定"
 
 #: tortoisehg/hgqt/run.py:492
 msgid "hint:"
-msgstr ""
+msgstr "提示:"
 
 #: tortoisehg/hgqt/run.py:499
 msgid "Keyboard interrupt"
 #: tortoisehg/hgqt/run.py:1004
 #, python-format
 msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"
-msgstr "TortoiseHg对话框(版本 %s), Mercurial(版本 %s)\n"
+msgstr "TortoiseHg 对话框 (版本 %s), Mercurial (版本 %s)\n"
 
 #: tortoisehg/hgqt/run.py:1033
 msgid "repository root directory or symbolic path name"
 
 #: tortoisehg/hgqt/run.py:1173
 msgid "launch visual diff tool"
-msgstr "启动GUI比较工具"
+msgstr "启动可视化差异工具"
 
 #: tortoisehg/hgqt/run.py:1175
 msgid "print license"
 
 #: tortoisehg/hgqt/rupdate.py:57
 msgid "Location:"
-msgstr "路径"
+msgstr "路径:"
 
 #: tortoisehg/hgqt/rupdate.py:61
 msgid "Discard remote changes, no backup (-C/--clean)"
 
 #: tortoisehg/hgqt/rupdate.py:65
 msgid "Allow pushing new branches (--new-branch)"
-msgstr "允许推送新分支(--new-branch)"
+msgstr "允许推送新分支 (--new-branch)"
 
 #: tortoisehg/hgqt/rupdate.py:67
 msgid "Force push to remote location (-f/--force)"
 
 #: tortoisehg/hgqt/serve_ui.py:84
 msgid "Port:"
-msgstr "端口"
+msgstr "端口:"
 
 #: tortoisehg/hgqt/serve_ui.py:85
 msgid "Status:"
-msgstr "状态"
+msgstr "状态:"
 
 #: tortoisehg/hgqt/serve_ui.py:86
 msgid "Start"
 
 #: tortoisehg/hgqt/settings.py:122
 msgid "&True"
-msgstr ""
+msgstr "是(&T)"
 
 #: tortoisehg/hgqt/settings.py:123
 msgid "&False"
-msgstr ""
+msgstr "否(&F)"
 
 #: tortoisehg/hgqt/settings.py:124
 msgid "&Unspecified"
 
 #: tortoisehg/hgqt/settings.py:184
 msgid "&Set..."
-msgstr ""
+msgstr "设置(&S)..."
 
 #: tortoisehg/hgqt/settings.py:185
 msgid "&Clear"
-msgstr ""
+msgstr "清除(&C)"
 
 #: tortoisehg/hgqt/settings.py:309
 #, python-format
 msgid "Failed to load issue tracker: '%s': %s. "
-msgstr "加载问题追踪器失败'%s': %s. "
+msgstr "加载问题追踪器失败: '%s': %s. "
 
 #: tortoisehg/hgqt/settings.py:339
 msgid "&Browse..."
-msgstr ""
+msgstr "浏览(&B)..."
 
 #: tortoisehg/hgqt/settings.py:458
 msgid "UI Language"
 
 #: tortoisehg/hgqt/settings.py:481
 msgid "Shell"
-msgstr ""
+msgstr "外壳"
 
 #: tortoisehg/hgqt/settings.py:482
 #, python-format
 "Windows: cmd.exe /K title %(reponame)s<br>Default, OS X: not set<br>Default, "
 "other: xterm -T \"%(reponame)s\""
 msgstr ""
+"指定启动您喜欢的外壳程序的命令。设置值中的字符串 %(reponame)s 将被仓库名替代。(需要重新启动)<br>Windows默认: cmd.exe "
+"/K title %(reponame)s<br>OS X默认: 未设置<br>其它系统默认: xterm -T \"%(reponame)s\""
 
 #: tortoisehg/hgqt/settings.py:490
 msgid "Immediate Operations"
-msgstr ""
+msgstr "无提示操作"
 
 #: tortoisehg/hgqt/settings.py:491
 msgid ""
 "Space separated list of shell operations you would like to be performed "
 "immediately, without user interaction. Commands are \"add remove revert "
 "forget\". Default: None (leave blank)"
-msgstr ""
+msgstr "列出不需要用户与交互直接完成的操作,用空格隔开。如 \"add remove revert forget\". 默认: 无 (留空)"
 
 #: tortoisehg/hgqt/settings.py:495
 msgid "Tab Width"
 msgid ""
 "Specify the number of spaces that tabs expand to in various TortoiseHg "
 "windows. Default: 0, Not expanded"
-msgstr ""
+msgstr "指定多个 TortoiseHg 窗口中制表符的宽度。默认: 0, 不展开"
 
 #: tortoisehg/hgqt/settings.py:499
 msgid "Force Repo Tab"
-msgstr ""
+msgstr "强制显示仓库标签"
 
 #: tortoisehg/hgqt/settings.py:500
 msgid "Always show repo tabs, even for a single repo. Default: False"
-msgstr ""
+msgstr "总是显示仓库标签,即使只有一个仓库。默认: 否"
 
 #: tortoisehg/hgqt/settings.py:501
 msgid "Monitor Repo Changes"
-msgstr ""
+msgstr "监视仓库变更"
 
 #: tortoisehg/hgqt/settings.py:503
 msgid ""
 "Specify the target filesystem where TortoiseHg monitors changes. Default: "
 "always"
-msgstr ""
+msgstr "指定 TortoiseHg 监视变更的目标文件系统。默认: always"
 
 #: tortoisehg/hgqt/settings.py:505
 msgid "Max Diff Size"
 "changelog, status, and commit windows. A value of zero implies no limit.  "
 "Default: 1024 (1MB)"
 msgstr ""
-"设置TortoiseHg在修改历史, 状态栏及提交窗口中所能显示的最大差分大小(以KB计算). 设为0表示不做限制. 默认: 1024 (1MB)"
+"设置 TortoiseHg 在修改历史状态栏及提交窗口中所能显示的最大差分大小 (以KB计算)设为0表示不做限制默认: 1024 (1MB)"
 
 #: tortoisehg/hgqt/settings.py:509
 msgid "Fork GUI"
-msgstr ""
+msgstr "图形界面进程"
 
 #: tortoisehg/hgqt/settings.py:510
 msgid ""
 "When running from the command line, fork a background process to run "
 "graphical dialogs.  Default: True"
-msgstr ""
+msgstr "从命令行运行时单独建立一个背景进程用于显示图形界面。默认: 是"
 
 #: tortoisehg/hgqt/settings.py:512
 msgid "Full Path Title"
-msgstr ""
+msgstr "显示完整路径"
 
 #: tortoisehg/hgqt/settings.py:513
 msgid ""
 "Show a full directory path of the repository in the dialog title instead of "
 "just the root directory name.  Default: False"
-msgstr "在对话框标题栏中显示仓库目录的完整路径而不是根路径, 默认: 否(False)"
+msgstr "在对话框标题栏中显示仓库目录的完整路径而不是根路径, 默认: 否"
 
 #: tortoisehg/hgqt/settings.py:515
 msgid "Auto-resolve merges"
-msgstr ""
+msgstr "自动解决合并冲突"
 
 #: tortoisehg/hgqt/settings.py:516
 msgid ""
 "of the file. In either case, when conflicts occur, the user will be invited "
 "to review and resolve changes manually. Default: False."
 msgstr ""
+"设置 TortoiseHg "
+"遇到合并冲突时是否尝试自动解决,仅当尝试不成功时报告合并冲突。设为“否”时,参与合并的双方均有修改的文件一律视为有冲突,即使两个修订版本修改的是同一文件的"
+"不同部分;用户需要手动审核和解决冲突。默认: 否"
 
 #: tortoisehg/hgqt/settings.py:526
 msgid "Default widget"
-msgstr ""
+msgstr "默认标签页"
 
 #: tortoisehg/hgqt/settings.py:528
 msgid ""
 "Select the initial widget that will be shown when opening a repository. "
 "Default: revdetails"
-msgstr ""
+msgstr "选择打开仓库时显示的默认标签页。默认: revdetails"
 
 #: tortoisehg/hgqt/settings.py:533
 msgid ""
 " You can select the \"current\" (i.e. the working directory parent), the "
 "current \"tip\" or the working directory (\"workingdir\"). Default: current"
 msgstr ""
+"选择打开仓库时初始选中的修订版本。您可以选择 \"current\" (工作目录的父版本),  \"tip\" (本分支的顶点) 或 "
+"\"workingdir\" (工作目录). 默认: current"
 
 #: tortoisehg/hgqt/settings.py:537
 msgid ""
 "Open new tabs next\n"
 "to the current tab"
 msgstr ""
+"在当前标签后面\n"
+"打开新的标签"
 
 #: tortoisehg/hgqt/settings.py:539
 msgid ""
 "Should new tabs be open next to the current tab? If False new tabs will be "
 "open after the last tab. Default: True"
-msgstr ""
+msgstr "设为“是”时,新的标签将在当前标签后面打开;设为“否”时,新的标签在所有标签最后打开。默认: 是"
 
 #: tortoisehg/hgqt/settings.py:542
 msgid "Author Coloring"
 "Color changesets by author name.  If not enabled, the changes are colored "
 "green for merge, red for non-trivial parents, black for normal. Default: "
 "False"
-msgstr ""
-"根据作者名称来用颜色来区分修改记录. 如果禁用, 修改记录的颜色是:合并操作用绿色、无意义的父记录为红色、正常为黑色. 默认: 否(False)"
+msgstr "根据作者名称来用颜色来区分修改记录. 如果禁用, 修改记录的颜色是:合并操作用绿色、无意义的父记录为红色、正常为黑色. 默认: 否"
 
 #: tortoisehg/hgqt/settings.py:547
 msgid "Task Tabs"
-msgstr ""
+msgstr "任务标签栏"
 
 #: tortoisehg/hgqt/settings.py:549
 msgid ""
 "Show tabs along the side of the bottom half of each repo widget allowing one "
 "to switch task tabs without using the toolbar. Default: off"
-msgstr ""
+msgstr "选择是否在任务标签页的侧面显示任务标签栏,这样可以不用工具栏切换任务标签页。默认: off"
 
 #: tortoisehg/hgqt/settings.py:552
 msgid "Long Summary"
 msgid ""
 "If true, concatenate multiple lines of changeset summary until they reach 80 "
 "characters. Default: False"
-msgstr "设置了的话, 会将摘要中的行进行合并, 使每行尽可能达到80个字. 默认: 否(False)"
+msgstr "设置了的话, 会将摘要中的行进行合并, 使每行尽可能达到80个字. 默认: 否"
 
 #: tortoisehg/hgqt/settings.py:556
 msgid "Log Batch Size"
 
 #: tortoisehg/hgqt/settings.py:560
 msgid "Dead Branches"
-msgstr "死亡分支"
+msgstr "死亡分支"
 
 #: tortoisehg/hgqt/settings.py:561
 msgid ""
 "Comma separated list of branch names that should be ignored when building a "
 "list of branch names for a repository. Default: None (leave blank)"
-msgstr ""
+msgstr "列出仓库分支名时需要忽略的分支名称,用逗号隔开。默认: 无 (留空)"
 
 #: tortoisehg/hgqt/settings.py:564
 msgid "Branch Colors"
 "be decoded to the @ character, and \\n to a linefeed. Default: None (leave "
 "blank)"
 msgstr ""
+"用空格隔开的分支名称与颜色对应列表,格式为“分支名:#XXXXXX”。分支名中的空格和冒号需要用反斜杠 (\\) "
+"转义。其它特殊字符也可以用此方法转义,如 \\u0040 代表 @ 字符, \\n 代表换行符。默认: 无 (留空)"
 
 #: tortoisehg/hgqt/settings.py:571
 msgid "Hide Tags"
 "\"qbase qparent qtip\" to hide the standard tags inserted by the Mercurial "
 "Queues Extension. Default: None (leave blank)"
 msgstr ""
+"不会显示的标签列表,用空格隔开。示例: 设为 \"qbase qparent qtip\" 以隐藏所有 Mercurial Queues "
+"扩展插入的标签。默认: 无 (留空)"
 
 #: tortoisehg/hgqt/settings.py:576
 msgid "After Pull Operation"
 
 #: tortoisehg/hgqt/settings.py:581
 msgid "Default Push"
-msgstr ""
+msgstr "默认推送"
 
 #: tortoisehg/hgqt/settings.py:583
 msgid ""
 "branch</i>.<li><b>revision</b>: Push the changes in the current branch "
 "<i><u>up to</u> the current revision</i>.</ul><p>Default: all"
 msgstr ""
+"选择点击“推送”按钮时推送的修订版本。<ul><li><b>all</b>: 默认值,推送 <i>所有分支</i> "
+"中的所有更改。<li><b>branch</b>: 推送 <i>当前分支</i> 中的所有更改。<li><b>revision</b>: "
+"推送当前分支中在 <i>当前修订版本<u>及以前</u></i> 的所有更改。</ul><p>默认: all"
 
 #: tortoisehg/hgqt/settings.py:591
 msgctxt "config item"
 msgid "Commit"
-msgstr ""
+msgstr "提交"
 
 #: tortoisehg/hgqt/settings.py:592 tortoisehg/hgqt/sync.py:1354
 msgid "Username"
 msgid ""
 "Name associated with commits.  The common format is:<br>Full Name "
 "&lt;email@example.com&gt;"
-msgstr ""
+msgstr "提交使用的用户名。常见格式: <br>全名 &lt;email@example.com&gt;"
 
 #: tortoisehg/hgqt/settings.py:595
 msgid "Summary Line Length"
 "Suggested length of commit message lines. A red vertical line will mark this "
 "length.  CTRL-E will reflow the current paragraph to the specified line "
 "length. Default: 80"
-msgstr ""
+msgstr "推荐的提交说明每行长度,一条红色竖线将显示在行末以标识长度。按 Ctrl+E 可按照此长度自动折行。默认: 80"
 
 #: tortoisehg/hgqt/settings.py:599
 msgid "Close After Commit"
 
 #: tortoisehg/hgqt/settings.py:600
 msgid "Close the commit tool after every successful commit.  Default: False"
-msgstr "每次成功提交后关闭提交工具.  默认: False"
+msgstr "每次成功提交后关闭提交工具.  默认: "
 
 #: tortoisehg/hgqt/settings.py:602
 msgid "Push After Commit"
-msgstr "提交推送改动"
+msgstr "提交推送"
 
 #: tortoisehg/hgqt/settings.py:604
 msgid ""
 "Attempt to push to specified URL or alias after each successful commit.  "