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.
5#
6# Please use the following translation throughout the file for consistence:
7#
8# repository 版本库
9# commit 提交
10# revision 版本
11# branch 分支
12# tag 标签
13# annotation 标注
14# merge 合并
15# fast forward 快速合并(??)
16# stage 缓存 (译自 index/cache)
17# amend 修正
18# reset 复位
19#
20# 2008-01-06 Eric Miao <eric.y.miao@gmail.com>
21# FIXME: checkout 的标准翻译
22#
23#, fuzzy
24msgid ""
25msgstr ""
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"
32"MIME-Version: 1.0\n"
33"Content-Type: text/plain; charset=UTF-8\n"
34"Content-Transfer-Encoding: 8bit\n"
35
36#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
37#: git-gui.sh:763
38msgid "git-gui: fatal error"
39msgstr "git-gui: 致命错误"
40
41#: git-gui.sh:593
42#, tcl-format
43msgid "Invalid font specified in %s:"
44msgstr "%s 中指定的字体无效:"
45
46#: git-gui.sh:620
47msgid "Main Font"
48msgstr "主要字体"
49
50#: git-gui.sh:621
51msgid "Diff/Console Font"
52msgstr "Diff/控制终端字体"
53
54#: git-gui.sh:635
55msgid "Cannot find git in PATH."
56msgstr "PATH 中没有找到 git"
57
58#: git-gui.sh:662
59msgid "Cannot parse Git version string:"
60msgstr "无法解析 Git 的版本信息:"
61
62#: git-gui.sh:680
63#, tcl-format
64msgid ""
65"Git version cannot be determined.\n"
66"\n"
67"%s claims it is version '%s'.\n"
68"\n"
69"%s requires at least Git 1.5.0 or later.\n"
70"\n"
71"Assume '%s' is version 1.5.0?\n"
72msgstr ""
73"无法确定 Git 的版本.\n"
74"\n"
75"%s 声明其版本为 '%s'.\n"
76"\n"
77"而 %s 需要 1.5.0 或这以后的 Git 版本.\n"
78"\n"
79"是否假定 '%s' 为版本 1.5.0?\n"
80
81#: git-gui.sh:918
82msgid "Git directory not found:"
83msgstr "Git 目录无法找到:"
84
85#: git-gui.sh:925
86msgid "Cannot move to top of working directory:"
87msgstr "无法移动到工作根目录:"
88
89#: git-gui.sh:932
90msgid "Cannot use funny .git directory:"
91msgstr "无法使用 .git 目录:"
92
93#: git-gui.sh:937
94msgid "No working directory"
95msgstr "没有工作目录"
96
97#: git-gui.sh:1084 lib/checkout_op.tcl:283
98msgid "Refreshing file status..."
99msgstr "更新文件状态..."
100
101#: git-gui.sh:1149
102msgid "Scanning for modified files ..."
103msgstr "扫描修改过的文件 ..."
104
105#: git-gui.sh:1324 lib/browser.tcl:246
106msgid "Ready."
107msgstr "就绪"
108
109#: git-gui.sh:1590
110msgid "Unmodified"
111msgstr "未修改"
112
113#: git-gui.sh:1592
114msgid "Modified, not staged"
115msgstr "修改但未缓存"
116
117#: git-gui.sh:1593 git-gui.sh:1598
118msgid "Staged for commit"
119msgstr "缓存为提交"
120
121#: git-gui.sh:1594 git-gui.sh:1599
122msgid "Portions staged for commit"
123msgstr "部分缓存为提交"
124
125#: git-gui.sh:1595 git-gui.sh:1600
126msgid "Staged for commit, missing"
127msgstr "缓存为提交, 不存在"
128
129#: git-gui.sh:1597
130msgid "Untracked, not staged"
131msgstr "未跟踪, 未缓存"
132
133#: git-gui.sh:1602
134msgid "Missing"
135msgstr "不存在"
136
137#: git-gui.sh:1603
138msgid "Staged for removal"
139msgstr "缓存为删除"
140
141#: git-gui.sh:1604
142msgid "Staged for removal, still present"
143msgstr "缓存为删除, 但仍存在"
144
145#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
146msgid "Requires merge resolution"
147msgstr "需要解决合并冲突"
148
149#: git-gui.sh:1644
150msgid "Starting gitk... please wait..."
151msgstr "启动 gitk... 请等待..."
152
153#: git-gui.sh:1653
154#, tcl-format
155msgid ""
156"Unable to start gitk:\n"
157"\n"
158"%s does not exist"
159msgstr ""
160"无法启动 gitk:\n"
161"\n"
162"%s 不存在"
163
164#: git-gui.sh:1860 lib/choose_repository.tcl:36
165msgid "Repository"
166msgstr "版本库(repository)"
167
168#: git-gui.sh:1861
169msgid "Edit"
170msgstr "编辑"
171
172#: git-gui.sh:1863 lib/choose_rev.tcl:561
173msgid "Branch"
174msgstr "分支(branch)"
175
176#: git-gui.sh:1866 lib/choose_rev.tcl:548
177msgid "Commit@@noun"
178msgstr "提交(commit)"
179
180#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
181msgid "Merge"
182msgstr "合并(merge)"
183
184#: git-gui.sh:1870 lib/choose_rev.tcl:557
185msgid "Remote"
186msgstr "远端(remote)"
187
188#: git-gui.sh:1879
189msgid "Browse Current Branch's Files"
190msgstr "浏览当前分支上的文件"
191
192#: git-gui.sh:1883
193msgid "Browse Branch Files..."
194msgstr "浏览分支上的文件..."
195
196#: git-gui.sh:1888
197msgid "Visualize Current Branch's History"
198msgstr "图示当前分支的历史"
199
200#: git-gui.sh:1892
201msgid "Visualize All Branch History"
202msgstr "图示所有分支的历史"
203
204#: git-gui.sh:1899
205#, tcl-format
206msgid "Browse %s's Files"
207msgstr "浏览 %s 上的文件"
208
209#: git-gui.sh:1901
210#, tcl-format
211msgid "Visualize %s's History"
212msgstr "图示 %s 分支的历史"
213
214#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
215msgid "Database Statistics"
216msgstr "数据库统计信息"
217
218#: git-gui.sh:1909 lib/database.tcl:34
219msgid "Compress Database"
220msgstr "压缩数据库"
221
222#: git-gui.sh:1912
223msgid "Verify Database"
224msgstr "验证数据库"
225
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
228msgid "Create Desktop Icon"
229msgstr "创建桌面图标"
230
231#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
232msgid "Quit"
233msgstr "退出"
234
235#: git-gui.sh:1939
236msgid "Undo"
237msgstr "撤销"
238
239#: git-gui.sh:1942
240msgid "Redo"
241msgstr "重做"
242
243#: git-gui.sh:1946 git-gui.sh:2443
244msgid "Cut"
245msgstr "剪切"
246
247#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
248#: lib/console.tcl:69
249msgid "Copy"
250msgstr "复制"
251
252#: git-gui.sh:1952 git-gui.sh:2449
253msgid "Paste"
254msgstr "粘贴"
255
256#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
257#: lib/remote_branch_delete.tcl:38
258msgid "Delete"
259msgstr "删除"
260
261#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
262msgid "Select All"
263msgstr "全选"
264
265#: git-gui.sh:1968
266msgid "Create..."
267msgstr "新建..."
268
269#: git-gui.sh:1974
270msgid "Checkout..."
271msgstr "Checkout..."
272
273#: git-gui.sh:1980
274msgid "Rename..."
275msgstr "更名..."
276
277#: git-gui.sh:1985 git-gui.sh:2085
278msgid "Delete..."
279msgstr "删除..."
280
281#: git-gui.sh:1990
282msgid "Reset..."
283msgstr "复位(Reset)..."
284
285#: git-gui.sh:2002 git-gui.sh:2389
286msgid "New Commit"
287msgstr "新建提交"
288
289#: git-gui.sh:2010 git-gui.sh:2396
290msgid "Amend Last Commit"
291msgstr "修正上次提交"
292
293#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
294msgid "Rescan"
295msgstr "重新扫描"
296
297#: git-gui.sh:2025
298msgid "Stage To Commit"
299msgstr "缓存为提交"
300
301#: git-gui.sh:2031
302msgid "Stage Changed Files To Commit"
303msgstr "缓存修改的文件为提交"
304
305#: git-gui.sh:2037
306msgid "Unstage From Commit"
307msgstr "从本次提交撤除"
308
309#: git-gui.sh:2042 lib/index.tcl:395
310msgid "Revert Changes"
311msgstr "撤销修改"
312
313#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
314msgid "Sign Off"
315msgstr "签名(Sign Off)"
316
317#: git-gui.sh:2053 git-gui.sh:2372
318msgid "Commit@@verb"
319msgstr "提交"
320
321#: git-gui.sh:2064
322msgid "Local Merge..."
323msgstr "本地合并..."
324
325#: git-gui.sh:2069
326msgid "Abort Merge..."
327msgstr "中止合并..."
328
329#: git-gui.sh:2081
330msgid "Push..."
331msgstr "上传..."
332
333#: git-gui.sh:2092 lib/choose_repository.tcl:41
334msgid "Apple"
335msgstr "苹果"
336
337#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
338#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
339#, tcl-format
340msgid "About %s"
341msgstr "关于 %s"
342
343#: git-gui.sh:2099
344msgid "Preferences..."
345msgstr "首选项..."
346
347#: git-gui.sh:2107 git-gui.sh:2639
348msgid "Options..."
349msgstr "选项..."
350
351#: git-gui.sh:2113 lib/choose_repository.tcl:47
352msgid "Help"
353msgstr "帮助"
354
355#: git-gui.sh:2154
356msgid "Online Documentation"
357msgstr "在线文档"
358
359#: git-gui.sh:2238
360#, tcl-format
361msgid "fatal: cannot stat path %s: No such file or directory"
362msgstr "致命错误: 无法获取路径 %s 的信息: 该文件或目录不存在"
363
364#: git-gui.sh:2271
365msgid "Current Branch:"
366msgstr "当前分支:"
367
368#: git-gui.sh:2292
369msgid "Staged Changes (Will Commit)"
370msgstr "已缓存的改动 (将被提交)"
371
372#: git-gui.sh:2312
373msgid "Unstaged Changes"
374msgstr "未缓存的改动"
375
376#: git-gui.sh:2362
377msgid "Stage Changed"
378msgstr "缓存改动"
379
380#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
381msgid "Push"
382msgstr "上传"
383
384#: git-gui.sh:2408
385msgid "Initial Commit Message:"
386msgstr "初始的提交描述:"
387
388#: git-gui.sh:2409
389msgid "Amended Commit Message:"
390msgstr "修正的提交描述:"
391
392#: git-gui.sh:2410
393msgid "Amended Initial Commit Message:"
394msgstr "修正的初始提交描述:"
395
396#: git-gui.sh:2411
397msgid "Amended Merge Commit Message:"
398msgstr "修正的合并提交描述:"
399
400#: git-gui.sh:2412
401msgid "Merge Commit Message:"
402msgstr "合并提交描述:"
403
404#: git-gui.sh:2413
405msgid "Commit Message:"
406msgstr "提交描述:"
407
408#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
409msgid "Copy All"
410msgstr "全部复制"
411
412#: git-gui.sh:2483 lib/blame.tcl:107
413msgid "File:"
414msgstr "文件:"
415
416#: git-gui.sh:2589
417msgid "Apply/Reverse Hunk"
418msgstr "应用/撤消此修改块"
419
420#: git-gui.sh:2595
421msgid "Show Less Context"
422msgstr "显示更少上下文"
423
424#: git-gui.sh:2602
425msgid "Show More Context"
426msgstr "显示更多上下文"
427
428#: git-gui.sh:2610
429msgid "Refresh"
430msgstr "刷新"
431
432#: git-gui.sh:2631
433msgid "Decrease Font Size"
434msgstr "缩小字体"
435
436#: git-gui.sh:2635
437msgid "Increase Font Size"
438msgstr "放大字体"
439
440#: git-gui.sh:2646
441msgid "Unstage Hunk From Commit"
442msgstr "从提交中撤除修改块"
443
444#: git-gui.sh:2648
445msgid "Stage Hunk For Commit"
446msgstr "缓存修改块为提交"
447
448#: git-gui.sh:2667
449msgid "Initializing..."
450msgstr "初始化..."
451
452#: git-gui.sh:2762
453#, tcl-format
454msgid ""
455"Possible environment issues exist.\n"
456"\n"
457"The following environment variables are probably\n"
458"going to be ignored by any Git subprocess run\n"
459"by %s:\n"
460"\n"
461msgstr ""
462"可能存在环境变量的问题.\n"
463"\n"
464"由 %s 执行的 Git 子进程可能忽略下列环境变量:\n"
465"\n"
466
467#: git-gui.sh:2792
468msgid ""
469"\n"
470"This is due to a known issue with the\n"
471"Tcl binary distributed by Cygwin."
472msgstr ""
473"\n"
474"这是由 Cygwin 发布的 Tcl 代码中一个\n"
475"已知问题所引起."
476
477#: git-gui.sh:2797
478#, tcl-format
479msgid ""
480"\n"
481"\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"
486msgstr ""
487"\n"
488"\n"
489"%s 的一个很好的替代方案是将 user.name 以及\n"
490"user.email 设置放在你的个人 ~/.gitconfig 文件中.\n"
491
492#: lib/about.tcl:26
493msgid "git-gui - a graphical user interface for Git."
494msgstr "git-gui - Git 的图形化用户界面"
495
496#: lib/blame.tcl:77
497msgid "File Viewer"
498msgstr "文件查看器"
499
500#: lib/blame.tcl:81
501msgid "Commit:"
502msgstr "提交:"
503
504#: lib/blame.tcl:264
505msgid "Copy Commit"
506msgstr "复制提交"
507
508#: lib/blame.tcl:384
509#, tcl-format
510msgid "Reading %s..."
511msgstr "读取 %s..."
512
513#: lib/blame.tcl:488
514msgid "Loading copy/move tracking annotations..."
515msgstr "装载复制/移动跟踪标注..."
516
517#: lib/blame.tcl:508
518msgid "lines annotated"
519msgstr "标注行"
520
521#: lib/blame.tcl:689
522msgid "Loading original location annotations..."
523msgstr "装载原始位置标注..."
524
525#: lib/blame.tcl:692
526msgid "Annotation complete."
527msgstr "标注完成."
528
529#: lib/blame.tcl:746
530msgid "Loading annotation..."
531msgstr "裝載标注..."
532
533#: lib/blame.tcl:802
534msgid "Author:"
535msgstr "作者:"
536
537#: lib/blame.tcl:806
538msgid "Committer:"
539msgstr "提交者:"
540
541#: lib/blame.tcl:811
542msgid "Original File:"
543msgstr "原始文件:"
544
545#: lib/blame.tcl:925
546msgid "Originally By:"
547msgstr "最初由:"
548
549#: lib/blame.tcl:931
550msgid "In File:"
551msgstr "在文件:"
552
553#: lib/blame.tcl:936
554msgid "Copied Or Moved Here By:"
555msgstr "由复制或移动至此:"
556
557#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
558msgid "Checkout Branch"
559msgstr "Checkout 分支"
560
561#: lib/branch_checkout.tcl:23
562msgid "Checkout"
563msgstr "Checkout"
564
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
569msgid "Cancel"
570msgstr "取消"
571
572#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
573msgid "Revision"
574msgstr "版本"
575
576#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
577msgid "Options"
578msgstr "选项..."
579
580#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
581msgid "Fetch Tracking Branch"
582msgstr "获取跟踪分支"
583
584#: lib/branch_checkout.tcl:44
585msgid "Detach From Local Branch"
586msgstr "从本地分支脱离"
587
588#: lib/branch_create.tcl:22
589msgid "Create Branch"
590msgstr "创建分支"
591
592#: lib/branch_create.tcl:27
593msgid "Create New Branch"
594msgstr "新建分支"
595
596#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
597msgid "Create"
598msgstr "新建"
599
600#: lib/branch_create.tcl:40
601msgid "Branch Name"
602msgstr "分支名"
603
604#: lib/branch_create.tcl:43
605msgid "Name:"
606msgstr "名字:"
607
608#: lib/branch_create.tcl:58
609msgid "Match Tracking Branch Name"
610msgstr "匹配跟踪分支名字"
611
612#: lib/branch_create.tcl:66
613msgid "Starting Revision"
614msgstr "起始版本"
615
616#: lib/branch_create.tcl:72
617msgid "Update Existing Branch:"
618msgstr "更新已有分支:"
619
620#: lib/branch_create.tcl:75
621msgid "No"
622msgstr "号码"
623
624#: lib/branch_create.tcl:80
625msgid "Fast Forward Only"
626msgstr "仅快速合并"
627
628#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
629msgid "Reset"
630msgstr "复位"
631
632#: lib/branch_create.tcl:97
633msgid "Checkout After Creation"
634msgstr "在创建后Checkout"
635
636#: lib/branch_create.tcl:131
637msgid "Please select a tracking branch."
638msgstr "请选择某个跟踪分支."
639
640#: lib/branch_create.tcl:140
641#, tcl-format
642msgid "Tracking branch %s is not a branch in the remote repository."
643msgstr "跟踪分支 %s 并不是远端版本库中的一个分支"
644
645#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
646msgid "Please supply a branch name."
647msgstr "请提供分支名字."
648
649#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
650#, tcl-format
651msgid "'%s' is not an acceptable branch name."
652msgstr "'%s'不是一个可接受的分支名."
653
654#: lib/branch_delete.tcl:15
655msgid "Delete Branch"
656msgstr "删除分支"
657
658#: lib/branch_delete.tcl:20
659msgid "Delete Local Branch"
660msgstr "删除本地分支"
661
662#: lib/branch_delete.tcl:37
663msgid "Local Branches"
664msgstr "本地分支"
665
666#: lib/branch_delete.tcl:52
667msgid "Delete Only If Merged Into"
668msgstr "仅在合并后删除"
669
670#: lib/branch_delete.tcl:54
671msgid "Always (Do not perform merge test.)"
672msgstr "总是合并 (不作合并测试.)"
673
674#: lib/branch_delete.tcl:103
675#, tcl-format
676msgid "The following branches are not completely merged into %s:"
677msgstr "下列分支没有完全被合并到 %s:"
678
679#: lib/branch_delete.tcl:141
680#, tcl-format
681msgid ""
682"Failed to delete branches:\n"
683"%s"
684msgstr ""
685"无法删除分支:\n"
686"%s"
687
688#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
689msgid "Rename Branch"
690msgstr "更改分支名:"
691
692#: lib/branch_rename.tcl:26
693msgid "Rename"
694msgstr "更名..."
695
696#: lib/branch_rename.tcl:36
697msgid "Branch:"
698msgstr "分支:"
699
700#: lib/branch_rename.tcl:39
701msgid "New Name:"
702msgstr "新名字:"
703
704#: lib/branch_rename.tcl:75
705msgid "Please select a branch to rename."
706msgstr "请选择分支更名."
707
708#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
709#, tcl-format
710msgid "Branch '%s' already exists."
711msgstr "分支 '%s' 已经存在."
712
713#: lib/branch_rename.tcl:117
714#, tcl-format
715msgid "Failed to rename '%s'."
716msgstr "无法更名 '%s'."
717
718#: lib/browser.tcl:17
719msgid "Starting..."
720msgstr "开始..."
721
722#: lib/browser.tcl:26
723msgid "File Browser"
724msgstr "文件浏览器"
725
726#: lib/browser.tcl:126 lib/browser.tcl:143
727#, tcl-format
728msgid "Loading %s..."
729msgstr "装载 %s..."
730
731#: lib/browser.tcl:187
732msgid "[Up To Parent]"
733msgstr "[上层目录]"
734
735#: lib/browser.tcl:267 lib/browser.tcl:273
736msgid "Browse Branch Files"
737msgstr "浏览分支文件"
738
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
742msgid "Browse"
743msgstr "浏览"
744
745#: lib/checkout_op.tcl:79
746#, tcl-format
747msgid "Fetching %s from %s"
748msgstr "获取 %s 自 %s"
749
750#: lib/checkout_op.tcl:127
751#, tcl-format
752msgid "fatal: Cannot resolve %s"
753msgstr "致命错误: 无法解决 %s"
754
755#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
756msgid "Close"
757msgstr "关闭"
758
759#: lib/checkout_op.tcl:169
760#, tcl-format
761msgid "Branch '%s' does not exist."
762msgstr "分支 '%s' 并不存在."
763
764#: lib/checkout_op.tcl:206
765#, tcl-format
766msgid ""
767"Branch '%s' already exists.\n"
768"\n"
769"It cannot fast-forward to %s.\n"
770"A merge is required."
771msgstr ""
772"分支 '%s' 已经存在.\n"
773"\n"
774"无法快速合并到 %s.\n"
775"需要普通合并."
776
777#: lib/checkout_op.tcl:220
778#, tcl-format
779msgid "Merge strategy '%s' not supported."
780msgstr "合并策略 '%s' 不支持."
781
782#: lib/checkout_op.tcl:239
783#, tcl-format
784msgid "Failed to update '%s'."
785msgstr "无法更新 '%s'."
786
787#: lib/checkout_op.tcl:251
788msgid "Staging area (index) is already locked."
789msgstr "缓存区域 (index) 已被锁定."
790
791#: lib/checkout_op.tcl:266
792msgid ""
793"Last scanned state does not match repository state.\n"
794"\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"
797"\n"
798"The rescan will be automatically started now.\n"
799msgstr ""
800"最后一次扫描的状态和当前版本库状态不符.\n"
801"\n"
802"另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
803"描.\n"
804"\n"
805"重新扫描将自动开始.\n"
806
807#: lib/checkout_op.tcl:322
808#, tcl-format
809msgid "Updating working directory to '%s'..."
810msgstr "更新工作目录到 '%s'..."
811
812#: lib/checkout_op.tcl:323
813msgid "files checked out"
814msgstr ""
815
816#: lib/checkout_op.tcl:353
817#, tcl-format
818msgid "Aborted checkout of '%s' (file level merging is required)."
819msgstr "中止 '%s' 的 checkout 操作 (需要做文件级合并)."
820
821#: lib/checkout_op.tcl:354
822msgid "File level merge required."
823msgstr "需要文件级合并."
824
825#: lib/checkout_op.tcl:358
826#, tcl-format
827msgid "Staying on branch '%s'."
828msgstr "停留在分支 '%s'."
829
830#: lib/checkout_op.tcl:429
831msgid ""
832"You are no longer on a local branch.\n"
833"\n"
834"If you wanted to be on a branch, create one now starting from 'This Detached "
835"Checkout'."
836msgstr ""
837"你不在某个本地分支上.\n"
838"\n"
839"如果你想位于某分支上, 从当前脱节的Checkout中创建一个新分支."
840
841#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
842#, tcl-format
843msgid "Checked out '%s'."
844msgstr "'%s' 已被 checkout"
845
846#: lib/checkout_op.tcl:478
847#, tcl-format
848msgid "Resetting '%s' to '%s' will lose the following commits:"
849msgstr "复位 '%s' 到 '%s' 将导致下列提交的丢失:"
850
851#: lib/checkout_op.tcl:500
852msgid "Recovering lost commits may not be easy."
853msgstr "恢复丢失的提交是比较困难的."
854
855#: lib/checkout_op.tcl:505
856#, tcl-format
857msgid "Reset '%s'?"
858msgstr "复位 '%s'?"
859
860#: lib/checkout_op.tcl:510 lib/merge.tcl:163
861msgid "Visualize"
862msgstr "图示"
863
864#: lib/checkout_op.tcl:578
865#, tcl-format
866msgid ""
867"Failed to set current branch.\n"
868"\n"
869"This working directory is only partially switched. We successfully updated "
870"your files, but failed to update an internal Git file.\n"
871"\n"
872"This should not have occurred. %s will now close and give up."
873msgstr ""
874"无法设定当前分支.\n"
875"\n"
876"当前工作目录仅有部分被切换出, 我们已成功的更新了您的文件但是无法更新某个内部"
877"的Git文件.\n"
878"\n"
879"这本不该发生, %s 将关闭并放弃."
880
881#: lib/choose_font.tcl:39
882msgid "Select"
883msgstr "选择"
884
885#: lib/choose_font.tcl:53
886msgid "Font Family"
887msgstr "字体族"
888
889#: lib/choose_font.tcl:74
890msgid "Font Size"
891msgstr "字体大小"
892
893#: lib/choose_font.tcl:91
894msgid "Font Example"
895msgstr "字体样例"
896
897#: lib/choose_font.tcl:103
898msgid ""
899"This is example text.\n"
900"If you like this text, it can be your font."
901msgstr ""
902"这是样例文本.\n"
903"如果你喜欢, 你可以设置该字体."
904
905#: lib/choose_repository.tcl:28
906msgid "Git Gui"
907msgstr "Git Gui"
908
909#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
910msgid "Create New Repository"
911msgstr "创建新的版本库"
912
913#: lib/choose_repository.tcl:87
914msgid "New..."
915msgstr "新建..."
916
917#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
918msgid "Clone Existing Repository"
919msgstr "克隆已有版本库"
920
921#: lib/choose_repository.tcl:100
922msgid "Clone..."
923msgstr "克隆..."
924
925#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
926msgid "Open Existing Repository"
927msgstr "打开已有版本库"
928
929#: lib/choose_repository.tcl:113
930msgid "Open..."
931msgstr "打开..."
932
933#: lib/choose_repository.tcl:126
934msgid "Recent Repositories"
935msgstr "最近版本库"
936
937#: lib/choose_repository.tcl:132
938msgid "Open Recent Repository:"
939msgstr "打开最近版本库"
940
941#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
942#: lib/choose_repository.tcl:310
943#, tcl-format
944msgid "Failed to create repository %s:"
945msgstr "无法创建版本库 %s:"
946
947#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
948msgid "Directory:"
949msgstr "目录:"
950
951#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
952#: lib/choose_repository.tcl:1011
953msgid "Git Repository"
954msgstr "Git 版本库"
955
956#: lib/choose_repository.tcl:437
957#, tcl-format
958msgid "Directory %s already exists."
959msgstr "目录 %s 已经存在."
960
961#: lib/choose_repository.tcl:441
962#, tcl-format
963msgid "File %s already exists."
964msgstr "文件 %s 已经存在."
965
966#: lib/choose_repository.tcl:455
967msgid "Clone"
968msgstr "克隆"
969
970#: lib/choose_repository.tcl:468
971msgid "URL:"
972msgstr "URL:"
973
974#: lib/choose_repository.tcl:489
975msgid "Clone Type:"
976msgstr "克隆类型:"
977
978#: lib/choose_repository.tcl:495
979msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
980msgstr "标准方式 (快速, 部分备份, 作硬连接)"
981
982#: lib/choose_repository.tcl:501
983msgid "Full Copy (Slower, Redundant Backup)"
984msgstr "全部复制 (较慢, 做备份)"
985
986#: lib/choose_repository.tcl:507
987msgid "Shared (Fastest, Not Recommended, No Backup)"
988msgstr "共享方式 (最快, 不推荐, 不做备份)"
989
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
993#, tcl-format
994msgid "Not a Git repository: %s"
995msgstr "不是一个 Git 版本库: %s"
996
997#: lib/choose_repository.tcl:579
998msgid "Standard only available for local repository."
999msgstr "标准方式仅当是本地版本库时有效."
1000
1001#: lib/choose_repository.tcl:583
1002msgid "Shared only available for local repository."
1003msgstr "共享方式仅当是本地版本库时有效."
1004
1005#: lib/choose_repository.tcl:604
1006#, tcl-format
1007msgid "Location %s already exists."
1008msgstr "位置 %s 已经存在."
1009
1010#: lib/choose_repository.tcl:615
1011msgid "Failed to configure origin"
1012msgstr "无法配置 origin"
1013
1014#: lib/choose_repository.tcl:627
1015msgid "Counting objects"
1016msgstr "清点对象"
1017
1018#: lib/choose_repository.tcl:628
1019#, fuzzy
1020msgid "buckets"
1021msgstr "水桶??"
1022
1023#: lib/choose_repository.tcl:652
1024#, tcl-format
1025msgid "Unable to copy objects/info/alternates: %s"
1026msgstr "无法复制 objects/info/alternates: %s"
1027
1028#: lib/choose_repository.tcl:688
1029#, tcl-format
1030msgid "Nothing to clone from %s."
1031msgstr "没有东西可从 %s 克隆."
1032
1033#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
1034#: lib/choose_repository.tcl:916
1035msgid "The 'master' branch has not been initialized."
1036msgstr "'master'分支尚未初始化."
1037
1038#: lib/choose_repository.tcl:703
1039msgid "Hardlinks are unavailable. Falling back to copying."
1040msgstr "硬连接不可用. 使用复制."
1041
1042#: lib/choose_repository.tcl:715
1043#, tcl-format
1044msgid "Cloning from %s"
1045msgstr "从 %s 克隆"
1046
1047#: lib/choose_repository.tcl:746
1048msgid "Copying objects"
1049msgstr "复制 objects"
1050
1051#: lib/choose_repository.tcl:747
1052msgid "KiB"
1053msgstr "KiB"
1054
1055#: lib/choose_repository.tcl:771
1056#, tcl-format
1057msgid "Unable to copy object: %s"
1058msgstr "无法复制 object: %s"
1059
1060#: lib/choose_repository.tcl:781
1061msgid "Linking objects"
1062msgstr "链接 objects"
1063
1064#: lib/choose_repository.tcl:782
1065msgid "objects"
1066msgstr "objects"
1067
1068#: lib/choose_repository.tcl:790
1069#, tcl-format
1070msgid "Unable to hardlink object: %s"
1071msgstr "无法硬链接 object: %s"
1072
1073#: lib/choose_repository.tcl:845
1074msgid "Cannot fetch branches and objects. See console output for details."
1075msgstr "无法获取分支和对象. 请查看控制终端的输出."
1076
1077#: lib/choose_repository.tcl:856
1078msgid "Cannot fetch tags. See console output for details."
1079msgstr "无法获取标签. 请查看控制终端的输出."
1080
1081#: lib/choose_repository.tcl:880
1082msgid "Cannot determine HEAD. See console output for details."
1083msgstr "无法确定 HEAD. 请查看控制终端的输出."
1084
1085#: lib/choose_repository.tcl:889
1086#, tcl-format
1087msgid "Unable to cleanup %s"
1088msgstr "无法清理 %s"
1089
1090#: lib/choose_repository.tcl:895
1091msgid "Clone failed."
1092msgstr "克隆失败."
1093
1094#: lib/choose_repository.tcl:902
1095msgid "No default branch obtained."
1096msgstr "没有获取缺省分支"
1097
1098#: lib/choose_repository.tcl:913
1099#, tcl-format
1100msgid "Cannot resolve %s as a commit."
1101msgstr "无法解析 %s 为提交."
1102
1103#: lib/choose_repository.tcl:925
1104msgid "Creating working directory"
1105msgstr "创建工作目录"
1106
1107#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
1108#: lib/index.tcl:193
1109msgid "files"
1110msgstr "文件"
1111
1112#: lib/choose_repository.tcl:955
1113msgid "Initial file checkout failed."
1114msgstr "初始的文件checkout失败"
1115
1116#: lib/choose_repository.tcl:971
1117msgid "Open"
1118msgstr "打开"
1119
1120#: lib/choose_repository.tcl:981
1121msgid "Repository:"
1122msgstr "版本库"
1123
1124#: lib/choose_repository.tcl:1031
1125#, tcl-format
1126msgid "Failed to open repository %s:"
1127msgstr "无法打开版本库 %s:"
1128
1129#: lib/choose_rev.tcl:53
1130msgid "This Detached Checkout"
1131msgstr "该脱节的Checkout"
1132
1133#: lib/choose_rev.tcl:60
1134msgid "Revision Expression:"
1135msgstr "版本表达式:"
1136
1137#: lib/choose_rev.tcl:74
1138msgid "Local Branch"
1139msgstr "本地分支"
1140
1141#: lib/choose_rev.tcl:79
1142msgid "Tracking Branch"
1143msgstr "跟踪分支:"
1144
1145#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
1146msgid "Tag"
1147msgstr "标签"
1148
1149#: lib/choose_rev.tcl:317
1150#, tcl-format
1151msgid "Invalid revision: %s"
1152msgstr "无效版本: %s"
1153
1154#: lib/choose_rev.tcl:338
1155msgid "No revision selected."
1156msgstr "没有选择版本."
1157
1158#: lib/choose_rev.tcl:346
1159msgid "Revision expression is empty."
1160msgstr "版本表达式为空."
1161
1162#: lib/choose_rev.tcl:531
1163msgid "Updated"
1164msgstr "已更新"
1165
1166#: lib/choose_rev.tcl:559
1167msgid "URL"
1168msgstr "URL"
1169
1170#: lib/commit.tcl:9
1171msgid ""
1172"There is nothing to amend.\n"
1173"\n"
1174"You are about to create the initial commit. There is no commit before this "
1175"to amend.\n"
1176msgstr ""
1177"没有改动需要修正.\n"
1178"\n"
1179"你正在创建最初的提交. 在此之前没有提交可以修正.\n"
1180
1181#: lib/commit.tcl:18
1182msgid ""
1183"Cannot amend while merging.\n"
1184"\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"
1188msgstr ""
1189"在合并时无法修正.\n"
1190"\n"
1191"你当前正在一次尚未完成的合并操作过程中. 除非中止当前合并活动,\n"
1192"否则无法修正之前的提交.\n"
1193
1194#: lib/commit.tcl:49
1195msgid "Error loading commit data for amend:"
1196msgstr "为修正装载提交数据出错:"
1197
1198#: lib/commit.tcl:76
1199msgid "Unable to obtain your identity:"
1200msgstr "无法获知你的身份:"
1201
1202#: lib/commit.tcl:81
1203msgid "Invalid GIT_COMMITTER_IDENT:"
1204msgstr "无效的 GIT_COMMITTER_IDENT"
1205
1206#: lib/commit.tcl:133
1207msgid ""
1208"Last scanned state does not match repository state.\n"
1209"\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"
1212"\n"
1213"The rescan will be automatically started now.\n"
1214msgstr ""
1215"最后一次扫描的状态和当前版本库状态不符.\n"
1216"\n"
1217"另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
1218"描.\n"
1219"\n"
1220"重新扫描将自动开始.\n"
1221
1222#: lib/commit.tcl:154
1223#, tcl-format
1224msgid ""
1225"Unmerged files cannot be committed.\n"
1226"\n"
1227"File %s has merge conflicts. You must resolve them and stage the file "
1228"before committing.\n"
1229msgstr ""
1230"尚未合并的文件没有办法提交.\n"
1231"\n"
1232"文件 %s 有合并冲突, 你必须解决这些冲突并缓存该文件作提交.\n"
1233
1234#: lib/commit.tcl:162
1235#, tcl-format
1236msgid ""
1237"Unknown file state %s detected.\n"
1238"\n"
1239"File %s cannot be committed by this program.\n"
1240msgstr ""
1241"检测到未知文件状态 %s.\n"
1242"\n"
1243"文件 %s 无法由该程序提交.\n"
1244
1245#: lib/commit.tcl:170
1246msgid ""
1247"No changes to commit.\n"
1248"\n"
1249"You must stage at least 1 file before you can commit.\n"
1250msgstr ""
1251"没有需要提交的变动.\n"
1252"\n"
1253"提交前你必须首先缓存至少一个文件.\n"
1254
1255#: lib/commit.tcl:183
1256msgid ""
1257"Please supply a commit message.\n"
1258"\n"
1259"A good commit message has the following format:\n"
1260"\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"
1264msgstr ""
1265"请提供一条提交信息.\n"
1266"\n"
1267"一条好的提交信息有下列格式:\n"
1268"\n"
1269"- 第一行: 一句话概括你做的修改.\n"
1270"- 第二行: 空行\n"
1271"- 剩余行: 请描述为什么你做的这些改动是好的.\n"
1272
1273#: lib/commit.tcl:207
1274#, tcl-format
1275msgid "warning: Tcl does not support encoding '%s'."
1276msgstr "警告: Tcl 不支持编码方式 '%s'."
1277
1278#: lib/commit.tcl:221
1279msgid "Calling pre-commit hook..."
1280msgstr ""
1281
1282#: lib/commit.tcl:236
1283msgid "Commit declined by pre-commit hook."
1284msgstr ""
1285
1286#: lib/commit.tcl:259
1287msgid "Calling commit-msg hook..."
1288msgstr ""
1289
1290#: lib/commit.tcl:274
1291msgid "Commit declined by commit-msg hook."
1292msgstr ""
1293
1294#: lib/commit.tcl:287
1295msgid "Committing changes..."
1296msgstr ""
1297
1298#: lib/commit.tcl:303
1299msgid "write-tree failed:"
1300msgstr "write-tree 失败:"
1301
1302#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
1303#, fuzzy
1304msgid "Commit failed."
1305msgstr "克隆失败."
1306
1307#: lib/commit.tcl:321
1308#, tcl-format
1309msgid "Commit %s appears to be corrupt"
1310msgstr "提交 %s 似乎已损坏"
1311
1312#: lib/commit.tcl:326
1313msgid ""
1314"No changes to commit.\n"
1315"\n"
1316"No files were modified by this commit and it was not a merge commit.\n"
1317"\n"
1318"A rescan will be automatically started now.\n"
1319msgstr ""
1320"没有改动提交.\n"
1321"\n"
1322"该提交没有改动任何文件也不是一个合并提交.\n"
1323"\n"
1324"重新扫描将自动开始.\n"
1325
1326#: lib/commit.tcl:333
1327msgid "No changes to commit."
1328msgstr "没有改动要提交."
1329
1330#: lib/commit.tcl:347
1331msgid "commit-tree failed:"
1332msgstr "commit-tree 失败:"
1333
1334#: lib/commit.tcl:367
1335msgid "update-ref failed:"
1336msgstr "update-ref 失败:"
1337
1338#: lib/commit.tcl:454
1339#, tcl-format
1340msgid "Created commit %s: %s"
1341msgstr "创建了 commit %s: %s"
1342
1343#: lib/console.tcl:59
1344msgid "Working... please wait..."
1345msgstr "工作中... 请等待..."
1346
1347#: lib/console.tcl:186
1348msgid "Success"
1349msgstr "成功"
1350
1351#: lib/console.tcl:200
1352msgid "Error: Command Failed"
1353msgstr "错误: 命令失败"
1354
1355#: lib/database.tcl:43
1356msgid "Number of loose objects"
1357msgstr "松散对象的数量"
1358
1359#: lib/database.tcl:44
1360msgid "Disk space used by loose objects"
1361msgstr "松散对象所使用的磁盘空间"
1362
1363#: lib/database.tcl:45
1364msgid "Number of packed objects"
1365msgstr "压缩对象数量"
1366
1367#: lib/database.tcl:46
1368msgid "Number of packs"
1369msgstr "压缩包数量"
1370
1371#: lib/database.tcl:47
1372msgid "Disk space used by packed objects"
1373msgstr "压缩对象所使用的磁盘空间"
1374
1375#: lib/database.tcl:48
1376msgid "Packed objects waiting for pruning"
1377msgstr "压缩对象等待清理"
1378
1379#: lib/database.tcl:49
1380msgid "Garbage files"
1381msgstr "垃圾文件"
1382
1383#: lib/database.tcl:72
1384msgid "Compressing the object database"
1385msgstr "压缩对象数据库"
1386
1387#: lib/database.tcl:83
1388msgid "Verifying the object database with fsck-objects"
1389msgstr "使用 fsck-objects 验证对象数据库"
1390
1391#: lib/database.tcl:108
1392#, tcl-format
1393msgid ""
1394"This repository currently has approximately %i loose objects.\n"
1395"\n"
1396"To maintain optimal performance it is strongly recommended that you compress "
1397"the database when more than %i loose objects exist.\n"
1398"\n"
1399"Compress the database now?"
1400msgstr ""
1401"该版本库当前约有 %i 个松散对象.\n"
1402"\n"
1403"为达到较优的性能,强烈建议你在松散对象多于 %i 时压缩数据库.\n"
1404"\n"
1405"现在就压缩数据库么?"
1406
1407#: lib/date.tcl:25
1408#, tcl-format
1409msgid "Invalid date from Git: %s"
1410msgstr "无效的日期: %s"
1411
1412#: lib/diff.tcl:42
1413#, tcl-format
1414msgid ""
1415"No differences detected.\n"
1416"\n"
1417"%s has no changes.\n"
1418"\n"
1419"The modification date of this file was updated by another application, but "
1420"the content within the file was not changed.\n"
1421"\n"
1422"A rescan will be automatically started to find other files which may have "
1423"the same state."
1424msgstr ""
1425"未检测到改动.\n"
1426"\n"
1427"该文件的修改日期被另一个程序所更新, 但其内容并没有变化.\n"
1428"\n"
1429"对于类似情况的其他文件的重新扫描将自动开始."
1430
1431#: lib/diff.tcl:81
1432#, fuzzy, tcl-format
1433msgid "Loading diff of %s..."
1434msgstr "装载 %s 的 diff ..."
1435
1436#: lib/diff.tcl:114 lib/diff.tcl:184
1437#, tcl-format
1438msgid "Unable to display %s"
1439msgstr "无法显示 %s"
1440
1441#: lib/diff.tcl:115
1442msgid "Error loading file:"
1443msgstr "装载文件出错:"
1444
1445#: lib/diff.tcl:122
1446msgid "Git Repository (subproject)"
1447msgstr "Git 版本库 (子项目)"
1448
1449#: lib/diff.tcl:134
1450msgid "* Binary file (not showing content)."
1451msgstr "* 二进制文件 (不显示内容)."
1452
1453#: lib/diff.tcl:185
1454msgid "Error loading diff:"
1455msgstr "装载 diff 错误:"
1456
1457#: lib/diff.tcl:303
1458msgid "Failed to unstage selected hunk."
1459msgstr "无法将选择的代码段从缓存中删除."
1460
1461#: lib/diff.tcl:310
1462msgid "Failed to stage selected hunk."
1463msgstr "无法缓存所选代码段."
1464
1465#: lib/error.tcl:20 lib/error.tcl:114
1466msgid "error"
1467msgstr "错误"
1468
1469#: lib/error.tcl:36
1470msgid "warning"
1471msgstr "警告"
1472
1473#: lib/error.tcl:94
1474msgid "You must correct the above errors before committing."
1475msgstr "你必须在提交前修正上述错误."
1476
1477#: lib/index.tcl:6
1478msgid "Unable to unlock the index."
1479msgstr "无法解锁缓存 (index)"
1480
1481#: lib/index.tcl:15
1482msgid "Index Error"
1483msgstr "缓存(Index)错误"
1484
1485#: lib/index.tcl:21
1486msgid ""
1487"Updating the Git index failed. A rescan will be automatically started to "
1488"resynchronize git-gui."
1489msgstr "更新 Git 缓存(Index)失败, 重新扫描将自动开始以重新同步 git-gui."
1490
1491#: lib/index.tcl:27
1492msgid "Continue"
1493msgstr "继续"
1494
1495#: lib/index.tcl:31
1496msgid "Unlock Index"
1497msgstr "解锁 Index"
1498
1499#: lib/index.tcl:282
1500#, tcl-format
1501msgid "Unstaging %s from commit"
1502msgstr "从提交缓存中删除 %s"
1503
1504#: lib/index.tcl:313
1505#, fuzzy
1506msgid "Ready to commit."
1507msgstr "缓存为提交"
1508
1509#: lib/index.tcl:326
1510#, tcl-format
1511msgid "Adding %s"
1512msgstr "添加 %s"
1513
1514#: lib/index.tcl:381
1515#, tcl-format
1516msgid "Revert changes in file %s?"
1517msgstr "撤销文件 %s 中的改动?"
1518
1519#: lib/index.tcl:383
1520#, tcl-format
1521msgid "Revert changes in these %i files?"
1522msgstr "撤销这些 (%i个) 文件的改动?"
1523
1524#: lib/index.tcl:391
1525msgid "Any unstaged changes will be permanently lost by the revert."
1526msgstr "任何未缓存的改动将在这次撤销中永久丢失."
1527
1528#: lib/index.tcl:394
1529msgid "Do Nothing"
1530msgstr "不做操作"
1531
1532#: lib/merge.tcl:13
1533msgid ""
1534"Cannot merge while amending.\n"
1535"\n"
1536"You must finish amending this commit before starting any type of merge.\n"
1537msgstr ""
1538"修正时无法做合并.\n"
1539"\n"
1540"你必须完成对该提交的修正才能继续任何类型的合并操作.\n"
1541
1542#: lib/merge.tcl:27
1543msgid ""
1544"Last scanned state does not match repository state.\n"
1545"\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"
1548"\n"
1549"The rescan will be automatically started now.\n"
1550msgstr ""
1551"最后一次扫描的状态和当前版本库状态不符.\n"
1552"\n"
1553"另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
1554"描.\n"
1555"\n"
1556"重新扫描将自动开始.\n"
1557
1558#: lib/merge.tcl:44
1559#, tcl-format
1560msgid ""
1561"You are in the middle of a conflicted merge.\n"
1562"\n"
1563"File %s has merge conflicts.\n"
1564"\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"
1567msgstr ""
1568"你正处在一个有冲突的合并操作中.\n"
1569"\n"
1570"文件 %s 有合并冲突.\n"
1571"\n"
1572"你必须解决这些冲突, 缓存该文件, 并提交来完成当前的合并.仅当这样后才能开始下一"
1573"个合并操作.\n"
1574
1575#: lib/merge.tcl:54
1576#, tcl-format
1577msgid ""
1578"You are in the middle of a change.\n"
1579"\n"
1580"File %s is modified.\n"
1581"\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"
1584msgstr ""
1585"你正处在一个改动当中.\n"
1586"\n"
1587"文件 %s 已被修改.\n"
1588"\n"
1589"你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于中止一次失败的合"
1590"并.\n"
1591
1592#: lib/merge.tcl:106
1593#, tcl-format
1594msgid "%s of %s"
1595msgstr ""
1596
1597#: lib/merge.tcl:119
1598#, fuzzy, tcl-format
1599msgid "Merging %s and %s..."
1600msgstr "合并 %s 和 %s"
1601
1602#: lib/merge.tcl:130
1603msgid "Merge completed successfully."
1604msgstr "合并成功完成."
1605
1606#: lib/merge.tcl:132
1607msgid "Merge failed. Conflict resolution is required."
1608msgstr "合并失败. 需要解决冲突."
1609
1610#: lib/merge.tcl:157
1611#, tcl-format
1612msgid "Merge Into %s"
1613msgstr "合并到 %s"
1614
1615#: lib/merge.tcl:176
1616msgid "Revision To Merge"
1617msgstr "要合并的版本"
1618
1619#: lib/merge.tcl:211
1620msgid ""
1621"Cannot abort while amending.\n"
1622"\n"
1623"You must finish amending this commit.\n"
1624msgstr ""
1625"修正操作中无法中止.\n"
1626"\n"
1627"你必须先完成本次修正操作.\n"
1628
1629#: lib/merge.tcl:221
1630msgid ""
1631"Abort merge?\n"
1632"\n"
1633"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
1634"\n"
1635"Continue with aborting the current merge?"
1636msgstr ""
1637"中止合并?\n"
1638"\n"
1639"中止当前的合并操作将导致 *所有* 尚未提交的改动丢失.\n"
1640"\n"
1641"是否要继续中止当前的合并操作?"
1642
1643#: lib/merge.tcl:227
1644msgid ""
1645"Reset changes?\n"
1646"\n"
1647"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
1648"\n"
1649"Continue with resetting the current changes?"
1650msgstr ""
1651"是否复位当前改动?\n"
1652"\n"
1653"复位当前的改动将导致 *所有* 未提交的改动丢失.\n"
1654"\n"
1655"是否要继续复位当前的改动?"
1656
1657#: lib/merge.tcl:238
1658msgid "Aborting"
1659msgstr "中止"
1660
1661#: lib/merge.tcl:238
1662#, fuzzy
1663msgid "files reset"
1664msgstr "文件"
1665
1666#: lib/merge.tcl:265
1667msgid "Abort failed."
1668msgstr "中止失败"
1669
1670#: lib/merge.tcl:267
1671msgid "Abort completed. Ready."
1672msgstr "中止完成. 就绪."
1673
1674#: lib/option.tcl:95
1675msgid "Restore Defaults"
1676msgstr "恢复默认值"
1677
1678#: lib/option.tcl:99
1679msgid "Save"
1680msgstr "保存"
1681
1682#: lib/option.tcl:109
1683#, tcl-format
1684msgid "%s Repository"
1685msgstr "%s 版本库"
1686
1687#: lib/option.tcl:110
1688msgid "Global (All Repositories)"
1689msgstr "全局 (所有版本库)"
1690
1691#: lib/option.tcl:116
1692msgid "User Name"
1693msgstr "用户名"
1694
1695#: lib/option.tcl:117
1696msgid "Email Address"
1697msgstr "Email 地址"
1698
1699#: lib/option.tcl:119
1700msgid "Summarize Merge Commits"
1701msgstr "概述合并提交:"
1702
1703#: lib/option.tcl:120
1704msgid "Merge Verbosity"
1705msgstr "合并冗余度"
1706
1707#: lib/option.tcl:121
1708msgid "Show Diffstat After Merge"
1709msgstr "在合并后显示 Diffstat"
1710
1711#: lib/option.tcl:123
1712msgid "Trust File Modification Timestamps"
1713msgstr "相信文件的改动时间"
1714
1715#: lib/option.tcl:124
1716msgid "Prune Tracking Branches During Fetch"
1717msgstr "获取时清除跟踪分支"
1718
1719#: lib/option.tcl:125
1720msgid "Match Tracking Branches"
1721msgstr "匹配跟踪分支"
1722
1723#: lib/option.tcl:126
1724msgid "Number of Diff Context Lines"
1725msgstr "Diff 上下文行数"
1726
1727#: lib/option.tcl:127
1728#, fuzzy
1729msgid "Commit Message Text Width"
1730msgstr "提交描述:"
1731
1732#: lib/option.tcl:128
1733msgid "New Branch Name Template"
1734msgstr "新建分支命名模板"
1735
1736#: lib/option.tcl:192
1737msgid "Spelling Dictionary:"
1738msgstr ""
1739
1740#: lib/option.tcl:216
1741msgid "Change Font"
1742msgstr "更改字体"
1743
1744#: lib/option.tcl:220
1745#, tcl-format
1746msgid "Choose %s"
1747msgstr "选择 %s"
1748
1749#: lib/option.tcl:226
1750msgid "pt."
1751msgstr "磅"
1752
1753#: lib/option.tcl:240
1754msgid "Preferences"
1755msgstr "首选项"
1756
1757#: lib/option.tcl:275
1758msgid "Failed to completely save options:"
1759msgstr "无法完全保存选项:"
1760
1761#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1762msgid "Delete Remote Branch"
1763msgstr "删除远端分支"
1764
1765#: lib/remote_branch_delete.tcl:47
1766msgid "From Repository"
1767msgstr "从版本库"
1768
1769#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
1770msgid "Remote:"
1771msgstr "Remote:"
1772
1773#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
1774msgid "Arbitrary URL:"
1775msgstr "任意 URL:"
1776
1777#: lib/remote_branch_delete.tcl:84
1778msgid "Branches"
1779msgstr "分支"
1780
1781#: lib/remote_branch_delete.tcl:109
1782msgid "Delete Only If"
1783msgstr "删除仅当"
1784
1785#: lib/remote_branch_delete.tcl:111
1786msgid "Merged Into:"
1787msgstr "合并到"
1788
1789#: lib/remote_branch_delete.tcl:119
1790msgid "Always (Do not perform merge checks)"
1791msgstr "总是合并 (不作合并检查)"
1792
1793#: lib/remote_branch_delete.tcl:152
1794msgid "A branch is required for 'Merged Into'."
1795msgstr "'合并到' 需要指定某个分支"
1796
1797#: lib/remote_branch_delete.tcl:184
1798#, tcl-format
1799msgid ""
1800"The following branches are not completely merged into %s:\n"
1801"\n"
1802" - %s"
1803msgstr ""
1804"下列分支没有被全部合并到 %s 中:\n"
1805"\n"
1806" - %s"
1807
1808#: lib/remote_branch_delete.tcl:189
1809#, tcl-format
1810msgid ""
1811"One or more of the merge tests failed because you have not fetched the "
1812"necessary commits. Try fetching from %s first."
1813msgstr ""
1814"由于没有获取到必要的提交,一个或多个合并测试失败。请尝试从 %s 处先获取。"
1815
1816#: lib/remote_branch_delete.tcl:207
1817msgid "Please select one or more branches to delete."
1818msgstr "请选择某个或多个分支来删除"
1819
1820#: lib/remote_branch_delete.tcl:216
1821msgid ""
1822"Recovering deleted branches is difficult.\n"
1823"\n"
1824"Delete the selected branches?"
1825msgstr ""
1826"恢复被删除的分支非常困难.\n"
1827"\n"
1828"是否要删除所选分支?"
1829
1830#: lib/remote_branch_delete.tcl:226
1831#, tcl-format
1832msgid "Deleting branches from %s"
1833msgstr "从 %s 中删除分支"
1834
1835#: lib/remote_branch_delete.tcl:286
1836msgid "No repository selected."
1837msgstr "没有选择版本库"
1838
1839#: lib/remote_branch_delete.tcl:291
1840#, tcl-format
1841msgid "Scanning %s..."
1842msgstr "正在扫描 %s..."
1843
1844#: lib/remote.tcl:165
1845msgid "Prune from"
1846msgstr "从..清除(prune)"
1847
1848#: lib/remote.tcl:170
1849msgid "Fetch from"
1850msgstr "从..获取(fetch)"
1851
1852#: lib/remote.tcl:213
1853msgid "Push to"
1854msgstr "上传到(push)"
1855
1856#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
1857msgid "Cannot write shortcut:"
1858msgstr "无法修改快捷方式:"
1859
1860#: lib/shortcut.tcl:136
1861msgid "Cannot write icon:"
1862msgstr "无法修改图标:"
1863
1864#: lib/spellcheck.tcl:57
1865msgid "Unsupported spell checker"
1866msgstr ""
1867
1868#: lib/spellcheck.tcl:65
1869msgid "Spell checking is unavailable"
1870msgstr ""
1871
1872#: lib/spellcheck.tcl:68
1873msgid "Invalid spell checking configuration"
1874msgstr ""
1875
1876#: lib/spellcheck.tcl:70
1877#, tcl-format
1878msgid "Reverting dictionary to %s."
1879msgstr ""
1880
1881#: lib/spellcheck.tcl:73
1882msgid "Spell checker silently failed on startup"
1883msgstr ""
1884
1885#: lib/spellcheck.tcl:80
1886msgid "Unrecognized spell checker"
1887msgstr ""
1888
1889#: lib/spellcheck.tcl:180
1890msgid "No Suggestions"
1891msgstr ""
1892
1893#: lib/spellcheck.tcl:381
1894msgid "Unexpected EOF from spell checker"
1895msgstr ""
1896
1897#: lib/spellcheck.tcl:385
1898msgid "Spell Checker Failed"
1899msgstr ""
1900
1901#: lib/status_bar.tcl:83
1902#, tcl-format
1903msgid "%s ... %*i of %*i %s (%3i%%)"
1904msgstr "%s ... %*i of %*i %s (%3i%%)"
1905
1906#: lib/transport.tcl:6
1907#, tcl-format
1908msgid "fetch %s"
1909msgstr "获取(fetch)"
1910
1911#: lib/transport.tcl:7
1912#, tcl-format
1913msgid "Fetching new changes from %s"
1914msgstr "从 %s 处获取新的改动"
1915
1916#: lib/transport.tcl:18
1917#, tcl-format
1918msgid "remote prune %s"
1919msgstr "清除远端 %s"
1920
1921#: lib/transport.tcl:19
1922#, tcl-format
1923msgid "Pruning tracking branches deleted from %s"
1924msgstr "清除"
1925
1926#: lib/transport.tcl:25 lib/transport.tcl:71
1927#, tcl-format
1928msgid "push %s"
1929msgstr "上传 %s"
1930
1931#: lib/transport.tcl:26
1932#, tcl-format
1933msgid "Pushing changes to %s"
1934msgstr "上传改动到 %s"
1935
1936#: lib/transport.tcl:72
1937#, tcl-format
1938msgid "Pushing %s %s to %s"
1939msgstr "上传 %s %s 到 %s"
1940
1941#: lib/transport.tcl:89
1942msgid "Push Branches"
1943msgstr "上传分支"
1944
1945#: lib/transport.tcl:103
1946msgid "Source Branches"
1947msgstr "源端分支:"
1948
1949#: lib/transport.tcl:120
1950msgid "Destination Repository"
1951msgstr "目标版本库"
1952
1953#: lib/transport.tcl:158
1954msgid "Transfer Options"
1955msgstr "传输选项"
1956
1957#: lib/transport.tcl:160
1958msgid "Force overwrite existing branch (may discard changes)"
1959msgstr "强制覆盖已有的分支 (可能会丢失改动)"
1960
1961#: lib/transport.tcl:164
1962msgid "Use thin pack (for slow network connections)"
1963msgstr "使用 thin pack (适用于低速网络连接)"
1964
1965#: lib/transport.tcl:168
1966msgid "Include tags"
1967msgstr "包含标签"