1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
4# This file is distributed under the same license as the Git package.
5# Contributors:
6# - Jiang Xin <worldhello.net AT gmail.com>
7# - Riku <lu.riku AT gmail.com>
8# - Zhuang Ya <zhuangya AT me.com>
9# - Lian Cheng <rhythm.mail AT gmail.com>
10#
11msgid ""
12msgstr ""
13"Project-Id-Version: Git\n"
14"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15"POT-Creation-Date: 2015-04-03 08:13+0800\n"
16"PO-Revision-Date: 2015-04-03 08:35+0800\n"
17"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
19"Language: zh_CN\n"
20"MIME-Version: 1.0\n"
21"Content-Type: text/plain; charset=UTF-8\n"
22"Content-Transfer-Encoding: 8bit\n"
23"Plural-Forms: nplurals=2; plural=(n != 1);\n"
24
25#: advice.c:55
26#, c-format
27msgid "hint: %.*s\n"
28msgstr "提示:%.*s\n"
29
30#: advice.c:88
31msgid ""
32"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
33"as appropriate to mark resolution and make a commit."
34msgstr ""
35"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
36"解决方案并提交。"
37
38#: archive.c:11
39msgid "git archive [<options>] <tree-ish> [<path>...]"
40msgstr "git archive [<选项>] <树或提交> [<路径>...]"
41
42#: archive.c:12
43msgid "git archive --list"
44msgstr "git archive --list"
45
46#: archive.c:13
47msgid ""
48"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
49msgstr ""
50"git archive --remote <版本库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
51
52#: archive.c:14
53msgid "git archive --remote <repo> [--exec <cmd>] --list"
54msgstr "git archive --remote <版本库> [--exec <命令>] --list"
55
56#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328
57#, c-format
58msgid "pathspec '%s' did not match any files"
59msgstr "路径规则 '%s' 未匹配任何文件"
60
61#: archive.c:427
62msgid "fmt"
63msgstr "格式"
64
65#: archive.c:427
66msgid "archive format"
67msgstr "归档格式"
68
69#: archive.c:428 builtin/log.c:1204
70msgid "prefix"
71msgstr "前缀"
72
73#: archive.c:429
74msgid "prepend prefix to each pathname in the archive"
75msgstr "为归档中每个路径名加上前缀"
76
77#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
78#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
79#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
80#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
81#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151
82msgid "file"
83msgstr "文件"
84
85#: archive.c:431 builtin/archive.c:89
86msgid "write the archive to this file"
87msgstr "归档写入此文件"
88
89#: archive.c:433
90msgid "read .gitattributes in working directory"
91msgstr "读取工作区中的 .gitattributes"
92
93#: archive.c:434
94msgid "report archived files on stderr"
95msgstr "在标准错误上报告归档文件"
96
97#: archive.c:435
98msgid "store only"
99msgstr "只存储"
100
101#: archive.c:436
102msgid "compress faster"
103msgstr "压缩速度更快"
104
105#: archive.c:444
106msgid "compress better"
107msgstr "压缩效果更好"
108
109#: archive.c:447
110msgid "list supported archive formats"
111msgstr "列出支持的归档格式"
112
113#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86
114msgid "repo"
115msgstr "版本库"
116
117#: archive.c:450 builtin/archive.c:91
118msgid "retrieve the archive from remote repository <repo>"
119msgstr "从远程版本库(<版本库>)提取归档文件"
120
121#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
122msgid "command"
123msgstr "命令"
124
125#: archive.c:452 builtin/archive.c:93
126msgid "path to the remote git-upload-archive command"
127msgstr "远程 git-upload-archive 命令的路径"
128
129#: attr.c:264
130msgid ""
131"Negative patterns are ignored in git attributes\n"
132"Use '\\!' for literal leading exclamation."
133msgstr ""
134"负值模版在 git attributes 中被忽略\n"
135"当字符串确实要以感叹号开始时,使用 '\\!'。"
136
137#: branch.c:60
138#, c-format
139msgid "Not setting branch %s as its own upstream."
140msgstr "未设置分支 %s 作为它自己的上游。"
141
142#: branch.c:83
143#, c-format
144msgid "Branch %s set up to track remote branch %s from %s by rebasing."
145msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
146
147#: branch.c:84
148#, c-format
149msgid "Branch %s set up to track remote branch %s from %s."
150msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
151
152#: branch.c:88
153#, c-format
154msgid "Branch %s set up to track local branch %s by rebasing."
155msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
156
157#: branch.c:89
158#, c-format
159msgid "Branch %s set up to track local branch %s."
160msgstr "分支 %s 设置为跟踪本地分支 %s。"
161
162#: branch.c:94
163#, c-format
164msgid "Branch %s set up to track remote ref %s by rebasing."
165msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
166
167#: branch.c:95
168#, c-format
169msgid "Branch %s set up to track remote ref %s."
170msgstr "分支 %s 设置为跟踪远程引用 %s。"
171
172#: branch.c:99
173#, c-format
174msgid "Branch %s set up to track local ref %s by rebasing."
175msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
176
177#: branch.c:100
178#, c-format
179msgid "Branch %s set up to track local ref %s."
180msgstr "分支 %s 设置为跟踪本地引用 %s。"
181
182#: branch.c:133
183#, c-format
184msgid "Not tracking: ambiguous information for ref %s"
185msgstr "未跟踪:引用 %s 有歧义"
186
187#: branch.c:162
188#, c-format
189msgid "'%s' is not a valid branch name."
190msgstr "'%s' 不是一个有效的分支名称。"
191
192#: branch.c:167
193#, c-format
194msgid "A branch named '%s' already exists."
195msgstr "一个分支名 '%s' 已经存在。"
196
197#: branch.c:175
198msgid "Cannot force update the current branch."
199msgstr "无法强制更新当前分支。"
200
201#: branch.c:195
202#, c-format
203msgid "Cannot setup tracking information; starting point '%s' is not a branch."
204msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
205
206#: branch.c:197
207#, c-format
208msgid "the requested upstream branch '%s' does not exist"
209msgstr "请求的上游分支 '%s' 不存在"
210
211#: branch.c:199
212msgid ""
213"\n"
214"If you are planning on basing your work on an upstream\n"
215"branch that already exists at the remote, you may need to\n"
216"run \"git fetch\" to retrieve it.\n"
217"\n"
218"If you are planning to push out a new local branch that\n"
219"will track its remote counterpart, you may want to use\n"
220"\"git push -u\" to set the upstream config as you push."
221msgstr ""
222"\n"
223"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
224"您可能需要执行 \"git fetch\" 来获取分支。\n"
225"\n"
226"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
227"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
228
229#: branch.c:243
230#, c-format
231msgid "Not a valid object name: '%s'."
232msgstr "不是一个有效的对象名:'%s'。"
233
234#: branch.c:263
235#, c-format
236msgid "Ambiguous object name: '%s'."
237msgstr "歧义的对象名:'%s'。"
238
239#: branch.c:268
240#, c-format
241msgid "Not a valid branch point: '%s'."
242msgstr "无效的分支点:'%s'。"
243
244#: bundle.c:34
245#, c-format
246msgid "'%s' does not look like a v2 bundle file"
247msgstr "'%s' 不像是一个 v2 版本的包文件"
248
249#: bundle.c:61
250#, c-format
251msgid "unrecognized header: %s%s (%d)"
252msgstr "未能识别的包头:%s%s (%d)"
253
254#: bundle.c:87 builtin/commit.c:766
255#, c-format
256msgid "could not open '%s'"
257msgstr "不能打开 '%s'"
258
259#: bundle.c:139
260msgid "Repository lacks these prerequisite commits:"
261msgstr "版本库缺少这些必备的提交:"
262
263#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
264#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330
265#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
266#: builtin/shortlog.c:158
267msgid "revision walk setup failed"
268msgstr "版本遍历设置失败"
269
270#: bundle.c:185
271#, c-format
272msgid "The bundle contains this ref:"
273msgid_plural "The bundle contains these %d refs:"
274msgstr[0] "这个包中含有这个引用:"
275msgstr[1] "这个包中含有 %d 个引用:"
276
277#: bundle.c:192
278msgid "The bundle records a complete history."
279msgstr "这个包记录一个完整历史。"
280
281#: bundle.c:194
282#, c-format
283msgid "The bundle requires this ref:"
284msgid_plural "The bundle requires these %d refs:"
285msgstr[0] "这个包需要这个引用:"
286msgstr[1] "这个包需要 %d 个引用:"
287
288#: bundle.c:251
289msgid "Could not spawn pack-objects"
290msgstr "不能生成 pack-objects 进程"
291
292#: bundle.c:269
293msgid "pack-objects died"
294msgstr "pack-objects 终止"
295
296#: bundle.c:309
297msgid "rev-list died"
298msgstr "rev-list 终止"
299
300#: bundle.c:358
301#, c-format
302msgid "ref '%s' is excluded by the rev-list options"
303msgstr "引用 '%s' 被 rev-list 选项排除"
304
305#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
306#, c-format
307msgid "unrecognized argument: %s"
308msgstr "未能识别的参数:%s"
309
310#: bundle.c:443
311msgid "Refusing to create empty bundle."
312msgstr "不能创建空包。"
313
314#: bundle.c:453
315#, c-format
316msgid "cannot create '%s'"
317msgstr "不能创建 '%s'"
318
319#: bundle.c:474
320msgid "index-pack died"
321msgstr "index-pack 终止"
322
323#: color.c:260
324#, c-format
325msgid "invalid color value: %.*s"
326msgstr "无效的颜色值:%.*s"
327
328#: commit.c:40
329#, c-format
330msgid "could not parse %s"
331msgstr "不能解析 %s"
332
333#: commit.c:42
334#, c-format
335msgid "%s %s is not a commit!"
336msgstr "%s %s 不是一个提交!"
337
338#: compat/obstack.c:406 compat/obstack.c:408
339msgid "memory exhausted"
340msgstr "内存耗尽"
341
342#: config.c:474 config.c:476
343#, c-format
344msgid "bad config file line %d in %s"
345msgstr "配置文件 %2$s 出错于第 %1$d 行"
346
347#: config.c:592
348#, c-format
349msgid "bad numeric config value '%s' for '%s' in %s: %s"
350msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
351
352#: config.c:594
353#, c-format
354msgid "bad numeric config value '%s' for '%s': %s"
355msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
356
357#: config.c:679
358#, c-format
359msgid "failed to expand user dir in: '%s'"
360msgstr "无法扩展 '%s' 中的用户目录"
361
362#: config.c:757 config.c:768
363#, c-format
364msgid "bad zlib compression level %d"
365msgstr "错误的 zlib 压缩级别 %d"
366
367#: config.c:890
368#, c-format
369msgid "invalid mode for object creation: %s"
370msgstr "无效的对象创建模式:%s"
371
372#: config.c:1216
373msgid "unable to parse command-line config"
374msgstr "无法解析命令行中的配置"
375
376#: config.c:1277
377msgid "unknown error occured while reading the configuration files"
378msgstr "在读取配置文件时遇到未知错误"
379
380#: config.c:1601
381#, c-format
382msgid "unable to parse '%s' from command-line config"
383msgstr "无法解析命令行配置中的 '%s'"
384
385#: config.c:1603
386#, c-format
387msgid "bad config variable '%s' in file '%s' at line %d"
388msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
389
390#: config.c:1662
391#, c-format
392msgid "%s has multiple values"
393msgstr "%s 有多个取值"
394
395#: connected.c:69
396msgid "Could not run 'git rev-list'"
397msgstr "不能执行 'git rev-list'"
398
399#: connected.c:89
400#, c-format
401msgid "failed write to rev-list: %s"
402msgstr "无法写入 rev-list:%s"
403
404#: connected.c:97
405#, c-format
406msgid "failed to close rev-list's stdin: %s"
407msgstr "无法关闭 rev-list 的标准输入:%s"
408
409#: date.c:95
410msgid "in the future"
411msgstr "在将来"
412
413#: date.c:101
414#, c-format
415msgid "%lu second ago"
416msgid_plural "%lu seconds ago"
417msgstr[0] "%lu 秒钟前"
418msgstr[1] "%lu 秒钟前"
419
420#: date.c:108
421#, c-format
422msgid "%lu minute ago"
423msgid_plural "%lu minutes ago"
424msgstr[0] "%lu 分钟前"
425msgstr[1] "%lu 分钟前"
426
427#: date.c:115
428#, c-format
429msgid "%lu hour ago"
430msgid_plural "%lu hours ago"
431msgstr[0] "%lu 小时前"
432msgstr[1] "%lu 小时前"
433
434#: date.c:122
435#, c-format
436msgid "%lu day ago"
437msgid_plural "%lu days ago"
438msgstr[0] "%lu 天前"
439msgstr[1] "%lu 天前"
440
441#: date.c:128
442#, c-format
443msgid "%lu week ago"
444msgid_plural "%lu weeks ago"
445msgstr[0] "%lu 周前"
446msgstr[1] "%lu 周前"
447
448#: date.c:135
449#, c-format
450msgid "%lu month ago"
451msgid_plural "%lu months ago"
452msgstr[0] "%lu 个月前"
453msgstr[1] "%lu 个月前"
454
455#: date.c:146
456#, c-format
457msgid "%lu year"
458msgid_plural "%lu years"
459msgstr[0] "%lu 年"
460msgstr[1] "%lu 年"
461
462#. TRANSLATORS: "%s" is "<n> years"
463#: date.c:149
464#, c-format
465msgid "%s, %lu month ago"
466msgid_plural "%s, %lu months ago"
467msgstr[0] "%s %lu 个月前"
468msgstr[1] "%s %lu 个月前"
469
470#: date.c:154 date.c:159
471#, c-format
472msgid "%lu year ago"
473msgid_plural "%lu years ago"
474msgstr[0] "%lu 年前"
475msgstr[1] "%lu 年前"
476
477#: diffcore-order.c:24
478#, c-format
479msgid "failed to read orderfile '%s'"
480msgstr "无法读取排序文件 '%s'"
481
482#: diffcore-rename.c:536
483msgid "Performing inexact rename detection"
484msgstr "正在进行非精确的重命名检测"
485
486# 译者:注意保持前导空格
487#: diff.c:114
488#, c-format
489msgid " Failed to parse dirstat cut-off percentage '%s'\n"
490msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
491
492# 译者:注意保持前导空格
493#: diff.c:119
494#, c-format
495msgid " Unknown dirstat parameter '%s'\n"
496msgstr " 未知的 dirstat 参数 '%s'\n"
497
498#: diff.c:214
499#, c-format
500msgid "Unknown value for 'diff.submodule' config variable: '%s'"
501msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
502
503#: diff.c:266
504#, c-format
505msgid ""
506"Found errors in 'diff.dirstat' config variable:\n"
507"%s"
508msgstr ""
509"发现配置变量 'diff.dirstat' 中的错误:\n"
510"%s"
511
512#: diff.c:2956
513#, c-format
514msgid "external diff died, stopping at %s"
515msgstr "外部 diff 退出,停止在 %s"
516
517#: diff.c:3351
518msgid "--follow requires exactly one pathspec"
519msgstr "--follow 参数后只跟一个 pathspec"
520
521#: diff.c:3514
522#, c-format
523msgid ""
524"Failed to parse --dirstat/-X option parameter:\n"
525"%s"
526msgstr ""
527"无法解析 --dirstat/-X 选项的参数:\n"
528"%s"
529
530#: diff.c:3528
531#, c-format
532msgid "Failed to parse --submodule option parameter: '%s'"
533msgstr "无法解析 --submodule 选项的参数:'%s'"
534
535#: gpg-interface.c:129 gpg-interface.c:200
536msgid "could not run gpg."
537msgstr "不能执行 gpg。"
538
539#: gpg-interface.c:141
540msgid "gpg did not accept the data"
541msgstr "gpg 没有接受数据"
542
543#: gpg-interface.c:152
544msgid "gpg failed to sign the data"
545msgstr "gpg 无法为数据签名"
546
547#: gpg-interface.c:185
548#, c-format
549msgid "could not create temporary file '%s': %s"
550msgstr "不能创建临时文件 '%s':%s"
551
552#: gpg-interface.c:188
553#, c-format
554msgid "failed writing detached signature to '%s': %s"
555msgstr "无法将分离式签名写入 '%s':%s"
556
557#: grep.c:1718
558#, c-format
559msgid "'%s': unable to read %s"
560msgstr "'%s':无法读取 %s"
561
562#: grep.c:1735
563#, c-format
564msgid "'%s': %s"
565msgstr "'%s':%s"
566
567#: grep.c:1746
568#, c-format
569msgid "'%s': short read %s"
570msgstr "'%s':读取不完整 %s"
571
572#: help.c:207
573#, c-format
574msgid "available git commands in '%s'"
575msgstr "在 '%s' 下可用的 git 命令"
576
577#: help.c:214
578msgid "git commands available from elsewhere on your $PATH"
579msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
580
581#: help.c:230
582msgid "The most commonly used git commands are:"
583msgstr "最常用的 git 命令有:"
584
585#: help.c:289
586#, c-format
587msgid ""
588"'%s' appears to be a git command, but we were not\n"
589"able to execute it. Maybe git-%s is broken?"
590msgstr ""
591"'%s' 像是一个 git 命令,但却无法运行。\n"
592"可能是 git-%s 受损?"
593
594#: help.c:346
595msgid "Uh oh. Your system reports no Git commands at all."
596msgstr "唉呀,您的系统中未发现 Git 命令。"
597
598#: help.c:368
599#, c-format
600msgid ""
601"WARNING: You called a Git command named '%s', which does not exist.\n"
602"Continuing under the assumption that you meant '%s'"
603msgstr ""
604"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
605"是 '%s'"
606
607#: help.c:373
608#, c-format
609msgid "in %0.1f seconds automatically..."
610msgstr "在 %0.1f 秒钟后自动运行..."
611
612#: help.c:380
613#, c-format
614msgid "git: '%s' is not a git command. See 'git --help'."
615msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
616
617#: help.c:384 help.c:444
618msgid ""
619"\n"
620"Did you mean this?"
621msgid_plural ""
622"\n"
623"Did you mean one of these?"
624msgstr[0] ""
625"\n"
626"您指的是这个么?"
627msgstr[1] ""
628"\n"
629"您指的是这其中的某一个么?"
630
631#: help.c:440
632#, c-format
633msgid "%s: %s - %s"
634msgstr "%s:%s - %s"
635
636#: lockfile.c:283
637msgid "BUG: reopen a lockfile that is still open"
638msgstr "BUG: 重新打开一个仍打开着的锁文件"
639
640#: lockfile.c:285
641msgid "BUG: reopen a lockfile that has been committed"
642msgstr "BUG: 重新打开一个已提交的锁文件"
643
644#: merge.c:41
645msgid "failed to read the cache"
646msgstr "无法读取缓存"
647
648#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580
649#: builtin/clone.c:662
650msgid "unable to write new index file"
651msgstr "无法写新的索引文件"
652
653#: merge-recursive.c:189
654#, c-format
655msgid "(bad commit)\n"
656msgstr "(坏提交)\n"
657
658#: merge-recursive.c:209
659#, c-format
660msgid "addinfo_cache failed for path '%s'"
661msgstr "为路径 '%s' addinfo_cache 失败"
662
663#: merge-recursive.c:270
664msgid "error building trees"
665msgstr "无法创建树"
666
667#: merge-recursive.c:688
668#, c-format
669msgid "failed to create path '%s'%s"
670msgstr "无法创建路径 '%s'%s"
671
672#: merge-recursive.c:699
673#, c-format
674msgid "Removing %s to make room for subdirectory\n"
675msgstr "删除 %s 以便为子目录留出空间\n"
676
677#: merge-recursive.c:713 merge-recursive.c:734
678msgid ": perhaps a D/F conflict?"
679msgstr ":可能是一个目录/文件冲突?"
680
681#: merge-recursive.c:724
682#, c-format
683msgid "refusing to lose untracked file at '%s'"
684msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
685
686#: merge-recursive.c:764
687#, c-format
688msgid "cannot read object %s '%s'"
689msgstr "不能读取对象 %s '%s'"
690
691#: merge-recursive.c:766
692#, c-format
693msgid "blob expected for %s '%s'"
694msgstr "%s '%s' 应为数据(blob)对象"
695
696#: merge-recursive.c:789 builtin/clone.c:321
697#, c-format
698msgid "failed to open '%s'"
699msgstr "无法打开 '%s'"
700
701#: merge-recursive.c:797
702#, c-format
703msgid "failed to symlink '%s'"
704msgstr "无法创建符号链接 '%s'"
705
706#: merge-recursive.c:800
707#, c-format
708msgid "do not know what to do with %06o %s '%s'"
709msgstr "不知道如何处理 %06o %s '%s'"
710
711#: merge-recursive.c:938
712msgid "Failed to execute internal merge"
713msgstr "无法执行内部合并"
714
715#: merge-recursive.c:942
716#, c-format
717msgid "Unable to add %s to database"
718msgstr "不能添加 %s 至对象库"
719
720#: merge-recursive.c:958
721msgid "unsupported object type in the tree"
722msgstr "在树中有不支持的对象类型"
723
724#: merge-recursive.c:1033 merge-recursive.c:1047
725#, c-format
726msgid ""
727"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
728"in tree."
729msgstr ""
730"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
731"的版本被保留。"
732
733#: merge-recursive.c:1039 merge-recursive.c:1052
734#, c-format
735msgid ""
736"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
737"in tree at %s."
738msgstr ""
739"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
740"的版本保留于 %8$s 中。"
741
742#: merge-recursive.c:1093
743msgid "rename"
744msgstr "重命名"
745
746#: merge-recursive.c:1093
747msgid "renamed"
748msgstr "重命名"
749
750#: merge-recursive.c:1149
751#, c-format
752msgid "%s is a directory in %s adding as %s instead"
753msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
754
755#: merge-recursive.c:1171
756#, c-format
757msgid ""
758"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
759"\"->\"%s\" in \"%s\"%s"
760msgstr ""
761"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
762"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
763
764#: merge-recursive.c:1176
765msgid " (left unresolved)"
766msgstr "(留下未解决)"
767
768#: merge-recursive.c:1230
769#, c-format
770msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
771msgstr ""
772"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
773"%5$s"
774
775#: merge-recursive.c:1260
776#, c-format
777msgid "Renaming %s to %s and %s to %s instead"
778msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
779
780#: merge-recursive.c:1459
781#, c-format
782msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
783msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
784
785#: merge-recursive.c:1469
786#, c-format
787msgid "Adding merged %s"
788msgstr "添加合并后的 %s"
789
790#: merge-recursive.c:1474 merge-recursive.c:1672
791#, c-format
792msgid "Adding as %s instead"
793msgstr "而是以 %s 为名添加"
794
795#: merge-recursive.c:1525
796#, c-format
797msgid "cannot read object %s"
798msgstr "不能读取对象 %s"
799
800#: merge-recursive.c:1528
801#, c-format
802msgid "object %s is not a blob"
803msgstr "对象 %s 不是一个数据(blob)对象"
804
805#: merge-recursive.c:1576
806msgid "modify"
807msgstr "修改"
808
809#: merge-recursive.c:1576
810msgid "modified"
811msgstr "修改"
812
813#: merge-recursive.c:1586
814msgid "content"
815msgstr "内容"
816
817#: merge-recursive.c:1593
818msgid "add/add"
819msgstr "添加/添加"
820
821#: merge-recursive.c:1627
822#, c-format
823msgid "Skipped %s (merged same as existing)"
824msgstr "略过 %s(已经做过相同合并)"
825
826#: merge-recursive.c:1641
827#, c-format
828msgid "Auto-merging %s"
829msgstr "自动合并 %s"
830
831#: merge-recursive.c:1645 git-submodule.sh:1150
832msgid "submodule"
833msgstr "子模组"
834
835#: merge-recursive.c:1646
836#, c-format
837msgid "CONFLICT (%s): Merge conflict in %s"
838msgstr "冲突(%s):合并冲突于 %s"
839
840#: merge-recursive.c:1732
841#, c-format
842msgid "Removing %s"
843msgstr "删除 %s"
844
845#: merge-recursive.c:1757
846msgid "file/directory"
847msgstr "文件/目录"
848
849#: merge-recursive.c:1763
850msgid "directory/file"
851msgstr "目录/文件"
852
853#: merge-recursive.c:1768
854#, c-format
855msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
856msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
857
858#: merge-recursive.c:1778
859#, c-format
860msgid "Adding %s"
861msgstr "添加 %s"
862
863#: merge-recursive.c:1795
864msgid "Fatal merge failure, shouldn't happen."
865msgstr "严重的合并错误,不应发生。"
866
867#: merge-recursive.c:1814
868msgid "Already up-to-date!"
869msgstr "已经是最新的!"
870
871#: merge-recursive.c:1823
872#, c-format
873msgid "merging of trees %s and %s failed"
874msgstr "无法合并树 %s 和 %s"
875
876#: merge-recursive.c:1853
877#, c-format
878msgid "Unprocessed path??? %s"
879msgstr "未处理的路径??? %s"
880
881#: merge-recursive.c:1901
882msgid "Merging:"
883msgstr "合并:"
884
885#: merge-recursive.c:1914
886#, c-format
887msgid "found %u common ancestor:"
888msgid_plural "found %u common ancestors:"
889msgstr[0] "发现 %u 个共同祖先:"
890msgstr[1] "发现 %u 个共同祖先:"
891
892#: merge-recursive.c:1951
893msgid "merge returned no commit"
894msgstr "合并未返回提交"
895
896#: merge-recursive.c:2008
897#, c-format
898msgid "Could not parse object '%s'"
899msgstr "不能解析对象 '%s'"
900
901#: merge-recursive.c:2019 builtin/merge.c:667
902msgid "Unable to write index."
903msgstr "不能写入索引。"
904
905#: notes-utils.c:41
906msgid "Cannot commit uninitialized/unreferenced notes tree"
907msgstr "不能提交未初始化/未引用的注解树"
908
909#: notes-utils.c:82
910#, c-format
911msgid "Bad notes.rewriteMode value: '%s'"
912msgstr "坏的 notes.rewriteMode 值:'%s'"
913
914#: notes-utils.c:92
915#, c-format
916msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
917msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
918
919#. TRANSLATORS: The first %s is the name of the
920#. environment variable, the second %s is its value
921#: notes-utils.c:119
922#, c-format
923msgid "Bad %s value: '%s'"
924msgstr "坏的 %s 值:'%s'"
925
926#: object.c:241
927#, c-format
928msgid "unable to parse object: %s"
929msgstr "不能解析对象:%s"
930
931#: parse-options.c:546
932msgid "..."
933msgstr "..."
934
935#: parse-options.c:564
936#, c-format
937msgid "usage: %s"
938msgstr "用法:%s"
939
940#. TRANSLATORS: the colon here should align with the
941#. one in "usage: %s" translation
942#: parse-options.c:568
943#, c-format
944msgid " or: %s"
945msgstr " 或:%s"
946
947# 译者:为保证在输出中对齐,注意调整句中空格!
948#: parse-options.c:571
949#, c-format
950msgid " %s"
951msgstr " %s"
952
953#: parse-options.c:605
954msgid "-NUM"
955msgstr "-数字"
956
957#: pathspec.c:133
958msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
959msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
960
961#: pathspec.c:143
962msgid ""
963"global 'literal' pathspec setting is incompatible with all other global "
964"pathspec settings"
965msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
966
967#: pathspec.c:177
968msgid "invalid parameter for pathspec magic 'prefix'"
969msgstr "路径规则包含无效的神奇前缀"
970
971#: pathspec.c:183
972#, c-format
973msgid "Invalid pathspec magic '%.*s' in '%s'"
974msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
975
976#: pathspec.c:187
977#, c-format
978msgid "Missing ')' at the end of pathspec magic in '%s'"
979msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
980
981#: pathspec.c:205
982#, c-format
983msgid "Unimplemented pathspec magic '%c' in '%s'"
984msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
985
986#: pathspec.c:230
987#, c-format
988msgid "%s: 'literal' and 'glob' are incompatible"
989msgstr "%s:'literal' 和 'glob' 不兼容"
990
991#: pathspec.c:241
992#, c-format
993msgid "%s: '%s' is outside repository"
994msgstr "%s:'%s' 在版本库之外"
995
996#: pathspec.c:291
997#, c-format
998msgid "Pathspec '%s' is in submodule '%.*s'"
999msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
1000
1001#: pathspec.c:353
1002#, c-format
1003msgid "%s: pathspec magic not supported by this command: %s"
1004msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
1005
1006#: pathspec.c:432
1007#, c-format
1008msgid "pathspec '%s' is beyond a symbolic link"
1009msgstr "路径规则 '%s' 位于符号链接中"
1010
1011#: pathspec.c:441
1012msgid ""
1013"There is nothing to exclude from by :(exclude) patterns.\n"
1014"Perhaps you forgot to add either ':/' or '.' ?"
1015msgstr ""
1016"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1017"添加 ':/' 或 '.' ?"
1018
1019#: pretty.c:968
1020msgid "unable to parse --pretty format"
1021msgstr "不能解析 --pretty 格式"
1022
1023#: progress.c:225
1024msgid "done"
1025msgstr "完成"
1026
1027#: read-cache.c:1275
1028#, c-format
1029msgid ""
1030"index.version set, but the value is invalid.\n"
1031"Using version %i"
1032msgstr ""
1033"设置了 index.version,但是取值无效。\n"
1034"使用版本 %i"
1035
1036#: read-cache.c:1285
1037#, c-format
1038msgid ""
1039"GIT_INDEX_VERSION set, but the value is invalid.\n"
1040"Using version %i"
1041msgstr ""
1042"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1043"使用版本 %i"
1044
1045#: remote.c:782
1046#, c-format
1047msgid "Cannot fetch both %s and %s to %s"
1048msgstr "不能同时获取 %s 和 %s 至 %s"
1049
1050#: remote.c:786
1051#, c-format
1052msgid "%s usually tracks %s, not %s"
1053msgstr "%s 通常跟踪 %s,而非 %s"
1054
1055#: remote.c:790
1056#, c-format
1057msgid "%s tracks both %s and %s"
1058msgstr "%s 同时跟踪 %s 和 %s"
1059
1060#: remote.c:798
1061msgid "Internal error"
1062msgstr "内部错误"
1063
1064#: remote.c:1980
1065#, c-format
1066msgid "Your branch is based on '%s', but the upstream is gone.\n"
1067msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1068
1069#: remote.c:1984
1070msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1071msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1072
1073#: remote.c:1987
1074#, c-format
1075msgid "Your branch is up-to-date with '%s'.\n"
1076msgstr "您的分支与上游分支 '%s' 一致。\n"
1077
1078#: remote.c:1991
1079#, c-format
1080msgid "Your branch is ahead of '%s' by %d commit.\n"
1081msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1082msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1083msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1084
1085#: remote.c:1997
1086msgid " (use \"git push\" to publish your local commits)\n"
1087msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1088
1089#: remote.c:2000
1090#, c-format
1091msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1092msgid_plural ""
1093"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1094msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1095msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1096
1097# 译者:注意保持前导空格
1098#: remote.c:2008
1099msgid " (use \"git pull\" to update your local branch)\n"
1100msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1101
1102#: remote.c:2011
1103#, c-format
1104msgid ""
1105"Your branch and '%s' have diverged,\n"
1106"and have %d and %d different commit each, respectively.\n"
1107msgid_plural ""
1108"Your branch and '%s' have diverged,\n"
1109"and have %d and %d different commits each, respectively.\n"
1110msgstr[0] ""
1111"您的分支和 '%s' 出现了偏离,\n"
1112"并且分别有 %d 和 %d 处不同的提交。\n"
1113msgstr[1] ""
1114"您的分支和 '%s' 出现了偏离,\n"
1115"并且分别有 %d 和 %d 处不同的提交。\n"
1116
1117# 译者:注意保持前导空格
1118#: remote.c:2021
1119msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1120msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1121
1122#: revision.c:2348
1123msgid "--first-parent is incompatible with --bisect"
1124msgstr "--first-parent 与 --bisect 不兼容"
1125
1126#: run-command.c:83
1127msgid "open /dev/null failed"
1128msgstr "不能打开 /dev/null"
1129
1130#: run-command.c:85
1131#, c-format
1132msgid "dup2(%d,%d) failed"
1133msgstr "不能调用 dup2(%d,%d)"
1134
1135#: send-pack.c:272
1136msgid "failed to sign the push certificate"
1137msgstr "无法为推送证书签名"
1138
1139#: send-pack.c:356
1140msgid "the receiving end does not support --signed push"
1141msgstr "接收端不支持签名推送"
1142
1143#: send-pack.c:366
1144msgid "the receiving end does not support --atomic push"
1145msgstr "接收端不支持原子推送"
1146
1147#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
1148#: builtin/merge.c:1005
1149#, c-format
1150msgid "Could not open '%s' for writing"
1151msgstr "不能为写入打开 '%s'"
1152
1153#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997
1154#: builtin/merge.c:1010
1155#, c-format
1156msgid "Could not write to '%s'"
1157msgstr "不能写入 '%s'"
1158
1159#: sequencer.c:195
1160msgid ""
1161"after resolving the conflicts, mark the corrected paths\n"
1162"with 'git add <paths>' or 'git rm <paths>'"
1163msgstr ""
1164"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1165"命令标记修正后的文件"
1166
1167#: sequencer.c:198
1168msgid ""
1169"after resolving the conflicts, mark the corrected paths\n"
1170"with 'git add <paths>' or 'git rm <paths>'\n"
1171"and commit the result with 'git commit'"
1172msgstr ""
1173"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1174"对修正后的文件做标记,然后用 'git commit' 提交"
1175
1176#: sequencer.c:211 sequencer.c:861 sequencer.c:944
1177#, c-format
1178msgid "Could not write to %s"
1179msgstr "不能写入 %s"
1180
1181#: sequencer.c:214
1182#, c-format
1183msgid "Error wrapping up %s"
1184msgstr "错误收尾 %s"
1185
1186#: sequencer.c:229
1187msgid "Your local changes would be overwritten by cherry-pick."
1188msgstr "您的本地修改将被拣选操作覆盖。"
1189
1190#: sequencer.c:231
1191msgid "Your local changes would be overwritten by revert."
1192msgstr "您的本地修改将被还原操作覆盖。"
1193
1194#: sequencer.c:234
1195msgid "Commit your changes or stash them to proceed."
1196msgstr "提交您的修改或保存进度后再继续。"
1197
1198#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1199#: sequencer.c:321
1200#, c-format
1201msgid "%s: Unable to write new index file"
1202msgstr "%s:无法写入新索引文件"
1203
1204#: sequencer.c:339
1205msgid "Could not resolve HEAD commit\n"
1206msgstr "不能解析 HEAD 提交\n"
1207
1208#: sequencer.c:359
1209msgid "Unable to update cache tree\n"
1210msgstr "不能更新缓存\n"
1211
1212#: sequencer.c:411
1213#, c-format
1214msgid "Could not parse commit %s\n"
1215msgstr "不能解析提交 %s\n"
1216
1217#: sequencer.c:416
1218#, c-format
1219msgid "Could not parse parent commit %s\n"
1220msgstr "不能解析父提交 %s\n"
1221
1222#: sequencer.c:482
1223msgid "Your index file is unmerged."
1224msgstr "您的索引文件未完成合并。"
1225
1226#: sequencer.c:501
1227#, c-format
1228msgid "Commit %s is a merge but no -m option was given."
1229msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1230
1231#: sequencer.c:509
1232#, c-format
1233msgid "Commit %s does not have parent %d"
1234msgstr "提交 %s 没有父提交 %d"
1235
1236#: sequencer.c:513
1237#, c-format
1238msgid "Mainline was specified but commit %s is not a merge."
1239msgstr "指定了主线但提交 %s 不是一个合并。"
1240
1241#. TRANSLATORS: The first %s will be "revert" or
1242#. "cherry-pick", the second %s a SHA1
1243#: sequencer.c:526
1244#, c-format
1245msgid "%s: cannot parse parent commit %s"
1246msgstr "%s:不能解析父提交 %s"
1247
1248#: sequencer.c:530
1249#, c-format
1250msgid "Cannot get commit message for %s"
1251msgstr "不能得到 %s 的提交说明"
1252
1253#: sequencer.c:616
1254#, c-format
1255msgid "could not revert %s... %s"
1256msgstr "不能还原 %s... %s"
1257
1258#: sequencer.c:617
1259#, c-format
1260msgid "could not apply %s... %s"
1261msgstr "不能应用 %s... %s"
1262
1263#: sequencer.c:653
1264msgid "empty commit set passed"
1265msgstr "提供了空的提交集"
1266
1267#: sequencer.c:661
1268#, c-format
1269msgid "git %s: failed to read the index"
1270msgstr "git %s:无法读取索引"
1271
1272#: sequencer.c:665
1273#, c-format
1274msgid "git %s: failed to refresh the index"
1275msgstr "git %s:无法刷新索引"
1276
1277#: sequencer.c:725
1278#, c-format
1279msgid "Cannot %s during a %s"
1280msgstr "无法 %s 在一个 %s 过程中"
1281
1282#: sequencer.c:747
1283#, c-format
1284msgid "Could not parse line %d."
1285msgstr "不能解析第 %d 行。"
1286
1287#: sequencer.c:752
1288msgid "No commits parsed."
1289msgstr "没有提交被解析。"
1290
1291#: sequencer.c:765
1292#, c-format
1293msgid "Could not open %s"
1294msgstr "不能打开 %s"
1295
1296#: sequencer.c:769
1297#, c-format
1298msgid "Could not read %s."
1299msgstr "不能读取 %s。"
1300
1301#: sequencer.c:776
1302#, c-format
1303msgid "Unusable instruction sheet: %s"
1304msgstr "无用的指令表单:%s"
1305
1306#: sequencer.c:806
1307#, c-format
1308msgid "Invalid key: %s"
1309msgstr "无效键名:%s"
1310
1311#: sequencer.c:809
1312#, c-format
1313msgid "Invalid value for %s: %s"
1314msgstr "%s 的值无效:%s"
1315
1316#: sequencer.c:821
1317#, c-format
1318msgid "Malformed options sheet: %s"
1319msgstr "非法的选项表单:%s"
1320
1321#: sequencer.c:842
1322msgid "a cherry-pick or revert is already in progress"
1323msgstr "一个拣选或还原操作已在进行"
1324
1325#: sequencer.c:843
1326msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1327msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1328
1329#: sequencer.c:847
1330#, c-format
1331msgid "Could not create sequencer directory %s"
1332msgstr "不能创建序列目录 %s"
1333
1334#: sequencer.c:863 sequencer.c:948
1335#, c-format
1336msgid "Error wrapping up %s."
1337msgstr "错误收尾 %s。"
1338
1339#: sequencer.c:882 sequencer.c:1018
1340msgid "no cherry-pick or revert in progress"
1341msgstr "拣选或还原操作并未进行"
1342
1343#: sequencer.c:884
1344msgid "cannot resolve HEAD"
1345msgstr "不能解析 HEAD"
1346
1347#: sequencer.c:886
1348msgid "cannot abort from a branch yet to be born"
1349msgstr "不能从尚未建立的分支终止"
1350
1351#: sequencer.c:908 builtin/apply.c:4288
1352#, c-format
1353msgid "cannot open %s: %s"
1354msgstr "不能打开 %s:%s"
1355
1356#: sequencer.c:911
1357#, c-format
1358msgid "cannot read %s: %s"
1359msgstr "不能读取 %s:%s"
1360
1361#: sequencer.c:912
1362msgid "unexpected end of file"
1363msgstr "意外的文件结束"
1364
1365#: sequencer.c:918
1366#, c-format
1367msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1368msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1369
1370#: sequencer.c:941
1371#, c-format
1372msgid "Could not format %s."
1373msgstr "不能格式化 %s。"
1374
1375#: sequencer.c:1086
1376#, c-format
1377msgid "%s: can't cherry-pick a %s"
1378msgstr "%s:不能拣选一个%s"
1379
1380#: sequencer.c:1089
1381#, c-format
1382msgid "%s: bad revision"
1383msgstr "%s:错误的版本"
1384
1385#: sequencer.c:1123
1386msgid "Can't revert as initial commit"
1387msgstr "不能作为初始提交还原"
1388
1389#: sequencer.c:1124
1390msgid "Can't cherry-pick into empty head"
1391msgstr "不能拣选到空分支"
1392
1393#: sha1_name.c:440
1394msgid ""
1395"Git normally never creates a ref that ends with 40 hex characters\n"
1396"because it will be ignored when you just specify 40-hex. These refs\n"
1397"may be created by mistake. For example,\n"
1398"\n"
1399" git checkout -b $br $(git rev-parse ...)\n"
1400"\n"
1401"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1402"examine these refs and maybe delete them. Turn this message off by\n"
1403"running \"git config advice.objectNameWarning false\""
1404msgstr ""
1405"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1406"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1407"\n"
1408" git checkout -b $br $(git rev-parse ...)\n"
1409"\n"
1410"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1411"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1412"命令关闭本消息通知。"
1413
1414#: sha1_name.c:1068
1415msgid "HEAD does not point to a branch"
1416msgstr "HEAD 没有指向一个分支"
1417
1418#: sha1_name.c:1071
1419#, c-format
1420msgid "No such branch: '%s'"
1421msgstr "没有此分支:'%s'"
1422
1423#: sha1_name.c:1073
1424#, c-format
1425msgid "No upstream configured for branch '%s'"
1426msgstr "尚未给分支 '%s' 设置上游"
1427
1428#: sha1_name.c:1077
1429#, c-format
1430msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1431msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1432
1433#: submodule.c:64 submodule.c:98
1434msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1435msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1436
1437#: submodule.c:68 submodule.c:102
1438#, c-format
1439msgid "Could not find section in .gitmodules where path=%s"
1440msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1441
1442#: submodule.c:76
1443#, c-format
1444msgid "Could not update .gitmodules entry %s"
1445msgstr "不能更新 .gitmodules 条目 %s"
1446
1447#: submodule.c:109
1448#, c-format
1449msgid "Could not remove .gitmodules entry for %s"
1450msgstr "无法移除 %s 的 .gitmodules 条目"
1451
1452#: submodule.c:120
1453msgid "staging updated .gitmodules failed"
1454msgstr "将更新后 .gitmodules 添加暂存区失败"
1455
1456#: submodule.c:1109 builtin/init-db.c:371
1457#, c-format
1458msgid "Could not create git link %s"
1459msgstr "不能创建 git link %s"
1460
1461#: submodule.c:1120
1462#, c-format
1463msgid "Could not set core.worktree in %s"
1464msgstr "不能在 %s 中设置 core.worktree"
1465
1466#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1467#: trailer.c:561
1468#, c-format
1469msgid "unknown value '%s' for key '%s'"
1470msgstr "键 '%2$s' 的未知取值 '%1$s'"
1471
1472#: trailer.c:543 trailer.c:548 builtin/remote.c:290
1473#, c-format
1474msgid "more than one %s"
1475msgstr "多于一个 %s"
1476
1477#: trailer.c:581
1478#, c-format
1479msgid "empty trailer token in trailer '%.*s'"
1480msgstr "签名 '%.*s' 的键为空"
1481
1482#: trailer.c:701
1483#, c-format
1484msgid "could not read input file '%s'"
1485msgstr "不能读取输入文件 '%s'"
1486
1487#: trailer.c:704
1488msgid "could not read from stdin"
1489msgstr "不能自标准输入读取"
1490
1491#: unpack-trees.c:202
1492msgid "Checking out files"
1493msgstr "正在检出文件"
1494
1495#: urlmatch.c:120
1496msgid "invalid URL scheme name or missing '://' suffix"
1497msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1498
1499#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1500#, c-format
1501msgid "invalid %XX escape sequence"
1502msgstr "无效的 %XX 转义序列"
1503
1504#: urlmatch.c:172
1505msgid "missing host and scheme is not 'file:'"
1506msgstr "缺失主机名且URL方案不是 'file:'"
1507
1508#: urlmatch.c:189
1509msgid "a 'file:' URL may not have a port number"
1510msgstr "一个 'file:' URL 不应该包含端口号"
1511
1512#: urlmatch.c:199
1513msgid "invalid characters in host name"
1514msgstr "主机名中包含无效的字符"
1515
1516#: urlmatch.c:244 urlmatch.c:255
1517msgid "invalid port number"
1518msgstr "无效的端口号"
1519
1520#: urlmatch.c:322
1521msgid "invalid '..' path segment"
1522msgstr "无效的 '..' 路径片段"
1523
1524#: wrapper.c:523
1525#, c-format
1526msgid "unable to access '%s': %s"
1527msgstr "不能访问 '%s':%s"
1528
1529#: wrapper.c:544
1530#, c-format
1531msgid "unable to access '%s'"
1532msgstr "不能访问 '%s'"
1533
1534#: wrapper.c:555
1535#, c-format
1536msgid "unable to look up current user in the passwd file: %s"
1537msgstr "无法在口令文件中查询到当前用户:%s"
1538
1539#: wrapper.c:556
1540msgid "no such user"
1541msgstr "无此用户"
1542
1543#: wrapper.c:564
1544msgid "unable to get current working directory"
1545msgstr "不能获取当前工作目录"
1546
1547#: wt-status.c:150
1548msgid "Unmerged paths:"
1549msgstr "未合并的路径:"
1550
1551# 译者:注意保持前导空格
1552#: wt-status.c:177 wt-status.c:204
1553#, c-format
1554msgid " (use \"git reset %s <file>...\" to unstage)"
1555msgstr " (使用 \"git reset %s <文件>...\" 撤出暂存区)"
1556
1557# 译者:注意保持前导空格
1558#: wt-status.c:179 wt-status.c:206
1559msgid " (use \"git rm --cached <file>...\" to unstage)"
1560msgstr " (使用 \"git rm --cached <文件>...\" 撤出暂存区)"
1561
1562# 译者:注意保持前导空格
1563#: wt-status.c:183
1564msgid " (use \"git add <file>...\" to mark resolution)"
1565msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
1566
1567# 译者:注意保持前导空格
1568#: wt-status.c:185 wt-status.c:189
1569msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1570msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1571
1572# 译者:注意保持前导空格
1573#: wt-status.c:187
1574msgid " (use \"git rm <file>...\" to mark resolution)"
1575msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
1576
1577#: wt-status.c:198 wt-status.c:878
1578msgid "Changes to be committed:"
1579msgstr "要提交的变更:"
1580
1581#: wt-status.c:216 wt-status.c:887
1582msgid "Changes not staged for commit:"
1583msgstr "尚未暂存以备提交的变更:"
1584
1585# 译者:注意保持前导空格
1586#: wt-status.c:220
1587msgid " (use \"git add <file>...\" to update what will be committed)"
1588msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
1589
1590# 译者:注意保持前导空格
1591#: wt-status.c:222
1592msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1593msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
1594
1595# 译者:注意保持前导空格
1596#: wt-status.c:223
1597msgid ""
1598" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1599msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
1600
1601# 译者:注意保持前导空格
1602#: wt-status.c:225
1603msgid " (commit or discard the untracked or modified content in submodules)"
1604msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1605
1606# 译者:注意保持前导空格
1607#: wt-status.c:237
1608#, c-format
1609msgid " (use \"git %s <file>...\" to include in what will be committed)"
1610msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
1611
1612#: wt-status.c:252
1613msgid "both deleted:"
1614msgstr "双方删除:"
1615
1616#: wt-status.c:254
1617msgid "added by us:"
1618msgstr "由我们添加:"
1619
1620#: wt-status.c:256
1621msgid "deleted by them:"
1622msgstr "由他们删除:"
1623
1624#: wt-status.c:258
1625msgid "added by them:"
1626msgstr "由他们添加:"
1627
1628#: wt-status.c:260
1629msgid "deleted by us:"
1630msgstr "由我们删除:"
1631
1632#: wt-status.c:262
1633msgid "both added:"
1634msgstr "双方添加:"
1635
1636#: wt-status.c:264
1637msgid "both modified:"
1638msgstr "双方修改:"
1639
1640#: wt-status.c:266
1641#, c-format
1642msgid "bug: unhandled unmerged status %x"
1643msgstr "bug:无法处理的未合并状态 %x"
1644
1645#: wt-status.c:274
1646msgid "new file:"
1647msgstr "新文件:"
1648
1649#: wt-status.c:276
1650msgid "copied:"
1651msgstr "拷贝:"
1652
1653#: wt-status.c:278
1654msgid "deleted:"
1655msgstr "删除:"
1656
1657#: wt-status.c:280
1658msgid "modified:"
1659msgstr "修改:"
1660
1661#: wt-status.c:282
1662msgid "renamed:"
1663msgstr "重命名:"
1664
1665#: wt-status.c:284
1666msgid "typechange:"
1667msgstr "类型变更:"
1668
1669#: wt-status.c:286
1670msgid "unknown:"
1671msgstr "未知:"
1672
1673#: wt-status.c:288
1674msgid "unmerged:"
1675msgstr "未合并:"
1676
1677# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1678#: wt-status.c:370
1679msgid "new commits, "
1680msgstr "新提交, "
1681
1682# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1683#: wt-status.c:372
1684msgid "modified content, "
1685msgstr "修改的内容, "
1686
1687# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1688#: wt-status.c:374
1689msgid "untracked content, "
1690msgstr "未跟踪的内容, "
1691
1692#: wt-status.c:391
1693#, c-format
1694msgid "bug: unhandled diff status %c"
1695msgstr "bug:无法处理的差异状态 %c"
1696
1697#: wt-status.c:753
1698msgid "Submodules changed but not updated:"
1699msgstr "子模组已修改但尚未更新:"
1700
1701#: wt-status.c:755
1702msgid "Submodule changes to be committed:"
1703msgstr "要提交的子模组变更:"
1704
1705#: wt-status.c:835
1706msgid ""
1707"Do not touch the line above.\n"
1708"Everything below will be removed."
1709msgstr ""
1710"不要改动上面的一行。\n"
1711"下面的所有内容均将被删除。"
1712
1713#: wt-status.c:946
1714msgid "You have unmerged paths."
1715msgstr "您有尚未合并的路径。"
1716
1717# 译者:注意保持前导空格
1718#: wt-status.c:949
1719msgid " (fix conflicts and run \"git commit\")"
1720msgstr " (解决冲突并运行 \"git commit\")"
1721
1722#: wt-status.c:952
1723msgid "All conflicts fixed but you are still merging."
1724msgstr "所有冲突已解决但您仍处于合并中。"
1725
1726# 译者:注意保持前导空格
1727#: wt-status.c:955
1728msgid " (use \"git commit\" to conclude merge)"
1729msgstr " (使用 \"git commit\" 结束合并)"
1730
1731#: wt-status.c:965
1732msgid "You are in the middle of an am session."
1733msgstr "您正处于 am 操作过程中。"
1734
1735#: wt-status.c:968
1736msgid "The current patch is empty."
1737msgstr "当前的补丁为空。"
1738
1739# 译者:注意保持前导空格
1740#: wt-status.c:972
1741msgid " (fix conflicts and then run \"git am --continue\")"
1742msgstr " (解决冲突,然后运行 \"git am --continue\")"
1743
1744# 译者:注意保持前导空格
1745#: wt-status.c:974
1746msgid " (use \"git am --skip\" to skip this patch)"
1747msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1748
1749# 译者:注意保持前导空格
1750#: wt-status.c:976
1751msgid " (use \"git am --abort\" to restore the original branch)"
1752msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1753
1754#: wt-status.c:1036 wt-status.c:1053
1755#, c-format
1756msgid "You are currently rebasing branch '%s' on '%s'."
1757msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1758
1759#: wt-status.c:1041 wt-status.c:1058
1760msgid "You are currently rebasing."
1761msgstr "您在执行变基操作。"
1762
1763# 译者:注意保持前导空格
1764#: wt-status.c:1044
1765msgid " (fix conflicts and then run \"git rebase --continue\")"
1766msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1767
1768# 译者:注意保持前导空格
1769#: wt-status.c:1046
1770msgid " (use \"git rebase --skip\" to skip this patch)"
1771msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1772
1773# 译者:注意保持前导空格
1774#: wt-status.c:1048
1775msgid " (use \"git rebase --abort\" to check out the original branch)"
1776msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1777
1778# 译者:注意保持前导空格
1779#: wt-status.c:1061
1780msgid " (all conflicts fixed: run \"git rebase --continue\")"
1781msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1782
1783#: wt-status.c:1065
1784#, c-format
1785msgid ""
1786"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1787msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1788
1789#: wt-status.c:1070
1790msgid "You are currently splitting a commit during a rebase."
1791msgstr "您在执行变基操作时拆分提交。"
1792
1793# 译者:注意保持前导空格
1794#: wt-status.c:1073
1795msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1796msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1797
1798#: wt-status.c:1077
1799#, c-format
1800msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1801msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1802
1803#: wt-status.c:1082
1804msgid "You are currently editing a commit during a rebase."
1805msgstr "您在执行变基操作时编辑提交。"
1806
1807# 译者:注意保持前导空格
1808#: wt-status.c:1085
1809msgid " (use \"git commit --amend\" to amend the current commit)"
1810msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1811
1812# 译者:注意保持前导空格
1813#: wt-status.c:1087
1814msgid ""
1815" (use \"git rebase --continue\" once you are satisfied with your changes)"
1816msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1817
1818#: wt-status.c:1097
1819#, c-format
1820msgid "You are currently cherry-picking commit %s."
1821msgstr "您在执行拣选提交 %s 的操作。"
1822
1823# 译者:注意保持前导空格
1824#: wt-status.c:1102
1825msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1826msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1827
1828# 译者:注意保持前导空格
1829#: wt-status.c:1105
1830msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1831msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1832
1833# 译者:注意保持前导空格
1834#: wt-status.c:1107
1835msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1836msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1837
1838#: wt-status.c:1116
1839#, c-format
1840msgid "You are currently reverting commit %s."
1841msgstr "您在执行反转提交 %s 的操作。"
1842
1843# 译者:注意保持前导空格
1844#: wt-status.c:1121
1845msgid " (fix conflicts and run \"git revert --continue\")"
1846msgstr " (解决冲突并运行 \"git revert --continue\")"
1847
1848# 译者:注意保持前导空格
1849#: wt-status.c:1124
1850msgid " (all conflicts fixed: run \"git revert --continue\")"
1851msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1852
1853# 译者:注意保持前导空格
1854#: wt-status.c:1126
1855msgid " (use \"git revert --abort\" to cancel the revert operation)"
1856msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1857
1858#: wt-status.c:1137
1859#, c-format
1860msgid "You are currently bisecting, started from branch '%s'."
1861msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1862
1863#: wt-status.c:1141
1864msgid "You are currently bisecting."
1865msgstr "您在执行二分查找操作。"
1866
1867# 译者:注意保持前导空格
1868#: wt-status.c:1144
1869msgid " (use \"git bisect reset\" to get back to the original branch)"
1870msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1871
1872#: wt-status.c:1321
1873msgid "On branch "
1874msgstr "位于分支 "
1875
1876#: wt-status.c:1328
1877msgid "rebase in progress; onto "
1878msgstr "变基操作正在进行中;至 "
1879
1880#: wt-status.c:1333
1881msgid "HEAD detached at "
1882msgstr "头指针分离于 "
1883
1884#: wt-status.c:1335
1885msgid "HEAD detached from "
1886msgstr "头指针分离自 "
1887
1888#: wt-status.c:1338
1889msgid "Not currently on any branch."
1890msgstr "当前不在任何分支上。"
1891
1892#: wt-status.c:1355
1893msgid "Initial commit"
1894msgstr "初始提交"
1895
1896#: wt-status.c:1369
1897msgid "Untracked files"
1898msgstr "未跟踪的文件"
1899
1900#: wt-status.c:1371
1901msgid "Ignored files"
1902msgstr "忽略的文件"
1903
1904#: wt-status.c:1375
1905#, c-format
1906msgid ""
1907"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1908"may speed it up, but you have to be careful not to forget to add\n"
1909"new files yourself (see 'git help status')."
1910msgstr ""
1911"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1912"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1913
1914#: wt-status.c:1381
1915#, c-format
1916msgid "Untracked files not listed%s"
1917msgstr "未跟踪的文件没有列出%s"
1918
1919# 译者:中文字符串拼接,可删除前导空格
1920#: wt-status.c:1383
1921msgid " (use -u option to show untracked files)"
1922msgstr "(使用 -u 参数显示未跟踪的文件)"
1923
1924#: wt-status.c:1389
1925msgid "No changes"
1926msgstr "没有修改"
1927
1928#: wt-status.c:1394
1929#, c-format
1930msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1931msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1932
1933#: wt-status.c:1397
1934#, c-format
1935msgid "no changes added to commit\n"
1936msgstr "修改尚未加入提交\n"
1937
1938#: wt-status.c:1400
1939#, c-format
1940msgid ""
1941"nothing added to commit but untracked files present (use \"git add\" to "
1942"track)\n"
1943msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1944
1945#: wt-status.c:1403
1946#, c-format
1947msgid "nothing added to commit but untracked files present\n"
1948msgstr "提交为空,但是存在尚未跟踪的文件\n"
1949
1950# 译者:中文字符串拼接,可删除前导空格
1951#: wt-status.c:1406
1952#, c-format
1953msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1954msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1955
1956#: wt-status.c:1409 wt-status.c:1414
1957#, c-format
1958msgid "nothing to commit\n"
1959msgstr "无文件要提交\n"
1960
1961# 译者:中文字符串拼接,可删除前导空格
1962#: wt-status.c:1412
1963#, c-format
1964msgid "nothing to commit (use -u to show untracked files)\n"
1965msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1966
1967# 译者:中文字符串拼接,可删除前导空格
1968#: wt-status.c:1416
1969#, c-format
1970msgid "nothing to commit, working directory clean\n"
1971msgstr "无文件要提交,干净的工作区\n"
1972
1973#: wt-status.c:1525
1974msgid "HEAD (no branch)"
1975msgstr "HEAD(非分支)"
1976
1977# 译者:注意保持句尾空格
1978#: wt-status.c:1531
1979msgid "Initial commit on "
1980msgstr "初始提交于 "
1981
1982#: wt-status.c:1563
1983msgid "gone"
1984msgstr "丢失"
1985
1986# 译者:注意保持句尾空格
1987#: wt-status.c:1565 wt-status.c:1573
1988msgid "behind "
1989msgstr "落后 "
1990
1991#: compat/precompose_utf8.c:55 builtin/clone.c:360
1992#, c-format
1993msgid "failed to unlink '%s'"
1994msgstr "无法删除 '%s'"
1995
1996#: builtin/add.c:22
1997msgid "git add [<options>] [--] <pathspec>..."
1998msgstr "git add [<选项>] [--] <路径规则>..."
1999
2000#: builtin/add.c:65
2001#, c-format
2002msgid "unexpected diff status %c"
2003msgstr "意外的差异状态 %c"
2004
2005#: builtin/add.c:70 builtin/commit.c:277
2006msgid "updating files failed"
2007msgstr "更新文件失败"
2008
2009#: builtin/add.c:80
2010#, c-format
2011msgid "remove '%s'\n"
2012msgstr "删除 '%s'\n"
2013
2014#: builtin/add.c:134
2015msgid "Unstaged changes after refreshing the index:"
2016msgstr "刷新索引之后尚未被暂存的变更:"
2017
2018#: builtin/add.c:194 builtin/rev-parse.c:785
2019msgid "Could not read the index"
2020msgstr "不能读取索引"
2021
2022#: builtin/add.c:205
2023#, c-format
2024msgid "Could not open '%s' for writing."
2025msgstr "不能打开 '%s' 以写入。"
2026
2027#: builtin/add.c:209
2028msgid "Could not write patch"
2029msgstr "不能生成补丁"
2030
2031#: builtin/add.c:214
2032#, c-format
2033msgid "Could not stat '%s'"
2034msgstr "不能查看文件状态 '%s'"
2035
2036#: builtin/add.c:216
2037msgid "Empty patch. Aborted."
2038msgstr "空补丁。异常终止。"
2039
2040#: builtin/add.c:221
2041#, c-format
2042msgid "Could not apply '%s'"
2043msgstr "不能应用 '%s'"
2044
2045#: builtin/add.c:231
2046msgid "The following paths are ignored by one of your .gitignore files:\n"
2047msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2048
2049#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110
2050#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372
2051#: builtin/rm.c:269
2052msgid "dry run"
2053msgstr "演习"
2054
2055#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19
2056#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608
2057#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2058msgid "be verbose"
2059msgstr "冗长输出"
2060
2061#: builtin/add.c:251
2062msgid "interactive picking"
2063msgstr "交互式拣选"
2064
2065#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286
2066msgid "select hunks interactively"
2067msgstr "交互式挑选数据块"
2068
2069#: builtin/add.c:253
2070msgid "edit current diff and apply"
2071msgstr "编辑当前差异并应用"
2072
2073#: builtin/add.c:254
2074msgid "allow adding otherwise ignored files"
2075msgstr "允许添加忽略的文件"
2076
2077#: builtin/add.c:255
2078msgid "update tracked files"
2079msgstr "更新已跟踪的文件"
2080
2081#: builtin/add.c:256
2082msgid "record only the fact that the path will be added later"
2083msgstr "只记录,该路径稍后再添加"
2084
2085#: builtin/add.c:257
2086msgid "add changes from all tracked and untracked files"
2087msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2088
2089#: builtin/add.c:260
2090msgid "ignore paths removed in the working tree (same as --no-all)"
2091msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2092
2093#: builtin/add.c:262
2094msgid "don't add, only refresh the index"
2095msgstr "不添加,只刷新索引"
2096
2097#: builtin/add.c:263
2098msgid "just skip files which cannot be added because of errors"
2099msgstr "跳过因出错不能添加的文件"
2100
2101#: builtin/add.c:264
2102msgid "check if - even missing - files are ignored in dry run"
2103msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2104
2105#: builtin/add.c:286
2106#, c-format
2107msgid "Use -f if you really want to add them.\n"
2108msgstr "使用 -f 参数如果您确实要添加它们。\n"
2109
2110#: builtin/add.c:293
2111msgid "adding files failed"
2112msgstr "添加文件失败"
2113
2114#: builtin/add.c:329
2115msgid "-A and -u are mutually incompatible"
2116msgstr "-A 和 -u 选项互斥"
2117
2118#: builtin/add.c:336
2119msgid "Option --ignore-missing can only be used together with --dry-run"
2120msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2121
2122#: builtin/add.c:357
2123#, c-format
2124msgid "Nothing specified, nothing added.\n"
2125msgstr "没有指定文件,也没有文件被添加。\n"
2126
2127#: builtin/add.c:358
2128#, c-format
2129msgid "Maybe you wanted to say 'git add .'?\n"
2130msgstr "也许您想要执行 'git add .'?\n"
2131
2132#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920
2133#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2134msgid "index file corrupt"
2135msgstr "索引文件损坏"
2136
2137#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431
2138msgid "Unable to write new index file"
2139msgstr "无法写入新索引文件"
2140
2141#: builtin/apply.c:59
2142msgid "git apply [<options>] [<patch>...]"
2143msgstr "git apply [<选项>] [<补丁>...]"
2144
2145#: builtin/apply.c:112
2146#, c-format
2147msgid "unrecognized whitespace option '%s'"
2148msgstr "未能识别的空白字符选项 '%s'"
2149
2150#: builtin/apply.c:127
2151#, c-format
2152msgid "unrecognized whitespace ignore option '%s'"
2153msgstr "未能识别的空白字符忽略选项 '%s'"
2154
2155#: builtin/apply.c:822
2156#, c-format
2157msgid "Cannot prepare timestamp regexp %s"
2158msgstr "无法准备时间戳正则表达式 %s"
2159
2160#: builtin/apply.c:831
2161#, c-format
2162msgid "regexec returned %d for input: %s"
2163msgstr "regexec 返回 %d,输入为:%s"
2164
2165#: builtin/apply.c:912
2166#, c-format
2167msgid "unable to find filename in patch at line %d"
2168msgstr "不能在补丁的第 %d 行找到文件名"
2169
2170#: builtin/apply.c:944
2171#, c-format
2172msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2173msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2174
2175#: builtin/apply.c:948
2176#, c-format
2177msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2178msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2179
2180#: builtin/apply.c:949
2181#, c-format
2182msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2183msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2184
2185#: builtin/apply.c:956
2186#, c-format
2187msgid "git apply: bad git-diff - expected /dev/null on line %d"
2188msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2189
2190#: builtin/apply.c:1419
2191#, c-format
2192msgid "recount: unexpected line: %.*s"
2193msgstr "recount:意外的行:%.*s"
2194
2195#: builtin/apply.c:1476
2196#, c-format
2197msgid "patch fragment without header at line %d: %.*s"
2198msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2199
2200#: builtin/apply.c:1493
2201#, c-format
2202msgid ""
2203"git diff header lacks filename information when removing %d leading pathname "
2204"component (line %d)"
2205msgid_plural ""
2206"git diff header lacks filename information when removing %d leading pathname "
2207"components (line %d)"
2208msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2209msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2210
2211#: builtin/apply.c:1656
2212msgid "new file depends on old contents"
2213msgstr "新文件依赖旧内容"
2214
2215#: builtin/apply.c:1658
2216msgid "deleted file still has contents"
2217msgstr "删除的文件仍有内容"
2218
2219#: builtin/apply.c:1684
2220#, c-format
2221msgid "corrupt patch at line %d"
2222msgstr "补丁在第 %d 行损坏"
2223
2224#: builtin/apply.c:1720
2225#, c-format
2226msgid "new file %s depends on old contents"
2227msgstr "新文件 %s 依赖旧内容"
2228
2229#: builtin/apply.c:1722
2230#, c-format
2231msgid "deleted file %s still has contents"
2232msgstr "删除的文件 %s 仍有内容"
2233
2234#: builtin/apply.c:1725
2235#, c-format
2236msgid "** warning: file %s becomes empty but is not deleted"
2237msgstr "** 警告:文件 %s 成为空文件但并未删除"
2238
2239#: builtin/apply.c:1871
2240#, c-format
2241msgid "corrupt binary patch at line %d: %.*s"
2242msgstr "二进制补丁在第 %d 行损坏:%.*s"
2243
2244#: builtin/apply.c:1900
2245#, c-format
2246msgid "unrecognized binary patch at line %d"
2247msgstr "未能识别的二进制补丁位于第 %d 行"
2248
2249#: builtin/apply.c:2051
2250#, c-format
2251msgid "patch with only garbage at line %d"
2252msgstr "补丁文件的第 %d 行只有垃圾数据"
2253
2254#: builtin/apply.c:2141
2255#, c-format
2256msgid "unable to read symlink %s"
2257msgstr "无法读取符号链接 %s"
2258
2259#: builtin/apply.c:2145
2260#, c-format
2261msgid "unable to open or read %s"
2262msgstr "不能打开或读取 %s"
2263
2264#: builtin/apply.c:2778
2265#, c-format
2266msgid "invalid start of line: '%c'"
2267msgstr "无效的行首字符:'%c'"
2268
2269#: builtin/apply.c:2897
2270#, c-format
2271msgid "Hunk #%d succeeded at %d (offset %d line)."
2272msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2273msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2274msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2275
2276#: builtin/apply.c:2909
2277#, c-format
2278msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2279msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2280
2281#: builtin/apply.c:2915
2282#, c-format
2283msgid ""
2284"while searching for:\n"
2285"%.*s"
2286msgstr ""
2287"当查询:\n"
2288"%.*s"
2289
2290#: builtin/apply.c:2935
2291#, c-format
2292msgid "missing binary patch data for '%s'"
2293msgstr "缺失 '%s' 的二进制补丁数据"
2294
2295#: builtin/apply.c:3036
2296#, c-format
2297msgid "binary patch does not apply to '%s'"
2298msgstr "二进制补丁未应用到 '%s'"
2299
2300#: builtin/apply.c:3042
2301#, c-format
2302msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2303msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2304
2305#: builtin/apply.c:3063
2306#, c-format
2307msgid "patch failed: %s:%ld"
2308msgstr "打补丁失败:%s:%ld"
2309
2310#: builtin/apply.c:3187
2311#, c-format
2312msgid "cannot checkout %s"
2313msgstr "不能检出 %s"
2314
2315#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288
2316#, c-format
2317msgid "read of %s failed"
2318msgstr "读取 %s 失败"
2319
2320#: builtin/apply.c:3240
2321#, c-format
2322msgid "reading from '%s' beyond a symbolic link"
2323msgstr "读取位于符号链接中的 '%s'"
2324
2325#: builtin/apply.c:3268 builtin/apply.c:3490
2326#, c-format
2327msgid "path %s has been renamed/deleted"
2328msgstr "路径 %s 已经被重命名/删除"
2329
2330#: builtin/apply.c:3349 builtin/apply.c:3504
2331#, c-format
2332msgid "%s: does not exist in index"
2333msgstr "%s:不存在于索引中"
2334
2335#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518
2336#, c-format
2337msgid "%s: %s"
2338msgstr "%s:%s"
2339
2340#: builtin/apply.c:3358 builtin/apply.c:3512
2341#, c-format
2342msgid "%s: does not match index"
2343msgstr "%s:和索引不匹配"
2344
2345#: builtin/apply.c:3460
2346msgid "removal patch leaves file contents"
2347msgstr "移除补丁仍留下了文件内容"
2348
2349#: builtin/apply.c:3529
2350#, c-format
2351msgid "%s: wrong type"
2352msgstr "%s:错误类型"
2353
2354#: builtin/apply.c:3531
2355#, c-format
2356msgid "%s has type %o, expected %o"
2357msgstr "%s 的类型是 %o,应为 %o"
2358
2359#: builtin/apply.c:3690 builtin/apply.c:3692
2360#, c-format
2361msgid "invalid path '%s'"
2362msgstr "无效路径 '%s'"
2363
2364#: builtin/apply.c:3747
2365#, c-format
2366msgid "%s: already exists in index"
2367msgstr "%s:已经存在于索引中"
2368
2369#: builtin/apply.c:3750
2370#, c-format
2371msgid "%s: already exists in working directory"
2372msgstr "%s:已经存在于工作区中"
2373
2374#: builtin/apply.c:3770
2375#, c-format
2376msgid "new mode (%o) of %s does not match old mode (%o)"
2377msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2378
2379#: builtin/apply.c:3775
2380#, c-format
2381msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2382msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2383
2384#: builtin/apply.c:3795
2385#, c-format
2386msgid "affected file '%s' is beyond a symbolic link"
2387msgstr "受影响的文件 '%s' 位于符号链接中"
2388
2389#: builtin/apply.c:3799
2390#, c-format
2391msgid "%s: patch does not apply"
2392msgstr "%s:补丁未应用"
2393
2394#: builtin/apply.c:3813
2395#, c-format
2396msgid "Checking patch %s..."
2397msgstr "检查补丁 %s..."
2398
2399#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135
2400#, c-format
2401msgid "make_cache_entry failed for path '%s'"
2402msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2403
2404#: builtin/apply.c:4049
2405#, c-format
2406msgid "unable to remove %s from index"
2407msgstr "不能从索引中移除 %s"
2408
2409#: builtin/apply.c:4078
2410#, c-format
2411msgid "corrupt patch for submodule %s"
2412msgstr "子模组 %s 损坏的补丁"
2413
2414#: builtin/apply.c:4082
2415#, c-format
2416msgid "unable to stat newly created file '%s'"
2417msgstr "不能枚举新建文件 '%s' 的状态"
2418
2419#: builtin/apply.c:4087
2420#, c-format
2421msgid "unable to create backing store for newly created file %s"
2422msgstr "不能为新建文件 %s 创建后端存储"
2423
2424#: builtin/apply.c:4090 builtin/apply.c:4198
2425#, c-format
2426msgid "unable to add cache entry for %s"
2427msgstr "无法为 %s 添加缓存条目"
2428
2429#: builtin/apply.c:4123
2430#, c-format
2431msgid "closing file '%s'"
2432msgstr "关闭文件 '%s'"
2433
2434#: builtin/apply.c:4172
2435#, c-format
2436msgid "unable to write file '%s' mode %o"
2437msgstr "不能写文件 '%s' 权限 %o"
2438
2439#: builtin/apply.c:4259
2440#, c-format
2441msgid "Applied patch %s cleanly."
2442msgstr "成功应用补丁 %s。"
2443
2444#: builtin/apply.c:4267
2445msgid "internal error"
2446msgstr "内部错误"
2447
2448#: builtin/apply.c:4270
2449#, c-format
2450msgid "Applying patch %%s with %d reject..."
2451msgid_plural "Applying patch %%s with %d rejects..."
2452msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2453msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2454
2455#: builtin/apply.c:4280
2456#, c-format
2457msgid "truncating .rej filename to %.*s.rej"
2458msgstr "截短 .rej 文件名为 %.*s.rej"
2459
2460#: builtin/apply.c:4301
2461#, c-format
2462msgid "Hunk #%d applied cleanly."
2463msgstr "第 #%d 个片段成功应用。"
2464
2465#: builtin/apply.c:4304
2466#, c-format
2467msgid "Rejected hunk #%d."
2468msgstr "拒绝第 #%d 个片段。"
2469
2470#: builtin/apply.c:4394
2471msgid "unrecognized input"
2472msgstr "未能识别的输入"
2473
2474#: builtin/apply.c:4405
2475msgid "unable to read index file"
2476msgstr "无法读取索引文件"
2477
2478#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92
2479#: builtin/fetch.c:92
2480msgid "path"
2481msgstr "路径"
2482
2483#: builtin/apply.c:4523
2484msgid "don't apply changes matching the given path"
2485msgstr "不要应用与给出路径向匹配的变更"
2486
2487#: builtin/apply.c:4526
2488msgid "apply changes matching the given path"
2489msgstr "应用与给出路径向匹配的变更"
2490
2491#: builtin/apply.c:4528
2492msgid "num"
2493msgstr "数字"
2494
2495#: builtin/apply.c:4529
2496msgid "remove <num> leading slashes from traditional diff paths"
2497msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2498
2499#: builtin/apply.c:4532
2500msgid "ignore additions made by the patch"
2501msgstr "忽略补丁中的添加的文件"
2502
2503#: builtin/apply.c:4534
2504msgid "instead of applying the patch, output diffstat for the input"
2505msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2506
2507#: builtin/apply.c:4538
2508msgid "show number of added and deleted lines in decimal notation"
2509msgstr "以十进制数显示添加和删除的行数"
2510
2511#: builtin/apply.c:4540
2512msgid "instead of applying the patch, output a summary for the input"
2513msgstr "不应用补丁,而是显示输入的概要"
2514
2515#: builtin/apply.c:4542
2516msgid "instead of applying the patch, see if the patch is applicable"
2517msgstr "不应用补丁,而是查看补丁是否可应用"
2518
2519#: builtin/apply.c:4544
2520msgid "make sure the patch is applicable to the current index"
2521msgstr "确认补丁可以应用到当前索引"
2522
2523#: builtin/apply.c:4546
2524msgid "apply a patch without touching the working tree"
2525msgstr "应用补丁而不修改工作区"
2526
2527#: builtin/apply.c:4548
2528msgid "accept a patch that touches outside the working area"
2529msgstr "接受修改工作区之外文件的补丁"
2530
2531#: builtin/apply.c:4550
2532msgid "also apply the patch (use with --stat/--summary/--check)"
2533msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2534
2535#: builtin/apply.c:4552
2536msgid "attempt three-way merge if a patch does not apply"
2537msgstr "如果一个补丁不能应用则尝试三路合并"
2538
2539#: builtin/apply.c:4554
2540msgid "build a temporary index based on embedded index information"
2541msgstr "创建一个临时索引基于嵌入的索引信息"
2542
2543#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412
2544msgid "paths are separated with NUL character"
2545msgstr "路径以 NUL 字符分隔"
2546
2547#: builtin/apply.c:4559
2548msgid "ensure at least <n> lines of context match"
2549msgstr "确保至少匹配 <n> 行上下文"
2550
2551#: builtin/apply.c:4560
2552msgid "action"
2553msgstr "动作"
2554
2555#: builtin/apply.c:4561
2556msgid "detect new or modified lines that have whitespace errors"
2557msgstr "检查新增和修改的行中间的空白字符滥用"
2558
2559#: builtin/apply.c:4564 builtin/apply.c:4567
2560msgid "ignore changes in whitespace when finding context"
2561msgstr "查找上下文时忽略空白字符的变更"
2562
2563#: builtin/apply.c:4570
2564msgid "apply the patch in reverse"
2565msgstr "反向应用补丁"
2566
2567#: builtin/apply.c:4572
2568msgid "don't expect at least one line of context"
2569msgstr "无需至少一行上下文"
2570
2571#: builtin/apply.c:4574
2572msgid "leave the rejected hunks in corresponding *.rej files"
2573msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2574
2575#: builtin/apply.c:4576
2576msgid "allow overlapping hunks"
2577msgstr "允许重叠的补丁片段"
2578
2579#: builtin/apply.c:4579
2580msgid "tolerate incorrectly detected missing new-line at the end of file"
2581msgstr "允许不正确的文件末尾换行符"
2582
2583#: builtin/apply.c:4582
2584msgid "do not trust the line counts in the hunk headers"
2585msgstr "不信任补丁片段的头信息中的行号"
2586
2587#: builtin/apply.c:4584
2588msgid "root"
2589msgstr "根目录"
2590
2591#: builtin/apply.c:4585
2592msgid "prepend <root> to all filenames"
2593msgstr "为所有文件名前添加 <根目录>"
2594
2595#: builtin/apply.c:4607
2596msgid "--3way outside a repository"
2597msgstr "--3way 在一个版本库之外"
2598
2599#: builtin/apply.c:4615
2600msgid "--index outside a repository"
2601msgstr "--index 在一个版本库之外"
2602
2603#: builtin/apply.c:4618
2604msgid "--cached outside a repository"
2605msgstr "--cached 在一个版本库之外"
2606
2607#: builtin/apply.c:4637
2608#, c-format
2609msgid "can't open patch '%s'"
2610msgstr "不能打开补丁 '%s'"
2611
2612#: builtin/apply.c:4651
2613#, c-format
2614msgid "squelched %d whitespace error"
2615msgid_plural "squelched %d whitespace errors"
2616msgstr[0] "抑制下仍有 %d 个空白字符误用"
2617msgstr[1] "抑制下仍有 %d 个空白字符误用"
2618
2619#: builtin/apply.c:4657 builtin/apply.c:4667
2620#, c-format
2621msgid "%d line adds whitespace errors."
2622msgid_plural "%d lines add whitespace errors."
2623msgstr[0] "%d 行有空白字符误用。"
2624msgstr[1] "%d 行有空白字符误用。"
2625
2626#: builtin/archive.c:17
2627#, c-format
2628msgid "could not create archive file '%s'"
2629msgstr "不能创建归档文件 '%s'"
2630
2631#: builtin/archive.c:20
2632msgid "could not redirect output"
2633msgstr "不能重定向输出"
2634
2635#: builtin/archive.c:37
2636msgid "git archive: Remote with no URL"
2637msgstr "git archive:未提供远程URL"
2638
2639#: builtin/archive.c:58
2640msgid "git archive: expected ACK/NAK, got EOF"
2641msgstr "git archive:应为ACK/NACK,却得到EOF"
2642
2643#: builtin/archive.c:61
2644#, c-format
2645msgid "git archive: NACK %s"
2646msgstr "git archive:NACK %s"
2647
2648#: builtin/archive.c:63
2649#, c-format
2650msgid "remote error: %s"
2651msgstr "远程错误:%s"
2652
2653#: builtin/archive.c:64
2654msgid "git archive: protocol error"
2655msgstr "git archive:协议错误"
2656
2657#: builtin/archive.c:68
2658msgid "git archive: expected a flush"
2659msgstr "git archive:应为刷新"
2660
2661#: builtin/bisect--helper.c:7
2662msgid "git bisect--helper --next-all [--no-checkout]"
2663msgstr "git bisect--helper --next-all [--no-checkout]"
2664
2665#: builtin/bisect--helper.c:17
2666msgid "perform 'git bisect next'"
2667msgstr "执行 'git bisect next'"
2668
2669#: builtin/bisect--helper.c:19
2670msgid "update BISECT_HEAD instead of checking out the current commit"
2671msgstr "更新 BISECT_HEAD 而非检出当前提交"
2672
2673#: builtin/blame.c:30
2674msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file"
2675msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] 文件"
2676
2677#: builtin/blame.c:35
2678msgid "<rev-opts> are documented in git-rev-list(1)"
2679msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
2680
2681#: builtin/blame.c:2500
2682msgid "Show blame entries as we find them, incrementally"
2683msgstr "增量式地显示发现的 blame 条目"
2684
2685#: builtin/blame.c:2501
2686msgid "Show blank SHA-1 for boundary commits (Default: off)"
2687msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2688
2689#: builtin/blame.c:2502
2690msgid "Do not treat root commits as boundaries (Default: off)"
2691msgstr "不把根提交作为边界(默认:关闭)"
2692
2693#: builtin/blame.c:2503
2694msgid "Show work cost statistics"
2695msgstr "显示命令消耗统计"
2696
2697#: builtin/blame.c:2504
2698msgid "Show output score for blame entries"
2699msgstr "显示判断 blame 条目位移的得分诊断信息"
2700
2701#: builtin/blame.c:2505
2702msgid "Show original filename (Default: auto)"
2703msgstr "显示原始文件名(默认:自动)"
2704
2705#: builtin/blame.c:2506
2706msgid "Show original linenumber (Default: off)"
2707msgstr "显示原始的行号(默认:关闭)"
2708
2709#: builtin/blame.c:2507
2710msgid "Show in a format designed for machine consumption"
2711msgstr "显示为一个适合机器读取的格式"
2712
2713#: builtin/blame.c:2508
2714msgid "Show porcelain format with per-line commit information"
2715msgstr "为每一行显示机器适用的提交信息"
2716
2717#: builtin/blame.c:2509
2718msgid "Use the same output mode as git-annotate (Default: off)"
2719msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2720
2721#: builtin/blame.c:2510
2722msgid "Show raw timestamp (Default: off)"
2723msgstr "显示原始时间戳(默认:关闭)"
2724
2725#: builtin/blame.c:2511
2726msgid "Show long commit SHA1 (Default: off)"
2727msgstr "显示长的SHA1提交号(默认:关闭)"
2728
2729#: builtin/blame.c:2512
2730msgid "Suppress author name and timestamp (Default: off)"
2731msgstr "隐藏作者名字和时间戳(默认:关闭)"
2732
2733#: builtin/blame.c:2513
2734msgid "Show author email instead of name (Default: off)"
2735msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2736
2737#: builtin/blame.c:2514
2738msgid "Ignore whitespace differences"
2739msgstr "忽略空白差异"
2740
2741#: builtin/blame.c:2515
2742msgid "Spend extra cycles to find better match"
2743msgstr "花费额外的循环来找到更好的匹配"
2744
2745#: builtin/blame.c:2516
2746msgid "Use revisions from <file> instead of calling git-rev-list"
2747msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
2748
2749#: builtin/blame.c:2517
2750msgid "Use <file>'s contents as the final image"
2751msgstr "使用 <文件> 的内容作为最终的图片"
2752
2753#: builtin/blame.c:2518 builtin/blame.c:2519
2754msgid "score"
2755msgstr "得分"
2756
2757#: builtin/blame.c:2518
2758msgid "Find line copies within and across files"
2759msgstr "找到文件内及跨文件的行拷贝"
2760
2761#: builtin/blame.c:2519
2762msgid "Find line movements within and across files"
2763msgstr "找到文件内及跨文件的行移动"
2764
2765#: builtin/blame.c:2520
2766msgid "n,m"
2767msgstr "n,m"
2768
2769#: builtin/blame.c:2520
2770msgid "Process only line range n,m, counting from 1"
2771msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2772
2773#. TRANSLATORS: This string is used to tell us the maximum
2774#. display width for a relative timestamp in "git blame"
2775#. output. For C locale, "4 years, 11 months ago", which
2776#. takes 22 places, is the longest among various forms of
2777#. relative timestamps, but your language may need more or
2778#. fewer display columns.
2779#: builtin/blame.c:2601
2780msgid "4 years, 11 months ago"
2781msgstr "4 年 11 个月前"
2782
2783#: builtin/branch.c:24
2784msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2785msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
2786
2787#: builtin/branch.c:25
2788msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2789msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
2790
2791#: builtin/branch.c:26
2792msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2793msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
2794
2795#: builtin/branch.c:27
2796msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2797msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
2798
2799# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2800#: builtin/branch.c:152
2801#, c-format
2802msgid ""
2803"deleting branch '%s' that has been merged to\n"
2804" '%s', but not yet merged to HEAD."
2805msgstr ""
2806"将要删除的分支 '%s' 已经被合并到\n"
2807" '%s',但未合并到 HEAD。"
2808
2809# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2810#: builtin/branch.c:156
2811#, c-format
2812msgid ""
2813"not deleting branch '%s' that is not yet merged to\n"
2814" '%s', even though it is merged to HEAD."
2815msgstr ""
2816"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2817" 然而却尚未被合并到分支 '%s' 。"
2818
2819#: builtin/branch.c:170
2820#, c-format
2821msgid "Couldn't look up commit object for '%s'"
2822msgstr "无法查询 '%s' 指向的提交对象"
2823
2824#: builtin/branch.c:174
2825#, c-format
2826msgid ""
2827"The branch '%s' is not fully merged.\n"
2828"If you are sure you want to delete it, run 'git branch -D %s'."
2829msgstr ""
2830"分支 '%s' 没有完全合并。\n"
2831"如果您确认要删除它,执行 'git branch -D %s'。"
2832
2833#: builtin/branch.c:187
2834msgid "Update of config-file failed"
2835msgstr "无法更新 config 文件"
2836
2837#: builtin/branch.c:215
2838msgid "cannot use -a with -d"
2839msgstr "不能将 -a 和 -d 同时使用"
2840
2841#: builtin/branch.c:221
2842msgid "Couldn't look up commit object for HEAD"
2843msgstr "无法查询 HEAD 指向的提交对象"
2844
2845#: builtin/branch.c:229
2846#, c-format
2847msgid "Cannot delete the branch '%s' which you are currently on."
2848msgstr "无法删除您当前所在的分支 '%s'。"
2849
2850#: builtin/branch.c:245
2851#, c-format
2852msgid "remote branch '%s' not found."
2853msgstr "远程分支 '%s' 未发现。"
2854
2855#: builtin/branch.c:246
2856#, c-format
2857msgid "branch '%s' not found."
2858msgstr "分支 '%s' 未发现。"
2859
2860#: builtin/branch.c:260
2861#, c-format
2862msgid "Error deleting remote branch '%s'"
2863msgstr "删除远程分支 '%s' 时出错"
2864
2865#: builtin/branch.c:261
2866#, c-format
2867msgid "Error deleting branch '%s'"
2868msgstr "删除分支 '%s' 时出错"
2869
2870#: builtin/branch.c:268
2871#, c-format
2872msgid "Deleted remote branch %s (was %s).\n"
2873msgstr "已删除远程分支 %s(曾为 %s)。\n"
2874
2875#: builtin/branch.c:269
2876#, c-format
2877msgid "Deleted branch %s (was %s).\n"
2878msgstr "已删除分支 %s(曾为 %s)。\n"
2879
2880#: builtin/branch.c:370
2881#, c-format
2882msgid "branch '%s' does not point at a commit"
2883msgstr "分支 '%s' 未指向一个提交"
2884
2885#: builtin/branch.c:459
2886#, c-format
2887msgid "[%s: gone]"
2888msgstr "[%s: 丢失]"
2889
2890#: builtin/branch.c:464
2891#, c-format
2892msgid "[%s]"
2893msgstr "[%s]"
2894
2895#: builtin/branch.c:469
2896#, c-format
2897msgid "[%s: behind %d]"
2898msgstr "[%s:落后 %d]"
2899
2900#: builtin/branch.c:471
2901#, c-format
2902msgid "[behind %d]"
2903msgstr "[落后 %d]"
2904
2905#: builtin/branch.c:475
2906#, c-format
2907msgid "[%s: ahead %d]"
2908msgstr "[%s:领先 %d]"
2909
2910#: builtin/branch.c:477
2911#, c-format
2912msgid "[ahead %d]"
2913msgstr "[领先 %d]"
2914
2915#: builtin/branch.c:480
2916#, c-format
2917msgid "[%s: ahead %d, behind %d]"
2918msgstr "[%s:领先 %d,落后 %d]"
2919
2920#: builtin/branch.c:483
2921#, c-format
2922msgid "[ahead %d, behind %d]"
2923msgstr "[领先 %d,落后 %d]"
2924
2925#: builtin/branch.c:496
2926msgid " **** invalid ref ****"
2927msgstr " **** 无效引用 ****"
2928
2929#: builtin/branch.c:587
2930#, c-format
2931msgid "(no branch, rebasing %s)"
2932msgstr "(非分支,正变基 %s)"
2933
2934#: builtin/branch.c:590
2935#, c-format
2936msgid "(no branch, bisect started on %s)"
2937msgstr "(非分支,二分查找开始于 %s)"
2938
2939#: builtin/branch.c:596
2940#, c-format
2941msgid "(HEAD detached at %s)"
2942msgstr "(头指针分离于 %s)"
2943
2944#: builtin/branch.c:599
2945#, c-format
2946msgid "(HEAD detached from %s)"
2947msgstr "(头指针分离自 %s)"
2948
2949#: builtin/branch.c:603
2950msgid "(no branch)"
2951msgstr "(非分支)"
2952
2953#: builtin/branch.c:650
2954#, c-format
2955msgid "object '%s' does not point to a commit"
2956msgstr "对象 '%s' 没有指向一个提交"
2957
2958#: builtin/branch.c:698
2959msgid "some refs could not be read"
2960msgstr "一些引用不能读取"
2961
2962#: builtin/branch.c:711
2963msgid "cannot rename the current branch while not on any."
2964msgstr "无法重命名当前分支因为不处于任何分支上。"
2965
2966#: builtin/branch.c:721
2967#, c-format
2968msgid "Invalid branch name: '%s'"
2969msgstr "无效的分支名:'%s'"
2970
2971#: builtin/branch.c:736
2972msgid "Branch rename failed"
2973msgstr "分支重命名失败"
2974
2975#: builtin/branch.c:740
2976#, c-format
2977msgid "Renamed a misnamed branch '%s' away"
2978msgstr "重命名掉一个错误命名的旧分支 '%s'"
2979
2980#: builtin/branch.c:744
2981#, c-format
2982msgid "Branch renamed to %s, but HEAD is not updated!"
2983msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2984
2985#: builtin/branch.c:751
2986msgid "Branch is renamed, but update of config-file failed"
2987msgstr "分支被重命名,但更新 config 文件失败"
2988
2989#: builtin/branch.c:766
2990#, c-format
2991msgid "malformed object name %s"
2992msgstr "非法的对象名 %s"
2993
2994#: builtin/branch.c:790
2995#, c-format
2996msgid "could not write branch description template: %s"
2997msgstr "不能写分支描述模版:%s"
2998
2999#: builtin/branch.c:820
3000msgid "Generic options"
3001msgstr "通用选项"
3002
3003#: builtin/branch.c:822
3004msgid "show hash and subject, give twice for upstream branch"
3005msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3006
3007#: builtin/branch.c:823
3008msgid "suppress informational messages"
3009msgstr "不显示信息"
3010
3011#: builtin/branch.c:824
3012msgid "set up tracking mode (see git-pull(1))"
3013msgstr "设置跟踪模式(参见 git-pull(1))"
3014
3015#: builtin/branch.c:826
3016msgid "change upstream info"
3017msgstr "改变上游信息"
3018
3019#: builtin/branch.c:830
3020msgid "use colored output"
3021msgstr "使用彩色输出"
3022
3023#: builtin/branch.c:831
3024msgid "act on remote-tracking branches"
3025msgstr "作用于远程跟踪分支"
3026
3027#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861
3028#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583
3029#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616
3030#: builtin/tag.c:622
3031msgid "commit"
3032msgstr "提交"
3033
3034#: builtin/branch.c:835 builtin/branch.c:841
3035msgid "print only branches that contain the commit"
3036msgstr "只打印包含该提交的分支"
3037
3038#: builtin/branch.c:847
3039msgid "Specific git-branch actions:"
3040msgstr "具体的 git-branch 动作:"
3041
3042#: builtin/branch.c:848
3043msgid "list both remote-tracking and local branches"
3044msgstr "列出远程跟踪及本地分支"
3045
3046#: builtin/branch.c:850
3047msgid "delete fully merged branch"
3048msgstr "删除完全合并的分支"
3049
3050#: builtin/branch.c:851
3051msgid "delete branch (even if not merged)"
3052msgstr "删除分支(即使没有合并)"
3053
3054#: builtin/branch.c:852
3055msgid "move/rename a branch and its reflog"
3056msgstr "移动/重命名一个分支,以及它的引用日志"
3057
3058#: builtin/branch.c:853
3059msgid "move/rename a branch, even if target exists"
3060msgstr "移动/重命名一个分支,即使目标已存在"
3061
3062#: builtin/branch.c:854
3063msgid "list branch names"
3064msgstr "列出分支名"
3065
3066#: builtin/branch.c:855
3067msgid "create the branch's reflog"
3068msgstr "创建分支的引用日志"
3069
3070#: builtin/branch.c:857
3071msgid "edit the description for the branch"
3072msgstr "标记分支的描述"
3073
3074#: builtin/branch.c:858
3075msgid "force creation, move/rename, deletion"
3076msgstr "强制创建、移动/重命名、删除"
3077
3078#: builtin/branch.c:861
3079msgid "print only not merged branches"
3080msgstr "只打印没有合并的分支"
3081
3082#: builtin/branch.c:867
3083msgid "print only merged branches"
3084msgstr "只打印合并的分支"
3085
3086#: builtin/branch.c:871
3087msgid "list branches in columns"
3088msgstr "以列的方式显示分支"
3089
3090#: builtin/branch.c:884
3091msgid "Failed to resolve HEAD as a valid ref."
3092msgstr "无法将 HEAD 解析为有效引用。"
3093
3094#: builtin/branch.c:888 builtin/clone.c:637
3095msgid "HEAD not found below refs/heads!"
3096msgstr "HEAD 没有位于 /refs/heads 之下!"
3097
3098#: builtin/branch.c:910
3099msgid "--column and --verbose are incompatible"
3100msgstr "--column 和 --verbose 不兼容"
3101
3102#: builtin/branch.c:921 builtin/branch.c:960
3103msgid "branch name required"
3104msgstr "必须提供分支名"
3105
3106#: builtin/branch.c:936
3107msgid "Cannot give description to detached HEAD"
3108msgstr "不能向分离头指针提供描述"
3109
3110#: builtin/branch.c:941
3111msgid "cannot edit description of more than one branch"
3112msgstr "不能为一个以上的分支编辑描述"
3113
3114#: builtin/branch.c:948
3115#, c-format
3116msgid "No commit on branch '%s' yet."
3117msgstr "分支 '%s' 尚无提交。"
3118
3119#: builtin/branch.c:951
3120#, c-format
3121msgid "No branch named '%s'."
3122msgstr "没有分支 '%s'。"
3123
3124#: builtin/branch.c:966
3125msgid "too many branches for a rename operation"
3126msgstr "为重命名操作提供了太多的分支名"
3127
3128#: builtin/branch.c:971
3129msgid "too many branches to set new upstream"
3130msgstr "为设置新上游提供了太多的分支名"
3131
3132#: builtin/branch.c:975
3133#, c-format
3134msgid ""
3135"could not set upstream of HEAD to %s when it does not point to any branch."
3136msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3137
3138#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021
3139#, c-format
3140msgid "no such branch '%s'"
3141msgstr "没有此分支 '%s'"
3142
3143#: builtin/branch.c:982
3144#, c-format
3145msgid "branch '%s' does not exist"
3146msgstr "分支 '%s' 不存在"
3147
3148#: builtin/branch.c:994
3149msgid "too many branches to unset upstream"
3150msgstr "为取消上游设置操作提供了太多的分支名"
3151
3152#: builtin/branch.c:998
3153msgid "could not unset upstream of HEAD when it does not point to any branch."
3154msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3155
3156#: builtin/branch.c:1004
3157#, c-format
3158msgid "Branch '%s' has no upstream information"
3159msgstr "分支 '%s' 没有上游信息"
3160
3161#: builtin/branch.c:1018
3162msgid "it does not make sense to create 'HEAD' manually"
3163msgstr "手工创建 'HEAD' 没有意义"
3164
3165#: builtin/branch.c:1024
3166msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3167msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3168
3169#: builtin/branch.c:1027
3170#, c-format
3171msgid ""
3172"The --set-upstream flag is deprecated and will be removed. Consider using --"
3173"track or --set-upstream-to\n"
3174msgstr ""
3175"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3176
3177#: builtin/branch.c:1044
3178#, c-format
3179msgid ""
3180"\n"
3181"If you wanted to make '%s' track '%s', do this:\n"
3182"\n"
3183msgstr ""
3184"\n"
3185"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3186"\n"
3187
3188#: builtin/branch.c:1045
3189#, c-format
3190msgid " git branch -d %s\n"
3191msgstr " git branch -d %s\n"
3192
3193#: builtin/branch.c:1046
3194#, c-format
3195msgid " git branch --set-upstream-to %s\n"
3196msgstr " git branch --set-upstream-to %s\n"
3197
3198#: builtin/bundle.c:47
3199#, c-format
3200msgid "%s is okay\n"
3201msgstr "%s 可以\n"
3202
3203#: builtin/bundle.c:56
3204msgid "Need a repository to create a bundle."
3205msgstr "需要一个版本库来创建包。"
3206
3207#: builtin/bundle.c:60
3208msgid "Need a repository to unbundle."
3209msgstr "需要一个版本库来解包。"
3210
3211#: builtin/cat-file.c:326
3212msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>"
3213msgstr "git cat-file (-t | -s | -e | -p | <类型> | --textconv) <对象>"
3214
3215#: builtin/cat-file.c:327
3216msgid "git cat-file (--batch | --batch-check) < <list-of-objects>"
3217msgstr "git cat-file (--batch | --batch-check) < <对象列表>"
3218
3219#: builtin/cat-file.c:364
3220msgid "<type> can be one of: blob, tree, commit, tag"
3221msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3222
3223#: builtin/cat-file.c:365
3224msgid "show object type"
3225msgstr "显示对象类型"
3226
3227#: builtin/cat-file.c:366
3228msgid "show object size"
3229msgstr "显示对象大小"
3230
3231#: builtin/cat-file.c:368
3232msgid "exit with zero when there's no error"
3233msgstr "当没有错误时退出并返回零"
3234
3235#: builtin/cat-file.c:369
3236msgid "pretty-print object's content"
3237msgstr "美观地打印对象的内容"
3238
3239#: builtin/cat-file.c:371
3240msgid "for blob objects, run textconv on object's content"
3241msgstr "对于数据(blob)对象,对其内容执行 textconv"
3242
3243#: builtin/cat-file.c:373
3244msgid "show info and content of objects fed from the standard input"
3245msgstr "显示从标准输入提供的对象的信息和内容"
3246
3247#: builtin/cat-file.c:376
3248msgid "show info about objects fed from the standard input"
3249msgstr "显示从标准输入提供的对象的信息"
3250
3251#: builtin/check-attr.c:11
3252msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3253msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
3254
3255#: builtin/check-attr.c:12
3256msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3257msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
3258
3259#: builtin/check-attr.c:19
3260msgid "report all attributes set on file"
3261msgstr "报告设置在文件上的所有属性"
3262
3263#: builtin/check-attr.c:20
3264msgid "use .gitattributes only from the index"
3265msgstr "只使用索引中的 .gitattributes"
3266
3267#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
3268msgid "read file names from stdin"
3269msgstr "从标准输入读出文件名"
3270
3271#: builtin/check-attr.c:23 builtin/check-ignore.c:24
3272msgid "terminate input and output records by a NUL character"
3273msgstr "输入和输出的记录使用 NUL 字符终结"
3274
3275#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274
3276msgid "suppress progress reporting"
3277msgstr "不显示进度报告"
3278
3279#: builtin/check-ignore.c:26
3280msgid "show non-matching input paths"
3281msgstr "显示未匹配的输入路径"
3282
3283#: builtin/check-ignore.c:28
3284msgid "ignore index when checking"
3285msgstr "检查时忽略索引"
3286
3287#: builtin/check-ignore.c:154
3288msgid "cannot specify pathnames with --stdin"
3289msgstr "不能同时提供路径及 --stdin 参数"
3290
3291#: builtin/check-ignore.c:157
3292msgid "-z only makes sense with --stdin"
3293msgstr "-z 需要和 --stdin 参数共用才有意义"
3294
3295#: builtin/check-ignore.c:159
3296msgid "no path specified"
3297msgstr "未指定路径"
3298
3299#: builtin/check-ignore.c:163
3300msgid "--quiet is only valid with a single pathname"
3301msgstr "参数 --quiet 只在提供一个路径名时有效"
3302
3303#: builtin/check-ignore.c:165
3304msgid "cannot have both --quiet and --verbose"
3305msgstr "不能同时提供 --quiet 和 --verbose 参数"
3306
3307#: builtin/check-ignore.c:168
3308msgid "--non-matching is only valid with --verbose"
3309msgstr "--non-matching 选项只在使用 --verbose 时有效"
3310
3311#: builtin/check-mailmap.c:8
3312msgid "git check-mailmap [<options>] <contact>..."
3313msgstr "git check-mailmap [<选项>] <联系地址>..."
3314
3315#: builtin/check-mailmap.c:13
3316msgid "also read contacts from stdin"
3317msgstr "还从标准输入读取联系地址"
3318
3319#: builtin/check-mailmap.c:24
3320#, c-format
3321msgid "unable to parse contact: %s"
3322msgstr "不能解析联系地址:%s"
3323
3324#: builtin/check-mailmap.c:47
3325msgid "no contacts specified"
3326msgstr "未指定联系地址"
3327
3328#: builtin/checkout-index.c:126
3329msgid "git checkout-index [<options>] [--] [<file>...]"
3330msgstr "git checkout-index [<选项>] [--] [<文件>...]"
3331
3332#: builtin/checkout-index.c:188
3333msgid "check out all files in the index"
3334msgstr "检出索引区的所有文件"
3335
3336#: builtin/checkout-index.c:189
3337msgid "force overwrite of existing files"
3338msgstr "强制覆盖现有的文件"
3339
3340#: builtin/checkout-index.c:191
3341msgid "no warning for existing files and files not in index"
3342msgstr "存在或不在索引中的文件都没有警告"
3343
3344#: builtin/checkout-index.c:193
3345msgid "don't checkout new files"
3346msgstr "不检出新文件"
3347
3348#: builtin/checkout-index.c:195
3349msgid "update stat information in the index file"
3350msgstr "更新索引中文件的状态信息"
3351
3352#: builtin/checkout-index.c:201
3353msgid "read list of paths from the standard input"
3354msgstr "从标准输入读取路径列表"
3355
3356#: builtin/checkout-index.c:203
3357msgid "write the content to temporary files"
3358msgstr "将内容写入临时文件"
3359
3360#: builtin/checkout-index.c:204 builtin/column.c:30
3361msgid "string"
3362msgstr "字符串"
3363
3364#: builtin/checkout-index.c:205
3365msgid "when creating files, prepend <string>"
3366msgstr "在创建文件时,在前面加上<字符串>"
3367
3368#: builtin/checkout-index.c:208
3369msgid "copy out the files from named stage"
3370msgstr "从指定暂存区中拷出文件"
3371
3372#: builtin/checkout.c:25
3373msgid "git checkout [<options>] <branch>"
3374msgstr "git checkout [<选项>] <分支>"
3375
3376#: builtin/checkout.c:26
3377msgid "git checkout [<options>] [<branch>] -- <file>..."
3378msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
3379
3380#: builtin/checkout.c:132 builtin/checkout.c:165
3381#, c-format
3382msgid "path '%s' does not have our version"
3383msgstr "路径 '%s' 没有我们的版本"
3384
3385#: builtin/checkout.c:134 builtin/checkout.c:167
3386#, c-format
3387msgid "path '%s' does not have their version"
3388msgstr "路径 '%s' 没有他们的版本"
3389
3390#: builtin/checkout.c:150
3391#, c-format
3392msgid "path '%s' does not have all necessary versions"
3393msgstr "路径 '%s' 没有全部必须的版本"
3394
3395#: builtin/checkout.c:194
3396#, c-format
3397msgid "path '%s' does not have necessary versions"
3398msgstr "路径 '%s' 没有必须的版本"
3399
3400#: builtin/checkout.c:211
3401#, c-format
3402msgid "path '%s': cannot merge"
3403msgstr "path '%s':无法合并"
3404
3405#: builtin/checkout.c:228
3406#, c-format
3407msgid "Unable to add merge result for '%s'"
3408msgstr "无法为 '%s' 添加合并结果"
3409
3410#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255
3411#: builtin/checkout.c:258
3412#, c-format
3413msgid "'%s' cannot be used with updating paths"
3414msgstr "'%s' 不能在更新路径时使用"
3415
3416#: builtin/checkout.c:261 builtin/checkout.c:264
3417#, c-format
3418msgid "'%s' cannot be used with %s"
3419msgstr "'%s' 不能和 %s 同时使用"
3420
3421#: builtin/checkout.c:267
3422#, c-format
3423msgid "Cannot update paths and switch to branch '%s' at the same time."
3424msgstr "不能同时更新路径并切换到分支'%s'。"
3425
3426#: builtin/checkout.c:278 builtin/checkout.c:467
3427msgid "corrupt index file"
3428msgstr "损坏的索引文件"
3429
3430#: builtin/checkout.c:338 builtin/checkout.c:345
3431#, c-format
3432msgid "path '%s' is unmerged"
3433msgstr "路径 '%s' 未合并"
3434
3435#: builtin/checkout.c:489
3436msgid "you need to resolve your current index first"
3437msgstr "您需要先解决当前索引的冲突"
3438
3439#: builtin/checkout.c:615
3440#, c-format
3441msgid "Can not do reflog for '%s'\n"
3442msgstr "不能对 '%s' 执行 reflog 操作\n"
3443
3444#: builtin/checkout.c:653
3445msgid "HEAD is now at"
3446msgstr "HEAD 目前位于"
3447
3448#: builtin/checkout.c:660
3449#, c-format
3450msgid "Reset branch '%s'\n"
3451msgstr "重置分支 '%s'\n"
3452
3453#: builtin/checkout.c:663
3454#, c-format
3455msgid "Already on '%s'\n"
3456msgstr "已经位于 '%s'\n"
3457
3458#: builtin/checkout.c:667
3459#, c-format
3460msgid "Switched to and reset branch '%s'\n"
3461msgstr "切换并重置分支 '%s'\n"
3462
3463#: builtin/checkout.c:669 builtin/checkout.c:1050
3464#, c-format
3465msgid "Switched to a new branch '%s'\n"
3466msgstr "切换到一个新分支 '%s'\n"
3467
3468#: builtin/checkout.c:671
3469#, c-format
3470msgid "Switched to branch '%s'\n"
3471msgstr "切换到分支 '%s'\n"
3472
3473# 译者:注意保持前导空格
3474#: builtin/checkout.c:723
3475#, c-format
3476msgid " ... and %d more.\n"
3477msgstr " ... 及其它 %d 个。\n"
3478
3479#: builtin/checkout.c:729
3480#, c-format
3481msgid ""
3482"Warning: you are leaving %d commit behind, not connected to\n"
3483"any of your branches:\n"
3484"\n"
3485"%s\n"
3486msgid_plural ""
3487"Warning: you are leaving %d commits behind, not connected to\n"
3488"any of your branches:\n"
3489"\n"
3490"%s\n"
3491msgstr[0] ""
3492"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3493"\n"
3494"%s\n"
3495msgstr[1] ""
3496"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3497"\n"
3498"%s\n"
3499
3500#: builtin/checkout.c:747
3501#, c-format
3502msgid ""
3503"If you want to keep them by creating a new branch, this may be a good time\n"
3504"to do so with:\n"
3505"\n"
3506" git branch <new-branch-name> %s\n"
3507"\n"
3508msgstr ""
3509"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3510"如下操作:\n"
3511"\n"
3512" git branch <新分支名> %s\n"
3513"\n"
3514
3515#: builtin/checkout.c:777
3516msgid "internal error in revision walk"
3517msgstr "在版本遍历时遇到内部错误"
3518
3519#: builtin/checkout.c:781
3520msgid "Previous HEAD position was"
3521msgstr "之前的 HEAD 位置是"
3522
3523#: builtin/checkout.c:808 builtin/checkout.c:1045
3524msgid "You are on a branch yet to be born"
3525msgstr "您位于一个尚未初始化的分支"
3526
3527#: builtin/checkout.c:952
3528#, c-format
3529msgid "only one reference expected, %d given."
3530msgstr "只要一个引用,却给出了 %d 个"
3531
3532#: builtin/checkout.c:991
3533#, c-format
3534msgid "invalid reference: %s"
3535msgstr "无效引用:%s"
3536
3537#: builtin/checkout.c:1020
3538#, c-format
3539msgid "reference is not a tree: %s"
3540msgstr "引用不是一个树:%s"
3541
3542#: builtin/checkout.c:1059
3543msgid "paths cannot be used with switching branches"
3544msgstr "路径不能和切换分支同时使用"
3545
3546#: builtin/checkout.c:1062 builtin/checkout.c:1066
3547#, c-format
3548msgid "'%s' cannot be used with switching branches"
3549msgstr "'%s' 不能和切换分支同时使用"
3550
3551#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078
3552#: builtin/checkout.c:1081
3553#, c-format
3554msgid "'%s' cannot be used with '%s'"
3555msgstr "'%s' 不能和 '%s' 同时使用"
3556
3557#: builtin/checkout.c:1086
3558#, c-format
3559msgid "Cannot switch branch to a non-commit '%s'"
3560msgstr "不能切换分支到一个非提交 '%s'"
3561
3562#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90
3563#: builtin/remote.c:159 builtin/remote.c:161
3564msgid "branch"
3565msgstr "分支"
3566
3567#: builtin/checkout.c:1109
3568msgid "create and checkout a new branch"
3569msgstr "创建并检出一个新的分支"
3570
3571#: builtin/checkout.c:1111
3572msgid "create/reset and checkout a branch"
3573msgstr "创建/重置并检出一个分支"
3574
3575#: builtin/checkout.c:1112
3576msgid "create reflog for new branch"
3577msgstr "为新的分支创建引用日志"
3578
3579#: builtin/checkout.c:1113
3580msgid "detach the HEAD at named commit"
3581msgstr "成为指向该提交的分离头指针"
3582
3583#: builtin/checkout.c:1114
3584msgid "set upstream info for new branch"
3585msgstr "为新的分支设置上游信息"
3586
3587#: builtin/checkout.c:1116
3588msgid "new-branch"
3589msgstr "新分支"
3590
3591#: builtin/checkout.c:1116
3592msgid "new unparented branch"
3593msgstr "新的没有父提交的分支"
3594
3595#: builtin/checkout.c:1117
3596msgid "checkout our version for unmerged files"
3597msgstr "对尚未合并的文件检出我们的版本"
3598
3599#: builtin/checkout.c:1119
3600msgid "checkout their version for unmerged files"
3601msgstr "对尚未合并的文件检出他们的版本"
3602
3603#: builtin/checkout.c:1121
3604msgid "force checkout (throw away local modifications)"
3605msgstr "强制检出(丢弃本地修改)"
3606
3607#: builtin/checkout.c:1122
3608msgid "perform a 3-way merge with the new branch"
3609msgstr "和新的分支执行三路合并"
3610
3611#: builtin/checkout.c:1123 builtin/merge.c:227
3612msgid "update ignored files (default)"
3613msgstr "更新忽略的文件(默认)"
3614
3615#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245
3616msgid "style"
3617msgstr "风格"
3618
3619#: builtin/checkout.c:1125
3620msgid "conflict style (merge or diff3)"
3621msgstr "冲突输出风格(merge 或 diff3)"
3622
3623#: builtin/checkout.c:1128
3624msgid "do not limit pathspecs to sparse entries only"
3625msgstr "对路径不做稀疏检出的限制"
3626
3627#: builtin/checkout.c:1130
3628msgid "second guess 'git checkout <no-such-branch>'"
3629msgstr "二次猜测'git checkout <无此分支>'"
3630
3631#: builtin/checkout.c:1153
3632msgid "-b, -B and --orphan are mutually exclusive"
3633msgstr "-b、-B 和 --orphan 是互斥的"
3634
3635#: builtin/checkout.c:1170
3636msgid "--track needs a branch name"
3637msgstr "--track 需要一个分支名"
3638
3639#: builtin/checkout.c:1175
3640msgid "Missing branch name; try -b"
3641msgstr "缺少分支名;尝试 -b"
3642
3643#: builtin/checkout.c:1212
3644msgid "invalid path specification"
3645msgstr "无效的路径规格"
3646
3647#: builtin/checkout.c:1219
3648#, c-format
3649msgid ""
3650"Cannot update paths and switch to branch '%s' at the same time.\n"
3651"Did you intend to checkout '%s' which can not be resolved as commit?"
3652msgstr ""
3653"不能同时更新路径并切换到分支'%s'。\n"
3654"您是想要检出 '%s' 但其未能解析为提交么?"
3655
3656#: builtin/checkout.c:1224
3657#, c-format
3658msgid "git checkout: --detach does not take a path argument '%s'"
3659msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3660
3661#: builtin/checkout.c:1228
3662msgid ""
3663"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3664"checking out of the index."
3665msgstr ""
3666"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3667
3668#: builtin/clean.c:26
3669msgid ""
3670"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3671msgstr ""
3672"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3673
3674#: builtin/clean.c:30
3675#, c-format
3676msgid "Removing %s\n"
3677msgstr "正删除 %s\n"
3678
3679#: builtin/clean.c:31
3680#, c-format
3681msgid "Would remove %s\n"
3682msgstr "将删除 %s\n"
3683
3684#: builtin/clean.c:32
3685#, c-format
3686msgid "Skipping repository %s\n"
3687msgstr "忽略版本库 %s\n"
3688
3689#: builtin/clean.c:33
3690#, c-format
3691msgid "Would skip repository %s\n"
3692msgstr "将忽略版本库 %s\n"
3693
3694#: builtin/clean.c:34
3695#, c-format
3696msgid "failed to remove %s"
3697msgstr "无法删除 %s"
3698
3699#: builtin/clean.c:295
3700msgid ""
3701"Prompt help:\n"
3702"1 - select a numbered item\n"
3703"foo - select item based on unique prefix\n"
3704" - (empty) select nothing"
3705msgstr ""
3706"帮助:\n"
3707"1 - 通过编号选择一个选项\n"
3708"foo - 通过标题选择一个选项\n"
3709" - (空)什么也不选择"
3710
3711#: builtin/clean.c:299
3712msgid ""
3713"Prompt help:\n"
3714"1 - select a single item\n"
3715"3-5 - select a range of items\n"
3716"2-3,6-9 - select multiple ranges\n"
3717"foo - select item based on unique prefix\n"
3718"-... - unselect specified items\n"
3719"* - choose all items\n"
3720" - (empty) finish selecting"
3721msgstr ""
3722"帮助:\n"
3723"1 - 选择一个选项\n"
3724"3-5 - 选择一个范围内的所有选项\n"
3725"2-3,6-9 - 选择多个范围内的所有选项\n"
3726"foo - 通过标题选择一个选项\n"
3727"-... - 反选特定的选项\n"
3728"* - 选择所有选项\n"
3729" - (空)结束选择"
3730
3731#: builtin/clean.c:517
3732#, c-format
3733msgid "Huh (%s)?"
3734msgstr "嗯(%s)?"
3735
3736#: builtin/clean.c:659
3737#, c-format
3738msgid "Input ignore patterns>> "
3739msgstr "输入模版以排除条目>> "
3740
3741#: builtin/clean.c:696
3742#, c-format
3743msgid "WARNING: Cannot find items matched by: %s"
3744msgstr "警告:无法找到和 %s 匹配的条目"
3745
3746#: builtin/clean.c:717
3747msgid "Select items to delete"
3748msgstr "选择要删除的条目"
3749
3750#. TRANSLATORS: Make sure to keep [y/N] as is
3751#: builtin/clean.c:758
3752#, c-format
3753msgid "Remove %s [y/N]? "
3754msgstr "删除 %s [y/N]?"
3755
3756#: builtin/clean.c:783
3757msgid "Bye."
3758msgstr "再见。"
3759
3760#: builtin/clean.c:791
3761msgid ""
3762"clean - start cleaning\n"
3763"filter by pattern - exclude items from deletion\n"
3764"select by numbers - select items to be deleted by numbers\n"
3765"ask each - confirm each deletion (like \"rm -i\")\n"
3766"quit - stop cleaning\n"
3767"help - this screen\n"
3768"? - help for prompt selection"
3769msgstr ""
3770"clean - 开始清理\n"
3771"filter by pattern - 通过模版排除要删除的条目\n"
3772"select by numbers - 通过数字选择要删除的条目\n"
3773"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3774"quit - 停止删除并退出\n"
3775"help - 显示本帮助\n"
3776"? - 显示如何在提示符下选择的帮助"
3777
3778#: builtin/clean.c:818
3779msgid "*** Commands ***"
3780msgstr "*** 命令 ***"
3781
3782#: builtin/clean.c:819
3783msgid "What now"
3784msgstr "请选择"
3785
3786#: builtin/clean.c:827
3787msgid "Would remove the following item:"
3788msgid_plural "Would remove the following items:"
3789msgstr[0] "将删除如下条目:"
3790msgstr[1] "将删除如下条目:"
3791
3792#: builtin/clean.c:844
3793msgid "No more files to clean, exiting."
3794msgstr "没有要清理的文件,退出。"
3795
3796#: builtin/clean.c:875
3797msgid "do not print names of files removed"
3798msgstr "不打印删除文件的名称"
3799
3800#: builtin/clean.c:877
3801msgid "force"
3802msgstr "强制"
3803
3804#: builtin/clean.c:878
3805msgid "interactive cleaning"
3806msgstr "交互式清除"
3807
3808#: builtin/clean.c:880
3809msgid "remove whole directories"
3810msgstr "删除整个目录"
3811
3812#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714
3813#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185
3814msgid "pattern"
3815msgstr "模式"
3816
3817#: builtin/clean.c:882
3818msgid "add <pattern> to ignore rules"
3819msgstr "添加<模式>到忽略规则"
3820
3821#: builtin/clean.c:883
3822msgid "remove ignored files, too"
3823msgstr "也删除忽略的文件"
3824
3825#: builtin/clean.c:885
3826msgid "remove only ignored files"
3827msgstr "只删除忽略的文件"
3828
3829#: builtin/clean.c:903
3830msgid "-x and -X cannot be used together"
3831msgstr "-x 和 -X 不能同时使用"
3832
3833#: builtin/clean.c:907
3834msgid ""
3835"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3836"clean"
3837msgstr ""
3838"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3839
3840#: builtin/clean.c:910
3841msgid ""
3842"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3843"refusing to clean"
3844msgstr ""
3845"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3846
3847#: builtin/clone.c:37
3848msgid "git clone [<options>] [--] <repo> [<dir>]"
3849msgstr "git clone [<选项>] [--] <版本库> [<路径>]"
3850
3851#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224
3852#: builtin/push.c:523
3853msgid "force progress reporting"
3854msgstr "强制显示进度报告"
3855
3856#: builtin/clone.c:68
3857msgid "don't create a checkout"
3858msgstr "不创建一个检出"
3859
3860#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496
3861msgid "create a bare repository"
3862msgstr "创建一个纯版本库"
3863
3864#: builtin/clone.c:73
3865msgid "create a mirror repository (implies bare)"
3866msgstr "创建一个镜像版本库(也是纯版本库)"
3867
3868#: builtin/clone.c:75
3869msgid "to clone from a local repository"
3870msgstr "从本地版本库克隆"
3871
3872#: builtin/clone.c:77
3873msgid "don't use local hardlinks, always copy"
3874msgstr "不使用本地硬链接,始终复制"
3875
3876#: builtin/clone.c:79
3877msgid "setup as shared repository"
3878msgstr "设置为共享版本库"
3879
3880#: builtin/clone.c:81 builtin/clone.c:83
3881msgid "initialize submodules in the clone"
3882msgstr "在克隆时初始化子模组"
3883
3884#: builtin/clone.c:84 builtin/init-db.c:493
3885msgid "template-directory"
3886msgstr "模板目录"
3887
3888#: builtin/clone.c:85 builtin/init-db.c:494
3889msgid "directory from which templates will be used"
3890msgstr "模板目录将被使用"
3891
3892#: builtin/clone.c:87
3893msgid "reference repository"
3894msgstr "参考版本库"
3895
3896#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
3897msgid "name"
3898msgstr "名称"
3899
3900#: builtin/clone.c:89
3901msgid "use <name> instead of 'origin' to track upstream"
3902msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3903
3904#: builtin/clone.c:91
3905msgid "checkout <branch> instead of the remote's HEAD"
3906msgstr "检出<分支>而不是远程HEAD"
3907
3908#: builtin/clone.c:93
3909msgid "path to git-upload-pack on the remote"
3910msgstr "远程 git-upload-pack 路径"
3911
3912#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659
3913msgid "depth"
3914msgstr "深度"
3915
3916#: builtin/clone.c:95
3917msgid "create a shallow clone of that depth"
3918msgstr "创建一个指定深度的浅克隆"
3919
3920#: builtin/clone.c:97
3921msgid "clone only one branch, HEAD or --branch"
3922msgstr "只克隆一个分支、HEAD 或 --branch"
3923
3924#: builtin/clone.c:99
3925msgid "use --reference only while cloning"
3926msgstr "仅在克隆时参考 --reference 指向的本地版本库"
3927
3928#: builtin/clone.c:100 builtin/init-db.c:502
3929msgid "gitdir"
3930msgstr "git目录"
3931
3932#: builtin/clone.c:101 builtin/init-db.c:503
3933msgid "separate git dir from working tree"
3934msgstr "git目录和工作区分离"
3935
3936#: builtin/clone.c:102
3937msgid "key=value"
3938msgstr "key=value"
3939
3940#: builtin/clone.c:103
3941msgid "set config inside the new repository"
3942msgstr "在新版本库中设置配置信息"
3943
3944#: builtin/clone.c:256
3945#, c-format
3946msgid "reference repository '%s' is not a local repository."
3947msgstr "参考版本库 '%s' 不是一个本地版本库。"
3948
3949#: builtin/clone.c:260
3950#, c-format
3951msgid "reference repository '%s' is shallow"
3952msgstr "参考版本库 '%s' 是一个浅克隆"
3953
3954#: builtin/clone.c:263
3955#, c-format
3956msgid "reference repository '%s' is grafted"
3957msgstr "参考版本库 '%s' 已被嫁接"
3958
3959#: builtin/clone.c:325
3960#, c-format
3961msgid "failed to create directory '%s'"
3962msgstr "无法创建目录 '%s'"
3963
3964#: builtin/clone.c:327 builtin/diff.c:84
3965#, c-format
3966msgid "failed to stat '%s'"
3967msgstr "无法枚举 '%s' 状态"
3968
3969#: builtin/clone.c:329
3970#, c-format
3971msgid "%s exists and is not a directory"
3972msgstr "%s 存在且不是一个目录"
3973
3974#: builtin/clone.c:343
3975#, c-format
3976msgid "failed to stat %s\n"
3977msgstr "无法枚举 %s 状态\n"
3978
3979#: builtin/clone.c:365
3980#, c-format
3981msgid "failed to create link '%s'"
3982msgstr "无法创建链接 '%s'"
3983
3984#: builtin/clone.c:369
3985#, c-format
3986msgid "failed to copy file to '%s'"
3987msgstr "无法拷贝文件至 '%s'"
3988
3989#: builtin/clone.c:392 builtin/clone.c:566
3990#, c-format
3991msgid "done.\n"
3992msgstr "完成。\n"
3993
3994#: builtin/clone.c:404
3995msgid ""
3996"Clone succeeded, but checkout failed.\n"
3997"You can inspect what was checked out with 'git status'\n"
3998"and retry the checkout with 'git checkout -f HEAD'\n"
3999msgstr ""
4000"克隆成功,但是检出失败。\n"
4001"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4002"'git checkout -f HEAD' 重试\n"
4003
4004#: builtin/clone.c:481
4005#, c-format
4006msgid "Could not find remote branch %s to clone."
4007msgstr "不能发现要克隆的远程分支 %s。"
4008
4009#: builtin/clone.c:561
4010#, c-format
4011msgid "Checking connectivity... "
4012msgstr "检查连接... "
4013
4014#: builtin/clone.c:564
4015msgid "remote did not send all necessary objects"
4016msgstr "远程没有发送所有必须的对象"
4017
4018#: builtin/clone.c:628
4019msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4020msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4021
4022#: builtin/clone.c:659
4023msgid "unable to checkout working tree"
4024msgstr "不能检出工作区"
4025
4026#: builtin/clone.c:746
4027msgid "cannot repack to clean up"
4028msgstr "无法执行 repack 来清理"
4029
4030#: builtin/clone.c:748
4031msgid "cannot unlink temporary alternates file"
4032msgstr "无法删除临时的 alternates 文件"
4033
4034#: builtin/clone.c:778
4035msgid "Too many arguments."
4036msgstr "太多参数。"
4037
4038#: builtin/clone.c:782
4039msgid "You must specify a repository to clone."
4040msgstr "您必须指定一个版本库来克隆。"
4041
4042#: builtin/clone.c:793
4043#, c-format
4044msgid "--bare and --origin %s options are incompatible."
4045msgstr "--bare 和 --origin %s 选项不兼容。"
4046
4047#: builtin/clone.c:796
4048msgid "--bare and --separate-git-dir are incompatible."
4049msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4050
4051#: builtin/clone.c:809
4052#, c-format
4053msgid "repository '%s' does not exist"
4054msgstr "版本库 '%s' 不存在"
4055
4056#: builtin/clone.c:815 builtin/fetch.c:1156
4057#, c-format
4058msgid "depth %s is not a positive number"
4059msgstr "深度 %s 不是一个正数"
4060
4061#: builtin/clone.c:825
4062#, c-format
4063msgid "destination path '%s' already exists and is not an empty directory."
4064msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4065
4066#: builtin/clone.c:835
4067#, c-format
4068msgid "working tree '%s' already exists."
4069msgstr "工作区 '%s' 已经存在。"
4070
4071#: builtin/clone.c:850 builtin/clone.c:861
4072#, c-format
4073msgid "could not create leading directories of '%s'"
4074msgstr "不能为 '%s' 创建先导目录"
4075
4076#: builtin/clone.c:853
4077#, c-format
4078msgid "could not create work tree dir '%s'"
4079msgstr "不能创建工作区目录 '%s'"
4080
4081#: builtin/clone.c:871
4082#, c-format
4083msgid "Cloning into bare repository '%s'...\n"
4084msgstr "克隆到纯版本库 '%s'...\n"
4085
4086#: builtin/clone.c:873
4087#, c-format
4088msgid "Cloning into '%s'...\n"
4089msgstr "正克隆到 '%s'...\n"
4090
4091#: builtin/clone.c:898
4092msgid "--dissociate given, but there is no --reference"
4093msgstr "提供了参数 --dissociate,但未提供 --reference"
4094
4095#: builtin/clone.c:913
4096msgid "--depth is ignored in local clones; use file:// instead."
4097msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4098
4099#: builtin/clone.c:916
4100msgid "source repository is shallow, ignoring --local"
4101msgstr "源版本库是浅克隆,忽略 --local"
4102
4103#: builtin/clone.c:921
4104msgid "--local is ignored"
4105msgstr "--local 被忽略"
4106
4107#: builtin/clone.c:925
4108#, c-format
4109msgid "Don't know how to clone %s"
4110msgstr "不知道如何克隆 %s"
4111
4112#: builtin/clone.c:976 builtin/clone.c:984
4113#, c-format
4114msgid "Remote branch %s not found in upstream %s"
4115msgstr "远程分支 %s 在上游 %s 未发现"
4116
4117#: builtin/clone.c:987
4118msgid "You appear to have cloned an empty repository."
4119msgstr "您似乎克隆了一个空版本库。"
4120
4121#: builtin/column.c:9
4122msgid "git column [<options>]"
4123msgstr "git column [<选项>]"
4124
4125#: builtin/column.c:26
4126msgid "lookup config vars"
4127msgstr "查找配置变量"
4128
4129#: builtin/column.c:27 builtin/column.c:28
4130msgid "layout to use"
4131msgstr "要使用的布局"
4132
4133#: builtin/column.c:29
4134msgid "Maximum width"
4135msgstr "最大宽度"
4136
4137#: builtin/column.c:30
4138msgid "Padding space on left border"
4139msgstr "左边框的填充空间"
4140
4141#: builtin/column.c:31
4142msgid "Padding space on right border"
4143msgstr "右边框的填充空间"
4144
4145#: builtin/column.c:32
4146msgid "Padding space between columns"
4147msgstr "两列之间的填充空间"
4148
4149#: builtin/column.c:51
4150msgid "--command must be the first argument"
4151msgstr "--command 必须是第一个参数"
4152
4153#: builtin/commit.c:37
4154msgid "git commit [<options>] [--] <pathspec>..."
4155msgstr "git commit [<选项>] [--] <路径规则>..."
4156
4157#: builtin/commit.c:42
4158msgid "git status [<options>] [--] <pathspec>..."
4159msgstr "git status [<选项>] [--] <路径规则>..."
4160
4161#: builtin/commit.c:47
4162msgid ""
4163"Your name and email address were configured automatically based\n"
4164"on your username and hostname. Please check that they are accurate.\n"
4165"You can suppress this message by setting them explicitly. Run the\n"
4166"following command and follow the instructions in your editor to edit\n"
4167"your configuration file:\n"
4168"\n"
4169" git config --global --edit\n"
4170"\n"
4171"After doing this, you may fix the identity used for this commit with:\n"
4172"\n"
4173" git commit --amend --reset-author\n"
4174msgstr ""
4175"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4176"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4177"中编辑您的配置文件:\n"
4178"\n"
4179" git config --global --edit\n"
4180"\n"
4181"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4182"\n"
4183" git commit --amend --reset-author\n"
4184
4185#: builtin/commit.c:60
4186msgid ""
4187"Your name and email address were configured automatically based\n"
4188"on your username and hostname. Please check that they are accurate.\n"
4189"You can suppress this message by setting them explicitly:\n"
4190"\n"
4191" git config --global user.name \"Your Name\"\n"
4192" git config --global user.email you@example.com\n"
4193"\n"
4194"After doing this, you may fix the identity used for this commit with:\n"
4195"\n"
4196" git commit --amend --reset-author\n"
4197msgstr ""
4198"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4199"与否。您可以对其进行设置以免再出现本提示信息:\n"
4200"\n"
4201" git config --global user.name \"Your Name\"\n"
4202" git config --global user.email you@example.com\n"
4203"\n"
4204"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4205"\n"
4206" git commit --amend --reset-author\n"
4207
4208#: builtin/commit.c:72
4209msgid ""
4210"You asked to amend the most recent commit, but doing so would make\n"
4211"it empty. You can repeat your command with --allow-empty, or you can\n"
4212"remove the commit entirely with \"git reset HEAD^\".\n"
4213msgstr ""
4214"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4215"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4216
4217#: builtin/commit.c:77
4218msgid ""
4219"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4220"If you wish to commit it anyway, use:\n"
4221"\n"
4222" git commit --allow-empty\n"
4223"\n"
4224msgstr ""
4225"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4226"也要提交,使用命令:\n"
4227"\n"
4228" git commit --allow-empty\n"
4229"\n"
4230
4231#: builtin/commit.c:84
4232msgid "Otherwise, please use 'git reset'\n"
4233msgstr "否则,请使用命令 'git reset'\n"
4234
4235#: builtin/commit.c:87
4236msgid ""
4237"If you wish to skip this commit, use:\n"
4238"\n"
4239" git reset\n"
4240"\n"
4241"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4242"the remaining commits.\n"
4243msgstr ""
4244"如果您想跳过这个提交,使用命令:\n"
4245"\n"
4246" git reset\n"
4247"\n"
4248"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4249"操作。\n"
4250
4251#: builtin/commit.c:304
4252msgid "failed to unpack HEAD tree object"
4253msgstr "无法解包 HEAD 树对象"
4254
4255#: builtin/commit.c:344
4256msgid "unable to create temporary index"
4257msgstr "不能创建临时索引"
4258
4259#: builtin/commit.c:350
4260msgid "interactive add failed"
4261msgstr "交互式添加失败"
4262
4263#: builtin/commit.c:361
4264msgid "unable to write index file"
4265msgstr "无法写入索引文件"
4266
4267#: builtin/commit.c:363
4268msgid "unable to update temporary index"
4269msgstr "无法更新临时索引"
4270
4271#: builtin/commit.c:365
4272msgid "Failed to update main cache tree"
4273msgstr "不能更新树的主缓存"
4274
4275#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
4276msgid "unable to write new_index file"
4277msgstr "无法写 new_index 文件"
4278
4279#: builtin/commit.c:445
4280msgid "cannot do a partial commit during a merge."
4281msgstr "在合并过程中不能做部分提交。"
4282
4283#: builtin/commit.c:447
4284msgid "cannot do a partial commit during a cherry-pick."
4285msgstr "在拣选过程中不能做部分提交。"
4286
4287#: builtin/commit.c:456
4288msgid "cannot read the index"
4289msgstr "无法读取索引"
4290
4291#: builtin/commit.c:475
4292msgid "unable to write temporary index file"
4293msgstr "无法写临时索引文件"
4294
4295#: builtin/commit.c:580
4296#, c-format
4297msgid "commit '%s' lacks author header"
4298msgstr "提交 '%s' 缺少作者信息"
4299
4300#: builtin/commit.c:582
4301#, c-format
4302msgid "commit '%s' has malformed author line"
4303msgstr "提交 '%s' 有非法的作者信息"
4304
4305#: builtin/commit.c:601
4306msgid "malformed --author parameter"
4307msgstr "非法的 --author 参数"
4308
4309#: builtin/commit.c:609
4310#, c-format
4311msgid "invalid date format: %s"
4312msgstr "无效的日期格式:%s"
4313
4314#: builtin/commit.c:653
4315msgid ""
4316"unable to select a comment character that is not used\n"
4317"in the current commit message"
4318msgstr "无法选择一个未被当前提交说明使用的注释字符"
4319
4320#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4321#, c-format
4322msgid "could not lookup commit %s"
4323msgstr "不能查询提交 %s"
4324
4325#: builtin/commit.c:702 builtin/shortlog.c:273
4326#, c-format
4327msgid "(reading log message from standard input)\n"
4328msgstr "(正从标准输入中读取日志信息)\n"
4329
4330#: builtin/commit.c:704
4331msgid "could not read log from standard input"
4332msgstr "不能从标准输入中读取日志信息"
4333
4334#: builtin/commit.c:708
4335#, c-format
4336msgid "could not read log file '%s'"
4337msgstr "不能读取日志文件 '%s'"
4338
4339#: builtin/commit.c:730
4340msgid "could not read MERGE_MSG"
4341msgstr "不能读取 MERGE_MSG"
4342
4343#: builtin/commit.c:734
4344msgid "could not read SQUASH_MSG"
4345msgstr "不能读取 SQUASH_MSG"
4346
4347#: builtin/commit.c:738
4348#, c-format
4349msgid "could not read '%s'"
4350msgstr "不能读取 '%s'"
4351
4352#: builtin/commit.c:785
4353msgid "could not write commit template"
4354msgstr "不能写提交模版"
4355
4356#: builtin/commit.c:803
4357#, c-format
4358msgid ""
4359"\n"
4360"It looks like you may be committing a merge.\n"
4361"If this is not correct, please remove the file\n"
4362"\t%s\n"
4363"and try again.\n"
4364msgstr ""
4365"\n"
4366"似乎您正在做一个合并提交。如果不对,请删除文件\n"
4367"\t%s\n"
4368"然后重试。\n"
4369
4370#: builtin/commit.c:808
4371#, c-format
4372msgid ""
4373"\n"
4374"It looks like you may be committing a cherry-pick.\n"
4375"If this is not correct, please remove the file\n"
4376"\t%s\n"
4377"and try again.\n"
4378msgstr ""
4379"\n"
4380"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4381"\t%s\n"
4382"然后重试。\n"
4383
4384#: builtin/commit.c:821
4385#, c-format
4386msgid ""
4387"Please enter the commit message for your changes. Lines starting\n"
4388"with '%c' will be ignored, and an empty message aborts the commit.\n"
4389msgstr ""
4390"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4391"说明将会终止提交。\n"
4392
4393#: builtin/commit.c:828
4394#, c-format
4395msgid ""
4396"Please enter the commit message for your changes. Lines starting\n"
4397"with '%c' will be kept; you may remove them yourself if you want to.\n"
4398"An empty message aborts the commit.\n"
4399msgstr ""
4400"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4401"也可以删除它们。一个空的提交说明将会终止提交。\n"
4402
4403# 译者:为保证在输出中对齐,注意调整句中空格!
4404#: builtin/commit.c:848
4405#, c-format
4406msgid "%sAuthor: %.*s <%.*s>"
4407msgstr "%s作者: %.*s <%.*s>"
4408
4409# 译者:为保证在输出中对齐,注意调整句中空格!
4410#: builtin/commit.c:856
4411#, c-format
4412msgid "%sDate: %s"
4413msgstr "%s日期: %s"
4414
4415# 译者:为保证在输出中对齐,注意调整句中空格!
4416#: builtin/commit.c:863
4417#, c-format
4418msgid "%sCommitter: %.*s <%.*s>"
4419msgstr "%s提交者:%.*s <%.*s>"
4420
4421#: builtin/commit.c:881
4422msgid "Cannot read index"
4423msgstr "无法读取索引"
4424
4425#: builtin/commit.c:938
4426msgid "Error building trees"
4427msgstr "无法创建树对象"
4428
4429#: builtin/commit.c:953 builtin/tag.c:495
4430#, c-format
4431msgid "Please supply the message using either -m or -F option.\n"
4432msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4433
4434#: builtin/commit.c:1055
4435#, c-format
4436msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4437msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
4438
4439#: builtin/commit.c:1070 builtin/commit.c:1310
4440#, c-format
4441msgid "Invalid untracked files mode '%s'"
4442msgstr "无效的未追踪文件参数 '%s'"
4443
4444#: builtin/commit.c:1107
4445msgid "--long and -z are incompatible"
4446msgstr "--long 和 -z 选项不兼容"
4447
4448#: builtin/commit.c:1137
4449msgid "Using both --reset-author and --author does not make sense"
4450msgstr "同时使用 --reset-author 和 --author 没有意义"
4451
4452#: builtin/commit.c:1146
4453msgid "You have nothing to amend."
4454msgstr "您没有可修补的提交。"
4455
4456#: builtin/commit.c:1149
4457msgid "You are in the middle of a merge -- cannot amend."
4458msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4459
4460#: builtin/commit.c:1151
4461msgid "You are in the middle of a cherry-pick -- cannot amend."
4462msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4463
4464#: builtin/commit.c:1154
4465msgid "Options --squash and --fixup cannot be used together"
4466msgstr "选项 --squash 和 --fixup 不能同时使用"
4467
4468#: builtin/commit.c:1164
4469msgid "Only one of -c/-C/-F/--fixup can be used."
4470msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4471
4472#: builtin/commit.c:1166
4473msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4474msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4475
4476#: builtin/commit.c:1174
4477msgid "--reset-author can be used only with -C, -c or --amend."
4478msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4479
4480#: builtin/commit.c:1191
4481msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4482msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4483
4484#: builtin/commit.c:1193
4485msgid "No paths with --include/--only does not make sense."
4486msgstr "参数 --include/--only 不跟路径没有意义。"
4487
4488#: builtin/commit.c:1195
4489msgid "Clever... amending the last one with dirty index."
4490msgstr "聪明... 在索引不干净下修补最后的提交。"
4491
4492#: builtin/commit.c:1197
4493msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4494msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
4495
4496#: builtin/commit.c:1209 builtin/tag.c:728
4497#, c-format
4498msgid "Invalid cleanup mode %s"
4499msgstr "无效的清理模式 %s"
4500
4501#: builtin/commit.c:1214
4502msgid "Paths with -a does not make sense."
4503msgstr "路径和 -a 选项同时使用没有意义。"
4504
4505#: builtin/commit.c:1324 builtin/commit.c:1604
4506msgid "show status concisely"
4507msgstr "以简洁的格式显示状态"
4508
4509#: builtin/commit.c:1326 builtin/commit.c:1606
4510msgid "show branch information"
4511msgstr "显示分支信息"
4512
4513#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509
4514msgid "machine-readable output"
4515msgstr "机器可读的输出"
4516
4517#: builtin/commit.c:1331 builtin/commit.c:1610
4518msgid "show status in long format (default)"
4519msgstr "以长格式显示状态(默认)"
4520
4521#: builtin/commit.c:1334 builtin/commit.c:1613
4522msgid "terminate entries with NUL"
4523msgstr "条目以NUL字符结尾"
4524
4525#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980
4526#: builtin/fast-export.c:983 builtin/tag.c:603
4527msgid "mode"
4528msgstr "模式"
4529
4530#: builtin/commit.c:1337 builtin/commit.c:1616
4531msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4532msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4533
4534#: builtin/commit.c:1340
4535msgid "show ignored files"
4536msgstr "显示忽略的文件"
4537
4538#: builtin/commit.c:1341 parse-options.h:153
4539msgid "when"
4540msgstr "何时"
4541
4542#: builtin/commit.c:1342
4543msgid ""
4544"ignore changes to submodules, optional when: all, dirty, untracked. "
4545"(Default: all)"
4546msgstr ""
4547"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4548
4549#: builtin/commit.c:1344
4550msgid "list untracked files in columns"
4551msgstr "以列的方式显示未跟踪的文件"
4552
4553#: builtin/commit.c:1431
4554msgid "couldn't look up newly created commit"
4555msgstr "无法找到新创建的提交"
4556
4557#: builtin/commit.c:1433
4558msgid "could not parse newly created commit"
4559msgstr "不能解析新创建的提交"
4560
4561#: builtin/commit.c:1478
4562msgid "detached HEAD"
4563msgstr "分离头指针"
4564
4565# 译者:中文字符串拼接,可删除前导空格
4566#: builtin/commit.c:1481
4567msgid " (root-commit)"
4568msgstr "(根提交)"
4569
4570#: builtin/commit.c:1574
4571msgid "suppress summary after successful commit"
4572msgstr "提交成功后不显示概述信息"
4573
4574#: builtin/commit.c:1575
4575msgid "show diff in commit message template"
4576msgstr "在提交说明模板里显示差异"
4577
4578#: builtin/commit.c:1577
4579msgid "Commit message options"
4580msgstr "提交说明选项"
4581
4582#: builtin/commit.c:1578 builtin/tag.c:601
4583msgid "read message from file"
4584msgstr "从文件中读取提交说明"
4585
4586#: builtin/commit.c:1579
4587msgid "author"
4588msgstr "作者"
4589
4590#: builtin/commit.c:1579
4591msgid "override author for commit"
4592msgstr "提交时覆盖作者"
4593
4594#: builtin/commit.c:1580 builtin/gc.c:275
4595msgid "date"
4596msgstr "日期"
4597
4598#: builtin/commit.c:1580
4599msgid "override date for commit"
4600msgstr "提交时覆盖日期"
4601
4602#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391
4603#: builtin/notes.c:554 builtin/tag.c:599
4604msgid "message"
4605msgstr "说明"
4606
4607#: builtin/commit.c:1581
4608msgid "commit message"
4609msgstr "提交说明"
4610
4611#: builtin/commit.c:1582
4612msgid "reuse and edit message from specified commit"
4613msgstr "重用并编辑指定提交的提交说明"
4614
4615#: builtin/commit.c:1583
4616msgid "reuse message from specified commit"
4617msgstr "重用指定提交的提交说明"
4618
4619#: builtin/commit.c:1584
4620msgid "use autosquash formatted message to fixup specified commit"
4621msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4622
4623#: builtin/commit.c:1585
4624msgid "use autosquash formatted message to squash specified commit"
4625msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4626
4627#: builtin/commit.c:1586
4628msgid "the commit is authored by me now (used with -C/-c/--amend)"
4629msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4630
4631#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86
4632msgid "add Signed-off-by:"
4633msgstr "添加 Signed-off-by: 签名"
4634
4635#: builtin/commit.c:1588
4636msgid "use specified template file"
4637msgstr "使用指定的模板文件"
4638
4639#: builtin/commit.c:1589
4640msgid "force edit of commit"
4641msgstr "强制编辑提交"
4642
4643# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4644#: builtin/commit.c:1590
4645msgid "default"
4646msgstr "default"
4647
4648#: builtin/commit.c:1590 builtin/tag.c:604
4649msgid "how to strip spaces and #comments from message"
4650msgstr "设置如何删除提交说明里的空格和#注释"
4651
4652#: builtin/commit.c:1591
4653msgid "include status in commit message template"
4654msgstr "在提交说明模板里包含状态信息"
4655
4656#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92
4657#: builtin/tag.c:605
4658msgid "key-id"
4659msgstr "key-id"
4660
4661#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93
4662msgid "GPG sign commit"
4663msgstr "GPG 提交签名"
4664
4665#: builtin/commit.c:1596
4666msgid "Commit contents options"
4667msgstr "提交内容选项"
4668
4669#: builtin/commit.c:1597
4670msgid "commit all changed files"
4671msgstr "提交所有改动的文件"
4672
4673#: builtin/commit.c:1598
4674msgid "add specified files to index for commit"
4675msgstr "添加指定的文件到索引区等待提交"
4676
4677#: builtin/commit.c:1599
4678msgid "interactively add files"
4679msgstr "交互式添加文件"
4680
4681#: builtin/commit.c:1600
4682msgid "interactively add changes"
4683msgstr "交互式添加变更"
4684
4685#: builtin/commit.c:1601
4686msgid "commit only specified files"
4687msgstr "只提交指定的文件"
4688
4689#: builtin/commit.c:1602
4690msgid "bypass pre-commit hook"
4691msgstr "绕过 pre-commit 钩子"
4692
4693#: builtin/commit.c:1603
4694msgid "show what would be committed"
4695msgstr "显示将要提交的内容"
4696
4697#: builtin/commit.c:1614
4698msgid "amend previous commit"
4699msgstr "修改先前的提交"
4700
4701#: builtin/commit.c:1615
4702msgid "bypass post-rewrite hook"
4703msgstr "绕过 post-rewrite 钩子"
4704
4705#: builtin/commit.c:1620
4706msgid "ok to record an empty change"
4707msgstr "允许一个空提交"
4708
4709#: builtin/commit.c:1622
4710msgid "ok to record a change with an empty message"
4711msgstr "允许空的提交说明"
4712
4713#: builtin/commit.c:1651
4714msgid "could not parse HEAD commit"
4715msgstr "不能解析 HEAD 提交"
4716
4717#: builtin/commit.c:1690 builtin/merge.c:519
4718#, c-format
4719msgid "could not open '%s' for reading"
4720msgstr "不能为读入打开 '%s'"
4721
4722#: builtin/commit.c:1697
4723#, c-format
4724msgid "Corrupt MERGE_HEAD file (%s)"
4725msgstr "损坏的 MERGE_HEAD 文件(%s)"
4726
4727#: builtin/commit.c:1704
4728msgid "could not read MERGE_MODE"
4729msgstr "不能读取 MERGE_MODE"
4730
4731#: builtin/commit.c:1723
4732#, c-format
4733msgid "could not read commit message: %s"
4734msgstr "不能读取提交说明:%s"
4735
4736#: builtin/commit.c:1734
4737#, c-format
4738msgid "Aborting commit; you did not edit the message.\n"
4739msgstr "终止提交;您未更改来自模版的提交说明。\n"
4740
4741#: builtin/commit.c:1739
4742#, c-format
4743msgid "Aborting commit due to empty commit message.\n"
4744msgstr "终止提交因为提交说明为空。\n"
4745
4746#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876
4747msgid "failed to write commit object"
4748msgstr "无法写提交对象"
4749
4750#: builtin/commit.c:1787
4751msgid ""
4752"Repository has been updated, but unable to write\n"
4753"new_index file. Check that disk is not full and quota is\n"
4754"not exceeded, and then \"git reset HEAD\" to recover."
4755msgstr ""
4756"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4757"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4758
4759#: builtin/config.c:8
4760msgid "git config [<options>]"
4761msgstr "git config [<选项>]"
4762
4763#: builtin/config.c:53
4764msgid "Config file location"
4765msgstr "配置文件位置"
4766
4767#: builtin/config.c:54
4768msgid "use global config file"
4769msgstr "使用全局配置文件"
4770
4771#: builtin/config.c:55
4772msgid "use system config file"
4773msgstr "使用系统级配置文件"
4774
4775#: builtin/config.c:56
4776msgid "use repository config file"
4777msgstr "使用版本库级配置文件"
4778
4779#: builtin/config.c:57
4780msgid "use given config file"
4781msgstr "使用指定的配置文件"
4782
4783#: builtin/config.c:58
4784msgid "blob-id"
4785msgstr "数据对象ID"
4786
4787#: builtin/config.c:58
4788msgid "read config from given blob object"
4789msgstr "从给定的数据对象读取配置"
4790
4791#: builtin/config.c:59
4792msgid "Action"
4793msgstr "操作"
4794
4795#: builtin/config.c:60
4796msgid "get value: name [value-regex]"
4797msgstr "获取值:name [value-regex]"
4798
4799#: builtin/config.c:61
4800msgid "get all values: key [value-regex]"
4801msgstr "获得所有的值:key [value-regex]"
4802
4803#: builtin/config.c:62
4804msgid "get values for regexp: name-regex [value-regex]"
4805msgstr "根据正则表达式获得值:name-regex [value-regex]"
4806
4807#: builtin/config.c:63
4808msgid "get value specific for the URL: section[.var] URL"
4809msgstr "获得 URL 取值:section[.var] URL"
4810
4811#: builtin/config.c:64
4812msgid "replace all matching variables: name value [value_regex]"
4813msgstr "替换所有匹配的变量:name value [value_regex]"
4814
4815#: builtin/config.c:65
4816msgid "add a new variable: name value"
4817msgstr "添加一个新的变量:name value"
4818
4819#: builtin/config.c:66
4820msgid "remove a variable: name [value-regex]"
4821msgstr "删除一个变量:name [value-regex]"
4822
4823#: builtin/config.c:67
4824msgid "remove all matches: name [value-regex]"
4825msgstr "删除所有匹配项:name [value-regex]"
4826
4827#: builtin/config.c:68
4828msgid "rename section: old-name new-name"
4829msgstr "重命名小节:old-name new-name"
4830
4831#: builtin/config.c:69
4832msgid "remove a section: name"
4833msgstr "删除一个小节:name"
4834
4835#: builtin/config.c:70
4836msgid "list all"
4837msgstr "列出所有"
4838
4839#: builtin/config.c:71
4840msgid "open an editor"
4841msgstr "打开一个编辑器"
4842
4843#: builtin/config.c:72
4844msgid "find the color configured: slot [default]"
4845msgstr "获得配置的颜色:配置 [默认]"
4846
4847#: builtin/config.c:73
4848msgid "find the color setting: slot [stdout-is-tty]"
4849msgstr "获得颜色设置:配置 [stdout-is-tty]"
4850
4851#: builtin/config.c:74
4852msgid "Type"
4853msgstr "类型"
4854
4855#: builtin/config.c:75
4856msgid "value is \"true\" or \"false\""
4857msgstr "值是 \"true\" 或 \"false\""
4858
4859#: builtin/config.c:76
4860msgid "value is decimal number"
4861msgstr "值是十进制数"
4862
4863#: builtin/config.c:77
4864msgid "value is --bool or --int"
4865msgstr "值是 --bool or --int"
4866
4867#: builtin/config.c:78
4868msgid "value is a path (file or directory name)"
4869msgstr "值是一个路径(文件或目录名)"
4870
4871#: builtin/config.c:79
4872msgid "Other"
4873msgstr "其它"
4874
4875#: builtin/config.c:80
4876msgid "terminate values with NUL byte"
4877msgstr "终止值是NUL字节"
4878
4879#: builtin/config.c:81
4880msgid "respect include directives on lookup"
4881msgstr "查询时参照 include 指令递归查找"
4882
4883#: builtin/config.c:316
4884msgid "unable to parse default color value"
4885msgstr "不能解析缺省的颜色值"
4886
4887#: builtin/config.c:457
4888#, c-format
4889msgid ""
4890"# This is Git's per-user configuration file.\n"
4891"[core]\n"
4892"# Please adapt and uncomment the following lines:\n"
4893"#\tuser = %s\n"
4894"#\temail = %s\n"
4895msgstr ""
4896"# This is Git's per-user configuration file.\n"
4897"[core]\n"
4898"# Please adapt and uncomment the following lines:\n"
4899"#\tuser = %s\n"
4900"#\temail = %s\n"
4901
4902#: builtin/config.c:589
4903#, c-format
4904msgid "cannot create configuration file %s"
4905msgstr "不能创建配置文件 %s"
4906
4907#: builtin/count-objects.c:55
4908msgid "git count-objects [-v] [-H | --human-readable]"
4909msgstr "git count-objects [-v] [-H | --human-readable]"
4910
4911#: builtin/count-objects.c:65
4912msgid "print sizes in human readable format"
4913msgstr "以用户可读的格式显示大小"
4914
4915#: builtin/describe.c:17
4916msgid "git describe [<options>] [<commit-ish>...]"
4917msgstr "git describe [<选项>] [<提交号>...]"
4918
4919#: builtin/describe.c:18
4920msgid "git describe [<options>] --dirty"
4921msgstr "git describe [<选项>] --dirty"
4922
4923#: builtin/describe.c:217
4924#, c-format
4925msgid "annotated tag %s not available"
4926msgstr "注释 tag %s 无效"
4927
4928#: builtin/describe.c:221
4929#, c-format
4930msgid "annotated tag %s has no embedded name"
4931msgstr "注释 tag %s 没有嵌入名称"
4932
4933#: builtin/describe.c:223
4934#, c-format
4935msgid "tag '%s' is really '%s' here"
4936msgstr "tag '%s' 的确是在 '%s'"
4937
4938#: builtin/describe.c:250 builtin/log.c:452
4939#, c-format
4940msgid "Not a valid object name %s"
4941msgstr "不是一个有效的对象名 %s"
4942
4943#: builtin/describe.c:253
4944#, c-format
4945msgid "%s is not a valid '%s' object"
4946msgstr "%s 不是一个有效的 '%s' 对象"
4947
4948#: builtin/describe.c:270
4949#, c-format
4950msgid "no tag exactly matches '%s'"
4951msgstr "没有 tag 准确匹配 '%s'"
4952
4953#: builtin/describe.c:272
4954#, c-format
4955msgid "searching to describe %s\n"
4956msgstr "搜索描述 %s\n"
4957
4958#: builtin/describe.c:319
4959#, c-format
4960msgid "finished search at %s\n"
4961msgstr "完成搜索 %s\n"
4962
4963#: builtin/describe.c:346
4964#, c-format
4965msgid ""
4966"No annotated tags can describe '%s'.\n"
4967"However, there were unannotated tags: try --tags."
4968msgstr ""
4969"没有注释 tag 能描述 '%s'。\n"
4970"然而,有非注释 tag:尝试 --tags。"
4971
4972#: builtin/describe.c:350
4973#, c-format
4974msgid ""
4975"No tags can describe '%s'.\n"
4976"Try --always, or create some tags."
4977msgstr ""
4978"没有注释 tag 能描述 '%s'。\n"
4979"尝试 --always,或者创建一些 tag。"
4980
4981#: builtin/describe.c:371
4982#, c-format
4983msgid "traversed %lu commits\n"
4984msgstr "已遍历 %lu 个提交\n"
4985
4986#: builtin/describe.c:374
4987#, c-format
4988msgid ""
4989"more than %i tags found; listed %i most recent\n"
4990"gave up search at %s\n"
4991msgstr ""
4992"发现多于 %i 个 tag,列出最近的 %i 个\n"
4993"在 %s 放弃搜索\n"
4994
4995#: builtin/describe.c:396
4996msgid "find the tag that comes after the commit"
4997msgstr "寻找提交之后的 tag(用于描述提交)"
4998
4999#: builtin/describe.c:397
5000msgid "debug search strategy on stderr"
5001msgstr "在标准错误上调试搜索策略"
5002
5003#: builtin/describe.c:398
5004msgid "use any ref"
5005msgstr "使用任意引用"
5006
5007#: builtin/describe.c:399
5008msgid "use any tag, even unannotated"
5009msgstr "使用任意 tag,即使未带注解"
5010
5011#: builtin/describe.c:400
5012msgid "always use long format"
5013msgstr "始终使用长提交号格式"
5014
5015#: builtin/describe.c:401
5016msgid "only follow first parent"
5017msgstr "只跟随第一个父提交"
5018
5019#: builtin/describe.c:404
5020msgid "only output exact matches"
5021msgstr "只输出精确匹配"
5022
5023#: builtin/describe.c:406
5024msgid "consider <n> most recent tags (default: 10)"
5025msgstr "考虑最近 <n> 个 tags(默认:10)"
5026
5027#: builtin/describe.c:408
5028msgid "only consider tags matching <pattern>"
5029msgstr "只考虑匹配 <模式> 的 tags"
5030
5031#: builtin/describe.c:410 builtin/name-rev.c:318
5032msgid "show abbreviated commit object as fallback"
5033msgstr "显示简写的提交号作为后备"
5034
5035#: builtin/describe.c:411
5036msgid "mark"
5037msgstr "标记"
5038
5039#: builtin/describe.c:412
5040msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5041msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
5042
5043#: builtin/describe.c:430
5044msgid "--long is incompatible with --abbrev=0"
5045msgstr "--long 与 --abbrev=0 不兼容"
5046
5047#: builtin/describe.c:456
5048msgid "No names found, cannot describe anything."
5049msgstr "没有发现名称,无法描述任何东西。"
5050
5051#: builtin/describe.c:476
5052msgid "--dirty is incompatible with commit-ishes"
5053msgstr "--dirty 不能与提交同时使用"
5054
5055#: builtin/diff.c:86
5056#, c-format
5057msgid "'%s': not a regular file or symlink"
5058msgstr "'%s':不是一个正规文件或符号链接"
5059
5060#: builtin/diff.c:237
5061#, c-format
5062msgid "invalid option: %s"
5063msgstr "无效选项:%s"
5064
5065#: builtin/diff.c:358
5066msgid "Not a git repository"
5067msgstr "不是一个 git 版本库"
5068
5069#: builtin/diff.c:401
5070#, c-format
5071msgid "invalid object '%s' given."
5072msgstr "提供了无效对象 '%s'。"
5073
5074#: builtin/diff.c:410
5075#, c-format
5076msgid "more than two blobs given: '%s'"
5077msgstr "提供了超过两个数据(blob)对象:'%s'"
5078
5079#: builtin/diff.c:417
5080#, c-format
5081msgid "unhandled object '%s' given."
5082msgstr "无法处理的对象 '%s'。"
5083
5084#: builtin/fast-export.c:24
5085msgid "git fast-export [rev-list-opts]"
5086msgstr "git fast-export [rev-list-opts]"
5087
5088#: builtin/fast-export.c:979
5089msgid "show progress after <n> objects"
5090msgstr "在 <n> 个对象之后显示进度"
5091
5092#: builtin/fast-export.c:981
5093msgid "select handling of signed tags"
5094msgstr "选择如何处理签名 tags"
5095
5096#: builtin/fast-export.c:984
5097msgid "select handling of tags that tag filtered objects"
5098msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
5099
5100#: builtin/fast-export.c:987
5101msgid "Dump marks to this file"
5102msgstr "把标记存储到这个文件"
5103
5104#: builtin/fast-export.c:989
5105msgid "Import marks from this file"
5106msgstr "从这个文件导入标记"
5107
5108#: builtin/fast-export.c:991
5109msgid "Fake a tagger when tags lack one"
5110msgstr "当 tags 缺少标记者字段时,假装提供一个"
5111
5112#: builtin/fast-export.c:993
5113msgid "Output full tree for each commit"
5114msgstr "每次提交都输出整个树"
5115
5116#: builtin/fast-export.c:995
5117msgid "Use the done feature to terminate the stream"
5118msgstr "使用 done 功能来终止流"
5119
5120#: builtin/fast-export.c:996
5121msgid "Skip output of blob data"
5122msgstr "跳过数据对象的输出"
5123
5124#: builtin/fast-export.c:997
5125msgid "refspec"
5126msgstr "引用表达式"
5127
5128#: builtin/fast-export.c:998
5129msgid "Apply refspec to exported refs"
5130msgstr "对导出的引用应用引用表达式"
5131
5132#: builtin/fast-export.c:999
5133msgid "anonymize output"
5134msgstr "匿名输出"
5135
5136#: builtin/fetch.c:19
5137msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5138msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
5139
5140#: builtin/fetch.c:20
5141msgid "git fetch [<options>] <group>"
5142msgstr "git fetch [<选项>] <组>"
5143
5144#: builtin/fetch.c:21
5145msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5146msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
5147
5148#: builtin/fetch.c:22
5149msgid "git fetch --all [<options>]"
5150msgstr "git fetch --all [<选项>]"
5151
5152#: builtin/fetch.c:89
5153msgid "fetch from all remotes"
5154msgstr "从所有的远程抓取"
5155
5156#: builtin/fetch.c:91
5157msgid "append to .git/FETCH_HEAD instead of overwriting"
5158msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5159
5160#: builtin/fetch.c:93
5161msgid "path to upload pack on remote end"
5162msgstr "上传包到远程的路径"
5163
5164#: builtin/fetch.c:94
5165msgid "force overwrite of local branch"
5166msgstr "强制覆盖本地分支"
5167
5168#: builtin/fetch.c:96
5169msgid "fetch from multiple remotes"
5170msgstr "从多个远程抓取"
5171
5172#: builtin/fetch.c:98
5173msgid "fetch all tags and associated objects"
5174msgstr "抓取所有的 tags 和关联对象"
5175
5176#: builtin/fetch.c:100
5177msgid "do not fetch all tags (--no-tags)"
5178msgstr "不抓取任何 tags (--no-tags)"
5179
5180#: builtin/fetch.c:102
5181msgid "prune remote-tracking branches no longer on remote"
5182msgstr "清除远程已经不存在的分支的跟踪分支"
5183
5184# 译者:可选值,不能翻译
5185#: builtin/fetch.c:103
5186msgid "on-demand"
5187msgstr "on-demand"
5188
5189#: builtin/fetch.c:104
5190msgid "control recursive fetching of submodules"
5191msgstr "控制子模组的递归抓取"
5192
5193#: builtin/fetch.c:108
5194msgid "keep downloaded pack"
5195msgstr "保持下载包"
5196
5197#: builtin/fetch.c:110
5198msgid "allow updating of HEAD ref"
5199msgstr "允许更新 HEAD 引用"
5200
5201#: builtin/fetch.c:113
5202msgid "deepen history of shallow clone"
5203msgstr "深化浅克隆的历史"
5204
5205#: builtin/fetch.c:115
5206msgid "convert to a complete repository"
5207msgstr "转换为一个完整的版本库"
5208
5209#: builtin/fetch.c:117 builtin/log.c:1208
5210msgid "dir"
5211msgstr "目录"
5212
5213#: builtin/fetch.c:118
5214msgid "prepend this to submodule path output"
5215msgstr "在子模组路径输出的前面加上此目录"
5216
5217#: builtin/fetch.c:121
5218msgid "default mode for recursion"
5219msgstr "递归的默认模式"
5220
5221#: builtin/fetch.c:123
5222msgid "accept refs that update .git/shallow"
5223msgstr "接受更新 .git/shallow 的引用"
5224
5225#: builtin/fetch.c:124
5226msgid "refmap"
5227msgstr "引用映射"
5228
5229#: builtin/fetch.c:125
5230msgid "specify fetch refmap"
5231msgstr "指定获取操作的引用映射"
5232
5233#: builtin/fetch.c:375
5234msgid "Couldn't find remote ref HEAD"
5235msgstr "无法发现远程 HEAD 引用"
5236
5237#: builtin/fetch.c:455
5238#, c-format
5239msgid "object %s not found"
5240msgstr "对象 %s 未发现"
5241
5242#: builtin/fetch.c:460
5243msgid "[up to date]"
5244msgstr "[最新]"
5245
5246#: builtin/fetch.c:474
5247#, c-format
5248msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5249msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5250
5251#: builtin/fetch.c:475 builtin/fetch.c:561
5252msgid "[rejected]"
5253msgstr "[已拒绝]"
5254
5255#: builtin/fetch.c:486
5256msgid "[tag update]"
5257msgstr "[tag更新]"
5258
5259# 译者:注意保持前导空格
5260#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541
5261msgid " (unable to update local ref)"
5262msgstr " (不能更新本地引用)"
5263
5264#: builtin/fetch.c:506
5265msgid "[new tag]"
5266msgstr "[新tag]"
5267
5268#: builtin/fetch.c:509
5269msgid "[new branch]"
5270msgstr "[新分支]"
5271
5272#: builtin/fetch.c:512
5273msgid "[new ref]"
5274msgstr "[新引用]"
5275
5276#: builtin/fetch.c:557
5277msgid "unable to update local ref"
5278msgstr "不能更新本地引用"
5279
5280#: builtin/fetch.c:557
5281msgid "forced update"
5282msgstr "强制更新"
5283
5284#: builtin/fetch.c:563
5285msgid "(non-fast-forward)"
5286msgstr "(非快进式)"
5287
5288#: builtin/fetch.c:596 builtin/fetch.c:829
5289#, c-format
5290msgid "cannot open %s: %s\n"
5291msgstr "无法打开 %s:%s\n"
5292
5293#: builtin/fetch.c:605
5294#, c-format
5295msgid "%s did not send all necessary objects\n"
5296msgstr "%s 未发送所有必须的对象\n"
5297
5298#: builtin/fetch.c:623
5299#, c-format
5300msgid "reject %s because shallow roots are not allowed to be updated"
5301msgstr "拒绝 %s 因为浅克隆不允许被更新"
5302
5303#: builtin/fetch.c:711 builtin/fetch.c:794
5304#, c-format
5305msgid "From %.*s\n"
5306msgstr "来自 %.*s\n"
5307
5308#: builtin/fetch.c:722
5309#, c-format
5310msgid ""
5311"some local refs could not be updated; try running\n"
5312" 'git remote prune %s' to remove any old, conflicting branches"
5313msgstr ""
5314"一些本地引用不能被更新;尝试运行\n"
5315" 'git remote prune %s' 来删除旧的、有冲突的分支"
5316
5317# 译者:注意保持前导空格
5318#: builtin/fetch.c:774
5319#, c-format
5320msgid " (%s will become dangling)"
5321msgstr " (%s 将成为摇摆状态)"
5322
5323# 译者:注意保持前导空格
5324#: builtin/fetch.c:775
5325#, c-format
5326msgid " (%s has become dangling)"
5327msgstr " (%s 已成为摇摆状态)"
5328
5329#: builtin/fetch.c:799
5330msgid "[deleted]"
5331msgstr "[已删除]"
5332
5333#: builtin/fetch.c:800 builtin/remote.c:1060
5334msgid "(none)"
5335msgstr "(无)"
5336
5337#: builtin/fetch.c:819
5338#, c-format
5339msgid "Refusing to fetch into current branch %s of non-bare repository"
5340msgstr "拒绝获取到非纯版本库的当前分支 %s"
5341
5342#: builtin/fetch.c:838
5343#, c-format
5344msgid "Option \"%s\" value \"%s\" is not valid for %s"
5345msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5346
5347#: builtin/fetch.c:841
5348#, c-format
5349msgid "Option \"%s\" is ignored for %s\n"
5350msgstr "选项 \"%s\" 为 %s 所忽略\n"
5351
5352#: builtin/fetch.c:897
5353#, c-format
5354msgid "Don't know how to fetch from %s"
5355msgstr "不知道如何从 %s 获取"
5356
5357#: builtin/fetch.c:1059
5358#, c-format
5359msgid "Fetching %s\n"
5360msgstr "正在获取 %s\n"
5361
5362#: builtin/fetch.c:1061 builtin/remote.c:90
5363#, c-format
5364msgid "Could not fetch %s"
5365msgstr "不能获取 %s"
5366
5367#: builtin/fetch.c:1079
5368msgid ""
5369"No remote repository specified. Please, specify either a URL or a\n"
5370"remote name from which new revisions should be fetched."
5371msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
5372
5373#: builtin/fetch.c:1102
5374msgid "You need to specify a tag name."
5375msgstr "您需要指定一个 tag 名称。"
5376
5377#: builtin/fetch.c:1144
5378msgid "--depth and --unshallow cannot be used together"
5379msgstr "--depth 和 --unshallow 不能同时使用"
5380
5381#: builtin/fetch.c:1146
5382msgid "--unshallow on a complete repository does not make sense"
5383msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5384
5385#: builtin/fetch.c:1169
5386msgid "fetch --all does not take a repository argument"
5387msgstr "fetch --all 不能带一个版本库参数"
5388
5389#: builtin/fetch.c:1171
5390msgid "fetch --all does not make sense with refspecs"
5391msgstr "fetch --all 带引用规则没有任何意义"
5392
5393#: builtin/fetch.c:1182
5394#, c-format
5395msgid "No such remote or remote group: %s"
5396msgstr "没有这样的远程或远程组:%s"
5397
5398#: builtin/fetch.c:1190
5399msgid "Fetching a group and specifying refspecs does not make sense"
5400msgstr "获取组并指定引用规则没有意义"
5401
5402#: builtin/fmt-merge-msg.c:13
5403msgid ""
5404"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5405msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
5406
5407#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
5408#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
5409#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590
5410#: parse-options.h:132 parse-options.h:239
5411msgid "n"
5412msgstr "n"
5413
5414#: builtin/fmt-merge-msg.c:663
5415msgid "populate log with at most <n> entries from shortlog"
5416msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5417
5418#: builtin/fmt-merge-msg.c:666
5419msgid "alias for --log (deprecated)"
5420msgstr "参数 --log 的别名(已弃用)"
5421
5422#: builtin/fmt-merge-msg.c:669
5423msgid "text"
5424msgstr "文本"
5425
5426#: builtin/fmt-merge-msg.c:670
5427msgid "use <text> as start of message"
5428msgstr "使用 <文本> 作为提交说明的开始"
5429
5430#: builtin/fmt-merge-msg.c:671
5431msgid "file to read from"
5432msgstr "从文件中读取"
5433
5434#: builtin/for-each-ref.c:675
5435msgid "unable to parse format"
5436msgstr "不能解析格式"
5437
5438#: builtin/for-each-ref.c:1063
5439msgid "git for-each-ref [<options>] [<pattern>]"
5440msgstr "git for-each-ref [<选项>] [<模式>]"
5441
5442#: builtin/for-each-ref.c:1078
5443msgid "quote placeholders suitably for shells"
5444msgstr "引用占位符适用于 shells"
5445
5446#: builtin/for-each-ref.c:1080
5447msgid "quote placeholders suitably for perl"
5448msgstr "引用占位符适用于 perl"
5449
5450#: builtin/for-each-ref.c:1082
5451msgid "quote placeholders suitably for python"
5452msgstr "引用占位符适用于 python"
5453
5454#: builtin/for-each-ref.c:1084
5455msgid "quote placeholders suitably for Tcl"
5456msgstr "引用占位符适用于 Tcl"
5457
5458#: builtin/for-each-ref.c:1087
5459msgid "show only <n> matched refs"
5460msgstr "只显示 <n> 个匹配的引用"
5461
5462#: builtin/for-each-ref.c:1088 builtin/replace.c:438
5463msgid "format"
5464msgstr "格式"
5465
5466#: builtin/for-each-ref.c:1088
5467msgid "format to use for the output"
5468msgstr "输出格式"
5469
5470#: builtin/for-each-ref.c:1089
5471msgid "key"
5472msgstr "key"
5473
5474#: builtin/for-each-ref.c:1090
5475msgid "field name to sort on"
5476msgstr "排序的字段名"
5477
5478#: builtin/fsck.c:147 builtin/prune.c:137
5479msgid "Checking connectivity"
5480msgstr "检查连接中"
5481
5482#: builtin/fsck.c:540
5483msgid "Checking object directories"
5484msgstr "检查对象目录中"
5485
5486#: builtin/fsck.c:603
5487msgid "git fsck [<options>] [<object>...]"
5488msgstr "git fsck [<选项>] [<对象>...]"
5489
5490#: builtin/fsck.c:609
5491msgid "show unreachable objects"
5492msgstr "显示不可达的对象"
5493
5494#: builtin/fsck.c:610
5495msgid "show dangling objects"
5496msgstr "显示摇摆的对象"
5497
5498#: builtin/fsck.c:611
5499msgid "report tags"
5500msgstr "报告 tags"
5501
5502#: builtin/fsck.c:612
5503msgid "report root nodes"
5504msgstr "报告根节点"
5505
5506#: builtin/fsck.c:613
5507msgid "make index objects head nodes"
5508msgstr "将索引亦作为检查的头节点"
5509
5510#: builtin/fsck.c:614
5511msgid "make reflogs head nodes (default)"
5512msgstr "将引用日志作为检查的头节点(默认)"
5513
5514#: builtin/fsck.c:615
5515msgid "also consider packs and alternate objects"
5516msgstr "也考虑包和备用对象"
5517
5518#: builtin/fsck.c:616
5519msgid "enable more strict checking"
5520msgstr "启用更严格的检查"
5521
5522#: builtin/fsck.c:618
5523msgid "write dangling objects in .git/lost-found"
5524msgstr "将摇摆对象写入 .git/lost-found 中"
5525
5526#: builtin/fsck.c:619 builtin/prune.c:108
5527msgid "show progress"
5528msgstr "显示进度"
5529
5530#: builtin/fsck.c:669
5531msgid "Checking objects"
5532msgstr "检查对象中"
5533
5534#: builtin/gc.c:24
5535msgid "git gc [<options>]"
5536msgstr "git gc [<选项>]"
5537
5538#: builtin/gc.c:79
5539#, c-format
5540msgid "Invalid gc.pruneexpire: '%s'"
5541msgstr "无效的 gc.pruneexpire:'%s'"
5542
5543#: builtin/gc.c:107
5544#, c-format
5545msgid "insanely long object directory %.*s"
5546msgstr "不正常的长对象目录 %.*s"
5547
5548#: builtin/gc.c:276
5549msgid "prune unreferenced objects"
5550msgstr "清除未引用的对象"
5551
5552#: builtin/gc.c:278
5553msgid "be more thorough (increased runtime)"
5554msgstr "更彻底(增加运行时间)"
5555
5556#: builtin/gc.c:279
5557msgid "enable auto-gc mode"
5558msgstr "启用自动垃圾回收模式"
5559
5560#: builtin/gc.c:280
5561msgid "force running gc even if there may be another gc running"
5562msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5563
5564#: builtin/gc.c:321
5565#, c-format
5566msgid "Auto packing the repository in background for optimum performance.\n"
5567msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5568
5569#: builtin/gc.c:323
5570#, c-format
5571msgid "Auto packing the repository for optimum performance.\n"
5572msgstr "自动打包版本库以求最佳性能。\n"
5573
5574#: builtin/gc.c:324
5575#, c-format
5576msgid "See \"git help gc\" for manual housekeeping.\n"
5577msgstr "手工维护参见 \"git help gc\"。\n"
5578
5579#: builtin/gc.c:342
5580#, c-format
5581msgid ""
5582"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5583msgstr ""
5584"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5585
5586#: builtin/gc.c:364
5587msgid ""
5588"There are too many unreachable loose objects; run 'git prune' to remove them."
5589msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5590
5591#: builtin/grep.c:23
5592msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5593msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
5594
5595#: builtin/grep.c:218
5596#, c-format
5597msgid "grep: failed to create thread: %s"
5598msgstr "grep:无法创建线程:%s"
5599
5600#: builtin/grep.c:441 builtin/grep.c:476
5601#, c-format
5602msgid "unable to read tree (%s)"
5603msgstr "无法读取树(%s)"
5604
5605#: builtin/grep.c:491
5606#, c-format
5607msgid "unable to grep from object of type %s"
5608msgstr "无法抓取来自于 %s 类型的对象"
5609
5610#: builtin/grep.c:547
5611#, c-format
5612msgid "switch `%c' expects a numerical value"
5613msgstr "开关 `%c' 期望一个数字值"
5614
5615#: builtin/grep.c:564
5616#, c-format
5617msgid "cannot open '%s'"
5618msgstr "不能打开 '%s'"
5619
5620#: builtin/grep.c:638
5621msgid "search in index instead of in the work tree"
5622msgstr "在索引区搜索而不是在工作区"
5623
5624#: builtin/grep.c:640
5625msgid "find in contents not managed by git"
5626msgstr "在未被 git 管理的内容中查找"
5627
5628# 译者:中文字符串拼接,可删除前导空格
5629#: builtin/grep.c:642
5630msgid "search in both tracked and untracked files"
5631msgstr "在跟踪和未跟踪的文件中搜索"
5632
5633#: builtin/grep.c:644
5634msgid "ignore files specified via '.gitignore'"
5635msgstr "忽略 '.gitignore' 包含的文件"
5636
5637#: builtin/grep.c:647
5638msgid "show non-matching lines"
5639msgstr "显示未匹配的行"
5640
5641#: builtin/grep.c:649
5642msgid "case insensitive matching"
5643msgstr "不区分大小写匹配"
5644
5645#: builtin/grep.c:651
5646msgid "match patterns only at word boundaries"
5647msgstr "只在单词边界匹配模式"
5648
5649#: builtin/grep.c:653
5650msgid "process binary files as text"
5651msgstr "把二进制文件当做文本处理"
5652
5653#: builtin/grep.c:655
5654msgid "don't match patterns in binary files"
5655msgstr "不在二进制文件中匹配模式"
5656
5657#: builtin/grep.c:658
5658msgid "process binary files with textconv filters"
5659msgstr "用 textconv 过滤器处理二进制文件"
5660
5661#: builtin/grep.c:660
5662msgid "descend at most <depth> levels"
5663msgstr "最多以指定的深度向下寻找"
5664
5665#: builtin/grep.c:664
5666msgid "use extended POSIX regular expressions"
5667msgstr "使用扩展的 POSIX 正则表达式"
5668
5669#: builtin/grep.c:667
5670msgid "use basic POSIX regular expressions (default)"
5671msgstr "使用基本的 POSIX 正则表达式(默认)"
5672
5673#: builtin/grep.c:670
5674msgid "interpret patterns as fixed strings"
5675msgstr "把模式解析为固定的字符串"
5676
5677#: builtin/grep.c:673
5678msgid "use Perl-compatible regular expressions"
5679msgstr "使用 Perl 兼容的正则表达式"
5680
5681#: builtin/grep.c:676
5682msgid "show line numbers"
5683msgstr "显示行号"
5684
5685#: builtin/grep.c:677
5686msgid "don't show filenames"
5687msgstr "不显示文件名"
5688
5689#: builtin/grep.c:678
5690msgid "show filenames"
5691msgstr "显示文件名"
5692
5693#: builtin/grep.c:680
5694msgid "show filenames relative to top directory"
5695msgstr "显示相对于顶级目录的文件名"
5696
5697#: builtin/grep.c:682
5698msgid "show only filenames instead of matching lines"
5699msgstr "只显示文件名而不显示匹配的行"
5700
5701#: builtin/grep.c:684
5702msgid "synonym for --files-with-matches"
5703msgstr "和 --files-with-matches 同义"
5704
5705#: builtin/grep.c:687
5706msgid "show only the names of files without match"
5707msgstr "只显示未匹配的文件名"
5708
5709#: builtin/grep.c:689
5710msgid "print NUL after filenames"
5711msgstr "在文件名后输出 NUL 字符"
5712
5713#: builtin/grep.c:691
5714msgid "show the number of matches instead of matching lines"
5715msgstr "显示总匹配行数,而不显示匹配的行"
5716
5717#: builtin/grep.c:692
5718msgid "highlight matches"
5719msgstr "高亮显示匹配项"
5720
5721#: builtin/grep.c:694
5722msgid "print empty line between matches from different files"
5723msgstr "在不同文件的匹配项之间打印空行"
5724
5725#: builtin/grep.c:696
5726msgid "show filename only once above matches from same file"
5727msgstr "只在同一文件的匹配项的上面显示一次文件名"
5728
5729#: builtin/grep.c:699
5730msgid "show <n> context lines before and after matches"
5731msgstr "显示匹配项前后的 <n> 行上下文"
5732
5733#: builtin/grep.c:702
5734msgid "show <n> context lines before matches"
5735msgstr "显示匹配项前 <n> 行上下文"
5736
5737#: builtin/grep.c:704
5738msgid "show <n> context lines after matches"
5739msgstr "显示匹配项后 <n> 行上下文"
5740
5741#: builtin/grep.c:705
5742msgid "shortcut for -C NUM"
5743msgstr "快捷键 -C 数字"
5744
5745#: builtin/grep.c:708
5746msgid "show a line with the function name before matches"
5747msgstr "在匹配的前面显示一行函数名"
5748
5749#: builtin/grep.c:710
5750msgid "show the surrounding function"
5751msgstr "显示所在函数的前后内容"
5752
5753#: builtin/grep.c:713
5754msgid "read patterns from file"
5755msgstr "从文件读取模式"
5756
5757#: builtin/grep.c:715
5758msgid "match <pattern>"
5759msgstr "匹配 <模式>"
5760
5761#: builtin/grep.c:717
5762msgid "combine patterns specified with -e"
5763msgstr "组合用 -e 参数设定的模式"
5764
5765#: builtin/grep.c:729
5766msgid "indicate hit with exit status without output"
5767msgstr "不输出,而用退出码标识命中状态"
5768
5769#: builtin/grep.c:731
5770msgid "show only matches from files that match all patterns"
5771msgstr "只显示匹配所有模式的文件中的匹配"
5772
5773#: builtin/grep.c:733
5774msgid "show parse tree for grep expression"
5775msgstr "显示 grep 表达式的解析树"
5776
5777#: builtin/grep.c:737
5778msgid "pager"
5779msgstr "分页"
5780
5781#: builtin/grep.c:737
5782msgid "show matching files in the pager"
5783msgstr "分页显示匹配的文件"
5784
5785#: builtin/grep.c:740
5786msgid "allow calling of grep(1) (ignored by this build)"
5787msgstr "允许调用 grep(1)(本次构建忽略)"
5788
5789#: builtin/grep.c:741 builtin/show-ref.c:187
5790msgid "show usage"
5791msgstr "显示用法"
5792
5793#: builtin/grep.c:808
5794msgid "no pattern given."
5795msgstr "未提供模式匹配。"
5796
5797#: builtin/grep.c:866
5798msgid "--open-files-in-pager only works on the worktree"
5799msgstr "--open-files-in-pager 仅用于工作区"
5800
5801#: builtin/grep.c:892
5802msgid "--cached or --untracked cannot be used with --no-index."
5803msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5804
5805#: builtin/grep.c:897
5806msgid "--no-index or --untracked cannot be used with revs."
5807msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5808
5809#: builtin/grep.c:900
5810msgid "--[no-]exclude-standard cannot be used for tracked contents."
5811msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5812
5813#: builtin/grep.c:908
5814msgid "both --cached and trees are given."
5815msgstr "同时给出了 --cached 和树对象。"
5816
5817#: builtin/hash-object.c:82
5818msgid ""
5819"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
5820"[--] <file>..."
5821msgstr ""
5822"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
5823"[--] <文件>..."
5824
5825#: builtin/hash-object.c:83
5826msgid "git hash-object --stdin-paths < <list-of-paths>"
5827msgstr "git hash-object --stdin-paths < <路径列表>"
5828
5829#: builtin/hash-object.c:94 builtin/tag.c:612
5830msgid "type"
5831msgstr "类型"
5832
5833#: builtin/hash-object.c:94
5834msgid "object type"
5835msgstr "对象类型"
5836
5837#: builtin/hash-object.c:95
5838msgid "write the object into the object database"
5839msgstr "将对象写入对象数据库"
5840
5841#: builtin/hash-object.c:97
5842msgid "read the object from stdin"
5843msgstr "从标准输入读取对象"
5844
5845#: builtin/hash-object.c:99
5846msgid "store file as is without filters"
5847msgstr "原样存储文件不使用过滤器"
5848
5849#: builtin/hash-object.c:100
5850msgid ""
5851"just hash any random garbage to create corrupt objects for debugging Git"
5852msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
5853
5854#: builtin/hash-object.c:101
5855msgid "process file as it were from this path"
5856msgstr "处理文件并假设其来自于此路径"
5857
5858#: builtin/help.c:41
5859msgid "print all available commands"
5860msgstr "打印所有可用的命令"
5861
5862#: builtin/help.c:42
5863msgid "print list of useful guides"
5864msgstr "显示有用的指南列表"
5865
5866#: builtin/help.c:43
5867msgid "show man page"
5868msgstr "显示 man 手册"
5869
5870#: builtin/help.c:44
5871msgid "show manual in web browser"
5872msgstr "在 web 浏览器中显示手册"
5873
5874#: builtin/help.c:46
5875msgid "show info page"
5876msgstr "显示 info 手册"
5877
5878#: builtin/help.c:52
5879msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
5880msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
5881
5882#: builtin/help.c:64
5883#, c-format
5884msgid "unrecognized help format '%s'"
5885msgstr "未能识别的帮助格式 '%s'"
5886
5887#: builtin/help.c:91
5888msgid "Failed to start emacsclient."
5889msgstr "无法启动 emacsclient。"
5890
5891#: builtin/help.c:104
5892msgid "Failed to parse emacsclient version."
5893msgstr "无法解析 emacsclient 版本。"
5894
5895#: builtin/help.c:112
5896#, c-format
5897msgid "emacsclient version '%d' too old (< 22)."
5898msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5899
5900#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
5901#, c-format
5902msgid "failed to exec '%s': %s"
5903msgstr "无法执行 '%s':%s"
5904
5905#: builtin/help.c:215
5906#, c-format
5907msgid ""
5908"'%s': path for unsupported man viewer.\n"
5909"Please consider using 'man.<tool>.cmd' instead."
5910msgstr ""
5911"'%s':不支持的 man 手册查看器的路径。\n"
5912"请使用 'man.<工具>.cmd'。"
5913
5914#: builtin/help.c:227
5915#, c-format
5916msgid ""
5917"'%s': cmd for supported man viewer.\n"
5918"Please consider using 'man.<tool>.path' instead."
5919msgstr ""
5920"'%s': 支持的 man 手册查看器命令。\n"
5921"请使用 'man.<工具>.path'。"
5922
5923#: builtin/help.c:354
5924#, c-format
5925msgid "'%s': unknown man viewer."
5926msgstr "'%s':未知的 man 查看器。"
5927
5928#: builtin/help.c:371
5929msgid "no man viewer handled the request"
5930msgstr "没有 man 查看器处理此请求"
5931
5932#: builtin/help.c:379
5933msgid "no info viewer handled the request"
5934msgstr "没有 info 查看器处理此请求"
5935
5936#: builtin/help.c:428
5937msgid "Defining attributes per path"
5938msgstr "定义路径的属性"
5939
5940#: builtin/help.c:429
5941msgid "Everyday Git With 20 Commands Or So"
5942msgstr "每一天 Git 常用的约 20 条命令"
5943
5944#: builtin/help.c:430
5945msgid "A Git glossary"
5946msgstr "Git 词汇表"
5947
5948#: builtin/help.c:431
5949msgid "Specifies intentionally untracked files to ignore"
5950msgstr "忽略指定的未跟踪文件"
5951
5952#: builtin/help.c:432
5953msgid "Defining submodule properties"
5954msgstr "定义子模组属性"
5955
5956#: builtin/help.c:433
5957msgid "Specifying revisions and ranges for Git"
5958msgstr "指定 Git 的版本和版本范围"
5959
5960#: builtin/help.c:434
5961msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5962msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5963
5964#: builtin/help.c:435
5965msgid "An overview of recommended workflows with Git"
5966msgstr "Git 推荐的工作流概览"
5967
5968#: builtin/help.c:447
5969msgid "The common Git guides are:\n"
5970msgstr "最常用的 Git 向导有:\n"
5971
5972#: builtin/help.c:468 builtin/help.c:485
5973#, c-format
5974msgid "usage: %s%s"
5975msgstr "用法:%s%s"
5976
5977#: builtin/help.c:501
5978#, c-format
5979msgid "`git %s' is aliased to `%s'"
5980msgstr "`git %s' 是 `%s' 的别名"
5981
5982#: builtin/index-pack.c:150
5983#, c-format
5984msgid "unable to open %s"
5985msgstr "不能打开 %s"
5986
5987#: builtin/index-pack.c:200
5988#, c-format
5989msgid "object type mismatch at %s"
5990msgstr "%s 的对象类型不匹配"
5991
5992#: builtin/index-pack.c:220
5993#, c-format
5994msgid "did not receive expected object %s"
5995msgstr "未能获取期望的对象 %s"
5996
5997#: builtin/index-pack.c:223
5998#, c-format
5999msgid "object %s: expected type %s, found %s"
6000msgstr "对象 %s:期待类型 %s,却是 %s"
6001
6002#: builtin/index-pack.c:265
6003#, c-format
6004msgid "cannot fill %d byte"
6005msgid_plural "cannot fill %d bytes"
6006msgstr[0] "无法填充 %d 字节"
6007msgstr[1] "无法填充 %d 字节"
6008
6009#: builtin/index-pack.c:275
6010msgid "early EOF"
6011msgstr "过早的文件结束符(EOF)"
6012
6013#: builtin/index-pack.c:276
6014msgid "read error on input"
6015msgstr "输入上的读错误"
6016
6017#: builtin/index-pack.c:288
6018msgid "used more bytes than were available"
6019msgstr "用掉了超过可用的字节"
6020
6021#: builtin/index-pack.c:295
6022msgid "pack too large for current definition of off_t"
6023msgstr "包太大超过了当前 off_t 的定义"
6024
6025#: builtin/index-pack.c:311
6026#, c-format
6027msgid "unable to create '%s'"
6028msgstr "不能创建 '%s'"
6029
6030#: builtin/index-pack.c:316
6031#, c-format
6032msgid "cannot open packfile '%s'"
6033msgstr "无法打开包文件 '%s'"
6034
6035#: builtin/index-pack.c:330
6036msgid "pack signature mismatch"
6037msgstr "包签名不匹配"
6038
6039#: builtin/index-pack.c:332
6040#, c-format
6041msgid "pack version %<PRIu32> unsupported"
6042msgstr "不支持包版本 %<PRIu32>"
6043
6044#: builtin/index-pack.c:350
6045#, c-format
6046msgid "pack has bad object at offset %lu: %s"
6047msgstr "包中有错误的对象位于 %lu:%s"
6048
6049#: builtin/index-pack.c:471
6050#, c-format
6051msgid "inflate returned %d"
6052msgstr "解压缩返回 %d"
6053
6054#: builtin/index-pack.c:520
6055msgid "offset value overflow for delta base object"
6056msgstr "偏移值覆盖了 delta 基准对象"
6057
6058#: builtin/index-pack.c:528
6059msgid "delta base offset is out of bound"
6060msgstr "delta 基准偏移越界"
6061
6062#: builtin/index-pack.c:536
6063#, c-format
6064msgid "unknown object type %d"
6065msgstr "未知对象类型 %d"
6066
6067#: builtin/index-pack.c:567
6068msgid "cannot pread pack file"
6069msgstr "无法读取包文件"
6070
6071#: builtin/index-pack.c:569
6072#, c-format
6073msgid "premature end of pack file, %lu byte missing"
6074msgid_plural "premature end of pack file, %lu bytes missing"
6075msgstr[0] "包文件过早结束,缺少 %lu 字节"
6076msgstr[1] "包文件过早结束,缺少 %lu 字节"
6077
6078#: builtin/index-pack.c:595
6079msgid "serious inflate inconsistency"
6080msgstr "解压缩严重的不一致"
6081
6082#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
6083#: builtin/index-pack.c:749 builtin/index-pack.c:758
6084#, c-format
6085msgid "SHA1 COLLISION FOUND WITH %s !"
6086msgstr "发现 %s 出现 SHA1 冲突!"
6087
6088#: builtin/index-pack.c:689 builtin/pack-objects.c:162
6089#: builtin/pack-objects.c:254
6090#, c-format
6091msgid "unable to read %s"
6092msgstr "不能读 %s"
6093
6094#: builtin/index-pack.c:755
6095#, c-format
6096msgid "cannot read existing object %s"
6097msgstr "不能读取现存对象 %s"
6098
6099#: builtin/index-pack.c:769
6100#, c-format
6101msgid "invalid blob object %s"
6102msgstr "无效的数据(blob)对象 %s"
6103
6104#: builtin/index-pack.c:783
6105#, c-format
6106msgid "invalid %s"
6107msgstr "无效的 %s"
6108
6109#: builtin/index-pack.c:787
6110msgid "Error in object"
6111msgstr "对象中出错"
6112
6113#: builtin/index-pack.c:789
6114#, c-format
6115msgid "Not all child objects of %s are reachable"
6116msgstr "%s 的所有子对象并非都可达"
6117
6118#: builtin/index-pack.c:861 builtin/index-pack.c:890
6119msgid "failed to apply delta"
6120msgstr "无法应用 delta"
6121
6122#: builtin/index-pack.c:1055
6123msgid "Receiving objects"
6124msgstr "接收对象中"
6125
6126#: builtin/index-pack.c:1055
6127msgid "Indexing objects"
6128msgstr "索引对象中"
6129
6130#: builtin/index-pack.c:1081
6131msgid "pack is corrupted (SHA1 mismatch)"
6132msgstr "包冲突(SHA1 不匹配)"
6133
6134#: builtin/index-pack.c:1086
6135msgid "cannot fstat packfile"
6136msgstr "不能枚举包文件状态"
6137
6138#: builtin/index-pack.c:1089
6139msgid "pack has junk at the end"
6140msgstr "包的结尾有垃圾数据"
6141
6142#: builtin/index-pack.c:1100
6143msgid "confusion beyond insanity in parse_pack_objects()"
6144msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6145
6146#: builtin/index-pack.c:1123
6147msgid "Resolving deltas"
6148msgstr "处理 delta 中"
6149
6150#: builtin/index-pack.c:1133
6151#, c-format
6152msgid "unable to create thread: %s"
6153msgstr "不能创建线程:%s"
6154
6155#: builtin/index-pack.c:1175
6156msgid "confusion beyond insanity"
6157msgstr "不可理喻"
6158
6159#: builtin/index-pack.c:1181
6160#, c-format
6161msgid "completed with %d local objects"
6162msgstr "完成 %d 个本地对象"
6163
6164#: builtin/index-pack.c:1191
6165#, c-format
6166msgid "Unexpected tail checksum for %s (disk corruption?)"
6167msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
6168
6169#: builtin/index-pack.c:1195
6170#, c-format
6171msgid "pack has %d unresolved delta"
6172msgid_plural "pack has %d unresolved deltas"
6173msgstr[0] "包有 %d 个未解决的 delta"
6174msgstr[1] "包有 %d 个未解决的 delta"
6175
6176#: builtin/index-pack.c:1219
6177#, c-format
6178msgid "unable to deflate appended object (%d)"
6179msgstr "不能压缩附加对象(%d)"
6180
6181#: builtin/index-pack.c:1298
6182#, c-format
6183msgid "local object %s is corrupt"
6184msgstr "本地对象 %s 已损坏"
6185
6186#: builtin/index-pack.c:1322
6187msgid "error while closing pack file"
6188msgstr "关闭包文件时出错"
6189
6190#: builtin/index-pack.c:1335
6191#, c-format
6192msgid "cannot write keep file '%s'"
6193msgstr "无法写保留文件 '%s'"
6194
6195#: builtin/index-pack.c:1343
6196#, c-format
6197msgid "cannot close written keep file '%s'"
6198msgstr "无法关闭保留文件 '%s'"
6199
6200#: builtin/index-pack.c:1356
6201msgid "cannot store pack file"
6202msgstr "无法存储包文件"
6203
6204#: builtin/index-pack.c:1367
6205msgid "cannot store index file"
6206msgstr "无法存储索引文件"
6207
6208#: builtin/index-pack.c:1400
6209#, c-format
6210msgid "bad pack.indexversion=%<PRIu32>"
6211msgstr "坏的 pack.indexversion=%<PRIu32>"
6212
6213#: builtin/index-pack.c:1406
6214#, c-format
6215msgid "invalid number of threads specified (%d)"
6216msgstr "指定的线程数无效(%d)"
6217
6218#: builtin/index-pack.c:1410 builtin/index-pack.c:1589
6219#, c-format
6220msgid "no threads support, ignoring %s"
6221msgstr "没有线程支持,忽略 %s"
6222
6223#: builtin/index-pack.c:1468
6224#, c-format
6225msgid "Cannot open existing pack file '%s'"
6226msgstr "无法打开现存包文件 '%s'"
6227
6228#: builtin/index-pack.c:1470
6229#, c-format
6230msgid "Cannot open existing pack idx file for '%s'"
6231msgstr "无法为 %s 打开包索引文件"
6232
6233#: builtin/index-pack.c:1517
6234#, c-format
6235msgid "non delta: %d object"
6236msgid_plural "non delta: %d objects"
6237msgstr[0] "非 delta:%d 个对象"
6238msgstr[1] "非 delta:%d 个对象"
6239
6240#: builtin/index-pack.c:1524
6241#, c-format
6242msgid "chain length = %d: %lu object"
6243msgid_plural "chain length = %d: %lu objects"
6244msgstr[0] "链长 = %d: %lu 对象"
6245msgstr[1] "链长 = %d: %lu 对象"
6246
6247#: builtin/index-pack.c:1553
6248msgid "Cannot come back to cwd"
6249msgstr "无法返回当前工作目录"
6250
6251#: builtin/index-pack.c:1601 builtin/index-pack.c:1604
6252#: builtin/index-pack.c:1616 builtin/index-pack.c:1620
6253#, c-format
6254msgid "bad %s"
6255msgstr "错误选项 %s"
6256
6257#: builtin/index-pack.c:1634
6258msgid "--fix-thin cannot be used without --stdin"
6259msgstr "--fix-thin 不能和 --stdin 同时使用"
6260
6261#: builtin/index-pack.c:1638 builtin/index-pack.c:1647
6262#, c-format
6263msgid "packfile name '%s' does not end with '.pack'"
6264msgstr "包名 '%s' 没有以 '.pack' 结尾"
6265
6266#: builtin/index-pack.c:1655
6267msgid "--verify with no packfile name given"
6268msgstr "--verify 没有提供包名参数"
6269
6270#: builtin/init-db.c:35
6271#, c-format
6272msgid "Could not make %s writable by group"
6273msgstr "不能设置 %s 为组可写"
6274
6275#: builtin/init-db.c:62
6276#, c-format
6277msgid "insanely long template name %s"
6278msgstr "太长的模版名 %s"
6279
6280#: builtin/init-db.c:67
6281#, c-format
6282msgid "cannot stat '%s'"
6283msgstr "不能枚举 '%s' 状态"
6284
6285#: builtin/init-db.c:73
6286#, c-format
6287msgid "cannot stat template '%s'"
6288msgstr "不能枚举模版 '%s' 状态"
6289
6290#: builtin/init-db.c:80
6291#, c-format
6292msgid "cannot opendir '%s'"
6293msgstr "不能打开目录 '%s'"
6294
6295#: builtin/init-db.c:97
6296#, c-format
6297msgid "cannot readlink '%s'"
6298msgstr "不能读取链接 '%s'"
6299
6300#: builtin/init-db.c:99
6301#, c-format
6302msgid "insanely long symlink %s"
6303msgstr "太长的符号链接 %s"
6304
6305#: builtin/init-db.c:102
6306#, c-format
6307msgid "cannot symlink '%s' '%s'"
6308msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6309
6310#: builtin/init-db.c:106
6311#, c-format
6312msgid "cannot copy '%s' to '%s'"
6313msgstr "不能拷贝 '%s' 至 '%s'"
6314
6315#: builtin/init-db.c:110
6316#, c-format
6317msgid "ignoring template %s"
6318msgstr "忽略模版 %s"
6319
6320#: builtin/init-db.c:136
6321#, c-format
6322msgid "insanely long template path %s"
6323msgstr "太长的模版路径 %s"
6324
6325#: builtin/init-db.c:144
6326#, c-format
6327msgid "templates not found %s"
6328msgstr "模版未找到 %s"
6329
6330#: builtin/init-db.c:157
6331#, c-format
6332msgid "not copying templates of a wrong format version %d from '%s'"
6333msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6334
6335#: builtin/init-db.c:197
6336#, c-format
6337msgid "insane git directory %s"
6338msgstr "不正常的 git 目录 %s"
6339
6340#: builtin/init-db.c:331 builtin/init-db.c:334
6341#, c-format
6342msgid "%s already exists"
6343msgstr "%s 已经存在"
6344
6345#: builtin/init-db.c:363
6346#, c-format
6347msgid "unable to handle file type %d"
6348msgstr "不能处理 %d 类型的文件"
6349
6350#: builtin/init-db.c:366
6351#, c-format
6352msgid "unable to move %s to %s"
6353msgstr "不能移动 %s 至 %s"
6354
6355#. TRANSLATORS: The first '%s' is either "Reinitialized
6356#. existing" or "Initialized empty", the second " shared" or
6357#. "", and the last '%s%s' is the verbatim directory name.
6358#: builtin/init-db.c:426
6359#, c-format
6360msgid "%s%s Git repository in %s%s\n"
6361msgstr "%s%s Git 版本库于 %s%s\n"
6362
6363#: builtin/init-db.c:427
6364msgid "Reinitialized existing"
6365msgstr "重新初始化现存的"
6366
6367#: builtin/init-db.c:427
6368msgid "Initialized empty"
6369msgstr "初始化空的"
6370
6371# 译者:中文字符串拼接,可删除前导空格
6372#: builtin/init-db.c:428
6373msgid " shared"
6374msgstr "共享"
6375
6376#: builtin/init-db.c:475
6377msgid ""
6378"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6379"shared[=<permissions>]] [<directory>]"
6380msgstr ""
6381"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6382"[<目录>]"
6383
6384#: builtin/init-db.c:498
6385msgid "permissions"
6386msgstr "权限"
6387
6388#: builtin/init-db.c:499
6389msgid "specify that the git repository is to be shared amongst several users"
6390msgstr "指定 git 版本库是多个用户之间共享的"
6391
6392#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171
6393msgid "be quiet"
6394msgstr "保持安静"
6395
6396#: builtin/init-db.c:533 builtin/init-db.c:538
6397#, c-format
6398msgid "cannot mkdir %s"
6399msgstr "不能创建目录 %s"
6400
6401#: builtin/init-db.c:542
6402#, c-format
6403msgid "cannot chdir to %s"
6404msgstr "不能切换目录到 %s"
6405
6406#: builtin/init-db.c:563
6407#, c-format
6408msgid ""
6409"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6410"dir=<directory>)"
6411msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
6412
6413#: builtin/init-db.c:591
6414#, c-format
6415msgid "Cannot access work tree '%s'"
6416msgstr "不能访问工作区 '%s'"
6417
6418#: builtin/interpret-trailers.c:15
6419msgid ""
6420"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6421"[<file>...]"
6422msgstr ""
6423"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6424">...]"
6425
6426#: builtin/interpret-trailers.c:25
6427msgid "trim empty trailers"
6428msgstr "删除空签名"
6429
6430#: builtin/interpret-trailers.c:26
6431msgid "trailer"
6432msgstr "签名"
6433
6434#: builtin/interpret-trailers.c:27
6435msgid "trailer(s) to add"
6436msgstr "要添加的签名"
6437
6438#: builtin/log.c:41
6439msgid "git log [<options>] [<revision range>] [[--] <path>...]"
6440msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
6441
6442#: builtin/log.c:42
6443msgid "git show [<options>] <object>..."
6444msgstr "git show [<选项>] <对象>..."
6445
6446#: builtin/log.c:81
6447#, c-format
6448msgid "invalid --decorate option: %s"
6449msgstr "无效的 --decorate 选项:%s"
6450
6451#: builtin/log.c:127
6452msgid "suppress diff output"
6453msgstr "不显示差异输出"
6454
6455#: builtin/log.c:128
6456msgid "show source"
6457msgstr "显示源"
6458
6459#: builtin/log.c:129
6460msgid "Use mail map file"
6461msgstr "使用邮件映射文件"
6462
6463#: builtin/log.c:130
6464msgid "decorate options"
6465msgstr "修饰选项"
6466
6467#: builtin/log.c:133
6468msgid "Process line range n,m in file, counting from 1"
6469msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6470
6471#: builtin/log.c:229
6472#, c-format
6473msgid "Final output: %d %s\n"
6474msgstr "最终输出:%d %s\n"
6475
6476#: builtin/log.c:458
6477#, c-format
6478msgid "git show %s: bad file"
6479msgstr "git show %s: 损坏的文件"
6480
6481#: builtin/log.c:472 builtin/log.c:564
6482#, c-format
6483msgid "Could not read object %s"
6484msgstr "不能读取对象 %s"
6485
6486#: builtin/log.c:588
6487#, c-format
6488msgid "Unknown type: %d"
6489msgstr "未知类型:%d"
6490
6491#: builtin/log.c:689
6492msgid "format.headers without value"
6493msgstr "format.headers 没有值"
6494
6495#: builtin/log.c:773
6496msgid "name of output directory is too long"
6497msgstr "输出目录名太长"
6498
6499#: builtin/log.c:789
6500#, c-format
6501msgid "Cannot open patch file %s"
6502msgstr "无法打开补丁文件 %s"
6503
6504#: builtin/log.c:803
6505msgid "Need exactly one range."
6506msgstr "只需要一个范围。"
6507
6508#: builtin/log.c:811
6509msgid "Not a range."
6510msgstr "不是一个范围。"
6511
6512#: builtin/log.c:919
6513msgid "Cover letter needs email format"
6514msgstr "信封需要邮件地址格式"
6515
6516#: builtin/log.c:998
6517#, c-format
6518msgid "insane in-reply-to: %s"
6519msgstr "不正常的 in-reply-to:%s"
6520
6521#: builtin/log.c:1026
6522msgid "git format-patch [<options>] [<since> | <revision-range>]"
6523msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
6524
6525#: builtin/log.c:1071
6526msgid "Two output directories?"
6527msgstr "两个输出目录?"
6528
6529#: builtin/log.c:1186
6530msgid "use [PATCH n/m] even with a single patch"
6531msgstr "使用 [PATCH n/m],即使只有一个补丁"
6532
6533#: builtin/log.c:1189
6534msgid "use [PATCH] even with multiple patches"
6535msgstr "使用 [PATCH],即使有多个补丁"
6536
6537#: builtin/log.c:1193
6538msgid "print patches to standard out"
6539msgstr "打印补丁到标准输出"
6540
6541#: builtin/log.c:1195
6542msgid "generate a cover letter"
6543msgstr "生成一封附信"
6544
6545#: builtin/log.c:1197
6546msgid "use simple number sequence for output file names"
6547msgstr "使用简单的数字序列作为输出文件名"
6548
6549#: builtin/log.c:1198
6550msgid "sfx"
6551msgstr "后缀"
6552
6553#: builtin/log.c:1199
6554msgid "use <sfx> instead of '.patch'"
6555msgstr "使用 <后缀> 代替 '.patch'"
6556
6557#: builtin/log.c:1201
6558msgid "start numbering patches at <n> instead of 1"
6559msgstr "补丁以 <n> 开始编号,而不是1"
6560
6561#: builtin/log.c:1203
6562msgid "mark the series as Nth re-roll"
6563msgstr "标记补丁系列是第几次重制"
6564
6565#: builtin/log.c:1205
6566msgid "Use [<prefix>] instead of [PATCH]"
6567msgstr "使用 [<前缀>] 代替 [PATCH]"
6568
6569#: builtin/log.c:1208
6570msgid "store resulting files in <dir>"
6571msgstr "把结果文件存储在 <目录>"
6572
6573#: builtin/log.c:1211
6574msgid "don't strip/add [PATCH]"
6575msgstr "不删除/添加 [PATCH]"
6576
6577#: builtin/log.c:1214
6578msgid "don't output binary diffs"
6579msgstr "不输出二进制差异"
6580
6581#: builtin/log.c:1216
6582msgid "don't include a patch matching a commit upstream"
6583msgstr "不包含已在上游提交中的补丁"
6584
6585#: builtin/log.c:1218
6586msgid "show patch format instead of default (patch + stat)"
6587msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6588
6589#: builtin/log.c:1220
6590msgid "Messaging"
6591msgstr "邮件发送"
6592
6593#: builtin/log.c:1221
6594msgid "header"
6595msgstr "header"
6596
6597#: builtin/log.c:1222
6598msgid "add email header"
6599msgstr "添加邮件头"
6600
6601#: builtin/log.c:1223 builtin/log.c:1225
6602msgid "email"
6603msgstr "邮件地址"
6604
6605#: builtin/log.c:1223
6606msgid "add To: header"
6607msgstr "添加收件人"
6608
6609#: builtin/log.c:1225
6610msgid "add Cc: header"
6611msgstr "添加抄送"
6612
6613#: builtin/log.c:1227
6614msgid "ident"
6615msgstr "标识"
6616
6617#: builtin/log.c:1228
6618msgid "set From address to <ident> (or committer ident if absent)"
6619msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者ID做为地址)"
6620
6621#: builtin/log.c:1230
6622msgid "message-id"
6623msgstr "邮件标识"
6624
6625#: builtin/log.c:1231
6626msgid "make first mail a reply to <message-id>"
6627msgstr "使第一封邮件作为对 <邮件标识> 的回复"
6628
6629#: builtin/log.c:1232 builtin/log.c:1235
6630msgid "boundary"
6631msgstr "边界"
6632
6633#: builtin/log.c:1233
6634msgid "attach the patch"
6635msgstr "附件方式添加补丁"
6636
6637#: builtin/log.c:1236
6638msgid "inline the patch"
6639msgstr "内联显示补丁"
6640
6641#: builtin/log.c:1240
6642msgid "enable message threading, styles: shallow, deep"
6643msgstr "启用邮件线索,风格:浅,深"
6644
6645#: builtin/log.c:1242
6646msgid "signature"
6647msgstr "签名"
6648
6649#: builtin/log.c:1243
6650msgid "add a signature"
6651msgstr "添加一个签名"
6652
6653#: builtin/log.c:1245
6654msgid "add a signature from a file"
6655msgstr "从文件添加一个签名"
6656
6657#: builtin/log.c:1246
6658msgid "don't print the patch filenames"
6659msgstr "不要打印补丁文件名"
6660
6661#: builtin/log.c:1320
6662#, c-format
6663msgid "invalid ident line: %s"
6664msgstr "包含无效的身份标识:%s"
6665
6666#: builtin/log.c:1335
6667msgid "-n and -k are mutually exclusive."
6668msgstr "-n 和 -k 互斥。"
6669
6670#: builtin/log.c:1337
6671msgid "--subject-prefix and -k are mutually exclusive."
6672msgstr "--subject-prefix 和 -k 互斥。"
6673
6674#: builtin/log.c:1345
6675msgid "--name-only does not make sense"
6676msgstr "--name-only 无意义"
6677
6678#: builtin/log.c:1347
6679msgid "--name-status does not make sense"
6680msgstr "--name-status 无意义"
6681
6682#: builtin/log.c:1349
6683msgid "--check does not make sense"
6684msgstr "--check 无意义"
6685
6686#: builtin/log.c:1372
6687msgid "standard output, or directory, which one?"
6688msgstr "标准输出或目录,哪一个?"
6689
6690#: builtin/log.c:1374
6691#, c-format
6692msgid "Could not create directory '%s'"
6693msgstr "不能创建目录 '%s'"
6694
6695#: builtin/log.c:1472
6696#, c-format
6697msgid "unable to read signature file '%s'"
6698msgstr "无法读取签名文件 '%s'"
6699
6700#: builtin/log.c:1535
6701msgid "Failed to create output files"
6702msgstr "无法创建输出文件"
6703
6704#: builtin/log.c:1583
6705msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6706msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6707
6708#: builtin/log.c:1638
6709#, c-format
6710msgid ""
6711"Could not find a tracked remote branch, please specify <upstream> manually.\n"
6712msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
6713
6714#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
6715#, c-format
6716msgid "Unknown commit %s"
6717msgstr "未知提交 %s"
6718
6719#: builtin/ls-files.c:358
6720msgid "git ls-files [<options>] [<file>...]"
6721msgstr "git ls-files [<选项>] [<文件>...]"
6722
6723#: builtin/ls-files.c:415
6724msgid "identify the file status with tags"
6725msgstr "用标签标识文件的状态"
6726
6727#: builtin/ls-files.c:417
6728msgid "use lowercase letters for 'assume unchanged' files"
6729msgstr "使用小写字母表示 '假设未改变的' 文件"
6730
6731#: builtin/ls-files.c:419
6732msgid "show cached files in the output (default)"
6733msgstr "显示缓存的文件(默认)"
6734
6735#: builtin/ls-files.c:421
6736msgid "show deleted files in the output"
6737msgstr "显示已删除的文件"
6738
6739#: builtin/ls-files.c:423
6740msgid "show modified files in the output"
6741msgstr "显示已修改的文件"
6742
6743#: builtin/ls-files.c:425
6744msgid "show other files in the output"
6745msgstr "显示其它文件"
6746
6747#: builtin/ls-files.c:427
6748msgid "show ignored files in the output"
6749msgstr "显示忽略的文件"
6750
6751#: builtin/ls-files.c:430
6752msgid "show staged contents' object name in the output"
6753msgstr "显示暂存区内容的对象名称"
6754
6755#: builtin/ls-files.c:432
6756msgid "show files on the filesystem that need to be removed"
6757msgstr "显示文件系统需要删除的文件"
6758
6759#: builtin/ls-files.c:434
6760msgid "show 'other' directories' names only"
6761msgstr "只显示“其他”目录的名称"
6762
6763#: builtin/ls-files.c:437
6764msgid "don't show empty directories"
6765msgstr "不显示空目录"
6766
6767#: builtin/ls-files.c:440
6768msgid "show unmerged files in the output"
6769msgstr "显示未合并的文件"
6770
6771#: builtin/ls-files.c:442
6772msgid "show resolve-undo information"
6773msgstr "显示 resolve-undo 信息"
6774
6775#: builtin/ls-files.c:444
6776msgid "skip files matching pattern"
6777msgstr "匹配排除文件的模式"
6778
6779#: builtin/ls-files.c:447
6780msgid "exclude patterns are read from <file>"
6781msgstr "从 <文件> 中读取排除模式"
6782
6783#: builtin/ls-files.c:450
6784msgid "read additional per-directory exclude patterns in <file>"
6785msgstr "从 <文件> 读取额外的每个目录的排除模式"
6786
6787#: builtin/ls-files.c:452
6788msgid "add the standard git exclusions"
6789msgstr "添加标准的 git 排除"
6790
6791#: builtin/ls-files.c:455
6792msgid "make the output relative to the project top directory"
6793msgstr "显示相对于顶级目录的文件名"
6794
6795#: builtin/ls-files.c:458
6796msgid "if any <file> is not in the index, treat this as an error"
6797msgstr "如果任何 <文件> 都不在索引区,视为错误"
6798
6799#: builtin/ls-files.c:459
6800msgid "tree-ish"
6801msgstr "树或提交"
6802
6803#: builtin/ls-files.c:460
6804msgid "pretend that paths removed since <tree-ish> are still present"
6805msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6806
6807#: builtin/ls-files.c:462
6808msgid "show debugging data"
6809msgstr "显示调试数据"
6810
6811#: builtin/ls-tree.c:28
6812msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6813msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6814
6815#: builtin/ls-tree.c:127
6816msgid "only show trees"
6817msgstr "只显示树"
6818
6819#: builtin/ls-tree.c:129
6820msgid "recurse into subtrees"
6821msgstr "递归到子树"
6822
6823#: builtin/ls-tree.c:131
6824msgid "show trees when recursing"
6825msgstr "当递归时显示树"
6826
6827#: builtin/ls-tree.c:134
6828msgid "terminate entries with NUL byte"
6829msgstr "条目以NUL字符终止"
6830
6831#: builtin/ls-tree.c:135
6832msgid "include object size"
6833msgstr "包括对象大小"
6834
6835#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
6836msgid "list only filenames"
6837msgstr "只列出文件名"
6838
6839#: builtin/ls-tree.c:142
6840msgid "use full path names"
6841msgstr "使用文件的全路径"
6842
6843#: builtin/ls-tree.c:144
6844msgid "list entire tree; not just current directory (implies --full-name)"
6845msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6846
6847#: builtin/merge.c:45
6848msgid "git merge [<options>] [<commit>...]"
6849msgstr "git merge [<选项>] [<提交>...]"
6850
6851#: builtin/merge.c:46
6852msgid "git merge [<options>] <msg> HEAD <commit>"
6853msgstr "git merge [<选项>] <说明> HEAD <提交>"
6854
6855#: builtin/merge.c:47
6856msgid "git merge --abort"
6857msgstr "git merge --abort"
6858
6859#: builtin/merge.c:100
6860msgid "switch `m' requires a value"
6861msgstr "开关 `m' 需要一个值"
6862
6863#: builtin/merge.c:137
6864#, c-format
6865msgid "Could not find merge strategy '%s'.\n"
6866msgstr "不能找到合并策略 '%s'。\n"
6867
6868#: builtin/merge.c:138
6869#, c-format
6870msgid "Available strategies are:"
6871msgstr "可用的策略有:"
6872
6873#: builtin/merge.c:143
6874#, c-format
6875msgid "Available custom strategies are:"
6876msgstr "可用的自定义策略有:"
6877
6878#: builtin/merge.c:193
6879msgid "do not show a diffstat at the end of the merge"
6880msgstr "在合并的最后不显示差异统计"
6881
6882#: builtin/merge.c:196
6883msgid "show a diffstat at the end of the merge"
6884msgstr "在合并的最后显示差异统计"
6885
6886#: builtin/merge.c:197
6887msgid "(synonym to --stat)"
6888msgstr "(和 --stat 同义)"
6889
6890#: builtin/merge.c:199
6891msgid "add (at most <n>) entries from shortlog to merge commit message"
6892msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6893
6894#: builtin/merge.c:202
6895msgid "create a single commit instead of doing a merge"
6896msgstr "创建一个单独的提交而不是做一次合并"
6897
6898#: builtin/merge.c:204
6899msgid "perform a commit if the merge succeeds (default)"
6900msgstr "如果合并成功,执行一次提交(默认)"
6901
6902#: builtin/merge.c:206
6903msgid "edit message before committing"
6904msgstr "在提交前编辑提交说明"
6905
6906#: builtin/merge.c:207
6907msgid "allow fast-forward (default)"
6908msgstr "允许快进(默认)"
6909
6910#: builtin/merge.c:209
6911msgid "abort if fast-forward is not possible"
6912msgstr "如果不能快进就放弃合并"
6913
6914#: builtin/merge.c:213
6915msgid "Verify that the named commit has a valid GPG signature"
6916msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6917
6918#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
6919msgid "strategy"
6920msgstr "策略"
6921
6922#: builtin/merge.c:215
6923msgid "merge strategy to use"
6924msgstr "要使用的合并策略"
6925
6926#: builtin/merge.c:216
6927msgid "option=value"
6928msgstr "option=value"
6929
6930#: builtin/merge.c:217
6931msgid "option for selected merge strategy"
6932msgstr "所选的合并策略的选项"
6933
6934#: builtin/merge.c:219
6935msgid "merge commit message (for a non-fast-forward merge)"
6936msgstr "合并的提交说明(针对非快进式合并)"
6937
6938#: builtin/merge.c:223
6939msgid "abort the current in-progress merge"
6940msgstr "放弃当前正在进行的合并"
6941
6942#: builtin/merge.c:251
6943msgid "could not run stash."
6944msgstr "不能进行进度保存。"
6945
6946#: builtin/merge.c:256
6947msgid "stash failed"
6948msgstr "进度保存失败"
6949
6950#: builtin/merge.c:261
6951#, c-format
6952msgid "not a valid object: %s"
6953msgstr "不是一个有效对象:%s"
6954
6955#: builtin/merge.c:280 builtin/merge.c:297
6956msgid "read-tree failed"
6957msgstr "读取树失败"
6958
6959# 译者:注意保持前导空格
6960#: builtin/merge.c:327
6961msgid " (nothing to squash)"
6962msgstr " (无可压缩)"
6963
6964#: builtin/merge.c:340
6965#, c-format
6966msgid "Squash commit -- not updating HEAD\n"
6967msgstr "压缩提交 -- 未更新 HEAD\n"
6968
6969#: builtin/merge.c:372
6970msgid "Writing SQUASH_MSG"
6971msgstr "写入 SQUASH_MSG"
6972
6973#: builtin/merge.c:374
6974msgid "Finishing SQUASH_MSG"
6975msgstr "完成 SQUASH_MSG"
6976
6977#: builtin/merge.c:397
6978#, c-format
6979msgid "No merge message -- not updating HEAD\n"
6980msgstr "无合并信息 -- 未更新 HEAD\n"
6981
6982#: builtin/merge.c:447
6983#, c-format
6984msgid "'%s' does not point to a commit"
6985msgstr "'%s' 没有指向一个提交"
6986
6987#: builtin/merge.c:559
6988#, c-format
6989msgid "Bad branch.%s.mergeoptions string: %s"
6990msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6991
6992#: builtin/merge.c:654
6993msgid "git write-tree failed to write a tree"
6994msgstr "git write-tree 无法写入一树对象"
6995
6996#: builtin/merge.c:678
6997msgid "Not handling anything other than two heads merge."
6998msgstr "不能处理两个头合并之外的任何操作。"
6999
7000#: builtin/merge.c:692
7001#, c-format
7002msgid "Unknown option for merge-recursive: -X%s"
7003msgstr "merge-recursive 的未知选项:-X%s"
7004
7005#: builtin/merge.c:705
7006#, c-format
7007msgid "unable to write %s"
7008msgstr "不能写 %s"
7009
7010#: builtin/merge.c:794
7011#, c-format
7012msgid "Could not read from '%s'"
7013msgstr "不能从 '%s' 读取"
7014
7015#: builtin/merge.c:803
7016#, c-format
7017msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7018msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7019
7020#: builtin/merge.c:809
7021#, c-format
7022msgid ""
7023"Please enter a commit message to explain why this merge is necessary,\n"
7024"especially if it merges an updated upstream into a topic branch.\n"
7025"\n"
7026"Lines starting with '%c' will be ignored, and an empty message aborts\n"
7027"the commit.\n"
7028msgstr ""
7029"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7030"合并到主题分支。\n"
7031"\n"
7032"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
7033
7034#: builtin/merge.c:833
7035msgid "Empty commit message."
7036msgstr "空提交信息。"
7037
7038#: builtin/merge.c:845
7039#, c-format
7040msgid "Wonderful.\n"
7041msgstr "太棒了。\n"
7042
7043#: builtin/merge.c:900
7044#, c-format
7045msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7046msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7047
7048#: builtin/merge.c:916
7049#, c-format
7050msgid "'%s' is not a commit"
7051msgstr "'%s' 不是一个提交"
7052
7053#: builtin/merge.c:957
7054msgid "No current branch."
7055msgstr "没有当前分支。"
7056
7057#: builtin/merge.c:959
7058msgid "No remote for the current branch."
7059msgstr "当前分支没有对应的远程版本库。"
7060
7061#: builtin/merge.c:961
7062msgid "No default upstream defined for the current branch."
7063msgstr "当前分支没有定义默认的上游分支。"
7064
7065#: builtin/merge.c:966
7066#, c-format
7067msgid "No remote-tracking branch for %s from %s"
7068msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7069
7070#: builtin/merge.c:1122
7071msgid "There is no merge to abort (MERGE_HEAD missing)."
7072msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7073
7074#: builtin/merge.c:1138
7075msgid ""
7076"You have not concluded your merge (MERGE_HEAD exists).\n"
7077"Please, commit your changes before you merge."
7078msgstr ""
7079"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7080"请在合并前先提交您的修改。"
7081
7082#: builtin/merge.c:1141 git-pull.sh:34
7083msgid "You have not concluded your merge (MERGE_HEAD exists)."
7084msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7085
7086#: builtin/merge.c:1145
7087msgid ""
7088"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7089"Please, commit your changes before you merge."
7090msgstr ""
7091"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7092"请在合并前先提交您的修改。"
7093
7094#: builtin/merge.c:1148
7095msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7096msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7097
7098#: builtin/merge.c:1157
7099msgid "You cannot combine --squash with --no-ff."
7100msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7101
7102#: builtin/merge.c:1166
7103msgid "No commit specified and merge.defaultToUpstream not set."
7104msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7105
7106#: builtin/merge.c:1198
7107msgid "Can merge only exactly one commit into empty head"
7108msgstr "只能将一个提交合并到空分支上"
7109
7110#: builtin/merge.c:1201
7111msgid "Squash commit into empty head not supported yet"
7112msgstr "尚不支持到空分支的压缩提交"
7113
7114#: builtin/merge.c:1203
7115msgid "Non-fast-forward commit does not make sense into an empty head"
7116msgstr "到空分支的非快进式提交没有意义"
7117
7118#: builtin/merge.c:1208
7119#, c-format
7120msgid "%s - not something we can merge"
7121msgstr "%s - 不能被合并"
7122
7123#: builtin/merge.c:1259
7124#, c-format
7125msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7126msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7127
7128#: builtin/merge.c:1262
7129#, c-format
7130msgid "Commit %s has a bad GPG signature allegedly by %s."
7131msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7132
7133#: builtin/merge.c:1265
7134#, c-format
7135msgid "Commit %s does not have a GPG signature."
7136msgstr "提交 %s 没有一个 GPG 签名。"
7137
7138#: builtin/merge.c:1268
7139#, c-format
7140msgid "Commit %s has a good GPG signature by %s\n"
7141msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7142
7143#: builtin/merge.c:1349
7144#, c-format
7145msgid "Updating %s..%s\n"
7146msgstr "更新 %s..%s\n"
7147
7148#: builtin/merge.c:1388
7149#, c-format
7150msgid "Trying really trivial in-index merge...\n"
7151msgstr "尝试非常小的索引内合并...\n"
7152
7153#: builtin/merge.c:1395
7154#, c-format
7155msgid "Nope.\n"
7156msgstr "无。\n"
7157
7158#: builtin/merge.c:1427
7159msgid "Not possible to fast-forward, aborting."
7160msgstr "无法快进,终止。"
7161
7162#: builtin/merge.c:1450 builtin/merge.c:1529
7163#, c-format
7164msgid "Rewinding the tree to pristine...\n"
7165msgstr "将树回滚至原始状态...\n"
7166
7167#: builtin/merge.c:1454
7168#, c-format
7169msgid "Trying merge strategy %s...\n"
7170msgstr "尝试合并策略 %s...\n"
7171
7172#: builtin/merge.c:1520
7173#, c-format
7174msgid "No merge strategy handled the merge.\n"
7175msgstr "没有合并策略处理此合并。\n"
7176
7177#: builtin/merge.c:1522
7178#, c-format
7179msgid "Merge with strategy %s failed.\n"
7180msgstr "使用策略 %s 合并失败。\n"
7181
7182#: builtin/merge.c:1531
7183#, c-format
7184msgid "Using the %s to prepare resolving by hand.\n"
7185msgstr "使用 %s 以准备手工解决。\n"
7186
7187#: builtin/merge.c:1543
7188#, c-format
7189msgid "Automatic merge went well; stopped before committing as requested\n"
7190msgstr "自动合并进展顺利,按要求在提交前停止\n"
7191
7192#: builtin/merge-base.c:29
7193msgid "git merge-base [-a | --all] <commit> <commit>..."
7194msgstr "git merge-base [-a | --all] <提交> <提交>..."
7195
7196#: builtin/merge-base.c:30
7197msgid "git merge-base [-a | --all] --octopus <commit>..."
7198msgstr "git merge-base [-a | --all] --octopus <提交>..."
7199
7200#: builtin/merge-base.c:31
7201msgid "git merge-base --independent <commit>..."
7202msgstr "git merge-base --independent <提交>..."
7203
7204#: builtin/merge-base.c:32
7205msgid "git merge-base --is-ancestor <commit> <commit>"
7206msgstr "git merge-base --is-ancestor <提交> <提交>"
7207
7208#: builtin/merge-base.c:33
7209msgid "git merge-base --fork-point <ref> [<commit>]"
7210msgstr "git merge-base --fork-point <引用> [<提交>]"
7211
7212#: builtin/merge-base.c:214
7213msgid "output all common ancestors"
7214msgstr "输出所有共同的祖先"
7215
7216#: builtin/merge-base.c:216
7217msgid "find ancestors for a single n-way merge"
7218msgstr "查找一个多路合并的祖先提交"
7219
7220#: builtin/merge-base.c:218
7221msgid "list revs not reachable from others"
7222msgstr "显示不能被其他访问到的版本"
7223
7224#: builtin/merge-base.c:220
7225msgid "is the first one ancestor of the other?"
7226msgstr "第一个是其他的祖先提交么?"
7227
7228#: builtin/merge-base.c:222
7229msgid "find where <commit> forked from reflog of <ref>"
7230msgstr "查找 <提交> 从<引用>日志的何处分支的"
7231
7232#: builtin/merge-file.c:8
7233msgid ""
7234"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7235"<orig-file> <file2>"
7236msgstr ""
7237"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7238"件> <文件2>"
7239
7240#: builtin/merge-file.c:33
7241msgid "send results to standard output"
7242msgstr "将结果发送到标准输出"
7243
7244#: builtin/merge-file.c:34
7245msgid "use a diff3 based merge"
7246msgstr "使用基于 diff3 的合并"
7247
7248#: builtin/merge-file.c:35
7249msgid "for conflicts, use our version"
7250msgstr "如果冲突,使用我们的版本"
7251
7252#: builtin/merge-file.c:37
7253msgid "for conflicts, use their version"
7254msgstr "如果冲突,使用他们的版本"
7255
7256#: builtin/merge-file.c:39
7257msgid "for conflicts, use a union version"
7258msgstr "如果冲突,使用联合版本"
7259
7260#: builtin/merge-file.c:42
7261msgid "for conflicts, use this marker size"
7262msgstr "如果冲突,使用指定长度的标记"
7263
7264#: builtin/merge-file.c:43
7265msgid "do not warn about conflicts"
7266msgstr "不要警告冲突"
7267
7268#: builtin/merge-file.c:45
7269msgid "set labels for file1/orig-file/file2"
7270msgstr "为 文件1/初始文件/文件2 设置标签"
7271
7272#: builtin/mktree.c:64
7273msgid "git mktree [-z] [--missing] [--batch]"
7274msgstr "git mktree [-z] [--missing] [--batch]"
7275
7276#: builtin/mktree.c:150
7277msgid "input is NUL terminated"
7278msgstr "输入以 NUL 字符终止"
7279
7280#: builtin/mktree.c:151 builtin/write-tree.c:24
7281msgid "allow missing objects"
7282msgstr "允许丢失的对象"
7283
7284#: builtin/mktree.c:152
7285msgid "allow creation of more than one tree"
7286msgstr "允许创建一个以上的树"
7287
7288#: builtin/mv.c:15
7289msgid "git mv [<options>] <source>... <destination>"
7290msgstr "git mv [<选项>] <源>... <目标>"
7291
7292#: builtin/mv.c:69
7293#, c-format
7294msgid "Directory %s is in index and no submodule?"
7295msgstr "目录 %s 在索引中并且不是子模组?"
7296
7297#: builtin/mv.c:71
7298msgid "Please stage your changes to .gitmodules or stash them to proceed"
7299msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7300
7301#: builtin/mv.c:89
7302#, c-format
7303msgid "%.*s is in index"
7304msgstr "%.*s 在索引中"
7305
7306#: builtin/mv.c:111
7307msgid "force move/rename even if target exists"
7308msgstr "强制移动/重命令,即使目标存在"
7309
7310#: builtin/mv.c:112
7311msgid "skip move/rename errors"
7312msgstr "跳过移动/重命名错误"
7313
7314#: builtin/mv.c:151
7315#, c-format
7316msgid "destination '%s' is not a directory"
7317msgstr "目标 '%s' 不是一个目录"
7318
7319#: builtin/mv.c:162
7320#, c-format
7321msgid "Checking rename of '%s' to '%s'\n"
7322msgstr "检查 '%s' 到 '%s' 的重命名\n"
7323
7324#: builtin/mv.c:166
7325msgid "bad source"
7326msgstr "坏的源"
7327
7328#: builtin/mv.c:169
7329msgid "can not move directory into itself"
7330msgstr "不能将目录移动到自身"
7331
7332#: builtin/mv.c:172
7333msgid "cannot move directory over file"
7334msgstr "不能将目录移动到文件"
7335
7336#: builtin/mv.c:181
7337msgid "source directory is empty"
7338msgstr "源目录为空"
7339
7340#: builtin/mv.c:206
7341msgid "not under version control"
7342msgstr "不在版本控制之下"
7343
7344#: builtin/mv.c:209
7345msgid "destination exists"
7346msgstr "目标已存在"
7347
7348#: builtin/mv.c:217
7349#, c-format
7350msgid "overwriting '%s'"
7351msgstr "覆盖 '%s'"
7352
7353#: builtin/mv.c:220
7354msgid "Cannot overwrite"
7355msgstr "不能覆盖"
7356
7357#: builtin/mv.c:223
7358msgid "multiple sources for the same target"
7359msgstr "同一目标具有多个源"
7360
7361#: builtin/mv.c:225
7362msgid "destination directory does not exist"
7363msgstr "目标目录不存在"
7364
7365#: builtin/mv.c:232
7366#, c-format
7367msgid "%s, source=%s, destination=%s"
7368msgstr "%s,源=%s,目标=%s"
7369
7370#: builtin/mv.c:253
7371#, c-format
7372msgid "Renaming %s to %s\n"
7373msgstr "重命名 %s 至 %s\n"
7374
7375#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359
7376#, c-format
7377msgid "renaming '%s' failed"
7378msgstr "重命名 '%s' 失败"
7379
7380#: builtin/name-rev.c:255
7381msgid "git name-rev [<options>] <commit>..."
7382msgstr "git name-rev [<选项>] <提交>..."
7383
7384#: builtin/name-rev.c:256
7385msgid "git name-rev [<options>] --all"
7386msgstr "git name-rev [<选项>] --all"
7387
7388#: builtin/name-rev.c:257
7389msgid "git name-rev [<options>] --stdin"
7390msgstr "git name-rev [<选项>] --stdin"
7391
7392#: builtin/name-rev.c:309
7393msgid "print only names (no SHA-1)"
7394msgstr "只打印名称(无 SHA-1)"
7395
7396#: builtin/name-rev.c:310
7397msgid "only use tags to name the commits"
7398msgstr "只使用 tags 来命名提交"
7399
7400#: builtin/name-rev.c:312
7401msgid "only use refs matching <pattern>"
7402msgstr "只使用和 <模式> 相匹配的引用"
7403
7404#: builtin/name-rev.c:314
7405msgid "list all commits reachable from all refs"
7406msgstr "列出可以从所有引用访问的提交"
7407
7408#: builtin/name-rev.c:315
7409msgid "read from stdin"
7410msgstr "从标准输入读取"
7411
7412#: builtin/name-rev.c:316
7413msgid "allow to print `undefined` names (default)"
7414msgstr "允许打印 `未定义` 的名称(默认)"
7415
7416#: builtin/name-rev.c:322
7417msgid "dereference tags in the input (internal use)"
7418msgstr "反向解析输入中的 tags(内部使用)"
7419
7420#: builtin/notes.c:24
7421msgid "git notes [--ref <notes-ref>] [list [<object>]]"
7422msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7423
7424#: builtin/notes.c:25
7425msgid ""
7426"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7427"| (-c | -C) <object>] [<object>]"
7428msgstr ""
7429"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7430"| (-c | -C) <对象>] [<对象>]"
7431
7432#: builtin/notes.c:26
7433msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
7434msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7435
7436#: builtin/notes.c:27
7437msgid ""
7438"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7439"(-c | -C) <object>] [<object>]"
7440msgstr ""
7441"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7442"(-c | -C) <对象>] [<对象>]"
7443
7444#: builtin/notes.c:28
7445msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
7446msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
7447
7448#: builtin/notes.c:29
7449msgid "git notes [--ref <notes-ref>] show [<object>]"
7450msgstr "git notes [--ref <注解引用>] show [<对象>]"
7451
7452#: builtin/notes.c:30
7453msgid ""
7454"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
7455msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7456
7457#: builtin/notes.c:31
7458msgid "git notes merge --commit [-v | -q]"
7459msgstr "git notes merge --commit [-v | -q]"
7460
7461#: builtin/notes.c:32
7462msgid "git notes merge --abort [-v | -q]"
7463msgstr "git notes merge --abort [-v | -q]"
7464
7465#: builtin/notes.c:33
7466msgid "git notes [--ref <notes-ref>] remove [<object>...]"
7467msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7468
7469#: builtin/notes.c:34
7470msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
7471msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7472
7473#: builtin/notes.c:35
7474msgid "git notes [--ref <notes-ref>] get-ref"
7475msgstr "git notes [--ref <注解引用>] get-ref"
7476
7477#: builtin/notes.c:40
7478msgid "git notes [list [<object>]]"
7479msgstr "git notes [list [<对象>]]"
7480
7481#: builtin/notes.c:45
7482msgid "git notes add [<options>] [<object>]"
7483msgstr "git notes add [<选项>] [<对象>]"
7484
7485#: builtin/notes.c:50
7486msgid "git notes copy [<options>] <from-object> <to-object>"
7487msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7488
7489#: builtin/notes.c:51
7490msgid "git notes copy --stdin [<from-object> <to-object>]..."
7491msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7492
7493#: builtin/notes.c:56
7494msgid "git notes append [<options>] [<object>]"
7495msgstr "git notes append [<选项>] [<对象>]"
7496
7497#: builtin/notes.c:61
7498msgid "git notes edit [<object>]"
7499msgstr "git notes edit [<对象>]"
7500
7501#: builtin/notes.c:66
7502msgid "git notes show [<object>]"
7503msgstr "git notes show [<对象>]"
7504
7505#: builtin/notes.c:71
7506msgid "git notes merge [<options>] <notes-ref>"
7507msgstr "git notes merge [<选项>] <注解引用>"
7508
7509#: builtin/notes.c:72
7510msgid "git notes merge --commit [<options>]"
7511msgstr "git notes merge --commit [<选项>]"
7512
7513#: builtin/notes.c:73
7514msgid "git notes merge --abort [<options>]"
7515msgstr "git notes merge --abort [<选项>]"
7516
7517#: builtin/notes.c:78
7518msgid "git notes remove [<object>]"
7519msgstr "git notes remove [<对象>]"
7520
7521#: builtin/notes.c:83
7522msgid "git notes prune [<options>]"
7523msgstr "git notes prune [<选项>]"
7524
7525#: builtin/notes.c:88
7526msgid "git notes get-ref"
7527msgstr "git notes get-ref"
7528
7529#: builtin/notes.c:146
7530#, c-format
7531msgid "unable to start 'show' for object '%s'"
7532msgstr "不能为对象 '%s' 开始 'show'"
7533
7534#: builtin/notes.c:150
7535msgid "could not read 'show' output"
7536msgstr "不能读取 'show' 的输出"
7537
7538#: builtin/notes.c:158
7539#, c-format
7540msgid "failed to finish 'show' for object '%s'"
7541msgstr "无法为对象 '%s' 完成 'show'"
7542
7543#: builtin/notes.c:173 builtin/tag.c:477
7544#, c-format
7545msgid "could not create file '%s'"
7546msgstr "不能创建文件 '%s'"
7547
7548#: builtin/notes.c:192
7549msgid "Please supply the note contents using either -m or -F option"
7550msgstr "请通过 -m 或 -F 选项为注解提供内容"
7551
7552#: builtin/notes.c:201
7553msgid "unable to write note object"
7554msgstr "不能写注解对象"
7555
7556#: builtin/notes.c:203
7557#, c-format
7558msgid "The note contents have been left in %s"
7559msgstr "注解内容被留在 %s 中"
7560
7561#: builtin/notes.c:231 builtin/tag.c:693
7562#, c-format
7563msgid "cannot read '%s'"
7564msgstr "不能读取 '%s'"
7565
7566#: builtin/notes.c:233 builtin/tag.c:696
7567#, c-format
7568msgid "could not open or read '%s'"
7569msgstr "不能打开或读取 '%s'"
7570
7571#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7572#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7573#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7574#: builtin/notes.c:854 builtin/tag.c:709
7575#, c-format
7576msgid "Failed to resolve '%s' as a valid ref."
7577msgstr "无法解析 '%s' 为一个有效引用。"
7578
7579#: builtin/notes.c:255
7580#, c-format
7581msgid "Failed to read object '%s'."
7582msgstr "无法读取对象 '%s'。"
7583
7584#: builtin/notes.c:259
7585#, c-format
7586msgid "Cannot read note data from non-blob object '%s'."
7587msgstr "不能从非数据对象 '%s' 中读取注解数据"
7588
7589#: builtin/notes.c:299
7590#, c-format
7591msgid "Malformed input line: '%s'."
7592msgstr "非法的输入行:'%s'。"
7593
7594#: builtin/notes.c:314
7595#, c-format
7596msgid "Failed to copy notes from '%s' to '%s'"
7597msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7598
7599#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7600#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7601#: builtin/notes.c:919
7602msgid "too many parameters"
7603msgstr "参数太多"
7604
7605#: builtin/notes.c:371 builtin/notes.c:658
7606#, c-format
7607msgid "No note found for object %s."
7608msgstr "未发现对象 %s 的注解。"
7609
7610#: builtin/notes.c:392 builtin/notes.c:555
7611msgid "note contents as a string"
7612msgstr "注解内容作为一个字符串"
7613
7614#: builtin/notes.c:395 builtin/notes.c:558
7615msgid "note contents in a file"
7616msgstr "注解内容到一个文件中"
7617
7618#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7619#: builtin/notes.c:563 builtin/tag.c:628
7620msgid "object"
7621msgstr "对象"
7622
7623#: builtin/notes.c:398 builtin/notes.c:561
7624msgid "reuse and edit specified note object"
7625msgstr "重用和编辑指定的注解对象"
7626
7627#: builtin/notes.c:401 builtin/notes.c:564
7628msgid "reuse specified note object"
7629msgstr "重用指定的注解对象"
7630
7631#: builtin/notes.c:404 builtin/notes.c:567
7632msgid "allow storing empty note"
7633msgstr "允许保存空白注释"
7634
7635#: builtin/notes.c:405 builtin/notes.c:476
7636msgid "replace existing notes"
7637msgstr "替换已存在的注解"
7638
7639#: builtin/notes.c:430
7640#, c-format
7641msgid ""
7642"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7643"existing notes"
7644msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7645
7646#: builtin/notes.c:445 builtin/notes.c:524
7647#, c-format
7648msgid "Overwriting existing notes for object %s\n"
7649msgstr "覆盖对象 %s 现存注解\n"
7650
7651#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7652#, c-format
7653msgid "Removing note for object %s\n"
7654msgstr "删除对象 %s 的注解\n"
7655
7656#: builtin/notes.c:477
7657msgid "read objects from stdin"
7658msgstr "从标准输入读取对象"
7659
7660#: builtin/notes.c:479
7661msgid "load rewriting config for <command> (implies --stdin)"
7662msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7663
7664#: builtin/notes.c:497
7665msgid "too few parameters"
7666msgstr "参数太少"
7667
7668#: builtin/notes.c:518
7669#, c-format
7670msgid ""
7671"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7672"existing notes"
7673msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7674
7675#: builtin/notes.c:530
7676#, c-format
7677msgid "Missing notes on source object %s. Cannot copy."
7678msgstr "源对象 %s 缺少注解。不能拷贝。"
7679
7680#: builtin/notes.c:582
7681#, c-format
7682msgid ""
7683"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7684"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7685msgstr ""
7686"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7687"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7688
7689#: builtin/notes.c:750
7690msgid "General options"
7691msgstr "通用选项"
7692
7693#: builtin/notes.c:752
7694msgid "Merge options"
7695msgstr "合并选项"
7696
7697#: builtin/notes.c:754
7698msgid ""
7699"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7700"cat_sort_uniq)"
7701msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7702
7703#: builtin/notes.c:756
7704msgid "Committing unmerged notes"
7705msgstr "提交未合并的注解"
7706
7707#: builtin/notes.c:758
7708msgid "finalize notes merge by committing unmerged notes"
7709msgstr "通过提交未合并的注解来完成注解合并"
7710
7711#: builtin/notes.c:760
7712msgid "Aborting notes merge resolution"
7713msgstr "中止注解合并的方案"
7714
7715#: builtin/notes.c:762
7716msgid "abort notes merge"
7717msgstr "中止注解合并"
7718
7719#: builtin/notes.c:857
7720#, c-format
7721msgid "Object %s has no note\n"
7722msgstr "对象 %s 没有注解\n"
7723
7724#: builtin/notes.c:869
7725msgid "attempt to remove non-existent note is not an error"
7726msgstr "尝试删除不存在的注解不是一个错误"
7727
7728#: builtin/notes.c:872
7729msgid "read object names from the standard input"
7730msgstr "从标准输入读取对象名称"
7731
7732#: builtin/notes.c:953
7733msgid "notes-ref"
7734msgstr "注解引用"
7735
7736#: builtin/notes.c:954
7737msgid "use notes from <notes-ref>"
7738msgstr "从 <注解引用> 使用注解"
7739
7740#: builtin/notes.c:989 builtin/remote.c:1621
7741#, c-format
7742msgid "Unknown subcommand: %s"
7743msgstr "未知子命令:%s"
7744
7745#: builtin/pack-objects.c:28
7746msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7747msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7748
7749#: builtin/pack-objects.c:29
7750msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7751msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7752
7753#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7754#, c-format
7755msgid "deflate error (%d)"
7756msgstr "压缩错误 (%d)"
7757
7758#: builtin/pack-objects.c:771
7759msgid "Writing objects"
7760msgstr "写入对象中"
7761
7762#: builtin/pack-objects.c:1013
7763msgid "disabling bitmap writing, as some objects are not being packed"
7764msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7765
7766#: builtin/pack-objects.c:2173
7767msgid "Compressing objects"
7768msgstr "压缩对象中"
7769
7770#: builtin/pack-objects.c:2570
7771#, c-format
7772msgid "unsupported index version %s"
7773msgstr "不支持的索引版本 %s"
7774
7775#: builtin/pack-objects.c:2574
7776#, c-format
7777msgid "bad index version '%s'"
7778msgstr "坏的索引版本 '%s'"
7779
7780#: builtin/pack-objects.c:2597
7781#, c-format
7782msgid "option %s does not accept negative form"
7783msgstr "选项 %s 不接受否定格式"
7784
7785#: builtin/pack-objects.c:2601
7786#, c-format
7787msgid "unable to parse value '%s' for option %s"
7788msgstr "不能解析选项 %1$s 的值 '%2$s'"
7789
7790#: builtin/pack-objects.c:2621
7791msgid "do not show progress meter"
7792msgstr "不显示进度表"
7793
7794#: builtin/pack-objects.c:2623
7795msgid "show progress meter"
7796msgstr "显示进度表"
7797
7798#: builtin/pack-objects.c:2625
7799msgid "show progress meter during object writing phase"
7800msgstr "在对象写入阶段显示进度表"
7801
7802#: builtin/pack-objects.c:2628
7803msgid "similar to --all-progress when progress meter is shown"
7804msgstr "当进度表显示时类似于 --all-progress"
7805
7806#: builtin/pack-objects.c:2629
7807msgid "version[,offset]"
7808msgstr "版本[,偏移]"
7809
7810#: builtin/pack-objects.c:2630
7811msgid "write the pack index file in the specified idx format version"
7812msgstr "用指定的 idx 格式版本来写包索引文件"
7813
7814#: builtin/pack-objects.c:2633
7815msgid "maximum size of each output pack file"
7816msgstr "每个输出包的最大尺寸"
7817
7818#: builtin/pack-objects.c:2635
7819msgid "ignore borrowed objects from alternate object store"
7820msgstr "忽略从替代对象存储里借用对象"
7821
7822#: builtin/pack-objects.c:2637
7823msgid "ignore packed objects"
7824msgstr "忽略包对象"
7825
7826#: builtin/pack-objects.c:2639
7827msgid "limit pack window by objects"
7828msgstr "限制打包窗口的对象数"
7829
7830#: builtin/pack-objects.c:2641
7831msgid "limit pack window by memory in addition to object limit"
7832msgstr "除对象数量限制外设置打包窗口的内存限制"
7833
7834#: builtin/pack-objects.c:2643
7835msgid "maximum length of delta chain allowed in the resulting pack"
7836msgstr "打包允许的 delta 链的最大长度"
7837
7838#: builtin/pack-objects.c:2645
7839msgid "reuse existing deltas"
7840msgstr "重用已存在的 deltas"
7841
7842#: builtin/pack-objects.c:2647
7843msgid "reuse existing objects"
7844msgstr "重用已存在的对象"
7845
7846#: builtin/pack-objects.c:2649
7847msgid "use OFS_DELTA objects"
7848msgstr "使用 OFS_DELTA 对象"
7849
7850#: builtin/pack-objects.c:2651
7851msgid "use threads when searching for best delta matches"
7852msgstr "使用线程查询最佳 delta 匹配"
7853
7854#: builtin/pack-objects.c:2653
7855msgid "do not create an empty pack output"
7856msgstr "不创建空的包输出"
7857
7858#: builtin/pack-objects.c:2655
7859msgid "read revision arguments from standard input"
7860msgstr "从标准输入读取版本号参数"
7861
7862#: builtin/pack-objects.c:2657
7863msgid "limit the objects to those that are not yet packed"
7864msgstr "限制那些尚未打包的对象"
7865
7866#: builtin/pack-objects.c:2660
7867msgid "include objects reachable from any reference"
7868msgstr "包括可以从任何引用访问到的对象"
7869
7870#: builtin/pack-objects.c:2663
7871msgid "include objects referred by reflog entries"
7872msgstr "包括被引用日志引用到的对象"
7873
7874#: builtin/pack-objects.c:2666
7875msgid "include objects referred to by the index"
7876msgstr "包括被索引引用到的对象"
7877
7878#: builtin/pack-objects.c:2669
7879msgid "output pack to stdout"
7880msgstr "输出包到标准输出"
7881
7882#: builtin/pack-objects.c:2671
7883msgid "include tag objects that refer to objects to be packed"
7884msgstr "包括引用了打包对象的 tag"
7885
7886#: builtin/pack-objects.c:2673
7887msgid "keep unreachable objects"
7888msgstr "维持不可达的对象"
7889
7890#: builtin/pack-objects.c:2674 parse-options.h:140
7891msgid "time"
7892msgstr "时间"
7893
7894#: builtin/pack-objects.c:2675
7895msgid "unpack unreachable objects newer than <time>"
7896msgstr "将比给定 <时间> 新的无法访问的对象解包"
7897
7898#: builtin/pack-objects.c:2678
7899msgid "create thin packs"
7900msgstr "创建精简包"
7901
7902#: builtin/pack-objects.c:2680
7903msgid "create packs suitable for shallow fetches"
7904msgstr "创建适合浅克隆版本库获取的包"
7905
7906#: builtin/pack-objects.c:2682
7907msgid "ignore packs that have companion .keep file"
7908msgstr "忽略配有 .keep 文件的包"
7909
7910#: builtin/pack-objects.c:2684
7911msgid "pack compression level"
7912msgstr "打包压缩级别"
7913
7914#: builtin/pack-objects.c:2686
7915msgid "do not hide commits by grafts"
7916msgstr "显示被嫁接隐藏的提交"
7917
7918#: builtin/pack-objects.c:2688
7919msgid "use a bitmap index if available to speed up counting objects"
7920msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
7921
7922#: builtin/pack-objects.c:2690
7923msgid "write a bitmap index together with the pack index"
7924msgstr "在建立包索引的同时创建 bitmap 索引"
7925
7926#: builtin/pack-objects.c:2781
7927msgid "Counting objects"
7928msgstr "对象计数中"
7929
7930#: builtin/pack-refs.c:6
7931msgid "git pack-refs [<options>]"
7932msgstr "git pack-refs [<选项>]"
7933
7934#: builtin/pack-refs.c:14
7935msgid "pack everything"
7936msgstr "打包一切"
7937
7938#: builtin/pack-refs.c:15
7939msgid "prune loose refs (default)"
7940msgstr "清除松散的引用(默认)"
7941
7942#: builtin/prune-packed.c:7
7943msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
7944msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
7945
7946#: builtin/prune-packed.c:40
7947msgid "Removing duplicate objects"
7948msgstr "正在删除重复对象"
7949
7950#: builtin/prune.c:12
7951msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7952msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7953
7954#: builtin/prune.c:106
7955msgid "do not remove, show only"
7956msgstr "不删除,只显示"
7957
7958#: builtin/prune.c:107
7959msgid "report pruned objects"
7960msgstr "报告清除的对象"
7961
7962#: builtin/prune.c:110
7963msgid "expire objects older than <time>"
7964msgstr "使早于给定时间的对象过期"
7965
7966#: builtin/push.c:14
7967msgid "git push [<options>] [<repository> [<refspec>...]]"
7968msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7969
7970#: builtin/push.c:85
7971msgid "tag shorthand without <tag>"
7972msgstr "tag 后面未提供 <标签> 参数"
7973
7974#: builtin/push.c:95
7975msgid "--delete only accepts plain target ref names"
7976msgstr "--delete 只接受简单的目标引用名"
7977
7978#: builtin/push.c:139
7979msgid ""
7980"\n"
7981"To choose either option permanently, see push.default in 'git help config'."
7982msgstr ""
7983"\n"
7984"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7985
7986#: builtin/push.c:142
7987#, c-format
7988msgid ""
7989"The upstream branch of your current branch does not match\n"
7990"the name of your current branch. To push to the upstream branch\n"
7991"on the remote, use\n"
7992"\n"
7993" git push %s HEAD:%s\n"
7994"\n"
7995"To push to the branch of the same name on the remote, use\n"
7996"\n"
7997" git push %s %s\n"
7998"%s"
7999msgstr ""
8000"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8001"上游分支,使用\n"
8002"\n"
8003" git push %s HEAD:%s\n"
8004"\n"
8005"为推送至远程同名分支,使用\n"
8006"\n"
8007" git push %s %s\n"
8008"%s"
8009
8010#: builtin/push.c:157
8011#, c-format
8012msgid ""
8013"You are not currently on a branch.\n"
8014"To push the history leading to the current (detached HEAD)\n"
8015"state now, use\n"
8016"\n"
8017" git push %s HEAD:<name-of-remote-branch>\n"
8018msgstr ""
8019"您当前不在一个分支上。\n"
8020"现在为推送当前(分离头指针)的历史,使用\n"
8021"\n"
8022" git push %s HEAD:<远程分支名字>\n"
8023
8024#: builtin/push.c:171
8025#, c-format
8026msgid ""
8027"The current branch %s has no upstream branch.\n"
8028"To push the current branch and set the remote as upstream, use\n"
8029"\n"
8030" git push --set-upstream %s %s\n"
8031msgstr ""
8032"当前分支 %s 没有对应的上游分支。\n"
8033"为推送当前分支并建立与远程上游的跟踪,使用\n"
8034"\n"
8035" git push --set-upstream %s %s\n"
8036
8037#: builtin/push.c:179
8038#, c-format
8039msgid "The current branch %s has multiple upstream branches, refusing to push."
8040msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8041
8042#: builtin/push.c:182
8043#, c-format
8044msgid ""
8045"You are pushing to remote '%s', which is not the upstream of\n"
8046"your current branch '%s', without telling me what to push\n"
8047"to update which remote branch."
8048msgstr ""
8049"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8050"而没有告诉我要推送什么、更新哪个远程分支。"
8051
8052# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
8053#: builtin/push.c:205
8054msgid ""
8055"push.default is unset; its implicit value has changed in\n"
8056"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8057"and maintain the traditional behavior, use:\n"
8058"\n"
8059" git config --global push.default matching\n"
8060"\n"
8061"To squelch this message and adopt the new behavior now, use:\n"
8062"\n"
8063" git config --global push.default simple\n"
8064"\n"
8065"When push.default is set to 'matching', git will push local branches\n"
8066"to the remote branches that already exist with the same name.\n"
8067"\n"
8068"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8069"behavior, which only pushes the current branch to the corresponding\n"
8070"remote branch that 'git pull' uses to update the current branch.\n"
8071"\n"
8072"See 'git help config' and search for 'push.default' for further "
8073"information.\n"
8074"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8075"'current' instead of 'simple' if you sometimes use older versions of Git)"
8076msgstr ""
8077"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
8078"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
8079"\n"
8080" git config --global push.default matching\n"
8081"\n"
8082"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8083"\n"
8084" git config --global push.default simple\n"
8085"\n"
8086"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8087"本地分支。\n"
8088"\n"
8089"从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
8090"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8091"\n"
8092"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8093"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
8094"为保持兼容,请用 'current' 代替 'simple')"
8095
8096#: builtin/push.c:272
8097msgid ""
8098"You didn't specify any refspecs to push, and push.default is \"nothing\"."
8099msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
8100
8101#: builtin/push.c:279
8102msgid ""
8103"Updates were rejected because the tip of your current branch is behind\n"
8104"its remote counterpart. Integrate the remote changes (e.g.\n"
8105"'git pull ...') before pushing again.\n"
8106"See the 'Note about fast-forwards' in 'git push --help' for details."
8107msgstr ""
8108"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
8109"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
8110"'git push --help' 中的 'Note about fast-forwards' 小节。"
8111
8112#: builtin/push.c:285
8113msgid ""
8114"Updates were rejected because a pushed branch tip is behind its remote\n"
8115"counterpart. Check out this branch and integrate the remote changes\n"
8116"(e.g. 'git pull ...') before pushing again.\n"
8117"See the 'Note about fast-forwards' in 'git push --help' for details."
8118msgstr ""
8119"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8120"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
8121"'git push --help' 中的 'Note about fast-forwards' 小节。"
8122
8123#: builtin/push.c:291
8124msgid ""
8125"Updates were rejected because the remote contains work that you do\n"
8126"not have locally. This is usually caused by another repository pushing\n"
8127"to the same ref. You may want to first integrate the remote changes\n"
8128"(e.g., 'git pull ...') before pushing again.\n"
8129"See the 'Note about fast-forwards' in 'git push --help' for details."
8130msgstr ""
8131"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
8132"一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8133"(如 'git pull ...')。\n"
8134"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8135
8136#: builtin/push.c:298
8137msgid "Updates were rejected because the tag already exists in the remote."
8138msgstr "更新被拒绝因为 tag 在远程已经存在。"
8139
8140#: builtin/push.c:301
8141msgid ""
8142"You cannot update a remote ref that points at a non-commit object,\n"
8143"or update a remote ref to make it point at a non-commit object,\n"
8144"without using the '--force' option.\n"
8145msgstr ""
8146"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8147"也不能更新远程引用让其指向一个非提交对象。\n"
8148
8149#: builtin/push.c:360
8150#, c-format
8151msgid "Pushing to %s\n"
8152msgstr "推送到 %s\n"
8153
8154#: builtin/push.c:364
8155#, c-format
8156msgid "failed to push some refs to '%s'"
8157msgstr "无法推送一些引用到 '%s'"
8158
8159#: builtin/push.c:394
8160#, c-format
8161msgid "bad repository '%s'"
8162msgstr "坏的版本库 '%s'"
8163
8164#: builtin/push.c:395
8165msgid ""
8166"No configured push destination.\n"
8167"Either specify the URL from the command-line or configure a remote "
8168"repository using\n"
8169"\n"
8170" git remote add <name> <url>\n"
8171"\n"
8172"and then push using the remote name\n"
8173"\n"
8174" git push <name>\n"
8175msgstr ""
8176"没有配置推送目标。\n"
8177"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
8178"\n"
8179" git remote add <名称> <地址>\n"
8180"\n"
8181"然后使用该远程版本库名执行推送\n"
8182"\n"
8183" git push <名称>\n"
8184
8185#: builtin/push.c:410
8186msgid "--all and --tags are incompatible"
8187msgstr "--all 和 --tags 不兼容"
8188
8189#: builtin/push.c:411
8190msgid "--all can't be combined with refspecs"
8191msgstr "--all 不能和引用规则同时使用"
8192
8193#: builtin/push.c:416
8194msgid "--mirror and --tags are incompatible"
8195msgstr "--mirror 和 --tags 不兼容"
8196
8197#: builtin/push.c:417
8198msgid "--mirror can't be combined with refspecs"
8199msgstr "--mirror 不能和引用规则同时使用"
8200
8201#: builtin/push.c:422
8202msgid "--all and --mirror are incompatible"
8203msgstr "--all 和 --mirror 不兼容"
8204
8205#: builtin/push.c:502
8206msgid "repository"
8207msgstr "版本库"
8208
8209#: builtin/push.c:503
8210msgid "push all refs"
8211msgstr "推送所有引用"
8212
8213#: builtin/push.c:504
8214msgid "mirror all refs"
8215msgstr "镜像所有引用"
8216
8217#: builtin/push.c:506
8218msgid "delete refs"
8219msgstr "删除引用"
8220
8221#: builtin/push.c:507
8222msgid "push tags (can't be used with --all or --mirror)"
8223msgstr "推送 tags(不能使用 --all or --mirror)"
8224
8225#: builtin/push.c:510
8226msgid "force updates"
8227msgstr "强制更新"
8228
8229#: builtin/push.c:512
8230msgid "refname>:<expect"
8231msgstr "引用名>:<期望值"
8232
8233#: builtin/push.c:513
8234msgid "require old value of ref to be at this value"
8235msgstr "要求引用旧的取值为设定值"
8236
8237#: builtin/push.c:516
8238msgid "control recursive pushing of submodules"
8239msgstr "控制子模组的递归推送"
8240
8241#: builtin/push.c:518
8242msgid "use thin pack"
8243msgstr "使用精简打包"
8244
8245#: builtin/push.c:519 builtin/push.c:520
8246msgid "receive pack program"
8247msgstr "接收包程序"
8248
8249#: builtin/push.c:521
8250msgid "set upstream for git pull/status"
8251msgstr "设置 git pull/status 的上游"
8252
8253#: builtin/push.c:524
8254msgid "prune locally removed refs"
8255msgstr "清除本地删除的引用"
8256
8257#: builtin/push.c:526
8258msgid "bypass pre-push hook"
8259msgstr "绕过 pre-push 钩子"
8260
8261#: builtin/push.c:527
8262msgid "push missing but relevant tags"
8263msgstr "推送缺失的有关的 tags"
8264
8265#: builtin/push.c:529
8266msgid "GPG sign the push"
8267msgstr "用 GPG 为推送签名"
8268
8269#: builtin/push.c:530
8270msgid "request atomic transaction on remote side"
8271msgstr "需要远端支持原子事务"
8272
8273#: builtin/push.c:539
8274msgid "--delete is incompatible with --all, --mirror and --tags"
8275msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8276
8277#: builtin/push.c:541
8278msgid "--delete doesn't make sense without any refs"
8279msgstr "--delete 未接任何引用没有意义"
8280
8281#: builtin/read-tree.c:37
8282msgid ""
8283"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8284"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8285"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8286msgstr ""
8287"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8288"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8289"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
8290
8291#: builtin/read-tree.c:110
8292msgid "write resulting index to <file>"
8293msgstr "将索引结果写入 <文件>"
8294
8295#: builtin/read-tree.c:113
8296msgid "only empty the index"
8297msgstr "只是清空索引"
8298
8299#: builtin/read-tree.c:115
8300msgid "Merging"
8301msgstr "合并"
8302
8303#: builtin/read-tree.c:117
8304msgid "perform a merge in addition to a read"
8305msgstr "读取之余再执行一个合并"
8306
8307#: builtin/read-tree.c:119
8308msgid "3-way merge if no file level merging required"
8309msgstr "如果没有文件级合并需要,执行三路合并"
8310
8311#: builtin/read-tree.c:121
8312msgid "3-way merge in presence of adds and removes"
8313msgstr "存在添加和删除时,也执行三路合并"
8314
8315#: builtin/read-tree.c:123
8316msgid "same as -m, but discard unmerged entries"
8317msgstr "类似于 -m,但丢弃未合并的条目"
8318
8319#: builtin/read-tree.c:124
8320msgid "<subdirectory>/"
8321msgstr "<子目录>/"
8322
8323#: builtin/read-tree.c:125
8324msgid "read the tree into the index under <subdirectory>/"
8325msgstr "读取树对象到索引的 <子目录>/ 下"
8326
8327#: builtin/read-tree.c:128
8328msgid "update working tree with merge result"
8329msgstr "用合并的结果更新工作区"
8330
8331#: builtin/read-tree.c:130
8332msgid "gitignore"
8333msgstr "gitignore"
8334
8335#: builtin/read-tree.c:131
8336msgid "allow explicitly ignored files to be overwritten"
8337msgstr "允许忽略文件中设定的文件可以被覆盖"
8338
8339#: builtin/read-tree.c:134
8340msgid "don't check the working tree after merging"
8341msgstr "合并后不检查工作区"
8342
8343#: builtin/read-tree.c:135
8344msgid "don't update the index or the work tree"
8345msgstr "不更新索引区和工作区"
8346
8347#: builtin/read-tree.c:137
8348msgid "skip applying sparse checkout filter"
8349msgstr "跳过应用稀疏检出过滤器"
8350
8351#: builtin/read-tree.c:139
8352msgid "debug unpack-trees"
8353msgstr "调试 unpack-trees"
8354
8355#: builtin/reflog.c:429
8356#, c-format
8357msgid "%s' for '%s' is not a valid timestamp"
8358msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8359
8360#: builtin/reflog.c:546 builtin/reflog.c:551
8361#, c-format
8362msgid "'%s' is not a valid timestamp"
8363msgstr "'%s' 不是一个有效的时间戳"
8364
8365#: builtin/remote.c:12
8366msgid "git remote [-v | --verbose]"
8367msgstr "git remote [-v | --verbose]"
8368
8369#: builtin/remote.c:13
8370msgid ""
8371"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
8372"mirror=<fetch|push>] <name> <url>"
8373msgstr ""
8374"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
8375"mirror=<fetch|push>] <名称> <地址>"
8376
8377#: builtin/remote.c:14 builtin/remote.c:33
8378msgid "git remote rename <old> <new>"
8379msgstr "git remote rename <旧名称> <新名称>"
8380
8381#: builtin/remote.c:15 builtin/remote.c:38
8382msgid "git remote remove <name>"
8383msgstr "git remote remove <名称>"
8384
8385#: builtin/remote.c:16 builtin/remote.c:43
8386msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8387msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8388
8389#: builtin/remote.c:17
8390msgid "git remote [-v | --verbose] show [-n] <name>"
8391msgstr "git remote [-v | --verbose] show [-n] <名称>"
8392
8393#: builtin/remote.c:18
8394msgid "git remote prune [-n | --dry-run] <name>"
8395msgstr "git remote prune [-n | --dry-run] <名称>"
8396
8397#: builtin/remote.c:19
8398msgid ""
8399"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8400msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8401
8402#: builtin/remote.c:20
8403msgid "git remote set-branches [--add] <name> <branch>..."
8404msgstr "git remote set-branches [--add] <名称> <分支>..."
8405
8406#: builtin/remote.c:21 builtin/remote.c:69
8407msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8408msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8409
8410#: builtin/remote.c:22 builtin/remote.c:70
8411msgid "git remote set-url --add <name> <newurl>"
8412msgstr "git remote set-url --add <名称> <新的地址>"
8413
8414#: builtin/remote.c:23 builtin/remote.c:71
8415msgid "git remote set-url --delete <name> <url>"
8416msgstr "git remote set-url --delete <名称> <地址>"
8417
8418#: builtin/remote.c:28
8419msgid "git remote add [<options>] <name> <url>"
8420msgstr "git remote add [<选项>] <名称> <地址>"
8421
8422#: builtin/remote.c:48
8423msgid "git remote set-branches <name> <branch>..."
8424msgstr "git remote set-branches <名称> <分支>..."
8425
8426#: builtin/remote.c:49
8427msgid "git remote set-branches --add <name> <branch>..."
8428msgstr "git remote set-branches --add <名称> <分支>..."
8429
8430#: builtin/remote.c:54
8431msgid "git remote show [<options>] <name>"
8432msgstr "git remote show [<选项>] <名称>"
8433
8434#: builtin/remote.c:59
8435msgid "git remote prune [<options>] <name>"
8436msgstr "git remote prune [<选项>] <名称>"
8437
8438#: builtin/remote.c:64
8439msgid "git remote update [<options>] [<group> | <remote>]..."
8440msgstr "git remote update [<选项>] [<组> | <远程>]..."
8441
8442#: builtin/remote.c:88
8443#, c-format
8444msgid "Updating %s"
8445msgstr "更新 %s 中"
8446
8447#: builtin/remote.c:120
8448msgid ""
8449"--mirror is dangerous and deprecated; please\n"
8450"\t use --mirror=fetch or --mirror=push instead"
8451msgstr ""
8452"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8453"\t 或 --mirror=push"
8454
8455#: builtin/remote.c:137
8456#, c-format
8457msgid "unknown mirror argument: %s"
8458msgstr "未知的镜像参数:%s"
8459
8460#: builtin/remote.c:153
8461msgid "fetch the remote branches"
8462msgstr "抓取远程的分支"
8463
8464#: builtin/remote.c:155
8465msgid "import all tags and associated objects when fetching"
8466msgstr "抓取时导入所有的 tags 和关联对象"
8467
8468#: builtin/remote.c:158
8469msgid "or do not fetch any tag at all (--no-tags)"
8470msgstr "或不抓取任何 tag(--no-tags)"
8471
8472#: builtin/remote.c:160
8473msgid "branch(es) to track"
8474msgstr "跟踪的分支"
8475
8476#: builtin/remote.c:161
8477msgid "master branch"
8478msgstr "主线分支"
8479
8480#: builtin/remote.c:162
8481msgid "push|fetch"
8482msgstr "push|fetch"
8483
8484#: builtin/remote.c:163
8485msgid "set up remote as a mirror to push to or fetch from"
8486msgstr "把远程设置为用以推送或抓取的镜像"
8487
8488#: builtin/remote.c:175
8489msgid "specifying a master branch makes no sense with --mirror"
8490msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8491
8492#: builtin/remote.c:177
8493msgid "specifying branches to track makes sense only with fetch mirrors"
8494msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8495
8496#: builtin/remote.c:187 builtin/remote.c:643
8497#, c-format
8498msgid "remote %s already exists."
8499msgstr "远程 %s 已经存在。"
8500
8501#: builtin/remote.c:191 builtin/remote.c:647
8502#, c-format
8503msgid "'%s' is not a valid remote name"
8504msgstr "'%s' 不是一个有效的远程名称"
8505
8506#: builtin/remote.c:235
8507#, c-format
8508msgid "Could not setup master '%s'"
8509msgstr "无法设置 master '%s'"
8510
8511#: builtin/remote.c:335
8512#, c-format
8513msgid "Could not get fetch map for refspec %s"
8514msgstr "无法得到引用规则 %s 的获取列表"
8515
8516#: builtin/remote.c:436 builtin/remote.c:444
8517msgid "(matching)"
8518msgstr "(匹配)"
8519
8520#: builtin/remote.c:448
8521msgid "(delete)"
8522msgstr "(删除)"
8523
8524#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604
8525#, c-format
8526msgid "Could not append '%s' to '%s'"
8527msgstr "不能添加 '%s' 至 '%s'"
8528
8529#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895
8530#, c-format
8531msgid "No such remote: %s"
8532msgstr "没有这样的远程:%s"
8533
8534#: builtin/remote.c:653
8535#, c-format
8536msgid "Could not rename config section '%s' to '%s'"
8537msgstr "不能重命名配置小节 '%s' 到 '%s'"
8538
8539#: builtin/remote.c:659 builtin/remote.c:847
8540#, c-format
8541msgid "Could not remove config section '%s'"
8542msgstr "不能移除配置小节 '%s'"
8543
8544#: builtin/remote.c:674
8545#, c-format
8546msgid ""
8547"Not updating non-default fetch refspec\n"
8548"\t%s\n"
8549"\tPlease update the configuration manually if necessary."
8550msgstr ""
8551"没有更新非默认的获取引用规则\n"
8552"\t%s\n"
8553"\t如果必要请手动更新配置。"
8554
8555#: builtin/remote.c:680
8556#, c-format
8557msgid "Could not append '%s'"
8558msgstr "不能追加 '%s'"
8559
8560#: builtin/remote.c:691
8561#, c-format
8562msgid "Could not set '%s'"
8563msgstr "不能设置 '%s'"
8564
8565#: builtin/remote.c:713
8566#, c-format
8567msgid "deleting '%s' failed"
8568msgstr "删除 '%s' 失败"
8569
8570#: builtin/remote.c:747
8571#, c-format
8572msgid "creating '%s' failed"
8573msgstr "创建 '%s' 失败"
8574
8575#: builtin/remote.c:766
8576#, c-format
8577msgid "Could not remove branch %s"
8578msgstr "无法移除分支 %s"
8579
8580#: builtin/remote.c:833
8581msgid ""
8582"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8583"to delete it, use:"
8584msgid_plural ""
8585"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8586"to delete them, use:"
8587msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8588msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8589
8590#: builtin/remote.c:948
8591#, c-format
8592msgid " new (next fetch will store in remotes/%s)"
8593msgstr " 新的(下一次获取将存储于 remotes/%s)"
8594
8595#: builtin/remote.c:951
8596msgid " tracked"
8597msgstr " 已跟踪"
8598
8599#: builtin/remote.c:953
8600msgid " stale (use 'git remote prune' to remove)"
8601msgstr " 过时(使用 'git remote prune' 来移除)"
8602
8603#: builtin/remote.c:955
8604msgid " ???"
8605msgstr " ???"
8606
8607#: builtin/remote.c:996
8608#, c-format
8609msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8610msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8611
8612#: builtin/remote.c:1003
8613#, c-format
8614msgid "rebases onto remote %s"
8615msgstr "变基到远程 %s"
8616
8617#: builtin/remote.c:1006
8618#, c-format
8619msgid " merges with remote %s"
8620msgstr " 与远程 %s 合并"
8621
8622#: builtin/remote.c:1007
8623msgid " and with remote"
8624msgstr " 且有远程"
8625
8626#: builtin/remote.c:1009
8627#, c-format
8628msgid "merges with remote %s"
8629msgstr "与远程 %s 合并"
8630
8631#: builtin/remote.c:1010
8632msgid " and with remote"
8633msgstr " 且有远程"
8634
8635#: builtin/remote.c:1056
8636msgid "create"
8637msgstr "创建"
8638
8639#: builtin/remote.c:1059
8640msgid "delete"
8641msgstr "删除"
8642
8643#: builtin/remote.c:1063
8644msgid "up to date"
8645msgstr "最新"
8646
8647#: builtin/remote.c:1066
8648msgid "fast-forwardable"
8649msgstr "可快进"
8650
8651#: builtin/remote.c:1069
8652msgid "local out of date"
8653msgstr "本地已过时"
8654
8655#: builtin/remote.c:1076
8656#, c-format
8657msgid " %-*s forces to %-*s (%s)"
8658msgstr " %-*s 强制推送至 %-*s (%s)"
8659
8660#: builtin/remote.c:1079
8661#, c-format
8662msgid " %-*s pushes to %-*s (%s)"
8663msgstr " %-*s 推送至 %-*s (%s)"
8664
8665#: builtin/remote.c:1083
8666#, c-format
8667msgid " %-*s forces to %s"
8668msgstr " %-*s 强制推送至 %s"
8669
8670#: builtin/remote.c:1086
8671#, c-format
8672msgid " %-*s pushes to %s"
8673msgstr " %-*s 推送至 %s"
8674
8675#: builtin/remote.c:1154
8676msgid "do not query remotes"
8677msgstr "不查询远程"
8678
8679#: builtin/remote.c:1181
8680#, c-format
8681msgid "* remote %s"
8682msgstr "* 远程 %s"
8683
8684#: builtin/remote.c:1182
8685#, c-format
8686msgid " Fetch URL: %s"
8687msgstr " 获取地址:%s"
8688
8689#: builtin/remote.c:1183 builtin/remote.c:1334
8690msgid "(no URL)"
8691msgstr "(无 URL)"
8692
8693#: builtin/remote.c:1192 builtin/remote.c:1194
8694#, c-format
8695msgid " Push URL: %s"
8696msgstr " 推送地址:%s"
8697
8698#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200
8699#, c-format
8700msgid " HEAD branch: %s"
8701msgstr " HEAD分支:%s"
8702
8703#: builtin/remote.c:1202
8704#, c-format
8705msgid ""
8706" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8707msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8708
8709#: builtin/remote.c:1214
8710#, c-format
8711msgid " Remote branch:%s"
8712msgid_plural " Remote branches:%s"
8713msgstr[0] " 远程分支:%s"
8714msgstr[1] " 远程分支:%s"
8715
8716# 译者:中文字符串拼接,可删除前导空格
8717#: builtin/remote.c:1217 builtin/remote.c:1244
8718msgid " (status not queried)"
8719msgstr "(状态未查询)"
8720
8721#: builtin/remote.c:1226
8722msgid " Local branch configured for 'git pull':"
8723msgid_plural " Local branches configured for 'git pull':"
8724msgstr[0] " 为 'git pull' 配置的本地分支:"
8725msgstr[1] " 为 'git pull' 配置的本地分支:"
8726
8727#: builtin/remote.c:1234
8728msgid " Local refs will be mirrored by 'git push'"
8729msgstr " 本地引用将在 'git push' 时被镜像"
8730
8731#: builtin/remote.c:1241
8732#, c-format
8733msgid " Local ref configured for 'git push'%s:"
8734msgid_plural " Local refs configured for 'git push'%s:"
8735msgstr[0] " 为 'git push' 配置的本地引用%s:"
8736msgstr[1] " 为 'git push' 配置的本地引用%s:"
8737
8738#: builtin/remote.c:1262
8739msgid "set refs/remotes/<name>/HEAD according to remote"
8740msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8741
8742#: builtin/remote.c:1264
8743msgid "delete refs/remotes/<name>/HEAD"
8744msgstr "删除 refs/remotes/<名称>/HEAD"
8745
8746#: builtin/remote.c:1279
8747msgid "Cannot determine remote HEAD"
8748msgstr "无法确定远程 HEAD"
8749
8750#: builtin/remote.c:1281
8751msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8752msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8753
8754#: builtin/remote.c:1291
8755#, c-format
8756msgid "Could not delete %s"
8757msgstr "无法删除 %s"
8758
8759#: builtin/remote.c:1299
8760#, c-format
8761msgid "Not a valid ref: %s"
8762msgstr "不是一个有效引用:%s"
8763
8764#: builtin/remote.c:1301
8765#, c-format
8766msgid "Could not setup %s"
8767msgstr "不能设置 %s"
8768
8769# 译者:注意保持前导空格
8770#: builtin/remote.c:1319
8771#, c-format
8772msgid " %s will become dangling!"
8773msgstr " %s 将成为摇摆状态!"
8774
8775# 译者:注意保持前导空格
8776#: builtin/remote.c:1320
8777#, c-format
8778msgid " %s has become dangling!"
8779msgstr " %s 已成为摇摆状态!"
8780
8781#: builtin/remote.c:1330
8782#, c-format
8783msgid "Pruning %s"
8784msgstr "修剪 %s"
8785
8786#: builtin/remote.c:1331
8787#, c-format
8788msgid "URL: %s"
8789msgstr "URL:%s"
8790
8791#: builtin/remote.c:1354
8792#, c-format
8793msgid " * [would prune] %s"
8794msgstr " * [将删除] %s"
8795
8796#: builtin/remote.c:1357
8797#, c-format
8798msgid " * [pruned] %s"
8799msgstr " * [已删除] %s"
8800
8801#: builtin/remote.c:1402
8802msgid "prune remotes after fetching"
8803msgstr "抓取后清除远程"
8804
8805#: builtin/remote.c:1468 builtin/remote.c:1542
8806#, c-format
8807msgid "No such remote '%s'"
8808msgstr "没有此远程 '%s'"
8809
8810#: builtin/remote.c:1488
8811msgid "add branch"
8812msgstr "添加分支"
8813
8814#: builtin/remote.c:1495
8815msgid "no remote specified"
8816msgstr "未指定远程"
8817
8818#: builtin/remote.c:1517
8819msgid "manipulate push URLs"
8820msgstr "操作推送 URLS"
8821
8822#: builtin/remote.c:1519
8823msgid "add URL"
8824msgstr "添加 URL"
8825
8826#: builtin/remote.c:1521
8827msgid "delete URLs"
8828msgstr "删除 URLS"
8829
8830#: builtin/remote.c:1528
8831msgid "--add --delete doesn't make sense"
8832msgstr "--add --delete 无意义"
8833
8834#: builtin/remote.c:1568
8835#, c-format
8836msgid "Invalid old URL pattern: %s"
8837msgstr "无效的旧URL匹配模版:%s"
8838
8839#: builtin/remote.c:1576
8840#, c-format
8841msgid "No such URL found: %s"
8842msgstr "未找到此URL:%s"
8843
8844#: builtin/remote.c:1578
8845msgid "Will not delete all non-push URLs"
8846msgstr "将不会删除所有非推送URL地址"
8847
8848#: builtin/remote.c:1592
8849msgid "be verbose; must be placed before a subcommand"
8850msgstr "冗长输出;必须置于子命令之前"
8851
8852#: builtin/repack.c:17
8853msgid "git repack [<options>]"
8854msgstr "git repack [<选项>]"
8855
8856#: builtin/repack.c:159
8857msgid "pack everything in a single pack"
8858msgstr "所有内容打包到一个包文件中"
8859
8860#: builtin/repack.c:161
8861msgid "same as -a, and turn unreachable objects loose"
8862msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8863
8864#: builtin/repack.c:164
8865msgid "remove redundant packs, and run git-prune-packed"
8866msgstr "删除多余的包,运行 git-prune-packed"
8867
8868#: builtin/repack.c:166
8869msgid "pass --no-reuse-delta to git-pack-objects"
8870msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8871
8872#: builtin/repack.c:168
8873msgid "pass --no-reuse-object to git-pack-objects"
8874msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8875
8876#: builtin/repack.c:170
8877msgid "do not run git-update-server-info"
8878msgstr "不运行 git-update-server-info"
8879
8880#: builtin/repack.c:173
8881msgid "pass --local to git-pack-objects"
8882msgstr "向 git-pack-objects 传递参数 --local"
8883
8884#: builtin/repack.c:175
8885msgid "write bitmap index"
8886msgstr "写 bitmap 索引"
8887
8888#: builtin/repack.c:176
8889msgid "approxidate"
8890msgstr "近似日期"
8891
8892#: builtin/repack.c:177
8893msgid "with -A, do not loosen objects older than this"
8894msgstr "使用 -A,不要将早于给定时间的对象过期"
8895
8896#: builtin/repack.c:179
8897msgid "size of the window used for delta compression"
8898msgstr "用于增量压缩的窗口值"
8899
8900#: builtin/repack.c:180 builtin/repack.c:184
8901msgid "bytes"
8902msgstr "字节"
8903
8904#: builtin/repack.c:181
8905msgid "same as the above, but limit memory size instead of entries count"
8906msgstr "和上面的相似,但限制内存大小而非条目数"
8907
8908#: builtin/repack.c:183
8909msgid "limits the maximum delta depth"
8910msgstr "限制最大增量深度"
8911
8912#: builtin/repack.c:185
8913msgid "maximum size of each packfile"
8914msgstr "每个包的最大尺寸"
8915
8916#: builtin/repack.c:187
8917msgid "repack objects in packs marked with .keep"
8918msgstr "对标记为 .keep 的包中的对象重新打包"
8919
8920#: builtin/repack.c:375
8921#, c-format
8922msgid "removing '%s' failed"
8923msgstr "删除 '%s' 失败"
8924
8925#: builtin/replace.c:19
8926msgid "git replace [-f] <object> <replacement>"
8927msgstr "git replace [-f] <对象> <替换物>"
8928
8929#: builtin/replace.c:20
8930msgid "git replace [-f] --edit <object>"
8931msgstr "git replace [-f] --edit <对象>"
8932
8933#: builtin/replace.c:21
8934msgid "git replace [-f] --graft <commit> [<parent>...]"
8935msgstr "git replace [-f] --graft <提交> [<父提交>...]"
8936
8937#: builtin/replace.c:22
8938msgid "git replace -d <object>..."
8939msgstr "git replace -d <对象>..."
8940
8941#: builtin/replace.c:23
8942msgid "git replace [--format=<format>] [-l [<pattern>]]"
8943msgstr "git replace [--format=<格式>] [-l [<模式>]]"
8944
8945#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
8946#, c-format
8947msgid "Not a valid object name: '%s'"
8948msgstr "不是一个有效的对象名:'%s'"
8949
8950#: builtin/replace.c:355
8951#, c-format
8952msgid "bad mergetag in commit '%s'"
8953msgstr "提交 '%s' 中损坏的 mergetag"
8954
8955#: builtin/replace.c:357
8956#, c-format
8957msgid "malformed mergetag in commit '%s'"
8958msgstr "提交 '%s' 中非法的 mergetag"
8959
8960#: builtin/replace.c:368
8961#, c-format
8962msgid ""
8963"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
8964"instead of --graft"
8965msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft"
8966
8967#: builtin/replace.c:401
8968#, c-format
8969msgid "the original commit '%s' has a gpg signature."
8970msgstr "原始提交 '%s' 中包含一个 GPG 签名"
8971
8972#: builtin/replace.c:402
8973msgid "the signature will be removed in the replacement commit!"
8974msgstr "在替换的提交中签名将被移除!"
8975
8976#: builtin/replace.c:408
8977#, c-format
8978msgid "could not write replacement commit for: '%s'"
8979msgstr "不能为 '%s' 写替换提交"
8980
8981#: builtin/replace.c:432
8982msgid "list replace refs"
8983msgstr "列出替换的引用"
8984
8985#: builtin/replace.c:433
8986msgid "delete replace refs"
8987msgstr "删除替换的引用"
8988
8989#: builtin/replace.c:434
8990msgid "edit existing object"
8991msgstr "编辑现存的对象"
8992
8993#: builtin/replace.c:435
8994msgid "change a commit's parents"
8995msgstr "修改一个提交的父提交"
8996
8997#: builtin/replace.c:436
8998msgid "replace the ref if it exists"
8999msgstr "如果存在则替换引用"
9000
9001#: builtin/replace.c:437
9002msgid "do not pretty-print contents for --edit"
9003msgstr "不要为 --edit 操作美观显示内容"
9004
9005#: builtin/replace.c:438
9006msgid "use this format"
9007msgstr "使用此格式"
9008
9009#: builtin/rerere.c:12
9010msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9011msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9012
9013#: builtin/rerere.c:57
9014msgid "register clean resolutions in index"
9015msgstr "在索引中注册干净的解决方案"
9016
9017#: builtin/reset.c:26
9018msgid ""
9019"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9020msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
9021
9022#: builtin/reset.c:27
9023msgid "git reset [-q] <tree-ish> [--] <paths>..."
9024msgstr "git reset [-q] <树或提交> [--] <路径>..."
9025
9026#: builtin/reset.c:28
9027msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9028msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
9029
9030#: builtin/reset.c:34
9031msgid "mixed"
9032msgstr "混杂"
9033
9034#: builtin/reset.c:34
9035msgid "soft"
9036msgstr "软性"
9037
9038#: builtin/reset.c:34
9039msgid "hard"
9040msgstr "硬性"
9041
9042#: builtin/reset.c:34
9043msgid "merge"
9044msgstr "合并"
9045
9046#: builtin/reset.c:34
9047msgid "keep"
9048msgstr "保持"
9049
9050#: builtin/reset.c:74
9051msgid "You do not have a valid HEAD."
9052msgstr "您没有一个有效的 HEAD。"
9053
9054#: builtin/reset.c:76
9055msgid "Failed to find tree of HEAD."
9056msgstr "无法找到 HEAD 指向的树。"
9057
9058#: builtin/reset.c:82
9059#, c-format
9060msgid "Failed to find tree of %s."
9061msgstr "无法找到 %s 指向的树。"
9062
9063#: builtin/reset.c:100
9064#, c-format
9065msgid "HEAD is now at %s"
9066msgstr "HEAD 现在位于 %s"
9067
9068# 译者:汉字之间无空格,故删除%s前后空格
9069#: builtin/reset.c:183
9070#, c-format
9071msgid "Cannot do a %s reset in the middle of a merge."
9072msgstr "在合并过程中不能做%s重置操作。"
9073
9074#: builtin/reset.c:276
9075msgid "be quiet, only report errors"
9076msgstr "安静模式,只报告错误"
9077
9078#: builtin/reset.c:278
9079msgid "reset HEAD and index"
9080msgstr "重置 HEAD 和索引"
9081
9082#: builtin/reset.c:279
9083msgid "reset only HEAD"
9084msgstr "只重置 HEAD"
9085
9086#: builtin/reset.c:281 builtin/reset.c:283
9087msgid "reset HEAD, index and working tree"
9088msgstr "重置 HEAD、索引和工作区"
9089
9090#: builtin/reset.c:285
9091msgid "reset HEAD but keep local changes"
9092msgstr "重置 HEAD 但保存本地变更"
9093
9094#: builtin/reset.c:288
9095msgid "record only the fact that removed paths will be added later"
9096msgstr "将删除的路径标记为稍后添加"
9097
9098#: builtin/reset.c:305
9099#, c-format
9100msgid "Failed to resolve '%s' as a valid revision."
9101msgstr "无法将 '%s' 解析为一个有效的版本。"
9102
9103#: builtin/reset.c:308 builtin/reset.c:316
9104#, c-format
9105msgid "Could not parse object '%s'."
9106msgstr "不能解析对象 '%s'。"
9107
9108#: builtin/reset.c:313
9109#, c-format
9110msgid "Failed to resolve '%s' as a valid tree."
9111msgstr "无法将 '%s' 解析为一个有效的树对象。"
9112
9113#: builtin/reset.c:322
9114msgid "--patch is incompatible with --{hard,mixed,soft}"
9115msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9116
9117#: builtin/reset.c:331
9118msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9119msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
9120
9121# 译者:汉字之间无空格,故删除%s前后空格
9122#: builtin/reset.c:333
9123#, c-format
9124msgid "Cannot do %s reset with paths."
9125msgstr "不能带路径进行%s重置。"
9126
9127# 译者:汉字之间无空格,故删除%s前后空格
9128#: builtin/reset.c:343
9129#, c-format
9130msgid "%s reset is not allowed in a bare repository"
9131msgstr "不能对纯版本库进行%s重置"
9132
9133#: builtin/reset.c:347
9134msgid "-N can only be used with --mixed"
9135msgstr "-N 只能和 --mixed 同时使用"
9136
9137#: builtin/reset.c:364
9138msgid "Unstaged changes after reset:"
9139msgstr "重置后撤出暂存区的变更:"
9140
9141#: builtin/reset.c:370
9142#, c-format
9143msgid "Could not reset index file to revision '%s'."
9144msgstr "不能重置索引文件至版本 '%s'。"
9145
9146#: builtin/reset.c:374
9147msgid "Could not write new index file."
9148msgstr "不能写入新的索引文件。"
9149
9150#: builtin/rev-parse.c:361
9151msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9152msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
9153
9154#: builtin/rev-parse.c:366
9155msgid "keep the `--` passed as an arg"
9156msgstr "保持 `--` 作为一个参数传递"
9157
9158#: builtin/rev-parse.c:368
9159msgid "stop parsing after the first non-option argument"
9160msgstr "遇到第一个非选项参数后停止解析"
9161
9162#: builtin/rev-parse.c:371
9163msgid "output in stuck long form"
9164msgstr "以固定长格式输出"
9165
9166#: builtin/rev-parse.c:499
9167msgid ""
9168"git rev-parse --parseopt [<options>] -- [<args>...]\n"
9169" or: git rev-parse --sq-quote [<arg>...]\n"
9170" or: git rev-parse [<options>] [<arg>...]\n"
9171"\n"
9172"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9173msgstr ""
9174"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
9175" 或者:git rev-parse --sq-quote [<参数>...]\n"
9176" 或者:git rev-parse [<选项>] [<参数>...]\n"
9177"\n"
9178"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
9179
9180#: builtin/revert.c:22
9181msgid "git revert [<options>] <commit-ish>..."
9182msgstr "git revert [<选项>] <提交号>..."
9183
9184#: builtin/revert.c:23
9185msgid "git revert <subcommand>"
9186msgstr "git revert <子命令>"
9187
9188#: builtin/revert.c:28
9189msgid "git cherry-pick [<options>] <commit-ish>..."
9190msgstr "git cherry-pick [<选项>] <提交号>..."
9191
9192#: builtin/revert.c:29
9193msgid "git cherry-pick <subcommand>"
9194msgstr "git cherry-pick <子命令>"
9195
9196#: builtin/revert.c:71
9197#, c-format
9198msgid "%s: %s cannot be used with %s"
9199msgstr "%s:%s 不能和 %s 同时使用"
9200
9201#: builtin/revert.c:80
9202msgid "end revert or cherry-pick sequence"
9203msgstr "终止反转或拣选操作"
9204
9205#: builtin/revert.c:81
9206msgid "resume revert or cherry-pick sequence"
9207msgstr "继续反转或拣选操作"
9208
9209#: builtin/revert.c:82
9210msgid "cancel revert or cherry-pick sequence"
9211msgstr "取消反转或拣选操作"
9212
9213#: builtin/revert.c:83
9214msgid "don't automatically commit"
9215msgstr "不要自动提交"
9216
9217#: builtin/revert.c:84
9218msgid "edit the commit message"
9219msgstr "编辑提交说明"
9220
9221#: builtin/revert.c:87
9222msgid "parent number"
9223msgstr "父编号"
9224
9225#: builtin/revert.c:89
9226msgid "merge strategy"
9227msgstr "合并策略"
9228
9229#: builtin/revert.c:90
9230msgid "option"
9231msgstr "选项"
9232
9233#: builtin/revert.c:91
9234msgid "option for merge strategy"
9235msgstr "合并策略的选项"
9236
9237#: builtin/revert.c:104
9238msgid "append commit name"
9239msgstr "追加提交名称"
9240
9241#: builtin/revert.c:105
9242msgid "allow fast-forward"
9243msgstr "允许快进式"
9244
9245#: builtin/revert.c:106
9246msgid "preserve initially empty commits"
9247msgstr "保留初始化的空提交"
9248
9249#: builtin/revert.c:107
9250msgid "allow commits with empty messages"
9251msgstr "允许提交说明为空"
9252
9253#: builtin/revert.c:108
9254msgid "keep redundant, empty commits"
9255msgstr "保持多余的、空的提交"
9256
9257#: builtin/revert.c:112
9258msgid "program error"
9259msgstr "程序错误"
9260
9261#: builtin/revert.c:197
9262msgid "revert failed"
9263msgstr "还原失败"
9264
9265#: builtin/revert.c:212
9266msgid "cherry-pick failed"
9267msgstr "拣选失败"
9268
9269#: builtin/rm.c:17
9270msgid "git rm [<options>] [--] <file>..."
9271msgstr "git rm [<选项>] [--] <文件>..."
9272
9273#: builtin/rm.c:65
9274msgid ""
9275"the following submodule (or one of its nested submodules)\n"
9276"uses a .git directory:"
9277msgid_plural ""
9278"the following submodules (or one of their nested submodules)\n"
9279"use a .git directory:"
9280msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9281msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9282
9283#: builtin/rm.c:71
9284msgid ""
9285"\n"
9286"(use 'rm -rf' if you really want to remove it including all of its history)"
9287msgstr ""
9288"\n"
9289"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9290
9291#: builtin/rm.c:231
9292msgid ""
9293"the following file has staged content different from both the\n"
9294"file and the HEAD:"
9295msgid_plural ""
9296"the following files have staged content different from both the\n"
9297"file and the HEAD:"
9298msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9299msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9300
9301#: builtin/rm.c:236
9302msgid ""
9303"\n"
9304"(use -f to force removal)"
9305msgstr ""
9306"\n"
9307"(使用 -f 强制删除)"
9308
9309#: builtin/rm.c:240
9310msgid "the following file has changes staged in the index:"
9311msgid_plural "the following files have changes staged in the index:"
9312msgstr[0] "如下文件相对索引区的内容有修改"
9313msgstr[1] "如下文件相对索引区的内容有修改"
9314
9315#: builtin/rm.c:244 builtin/rm.c:255
9316msgid ""
9317"\n"
9318"(use --cached to keep the file, or -f to force removal)"
9319msgstr ""
9320"\n"
9321"(使用 --cached 保留本地文件,或用 -f 强制删除)"
9322
9323#: builtin/rm.c:252
9324msgid "the following file has local modifications:"
9325msgid_plural "the following files have local modifications:"
9326msgstr[0] "如下文件有本地修改:"
9327msgstr[1] "如下文件有本地修改:"
9328
9329#: builtin/rm.c:270
9330msgid "do not list removed files"
9331msgstr "不列出删除的文件"
9332
9333#: builtin/rm.c:271
9334msgid "only remove from the index"
9335msgstr "只从索引区删除"
9336
9337#: builtin/rm.c:272
9338msgid "override the up-to-date check"
9339msgstr "忽略文件更新状态检查"
9340
9341#: builtin/rm.c:273
9342msgid "allow recursive removal"
9343msgstr "允许递归删除"
9344
9345#: builtin/rm.c:275
9346msgid "exit with a zero status even if nothing matched"
9347msgstr "即使没有匹配,也以零状态退出"
9348
9349#: builtin/rm.c:318
9350msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9351msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9352
9353#: builtin/rm.c:336
9354#, c-format
9355msgid "not removing '%s' recursively without -r"
9356msgstr "未提供 -r 选项不会递归删除 '%s'"
9357
9358#: builtin/rm.c:375
9359#, c-format
9360msgid "git rm: unable to remove %s"
9361msgstr "git rm:不能删除 %s"
9362
9363#: builtin/shortlog.c:13
9364msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
9365msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9366
9367#: builtin/shortlog.c:131
9368#, c-format
9369msgid "Missing author: %s"
9370msgstr "缺少作者:%s"
9371
9372#: builtin/shortlog.c:230
9373msgid "sort output according to the number of commits per author"
9374msgstr "根据每个作者的提交数量排序"
9375
9376#: builtin/shortlog.c:232
9377msgid "Suppress commit descriptions, only provides commit count"
9378msgstr "隐藏提交说明,只提供提交数量"
9379
9380#: builtin/shortlog.c:234
9381msgid "Show the email address of each author"
9382msgstr "显示每个作者的电子邮件地址"
9383
9384#: builtin/shortlog.c:235
9385msgid "w[,i1[,i2]]"
9386msgstr "w[,i1[,i2]]"
9387
9388#: builtin/shortlog.c:236
9389msgid "Linewrap output"
9390msgstr "折行输出"
9391
9392#: builtin/show-branch.c:9
9393msgid ""
9394"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9395"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9396"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9397"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9398msgstr ""
9399"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9400"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9401"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9402"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
9403
9404#: builtin/show-branch.c:13
9405msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9406msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
9407
9408#: builtin/show-branch.c:652
9409msgid "show remote-tracking and local branches"
9410msgstr "显示远程跟踪的和本地的分支"
9411
9412#: builtin/show-branch.c:654
9413msgid "show remote-tracking branches"
9414msgstr "显示远程跟踪的分支"
9415
9416#: builtin/show-branch.c:656
9417msgid "color '*!+-' corresponding to the branch"
9418msgstr "着色 '*!+-' 到相应的分支"
9419
9420#: builtin/show-branch.c:658
9421msgid "show <n> more commits after the common ancestor"
9422msgstr "显示共同祖先后的 <n> 个提交"
9423
9424#: builtin/show-branch.c:660
9425msgid "synonym to more=-1"
9426msgstr "和 more=-1 同义"
9427
9428#: builtin/show-branch.c:661
9429msgid "suppress naming strings"
9430msgstr "不显示字符串命名"
9431
9432#: builtin/show-branch.c:663
9433msgid "include the current branch"
9434msgstr "包括当前分支"
9435
9436#: builtin/show-branch.c:665
9437msgid "name commits with their object names"
9438msgstr "以对象名字命名提交"
9439
9440#: builtin/show-branch.c:667
9441msgid "show possible merge bases"
9442msgstr "显示可能合并的基线"
9443
9444#: builtin/show-branch.c:669
9445msgid "show refs unreachable from any other ref"
9446msgstr "显示没有任何引用的的引用"
9447
9448#: builtin/show-branch.c:671
9449msgid "show commits in topological order"
9450msgstr "以拓扑顺序显示提交"
9451
9452#: builtin/show-branch.c:674
9453msgid "show only commits not on the first branch"
9454msgstr "只显示不在第一个分支上的提交"
9455
9456#: builtin/show-branch.c:676
9457msgid "show merges reachable from only one tip"
9458msgstr "显示仅一个分支可访问的合并提交"
9459
9460#: builtin/show-branch.c:678
9461msgid "topologically sort, maintaining date order where possible"
9462msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9463
9464#: builtin/show-branch.c:681
9465msgid "<n>[,<base>]"
9466msgstr "<n>[,<base>]"
9467
9468#: builtin/show-branch.c:682
9469msgid "show <n> most recent ref-log entries starting at base"
9470msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9471
9472#: builtin/show-ref.c:10
9473msgid ""
9474"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9475"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
9476msgstr ""
9477"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9478"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
9479
9480#: builtin/show-ref.c:11
9481msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9482msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9483
9484#: builtin/show-ref.c:168
9485msgid "only show tags (can be combined with heads)"
9486msgstr "只显示 tags(可以和头共用)"
9487
9488#: builtin/show-ref.c:169
9489msgid "only show heads (can be combined with tags)"
9490msgstr "只显示头(可以和 tags 共用)"
9491
9492#: builtin/show-ref.c:170
9493msgid "stricter reference checking, requires exact ref path"
9494msgstr "更严格的引用检测,需要精确的引用路径"
9495
9496#: builtin/show-ref.c:173 builtin/show-ref.c:175
9497msgid "show the HEAD reference, even if it would be filtered out"
9498msgstr "显示 HEAD 引用,即使被过滤掉"
9499
9500#: builtin/show-ref.c:177
9501msgid "dereference tags into object IDs"
9502msgstr "转换 tags 到对象ID"
9503
9504#: builtin/show-ref.c:179
9505msgid "only show SHA1 hash using <n> digits"
9506msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9507
9508#: builtin/show-ref.c:183
9509msgid "do not print results to stdout (useful with --verify)"
9510msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9511
9512#: builtin/show-ref.c:185
9513msgid "show refs from stdin that aren't in local repository"
9514msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9515
9516#: builtin/symbolic-ref.c:7
9517msgid "git symbolic-ref [<options>] <name> [<ref>]"
9518msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
9519
9520#: builtin/symbolic-ref.c:8
9521msgid "git symbolic-ref -d [-q] <name>"
9522msgstr "git symbolic-ref -d [-q] <名称>"
9523
9524#: builtin/symbolic-ref.c:40
9525msgid "suppress error message for non-symbolic (detached) refs"
9526msgstr "不显示非符号(分离的)引用的错误信息"
9527
9528#: builtin/symbolic-ref.c:41
9529msgid "delete symbolic ref"
9530msgstr "删除符号引用"
9531
9532#: builtin/symbolic-ref.c:42
9533msgid "shorten ref output"
9534msgstr "简短的引用输出"
9535
9536#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9537msgid "reason"
9538msgstr "原因"
9539
9540#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9541msgid "reason of the update"
9542msgstr "更新的原因"
9543
9544#: builtin/tag.c:22
9545msgid ""
9546"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9547"[<head>]"
9548msgstr ""
9549"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
9550
9551#: builtin/tag.c:23
9552msgid "git tag -d <tagname>..."
9553msgstr "git tag -d <标签名>..."
9554
9555#: builtin/tag.c:24
9556msgid ""
9557"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
9558"\t\t[<pattern>...]"
9559msgstr ""
9560"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
9561
9562#: builtin/tag.c:26
9563msgid "git tag -v <tagname>..."
9564msgstr "git tag -v <标签名>..."
9565
9566#: builtin/tag.c:69
9567#, c-format
9568msgid "malformed object at '%s'"
9569msgstr "非法的对象于 '%s'"
9570
9571#: builtin/tag.c:301
9572#, c-format
9573msgid "tag name too long: %.*s..."
9574msgstr "tag 名字太长:%.*s..."
9575
9576#: builtin/tag.c:306
9577#, c-format
9578msgid "tag '%s' not found."
9579msgstr "tag '%s' 未发现。"
9580
9581#: builtin/tag.c:321
9582#, c-format
9583msgid "Deleted tag '%s' (was %s)\n"
9584msgstr "已删除 tag '%s'(曾为 %s)\n"
9585
9586#: builtin/tag.c:333
9587#, c-format
9588msgid "could not verify the tag '%s'"
9589msgstr "不能校验 tag '%s'"
9590
9591#: builtin/tag.c:343
9592#, c-format
9593msgid ""
9594"\n"
9595"Write a message for tag:\n"
9596" %s\n"
9597"Lines starting with '%c' will be ignored.\n"
9598msgstr ""
9599"\n"
9600"输入一个 tag 说明:\n"
9601" %s\n"
9602"以 '%c' 开头的行将被忽略。\n"
9603
9604#: builtin/tag.c:347
9605#, c-format
9606msgid ""
9607"\n"
9608"Write a message for tag:\n"
9609" %s\n"
9610"Lines starting with '%c' will be kept; you may remove them yourself if you "
9611"want to.\n"
9612msgstr ""
9613"\n"
9614"输入一个 tag 说明:\n"
9615" %s\n"
9616"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9617
9618#: builtin/tag.c:371
9619#, c-format
9620msgid "unsupported sort specification '%s'"
9621msgstr "不支持的排序规格 '%s'"
9622
9623#: builtin/tag.c:373
9624#, c-format
9625msgid "unsupported sort specification '%s' in variable '%s'"
9626msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9627
9628#: builtin/tag.c:428
9629msgid "unable to sign the tag"
9630msgstr "无法签署 tag"
9631
9632#: builtin/tag.c:430
9633msgid "unable to write tag file"
9634msgstr "无法写 tag 文件"
9635
9636#: builtin/tag.c:455
9637msgid "bad object type."
9638msgstr "坏的对象类型。"
9639
9640#: builtin/tag.c:468
9641msgid "tag header too big."
9642msgstr "tag 头信息太大。"
9643
9644#: builtin/tag.c:504
9645msgid "no tag message?"
9646msgstr "无 tag 说明?"
9647
9648#: builtin/tag.c:510
9649#, c-format
9650msgid "The tag message has been left in %s\n"
9651msgstr "tag 说明被保留在 %s\n"
9652
9653#: builtin/tag.c:559
9654msgid "switch 'points-at' requires an object"
9655msgstr "开关 'points-at' 需要一个对象"
9656
9657#: builtin/tag.c:561
9658#, c-format
9659msgid "malformed object name '%s'"
9660msgstr "非法的对象名 '%s'"
9661
9662#: builtin/tag.c:589
9663msgid "list tag names"
9664msgstr "列出tag名称"
9665
9666#: builtin/tag.c:591
9667msgid "print <n> lines of each tag message"
9668msgstr "每个 tag 信息打印 <n> 行"
9669
9670#: builtin/tag.c:593
9671msgid "delete tags"
9672msgstr "删除 tags"
9673
9674#: builtin/tag.c:594
9675msgid "verify tags"
9676msgstr "验证 tags"
9677
9678#: builtin/tag.c:596
9679msgid "Tag creation options"
9680msgstr "Tag 创建选项"
9681
9682#: builtin/tag.c:598
9683msgid "annotated tag, needs a message"
9684msgstr "注解 tag,需要一个说明"
9685
9686#: builtin/tag.c:600
9687msgid "tag message"
9688msgstr "tag 说明"
9689
9690#: builtin/tag.c:602
9691msgid "annotated and GPG-signed tag"
9692msgstr "注解并 GPG 签名的 tag"
9693
9694#: builtin/tag.c:606
9695msgid "use another key to sign the tag"
9696msgstr "使用另外的私钥签名 tag"
9697
9698#: builtin/tag.c:607
9699msgid "replace the tag if exists"
9700msgstr "如果存在,替换现有的 tag"
9701
9702#: builtin/tag.c:609
9703msgid "Tag listing options"
9704msgstr "Tag 列表选项"
9705
9706#: builtin/tag.c:610
9707msgid "show tag list in columns"
9708msgstr "以列的方式显示 tag"
9709
9710#: builtin/tag.c:612
9711msgid "sort tags"
9712msgstr "排序 tags"
9713
9714#: builtin/tag.c:617 builtin/tag.c:623
9715msgid "print only tags that contain the commit"
9716msgstr "只打印包含提交的tags"
9717
9718#: builtin/tag.c:629
9719msgid "print only tags of the object"
9720msgstr "只打印tags对象"
9721
9722#: builtin/tag.c:655
9723msgid "--column and -n are incompatible"
9724msgstr "--column 和 -n 不兼容"
9725
9726#: builtin/tag.c:667
9727msgid "--sort and -n are incompatible"
9728msgstr "--sort 和 -n 不兼容"
9729
9730#: builtin/tag.c:674
9731msgid "-n option is only allowed with -l."
9732msgstr "-n 选项只允许和 -l 同时使用。"
9733
9734#: builtin/tag.c:676
9735msgid "--contains option is only allowed with -l."
9736msgstr "--contains 选项只允许和 -l 同时使用。"
9737
9738#: builtin/tag.c:678
9739msgid "--points-at option is only allowed with -l."
9740msgstr "--points-at 选项只允许和 -l 同时使用。"
9741
9742#: builtin/tag.c:686
9743msgid "only one -F or -m option is allowed."
9744msgstr "只允许一个 -F 或 -m 选项。"
9745
9746#: builtin/tag.c:706
9747msgid "too many params"
9748msgstr "太多参数"
9749
9750#: builtin/tag.c:712
9751#, c-format
9752msgid "'%s' is not a valid tag name."
9753msgstr "'%s' 不是一个有效的tag名称。"
9754
9755#: builtin/tag.c:717
9756#, c-format
9757msgid "tag '%s' already exists"
9758msgstr "tag '%s' 已存在"
9759
9760#: builtin/tag.c:741
9761#, c-format
9762msgid "Updated tag '%s' (was %s)\n"
9763msgstr "已更新tag '%s'(曾为 %s)\n"
9764
9765#: builtin/unpack-objects.c:489
9766msgid "Unpacking objects"
9767msgstr "展开对象中"
9768
9769#: builtin/update-index.c:403
9770msgid "git update-index [<options>] [--] [<file>...]"
9771msgstr "git update-index [<选项>] [--] [<文件>...]"
9772
9773#: builtin/update-index.c:757
9774msgid "continue refresh even when index needs update"
9775msgstr "当索引需要更新时继续刷新"
9776
9777#: builtin/update-index.c:760
9778msgid "refresh: ignore submodules"
9779msgstr "刷新:忽略子模组"
9780
9781#: builtin/update-index.c:763
9782msgid "do not ignore new files"
9783msgstr "不忽略新的文件"
9784
9785#: builtin/update-index.c:765
9786msgid "let files replace directories and vice-versa"
9787msgstr "让文件替换目录(反之亦然)"
9788
9789#: builtin/update-index.c:767
9790msgid "notice files missing from worktree"
9791msgstr "通知文件从工作区丢失"
9792
9793#: builtin/update-index.c:769
9794msgid "refresh even if index contains unmerged entries"
9795msgstr "即使索引区包含未合并的条目也执行刷新"
9796
9797#: builtin/update-index.c:772
9798msgid "refresh stat information"
9799msgstr "刷新统计信息"
9800
9801#: builtin/update-index.c:776
9802msgid "like --refresh, but ignore assume-unchanged setting"
9803msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
9804
9805#: builtin/update-index.c:780
9806msgid "<mode>,<object>,<path>"
9807msgstr "<存取模式>,<对象>,<路径>"
9808
9809#: builtin/update-index.c:781
9810msgid "add the specified entry to the index"
9811msgstr "添加指定的条目到索引区"
9812
9813#: builtin/update-index.c:785
9814msgid "(+/-)x"
9815msgstr "(+/-)x"
9816
9817#: builtin/update-index.c:786
9818msgid "override the executable bit of the listed files"
9819msgstr "覆盖列表里文件的可执行位"
9820
9821#: builtin/update-index.c:790
9822msgid "mark files as \"not changing\""
9823msgstr "把文件标记为 \"没有变更\""
9824
9825#: builtin/update-index.c:793
9826msgid "clear assumed-unchanged bit"
9827msgstr "清除 assumed-unchanged 位"
9828
9829#: builtin/update-index.c:796
9830msgid "mark files as \"index-only\""
9831msgstr "把文件标记为 \"仅索引\""
9832
9833#: builtin/update-index.c:799
9834msgid "clear skip-worktree bit"
9835msgstr "清除 skip-worktree 位"
9836
9837#: builtin/update-index.c:802
9838msgid "add to index only; do not add content to object database"
9839msgstr "只添加到索引区;不添加对象到对象库"
9840
9841#: builtin/update-index.c:804
9842msgid "remove named paths even if present in worktree"
9843msgstr "即使存在工作区里,也删除路径"
9844
9845#: builtin/update-index.c:806
9846msgid "with --stdin: input lines are terminated by null bytes"
9847msgstr "携带 --stdin:输入的行以 null 字符终止"
9848
9849#: builtin/update-index.c:808
9850msgid "read list of paths to be updated from standard input"
9851msgstr "从标准输入中读取需要更新的路径列表"
9852
9853#: builtin/update-index.c:812
9854msgid "add entries from standard input to the index"
9855msgstr "从标准输入添加条目到索引区"
9856
9857#: builtin/update-index.c:816
9858msgid "repopulate stages #2 and #3 for the listed paths"
9859msgstr "为指定文件重新生成第2和第3暂存区"
9860
9861#: builtin/update-index.c:820
9862msgid "only update entries that differ from HEAD"
9863msgstr "只更新与 HEAD 不同的条目"
9864
9865#: builtin/update-index.c:824
9866msgid "ignore files missing from worktree"
9867msgstr "忽略工作区丢失的文件"
9868
9869#: builtin/update-index.c:827
9870msgid "report actions to standard output"
9871msgstr "在标准输出显示操作"
9872
9873#: builtin/update-index.c:829
9874msgid "(for porcelains) forget saved unresolved conflicts"
9875msgstr "(for porcelains) 忘记保存的未解决的冲突"
9876
9877#: builtin/update-index.c:833
9878msgid "write index in this format"
9879msgstr "以这种格式写入索引区"
9880
9881#: builtin/update-index.c:835
9882msgid "enable or disable split index"
9883msgstr "启用或禁用索引拆分"
9884
9885#: builtin/update-ref.c:9
9886msgid "git update-ref [<options>] -d <refname> [<old-val>]"
9887msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
9888
9889#: builtin/update-ref.c:10
9890msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
9891msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
9892
9893#: builtin/update-ref.c:11
9894msgid "git update-ref [<options>] --stdin [-z]"
9895msgstr "git update-ref [<选项>] --stdin [-z]"
9896
9897#: builtin/update-ref.c:359
9898msgid "delete the reference"
9899msgstr "删除引用"
9900
9901#: builtin/update-ref.c:361
9902msgid "update <refname> not the one it points to"
9903msgstr "更新 <引用名> 本身而不是它指向的引用"
9904
9905#: builtin/update-ref.c:362
9906msgid "stdin has NUL-terminated arguments"
9907msgstr "标准输入有以 NUL 字符终止的参数"
9908
9909#: builtin/update-ref.c:363
9910msgid "read updates from stdin"
9911msgstr "从标准输入读取更新"
9912
9913#: builtin/update-server-info.c:6
9914msgid "git update-server-info [--force]"
9915msgstr "git update-server-info [--force]"
9916
9917#: builtin/update-server-info.c:14
9918msgid "update the info files from scratch"
9919msgstr "从头开始更新文件信息"
9920
9921#: builtin/verify-commit.c:17
9922msgid "git verify-commit [-v | --verbose] <commit>..."
9923msgstr "git verify-commit [-v | --verbose] <提交>..."
9924
9925#: builtin/verify-commit.c:75
9926msgid "print commit contents"
9927msgstr "打印提交内容"
9928
9929#: builtin/verify-pack.c:54
9930msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
9931msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
9932
9933#: builtin/verify-pack.c:64
9934msgid "verbose"
9935msgstr "冗长输出"
9936
9937#: builtin/verify-pack.c:66
9938msgid "show statistics only"
9939msgstr "只显示统计"
9940
9941#: builtin/verify-tag.c:17
9942msgid "git verify-tag [-v | --verbose] <tag>..."
9943msgstr "git verify-tag [-v | --verbose] <标签>..."
9944
9945#: builtin/verify-tag.c:73
9946msgid "print tag contents"
9947msgstr "打印 tag 内容"
9948
9949#: builtin/write-tree.c:13
9950msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9951msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
9952
9953#: builtin/write-tree.c:26
9954msgid "<prefix>/"
9955msgstr "<前缀>/"
9956
9957#: builtin/write-tree.c:27
9958msgid "write tree object for a subdirectory <prefix>"
9959msgstr "将 <前缀> 子目录内容写到一个树对象"
9960
9961#: builtin/write-tree.c:30
9962msgid "only useful for debugging"
9963msgstr "只对调试有用"
9964
9965#: credential-cache--daemon.c:267
9966msgid "print debugging messages to stderr"
9967msgstr "调试信息输出到标准错误"
9968
9969#: git.c:14
9970msgid ""
9971"'git help -a' and 'git help -g' list available subcommands and some\n"
9972"concept guides. See 'git help <command>' or 'git help <concept>'\n"
9973"to read about a specific subcommand or concept."
9974msgstr ""
9975"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
9976"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
9977"帮助。"
9978
9979#: common-cmds.h:8
9980msgid "Add file contents to the index"
9981msgstr "添加文件内容至索引"
9982
9983#: common-cmds.h:9
9984msgid "Find by binary search the change that introduced a bug"
9985msgstr "通过二分查找定位引入 bug 的变更"
9986
9987#: common-cmds.h:10
9988msgid "List, create, or delete branches"
9989msgstr "列出、创建或删除分支"
9990
9991#: common-cmds.h:11
9992msgid "Checkout a branch or paths to the working tree"
9993msgstr "检出一个分支或路径到工作区"
9994
9995#: common-cmds.h:12
9996msgid "Clone a repository into a new directory"
9997msgstr "克隆一个版本库到一个新目录"
9998
9999#: common-cmds.h:13
10000msgid "Record changes to the repository"
10001msgstr "记录变更到版本库"
10002
10003#: common-cmds.h:14
10004msgid "Show changes between commits, commit and working tree, etc"
10005msgstr "显示提交之间、提交和工作区之间等的差异"
10006
10007#: common-cmds.h:15
10008msgid "Download objects and refs from another repository"
10009msgstr "从另外一个版本库下载对象和引用"
10010
10011#: common-cmds.h:16
10012msgid "Print lines matching a pattern"
10013msgstr "输出和模式匹配的行"
10014
10015#: common-cmds.h:17
10016msgid "Create an empty Git repository or reinitialize an existing one"
10017msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
10018
10019#: common-cmds.h:18
10020msgid "Show commit logs"
10021msgstr "显示提交日志"
10022
10023#: common-cmds.h:19
10024msgid "Join two or more development histories together"
10025msgstr "合并两个或更多开发历史"
10026
10027#: common-cmds.h:20
10028msgid "Move or rename a file, a directory, or a symlink"
10029msgstr "移动或重命名一个文件、目录或符号链接"
10030
10031#: common-cmds.h:21
10032msgid "Fetch from and integrate with another repository or a local branch"
10033msgstr "获取并整合另外的版本库或一个本地分支"
10034
10035#: common-cmds.h:22
10036msgid "Update remote refs along with associated objects"
10037msgstr "更新远程引用和相关的对象"
10038
10039#: common-cmds.h:23
10040msgid "Forward-port local commits to the updated upstream head"
10041msgstr "本地提交转移至更新后的上游分支中"
10042
10043#: common-cmds.h:24
10044msgid "Reset current HEAD to the specified state"
10045msgstr "重置当前HEAD到指定状态"
10046
10047#: common-cmds.h:25
10048msgid "Remove files from the working tree and from the index"
10049msgstr "从工作区和索引中删除文件"
10050
10051#: common-cmds.h:26
10052msgid "Show various types of objects"
10053msgstr "显示各种类型的对象"
10054
10055#: common-cmds.h:27
10056msgid "Show the working tree status"
10057msgstr "显示工作区状态"
10058
10059#: common-cmds.h:28
10060msgid "Create, list, delete or verify a tag object signed with GPG"
10061msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
10062
10063#: parse-options.h:143
10064msgid "expiry-date"
10065msgstr "到期时间"
10066
10067#: parse-options.h:158
10068msgid "no-op (backward compatibility)"
10069msgstr "空操作(向后兼容)"
10070
10071#: parse-options.h:232
10072msgid "be more verbose"
10073msgstr "更加详细"
10074
10075#: parse-options.h:234
10076msgid "be more quiet"
10077msgstr "更加安静"
10078
10079#: parse-options.h:240
10080msgid "use <n> digits to display SHA-1s"
10081msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10082
10083#: rerere.h:27
10084msgid "update the index with reused conflict resolution if possible"
10085msgstr "如果可能,重用冲突解决更新索引"
10086
10087#: git-am.sh:53
10088msgid "You need to set your committer info first"
10089msgstr "您需要先设置你的提交者信息"
10090
10091#: git-am.sh:98
10092msgid ""
10093"You seem to have moved HEAD since the last 'am' failure.\n"
10094"Not rewinding to ORIG_HEAD"
10095msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
10096
10097#: git-am.sh:108
10098#, sh-format
10099msgid ""
10100"When you have resolved this problem, run \"$cmdline --continue\".\n"
10101"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10102"To restore the original branch and stop patching, run \"$cmdline --abort\"."
10103msgstr ""
10104"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
10105"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10106"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10107
10108#: git-am.sh:124
10109msgid "Cannot fall back to three-way merge."
10110msgstr "无法求助于三路合并。"
10111
10112#: git-am.sh:140
10113msgid "Repository lacks necessary blobs to fall back on 3-way merge."
10114msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
10115
10116#: git-am.sh:142
10117msgid "Using index info to reconstruct a base tree..."
10118msgstr "使用索引来重建一个(三路合并的)基础目录树..."
10119
10120#: git-am.sh:157
10121msgid ""
10122"Did you hand edit your patch?\n"
10123"It does not apply to blobs recorded in its index."
10124msgstr ""
10125"您是否曾手动编辑过您的补丁?\n"
10126"无法应用补丁到索引中的数据(blob)对象上。"
10127
10128#: git-am.sh:166
10129msgid "Falling back to patching base and 3-way merge..."
10130msgstr "转而在基础版本上打补丁及进行三路合并..."
10131
10132#: git-am.sh:182
10133msgid "Failed to merge in the changes."
10134msgstr "无法合并变更。"
10135
10136#: git-am.sh:277
10137msgid "Only one StGIT patch series can be applied at once"
10138msgstr "一次只能有一个 StGIT 补丁队列被应用"
10139
10140#: git-am.sh:364
10141#, sh-format
10142msgid "Patch format $patch_format is not supported."
10143msgstr "不支持 $patch_format 补丁格式。"
10144
10145#: git-am.sh:366
10146msgid "Patch format detection failed."
10147msgstr "补丁格式检测失败。"
10148
10149#: git-am.sh:398
10150msgid ""
10151"The -b/--binary option has been a no-op for long time, and\n"
10152"it will be removed. Please do not use it anymore."
10153msgstr ""
10154"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10155"请不要再使用它了。"
10156
10157#: git-am.sh:496
10158#, sh-format
10159msgid "previous rebase directory $dotest still exists but mbox given."
10160msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
10161
10162#: git-am.sh:501
10163msgid "Please make up your mind. --skip or --abort?"
10164msgstr "请下决心。--skip 或是 --abort ?"
10165
10166#: git-am.sh:537
10167#, sh-format
10168msgid ""
10169"Stray $dotest directory found.\n"
10170"Use \"git am --abort\" to remove it."
10171msgstr ""
10172"发现了错误的 $dotest 目录。\n"
10173"使用 \"git am --abort\" 删除它。"
10174
10175#: git-am.sh:545
10176msgid "Resolve operation not in progress, we are not resuming."
10177msgstr "解决操作未进行,我们不会继续。"
10178
10179#: git-am.sh:612
10180#, sh-format
10181msgid "Dirty index: cannot apply patches (dirty: $files)"
10182msgstr "脏的索引:不能应用补丁(脏文件:$files)"
10183
10184#: git-am.sh:722
10185#, sh-format
10186msgid ""
10187"Patch is empty. Was it split wrong?\n"
10188"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10189"To restore the original branch and stop patching run \"$cmdline --abort\"."
10190msgstr ""
10191"补丁为空。是不是切分错误?\n"
10192"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10193"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10194
10195#: git-am.sh:749
10196msgid "Patch does not have a valid e-mail address."
10197msgstr "补丁中没有一个有效的邮件地址。"
10198
10199#: git-am.sh:796
10200msgid "cannot be interactive without stdin connected to a terminal."
10201msgstr "标准输入没有和终端关联,不能进行交互式操作。"
10202
10203#: git-am.sh:800
10204msgid "Commit Body is:"
10205msgstr "提交内容为:"
10206
10207# 译者:注意保持句尾空格
10208#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10209#. in your translation. The program will only accept English
10210#. input at this point.
10211#: git-am.sh:807
10212msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10213msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10214
10215#: git-am.sh:843
10216#, sh-format
10217msgid "Applying: $FIRSTLINE"
10218msgstr "正应用:$FIRSTLINE"
10219
10220#: git-am.sh:864
10221msgid ""
10222"No changes - did you forget to use 'git add'?\n"
10223"If there is nothing left to stage, chances are that something else\n"
10224"already introduced the same changes; you might want to skip this patch."
10225msgstr ""
10226"没有变更 —— 您是不是忘了执行 'git add'?\n"
10227"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10228"您也许想要跳过这个补丁。"
10229
10230#: git-am.sh:872
10231msgid ""
10232"You still have unmerged paths in your index\n"
10233"did you forget to use 'git add'?"
10234msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
10235
10236#: git-am.sh:888
10237msgid "No changes -- Patch already applied."
10238msgstr "没有变更 —— 补丁已经应用过。"
10239
10240#: git-am.sh:898
10241#, sh-format
10242msgid "Patch failed at $msgnum $FIRSTLINE"
10243msgstr "补丁失败于 $msgnum $FIRSTLINE"
10244
10245#: git-am.sh:901
10246#, sh-format
10247msgid ""
10248"The copy of the patch that failed is found in:\n"
10249" $dotest/patch"
10250msgstr ""
10251"失败的补丁文件副本位于:\n"
10252" $dotest/patch"
10253
10254#: git-am.sh:919
10255msgid "applying to an empty history"
10256msgstr "正应用到一个空历史上"
10257
10258#: git-bisect.sh:48
10259msgid "You need to start by \"git bisect start\""
10260msgstr "您需要执行 \"git bisect start\" 来开始"
10261
10262# 译者:注意保持句尾空格
10263#. TRANSLATORS: Make sure to include [Y] and [n] in your
10264#. translation. The program will only accept English input
10265#. at this point.
10266#: git-bisect.sh:54
10267msgid "Do you want me to do it for you [Y/n]? "
10268msgstr "您想让我为您这样做么[Y/n]? "
10269
10270#: git-bisect.sh:95
10271#, sh-format
10272msgid "unrecognised option: '$arg'"
10273msgstr "未能识别的选项:'$arg'"
10274
10275#: git-bisect.sh:99
10276#, sh-format
10277msgid "'$arg' does not appear to be a valid revision"
10278msgstr "'$arg' 看起来不像是一个有效的版本"
10279
10280#: git-bisect.sh:117
10281msgid "Bad HEAD - I need a HEAD"
10282msgstr "坏的 HEAD - 我需要一个 HEAD"
10283
10284#: git-bisect.sh:130
10285#, sh-format
10286msgid ""
10287"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
10288msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
10289
10290#: git-bisect.sh:140
10291msgid "won't bisect on cg-seek'ed tree"
10292msgstr "不会在做了 cg-seek 的树上做二分查找"
10293
10294#: git-bisect.sh:144
10295msgid "Bad HEAD - strange symbolic ref"
10296msgstr "坏的 HEAD - 奇怪的符号引用"
10297
10298#: git-bisect.sh:189
10299#, sh-format
10300msgid "Bad bisect_write argument: $state"
10301msgstr "坏的 bisect_write 参数:$state"
10302
10303#: git-bisect.sh:218
10304#, sh-format
10305msgid "Bad rev input: $arg"
10306msgstr "输入坏的版本:$arg"
10307
10308#: git-bisect.sh:232
10309msgid "Please call 'bisect_state' with at least one argument."
10310msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10311
10312#: git-bisect.sh:244
10313#, sh-format
10314msgid "Bad rev input: $rev"
10315msgstr "输入坏的版本:$rev"
10316
10317#: git-bisect.sh:253
10318msgid "'git bisect bad' can take only one argument."
10319msgstr "'git bisect bad' 只能带一个参数。"
10320
10321#: git-bisect.sh:276
10322msgid "Warning: bisecting only with a bad commit."
10323msgstr "警告:在仅有一个坏提交下进行二分查找。"
10324
10325# 译者:注意保持句尾空格
10326#. TRANSLATORS: Make sure to include [Y] and [n] in your
10327#. translation. The program will only accept English input
10328#. at this point.
10329#: git-bisect.sh:282
10330msgid "Are you sure [Y/n]? "
10331msgstr "您确认么[Y/n]? "
10332
10333#: git-bisect.sh:292
10334msgid ""
10335"You need to give me at least one good and one bad revision.\n"
10336"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10337msgstr ""
10338"您需要给我至少一个好版本和一个坏版本。\n"
10339"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10340
10341#: git-bisect.sh:295
10342msgid ""
10343"You need to start by \"git bisect start\".\n"
10344"You then need to give me at least one good and one bad revision.\n"
10345"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10346msgstr ""
10347"您需要执行 \"git bisect start\" 来开始。\n"
10348"然后需要提供我至少一个好版本和一个坏版本。\n"
10349"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10350
10351#: git-bisect.sh:366 git-bisect.sh:493
10352msgid "We are not bisecting."
10353msgstr "我们没有在二分查找。"
10354
10355#: git-bisect.sh:373
10356#, sh-format
10357msgid "'$invalid' is not a valid commit"
10358msgstr "'$invalid' 不是一个有效的提交"
10359
10360#: git-bisect.sh:382
10361#, sh-format
10362msgid ""
10363"Could not check out original HEAD '$branch'.\n"
10364"Try 'git bisect reset <commit>'."
10365msgstr ""
10366"不能检出原始 HEAD '$branch'。\n"
10367"尝试 'git bisect reset <提交>'。"
10368
10369#: git-bisect.sh:409
10370msgid "No logfile given"
10371msgstr "未提供日志文件"
10372
10373#: git-bisect.sh:410
10374#, sh-format
10375msgid "cannot read $file for replaying"
10376msgstr "不能读取 $file 来重放"
10377
10378#: git-bisect.sh:427
10379msgid "?? what are you talking about?"
10380msgstr "?? 您在说什么?"
10381
10382#: git-bisect.sh:439
10383#, sh-format
10384msgid "running $command"
10385msgstr "运行 $command"
10386
10387#: git-bisect.sh:446
10388#, sh-format
10389msgid ""
10390"bisect run failed:\n"
10391"exit code $res from '$command' is < 0 or >= 128"
10392msgstr ""
10393"二分查找运行失败:\n"
10394"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10395
10396#: git-bisect.sh:472
10397msgid "bisect run cannot continue any more"
10398msgstr "二分查找不能继续运行"
10399
10400#: git-bisect.sh:478
10401#, sh-format
10402msgid ""
10403"bisect run failed:\n"
10404"'bisect_state $state' exited with error code $res"
10405msgstr ""
10406"二分查找运行失败:\n"
10407"'bisect_state $state' 退出码为 $res"
10408
10409#: git-bisect.sh:485
10410msgid "bisect run success"
10411msgstr "二分查找运行成功"
10412
10413#: git-pull.sh:21
10414msgid ""
10415"Pull is not possible because you have unmerged files.\n"
10416"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10417"as appropriate to mark resolution and make a commit."
10418msgstr ""
10419"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10420"然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
10421
10422#: git-pull.sh:25
10423msgid "Pull is not possible because you have unmerged files."
10424msgstr "Pull 不可用,因为您尚有未合并的文件。"
10425
10426#: git-pull.sh:31
10427msgid ""
10428"You have not concluded your merge (MERGE_HEAD exists).\n"
10429"Please, commit your changes before you can merge."
10430msgstr ""
10431"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10432"请在合并前先提交您的修改。"
10433
10434#: git-pull.sh:245
10435msgid "updating an unborn branch with changes added to the index"
10436msgstr "更新尚未诞生的分支,变更添加至索引"
10437
10438#: git-pull.sh:269
10439#, sh-format
10440msgid ""
10441"Warning: fetch updated the current branch head.\n"
10442"Warning: fast-forwarding your working tree from\n"
10443"Warning: commit $orig_head."
10444msgstr ""
10445"警告:fetch 更新了当前的分支。您的工作区\n"
10446"警告:从原提交 $orig_head 快进。"
10447
10448#: git-pull.sh:294
10449msgid "Cannot merge multiple branches into empty head"
10450msgstr "无法将多个分支合并到空分支"
10451
10452#: git-pull.sh:298
10453msgid "Cannot rebase onto multiple branches"
10454msgstr "无法变基到多个分支"
10455
10456#: git-rebase.sh:57
10457msgid ""
10458"When you have resolved this problem, run \"git rebase --continue\".\n"
10459"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10460"To check out the original branch and stop rebasing, run \"git rebase --abort"
10461"\"."
10462msgstr ""
10463"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10464"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10465"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10466
10467#: git-rebase.sh:165
10468msgid "Applied autostash."
10469msgstr "成功应用 autostash。"
10470
10471#: git-rebase.sh:168
10472#, sh-format
10473msgid "Cannot store $stash_sha1"
10474msgstr "无法保存 $stash_sha1"
10475
10476#: git-rebase.sh:169
10477msgid ""
10478"Applying autostash resulted in conflicts.\n"
10479"Your changes are safe in the stash.\n"
10480"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10481msgstr ""
10482"应用 autostash 导致冲突。\n"
10483"您的修改安全地保存在 stash 中。\n"
10484"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10485
10486#: git-rebase.sh:208
10487msgid "The pre-rebase hook refused to rebase."
10488msgstr "钩子 pre-rebase 拒绝变基操作。"
10489
10490#: git-rebase.sh:213
10491msgid "It looks like git-am is in progress. Cannot rebase."
10492msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10493
10494#: git-rebase.sh:351
10495msgid "The --exec option must be used with the --interactive option"
10496msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10497
10498#: git-rebase.sh:356
10499msgid "No rebase in progress?"
10500msgstr "没有正在进行的变基?"
10501
10502#: git-rebase.sh:367
10503msgid "The --edit-todo action can only be used during interactive rebase."
10504msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10505
10506#: git-rebase.sh:374
10507msgid "Cannot read HEAD"
10508msgstr "不能读取 HEAD"
10509
10510#: git-rebase.sh:377
10511msgid ""
10512"You must edit all merge conflicts and then\n"
10513"mark them as resolved using git add"
10514msgstr ""
10515"您必须编辑所有的合并冲突,然后通过 git add\n"
10516"命令将它们标记为已解决"
10517
10518#: git-rebase.sh:395
10519#, sh-format
10520msgid "Could not move back to $head_name"
10521msgstr "无法移回 $head_name"
10522
10523#: git-rebase.sh:414
10524#, sh-format
10525msgid ""
10526"It seems that there is already a $state_dir_base directory, and\n"
10527"I wonder if you are in the middle of another rebase. If that is the\n"
10528"case, please try\n"
10529"\t$cmd_live_rebase\n"
10530"If that is not the case, please\n"
10531"\t$cmd_clear_stale_rebase\n"
10532"and run me again. I am stopping in case you still have something\n"
10533"valuable there."
10534msgstr ""
10535"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10536"过程中。 如果是这样,请执行\n"
10537"\t$cmd_live_rebase\n"
10538"如果不是这样,请执行\n"
10539"\t$cmd_clear_stale_rebase\n"
10540"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
10541
10542#: git-rebase.sh:465
10543#, sh-format
10544msgid "invalid upstream $upstream_name"
10545msgstr "无效的上游 $upstream_name"
10546
10547#: git-rebase.sh:489
10548#, sh-format
10549msgid "$onto_name: there are more than one merge bases"
10550msgstr "$onto_name: 有一个以上的合并基准"
10551
10552#: git-rebase.sh:492 git-rebase.sh:496
10553#, sh-format
10554msgid "$onto_name: there is no merge base"
10555msgstr "$onto_name: 没有合并基准"
10556
10557#: git-rebase.sh:501
10558#, sh-format
10559msgid "Does not point to a valid commit: $onto_name"
10560msgstr "没有指向一个有效的提交:$onto_name"
10561
10562#: git-rebase.sh:524
10563#, sh-format
10564msgid "fatal: no such branch: $branch_name"
10565msgstr "严重错误:无此分支:$branch_name"
10566
10567#: git-rebase.sh:557
10568msgid "Cannot autostash"
10569msgstr "无法 autostash"
10570
10571#: git-rebase.sh:562
10572#, sh-format
10573msgid "Created autostash: $stash_abbrev"
10574msgstr "创建了 autostash: $stash_abbrev"
10575
10576#: git-rebase.sh:566
10577msgid "Please commit or stash them."
10578msgstr "请提交或为它们保存进度。"
10579
10580#: git-rebase.sh:586
10581#, sh-format
10582msgid "Current branch $branch_name is up to date."
10583msgstr "当前分支 $branch_name 是最新的。"
10584
10585#: git-rebase.sh:590
10586#, sh-format
10587msgid "Current branch $branch_name is up to date, rebase forced."
10588msgstr "当前分支 $branch_name 是最新的,强制变基。"
10589
10590#: git-rebase.sh:601
10591#, sh-format
10592msgid "Changes from $mb to $onto:"
10593msgstr "变更从 $mb 到 $onto:"
10594
10595#: git-rebase.sh:610
10596msgid "First, rewinding head to replay your work on top of it..."
10597msgstr "首先,重置头指针以便在上面重放您的工作..."
10598
10599#: git-rebase.sh:620
10600#, sh-format
10601msgid "Fast-forwarded $branch_name to $onto_name."
10602msgstr "快进 $branch_name 至 $onto_name。"
10603
10604#: git-stash.sh:51
10605msgid "git stash clear with parameters is unimplemented"
10606msgstr "git stash clear 不支持参数"
10607
10608#: git-stash.sh:74
10609msgid "You do not have the initial commit yet"
10610msgstr "您尚未建立初始提交"
10611
10612#: git-stash.sh:89
10613msgid "Cannot save the current index state"
10614msgstr "无法保存当前索引状态"
10615
10616#: git-stash.sh:124 git-stash.sh:137
10617msgid "Cannot save the current worktree state"
10618msgstr "无法保存当前工作区状态"
10619
10620#: git-stash.sh:141
10621msgid "No changes selected"
10622msgstr "没有选择变更"
10623
10624#: git-stash.sh:144
10625msgid "Cannot remove temporary index (can't happen)"
10626msgstr "无法删除临时索引(不应发生)"
10627
10628#: git-stash.sh:157
10629msgid "Cannot record working tree state"
10630msgstr "不能记录工作区状态"
10631
10632#: git-stash.sh:191
10633#, sh-format
10634msgid "Cannot update $ref_stash with $w_commit"
10635msgstr "无法用 $w_commit 更新 $ref_stash"
10636
10637#. TRANSLATORS: $option is an invalid option, like
10638#. `--blah-blah'. The 7 spaces at the beginning of the
10639#. second line correspond to "error: ". So you should line
10640#. up the second line with however many characters the
10641#. translation of "error: " takes in your language. E.g. in
10642#. English this is:
10643#.
10644#. $ git stash save --blah-blah 2>&1 | head -n 2
10645#. error: unknown option for 'stash save': --blah-blah
10646#. To provide a message, use git stash save -- '--blah-blah'
10647#: git-stash.sh:238
10648#, sh-format
10649msgid ""
10650"error: unknown option for 'stash save': $option\n"
10651" To provide a message, use git stash save -- '$option'"
10652msgstr ""
10653"错误:'stash save' 的未知选项:$option\n"
10654" 要提供一个描述信息,使用 git stash save -- '$option'"
10655
10656#: git-stash.sh:259
10657msgid "No local changes to save"
10658msgstr "没有要保存的本地修改"
10659
10660#: git-stash.sh:263
10661msgid "Cannot initialize stash"
10662msgstr "无法初始化 stash"
10663
10664#: git-stash.sh:267
10665msgid "Cannot save the current status"
10666msgstr "无法保存当前状态"
10667
10668#: git-stash.sh:285
10669msgid "Cannot remove worktree changes"
10670msgstr "无法删除工作区变更"
10671
10672#: git-stash.sh:384
10673msgid "No stash found."
10674msgstr "未发现 stash。"
10675
10676#: git-stash.sh:391
10677#, sh-format
10678msgid "Too many revisions specified: $REV"
10679msgstr "指定了太多的版本:$REV"
10680
10681#: git-stash.sh:397
10682#, sh-format
10683msgid "$reference is not a valid reference"
10684msgstr "$reference 不是一个有效的引用"
10685
10686#: git-stash.sh:425
10687#, sh-format
10688msgid "'$args' is not a stash-like commit"
10689msgstr "'$args' 不是 stash 样提交"
10690
10691#: git-stash.sh:436
10692#, sh-format
10693msgid "'$args' is not a stash reference"
10694msgstr "'$args' 不是一个 stash 引用"
10695
10696#: git-stash.sh:444
10697msgid "unable to refresh index"
10698msgstr "无法刷新索引"
10699
10700#: git-stash.sh:448
10701msgid "Cannot apply a stash in the middle of a merge"
10702msgstr "无法在合并过程中恢复进度"
10703
10704#: git-stash.sh:456
10705msgid "Conflicts in index. Try without --index."
10706msgstr "索引中有冲突。尝试不使用 --index。"
10707
10708#: git-stash.sh:458
10709msgid "Could not save index tree"
10710msgstr "不能保存索引树"
10711
10712#: git-stash.sh:492
10713msgid "Cannot unstage modified files"
10714msgstr "无法还原修改的文件"
10715
10716#: git-stash.sh:507
10717msgid "Index was not unstashed."
10718msgstr "索引的进度没有被恢复。"
10719
10720#: git-stash.sh:530
10721#, sh-format
10722msgid "Dropped ${REV} ($s)"
10723msgstr "丢弃了 ${REV} ($s)"
10724
10725#: git-stash.sh:531
10726#, sh-format
10727msgid "${REV}: Could not drop stash entry"
10728msgstr "${REV}:不能丢弃进度条目"
10729
10730#: git-stash.sh:539
10731msgid "No branch name specified"
10732msgstr "未指定分支名"
10733
10734#: git-stash.sh:611
10735msgid "(To restore them type \"git stash apply\")"
10736msgstr "(为恢复数据输入 \"git stash apply\")"
10737
10738#: git-submodule.sh:95
10739#, sh-format
10740msgid "cannot strip one component off url '$remoteurl'"
10741msgstr "无法从 url '$remoteurl' 剥离一个组件"
10742
10743#: git-submodule.sh:237
10744#, sh-format
10745msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10746msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
10747
10748#: git-submodule.sh:287
10749#, sh-format
10750msgid "Clone of '$url' into submodule path '$sm_path' failed"
10751msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
10752
10753#: git-submodule.sh:296
10754#, sh-format
10755msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10756msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
10757
10758#: git-submodule.sh:406
10759msgid "Relative path can only be used from the toplevel of the working tree"
10760msgstr "只能在工作区的顶级目录中使用相对路径"
10761
10762#: git-submodule.sh:416
10763#, sh-format
10764msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10765msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10766
10767#: git-submodule.sh:433
10768#, sh-format
10769msgid "'$sm_path' already exists in the index"
10770msgstr "'$sm_path' 已经存在于索引中"
10771
10772#: git-submodule.sh:437
10773#, sh-format
10774msgid ""
10775"The following path is ignored by one of your .gitignore files:\n"
10776"$sm_path\n"
10777"Use -f if you really want to add it."
10778msgstr ""
10779"以下路径被您的一个 .gitignore 文件所忽略:\n"
10780"$sm_path\n"
10781"如果您确实想添加它,使用 -f 参数。"
10782
10783#: git-submodule.sh:455
10784#, sh-format
10785msgid "Adding existing repo at '$sm_path' to the index"
10786msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10787
10788#: git-submodule.sh:457
10789#, sh-format
10790msgid "'$sm_path' already exists and is not a valid git repo"
10791msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
10792
10793#: git-submodule.sh:465
10794#, sh-format
10795msgid "A git directory for '$sm_name' is found locally with remote(s):"
10796msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10797
10798#: git-submodule.sh:467
10799#, sh-format
10800msgid ""
10801"If you want to reuse this local git directory instead of cloning again from"
10802msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10803
10804#: git-submodule.sh:469
10805#, sh-format
10806msgid ""
10807"use the '--force' option. If the local git directory is not the correct repo"
10808msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10809
10810#: git-submodule.sh:470
10811#, sh-format
10812msgid ""
10813"or you are unsure what this means choose another name with the '--name' "
10814"option."
10815msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10816
10817#: git-submodule.sh:472
10818#, sh-format
10819msgid "Reactivating local git directory for submodule '$sm_name'."
10820msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10821
10822#: git-submodule.sh:484
10823#, sh-format
10824msgid "Unable to checkout submodule '$sm_path'"
10825msgstr "不能检出子模组 '$sm_path'"
10826
10827#: git-submodule.sh:489
10828#, sh-format
10829msgid "Failed to add submodule '$sm_path'"
10830msgstr "无法添加子模组 '$sm_path'"
10831
10832#: git-submodule.sh:498
10833#, sh-format
10834msgid "Failed to register submodule '$sm_path'"
10835msgstr "无法注册子模组 '$sm_path'"
10836
10837#: git-submodule.sh:542
10838#, sh-format
10839msgid "Entering '$prefix$displaypath'"
10840msgstr "正在进入 '$prefix$displaypath'"
10841
10842#: git-submodule.sh:562
10843#, sh-format
10844msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10845msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
10846
10847#: git-submodule.sh:608
10848#, sh-format
10849msgid "No url found for submodule path '$displaypath' in .gitmodules"
10850msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
10851
10852#: git-submodule.sh:617
10853#, sh-format
10854msgid "Failed to register url for submodule path '$displaypath'"
10855msgstr "无法为子模组路径 '$displaypath' 注册 url"
10856
10857#: git-submodule.sh:619
10858#, sh-format
10859msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10860msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10861
10862#: git-submodule.sh:636
10863#, sh-format
10864msgid "Failed to register update mode for submodule path '$displaypath'"
10865msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
10866
10867#: git-submodule.sh:674
10868#, sh-format
10869msgid "Use '.' if you really want to deinitialize all submodules"
10870msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10871
10872#: git-submodule.sh:691
10873#, sh-format
10874msgid "Submodule work tree '$displaypath' contains a .git directory"
10875msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
10876
10877#: git-submodule.sh:692
10878#, sh-format
10879msgid ""
10880"(use 'rm -rf' if you really want to remove it including all of its history)"
10881msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10882
10883#: git-submodule.sh:698
10884#, sh-format
10885msgid ""
10886"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10887"discard them"
10888msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
10889
10890#: git-submodule.sh:701
10891#, sh-format
10892msgid "Cleared directory '$displaypath'"
10893msgstr "已清除目录 '$displaypath'"
10894
10895#: git-submodule.sh:702
10896#, sh-format
10897msgid "Could not remove submodule work tree '$displaypath'"
10898msgstr "无法移除子模组工作区 '$displaypath'"
10899
10900#: git-submodule.sh:705
10901#, sh-format
10902msgid "Could not create empty submodule directory '$displaypath'"
10903msgstr "不能创建空的子模组目录 '$displaypath'"
10904
10905#: git-submodule.sh:714
10906#, sh-format
10907msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10908msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10909
10910#: git-submodule.sh:830
10911#, sh-format
10912msgid ""
10913"Submodule path '$displaypath' not initialized\n"
10914"Maybe you want to use 'update --init'?"
10915msgstr ""
10916"子模组路径 '$displaypath' 没有初始化\n"
10917"也许您想用 'update --init'?"
10918
10919#: git-submodule.sh:843
10920#, sh-format
10921msgid "Unable to find current revision in submodule path '$displaypath'"
10922msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
10923
10924#: git-submodule.sh:852
10925#, sh-format
10926msgid "Unable to fetch in submodule path '$sm_path'"
10927msgstr "无法在子模组路径 '$sm_path' 中获取"
10928
10929#: git-submodule.sh:876
10930#, sh-format
10931msgid "Unable to fetch in submodule path '$displaypath'"
10932msgstr "无法在子模组路径 '$displaypath' 中获取"
10933
10934#: git-submodule.sh:890
10935#, sh-format
10936msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10937msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
10938
10939#: git-submodule.sh:891
10940#, sh-format
10941msgid "Submodule path '$displaypath': checked out '$sha1'"
10942msgstr "子模组路径 '$displaypath':检出 '$sha1'"
10943
10944#: git-submodule.sh:895
10945#, sh-format
10946msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10947msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
10948
10949#: git-submodule.sh:896
10950#, sh-format
10951msgid "Submodule path '$displaypath': rebased into '$sha1'"
10952msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
10953
10954#: git-submodule.sh:901
10955#, sh-format
10956msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10957msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
10958
10959#: git-submodule.sh:902
10960#, sh-format
10961msgid "Submodule path '$displaypath': merged in '$sha1'"
10962msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
10963
10964#: git-submodule.sh:907
10965#, sh-format
10966msgid ""
10967"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10968msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
10969
10970#: git-submodule.sh:908
10971#, sh-format
10972msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10973msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
10974
10975#: git-submodule.sh:938
10976#, sh-format
10977msgid "Failed to recurse into submodule path '$displaypath'"
10978msgstr "无法递归进子模组路径 '$displaypath'"
10979
10980#: git-submodule.sh:1046
10981msgid "The --cached option cannot be used with the --files option"
10982msgstr "选项 --cached 不能和选项 --files 同时使用"
10983
10984#: git-submodule.sh:1098
10985#, sh-format
10986msgid "unexpected mode $mod_dst"
10987msgstr "意外的模式 $mod_dst"
10988
10989# 译者:注意保持前导空格
10990#: git-submodule.sh:1118
10991#, sh-format
10992msgid " Warn: $display_name doesn't contain commit $sha1_src"
10993msgstr " 警告:$display_name 未包含提交 $sha1_src"
10994
10995# 译者:注意保持前导空格
10996#: git-submodule.sh:1121
10997#, sh-format
10998msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10999msgstr " 警告:$display_name 未包含提交 $sha1_dst"
11000
11001# 译者:注意保持前导空格
11002#: git-submodule.sh:1124
11003#, sh-format
11004msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11005msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
11006
11007#: git-submodule.sh:1149
11008msgid "blob"
11009msgstr "数据对象"
11010
11011#: git-submodule.sh:1267
11012#, sh-format
11013msgid "Failed to recurse into submodule path '$sm_path'"
11014msgstr "无法递归进子模组路径 '$sm_path'"
11015
11016#: git-submodule.sh:1331
11017#, sh-format
11018msgid "Synchronizing submodule url for '$displaypath'"
11019msgstr "为 '$displaypath' 同步子模组 url"