X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=po%2Fzh_cn.po;h=621c9479b2b90c13119985df889af70b206e3cbd;hb=afdb4be0fc48da74e8f02fe5ca22777cb2d214ed;hp=45eb5b5f98f515182c42c7468d0b3c3be2246114;hpb=c8dd7f62e8b335681099cdcec2b01aeaad646813;p=git.git

diff --git a/po/zh_cn.po b/po/zh_cn.po
index 45eb5b5f9..621c9479b 100644
--- a/po/zh_cn.po
+++ b/po/zh_cn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-27 19:33+0200\n"
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
 "PO-Revision-Date: 2007-07-21 01:23-0700\n"
 "Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n"
 "Language-Team: Chinese\n"
@@ -16,15 +16,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: git-gui.sh:531
+#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
+#: git-gui.sh:763
+msgid "git-gui: fatal error"
+msgstr ""
+
+#: git-gui.sh:595
+#, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr ""
+
+#: git-gui.sh:620
+msgid "Main Font"
+msgstr ""
+
+#: git-gui.sh:621
+msgid "Diff/Console Font"
+msgstr ""
+
+#: git-gui.sh:635
 msgid "Cannot find git in PATH."
 msgstr ""
 
-#: git-gui.sh:550
+#: git-gui.sh:662
 msgid "Cannot parse Git version string:"
 msgstr ""
 
-#: git-gui.sh:567
+#: git-gui.sh:680
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -36,82 +54,82 @@ msgid ""
 "Assume '%s' is version 1.5.0?\n"
 msgstr ""
 
-#: git-gui.sh:689
-msgid "Cannot find the git directory:"
+#: git-gui.sh:853
+msgid "Git directory not found:"
 msgstr ""
 
-#: git-gui.sh:697
-msgid "Git directory not found:"
+#: git-gui.sh:860
+msgid "Cannot move to top of working directory:"
 msgstr ""
 
-#: git-gui.sh:703
+#: git-gui.sh:867
 msgid "Cannot use funny .git directory:"
 msgstr ""
 
-#: git-gui.sh:708
+#: git-gui.sh:872
 msgid "No working directory"
 msgstr ""
 
-#: git-gui.sh:853
+#: git-gui.sh:1019
 msgid "Refreshing file status..."
 msgstr ""
 
-#: git-gui.sh:886
+#: git-gui.sh:1084
 msgid "Scanning for modified files ..."
 msgstr ""
 
-#: git-gui.sh:1052 lib/browser.tcl:233
+#: git-gui.sh:1259 lib/browser.tcl:245
 #, fuzzy
 msgid "Ready."
 msgstr "重做"
 
-#: git-gui.sh:1343
+#: git-gui.sh:1525
 msgid "Unmodified"
 msgstr ""
 
-#: git-gui.sh:1345
+#: git-gui.sh:1527
 msgid "Modified, not staged"
 msgstr ""
 
-#: git-gui.sh:1346 git-gui.sh:1351
+#: git-gui.sh:1528 git-gui.sh:1533
 #, fuzzy
 msgid "Staged for commit"
 msgstr "从本次提交移除"
 
-#: git-gui.sh:1347 git-gui.sh:1352
+#: git-gui.sh:1529 git-gui.sh:1534
 #, fuzzy
 msgid "Portions staged for commit"
 msgstr "从本次提交移除"
 
-#: git-gui.sh:1348 git-gui.sh:1353
+#: git-gui.sh:1530 git-gui.sh:1535
 msgid "Staged for commit, missing"
 msgstr ""
 
-#: git-gui.sh:1350
+#: git-gui.sh:1532
 msgid "Untracked, not staged"
 msgstr ""
 
-#: git-gui.sh:1355
+#: git-gui.sh:1537
 msgid "Missing"
 msgstr ""
 
-#: git-gui.sh:1356
+#: git-gui.sh:1538
 msgid "Staged for removal"
 msgstr ""
 
-#: git-gui.sh:1357
+#: git-gui.sh:1539
 msgid "Staged for removal, still present"
 msgstr ""
 
-#: git-gui.sh:1359 git-gui.sh:1360 git-gui.sh:1361 git-gui.sh:1362
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
 msgid "Requires merge resolution"
 msgstr ""
 
-#: git-gui.sh:1404
+#: git-gui.sh:1579
 msgid "Starting gitk... please wait..."
 msgstr ""
 
-#: git-gui.sh:1413
+#: git-gui.sh:1588
 #, tcl-format
 msgid ""
 "Unable to start gitk:\n"
@@ -119,300 +137,336 @@ msgid ""
 "%s does not exist"
 msgstr ""
 
-#: git-gui.sh:1630
-#, tcl-format
-msgid "Invalid font specified in gui.%s:"
-msgstr ""
-
-#: git-gui.sh:1655
-msgid "Main Font"
-msgstr ""
-
-#: git-gui.sh:1656
-msgid "Diff/Console Font"
-msgstr ""
-
-#: git-gui.sh:1670
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
 msgid "Repository"
 msgstr "版本树"
 
-#: git-gui.sh:1671
+#: git-gui.sh:1789
 msgid "Edit"
 msgstr "编辑"
 
-#: git-gui.sh:1673
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
 msgid "Branch"
 msgstr "分支"
 
-#: git-gui.sh:1676 git-gui.sh:1854 git-gui.sh:2193
-msgid "Commit"
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
+#, fuzzy
+msgid "Commit@@noun"
 msgstr "提交"
 
