Commits

Wagner Bruna committed f50fdb0

i18n: pull latest fr, zh_CN and zh_TW translations from Launchpad

Comments (0)

Files changed (3)

i18n/tortoisehg/fr.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-05 08:55-0200\n"
-"PO-Revision-Date: 2012-02-02 20:41+0000\n"
-"Last-Translator: remram44 <remirampin@gmail.com>\n"
+"PO-Revision-Date: 2012-02-26 17:31+0000\n"
+"Last-Translator: André Sintzoff <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2012-02-06 04:50+0000\n"
-"X-Generator: Launchpad (build 14747)\n"
+"X-Launchpad-Export-Date: 2012-02-27 04:54+0000\n"
+"X-Generator: Launchpad (build 14868)\n"
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-Language: French\n"
 
 #: tortoisehg/hgqt/backout.py:29
 #, python-format
 msgid "Backout - %s"
-msgstr "Séquence inversée -%s"
+msgstr ""
 
 #: tortoisehg/hgqt/backout.py:99
 msgid "Prepare to backout"
-msgstr "Préparez-vous à la séquence inversée"
+msgstr ""
 
 #: tortoisehg/hgqt/backout.py:100
 msgid "Verify backout revision and ensure your working directory is clean."
 #: tortoisehg/hgqt/backout.py:111 tortoisehg/hgqt/backout.py:123
 #: tortoisehg/hgqt/backout.py:130
 msgid "Unable to backout"
-msgstr "Incapable de séquence inversée"
+msgstr ""
 
 #: tortoisehg/hgqt/backout.py:112
 msgid "Backout revision not found"
 
 #: tortoisehg/hgqt/commit.py:162 tortoisehg/hgqt/sync.py:188
 msgid "<b>Selected Options:</b>"
-msgstr ""
+msgstr "<b>Options sélectionnées :</b>"
 
 #: tortoisehg/hgqt/commit.py:249
 msgid "Commit changes"
 
 #: tortoisehg/hgqt/commit.py:719
 msgid "&Replace"
-msgstr ""
+msgstr "&Remplacer"
 
 #: tortoisehg/hgqt/commit.py:727 tortoisehg/hgqt/commit.py:740
 #: tortoisehg/hgtk/commit.py:934 tortoisehg/hgtk/commit.py:1078
 
 #: tortoisehg/hgqt/filedialogs.py:210 tortoisehg/hgqt/filedialogs.py:696
 msgid "View at revision..."
-msgstr ""
+msgstr "Voir à la révision..."
 
 #: tortoisehg/hgqt/filedialogs.py:213 tortoisehg/hgqt/filedialogs.py:699
 msgid "Save at revision..."
-msgstr ""
+msgstr "Enregistrer à la révision..."
 
 #: tortoisehg/hgqt/filedialogs.py:215 tortoisehg/hgqt/filedialogs.py:701
 msgid "Edit local"
-msgstr ""
+msgstr "Éditer la révision locale"
 
 #: tortoisehg/hgqt/filedialogs.py:218 tortoisehg/hgqt/filedialogs.py:704
 msgid "Revert to revision..."
 
 #: tortoisehg/hgqt/hgemail_ui.py:280
 msgid "Select &All"
-msgstr ""
+msgstr "Tout sélectionner"
 
 #: tortoisehg/hgqt/hgemail_ui.py:281
 msgid "Select &None"
-msgstr ""
+msgstr "Tout désélectionner"
 
 #: tortoisehg/hgqt/hgemail_ui.py:282 tortoisehg/hgqt/wctxactions.py:42
 #: tortoisehg/hgqt/webconf.py:256 tortoisehg/hgqt/webconf_ui.py:79
 
 #: tortoisehg/hgqt/manifestdialog.py:209
 msgid "Open at Revision"
-msgstr ""
+msgstr "Ouvrir à la révision"
 
 #: tortoisehg/hgqt/manifestdialog.py:210
 msgid "Open file as it appeared at this revision"
 
 #: tortoisehg/hgqt/manifestdialog.py:211 tortoisehg/hgqt/revdetails.py:237
 msgid "Save at Revision"
-msgstr ""
+msgstr "Enregistrer à la révision"
 
 #: tortoisehg/hgqt/manifestdialog.py:212 tortoisehg/hgqt/revdetails.py:238
 msgid "Save file as it appeared at this revision"
-msgstr ""
+msgstr "Enregistrer le fichier tel qu'il est à cette révision"
 
 #: tortoisehg/hgqt/manifestdialog.py:215 tortoisehg/hgqt/revdetails.py:241
 msgid "Open Local"
 
 #: tortoisehg/hgqt/repofilter.py:224
 msgid "Display only active branches"
-msgstr ""
+msgstr "Afficher seulement les branches actives"
 
 #: tortoisehg/hgqt/repofilter.py:227
 msgid "Display closed branches"
 
 #: tortoisehg/hgqt/reporegistry.py:443 tortoisehg/hgqt/wctxactions.py:52
 msgid "Copy path"
-msgstr ""
+msgstr "Copier le chemin"
 
 #: tortoisehg/hgqt/reporegistry.py:444
 msgid "Copy the root path of the repository to the clipboard"
 
 #: tortoisehg/hgqt/resolve.py:98
 msgid "Accept the local file version (yours)"
-msgstr "Accepter la version locale du fichier (la votre)"
+msgstr "Accepter la version locale du fichier (la vôtre)"
 
 #: tortoisehg/hgqt/resolve.py:100
 msgid "Take Other"
 
 #: tortoisehg/hgqt/revdetails.py:243
 msgid "Copy Path"
-msgstr ""
+msgstr "Copier le chemin"
 
 #: tortoisehg/hgqt/revdetails.py:244
 msgid "Copy full path of file(s) to the clipboard"
-msgstr ""
+msgstr "Copier le chemin complet du/des fichier(s) dans le presse-papier"
 
 #: tortoisehg/hgqt/revert.py:22 tortoisehg/hgqt/revert.py:26
 msgid "Cannot revert to working directory"
 #: tortoisehg/hgqt/revert.py:44
 #, python-format
 msgid "<b>Revert %d files to their contents at revision %d?</b>"
-msgstr ""
+msgstr "<b>Rétablir %d fichiers au contenu de la révision %d ?</b>"
 
 #: tortoisehg/hgqt/revert.py:50
 msgid "Revert all files to this revision"
 "Open new tabs next\n"
 "to the current tab"
 msgstr ""
+"Ouvrir les nouveaux onglets\n"
+"à côté de l'actuel"
 
 #: 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 ""
+"Ouvrir les nouveaux onglets à côté de l'onglet actuel ? Si False les "
+"nouveaux onglets s'ouvriront après le dernier. Défaut : True"
 
 #: tortoisehg/hgqt/settings.py:542 tortoisehg/hgtk/thgconfig.py:130
 msgid "Author Coloring"
 "length.  CTRL-E will reflow the current paragraph to the specified line "
 "length. Default: 80"
 msgstr ""
+"Longueur suggérée pour les lignes de message de commit. Une ligne rouge "
+"verticale indiquera cette longueur. CTRL-E arrangera le paragraphe actuel à "
+"la longueur indiquée. Valeur par défaut : 80"
 
 #: tortoisehg/hgqt/settings.py:599 tortoisehg/hgtk/thgconfig.py:103
 msgid "Close After Commit"
 
 #: tortoisehg/hgqt/workbench.py:305 tortoisehg/hgqt/workbench.py:350
 msgid "Go to a specific revision"
-msgstr ""
+msgstr "Aller à une révision précise"
 
 #: tortoisehg/hgqt/workbench.py:307
 msgid "Web Server..."
 
 #: tortoisehg/hgqt/workbench.py:347
 msgid "Go to current revision"
-msgstr ""
+msgstr "Aller à la révision actuelle"
 
 #: tortoisehg/hgqt/workbench.py:361
 msgid "Filter Toolbar"
 
 #: tortoisehg/hgqt/workbench.py:364
 msgid "Filter graph with revision sets or branches"
-msgstr ""
+msgstr "Filtrer le graphe avec des ensembles de révisions ou des branches"
 
 #: tortoisehg/hgqt/workbench.py:373 tortoisehg/hgtk/history.py:438
 #: tortoisehg/hgtk/history.py:1856 tortoisehg/hgtk/synch.py:57

i18n/tortoisehg/zh_CN.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-05 08:55-0200\n"
-"PO-Revision-Date: 2011-11-18 15:11+0000\n"
-"Last-Translator: Jally <Unknown>\n"
+"PO-Revision-Date: 2012-02-28 19:07+0000\n"
+"Last-Translator: Lionheart <Unknown>\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-02-06 04:57+0000\n"
-"X-Generator: Launchpad (build 14747)\n"
+"X-Launchpad-Export-Date: 2012-02-29 04:45+0000\n"
+"X-Generator: Launchpad (build 14874)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
-msgstr "TortoiseHg Overlay 图标服务"
+msgstr "TortoiseHg 层叠图标服务"
 
 #: TortoiseHgOverlayServer.py:162
 msgid "Exit"
 
 #: tortoisehg/hgqt/about.py:56
 msgid "Copyright 2008-2011 Steve Borho and others"
