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: 2008-03-14 07:18+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:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
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"
97 #: git-gui.sh:1084 lib/checkout_op.tcl:283
98 msgid "Refreshing file status..."
102 msgid "Scanning for modified files ..."
103 msgstr "扫描修改过的文件 ..."
105 #: git-gui.sh:1324 lib/browser.tcl:246
114 msgid "Modified, not staged"
117 #: git-gui.sh:1593 git-gui.sh:1598
118 msgid "Staged for commit"
121 #: git-gui.sh:1594 git-gui.sh:1599
122 msgid "Portions staged for commit"
125 #: git-gui.sh:1595 git-gui.sh:1600
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:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
146 msgid "Requires merge resolution"
150 msgid "Starting gitk... please wait..."
151 msgstr "启动 gitk... 请等待..."
156 "Unable to start gitk:\n"
164 #: git-gui.sh:1860 lib/choose_repository.tcl:36
166 msgstr "版本库(repository)"
172 #: git-gui.sh:1863 lib/choose_rev.tcl:561
176 #: git-gui.sh:1866 lib/choose_rev.tcl:548
180 #: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
184 #: git-gui.sh:1870 lib/choose_rev.tcl:557
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:1906 lib/database.tcl:27 lib/database.tcl:67
215 msgid "Database Statistics"
218 #: git-gui.sh:1909 lib/database.tcl:34
219 msgid "Compress Database"
223 msgid "Verify Database"
226 #: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
227 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
228 msgid "Create Desktop Icon"
231 #: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
243 #: git-gui.sh:1946 git-gui.sh:2443
247 #: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
248 #: lib/console.tcl:69
252 #: git-gui.sh:1952 git-gui.sh:2449
256 #: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
257 #: lib/remote_branch_delete.tcl:38
261 #: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
277 #: git-gui.sh:1985 git-gui.sh:2085
283 msgstr "复位(Reset)..."
285 #: git-gui.sh:2002 git-gui.sh:2389
289 #: git-gui.sh:2010 git-gui.sh:2396
290 msgid "Amend Last Commit"
293 #: git-gui.sh:2019 git-gui.sh:2356 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:2042 lib/index.tcl:395
310 msgid "Revert Changes"
313 #: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
315 msgstr "签名(Sign Off)"
317 #: git-gui.sh:2053 git-gui.sh:2372
322 msgid "Local Merge..."
326 msgid "Abort Merge..."
333 #: git-gui.sh:2092 lib/choose_repository.tcl:41
337 #: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
338 #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
344 msgid "Preferences..."
347 #: git-gui.sh:2107 git-gui.sh:2639
351 #: git-gui.sh:2113 lib/choose_repository.tcl:47
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:2378 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:2459 git-gui.sh:2622 lib/console.tcl:73
412 #: git-gui.sh:2483 lib/blame.tcl:107
417 msgid "Apply/Reverse Hunk"
421 msgid "Show Less Context"
425 msgid "Show More Context"
433 msgid "Decrease Font Size"
437 msgid "Increase Font Size"
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:282
567 #: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
568 #: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
572 #: lib/branch_checkout.tcl:32 lib/browser.tcl:287
576 #: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
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:371
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:141
682 "Failed to delete branches:\n"
688 #: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
689 msgid "Rename Branch"
692 #: lib/branch_rename.tcl:26
696 #: lib/branch_rename.tcl:36
700 #: lib/branch_rename.tcl:39
704 #: lib/branch_rename.tcl:75
705 msgid "Please select a branch to rename."
708 #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
710 msgid "Branch '%s' already exists."
711 msgstr "分支 '%s' 已经存在."
713 #: lib/branch_rename.tcl:117
715 msgid "Failed to rename '%s'."
718 #: lib/browser.tcl:17
722 #: lib/browser.tcl:26
726 #: lib/browser.tcl:126 lib/browser.tcl:143
728 msgid "Loading %s..."
731 #: lib/browser.tcl:187
732 msgid "[Up To Parent]"
735 #: lib/browser.tcl:267 lib/browser.tcl:273
736 msgid "Browse Branch Files"
739 #: lib/browser.tcl:278 lib/choose_repository.tcl:387
740 #: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
741 #: lib/choose_repository.tcl:987
745 #: lib/checkout_op.tcl:79
747 msgid "Fetching %s from %s"
750 #: lib/checkout_op.tcl:127
752 msgid "fatal: Cannot resolve %s"
753 msgstr "致命错误: 无法解决 %s"
755 #: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
759 #: lib/checkout_op.tcl:169
761 msgid "Branch '%s' does not exist."
762 msgstr "分支 '%s' 并不存在."
764 #: lib/checkout_op.tcl:206
767 "Branch '%s' already exists.\n"
769 "It cannot fast-forward to %s.\n"
770 "A merge is required."
777 #: lib/checkout_op.tcl:220
779 msgid "Merge strategy '%s' not supported."
780 msgstr "合并策略 '%s' 不支持."
782 #: lib/checkout_op.tcl:239
784 msgid "Failed to update '%s'."
787 #: lib/checkout_op.tcl:251
788 msgid "Staging area (index) is already locked."
789 msgstr "缓存区域 (index) 已被锁定."
791 #: lib/checkout_op.tcl:266
793 "Last scanned state does not match repository state.\n"
795 "Another Git program has modified this repository since the last scan. A "
796 "rescan must be performed before the current branch can be changed.\n"
798 "The rescan will be automatically started now.\n"
800 "最后一次扫描的状态和当前版本库状态不符.\n"
802 "另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
807 #: lib/checkout_op.tcl:322
809 msgid "Updating working directory to '%s'..."
810 msgstr "更新工作目录到 '%s'..."
812 #: lib/checkout_op.tcl:323
813 msgid "files checked out"
816 #: lib/checkout_op.tcl:353
818 msgid "Aborted checkout of '%s' (file level merging is required)."
819 msgstr "中止 '%s' 的 checkout 操作 (需要做文件级合并)."
821 #: lib/checkout_op.tcl:354
822 msgid "File level merge required."
825 #: lib/checkout_op.tcl:358
827 msgid "Staying on branch '%s'."
830 #: lib/checkout_op.tcl:429
832 "You are no longer on a local branch.\n"
834 "If you wanted to be on a branch, create one now starting from 'This Detached "
839 "如果你想位于某分支上, 从当前脱节的Checkout中创建一个新分支."
841 #: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
843 msgid "Checked out '%s'."
844 msgstr "'%s' 已被 checkout"
846 #: lib/checkout_op.tcl:478
848 msgid "Resetting '%s' to '%s' will lose the following commits:"
849 msgstr "复位 '%s' 到 '%s' 将导致下列提交的丢失:"
851 #: lib/checkout_op.tcl:500
852 msgid "Recovering lost commits may not be easy."
853 msgstr "恢复丢失的提交是比较困难的."
855 #: lib/checkout_op.tcl:505
860 #: lib/checkout_op.tcl:510 lib/merge.tcl:163
864 #: lib/checkout_op.tcl:578
867 "Failed to set current branch.\n"
869 "This working directory is only partially switched. We successfully updated "
870 "your files, but failed to update an internal Git file.\n"
872 "This should not have occurred. %s will now close and give up."
876 "当前工作目录仅有部分被切换出, 我们已成功的更新了您的文件但是无法更新某个内部"
881 #: lib/choose_font.tcl:39
885 #: lib/choose_font.tcl:53
889 #: lib/choose_font.tcl:74
893 #: lib/choose_font.tcl:91
897 #: lib/choose_font.tcl:103
899 "This is example text.\n"
900 "If you like this text, it can be your font."
905 #: lib/choose_repository.tcl:28
909 #: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
910 msgid "Create New Repository"
913 #: lib/choose_repository.tcl:87
917 #: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
918 msgid "Clone Existing Repository"
921 #: lib/choose_repository.tcl:100
925 #: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
926 msgid "Open Existing Repository"
929 #: lib/choose_repository.tcl:113
933 #: lib/choose_repository.tcl:126
934 msgid "Recent Repositories"
937 #: lib/choose_repository.tcl:132
938 msgid "Open Recent Repository:"
941 #: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
942 #: lib/choose_repository.tcl:310
944 msgid "Failed to create repository %s:"
947 #: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
951 #: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
952 #: lib/choose_repository.tcl:1011
953 msgid "Git Repository"
956 #: lib/choose_repository.tcl:437
958 msgid "Directory %s already exists."
961 #: lib/choose_repository.tcl:441
963 msgid "File %s already exists."
966 #: lib/choose_repository.tcl:455
970 #: lib/choose_repository.tcl:468
974 #: lib/choose_repository.tcl:489
978 #: lib/choose_repository.tcl:495
979 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
980 msgstr "标准方式 (快速, 部分备份, 作硬连接)"
982 #: lib/choose_repository.tcl:501
983 msgid "Full Copy (Slower, Redundant Backup)"
984 msgstr "全部复制 (较慢, 做备份)"
986 #: lib/choose_repository.tcl:507
987 msgid "Shared (Fastest, Not Recommended, No Backup)"
988 msgstr "共享方式 (最快, 不推荐, 不做备份)"
990 #: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
991 #: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
992 #: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
994 msgid "Not a Git repository: %s"
995 msgstr "不是一个 Git 版本库: %s"
997 #: lib/choose_repository.tcl:579
998 msgid "Standard only available for local repository."
999 msgstr "标准方式仅当是本地版本库时有效."
1001 #: lib/choose_repository.tcl:583
1002 msgid "Shared only available for local repository."
1003 msgstr "共享方式仅当是本地版本库时有效."
1005 #: lib/choose_repository.tcl:604
1007 msgid "Location %s already exists."
1008 msgstr "位置 %s 已经存在."
1010 #: lib/choose_repository.tcl:615
1011 msgid "Failed to configure origin"
1012 msgstr "无法配置 origin"
1014 #: lib/choose_repository.tcl:627
1015 msgid "Counting objects"
1018 #: lib/choose_repository.tcl:628
1023 #: lib/choose_repository.tcl:652
1025 msgid "Unable to copy objects/info/alternates: %s"
1026 msgstr "无法复制 objects/info/alternates: %s"
1028 #: lib/choose_repository.tcl:688
1030 msgid "Nothing to clone from %s."
1031 msgstr "没有东西可从 %s 克隆."
1033 #: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
1034 #: lib/choose_repository.tcl:916
1035 msgid "The 'master' branch has not been initialized."
1036 msgstr "'master'分支尚未初始化."
1038 #: lib/choose_repository.tcl:703
1039 msgid "Hardlinks are unavailable. Falling back to copying."
1040 msgstr "硬连接不可用. 使用复制."
1042 #: lib/choose_repository.tcl:715
1044 msgid "Cloning from %s"
1047 #: lib/choose_repository.tcl:746
1048 msgid "Copying objects"
1051 #: lib/choose_repository.tcl:747
1055 #: lib/choose_repository.tcl:771
1057 msgid "Unable to copy object: %s"
1058 msgstr "无法复制 object: %s"
1060 #: lib/choose_repository.tcl:781
1061 msgid "Linking objects"
1064 #: lib/choose_repository.tcl:782
1068 #: lib/choose_repository.tcl:790
1070 msgid "Unable to hardlink object: %s"
1071 msgstr "无法硬链接 object: %s"
1073 #: lib/choose_repository.tcl:845
1074 msgid "Cannot fetch branches and objects. See console output for details."
1075 msgstr "无法获取分支和对象. 请查看控制终端的输出."
1077 #: lib/choose_repository.tcl:856
1078 msgid "Cannot fetch tags. See console output for details."
1079 msgstr "无法获取标签. 请查看控制终端的输出."
1081 #: lib/choose_repository.tcl:880
1082 msgid "Cannot determine HEAD. See console output for details."
1083 msgstr "无法确定 HEAD. 请查看控制终端的输出."
1085 #: lib/choose_repository.tcl:889
1087 msgid "Unable to cleanup %s"
1090 #: lib/choose_repository.tcl:895
1091 msgid "Clone failed."
1094 #: lib/choose_repository.tcl:902
1095 msgid "No default branch obtained."
1098 #: lib/choose_repository.tcl:913
1100 msgid "Cannot resolve %s as a commit."
1101 msgstr "无法解析 %s 为提交."
1103 #: lib/choose_repository.tcl:925
1104 msgid "Creating working directory"
1107 #: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
1108 #: lib/index.tcl:193
1112 #: lib/choose_repository.tcl:955
1113 msgid "Initial file checkout failed."
1114 msgstr "初始的文件checkout失败"
1116 #: lib/choose_repository.tcl:971
1120 #: lib/choose_repository.tcl:981
1124 #: lib/choose_repository.tcl:1031
1126 msgid "Failed to open repository %s:"
1127 msgstr "无法打开版本库 %s:"
1129 #: lib/choose_rev.tcl:53
1130 msgid "This Detached Checkout"
1131 msgstr "该脱节的Checkout"
1133 #: lib/choose_rev.tcl:60
1134 msgid "Revision Expression:"
1137 #: lib/choose_rev.tcl:74
1138 msgid "Local Branch"
1141 #: lib/choose_rev.tcl:79
1142 msgid "Tracking Branch"
1145 #: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
1149 #: lib/choose_rev.tcl:317
1151 msgid "Invalid revision: %s"
1154 #: lib/choose_rev.tcl:338
1155 msgid "No revision selected."
1158 #: lib/choose_rev.tcl:346
1159 msgid "Revision expression is empty."
1162 #: lib/choose_rev.tcl:531
1166 #: lib/choose_rev.tcl:559
1172 "There is nothing to amend.\n"
1174 "You are about to create the initial commit. There is no commit before this "
1179 "你正在创建最初的提交. 在此之前没有提交可以修正.\n"
1181 #: lib/commit.tcl:18
1183 "Cannot amend while merging.\n"
1185 "You are currently in the middle of a merge that has not been fully "
1186 "completed. You cannot amend the prior commit unless you first abort the "
1187 "current merge activity.\n"
1191 "你当前正在一次尚未完成的合并操作过程中. 除非中止当前合并活动,\n"
1194 #: lib/commit.tcl:49
1195 msgid "Error loading commit data for amend:"
1196 msgstr "为修正装载提交数据出错:"
1198 #: lib/commit.tcl:76
1199 msgid "Unable to obtain your identity:"
1202 #: lib/commit.tcl:81
1203 msgid "Invalid GIT_COMMITTER_IDENT:"
1204 msgstr "无效的 GIT_COMMITTER_IDENT"
1206 #: lib/commit.tcl:133
1208 "Last scanned state does not match repository state.\n"
1210 "Another Git program has modified this repository since the last scan. A "
1211 "rescan must be performed before another commit can be created.\n"
1213 "The rescan will be automatically started now.\n"
1215 "最后一次扫描的状态和当前版本库状态不符.\n"
1217 "另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
1222 #: lib/commit.tcl:154
1225 "Unmerged files cannot be committed.\n"
1227 "File %s has merge conflicts. You must resolve them and stage the file "
1228 "before committing.\n"
1232 "文件 %s 有合并冲突, 你必须解决这些冲突并缓存该文件作提交.\n"
1234 #: lib/commit.tcl:162
1237 "Unknown file state %s detected.\n"
1239 "File %s cannot be committed by this program.\n"
1245 #: lib/commit.tcl:170
1247 "No changes to commit.\n"
1249 "You must stage at least 1 file before you can commit.\n"
1253 "提交前你必须首先缓存至少一个文件.\n"
1255 #: lib/commit.tcl:183
1257 "Please supply a commit message.\n"
1259 "A good commit message has the following format:\n"
1261 "- First line: Describe in one sentence what you did.\n"
1262 "- Second line: Blank\n"
1263 "- Remaining lines: Describe why this change is good.\n"
1269 "- 第一行: 一句话概括你做的修改.\n"
1271 "- 剩余行: 请描述为什么你做的这些改动是好的.\n"
1273 #: lib/commit.tcl:207
1275 msgid "warning: Tcl does not support encoding '%s'."
1276 msgstr "警告: Tcl 不支持编码方式 '%s'."
1278 #: lib/commit.tcl:221
1279 msgid "Calling pre-commit hook..."
1282 #: lib/commit.tcl:236
1283 msgid "Commit declined by pre-commit hook."
1286 #: lib/commit.tcl:259
1287 msgid "Calling commit-msg hook..."
1290 #: lib/commit.tcl:274
1291 msgid "Commit declined by commit-msg hook."
1294 #: lib/commit.tcl:287
1295 msgid "Committing changes..."
1298 #: lib/commit.tcl:303
1299 msgid "write-tree failed:"
1300 msgstr "write-tree 失败:"
1302 #: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
1304 msgid "Commit failed."
1307 #: lib/commit.tcl:321
1309 msgid "Commit %s appears to be corrupt"
1310 msgstr "提交 %s 似乎已损坏"
1312 #: lib/commit.tcl:326
1314 "No changes to commit.\n"
1316 "No files were modified by this commit and it was not a merge commit.\n"
1318 "A rescan will be automatically started now.\n"
1322 "该提交没有改动任何文件也不是一个合并提交.\n"
1326 #: lib/commit.tcl:333
1327 msgid "No changes to commit."
1330 #: lib/commit.tcl:347
1331 msgid "commit-tree failed:"
1332 msgstr "commit-tree 失败:"
1334 #: lib/commit.tcl:367
1335 msgid "update-ref failed:"
1336 msgstr "update-ref 失败:"
1338 #: lib/commit.tcl:454
1340 msgid "Created commit %s: %s"
1341 msgstr "创建了 commit %s: %s"
1343 #: lib/console.tcl:59
1344 msgid "Working... please wait..."
1345 msgstr "工作中... 请等待..."
1347 #: lib/console.tcl:186
1351 #: lib/console.tcl:200
1352 msgid "Error: Command Failed"
1355 #: lib/database.tcl:43
1356 msgid "Number of loose objects"
1359 #: lib/database.tcl:44
1360 msgid "Disk space used by loose objects"
1361 msgstr "松散对象所使用的磁盘空间"
1363 #: lib/database.tcl:45
1364 msgid "Number of packed objects"
1367 #: lib/database.tcl:46
1368 msgid "Number of packs"
1371 #: lib/database.tcl:47
1372 msgid "Disk space used by packed objects"
1373 msgstr "压缩对象所使用的磁盘空间"
1375 #: lib/database.tcl:48
1376 msgid "Packed objects waiting for pruning"
1379 #: lib/database.tcl:49
1380 msgid "Garbage files"
1383 #: lib/database.tcl:72
1384 msgid "Compressing the object database"
1387 #: lib/database.tcl:83
1388 msgid "Verifying the object database with fsck-objects"
1389 msgstr "使用 fsck-objects 验证对象数据库"
1391 #: lib/database.tcl:108
1394 "This repository currently has approximately %i loose objects.\n"
1396 "To maintain optimal performance it is strongly recommended that you compress "
1397 "the database when more than %i loose objects exist.\n"
1399 "Compress the database now?"
1401 "该版本库当前约有 %i 个松散对象.\n"
1403 "为达到较优的性能,强烈建议你在松散对象多于 %i 时压缩数据库.\n"
1409 msgid "Invalid date from Git: %s"
1415 "No differences detected.\n"
1417 "%s has no changes.\n"
1419 "The modification date of this file was updated by another application, but "
1420 "the content within the file was not changed.\n"
1422 "A rescan will be automatically started to find other files which may have "
1427 "该文件的修改日期被另一个程序所更新, 但其内容并没有变化.\n"
1429 "对于类似情况的其他文件的重新扫描将自动开始."
1432 #, fuzzy, tcl-format
1433 msgid "Loading diff of %s..."
1434 msgstr "装载 %s 的 diff ..."
1436 #: lib/diff.tcl:114 lib/diff.tcl:184
1438 msgid "Unable to display %s"
1442 msgid "Error loading file:"
1446 msgid "Git Repository (subproject)"
1447 msgstr "Git 版本库 (子项目)"
1450 msgid "* Binary file (not showing content)."
1451 msgstr "* 二进制文件 (不显示内容)."
1454 msgid "Error loading diff:"
1455 msgstr "装载 diff 错误:"
1458 msgid "Failed to unstage selected hunk."
1459 msgstr "无法将选择的代码段从缓存中删除."
1462 msgid "Failed to stage selected hunk."
1465 #: lib/error.tcl:20 lib/error.tcl:114
1474 msgid "You must correct the above errors before committing."
1475 msgstr "你必须在提交前修正上述错误."
1478 msgid "Unable to unlock the index."
1479 msgstr "无法解锁缓存 (index)"
1483 msgstr "缓存(Index)错误"
1487 "Updating the Git index failed. A rescan will be automatically started to "
1488 "resynchronize git-gui."
1489 msgstr "更新 Git 缓存(Index)失败, 重新扫描将自动开始以重新同步 git-gui."
1496 msgid "Unlock Index"
1499 #: lib/index.tcl:282
1501 msgid "Unstaging %s from commit"
1502 msgstr "从提交缓存中删除 %s"
1504 #: lib/index.tcl:313
1506 msgid "Ready to commit."
1509 #: lib/index.tcl:326
1514 #: lib/index.tcl:381
1516 msgid "Revert changes in file %s?"
1517 msgstr "撤销文件 %s 中的改动?"
1519 #: lib/index.tcl:383
1521 msgid "Revert changes in these %i files?"
1522 msgstr "撤销这些 (%i个) 文件的改动?"
1524 #: lib/index.tcl:391
1525 msgid "Any unstaged changes will be permanently lost by the revert."
1526 msgstr "任何未缓存的改动将在这次撤销中永久丢失."
1528 #: lib/index.tcl:394
1534 "Cannot merge while amending.\n"
1536 "You must finish amending this commit before starting any type of merge.\n"
1540 "你必须完成对该提交的修正才能继续任何类型的合并操作.\n"
1544 "Last scanned state does not match repository state.\n"
1546 "Another Git program has modified this repository since the last scan. A "
1547 "rescan must be performed before a merge can be performed.\n"
1549 "The rescan will be automatically started now.\n"
1551 "最后一次扫描的状态和当前版本库状态不符.\n"
1553 "另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
1561 "You are in the middle of a conflicted merge.\n"
1563 "File %s has merge conflicts.\n"
1565 "You must resolve them, stage the file, and commit to complete the current "
1566 "merge. Only then can you begin another merge.\n"
1568 "你正处在一个有冲突的合并操作中.\n"
1572 "你必须解决这些冲突, 缓存该文件, 并提交来完成当前的合并.仅当这样后才能开始下一"
1578 "You are in the middle of a change.\n"
1580 "File %s is modified.\n"
1582 "You should complete the current commit before starting a merge. Doing so "
1583 "will help you abort a failed merge, should the need arise.\n"
1589 "你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于中止一次失败的合"
1592 #: lib/merge.tcl:106
1597 #: lib/merge.tcl:119
1598 #, fuzzy, tcl-format
1599 msgid "Merging %s and %s..."
1602 #: lib/merge.tcl:130
1603 msgid "Merge completed successfully."
1606 #: lib/merge.tcl:132
1607 msgid "Merge failed. Conflict resolution is required."
1608 msgstr "合并失败. 需要解决冲突."
1610 #: lib/merge.tcl:157
1612 msgid "Merge Into %s"
1615 #: lib/merge.tcl:176
1616 msgid "Revision To Merge"
1619 #: lib/merge.tcl:211
1621 "Cannot abort while amending.\n"
1623 "You must finish amending this commit.\n"
1629 #: lib/merge.tcl:221
1633 "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
1635 "Continue with aborting the current merge?"
1639 "中止当前的合并操作将导致 *所有* 尚未提交的改动丢失.\n"
1643 #: lib/merge.tcl:227
1647 "Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
1649 "Continue with resetting the current changes?"
1653 "复位当前的改动将导致 *所有* 未提交的改动丢失.\n"
1657 #: lib/merge.tcl:238
1661 #: lib/merge.tcl:238
1666 #: lib/merge.tcl:265
1667 msgid "Abort failed."
1670 #: lib/merge.tcl:267
1671 msgid "Abort completed. Ready."
1674 #: lib/option.tcl:95
1675 msgid "Restore Defaults"
1678 #: lib/option.tcl:99
1682 #: lib/option.tcl:109
1684 msgid "%s Repository"
1687 #: lib/option.tcl:110
1688 msgid "Global (All Repositories)"
1691 #: lib/option.tcl:116
1695 #: lib/option.tcl:117
1696 msgid "Email Address"
1699 #: lib/option.tcl:119
1700 msgid "Summarize Merge Commits"
1703 #: lib/option.tcl:120
1704 msgid "Merge Verbosity"
1707 #: lib/option.tcl:121
1708 msgid "Show Diffstat After Merge"
1709 msgstr "在合并后显示 Diffstat"
1711 #: lib/option.tcl:123
1712 msgid "Trust File Modification Timestamps"
1715 #: lib/option.tcl:124
1716 msgid "Prune Tracking Branches During Fetch"
1719 #: lib/option.tcl:125
1720 msgid "Match Tracking Branches"
1723 #: lib/option.tcl:126
1724 msgid "Number of Diff Context Lines"
1727 #: lib/option.tcl:127
1729 msgid "Commit Message Text Width"
1732 #: lib/option.tcl:128
1733 msgid "New Branch Name Template"
1736 #: lib/option.tcl:192
1737 msgid "Spelling Dictionary:"
1740 #: lib/option.tcl:216
1744 #: lib/option.tcl:220
1749 #: lib/option.tcl:226
1753 #: lib/option.tcl:240
1757 #: lib/option.tcl:275
1758 msgid "Failed to completely save options:"
1761 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1762 msgid "Delete Remote Branch"
1765 #: lib/remote_branch_delete.tcl:47
1766 msgid "From Repository"
1769 #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
1773 #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
1774 msgid "Arbitrary URL:"
1777 #: lib/remote_branch_delete.tcl:84
1781 #: lib/remote_branch_delete.tcl:109
1782 msgid "Delete Only If"
1785 #: lib/remote_branch_delete.tcl:111
1786 msgid "Merged Into:"
1789 #: lib/remote_branch_delete.tcl:119
1790 msgid "Always (Do not perform merge checks)"
1791 msgstr "总是合并 (不作合并检查)"
1793 #: lib/remote_branch_delete.tcl:152
1794 msgid "A branch is required for 'Merged Into'."
1795 msgstr "'合并到' 需要指定某个分支"
1797 #: lib/remote_branch_delete.tcl:184
1800 "The following branches are not completely merged into %s:\n"
1804 "下列分支没有被全部合并到 %s 中:\n"
1808 #: lib/remote_branch_delete.tcl:189
1811 "One or more of the merge tests failed because you have not fetched the "
1812 "necessary commits. Try fetching from %s first."
1814 "由于没有获取到必要的提交,一个或多个合并测试失败。请尝试从 %s 处先获取。"
1816 #: lib/remote_branch_delete.tcl:207
1817 msgid "Please select one or more branches to delete."
1818 msgstr "请选择某个或多个分支来删除"
1820 #: lib/remote_branch_delete.tcl:216
1822 "Recovering deleted branches is difficult.\n"
1824 "Delete the selected branches?"
1830 #: lib/remote_branch_delete.tcl:226
1832 msgid "Deleting branches from %s"
1835 #: lib/remote_branch_delete.tcl:286
1836 msgid "No repository selected."
1839 #: lib/remote_branch_delete.tcl:291
1841 msgid "Scanning %s..."
1844 #: lib/remote.tcl:165
1846 msgstr "从..清除(prune)"
1848 #: lib/remote.tcl:170
1850 msgstr "从..获取(fetch)"
1852 #: lib/remote.tcl:213
1856 #: lib/shortcut.tcl:20 lib/shortcut.tcl:61
1857 msgid "Cannot write shortcut:"
1860 #: lib/shortcut.tcl:136
1861 msgid "Cannot write icon:"
1864 #: lib/spellcheck.tcl:57
1865 msgid "Unsupported spell checker"
1868 #: lib/spellcheck.tcl:65
1869 msgid "Spell checking is unavailable"
1872 #: lib/spellcheck.tcl:68
1873 msgid "Invalid spell checking configuration"
1876 #: lib/spellcheck.tcl:70
1878 msgid "Reverting dictionary to %s."
1881 #: lib/spellcheck.tcl:73
1882 msgid "Spell checker silently failed on startup"
1885 #: lib/spellcheck.tcl:80
1886 msgid "Unrecognized spell checker"
1889 #: lib/spellcheck.tcl:180
1890 msgid "No Suggestions"
1893 #: lib/spellcheck.tcl:381
1894 msgid "Unexpected EOF from spell checker"
1897 #: lib/spellcheck.tcl:385
1898 msgid "Spell Checker Failed"
1901 #: lib/status_bar.tcl:83
1903 msgid "%s ... %*i of %*i %s (%3i%%)"
1904 msgstr "%s ... %*i of %*i %s (%3i%%)"
1906 #: lib/transport.tcl:6
1911 #: lib/transport.tcl:7
1913 msgid "Fetching new changes from %s"
1914 msgstr "从 %s 处获取新的改动"
1916 #: lib/transport.tcl:18
1918 msgid "remote prune %s"
1921 #: lib/transport.tcl:19
1923 msgid "Pruning tracking branches deleted from %s"
1926 #: lib/transport.tcl:25 lib/transport.tcl:71
1931 #: lib/transport.tcl:26
1933 msgid "Pushing changes to %s"
1936 #: lib/transport.tcl:72
1938 msgid "Pushing %s %s to %s"
1939 msgstr "上传 %s %s 到 %s"
1941 #: lib/transport.tcl:89
1942 msgid "Push Branches"
1945 #: lib/transport.tcl:103
1946 msgid "Source Branches"
1949 #: lib/transport.tcl:120
1950 msgid "Destination Repository"
1953 #: lib/transport.tcl:158
1954 msgid "Transfer Options"
1957 #: lib/transport.tcl:160
1958 msgid "Force overwrite existing branch (may discard changes)"
1959 msgstr "强制覆盖已有的分支 (可能会丢失改动)"
1961 #: lib/transport.tcl:164
1962 msgid "Use thin pack (for slow network connections)"
1963 msgstr "使用 thin pack (适用于低速网络连接)"
1965 #: lib/transport.tcl:168
1966 msgid "Include tags"