-#: git-gui.sh:1679 lib/merge.tcl:96 lib/merge.tcl:157 lib/merge.tcl:173
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 msgid "Merge"
 msgstr "合并"
 
-#: git-gui.sh:1680
-msgid "Fetch"
-msgstr "导入"
-
-#: git-gui.sh:1681 git-gui.sh:2199 lib/transport.tcl:88 lib/transport.tcl:172
-msgid "Push"
-msgstr "上传"
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
+#, fuzzy
+msgid "Remote"
+msgstr "改名..."
 
-#: git-gui.sh:1690
+#: git-gui.sh:1807
 msgid "Browse Current Branch's Files"
 msgstr "浏览当前分支文件"
 
-#: git-gui.sh:1692
-#, fuzzy, tcl-format
-msgid "Browse %s's Files"
-msgstr "浏览当前分支文件"
-
-#: git-gui.sh:1694
+#: git-gui.sh:1811
 #, fuzzy
 msgid "Browse Branch Files..."
 msgstr "浏览当前分支文件"
 
-#: git-gui.sh:1699
+#: git-gui.sh:1816
 msgid "Visualize Current Branch's History"
 msgstr "调用gitk显示当前分支"
 
-#: git-gui.sh:1701
-#, fuzzy, tcl-format
-msgid "Visualize %s's History"
+#: git-gui.sh:1820
+msgid "Visualize All Branch History"
 msgstr "调用gitk显示所有分支"
 
-#: git-gui.sh:1703
-msgid "Visualize All Branch History"
+#: git-gui.sh:1827
+#, fuzzy, tcl-format
+msgid "Browse %s's Files"
+msgstr "浏览当前分支文件"
+
+#: git-gui.sh:1829
+#, fuzzy, tcl-format
+msgid "Visualize %s's History"
 msgstr "调用gitk显示所有分支"
 
-#: git-gui.sh:1708 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
 msgid "Database Statistics"
 msgstr "数据库统计数据"
 
-#: git-gui.sh:1711 lib/database.tcl:34
+#: git-gui.sh:1837 lib/database.tcl:34
 msgid "Compress Database"
 msgstr "压缩数据库"
 
-#: git-gui.sh:1714
+#: git-gui.sh:1840
 msgid "Verify Database"
 msgstr "验证数据库"
 
-#: git-gui.sh:1721 git-gui.sh:1725 git-gui.sh:1729 lib/shortcut.tcl:9
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
 #: lib/shortcut.tcl:45 lib/shortcut.tcl:84
 msgid "Create Desktop Icon"
 msgstr "创建桌面图标"
 
-#: git-gui.sh:1734
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
 msgid "Quit"
 msgstr "退出"
 
-#: git-gui.sh:1741
+#: git-gui.sh:1867
 msgid "Undo"
 msgstr "撤销"
 
-#: git-gui.sh:1744
+#: git-gui.sh:1870
 msgid "Redo"
 msgstr "重做"
 
-#: git-gui.sh:1748 git-gui.sh:2263
+#: git-gui.sh:1874 git-gui.sh:2366
 msgid "Cut"
 msgstr "剪切"
 
-#: git-gui.sh:1751 git-gui.sh:2266 git-gui.sh:2337 git-gui.sh:2409
-#: lib/console.tcl:69
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
+#: lib/console.tcl:67
 msgid "Copy"
 msgstr "复制"
 
-#: git-gui.sh:1754 git-gui.sh:2269
+#: git-gui.sh:1880 git-gui.sh:2372
 msgid "Paste"
 msgstr "粘贴"
 
-#: git-gui.sh:1757 git-gui.sh:2272 lib/branch_delete.tcl:26
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
 #: lib/remote_branch_delete.tcl:38
 msgid "Delete"
 msgstr "删除"
 
-#: git-gui.sh:1761 git-gui.sh:2276 git-gui.sh:2413 lib/console.tcl:71
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
 msgid "Select All"
 msgstr "全选"
 
-#: git-gui.sh:1770
+#: git-gui.sh:1896
 msgid "Create..."
 msgstr "新建..."
 
-#: git-gui.sh:1776
+#: git-gui.sh:1902
 msgid "Checkout..."
 msgstr "切换..."
 
-#: git-gui.sh:1782
+#: git-gui.sh:1908
 msgid "Rename..."
 msgstr "改名..."
 
-#: git-gui.sh:1787 git-gui.sh:1885
+#: git-gui.sh:1913 git-gui.sh:2012
 msgid "Delete..."
 msgstr "删除..."
 
-#: git-gui.sh:1792
+#: git-gui.sh:1918
 msgid "Reset..."
 msgstr "重置所有修动..."
 
-#: git-gui.sh:1804 git-gui.sh:2210
+#: git-gui.sh:1930 git-gui.sh:2313
 msgid "New Commit"
 msgstr "新提交"
 
-#: git-gui.sh:1812 git-gui.sh:2217
+#: git-gui.sh:1938 git-gui.sh:2320
 msgid "Amend Last Commit"
 msgstr "修订上次提交"
 
-#: git-gui.sh:1821 git-gui.sh:2177 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
 msgid "Rescan"
 msgstr "重新扫描"
 
-#: git-gui.sh:1827
-msgid "Add To Commit"
-msgstr "添加到本次提交"
+#: git-gui.sh:1953
+#, fuzzy
+msgid "Stage To Commit"
+msgstr "从本次提交移除"
 
