diff --git a/git-gui/po/zh_cn.po b/git-gui/po/zh_cn.po
index 621c9479b2b90c13119985df889af70b206e3cbd..f8697216f71a56fcda47056fe5b5c287839ef7f0 100644 (file)
--- a/git-gui/po/zh_cn.po
+++ b/git-gui/po/zh_cn.po
# This file is distributed under the same license as the git-gui package.
# Xudong Guan <xudong.guan@gmail.com>, 2007.
#
# This file is distributed under the same license as the git-gui package.
# Xudong Guan <xudong.guan@gmail.com>, 2007.
#
+# Please use the following translation throughout the file for consistence:
+#
+# repository 版本库
+# commit 提交
+# revision 版本
+# branch 分支
+# tag 标签
+# annotation 标注
+# merge 合并
+# fast forward 快速合并(??)
+# stage 缓存 (译自 index/cache)
+# amend 修正
+# reset 复位
+#
+# 2008-01-06 Eric Miao <eric.y.miao@gmail.com>
+# FIXME: checkout 的标准翻译
+#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-10 04:04-0400\n"
+"POT-Creation-Date: 2007-11-24 10:36+0100\n"
"PO-Revision-Date: 2007-07-21 01:23-0700\n"
"PO-Revision-Date: 2007-07-21 01:23-0700\n"
-"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n"
+"Last-Translator: Eric Miao <eric.y.miao@gmail.com>\n"
"Language-Team: Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language-Team: Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
-#: git-gui.sh:763
+#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
+#: git-gui.sh:733
msgid "git-gui: fatal error"
msgid "git-gui: fatal error"
-msgstr ""
+msgstr "git-gui: 致命错误"
-#: git-gui.sh:595
+#: git-gui.sh:565
#, tcl-format
msgid "Invalid font specified in %s:"
#, tcl-format
msgid "Invalid font specified in %s:"
-msgstr ""
+msgstr "%s 中指定的字体无效:"
-#: git-gui.sh:620
+#: git-gui.sh:590
msgid "Main Font"
msgid "Main Font"
-msgstr ""
+msgstr "主要字体"
-#: git-gui.sh:621
+#: git-gui.sh:591
msgid "Diff/Console Font"
msgid "Diff/Console Font"
-msgstr ""
+msgstr "Diff/控制终端字体"
-#: git-gui.sh:635
+#: git-gui.sh:605
msgid "Cannot find git in PATH."
msgid "Cannot find git in PATH."
-msgstr ""
+msgstr "PATH 中没有找到 git"
-#: git-gui.sh:662
+#: git-gui.sh:632
msgid "Cannot parse Git version string:"
msgid "Cannot parse Git version string:"
-msgstr ""
+msgstr "无法解析 Git 的版本信息:"
-#: git-gui.sh:680
+#: git-gui.sh:650
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
"\n"
"Assume '%s' is version 1.5.0?\n"
msgstr ""
"\n"
"Assume '%s' is version 1.5.0?\n"
msgstr ""
+"无法确定 Git 的版本.\n"
+"\n"
+"%s 声明其版本为 '%s'.\n"
+"\n"
+"而 %s 需要 1.5.0 或这以后的 Git 版本.\n"
+"\n"
+"是否假定 '%s' 为版本 1.5.0?\n"
-#: git-gui.sh:853
+#: git-gui.sh:888
msgid "Git directory not found:"
msgid "Git directory not found:"
-msgstr ""
+msgstr "Git 目录无法找到:"
-#: git-gui.sh:860
+#: git-gui.sh:895
msgid "Cannot move to top of working directory:"
msgid "Cannot move to top of working directory:"
-msgstr ""
+msgstr "无法移动到工作根目录:"
-#: git-gui.sh:867
+#: git-gui.sh:902
msgid "Cannot use funny .git directory:"
msgid "Cannot use funny .git directory:"
-msgstr ""
+msgstr "无法使用 .git 目录:"
-#: git-gui.sh:872
+#: git-gui.sh:907
msgid "No working directory"
msgid "No working directory"
-msgstr ""
+msgstr "没有工作目录"
-#: git-gui.sh:1019
+#: git-gui.sh:1054
msgid "Refreshing file status..."
msgid "Refreshing file status..."
-msgstr ""
+msgstr "更新文件状态..."
-#: git-gui.sh:1084
+#: git-gui.sh:1119
msgid "Scanning for modified files ..."
msgid "Scanning for modified files ..."
-msgstr ""
+msgstr "扫描修改过的文件 ..."
-#: git-gui.sh:1259 lib/browser.tcl:245
-#, fuzzy
+#: git-gui.sh:1294 lib/browser.tcl:245
msgid "Ready."
msgid "Ready."
-msgstr "重做"
+msgstr "就绪"
-#: git-gui.sh:1525
+#: git-gui.sh:1560
msgid "Unmodified"
msgid "Unmodified"
-msgstr ""
+msgstr "未修改"
-#: git-gui.sh:1527
+#: git-gui.sh:1562
msgid "Modified, not staged"
msgid "Modified, not staged"
-msgstr ""
+msgstr "修改但未缓存"
-#: git-gui.sh:1528 git-gui.sh:1533
-#, fuzzy
+#: git-gui.sh:1563 git-gui.sh:1568
msgid "Staged for commit"
msgid "Staged for commit"
-msgstr "ä»\8eæ\9c¬æ¬¡æ\8f\90交移é\99¤"
+msgstr "ç¼\93å\98为æ\8f\90交"
-#: git-gui.sh:1529 git-gui.sh:1534
-#, fuzzy
+#: git-gui.sh:1564 git-gui.sh:1569
msgid "Portions staged for commit"
msgid "Portions staged for commit"
-msgstr "ä»\8eæ\9c¬æ¬¡æ\8f\90交移é\99¤"
+msgstr "é\83¨å\88\86ç¼\93å\98为æ\8f\90交"
-#: git-gui.sh:1530 git-gui.sh:1535
+#: git-gui.sh:1565 git-gui.sh:1570
msgid "Staged for commit, missing"
msgid "Staged for commit, missing"
-msgstr ""
+msgstr "缓存为提交, 不存在"
-#: git-gui.sh:1532
+#: git-gui.sh:1567
msgid "Untracked, not staged"
msgid "Untracked, not staged"
-msgstr ""
+msgstr "未跟踪, 未缓存"
-#: git-gui.sh:1537
+#: git-gui.sh:1572
msgid "Missing"
msgid "Missing"
-msgstr ""
+msgstr "不存在"
-#: git-gui.sh:1538
+#: git-gui.sh:1573
msgid "Staged for removal"
msgid "Staged for removal"
-msgstr ""
+msgstr "缓存为删除"
-#: git-gui.sh:1539
+#: git-gui.sh:1574
msgid "Staged for removal, still present"
msgid "Staged for removal, still present"
-msgstr ""
+msgstr "缓存为删除, 但仍存在"
-#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
+#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
msgid "Requires merge resolution"
msgid "Requires merge resolution"
-msgstr ""
+msgstr "需要解决合并冲突"
-#: git-gui.sh:1579
+#: git-gui.sh:1614
msgid "Starting gitk... please wait..."
msgid "Starting gitk... please wait..."
-msgstr ""
+msgstr "启动 gitk... 请等待..."
-#: git-gui.sh:1588
+#: git-gui.sh:1623
#, tcl-format
msgid ""
"Unable to start gitk:\n"
"\n"
"%s does not exist"
msgstr ""
#, tcl-format
msgid ""
"Unable to start gitk:\n"
"\n"
"%s does not exist"
msgstr ""
+"无法启动 gitk:\n"
+"\n"
+"%s 不存在"
-#: git-gui.sh:1788 lib/choose_repository.tcl:32
+#: git-gui.sh:1823 lib/choose_repository.tcl:35
msgid "Repository"
msgid "Repository"
-msgstr "版本树"
+msgstr "版本库(repository)"
-#: git-gui.sh:1789
+#: git-gui.sh:1824
msgid "Edit"
msgstr "编辑"
msgid "Edit"
msgstr "编辑"
-#: git-gui.sh:1791 lib/choose_rev.tcl:560
+#: git-gui.sh:1826 lib/choose_rev.tcl:560
msgid "Branch"
msgid "Branch"
-msgstr "分支"
+msgstr "分支(branch)"
-#: git-gui.sh:1794 lib/choose_rev.tcl:547
-#, fuzzy
+#: git-gui.sh:1829 lib/choose_rev.tcl:547
msgid "Commit@@noun"
msgid "Commit@@noun"
-msgstr "提交"
+msgstr "提交(commit)"
-#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
msgid "Merge"
msgid "Merge"
-msgstr "合并"
+msgstr "合并(merge)"
-#: git-gui.sh:1798 lib/choose_rev.tcl:556
-#, fuzzy
+#: git-gui.sh:1833 lib/choose_rev.tcl:556
msgid "Remote"
msgid "Remote"
-msgstr "改名..."
+msgstr "远端(remote)"
-#: git-gui.sh:1807
+#: git-gui.sh:1842
msgid "Browse Current Branch's Files"
msgid "Browse Current Branch's Files"
-msgstr "浏览当前分支文件"
+msgstr "浏览当前分支上的文件"
-#: git-gui.sh:1811
-#, fuzzy
+#: git-gui.sh:1846
msgid "Browse Branch Files..."
msgid "Browse Branch Files..."
-msgstr "æµ\8fè§\88å½\93å\89\8då\88\86æ\94¯æ\96\87件"
+msgstr "æµ\8fè§\88å\88\86æ\94¯ä¸\8aç\9a\84æ\96\87件..."
-#: git-gui.sh:1816
+#: git-gui.sh:1851
msgid "Visualize Current Branch's History"
msgid "Visualize Current Branch's History"
-msgstr "调用gitk显示当前分支"
+msgstr "图示当前分支的历史"
-#: git-gui.sh:1820
+#: git-gui.sh:1855
msgid "Visualize All Branch History"
msgid "Visualize All Branch History"
-msgstr "调用gitk显示所有分支"
+msgstr "图示所有分支的历史"
-#: git-gui.sh:1827
-#, fuzzy, tcl-format
+#: git-gui.sh:1862
+#, tcl-format
msgid "Browse %s's Files"
msgid "Browse %s's Files"
-msgstr "浏览当前分支文件"
+msgstr "浏览 %s 上的文件"
-#: git-gui.sh:1829
-#, fuzzy, tcl-format
+#: git-gui.sh:1864
+#, tcl-format
msgid "Visualize %s's History"
msgid "Visualize %s's History"
-msgstr "调用gitk显示所有分支"
+msgstr "图示 %s 分支的历史"
-#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
msgid "Database Statistics"
msgid "Database Statistics"
-msgstr "数据库统计数据"
+msgstr "数据库统计信息"
-#: git-gui.sh:1837 lib/database.tcl:34
+#: git-gui.sh:1872 lib/database.tcl:34
msgid "Compress Database"
msgstr "压缩数据库"
msgid "Compress Database"
msgstr "压缩数据库"
-#: git-gui.sh:1840
+#: git-gui.sh:1875
msgid "Verify Database"
msgstr "验证数据库"
msgid "Verify Database"
msgstr "验证数据库"
-#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
-#: lib/shortcut.tcl:45 lib/shortcut.tcl:84
+#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
+#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
msgid "Create Desktop Icon"
msgstr "创建桌面图标"
msgid "Create Desktop Icon"
msgstr "创建桌面图标"
-#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
+#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
msgid "Quit"
msgstr "退出"
msgid "Quit"
msgstr "退出"
-#: git-gui.sh:1867
+#: git-gui.sh:1902
msgid "Undo"
msgstr "撤销"
msgid "Undo"
msgstr "撤销"
-#: git-gui.sh:1870
+#: git-gui.sh:1905
msgid "Redo"
msgstr "重做"
msgid "Redo"
msgstr "重做"
-#: git-gui.sh:1874 git-gui.sh:2366
+#: git-gui.sh:1909 git-gui.sh:2403
msgid "Cut"
msgstr "剪切"
msgid "Cut"
msgstr "剪切"
-#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
+#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
#: lib/console.tcl:67
msgid "Copy"
msgstr "复制"
#: lib/console.tcl:67
msgid "Copy"
msgstr "复制"
-#: git-gui.sh:1880 git-gui.sh:2372
+#: git-gui.sh:1915 git-gui.sh:2409
msgid "Paste"
msgstr "粘贴"
msgid "Paste"
msgstr "粘贴"
-#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
+#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
#: lib/remote_branch_delete.tcl:38
msgid "Delete"
msgstr "删除"
#: lib/remote_branch_delete.tcl:38
msgid "Delete"
msgstr "删除"
-#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
+#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
msgid "Select All"
msgstr "全选"
msgid "Select All"
msgstr "全选"
-#: git-gui.sh:1896
+#: git-gui.sh:1931
msgid "Create..."
msgstr "新建..."
msgid "Create..."
msgstr "新建..."
-#: git-gui.sh:1902
+#: git-gui.sh:1937
msgid "Checkout..."
msgid "Checkout..."
-msgstr "切换..."
+msgstr "Checkout..."
-#: git-gui.sh:1908
+#: git-gui.sh:1943
msgid "Rename..."
msgid "Rename..."
-msgstr "æ\94¹名..."
+msgstr "æ\9b´名..."
-#: git-gui.sh:1913 git-gui.sh:2012
+#: git-gui.sh:1948 git-gui.sh:2048
msgid "Delete..."
msgstr "删除..."
msgid "Delete..."
msgstr "删除..."
-#: git-gui.sh:1918
+#: git-gui.sh:1953
msgid "Reset..."
msgid "Reset..."
-msgstr "重置所有修动..."
+msgstr "复位(Reset)..."
-#: git-gui.sh:1930 git-gui.sh:2313
+#: git-gui.sh:1965 git-gui.sh:2350
msgid "New Commit"
msgid "New Commit"
-msgstr "新提交"
+msgstr "新建提交"
-#: git-gui.sh:1938 git-gui.sh:2320
+#: git-gui.sh:1973 git-gui.sh:2357
msgid "Amend Last Commit"
msgid "Amend Last Commit"
-msgstr "修订上次提交"
+msgstr "修正上次提交"
-#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
msgid "Rescan"
msgstr "重新扫描"
msgid "Rescan"
msgstr "重新扫描"
-#: git-gui.sh:1953
-#, fuzzy
+#: git-gui.sh:1988
msgid "Stage To Commit"
msgid "Stage To Commit"
-msgstr "ä»\8eæ\9c¬æ¬¡æ\8f\90交移é\99¤"
+msgstr "ç¼\93å\98为æ\8f\90交"
-#: git-gui.sh:1958
-#, fuzzy
+#: git-gui.sh:1994
msgid "Stage Changed Files To Commit"
msgid "Stage Changed Files To Commit"
-msgstr "将被提交的修改"
+msgstr "缓存修改的文件为提交"
-#: git-gui.sh:1964
+#: git-gui.sh:2000
msgid "Unstage From Commit"
msgid "Unstage From Commit"
-msgstr "从本次提交移除"
+msgstr "从本次提交撤除"
-#: git-gui.sh:1969 lib/index.tcl:352
+#: git-gui.sh:2005 lib/index.tcl:393
msgid "Revert Changes"
msgid "Revert Changes"
-msgstr "æ\81¢å¤\8d修改"
+msgstr "æ\92¤é\94\80修改"
-#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
+#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
msgid "Sign Off"
msgid "Sign Off"
-msgstr "签名"
+msgstr "签名(Sign Off)"
-#: git-gui.sh:1980 git-gui.sh:2296
-#, fuzzy
+#: git-gui.sh:2016 git-gui.sh:2333
msgid "Commit@@verb"
msgstr "提交"
msgid "Commit@@verb"
msgstr "提交"
-#: git-gui.sh:1991
+#: git-gui.sh:2027
msgid "Local Merge..."
msgstr "本地合并..."
msgid "Local Merge..."
msgstr "本地合并..."
-#: git-gui.sh:1996
+#: git-gui.sh:2032
msgid "Abort Merge..."
msgid "Abort Merge..."
-msgstr "取消合并..."
+msgstr "中止合并..."
-#: git-gui.sh:2008
+#: git-gui.sh:2044
msgid "Push..."
msgstr "上传..."
msgid "Push..."
msgstr "上传..."
-#: git-gui.sh:2019 lib/choose_repository.tcl:41
+#: git-gui.sh:2055 lib/choose_repository.tcl:40
msgid "Apple"
msgstr "苹果"
msgid "Apple"
msgstr "苹果"
-#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
+#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
+#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
#, tcl-format
msgid "About %s"
#, tcl-format
msgid "About %s"
-msgstr "关于%s"
+msgstr "关于 %s"
-#: git-gui.sh:2026
+#: git-gui.sh:2062
msgid "Preferences..."
msgid "Preferences..."
-msgstr ""
+msgstr "首选项..."
-#: git-gui.sh:2034 git-gui.sh:2558
+#: git-gui.sh:2070 git-gui.sh:2595
msgid "Options..."
msgstr "选项..."
msgid "Options..."
msgstr "选项..."
-#: git-gui.sh:2040 lib/choose_repository.tcl:47
+#: git-gui.sh:2076 lib/choose_repository.tcl:46
msgid "Help"
msgstr "帮助"
msgid "Help"
msgstr "帮助"
-#: git-gui.sh:2081
+#: git-gui.sh:2117
msgid "Online Documentation"
msgstr "在线文档"
msgid "Online Documentation"
msgstr "在线文档"
-#: git-gui.sh:2165
+#: git-gui.sh:2201
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
-msgstr ""
+msgstr "致命错误: 无法获取路径 %s 的信息: 该文件或目录不存在"
-#: git-gui.sh:2198
+#: git-gui.sh:2234
msgid "Current Branch:"
msgstr "当前分支:"
msgid "Current Branch:"
msgstr "当前分支:"
-#: git-gui.sh:2219
-#, fuzzy
+#: git-gui.sh:2255
msgid "Staged Changes (Will Commit)"
msgid "Staged Changes (Will Commit)"
-msgstr "å°\86被æ\8f\90交ç\9a\84ä¿®æ\94¹"
+msgstr "å·²ç¼\93å\98ç\9a\84æ\94¹å\8a¨ (å°\86被æ\8f\90交)"
-#: git-gui.sh:2239
+#: git-gui.sh:2274
msgid "Unstaged Changes"
msgid "Unstaged Changes"
-msgstr ""
+msgstr "未缓存的改动"
-#: git-gui.sh:2286
+#: git-gui.sh:2323
msgid "Stage Changed"
msgid "Stage Changed"
-msgstr ""
+msgstr "缓存改动"
-#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
+#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
msgid "Push"
msgstr "上传"
msgid "Push"
msgstr "上传"
-#: git-gui.sh:2332
+#: git-gui.sh:2369
msgid "Initial Commit Message:"
msgid "Initial Commit Message:"
-msgstr "初始提交描述:"
+msgstr "初始的提交描述:"
-#: git-gui.sh:2333
+#: git-gui.sh:2370
msgid "Amended Commit Message:"
msgid "Amended Commit Message:"
-msgstr "修订提交描述:"
+msgstr "修正的提交描述:"
-#: git-gui.sh:2334
+#: git-gui.sh:2371
msgid "Amended Initial Commit Message:"
msgid "Amended Initial Commit Message:"
-msgstr "修订初始提交描述:"
+msgstr "修正的初始提交描述:"
-#: git-gui.sh:2335
+#: git-gui.sh:2372
msgid "Amended Merge Commit Message:"
msgid "Amended Merge Commit Message:"
-msgstr "修订合并提交描述:"
+msgstr "修正的合并提交描述:"
-#: git-gui.sh:2336
+#: git-gui.sh:2373
msgid "Merge Commit Message:"
msgstr "合并提交描述:"
msgid "Merge Commit Message:"
msgstr "合并提交描述:"
-#: git-gui.sh:2337
+#: git-gui.sh:2374
msgid "Commit Message:"
msgstr "提交描述:"
msgid "Commit Message:"
msgstr "提交描述:"
-#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
+#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
msgid "Copy All"
msgstr "全部复制"
msgid "Copy All"
msgstr "全部复制"
-#: git-gui.sh:2406 lib/blame.tcl:104
+#: git-gui.sh:2443 lib/blame.tcl:104
msgid "File:"
msgid "File:"
-msgstr ""
+msgstr "文件:"
-#: git-gui.sh:2508
+#: git-gui.sh:2545
msgid "Refresh"
msgstr "刷新"
msgid "Refresh"
msgstr "刷新"
-#: git-gui.sh:2529
+#: git-gui.sh:2566
msgid "Apply/Reverse Hunk"
msgstr "应用/撤消此修改块"
msgid "Apply/Reverse Hunk"
msgstr "应用/撤消此修改块"
-#: git-gui.sh:2535
+#: git-gui.sh:2572
msgid "Decrease Font Size"
msgstr "缩小字体"
msgid "Decrease Font Size"
msgstr "缩小字体"
-#: git-gui.sh:2539
+#: git-gui.sh:2576
msgid "Increase Font Size"
msgstr "放大字体"
msgid "Increase Font Size"
msgstr "放大字体"
-#: git-gui.sh:2544
+#: git-gui.sh:2581
msgid "Show Less Context"
msgid "Show Less Context"
-msgstr "æ\98¾ç¤ºæ\9b´å¤\9adiff上下文"
+msgstr "æ\98¾ç¤ºæ\9b´å°\91上下文"
-#: git-gui.sh:2551
+#: git-gui.sh:2588
msgid "Show More Context"
msgid "Show More Context"
-msgstr "æ\98¾ç¤ºæ\9b´å°\91diff上下文"
+msgstr "æ\98¾ç¤ºæ\9b´å¤\9a上下文"
-#: git-gui.sh:2565
-#, fuzzy
+#: git-gui.sh:2602
msgid "Unstage Hunk From Commit"
msgid "Unstage Hunk From Commit"
-msgstr "ä»\8eæ\9c¬æ¬¡æ\8f\90交移é\99¤"
+msgstr "ä»\8eæ\8f\90交ä¸æ\92¤é\99¤ä¿®æ\94¹å\9d\97"
-#: git-gui.sh:2567
-#, fuzzy
+#: git-gui.sh:2604
msgid "Stage Hunk For Commit"
msgid "Stage Hunk For Commit"
-msgstr "ä»\8eæ\9c¬æ¬¡æ\8f\90交移é\99¤"
+msgstr "ç¼\93å\98ä¿®æ\94¹å\9d\97为æ\8f\90交"
-#: git-gui.sh:2586
+#: git-gui.sh:2623
msgid "Initializing..."
msgid "Initializing..."
-msgstr ""
+msgstr "初始化..."
-#: git-gui.sh:2677
+#: git-gui.sh:2718
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
"by %s:\n"
"\n"
msgstr ""
"by %s:\n"
"\n"
msgstr ""
+"可能存在环境变量的问题.\n"
+"\n"
+"由 %s 执行的 Git 子进程可能忽略下列环境变量:\n"
+"\n"
-#: git-gui.sh:2707
+#: git-gui.sh:2748
msgid ""
"\n"
"This is due to a known issue with the\n"
"Tcl binary distributed by Cygwin."
msgstr ""
msgid ""
"\n"
"This is due to a known issue with the\n"
"Tcl binary distributed by Cygwin."
msgstr ""
+"\n"
+"这是由 Cygwin 发布的 Tcl 代码中一个\n"
+"已知问题所引起."
-#: git-gui.sh:2712
+#: git-gui.sh:2753
#, tcl-format
msgid ""
"\n"
#, tcl-format
msgid ""
"\n"
"user.email settings into your personal\n"
"~/.gitconfig file.\n"
msgstr ""
"user.email settings into your personal\n"
"~/.gitconfig file.\n"
msgstr ""
+"\n"
+"\n"
+"%s 的一个很好的替代方案是将 user.name 以及\n"
+"user.email 设置放在你的个人 ~/.gitconfig 文件中.\n"
#: lib/about.tcl:25
msgid "git-gui - a graphical user interface for Git."
#: lib/about.tcl:25
msgid "git-gui - a graphical user interface for Git."
-msgstr ""
+msgstr "git-gui - Git 的图形化用户界面"
#: lib/blame.tcl:77
msgid "File Viewer"
#: lib/blame.tcl:77
msgid "File Viewer"
-msgstr ""
+msgstr "文件查看器"
#: lib/blame.tcl:81
#: lib/blame.tcl:81
-#, fuzzy
msgid "Commit:"
msgid "Commit:"
-msgstr "提交"
+msgstr "提交:"
#: lib/blame.tcl:249
#: lib/blame.tcl:249
-#, fuzzy
msgid "Copy Commit"
msgid "Copy Commit"
-msgstr "提交"
+msgstr "复制提交"
#: lib/blame.tcl:369
#, tcl-format
msgid "Reading %s..."
#: lib/blame.tcl:369
#, tcl-format
msgid "Reading %s..."
-msgstr ""
+msgstr "读取 %s..."
#: lib/blame.tcl:473
msgid "Loading copy/move tracking annotations..."
#: lib/blame.tcl:473
msgid "Loading copy/move tracking annotations..."
-msgstr ""
+msgstr "装载复制/移动跟踪标注..."
#: lib/blame.tcl:493
msgid "lines annotated"
#: lib/blame.tcl:493
msgid "lines annotated"
-msgstr ""
+msgstr "标注行"
#: lib/blame.tcl:674
msgid "Loading original location annotations..."
#: lib/blame.tcl:674
msgid "Loading original location annotations..."
-msgstr ""
+msgstr "装载原始位置标注..."
#: lib/blame.tcl:677
msgid "Annotation complete."
#: lib/blame.tcl:677
msgid "Annotation complete."
-msgstr ""
+msgstr "标注完成."
#: lib/blame.tcl:731
msgid "Loading annotation..."
#: lib/blame.tcl:731
msgid "Loading annotation..."
-msgstr ""
+msgstr "裝載标注..."
#: lib/blame.tcl:787
msgid "Author:"
#: lib/blame.tcl:787
msgid "Author:"
-msgstr ""
+msgstr "作者:"
#: lib/blame.tcl:791
#: lib/blame.tcl:791
-#, fuzzy
msgid "Committer:"
msgid "Committer:"
-msgstr "提交"
+msgstr "提交者:"
#: lib/blame.tcl:796
msgid "Original File:"
#: lib/blame.tcl:796
msgid "Original File:"
-msgstr ""
+msgstr "原始文件:"
#: lib/blame.tcl:910
msgid "Originally By:"
#: lib/blame.tcl:910
msgid "Originally By:"
-msgstr ""
+msgstr "最初由:"
#: lib/blame.tcl:916
msgid "In File:"
#: lib/blame.tcl:916
msgid "In File:"
-msgstr ""
+msgstr "在文件:"
#: lib/blame.tcl:921
msgid "Copied Or Moved Here By:"
#: lib/blame.tcl:921
msgid "Copied Or Moved Here By:"
-msgstr ""
+msgstr "由复制或移动至此:"
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
-#, fuzzy
msgid "Checkout Branch"
msgid "Checkout Branch"
-msgstr "当前分支:"
+msgstr "Checkout 分支"
#: lib/branch_checkout.tcl:23
#: lib/branch_checkout.tcl:23
-#, fuzzy
msgid "Checkout"
msgid "Checkout"
-msgstr "切换..."
+msgstr "Checkout"
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
#: 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"
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
#: 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 ""
+msgstr "取消"
#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
msgid "Revision"
#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
msgid "Revision"
-msgstr ""
+msgstr "版本"
#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
-#, fuzzy
msgid "Options"
msgstr "选项..."
#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
msgid "Fetch Tracking Branch"
msgid "Options"
msgstr "选项..."
#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
msgid "Fetch Tracking Branch"
-msgstr ""
+msgstr "获取跟踪分支"
#: lib/branch_checkout.tcl:44
msgid "Detach From Local Branch"
#: lib/branch_checkout.tcl:44
msgid "Detach From Local Branch"
-msgstr ""
+msgstr "从本地分支脱离"
#: lib/branch_create.tcl:22
#: lib/branch_create.tcl:22
-#, fuzzy
msgid "Create Branch"
msgid "Create Branch"
-msgstr "å½\93å\89\8då\88\86æ\94¯:"
+msgstr "å\88\9b建å\88\86æ\94¯"
#: lib/branch_create.tcl:27
#: lib/branch_create.tcl:27
-#, fuzzy
msgid "Create New Branch"
msgid "Create New Branch"
-msgstr "当前分支:"
+msgstr "新建分支"
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
-#, fuzzy
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
msgid "Create"
msgid "Create"
-msgstr "新建..."
+msgstr "新建"
#: lib/branch_create.tcl:40
#: lib/branch_create.tcl:40
-#, fuzzy
msgid "Branch Name"
msgid "Branch Name"
-msgstr "分支"
+msgstr "分支名"
#: lib/branch_create.tcl:43
msgid "Name:"
#: lib/branch_create.tcl:43
msgid "Name:"
-msgstr ""
+msgstr "名字:"
#: lib/branch_create.tcl:58
msgid "Match Tracking Branch Name"
#: lib/branch_create.tcl:58
msgid "Match Tracking Branch Name"
-msgstr ""
+msgstr "匹配跟踪分支名字"
#: lib/branch_create.tcl:66
msgid "Starting Revision"
#: lib/branch_create.tcl:66
msgid "Starting Revision"
-msgstr ""
+msgstr "起始版本"
#: lib/branch_create.tcl:72
msgid "Update Existing Branch:"
#: lib/branch_create.tcl:72
msgid "Update Existing Branch:"
-msgstr ""
+msgstr "更新已有分支:"
#: lib/branch_create.tcl:75
msgid "No"
#: lib/branch_create.tcl:75
msgid "No"
-msgstr ""
+msgstr "号码"
#: lib/branch_create.tcl:80
msgid "Fast Forward Only"
#: lib/branch_create.tcl:80
msgid "Fast Forward Only"
-msgstr ""
+msgstr "仅快速合并"
#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
-#, fuzzy
msgid "Reset"
msgid "Reset"
-msgstr "重置所有修动..."
+msgstr "复位"
#: lib/branch_create.tcl:97
msgid "Checkout After Creation"
#: lib/branch_create.tcl:97
msgid "Checkout After Creation"
-msgstr ""
+msgstr "在创建后Checkout"
#: lib/branch_create.tcl:131
msgid "Please select a tracking branch."
#: lib/branch_create.tcl:131
msgid "Please select a tracking branch."
-msgstr ""
+msgstr "请选择某个跟踪分支."
#: lib/branch_create.tcl:140
#, tcl-format
msgid "Tracking branch %s is not a branch in the remote repository."
#: lib/branch_create.tcl:140
#, tcl-format
msgid "Tracking branch %s is not a branch in the remote repository."
-msgstr ""
+msgstr "跟踪分支 %s 并不是远端版本库中的一个分支"
#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
msgid "Please supply a branch name."
#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
msgid "Please supply a branch name."
-msgstr ""
+msgstr "请提供分支名字."
#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
#, tcl-format
msgid "'%s' is not an acceptable branch name."
#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
#, tcl-format
msgid "'%s' is not an acceptable branch name."
-msgstr ""
+msgstr "'%s'不是一个可接受的分支名."
#: lib/branch_delete.tcl:15
#: lib/branch_delete.tcl:15
-#, fuzzy
msgid "Delete Branch"
msgid "Delete Branch"
-msgstr "å½\93å\89\8då\88\86æ\94¯:"
+msgstr "å\88 é\99¤å\88\86æ\94¯"
#: lib/branch_delete.tcl:20
msgid "Delete Local Branch"
#: lib/branch_delete.tcl:20
msgid "Delete Local Branch"
-msgstr ""
+msgstr "删除本地分支"
#: lib/branch_delete.tcl:37
#: lib/branch_delete.tcl:37
-#, fuzzy
msgid "Local Branches"
msgid "Local Branches"
-msgstr "分支"
+msgstr "本地分支"
#: lib/branch_delete.tcl:52
msgid "Delete Only If Merged Into"
#: lib/branch_delete.tcl:52
msgid "Delete Only If Merged Into"
-msgstr ""
+msgstr "仅在合并后删除"
#: lib/branch_delete.tcl:54
msgid "Always (Do not perform merge test.)"
#: lib/branch_delete.tcl:54
msgid "Always (Do not perform merge test.)"
-msgstr ""
+msgstr "总是合并 (不作合并测试.)"
#: lib/branch_delete.tcl:103
#, tcl-format
msgid "The following branches are not completely merged into %s:"
#: lib/branch_delete.tcl:103
#, tcl-format
msgid "The following branches are not completely merged into %s:"
-msgstr ""
+msgstr "下列分支没有完全被合并到 %s:"
#: lib/branch_delete.tcl:115
msgid ""
#: lib/branch_delete.tcl:115
msgid ""
"\n"
" Delete the selected branches?"
msgstr ""
"\n"
" Delete the selected branches?"
msgstr ""
+"恢复被删除的分支非常困难.\n"
+"\n"
+"是否要删除所选分支?"
#: lib/branch_delete.tcl:141
#, tcl-format
#: lib/branch_delete.tcl:141
#, tcl-format
"Failed to delete branches:\n"
"%s"
msgstr ""
"Failed to delete branches:\n"
"%s"
msgstr ""
+"无法删除分支:\n"
+"%s"
#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
-#, fuzzy
msgid "Rename Branch"
msgid "Rename Branch"
-msgstr "当前分支:"
+msgstr "更改分支名:"
#: lib/branch_rename.tcl:26
#: lib/branch_rename.tcl:26
-#, fuzzy
msgid "Rename"
msgid "Rename"
-msgstr "æ\94¹名..."
+msgstr "æ\9b´名..."
#: lib/branch_rename.tcl:36
#: lib/branch_rename.tcl:36
-#, fuzzy
msgid "Branch:"
msgid "Branch:"
-msgstr "分支"
+msgstr "分支:"
#: lib/branch_rename.tcl:39
msgid "New Name:"
#: lib/branch_rename.tcl:39
msgid "New Name:"
-msgstr ""
+msgstr "新名字:"
#: lib/branch_rename.tcl:75
msgid "Please select a branch to rename."
#: lib/branch_rename.tcl:75
msgid "Please select a branch to rename."
-msgstr ""
+msgstr "请选择分支更名."
#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
#, tcl-format
msgid "Branch '%s' already exists."
#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
#, tcl-format
msgid "Branch '%s' already exists."
-msgstr ""
+msgstr "分支 '%s' 已经存在."
#: lib/branch_rename.tcl:117
#, tcl-format
msgid "Failed to rename '%s'."
#: lib/branch_rename.tcl:117
#, tcl-format
msgid "Failed to rename '%s'."
-msgstr ""
+msgstr "无法更名 '%s'."
#: lib/browser.tcl:17
msgid "Starting..."
#: lib/browser.tcl:17
msgid "Starting..."
-msgstr ""
+msgstr "开始..."
#: lib/browser.tcl:26
msgid "File Browser"
#: lib/browser.tcl:26
msgid "File Browser"
-msgstr ""
+msgstr "文件浏览器"
#: lib/browser.tcl:125 lib/browser.tcl:142
#, tcl-format
msgid "Loading %s..."
#: lib/browser.tcl:125 lib/browser.tcl:142
#, tcl-format
msgid "Loading %s..."
-msgstr ""
+msgstr "装载 %s..."
#: lib/browser.tcl:186
msgid "[Up To Parent]"
#: lib/browser.tcl:186
msgid "[Up To Parent]"
-msgstr ""
+msgstr "[上层目录]"
#: lib/browser.tcl:266 lib/browser.tcl:272
#: lib/browser.tcl:266 lib/browser.tcl:272
-#, fuzzy
msgid "Browse Branch Files"
msgid "Browse Branch Files"
-msgstr "æµ\8fè§\88å½\93å\89\8då\88\86æ\94¯æ\96\87件"
+msgstr "浏览分支文件"
-#: lib/browser.tcl:277 lib/choose_repository.tcl:215
-#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
-#: lib/choose_repository.tcl:811
+#: lib/browser.tcl:277 lib/choose_repository.tcl:391
+#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
+#: lib/choose_repository.tcl:989
msgid "Browse"
msgid "Browse"
-msgstr ""
+msgstr "浏览"
#: lib/checkout_op.tcl:79
#, tcl-format
msgid "Fetching %s from %s"
#: lib/checkout_op.tcl:79
#, tcl-format
msgid "Fetching %s from %s"
-msgstr ""
+msgstr "获取 %s 自 %s"
#: lib/checkout_op.tcl:127
#, tcl-format
msgid "fatal: Cannot resolve %s"
#: lib/checkout_op.tcl:127
#, tcl-format
msgid "fatal: Cannot resolve %s"
-msgstr ""
+msgstr "致命错误: 无法解决 %s"
#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
msgid "Close"
#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
msgid "Close"
-msgstr ""
+msgstr "关闭"
#: lib/checkout_op.tcl:169
#, tcl-format
msgid "Branch '%s' does not exist."
#: lib/checkout_op.tcl:169
#, tcl-format
msgid "Branch '%s' does not exist."
-msgstr ""
+msgstr "分支 '%s' 并不存在."
#: lib/checkout_op.tcl:206
#, tcl-format
#: lib/checkout_op.tcl:206
#, tcl-format
"It cannot fast-forward to %s.\n"
"A merge is required."
msgstr ""
"It cannot fast-forward to %s.\n"
"A merge is required."
msgstr ""
+"分支 '%s' 已经存在.\n"
+"\n"
+"无法快速合并到 %s.\n"
+"需要普通合并."
#: lib/checkout_op.tcl:220
#, tcl-format
msgid "Merge strategy '%s' not supported."
#: lib/checkout_op.tcl:220
#, tcl-format
msgid "Merge strategy '%s' not supported."
-msgstr ""
+msgstr "合并策略 '%s' 不支持."
#: lib/checkout_op.tcl:239
#, tcl-format
msgid "Failed to update '%s'."
#: lib/checkout_op.tcl:239
#, tcl-format
msgid "Failed to update '%s'."
-msgstr ""
+msgstr "无法更新 '%s'."
#: lib/checkout_op.tcl:251
msgid "Staging area (index) is already locked."
#: lib/checkout_op.tcl:251
msgid "Staging area (index) is already locked."
-msgstr ""
+msgstr "缓存区域 (index) 已被锁定."
#: lib/checkout_op.tcl:266
msgid ""
#: lib/checkout_op.tcl:266
msgid ""
"\n"
"The rescan will be automatically started now.\n"
msgstr ""
"\n"
"The rescan will be automatically started now.\n"
msgstr ""
+"最后一次扫描的状态和当前版本库状态不符.\n"
+"\n"
+"另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
+"描.\n"
+"\n"
+"重新扫描将自动开始.\n"
#: lib/checkout_op.tcl:322
#, tcl-format
msgid "Updating working directory to '%s'..."
#: lib/checkout_op.tcl:322
#, tcl-format
msgid "Updating working directory to '%s'..."
-msgstr ""
+msgstr "更新工作目录到 '%s'..."
#: lib/checkout_op.tcl:353
#, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)."
#: lib/checkout_op.tcl:353
#, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)."
-msgstr ""
+msgstr "中止 '%s' 的 checkout 操作 (需要做文件级合并)."
#: lib/checkout_op.tcl:354
msgid "File level merge required."
#: lib/checkout_op.tcl:354
msgid "File level merge required."
-msgstr ""
+msgstr "需要文件级合并."
#: lib/checkout_op.tcl:358
#, tcl-format
msgid "Staying on branch '%s'."
#: lib/checkout_op.tcl:358
#, tcl-format
msgid "Staying on branch '%s'."
-msgstr ""
+msgstr "停留在分支 '%s'."
#: lib/checkout_op.tcl:429
msgid ""
#: lib/checkout_op.tcl:429
msgid ""
"If you wanted to be on a branch, create one now starting from 'This Detached "
"Checkout'."
msgstr ""
"If you wanted to be on a branch, create one now starting from 'This Detached "
"Checkout'."
msgstr ""
+"你不在某个本地分支上.\n"
+"\n"
+"如果你想位于某分支上, 从当前脱节的Checkout中创建一个新分支."
#: lib/checkout_op.tcl:446
#: lib/checkout_op.tcl:446
-#, fuzzy, tcl-format
+#, tcl-format
msgid "Checked out '%s'."
msgid "Checked out '%s'."
-msgstr "切换..."
+msgstr "'%s' 已被 checkout"
#: lib/checkout_op.tcl:478
#, tcl-format
msgid "Resetting '%s' to '%s' will lose the following commits:"
#: lib/checkout_op.tcl:478
#, tcl-format
msgid "Resetting '%s' to '%s' will lose the following commits:"
-msgstr ""
+msgstr "复位 '%s' 到 '%s' 将导致下列提交的丢失:"
#: lib/checkout_op.tcl:500
msgid "Recovering lost commits may not be easy."
#: lib/checkout_op.tcl:500
msgid "Recovering lost commits may not be easy."
-msgstr ""
+msgstr "恢复丢失的提交是比较困难的."
#: lib/checkout_op.tcl:505
#, tcl-format
msgid "Reset '%s'?"
#: lib/checkout_op.tcl:505
#, tcl-format
msgid "Reset '%s'?"
-msgstr ""
+msgstr "复位 '%s'?"
#: lib/checkout_op.tcl:510 lib/merge.tcl:164
msgid "Visualize"
#: lib/checkout_op.tcl:510 lib/merge.tcl:164
msgid "Visualize"
-msgstr ""
+msgstr "图示"
#: lib/checkout_op.tcl:578
#, tcl-format
#: lib/checkout_op.tcl:578
#, tcl-format
"\n"
"This should not have occurred. %s will now close and give up."
msgstr ""
"\n"
"This should not have occurred. %s will now close and give up."
msgstr ""
+"无法设定当前分支.\n"
+"\n"
+"当前工作目录仅有部分被切换出, 我们已成功的更新了您的文件但是无法更新某个内部"
+"的Git文件.\n"
+"\n"
+"这本不该发生, %s 将关闭并放弃."
#: lib/choose_font.tcl:39
#: lib/choose_font.tcl:39
-#, fuzzy
msgid "Select"
msgid "Select"
-msgstr "全选"
+msgstr "选择"
#: lib/choose_font.tcl:53
msgid "Font Family"
#: lib/choose_font.tcl:53
msgid "Font Family"
-msgstr ""
+msgstr "字体族"
#: lib/choose_font.tcl:73
#: lib/choose_font.tcl:73
-#, fuzzy
msgid "Font Size"
msgid "Font Size"
-msgstr "缩小字体"
+msgstr "字体大小"
#: lib/choose_font.tcl:90
msgid "Font Example"
#: lib/choose_font.tcl:90
msgid "Font Example"
-msgstr ""
+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_font.tcl:101
msgid ""
"This is example text.\n"
"If you like this text, it can be your font."
msgstr ""
+"这是样例文本.\n"
+"如果你喜欢, 你可以设置该字体."
-#: lib/choose_repository.tcl:25
+#: lib/choose_repository.tcl:27
msgid "Git Gui"
msgid "Git Gui"
-msgstr ""
+msgstr "Git Gui"
-#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
-#, fuzzy
+#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
msgid "Create New Repository"
msgid "Create New Repository"
-msgstr "版本树"
+msgstr "创建新的版本库"
-#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
-#, fuzzy
+#: lib/choose_repository.tcl:86
+msgid "New..."
+msgstr "新建..."
+
+#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
msgid "Clone Existing Repository"
msgid "Clone Existing Repository"
-msgstr "版本树"
+msgstr "克隆已有版本库"
-#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
-#, fuzzy
+#: lib/choose_repository.tcl:99
+msgid "Clone..."
+msgstr "克隆..."
+
+#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
msgid "Open Existing Repository"
msgid "Open Existing Repository"
-msgstr "版本树"
+msgstr "打开已有版本库"
-#: lib/choose_repository.tcl:91
-msgid "Next >"
-msgstr ""
+#: lib/choose_repository.tcl:112
+msgid "Open..."
+msgstr "打开..."
-#: lib/choose_repository.tcl:152
+#: lib/choose_repository.tcl:125
+msgid "Recent Repositories"
+msgstr "最近版本库"
+
+#: lib/choose_repository.tcl:131
+msgid "Open Recent Repository:"
+msgstr "打开最近版本库"
+
+#: lib/choose_repository.tcl:294
#, tcl-format
msgid "Location %s already exists."
#, tcl-format
msgid "Location %s already exists."
-msgstr ""
+msgstr "位置 %s 已经存在."
-#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
-#: lib/choose_repository.tcl:172
+#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
+#: lib/choose_repository.tcl:314
#, tcl-format
msgid "Failed to create repository %s:"
#, tcl-format
msgid "Failed to create repository %s:"
-msgstr ""
+msgstr "无法创建版本库 %s:"
-#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
+#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
msgid "Directory:"
msgid "Directory:"
-msgstr ""
+msgstr "目录:"
-#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
-#: lib/choose_repository.tcl:834
-#, fuzzy
+#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
+#: lib/choose_repository.tcl:1013
msgid "Git Repository"
msgid "Git Repository"
-msgstr "版本树"
+msgstr "Git 版本库"
-#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
+#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
#, tcl-format
msgid "Directory %s already exists."
#, tcl-format
msgid "Directory %s already exists."
-msgstr ""
+msgstr "目录 %s 已经存在."
-#: lib/choose_repository.tcl:265
+#: lib/choose_repository.tcl:442
#, tcl-format
msgid "File %s already exists."
#, tcl-format
msgid "File %s already exists."
-msgstr ""
+msgstr "文件 %s 已经存在."
-#: lib/choose_repository.tcl:286
+#: lib/choose_repository.tcl:463
msgid "Clone"
msgid "Clone"
-msgstr ""
+msgstr "克隆"
-#: lib/choose_repository.tcl:299
+#: lib/choose_repository.tcl:476
msgid "URL:"
msgid "URL:"
-msgstr ""
+msgstr "URL:"
-#: lib/choose_repository.tcl:319
+#: lib/choose_repository.tcl:496
msgid "Clone Type:"
msgid "Clone Type:"
-msgstr ""
+msgstr "克隆类型:"
-#: lib/choose_repository.tcl:325
+#: lib/choose_repository.tcl:502
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
-msgstr ""
+msgstr "标准方式 (快速, 部分备份, 作硬连接)"
-#: lib/choose_repository.tcl:331
+#: lib/choose_repository.tcl:508
msgid "Full Copy (Slower, Redundant Backup)"
msgid "Full Copy (Slower, Redundant Backup)"
-msgstr ""
+msgstr "全部复制 (较慢, 做备份)"
-#: lib/choose_repository.tcl:337
+#: lib/choose_repository.tcl:514
msgid "Shared (Fastest, Not Recommended, No Backup)"
msgid "Shared (Fastest, Not Recommended, No Backup)"
-msgstr ""
+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
+#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
+#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
+#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
#, tcl-format
msgid "Not a Git repository: %s"
#, tcl-format
msgid "Not a Git repository: %s"
-msgstr ""
+msgstr "不是一个 Git 版本库: %s"
-#: lib/choose_repository.tcl:405
+#: lib/choose_repository.tcl:586
msgid "Standard only available for local repository."
msgid "Standard only available for local repository."
-msgstr ""
+msgstr "标准方式仅当是本地版本库时有效."
-#: lib/choose_repository.tcl:409
+#: lib/choose_repository.tcl:590
msgid "Shared only available for local repository."
msgid "Shared only available for local repository."
-msgstr ""
+msgstr "共享方式仅当是本地版本库时有效."
-#: lib/choose_repository.tcl:439
+#: lib/choose_repository.tcl:617
msgid "Failed to configure origin"
msgid "Failed to configure origin"
-msgstr ""
+msgstr "无法配置 origin"
-#: lib/choose_repository.tcl:451
+#: lib/choose_repository.tcl:629
msgid "Counting objects"
msgid "Counting objects"
-msgstr ""
+msgstr "清点对象"
-#: lib/choose_repository.tcl:452
+#: lib/choose_repository.tcl:630
+#, fuzzy
msgid "buckets"
msgid "buckets"
-msgstr ""
+msgstr "水桶??"
-#: lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:654
#, tcl-format
msgid "Unable to copy objects/info/alternates: %s"
#, tcl-format
msgid "Unable to copy objects/info/alternates: %s"
-msgstr ""
+msgstr "无法复制 objects/info/alternates: %s"
-#: lib/choose_repository.tcl:512
+#: lib/choose_repository.tcl:690
#, tcl-format
msgid "Nothing to clone from %s."
#, tcl-format
msgid "Nothing to clone from %s."
-msgstr ""
+msgstr "没有东西可从 %s 克隆."
-#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
-#: lib/choose_repository.tcl:740
+#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
+#: lib/choose_repository.tcl:918
msgid "The 'master' branch has not been initialized."
msgid "The 'master' branch has not been initialized."
-msgstr ""
+msgstr "'master'分支尚未初始化."
-#: lib/choose_repository.tcl:527
+#: lib/choose_repository.tcl:705
msgid "Hardlinks are unavailable. Falling back to copying."
msgid "Hardlinks are unavailable. Falling back to copying."
-msgstr ""
+msgstr "硬连接不可用. 使用复制."
-#: lib/choose_repository.tcl:539
+#: lib/choose_repository.tcl:717
#, tcl-format
msgid "Cloning from %s"
#, tcl-format
msgid "Cloning from %s"
-msgstr ""
+msgstr "从 %s 克隆"
-#: lib/choose_repository.tcl:570
-#, fuzzy
+#: lib/choose_repository.tcl:748
msgid "Copying objects"
msgid "Copying objects"
-msgstr "å\8e\8b缩æ\95°æ\8d®åº\93"
+msgstr "å¤\8då\88¶ objects"
-#: lib/choose_repository.tcl:571
+#: lib/choose_repository.tcl:749
msgid "KiB"
msgid "KiB"
-msgstr ""
+msgstr "KiB"
-#: lib/choose_repository.tcl:595
+#: lib/choose_repository.tcl:773
#, tcl-format
msgid "Unable to copy object: %s"
#, tcl-format
msgid "Unable to copy object: %s"
-msgstr ""
+msgstr "无法复制 object: %s"
-#: lib/choose_repository.tcl:605
+#: lib/choose_repository.tcl:783
msgid "Linking objects"
msgid "Linking objects"
-msgstr ""
+msgstr "链接 objects"
-#: lib/choose_repository.tcl:606
+#: lib/choose_repository.tcl:784
msgid "objects"
msgid "objects"
-msgstr ""
+msgstr "objects"
-#: lib/choose_repository.tcl:614
+#: lib/choose_repository.tcl:792
#, tcl-format
msgid "Unable to hardlink object: %s"
#, tcl-format
msgid "Unable to hardlink object: %s"
-msgstr ""
+msgstr "无法硬链接 object: %s"
-#: lib/choose_repository.tcl:669
+#: lib/choose_repository.tcl:847
msgid "Cannot fetch branches and objects. See console output for details."
msgid "Cannot fetch branches and objects. See console output for details."
-msgstr ""
+msgstr "无法获取分支和对象. 请查看控制终端的输出."
-#: lib/choose_repository.tcl:680
+#: lib/choose_repository.tcl:858
msgid "Cannot fetch tags. See console output for details."
msgid "Cannot fetch tags. See console output for details."
-msgstr ""
+msgstr "无法获取标签. 请查看控制终端的输出."
-#: lib/choose_repository.tcl:704
+#: lib/choose_repository.tcl:882
msgid "Cannot determine HEAD. See console output for details."
msgid "Cannot determine HEAD. See console output for details."
-msgstr ""
+msgstr "无法确定 HEAD. 请查看控制终端的输出."
-#: lib/choose_repository.tcl:713
+#: lib/choose_repository.tcl:891
#, tcl-format
msgid "Unable to cleanup %s"
#, tcl-format
msgid "Unable to cleanup %s"
-msgstr ""
+msgstr "无法清理 %s"
-#: lib/choose_repository.tcl:719
+#: lib/choose_repository.tcl:897
msgid "Clone failed."
msgid "Clone failed."
-msgstr ""
+msgstr "克隆失败."
-#: lib/choose_repository.tcl:726
+#: lib/choose_repository.tcl:904
msgid "No default branch obtained."
msgid "No default branch obtained."
-msgstr ""
+msgstr "没有获取缺省分支"
-#: lib/choose_repository.tcl:737
+#: lib/choose_repository.tcl:915
#, tcl-format
msgid "Cannot resolve %s as a commit."
#, tcl-format
msgid "Cannot resolve %s as a commit."
-msgstr ""
+msgstr "无法解析 %s 为提交."
-#: lib/choose_repository.tcl:749
+#: lib/choose_repository.tcl:927
msgid "Creating working directory"
msgid "Creating working directory"
-msgstr ""
+msgstr "创建工作目录"
-#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
-#: lib/index.tcl:149
+#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
+#: lib/index.tcl:193
msgid "files"
msgid "files"
-msgstr ""
+msgstr "文件"
-#: lib/choose_repository.tcl:779
+#: lib/choose_repository.tcl:957
msgid "Initial file checkout failed."
msgid "Initial file checkout failed."
-msgstr ""
+msgstr "初始的文件checkout失败"
-#: lib/choose_repository.tcl:795
+#: lib/choose_repository.tcl:973
msgid "Open"
msgid "Open"
-msgstr ""
+msgstr "打开"
-#: lib/choose_repository.tcl:805
-#, fuzzy
+#: lib/choose_repository.tcl:983
msgid "Repository:"
msgid "Repository:"
-msgstr "版本树"
+msgstr "版本库"
-#: lib/choose_repository.tcl:854
+#: lib/choose_repository.tcl:1033
#, tcl-format
msgid "Failed to open repository %s:"
#, tcl-format
msgid "Failed to open repository %s:"
-msgstr ""
+msgstr "无法打开版本库 %s:"
#: lib/choose_rev.tcl:53
msgid "This Detached Checkout"
#: lib/choose_rev.tcl:53
msgid "This Detached Checkout"
-msgstr ""
+msgstr "该脱节的Checkout"
#: lib/choose_rev.tcl:60
msgid "Revision Expression:"
#: lib/choose_rev.tcl:60
msgid "Revision Expression:"
-msgstr ""
+msgstr "版本表达式:"
#: lib/choose_rev.tcl:74
#: lib/choose_rev.tcl:74
-#, fuzzy
msgid "Local Branch"
msgid "Local Branch"
-msgstr "分支"
+msgstr "本地分支"
#: lib/choose_rev.tcl:79
#: lib/choose_rev.tcl:79
-#, fuzzy
msgid "Tracking Branch"
msgid "Tracking Branch"
-msgstr "当前分支:"
+msgstr "跟踪分支:"
#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
msgid "Tag"
#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
msgid "Tag"
-msgstr ""
+msgstr "标签"
#: lib/choose_rev.tcl:317
#, tcl-format
msgid "Invalid revision: %s"
#: lib/choose_rev.tcl:317
#, tcl-format
msgid "Invalid revision: %s"
-msgstr ""
+msgstr "无效版本: %s"
#: lib/choose_rev.tcl:338
msgid "No revision selected."
#: lib/choose_rev.tcl:338
msgid "No revision selected."
-msgstr ""
+msgstr "没有选择版本."
#: lib/choose_rev.tcl:346
msgid "Revision expression is empty."
#: lib/choose_rev.tcl:346
msgid "Revision expression is empty."
-msgstr ""
+msgstr "版本表达式为空."
#: lib/choose_rev.tcl:530
msgid "Updated"
#: lib/choose_rev.tcl:530
msgid "Updated"
-msgstr ""
+msgstr "已更新"
#: lib/choose_rev.tcl:558
msgid "URL"
#: lib/choose_rev.tcl:558
msgid "URL"
-msgstr ""
+msgstr "URL"
#: lib/commit.tcl:9
msgid ""
#: lib/commit.tcl:9
msgid ""
"You are about to create the initial commit. There is no commit before this "
"to amend.\n"
msgstr ""
"You are about to create the initial commit. There is no commit before this "
"to amend.\n"
msgstr ""
+"没有改动需要修正.\n"
+"\n"
+"你正在创建最初的提交. 在此之前没有提交可以修正.\n"
#: lib/commit.tcl:18
msgid ""
#: lib/commit.tcl:18
msgid ""
"completed. You cannot amend the prior commit unless you first abort the "
"current merge activity.\n"
msgstr ""
"completed. You cannot amend the prior commit unless you first abort the "
"current merge activity.\n"
msgstr ""
+"在合并时无法修正.\n"
+"\n"
+"你当前正在一次尚未完成的合并操作过程中. 除非中止当前合并活动,\n"
+"否则无法修正之前的提交.\n"
#: lib/commit.tcl:49
msgid "Error loading commit data for amend:"
#: lib/commit.tcl:49
msgid "Error loading commit data for amend:"
-msgstr ""
+msgstr "为修正装载提交数据出错:"
#: lib/commit.tcl:76
msgid "Unable to obtain your identity:"
#: lib/commit.tcl:76
msgid "Unable to obtain your identity:"
-msgstr ""
+msgstr "无法获知你的身份:"
#: lib/commit.tcl:81
msgid "Invalid GIT_COMMITTER_IDENT:"
#: lib/commit.tcl:81
msgid "Invalid GIT_COMMITTER_IDENT:"
-msgstr ""
+msgstr "无效的 GIT_COMMITTER_IDENT"
#: lib/commit.tcl:133
msgid ""
#: lib/commit.tcl:133
msgid ""
"\n"
"The rescan will be automatically started now.\n"
msgstr ""
"\n"
"The rescan will be automatically started now.\n"
msgstr ""
+"最后一次扫描的状态和当前版本库状态不符.\n"
+"\n"
+"另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
+"描.\n"
+"\n"
+"重新扫描将自动开始.\n"
#: lib/commit.tcl:154
#, tcl-format
#: lib/commit.tcl:154
#, tcl-format
"File %s has merge conflicts. You must resolve them and stage the file "
"before committing.\n"
msgstr ""
"File %s has merge conflicts. You must resolve them and stage the file "
"before committing.\n"
msgstr ""
+"尚未合并的文件没有办法提交.\n"
+"\n"
+"文件 %s 有合并冲突, 你必须解决这些冲突并缓存该文件作提交.\n"
#: lib/commit.tcl:162
#, tcl-format
#: lib/commit.tcl:162
#, tcl-format
"\n"
"File %s cannot be committed by this program.\n"
msgstr ""
"\n"
"File %s cannot be committed by this program.\n"
msgstr ""
+"检测到未知文件状态 %s.\n"
+"\n"
+"文件 %s 无法由该程序提交.\n"
#: lib/commit.tcl:170
msgid ""
#: lib/commit.tcl:170
msgid ""
"\n"
"You must stage at least 1 file before you can commit.\n"
msgstr ""
"\n"
"You must stage at least 1 file before you can commit.\n"
msgstr ""
+"没有需要提交的变动.\n"
+"\n"
+"提交前你必须首先缓存至少一个文件.\n"
#: lib/commit.tcl:183
msgid ""
#: lib/commit.tcl:183
msgid ""
"\n"
"A good commit message has the following format:\n"
"\n"
"\n"
"A good commit message has the following format:\n"
"\n"
-"- First line: Describe in one sentance what you did.\n"
+"- First line: Describe in one sentence what you did.\n"
"- Second line: Blank\n"
"- Remaining lines: Describe why this change is good.\n"
msgstr ""
"- Second line: Blank\n"
"- Remaining lines: Describe why this change is good.\n"
msgstr ""
+"请提供一条提交信息.\n"
+"\n"
+"一条好的提交信息有下列格式:\n"
+"\n"
+"- 第一行: 一句话概括你做的修改.\n"
+"- 第二行: 空行\n"
+"- 剩余行: 请描述为什么你做的这些改动是好的.\n"
#: lib/commit.tcl:257
msgid "write-tree failed:"
#: lib/commit.tcl:257
msgid "write-tree failed:"
-msgstr ""
+msgstr "write-tree 失败:"
#: lib/commit.tcl:275
#, tcl-format
msgid "Commit %s appears to be corrupt"
#: lib/commit.tcl:275
#, tcl-format
msgid "Commit %s appears to be corrupt"
-msgstr ""
+msgstr "提交 %s 似乎已损坏"
#: lib/commit.tcl:279
msgid ""
#: lib/commit.tcl:279
msgid ""
"\n"
"A rescan will be automatically started now.\n"
msgstr ""
"\n"
"A rescan will be automatically started now.\n"
msgstr ""
+"没有改动提交.\n"
+"\n"
+"该提交没有改动任何文件也不是一个合并提交.\n"
+"\n"
+"重新扫描将自动开始.\n"
#: lib/commit.tcl:286
msgid "No changes to commit."
#: lib/commit.tcl:286
msgid "No changes to commit."
-msgstr ""
+msgstr "没有改动要提交."
#: lib/commit.tcl:303
#, tcl-format
msgid "warning: Tcl does not support encoding '%s'."
#: lib/commit.tcl:303
#, tcl-format
msgid "warning: Tcl does not support encoding '%s'."
-msgstr ""
+msgstr "警告: Tcl 不支持编码方式 '%s'."
#: lib/commit.tcl:317
msgid "commit-tree failed:"
#: lib/commit.tcl:317
msgid "commit-tree failed:"
-msgstr ""
+msgstr "commit-tree 失败:"
#: lib/commit.tcl:339
msgid "update-ref failed:"
#: lib/commit.tcl:339
msgid "update-ref failed:"
-msgstr ""
+msgstr "update-ref 失败:"
#: lib/commit.tcl:430
#, tcl-format
msgid "Created commit %s: %s"
#: lib/commit.tcl:430
#, tcl-format
msgid "Created commit %s: %s"
-msgstr ""
+msgstr "创建了 commit %s: %s"
#: lib/console.tcl:57
msgid "Working... please wait..."
#: lib/console.tcl:57
msgid "Working... please wait..."
-msgstr ""
+msgstr "工作中... 请等待..."
#: lib/console.tcl:183
msgid "Success"
#: lib/console.tcl:183
msgid "Success"
-msgstr ""
+msgstr "成功"
#: lib/console.tcl:196
msgid "Error: Command Failed"
#: lib/console.tcl:196
msgid "Error: Command Failed"
-msgstr ""
+msgstr "错误: 命令失败"
#: lib/database.tcl:43
msgid "Number of loose objects"
#: lib/database.tcl:43
msgid "Number of loose objects"
-msgstr ""
+msgstr "松散对象的数量"
#: lib/database.tcl:44
msgid "Disk space used by loose objects"
#: lib/database.tcl:44
msgid "Disk space used by loose objects"
-msgstr ""
+msgstr "松散对象所使用的磁盘空间"
#: lib/database.tcl:45
msgid "Number of packed objects"
#: lib/database.tcl:45
msgid "Number of packed objects"
-msgstr ""
+msgstr "压缩对象数量"
#: lib/database.tcl:46
msgid "Number of packs"
#: lib/database.tcl:46
msgid "Number of packs"
-msgstr ""
+msgstr "压缩包数量"
#: lib/database.tcl:47
msgid "Disk space used by packed objects"
#: lib/database.tcl:47
msgid "Disk space used by packed objects"
-msgstr ""
+msgstr "压缩对象所使用的磁盘空间"
#: lib/database.tcl:48
msgid "Packed objects waiting for pruning"
#: lib/database.tcl:48
msgid "Packed objects waiting for pruning"
-msgstr ""
+msgstr "压缩对象等待清理"
#: lib/database.tcl:49
msgid "Garbage files"
#: lib/database.tcl:49
msgid "Garbage files"
-msgstr ""
+msgstr "垃圾文件"
#: lib/database.tcl:72
#: lib/database.tcl:72
-#, fuzzy
msgid "Compressing the object database"
msgid "Compressing the object database"
-msgstr "压缩数据库"
+msgstr "压缩对象数据库"
#: lib/database.tcl:83
msgid "Verifying the object database with fsck-objects"
#: lib/database.tcl:83
msgid "Verifying the object database with fsck-objects"
-msgstr ""
+msgstr "使用 fsck-objects 验证对象数据库"
#: lib/database.tcl:108
#, tcl-format
#: lib/database.tcl:108
#, tcl-format
"\n"
"Compress the database now?"
msgstr ""
"\n"
"Compress the database now?"
msgstr ""
+"该版本库当前约有 %i 个松散对象.\n"
+"\n"
+"为达到较优的性能,强烈建议你在松散对象多于 %i 时压缩数据库.\n"
+"\n"
+"现在就压缩数据库么?"
#: lib/date.tcl:25
#, tcl-format
msgid "Invalid date from Git: %s"
#: lib/date.tcl:25
#, tcl-format
msgid "Invalid date from Git: %s"
-msgstr ""
+msgstr "无效的日期: %s"
#: lib/diff.tcl:42
#, tcl-format
#: lib/diff.tcl:42
#, tcl-format
"A rescan will be automatically started to find other files which may have "
"the same state."
msgstr ""
"A rescan will be automatically started to find other files which may have "
"the same state."
msgstr ""
+"未检测到改动.\n"
+"\n"
+"该文件的修改日期被另一个程序所更新, 但其内容并没有变化.\n"
+"\n"
+"对于类似情况的其他文件的重新扫描将自动开始."
#: lib/diff.tcl:81
#: lib/diff.tcl:81
-#, tcl-format
+#, fuzzy, tcl-format
msgid "Loading diff of %s..."
msgid "Loading diff of %s..."
-msgstr ""
+msgstr "装载 %s 的 diff ..."
#: lib/diff.tcl:114 lib/diff.tcl:184
#, tcl-format
msgid "Unable to display %s"
#: lib/diff.tcl:114 lib/diff.tcl:184
#, tcl-format
msgid "Unable to display %s"
-msgstr ""
+msgstr "无法显示 %s"
#: lib/diff.tcl:115
msgid "Error loading file:"
#: lib/diff.tcl:115
msgid "Error loading file:"
-msgstr ""
+msgstr "装载文件出错:"
#: lib/diff.tcl:122
msgid "Git Repository (subproject)"
#: lib/diff.tcl:122
msgid "Git Repository (subproject)"
-msgstr ""
+msgstr "Git 版本库 (子项目)"
#: lib/diff.tcl:134
msgid "* Binary file (not showing content)."
#: lib/diff.tcl:134
msgid "* Binary file (not showing content)."
-msgstr ""
+msgstr "* 二进制文件 (不显示内容)."
#: lib/diff.tcl:185
msgid "Error loading diff:"
#: lib/diff.tcl:185
msgid "Error loading diff:"
-msgstr ""
+msgstr "装载 diff 错误:"
#: lib/diff.tcl:302
msgid "Failed to unstage selected hunk."
#: lib/diff.tcl:302
msgid "Failed to unstage selected hunk."
-msgstr ""
+msgstr "无法将选择的代码段从缓存中删除."
#: lib/diff.tcl:309
msgid "Failed to stage selected hunk."
#: lib/diff.tcl:309
msgid "Failed to stage selected hunk."
-msgstr ""
+msgstr "无法缓存所选代码段."
#: lib/error.tcl:12 lib/error.tcl:102
msgid "error"
#: lib/error.tcl:12 lib/error.tcl:102
msgid "error"
-msgstr ""
+msgstr "错误"
#: lib/error.tcl:28
msgid "warning"
#: lib/error.tcl:28
msgid "warning"
-msgstr ""
+msgstr "警告"
#: lib/error.tcl:81
msgid "You must correct the above errors before committing."
#: lib/error.tcl:81
msgid "You must correct the above errors before committing."
-msgstr ""
+msgstr "你必须在提交前修正上述错误."
-#: lib/index.tcl:241
-#, fuzzy, tcl-format
+#: lib/index.tcl:6
+msgid "Unable to unlock the index."
+msgstr "无法解锁缓存 (index)"
+
+#: lib/index.tcl:15
+msgid "Index Error"
+msgstr "缓存(Index)错误"
+
+#: lib/index.tcl:21
+msgid ""
+"Updating the Git index failed. A rescan will be automatically started to "
+"resynchronize git-gui."
+msgstr "更新 Git 缓存(Index)失败, 重新扫描将自动开始以重新同步 git-gui."
+
+#: lib/index.tcl:27
+msgid "Continue"
+msgstr "继续"
+
+#: lib/index.tcl:31
+msgid "Unlock Index"
+msgstr "解锁 Index"
+
+#: lib/index.tcl:282
+#, tcl-format
msgid "Unstaging %s from commit"
msgid "Unstaging %s from commit"
-msgstr "ä»\8eæ\9c¬æ¬¡æ\8f\90交移é\99¤"
+msgstr "ä»\8eæ\8f\90交ç¼\93å\98ä¸å\88 é\99¤ %s"
-#: lib/index.tcl:285
+#: lib/index.tcl:326
#, tcl-format
msgid "Adding %s"
#, tcl-format
msgid "Adding %s"
-msgstr ""
+msgstr "添加 %s"
-#: lib/index.tcl:340
-#, fuzzy, tcl-format
+#: lib/index.tcl:381
+#, tcl-format
msgid "Revert changes in file %s?"
msgid "Revert changes in file %s?"
-msgstr "æ\81¢å¤\8dä¿®æ\94¹"
+msgstr "æ\92¤é\94\80æ\96\87件 %s ä¸ç\9a\84æ\94¹å\8a¨?"
-#: lib/index.tcl:342
+#: lib/index.tcl:383
#, tcl-format
msgid "Revert changes in these %i files?"
#, tcl-format
msgid "Revert changes in these %i files?"
-msgstr ""
+msgstr "撤销这些 (%i个) 文件的改动?"
-#: lib/index.tcl:348
+#: lib/index.tcl:389
msgid "Any unstaged changes will be permanently lost by the revert."
msgid "Any unstaged changes will be permanently lost by the revert."
-msgstr ""
+msgstr "任何未缓存的改动将在这次撤销中永久丢失."
-#: lib/index.tcl:351
+#: lib/index.tcl:392
msgid "Do Nothing"
msgid "Do Nothing"
-msgstr ""
+msgstr "不做操作"
#: lib/merge.tcl:13
msgid ""
#: lib/merge.tcl:13
msgid ""
"\n"
"You must finish amending this commit before starting any type of merge.\n"
msgstr ""
"\n"
"You must finish amending this commit before starting any type of merge.\n"
msgstr ""
+"修正时无法做合并.\n"
+"\n"
+"你必须完成对该提交的修正才能继续任何类型的合并操作.\n"
#: lib/merge.tcl:27
msgid ""
#: lib/merge.tcl:27
msgid ""
"\n"
"The rescan will be automatically started now.\n"
msgstr ""
"\n"
"The rescan will be automatically started now.\n"
msgstr ""
+"最后一次扫描的状态和当前版本库状态不符.\n"
+"\n"
+"另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
+"描.\n"
+"\n"
+"重新扫描将自动开始.\n"
#: lib/merge.tcl:44
#, tcl-format
#: lib/merge.tcl:44
#, tcl-format
"You must resolve them, stage the file, and commit to complete the current "
"merge. Only then can you begin another merge.\n"
msgstr ""
"You must resolve them, stage the file, and commit to complete the current "
"merge. Only then can you begin another merge.\n"
msgstr ""
+"你正处在一个有冲突的合并操作中.\n"
+"\n"
+"文件 %s 有合并冲突.\n"
+"\n"
+"你必须解决这些冲突, 缓存该文件, 并提交来完成当前的合并.仅当这样后才能开始下一"
+"个合并操作.\n"
#: lib/merge.tcl:54
#, tcl-format
#: lib/merge.tcl:54
#, tcl-format
"You should complete the current commit before starting a merge. Doing so "
"will help you abort a failed merge, should the need arise.\n"
msgstr ""
"You should complete the current commit before starting a merge. Doing so "
"will help you abort a failed merge, should the need arise.\n"
msgstr ""
+"你正处在一个改动当中.\n"
+"\n"
+"文件 %s 已被修改.\n"
+"\n"
+"你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于"
+"中止一次失败的合并.\n"
#: lib/merge.tcl:106
#, tcl-format
#: lib/merge.tcl:106
#, tcl-format
#: lib/merge.tcl:119
#, tcl-format
msgid "Merging %s and %s"
#: lib/merge.tcl:119
#, tcl-format
msgid "Merging %s and %s"
-msgstr ""
+msgstr "合并 %s 和 %s"
#: lib/merge.tcl:131
msgid "Merge completed successfully."
#: lib/merge.tcl:131
msgid "Merge completed successfully."
-msgstr ""
+msgstr "合并成功完成."
#: lib/merge.tcl:133
msgid "Merge failed. Conflict resolution is required."
#: lib/merge.tcl:133
msgid "Merge failed. Conflict resolution is required."
-msgstr ""
+msgstr "合并失败. 需要解决冲突."
#: lib/merge.tcl:158
#, tcl-format
msgid "Merge Into %s"
#: lib/merge.tcl:158
#, tcl-format
msgid "Merge Into %s"
-msgstr ""
+msgstr "合并到 %s"
#: lib/merge.tcl:177
msgid "Revision To Merge"
#: lib/merge.tcl:177
msgid "Revision To Merge"
-msgstr ""
+msgstr "要合并的版本"
#: lib/merge.tcl:212
msgid ""
#: lib/merge.tcl:212
msgid ""
"\n"
"You must finish amending this commit.\n"
msgstr ""
"\n"
"You must finish amending this commit.\n"
msgstr ""
+"修正操作中无法中止.\n"
+"\n"
+"你必须先完成本次修正操作.\n"
#: lib/merge.tcl:222
msgid ""
#: lib/merge.tcl:222
msgid ""
"\n"
"Continue with aborting the current merge?"
msgstr ""
"\n"
"Continue with aborting the current merge?"
msgstr ""
+"中止合并?\n"
+"\n"
+"中止当前的合并操作将导致 *所有* 尚未提交的改动丢失.\n"
+"\n"
+"是否要继续中止当前的合并操作?"
#: lib/merge.tcl:228
msgid ""
#: lib/merge.tcl:228
msgid ""
"\n"
"Continue with resetting the current changes?"
msgstr ""
"\n"
"Continue with resetting the current changes?"
msgstr ""
+"是否复位当前改动?\n"
+"\n"
+"复位当前的改动将导致 *所有* 未提交的改动丢失.\n"
+"\n"
+"是否要继续复位当前的改动?"
#: lib/merge.tcl:239
msgid "Aborting"
#: lib/merge.tcl:239
msgid "Aborting"
-msgstr ""
+msgstr "中止"
#: lib/merge.tcl:266
msgid "Abort failed."
#: lib/merge.tcl:266
msgid "Abort failed."
-msgstr ""
+msgstr "中止失败"
#: lib/merge.tcl:268
msgid "Abort completed. Ready."
#: lib/merge.tcl:268
msgid "Abort completed. Ready."
-msgstr ""
+msgstr "中止完成. 就绪."
#: lib/option.tcl:82
msgid "Restore Defaults"
#: lib/option.tcl:82
msgid "Restore Defaults"
-msgstr ""
+msgstr "恢复默认值"
#: lib/option.tcl:86
msgid "Save"
#: lib/option.tcl:86
msgid "Save"
-msgstr ""
+msgstr "保存"
#: lib/option.tcl:96
#: lib/option.tcl:96
-#, fuzzy, tcl-format
+#, tcl-format
msgid "%s Repository"
msgid "%s Repository"
-msgstr "版本树"
+msgstr "%s 版本库"
#: lib/option.tcl:97
msgid "Global (All Repositories)"
#: lib/option.tcl:97
msgid "Global (All Repositories)"
-msgstr ""
+msgstr "全局 (所有版本库)"
#: lib/option.tcl:103
msgid "User Name"
#: lib/option.tcl:103
msgid "User Name"
-msgstr ""
+msgstr "用户名"
#: lib/option.tcl:104
msgid "Email Address"
#: lib/option.tcl:104
msgid "Email Address"
-msgstr ""
+msgstr "Email 地址"
#: lib/option.tcl:106
#: lib/option.tcl:106
-#, fuzzy
msgid "Summarize Merge Commits"
msgid "Summarize Merge Commits"
-msgstr "修订合并提交描述:"
+msgstr "概述合并提交:"
#: lib/option.tcl:107
msgid "Merge Verbosity"
#: lib/option.tcl:107
msgid "Merge Verbosity"
-msgstr ""
+msgstr "合并冗余度"
#: lib/option.tcl:108
msgid "Show Diffstat After Merge"
#: lib/option.tcl:108
msgid "Show Diffstat After Merge"
-msgstr ""
+msgstr "在合并后显示 Diffstat"
#: lib/option.tcl:110
msgid "Trust File Modification Timestamps"
#: lib/option.tcl:110
msgid "Trust File Modification Timestamps"
-msgstr ""
+msgstr "相信文件的改动时间"
#: lib/option.tcl:111
msgid "Prune Tracking Branches During Fetch"
#: lib/option.tcl:111
msgid "Prune Tracking Branches During Fetch"
-msgstr ""
+msgstr "获取时清除跟踪分支"
#: lib/option.tcl:112
msgid "Match Tracking Branches"
#: lib/option.tcl:112
msgid "Match Tracking Branches"
-msgstr ""
+msgstr "匹配跟踪分支"
#: lib/option.tcl:113
msgid "Number of Diff Context Lines"
#: lib/option.tcl:113
msgid "Number of Diff Context Lines"
-msgstr ""
+msgstr "Diff 上下文行数"
#: lib/option.tcl:114
msgid "New Branch Name Template"
#: lib/option.tcl:114
msgid "New Branch Name Template"
-msgstr ""
+msgstr "新建分支命名模板"
#: lib/option.tcl:176
msgid "Change Font"
#: lib/option.tcl:176
msgid "Change Font"
-msgstr ""
+msgstr "更改字体"
#: lib/option.tcl:180
#, tcl-format
msgid "Choose %s"
#: lib/option.tcl:180
#, tcl-format
msgid "Choose %s"
-msgstr ""
+msgstr "选择 %s"
#: lib/option.tcl:186
msgid "pt."
#: lib/option.tcl:186
msgid "pt."
-msgstr ""
+msgstr "磅"
#: lib/option.tcl:200
msgid "Preferences"
#: lib/option.tcl:200
msgid "Preferences"
-msgstr ""
+msgstr "首选项"
#: lib/option.tcl:235
msgid "Failed to completely save options:"
#: 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 "上传"
+msgstr "无法完全保存选项:"
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
msgid "Delete Remote Branch"
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
msgid "Delete Remote Branch"
-msgstr ""
+msgstr "删除远端分支"
#: lib/remote_branch_delete.tcl:47
#: lib/remote_branch_delete.tcl:47
-#, fuzzy
msgid "From Repository"
msgid "From Repository"
-msgstr "版本树"
+msgstr "从版本库"
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
msgid "Remote:"
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
msgid "Remote:"
-msgstr ""
+msgstr "Remote:"
#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
msgid "Arbitrary URL:"
#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
msgid "Arbitrary URL:"
-msgstr ""
+msgstr "任意 URL:"
#: lib/remote_branch_delete.tcl:84
#: lib/remote_branch_delete.tcl:84
-#, fuzzy
msgid "Branches"
msgstr "分支"
#: lib/remote_branch_delete.tcl:109
msgid "Branches"
msgstr "分支"
#: lib/remote_branch_delete.tcl:109
-#, fuzzy
msgid "Delete Only If"
msgid "Delete Only If"
-msgstr "删除"
+msgstr "删除仅当"
#: lib/remote_branch_delete.tcl:111
msgid "Merged Into:"
#: lib/remote_branch_delete.tcl:111
msgid "Merged Into:"
-msgstr ""
+msgstr "合并到"
#: lib/remote_branch_delete.tcl:119
msgid "Always (Do not perform merge checks)"
#: lib/remote_branch_delete.tcl:119
msgid "Always (Do not perform merge checks)"
-msgstr ""
+msgstr "总是合并 (不作合并检查)"
#: lib/remote_branch_delete.tcl:152
msgid "A branch is required for 'Merged Into'."
#: lib/remote_branch_delete.tcl:152
msgid "A branch is required for 'Merged Into'."
-msgstr ""
+msgstr "'合并到' 需要指定某个分支"
#: lib/remote_branch_delete.tcl:184
#, tcl-format
#: lib/remote_branch_delete.tcl:184
#, tcl-format
"\n"
" - %s"
msgstr ""
"\n"
" - %s"
msgstr ""
+"下列分支没有被全部合并到 %s 中:\n"
+"\n"
+" - %s"
#: lib/remote_branch_delete.tcl:189
#, tcl-format
#: lib/remote_branch_delete.tcl:189
#, tcl-format
"One or more of the merge tests failed because you have not fetched the "
"necessary commits. Try fetching from %s first."
msgstr ""
"One or more of the merge tests failed because you have not fetched the "
"necessary commits. Try fetching from %s first."
msgstr ""
+"由于没有获取到必要的提交,一个或多个合并测试失败。请尝试从 %s 处先获取。"
#: lib/remote_branch_delete.tcl:207
msgid "Please select one or more branches to delete."
#: lib/remote_branch_delete.tcl:207
msgid "Please select one or more branches to delete."
-msgstr ""
+msgstr "请选择某个或多个分支来删除"
#: lib/remote_branch_delete.tcl:216
msgid ""
#: lib/remote_branch_delete.tcl:216
msgid ""
"\n"
"Delete the selected branches?"
msgstr ""
"\n"
"Delete the selected branches?"
msgstr ""
+"恢复被删除的分支非常困难.\n"
+"\n"
+"是否要删除所选分支?"
#: lib/remote_branch_delete.tcl:226
#, tcl-format
msgid "Deleting branches from %s"
#: lib/remote_branch_delete.tcl:226
#, tcl-format
msgid "Deleting branches from %s"
-msgstr ""
+msgstr "从 %s 中删除分支"
#: lib/remote_branch_delete.tcl:286
msgid "No repository selected."
#: lib/remote_branch_delete.tcl:286
msgid "No repository selected."
-msgstr ""
+msgstr "没有选择版本库"
#: lib/remote_branch_delete.tcl:291
#, tcl-format
msgid "Scanning %s..."
#: lib/remote_branch_delete.tcl:291
#, tcl-format
msgid "Scanning %s..."
-msgstr ""
+msgstr "正在扫描 %s..."
-#: lib/shortcut.tcl:26 lib/shortcut.tcl:74
-msgid "Cannot write script:"
-msgstr ""
+#: lib/remote.tcl:165
+msgid "Prune from"
+msgstr "从..清除(prune)"
+
+#: lib/remote.tcl:170
+msgid "Fetch from"
+msgstr "从..获取(fetch)"
+
+#: lib/remote.tcl:213
+msgid "Push to"
+msgstr "上传到(push)"
+
+#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
+msgid "Cannot write shortcut:"
+msgstr "无法修改快捷方式:"
-#: lib/shortcut.tcl:149
+#: lib/shortcut.tcl:136
msgid "Cannot write icon:"
msgid "Cannot write icon:"
-msgstr ""
+msgstr "无法修改图标:"
#: lib/status_bar.tcl:83
#, tcl-format
msgid "%s ... %*i of %*i %s (%3i%%)"
#: lib/status_bar.tcl:83
#, tcl-format
msgid "%s ... %*i of %*i %s (%3i%%)"
-msgstr ""
+msgstr "%s ... %*i of %*i %s (%3i%%)"
#: lib/transport.tcl:6
#: lib/transport.tcl:6
-#, fuzzy, tcl-format
+#, tcl-format
msgid "fetch %s"
msgid "fetch %s"
-msgstr "导入"
+msgstr "获取(fetch)"
#: lib/transport.tcl:7
#, tcl-format
msgid "Fetching new changes from %s"
#: lib/transport.tcl:7
#, tcl-format
msgid "Fetching new changes from %s"
-msgstr ""
+msgstr "从 %s 处获取新的改动"
#: lib/transport.tcl:18
#, tcl-format
msgid "remote prune %s"
#: lib/transport.tcl:18
#, tcl-format
msgid "remote prune %s"
-msgstr ""
+msgstr "清除远端 %s"
#: lib/transport.tcl:19
#, tcl-format
msgid "Pruning tracking branches deleted from %s"
#: lib/transport.tcl:19
#, tcl-format
msgid "Pruning tracking branches deleted from %s"
-msgstr ""
+msgstr "清除"
#: lib/transport.tcl:25 lib/transport.tcl:71
#, tcl-format
msgid "push %s"
#: lib/transport.tcl:25 lib/transport.tcl:71
#, tcl-format
msgid "push %s"
-msgstr ""
+msgstr "上传 %s"
#: lib/transport.tcl:26
#, tcl-format
msgid "Pushing changes to %s"
#: lib/transport.tcl:26
#, tcl-format
msgid "Pushing changes to %s"
-msgstr ""
+msgstr "上传改动到 %s"
#: lib/transport.tcl:72
#, tcl-format
msgid "Pushing %s %s to %s"
#: lib/transport.tcl:72
#, tcl-format
msgid "Pushing %s %s to %s"
-msgstr ""
+msgstr "上传 %s %s 到 %s"
#: lib/transport.tcl:89
#: lib/transport.tcl:89
-#, fuzzy
msgid "Push Branches"
msgid "Push Branches"
-msgstr "分支"
+msgstr "上传分支"
#: lib/transport.tcl:103
#: lib/transport.tcl:103
-#, fuzzy
msgid "Source Branches"
msgid "Source Branches"
-msgstr "当前分支:"
+msgstr "源端分支:"
#: lib/transport.tcl:120
#: lib/transport.tcl:120
-#, fuzzy
msgid "Destination Repository"
msgid "Destination Repository"
-msgstr "ç\89\88æ\9c¬æ \91"
+msgstr "ç\9b®æ \87ç\89\88æ\9c¬åº\93"
#: lib/transport.tcl:158
msgid "Transfer Options"
#: lib/transport.tcl:158
msgid "Transfer Options"
-msgstr ""
+msgstr "传输选项"
#: lib/transport.tcl:160
msgid "Force overwrite existing branch (may discard changes)"
#: lib/transport.tcl:160
msgid "Force overwrite existing branch (may discard changes)"
-msgstr ""
+msgstr "强制覆盖已有的分支 (可能会丢失改动)"
#: lib/transport.tcl:164
msgid "Use thin pack (for slow network connections)"
#: lib/transport.tcl:164
msgid "Use thin pack (for slow network connections)"
-msgstr ""
+msgstr "使用 thin pack (适用于低速网络连接)"
#: lib/transport.tcl:168
msgid "Include tags"
#: 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 "上传..."
+msgstr "包含标签"