-msgstr "版权所有 2008-2011 Steve Borho和其他"
+msgstr "版权所有 2008-2011 Steve Borho和其他开发者"
 
 #: tortoisehg/hgqt/about.py:61 tortoisehg/hgtk/about.py:42
 msgid "Several icons are courtesy of the TortoiseSVN project"
 
 #: tortoisehg/hgqt/archive.py:314 tortoisehg/hgqt/archive.py:332
 msgid "Duplicate Name"
-msgstr "复制名称"
+msgstr "重复的名称"
 
 #: tortoisehg/hgqt/archive.py:315
 #, python-format
 #: tortoisehg/hgqt/backout.py:29
 #, python-format
 msgid "Backout - %s"
-msgstr "删除旧版本 - %s"
+msgstr "回退 - %s"
 
 #: tortoisehg/hgqt/backout.py:99
 msgid "Prepare to backout"
-msgstr "正在准备删除旧版本"
+msgstr "准备回退"
 
 #: tortoisehg/hgqt/backout.py:100
 msgid "Verify backout revision and ensure your working directory is clean."
-msgstr "验证删除的旧版本并保证你的工作目录是干净的。"
+msgstr "验证回退版本并确认你的工作目录是干净的。"
 
 #: tortoisehg/hgqt/backout.py:111 tortoisehg/hgqt/backout.py:123
 #: tortoisehg/hgqt/backout.py:130
 msgid "Unable to backout"
-msgstr "无法删除旧版本"
+msgstr "无法回退"
 
 #: tortoisehg/hgqt/backout.py:112
 msgid "Backout revision not found"
-msgstr "没有找到要删除的旧版本"
+msgstr "回退版本没有找到"
 
 #: tortoisehg/hgqt/backout.py:117
 msgid "Backing out a parent revision is a single step operation"
-msgstr "删除旧版本是一个步骤"
+msgstr "回退父版本是一个单步操作"
 
 #: tortoisehg/hgqt/backout.py:124
 msgid "Backout requires a parent revision"
-msgstr ""
+msgstr "回退需要有父版本"
 
 #: tortoisehg/hgqt/backout.py:131
 msgid "Cannot backout change on a different branch"
-msgstr "不能删除另一个分支的旧版本"
+msgstr "不能在不同的分支回退修改"
 
 #: tortoisehg/hgqt/backout.py:137
 msgid "Backout revision"
-msgstr "删除的旧版本"
+msgstr "回退版本"
 
 #: tortoisehg/hgqt/backout.py:147
 msgid "Not a head, backout will create a new head!"
-msgstr "当前不是HEAD,删除旧版本会创建新的HEAD"
+msgstr "不是HEAD版本,回退操作将会创建新的HEAD版本"
 
 #: tortoisehg/hgqt/backout.py:153
 msgid "Current local revision"
 
 #: tortoisehg/hgqt/backout.py:171
 msgid "Merge parent to backout to"
-msgstr ""
+msgstr "回退到合并的父版本"
 
 #: tortoisehg/hgqt/backout.py:174
 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 ""
+msgstr "要回退<b>合并</b>版本,你必须选择需要回退到的父版本(即:变更会<i>保留</i>的)"
 
 #: tortoisehg/hgqt/backout.py:179
 #, python-format
 msgid "First Parent: revision %s (%s)"
-msgstr ""
+msgstr "第一个父版本:版本%s (%s)"
 
 #: tortoisehg/hgqt/backout.py:185
 msgid "Backout to the first parent of the merge revision"
-msgstr ""
+msgstr "回退到合并版本的第一个父版本"
 
 #: tortoisehg/hgqt/backout.py:190
 #, python-format
 msgid "Second Parent: revision %s (%s)"
-msgstr ""
+msgstr "第二个父版本:版本 %s (%s)"
 
 #: tortoisehg/hgqt/backout.py:195
 msgid "Backout to the second parent of the merge revision"
-msgstr ""
+msgstr "回退到合并版本的第二个父版本"
 
 #: tortoisehg/hgqt/backout.py:203 tortoisehg/hgqt/merge.py:154
 msgid "Working directory status"
-msgstr ""
+msgstr "工作目录状态"
 
 #: tortoisehg/hgqt/backout.py:209 tortoisehg/hgqt/compress.py:69
 #: tortoisehg/hgqt/merge.py:162 tortoisehg/hgqt/rebase.py:113
 "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>shelve</b></a>补丁,或者<a href=\"discard\"><b>丢弃</b></a>更改。"
 
 #: tortoisehg/hgqt/backout.py:228 tortoisehg/hgqt/merge.py:215
 #: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1107
 
 #: tortoisehg/hgqt/backout.py:274 tortoisehg/hgqt/merge.py:285
 msgid "<b>Uncommitted local changes are detected</b>"
-msgstr ""
+msgstr "<b>检测到未提交的本地更改</b>"
 
 #: tortoisehg/hgqt/backout.py:278 tortoisehg/hgtk/recovery.py:52
 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:301 tortoisehg/hgqt/compress.py:151
 #: tortoisehg/hgqt/merge.py:313 tortoisehg/hgqt/rebase.py:238
 msgid "Confirm Discard"
-msgstr "验证放弃"
+msgstr "确认丢弃"
 
 #: tortoisehg/hgqt/backout.py:302 tortoisehg/hgqt/compress.py:152
 #: tortoisehg/hgqt/merge.py:314 tortoisehg/hgqt/rebase.py:239
 msgid "Discard outstanding changes to working directory?"
-msgstr "弃工作目录未提交的更改?"
+msgstr "弃工作目录未提交的更改?"
 
 #: tortoisehg/hgqt/backout.py:327
 msgid "Backing out, then merging..."
-msgstr ""
+msgstr "回退中,然后合并..."
 
 #: tortoisehg/hgqt/backout.py:328 tortoisehg/hgqt/merge.py:342
 msgid "All conflicting files will be marked unresolved."
 #: tortoisehg/hgqt/backout.py:341
 msgid ""
 "Automatically advance to next page when backout and merge are complete."
-msgstr ""
+msgstr "回退和合并完成后自动前进到下一个页面。"
 
 #: tortoisehg/hgqt/backout.py:372 tortoisehg/hgqt/merge.py:395
 #, python-format
 msgid ""
 "%d files have <b>merge conflicts</b> that must be <a "
 "href=\"resolve\"><b>resolved</b></a>"
-msgstr "%d个文件有需要<a href\"resolve\"><b>解决</b></a>的<b>合并冲突</b>"
+msgstr "%d个需要<b>合并冲突</b>的文件要<a href\"resolve\"><b>解决</b></a>"
 
 #: tortoisehg/hgqt/backout.py:377 tortoisehg/hgqt/merge.py:405
 msgid "No merge conflicts, ready to commit"
-msgstr "没有合并冲突,可以提交"
+msgstr "没有合并冲突可以提交"
 
 #: tortoisehg/hgqt/backout.py:412
 msgid "Commit backout and merge results"
-msgstr ""
+msgstr "提交回退并合并"
 
 #: tortoisehg/hgqt/backout.py:422 tortoisehg/hgqt/merge.py:449
 #: tortoisehg/hgtk/commit.py:236 tortoisehg/hgtk/history.py:66
 
 #: 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
 #: tortoisehg/hgtk/backout.py:41
 msgid "Backed out changeset: "
-msgstr "撤销的变更集: "
+msgstr "回退的变更集 "
 
 #: tortoisehg/hgqt/backout.py:514 tortoisehg/hgqt/commit.py:634
 #: tortoisehg/hgqt/mq.py:821 tortoisehg/hgtk/backout.py:139
 
 #: tortoisehg/hgqt/backout.py:515 tortoisehg/hgtk/backout.py:140
 msgid "Discard current backout message?"
-msgstr "要丢弃当前的反转说明吗?"
+msgstr "要丢弃当前的回退说明吗?"
 
 #: tortoisehg/hgqt/backout.py:524 tortoisehg/hgtk/backout.py:82
 msgid "Use English backout message"
-msgstr "使用英文撤销信息"
+msgstr "使用英文回退说明"
 
 #: tortoisehg/hgqt/backout.py:553
 #, python-format
 msgid "Backed out merge revision to its first parent (%s)"
-msgstr ""
+msgstr "回退合并版本到第一个父版本(%s)"
 
 #: tortoisehg/hgqt/backout.py:556
 #, python-format
 msgid "Backed out merge revision to its second parent (%s)"
-msgstr ""
+msgstr "回退合并版本到第二个父版本(%s)"
 
 #: tortoisehg/hgqt/backout.py:585
 msgid "Backing out and committing..."
-msgstr ""
+msgstr "回退并提交..."
 
 #: tortoisehg/hgqt/backout.py:586
 msgid "Please wait while making backout."