-#: git-gui.sh:1832
-msgid "Add Existing To Commit"
-msgstr "添加默认修改文件"
+#: git-gui.sh:1958
+#, fuzzy
+msgid "Stage Changed Files To Commit"
+msgstr "将被提交的修改"
 
-#: git-gui.sh:1838
+#: git-gui.sh:1964
 msgid "Unstage From Commit"
 msgstr "从本次提交移除"
 
-#: git-gui.sh:1843 lib/index.tcl:376
+#: git-gui.sh:1969 lib/index.tcl:352
 msgid "Revert Changes"
 msgstr "恢复修改"
 
-#: git-gui.sh:1850 git-gui.sh:2189 git-gui.sh:2287
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
 msgid "Sign Off"
 msgstr "签名"
 
-#: git-gui.sh:1865
+#: git-gui.sh:1980 git-gui.sh:2296
+#, fuzzy
+msgid "Commit@@verb"
+msgstr "提交"
+
+#: git-gui.sh:1991
 msgid "Local Merge..."
 msgstr "本地合并..."
 
-#: git-gui.sh:1870
+#: git-gui.sh:1996
 msgid "Abort Merge..."
 msgstr "取消合并..."
 
-#: git-gui.sh:1882
+#: git-gui.sh:2008
 msgid "Push..."
 msgstr "上传..."
 
-#: git-gui.sh:1892
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
 msgid "Apple"
 msgstr "苹果"
 
-#: git-gui.sh:1895 git-gui.sh:1942 lib/option.tcl:65
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
 #, tcl-format
 msgid "About %s"
 msgstr "关于%s"
 
-#: git-gui.sh:1897 git-gui.sh:1903 git-gui.sh:2455
+#: git-gui.sh:2026
+msgid "Preferences..."
+msgstr ""
+
+#: git-gui.sh:2034 git-gui.sh:2558
 msgid "Options..."
 msgstr "选项..."
 
-#: git-gui.sh:1917
-msgid "Running miga..."
-msgstr ""
-
-#: git-gui.sh:1938
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
 msgid "Help"
 msgstr "帮助"
 
-#: git-gui.sh:1979
+#: git-gui.sh:2081
 msgid "Online Documentation"
 msgstr "在线文档"
 
-#: git-gui.sh:2095
+#: git-gui.sh:2165
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+
+#: git-gui.sh:2198
 msgid "Current Branch:"
 msgstr "当前分支:"
 
-#: git-gui.sh:2116
-msgid "Staged Changes (Will Be Committed)"
+#: git-gui.sh:2219
+#, fuzzy
+msgid "Staged Changes (Will Commit)"
 msgstr "将被提交的修改"
 
-#: git-gui.sh:2136
-msgid "Unstaged Changes (Will Not Be Committed)"
-msgstr "不被提交的修改"
+#: git-gui.sh:2239
+msgid "Unstaged Changes"
+msgstr ""
+
+#: git-gui.sh:2286
+msgid "Stage Changed"
+msgstr ""
 
-#: git-gui.sh:2183
-msgid "Add Existing"
-msgstr "添加默认修改文件"
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr "上传"
 
-#: git-gui.sh:2229
+#: git-gui.sh:2332
 msgid "Initial Commit Message:"
 msgstr "初始提交描述:"
 
-#: git-gui.sh:2230
+#: git-gui.sh:2333
 msgid "Amended Commit Message:"
 msgstr "修订提交描述:"
 
-#: git-gui.sh:2231
+#: git-gui.sh:2334
 msgid "Amended Initial Commit Message:"
 msgstr "修订初始提交描述:"
 
-#: git-gui.sh:2232
+#: git-gui.sh:2335
 msgid "Amended Merge Commit Message:"
 msgstr "修订合并提交描述:"
 
-#: git-gui.sh:2233
+#: git-gui.sh:2336
 msgid "Merge Commit Message:"
 msgstr "合并提交描述:"
 
-#: git-gui.sh:2234
+#: git-gui.sh:2337
 msgid "Commit Message:"
 msgstr "提交描述:"
 
-#: git-gui.sh:2279 git-gui.sh:2417 lib/console.tcl:73
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
 msgid "Copy All"
 msgstr "全部复制"
 
-#: git-gui.sh:2303 lib/blame.tcl:104
+#: git-gui.sh:2406 lib/blame.tcl:104
 msgid "File:"
 msgstr ""
 
-#: git-gui.sh:2405
+#: git-gui.sh:2508
 msgid "Refresh"
 msgstr "刷新"
 
-#: git-gui.sh:2426
+#: git-gui.sh:2529
 msgid "Apply/Reverse Hunk"
 msgstr "应用/撤消此修改块"
 
-#: git-gui.sh:2432
+#: git-gui.sh:2535
 msgid "Decrease Font Size"
 msgstr "缩小字体"
 
-#: git-gui.sh:2436
+#: git-gui.sh:2539
 msgid "Increase Font Size"
 msgstr "放大字体"
 
-#: git-gui.sh:2441
+#: git-gui.sh:2544
 msgid "Show Less Context"
 msgstr "显示更多diff上下文"
 
-#: git-gui.sh:2448
+#: git-gui.sh:2551
 msgid "Show More Context"
 msgstr "显示更少diff上下文"
 
