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: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:126 lib/browser.tcl:143
738 msgid "Loading %s..."
741 #: lib/browser.tcl:187
742 msgid "[Up To Parent]"
745 #: lib/browser.tcl:267 lib/browser.tcl:273
746 msgid "Browse Branch Files"
749 #: lib/browser.tcl:278 lib/choose_repository.tcl:387
750 #: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
751 #: lib/choose_repository.tcl:987
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:81 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:323
823 msgid "files checked out"
826 #: lib/checkout_op.tcl:353
828 msgid "Aborted checkout of '%s' (file level merging is required)."
829 msgstr "中止 '%s' 的 checkout 操作 (需要做文件级合并)."
831 #: lib/checkout_op.tcl:354
832 msgid "File level merge required."
835 #: lib/checkout_op.tcl:358
837 msgid "Staying on branch '%s'."
840 #: lib/checkout_op.tcl:429
842 "You are no longer on a local branch.\n"
844 "If you wanted to be on a branch, create one now starting from 'This Detached "
849 "如果你想位于某分支上, 从当前脱节的Checkout中创建一个新分支."
851 #: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
853 msgid "Checked out '%s'."
854 msgstr "'%s' 已被 checkout"
856 #: lib/checkout_op.tcl:478
858 msgid "Resetting '%s' to '%s' will lose the following commits:"
859 msgstr "复位 '%s' 到 '%s' 将导致下列提交的丢失:"
861 #: lib/checkout_op.tcl:500
862 msgid "Recovering lost commits may not be easy."
863 msgstr "恢复丢失的提交是比较困难的."
865 #: lib/checkout_op.tcl:505
870 #: lib/checkout_op.tcl:510 lib/merge.tcl:163
874 #: lib/checkout_op.tcl:578
877 "Failed to set current branch.\n"
879 "This working directory is only partially switched. We successfully updated "
880 "your files, but failed to update an internal Git file.\n"
882 "This should not have occurred. %s will now close and give up."
886 "当前工作目录仅有部分被切换出, 我们已成功的更新了您的文件但是无法更新某个内部"
891 #: lib/choose_font.tcl:39
895 #: lib/choose_font.tcl:53
899 #: lib/choose_font.tcl:74
903 #: lib/choose_font.tcl:91
907 #: lib/choose_font.tcl:103
909 "This is example text.\n"
910 "If you like this text, it can be your font."
915 #: lib/choose_repository.tcl:28
919 #: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
920 msgid "Create New Repository"
923 #: lib/choose_repository.tcl:87
927 #: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
928 msgid "Clone Existing Repository"
931 #: lib/choose_repository.tcl:100
935 #: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
936 msgid "Open Existing Repository"
939 #: lib/choose_repository.tcl:113
943 #: lib/choose_repository.tcl:126
944 msgid "Recent Repositories"
947 #: lib/choose_repository.tcl:132
948 msgid "Open Recent Repository:"
951 #: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
952 #: lib/choose_repository.tcl:310
954 msgid "Failed to create repository %s:"
957 #: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
961 #: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
962 #: lib/choose_repository.tcl:1011
963 msgid "Git Repository"
966 #: lib/choose_repository.tcl:437
968 msgid "Directory %s already exists."
971 #: lib/choose_repository.tcl:441
973 msgid "File %s already exists."
976 #: lib/choose_repository.tcl:455
980 #: lib/choose_repository.tcl:468
984 #: lib/choose_repository.tcl:489
988 #: lib/choose_repository.tcl:495
989 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
990 msgstr "标准方式 (快速, 部分备份, 作硬连接)"
992 #: lib/choose_repository.tcl:501
993 msgid "Full Copy (Slower, Redundant Backup)"
994 msgstr "全部复制 (较慢, 做备份)"
996 #: lib/choose_repository.tcl:507
997 msgid "Shared (Fastest, Not Recommended, No Backup)"
998 msgstr "共享方式 (最快, 不推荐, 不做备份)"
1000 #: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
1001 #: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
1002 #: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
1004 msgid "Not a Git repository: %s"
1005 msgstr "不是一个 Git 版本库: %s"
1007 #: lib/choose_repository.tcl:579
1008 msgid "Standard only available for local repository."
1009 msgstr "标准方式仅当是本地版本库时有效."
1011 #: lib/choose_repository.tcl:583
1012 msgid "Shared only available for local repository."
1013 msgstr "共享方式仅当是本地版本库时有效."
1015 #: lib/choose_repository.tcl:604
1017 msgid "Location %s already exists."
1018 msgstr "位置 %s 已经存在."
1020 #: lib/choose_repository.tcl:615
1021 msgid "Failed to configure origin"
1022 msgstr "无法配置 origin"
1024 #: lib/choose_repository.tcl:627
1025 msgid "Counting objects"
1028 #: lib/choose_repository.tcl:628
1033 #: lib/choose_repository.tcl:652
1035 msgid "Unable to copy objects/info/alternates: %s"
1036 msgstr "无法复制 objects/info/alternates: %s"
1038 #: lib/choose_repository.tcl:688
1040 msgid "Nothing to clone from %s."
1041 msgstr "没有东西可从 %s 克隆."
1043 #: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
1044 #: lib/choose_repository.tcl:916
1045 msgid "The 'master' branch has not been initialized."
1046 msgstr "'master'分支尚未初始化."
1048 #: lib/choose_repository.tcl:703
1049 msgid "Hardlinks are unavailable. Falling back to copying."
1050 msgstr "硬连接不可用. 使用复制."
1052 #: lib/choose_repository.tcl:715
1054 msgid "Cloning from %s"
1057 #: lib/choose_repository.tcl:746
1058 msgid "Copying objects"
1061 #: lib/choose_repository.tcl:747
1065 #: lib/choose_repository.tcl:771
1067 msgid "Unable to copy object: %s"
1068 msgstr "无法复制 object: %s"
1070 #: lib/choose_repository.tcl:781
1071 msgid "Linking objects"
1074 #: lib/choose_repository.tcl:782
1078 #: lib/choose_repository.tcl:790
1080 msgid "Unable to hardlink object: %s"
1081 msgstr "无法硬链接 object: %s"
1083 #: lib/choose_repository.tcl:845
1084 msgid "Cannot fetch branches and objects. See console output for details."
1085 msgstr "无法获取分支和对象. 请查看控制终端的输出."
1087 #: lib/choose_repository.tcl:856
1088 msgid "Cannot fetch tags. See console output for details."
1089 msgstr "无法获取标签. 请查看控制终端的输出."
1091 #: lib/choose_repository.tcl:880
1092 msgid "Cannot determine HEAD. See console output for details."
1093 msgstr "无法确定 HEAD. 请查看控制终端的输出."
1095 #: lib/choose_repository.tcl:889
1097 msgid "Unable to cleanup %s"
1100 #: lib/choose_repository.tcl:895
1101 msgid "Clone failed."
1104 #: lib/choose_repository.tcl:902
1105 msgid "No default branch obtained."
1108 #: lib/choose_repository.tcl:913
1110 msgid "Cannot resolve %s as a commit."
1111 msgstr "无法解析 %s 为提交."
1113 #: lib/choose_repository.tcl:925
1114 msgid "Creating working directory"
1117 #: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
1118 #: lib/index.tcl:193
1122 #: lib/choose_repository.tcl:955
1123 msgid "Initial file checkout failed."
1124 msgstr "初始的文件checkout失败"
1126 #: lib/choose_repository.tcl:971
1130 #: lib/choose_repository.tcl:981
1134 #: lib/choose_repository.tcl:1031
1136 msgid "Failed to open repository %s:"
1137 msgstr "无法打开版本库 %s:"
1139 #: lib/choose_rev.tcl:53
1140 msgid "This Detached Checkout"
1141 msgstr "该脱节的Checkout"
1143 #: lib/choose_rev.tcl:60
1144 msgid "Revision Expression:"
1147 #: lib/choose_rev.tcl:74
1148 msgid "Local Branch"
1151 #: lib/choose_rev.tcl:79
1152 msgid "Tracking Branch"
1155 #: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
1159 #: lib/choose_rev.tcl:317
1161 msgid "Invalid revision: %s"
1164 #: lib/choose_rev.tcl:338
1165 msgid "No revision selected."
1168 #: lib/choose_rev.tcl:346
1169 msgid "Revision expression is empty."
1172 #: lib/choose_rev.tcl:531
1176 #: lib/choose_rev.tcl:559
1182 "There is nothing to amend.\n"
1184 "You are about to create the initial commit. There is no commit before this "
1189 "你正在创建最初的提交. 在此之前没有提交可以修正.\n"
1191 #: lib/commit.tcl:18
1193 "Cannot amend while merging.\n"
1195 "You are currently in the middle of a merge that has not been fully "
1196 "completed. You cannot amend the prior commit unless you first abort the "
1197 "current merge activity.\n"
1201 "你当前正在一次尚未完成的合并操作过程中. 除非中止当前合并活动,\n"
1204 #: lib/commit.tcl:49
1205 msgid "Error loading commit data for amend:"
1206 msgstr "为修正装载提交数据出错:"
1208 #: lib/commit.tcl:76
1209 msgid "Unable to obtain your identity:"
1212 #: lib/commit.tcl:81
1213 msgid "Invalid GIT_COMMITTER_IDENT:"
1214 msgstr "无效的 GIT_COMMITTER_IDENT"
1216 #: lib/commit.tcl:133
1218 "Last scanned state does not match repository state.\n"
1220 "Another Git program has modified this repository since the last scan. A "
1221 "rescan must be performed before another commit can be created.\n"
1223 "The rescan will be automatically started now.\n"
1225 "最后一次扫描的状态和当前版本库状态不符.\n"
1227 "另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
1232 #: lib/commit.tcl:154
1235 "Unmerged files cannot be committed.\n"
1237 "File %s has merge conflicts. You must resolve them and stage the file "
1238 "before committing.\n"
1242 "文件 %s 有合并冲突, 你必须解决这些冲突并缓存该文件作提交.\n"
1244 #: lib/commit.tcl:162
1247 "Unknown file state %s detected.\n"
1249 "File %s cannot be committed by this program.\n"
1255 #: lib/commit.tcl:170
1257 "No changes to commit.\n"
1259 "You must stage at least 1 file before you can commit.\n"
1263 "提交前你必须首先缓存至少一个文件.\n"
1265 #: lib/commit.tcl:183
1267 "Please supply a commit message.\n"
1269 "A good commit message has the following format:\n"
1271 "- First line: Describe in one sentence what you did.\n"
1272 "- Second line: Blank\n"
1273 "- Remaining lines: Describe why this change is good.\n"
1279 "- 第一行: 一句话概括你做的修改.\n"
1281 "- 剩余行: 请描述为什么你做的这些改动是好的.\n"
1283 #: lib/commit.tcl:207
1285 msgid "warning: Tcl does not support encoding '%s'."
1286 msgstr "警告: Tcl 不支持编码方式 '%s'."
1288 #: lib/commit.tcl:221
1289 msgid "Calling pre-commit hook..."
1292 #: lib/commit.tcl:236
1293 msgid "Commit declined by pre-commit hook."
1296 #: lib/commit.tcl:259
1297 msgid "Calling commit-msg hook..."
1300 #: lib/commit.tcl:274
1301 msgid "Commit declined by commit-msg hook."
1304 #: lib/commit.tcl:287
1305 msgid "Committing changes..."
1308 #: lib/commit.tcl:303
1309 msgid "write-tree failed:"
1310 msgstr "write-tree 失败:"
1312 #: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
1314 msgid "Commit failed."
1317 #: lib/commit.tcl:321
1319 msgid "Commit %s appears to be corrupt"
1320 msgstr "提交 %s 似乎已损坏"
1322 #: lib/commit.tcl:326
1324 "No changes to commit.\n"
1326 "No files were modified by this commit and it was not a merge commit.\n"
1328 "A rescan will be automatically started now.\n"
1332 "该提交没有改动任何文件也不是一个合并提交.\n"
1336 #: lib/commit.tcl:333
1337 msgid "No changes to commit."
1340 #: lib/commit.tcl:347
1341 msgid "commit-tree failed:"
1342 msgstr "commit-tree 失败:"
1344 #: lib/commit.tcl:367
1345 msgid "update-ref failed:"
1346 msgstr "update-ref 失败:"
1348 #: lib/commit.tcl:454
1350 msgid "Created commit %s: %s"
1351 msgstr "创建了 commit %s: %s"
1353 #: lib/console.tcl:59
1354 msgid "Working... please wait..."
1355 msgstr "工作中... 请等待..."
1357 #: lib/console.tcl:186
1361 #: lib/console.tcl:200
1362 msgid "Error: Command Failed"
1365 #: lib/database.tcl:43
1366 msgid "Number of loose objects"
1369 #: lib/database.tcl:44
1370 msgid "Disk space used by loose objects"
1371 msgstr "松散对象所使用的磁盘空间"
1373 #: lib/database.tcl:45
1374 msgid "Number of packed objects"
1377 #: lib/database.tcl:46
1378 msgid "Number of packs"
1381 #: lib/database.tcl:47
1382 msgid "Disk space used by packed objects"
1383 msgstr "压缩对象所使用的磁盘空间"
1385 #: lib/database.tcl:48
1386 msgid "Packed objects waiting for pruning"
1389 #: lib/database.tcl:49
1390 msgid "Garbage files"
1393 #: lib/database.tcl:72
1394 msgid "Compressing the object database"
1397 #: lib/database.tcl:83
1398 msgid "Verifying the object database with fsck-objects"
1399 msgstr "使用 fsck-objects 验证对象数据库"
1401 #: lib/database.tcl:108
1404 "This repository currently has approximately %i loose objects.\n"
1406 "To maintain optimal performance it is strongly recommended that you compress "
1407 "the database when more than %i loose objects exist.\n"
1409 "Compress the database now?"
1411 "该版本库当前约有 %i 个松散对象.\n"
1413 "为达到较优的性能,强烈建议你在松散对象多于 %i 时压缩数据库.\n"
1419 msgid "Invalid date from Git: %s"
1425 "No differences detected.\n"
1427 "%s has no changes.\n"
1429 "The modification date of this file was updated by another application, but "
1430 "the content within the file was not changed.\n"
1432 "A rescan will be automatically started to find other files which may have "
1437 "该文件的修改日期被另一个程序所更新, 但其内容并没有变化.\n"
1439 "对于类似情况的其他文件的重新扫描将自动开始."
1442 #, fuzzy, tcl-format
1443 msgid "Loading diff of %s..."
1444 msgstr "装载 %s 的 diff ..."
1446 #: lib/diff.tcl:114 lib/diff.tcl:184
1448 msgid "Unable to display %s"
1452 msgid "Error loading file:"
1456 msgid "Git Repository (subproject)"
1457 msgstr "Git 版本库 (子项目)"
1460 msgid "* Binary file (not showing content)."
1461 msgstr "* 二进制文件 (不显示内容)."
1464 msgid "Error loading diff:"
1465 msgstr "装载 diff 错误:"
1468 msgid "Failed to unstage selected hunk."
1469 msgstr "无法将选择的代码段从缓存中删除."
1472 msgid "Failed to stage selected hunk."
1475 #: lib/error.tcl:20 lib/error.tcl:114
1484 msgid "You must correct the above errors before committing."
1485 msgstr "你必须在提交前修正上述错误."
1488 msgid "Unable to unlock the index."
1489 msgstr "无法解锁缓存 (index)"
1493 msgstr "缓存(Index)错误"
1497 "Updating the Git index failed. A rescan will be automatically started to "
1498 "resynchronize git-gui."
1499 msgstr "更新 Git 缓存(Index)失败, 重新扫描将自动开始以重新同步 git-gui."
1506 msgid "Unlock Index"
1509 #: lib/index.tcl:282
1511 msgid "Unstaging %s from commit"
1512 msgstr "从提交缓存中删除 %s"
1514 #: lib/index.tcl:313
1516 msgid "Ready to commit."
1519 #: lib/index.tcl:326
1524 #: lib/index.tcl:381
1526 msgid "Revert changes in file %s?"
1527 msgstr "撤销文件 %s 中的改动?"
1529 #: lib/index.tcl:383
1531 msgid "Revert changes in these %i files?"
1532 msgstr "撤销这些 (%i个) 文件的改动?"
1534 #: lib/index.tcl:391
1535 msgid "Any unstaged changes will be permanently lost by the revert."
1536 msgstr "任何未缓存的改动将在这次撤销中永久丢失."
1538 #: lib/index.tcl:394
1544 "Cannot merge while amending.\n"
1546 "You must finish amending this commit before starting any type of merge.\n"
1550 "你必须完成对该提交的修正才能继续任何类型的合并操作.\n"
1554 "Last scanned state does not match repository state.\n"
1556 "Another Git program has modified this repository since the last scan. A "
1557 "rescan must be performed before a merge can be performed.\n"
1559 "The rescan will be automatically started now.\n"
1561 "最后一次扫描的状态和当前版本库状态不符.\n"
1563 "另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
1571 "You are in the middle of a conflicted merge.\n"
1573 "File %s has merge conflicts.\n"
1575 "You must resolve them, stage the file, and commit to complete the current "
1576 "merge. Only then can you begin another merge.\n"
1578 "你正处在一个有冲突的合并操作中.\n"
1582 "你必须解决这些冲突, 缓存该文件, 并提交来完成当前的合并.仅当这样后才能开始下一"
1588 "You are in the middle of a change.\n"
1590 "File %s is modified.\n"
1592 "You should complete the current commit before starting a merge. Doing so "
1593 "will help you abort a failed merge, should the need arise.\n"
1599 "你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于中止一次失败的合"
1602 #: lib/merge.tcl:106
1607 #: lib/merge.tcl:119
1608 #, fuzzy, tcl-format
1609 msgid "Merging %s and %s..."
1612 #: lib/merge.tcl:130
1613 msgid "Merge completed successfully."
1616 #: lib/merge.tcl:132
1617 msgid "Merge failed. Conflict resolution is required."
1618 msgstr "合并失败. 需要解决冲突."
1620 #: lib/merge.tcl:157
1622 msgid "Merge Into %s"
1625 #: lib/merge.tcl:176
1626 msgid "Revision To Merge"
1629 #: lib/merge.tcl:211
1631 "Cannot abort while amending.\n"
1633 "You must finish amending this commit.\n"
1639 #: lib/merge.tcl:221
1643 "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
1645 "Continue with aborting the current merge?"
1649 "中止当前的合并操作将导致 *所有* 尚未提交的改动丢失.\n"
1653 #: lib/merge.tcl:227
1657 "Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
1659 "Continue with resetting the current changes?"
1663 "复位当前的改动将导致 *所有* 未提交的改动丢失.\n"
1667 #: lib/merge.tcl:238
1671 #: lib/merge.tcl:238
1676 #: lib/merge.tcl:265
1677 msgid "Abort failed."
1680 #: lib/merge.tcl:267
1681 msgid "Abort completed. Ready."
1684 #: lib/option.tcl:95
1685 msgid "Restore Defaults"
1688 #: lib/option.tcl:99
1692 #: lib/option.tcl:109
1694 msgid "%s Repository"
1697 #: lib/option.tcl:110
1698 msgid "Global (All Repositories)"
1701 #: lib/option.tcl:116
1705 #: lib/option.tcl:117
1706 msgid "Email Address"
1709 #: lib/option.tcl:119
1710 msgid "Summarize Merge Commits"
1713 #: lib/option.tcl:120
1714 msgid "Merge Verbosity"
1717 #: lib/option.tcl:121
1718 msgid "Show Diffstat After Merge"
1719 msgstr "在合并后显示 Diffstat"
1721 #: lib/option.tcl:123
1722 msgid "Trust File Modification Timestamps"
1725 #: lib/option.tcl:124
1726 msgid "Prune Tracking Branches During Fetch"
1729 #: lib/option.tcl:125
1730 msgid "Match Tracking Branches"
1733 #: lib/option.tcl:126
1734 msgid "Number of Diff Context Lines"
1737 #: lib/option.tcl:127
1739 msgid "Commit Message Text Width"
1742 #: lib/option.tcl:128
1743 msgid "New Branch Name Template"
1746 #: lib/option.tcl:192
1747 msgid "Spelling Dictionary:"
1750 #: lib/option.tcl:216
1754 #: lib/option.tcl:220
1759 #: lib/option.tcl:226
1763 #: lib/option.tcl:240
1767 #: lib/option.tcl:275
1768 msgid "Failed to completely save options:"
1771 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1772 msgid "Delete Remote Branch"
1775 #: lib/remote_branch_delete.tcl:47
1776 msgid "From Repository"
1779 #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
1783 #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
1784 msgid "Arbitrary URL:"
1787 #: lib/remote_branch_delete.tcl:84
1791 #: lib/remote_branch_delete.tcl:109
1792 msgid "Delete Only If"
1795 #: lib/remote_branch_delete.tcl:111
1796 msgid "Merged Into:"
1799 #: lib/remote_branch_delete.tcl:119
1800 msgid "Always (Do not perform merge checks)"
1801 msgstr "总是合并 (不作合并检查)"
1803 #: lib/remote_branch_delete.tcl:152
1804 msgid "A branch is required for 'Merged Into'."
1805 msgstr "'合并到' 需要指定某个分支"
1807 #: lib/remote_branch_delete.tcl:184
1810 "The following branches are not completely merged into %s:\n"
1814 "下列分支没有被全部合并到 %s 中:\n"
1818 #: lib/remote_branch_delete.tcl:189
1821 "One or more of the merge tests failed because you have not fetched the "
1822 "necessary commits. Try fetching from %s first."
1824 "由于没有获取到必要的提交,一个或多个合并测试失败。请尝试从 %s 处先获取。"
1826 #: lib/remote_branch_delete.tcl:207
1827 msgid "Please select one or more branches to delete."
1828 msgstr "请选择某个或多个分支来删除"
1830 #: lib/remote_branch_delete.tcl:216
1832 "Recovering deleted branches is difficult.\n"
1834 "Delete the selected branches?"
1840 #: lib/remote_branch_delete.tcl:226
1842 msgid "Deleting branches from %s"
1845 #: lib/remote_branch_delete.tcl:286
1846 msgid "No repository selected."
1849 #: lib/remote_branch_delete.tcl:291
1851 msgid "Scanning %s..."
1854 #: lib/remote.tcl:165
1856 msgstr "从..清除(prune)"
1858 #: lib/remote.tcl:170
1860 msgstr "从..获取(fetch)"
1862 #: lib/remote.tcl:213
1866 #: lib/shortcut.tcl:20 lib/shortcut.tcl:61
1867 msgid "Cannot write shortcut:"
1870 #: lib/shortcut.tcl:136
1871 msgid "Cannot write icon:"
1874 #: lib/spellcheck.tcl:57
1875 msgid "Unsupported spell checker"
1878 #: lib/spellcheck.tcl:65
1879 msgid "Spell checking is unavailable"
1882 #: lib/spellcheck.tcl:68
1883 msgid "Invalid spell checking configuration"
1886 #: lib/spellcheck.tcl:70
1888 msgid "Reverting dictionary to %s."
1891 #: lib/spellcheck.tcl:73
1892 msgid "Spell checker silently failed on startup"
1895 #: lib/spellcheck.tcl:80
1896 msgid "Unrecognized spell checker"
1899 #: lib/spellcheck.tcl:180
1900 msgid "No Suggestions"
1903 #: lib/spellcheck.tcl:381
1904 msgid "Unexpected EOF from spell checker"
1907 #: lib/spellcheck.tcl:385
1908 msgid "Spell Checker Failed"
1911 #: lib/status_bar.tcl:83
1913 msgid "%s ... %*i of %*i %s (%3i%%)"
1914 msgstr "%s ... %*i of %*i %s (%3i%%)"
1916 #: lib/transport.tcl:6
1921 #: lib/transport.tcl:7
1923 msgid "Fetching new changes from %s"
1924 msgstr "从 %s 处获取新的改动"
1926 #: lib/transport.tcl:18
1928 msgid "remote prune %s"
1931 #: lib/transport.tcl:19
1933 msgid "Pruning tracking branches deleted from %s"
1936 #: lib/transport.tcl:25 lib/transport.tcl:71
1941 #: lib/transport.tcl:26
1943 msgid "Pushing changes to %s"
1946 #: lib/transport.tcl:72
1948 msgid "Pushing %s %s to %s"
1949 msgstr "上传 %s %s 到 %s"
1951 #: lib/transport.tcl:89
1952 msgid "Push Branches"
1955 #: lib/transport.tcl:103
1956 msgid "Source Branches"
1959 #: lib/transport.tcl:120
1960 msgid "Destination Repository"
1963 #: lib/transport.tcl:158
1964 msgid "Transfer Options"
1967 #: lib/transport.tcl:160
1968 msgid "Force overwrite existing branch (may discard changes)"
1969 msgstr "强制覆盖已有的分支 (可能会丢失改动)"
1971 #: lib/transport.tcl:164
1972 msgid "Use thin pack (for slow network connections)"
1973 msgstr "使用 thin pack (适用于低速网络连接)"
1975 #: lib/transport.tcl:168
1976 msgid "Include tags"