-msgstr "删除旧版本时请稍候。"
+msgstr "正在回退,请稍等..."
 
 #: tortoisehg/hgqt/backout.py:594 tortoisehg/hgqt/merge.py:573
 msgid "Committing..."
 
 #: tortoisehg/hgqt/backout.py:595 tortoisehg/hgqt/merge.py:574
 msgid "Please wait while committing merged files."
-msgstr "提交合并的文件时请等待。"
+msgstr "请稍等,正在提交合并的文件..."
 
 #: tortoisehg/hgqt/backout.py:620 tortoisehg/hgqt/cmdui.py:313
 #: tortoisehg/hgqt/merge.py:602 tortoisehg/hgtk/p4pending.py:101
 
 #: tortoisehg/hgqt/backout.py:625
 msgid "Backout changeset"
-msgstr ""
+msgstr "回退修订集"
 
 #: tortoisehg/hgqt/bisect.py:22
 #, python-format
 #: tortoisehg/hgqt/chunks.py:90 tortoisehg/hgqt/manifestdialog.py:203
 #: tortoisehg/hgqt/revdetails.py:231
 msgid "View file changes in external diff tool"
-msgstr "用外置的diff工具查看文件更改"
+msgstr "用外置的差异工具查看文件更改"
 
 #: tortoisehg/hgqt/chunks.py:91 tortoisehg/hgqt/manifestdialog.py:213
 #: tortoisehg/hgqt/revdetails.py:239
 #: tortoisehg/hgqt/chunks.py:94 tortoisehg/hgqt/manifestdialog.py:218
 #: tortoisehg/hgqt/revdetails.py:247
 msgid "Revert file(s) to contents at this revision"
-msgstr ""
+msgstr "以这个版本恢复文件"
 
 #: tortoisehg/hgqt/chunks.py:195
 msgid "Patch failed to apply"
 
 #: tortoisehg/hgqt/chunks.py:399
 msgid "Unable to remove"
-msgstr ""
+msgstr "无法删除"
 
 #: tortoisehg/hgqt/chunks.py:400
 #, python-format
 "Unable to remove file %s,\n"
 "permission denied"
 msgstr ""
+"无法删除文件 %s\n"
+"权限被拒绝"
 
 #: tortoisehg/hgqt/chunks.py:536
 msgctxt "files"
 
 #: tortoisehg/hgqt/clone.py:138
 msgid "Include patch queue"
-msgstr ""
+msgstr "导入补丁队列"
 
 #: tortoisehg/hgqt/clone.py:141 tortoisehg/hgtk/clone.py:149
 #: tortoisehg/hgtk/history.py:467 tortoisehg/hgtk/synch.py:179
 
 #: tortoisehg/hgqt/clone.py:357
 msgid "Please specify different paths."
-msgstr ""
+msgstr "请指定不同的路径。"
 
 #: tortoisehg/hgqt/clone.py:381
 msgid "Please enter a new destination path."
 
 #: tortoisehg/hgqt/cmdui.py:315
 msgid "Failed!"
-msgstr ""
+msgstr "失败!"
 
 #: tortoisehg/hgqt/cmdui.py:543
 msgid "failed to run command\n"
 #: tortoisehg/hgqt/cmdui.py:612
 #, python-format
 msgid "command parse error: %s"
-msgstr ""
+msgstr "命令解析错误:%s"
 
 #: tortoisehg/hgqt/cmdui.py:618
 #, python-format
 msgid "no matches found: %s"
-msgstr ""
+msgstr "没有匹配:%s"
 
 #: tortoisehg/hgqt/cmdui.py:773
 msgid "TortoiseHg Command Dialog"
 #: tortoisehg/hgqt/commit.py:126
 #, python-format
 msgid "Failed to load issue tracker '%s': %s"
-msgstr "无法加载问题追踪器%s:%s"
+msgstr "加载问题追踪器失败 '%s':%s"
 
 #: tortoisehg/hgqt/commit.py:136 tortoisehg/hgqt/grep.py:53
 #: tortoisehg/hgqt/serve_ui.py:87 tortoisehg/hgtk/datamine.py:54
 
 #: tortoisehg/hgqt/commit.py:162 tortoisehg/hgqt/sync.py:188
 msgid "<b>Selected Options:</b>"
-msgstr ""
+msgstr "<b>选中的选项:</b>"
 
 #: tortoisehg/hgqt/commit.py:249
 msgid "Commit changes"
 
 #: tortoisehg/hgqt/commit.py:535
 msgid "Close Branch: "
-msgstr ""
+msgstr "关闭分支: "
 
 #: tortoisehg/hgqt/commit.py:537
 msgid "New Branch: "
 #: tortoisehg/hgqt/commit.py:606
 msgctxt "start progress"
 msgid "Rollback"
-msgstr ""
+msgstr "回滚"
 
 #: tortoisehg/hgqt/commit.py:635 tortoisehg/hgqt/mq.py:822
 #: tortoisehg/hgtk/commit.py:581
 
 #: tortoisehg/hgqt/commit.py:715
 msgid "Message Translation Failure"
-msgstr ""
+msgstr "消息翻译失败"
 
 #: tortoisehg/hgqt/commit.py:716
 msgid ""
 "Consider setting HGENCODING environment variable\n"
 "Replace untranslatable characters with \"?\"?\n"
 msgstr ""
+"无法翻译说明到本地编码\n"
+"考虑设置 HGENCODING 环境变量\n"
+"使用“?”替换不能翻译的字符?\n"
 
 #: tortoisehg/hgqt/commit.py:719
 msgid "&Replace"
-msgstr ""
+msgstr "替换(&R)"
 
 #: tortoisehg/hgqt/commit.py:727 tortoisehg/hgqt/commit.py:740
 #: tortoisehg/hgtk/commit.py:934 tortoisehg/hgtk/commit.py:1078
 
 #: tortoisehg/hgqt/commit.py:991
 msgid "Auto Includes:"
-msgstr ""
+msgstr "自动包含:"
 
 #: tortoisehg/hgqt/commit.py:1016
 msgid "Recurse into subrepositories (--subrepos)"
-msgstr ""
+msgstr "递归到子目录(--subrepos)"
 
 #: tortoisehg/hgqt/commit.py:1045
 msgid "Unable to save username"
 
 #: tortoisehg/hgqt/compress.py:121
 msgid "Changes have been moved, you must now commit"
-msgstr ""
+msgstr "变更将被移除,你必须现在提交"
 
 #: tortoisehg/hgqt/compress.py:137
 msgid "Compress is complete, old history untouched"
 
 #: tortoisehg/hgqt/csinfo.py:113
 msgid "Converted From:"
-msgstr ""
+msgstr "转换自:"
 
 #: tortoisehg/hgqt/cslist.py:48 tortoisehg/hgqt/cslist.py:130
 #: tortoisehg/hgtk/cslist.py:384
 
 #: tortoisehg/hgqt/filedata.py:51
 msgid "File is binary"
-msgstr ""
+msgstr "文件是二进制的"
 
 #: tortoisehg/hgqt/filedata.py:59 tortoisehg/hgqt/filedata.py:370
 #, python-format
 msgid " <i>(renamed from %s)</i>"
-msgstr ""
+msgstr " <i>(改名自%s)</i>"
 
 #: tortoisehg/hgqt/filedata.py:61 tortoisehg/hgqt/filedata.py:365
 #: tortoisehg/hgqt/filedata.py:375
 msgid " <i>(was added)</i>"
-msgstr ""
+msgstr " <i>(已添加)</i>"
 
 #: tortoisehg/hgqt/filedata.py:94 tortoisehg/hgqt/filedata.py:359
 #, python-format
 
 #: tortoisehg/hgqt/filedata.py:95 tortoisehg/hgqt/filedata.py:355
 msgid "set"
-msgstr ""
+msgstr "设置"
 
 #: tortoisehg/hgqt/filedata.py:95 tortoisehg/hgqt/filedata.py:357
 msgid "unset"
-msgstr ""
+msgstr "取消设置"
 
 #: tortoisehg/hgqt/filedata.py:98 tortoisehg/hgqt/filedata.py:118
 msgid " <i>(is a symlink)</i>"
 "\t%s\n"
 "\n"
 msgstr ""
+"[警告] 无效的子仓库版本ID:\n"
+"\t%s\n"
+"\n"
 
 #: tortoisehg/hgqt/filedata.py:167
 msgid "Subrepo created and set to initial revision."
-msgstr "子仓库创建了并设置初始版本。"
+msgstr "已创建子仓库并设置初始版本。"
 
 #: tortoisehg/hgqt/filedata.py:171
 msgid "Subrepo initialized to revision:"
 
 #: tortoisehg/hgqt/filedata.py:174
 msgid "Subrepo removed from repository."
-msgstr ""
+msgstr "子仓库已经从仓库中移除。"
 
 #: tortoisehg/hgqt/filedata.py:178
 msgid "Subrepo was not changed."