-#: git-gui.sh:2461
+#: git-gui.sh:2565
 #, fuzzy
 msgid "Unstage Hunk From Commit"
 msgstr "从本次提交移除"
 
-#: git-gui.sh:2463
+#: git-gui.sh:2567
 #, fuzzy
 msgid "Stage Hunk For Commit"
 msgstr "从本次提交移除"
 
-#: git-gui.sh:2473
+#: git-gui.sh:2586
 msgid "Initializing..."
 msgstr ""
 
+#: git-gui.sh:2677
+#, tcl-format
+msgid ""
+"Possible environment issues exist.\n"
+"\n"
+"The following environment variables are probably\n"
+"going to be ignored by any Git subprocess run\n"
+"by %s:\n"
+"\n"
+msgstr ""
+
+#: git-gui.sh:2707
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+
+#: git-gui.sh:2712
+#, tcl-format
+msgid ""
+"\n"
+"\n"
+"A good replacement for %s\n"
+"is placing values for the user.name and\n"
+"user.email settings into your personal\n"
+"~/.gitconfig file.\n"
+msgstr ""
+
+#: lib/about.tcl:25
+msgid "git-gui - a graphical user interface for Git."
+msgstr ""
+
 #: lib/blame.tcl:77
 msgid "File Viewer"
 msgstr ""
@@ -432,6 +486,51 @@ msgstr "提交"
 msgid "Reading %s..."
 msgstr ""
 
+#: lib/blame.tcl:473
+msgid "Loading copy/move tracking annotations..."
+msgstr ""
+
+#: lib/blame.tcl:493
+msgid "lines annotated"
+msgstr ""
+
+#: lib/blame.tcl:674
+msgid "Loading original location annotations..."
+msgstr ""
+
+#: lib/blame.tcl:677
+msgid "Annotation complete."
+msgstr ""
+
+#: lib/blame.tcl:731
+msgid "Loading annotation..."
+msgstr ""
+
+#: lib/blame.tcl:787
+msgid "Author:"
+msgstr ""
+
+#: lib/blame.tcl:791
+#, fuzzy
+msgid "Committer:"
+msgstr "提交"
+
+#: lib/blame.tcl:796
+msgid "Original File:"
+msgstr ""
+
+#: lib/blame.tcl:910
+msgid "Originally By:"
+msgstr ""
+
+#: lib/blame.tcl:916
+msgid "In File:"
+msgstr ""
+
+#: lib/blame.tcl:921
+msgid "Copied Or Moved Here By:"
+msgstr ""
+
 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 #, fuzzy
 msgid "Checkout Branch"
@@ -443,18 +542,17 @@ msgid "Checkout"
 msgstr "切换..."
 
 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:269
-#: lib/checkout_op.tcl:519 lib/merge.tcl:176 lib/option.tcl:172
-#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
 msgid "Cancel"
 msgstr ""
 
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:274
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
 msgid "Revision"
 msgstr ""
 
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159
-#: lib/option.tcl:274
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
 #, fuzzy
 msgid "Options"
 msgstr "选项..."
@@ -477,7 +575,7 @@ msgstr "当前分支:"
 msgid "Create New Branch"
 msgstr "当前分支:"
 
-#: lib/branch_create.tcl:31
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
 #, fuzzy
 msgid "Create"
 msgstr "新建..."
@@ -511,7 +609,7 @@ msgstr ""
 msgid "Fast Forward Only"
 msgstr ""
 
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:511
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
 #, fuzzy
 msgid "Reset"
 msgstr "重置所有修动..."
@@ -612,25 +710,31 @@ msgstr ""
 msgid "Failed to rename '%s'."
 msgstr ""
 
-#: lib/browser.tcl:10
+#: lib/browser.tcl:17
 msgid "Starting..."
 msgstr ""
 
-#: lib/browser.tcl:19
+#: lib/browser.tcl:26
 msgid "File Browser"
 msgstr ""
 
-#: lib/browser.tcl:120 lib/browser.tcl:137
+#: lib/browser.tcl:125 lib/browser.tcl:142
 #, tcl-format
 msgid "Loading %s..."
 msgstr ""
 
-#: lib/browser.tcl:254 lib/browser.tcl:260
+#: lib/browser.tcl:186
+msgid "[Up To Parent]"
+msgstr ""
+
+#: lib/browser.tcl:266 lib/browser.tcl:272
 #, fuzzy
 msgid "Browse Branch Files"
 msgstr "浏览当前分支文件"
 
-#: lib/browser.tcl:265
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
+#: lib/choose_repository.tcl:811
 msgid "Browse"
 msgstr ""
 
@@ -639,7 +743,12 @@ msgstr ""
 msgid "Fetching %s from %s"
 msgstr ""
 
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:127
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr ""
+
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
 msgid "Close"
 msgstr ""
 
@@ -648,7 +757,7 @@ msgstr ""
 msgid "Branch '%s' does not exist."
 msgstr ""
 
-#: lib/checkout_op.tcl:205
+#: lib/checkout_op.tcl:206
 #, tcl-format
 msgid ""
 "Branch '%s' already exists.\n"
@@ -657,21 +766,21 @@ msgid ""
 "A merge is required."
 msgstr ""
 
-#: lib/checkout_op.tcl:219
+#: lib/checkout_op.tcl:220
 #, tcl-format
 msgid "Merge strategy '%s' not supported."
 msgstr ""
 
