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