-msgstr ""
+msgstr "子仓库未被修改。"
 
 #: tortoisehg/hgqt/filedata.py:179
 msgid "Subrepo state is:"
-msgstr ""
+msgstr "子仓库状态是:"
 
 #: tortoisehg/hgqt/filedata.py:181 tortoisehg/hgqt/filedata.py:191
 #: tortoisehg/hgqt/filedata.py:196 tortoisehg/hgqt/filedata.py:200
 #: tortoisehg/hgqt/filedata.py:206
 #, python-format
 msgid "changeset: %s"
-msgstr ""
+msgstr "修改集: %s"
 
 #: tortoisehg/hgqt/filedata.py:188
 msgid "Revision has changed to:"
-msgstr ""
+msgstr "版本修改为:"
 
 #: tortoisehg/hgqt/filedata.py:197 tortoisehg/hgqt/hgemail_ui.py:258
 #: tortoisehg/hgtk/hgemail.py:86
 
 #: tortoisehg/hgqt/filedata.py:321
 msgid " <i>(was added, now missing)</i>"
-msgstr ""
+msgstr " <i>(已添加,但丢失)</i>"
 
 #: tortoisehg/hgqt/filedata.py:327
 msgid " <i>(is unversioned)</i>"
-msgstr ""
+msgstr " <i>(无版本控制的)</i>"
 
 #: tortoisehg/hgqt/filedialogs.py:124
 msgid "File History Log Columns"
 
 #: tortoisehg/hgqt/grep.py:565
 msgid "View Changeset"
-msgstr ""
+msgstr "查看修改集"
 
 #: tortoisehg/hgqt/grep.py:567
 msgid "Annotate file"
 #: tortoisehg/hgqt/hgemail_ui.py:255 tortoisehg/hgqt/settings.py:701
 #: tortoisehg/hgtk/synch.py:78 tortoisehg/hgtk/thgconfig.py:238
 msgid "Email"
-msgstr "邮"
+msgstr "邮件服务器"
 
 #: tortoisehg/hgqt/hgemail_ui.py:256 tortoisehg/hgtk/hgemail.py:76
 msgid "To:"
 
 #: tortoisehg/hgqt/hgemail_ui.py:263 tortoisehg/hgtk/hgemail.py:98
 msgid "Send changesets as Hg patches"
-msgstr "发送变更集为 Hg 补丁"
+msgstr "发送变更集为Hg补丁"
 
 #: tortoisehg/hgqt/hgemail_ui.py:264 tortoisehg/hgtk/hgemail.py:109
 msgid ""
 
 #: tortoisehg/hgqt/hgemail_ui.py:279 tortoisehg/hgqt/postreview_ui.py:174
 msgid "Changesets"
-msgstr "更改组合"
+msgstr "修改集"
 
 #: tortoisehg/hgqt/hgemail_ui.py:280
 msgid "Select &All"
 
 #: tortoisehg/hgqt/hginit.py:47
 msgid "Make repo compatible with Mercurial <1.7"
-msgstr ""
+msgstr "创建和Mercurial 1.7以前的版本兼容的仓库"
 
 #: tortoisehg/hgqt/hginit.py:49
 msgid "Show in Workbench after init"
 
 #: tortoisehg/hgqt/manifestdialog.py:205 tortoisehg/hgqt/revdetails.py:233
 msgid "View changes to current in external diff tool"
-msgstr ""
+msgstr "用外置的差异工具查看当前文件更改"
 
 #: tortoisehg/hgqt/manifestdialog.py:207 tortoisehg/hgqt/revdetails.py:235
 msgid "View at Revision"
 #: tortoisehg/hgqt/manifestdialog.py:223 tortoisehg/hgqt/revdetails.py:252
 #: tortoisehg/hgqt/wctxactions.py:47
 msgid "Explore subrepository"
-msgstr ""
+msgstr "用资源管理器打开子仓库"
 
 #: tortoisehg/hgqt/manifestdialog.py:225
 msgid "Open the selected subrepository in a file browser"
 #: tortoisehg/hgqt/manifestdialog.py:227 tortoisehg/hgqt/revdetails.py:255
 #: tortoisehg/hgqt/wctxactions.py:49
 msgid "Open terminal in subrepository"
-msgstr ""
+msgstr "在子仓库中打开终端"
 
 #: tortoisehg/hgqt/manifestdialog.py:229 tortoisehg/hgqt/revdetails.py:257
 msgid "Open a shell terminal in the selected subrepository root"
-msgstr ""
+msgstr "在选中的子仓库中打开终端"
 
 #: tortoisehg/hgqt/manifestdialog.py:332 tortoisehg/hgqt/revdetails.py:381
 #, python-format
 
 #: tortoisehg/hgqt/merge.py:607
 msgid "Merge changeset"
-msgstr ""
+msgstr "合并修改集"
 
 #: tortoisehg/hgqt/messageentry.py:74
 msgid "Paste &Filenames"
 
 #: tortoisehg/hgqt/pbranch.py:299
 msgid "will be closed"
-msgstr ""
+msgstr "将被关闭"
 
 #: tortoisehg/hgqt/pbranch.py:301 tortoisehg/hgtk/thgpbranch.py:375
 #, python-format
 
 #: tortoisehg/hgqt/postreview.py:34
 msgid "Invalid Settings - The ReviewBoard server is not setup"
-msgstr ""
+msgstr "无效的设置 - The ReviewBoard server is not setup"
 
 #: tortoisehg/hgqt/postreview.py:36
 msgid "Invalid Settings - Please provide your ReviewBoard username"
-msgstr ""
+msgstr "无效的设置 - Please provide your ReviewBoard username"
 
 #: tortoisehg/hgqt/postreview.py:55
 #, python-format
 
 #: tortoisehg/hgqt/qtlib.py:191
 msgid "Failed to open path in terminal"
-msgstr ""
+msgstr "在终端打开路径失败"
 
 #: tortoisehg/hgqt/qtlib.py:192
 #, python-format
 
 #: tortoisehg/hgqt/qtlib.py:204
 msgid "A terminal shell must be configured"
-msgstr ""
+msgstr "必须配置终端外壳"
 
 #: tortoisehg/hgqt/qtlib.py:864
 msgid "Show Log"
-msgstr ""
+msgstr "显示日志"
 
 #: tortoisehg/hgqt/qtlib.py:1036
 msgid "Please enter a username"
 
 #: tortoisehg/hgqt/repofilter.py:227
 msgid "Display closed branches"
-msgstr ""
+msgstr "显示已关闭的分支"
 
 #: tortoisehg/hgqt/repofilter.py:230
 msgid "Include all ancestors"
 #: tortoisehg/hgqt/repomodel.py:50
 msgctxt "column header"
 msgid "Tags"
-msgstr ""
+msgstr "标签"
 
 #: tortoisehg/hgqt/repomodel.py:51
 msgctxt "column header"
 
 #: tortoisehg/hgqt/reporegistry.py:238
 msgid "Repository Registry"
-msgstr ""
+msgstr "仓库注册表"
 
 #: tortoisehg/hgqt/reporegistry.py:416
 msgid "Refresh repository list"
 
 #: tortoisehg/hgqt/reporegistry.py:417
 msgid "Refresh the Repository Registry list"
-msgstr ""
+msgstr "刷新仓库注册表"
 
 #: tortoisehg/hgqt/reporegistry.py:418 tortoisehg/hgqt/wctxactions.py:43
 #: tortoisehg/hgqt/webconf_ui.py:76
 
 #: tortoisehg/hgqt/reporegistry.py:426
 msgid "Settings..."
-msgstr ""
+msgstr "设置..."
 
 #: tortoisehg/hgqt/reporegistry.py:427
 msgid "View the repository's settings"
-msgstr ""
+msgstr "查看仓库设置"
 
 #: tortoisehg/hgqt/reporegistry.py:428
 msgid "Remove from registry"
-msgstr ""
+msgstr "从仓库注册表删除"
 
 #: tortoisehg/hgqt/reporegistry.py:429
 msgid ""
 #: tortoisehg/hgqt/reporegistry.py:434 tortoisehg/hgqt/sync.py:572
 #: tortoisehg/hgqt/workbench.py:333
 msgid "Explore"
-msgstr ""
+msgstr "用资源管理器打开"
 
 #: tortoisehg/hgqt/reporegistry.py:435
 msgid "Open the repository in a file browser"
 #: tortoisehg/hgqt/reporegistry.py:436 tortoisehg/hgqt/sync.py:573
 #: tortoisehg/hgqt/workbench.py:336
 msgid "Terminal"
-msgstr ""
+msgstr "终端"
 
 #: tortoisehg/hgqt/reporegistry.py:437
 msgid "Open a shell terminal in the repository root"
-msgstr ""
+msgstr "在仓库根目录下打开终端外壳"
 
 #: tortoisehg/hgqt/reporegistry.py:438
 msgid "Add repository..."