-#: lib/checkout_op.tcl:238
+#: lib/checkout_op.tcl:239
 #, tcl-format
 msgid "Failed to update '%s'."
 msgstr ""
 
-#: lib/checkout_op.tcl:250
-msgid "Index is already locked."
+#: lib/checkout_op.tcl:251
+msgid "Staging area (index) is already locked."
 msgstr ""
 
-#: lib/checkout_op.tcl:265
+#: lib/checkout_op.tcl:266
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -681,21 +790,26 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/checkout_op.tcl:352
+#: lib/checkout_op.tcl:322
 #, tcl-format
-msgid "Aborted checkout of '%s' (file level merging is required)."
+msgid "Updating working directory to '%s'..."
 msgstr ""
 
 #: lib/checkout_op.tcl:353
+#, tcl-format
+msgid "Aborted checkout of '%s' (file level merging is required)."
+msgstr ""
+
+#: lib/checkout_op.tcl:354
 msgid "File level merge required."
 msgstr ""
 
-#: lib/checkout_op.tcl:357
+#: lib/checkout_op.tcl:358
 #, tcl-format
 msgid "Staying on branch '%s'."
 msgstr ""
 
-#: lib/checkout_op.tcl:426
+#: lib/checkout_op.tcl:429
 msgid ""
 "You are no longer on a local branch.\n"
 "\n"
@@ -703,25 +817,30 @@ msgid ""
 "Checkout'."
 msgstr ""
 
-#: lib/checkout_op.tcl:475
+#: lib/checkout_op.tcl:446
+#, fuzzy, tcl-format
+msgid "Checked out '%s'."
+msgstr "切换..."
+
+#: lib/checkout_op.tcl:478
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
 msgstr ""
 
-#: lib/checkout_op.tcl:497
+#: lib/checkout_op.tcl:500
 msgid "Recovering lost commits may not be easy."
 msgstr ""
 
-#: lib/checkout_op.tcl:502
+#: lib/checkout_op.tcl:505
 #, tcl-format
 msgid "Reset '%s'?"
 msgstr ""
 
-#: lib/checkout_op.tcl:507 lib/merge.tcl:171
+#: lib/checkout_op.tcl:510 lib/merge.tcl:164
 msgid "Visualize"
 msgstr ""
 
-#: lib/checkout_op.tcl:575
+#: lib/checkout_op.tcl:578
 #, tcl-format
 msgid ""
 "Failed to set current branch.\n"
@@ -732,41 +851,286 @@ msgid ""
 "This should not have occurred.  %s will now close and give up."
 msgstr ""
 
-#: lib/choose_rev.tcl:35
+#: lib/choose_font.tcl:39
+#, fuzzy
+msgid "Select"
+msgstr "全选"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr ""
+
+#: lib/choose_font.tcl:73
+#, fuzzy
+msgid "Font Size"
+msgstr "缩小字体"
+
+#: lib/choose_font.tcl:90
+msgid "Font Example"
+msgstr ""
+
+#: lib/choose_font.tcl:101
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+
+#: lib/choose_repository.tcl:25
+msgid "Git Gui"
+msgstr ""
+
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
+#, fuzzy
+msgid "Create New Repository"
+msgstr "版本树"
+
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
+#, fuzzy
+msgid "Clone Existing Repository"
+msgstr "版本树"
+
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
+#, fuzzy
+msgid "Open Existing Repository"
+msgstr "版本树"
+
+#: lib/choose_repository.tcl:91
+msgid "Next >"
+msgstr ""
+
+#: lib/choose_repository.tcl:152
+#, tcl-format
+msgid "Location %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
+#: lib/choose_repository.tcl:172
+#, tcl-format
+msgid "Failed to create repository %s:"
+msgstr ""
+
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
+msgid "Directory:"
+msgstr ""
+
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
+#: lib/choose_repository.tcl:834
+#, fuzzy
+msgid "Git Repository"
+msgstr "版本树"
+
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
+#, tcl-format
+msgid "Directory %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:265
+#, tcl-format
+msgid "File %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:286
+msgid "Clone"
+msgstr ""
+
+#: lib/choose_repository.tcl:299
+msgid "URL:"
+msgstr ""
+
+#: lib/choose_repository.tcl:319
+msgid "Clone Type:"
+msgstr ""
+
+#: lib/choose_repository.tcl:325
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr ""
+
+#: lib/choose_repository.tcl:331
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:337
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
+#, tcl-format
+msgid "Not a Git repository: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:405
+msgid "Standard only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:409
+msgid "Shared only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:439
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:451
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:452
+msgid "buckets"
+msgstr ""
+
+#: lib/choose_repository.tcl:476
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:512
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr ""
+
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:740
+msgid "The 'master' branch has not been initialized."
+msgstr ""
+
+#: lib/choose_repository.tcl:527
+msgid "Hardlinks are unavailable.  Falling back to copying."
+msgstr ""
+
+#: lib/choose_repository.tcl:539
+#, tcl-format
+msgid "Cloning from %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:570
+#, fuzzy
+msgid "Copying objects"
+msgstr "压缩数据库"
+
+#: lib/choose_repository.tcl:571
+msgid "KiB"
+msgstr ""
+
+#: lib/choose_repository.tcl:595
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:605
+msgid "Linking objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:606
+msgid "objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:614
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:669
+msgid "Cannot fetch branches and objects.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:680
+msgid "Cannot fetch tags.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:704
+msgid "Cannot determine HEAD.  See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:713
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:719
+msgid "Clone failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:726
+msgid "No default branch obtained."
+msgstr ""
+
+#: lib/choose_repository.tcl:737
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr ""
+
+#: lib/choose_repository.tcl:749
+msgid "Creating working directory"
+msgstr ""
+
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
+#: lib/index.tcl:149
+msgid "files"
+msgstr ""
+
+#: lib/choose_repository.tcl:779
+msgid "Initial file checkout failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:795
+msgid "Open"
+msgstr ""
+
+#: lib/choose_repository.tcl:805
+#, fuzzy
+msgid "Repository:"
+msgstr "版本树"
+
+#: lib/choose_repository.tcl:854
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr ""
+
+#: lib/choose_rev.tcl:53
 msgid "This Detached Checkout"
 msgstr ""
 
