1 # Translation of git-gui to Chinese
2 # Copyright (C) 2007 Shawn Pearce
3 # This file is distributed under the same license as the git-gui package.
4 # Xudong Guan <xudong.guan@gmail.com>, 2007.
6 # Please use the following translation throughout the file for consistence:
15 # fast forward 快速合并(??)
16 # stage 缓存 (译自 index/cache)
20 # 2008-01-06 Eric Miao <eric.y.miao@gmail.com>
21 # FIXME: checkout 的标准翻译
26 "Project-Id-Version: git-gui\n"
27 "Report-Msgid-Bugs-To: \n"
28 "POT-Creation-Date: 2007-11-24 10:36+0100\n"
29 "PO-Revision-Date: 2007-07-21 01:23-0700\n"
30 "Last-Translator: Eric Miao <eric.y.miao@gmail.com>\n"
31 "Language-Team: Chinese\n"
33 "Content-Type: text/plain; charset=UTF-8\n"
34 "Content-Transfer-Encoding: 8bit\n"
36 #: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
38 msgid "git-gui: fatal error"
39 msgstr "git-gui: 致命错误"
43 msgid "Invalid font specified in %s:"
51 msgid "Diff/Console Font"
55 msgid "Cannot find git in PATH."
56 msgstr "PATH 中没有找到 git"
59 msgid "Cannot parse Git version string:"
60 msgstr "无法解析 Git 的版本信息:"
65 "Git version cannot be determined.\n"
67 "%s claims it is version '%s'.\n"
69 "%s requires at least Git 1.5.0 or later.\n"
71 "Assume '%s' is version 1.5.0?\n"
77 "而 %s 需要 1.5.0 或这以后的 Git 版本.\n"
79 "是否假定 '%s' 为版本 1.5.0?\n"
82 msgid "Git directory not found:"
86 msgid "Cannot move to top of working directory:"
90 msgid "Cannot use funny .git directory:"
91 msgstr "无法使用 .git 目录:"
94 msgid "No working directory"
98 msgid "Refreshing file status..."
102 msgid "Scanning for modified files ..."
103 msgstr "扫描修改过的文件 ..."
105 #: git-gui.sh:1294 lib/browser.tcl:245
114 msgid "Modified, not staged"
117 #: git-gui.sh:1563 git-gui.sh:1568
118 msgid "Staged for commit"
121 #: git-gui.sh:1564 git-gui.sh:1569
122 msgid "Portions staged for commit"
125 #: git-gui.sh:1565 git-gui.sh:1570
126 msgid "Staged for commit, missing"
130 msgid "Untracked, not staged"
138 msgid "Staged for removal"
142 msgid "Staged for removal, still present"
145 #: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
146 msgid "Requires merge resolution"
150 msgid "Starting gitk... please wait..."
151 msgstr "启动 gitk... 请等待..."
156 "Unable to start gitk:\n"
164 #: git-gui.sh:1823 lib/choose_repository.tcl:35
166 msgstr "版本库(repository)"
172 #: git-gui.sh:1826 lib/choose_rev.tcl:560
176 #: git-gui.sh:1829 lib/choose_rev.tcl:547
180 #: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
184 #: git-gui.sh:1833 lib/choose_rev.tcl:556
189 msgid "Browse Current Branch's Files"
193 msgid "Browse Branch Files..."
197 msgid "Visualize Current Branch's History"
201 msgid "Visualize All Branch History"
206 msgid "Browse %s's Files"
211 msgid "Visualize %s's History"
214 #: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
215 msgid "Database Statistics"
218 #: git-gui.sh:1872 lib/database.tcl:34
219 msgid "Compress Database"
223 msgid "Verify Database"
226 #: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
227 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
228 msgid "Create Desktop Icon"
231 #: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
243 #: git-gui.sh:1909 git-gui.sh:2403
247 #: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
248 #: lib/console.tcl:67
252 #: git-gui.sh:1915 git-gui.sh:2409
256 #: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
257 #: lib/remote_branch_delete.tcl:38
261 #: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
277 #: git-gui.sh:1948 git-gui.sh:2048
283 msgstr "复位(Reset)..."
285 #: git-gui.sh:1965 git-gui.sh:2350
289 #: git-gui.sh:1973 git-gui.sh:2357
290 msgid "Amend Last Commit"
293 #: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
298 msgid "Stage To Commit"
302 msgid "Stage Changed Files To Commit"
306 msgid "Unstage From Commit"
309 #: git-gui.sh:2005 lib/index.tcl:393
310 msgid "Revert Changes"
313 #: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
315 msgstr "签名(Sign Off)"
317 #: git-gui.sh:2016 git-gui.sh:2333
322 msgid "Local Merge..."
326 msgid "Abort Merge..."
333 #: git-gui.sh:2055 lib/choose_repository.tcl:40
337 #: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
338 #: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
344 msgid "Preferences..."
347 #: git-gui.sh:2070 git-gui.sh:2595
351 #: git-gui.sh:2076 lib/choose_repository.tcl:46
356 msgid "Online Documentation"
361 msgid "fatal: cannot stat path %s: No such file or directory"
362 msgstr "致命错误: 无法获取路径 %s 的信息: 该文件或目录不存在"
365 msgid "Current Branch:"
369 msgid "Staged Changes (Will Commit)"
370 msgstr "已缓存的改动 (将被提交)"
373 msgid "Unstaged Changes"
377 msgid "Stage Changed"
380 #: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
385 msgid "Initial Commit Message:"
389 msgid "Amended Commit Message:"
393 msgid "Amended Initial Commit Message:"
397 msgid "Amended Merge Commit Message:"
401 msgid "Merge Commit Message:"
405 msgid "Commit Message:"
408 #: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
412 #: git-gui.sh:2443 lib/blame.tcl:104
421 msgid "Apply/Reverse Hunk"
425 msgid "Decrease Font Size"
429 msgid "Increase Font Size"
433 msgid "Show Less Context"
437 msgid "Show More Context"
441 msgid "Unstage Hunk From Commit"
445 msgid "Stage Hunk For Commit"
449 msgid "Initializing..."
455 "Possible environment issues exist.\n"
457 "The following environment variables are probably\n"
458 "going to be ignored by any Git subprocess run\n"
464 "由 %s 执行的 Git 子进程可能忽略下列环境变量:\n"
470 "This is due to a known issue with the\n"
471 "Tcl binary distributed by Cygwin."
474 "这是由 Cygwin 发布的 Tcl 代码中一个\n"
482 "A good replacement for %s\n"
483 "is placing values for the user.name and\n"
484 "user.email settings into your personal\n"
485 "~/.gitconfig file.\n"
489 "%s 的一个很好的替代方案是将 user.name 以及\n"
490 "user.email 设置放在你的个人 ~/.gitconfig 文件中.\n"
493 msgid "git-gui - a graphical user interface for Git."
494 msgstr "git-gui - Git 的图形化用户界面"
510 msgid "Reading %s..."
514 msgid "Loading copy/move tracking annotations..."
515 msgstr "装载复制/移动跟踪标注..."
518 msgid "lines annotated"
522 msgid "Loading original location annotations..."
526 msgid "Annotation complete."
530 msgid "Loading annotation..."
542 msgid "Original File:"
546 msgid "Originally By:"
554 msgid "Copied Or Moved Here By:"
557 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
558 msgid "Checkout Branch"
561 #: lib/branch_checkout.tcl:23
565 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
566 #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
567 #: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
568 #: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
572 #: lib/branch_checkout.tcl:32 lib/browser.tcl:286
576 #: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
580 #: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
581 msgid "Fetch Tracking Branch"
584 #: lib/branch_checkout.tcl:44
585 msgid "Detach From Local Branch"
588 #: lib/branch_create.tcl:22
589 msgid "Create Branch"
592 #: lib/branch_create.tcl:27
593 msgid "Create New Branch"
596 #: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
600 #: lib/branch_create.tcl:40
604 #: lib/branch_create.tcl:43
608 #: lib/branch_create.tcl:58
609 msgid "Match Tracking Branch Name"
612 #: lib/branch_create.tcl:66
613 msgid "Starting Revision"
616 #: lib/branch_create.tcl:72
617 msgid "Update Existing Branch:"
620 #: lib/branch_create.tcl:75
624 #: lib/branch_create.tcl:80
625 msgid "Fast Forward Only"
628 #: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
632 #: lib/branch_create.tcl:97
633 msgid "Checkout After Creation"
634 msgstr "在创建后Checkout"
636 #: lib/branch_create.tcl:131
637 msgid "Please select a tracking branch."
640 #: lib/branch_create.tcl:140
642 msgid "Tracking branch %s is not a branch in the remote repository."
643 msgstr "跟踪分支 %s 并不是远端版本库中的一个分支"
645 #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
646 msgid "Please supply a branch name."
649 #: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
651 msgid "'%s' is not an acceptable branch name."
652 msgstr "'%s'不是一个可接受的分支名."
654 #: lib/branch_delete.tcl:15
655 msgid "Delete Branch"
658 #: lib/branch_delete.tcl:20
659 msgid "Delete Local Branch"
662 #: lib/branch_delete.tcl:37
663 msgid "Local Branches"
666 #: lib/branch_delete.tcl:52
667 msgid "Delete Only If Merged Into"
670 #: lib/branch_delete.tcl:54
671 msgid "Always (Do not perform merge test.)"
672 msgstr "总是合并 (不作合并测试.)"
674 #: lib/branch_delete.tcl:103
676 msgid "The following branches are not completely merged into %s:"
677 msgstr "下列分支没有完全被合并到 %s:"
679 #: lib/branch_delete.tcl:115
681 "Recovering deleted branches is difficult. \n"
683 " Delete the selected branches?"
689 #: lib/branch_delete.tcl:141
692 "Failed to delete branches:\n"
698 #: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
699 msgid "Rename Branch"
702 #: lib/branch_rename.tcl:26
706 #: lib/branch_rename.tcl:36
710 #: lib/branch_rename.tcl:39
714 #: lib/branch_rename.tcl:75
715 msgid "Please select a branch to rename."
718 #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
720 msgid "Branch '%s' already exists."
721 msgstr "分支 '%s' 已经存在."
723 #: lib/branch_rename.tcl:117
725 msgid "Failed to rename '%s'."
728 #: lib/browser.tcl:17
732 #: lib/browser.tcl:26
736 #: lib/browser.tcl:125 lib/browser.tcl:142
738 msgid "Loading %s..."
741 #: lib/browser.tcl:186
742 msgid "[Up To Parent]"
745 #: lib/browser.tcl:266 lib/browser.tcl:272
746 msgid "Browse Branch Files"
749 #: lib/browser.tcl:277 lib/choose_repository.tcl:391
750 #: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
751 #: lib/choose_repository.tcl:989
755 #: lib/checkout_op.tcl:79
757 msgid "Fetching %s from %s"
760 #: lib/checkout_op.tcl:127
762 msgid "fatal: Cannot resolve %s"
763 msgstr "致命错误: 无法解决 %s"
765 #: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
769 #: lib/checkout_op.tcl:169
771 msgid "Branch '%s' does not exist."
772 msgstr "分支 '%s' 并不存在."
774 #: lib/checkout_op.tcl:206
777 "Branch '%s' already exists.\n"
779 "It cannot fast-forward to %s.\n"
780 "A merge is required."
787 #: lib/checkout_op.tcl:220
789 msgid "Merge strategy '%s' not supported."
790 msgstr "合并策略 '%s' 不支持."
792 #: lib/checkout_op.tcl:239
794 msgid "Failed to update '%s'."
797 #: lib/checkout_op.tcl:251
798 msgid "Staging area (index) is already locked."
799 msgstr "缓存区域 (index) 已被锁定."
801 #: lib/checkout_op.tcl:266
803 "Last scanned state does not match repository state.\n"
805 "Another Git program has modified this repository since the last scan. A "
806 "rescan must be performed before the current branch can be changed.\n"
808 "The rescan will be automatically started now.\n"
810 "最后一次扫描的状态和当前版本库状态不符.\n"
812 "另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
817 #: lib/checkout_op.tcl:322
819 msgid "Updating working directory to '%s'..."
820 msgstr "更新工作目录到 '%s'..."
822 #: lib/checkout_op.tcl:353
824 msgid "Aborted checkout of '%s' (file level merging is required)."
825 msgstr "中止 '%s' 的 checkout 操作 (需要做文件级合并)."
827 #: lib/checkout_op.tcl:354
828 msgid "File level merge required."
831 #: lib/checkout_op.tcl:358
833 msgid "Staying on branch '%s'."
836 #: lib/checkout_op.tcl:429
838 "You are no longer on a local branch.\n"
840 "If you wanted to be on a branch, create one now starting from 'This Detached "
845 "如果你想位于某分支上, 从当前脱节的Checkout中创建一个新分支."
847 #: lib/checkout_op.tcl:446
849 msgid "Checked out '%s'."
850 msgstr "'%s' 已被 checkout"
852 #: lib/checkout_op.tcl:478
854 msgid "Resetting '%s' to '%s' will lose the following commits:"
855 msgstr "复位 '%s' 到 '%s' 将导致下列提交的丢失:"
857 #: lib/checkout_op.tcl:500
858 msgid "Recovering lost commits may not be easy."
859 msgstr "恢复丢失的提交是比较困难的."
861 #: lib/checkout_op.tcl:505
866 #: lib/checkout_op.tcl:510 lib/merge.tcl:164
870 #: lib/checkout_op.tcl:578
873 "Failed to set current branch.\n"
875 "This working directory is only partially switched. We successfully updated "
876 "your files, but failed to update an internal Git file.\n"
878 "This should not have occurred. %s will now close and give up."
882 "当前工作目录仅有部分被切换出, 我们已成功的更新了您的文件但是无法更新某个内部"
887 #: lib/choose_font.tcl:39
891 #: lib/choose_font.tcl:53
895 #: lib/choose_font.tcl:73
899 #: lib/choose_font.tcl:90
903 #: lib/choose_font.tcl:101
905 "This is example text.\n"
906 "If you like this text, it can be your font."
911 #: lib/choose_repository.tcl:27
915 #: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
916 msgid "Create New Repository"
919 #: lib/choose_repository.tcl:86
923 #: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
924 msgid "Clone Existing Repository"
927 #: lib/choose_repository.tcl:99
931 #: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
932 msgid "Open Existing Repository"
935 #: lib/choose_repository.tcl:112
939 #: lib/choose_repository.tcl:125
940 msgid "Recent Repositories"
943 #: lib/choose_repository.tcl:131
944 msgid "Open Recent Repository:"
947 #: lib/choose_repository.tcl:294
949 msgid "Location %s already exists."
952 #: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
953 #: lib/choose_repository.tcl:314
955 msgid "Failed to create repository %s:"
958 #: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
962 #: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
963 #: lib/choose_repository.tcl:1013
964 msgid "Git Repository"
967 #: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
969 msgid "Directory %s already exists."
972 #: lib/choose_repository.tcl:442
974 msgid "File %s already exists."
977 #: lib/choose_repository.tcl:463
981 #: lib/choose_repository.tcl:476
985 #: lib/choose_repository.tcl:496
989 #: lib/choose_repository.tcl:502
990 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
991 msgstr "标准方式 (快速, 部分备份, 作硬连接)"
993 #: lib/choose_repository.tcl:508
994 msgid "Full Copy (Slower, Redundant Backup)"
995 msgstr "全部复制 (较慢, 做备份)"
997 #: lib/choose_repository.tcl:514
998 msgid "Shared (Fastest, Not Recommended, No Backup)"
999 msgstr "共享方式 (最快, 不推荐, 不做备份)"
1001 #: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
1002 #: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
1003 #: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
1005 msgid "Not a Git repository: %s"
1006 msgstr "不是一个 Git 版本库: %s"
1008 #: lib/choose_repository.tcl:586
1009 msgid "Standard only available for local repository."
1010 msgstr "标准方式仅当是本地版本库时有效."
1012 #: lib/choose_repository.tcl:590
1013 msgid "Shared only available for local repository."
1014 msgstr "共享方式仅当是本地版本库时有效."
1016 #: lib/choose_repository.tcl:617
1017 msgid "Failed to configure origin"
1018 msgstr "无法配置 origin"
1020 #: lib/choose_repository.tcl:629
1021 msgid "Counting objects"
1024 #: lib/choose_repository.tcl:630
1029 #: lib/choose_repository.tcl:654
1031 msgid "Unable to copy objects/info/alternates: %s"
1032 msgstr "无法复制 objects/info/alternates: %s"
1034 #: lib/choose_repository.tcl:690
1036 msgid "Nothing to clone from %s."
1037 msgstr "没有东西可从 %s 克隆."
1039 #: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
1040 #: lib/choose_repository.tcl:918
1041 msgid "The 'master' branch has not been initialized."
1042 msgstr "'master'分支尚未初始化."
1044 #: lib/choose_repository.tcl:705
1045 msgid "Hardlinks are unavailable. Falling back to copying."
1046 msgstr "硬连接不可用. 使用复制."
1048 #: lib/choose_repository.tcl:717
1050 msgid "Cloning from %s"
1053 #: lib/choose_repository.tcl:748
1054 msgid "Copying objects"
1057 #: lib/choose_repository.tcl:749
1061 #: lib/choose_repository.tcl:773
1063 msgid "Unable to copy object: %s"
1064 msgstr "无法复制 object: %s"
1066 #: lib/choose_repository.tcl:783
1067 msgid "Linking objects"
1070 #: lib/choose_repository.tcl:784
1074 #: lib/choose_repository.tcl:792
1076 msgid "Unable to hardlink object: %s"
1077 msgstr "无法硬链接 object: %s"
1079 #: lib/choose_repository.tcl:847
1080 msgid "Cannot fetch branches and objects. See console output for details."
1081 msgstr "无法获取分支和对象. 请查看控制终端的输出."
1083 #: lib/choose_repository.tcl:858
1084 msgid "Cannot fetch tags. See console output for details."
1085 msgstr "无法获取标签. 请查看控制终端的输出."
1087 #: lib/choose_repository.tcl:882
1088 msgid "Cannot determine HEAD. See console output for details."
1089 msgstr "无法确定 HEAD. 请查看控制终端的输出."
1091 #: lib/choose_repository.tcl:891
1093 msgid "Unable to cleanup %s"
1096 #: lib/choose_repository.tcl:897
1097 msgid "Clone failed."
1100 #: lib/choose_repository.tcl:904
1101 msgid "No default branch obtained."
1104 #: lib/choose_repository.tcl:915
1106 msgid "Cannot resolve %s as a commit."
1107 msgstr "无法解析 %s 为提交."
1109 #: lib/choose_repository.tcl:927
1110 msgid "Creating working directory"
1113 #: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
1114 #: lib/index.tcl:193
1118 #: lib/choose_repository.tcl:957
1119 msgid "Initial file checkout failed."
1120 msgstr "初始的文件checkout失败"
1122 #: lib/choose_repository.tcl:973
1126 #: lib/choose_repository.tcl:983
1130 #: lib/choose_repository.tcl:1033
1132 msgid "Failed to open repository %s:"
1133 msgstr "无法打开版本库 %s:"
1135 #: lib/choose_rev.tcl:53
1136 msgid "This Detached Checkout"
1137 msgstr "该脱节的Checkout"
1139 #: lib/choose_rev.tcl:60
1140 msgid "Revision Expression:"
1143 #: lib/choose_rev.tcl:74
1144 msgid "Local Branch"
1147 #: lib/choose_rev.tcl:79
1148 msgid "Tracking Branch"
1151 #: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1155 #: lib/choose_rev.tcl:317
1157 msgid "Invalid revision: %s"
1160 #: lib/choose_rev.tcl:338
1161 msgid "No revision selected."
1164 #: lib/choose_rev.tcl:346
1165 msgid "Revision expression is empty."
1168 #: lib/choose_rev.tcl:530
1172 #: lib/choose_rev.tcl:558
1178 "There is nothing to amend.\n"
1180 "You are about to create the initial commit. There is no commit before this "
1185 "你正在创建最初的提交. 在此之前没有提交可以修正.\n"
1187 #: lib/commit.tcl:18
1189 "Cannot amend while merging.\n"
1191 "You are currently in the middle of a merge that has not been fully "
1192 "completed. You cannot amend the prior commit unless you first abort the "
1193 "current merge activity.\n"
1197 "你当前正在一次尚未完成的合并操作过程中. 除非中止当前合并活动,\n"
1200 #: lib/commit.tcl:49
1201 msgid "Error loading commit data for amend:"
1202 msgstr "为修正装载提交数据出错:"
1204 #: lib/commit.tcl:76
1205 msgid "Unable to obtain your identity:"
1208 #: lib/commit.tcl:81
1209 msgid "Invalid GIT_COMMITTER_IDENT:"
1210 msgstr "无效的 GIT_COMMITTER_IDENT"
1212 #: lib/commit.tcl:133
1214 "Last scanned state does not match repository state.\n"
1216 "Another Git program has modified this repository since the last scan. A "
1217 "rescan must be performed before another commit can be created.\n"
1219 "The rescan will be automatically started now.\n"
1221 "最后一次扫描的状态和当前版本库状态不符.\n"
1223 "另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
1228 #: lib/commit.tcl:154
1231 "Unmerged files cannot be committed.\n"
1233 "File %s has merge conflicts. You must resolve them and stage the file "
1234 "before committing.\n"
1238 "文件 %s 有合并冲突, 你必须解决这些冲突并缓存该文件作提交.\n"
1240 #: lib/commit.tcl:162
1243 "Unknown file state %s detected.\n"
1245 "File %s cannot be committed by this program.\n"
1251 #: lib/commit.tcl:170
1253 "No changes to commit.\n"
1255 "You must stage at least 1 file before you can commit.\n"
1259 "提交前你必须首先缓存至少一个文件.\n"
1261 #: lib/commit.tcl:183
1263 "Please supply a commit message.\n"
1265 "A good commit message has the following format:\n"
1267 "- First line: Describe in one sentence what you did.\n"
1268 "- Second line: Blank\n"
1269 "- Remaining lines: Describe why this change is good.\n"
1275 "- 第一行: 一句话概括你做的修改.\n"
1277 "- 剩余行: 请描述为什么你做的这些改动是好的.\n"
1279 #: lib/commit.tcl:257
1280 msgid "write-tree failed:"
1281 msgstr "write-tree 失败:"
1283 #: lib/commit.tcl:275
1285 msgid "Commit %s appears to be corrupt"
1286 msgstr "提交 %s 似乎已损坏"
1288 #: lib/commit.tcl:279
1290 "No changes to commit.\n"
1292 "No files were modified by this commit and it was not a merge commit.\n"
1294 "A rescan will be automatically started now.\n"
1298 "该提交没有改动任何文件也不是一个合并提交.\n"
1302 #: lib/commit.tcl:286
1303 msgid "No changes to commit."
1306 #: lib/commit.tcl:303
1308 msgid "warning: Tcl does not support encoding '%s'."
1309 msgstr "警告: Tcl 不支持编码方式 '%s'."
1311 #: lib/commit.tcl:317
1312 msgid "commit-tree failed:"
1313 msgstr "commit-tree 失败:"
1315 #: lib/commit.tcl:339
1316 msgid "update-ref failed:"
1317 msgstr "update-ref 失败:"
1319 #: lib/commit.tcl:430
1321 msgid "Created commit %s: %s"
1322 msgstr "创建了 commit %s: %s"
1324 #: lib/console.tcl:57
1325 msgid "Working... please wait..."
1326 msgstr "工作中... 请等待..."
1328 #: lib/console.tcl:183
1332 #: lib/console.tcl:196
1333 msgid "Error: Command Failed"
1336 #: lib/database.tcl:43
1337 msgid "Number of loose objects"
1340 #: lib/database.tcl:44
1341 msgid "Disk space used by loose objects"
1342 msgstr "松散对象所使用的磁盘空间"
1344 #: lib/database.tcl:45
1345 msgid "Number of packed objects"
1348 #: lib/database.tcl:46
1349 msgid "Number of packs"
1352 #: lib/database.tcl:47
1353 msgid "Disk space used by packed objects"
1354 msgstr "压缩对象所使用的磁盘空间"
1356 #: lib/database.tcl:48
1357 msgid "Packed objects waiting for pruning"
1360 #: lib/database.tcl:49
1361 msgid "Garbage files"
1364 #: lib/database.tcl:72
1365 msgid "Compressing the object database"
1368 #: lib/database.tcl:83
1369 msgid "Verifying the object database with fsck-objects"
1370 msgstr "使用 fsck-objects 验证对象数据库"
1372 #: lib/database.tcl:108
1375 "This repository currently has approximately %i loose objects.\n"
1377 "To maintain optimal performance it is strongly recommended that you compress "
1378 "the database when more than %i loose objects exist.\n"
1380 "Compress the database now?"
1382 "该版本库当前约有 %i 个松散对象.\n"
1384 "为达到较优的性能,强烈建议你在松散对象多于 %i 时压缩数据库.\n"
1390 msgid "Invalid date from Git: %s"
1396 "No differences detected.\n"
1398 "%s has no changes.\n"
1400 "The modification date of this file was updated by another application, but "
1401 "the content within the file was not changed.\n"
1403 "A rescan will be automatically started to find other files which may have "
1408 "该文件的修改日期被另一个程序所更新, 但其内容并没有变化.\n"
1410 "对于类似情况的其他文件的重新扫描将自动开始."
1413 #, fuzzy, tcl-format
1414 msgid "Loading diff of %s..."
1415 msgstr "装载 %s 的 diff ..."
1417 #: lib/diff.tcl:114 lib/diff.tcl:184
1419 msgid "Unable to display %s"
1423 msgid "Error loading file:"
1427 msgid "Git Repository (subproject)"
1428 msgstr "Git 版本库 (子项目)"
1431 msgid "* Binary file (not showing content)."
1432 msgstr "* 二进制文件 (不显示内容)."
1435 msgid "Error loading diff:"
1436 msgstr "装载 diff 错误:"
1439 msgid "Failed to unstage selected hunk."
1440 msgstr "无法将选择的代码段从缓存中删除."
1443 msgid "Failed to stage selected hunk."
1446 #: lib/error.tcl:12 lib/error.tcl:102
1455 msgid "You must correct the above errors before committing."
1456 msgstr "你必须在提交前修正上述错误."
1459 msgid "Unable to unlock the index."
1460 msgstr "无法解锁缓存 (index)"
1464 msgstr "缓存(Index)错误"
1468 "Updating the Git index failed. A rescan will be automatically started to "
1469 "resynchronize git-gui."
1470 msgstr "更新 Git 缓存(Index)失败, 重新扫描将自动开始以重新同步 git-gui."
1477 msgid "Unlock Index"
1480 #: lib/index.tcl:282
1482 msgid "Unstaging %s from commit"
1483 msgstr "从提交缓存中删除 %s"
1485 #: lib/index.tcl:326
1490 #: lib/index.tcl:381
1492 msgid "Revert changes in file %s?"
1493 msgstr "撤销文件 %s 中的改动?"
1495 #: lib/index.tcl:383
1497 msgid "Revert changes in these %i files?"
1498 msgstr "撤销这些 (%i个) 文件的改动?"
1500 #: lib/index.tcl:389
1501 msgid "Any unstaged changes will be permanently lost by the revert."
1502 msgstr "任何未缓存的改动将在这次撤销中永久丢失."
1504 #: lib/index.tcl:392
1510 "Cannot merge while amending.\n"
1512 "You must finish amending this commit before starting any type of merge.\n"
1516 "你必须完成对该提交的修正才能继续任何类型的合并操作.\n"
1520 "Last scanned state does not match repository state.\n"
1522 "Another Git program has modified this repository since the last scan. A "
1523 "rescan must be performed before a merge can be performed.\n"
1525 "The rescan will be automatically started now.\n"
1527 "最后一次扫描的状态和当前版本库状态不符.\n"
1529 "另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
1537 "You are in the middle of a conflicted merge.\n"
1539 "File %s has merge conflicts.\n"
1541 "You must resolve them, stage the file, and commit to complete the current "
1542 "merge. Only then can you begin another merge.\n"
1544 "你正处在一个有冲突的合并操作中.\n"
1548 "你必须解决这些冲突, 缓存该文件, 并提交来完成当前的合并.仅当这样后才能开始下一"
1554 "You are in the middle of a change.\n"
1556 "File %s is modified.\n"
1558 "You should complete the current commit before starting a merge. Doing so "
1559 "will help you abort a failed merge, should the need arise.\n"
1565 "你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于"
1568 #: lib/merge.tcl:106
1573 #: lib/merge.tcl:119
1575 msgid "Merging %s and %s"
1578 #: lib/merge.tcl:131
1579 msgid "Merge completed successfully."
1582 #: lib/merge.tcl:133
1583 msgid "Merge failed. Conflict resolution is required."
1584 msgstr "合并失败. 需要解决冲突."
1586 #: lib/merge.tcl:158
1588 msgid "Merge Into %s"
1591 #: lib/merge.tcl:177
1592 msgid "Revision To Merge"
1595 #: lib/merge.tcl:212
1597 "Cannot abort while amending.\n"
1599 "You must finish amending this commit.\n"
1605 #: lib/merge.tcl:222
1609 "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
1611 "Continue with aborting the current merge?"
1615 "中止当前的合并操作将导致 *所有* 尚未提交的改动丢失.\n"
1619 #: lib/merge.tcl:228
1623 "Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
1625 "Continue with resetting the current changes?"
1629 "复位当前的改动将导致 *所有* 未提交的改动丢失.\n"
1633 #: lib/merge.tcl:239
1637 #: lib/merge.tcl:266
1638 msgid "Abort failed."
1641 #: lib/merge.tcl:268
1642 msgid "Abort completed. Ready."
1645 #: lib/option.tcl:82
1646 msgid "Restore Defaults"
1649 #: lib/option.tcl:86
1653 #: lib/option.tcl:96
1655 msgid "%s Repository"
1658 #: lib/option.tcl:97
1659 msgid "Global (All Repositories)"
1662 #: lib/option.tcl:103
1666 #: lib/option.tcl:104
1667 msgid "Email Address"
1670 #: lib/option.tcl:106
1671 msgid "Summarize Merge Commits"
1674 #: lib/option.tcl:107
1675 msgid "Merge Verbosity"
1678 #: lib/option.tcl:108
1679 msgid "Show Diffstat After Merge"
1680 msgstr "在合并后显示 Diffstat"
1682 #: lib/option.tcl:110
1683 msgid "Trust File Modification Timestamps"
1686 #: lib/option.tcl:111
1687 msgid "Prune Tracking Branches During Fetch"
1690 #: lib/option.tcl:112
1691 msgid "Match Tracking Branches"
1694 #: lib/option.tcl:113
1695 msgid "Number of Diff Context Lines"
1698 #: lib/option.tcl:114
1699 msgid "New Branch Name Template"
1702 #: lib/option.tcl:176
1706 #: lib/option.tcl:180
1711 #: lib/option.tcl:186
1715 #: lib/option.tcl:200
1719 #: lib/option.tcl:235
1720 msgid "Failed to completely save options:"
1723 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1724 msgid "Delete Remote Branch"
1727 #: lib/remote_branch_delete.tcl:47
1728 msgid "From Repository"
1731 #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
1735 #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
1736 msgid "Arbitrary URL:"
1739 #: lib/remote_branch_delete.tcl:84
1743 #: lib/remote_branch_delete.tcl:109
1744 msgid "Delete Only If"
1747 #: lib/remote_branch_delete.tcl:111
1748 msgid "Merged Into:"
1751 #: lib/remote_branch_delete.tcl:119
1752 msgid "Always (Do not perform merge checks)"
1753 msgstr "总是合并 (不作合并检查)"
1755 #: lib/remote_branch_delete.tcl:152
1756 msgid "A branch is required for 'Merged Into'."
1757 msgstr "'合并到' 需要指定某个分支"
1759 #: lib/remote_branch_delete.tcl:184
1762 "The following branches are not completely merged into %s:\n"
1766 "下列分支没有被全部合并到 %s 中:\n"
1770 #: lib/remote_branch_delete.tcl:189
1773 "One or more of the merge tests failed because you have not fetched the "
1774 "necessary commits. Try fetching from %s first."
1776 "由于没有获取到必要的提交,一个或多个合并测试失败。请尝试从 %s 处先获取。"
1778 #: lib/remote_branch_delete.tcl:207
1779 msgid "Please select one or more branches to delete."
1780 msgstr "请选择某个或多个分支来删除"
1782 #: lib/remote_branch_delete.tcl:216
1784 "Recovering deleted branches is difficult.\n"
1786 "Delete the selected branches?"
1792 #: lib/remote_branch_delete.tcl:226
1794 msgid "Deleting branches from %s"
1797 #: lib/remote_branch_delete.tcl:286
1798 msgid "No repository selected."
1801 #: lib/remote_branch_delete.tcl:291
1803 msgid "Scanning %s..."
1806 #: lib/remote.tcl:165
1808 msgstr "从..清除(prune)"
1810 #: lib/remote.tcl:170
1812 msgstr "从..获取(fetch)"
1814 #: lib/remote.tcl:213
1818 #: lib/shortcut.tcl:20 lib/shortcut.tcl:61
1819 msgid "Cannot write shortcut:"
1822 #: lib/shortcut.tcl:136
1823 msgid "Cannot write icon:"
1826 #: lib/status_bar.tcl:83
1828 msgid "%s ... %*i of %*i %s (%3i%%)"
1829 msgstr "%s ... %*i of %*i %s (%3i%%)"
1831 #: lib/transport.tcl:6
1836 #: lib/transport.tcl:7
1838 msgid "Fetching new changes from %s"
1839 msgstr "从 %s 处获取新的改动"
1841 #: lib/transport.tcl:18
1843 msgid "remote prune %s"
1846 #: lib/transport.tcl:19
1848 msgid "Pruning tracking branches deleted from %s"
1851 #: lib/transport.tcl:25 lib/transport.tcl:71
1856 #: lib/transport.tcl:26
1858 msgid "Pushing changes to %s"
1861 #: lib/transport.tcl:72
1863 msgid "Pushing %s %s to %s"
1864 msgstr "上传 %s %s 到 %s"
1866 #: lib/transport.tcl:89
1867 msgid "Push Branches"
1870 #: lib/transport.tcl:103
1871 msgid "Source Branches"
1874 #: lib/transport.tcl:120
1875 msgid "Destination Repository"
1878 #: lib/transport.tcl:158
1879 msgid "Transfer Options"
1882 #: lib/transport.tcl:160
1883 msgid "Force overwrite existing branch (may discard changes)"
1884 msgstr "强制覆盖已有的分支 (可能会丢失改动)"
1886 #: lib/transport.tcl:164
1887 msgid "Use thin pack (for slow network connections)"
1888 msgstr "使用 thin pack (适用于低速网络连接)"
1890 #: lib/transport.tcl:168
1891 msgid "Include tags"