-msgstr ""
+msgstr "增加仓库..."
 
 #: tortoisehg/hgqt/reporegistry.py:439
 msgid "Add a repository to this group"
 
 #: tortoisehg/hgqt/reporegistry.py:440
 msgid "Add a subrepository..."
-msgstr ""
+msgstr "增加子仓库..."
 
 #: tortoisehg/hgqt/reporegistry.py:441
 msgid "Convert an existing repository into a subrepository"
 
 #: 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
 
 #: tortoisehg/hgqt/reporegistry.py:630
 msgid "Subrepo added to .hgsub file"
-msgstr ""
+msgstr "子版本库已添加 .hgsub 文件"
 
 #: tortoisehg/hgqt/reporegistry.py:631
 #, python-format
 #: tortoisehg/hgtk/history.py:2021
 #, python-format
 msgid "%d outgoing changesets"
-msgstr "%d 个输出的变更集"
+msgstr "%d个外发的改动集"
 
 #: tortoisehg/hgqt/repowidget.py:538 tortoisehg/hgqt/repowidget.py:1176
 #: tortoisehg/hgqt/workbench.py:382 tortoisehg/hgtk/history.py:444
 
 #: tortoisehg/hgqt/repowidget.py:1194
 msgid "Merge with local..."
-msgstr ""
+msgstr "合并到本地..."
 
 #: tortoisehg/hgqt/repowidget.py:1197
 msgid "Tag..."
-msgstr ""
+msgstr "标签..."
 
 #: tortoisehg/hgqt/repowidget.py:1199
 msgid "Bookmark..."
-msgstr ""
+msgstr "书签..."
 
 #: tortoisehg/hgqt/repowidget.py:1202 tortoisehg/hgtk/history.py:1290
 msgid "Backout..."
 
 #: tortoisehg/hgqt/repowidget.py:1206
 msgid "Copy hash"
-msgstr ""
+msgstr "复制校验码"
 
 #: tortoisehg/hgqt/repowidget.py:1210 tortoisehg/hgtk/history.py:1293
 msgid "Export"
 
 #: tortoisehg/hgqt/repowidget.py:1213
 msgid "Email patch..."
-msgstr ""
+msgstr "邮寄补丁..."
 
 #: tortoisehg/hgqt/repowidget.py:1215
 msgid "Archive..."
 
 #: tortoisehg/hgqt/repowidget.py:1351 tortoisehg/hgqt/repowidget.py:1442
 msgid "Email Selected..."
-msgstr ""
+msgstr "邮寄选中的..."
 
 #: tortoisehg/hgqt/repowidget.py:1353
 msgid "Export DAG Range..."
 
 #: tortoisehg/hgqt/resolve.py:158
 msgid "Detected merge/diff tools:"
-msgstr ""
+msgstr "检测 合并/差异 工具:"
 
 #: tortoisehg/hgqt/resolve.py:162
 msgid "Command output"
 
 #: tortoisehg/hgqt/revdetails.py:199
 msgid "Show All"
-msgstr ""
+msgstr "显示全部"
 
 #: tortoisehg/hgqt/revdetails.py:201
 msgid "Toggle display of all files and the direction they were merged"
 
 #: tortoisehg/hgqt/revpanel.py:164
 msgid "Head is closed!"
-msgstr ""
+msgstr "HEAD版本已关闭!"
 
 #: tortoisehg/hgqt/revset.py:28
 msgid "Changesets where username contains string."
 
 #: tortoisehg/hgqt/revset.py:48
 msgid "Changeset is closed."
-msgstr ""
+msgstr "变更集已关闭。"
 
 #: tortoisehg/hgqt/revset.py:50
 msgid ""
 
 #: tortoisehg/hgqt/run.py:500
 msgid "Close this application?"
-msgstr ""
+msgstr "关闭程序?"
 
 #: tortoisehg/hgqt/run.py:783
 msgid "annotate requires a single filename\n"
 
 #: tortoisehg/hgqt/run.py:1170 tortoisehg/hgtk/hgtk.py:808
 msgid "changeset to view in diff tool"
-msgstr "比较查看改动集"
+msgstr "使用差异工具查看变更集"
 
 #: tortoisehg/hgqt/run.py:1171 tortoisehg/hgtk/hgtk.py:809
 msgid "revisions to view in diff tool"
-msgstr "比较查看修订版本"
+msgstr "使用差异工具查看修订版本"
 
 #: tortoisehg/hgqt/run.py:1172 tortoisehg/hgtk/hgtk.py:810
 msgid "bundle file to preview"
 
 #: tortoisehg/hgqt/run.py:1173 tortoisehg/hgtk/hgtk.py:811
 msgid "launch visual diff tool"
-msgstr "启动GUI比较工具"
+msgstr "启动可视化差异工具"
 
 #: tortoisehg/hgqt/run.py:1175 tortoisehg/hgtk/hgtk.py:813
 msgid "print license"
 
 #: tortoisehg/hgqt/settings.py:124
 msgid "&Unspecified"
-msgstr ""
+msgstr "未指定(&U)"
 
 #: tortoisehg/hgqt/settings.py:184
 msgid "&Set..."
 #: tortoisehg/hgqt/settings.py:309
 #, python-format
 msgid "Failed to load issue tracker: '%s': %s. "
-msgstr ""
+msgstr "加载问题追踪器失败:'%s': %s. "
 
 #: tortoisehg/hgqt/settings.py:339
 msgid "&Browse..."
 
 #: tortoisehg/hgqt/settings.py:458 tortoisehg/hgtk/thgconfig.py:43
 msgid "UI Language"
-msgstr ""
+msgstr "界面语言"
 
 #: tortoisehg/hgqt/settings.py:460 tortoisehg/hgtk/thgconfig.py:44
 msgid "Specify your preferred user interface language (restart needed)"
-msgstr ""
+msgstr "指定您的首选用户界面语言(需要重新启动)"
 
 #: tortoisehg/hgqt/settings.py:462 tortoisehg/hgtk/thgconfig.py:45
 msgid "Three-way Merge Tool"
 
 #: tortoisehg/hgqt/settings.py:470 tortoisehg/hgtk/thgconfig.py:52
 msgid "Visual Diff Tool"
-msgstr ""
+msgstr "可视化差异工具"
 
 #: tortoisehg/hgqt/settings.py:472 tortoisehg/hgtk/thgconfig.py:53
 msgid ""
 "variables are set to a non-English language. This setting is used by the "
 "Merge, Tag and Backout dialogs. Default: False"
 msgstr ""
+"生成英文提交说明,即使环境变量 LANGUAGE 或 LANG 设置为非英语语言。此设置应用到 合并,标签和回退 对话框。默认:False"
 
 #: tortoisehg/hgqt/settings.py:619
 msgid "Secret MQ Patches"
 
 #: tortoisehg/hgqt/settings.py:703 tortoisehg/hgtk/thgconfig.py:240
 msgid "Email address to use in the \"From\" header and for the SMTP envelope"
-msgstr "邮件地址, 用在发件人和SMTP信封"
+msgstr "邮件地址,使用于邮件中的发件人和SMTP信封"
 
 #: tortoisehg/hgqt/settings.py:705 tortoisehg/hgtk/thgconfig.py:242
 msgid "To"
 
 #: tortoisehg/hgqt/settings.py:770
 msgid "Fonts"
-msgstr ""
+msgstr "字体"
 
 #: tortoisehg/hgqt/settings.py:771
 msgid "Message Font"
 
 #: tortoisehg/hgqt/settings.py:792 tortoisehg/hgtk/thgconfig.py:323
 msgid "Issue Regex"
-msgstr ""
+msgstr "问题筛选正则表达式"
 
 #: tortoisehg/hgqt/settings.py:793 tortoisehg/hgtk/thgconfig.py:324
 msgid "Defines the regex to match when picking up issue numbers."
-msgstr ""
+msgstr "定义匹配问题编号的正则表达式。"
 
 #: tortoisehg/hgqt/settings.py:794 tortoisehg/hgtk/thgconfig.py:325
 msgid "Issue Link"
-msgstr ""
+msgstr "问题链接"
 
 #: tortoisehg/hgqt/settings.py:795 tortoisehg/hgtk/thgconfig.py:326
 msgid ""
 
 #: tortoisehg/hgqt/settings.py:806
 msgid "Issue Tracker Plugin"
-msgstr ""
+msgstr "问题追踪器插件"
 
 #: tortoisehg/hgqt/settings.py:808
 msgid ""
 
 #: tortoisehg/hgqt/settings.py:810
 msgid "Configure Issue Tracker"
-msgstr ""
+msgstr "配置问题跟踪器"
 
 #: tortoisehg/hgqt/settings.py:811
 msgid "Configure the selected COM Bug Tracker plugin."
 
 #: tortoisehg/hgqt/settings.py:813
 msgid "Issue Tracker Trigger"
-msgstr ""
+msgstr "问题跟踪触发器"
 
 #: tortoisehg/hgqt/settings.py:815
 msgid ""
 
 #: tortoisehg/hgqt/settings.py:882
 msgid "TortoiseHg Settings"