-#: lib/choose_rev.tcl:42
+#: lib/choose_rev.tcl:60
 msgid "Revision Expression:"
 msgstr ""
 
-#: lib/choose_rev.tcl:56
+#: lib/choose_rev.tcl:74
 #, fuzzy
 msgid "Local Branch"
 msgstr "分支"
 
-#: lib/choose_rev.tcl:61
+#: lib/choose_rev.tcl:79
 #, fuzzy
 msgid "Tracking Branch"
 msgstr "当前分支:"
 
-#: lib/choose_rev.tcl:66
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
 msgid "Tag"
 msgstr ""
 
-#: lib/choose_rev.tcl:227
+#: lib/choose_rev.tcl:317
 #, tcl-format
 msgid "Invalid revision: %s"
 msgstr ""
 
-#: lib/choose_rev.tcl:248
+#: lib/choose_rev.tcl:338
 msgid "No revision selected."
 msgstr ""
 
-#: lib/choose_rev.tcl:256
+#: lib/choose_rev.tcl:346
 msgid "Revision expression is empty."
 msgstr ""
 
+#: lib/choose_rev.tcl:530
+msgid "Updated"
+msgstr ""
+
+#: lib/choose_rev.tcl:558
+msgid "URL"
+msgstr ""
+
 #: lib/commit.tcl:9
 msgid ""
 "There is nothing to amend.\n"
@@ -811,8 +1175,8 @@ msgstr ""
 msgid ""
 "Unmerged files cannot be committed.\n"
 "\n"
-"File %s has merge conflicts.  You must resolve them and add the file before "
-"committing.\n"
+"File %s has merge conflicts.  You must resolve them and stage the file "
+"before committing.\n"
 msgstr ""
 
 #: lib/commit.tcl:162
@@ -827,7 +1191,7 @@ msgstr ""
 msgid ""
 "No changes to commit.\n"
 "\n"
-"You must add at least 1 file before you can commit.\n"
+"You must stage at least 1 file before you can commit.\n"
 msgstr ""
 
 #: lib/commit.tcl:183
@@ -845,6 +1209,11 @@ msgstr ""
 msgid "write-tree failed:"
 msgstr ""
 
+#: lib/commit.tcl:275
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr ""
+
 #: lib/commit.tcl:279
 msgid ""
 "No changes to commit.\n"
@@ -858,6 +1227,11 @@ msgstr ""
 msgid "No changes to commit."
 msgstr ""
 
+#: lib/commit.tcl:303
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
+
 #: lib/commit.tcl:317
 msgid "commit-tree failed:"
 msgstr ""
@@ -871,15 +1245,15 @@ msgstr ""
 msgid "Created commit %s: %s"
 msgstr ""
 
-#: lib/console.tcl:55
+#: lib/console.tcl:57
 msgid "Working... please wait..."
 msgstr ""
 
-#: lib/console.tcl:184
+#: lib/console.tcl:183
 msgid "Success"
 msgstr ""
 
-#: lib/console.tcl:194
+#: lib/console.tcl:196
 msgid "Error: Command Failed"
 msgstr ""
 
@@ -920,6 +1294,22 @@ msgstr "压缩数据库"
 msgid "Verifying the object database with fsck-objects"
 msgstr ""
 
+#: lib/database.tcl:108
+#, tcl-format
+msgid ""
+"This repository currently has approximately %i loose objects.\n"
+"\n"
+"To maintain optimal performance it is strongly recommended that you compress "
+"the database when more than %i loose objects exist.\n"
+"\n"
+"Compress the database now?"
+msgstr ""
+
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr ""
+
 #: lib/diff.tcl:42
 #, tcl-format
 msgid ""
@@ -934,19 +1324,37 @@ msgid ""
 "the same state."
 msgstr ""
 
-#: lib/diff.tcl:97
+#: lib/diff.tcl:81
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr ""
+
+#: lib/diff.tcl:114 lib/diff.tcl:184
+#, tcl-format
+msgid "Unable to display %s"
+msgstr ""
+
+#: lib/diff.tcl:115
 msgid "Error loading file:"
 msgstr ""
 
-#: lib/diff.tcl:162
+#: lib/diff.tcl:122
+msgid "Git Repository (subproject)"
+msgstr ""
+
+#: lib/diff.tcl:134
+msgid "* Binary file (not showing content)."
+msgstr ""
+
+#: lib/diff.tcl:185
 msgid "Error loading diff:"
 msgstr ""
 
-#: lib/diff.tcl:278
+#: lib/diff.tcl:302
 msgid "Failed to unstage selected hunk."
 msgstr ""
 
-#: lib/diff.tcl:285
+#: lib/diff.tcl:309
 msgid "Failed to stage selected hunk."
 msgstr ""
 
@@ -962,32 +1370,42 @@ msgstr ""
 msgid "You must correct the above errors before committing."
 msgstr ""
 
-#: lib/index.tcl:364
+#: lib/index.tcl:241
+#, fuzzy, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "从本次提交移除"
+
+#: lib/index.tcl:285
+#, tcl-format
+msgid "Adding %s"
+msgstr ""
+
+#: lib/index.tcl:340
 #, fuzzy, tcl-format
 msgid "Revert changes in file %s?"
 msgstr "恢复修改"
 
-#: lib/index.tcl:366
+#: lib/index.tcl:342
 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr ""
 
-#: lib/index.tcl:372
-msgid "Any unadded changes will be permanently lost by the revert."
+#: lib/index.tcl:348
+msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 
-#: lib/index.tcl:375
+#: lib/index.tcl:351
 msgid "Do Nothing"
 msgstr ""
 
-#: lib/merge.tcl:14
+#: lib/merge.tcl:13
 msgid ""
 "Cannot merge while amending.\n"
 "\n"
 "You must finish amending this commit before starting any type of merge.\n"
 msgstr ""
 
-#: lib/merge.tcl:28
+#: lib/merge.tcl:27
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -997,18 +1415,18 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/merge.tcl:45
+#: lib/merge.tcl:44
 #, tcl-format
 msgid ""
 "You are in the middle of a conflicted merge.\n"
 "\n"
 "File %s has merge conflicts.\n"
 "\n"
-"You must resolve them, add the file, and commit to complete the current "
+"You must resolve them, stage the file, and commit to complete the current "
 "merge.  Only then can you begin another merge.\n"
 msgstr ""
 
-#: lib/merge.tcl:55
+#: lib/merge.tcl:54
 #, tcl-format
 msgid ""
 "You are in the middle of a change.\n"
@@ -1019,37 +1437,41 @@ msgid ""
 "will help you abort a failed merge, should the need arise.\n"
 msgstr ""
 
-#: lib/merge.tcl:94
+#: lib/merge.tcl:106
+#, tcl-format
+msgid "%s of %s"
+msgstr ""
+
+#: lib/merge.tcl:119
 #, tcl-format
 msgid "Merging %s and %s"
 msgstr ""
 
-#: lib/merge.tcl:106
+#: lib/merge.tcl:131
 msgid "Merge completed successfully."
 msgstr ""
 
-#: lib/merge.tcl:108
+#: lib/merge.tcl:133
 msgid "Merge failed.  Conflict resolution is required."
 msgstr ""
 
-#: lib/merge.tcl:166
+#: lib/merge.tcl:158
 #, tcl-format
 msgid "Merge Into %s"
 msgstr ""
 
-#: lib/merge.tcl:181 lib/transport.tcl:98
-#, fuzzy
-msgid "Source Branches"
-msgstr "当前分支:"
+#: lib/merge.tcl:177
+msgid "Revision To Merge"
+msgstr ""
 
-#: lib/merge.tcl:240
+#: lib/merge.tcl:212
 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 "You must finish amending this commit.\n"
 msgstr ""
 
-#: lib/merge.tcl:250
+#: lib/merge.tcl:222
 msgid ""
 "Abort merge?\n"
 "\n"
@@ -1058,90 +1480,120 @@ msgid ""
 "Continue with aborting the current merge?"
 msgstr ""
 
-#: lib/merge.tcl:256
+#: lib/merge.tcl:228
 msgid ""
-"Abort commit?\n"
+"Reset changes?\n"
 "\n"
-"Aborting the current commit will cause *ALL* uncommitted changes to be "
-"lost.\n"
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
 "\n"
-"Continue with aborting the current commit?"
+"Continue with resetting the current changes?"
 msgstr ""
 
-#: lib/merge.tcl:267
-msgid "Aborting... please wait..."
+#: lib/merge.tcl:239
+msgid "Aborting"
 msgstr ""
 
-#: lib/merge.tcl:290
-msgid "Abort completed.  Ready."
+#: lib/merge.tcl:266
+msgid "Abort failed."
 msgstr ""
 
-#: lib/option.tcl:77
-msgid "git-gui - a graphical user interface for Git."
+#: lib/merge.tcl:268
+msgid "Abort completed.  Ready."
 msgstr ""
 
-#: lib/option.tcl:164
+#: lib/option.tcl:82
 msgid "Restore Defaults"
 msgstr ""
 
-#: lib/option.tcl:168
+#: lib/option.tcl:86
 msgid "Save"
 msgstr ""
 
-#: lib/option.tcl:178
+#: lib/option.tcl:96
 #, fuzzy, tcl-format
 msgid "%s Repository"
 msgstr "版本树"
 
-#: lib/option.tcl:179
+#: lib/option.tcl:97
 msgid "Global (All Repositories)"
 msgstr ""
 
-#: lib/option.tcl:185
+#: lib/option.tcl:103
 msgid "User Name"
 msgstr ""
 
-#: lib/option.tcl:186
+#: lib/option.tcl:104
 msgid "Email Address"
 msgstr ""
 
-#: lib/option.tcl:188
+#: lib/option.tcl:106
 #, fuzzy
 msgid "Summarize Merge Commits"
 msgstr "修订合并提交描述:"
 