-msgstr ""
+msgstr "TortoiseHg 设置"
 
 #: tortoisehg/hgqt/settings.py:888 tortoisehg/hgtk/thgconfig.py:648
 msgid "Iniparse package not found"
 
 #: tortoisehg/hgqt/settings.py:889 tortoisehg/hgtk/thgconfig.py:649
 msgid "Can't change settings without iniparse package - view is readonly."
-msgstr "没有 iniparse 包不能改设置 - 查看是只读的."
+msgstr "没有ini解释器不能改设置 - 视图是只读的"
 
 #: tortoisehg/hgqt/settings.py:913
 #, python-format
 msgid "%s's global settings"
-msgstr ""
+msgstr "%s 的全局设置"
 
 #: tortoisehg/hgqt/settings.py:927 tortoisehg/hgtk/thgconfig.py:638
 msgid "No repository found"
 #: tortoisehg/hgqt/settings.py:936
 #, python-format
 msgid "%s project settings (.hg/projrc)"
-msgstr ""
+msgstr "%s 项目设置 (.hg/projrc)"
 
 #: tortoisehg/hgqt/settings.py:942 tortoisehg/hgtk/thgconfig.py:671
 #, python-format
 
 #: tortoisehg/hgqt/settings.py:1035
 msgid "Settings File:"
-msgstr ""
+msgstr "设置文件:"
 
 #: tortoisehg/hgqt/settings.py:1095
 msgid "Confirm Save"
 
 #: tortoisehg/hgqt/shellconf.py:86
 msgid "Contex Menu"
-msgstr ""
+msgstr "右键菜单"
 
 #: tortoisehg/hgqt/shellconf.py:88 tortoisehg/hgtk/shellconf.py:82
 msgid "Top menu items:"
 
 #: tortoisehg/hgqt/shellconf.py:120 tortoisehg/hgtk/shellconf.py:120
 msgid "Hide context menu outside repositories"
-msgstr ""
+msgstr "在仓库外隐藏右键菜单"
 
 #: tortoisehg/hgqt/shellconf.py:121 tortoisehg/hgtk/shellconf.py:210
 msgid ""
 "Do not show menu items on unversioned folders (use shift + click to override)"
-msgstr ""
+msgstr "不在无版本控制的文件夹显示菜单项(shift+右键时显示)"
 
 #: tortoisehg/hgqt/shellconf.py:130 tortoisehg/hgtk/shellconf.py:124
 msgid "Icons"
 
 #: tortoisehg/hgqt/shellconf.py:133 tortoisehg/hgtk/shellconf.py:129
 msgid "Overlays"
-msgstr "图标叠"
+msgstr "图标叠"
 
 #: tortoisehg/hgqt/shellconf.py:137
 msgid "Enabled overlays"
-msgstr ""
+msgstr "启用图标层叠"
 
 #: tortoisehg/hgqt/shellconf.py:139 tortoisehg/hgtk/shellconf.py:138
 msgid "Local disks only"
 
 #: tortoisehg/hgqt/shellconf.py:144 tortoisehg/hgtk/shellconf.py:142
 msgid "Enabled Overlay Handlers"
-msgstr ""
+msgstr "启用层叠句柄"
 
 #: tortoisehg/hgqt/shellconf.py:149 tortoisehg/hgtk/shellconf.py:151
 msgid "Warning: affects all Tortoises, logoff required after change"
-msgstr ""
+msgstr "警告:影响所有的Tortoise,注销后生效"
 
 #: tortoisehg/hgqt/shellconf.py:151 tortoisehg/hgtk/shellconf.py:159
 msgid "Added"
-msgstr ""
+msgstr "已添加"
 
 #: tortoisehg/hgqt/shellconf.py:153 tortoisehg/hgtk/shellconf.py:166
 msgid "Locked*"
 
 #: tortoisehg/hgqt/shellconf.py:157 tortoisehg/hgtk/shellconf.py:161
 msgid "Unversioned"
-msgstr ""
+msgstr "无版本控制的"
 
 #: tortoisehg/hgqt/shellconf.py:159 tortoisehg/hgtk/shellconf.py:168
 msgid "Readonly*"
 #: tortoisehg/hgqt/status.py:832
 #, python-format
 msgid "%s is added"
-msgstr ""
+msgstr "%s 已被添加"
 
 #: tortoisehg/hgqt/status.py:833 tortoisehg/hgtk/quickop.py:166
 msgid "added"
-msgstr "添加过的"
+msgstr "添加"
 
 #: tortoisehg/hgqt/status.py:834
 #, python-format
 
 #: tortoisehg/hgqt/sync.py:274
 msgid "Paths in Repository Settings:"
-msgstr ""
+msgstr "仓库设置中的Paths:"
 
 #: tortoisehg/hgqt/sync.py:289
 msgid "Related Paths:"
 
 #: tortoisehg/hgqt/sync.py:601
 msgid "A terminal shell cannot be opened for remote"
-msgstr ""
+msgstr "终端外壳不能打开远程操作"
 
 #: tortoisehg/hgqt/sync.py:606 tortoisehg/hgqt/sync.py:1458
 msgid "Confirm path delete"
 
 #: tortoisehg/hgqt/sync.py:1113
 msgid "<a href=\"config\">Launch settings tool...</a>"
-msgstr ""
+msgstr "<a href=\"config\">正在加载设置工具...</a>"
 
 #: tortoisehg/hgqt/sync.py:1146
 msgid "Unable to save post pull operation"
 #: tortoisehg/hgqt/tag.py:268
 #, python-format
 msgid "Tag '%s' has been added"
-msgstr ""
+msgstr "已添加标签 '%s'"
 
 #: tortoisehg/hgqt/tag.py:299 tortoisehg/hgtk/tagadd.py:303
 #, python-format
 #: tortoisehg/hgqt/visdiff.py:154 tortoisehg/hgqt/visdiff.py:226
 #: tortoisehg/hgtk/visdiff.py:132 tortoisehg/hgtk/visdiff.py:201
 msgid "No diff tool found"
-msgstr ""
+msgstr "没有差异工具"
 
 #: tortoisehg/hgqt/visdiff.py:155 tortoisehg/hgqt/visdiff.py:227
 #: tortoisehg/hgtk/visdiff.py:133 tortoisehg/hgtk/visdiff.py:202
 msgid "No visual diff tools were detected"
-msgstr ""
+msgstr "没有检测到可视化差异工具"
 
 #: tortoisehg/hgqt/visdiff.py:160 tortoisehg/hgtk/visdiff.py:138
 msgid "[working copy]"
 
 #: tortoisehg/hgqt/visdiff.py:400 tortoisehg/hgtk/visdiff.py:370
 msgid "Temporary files are removed when this dialog is closed"
-msgstr "临时文件在对话框关闭自动删除"
+msgstr "临时文件在对话框关闭自动删除"
 
 #: tortoisehg/hgqt/visdiff.py:418
 msgid "Select Tool:"
 
 #: tortoisehg/hgqt/wctxactions.py:71
 msgid "&Delete unversioned..."
-msgstr ""
+msgstr "删除无版本控制的文件(&D)..."
 
 #: tortoisehg/hgqt/wctxactions.py:73 tortoisehg/hgtk/status.py:1265
 msgid "Mark unresolved"
 
 #: tortoisehg/hgqt/wctxactions.py:369
 msgid "Confirm Delete Unversioned"
-msgstr ""
+msgstr "确认删除无版本控制的文件"
 
 #: tortoisehg/hgqt/wctxactions.py:370
 msgid "Delete the following unversioned files?"
-msgstr ""
+msgstr "删除以下无版本控制的文件?"
 
 #: tortoisehg/hgqt/wctxactions.py:382 tortoisehg/hgtk/statusact.py:40
 msgid "Copy file to"
 
 #: tortoisehg/hgqt/workbench.py:78
 msgid "New Repository..."
-msgstr ""
+msgstr "新建仓库..."
 
 #: tortoisehg/hgqt/workbench.py:80 tortoisehg/hgqt/workbench.py:204
 msgid "Clone Repository..."
-msgstr ""
+msgstr "克隆仓库..."
 
 #: tortoisehg/hgqt/workbench.py:82
 msgid "Open Repository..."
-msgstr ""
+msgstr "打开仓库..."
 
 #: tortoisehg/hgqt/workbench.py:123
 msgid "&File"
 
 #: tortoisehg/hgqt/workbench.py:202
 msgid "&New Repository..."
-msgstr ""
+msgstr "新建仓库..."
 
 #: tortoisehg/hgqt/workbench.py:208
 msgid "&Open Repository..."
-msgstr ""
+msgstr "打开仓库..."
 
 #: tortoisehg/hgqt/workbench.py:210
 msgid "&Close Repository"
-msgstr ""
+msgstr "关闭仓库"
 
 #: tortoisehg/hgqt/workbench.py:217
 msgid "&Settings..."