-#: lib/option.tcl:189
+#: lib/option.tcl:107
 msgid "Merge Verbosity"
 msgstr ""
 
-#: lib/option.tcl:190
+#: lib/option.tcl:108
 msgid "Show Diffstat After Merge"
 msgstr ""
 
-#: lib/option.tcl:192
+#: lib/option.tcl:110
 msgid "Trust File Modification Timestamps"
 msgstr ""
 
-#: lib/option.tcl:193
+#: lib/option.tcl:111
 msgid "Prune Tracking Branches During Fetch"
 msgstr ""
 
-#: lib/option.tcl:194
+#: lib/option.tcl:112
 msgid "Match Tracking Branches"
 msgstr ""
 
-#: lib/option.tcl:195
+#: lib/option.tcl:113
 msgid "Number of Diff Context Lines"
 msgstr ""
 
-#: lib/option.tcl:196
+#: lib/option.tcl:114
 msgid "New Branch Name Template"
 msgstr ""
 
-#: lib/option.tcl:305
+#: lib/option.tcl:176
+msgid "Change Font"
+msgstr ""
+
+#: lib/option.tcl:180
+#, tcl-format
+msgid "Choose %s"
+msgstr ""
+
+#: lib/option.tcl:186
+msgid "pt."
+msgstr ""
+
+#: lib/option.tcl:200
+msgid "Preferences"
+msgstr ""
+
+#: lib/option.tcl:235
 msgid "Failed to completely save options:"
 msgstr ""
 
+#: lib/remote.tcl:165
+msgid "Prune from"
+msgstr ""
+
+#: lib/remote.tcl:170
+#, fuzzy
+msgid "Fetch from"
+msgstr "导入"
+
+#: lib/remote.tcl:213
+#, fuzzy
+msgid "Push to"
+msgstr "上传"
+
 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 msgid "Delete Remote Branch"
 msgstr ""
@@ -1151,11 +1603,11 @@ msgstr ""
 msgid "From Repository"
 msgstr "版本树"
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 msgid "Remote:"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
 msgid "Arbitrary URL:"
 msgstr ""
 
@@ -1181,6 +1633,14 @@ msgstr ""
 msgid "A branch is required for 'Merged Into'."
 msgstr ""
 
+#: lib/remote_branch_delete.tcl:184
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr ""
+
 #: lib/remote_branch_delete.tcl:189
 #, tcl-format
 msgid ""
@@ -1213,21 +1673,6 @@ msgstr ""
 msgid "Scanning %s..."
 msgstr ""
 
-#: lib/remote.tcl:156
-#, tcl-format
-msgid "Fetch from %s..."
-msgstr ""
-
-#: lib/remote.tcl:166
-#, tcl-format
-msgid "Prune from %s..."
-msgstr ""
-
-#: lib/remote.tcl:200
-#, fuzzy, tcl-format
-msgid "Push to %s..."
-msgstr "上传..."
-
 #: lib/shortcut.tcl:26 lib/shortcut.tcl:74
 msgid "Cannot write script:"
 msgstr ""
@@ -1236,49 +1681,89 @@ msgstr ""
 msgid "Cannot write icon:"
 msgstr ""
 
-#: lib/status_bar.tcl:58
+#: lib/status_bar.tcl:83
 #, tcl-format
-msgid "%s ... %i of %i %s (%2i%%)"
+msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr ""
 
+#: lib/transport.tcl:6
+#, fuzzy, tcl-format
+msgid "fetch %s"
+msgstr "导入"
+
 #: lib/transport.tcl:7
 #, tcl-format
 msgid "Fetching new changes from %s"
 msgstr ""
 
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr ""
+
 #: lib/transport.tcl:19
 #, tcl-format
 msgid "Pruning tracking branches deleted from %s"
 msgstr ""
 
+#: lib/transport.tcl:25 lib/transport.tcl:71
+#, tcl-format
+msgid "push %s"
+msgstr ""
+
 #: lib/transport.tcl:26
 #, tcl-format
 msgid "Pushing changes to %s"
 msgstr ""
 
-#: lib/transport.tcl:68
+#: lib/transport.tcl:72
 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr ""
 
-#: lib/transport.tcl:84
+#: lib/transport.tcl:89
 #, fuzzy
 msgid "Push Branches"
 msgstr "分支"
 
-#: lib/transport.tcl:115
+#: lib/transport.tcl:103
+#, fuzzy
+msgid "Source Branches"
+msgstr "当前分支:"
+
+#: lib/transport.tcl:120
 #, fuzzy
 msgid "Destination Repository"
 msgstr "版本树"
 
-#: lib/transport.tcl:153
+#: lib/transport.tcl:158
 msgid "Transfer Options"
 msgstr ""
 
-#: lib/transport.tcl:155
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+
+#: lib/transport.tcl:164
 msgid "Use thin pack (for slow network connections)"
 msgstr ""
 
-#: lib/transport.tcl:159
+#: lib/transport.tcl:168
 msgid "Include tags"
 msgstr ""
+
+#~ msgid "Add To Commit"
+#~ msgstr "添加到本次提交"
+
+#~ msgid "Add Existing To Commit"
+#~ msgstr "添加默认修改文件"
+
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
+#~ msgstr "不被提交的修改"
+
+#~ msgid "Add Existing"
+#~ msgstr "添加默认修改文件"
+
+#, fuzzy
+#~ msgid "Push to %s..."
+#~ msgstr "上传..."