-msgstr ""
+msgstr "设置(&S)..."
 
 #: tortoisehg/hgqt/workbench.py:223
 msgid "Show Repository Registry"
-msgstr ""
+msgstr "显示仓库注册表"
 
 #: tortoisehg/hgqt/workbench.py:230
 msgid "Show Patch Queue"
 
 #: tortoisehg/hgqt/workbench.py:243
 msgid "Repository Registry Options"
-msgstr ""
+msgstr "仓库注册表选项"
 
 #: tortoisehg/hgqt/workbench.py:245
 msgid "Show Paths"
 
 #: tortoisehg/hgqt/workbench.py:249
 msgid "Show Subrepos on Registry"
-msgstr ""
+msgstr "在注册表中显示子仓库"
 
 #: tortoisehg/hgqt/workbench.py:254
 msgid "Show Subrepos for remote repositories"
 
 #: tortoisehg/hgqt/workbench.py:389 tortoisehg/hgqt/workbench.py:390
 msgid "Close tab"
-msgstr ""
+msgstr "关闭标签页"
 
 #: tortoisehg/hgqt/workbench.py:391 tortoisehg/hgqt/workbench.py:392
 msgid "Close other tabs"
-msgstr ""
+msgstr "关闭其他标签页"
 
 #: tortoisehg/hgqt/workbench.py:393
 msgid "Undo close tab"
-msgstr ""
+msgstr "撤消关闭标签页"
 
 #: tortoisehg/hgqt/workbench.py:394
 msgid "Reopen last closed tab"
-msgstr ""
+msgstr "重新打开最后关闭的标签页"
 
 #: tortoisehg/hgqt/workbench.py:395
 msgid "Undo close other tabs"
-msgstr ""
+msgstr "撤消关闭其他标签页"
 
 #: tortoisehg/hgqt/workbench.py:396
 msgid "Reopen last closed tab group"
-msgstr ""
+msgstr "重新打开最后关闭的标签组"
 
 #: tortoisehg/hgqt/workbench.py:578
 #, python-format
 #: tortoisehg/hgtk/bugreport.py:57
 msgid ""
 "** Please report this bug to http://bitbucket.org/tortoisehg/stable/issues\n"
-msgstr ""
+msgstr "** 请到 http://bitbucket.org/tortoisehg/stable/issues 报告这个bug\n"
 
 #: tortoisehg/hgtk/changeset.py:46
 #, python-format
 
 #: tortoisehg/hgtk/commit.py:69
 msgid "Close current named branch"
-msgstr "关闭当前分支"
+msgstr "关闭当前命名分支"
 
 #: tortoisehg/hgtk/commit.py:173
 msgid "merging "
 
 #: tortoisehg/hgtk/commit.py:789
 msgid "close branch: "
-msgstr "关闭分支: "
+msgstr "关闭分支 "
 
 #: tortoisehg/hgtk/commit.py:822
 msgid "Merge "
 
 #: tortoisehg/hgtk/history.py:1273
 msgid "_Copy Hash"
-msgstr ""
+msgstr "复制校验码(_C)"
 
 #: tortoisehg/hgtk/history.py:1277
 msgid "Pull to Here"
 
 #: tortoisehg/hgtk/shellconf.py:42
 msgid "Context Menu"
-msgstr "环境菜单"
+msgstr "右键菜单"
 
 #: tortoisehg/hgtk/shellconf.py:47
 msgid "Menu Items"
 
 #: tortoisehg/hgtk/shellconf.py:136
 msgid "Enable overlays"
-msgstr "启用图标叠"
+msgstr "启用图标叠"
 
 #: tortoisehg/hgtk/shellconf.py:213
 msgid "Show overlay icons in Mercurial repositories"
-msgstr "在 Mercurial 仓库中显示覆盖图标"
+msgstr "在 Mercurial 仓库中显示层叠图标"
 
 #: tortoisehg/hgtk/shellconf.py:216
 msgid "Show overlays on local disks only"
 
 #: tortoisehg/hgtk/status.py:1258
 msgid "_Delete unversioned"
-msgstr "删除未纳入版本控制的"
+msgstr "删除版本控制的文件(&D)"
 
 #: tortoisehg/hgtk/status.py:1261
 msgid "_Copy..."
 "Maximum length of the commit message summary line. If set, TortoiseHg will "
 "issue a warning if the summary line is too long or not separated by a blank "
 "line. Default: 0 (unenforced)"
-msgstr ""
+msgstr "最大提交说明摘要行数。如果设置,TortoiseHg将会在摘要行数过多或没有使用空行分割时提醒。默认:0 (非强制)"
 
 #: tortoisehg/hgtk/thgconfig.py:97
 msgid "Message Line Length"
 "Word wrap length of the commit message.  If set, the popup menu can be used "
 "to format the message and a warning will be issued if any lines are too long "
 "at commit. Default: 0 (unenforced)"
-msgstr ""
+msgstr "提交说明的自动换行长度。如果设置,弹出菜单可以使用格式化的说明,并且会在有过长的行提交时警告。默认:0 (非强制)"
 
 #: tortoisehg/hgtk/thgconfig.py:104
 msgid "Close the commit tool after every successful commit. Default: False"
-msgstr ""
+msgstr "成功提交后关闭。默认:False"
 
 #: tortoisehg/hgtk/thgconfig.py:107
 msgid ""
 msgid ""
 "Adjust the display of the main toolbar in the Repository Explorer.  Values: "
 "small, large, or theme. Default: theme"
-msgstr ""
+msgstr "调整工具栏在仓库浏览器中的显示。值:small,large或theme。默认:theme"
 
 #: tortoisehg/hgtk/thgconfig.py:174
 msgid ""
 
 #: tortoisehg/hgtk/thgconfig.py:798
 msgid "TortoiseHg Configure User-Global Settings"
-msgstr "TortoiseHg 配置用户/全局设置"
+msgstr "TortoiseHg 配置用户全局设置"
 
 #: tortoisehg/hgtk/thgconfig.py:847
 msgid "Exit after saving changes?"
 
 #: tortoisehg/hgtk/visdiff.py:531
 msgid "Close diff tools and try again, or quit to leak files?"
-msgstr "关闭比较工具再重新尝试, 或退出而不删除临时文件"
+msgstr "关闭比较工具并重试,或退出而不删除临时文件"
 
 #: tortoisehg/hgtk/visdiff.py:532
 msgid "Try &Again"
 
 #: tortoisehg/util/menuthg.py:70
 msgid "Explorer Extension Settings"
-msgstr ""
+msgstr "资源管理器扩展设置"
 
 #: tortoisehg/util/menuthg.py:71
 msgid "Configure Explorer extension"
-msgstr ""
+msgstr "配置资源管理器扩展"
 
 #: tortoisehg/util/menuthg.py:74
 msgid "Show About Dialog"
 
 #: tortoisehg/util/menuthg.py:77
 msgid "View changes using GUI diff tool"
-msgstr "用GUI比较工具查看改动"
+msgstr "使用GUI差异工具查看变更"
 
 #: tortoisehg/util/menuthg.py:79
 msgid "Edit Ignore Filter"

i18n/tortoisehg/zh_TW.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-05 08:55-0200\n"
-"PO-Revision-Date: 2011-12-29 06:52+0000\n"
-"Last-Translator: leolarrel Wang <Unknown>\n"
+"PO-Revision-Date: 2012-02-28 17:22+0000\n"
+"Last-Translator: Lionheart <Unknown>\n"
 "Language-Team: Traditional Chinese <zh_TW@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-02-06 04:56+0000\n"
-"X-Generator: Launchpad (build 14747)\n"
+"X-Launchpad-Export-Date: 2012-02-29 04:45+0000\n"
+"X-Generator: Launchpad (build 14874)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
-msgstr ""
+msgstr "TortoiseHg Overlay 圖標服務"
 
 #: TortoiseHgOverlayServer.py:162
 msgid "Exit"
 
 #: tortoisehg/hgqt/about.py:56
 msgid "Copyright 2008-2011 Steve Borho and others"
-msgstr ""
+msgstr "版權所有 2008-2011 Steve Borho和其他開發者"
 
 #: tortoisehg/hgqt/about.py:61 tortoisehg/hgtk/about.py:42
 msgid "Several icons are courtesy of the TortoiseSVN project"
-msgstr "些圖示是由 TortoiseSVN 計劃所提供"
+msgstr "些圖由 TortoiseSVN 項目友情提供"
 
 #: tortoisehg/hgqt/about.py:71
 msgid "You can visit our site here"
 #: tortoisehg/hgqt/about.py:107
 #, python-format
 msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
-msgstr ""
+msgstr "附 Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
 
 #: tortoisehg/hgqt/about.py:156 tortoisehg/hgtk/about.py:70
 msgid "A new version of TortoiseHg is ready for download!"
-msgstr "已有新版 TortoiseHG 可供下載!"
+msgstr "新版 TortoiseHg 已經可以下載!"
 
 #: tortoisehg/hgqt/archive.py:20 tortoisehg/hgtk/archive.py:18
 msgid "= Working Directory Parent ="
 
 #: tortoisehg/hgqt/archive.py:46 tortoisehg/hgtk/archive.py:62
 msgid "Only files modified/created in this revision"
-msgstr "修訂版只有被修改/建立的檔案"
+msgstr "僅當前修訂版被修改/建立的檔案"
 
 #: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:68
 #: tortoisehg/hgqt/sync.py:1563
 #: tortoisehg/hgqt/backout.py:29
 #, python-format
 msgid "Backout - %s"
-msgstr ""
+msgstr "回退 - %s"
 
 #: tortoisehg/hgqt/backout.py:99
 msgid "Prepare to backout"
-msgstr "準備backout"
+msgstr "準備回退"
 
 #: tortoisehg/hgqt/backout.py:100
 msgid "Verify backout revision and ensure your working directory is clean."
-msgstr "驗證backout的修訂版,確認你的工作目錄是乾淨的"
+msgstr "驗證回退修訂版確認你的工作目錄是乾淨的"
 
 #: tortoisehg/hgqt/backout.py:111 tortoisehg/hgqt/backout.py:123
 #: tortoisehg/hgqt/backout.py:130
 msgid "Unable to backout"
-msgstr "不能backout ><"
+msgstr "不能回退"
 
 #: tortoisehg/hgqt/backout.py:112
 msgid "Backout revision not found"
-msgstr "找不到要backout的修訂版"
+msgstr "找不到要回退的修訂版"
 
 #: tortoisehg/hgqt/backout.py:117
 msgid "Backing out a parent revision is a single step operation"
-msgstr "退回一個母系修訂版是一個單步操作"
+msgstr "退母系修訂版是一個單步操作"
 
 #: tortoisehg/hgqt/backout.py:124
 msgid "Backout requires a parent revision"
-msgstr "Backout需要一個母系修訂版"
+msgstr "回退需要一個母系修訂版"
 
 #: tortoisehg/hgqt/backout.py:131
 msgid "Cannot backout change on a different branch"
-msgstr "不能在不同的分支中backout變更"
+msgstr "不能在不同的分支中回退變更"
 
 #: tortoisehg/hgqt/backout.py:137
 msgid "Backout revision"
-msgstr "Backout修訂版"
+msgstr "回退修訂版"
 
 #: tortoisehg/hgqt/backout.py:147
 msgid "Not a head, backout will create a new head!"
-msgstr "沒有標頭,backout操作將建立一個新的標頭!"
+msgstr "不是HEAD修訂版,回退操作將會創建新的Head修訂版!"
 
 #: tortoisehg/hgqt/backout.py:153
 msgid "Current local revision"
 
 #: tortoisehg/hgqt/backout.py:171
 msgid "Merge parent to backout to"
-msgstr ""
+msgstr "回退到合併的母系"
 
 #: tortoisehg/hgqt/backout.py:174
 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 ""
+msgstr "要回退<b>合併</b>修訂版,你必須選擇需要回退到的母系(即:變更會<i>保留</i>的)"
 
 #: tortoisehg/hgqt/backout.py:179
 #, python-format
 
 #: tortoisehg/hgqt/backout.py:185
 msgid "Backout to the first parent of the merge revision"
-msgstr "backout到合併修訂版的第一個母系"
+msgstr "回退到合併修訂版的第一個母系"
 
 #: tortoisehg/hgqt/backout.py:190
 #, python-format
 
 #: tortoisehg/hgqt/backout.py:195
 msgid "Backout to the second parent of the merge revision"
-msgstr "backout到合併修訂版的第二個母系"
+msgstr "回退到合併修訂版的第二個母系"
 
 #: tortoisehg/hgqt/backout.py:203 tortoisehg/hgqt/merge.py:154
 msgid "Working directory status"
 "href=\"shelve\"><b>shelve</b></a> to patch, or <a "
 "href=\"discard\"><b>discard</b></a> changes."
 msgstr ""
-"backout之前,你必須 <a href=\"commit\"><b>提交</b></a>, <a "
-"href=\"shelve\"><b>shelve</b></a> 到補丁,或 <a href=\"discard\"><b>丟棄</b></a>變更"
+"回退之前,你必須 <a href=\"commit\"><b>提交</b></a>, <a "
+"href=\"shelve\"><b>shelve</b></a> 到補丁,或 <a href=\"discard\"><b>丟棄</b></a>變更。"
 
 #: tortoisehg/hgqt/backout.py:228 tortoisehg/hgqt/merge.py:215
 #: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1107
 
 #: tortoisehg/hgqt/backout.py:278 tortoisehg/hgtk/recovery.py:52
 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:327
 msgid "Backing out, then merging..."
-msgstr "backout中,然後合併..."
+msgstr "回退中,然后合并..."
 
 #: tortoisehg/hgqt/backout.py:328 tortoisehg/hgqt/merge.py:342
 msgid "All conflicting files will be marked unresolved."
 #: tortoisehg/hgqt/backout.py:341
 msgid ""
 "Automatically advance to next page when backout and merge are complete."
-msgstr "backout或合併完成後自動前進到下一個頁面"
+msgstr "回退和合併完成後自動前進到下一個頁面"
 
 #: tortoisehg/hgqt/backout.py:372 tortoisehg/hgqt/merge.py:395
 #, python-format
 msgid ""
 "%d files have <b>merge conflicts</b> that must be <a "
 "href=\"resolve\"><b>resolved</b></a>"
-msgstr "%d 個檔案有<b>合併衝突</b>必須被<a href=\"resolve\"><b>解決</b></a>"
+msgstr "%d個需要<b>合併衝突</b>的檔案要<a href=\"resolve\"><b>解決</b></a>"
 
 #: tortoisehg/hgqt/backout.py:377 tortoisehg/hgqt/merge.py:405
 msgid "No merge conflicts, ready to commit"
-msgstr "沒有合併衝突,準備提交"
+msgstr "沒有合併衝突,可以提交"
 
 #: tortoisehg/hgqt/backout.py:412
 msgid "Commit backout and merge results"
-msgstr "提交backout,合併結果"
+msgstr "提交回退並合併"
 
 #: tortoisehg/hgqt/backout.py:422 tortoisehg/hgqt/merge.py:449
 #: tortoisehg/hgtk/commit.py:236 tortoisehg/hgtk/history.py:66
 
 #: 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 "Backed out 合併變更集: "
+msgstr "回退合併後的變更集 "
 
 #: tortoisehg/hgqt/backout.py:511 tortoisehg/hgqt/backout.py:545
 #: tortoisehg/hgtk/backout.py:41
 msgid "Backed out changeset: "
-msgstr "backout變更集: "
+msgstr "回退的變更集 "
 
 #: tortoisehg/hgqt/backout.py:514 tortoisehg/hgqt/commit.py:634
 #: tortoisehg/hgqt/mq.py:821 tortoisehg/hgtk/backout.py:139
 
 #: tortoisehg/hgqt/backout.py:515 tortoisehg/hgtk/backout.py:140
 msgid "Discard current backout message?"
-msgstr "丟棄目前的backout訊息?"
+msgstr "丟棄目前的回退訊息?"
 
 #: tortoisehg/hgqt/backout.py:524 tortoisehg/hgtk/backout.py:82
 msgid "Use English backout message"
-msgstr "使用英文backout訊息"
+msgstr "使用英文回退訊息"
 
 #: tortoisehg/hgqt/backout.py:553
 #, python-format
 msgid "Backed out merge revision to its first parent (%s)"
-msgstr "退回合併的修訂版到他的個母系(%s)"
+msgstr "回退合併的修訂版到他的第一個母系(%s)"
 
 #: tortoisehg/hgqt/backout.py:556
 #, python-format
 msgid "Backed out merge revision to its second parent (%s)"
-msgstr "退回合併的修訂版到他的第二個母系(%s)"
+msgstr "回退合併的修訂版到他的第二個母系(%s)"
 
 #: tortoisehg/hgqt/backout.py:585
 msgid "Backing out and committing..."
-msgstr "Backing out ,然後提交..."
+msgstr "回退並提交..."
 
 #: tortoisehg/hgqt/backout.py:586
 msgid "Please wait while making backout."
-msgstr "正在backout,請等一下"
+msgstr "回退中,請稍等..."
 
 #: tortoisehg/hgqt/backout.py:594 tortoisehg/hgqt/merge.py:573
 msgid "Committing..."
 
 #: tortoisehg/hgqt/backout.py:595 tortoisehg/hgqt/merge.py:574
 msgid "Please wait while committing merged files."
-msgstr "正在提交合併的檔案請等等"
+msgstr "正在提交合併的文件,請稍等..."
 
 #: tortoisehg/hgqt/backout.py:620 tortoisehg/hgqt/cmdui.py:313
 #: tortoisehg/hgqt/merge.py:602 tortoisehg/hgtk/p4pending.py:101