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# Contributers:
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-01-18 11:24+0800\n"
16"PO-Revision-Date: 2015-01-18 20:34+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:2517
78#: builtin/blame.c:2518 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:489 builtin/ls-files.c:492 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:258
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:770
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:645 sequencer.c:1100 builtin/blame.c:2706
264#: builtin/branch.c:652 builtin/commit.c:1049 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:438 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:444
311msgid "Refusing to create empty bundle."
312msgstr "不能创建空包。"
313
314#: bundle.c:454
315#, c-format
316msgid "cannot create '%s'"
317msgstr "不能创建 '%s'"
318
319#: bundle.c:475
320msgid "index-pack died"
321msgstr "index-pack 终止"
322
323#: color.c:259
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:469 config.c:471
343#, c-format
344msgid "bad config file line %d in %s"
345msgstr "配置文件 %2$s 出错于第 %1$d 行"
346
347#: config.c:587
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:589
353#, c-format
354msgid "bad numeric config value '%s' for '%s': %s"
355msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
356
357#: config.c:674
358#, c-format
359msgid "failed to expand user dir in: '%s'"
360msgstr "无法扩展 '%s' 中的用户目录"
361
362#: config.c:752 config.c:763
363#, c-format
364msgid "bad zlib compression level %d"
365msgstr "错误的 zlib 压缩级别 %d"
366
367#: config.c:885
368#, c-format
369msgid "invalid mode for object creation: %s"
370msgstr "无效的对象创建模式:%s"
371
372#: config.c:1211
373msgid "unable to parse command-line config"
374msgstr "无法解析命令行中的配置"
375
376#: config.c:1272
377msgid "unknown error occured while reading the configuration files"
378msgstr "在读取配置文件时遇到未知错误"
379
380#: config.c:1596
381#, c-format
382msgid "unable to parse '%s' from command-line config"
383msgstr "无法解析命令行配置中的 '%s'"
384
385#: config.c:1598
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:1657
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:516
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:2957
513#, c-format
514msgid "external diff died, stopping at %s"
515msgstr "外部 diff 退出,停止在 %s"
516
517#: diff.c:3352
518msgid "--follow requires exactly one pathspec"
519msgstr "--follow 参数后只跟一个 pathspec"
520
521#: diff.c:3515
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:3529
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:1898
882msgid "Merging:"
883msgstr "合并:"
884
885#: merge-recursive.c:1911
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:1948
893msgid "merge returned no commit"
894msgstr "合并未返回提交"
895
896#: merge-recursive.c:2005
897#, c-format
898msgid "Could not parse object '%s'"
899msgstr "不能解析对象 '%s'"
900
901#: merge-recursive.c:2016 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:1267
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:1277
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#: run-command.c:87
1123msgid "open /dev/null failed"
1124msgstr "不能打开 /dev/null"
1125
1126#: run-command.c:89
1127#, c-format
1128msgid "dup2(%d,%d) failed"
1129msgstr "不能调用 dup2(%d,%d)"
1130
1131#: send-pack.c:268
1132msgid "failed to sign the push certificate"
1133msgstr "无法为推送证书签名"
1134
1135#: send-pack.c:325
1136msgid "the receiving end does not support --signed push"
1137msgstr "接收端不支持签名推送"
1138
1139#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
1140#: builtin/merge.c:1005
1141#, c-format
1142msgid "Could not open '%s' for writing"
1143msgstr "不能为写入打开 '%s'"
1144
1145#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997
1146#: builtin/merge.c:1010
1147#, c-format
1148msgid "Could not write to '%s'"
1149msgstr "不能写入 '%s'"
1150
1151#: sequencer.c:195
1152msgid ""
1153"after resolving the conflicts, mark the corrected paths\n"
1154"with 'git add <paths>' or 'git rm <paths>'"
1155msgstr ""
1156"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1157"命令标记修正后的文件"
1158
1159#: sequencer.c:198
1160msgid ""
1161"after resolving the conflicts, mark the corrected paths\n"
1162"with 'git add <paths>' or 'git rm <paths>'\n"
1163"and commit the result with 'git commit'"
1164msgstr ""
1165"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1166"对修正后的文件做标记,然后用 'git commit' 提交"
1167
1168#: sequencer.c:211 sequencer.c:856 sequencer.c:939
1169#, c-format
1170msgid "Could not write to %s"
1171msgstr "不能写入 %s"
1172
1173#: sequencer.c:214
1174#, c-format
1175msgid "Error wrapping up %s"
1176msgstr "错误收尾 %s"
1177
1178#: sequencer.c:229
1179msgid "Your local changes would be overwritten by cherry-pick."
1180msgstr "您的本地修改将被拣选操作覆盖。"
1181
1182#: sequencer.c:231
1183msgid "Your local changes would be overwritten by revert."
1184msgstr "您的本地修改将被还原操作覆盖。"
1185
1186#: sequencer.c:234
1187msgid "Commit your changes or stash them to proceed."
1188msgstr "提交您的修改或保存进度后再继续。"
1189
1190#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1191#: sequencer.c:321
1192#, c-format
1193msgid "%s: Unable to write new index file"
1194msgstr "%s:无法写入新索引文件"
1195
1196#: sequencer.c:339
1197msgid "Could not resolve HEAD commit\n"
1198msgstr "不能解析 HEAD 提交\n"
1199
1200#: sequencer.c:359
1201msgid "Unable to update cache tree\n"
1202msgstr "不能更新缓存\n"
1203
1204#: sequencer.c:406
1205#, c-format
1206msgid "Could not parse commit %s\n"
1207msgstr "不能解析提交 %s\n"
1208
1209#: sequencer.c:411
1210#, c-format
1211msgid "Could not parse parent commit %s\n"
1212msgstr "不能解析父提交 %s\n"
1213
1214#: sequencer.c:477
1215msgid "Your index file is unmerged."
1216msgstr "您的索引文件未完成合并。"
1217
1218#: sequencer.c:496
1219#, c-format
1220msgid "Commit %s is a merge but no -m option was given."
1221msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1222
1223#: sequencer.c:504
1224#, c-format
1225msgid "Commit %s does not have parent %d"
1226msgstr "提交 %s 没有父提交 %d"
1227
1228#: sequencer.c:508
1229#, c-format
1230msgid "Mainline was specified but commit %s is not a merge."
1231msgstr "指定了主线但提交 %s 不是一个合并。"
1232
1233#. TRANSLATORS: The first %s will be "revert" or
1234#. "cherry-pick", the second %s a SHA1
1235#: sequencer.c:521
1236#, c-format
1237msgid "%s: cannot parse parent commit %s"
1238msgstr "%s:不能解析父提交 %s"
1239
1240#: sequencer.c:525
1241#, c-format
1242msgid "Cannot get commit message for %s"
1243msgstr "不能得到 %s 的提交说明"
1244
1245#: sequencer.c:611
1246#, c-format
1247msgid "could not revert %s... %s"
1248msgstr "不能还原 %s... %s"
1249
1250#: sequencer.c:612
1251#, c-format
1252msgid "could not apply %s... %s"
1253msgstr "不能应用 %s... %s"
1254
1255#: sequencer.c:648
1256msgid "empty commit set passed"
1257msgstr "提供了空的提交集"
1258
1259#: sequencer.c:656
1260#, c-format
1261msgid "git %s: failed to read the index"
1262msgstr "git %s:无法读取索引"
1263
1264#: sequencer.c:660
1265#, c-format
1266msgid "git %s: failed to refresh the index"
1267msgstr "git %s:无法刷新索引"
1268
1269#: sequencer.c:720
1270#, c-format
1271msgid "Cannot %s during a %s"
1272msgstr "无法 %s 在一个 %s 过程中"
1273
1274#: sequencer.c:742
1275#, c-format
1276msgid "Could not parse line %d."
1277msgstr "不能解析第 %d 行。"
1278
1279#: sequencer.c:747
1280msgid "No commits parsed."
1281msgstr "没有提交被解析。"
1282
1283#: sequencer.c:760
1284#, c-format
1285msgid "Could not open %s"
1286msgstr "不能打开 %s"
1287
1288#: sequencer.c:764
1289#, c-format
1290msgid "Could not read %s."
1291msgstr "不能读取 %s。"
1292
1293#: sequencer.c:771
1294#, c-format
1295msgid "Unusable instruction sheet: %s"
1296msgstr "无用的指令表单:%s"
1297
1298#: sequencer.c:801
1299#, c-format
1300msgid "Invalid key: %s"
1301msgstr "无效键名:%s"
1302
1303#: sequencer.c:804
1304#, c-format
1305msgid "Invalid value for %s: %s"
1306msgstr "%s 的值无效:%s"
1307
1308#: sequencer.c:816
1309#, c-format
1310msgid "Malformed options sheet: %s"
1311msgstr "非法的选项表单:%s"
1312
1313#: sequencer.c:837
1314msgid "a cherry-pick or revert is already in progress"
1315msgstr "一个拣选或还原操作已在进行"
1316
1317#: sequencer.c:838
1318msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1319msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1320
1321#: sequencer.c:842
1322#, c-format
1323msgid "Could not create sequencer directory %s"
1324msgstr "不能创建序列目录 %s"
1325
1326#: sequencer.c:858 sequencer.c:943
1327#, c-format
1328msgid "Error wrapping up %s."
1329msgstr "错误收尾 %s。"
1330
1331#: sequencer.c:877 sequencer.c:1013
1332msgid "no cherry-pick or revert in progress"
1333msgstr "拣选或还原操作并未进行"
1334
1335#: sequencer.c:879
1336msgid "cannot resolve HEAD"
1337msgstr "不能解析 HEAD"
1338
1339#: sequencer.c:881
1340msgid "cannot abort from a branch yet to be born"
1341msgstr "不能从尚未建立的分支终止"
1342
1343#: sequencer.c:903 builtin/apply.c:4128
1344#, c-format
1345msgid "cannot open %s: %s"
1346msgstr "不能打开 %s:%s"
1347
1348#: sequencer.c:906
1349#, c-format
1350msgid "cannot read %s: %s"
1351msgstr "不能读取 %s:%s"
1352
1353#: sequencer.c:907
1354msgid "unexpected end of file"
1355msgstr "意外的文件结束"
1356
1357#: sequencer.c:913
1358#, c-format
1359msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1360msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1361
1362#: sequencer.c:936
1363#, c-format
1364msgid "Could not format %s."
1365msgstr "不能格式化 %s。"
1366
1367#: sequencer.c:1081
1368#, c-format
1369msgid "%s: can't cherry-pick a %s"
1370msgstr "%s:不能拣选一个%s"
1371
1372#: sequencer.c:1084
1373#, c-format
1374msgid "%s: bad revision"
1375msgstr "%s:错误的版本"
1376
1377#: sequencer.c:1118
1378msgid "Can't revert as initial commit"
1379msgstr "不能作为初始提交还原"
1380
1381#: sequencer.c:1119
1382msgid "Can't cherry-pick into empty head"
1383msgstr "不能拣选到空分支"
1384
1385#: sha1_name.c:440
1386msgid ""
1387"Git normally never creates a ref that ends with 40 hex characters\n"
1388"because it will be ignored when you just specify 40-hex. These refs\n"
1389"may be created by mistake. For example,\n"
1390"\n"
1391" git checkout -b $br $(git rev-parse ...)\n"
1392"\n"
1393"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1394"examine these refs and maybe delete them. Turn this message off by\n"
1395"running \"git config advice.objectNameWarning false\""
1396msgstr ""
1397"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1398"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1399"\n"
1400" git checkout -b $br $(git rev-parse ...)\n"
1401"\n"
1402"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1403"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1404"命令关闭本消息通知。"
1405
1406#: sha1_name.c:1068
1407msgid "HEAD does not point to a branch"
1408msgstr "HEAD 没有指向一个分支"
1409
1410#: sha1_name.c:1071
1411#, c-format
1412msgid "No such branch: '%s'"
1413msgstr "没有此分支:'%s'"
1414
1415#: sha1_name.c:1073
1416#, c-format
1417msgid "No upstream configured for branch '%s'"
1418msgstr "尚未给分支 '%s' 设置上游"
1419
1420#: sha1_name.c:1077
1421#, c-format
1422msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1423msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1424
1425#: submodule.c:64 submodule.c:98
1426msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1427msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1428
1429#: submodule.c:68 submodule.c:102
1430#, c-format
1431msgid "Could not find section in .gitmodules where path=%s"
1432msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1433
1434#: submodule.c:76
1435#, c-format
1436msgid "Could not update .gitmodules entry %s"
1437msgstr "不能更新 .gitmodules 条目 %s"
1438
1439#: submodule.c:109
1440#, c-format
1441msgid "Could not remove .gitmodules entry for %s"
1442msgstr "无法移除 %s 的 .gitmodules 条目"
1443
1444#: submodule.c:120
1445msgid "staging updated .gitmodules failed"
1446msgstr "将更新后 .gitmodules 添加暂存区失败"
1447
1448#: submodule.c:1111 builtin/init-db.c:371
1449#, c-format
1450msgid "Could not create git link %s"
1451msgstr "不能创建 git link %s"
1452
1453#: submodule.c:1122
1454#, c-format
1455msgid "Could not set core.worktree in %s"
1456msgstr "不能在 %s 中设置 core.worktree"
1457
1458#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566
1459#: trailer.c:570
1460#, c-format
1461msgid "unknown value '%s' for key '%s'"
1462msgstr "键 '%2$s' 的未知取值 '%1$s'"
1463
1464#: trailer.c:552 trailer.c:557 builtin/remote.c:290
1465#, c-format
1466msgid "more than one %s"
1467msgstr "多于一个 %s"
1468
1469#: trailer.c:590
1470#, c-format
1471msgid "empty trailer token in trailer '%.*s'"
1472msgstr "签名 '%.*s' 的键为空"
1473
1474#: trailer.c:710
1475#, c-format
1476msgid "could not read input file '%s'"
1477msgstr "不能读取输入文件 '%s'"
1478
1479#: trailer.c:713
1480msgid "could not read from stdin"
1481msgstr "不能自标准输入读取"
1482
1483#: unpack-trees.c:202
1484msgid "Checking out files"
1485msgstr "正在检出文件"
1486
1487#: urlmatch.c:120
1488msgid "invalid URL scheme name or missing '://' suffix"
1489msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1490
1491#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1492#, c-format
1493msgid "invalid %XX escape sequence"
1494msgstr "无效的 %XX 转义序列"
1495
1496#: urlmatch.c:172
1497msgid "missing host and scheme is not 'file:'"
1498msgstr "缺失主机名且URL方案不是 'file:'"
1499
1500#: urlmatch.c:189
1501msgid "a 'file:' URL may not have a port number"
1502msgstr "一个 'file:' URL 不应该包含端口号"
1503
1504#: urlmatch.c:199
1505msgid "invalid characters in host name"
1506msgstr "主机名中包含无效的字符"
1507
1508#: urlmatch.c:244 urlmatch.c:255
1509msgid "invalid port number"
1510msgstr "无效的端口号"
1511
1512#: urlmatch.c:322
1513msgid "invalid '..' path segment"
1514msgstr "无效的 '..' 路径片段"
1515
1516#: wrapper.c:509
1517#, c-format
1518msgid "unable to access '%s': %s"
1519msgstr "不能访问 '%s':%s"
1520
1521#: wrapper.c:530
1522#, c-format
1523msgid "unable to access '%s'"
1524msgstr "不能访问 '%s'"
1525
1526#: wrapper.c:541
1527#, c-format
1528msgid "unable to look up current user in the passwd file: %s"
1529msgstr "无法在口令文件中查询到当前用户:%s"
1530
1531#: wrapper.c:542
1532msgid "no such user"
1533msgstr "无此用户"
1534
1535#: wrapper.c:550
1536msgid "unable to get current working directory"
1537msgstr "不能获取当前工作目录"
1538
1539#: wt-status.c:150
1540msgid "Unmerged paths:"
1541msgstr "未合并的路径:"
1542
1543# 译者:注意保持前导空格
1544#: wt-status.c:177 wt-status.c:204
1545#, c-format
1546msgid " (use \"git reset %s <file>...\" to unstage)"
1547msgstr " (使用 \"git reset %s <文件>...\" 撤出暂存区)"
1548
1549# 译者:注意保持前导空格
1550#: wt-status.c:179 wt-status.c:206
1551msgid " (use \"git rm --cached <file>...\" to unstage)"
1552msgstr " (使用 \"git rm --cached <文件>...\" 撤出暂存区)"
1553
1554# 译者:注意保持前导空格
1555#: wt-status.c:183
1556msgid " (use \"git add <file>...\" to mark resolution)"
1557msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
1558
1559# 译者:注意保持前导空格
1560#: wt-status.c:185 wt-status.c:189
1561msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1562msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1563
1564# 译者:注意保持前导空格
1565#: wt-status.c:187
1566msgid " (use \"git rm <file>...\" to mark resolution)"
1567msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
1568
1569#: wt-status.c:198
1570msgid "Changes to be committed:"
1571msgstr "要提交的变更:"
1572
1573#: wt-status.c:216
1574msgid "Changes not staged for commit:"
1575msgstr "尚未暂存以备提交的变更:"
1576
1577# 译者:注意保持前导空格
1578#: wt-status.c:220
1579msgid " (use \"git add <file>...\" to update what will be committed)"
1580msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
1581
1582# 译者:注意保持前导空格
1583#: wt-status.c:222
1584msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1585msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
1586
1587# 译者:注意保持前导空格
1588#: wt-status.c:223
1589msgid ""
1590" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1591msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
1592
1593# 译者:注意保持前导空格
1594#: wt-status.c:225
1595msgid " (commit or discard the untracked or modified content in submodules)"
1596msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1597
1598# 译者:注意保持前导空格
1599#: wt-status.c:237
1600#, c-format
1601msgid " (use \"git %s <file>...\" to include in what will be committed)"
1602msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
1603
1604#: wt-status.c:252
1605msgid "both deleted:"
1606msgstr "双方删除:"
1607
1608#: wt-status.c:254
1609msgid "added by us:"
1610msgstr "由我们添加:"
1611
1612#: wt-status.c:256
1613msgid "deleted by them:"
1614msgstr "由他们删除:"
1615
1616#: wt-status.c:258
1617msgid "added by them:"
1618msgstr "由他们添加:"
1619
1620#: wt-status.c:260
1621msgid "deleted by us:"
1622msgstr "由我们删除:"
1623
1624#: wt-status.c:262
1625msgid "both added:"
1626msgstr "双方添加:"
1627
1628#: wt-status.c:264
1629msgid "both modified:"
1630msgstr "双方修改:"
1631
1632#: wt-status.c:266
1633#, c-format
1634msgid "bug: unhandled unmerged status %x"
1635msgstr "bug:无法处理的未合并状态 %x"
1636
1637#: wt-status.c:274
1638msgid "new file:"
1639msgstr "新文件:"
1640
1641#: wt-status.c:276
1642msgid "copied:"
1643msgstr "拷贝:"
1644
1645#: wt-status.c:278
1646msgid "deleted:"
1647msgstr "删除:"
1648
1649#: wt-status.c:280
1650msgid "modified:"
1651msgstr "修改:"
1652
1653#: wt-status.c:282
1654msgid "renamed:"
1655msgstr "重命名:"
1656
1657#: wt-status.c:284
1658msgid "typechange:"
1659msgstr "类型变更:"
1660
1661#: wt-status.c:286
1662msgid "unknown:"
1663msgstr "未知:"
1664
1665#: wt-status.c:288
1666msgid "unmerged:"
1667msgstr "未合并:"
1668
1669# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1670#: wt-status.c:370
1671msgid "new commits, "
1672msgstr "新提交, "
1673
1674# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1675#: wt-status.c:372
1676msgid "modified content, "
1677msgstr "修改的内容, "
1678
1679# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1680#: wt-status.c:374
1681msgid "untracked content, "
1682msgstr "未跟踪的内容, "
1683
1684#: wt-status.c:391
1685#, c-format
1686msgid "bug: unhandled diff status %c"
1687msgstr "bug:无法处理的差异状态 %c"
1688
1689#: wt-status.c:758
1690msgid "Submodules changed but not updated:"
1691msgstr "子模组已修改但尚未更新:"
1692
1693#: wt-status.c:760
1694msgid "Submodule changes to be committed:"
1695msgstr "要提交的子模组变更:"
1696
1697#: wt-status.c:839
1698msgid ""
1699"Do not touch the line above.\n"
1700"Everything below will be removed."
1701msgstr ""
1702"不要改动上面的一行。\n"
1703"下面的所有内容均将被删除。"
1704
1705#: wt-status.c:930
1706msgid "You have unmerged paths."
1707msgstr "您有尚未合并的路径。"
1708
1709# 译者:注意保持前导空格
1710#: wt-status.c:933
1711msgid " (fix conflicts and run \"git commit\")"
1712msgstr " (解决冲突并运行 \"git commit\")"
1713
1714#: wt-status.c:936
1715msgid "All conflicts fixed but you are still merging."
1716msgstr "所有冲突已解决但您仍处于合并中。"
1717
1718# 译者:注意保持前导空格
1719#: wt-status.c:939
1720msgid " (use \"git commit\" to conclude merge)"
1721msgstr " (使用 \"git commit\" 结束合并)"
1722
1723#: wt-status.c:949
1724msgid "You are in the middle of an am session."
1725msgstr "您正处于 am 操作过程中。"
1726
1727#: wt-status.c:952
1728msgid "The current patch is empty."
1729msgstr "当前的补丁为空。"
1730
1731# 译者:注意保持前导空格
1732#: wt-status.c:956
1733msgid " (fix conflicts and then run \"git am --continue\")"
1734msgstr " (解决冲突,然后运行 \"git am --continue\")"
1735
1736# 译者:注意保持前导空格
1737#: wt-status.c:958
1738msgid " (use \"git am --skip\" to skip this patch)"
1739msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1740
1741# 译者:注意保持前导空格
1742#: wt-status.c:960
1743msgid " (use \"git am --abort\" to restore the original branch)"
1744msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1745
1746#: wt-status.c:1020 wt-status.c:1037
1747#, c-format
1748msgid "You are currently rebasing branch '%s' on '%s'."
1749msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1750
1751#: wt-status.c:1025 wt-status.c:1042
1752msgid "You are currently rebasing."
1753msgstr "您在执行变基操作。"
1754
1755# 译者:注意保持前导空格
1756#: wt-status.c:1028
1757msgid " (fix conflicts and then run \"git rebase --continue\")"
1758msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1759
1760# 译者:注意保持前导空格
1761#: wt-status.c:1030
1762msgid " (use \"git rebase --skip\" to skip this patch)"
1763msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1764
1765# 译者:注意保持前导空格
1766#: wt-status.c:1032
1767msgid " (use \"git rebase --abort\" to check out the original branch)"
1768msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1769
1770# 译者:注意保持前导空格
1771#: wt-status.c:1045
1772msgid " (all conflicts fixed: run \"git rebase --continue\")"
1773msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1774
1775#: wt-status.c:1049
1776#, c-format
1777msgid ""
1778"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1779msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1780
1781#: wt-status.c:1054
1782msgid "You are currently splitting a commit during a rebase."
1783msgstr "您在执行变基操作时拆分提交。"
1784
1785# 译者:注意保持前导空格
1786#: wt-status.c:1057
1787msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1788msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1789
1790#: wt-status.c:1061
1791#, c-format
1792msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1793msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1794
1795#: wt-status.c:1066
1796msgid "You are currently editing a commit during a rebase."
1797msgstr "您在执行变基操作时编辑提交。"
1798
1799# 译者:注意保持前导空格
1800#: wt-status.c:1069
1801msgid " (use \"git commit --amend\" to amend the current commit)"
1802msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1803
1804# 译者:注意保持前导空格
1805#: wt-status.c:1071
1806msgid ""
1807" (use \"git rebase --continue\" once you are satisfied with your changes)"
1808msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1809
1810#: wt-status.c:1081
1811#, c-format
1812msgid "You are currently cherry-picking commit %s."
1813msgstr "您在执行拣选提交 %s 的操作。"
1814
1815# 译者:注意保持前导空格
1816#: wt-status.c:1086
1817msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1818msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1819
1820# 译者:注意保持前导空格
1821#: wt-status.c:1089
1822msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1823msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1824
1825# 译者:注意保持前导空格
1826#: wt-status.c:1091
1827msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1828msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1829
1830#: wt-status.c:1100
1831#, c-format
1832msgid "You are currently reverting commit %s."
1833msgstr "您在执行反转提交 %s 的操作。"
1834
1835# 译者:注意保持前导空格
1836#: wt-status.c:1105
1837msgid " (fix conflicts and run \"git revert --continue\")"
1838msgstr " (解决冲突并运行 \"git revert --continue\")"
1839
1840# 译者:注意保持前导空格
1841#: wt-status.c:1108
1842msgid " (all conflicts fixed: run \"git revert --continue\")"
1843msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1844
1845# 译者:注意保持前导空格
1846#: wt-status.c:1110
1847msgid " (use \"git revert --abort\" to cancel the revert operation)"
1848msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1849
1850#: wt-status.c:1121
1851#, c-format
1852msgid "You are currently bisecting, started from branch '%s'."
1853msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1854
1855#: wt-status.c:1125
1856msgid "You are currently bisecting."
1857msgstr "您在执行二分查找操作。"
1858
1859# 译者:注意保持前导空格
1860#: wt-status.c:1128
1861msgid " (use \"git bisect reset\" to get back to the original branch)"
1862msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1863
1864#: wt-status.c:1303
1865msgid "On branch "
1866msgstr "位于分支 "
1867
1868#: wt-status.c:1310
1869msgid "rebase in progress; onto "
1870msgstr "变基操作正在进行中;至 "
1871
1872#: wt-status.c:1317
1873msgid "HEAD detached at "
1874msgstr "头指针分离于 "
1875
1876#: wt-status.c:1319
1877msgid "HEAD detached from "
1878msgstr "头指针分离自 "
1879
1880#: wt-status.c:1322
1881msgid "Not currently on any branch."
1882msgstr "当前不在任何分支上。"
1883
1884#: wt-status.c:1339
1885msgid "Initial commit"
1886msgstr "初始提交"
1887
1888#: wt-status.c:1353
1889msgid "Untracked files"
1890msgstr "未跟踪的文件"
1891
1892#: wt-status.c:1355
1893msgid "Ignored files"
1894msgstr "忽略的文件"
1895
1896#: wt-status.c:1359
1897#, c-format
1898msgid ""
1899"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1900"may speed it up, but you have to be careful not to forget to add\n"
1901"new files yourself (see 'git help status')."
1902msgstr ""
1903"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1904"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1905
1906#: wt-status.c:1365
1907#, c-format
1908msgid "Untracked files not listed%s"
1909msgstr "未跟踪的文件没有列出%s"
1910
1911# 译者:中文字符串拼接,可删除前导空格
1912#: wt-status.c:1367
1913msgid " (use -u option to show untracked files)"
1914msgstr "(使用 -u 参数显示未跟踪的文件)"
1915
1916#: wt-status.c:1373
1917msgid "No changes"
1918msgstr "没有修改"
1919
1920#: wt-status.c:1378
1921#, c-format
1922msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1923msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1924
1925#: wt-status.c:1381
1926#, c-format
1927msgid "no changes added to commit\n"
1928msgstr "修改尚未加入提交\n"
1929
1930#: wt-status.c:1384
1931#, c-format
1932msgid ""
1933"nothing added to commit but untracked files present (use \"git add\" to "
1934"track)\n"
1935msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1936
1937#: wt-status.c:1387
1938#, c-format
1939msgid "nothing added to commit but untracked files present\n"
1940msgstr "提交为空,但是存在尚未跟踪的文件\n"
1941
1942# 译者:中文字符串拼接,可删除前导空格
1943#: wt-status.c:1390
1944#, c-format
1945msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1946msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1947
1948#: wt-status.c:1393 wt-status.c:1398
1949#, c-format
1950msgid "nothing to commit\n"
1951msgstr "无文件要提交\n"
1952
1953# 译者:中文字符串拼接,可删除前导空格
1954#: wt-status.c:1396
1955#, c-format
1956msgid "nothing to commit (use -u to show untracked files)\n"
1957msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1958
1959# 译者:中文字符串拼接,可删除前导空格
1960#: wt-status.c:1400
1961#, c-format
1962msgid "nothing to commit, working directory clean\n"
1963msgstr "无文件要提交,干净的工作区\n"
1964
1965#: wt-status.c:1509
1966msgid "HEAD (no branch)"
1967msgstr "HEAD(非分支)"
1968
1969# 译者:注意保持句尾空格
1970#: wt-status.c:1515
1971msgid "Initial commit on "
1972msgstr "初始提交于 "
1973
1974#: wt-status.c:1547
1975msgid "gone"
1976msgstr "丢失"
1977
1978# 译者:注意保持句尾空格
1979#: wt-status.c:1549 wt-status.c:1557
1980msgid "behind "
1981msgstr "落后 "
1982
1983#: compat/precompose_utf8.c:55 builtin/clone.c:360
1984#, c-format
1985msgid "failed to unlink '%s'"
1986msgstr "无法删除 '%s'"
1987
1988#: builtin/add.c:22
1989msgid "git add [options] [--] <pathspec>..."
1990msgstr "git add [选项] [--] <路径规则>..."
1991
1992#: builtin/add.c:65
1993#, c-format
1994msgid "unexpected diff status %c"
1995msgstr "意外的差异状态 %c"
1996
1997#: builtin/add.c:70 builtin/commit.c:275
1998msgid "updating files failed"
1999msgstr "更新文件失败"
2000
2001#: builtin/add.c:80
2002#, c-format
2003msgid "remove '%s'\n"
2004msgstr "删除 '%s'\n"
2005
2006#: builtin/add.c:134
2007msgid "Unstaged changes after refreshing the index:"
2008msgstr "刷新索引之后尚未被暂存的变更:"
2009
2010#: builtin/add.c:194 builtin/rev-parse.c:785
2011msgid "Could not read the index"
2012msgstr "不能读取索引"
2013
2014#: builtin/add.c:205
2015#, c-format
2016msgid "Could not open '%s' for writing."
2017msgstr "不能打开 '%s' 以写入。"
2018
2019#: builtin/add.c:209
2020msgid "Could not write patch"
2021msgstr "不能生成补丁"
2022
2023#: builtin/add.c:214
2024#, c-format
2025msgid "Could not stat '%s'"
2026msgstr "不能查看文件状态 '%s'"
2027
2028#: builtin/add.c:216
2029msgid "Empty patch. Aborted."
2030msgstr "空补丁。异常终止。"
2031
2032#: builtin/add.c:221
2033#, c-format
2034msgid "Could not apply '%s'"
2035msgstr "不能应用 '%s'"
2036
2037#: builtin/add.c:231
2038msgid "The following paths are ignored by one of your .gitignore files:\n"
2039msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2040
2041#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
2042#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372
2043#: builtin/rm.c:269
2044msgid "dry run"
2045msgstr "演习"
2046
2047#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19
2048#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608
2049#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2050msgid "be verbose"
2051msgstr "冗长输出"
2052
2053#: builtin/add.c:251
2054msgid "interactive picking"
2055msgstr "交互式拣选"
2056
2057#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286
2058msgid "select hunks interactively"
2059msgstr "交互式挑选数据块"
2060
2061#: builtin/add.c:253
2062msgid "edit current diff and apply"
2063msgstr "编辑当前差异并应用"
2064
2065#: builtin/add.c:254
2066msgid "allow adding otherwise ignored files"
2067msgstr "允许添加忽略的文件"
2068
2069#: builtin/add.c:255
2070msgid "update tracked files"
2071msgstr "更新已跟踪的文件"
2072
2073#: builtin/add.c:256
2074msgid "record only the fact that the path will be added later"
2075msgstr "只记录,该路径稍后再添加"
2076
2077#: builtin/add.c:257
2078msgid "add changes from all tracked and untracked files"
2079msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2080
2081#: builtin/add.c:260
2082msgid "ignore paths removed in the working tree (same as --no-all)"
2083msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2084
2085#: builtin/add.c:262
2086msgid "don't add, only refresh the index"
2087msgstr "不添加,只刷新索引"
2088
2089#: builtin/add.c:263
2090msgid "just skip files which cannot be added because of errors"
2091msgstr "跳过因出错不能添加的文件"
2092
2093#: builtin/add.c:264
2094msgid "check if - even missing - files are ignored in dry run"
2095msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2096
2097#: builtin/add.c:286
2098#, c-format
2099msgid "Use -f if you really want to add them.\n"
2100msgstr "使用 -f 参数如果您确实要添加它们。\n"
2101
2102#: builtin/add.c:293
2103msgid "adding files failed"
2104msgstr "添加文件失败"
2105
2106#: builtin/add.c:329
2107msgid "-A and -u are mutually incompatible"
2108msgstr "-A 和 -u 选项互斥"
2109
2110#: builtin/add.c:336
2111msgid "Option --ignore-missing can only be used together with --dry-run"
2112msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2113
2114#: builtin/add.c:357
2115#, c-format
2116msgid "Nothing specified, nothing added.\n"
2117msgstr "没有指定文件,也没有文件被添加。\n"
2118
2119#: builtin/add.c:358
2120#, c-format
2121msgid "Maybe you wanted to say 'git add .'?\n"
2122msgstr "也许您想要执行 'git add .'?\n"
2123
2124#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
2125#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2126msgid "index file corrupt"
2127msgstr "索引文件损坏"
2128
2129#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431
2130msgid "Unable to write new index file"
2131msgstr "无法写入新索引文件"
2132
2133#: builtin/apply.c:58
2134msgid "git apply [options] [<patch>...]"
2135msgstr "git apply [选项] [<补丁>...]"
2136
2137#: builtin/apply.c:111
2138#, c-format
2139msgid "unrecognized whitespace option '%s'"
2140msgstr "未能识别的空白字符选项 '%s'"
2141
2142#: builtin/apply.c:126
2143#, c-format
2144msgid "unrecognized whitespace ignore option '%s'"
2145msgstr "未能识别的空白字符忽略选项 '%s'"
2146
2147#: builtin/apply.c:826
2148#, c-format
2149msgid "Cannot prepare timestamp regexp %s"
2150msgstr "无法准备时间戳正则表达式 %s"
2151
2152#: builtin/apply.c:835
2153#, c-format
2154msgid "regexec returned %d for input: %s"
2155msgstr "regexec 返回 %d,输入为:%s"
2156
2157#: builtin/apply.c:916
2158#, c-format
2159msgid "unable to find filename in patch at line %d"
2160msgstr "不能在补丁的第 %d 行找到文件名"
2161
2162#: builtin/apply.c:948
2163#, c-format
2164msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2165msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2166
2167#: builtin/apply.c:952
2168#, c-format
2169msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2170msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2171
2172#: builtin/apply.c:953
2173#, c-format
2174msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2175msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2176
2177#: builtin/apply.c:960
2178#, c-format
2179msgid "git apply: bad git-diff - expected /dev/null on line %d"
2180msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2181
2182#: builtin/apply.c:1423
2183#, c-format
2184msgid "recount: unexpected line: %.*s"
2185msgstr "recount:意外的行:%.*s"
2186
2187#: builtin/apply.c:1480
2188#, c-format
2189msgid "patch fragment without header at line %d: %.*s"
2190msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2191
2192#: builtin/apply.c:1497
2193#, c-format
2194msgid ""
2195"git diff header lacks filename information when removing %d leading pathname "
2196"component (line %d)"
2197msgid_plural ""
2198"git diff header lacks filename information when removing %d leading pathname "
2199"components (line %d)"
2200msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2201msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2202
2203#: builtin/apply.c:1657
2204msgid "new file depends on old contents"
2205msgstr "新文件依赖旧内容"
2206
2207#: builtin/apply.c:1659
2208msgid "deleted file still has contents"
2209msgstr "删除的文件仍有内容"
2210
2211#: builtin/apply.c:1685
2212#, c-format
2213msgid "corrupt patch at line %d"
2214msgstr "补丁在第 %d 行损坏"
2215
2216#: builtin/apply.c:1721
2217#, c-format
2218msgid "new file %s depends on old contents"
2219msgstr "新文件 %s 依赖旧内容"
2220
2221#: builtin/apply.c:1723
2222#, c-format
2223msgid "deleted file %s still has contents"
2224msgstr "删除的文件 %s 仍有内容"
2225
2226#: builtin/apply.c:1726
2227#, c-format
2228msgid "** warning: file %s becomes empty but is not deleted"
2229msgstr "** 警告:文件 %s 成为空文件但并未删除"
2230
2231#: builtin/apply.c:1872
2232#, c-format
2233msgid "corrupt binary patch at line %d: %.*s"
2234msgstr "二进制补丁在第 %d 行损坏:%.*s"
2235
2236#: builtin/apply.c:1901
2237#, c-format
2238msgid "unrecognized binary patch at line %d"
2239msgstr "未能识别的二进制补丁位于第 %d 行"
2240
2241#: builtin/apply.c:2052
2242#, c-format
2243msgid "patch with only garbage at line %d"
2244msgstr "补丁文件的第 %d 行只有垃圾数据"
2245
2246#: builtin/apply.c:2142
2247#, c-format
2248msgid "unable to read symlink %s"
2249msgstr "无法读取符号链接 %s"
2250
2251#: builtin/apply.c:2146
2252#, c-format
2253msgid "unable to open or read %s"
2254msgstr "不能打开或读取 %s"
2255
2256#: builtin/apply.c:2754
2257#, c-format
2258msgid "invalid start of line: '%c'"
2259msgstr "无效的行首字符:'%c'"
2260
2261#: builtin/apply.c:2872
2262#, c-format
2263msgid "Hunk #%d succeeded at %d (offset %d line)."
2264msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2265msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2266msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2267
2268#: builtin/apply.c:2884
2269#, c-format
2270msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2271msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2272
2273#: builtin/apply.c:2890
2274#, c-format
2275msgid ""
2276"while searching for:\n"
2277"%.*s"
2278msgstr ""
2279"当查询:\n"
2280"%.*s"
2281
2282#: builtin/apply.c:2909
2283#, c-format
2284msgid "missing binary patch data for '%s'"
2285msgstr "缺失 '%s' 的二进制补丁数据"
2286
2287#: builtin/apply.c:3010
2288#, c-format
2289msgid "binary patch does not apply to '%s'"
2290msgstr "二进制补丁未应用到 '%s'"
2291
2292#: builtin/apply.c:3016
2293#, c-format
2294msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2295msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2296
2297#: builtin/apply.c:3037
2298#, c-format
2299msgid "patch failed: %s:%ld"
2300msgstr "打补丁失败:%s:%ld"
2301
2302#: builtin/apply.c:3161
2303#, c-format
2304msgid "cannot checkout %s"
2305msgstr "不能检出 %s"
2306
2307#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260
2308#, c-format
2309msgid "read of %s failed"
2310msgstr "读取 %s 失败"
2311
2312#: builtin/apply.c:3240 builtin/apply.c:3462
2313#, c-format
2314msgid "path %s has been renamed/deleted"
2315msgstr "路径 %s 已经被重命名/删除"
2316
2317#: builtin/apply.c:3321 builtin/apply.c:3476
2318#, c-format
2319msgid "%s: does not exist in index"
2320msgstr "%s:不存在于索引中"
2321
2322#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490
2323#, c-format
2324msgid "%s: %s"
2325msgstr "%s:%s"
2326
2327#: builtin/apply.c:3330 builtin/apply.c:3484
2328#, c-format
2329msgid "%s: does not match index"
2330msgstr "%s:和索引不匹配"
2331
2332#: builtin/apply.c:3432
2333msgid "removal patch leaves file contents"
2334msgstr "移除补丁仍留下了文件内容"
2335
2336#: builtin/apply.c:3501
2337#, c-format
2338msgid "%s: wrong type"
2339msgstr "%s:错误类型"
2340
2341#: builtin/apply.c:3503
2342#, c-format
2343msgid "%s has type %o, expected %o"
2344msgstr "%s 的类型是 %o,应为 %o"
2345
2346#: builtin/apply.c:3604
2347#, c-format
2348msgid "%s: already exists in index"
2349msgstr "%s:已经存在于索引中"
2350
2351#: builtin/apply.c:3607
2352#, c-format
2353msgid "%s: already exists in working directory"
2354msgstr "%s:已经存在于工作区中"
2355
2356#: builtin/apply.c:3627
2357#, c-format
2358msgid "new mode (%o) of %s does not match old mode (%o)"
2359msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2360
2361#: builtin/apply.c:3632
2362#, c-format
2363msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2364msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2365
2366#: builtin/apply.c:3640
2367#, c-format
2368msgid "%s: patch does not apply"
2369msgstr "%s:补丁未应用"
2370
2371#: builtin/apply.c:3653
2372#, c-format
2373msgid "Checking patch %s..."
2374msgstr "检查补丁 %s..."
2375
2376#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135
2377#, c-format
2378msgid "make_cache_entry failed for path '%s'"
2379msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2380
2381#: builtin/apply.c:3889
2382#, c-format
2383msgid "unable to remove %s from index"
2384msgstr "不能从索引中移除 %s"
2385
2386#: builtin/apply.c:3918
2387#, c-format
2388msgid "corrupt patch for submodule %s"
2389msgstr "子模组 %s 损坏的补丁"
2390
2391#: builtin/apply.c:3922
2392#, c-format
2393msgid "unable to stat newly created file '%s'"
2394msgstr "不能枚举新建文件 '%s' 的状态"
2395
2396#: builtin/apply.c:3927
2397#, c-format
2398msgid "unable to create backing store for newly created file %s"
2399msgstr "不能为新建文件 %s 创建后端存储"
2400
2401#: builtin/apply.c:3930 builtin/apply.c:4038
2402#, c-format
2403msgid "unable to add cache entry for %s"
2404msgstr "无法为 %s 添加缓存条目"
2405
2406#: builtin/apply.c:3963
2407#, c-format
2408msgid "closing file '%s'"
2409msgstr "关闭文件 '%s'"
2410
2411#: builtin/apply.c:4012
2412#, c-format
2413msgid "unable to write file '%s' mode %o"
2414msgstr "不能写文件 '%s' 权限 %o"
2415
2416#: builtin/apply.c:4099
2417#, c-format
2418msgid "Applied patch %s cleanly."
2419msgstr "成功应用补丁 %s。"
2420
2421#: builtin/apply.c:4107
2422msgid "internal error"
2423msgstr "内部错误"
2424
2425#: builtin/apply.c:4110
2426#, c-format
2427msgid "Applying patch %%s with %d reject..."
2428msgid_plural "Applying patch %%s with %d rejects..."
2429msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2430msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2431
2432#: builtin/apply.c:4120
2433#, c-format
2434msgid "truncating .rej filename to %.*s.rej"
2435msgstr "截短 .rej 文件名为 %.*s.rej"
2436
2437#: builtin/apply.c:4141
2438#, c-format
2439msgid "Hunk #%d applied cleanly."
2440msgstr "第 #%d 个片段成功应用。"
2441
2442#: builtin/apply.c:4144
2443#, c-format
2444msgid "Rejected hunk #%d."
2445msgstr "拒绝第 #%d 个片段。"
2446
2447#: builtin/apply.c:4234
2448msgid "unrecognized input"
2449msgstr "未能识别的输入"
2450
2451#: builtin/apply.c:4245
2452msgid "unable to read index file"
2453msgstr "无法读取索引文件"
2454
2455#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92
2456#: builtin/fetch.c:93
2457msgid "path"
2458msgstr "路径"
2459
2460#: builtin/apply.c:4363
2461msgid "don't apply changes matching the given path"
2462msgstr "不要应用与给出路径向匹配的变更"
2463
2464#: builtin/apply.c:4366
2465msgid "apply changes matching the given path"
2466msgstr "应用与给出路径向匹配的变更"
2467
2468#: builtin/apply.c:4368
2469msgid "num"
2470msgstr "数字"
2471
2472#: builtin/apply.c:4369
2473msgid "remove <num> leading slashes from traditional diff paths"
2474msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2475
2476#: builtin/apply.c:4372
2477msgid "ignore additions made by the patch"
2478msgstr "忽略补丁中的添加的文件"
2479
2480#: builtin/apply.c:4374
2481msgid "instead of applying the patch, output diffstat for the input"
2482msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2483
2484#: builtin/apply.c:4378
2485msgid "show number of added and deleted lines in decimal notation"
2486msgstr "以十进制数显示添加和删除的行数"
2487
2488#: builtin/apply.c:4380
2489msgid "instead of applying the patch, output a summary for the input"
2490msgstr "不应用补丁,而是显示输入的概要"
2491
2492#: builtin/apply.c:4382
2493msgid "instead of applying the patch, see if the patch is applicable"
2494msgstr "不应用补丁,而是查看补丁是否可应用"
2495
2496#: builtin/apply.c:4384
2497msgid "make sure the patch is applicable to the current index"
2498msgstr "确认补丁可以应用到当前索引"
2499
2500#: builtin/apply.c:4386
2501msgid "apply a patch without touching the working tree"
2502msgstr "应用补丁而不修改工作区"
2503
2504#: builtin/apply.c:4388
2505msgid "also apply the patch (use with --stat/--summary/--check)"
2506msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2507
2508#: builtin/apply.c:4390
2509msgid "attempt three-way merge if a patch does not apply"
2510msgstr "如果一个补丁不能应用则尝试三路合并"
2511
2512#: builtin/apply.c:4392
2513msgid "build a temporary index based on embedded index information"
2514msgstr "创建一个临时索引基于嵌入的索引信息"
2515
2516#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455
2517msgid "paths are separated with NUL character"
2518msgstr "路径以 NUL 字符分隔"
2519
2520#: builtin/apply.c:4397
2521msgid "ensure at least <n> lines of context match"
2522msgstr "确保至少匹配 <n> 行上下文"
2523
2524#: builtin/apply.c:4398
2525msgid "action"
2526msgstr "动作"
2527
2528#: builtin/apply.c:4399
2529msgid "detect new or modified lines that have whitespace errors"
2530msgstr "检查新增和修改的行中间的空白字符滥用"
2531
2532#: builtin/apply.c:4402 builtin/apply.c:4405
2533msgid "ignore changes in whitespace when finding context"
2534msgstr "查找上下文时忽略空白字符的变更"
2535
2536#: builtin/apply.c:4408
2537msgid "apply the patch in reverse"
2538msgstr "反向应用补丁"
2539
2540#: builtin/apply.c:4410
2541msgid "don't expect at least one line of context"
2542msgstr "无需至少一行上下文"
2543
2544#: builtin/apply.c:4412
2545msgid "leave the rejected hunks in corresponding *.rej files"
2546msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2547
2548#: builtin/apply.c:4414
2549msgid "allow overlapping hunks"
2550msgstr "允许重叠的补丁片段"
2551
2552#: builtin/apply.c:4417
2553msgid "tolerate incorrectly detected missing new-line at the end of file"
2554msgstr "允许不正确的文件末尾换行符"
2555
2556#: builtin/apply.c:4420
2557msgid "do not trust the line counts in the hunk headers"
2558msgstr "不信任补丁片段的头信息中的行号"
2559
2560#: builtin/apply.c:4422
2561msgid "root"
2562msgstr "根目录"
2563
2564#: builtin/apply.c:4423
2565msgid "prepend <root> to all filenames"
2566msgstr "为所有文件名前添加 <根目录>"
2567
2568#: builtin/apply.c:4445
2569msgid "--3way outside a repository"
2570msgstr "--3way 在一个版本库之外"
2571
2572#: builtin/apply.c:4453
2573msgid "--index outside a repository"
2574msgstr "--index 在一个版本库之外"
2575
2576#: builtin/apply.c:4456
2577msgid "--cached outside a repository"
2578msgstr "--cached 在一个版本库之外"
2579
2580#: builtin/apply.c:4472
2581#, c-format
2582msgid "can't open patch '%s'"
2583msgstr "不能打开补丁 '%s'"
2584
2585#: builtin/apply.c:4486
2586#, c-format
2587msgid "squelched %d whitespace error"
2588msgid_plural "squelched %d whitespace errors"
2589msgstr[0] "抑制下仍有 %d 个空白字符误用"
2590msgstr[1] "抑制下仍有 %d 个空白字符误用"
2591
2592#: builtin/apply.c:4492 builtin/apply.c:4502
2593#, c-format
2594msgid "%d line adds whitespace errors."
2595msgid_plural "%d lines add whitespace errors."
2596msgstr[0] "%d 行有空白字符误用。"
2597msgstr[1] "%d 行有空白字符误用。"
2598
2599#: builtin/archive.c:17
2600#, c-format
2601msgid "could not create archive file '%s'"
2602msgstr "不能创建归档文件 '%s'"
2603
2604#: builtin/archive.c:20
2605msgid "could not redirect output"
2606msgstr "不能重定向输出"
2607
2608#: builtin/archive.c:37
2609msgid "git archive: Remote with no URL"
2610msgstr "git archive:未提供远程URL"
2611
2612#: builtin/archive.c:58
2613msgid "git archive: expected ACK/NAK, got EOF"
2614msgstr "git archive:应为ACK/NACK,却得到EOF"
2615
2616#: builtin/archive.c:61
2617#, c-format
2618msgid "git archive: NACK %s"
2619msgstr "git archive:NACK %s"
2620
2621#: builtin/archive.c:63
2622#, c-format
2623msgid "remote error: %s"
2624msgstr "远程错误:%s"
2625
2626#: builtin/archive.c:64
2627msgid "git archive: protocol error"
2628msgstr "git archive:协议错误"
2629
2630#: builtin/archive.c:68
2631msgid "git archive: expected a flush"
2632msgstr "git archive:应为刷新"
2633
2634#: builtin/bisect--helper.c:7
2635msgid "git bisect--helper --next-all [--no-checkout]"
2636msgstr "git bisect--helper --next-all [--no-checkout]"
2637
2638#: builtin/bisect--helper.c:17
2639msgid "perform 'git bisect next'"
2640msgstr "执行 'git bisect next'"
2641
2642#: builtin/bisect--helper.c:19
2643msgid "update BISECT_HEAD instead of checking out the current commit"
2644msgstr "更新 BISECT_HEAD 而非检出当前提交"
2645
2646#: builtin/blame.c:30
2647msgid "git blame [options] [rev-opts] [rev] [--] file"
2648msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2649
2650#: builtin/blame.c:35
2651msgid "[rev-opts] are documented in git-rev-list(1)"
2652msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2653
2654#: builtin/blame.c:2501
2655msgid "Show blame entries as we find them, incrementally"
2656msgstr "增量式地显示发现的 blame 条目"
2657
2658#: builtin/blame.c:2502
2659msgid "Show blank SHA-1 for boundary commits (Default: off)"
2660msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2661
2662#: builtin/blame.c:2503
2663msgid "Do not treat root commits as boundaries (Default: off)"
2664msgstr "不把根提交作为边界(默认:关闭)"
2665
2666#: builtin/blame.c:2504
2667msgid "Show work cost statistics"
2668msgstr "显示命令消耗统计"
2669
2670#: builtin/blame.c:2505
2671msgid "Show output score for blame entries"
2672msgstr "显示判断 blame 条目位移的得分诊断信息"
2673
2674#: builtin/blame.c:2506
2675msgid "Show original filename (Default: auto)"
2676msgstr "显示原始文件名(默认:自动)"
2677
2678#: builtin/blame.c:2507
2679msgid "Show original linenumber (Default: off)"
2680msgstr "显示原始的行号(默认:关闭)"
2681
2682#: builtin/blame.c:2508
2683msgid "Show in a format designed for machine consumption"
2684msgstr "显示为一个适合机器读取的格式"
2685
2686#: builtin/blame.c:2509
2687msgid "Show porcelain format with per-line commit information"
2688msgstr "为每一行显示机器适用的提交信息"
2689
2690#: builtin/blame.c:2510
2691msgid "Use the same output mode as git-annotate (Default: off)"
2692msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2693
2694#: builtin/blame.c:2511
2695msgid "Show raw timestamp (Default: off)"
2696msgstr "显示原始时间戳(默认:关闭)"
2697
2698#: builtin/blame.c:2512
2699msgid "Show long commit SHA1 (Default: off)"
2700msgstr "显示长的SHA1提交号(默认:关闭)"
2701
2702#: builtin/blame.c:2513
2703msgid "Suppress author name and timestamp (Default: off)"
2704msgstr "隐藏作者名字和时间戳(默认:关闭)"
2705
2706#: builtin/blame.c:2514
2707msgid "Show author email instead of name (Default: off)"
2708msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2709
2710#: builtin/blame.c:2515
2711msgid "Ignore whitespace differences"
2712msgstr "忽略空白差异"
2713
2714#: builtin/blame.c:2516
2715msgid "Spend extra cycles to find better match"
2716msgstr "花费额外的循环来找到更好的匹配"
2717
2718#: builtin/blame.c:2517
2719msgid "Use revisions from <file> instead of calling git-rev-list"
2720msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
2721
2722#: builtin/blame.c:2518
2723msgid "Use <file>'s contents as the final image"
2724msgstr "使用 <文件> 的内容作为最终的图片"
2725
2726#: builtin/blame.c:2519 builtin/blame.c:2520
2727msgid "score"
2728msgstr "得分"
2729
2730#: builtin/blame.c:2519
2731msgid "Find line copies within and across files"
2732msgstr "找到文件内及跨文件的行拷贝"
2733
2734#: builtin/blame.c:2520
2735msgid "Find line movements within and across files"
2736msgstr "找到文件内及跨文件的行移动"
2737
2738#: builtin/blame.c:2521
2739msgid "n,m"
2740msgstr "n,m"
2741
2742#: builtin/blame.c:2521
2743msgid "Process only line range n,m, counting from 1"
2744msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2745
2746#. TRANSLATORS: This string is used to tell us the maximum
2747#. display width for a relative timestamp in "git blame"
2748#. output. For C locale, "4 years, 11 months ago", which
2749#. takes 22 places, is the longest among various forms of
2750#. relative timestamps, but your language may need more or
2751#. fewer display columns.
2752#: builtin/blame.c:2602
2753msgid "4 years, 11 months ago"
2754msgstr "4 年 11 个月前"
2755
2756#: builtin/branch.c:24
2757msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2758msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2759
2760#: builtin/branch.c:25
2761msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2762msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2763
2764#: builtin/branch.c:26
2765msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2766msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2767
2768#: builtin/branch.c:27
2769msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2770msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2771
2772# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2773#: builtin/branch.c:152
2774#, c-format
2775msgid ""
2776"deleting branch '%s' that has been merged to\n"
2777" '%s', but not yet merged to HEAD."
2778msgstr ""
2779"将要删除的分支 '%s' 已经被合并到\n"
2780" '%s',但未合并到 HEAD。"
2781
2782# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2783#: builtin/branch.c:156
2784#, c-format
2785msgid ""
2786"not deleting branch '%s' that is not yet merged to\n"
2787" '%s', even though it is merged to HEAD."
2788msgstr ""
2789"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2790" 然而却尚未被合并到分支 '%s' 。"
2791
2792#: builtin/branch.c:170
2793#, c-format
2794msgid "Couldn't look up commit object for '%s'"
2795msgstr "无法查询 '%s' 指向的提交对象"
2796
2797#: builtin/branch.c:174
2798#, c-format
2799msgid ""
2800"The branch '%s' is not fully merged.\n"
2801"If you are sure you want to delete it, run 'git branch -D %s'."
2802msgstr ""
2803"分支 '%s' 没有完全合并。\n"
2804"如果您确认要删除它,执行 'git branch -D %s'。"
2805
2806#: builtin/branch.c:187
2807msgid "Update of config-file failed"
2808msgstr "无法更新 config 文件"
2809
2810#: builtin/branch.c:215
2811msgid "cannot use -a with -d"
2812msgstr "不能将 -a 和 -d 同时使用"
2813
2814#: builtin/branch.c:221
2815msgid "Couldn't look up commit object for HEAD"
2816msgstr "无法查询 HEAD 指向的提交对象"
2817
2818#: builtin/branch.c:229
2819#, c-format
2820msgid "Cannot delete the branch '%s' which you are currently on."
2821msgstr "无法删除您当前所在的分支 '%s'。"
2822
2823#: builtin/branch.c:245
2824#, c-format
2825msgid "remote branch '%s' not found."
2826msgstr "远程分支 '%s' 未发现。"
2827
2828#: builtin/branch.c:246
2829#, c-format
2830msgid "branch '%s' not found."
2831msgstr "分支 '%s' 未发现。"
2832
2833#: builtin/branch.c:260
2834#, c-format
2835msgid "Error deleting remote branch '%s'"
2836msgstr "删除远程分支 '%s' 时出错"
2837
2838#: builtin/branch.c:261
2839#, c-format
2840msgid "Error deleting branch '%s'"
2841msgstr "删除分支 '%s' 时出错"
2842
2843#: builtin/branch.c:268
2844#, c-format
2845msgid "Deleted remote branch %s (was %s).\n"
2846msgstr "已删除远程分支 %s(曾为 %s)。\n"
2847
2848#: builtin/branch.c:269
2849#, c-format
2850msgid "Deleted branch %s (was %s).\n"
2851msgstr "已删除分支 %s(曾为 %s)。\n"
2852
2853#: builtin/branch.c:370
2854#, c-format
2855msgid "branch '%s' does not point at a commit"
2856msgstr "分支 '%s' 未指向一个提交"
2857
2858#: builtin/branch.c:459
2859#, c-format
2860msgid "[%s: gone]"
2861msgstr "[%s: 丢失]"
2862
2863#: builtin/branch.c:464
2864#, c-format
2865msgid "[%s]"
2866msgstr "[%s]"
2867
2868#: builtin/branch.c:469
2869#, c-format
2870msgid "[%s: behind %d]"
2871msgstr "[%s:落后 %d]"
2872
2873#: builtin/branch.c:471
2874#, c-format
2875msgid "[behind %d]"
2876msgstr "[落后 %d]"
2877
2878#: builtin/branch.c:475
2879#, c-format
2880msgid "[%s: ahead %d]"
2881msgstr "[%s:领先 %d]"
2882
2883#: builtin/branch.c:477
2884#, c-format
2885msgid "[ahead %d]"
2886msgstr "[领先 %d]"
2887
2888#: builtin/branch.c:480
2889#, c-format
2890msgid "[%s: ahead %d, behind %d]"
2891msgstr "[%s:领先 %d,落后 %d]"
2892
2893#: builtin/branch.c:483
2894#, c-format
2895msgid "[ahead %d, behind %d]"
2896msgstr "[领先 %d,落后 %d]"
2897
2898#: builtin/branch.c:496
2899msgid " **** invalid ref ****"
2900msgstr " **** 无效引用 ****"
2901
2902#: builtin/branch.c:587
2903#, c-format
2904msgid "(no branch, rebasing %s)"
2905msgstr "(非分支,正变基 %s)"
2906
2907#: builtin/branch.c:590
2908#, c-format
2909msgid "(no branch, bisect started on %s)"
2910msgstr "(非分支,二分查找开始于 %s)"
2911
2912#: builtin/branch.c:593
2913#, c-format
2914msgid "(detached from %s)"
2915msgstr "(分离自 %s)"
2916
2917#: builtin/branch.c:596
2918msgid "(no branch)"
2919msgstr "(非分支)"
2920
2921#: builtin/branch.c:643
2922#, c-format
2923msgid "object '%s' does not point to a commit"
2924msgstr "对象 '%s' 没有指向一个提交"
2925
2926#: builtin/branch.c:691
2927msgid "some refs could not be read"
2928msgstr "一些引用不能读取"
2929
2930#: builtin/branch.c:704
2931msgid "cannot rename the current branch while not on any."
2932msgstr "无法重命名当前分支因为不处于任何分支上。"
2933
2934#: builtin/branch.c:714
2935#, c-format
2936msgid "Invalid branch name: '%s'"
2937msgstr "无效的分支名:'%s'"
2938
2939#: builtin/branch.c:729
2940msgid "Branch rename failed"
2941msgstr "分支重命名失败"
2942
2943#: builtin/branch.c:733
2944#, c-format
2945msgid "Renamed a misnamed branch '%s' away"
2946msgstr "重命名掉一个错误命名的旧分支 '%s'"
2947
2948#: builtin/branch.c:737
2949#, c-format
2950msgid "Branch renamed to %s, but HEAD is not updated!"
2951msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2952
2953#: builtin/branch.c:744
2954msgid "Branch is renamed, but update of config-file failed"
2955msgstr "分支被重命名,但更新 config 文件失败"
2956
2957#: builtin/branch.c:759
2958#, c-format
2959msgid "malformed object name %s"
2960msgstr "非法的对象名 %s"
2961
2962#: builtin/branch.c:783
2963#, c-format
2964msgid "could not write branch description template: %s"
2965msgstr "不能写分支描述模版:%s"
2966
2967#: builtin/branch.c:813
2968msgid "Generic options"
2969msgstr "通用选项"
2970
2971#: builtin/branch.c:815
2972msgid "show hash and subject, give twice for upstream branch"
2973msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2974
2975#: builtin/branch.c:816
2976msgid "suppress informational messages"
2977msgstr "不显示信息"
2978
2979#: builtin/branch.c:817
2980msgid "set up tracking mode (see git-pull(1))"
2981msgstr "设置跟踪模式(参见 git-pull(1))"
2982
2983#: builtin/branch.c:819
2984msgid "change upstream info"
2985msgstr "改变上游信息"
2986
2987#: builtin/branch.c:823
2988msgid "use colored output"
2989msgstr "使用彩色输出"
2990
2991#: builtin/branch.c:824
2992msgid "act on remote-tracking branches"
2993msgstr "作用于远程跟踪分支"
2994
2995#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854
2996#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587
2997#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616
2998#: builtin/tag.c:622
2999msgid "commit"
3000msgstr "提交"
3001
3002#: builtin/branch.c:828 builtin/branch.c:834
3003msgid "print only branches that contain the commit"
3004msgstr "只打印包含该提交的分支"
3005
3006#: builtin/branch.c:840
3007msgid "Specific git-branch actions:"
3008msgstr "具体的 git-branch 动作:"
3009
3010#: builtin/branch.c:841
3011msgid "list both remote-tracking and local branches"
3012msgstr "列出远程跟踪及本地分支"
3013
3014#: builtin/branch.c:843
3015msgid "delete fully merged branch"
3016msgstr "删除完全合并的分支"
3017
3018#: builtin/branch.c:844
3019msgid "delete branch (even if not merged)"
3020msgstr "删除分支(即使没有合并)"
3021
3022#: builtin/branch.c:845
3023msgid "move/rename a branch and its reflog"
3024msgstr "移动/重命名一个分支,以及它的引用日志"
3025
3026#: builtin/branch.c:846
3027msgid "move/rename a branch, even if target exists"
3028msgstr "移动/重命名一个分支,即使目标已存在"
3029
3030#: builtin/branch.c:847
3031msgid "list branch names"
3032msgstr "列出分支名"
3033
3034#: builtin/branch.c:848
3035msgid "create the branch's reflog"
3036msgstr "创建分支的引用日志"
3037
3038#: builtin/branch.c:850
3039msgid "edit the description for the branch"
3040msgstr "标记分支的描述"
3041
3042#: builtin/branch.c:851
3043msgid "force creation, move/rename, deletion"
3044msgstr "强制创建、移动/重命名、删除"
3045
3046#: builtin/branch.c:854
3047msgid "print only not merged branches"
3048msgstr "只打印没有合并的分支"
3049
3050#: builtin/branch.c:860
3051msgid "print only merged branches"
3052msgstr "只打印合并的分支"
3053
3054#: builtin/branch.c:864
3055msgid "list branches in columns"
3056msgstr "以列的方式显示分支"
3057
3058#: builtin/branch.c:877
3059msgid "Failed to resolve HEAD as a valid ref."
3060msgstr "无法将 HEAD 解析为有效引用。"
3061
3062#: builtin/branch.c:881 builtin/clone.c:637
3063msgid "HEAD not found below refs/heads!"
3064msgstr "HEAD 没有位于 /refs/heads 之下!"
3065
3066#: builtin/branch.c:903
3067msgid "--column and --verbose are incompatible"
3068msgstr "--column 和 --verbose 不兼容"
3069
3070#: builtin/branch.c:914 builtin/branch.c:953
3071msgid "branch name required"
3072msgstr "必须提供分支名"
3073
3074#: builtin/branch.c:929
3075msgid "Cannot give description to detached HEAD"
3076msgstr "不能向分离头指针提供描述"
3077
3078#: builtin/branch.c:934
3079msgid "cannot edit description of more than one branch"
3080msgstr "不能为一个以上的分支编辑描述"
3081
3082#: builtin/branch.c:941
3083#, c-format
3084msgid "No commit on branch '%s' yet."
3085msgstr "分支 '%s' 尚无提交。"
3086
3087#: builtin/branch.c:944
3088#, c-format
3089msgid "No branch named '%s'."
3090msgstr "没有分支 '%s'。"
3091
3092#: builtin/branch.c:959
3093msgid "too many branches for a rename operation"
3094msgstr "为重命名操作提供了太多的分支名"
3095
3096#: builtin/branch.c:964
3097msgid "too many branches to set new upstream"
3098msgstr "为设置新上游提供了太多的分支名"
3099
3100#: builtin/branch.c:968
3101#, c-format
3102msgid ""
3103"could not set upstream of HEAD to %s when it does not point to any branch."
3104msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3105
3106#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014
3107#, c-format
3108msgid "no such branch '%s'"
3109msgstr "没有此分支 '%s'"
3110
3111#: builtin/branch.c:975
3112#, c-format
3113msgid "branch '%s' does not exist"
3114msgstr "分支 '%s' 不存在"
3115
3116#: builtin/branch.c:987
3117msgid "too many branches to unset upstream"
3118msgstr "为取消上游设置操作提供了太多的分支名"
3119
3120#: builtin/branch.c:991
3121msgid "could not unset upstream of HEAD when it does not point to any branch."
3122msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3123
3124#: builtin/branch.c:997
3125#, c-format
3126msgid "Branch '%s' has no upstream information"
3127msgstr "分支 '%s' 没有上游信息"
3128
3129#: builtin/branch.c:1011
3130msgid "it does not make sense to create 'HEAD' manually"
3131msgstr "手工创建 'HEAD' 没有意义"
3132
3133#: builtin/branch.c:1017
3134msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3135msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3136
3137#: builtin/branch.c:1020
3138#, c-format
3139msgid ""
3140"The --set-upstream flag is deprecated and will be removed. Consider using --"
3141"track or --set-upstream-to\n"
3142msgstr ""
3143"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3144
3145#: builtin/branch.c:1037
3146#, c-format
3147msgid ""
3148"\n"
3149"If you wanted to make '%s' track '%s', do this:\n"
3150"\n"
3151msgstr ""
3152"\n"
3153"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3154"\n"
3155
3156#: builtin/branch.c:1038
3157#, c-format
3158msgid " git branch -d %s\n"
3159msgstr " git branch -d %s\n"
3160
3161#: builtin/branch.c:1039
3162#, c-format
3163msgid " git branch --set-upstream-to %s\n"
3164msgstr " git branch --set-upstream-to %s\n"
3165
3166#: builtin/bundle.c:47
3167#, c-format
3168msgid "%s is okay\n"
3169msgstr "%s 可以\n"
3170
3171#: builtin/bundle.c:56
3172msgid "Need a repository to create a bundle."
3173msgstr "需要一个版本库来创建包。"
3174
3175#: builtin/bundle.c:60
3176msgid "Need a repository to unbundle."
3177msgstr "需要一个版本库来解包。"
3178
3179#: builtin/cat-file.c:328
3180msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
3181msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
3182
3183#: builtin/cat-file.c:329
3184msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
3185msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
3186
3187#: builtin/cat-file.c:366
3188msgid "<type> can be one of: blob, tree, commit, tag"
3189msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3190
3191#: builtin/cat-file.c:367
3192msgid "show object type"
3193msgstr "显示对象类型"
3194
3195#: builtin/cat-file.c:368
3196msgid "show object size"
3197msgstr "显示对象大小"
3198
3199#: builtin/cat-file.c:370
3200msgid "exit with zero when there's no error"
3201msgstr "当没有错误时退出并返回零"
3202
3203#: builtin/cat-file.c:371
3204msgid "pretty-print object's content"
3205msgstr "美观地打印对象的内容"
3206
3207#: builtin/cat-file.c:373
3208msgid "for blob objects, run textconv on object's content"
3209msgstr "对于数据(blob)对象,对其内容执行 textconv"
3210
3211#: builtin/cat-file.c:375
3212msgid "show info and content of objects fed from the standard input"
3213msgstr "显示从标准输入提供的对象的信息和内容"
3214
3215#: builtin/cat-file.c:378
3216msgid "show info about objects fed from the standard input"
3217msgstr "显示从标准输入提供的对象的信息"
3218
3219#: builtin/check-attr.c:11
3220msgid "git check-attr [-a | --all | attr...] [--] pathname..."
3221msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
3222
3223#: builtin/check-attr.c:12
3224msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3225msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
3226
3227#: builtin/check-attr.c:19
3228msgid "report all attributes set on file"
3229msgstr "报告设置在文件上的所有属性"
3230
3231#: builtin/check-attr.c:20
3232msgid "use .gitattributes only from the index"
3233msgstr "只使用索引中的 .gitattributes"
3234
3235#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
3236msgid "read file names from stdin"
3237msgstr "从标准输入读出文件名"
3238
3239#: builtin/check-attr.c:23 builtin/check-ignore.c:24
3240msgid "terminate input and output records by a NUL character"
3241msgstr "输入和输出的记录使用 NUL 字符终结"
3242
3243#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274
3244msgid "suppress progress reporting"
3245msgstr "不显示进度报告"
3246
3247#: builtin/check-ignore.c:26
3248msgid "show non-matching input paths"
3249msgstr "显示未匹配的输入路径"
3250
3251#: builtin/check-ignore.c:28
3252msgid "ignore index when checking"
3253msgstr "检查时忽略索引"
3254
3255#: builtin/check-ignore.c:154
3256msgid "cannot specify pathnames with --stdin"
3257msgstr "不能同时提供路径及 --stdin 参数"
3258
3259#: builtin/check-ignore.c:157
3260msgid "-z only makes sense with --stdin"
3261msgstr "-z 需要和 --stdin 参数共用才有意义"
3262
3263#: builtin/check-ignore.c:159
3264msgid "no path specified"
3265msgstr "未指定路径"
3266
3267#: builtin/check-ignore.c:163
3268msgid "--quiet is only valid with a single pathname"
3269msgstr "参数 --quiet 只在提供一个路径名时有效"
3270
3271#: builtin/check-ignore.c:165
3272msgid "cannot have both --quiet and --verbose"
3273msgstr "不能同时提供 --quiet 和 --verbose 参数"
3274
3275#: builtin/check-ignore.c:168
3276msgid "--non-matching is only valid with --verbose"
3277msgstr "--non-matching 选项只在使用 --verbose 时有效"
3278
3279#: builtin/check-mailmap.c:8
3280msgid "git check-mailmap [options] <contact>..."
3281msgstr "git check-mailmap [选项] <联系地址>..."
3282
3283#: builtin/check-mailmap.c:13
3284msgid "also read contacts from stdin"
3285msgstr "还从标准输入读取联系地址"
3286
3287#: builtin/check-mailmap.c:24
3288#, c-format
3289msgid "unable to parse contact: %s"
3290msgstr "不能解析联系地址:%s"
3291
3292#: builtin/check-mailmap.c:47
3293msgid "no contacts specified"
3294msgstr "未指定联系地址"
3295
3296#: builtin/checkout-index.c:126
3297msgid "git checkout-index [options] [--] [<file>...]"
3298msgstr "git checkout-index [选项] [--] [<文件>...]"
3299
3300#: builtin/checkout-index.c:188
3301msgid "check out all files in the index"
3302msgstr "检出索引区的所有文件"
3303
3304#: builtin/checkout-index.c:189
3305msgid "force overwrite of existing files"
3306msgstr "强制覆盖现有的文件"
3307
3308#: builtin/checkout-index.c:191
3309msgid "no warning for existing files and files not in index"
3310msgstr "存在或不在索引中的文件都没有警告"
3311
3312#: builtin/checkout-index.c:193
3313msgid "don't checkout new files"
3314msgstr "不检出新文件"
3315
3316#: builtin/checkout-index.c:195
3317msgid "update stat information in the index file"
3318msgstr "更新索引中文件的状态信息"
3319
3320#: builtin/checkout-index.c:201
3321msgid "read list of paths from the standard input"
3322msgstr "从标准输入读取路径列表"
3323
3324#: builtin/checkout-index.c:203
3325msgid "write the content to temporary files"
3326msgstr "将内容写入临时文件"
3327
3328#: builtin/checkout-index.c:204 builtin/column.c:30
3329msgid "string"
3330msgstr "字符串"
3331
3332#: builtin/checkout-index.c:205
3333msgid "when creating files, prepend <string>"
3334msgstr "在创建文件时,在前面加上<字符串>"
3335
3336#: builtin/checkout-index.c:208
3337msgid "copy out the files from named stage"
3338msgstr "从指定暂存区中拷出文件"
3339
3340#: builtin/checkout.c:25
3341msgid "git checkout [options] <branch>"
3342msgstr "git checkout [选项] <分支>"
3343
3344#: builtin/checkout.c:26
3345msgid "git checkout [options] [<branch>] -- <file>..."
3346msgstr "git checkout [选项] [<分支>] -- <文件>..."
3347
3348#: builtin/checkout.c:132 builtin/checkout.c:165
3349#, c-format
3350msgid "path '%s' does not have our version"
3351msgstr "路径 '%s' 没有我们的版本"
3352
3353#: builtin/checkout.c:134 builtin/checkout.c:167
3354#, c-format
3355msgid "path '%s' does not have their version"
3356msgstr "路径 '%s' 没有他们的版本"
3357
3358#: builtin/checkout.c:150
3359#, c-format
3360msgid "path '%s' does not have all necessary versions"
3361msgstr "路径 '%s' 没有全部必须的版本"
3362
3363#: builtin/checkout.c:194
3364#, c-format
3365msgid "path '%s' does not have necessary versions"
3366msgstr "路径 '%s' 没有必须的版本"
3367
3368#: builtin/checkout.c:211
3369#, c-format
3370msgid "path '%s': cannot merge"
3371msgstr "path '%s':无法合并"
3372
3373#: builtin/checkout.c:228
3374#, c-format
3375msgid "Unable to add merge result for '%s'"
3376msgstr "无法为 '%s' 添加合并结果"
3377
3378#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255
3379#: builtin/checkout.c:258
3380#, c-format
3381msgid "'%s' cannot be used with updating paths"
3382msgstr "'%s' 不能在更新路径时使用"
3383
3384#: builtin/checkout.c:261 builtin/checkout.c:264
3385#, c-format
3386msgid "'%s' cannot be used with %s"
3387msgstr "'%s' 不能和 %s 同时使用"
3388
3389#: builtin/checkout.c:267
3390#, c-format
3391msgid "Cannot update paths and switch to branch '%s' at the same time."
3392msgstr "不能同时更新路径并切换到分支'%s'。"
3393
3394#: builtin/checkout.c:278 builtin/checkout.c:467
3395msgid "corrupt index file"
3396msgstr "损坏的索引文件"
3397
3398#: builtin/checkout.c:338 builtin/checkout.c:345
3399#, c-format
3400msgid "path '%s' is unmerged"
3401msgstr "路径 '%s' 未合并"
3402
3403#: builtin/checkout.c:489
3404msgid "you need to resolve your current index first"
3405msgstr "您需要先解决当前索引的冲突"
3406
3407#: builtin/checkout.c:615
3408#, c-format
3409msgid "Can not do reflog for '%s'\n"
3410msgstr "不能对 '%s' 执行 reflog 操作\n"
3411
3412#: builtin/checkout.c:653
3413msgid "HEAD is now at"
3414msgstr "HEAD 目前位于"
3415
3416#: builtin/checkout.c:660
3417#, c-format
3418msgid "Reset branch '%s'\n"
3419msgstr "重置分支 '%s'\n"
3420
3421#: builtin/checkout.c:663
3422#, c-format
3423msgid "Already on '%s'\n"
3424msgstr "已经位于 '%s'\n"
3425
3426#: builtin/checkout.c:667
3427#, c-format
3428msgid "Switched to and reset branch '%s'\n"
3429msgstr "切换并重置分支 '%s'\n"
3430
3431#: builtin/checkout.c:669 builtin/checkout.c:1050
3432#, c-format
3433msgid "Switched to a new branch '%s'\n"
3434msgstr "切换到一个新分支 '%s'\n"
3435
3436#: builtin/checkout.c:671
3437#, c-format
3438msgid "Switched to branch '%s'\n"
3439msgstr "切换到分支 '%s'\n"
3440
3441# 译者:注意保持前导空格
3442#: builtin/checkout.c:723
3443#, c-format
3444msgid " ... and %d more.\n"
3445msgstr " ... 及其它 %d 个。\n"
3446
3447#: builtin/checkout.c:729
3448#, c-format
3449msgid ""
3450"Warning: you are leaving %d commit behind, not connected to\n"
3451"any of your branches:\n"
3452"\n"
3453"%s\n"
3454msgid_plural ""
3455"Warning: you are leaving %d commits behind, not connected to\n"
3456"any of your branches:\n"
3457"\n"
3458"%s\n"
3459msgstr[0] ""
3460"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3461"\n"
3462"%s\n"
3463msgstr[1] ""
3464"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3465"\n"
3466"%s\n"
3467
3468#: builtin/checkout.c:747
3469#, c-format
3470msgid ""
3471"If you want to keep them by creating a new branch, this may be a good time\n"
3472"to do so with:\n"
3473"\n"
3474" git branch new_branch_name %s\n"
3475"\n"
3476msgstr ""
3477"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3478"如下操作:\n"
3479"\n"
3480" git branch new_branch_name %s\n"
3481"\n"
3482
3483#: builtin/checkout.c:777
3484msgid "internal error in revision walk"
3485msgstr "在版本遍历时遇到内部错误"
3486
3487#: builtin/checkout.c:781
3488msgid "Previous HEAD position was"
3489msgstr "之前的 HEAD 位置是"
3490
3491#: builtin/checkout.c:808 builtin/checkout.c:1045
3492msgid "You are on a branch yet to be born"
3493msgstr "您位于一个尚未初始化的分支"
3494
3495#: builtin/checkout.c:952
3496#, c-format
3497msgid "only one reference expected, %d given."
3498msgstr "只要一个引用,却给出了 %d 个"
3499
3500#: builtin/checkout.c:991
3501#, c-format
3502msgid "invalid reference: %s"
3503msgstr "无效引用:%s"
3504
3505#: builtin/checkout.c:1020
3506#, c-format
3507msgid "reference is not a tree: %s"
3508msgstr "引用不是一个树:%s"
3509
3510#: builtin/checkout.c:1059
3511msgid "paths cannot be used with switching branches"
3512msgstr "路径不能和切换分支同时使用"
3513
3514#: builtin/checkout.c:1062 builtin/checkout.c:1066
3515#, c-format
3516msgid "'%s' cannot be used with switching branches"
3517msgstr "'%s' 不能和切换分支同时使用"
3518
3519#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078
3520#: builtin/checkout.c:1081
3521#, c-format
3522msgid "'%s' cannot be used with '%s'"
3523msgstr "'%s' 不能和 '%s' 同时使用"
3524
3525#: builtin/checkout.c:1086
3526#, c-format
3527msgid "Cannot switch branch to a non-commit '%s'"
3528msgstr "不能切换分支到一个非提交 '%s'"
3529
3530#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90
3531#: builtin/remote.c:159 builtin/remote.c:161
3532msgid "branch"
3533msgstr "分支"
3534
3535#: builtin/checkout.c:1109
3536msgid "create and checkout a new branch"
3537msgstr "创建并检出一个新的分支"
3538
3539#: builtin/checkout.c:1111
3540msgid "create/reset and checkout a branch"
3541msgstr "创建/重置并检出一个分支"
3542
3543#: builtin/checkout.c:1112
3544msgid "create reflog for new branch"
3545msgstr "为新的分支创建引用日志"
3546
3547#: builtin/checkout.c:1113
3548msgid "detach the HEAD at named commit"
3549msgstr "成为指向该提交的分离头指针"
3550
3551#: builtin/checkout.c:1114
3552msgid "set upstream info for new branch"
3553msgstr "为新的分支设置上游信息"
3554
3555#: builtin/checkout.c:1116
3556msgid "new-branch"
3557msgstr "新分支"
3558
3559#: builtin/checkout.c:1116
3560msgid "new unparented branch"
3561msgstr "新的没有父提交的分支"
3562
3563#: builtin/checkout.c:1117
3564msgid "checkout our version for unmerged files"
3565msgstr "对尚未合并的文件检出我们的版本"
3566
3567#: builtin/checkout.c:1119
3568msgid "checkout their version for unmerged files"
3569msgstr "对尚未合并的文件检出他们的版本"
3570
3571#: builtin/checkout.c:1121
3572msgid "force checkout (throw away local modifications)"
3573msgstr "强制检出(丢弃本地修改)"
3574
3575#: builtin/checkout.c:1122
3576msgid "perform a 3-way merge with the new branch"
3577msgstr "和新的分支执行三路合并"
3578
3579#: builtin/checkout.c:1123 builtin/merge.c:227
3580msgid "update ignored files (default)"
3581msgstr "更新忽略的文件(默认)"
3582
3583#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245
3584msgid "style"
3585msgstr "风格"
3586
3587#: builtin/checkout.c:1125
3588msgid "conflict style (merge or diff3)"
3589msgstr "冲突输出风格(merge 或 diff3)"
3590
3591#: builtin/checkout.c:1128
3592msgid "do not limit pathspecs to sparse entries only"
3593msgstr "对路径不做稀疏检出的限制"
3594
3595#: builtin/checkout.c:1130
3596msgid "second guess 'git checkout no-such-branch'"
3597msgstr "再者猜测'git checkout no-such-branch'"
3598
3599#: builtin/checkout.c:1153
3600msgid "-b, -B and --orphan are mutually exclusive"
3601msgstr "-b、-B 和 --orphan 是互斥的"
3602
3603#: builtin/checkout.c:1170
3604msgid "--track needs a branch name"
3605msgstr "--track 需要一个分支名"
3606
3607#: builtin/checkout.c:1175
3608msgid "Missing branch name; try -b"
3609msgstr "缺少分支名;尝试 -b"
3610
3611#: builtin/checkout.c:1212
3612msgid "invalid path specification"
3613msgstr "无效的路径规格"
3614
3615#: builtin/checkout.c:1219
3616#, c-format
3617msgid ""
3618"Cannot update paths and switch to branch '%s' at the same time.\n"
3619"Did you intend to checkout '%s' which can not be resolved as commit?"
3620msgstr ""
3621"不能同时更新路径并切换到分支'%s'。\n"
3622"您是想要检出 '%s' 但其未能解析为提交么?"
3623
3624#: builtin/checkout.c:1224
3625#, c-format
3626msgid "git checkout: --detach does not take a path argument '%s'"
3627msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3628
3629#: builtin/checkout.c:1228
3630msgid ""
3631"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3632"checking out of the index."
3633msgstr ""
3634"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3635
3636#: builtin/clean.c:26
3637msgid ""
3638"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3639msgstr ""
3640"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3641
3642#: builtin/clean.c:30
3643#, c-format
3644msgid "Removing %s\n"
3645msgstr "正删除 %s\n"
3646
3647#: builtin/clean.c:31
3648#, c-format
3649msgid "Would remove %s\n"
3650msgstr "将删除 %s\n"
3651
3652#: builtin/clean.c:32
3653#, c-format
3654msgid "Skipping repository %s\n"
3655msgstr "忽略版本库 %s\n"
3656
3657#: builtin/clean.c:33
3658#, c-format
3659msgid "Would skip repository %s\n"
3660msgstr "将忽略版本库 %s\n"
3661
3662#: builtin/clean.c:34
3663#, c-format
3664msgid "failed to remove %s"
3665msgstr "无法删除 %s"
3666
3667#: builtin/clean.c:295
3668msgid ""
3669"Prompt help:\n"
3670"1 - select a numbered item\n"
3671"foo - select item based on unique prefix\n"
3672" - (empty) select nothing"
3673msgstr ""
3674"帮助:\n"
3675"1 - 通过编号选择一个选项\n"
3676"foo - 通过标题选择一个选项\n"
3677" - (空)什么也不选择"
3678
3679#: builtin/clean.c:299
3680msgid ""
3681"Prompt help:\n"
3682"1 - select a single item\n"
3683"3-5 - select a range of items\n"
3684"2-3,6-9 - select multiple ranges\n"
3685"foo - select item based on unique prefix\n"
3686"-... - unselect specified items\n"
3687"* - choose all items\n"
3688" - (empty) finish selecting"
3689msgstr ""
3690"帮助:\n"
3691"1 - 选择一个选项\n"
3692"3-5 - 选择一个范围内的所有选项\n"
3693"2-3,6-9 - 选择多个范围内的所有选项\n"
3694"foo - 通过标题选择一个选项\n"
3695"-... - 反选特定的选项\n"
3696"* - 选择所有选项\n"
3697" - (空)结束选择"
3698
3699#: builtin/clean.c:517
3700#, c-format
3701msgid "Huh (%s)?"
3702msgstr "嗯(%s)?"
3703
3704#: builtin/clean.c:659
3705#, c-format
3706msgid "Input ignore patterns>> "
3707msgstr "输入模版以排除条目>> "
3708
3709#: builtin/clean.c:696
3710#, c-format
3711msgid "WARNING: Cannot find items matched by: %s"
3712msgstr "警告:无法找到和 %s 匹配的条目"
3713
3714#: builtin/clean.c:717
3715msgid "Select items to delete"
3716msgstr "选择要删除的条目"
3717
3718#: builtin/clean.c:757
3719#, c-format
3720msgid "remove %s? "
3721msgstr "删除 %s?"
3722
3723#: builtin/clean.c:782
3724msgid "Bye."
3725msgstr "再见。"
3726
3727#: builtin/clean.c:790
3728msgid ""
3729"clean - start cleaning\n"
3730"filter by pattern - exclude items from deletion\n"
3731"select by numbers - select items to be deleted by numbers\n"
3732"ask each - confirm each deletion (like \"rm -i\")\n"
3733"quit - stop cleaning\n"
3734"help - this screen\n"
3735"? - help for prompt selection"
3736msgstr ""
3737"clean - 开始清理\n"
3738"filter by pattern - 通过模版排除要删除的条目\n"
3739"select by numbers - 通过数字选择要删除的条目\n"
3740"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3741"quit - 停止删除并退出\n"
3742"help - 显示本帮助\n"
3743"? - 显示如何在提示符下选择的帮助"
3744
3745#: builtin/clean.c:817
3746msgid "*** Commands ***"
3747msgstr "*** 命令 ***"
3748
3749#: builtin/clean.c:818
3750msgid "What now"
3751msgstr "请选择"
3752
3753#: builtin/clean.c:826
3754msgid "Would remove the following item:"
3755msgid_plural "Would remove the following items:"
3756msgstr[0] "将删除如下条目:"
3757msgstr[1] "将删除如下条目:"
3758
3759#: builtin/clean.c:843
3760msgid "No more files to clean, exiting."
3761msgstr "没有要清理的文件,退出。"
3762
3763#: builtin/clean.c:874
3764msgid "do not print names of files removed"
3765msgstr "不打印删除文件的名称"
3766
3767#: builtin/clean.c:876
3768msgid "force"
3769msgstr "强制"
3770
3771#: builtin/clean.c:877
3772msgid "interactive cleaning"
3773msgstr "交互式清除"
3774
3775#: builtin/clean.c:879
3776msgid "remove whole directories"
3777msgstr "删除整个目录"
3778
3779#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714
3780#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
3781msgid "pattern"
3782msgstr "模式"
3783
3784#: builtin/clean.c:881
3785msgid "add <pattern> to ignore rules"
3786msgstr "添加<模式>到忽略规则"
3787
3788#: builtin/clean.c:882
3789msgid "remove ignored files, too"
3790msgstr "也删除忽略的文件"
3791
3792#: builtin/clean.c:884
3793msgid "remove only ignored files"
3794msgstr "只删除忽略的文件"
3795
3796#: builtin/clean.c:902
3797msgid "-x and -X cannot be used together"
3798msgstr "-x 和 -X 不能同时使用"
3799
3800#: builtin/clean.c:906
3801msgid ""
3802"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3803"clean"
3804msgstr ""
3805"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3806
3807#: builtin/clean.c:909
3808msgid ""
3809"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3810"refusing to clean"
3811msgstr ""
3812"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3813
3814#: builtin/clone.c:37
3815msgid "git clone [options] [--] <repo> [<dir>]"
3816msgstr "git clone [选项] [--] <版本库> [<路径>]"
3817
3818#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224
3819#: builtin/push.c:514
3820msgid "force progress reporting"
3821msgstr "强制显示进度报告"
3822
3823#: builtin/clone.c:68
3824msgid "don't create a checkout"
3825msgstr "不创建一个检出"
3826
3827#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496
3828msgid "create a bare repository"
3829msgstr "创建一个纯版本库"
3830
3831#: builtin/clone.c:73
3832msgid "create a mirror repository (implies bare)"
3833msgstr "创建一个镜像版本库(也是纯版本库)"
3834
3835#: builtin/clone.c:75
3836msgid "to clone from a local repository"
3837msgstr "从本地版本库克隆"
3838
3839#: builtin/clone.c:77
3840msgid "don't use local hardlinks, always copy"
3841msgstr "不使用本地硬链接,始终复制"
3842
3843#: builtin/clone.c:79
3844msgid "setup as shared repository"
3845msgstr "设置为共享版本库"
3846
3847#: builtin/clone.c:81 builtin/clone.c:83
3848msgid "initialize submodules in the clone"
3849msgstr "在克隆时初始化子模组"
3850
3851#: builtin/clone.c:84 builtin/init-db.c:493
3852msgid "template-directory"
3853msgstr "模板目录"
3854
3855#: builtin/clone.c:85 builtin/init-db.c:494
3856msgid "directory from which templates will be used"
3857msgstr "模板目录将被使用"
3858
3859#: builtin/clone.c:87
3860msgid "reference repository"
3861msgstr "参考版本库"
3862
3863#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
3864msgid "name"
3865msgstr "名称"
3866
3867#: builtin/clone.c:89
3868msgid "use <name> instead of 'origin' to track upstream"
3869msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3870
3871#: builtin/clone.c:91
3872msgid "checkout <branch> instead of the remote's HEAD"
3873msgstr "检出<分支>而不是远程HEAD"
3874
3875#: builtin/clone.c:93
3876msgid "path to git-upload-pack on the remote"
3877msgstr "远程 git-upload-pack 路径"
3878
3879#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659
3880msgid "depth"
3881msgstr "深度"
3882
3883#: builtin/clone.c:95
3884msgid "create a shallow clone of that depth"
3885msgstr "创建一个指定深度的浅克隆"
3886
3887#: builtin/clone.c:97
3888msgid "clone only one branch, HEAD or --branch"
3889msgstr "只克隆一个分支、HEAD 或 --branch"
3890
3891#: builtin/clone.c:99
3892msgid "use --reference only while cloning"
3893msgstr "仅在克隆时参考 --reference 指向的本地版本库"
3894
3895#: builtin/clone.c:100 builtin/init-db.c:502
3896msgid "gitdir"
3897msgstr "git目录"
3898
3899#: builtin/clone.c:101 builtin/init-db.c:503
3900msgid "separate git dir from working tree"
3901msgstr "git目录和工作区分离"
3902
3903#: builtin/clone.c:102
3904msgid "key=value"
3905msgstr "key=value"
3906
3907#: builtin/clone.c:103
3908msgid "set config inside the new repository"
3909msgstr "在新版本库中设置配置信息"
3910
3911#: builtin/clone.c:256
3912#, c-format
3913msgid "reference repository '%s' is not a local repository."
3914msgstr "参考版本库 '%s' 不是一个本地版本库。"
3915
3916#: builtin/clone.c:260
3917#, c-format
3918msgid "reference repository '%s' is shallow"
3919msgstr "参考版本库 '%s' 是一个浅克隆"
3920
3921#: builtin/clone.c:263
3922#, c-format
3923msgid "reference repository '%s' is grafted"
3924msgstr "参考版本库 '%s' 已被嫁接"
3925
3926#: builtin/clone.c:325
3927#, c-format
3928msgid "failed to create directory '%s'"
3929msgstr "无法创建目录 '%s'"
3930
3931#: builtin/clone.c:327 builtin/diff.c:84
3932#, c-format
3933msgid "failed to stat '%s'"
3934msgstr "无法枚举 '%s' 状态"
3935
3936#: builtin/clone.c:329
3937#, c-format
3938msgid "%s exists and is not a directory"
3939msgstr "%s 存在且不是一个目录"
3940
3941#: builtin/clone.c:343
3942#, c-format
3943msgid "failed to stat %s\n"
3944msgstr "无法枚举 %s 状态\n"
3945
3946#: builtin/clone.c:365
3947#, c-format
3948msgid "failed to create link '%s'"
3949msgstr "无法创建链接 '%s'"
3950
3951#: builtin/clone.c:369
3952#, c-format
3953msgid "failed to copy file to '%s'"
3954msgstr "无法拷贝文件至 '%s'"
3955
3956#: builtin/clone.c:392 builtin/clone.c:566
3957#, c-format
3958msgid "done.\n"
3959msgstr "完成。\n"
3960
3961#: builtin/clone.c:404
3962msgid ""
3963"Clone succeeded, but checkout failed.\n"
3964"You can inspect what was checked out with 'git status'\n"
3965"and retry the checkout with 'git checkout -f HEAD'\n"
3966msgstr ""
3967"克隆成功,但是检出失败。\n"
3968"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3969"'git checkout -f HEAD' 重试\n"
3970
3971#: builtin/clone.c:481
3972#, c-format
3973msgid "Could not find remote branch %s to clone."
3974msgstr "不能发现要克隆的远程分支 %s。"
3975
3976#: builtin/clone.c:561
3977#, c-format
3978msgid "Checking connectivity... "
3979msgstr "检查连接... "
3980
3981#: builtin/clone.c:564
3982msgid "remote did not send all necessary objects"
3983msgstr "远程没有发送所有必须的对象"
3984
3985#: builtin/clone.c:628
3986msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3987msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3988
3989#: builtin/clone.c:659
3990msgid "unable to checkout working tree"
3991msgstr "不能检出工作区"
3992
3993#: builtin/clone.c:746
3994msgid "cannot repack to clean up"
3995msgstr "无法执行 repack 来清理"
3996
3997#: builtin/clone.c:748
3998msgid "cannot unlink temporary alternates file"
3999msgstr "无法删除临时的 alternates 文件"
4000
4001#: builtin/clone.c:778
4002msgid "Too many arguments."
4003msgstr "太多参数。"
4004
4005#: builtin/clone.c:782
4006msgid "You must specify a repository to clone."
4007msgstr "您必须指定一个版本库来克隆。"
4008
4009#: builtin/clone.c:793
4010#, c-format
4011msgid "--bare and --origin %s options are incompatible."
4012msgstr "--bare 和 --origin %s 选项不兼容。"
4013
4014#: builtin/clone.c:796
4015msgid "--bare and --separate-git-dir are incompatible."
4016msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4017
4018#: builtin/clone.c:809
4019#, c-format
4020msgid "repository '%s' does not exist"
4021msgstr "版本库 '%s' 不存在"
4022
4023#: builtin/clone.c:815 builtin/fetch.c:1155
4024#, c-format
4025msgid "depth %s is not a positive number"
4026msgstr "深度 %s 不是一个正数"
4027
4028#: builtin/clone.c:825
4029#, c-format
4030msgid "destination path '%s' already exists and is not an empty directory."
4031msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4032
4033#: builtin/clone.c:835
4034#, c-format
4035msgid "working tree '%s' already exists."
4036msgstr "工作区 '%s' 已经存在。"
4037
4038#: builtin/clone.c:848 builtin/clone.c:860
4039#, c-format
4040msgid "could not create leading directories of '%s'"
4041msgstr "不能为 '%s' 创建先导目录"
4042
4043#: builtin/clone.c:851
4044#, c-format
4045msgid "could not create work tree dir '%s'."
4046msgstr "不能为 '%s' 创建工作区目录。"
4047
4048#: builtin/clone.c:870
4049#, c-format
4050msgid "Cloning into bare repository '%s'...\n"
4051msgstr "克隆到纯版本库 '%s'...\n"
4052
4053#: builtin/clone.c:872
4054#, c-format
4055msgid "Cloning into '%s'...\n"
4056msgstr "正克隆到 '%s'...\n"
4057
4058#: builtin/clone.c:897
4059msgid "--dissociate given, but there is no --reference"
4060msgstr "提供了参数 --dissociate,但未提供 --reference"
4061
4062#: builtin/clone.c:912
4063msgid "--depth is ignored in local clones; use file:// instead."
4064msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4065
4066#: builtin/clone.c:915
4067msgid "source repository is shallow, ignoring --local"
4068msgstr "源版本库是浅克隆,忽略 --local"
4069
4070#: builtin/clone.c:920
4071msgid "--local is ignored"
4072msgstr "--local 被忽略"
4073
4074#: builtin/clone.c:924
4075#, c-format
4076msgid "Don't know how to clone %s"
4077msgstr "不知道如何克隆 %s"
4078
4079#: builtin/clone.c:975 builtin/clone.c:983
4080#, c-format
4081msgid "Remote branch %s not found in upstream %s"
4082msgstr "远程分支 %s 在上游 %s 未发现"
4083
4084#: builtin/clone.c:986
4085msgid "You appear to have cloned an empty repository."
4086msgstr "您似乎克隆了一个空版本库。"
4087
4088#: builtin/column.c:9
4089msgid "git column [options]"
4090msgstr "git column [选项]"
4091
4092#: builtin/column.c:26
4093msgid "lookup config vars"
4094msgstr "查找配置变量"
4095
4096#: builtin/column.c:27 builtin/column.c:28
4097msgid "layout to use"
4098msgstr "要使用的布局"
4099
4100#: builtin/column.c:29
4101msgid "Maximum width"
4102msgstr "最大宽度"
4103
4104#: builtin/column.c:30
4105msgid "Padding space on left border"
4106msgstr "左边框的填充空间"
4107
4108#: builtin/column.c:31
4109msgid "Padding space on right border"
4110msgstr "右边框的填充空间"
4111
4112#: builtin/column.c:32
4113msgid "Padding space between columns"
4114msgstr "两列之间的填充空间"
4115
4116#: builtin/column.c:51
4117msgid "--command must be the first argument"
4118msgstr "--command 必须是第一个参数"
4119
4120#: builtin/commit.c:37
4121msgid "git commit [options] [--] <pathspec>..."
4122msgstr "git commit [选项] [--] <路径规则>..."
4123
4124#: builtin/commit.c:42
4125msgid "git status [options] [--] <pathspec>..."
4126msgstr "git status [选项] [--] <路径规则>..."
4127
4128#: builtin/commit.c:47
4129msgid ""
4130"Your name and email address were configured automatically based\n"
4131"on your username and hostname. Please check that they are accurate.\n"
4132"You can suppress this message by setting them explicitly. Run the\n"
4133"following command and follow the instructions in your editor to edit\n"
4134"your configuration file:\n"
4135"\n"
4136" git config --global --edit\n"
4137"\n"
4138"After doing this, you may fix the identity used for this commit with:\n"
4139"\n"
4140" git commit --amend --reset-author\n"
4141msgstr ""
4142"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4143"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4144"中编辑您的配置文件:\n"
4145"\n"
4146" git config --global --edit\n"
4147"\n"
4148"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4149"\n"
4150" git commit --amend --reset-author\n"
4151
4152#: builtin/commit.c:60
4153msgid ""
4154"Your name and email address were configured automatically based\n"
4155"on your username and hostname. Please check that they are accurate.\n"
4156"You can suppress this message by setting them explicitly:\n"
4157"\n"
4158" git config --global user.name \"Your Name\"\n"
4159" git config --global user.email you@example.com\n"
4160"\n"
4161"After doing this, you may fix the identity used for this commit with:\n"
4162"\n"
4163" git commit --amend --reset-author\n"
4164msgstr ""
4165"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4166"与否。您可以对其进行设置以免再出现本提示信息:\n"
4167"\n"
4168" git config --global user.name \"Your Name\"\n"
4169" git config --global user.email you@example.com\n"
4170"\n"
4171"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4172"\n"
4173" git commit --amend --reset-author\n"
4174
4175#: builtin/commit.c:72
4176msgid ""
4177"You asked to amend the most recent commit, but doing so would make\n"
4178"it empty. You can repeat your command with --allow-empty, or you can\n"
4179"remove the commit entirely with \"git reset HEAD^\".\n"
4180msgstr ""
4181"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4182"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4183
4184#: builtin/commit.c:77
4185msgid ""
4186"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4187"If you wish to commit it anyway, use:\n"
4188"\n"
4189" git commit --allow-empty\n"
4190"\n"
4191msgstr ""
4192"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4193"也要提交,使用命令:\n"
4194"\n"
4195" git commit --allow-empty\n"
4196"\n"
4197
4198#: builtin/commit.c:84
4199msgid "Otherwise, please use 'git reset'\n"
4200msgstr "否则,请使用命令 'git reset'\n"
4201
4202#: builtin/commit.c:87
4203msgid ""
4204"If you wish to skip this commit, use:\n"
4205"\n"
4206" git reset\n"
4207"\n"
4208"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4209"the remaining commits.\n"
4210msgstr ""
4211"如果您想跳过这个提交,使用命令:\n"
4212"\n"
4213" git reset\n"
4214"\n"
4215"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4216"操作。\n"
4217
4218#: builtin/commit.c:302
4219msgid "failed to unpack HEAD tree object"
4220msgstr "无法解包 HEAD 树对象"
4221
4222#: builtin/commit.c:342
4223msgid "unable to create temporary index"
4224msgstr "不能创建临时索引"
4225
4226#: builtin/commit.c:348
4227msgid "interactive add failed"
4228msgstr "交互式添加失败"
4229
4230#: builtin/commit.c:359
4231msgid "unable to write index file"
4232msgstr "无法写入索引文件"
4233
4234#: builtin/commit.c:361
4235msgid "unable to update temporary index"
4236msgstr "无法更新临时索引"
4237
4238#: builtin/commit.c:363
4239msgid "Failed to update main cache tree"
4240msgstr "不能更新树的主缓存"
4241
4242#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461
4243msgid "unable to write new_index file"
4244msgstr "无法写 new_index 文件"
4245
4246#: builtin/commit.c:443
4247msgid "cannot do a partial commit during a merge."
4248msgstr "在合并过程中不能做部分提交。"
4249
4250#: builtin/commit.c:445
4251msgid "cannot do a partial commit during a cherry-pick."
4252msgstr "在拣选过程中不能做部分提交。"
4253
4254#: builtin/commit.c:454
4255msgid "cannot read the index"
4256msgstr "无法读取索引"
4257
4258#: builtin/commit.c:473
4259msgid "unable to write temporary index file"
4260msgstr "无法写临时索引文件"
4261
4262#: builtin/commit.c:584
4263#, c-format
4264msgid "commit '%s' lacks author header"
4265msgstr "提交 '%s' 缺少作者信息"
4266
4267#: builtin/commit.c:586
4268#, c-format
4269msgid "commit '%s' has malformed author line"
4270msgstr "提交 '%s' 有非法的作者信息"
4271
4272#: builtin/commit.c:605
4273msgid "malformed --author parameter"
4274msgstr "非法的 --author 参数"
4275
4276#: builtin/commit.c:613
4277#, c-format
4278msgid "invalid date format: %s"
4279msgstr "无效的日期格式:%s"
4280
4281#: builtin/commit.c:657
4282msgid ""
4283"unable to select a comment character that is not used\n"
4284"in the current commit message"
4285msgstr "无法选择一个未被当前提交说明使用的注释字符"
4286
4287#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084
4288#, c-format
4289msgid "could not lookup commit %s"
4290msgstr "不能查询提交 %s"
4291
4292#: builtin/commit.c:706 builtin/shortlog.c:273
4293#, c-format
4294msgid "(reading log message from standard input)\n"
4295msgstr "(正从标准输入中读取日志信息)\n"
4296
4297#: builtin/commit.c:708
4298msgid "could not read log from standard input"
4299msgstr "不能从标准输入中读取日志信息"
4300
4301#: builtin/commit.c:712
4302#, c-format
4303msgid "could not read log file '%s'"
4304msgstr "不能读取日志文件 '%s'"
4305
4306#: builtin/commit.c:734
4307msgid "could not read MERGE_MSG"
4308msgstr "不能读取 MERGE_MSG"
4309
4310#: builtin/commit.c:738
4311msgid "could not read SQUASH_MSG"
4312msgstr "不能读取 SQUASH_MSG"
4313
4314#: builtin/commit.c:742
4315#, c-format
4316msgid "could not read '%s'"
4317msgstr "不能读取 '%s'"
4318
4319#: builtin/commit.c:789
4320msgid "could not write commit template"
4321msgstr "不能写提交模版"
4322
4323#: builtin/commit.c:807
4324#, c-format
4325msgid ""
4326"\n"
4327"It looks like you may be committing a merge.\n"
4328"If this is not correct, please remove the file\n"
4329"\t%s\n"
4330"and try again.\n"
4331msgstr ""
4332"\n"
4333"似乎您正在做一个合并提交。如果不对,请删除文件\n"
4334"\t%s\n"
4335"然后重试。\n"
4336
4337#: builtin/commit.c:812
4338#, c-format
4339msgid ""
4340"\n"
4341"It looks like you may be committing a cherry-pick.\n"
4342"If this is not correct, please remove the file\n"
4343"\t%s\n"
4344"and try again.\n"
4345msgstr ""
4346"\n"
4347"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4348"\t%s\n"
4349"然后重试。\n"
4350
4351#: builtin/commit.c:825
4352#, c-format
4353msgid ""
4354"Please enter the commit message for your changes. Lines starting\n"
4355"with '%c' will be ignored, and an empty message aborts the commit.\n"
4356msgstr ""
4357"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4358"说明将会终止提交。\n"
4359
4360#: builtin/commit.c:832
4361#, c-format
4362msgid ""
4363"Please enter the commit message for your changes. Lines starting\n"
4364"with '%c' will be kept; you may remove them yourself if you want to.\n"
4365"An empty message aborts the commit.\n"
4366msgstr ""
4367"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4368"也可以删除它们。一个空的提交说明将会终止提交。\n"
4369
4370# 译者:为保证在输出中对齐,注意调整句中空格!
4371#: builtin/commit.c:852
4372#, c-format
4373msgid "%sAuthor: %.*s <%.*s>"
4374msgstr "%s作者: %.*s <%.*s>"
4375
4376# 译者:为保证在输出中对齐,注意调整句中空格!
4377#: builtin/commit.c:860
4378#, c-format
4379msgid "%sDate: %s"
4380msgstr "%s日期: %s"
4381
4382# 译者:为保证在输出中对齐,注意调整句中空格!
4383#: builtin/commit.c:867
4384#, c-format
4385msgid "%sCommitter: %.*s <%.*s>"
4386msgstr "%s提交者:%.*s <%.*s>"
4387
4388#: builtin/commit.c:885
4389msgid "Cannot read index"
4390msgstr "无法读取索引"
4391
4392#: builtin/commit.c:942
4393msgid "Error building trees"
4394msgstr "无法创建树对象"
4395
4396#: builtin/commit.c:957 builtin/tag.c:495
4397#, c-format
4398msgid "Please supply the message using either -m or -F option.\n"
4399msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4400
4401#: builtin/commit.c:1059
4402#, c-format
4403msgid "No existing author found with '%s'"
4404msgstr "没有找到匹配 '%s' 的作者"
4405
4406#: builtin/commit.c:1074 builtin/commit.c:1314
4407#, c-format
4408msgid "Invalid untracked files mode '%s'"
4409msgstr "无效的未追踪文件参数 '%s'"
4410
4411#: builtin/commit.c:1111
4412msgid "--long and -z are incompatible"
4413msgstr "--long 和 -z 选项不兼容"
4414
4415#: builtin/commit.c:1141
4416msgid "Using both --reset-author and --author does not make sense"
4417msgstr "同时使用 --reset-author 和 --author 没有意义"
4418
4419#: builtin/commit.c:1150
4420msgid "You have nothing to amend."
4421msgstr "您没有可修补的提交。"
4422
4423#: builtin/commit.c:1153
4424msgid "You are in the middle of a merge -- cannot amend."
4425msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4426
4427#: builtin/commit.c:1155
4428msgid "You are in the middle of a cherry-pick -- cannot amend."
4429msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4430
4431#: builtin/commit.c:1158
4432msgid "Options --squash and --fixup cannot be used together"
4433msgstr "选项 --squash 和 --fixup 不能同时使用"
4434
4435#: builtin/commit.c:1168
4436msgid "Only one of -c/-C/-F/--fixup can be used."
4437msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4438
4439#: builtin/commit.c:1170
4440msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4441msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4442
4443#: builtin/commit.c:1178
4444msgid "--reset-author can be used only with -C, -c or --amend."
4445msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4446
4447#: builtin/commit.c:1195
4448msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4449msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4450
4451#: builtin/commit.c:1197
4452msgid "No paths with --include/--only does not make sense."
4453msgstr "参数 --include/--only 不跟路径没有意义。"
4454
4455#: builtin/commit.c:1199
4456msgid "Clever... amending the last one with dirty index."
4457msgstr "聪明... 在索引不干净下修补最后的提交。"
4458
4459#: builtin/commit.c:1201
4460msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4461msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
4462
4463#: builtin/commit.c:1213 builtin/tag.c:728
4464#, c-format
4465msgid "Invalid cleanup mode %s"
4466msgstr "无效的清理模式 %s"
4467
4468#: builtin/commit.c:1218
4469msgid "Paths with -a does not make sense."
4470msgstr "路径和 -a 选项同时使用没有意义。"
4471
4472#: builtin/commit.c:1328 builtin/commit.c:1608
4473msgid "show status concisely"
4474msgstr "以简洁的格式显示状态"
4475
4476#: builtin/commit.c:1330 builtin/commit.c:1610
4477msgid "show branch information"
4478msgstr "显示分支信息"
4479
4480#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500
4481msgid "machine-readable output"
4482msgstr "机器可读的输出"
4483
4484#: builtin/commit.c:1335 builtin/commit.c:1614
4485msgid "show status in long format (default)"
4486msgstr "以长格式显示状态(默认)"
4487
4488#: builtin/commit.c:1338 builtin/commit.c:1617
4489msgid "terminate entries with NUL"
4490msgstr "条目以NUL字符结尾"
4491
4492#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980
4493#: builtin/fast-export.c:983 builtin/tag.c:603
4494msgid "mode"
4495msgstr "模式"
4496
4497#: builtin/commit.c:1341 builtin/commit.c:1620
4498msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4499msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4500
4501#: builtin/commit.c:1344
4502msgid "show ignored files"
4503msgstr "显示忽略的文件"
4504
4505#: builtin/commit.c:1345 parse-options.h:153
4506msgid "when"
4507msgstr "何时"
4508
4509#: builtin/commit.c:1346
4510msgid ""
4511"ignore changes to submodules, optional when: all, dirty, untracked. "
4512"(Default: all)"
4513msgstr ""
4514"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4515
4516#: builtin/commit.c:1348
4517msgid "list untracked files in columns"
4518msgstr "以列的方式显示未跟踪的文件"
4519
4520#: builtin/commit.c:1435
4521msgid "couldn't look up newly created commit"
4522msgstr "无法找到新创建的提交"
4523
4524#: builtin/commit.c:1437
4525msgid "could not parse newly created commit"
4526msgstr "不能解析新创建的提交"
4527
4528#: builtin/commit.c:1482
4529msgid "detached HEAD"
4530msgstr "分离头指针"
4531
4532# 译者:中文字符串拼接,可删除前导空格
4533#: builtin/commit.c:1485
4534msgid " (root-commit)"
4535msgstr "(根提交)"
4536
4537#: builtin/commit.c:1578
4538msgid "suppress summary after successful commit"
4539msgstr "提交成功后不显示概述信息"
4540
4541#: builtin/commit.c:1579
4542msgid "show diff in commit message template"
4543msgstr "在提交说明模板里显示差异"
4544
4545#: builtin/commit.c:1581
4546msgid "Commit message options"
4547msgstr "提交说明选项"
4548
4549#: builtin/commit.c:1582 builtin/tag.c:601
4550msgid "read message from file"
4551msgstr "从文件中读取提交说明"
4552
4553#: builtin/commit.c:1583
4554msgid "author"
4555msgstr "作者"
4556
4557#: builtin/commit.c:1583
4558msgid "override author for commit"
4559msgstr "提交时覆盖作者"
4560
4561#: builtin/commit.c:1584 builtin/gc.c:275
4562msgid "date"
4563msgstr "日期"
4564
4565#: builtin/commit.c:1584
4566msgid "override date for commit"
4567msgstr "提交时覆盖日期"
4568
4569#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391
4570#: builtin/notes.c:554 builtin/tag.c:599
4571msgid "message"
4572msgstr "说明"
4573
4574#: builtin/commit.c:1585
4575msgid "commit message"
4576msgstr "提交说明"
4577
4578#: builtin/commit.c:1586
4579msgid "reuse and edit message from specified commit"
4580msgstr "重用并编辑指定提交的提交说明"
4581
4582#: builtin/commit.c:1587
4583msgid "reuse message from specified commit"
4584msgstr "重用指定提交的提交说明"
4585
4586#: builtin/commit.c:1588
4587msgid "use autosquash formatted message to fixup specified commit"
4588msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4589
4590#: builtin/commit.c:1589
4591msgid "use autosquash formatted message to squash specified commit"
4592msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4593
4594#: builtin/commit.c:1590
4595msgid "the commit is authored by me now (used with -C/-c/--amend)"
4596msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4597
4598#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86
4599msgid "add Signed-off-by:"
4600msgstr "添加 Signed-off-by: 签名"
4601
4602#: builtin/commit.c:1592
4603msgid "use specified template file"
4604msgstr "使用指定的模板文件"
4605
4606#: builtin/commit.c:1593
4607msgid "force edit of commit"
4608msgstr "强制编辑提交"
4609
4610# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4611#: builtin/commit.c:1594
4612msgid "default"
4613msgstr "default"
4614
4615#: builtin/commit.c:1594 builtin/tag.c:604
4616msgid "how to strip spaces and #comments from message"
4617msgstr "设置如何删除提交说明里的空格和#注释"
4618
4619#: builtin/commit.c:1595
4620msgid "include status in commit message template"
4621msgstr "在提交说明模板里包含状态信息"
4622
4623#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92
4624#: builtin/tag.c:605
4625msgid "key-id"
4626msgstr "key-id"
4627
4628#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93
4629msgid "GPG sign commit"
4630msgstr "GPG 提交签名"
4631
4632#: builtin/commit.c:1600
4633msgid "Commit contents options"
4634msgstr "提交内容选项"
4635
4636#: builtin/commit.c:1601
4637msgid "commit all changed files"
4638msgstr "提交所有改动的文件"
4639
4640#: builtin/commit.c:1602
4641msgid "add specified files to index for commit"
4642msgstr "添加指定的文件到索引区等待提交"
4643
4644#: builtin/commit.c:1603
4645msgid "interactively add files"
4646msgstr "交互式添加文件"
4647
4648#: builtin/commit.c:1604
4649msgid "interactively add changes"
4650msgstr "交互式添加变更"
4651
4652#: builtin/commit.c:1605
4653msgid "commit only specified files"
4654msgstr "只提交指定的文件"
4655
4656#: builtin/commit.c:1606
4657msgid "bypass pre-commit hook"
4658msgstr "绕过 pre-commit 钩子"
4659
4660#: builtin/commit.c:1607
4661msgid "show what would be committed"
4662msgstr "显示将要提交的内容"
4663
4664#: builtin/commit.c:1618
4665msgid "amend previous commit"
4666msgstr "修改先前的提交"
4667
4668#: builtin/commit.c:1619
4669msgid "bypass post-rewrite hook"
4670msgstr "绕过 post-rewrite 钩子"
4671
4672#: builtin/commit.c:1624
4673msgid "ok to record an empty change"
4674msgstr "允许一个空提交"
4675
4676#: builtin/commit.c:1626
4677msgid "ok to record a change with an empty message"
4678msgstr "允许空的提交说明"
4679
4680#: builtin/commit.c:1655
4681msgid "could not parse HEAD commit"
4682msgstr "不能解析 HEAD 提交"
4683
4684#: builtin/commit.c:1694 builtin/merge.c:519
4685#, c-format
4686msgid "could not open '%s' for reading"
4687msgstr "不能为读入打开 '%s'"
4688
4689#: builtin/commit.c:1701
4690#, c-format
4691msgid "Corrupt MERGE_HEAD file (%s)"
4692msgstr "损坏的 MERGE_HEAD 文件(%s)"
4693
4694#: builtin/commit.c:1708
4695msgid "could not read MERGE_MODE"
4696msgstr "不能读取 MERGE_MODE"
4697
4698#: builtin/commit.c:1727
4699#, c-format
4700msgid "could not read commit message: %s"
4701msgstr "不能读取提交说明:%s"
4702
4703#: builtin/commit.c:1738
4704#, c-format
4705msgid "Aborting commit; you did not edit the message.\n"
4706msgstr "终止提交;您未更改来自模版的提交说明。\n"
4707
4708#: builtin/commit.c:1743
4709#, c-format
4710msgid "Aborting commit due to empty commit message.\n"
4711msgstr "终止提交因为提交说明为空。\n"
4712
4713#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876
4714msgid "failed to write commit object"
4715msgstr "无法写提交对象"
4716
4717#: builtin/commit.c:1791
4718msgid ""
4719"Repository has been updated, but unable to write\n"
4720"new_index file. Check that disk is not full and quota is\n"
4721"not exceeded, and then \"git reset HEAD\" to recover."
4722msgstr ""
4723"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4724"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4725
4726#: builtin/config.c:8
4727msgid "git config [options]"
4728msgstr "git config [选项]"
4729
4730#: builtin/config.c:53
4731msgid "Config file location"
4732msgstr "配置文件位置"
4733
4734#: builtin/config.c:54
4735msgid "use global config file"
4736msgstr "使用全局配置文件"
4737
4738#: builtin/config.c:55
4739msgid "use system config file"
4740msgstr "使用系统级配置文件"
4741
4742#: builtin/config.c:56
4743msgid "use repository config file"
4744msgstr "使用版本库级配置文件"
4745
4746#: builtin/config.c:57
4747msgid "use given config file"
4748msgstr "使用指定的配置文件"
4749
4750#: builtin/config.c:58
4751msgid "blob-id"
4752msgstr "数据对象ID"
4753
4754#: builtin/config.c:58
4755msgid "read config from given blob object"
4756msgstr "从给定的数据对象读取配置"
4757
4758#: builtin/config.c:59
4759msgid "Action"
4760msgstr "操作"
4761
4762#: builtin/config.c:60
4763msgid "get value: name [value-regex]"
4764msgstr "获取值:name [value-regex]"
4765
4766#: builtin/config.c:61
4767msgid "get all values: key [value-regex]"
4768msgstr "获得所有的值:key [value-regex]"
4769
4770#: builtin/config.c:62
4771msgid "get values for regexp: name-regex [value-regex]"
4772msgstr "根据正则表达式获得值:name-regex [value-regex]"
4773
4774#: builtin/config.c:63
4775msgid "get value specific for the URL: section[.var] URL"
4776msgstr "获得 URL 取值:section[.var] URL"
4777
4778#: builtin/config.c:64
4779msgid "replace all matching variables: name value [value_regex]"
4780msgstr "替换所有匹配的变量:name value [value_regex]"
4781
4782#: builtin/config.c:65
4783msgid "add a new variable: name value"
4784msgstr "添加一个新的变量:name value"
4785
4786#: builtin/config.c:66
4787msgid "remove a variable: name [value-regex]"
4788msgstr "删除一个变量:name [value-regex]"
4789
4790#: builtin/config.c:67
4791msgid "remove all matches: name [value-regex]"
4792msgstr "删除所有匹配项:name [value-regex]"
4793
4794#: builtin/config.c:68
4795msgid "rename section: old-name new-name"
4796msgstr "重命名小节:old-name new-name"
4797
4798#: builtin/config.c:69
4799msgid "remove a section: name"
4800msgstr "删除一个小节:name"
4801
4802#: builtin/config.c:70
4803msgid "list all"
4804msgstr "列出所有"
4805
4806#: builtin/config.c:71
4807msgid "open an editor"
4808msgstr "打开一个编辑器"
4809
4810#: builtin/config.c:72
4811msgid "find the color configured: slot [default]"
4812msgstr "获得配置的颜色:配置 [默认]"
4813
4814#: builtin/config.c:73
4815msgid "find the color setting: slot [stdout-is-tty]"
4816msgstr "获得颜色设置:配置 [stdout-is-tty]"
4817
4818#: builtin/config.c:74
4819msgid "Type"
4820msgstr "类型"
4821
4822#: builtin/config.c:75
4823msgid "value is \"true\" or \"false\""
4824msgstr "值是 \"true\" 或 \"false\""
4825
4826#: builtin/config.c:76
4827msgid "value is decimal number"
4828msgstr "值是十进制数"
4829
4830#: builtin/config.c:77
4831msgid "value is --bool or --int"
4832msgstr "值是 --bool or --int"
4833
4834#: builtin/config.c:78
4835msgid "value is a path (file or directory name)"
4836msgstr "值是一个路径(文件或目录名)"
4837
4838#: builtin/config.c:79
4839msgid "Other"
4840msgstr "其它"
4841
4842#: builtin/config.c:80
4843msgid "terminate values with NUL byte"
4844msgstr "终止值是NUL字节"
4845
4846#: builtin/config.c:81
4847msgid "respect include directives on lookup"
4848msgstr "查询时参照 include 指令递归查找"
4849
4850#: builtin/config.c:316
4851msgid "unable to parse default color value"
4852msgstr "不能解析缺省的颜色值"
4853
4854#: builtin/config.c:457
4855#, c-format
4856msgid ""
4857"# This is Git's per-user configuration file.\n"
4858"[core]\n"
4859"# Please adapt and uncomment the following lines:\n"
4860"#\tuser = %s\n"
4861"#\temail = %s\n"
4862msgstr ""
4863"# This is Git's per-user configuration file.\n"
4864"[core]\n"
4865"# Please adapt and uncomment the following lines:\n"
4866"#\tuser = %s\n"
4867"#\temail = %s\n"
4868
4869#: builtin/config.c:589
4870#, c-format
4871msgid "cannot create configuration file %s"
4872msgstr "不能创建配置文件 %s"
4873
4874#: builtin/count-objects.c:55
4875msgid "git count-objects [-v] [-H | --human-readable]"
4876msgstr "git count-objects [-v] [-H | --human-readable]"
4877
4878#: builtin/count-objects.c:65
4879msgid "print sizes in human readable format"
4880msgstr "以用户可读的格式显示大小"
4881
4882#: builtin/describe.c:17
4883msgid "git describe [options] <commit-ish>*"
4884msgstr "git describe [选项] <提交号>*"
4885
4886#: builtin/describe.c:18
4887msgid "git describe [options] --dirty"
4888msgstr "git describe [选项] --dirty"
4889
4890#: builtin/describe.c:217
4891#, c-format
4892msgid "annotated tag %s not available"
4893msgstr "注释 tag %s 无效"
4894
4895#: builtin/describe.c:221
4896#, c-format
4897msgid "annotated tag %s has no embedded name"
4898msgstr "注释 tag %s 没有嵌入名称"
4899
4900#: builtin/describe.c:223
4901#, c-format
4902msgid "tag '%s' is really '%s' here"
4903msgstr "tag '%s' 的确是在 '%s'"
4904
4905#: builtin/describe.c:250 builtin/log.c:452
4906#, c-format
4907msgid "Not a valid object name %s"
4908msgstr "不是一个有效的对象名 %s"
4909
4910#: builtin/describe.c:253
4911#, c-format
4912msgid "%s is not a valid '%s' object"
4913msgstr "%s 不是一个有效的 '%s' 对象"
4914
4915#: builtin/describe.c:270
4916#, c-format
4917msgid "no tag exactly matches '%s'"
4918msgstr "没有 tag 准确匹配 '%s'"
4919
4920#: builtin/describe.c:272
4921#, c-format
4922msgid "searching to describe %s\n"
4923msgstr "搜索描述 %s\n"
4924
4925#: builtin/describe.c:319
4926#, c-format
4927msgid "finished search at %s\n"
4928msgstr "完成搜索 %s\n"
4929
4930#: builtin/describe.c:346
4931#, c-format
4932msgid ""
4933"No annotated tags can describe '%s'.\n"
4934"However, there were unannotated tags: try --tags."
4935msgstr ""
4936"没有注释 tag 能描述 '%s'。\n"
4937"然而,有非注释 tag:尝试 --tags。"
4938
4939#: builtin/describe.c:350
4940#, c-format
4941msgid ""
4942"No tags can describe '%s'.\n"
4943"Try --always, or create some tags."
4944msgstr ""
4945"没有注释 tag 能描述 '%s'。\n"
4946"尝试 --always,或者创建一些 tag。"
4947
4948#: builtin/describe.c:371
4949#, c-format
4950msgid "traversed %lu commits\n"
4951msgstr "已遍历 %lu 个提交\n"
4952
4953#: builtin/describe.c:374
4954#, c-format
4955msgid ""
4956"more than %i tags found; listed %i most recent\n"
4957"gave up search at %s\n"
4958msgstr ""
4959"发现多于 %i 个 tag,列出最近的 %i 个\n"
4960"在 %s 放弃搜索\n"
4961
4962#: builtin/describe.c:396
4963msgid "find the tag that comes after the commit"
4964msgstr "寻找提交之后的 tag(用于描述提交)"
4965
4966#: builtin/describe.c:397
4967msgid "debug search strategy on stderr"
4968msgstr "在标准错误上调试搜索策略"
4969
4970#: builtin/describe.c:398
4971msgid "use any ref"
4972msgstr "使用任意引用"
4973
4974#: builtin/describe.c:399
4975msgid "use any tag, even unannotated"
4976msgstr "使用任意 tag,即使未带注解"
4977
4978#: builtin/describe.c:400
4979msgid "always use long format"
4980msgstr "始终使用长提交号格式"
4981
4982#: builtin/describe.c:401
4983msgid "only follow first parent"
4984msgstr "只跟随第一个父提交"
4985
4986#: builtin/describe.c:404
4987msgid "only output exact matches"
4988msgstr "只输出精确匹配"
4989
4990#: builtin/describe.c:406
4991msgid "consider <n> most recent tags (default: 10)"
4992msgstr "考虑最近 <n> 个 tags(默认:10)"
4993
4994#: builtin/describe.c:408
4995msgid "only consider tags matching <pattern>"
4996msgstr "只考虑匹配 <模式> 的 tags"
4997
4998#: builtin/describe.c:410 builtin/name-rev.c:318
4999msgid "show abbreviated commit object as fallback"
5000msgstr "显示简写的提交号作为后备"
5001
5002#: builtin/describe.c:411
5003msgid "mark"
5004msgstr "标记"
5005
5006#: builtin/describe.c:412
5007msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5008msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
5009
5010#: builtin/describe.c:430
5011msgid "--long is incompatible with --abbrev=0"
5012msgstr "--long 与 --abbrev=0 不兼容"
5013
5014#: builtin/describe.c:456
5015msgid "No names found, cannot describe anything."
5016msgstr "没有发现名称,无法描述任何东西。"
5017
5018#: builtin/describe.c:476
5019msgid "--dirty is incompatible with commit-ishes"
5020msgstr "--dirty 不能与提交同时使用"
5021
5022#: builtin/diff.c:86
5023#, c-format
5024msgid "'%s': not a regular file or symlink"
5025msgstr "'%s':不是一个正规文件或符号链接"
5026
5027#: builtin/diff.c:237
5028#, c-format
5029msgid "invalid option: %s"
5030msgstr "无效选项:%s"
5031
5032#: builtin/diff.c:358
5033msgid "Not a git repository"
5034msgstr "不是一个 git 版本库"
5035
5036#: builtin/diff.c:401
5037#, c-format
5038msgid "invalid object '%s' given."
5039msgstr "提供了无效对象 '%s'。"
5040
5041#: builtin/diff.c:410
5042#, c-format
5043msgid "more than two blobs given: '%s'"
5044msgstr "提供了超过两个数据(blob)对象:'%s'"
5045
5046#: builtin/diff.c:417
5047#, c-format
5048msgid "unhandled object '%s' given."
5049msgstr "无法处理的对象 '%s'。"
5050
5051#: builtin/fast-export.c:24
5052msgid "git fast-export [rev-list-opts]"
5053msgstr "git fast-export [rev-list-opts]"
5054
5055#: builtin/fast-export.c:979
5056msgid "show progress after <n> objects"
5057msgstr "在 <n> 个对象之后显示进度"
5058
5059#: builtin/fast-export.c:981
5060msgid "select handling of signed tags"
5061msgstr "选择如何处理签名 tags"
5062
5063#: builtin/fast-export.c:984
5064msgid "select handling of tags that tag filtered objects"
5065msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
5066
5067#: builtin/fast-export.c:987
5068msgid "Dump marks to this file"
5069msgstr "把标记存储到这个文件"
5070
5071#: builtin/fast-export.c:989
5072msgid "Import marks from this file"
5073msgstr "从这个文件导入标记"
5074
5075#: builtin/fast-export.c:991
5076msgid "Fake a tagger when tags lack one"
5077msgstr "当 tags 缺少标记者字段时,假装提供一个"
5078
5079#: builtin/fast-export.c:993
5080msgid "Output full tree for each commit"
5081msgstr "每次提交都输出整个树"
5082
5083#: builtin/fast-export.c:995
5084msgid "Use the done feature to terminate the stream"
5085msgstr "使用 done 功能来终止流"
5086
5087#: builtin/fast-export.c:996
5088msgid "Skip output of blob data"
5089msgstr "跳过数据对象的输出"
5090
5091#: builtin/fast-export.c:997
5092msgid "refspec"
5093msgstr "引用表达式"
5094
5095#: builtin/fast-export.c:998
5096msgid "Apply refspec to exported refs"
5097msgstr "对导出的引用应用引用表达式"
5098
5099#: builtin/fast-export.c:999
5100msgid "anonymize output"
5101msgstr "匿名输出"
5102
5103#: builtin/fetch.c:20
5104msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5105msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
5106
5107#: builtin/fetch.c:21
5108msgid "git fetch [<options>] <group>"
5109msgstr "git fetch [<选项>] <组>"
5110
5111#: builtin/fetch.c:22
5112msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5113msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
5114
5115#: builtin/fetch.c:23
5116msgid "git fetch --all [<options>]"
5117msgstr "git fetch --all [<选项>]"
5118
5119#: builtin/fetch.c:90
5120msgid "fetch from all remotes"
5121msgstr "从所有的远程抓取"
5122
5123#: builtin/fetch.c:92
5124msgid "append to .git/FETCH_HEAD instead of overwriting"
5125msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5126
5127#: builtin/fetch.c:94
5128msgid "path to upload pack on remote end"
5129msgstr "上传包到远程的路径"
5130
5131#: builtin/fetch.c:95
5132msgid "force overwrite of local branch"
5133msgstr "强制覆盖本地分支"
5134
5135#: builtin/fetch.c:97
5136msgid "fetch from multiple remotes"
5137msgstr "从多个远程抓取"
5138
5139#: builtin/fetch.c:99
5140msgid "fetch all tags and associated objects"
5141msgstr "抓取所有的 tags 和关联对象"
5142
5143#: builtin/fetch.c:101
5144msgid "do not fetch all tags (--no-tags)"
5145msgstr "不抓取任何 tags (--no-tags)"
5146
5147#: builtin/fetch.c:103
5148msgid "prune remote-tracking branches no longer on remote"
5149msgstr "清除远程已经不存在的分支的跟踪分支"
5150
5151# 译者:可选值,不能翻译
5152#: builtin/fetch.c:104
5153msgid "on-demand"
5154msgstr "on-demand"
5155
5156#: builtin/fetch.c:105
5157msgid "control recursive fetching of submodules"
5158msgstr "控制子模组的递归抓取"
5159
5160#: builtin/fetch.c:109
5161msgid "keep downloaded pack"
5162msgstr "保持下载包"
5163
5164#: builtin/fetch.c:111
5165msgid "allow updating of HEAD ref"
5166msgstr "允许更新 HEAD 引用"
5167
5168#: builtin/fetch.c:114
5169msgid "deepen history of shallow clone"
5170msgstr "深化浅克隆的历史"
5171
5172#: builtin/fetch.c:116
5173msgid "convert to a complete repository"
5174msgstr "转换为一个完整的版本库"
5175
5176#: builtin/fetch.c:118 builtin/log.c:1208
5177msgid "dir"
5178msgstr "目录"
5179
5180#: builtin/fetch.c:119
5181msgid "prepend this to submodule path output"
5182msgstr "在子模组路径输出的前面加上此目录"
5183
5184#: builtin/fetch.c:122
5185msgid "default mode for recursion"
5186msgstr "递归的默认模式"
5187
5188#: builtin/fetch.c:124
5189msgid "accept refs that update .git/shallow"
5190msgstr "接受更新 .git/shallow 的引用"
5191
5192#: builtin/fetch.c:125
5193msgid "refmap"
5194msgstr "引用映射"
5195
5196#: builtin/fetch.c:126
5197msgid "specify fetch refmap"
5198msgstr "指定获取操作的引用映射"
5199
5200#: builtin/fetch.c:376
5201msgid "Couldn't find remote ref HEAD"
5202msgstr "无法发现远程 HEAD 引用"
5203
5204#: builtin/fetch.c:454
5205#, c-format
5206msgid "object %s not found"
5207msgstr "对象 %s 未发现"
5208
5209#: builtin/fetch.c:459
5210msgid "[up to date]"
5211msgstr "[最新]"
5212
5213#: builtin/fetch.c:473
5214#, c-format
5215msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5216msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5217
5218#: builtin/fetch.c:474 builtin/fetch.c:560
5219msgid "[rejected]"
5220msgstr "[已拒绝]"
5221
5222#: builtin/fetch.c:485
5223msgid "[tag update]"
5224msgstr "[tag更新]"
5225
5226# 译者:注意保持前导空格
5227#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540
5228msgid " (unable to update local ref)"
5229msgstr " (不能更新本地引用)"
5230
5231#: builtin/fetch.c:505
5232msgid "[new tag]"
5233msgstr "[新tag]"
5234
5235#: builtin/fetch.c:508
5236msgid "[new branch]"
5237msgstr "[新分支]"
5238
5239#: builtin/fetch.c:511
5240msgid "[new ref]"
5241msgstr "[新引用]"
5242
5243#: builtin/fetch.c:556
5244msgid "unable to update local ref"
5245msgstr "不能更新本地引用"
5246
5247#: builtin/fetch.c:556
5248msgid "forced update"
5249msgstr "强制更新"
5250
5251#: builtin/fetch.c:562
5252msgid "(non-fast-forward)"
5253msgstr "(非快进式)"
5254
5255#: builtin/fetch.c:595 builtin/fetch.c:828
5256#, c-format
5257msgid "cannot open %s: %s\n"
5258msgstr "无法打开 %s:%s\n"
5259
5260#: builtin/fetch.c:604
5261#, c-format
5262msgid "%s did not send all necessary objects\n"
5263msgstr "%s 未发送所有必须的对象\n"
5264
5265#: builtin/fetch.c:622
5266#, c-format
5267msgid "reject %s because shallow roots are not allowed to be updated"
5268msgstr "拒绝 %s 因为浅克隆不允许被更新"
5269
5270#: builtin/fetch.c:710 builtin/fetch.c:793
5271#, c-format
5272msgid "From %.*s\n"
5273msgstr "来自 %.*s\n"
5274
5275#: builtin/fetch.c:721
5276#, c-format
5277msgid ""
5278"some local refs could not be updated; try running\n"
5279" 'git remote prune %s' to remove any old, conflicting branches"
5280msgstr ""
5281"一些本地引用不能被更新;尝试运行\n"
5282" 'git remote prune %s' 来删除旧的、有冲突的分支"
5283
5284# 译者:注意保持前导空格
5285#: builtin/fetch.c:773
5286#, c-format
5287msgid " (%s will become dangling)"
5288msgstr " (%s 将成为摇摆状态)"
5289
5290# 译者:注意保持前导空格
5291#: builtin/fetch.c:774
5292#, c-format
5293msgid " (%s has become dangling)"
5294msgstr " (%s 已成为摇摆状态)"
5295
5296#: builtin/fetch.c:798
5297msgid "[deleted]"
5298msgstr "[已删除]"
5299
5300#: builtin/fetch.c:799 builtin/remote.c:1060
5301msgid "(none)"
5302msgstr "(无)"
5303
5304#: builtin/fetch.c:818
5305#, c-format
5306msgid "Refusing to fetch into current branch %s of non-bare repository"
5307msgstr "拒绝获取到非纯版本库的当前分支 %s"
5308
5309#: builtin/fetch.c:837
5310#, c-format
5311msgid "Option \"%s\" value \"%s\" is not valid for %s"
5312msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5313
5314#: builtin/fetch.c:840
5315#, c-format
5316msgid "Option \"%s\" is ignored for %s\n"
5317msgstr "选项 \"%s\" 为 %s 所忽略\n"
5318
5319#: builtin/fetch.c:896
5320#, c-format
5321msgid "Don't know how to fetch from %s"
5322msgstr "不知道如何从 %s 获取"
5323
5324#: builtin/fetch.c:1058
5325#, c-format
5326msgid "Fetching %s\n"
5327msgstr "正在获取 %s\n"
5328
5329#: builtin/fetch.c:1060 builtin/remote.c:90
5330#, c-format
5331msgid "Could not fetch %s"
5332msgstr "不能获取 %s"
5333
5334#: builtin/fetch.c:1078
5335msgid ""
5336"No remote repository specified. Please, specify either a URL or a\n"
5337"remote name from which new revisions should be fetched."
5338msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
5339
5340#: builtin/fetch.c:1101
5341msgid "You need to specify a tag name."
5342msgstr "您需要指定一个 tag 名称。"
5343
5344#: builtin/fetch.c:1143
5345msgid "--depth and --unshallow cannot be used together"
5346msgstr "--depth 和 --unshallow 不能同时使用"
5347
5348#: builtin/fetch.c:1145
5349msgid "--unshallow on a complete repository does not make sense"
5350msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5351
5352#: builtin/fetch.c:1168
5353msgid "fetch --all does not take a repository argument"
5354msgstr "fetch --all 不能带一个版本库参数"
5355
5356#: builtin/fetch.c:1170
5357msgid "fetch --all does not make sense with refspecs"
5358msgstr "fetch --all 带引用规则没有任何意义"
5359
5360#: builtin/fetch.c:1181
5361#, c-format
5362msgid "No such remote or remote group: %s"
5363msgstr "没有这样的远程或远程组:%s"
5364
5365#: builtin/fetch.c:1189
5366msgid "Fetching a group and specifying refspecs does not make sense"
5367msgstr "获取组并指定引用规则没有意义"
5368
5369#: builtin/fmt-merge-msg.c:13
5370msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5371msgstr ""
5372"git fmt-merge-msg [-m <说明>] [--log[=<n>]|--no-log] [--file <文件>]"
5373
5374#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
5375#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
5376#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590
5377#: parse-options.h:132 parse-options.h:239
5378msgid "n"
5379msgstr "n"
5380
5381#: builtin/fmt-merge-msg.c:663
5382msgid "populate log with at most <n> entries from shortlog"
5383msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5384
5385#: builtin/fmt-merge-msg.c:666
5386msgid "alias for --log (deprecated)"
5387msgstr "参数 --log 的别名(已弃用)"
5388
5389#: builtin/fmt-merge-msg.c:669
5390msgid "text"
5391msgstr "文本"
5392
5393#: builtin/fmt-merge-msg.c:670
5394msgid "use <text> as start of message"
5395msgstr "使用 <文本> 作为提交说明的开始"
5396
5397#: builtin/fmt-merge-msg.c:671
5398msgid "file to read from"
5399msgstr "从文件中读取"
5400
5401#: builtin/for-each-ref.c:676
5402msgid "unable to parse format"
5403msgstr "不能解析格式"
5404
5405#: builtin/for-each-ref.c:1064
5406msgid "git for-each-ref [options] [<pattern>]"
5407msgstr "git for-each-ref [选项] [<模式>]"
5408
5409#: builtin/for-each-ref.c:1079
5410msgid "quote placeholders suitably for shells"
5411msgstr "引用占位符适用于 shells"
5412
5413#: builtin/for-each-ref.c:1081
5414msgid "quote placeholders suitably for perl"
5415msgstr "引用占位符适用于 perl"
5416
5417#: builtin/for-each-ref.c:1083
5418msgid "quote placeholders suitably for python"
5419msgstr "引用占位符适用于 python"
5420
5421#: builtin/for-each-ref.c:1085
5422msgid "quote placeholders suitably for Tcl"
5423msgstr "引用占位符适用于 Tcl"
5424
5425#: builtin/for-each-ref.c:1088
5426msgid "show only <n> matched refs"
5427msgstr "只显示 <n> 个匹配的引用"
5428
5429#: builtin/for-each-ref.c:1089 builtin/replace.c:438
5430msgid "format"
5431msgstr "格式"
5432
5433#: builtin/for-each-ref.c:1089
5434msgid "format to use for the output"
5435msgstr "输出格式"
5436
5437#: builtin/for-each-ref.c:1090
5438msgid "key"
5439msgstr "key"
5440
5441#: builtin/for-each-ref.c:1091
5442msgid "field name to sort on"
5443msgstr "排序的字段名"
5444
5445#: builtin/fsck.c:147 builtin/prune.c:136
5446msgid "Checking connectivity"
5447msgstr "检查连接中"
5448
5449#: builtin/fsck.c:540
5450msgid "Checking object directories"
5451msgstr "检查对象目录中"
5452
5453#: builtin/fsck.c:603
5454msgid "git fsck [options] [<object>...]"
5455msgstr "git fsck [选项] [<对象>...]"
5456
5457#: builtin/fsck.c:609
5458msgid "show unreachable objects"
5459msgstr "显示不可达的对象"
5460
5461#: builtin/fsck.c:610
5462msgid "show dangling objects"
5463msgstr "显示摇摆的对象"
5464
5465#: builtin/fsck.c:611
5466msgid "report tags"
5467msgstr "报告 tags"
5468
5469#: builtin/fsck.c:612
5470msgid "report root nodes"
5471msgstr "报告根节点"
5472
5473#: builtin/fsck.c:613
5474msgid "make index objects head nodes"
5475msgstr "将索引亦作为检查的头节点"
5476
5477#: builtin/fsck.c:614
5478msgid "make reflogs head nodes (default)"
5479msgstr "将引用日志作为检查的头节点(默认)"
5480
5481#: builtin/fsck.c:615
5482msgid "also consider packs and alternate objects"
5483msgstr "也考虑包和备用对象"
5484
5485#: builtin/fsck.c:616
5486msgid "enable more strict checking"
5487msgstr "启用更严格的检查"
5488
5489#: builtin/fsck.c:618
5490msgid "write dangling objects in .git/lost-found"
5491msgstr "将摇摆对象写入 .git/lost-found 中"
5492
5493#: builtin/fsck.c:619 builtin/prune.c:108
5494msgid "show progress"
5495msgstr "显示进度"
5496
5497#: builtin/fsck.c:669
5498msgid "Checking objects"
5499msgstr "检查对象中"
5500
5501#: builtin/gc.c:24
5502msgid "git gc [options]"
5503msgstr "git gc [选项]"
5504
5505#: builtin/gc.c:79
5506#, c-format
5507msgid "Invalid gc.pruneexpire: '%s'"
5508msgstr "无效的 gc.pruneexpire:'%s'"
5509
5510#: builtin/gc.c:107
5511#, c-format
5512msgid "insanely long object directory %.*s"
5513msgstr "不正常的长对象目录 %.*s"
5514
5515#: builtin/gc.c:276
5516msgid "prune unreferenced objects"
5517msgstr "清除未引用的对象"
5518
5519#: builtin/gc.c:278
5520msgid "be more thorough (increased runtime)"
5521msgstr "更彻底(增加运行时间)"
5522
5523#: builtin/gc.c:279
5524msgid "enable auto-gc mode"
5525msgstr "启用自动垃圾回收模式"
5526
5527#: builtin/gc.c:280
5528msgid "force running gc even if there may be another gc running"
5529msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5530
5531#: builtin/gc.c:321
5532#, c-format
5533msgid "Auto packing the repository in background for optimum performance.\n"
5534msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5535
5536#: builtin/gc.c:323
5537#, c-format
5538msgid "Auto packing the repository for optimum performance.\n"
5539msgstr "自动打包版本库以求最佳性能。\n"
5540
5541#: builtin/gc.c:324
5542#, c-format
5543msgid "See \"git help gc\" for manual housekeeping.\n"
5544msgstr "手工维护参见 \"git help gc\"。\n"
5545
5546#: builtin/gc.c:342
5547#, c-format
5548msgid ""
5549"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5550msgstr ""
5551"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5552
5553#: builtin/gc.c:364
5554msgid ""
5555"There are too many unreachable loose objects; run 'git prune' to remove them."
5556msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5557
5558#: builtin/grep.c:23
5559msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
5560msgstr "git grep [选项] [-e] <模式> [<版本>...] [[--] <路径>...]"
5561
5562#: builtin/grep.c:218
5563#, c-format
5564msgid "grep: failed to create thread: %s"
5565msgstr "grep:无法创建线程:%s"
5566
5567#: builtin/grep.c:441 builtin/grep.c:476
5568#, c-format
5569msgid "unable to read tree (%s)"
5570msgstr "无法读取树(%s)"
5571
5572#: builtin/grep.c:491
5573#, c-format
5574msgid "unable to grep from object of type %s"
5575msgstr "无法抓取来自于 %s 类型的对象"
5576
5577#: builtin/grep.c:547
5578#, c-format
5579msgid "switch `%c' expects a numerical value"
5580msgstr "开关 `%c' 期望一个数字值"
5581
5582#: builtin/grep.c:564
5583#, c-format
5584msgid "cannot open '%s'"
5585msgstr "不能打开 '%s'"
5586
5587#: builtin/grep.c:638
5588msgid "search in index instead of in the work tree"
5589msgstr "在索引区搜索而不是在工作区"
5590
5591#: builtin/grep.c:640
5592msgid "find in contents not managed by git"
5593msgstr "在未被 git 管理的内容中查找"
5594
5595# 译者:中文字符串拼接,可删除前导空格
5596#: builtin/grep.c:642
5597msgid "search in both tracked and untracked files"
5598msgstr "在跟踪和未跟踪的文件中搜索"
5599
5600#: builtin/grep.c:644
5601msgid "search also in ignored files"
5602msgstr "也在忽略的文件中搜索"
5603
5604#: builtin/grep.c:647
5605msgid "show non-matching lines"
5606msgstr "显示未匹配的行"
5607
5608#: builtin/grep.c:649
5609msgid "case insensitive matching"
5610msgstr "不区分大小写匹配"
5611
5612#: builtin/grep.c:651
5613msgid "match patterns only at word boundaries"
5614msgstr "只在单词边界匹配模式"
5615
5616#: builtin/grep.c:653
5617msgid "process binary files as text"
5618msgstr "把二进制文件当做文本处理"
5619
5620#: builtin/grep.c:655
5621msgid "don't match patterns in binary files"
5622msgstr "不在二进制文件中匹配模式"
5623
5624#: builtin/grep.c:658
5625msgid "process binary files with textconv filters"
5626msgstr "用 textconv 过滤器处理二进制文件"
5627
5628#: builtin/grep.c:660
5629msgid "descend at most <depth> levels"
5630msgstr "最多以指定的深度向下寻找"
5631
5632#: builtin/grep.c:664
5633msgid "use extended POSIX regular expressions"
5634msgstr "使用扩展的 POSIX 正则表达式"
5635
5636#: builtin/grep.c:667
5637msgid "use basic POSIX regular expressions (default)"
5638msgstr "使用基本的 POSIX 正则表达式(默认)"
5639
5640#: builtin/grep.c:670
5641msgid "interpret patterns as fixed strings"
5642msgstr "把模式解析为固定的字符串"
5643
5644#: builtin/grep.c:673
5645msgid "use Perl-compatible regular expressions"
5646msgstr "使用 Perl 兼容的正则表达式"
5647
5648#: builtin/grep.c:676
5649msgid "show line numbers"
5650msgstr "显示行号"
5651
5652#: builtin/grep.c:677
5653msgid "don't show filenames"
5654msgstr "不显示文件名"
5655
5656#: builtin/grep.c:678
5657msgid "show filenames"
5658msgstr "显示文件名"
5659
5660#: builtin/grep.c:680
5661msgid "show filenames relative to top directory"
5662msgstr "显示相对于顶级目录的文件名"
5663
5664#: builtin/grep.c:682
5665msgid "show only filenames instead of matching lines"
5666msgstr "只显示文件名而不显示匹配的行"
5667
5668#: builtin/grep.c:684
5669msgid "synonym for --files-with-matches"
5670msgstr "和 --files-with-matches 同义"
5671
5672#: builtin/grep.c:687
5673msgid "show only the names of files without match"
5674msgstr "只显示未匹配的文件名"
5675
5676#: builtin/grep.c:689
5677msgid "print NUL after filenames"
5678msgstr "在文件名后输出 NUL 字符"
5679
5680#: builtin/grep.c:691
5681msgid "show the number of matches instead of matching lines"
5682msgstr "显示总匹配行数,而不显示匹配的行"
5683
5684#: builtin/grep.c:692
5685msgid "highlight matches"
5686msgstr "高亮显示匹配项"
5687
5688#: builtin/grep.c:694
5689msgid "print empty line between matches from different files"
5690msgstr "在不同文件的匹配项之间打印空行"
5691
5692#: builtin/grep.c:696
5693msgid "show filename only once above matches from same file"
5694msgstr "只在同一文件的匹配项的上面显示一次文件名"
5695
5696#: builtin/grep.c:699
5697msgid "show <n> context lines before and after matches"
5698msgstr "显示匹配项前后的 <n> 行上下文"
5699
5700#: builtin/grep.c:702
5701msgid "show <n> context lines before matches"
5702msgstr "显示匹配项前 <n> 行上下文"
5703
5704#: builtin/grep.c:704
5705msgid "show <n> context lines after matches"
5706msgstr "显示匹配项后 <n> 行上下文"
5707
5708#: builtin/grep.c:705
5709msgid "shortcut for -C NUM"
5710msgstr "快捷键 -C 数字"
5711
5712#: builtin/grep.c:708
5713msgid "show a line with the function name before matches"
5714msgstr "在匹配的前面显示一行函数名"
5715
5716#: builtin/grep.c:710
5717msgid "show the surrounding function"
5718msgstr "显示所在函数的前后内容"
5719
5720#: builtin/grep.c:713
5721msgid "read patterns from file"
5722msgstr "从文件读取模式"
5723
5724#: builtin/grep.c:715
5725msgid "match <pattern>"
5726msgstr "匹配 <模式>"
5727
5728#: builtin/grep.c:717
5729msgid "combine patterns specified with -e"
5730msgstr "组合用 -e 参数设定的模式"
5731
5732#: builtin/grep.c:729
5733msgid "indicate hit with exit status without output"
5734msgstr "不输出,而用退出码标识命中状态"
5735
5736#: builtin/grep.c:731
5737msgid "show only matches from files that match all patterns"
5738msgstr "只显示匹配所有模式的文件中的匹配"
5739
5740#: builtin/grep.c:733
5741msgid "show parse tree for grep expression"
5742msgstr "显示 grep 表达式的解析树"
5743
5744#: builtin/grep.c:737
5745msgid "pager"
5746msgstr "分页"
5747
5748#: builtin/grep.c:737
5749msgid "show matching files in the pager"
5750msgstr "分页显示匹配的文件"
5751
5752#: builtin/grep.c:740
5753msgid "allow calling of grep(1) (ignored by this build)"
5754msgstr "允许调用 grep(1)(本次构建忽略)"
5755
5756#: builtin/grep.c:741 builtin/show-ref.c:187
5757msgid "show usage"
5758msgstr "显示用法"
5759
5760#: builtin/grep.c:808
5761msgid "no pattern given."
5762msgstr "未提供模式匹配。"
5763
5764#: builtin/grep.c:866
5765msgid "--open-files-in-pager only works on the worktree"
5766msgstr "--open-files-in-pager 仅用于工作区"
5767
5768#: builtin/grep.c:892
5769msgid "--cached or --untracked cannot be used with --no-index."
5770msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5771
5772#: builtin/grep.c:897
5773msgid "--no-index or --untracked cannot be used with revs."
5774msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5775
5776#: builtin/grep.c:900
5777msgid "--[no-]exclude-standard cannot be used for tracked contents."
5778msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5779
5780#: builtin/grep.c:908
5781msgid "both --cached and trees are given."
5782msgstr "同时给出了 --cached 和树对象。"
5783
5784#: builtin/hash-object.c:82
5785msgid ""
5786"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5787"<file>..."
5788msgstr ""
5789"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5790"<文件>..."
5791
5792#: builtin/hash-object.c:83
5793msgid "git hash-object --stdin-paths < <list-of-paths>"
5794msgstr "git hash-object --stdin-paths < <路径列表>"
5795
5796#: builtin/hash-object.c:94 builtin/tag.c:610
5797msgid "type"
5798msgstr "类型"
5799
5800#: builtin/hash-object.c:94
5801msgid "object type"
5802msgstr "对象类型"
5803
5804#: builtin/hash-object.c:95
5805msgid "write the object into the object database"
5806msgstr "将对象写入对象数据库"
5807
5808#: builtin/hash-object.c:97
5809msgid "read the object from stdin"
5810msgstr "从标准输入读取对象"
5811
5812#: builtin/hash-object.c:99
5813msgid "store file as is without filters"
5814msgstr "原样存储文件不使用过滤器"
5815
5816#: builtin/hash-object.c:100
5817msgid ""
5818"just hash any random garbage to create corrupt objects for debugging Git"
5819msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
5820
5821#: builtin/hash-object.c:101
5822msgid "process file as it were from this path"
5823msgstr "处理文件并假设其来自于此路径"
5824
5825#: builtin/help.c:41
5826msgid "print all available commands"
5827msgstr "打印所有可用的命令"
5828
5829#: builtin/help.c:42
5830msgid "print list of useful guides"
5831msgstr "显示有用的指南列表"
5832
5833#: builtin/help.c:43
5834msgid "show man page"
5835msgstr "显示 man 手册"
5836
5837#: builtin/help.c:44
5838msgid "show manual in web browser"
5839msgstr "在 web 浏览器中显示手册"
5840
5841#: builtin/help.c:46
5842msgid "show info page"
5843msgstr "显示 info 手册"
5844
5845#: builtin/help.c:52
5846msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5847msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
5848
5849#: builtin/help.c:64
5850#, c-format
5851msgid "unrecognized help format '%s'"
5852msgstr "未能识别的帮助格式 '%s'"
5853
5854#: builtin/help.c:91
5855msgid "Failed to start emacsclient."
5856msgstr "无法启动 emacsclient。"
5857
5858#: builtin/help.c:104
5859msgid "Failed to parse emacsclient version."
5860msgstr "无法解析 emacsclient 版本。"
5861
5862#: builtin/help.c:112
5863#, c-format
5864msgid "emacsclient version '%d' too old (< 22)."
5865msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5866
5867#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
5868#, c-format
5869msgid "failed to exec '%s': %s"
5870msgstr "无法执行 '%s':%s"
5871
5872#: builtin/help.c:215
5873#, c-format
5874msgid ""
5875"'%s': path for unsupported man viewer.\n"
5876"Please consider using 'man.<tool>.cmd' instead."
5877msgstr ""
5878"'%s':不支持的 man 手册查看器的路径。\n"
5879"请使用 'man.<工具>.cmd'。"
5880
5881#: builtin/help.c:227
5882#, c-format
5883msgid ""
5884"'%s': cmd for supported man viewer.\n"
5885"Please consider using 'man.<tool>.path' instead."
5886msgstr ""
5887"'%s': 支持的 man 手册查看器命令。\n"
5888"请使用 'man.<工具>.path'。"
5889
5890#: builtin/help.c:354
5891#, c-format
5892msgid "'%s': unknown man viewer."
5893msgstr "'%s':未知的 man 查看器。"
5894
5895#: builtin/help.c:371
5896msgid "no man viewer handled the request"
5897msgstr "没有 man 查看器处理此请求"
5898
5899#: builtin/help.c:379
5900msgid "no info viewer handled the request"
5901msgstr "没有 info 查看器处理此请求"
5902
5903#: builtin/help.c:428
5904msgid "Defining attributes per path"
5905msgstr "定义路径的属性"
5906
5907#: builtin/help.c:429
5908msgid "Everyday Git With 20 Commands Or So"
5909msgstr "每一天 Git 常用的约 20 条命令"
5910
5911#: builtin/help.c:430
5912msgid "A Git glossary"
5913msgstr "Git 词汇表"
5914
5915#: builtin/help.c:431
5916msgid "Specifies intentionally untracked files to ignore"
5917msgstr "忽略指定的未跟踪文件"
5918
5919#: builtin/help.c:432
5920msgid "Defining submodule properties"
5921msgstr "定义子模组属性"
5922
5923#: builtin/help.c:433
5924msgid "Specifying revisions and ranges for Git"
5925msgstr "指定 Git 的版本和版本范围"
5926
5927#: builtin/help.c:434
5928msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5929msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5930
5931#: builtin/help.c:435
5932msgid "An overview of recommended workflows with Git"
5933msgstr "Git 推荐的工作流概览"
5934
5935#: builtin/help.c:447
5936msgid "The common Git guides are:\n"
5937msgstr "最常用的 Git 向导有:\n"
5938
5939#: builtin/help.c:468 builtin/help.c:485
5940#, c-format
5941msgid "usage: %s%s"
5942msgstr "用法:%s%s"
5943
5944#: builtin/help.c:501
5945#, c-format
5946msgid "`git %s' is aliased to `%s'"
5947msgstr "`git %s' 是 `%s' 的别名"
5948
5949#: builtin/index-pack.c:150
5950#, c-format
5951msgid "unable to open %s"
5952msgstr "不能打开 %s"
5953
5954#: builtin/index-pack.c:200
5955#, c-format
5956msgid "object type mismatch at %s"
5957msgstr "%s 的对象类型不匹配"
5958
5959#: builtin/index-pack.c:220
5960#, c-format
5961msgid "did not receive expected object %s"
5962msgstr "未能获取期望的对象 %s"
5963
5964#: builtin/index-pack.c:223
5965#, c-format
5966msgid "object %s: expected type %s, found %s"
5967msgstr "对象 %s:期待类型 %s,却是 %s"
5968
5969#: builtin/index-pack.c:265
5970#, c-format
5971msgid "cannot fill %d byte"
5972msgid_plural "cannot fill %d bytes"
5973msgstr[0] "无法填充 %d 字节"
5974msgstr[1] "无法填充 %d 字节"
5975
5976#: builtin/index-pack.c:275
5977msgid "early EOF"
5978msgstr "过早的文件结束符(EOF)"
5979
5980#: builtin/index-pack.c:276
5981msgid "read error on input"
5982msgstr "输入上的读错误"
5983
5984#: builtin/index-pack.c:288
5985msgid "used more bytes than were available"
5986msgstr "用掉了超过可用的字节"
5987
5988#: builtin/index-pack.c:295
5989msgid "pack too large for current definition of off_t"
5990msgstr "包太大超过了当前 off_t 的定义"
5991
5992#: builtin/index-pack.c:311
5993#, c-format
5994msgid "unable to create '%s'"
5995msgstr "不能创建 '%s'"
5996
5997#: builtin/index-pack.c:316
5998#, c-format
5999msgid "cannot open packfile '%s'"
6000msgstr "无法打开包文件 '%s'"
6001
6002#: builtin/index-pack.c:330
6003msgid "pack signature mismatch"
6004msgstr "包签名不匹配"
6005
6006#: builtin/index-pack.c:332
6007#, c-format
6008msgid "pack version %<PRIu32> unsupported"
6009msgstr "不支持包版本 %<PRIu32>"
6010
6011#: builtin/index-pack.c:350
6012#, c-format
6013msgid "pack has bad object at offset %lu: %s"
6014msgstr "包中有错误的对象位于 %lu:%s"
6015
6016#: builtin/index-pack.c:471
6017#, c-format
6018msgid "inflate returned %d"
6019msgstr "解压缩返回 %d"
6020
6021#: builtin/index-pack.c:520
6022msgid "offset value overflow for delta base object"
6023msgstr "偏移值覆盖了 delta 基准对象"
6024
6025#: builtin/index-pack.c:528
6026msgid "delta base offset is out of bound"
6027msgstr "delta 基准偏移越界"
6028
6029#: builtin/index-pack.c:536
6030#, c-format
6031msgid "unknown object type %d"
6032msgstr "未知对象类型 %d"
6033
6034#: builtin/index-pack.c:567
6035msgid "cannot pread pack file"
6036msgstr "无法读取包文件"
6037
6038#: builtin/index-pack.c:569
6039#, c-format
6040msgid "premature end of pack file, %lu byte missing"
6041msgid_plural "premature end of pack file, %lu bytes missing"
6042msgstr[0] "包文件过早结束,缺少 %lu 字节"
6043msgstr[1] "包文件过早结束,缺少 %lu 字节"
6044
6045#: builtin/index-pack.c:595
6046msgid "serious inflate inconsistency"
6047msgstr "解压缩严重的不一致"
6048
6049#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
6050#: builtin/index-pack.c:749 builtin/index-pack.c:758
6051#, c-format
6052msgid "SHA1 COLLISION FOUND WITH %s !"
6053msgstr "发现 %s 出现 SHA1 冲突!"
6054
6055#: builtin/index-pack.c:689 builtin/pack-objects.c:164
6056#: builtin/pack-objects.c:256
6057#, c-format
6058msgid "unable to read %s"
6059msgstr "不能读 %s"
6060
6061#: builtin/index-pack.c:755
6062#, c-format
6063msgid "cannot read existing object %s"
6064msgstr "不能读取现存对象 %s"
6065
6066#: builtin/index-pack.c:769
6067#, c-format
6068msgid "invalid blob object %s"
6069msgstr "无效的数据(blob)对象 %s"
6070
6071#: builtin/index-pack.c:783
6072#, c-format
6073msgid "invalid %s"
6074msgstr "无效的 %s"
6075
6076#: builtin/index-pack.c:787
6077msgid "Error in object"
6078msgstr "对象中出错"
6079
6080#: builtin/index-pack.c:789
6081#, c-format
6082msgid "Not all child objects of %s are reachable"
6083msgstr "%s 的所有子对象并非都可达"
6084
6085#: builtin/index-pack.c:861 builtin/index-pack.c:890
6086msgid "failed to apply delta"
6087msgstr "无法应用 delta"
6088
6089#: builtin/index-pack.c:1055
6090msgid "Receiving objects"
6091msgstr "接收对象中"
6092
6093#: builtin/index-pack.c:1055
6094msgid "Indexing objects"
6095msgstr "索引对象中"
6096
6097#: builtin/index-pack.c:1081
6098msgid "pack is corrupted (SHA1 mismatch)"
6099msgstr "包冲突(SHA1 不匹配)"
6100
6101#: builtin/index-pack.c:1086
6102msgid "cannot fstat packfile"
6103msgstr "不能枚举包文件状态"
6104
6105#: builtin/index-pack.c:1089
6106msgid "pack has junk at the end"
6107msgstr "包的结尾有垃圾数据"
6108
6109#: builtin/index-pack.c:1100
6110msgid "confusion beyond insanity in parse_pack_objects()"
6111msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6112
6113#: builtin/index-pack.c:1123
6114msgid "Resolving deltas"
6115msgstr "处理 delta 中"
6116
6117#: builtin/index-pack.c:1133
6118#, c-format
6119msgid "unable to create thread: %s"
6120msgstr "不能创建线程:%s"
6121
6122#: builtin/index-pack.c:1175
6123msgid "confusion beyond insanity"
6124msgstr "不可理喻"
6125
6126#: builtin/index-pack.c:1181
6127#, c-format
6128msgid "completed with %d local objects"
6129msgstr "完成 %d 个本地对象"
6130
6131#: builtin/index-pack.c:1191
6132#, c-format
6133msgid "Unexpected tail checksum for %s (disk corruption?)"
6134msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
6135
6136#: builtin/index-pack.c:1195
6137#, c-format
6138msgid "pack has %d unresolved delta"
6139msgid_plural "pack has %d unresolved deltas"
6140msgstr[0] "包有 %d 个未解决的 delta"
6141msgstr[1] "包有 %d 个未解决的 delta"
6142
6143#: builtin/index-pack.c:1220
6144#, c-format
6145msgid "unable to deflate appended object (%d)"
6146msgstr "不能压缩附加对象(%d)"
6147
6148#: builtin/index-pack.c:1299
6149#, c-format
6150msgid "local object %s is corrupt"
6151msgstr "本地对象 %s 已损坏"
6152
6153#: builtin/index-pack.c:1323
6154msgid "error while closing pack file"
6155msgstr "关闭包文件时出错"
6156
6157#: builtin/index-pack.c:1336
6158#, c-format
6159msgid "cannot write keep file '%s'"
6160msgstr "无法写保留文件 '%s'"
6161
6162#: builtin/index-pack.c:1344
6163#, c-format
6164msgid "cannot close written keep file '%s'"
6165msgstr "无法关闭保留文件 '%s'"
6166
6167#: builtin/index-pack.c:1357
6168msgid "cannot store pack file"
6169msgstr "无法存储包文件"
6170
6171#: builtin/index-pack.c:1368
6172msgid "cannot store index file"
6173msgstr "无法存储索引文件"
6174
6175#: builtin/index-pack.c:1401
6176#, c-format
6177msgid "bad pack.indexversion=%<PRIu32>"
6178msgstr "坏的 pack.indexversion=%<PRIu32>"
6179
6180#: builtin/index-pack.c:1407
6181#, c-format
6182msgid "invalid number of threads specified (%d)"
6183msgstr "指定的线程数无效(%d)"
6184
6185#: builtin/index-pack.c:1411 builtin/index-pack.c:1590
6186#, c-format
6187msgid "no threads support, ignoring %s"
6188msgstr "没有线程支持,忽略 %s"
6189
6190#: builtin/index-pack.c:1469
6191#, c-format
6192msgid "Cannot open existing pack file '%s'"
6193msgstr "无法打开现存包文件 '%s'"
6194
6195#: builtin/index-pack.c:1471
6196#, c-format
6197msgid "Cannot open existing pack idx file for '%s'"
6198msgstr "无法为 %s 打开包索引文件"
6199
6200#: builtin/index-pack.c:1518
6201#, c-format
6202msgid "non delta: %d object"
6203msgid_plural "non delta: %d objects"
6204msgstr[0] "非 delta:%d 个对象"
6205msgstr[1] "非 delta:%d 个对象"
6206
6207#: builtin/index-pack.c:1525
6208#, c-format
6209msgid "chain length = %d: %lu object"
6210msgid_plural "chain length = %d: %lu objects"
6211msgstr[0] "链长 = %d: %lu 对象"
6212msgstr[1] "链长 = %d: %lu 对象"
6213
6214#: builtin/index-pack.c:1554
6215msgid "Cannot come back to cwd"
6216msgstr "无法返回当前工作目录"
6217
6218#: builtin/index-pack.c:1602 builtin/index-pack.c:1605
6219#: builtin/index-pack.c:1617 builtin/index-pack.c:1621
6220#, c-format
6221msgid "bad %s"
6222msgstr "错误选项 %s"
6223
6224#: builtin/index-pack.c:1635
6225msgid "--fix-thin cannot be used without --stdin"
6226msgstr "--fix-thin 不能和 --stdin 同时使用"
6227
6228#: builtin/index-pack.c:1639 builtin/index-pack.c:1648
6229#, c-format
6230msgid "packfile name '%s' does not end with '.pack'"
6231msgstr "包名 '%s' 没有以 '.pack' 结尾"
6232
6233#: builtin/index-pack.c:1656
6234msgid "--verify with no packfile name given"
6235msgstr "--verify 没有提供包名参数"
6236
6237#: builtin/init-db.c:35
6238#, c-format
6239msgid "Could not make %s writable by group"
6240msgstr "不能设置 %s 为组可写"
6241
6242#: builtin/init-db.c:62
6243#, c-format
6244msgid "insanely long template name %s"
6245msgstr "太长的模版名 %s"
6246
6247#: builtin/init-db.c:67
6248#, c-format
6249msgid "cannot stat '%s'"
6250msgstr "不能枚举 '%s' 状态"
6251
6252#: builtin/init-db.c:73
6253#, c-format
6254msgid "cannot stat template '%s'"
6255msgstr "不能枚举模版 '%s' 状态"
6256
6257#: builtin/init-db.c:80
6258#, c-format
6259msgid "cannot opendir '%s'"
6260msgstr "不能打开目录 '%s'"
6261
6262#: builtin/init-db.c:97
6263#, c-format
6264msgid "cannot readlink '%s'"
6265msgstr "不能读取链接 '%s'"
6266
6267#: builtin/init-db.c:99
6268#, c-format
6269msgid "insanely long symlink %s"
6270msgstr "太长的符号链接 %s"
6271
6272#: builtin/init-db.c:102
6273#, c-format
6274msgid "cannot symlink '%s' '%s'"
6275msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6276
6277#: builtin/init-db.c:106
6278#, c-format
6279msgid "cannot copy '%s' to '%s'"
6280msgstr "不能拷贝 '%s' 至 '%s'"
6281
6282#: builtin/init-db.c:110
6283#, c-format
6284msgid "ignoring template %s"
6285msgstr "忽略模版 %s"
6286
6287#: builtin/init-db.c:136
6288#, c-format
6289msgid "insanely long template path %s"
6290msgstr "太长的模版路径 %s"
6291
6292#: builtin/init-db.c:144
6293#, c-format
6294msgid "templates not found %s"
6295msgstr "模版未找到 %s"
6296
6297#: builtin/init-db.c:157
6298#, c-format
6299msgid "not copying templates of a wrong format version %d from '%s'"
6300msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6301
6302#: builtin/init-db.c:197
6303#, c-format
6304msgid "insane git directory %s"
6305msgstr "不正常的 git 目录 %s"
6306
6307#: builtin/init-db.c:331 builtin/init-db.c:334
6308#, c-format
6309msgid "%s already exists"
6310msgstr "%s 已经存在"
6311
6312#: builtin/init-db.c:363
6313#, c-format
6314msgid "unable to handle file type %d"
6315msgstr "不能处理 %d 类型的文件"
6316
6317#: builtin/init-db.c:366
6318#, c-format
6319msgid "unable to move %s to %s"
6320msgstr "不能移动 %s 至 %s"
6321
6322#. TRANSLATORS: The first '%s' is either "Reinitialized
6323#. existing" or "Initialized empty", the second " shared" or
6324#. "", and the last '%s%s' is the verbatim directory name.
6325#: builtin/init-db.c:426
6326#, c-format
6327msgid "%s%s Git repository in %s%s\n"
6328msgstr "%s%s Git 版本库于 %s%s\n"
6329
6330#: builtin/init-db.c:427
6331msgid "Reinitialized existing"
6332msgstr "重新初始化现存的"
6333
6334#: builtin/init-db.c:427
6335msgid "Initialized empty"
6336msgstr "初始化空的"
6337
6338# 译者:中文字符串拼接,可删除前导空格
6339#: builtin/init-db.c:428
6340msgid " shared"
6341msgstr "共享"
6342
6343#: builtin/init-db.c:475
6344msgid ""
6345"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6346"shared[=<permissions>]] [directory]"
6347msgstr ""
6348"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6349"[目录]"
6350
6351#: builtin/init-db.c:498
6352msgid "permissions"
6353msgstr "权限"
6354
6355#: builtin/init-db.c:499
6356msgid "specify that the git repository is to be shared amongst several users"
6357msgstr "指定 git 版本库是多个用户之间共享的"
6358
6359#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171
6360msgid "be quiet"
6361msgstr "保持安静"
6362
6363#: builtin/init-db.c:533 builtin/init-db.c:538
6364#, c-format
6365msgid "cannot mkdir %s"
6366msgstr "不能创建目录 %s"
6367
6368#: builtin/init-db.c:542
6369#, c-format
6370msgid "cannot chdir to %s"
6371msgstr "不能切换目录到 %s"
6372
6373#: builtin/init-db.c:563
6374#, c-format
6375msgid ""
6376"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6377"dir=<directory>)"
6378msgstr ""
6379"不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
6380
6381#: builtin/init-db.c:591
6382#, c-format
6383msgid "Cannot access work tree '%s'"
6384msgstr "不能访问工作区 '%s'"
6385
6386#: builtin/interpret-trailers.c:15
6387msgid ""
6388"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6389"[<file>...]"
6390msgstr ""
6391"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6392">...]"
6393
6394#: builtin/interpret-trailers.c:25
6395msgid "trim empty trailers"
6396msgstr "删除空签名"
6397
6398#: builtin/interpret-trailers.c:26
6399msgid "trailer"
6400msgstr "签名"
6401
6402#: builtin/interpret-trailers.c:27
6403msgid "trailer(s) to add"
6404msgstr "要添加的签名"
6405
6406#: builtin/log.c:41
6407msgid "git log [<options>] [<revision range>] [[--] <path>...]"
6408msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
6409
6410#: builtin/log.c:42
6411msgid "git show [options] <object>..."
6412msgstr "git show [选项] <对象>..."
6413
6414#: builtin/log.c:81
6415#, c-format
6416msgid "invalid --decorate option: %s"
6417msgstr "无效的 --decorate 选项:%s"
6418
6419#: builtin/log.c:127
6420msgid "suppress diff output"
6421msgstr "不显示差异输出"
6422
6423#: builtin/log.c:128
6424msgid "show source"
6425msgstr "显示源"
6426
6427#: builtin/log.c:129
6428msgid "Use mail map file"
6429msgstr "使用邮件映射文件"
6430
6431#: builtin/log.c:130
6432msgid "decorate options"
6433msgstr "修饰选项"
6434
6435#: builtin/log.c:133
6436msgid "Process line range n,m in file, counting from 1"
6437msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6438
6439#: builtin/log.c:229
6440#, c-format
6441msgid "Final output: %d %s\n"
6442msgstr "最终输出:%d %s\n"
6443
6444#: builtin/log.c:458
6445#, c-format
6446msgid "git show %s: bad file"
6447msgstr "git show %s: 损坏的文件"
6448
6449#: builtin/log.c:472 builtin/log.c:564
6450#, c-format
6451msgid "Could not read object %s"
6452msgstr "不能读取对象 %s"
6453
6454#: builtin/log.c:588
6455#, c-format
6456msgid "Unknown type: %d"
6457msgstr "未知类型:%d"
6458
6459#: builtin/log.c:689
6460msgid "format.headers without value"
6461msgstr "format.headers 没有值"
6462
6463#: builtin/log.c:773
6464msgid "name of output directory is too long"
6465msgstr "输出目录名太长"
6466
6467#: builtin/log.c:789
6468#, c-format
6469msgid "Cannot open patch file %s"
6470msgstr "无法打开补丁文件 %s"
6471
6472#: builtin/log.c:803
6473msgid "Need exactly one range."
6474msgstr "只需要一个范围。"
6475
6476#: builtin/log.c:811
6477msgid "Not a range."
6478msgstr "不是一个范围。"
6479
6480#: builtin/log.c:919
6481msgid "Cover letter needs email format"
6482msgstr "信封需要邮件地址格式"
6483
6484#: builtin/log.c:998
6485#, c-format
6486msgid "insane in-reply-to: %s"
6487msgstr "不正常的 in-reply-to:%s"
6488
6489#: builtin/log.c:1026
6490msgid "git format-patch [options] [<since> | <revision range>]"
6491msgstr "git format-patch [选项] [<从> | <版本范围>]"
6492
6493#: builtin/log.c:1071
6494msgid "Two output directories?"
6495msgstr "两个输出目录?"
6496
6497#: builtin/log.c:1186
6498msgid "use [PATCH n/m] even with a single patch"
6499msgstr "使用 [PATCH n/m],即使只有一个补丁"
6500
6501#: builtin/log.c:1189
6502msgid "use [PATCH] even with multiple patches"
6503msgstr "使用 [PATCH],即使有多个补丁"
6504
6505#: builtin/log.c:1193
6506msgid "print patches to standard out"
6507msgstr "打印补丁到标准输出"
6508
6509#: builtin/log.c:1195
6510msgid "generate a cover letter"
6511msgstr "生成一封附信"
6512
6513#: builtin/log.c:1197
6514msgid "use simple number sequence for output file names"
6515msgstr "使用简单的数字序列作为输出文件名"
6516
6517#: builtin/log.c:1198
6518msgid "sfx"
6519msgstr "后缀"
6520
6521#: builtin/log.c:1199
6522msgid "use <sfx> instead of '.patch'"
6523msgstr "使用 <后缀> 代替 '.patch'"
6524
6525#: builtin/log.c:1201
6526msgid "start numbering patches at <n> instead of 1"
6527msgstr "补丁以 <n> 开始编号,而不是1"
6528
6529#: builtin/log.c:1203
6530msgid "mark the series as Nth re-roll"
6531msgstr "标记补丁系列是第几次重制"
6532
6533#: builtin/log.c:1205
6534msgid "Use [<prefix>] instead of [PATCH]"
6535msgstr "使用 [<前缀>] 代替 [PATCH]"
6536
6537#: builtin/log.c:1208
6538msgid "store resulting files in <dir>"
6539msgstr "把结果文件存储在 <目录>"
6540
6541#: builtin/log.c:1211
6542msgid "don't strip/add [PATCH]"
6543msgstr "不删除/添加 [PATCH]"
6544
6545#: builtin/log.c:1214
6546msgid "don't output binary diffs"
6547msgstr "不输出二进制差异"
6548
6549#: builtin/log.c:1216
6550msgid "don't include a patch matching a commit upstream"
6551msgstr "不包含已在上游提交中的补丁"
6552
6553#: builtin/log.c:1218
6554msgid "show patch format instead of default (patch + stat)"
6555msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6556
6557#: builtin/log.c:1220
6558msgid "Messaging"
6559msgstr "邮件发送"
6560
6561#: builtin/log.c:1221
6562msgid "header"
6563msgstr "header"
6564
6565#: builtin/log.c:1222
6566msgid "add email header"
6567msgstr "添加邮件头"
6568
6569#: builtin/log.c:1223 builtin/log.c:1225
6570msgid "email"
6571msgstr "邮件地址"
6572
6573#: builtin/log.c:1223
6574msgid "add To: header"
6575msgstr "添加收件人"
6576
6577#: builtin/log.c:1225
6578msgid "add Cc: header"
6579msgstr "添加抄送"
6580
6581#: builtin/log.c:1227
6582msgid "ident"
6583msgstr "标识"
6584
6585#: builtin/log.c:1228
6586msgid "set From address to <ident> (or committer ident if absent)"
6587msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者ID做为地址)"
6588
6589#: builtin/log.c:1230
6590msgid "message-id"
6591msgstr "邮件标识"
6592
6593#: builtin/log.c:1231
6594msgid "make first mail a reply to <message-id>"
6595msgstr "使第一封邮件作为对 <邮件标识> 的回复"
6596
6597#: builtin/log.c:1232 builtin/log.c:1235
6598msgid "boundary"
6599msgstr "边界"
6600
6601#: builtin/log.c:1233
6602msgid "attach the patch"
6603msgstr "附件方式添加补丁"
6604
6605#: builtin/log.c:1236
6606msgid "inline the patch"
6607msgstr "内联显示补丁"
6608
6609#: builtin/log.c:1240
6610msgid "enable message threading, styles: shallow, deep"
6611msgstr "启用邮件线索,风格:浅,深"
6612
6613#: builtin/log.c:1242
6614msgid "signature"
6615msgstr "签名"
6616
6617#: builtin/log.c:1243
6618msgid "add a signature"
6619msgstr "添加一个签名"
6620
6621#: builtin/log.c:1245
6622msgid "add a signature from a file"
6623msgstr "从文件添加一个签名"
6624
6625#: builtin/log.c:1246
6626msgid "don't print the patch filenames"
6627msgstr "不要打印补丁文件名"
6628
6629#: builtin/log.c:1320
6630#, c-format
6631msgid "invalid ident line: %s"
6632msgstr "包含无效的身份标识:%s"
6633
6634#: builtin/log.c:1335
6635msgid "-n and -k are mutually exclusive."
6636msgstr "-n 和 -k 互斥。"
6637
6638#: builtin/log.c:1337
6639msgid "--subject-prefix and -k are mutually exclusive."
6640msgstr "--subject-prefix 和 -k 互斥。"
6641
6642#: builtin/log.c:1345
6643msgid "--name-only does not make sense"
6644msgstr "--name-only 无意义"
6645
6646#: builtin/log.c:1347
6647msgid "--name-status does not make sense"
6648msgstr "--name-status 无意义"
6649
6650#: builtin/log.c:1349
6651msgid "--check does not make sense"
6652msgstr "--check 无意义"
6653
6654#: builtin/log.c:1372
6655msgid "standard output, or directory, which one?"
6656msgstr "标准输出或目录,哪一个?"
6657
6658#: builtin/log.c:1374
6659#, c-format
6660msgid "Could not create directory '%s'"
6661msgstr "不能创建目录 '%s'"
6662
6663#: builtin/log.c:1472
6664#, c-format
6665msgid "unable to read signature file '%s'"
6666msgstr "无法读取签名文件 '%s'"
6667
6668#: builtin/log.c:1535
6669msgid "Failed to create output files"
6670msgstr "无法创建输出文件"
6671
6672#: builtin/log.c:1583
6673msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6674msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6675
6676#: builtin/log.c:1638
6677#, c-format
6678msgid ""
6679"Could not find a tracked remote branch, please specify <upstream> manually.\n"
6680msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
6681
6682#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
6683#, c-format
6684msgid "Unknown commit %s"
6685msgstr "未知提交 %s"
6686
6687#: builtin/ls-files.c:401
6688msgid "git ls-files [options] [<file>...]"
6689msgstr "git ls-files [选项] [<文件>...]"
6690
6691#: builtin/ls-files.c:458
6692msgid "identify the file status with tags"
6693msgstr "用标签标识文件的状态"
6694
6695#: builtin/ls-files.c:460
6696msgid "use lowercase letters for 'assume unchanged' files"
6697msgstr "使用小写字母表示 '假设未改变的' 文件"
6698
6699#: builtin/ls-files.c:462
6700msgid "show cached files in the output (default)"
6701msgstr "显示缓存的文件(默认)"
6702
6703#: builtin/ls-files.c:464
6704msgid "show deleted files in the output"
6705msgstr "显示已删除的文件"
6706
6707#: builtin/ls-files.c:466
6708msgid "show modified files in the output"
6709msgstr "显示已修改的文件"
6710
6711#: builtin/ls-files.c:468
6712msgid "show other files in the output"
6713msgstr "显示其它文件"
6714
6715#: builtin/ls-files.c:470
6716msgid "show ignored files in the output"
6717msgstr "显示忽略的文件"
6718
6719#: builtin/ls-files.c:473
6720msgid "show staged contents' object name in the output"
6721msgstr "显示暂存区内容的对象名称"
6722
6723#: builtin/ls-files.c:475
6724msgid "show files on the filesystem that need to be removed"
6725msgstr "显示文件系统需要删除的文件"
6726
6727#: builtin/ls-files.c:477
6728msgid "show 'other' directories' names only"
6729msgstr "只显示“其他”目录的名称"
6730
6731#: builtin/ls-files.c:480
6732msgid "don't show empty directories"
6733msgstr "不显示空目录"
6734
6735#: builtin/ls-files.c:483
6736msgid "show unmerged files in the output"
6737msgstr "显示未合并的文件"
6738
6739#: builtin/ls-files.c:485
6740msgid "show resolve-undo information"
6741msgstr "显示 resolve-undo 信息"
6742
6743#: builtin/ls-files.c:487
6744msgid "skip files matching pattern"
6745msgstr "匹配排除文件的模式"
6746
6747#: builtin/ls-files.c:490
6748msgid "exclude patterns are read from <file>"
6749msgstr "从 <文件> 中读取排除模式"
6750
6751#: builtin/ls-files.c:493
6752msgid "read additional per-directory exclude patterns in <file>"
6753msgstr "从 <文件> 读取额外的每个目录的排除模式"
6754
6755#: builtin/ls-files.c:495
6756msgid "add the standard git exclusions"
6757msgstr "添加标准的 git 排除"
6758
6759#: builtin/ls-files.c:498
6760msgid "make the output relative to the project top directory"
6761msgstr "显示相对于顶级目录的文件名"
6762
6763#: builtin/ls-files.c:501
6764msgid "if any <file> is not in the index, treat this as an error"
6765msgstr "如果任何 <文件> 都不在索引区,视为错误"
6766
6767#: builtin/ls-files.c:502
6768msgid "tree-ish"
6769msgstr "树或提交"
6770
6771#: builtin/ls-files.c:503
6772msgid "pretend that paths removed since <tree-ish> are still present"
6773msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6774
6775#: builtin/ls-files.c:505
6776msgid "show debugging data"
6777msgstr "显示调试数据"
6778
6779#: builtin/ls-tree.c:28
6780msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6781msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6782
6783#: builtin/ls-tree.c:127
6784msgid "only show trees"
6785msgstr "只显示树"
6786
6787#: builtin/ls-tree.c:129
6788msgid "recurse into subtrees"
6789msgstr "递归到子树"
6790
6791#: builtin/ls-tree.c:131
6792msgid "show trees when recursing"
6793msgstr "当递归时显示树"
6794
6795#: builtin/ls-tree.c:134
6796msgid "terminate entries with NUL byte"
6797msgstr "条目以NUL字符终止"
6798
6799#: builtin/ls-tree.c:135
6800msgid "include object size"
6801msgstr "包括对象大小"
6802
6803#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
6804msgid "list only filenames"
6805msgstr "只列出文件名"
6806
6807#: builtin/ls-tree.c:142
6808msgid "use full path names"
6809msgstr "使用文件的全路径"
6810
6811#: builtin/ls-tree.c:144
6812msgid "list entire tree; not just current directory (implies --full-name)"
6813msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6814
6815#: builtin/merge.c:45
6816msgid "git merge [options] [<commit>...]"
6817msgstr "git merge [选项] [<提交>...]"
6818
6819#: builtin/merge.c:46
6820msgid "git merge [options] <msg> HEAD <commit>"
6821msgstr "git merge [选项] <说明> HEAD <提交>"
6822
6823#: builtin/merge.c:47
6824msgid "git merge --abort"
6825msgstr "git merge --abort"
6826
6827#: builtin/merge.c:100
6828msgid "switch `m' requires a value"
6829msgstr "开关 `m' 需要一个值"
6830
6831#: builtin/merge.c:137
6832#, c-format
6833msgid "Could not find merge strategy '%s'.\n"
6834msgstr "不能找到合并策略 '%s'。\n"
6835
6836#: builtin/merge.c:138
6837#, c-format
6838msgid "Available strategies are:"
6839msgstr "可用的策略有:"
6840
6841#: builtin/merge.c:143
6842#, c-format
6843msgid "Available custom strategies are:"
6844msgstr "可用的自定义策略有:"
6845
6846#: builtin/merge.c:193
6847msgid "do not show a diffstat at the end of the merge"
6848msgstr "在合并的最后不显示差异统计"
6849
6850#: builtin/merge.c:196
6851msgid "show a diffstat at the end of the merge"
6852msgstr "在合并的最后显示差异统计"
6853
6854#: builtin/merge.c:197
6855msgid "(synonym to --stat)"
6856msgstr "(和 --stat 同义)"
6857
6858#: builtin/merge.c:199
6859msgid "add (at most <n>) entries from shortlog to merge commit message"
6860msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6861
6862#: builtin/merge.c:202
6863msgid "create a single commit instead of doing a merge"
6864msgstr "创建一个单独的提交而不是做一次合并"
6865
6866#: builtin/merge.c:204
6867msgid "perform a commit if the merge succeeds (default)"
6868msgstr "如果合并成功,执行一次提交(默认)"
6869
6870#: builtin/merge.c:206
6871msgid "edit message before committing"
6872msgstr "在提交前编辑提交说明"
6873
6874#: builtin/merge.c:207
6875msgid "allow fast-forward (default)"
6876msgstr "允许快进(默认)"
6877
6878#: builtin/merge.c:209
6879msgid "abort if fast-forward is not possible"
6880msgstr "如果不能快进就放弃合并"
6881
6882#: builtin/merge.c:213
6883msgid "Verify that the named commit has a valid GPG signature"
6884msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6885
6886#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
6887msgid "strategy"
6888msgstr "策略"
6889
6890#: builtin/merge.c:215
6891msgid "merge strategy to use"
6892msgstr "要使用的合并策略"
6893
6894#: builtin/merge.c:216
6895msgid "option=value"
6896msgstr "option=value"
6897
6898#: builtin/merge.c:217
6899msgid "option for selected merge strategy"
6900msgstr "所选的合并策略的选项"
6901
6902#: builtin/merge.c:219
6903msgid "merge commit message (for a non-fast-forward merge)"
6904msgstr "合并的提交说明(针对非快进式合并)"
6905
6906#: builtin/merge.c:223
6907msgid "abort the current in-progress merge"
6908msgstr "放弃当前正在进行的合并"
6909
6910#: builtin/merge.c:251
6911msgid "could not run stash."
6912msgstr "不能进行进度保存。"
6913
6914#: builtin/merge.c:256
6915msgid "stash failed"
6916msgstr "进度保存失败"
6917
6918#: builtin/merge.c:261
6919#, c-format
6920msgid "not a valid object: %s"
6921msgstr "不是一个有效对象:%s"
6922
6923#: builtin/merge.c:280 builtin/merge.c:297
6924msgid "read-tree failed"
6925msgstr "读取树失败"
6926
6927# 译者:注意保持前导空格
6928#: builtin/merge.c:327
6929msgid " (nothing to squash)"
6930msgstr " (无可压缩)"
6931
6932#: builtin/merge.c:340
6933#, c-format
6934msgid "Squash commit -- not updating HEAD\n"
6935msgstr "压缩提交 -- 未更新 HEAD\n"
6936
6937#: builtin/merge.c:372
6938msgid "Writing SQUASH_MSG"
6939msgstr "写入 SQUASH_MSG"
6940
6941#: builtin/merge.c:374
6942msgid "Finishing SQUASH_MSG"
6943msgstr "完成 SQUASH_MSG"
6944
6945#: builtin/merge.c:397
6946#, c-format
6947msgid "No merge message -- not updating HEAD\n"
6948msgstr "无合并信息 -- 未更新 HEAD\n"
6949
6950#: builtin/merge.c:447
6951#, c-format
6952msgid "'%s' does not point to a commit"
6953msgstr "'%s' 没有指向一个提交"
6954
6955#: builtin/merge.c:559
6956#, c-format
6957msgid "Bad branch.%s.mergeoptions string: %s"
6958msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6959
6960#: builtin/merge.c:654
6961msgid "git write-tree failed to write a tree"
6962msgstr "git write-tree 无法写入一树对象"
6963
6964#: builtin/merge.c:678
6965msgid "Not handling anything other than two heads merge."
6966msgstr "不能处理两个头合并之外的任何操作。"
6967
6968#: builtin/merge.c:692
6969#, c-format
6970msgid "Unknown option for merge-recursive: -X%s"
6971msgstr "merge-recursive 的未知选项:-X%s"
6972
6973#: builtin/merge.c:705
6974#, c-format
6975msgid "unable to write %s"
6976msgstr "不能写 %s"
6977
6978#: builtin/merge.c:794
6979#, c-format
6980msgid "Could not read from '%s'"
6981msgstr "不能从 '%s' 读取"
6982
6983#: builtin/merge.c:803
6984#, c-format
6985msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6986msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6987
6988#: builtin/merge.c:809
6989#, c-format
6990msgid ""
6991"Please enter a commit message to explain why this merge is necessary,\n"
6992"especially if it merges an updated upstream into a topic branch.\n"
6993"\n"
6994"Lines starting with '%c' will be ignored, and an empty message aborts\n"
6995"the commit.\n"
6996msgstr ""
6997"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6998"合并到主题分支。\n"
6999"\n"
7000"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
7001
7002#: builtin/merge.c:833
7003msgid "Empty commit message."
7004msgstr "空提交信息。"
7005
7006#: builtin/merge.c:845
7007#, c-format
7008msgid "Wonderful.\n"
7009msgstr "太棒了。\n"
7010
7011#: builtin/merge.c:900
7012#, c-format
7013msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7014msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7015
7016#: builtin/merge.c:916
7017#, c-format
7018msgid "'%s' is not a commit"
7019msgstr "'%s' 不是一个提交"
7020
7021#: builtin/merge.c:957
7022msgid "No current branch."
7023msgstr "没有当前分支。"
7024
7025#: builtin/merge.c:959
7026msgid "No remote for the current branch."
7027msgstr "当前分支没有对应的远程版本库。"
7028
7029#: builtin/merge.c:961
7030msgid "No default upstream defined for the current branch."
7031msgstr "当前分支没有定义默认的上游分支。"
7032
7033#: builtin/merge.c:966
7034#, c-format
7035msgid "No remote-tracking branch for %s from %s"
7036msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7037
7038#: builtin/merge.c:1122
7039msgid "There is no merge to abort (MERGE_HEAD missing)."
7040msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7041
7042#: builtin/merge.c:1138
7043msgid ""
7044"You have not concluded your merge (MERGE_HEAD exists).\n"
7045"Please, commit your changes before you merge."
7046msgstr ""
7047"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7048"请在合并前先提交您的修改。"
7049
7050#: builtin/merge.c:1141 git-pull.sh:34
7051msgid "You have not concluded your merge (MERGE_HEAD exists)."
7052msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7053
7054#: builtin/merge.c:1145
7055msgid ""
7056"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7057"Please, commit your changes before you merge."
7058msgstr ""
7059"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7060"请在合并前先提交您的修改。"
7061
7062#: builtin/merge.c:1148
7063msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7064msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7065
7066#: builtin/merge.c:1157
7067msgid "You cannot combine --squash with --no-ff."
7068msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7069
7070#: builtin/merge.c:1166
7071msgid "No commit specified and merge.defaultToUpstream not set."
7072msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7073
7074#: builtin/merge.c:1198
7075msgid "Can merge only exactly one commit into empty head"
7076msgstr "只能将一个提交合并到空分支上"
7077
7078#: builtin/merge.c:1201
7079msgid "Squash commit into empty head not supported yet"
7080msgstr "尚不支持到空分支的压缩提交"
7081
7082#: builtin/merge.c:1203
7083msgid "Non-fast-forward commit does not make sense into an empty head"
7084msgstr "到空分支的非快进式提交没有意义"
7085
7086#: builtin/merge.c:1208
7087#, c-format
7088msgid "%s - not something we can merge"
7089msgstr "%s - 不能被合并"
7090
7091#: builtin/merge.c:1259
7092#, c-format
7093msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7094msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7095
7096#: builtin/merge.c:1262
7097#, c-format
7098msgid "Commit %s has a bad GPG signature allegedly by %s."
7099msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7100
7101#: builtin/merge.c:1265
7102#, c-format
7103msgid "Commit %s does not have a GPG signature."
7104msgstr "提交 %s 没有一个 GPG 签名。"
7105
7106#: builtin/merge.c:1268
7107#, c-format
7108msgid "Commit %s has a good GPG signature by %s\n"
7109msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7110
7111#: builtin/merge.c:1349
7112#, c-format
7113msgid "Updating %s..%s\n"
7114msgstr "更新 %s..%s\n"
7115
7116#: builtin/merge.c:1388
7117#, c-format
7118msgid "Trying really trivial in-index merge...\n"
7119msgstr "尝试非常小的索引内合并...\n"
7120
7121#: builtin/merge.c:1395
7122#, c-format
7123msgid "Nope.\n"
7124msgstr "无。\n"
7125
7126#: builtin/merge.c:1427
7127msgid "Not possible to fast-forward, aborting."
7128msgstr "无法快进,终止。"
7129
7130#: builtin/merge.c:1450 builtin/merge.c:1529
7131#, c-format
7132msgid "Rewinding the tree to pristine...\n"
7133msgstr "将树回滚至原始状态...\n"
7134
7135#: builtin/merge.c:1454
7136#, c-format
7137msgid "Trying merge strategy %s...\n"
7138msgstr "尝试合并策略 %s...\n"
7139
7140#: builtin/merge.c:1520
7141#, c-format
7142msgid "No merge strategy handled the merge.\n"
7143msgstr "没有合并策略处理此合并。\n"
7144
7145#: builtin/merge.c:1522
7146#, c-format
7147msgid "Merge with strategy %s failed.\n"
7148msgstr "使用策略 %s 合并失败。\n"
7149
7150#: builtin/merge.c:1531
7151#, c-format
7152msgid "Using the %s to prepare resolving by hand.\n"
7153msgstr "使用 %s 以准备手工解决。\n"
7154
7155#: builtin/merge.c:1543
7156#, c-format
7157msgid "Automatic merge went well; stopped before committing as requested\n"
7158msgstr "自动合并进展顺利,按要求在提交前停止\n"
7159
7160#: builtin/merge-base.c:29
7161msgid "git merge-base [-a|--all] <commit> <commit>..."
7162msgstr "git merge-base [-a|--all] <提交> <提交>..."
7163
7164#: builtin/merge-base.c:30
7165msgid "git merge-base [-a|--all] --octopus <commit>..."
7166msgstr "git merge-base [-a|--all] --octopus <提交>..."
7167
7168#: builtin/merge-base.c:31
7169msgid "git merge-base --independent <commit>..."
7170msgstr "git merge-base --independent <提交>..."
7171
7172#: builtin/merge-base.c:32
7173msgid "git merge-base --is-ancestor <commit> <commit>"
7174msgstr "git merge-base --is-ancestor <提交> <提交>"
7175
7176#: builtin/merge-base.c:33
7177msgid "git merge-base --fork-point <ref> [<commit>]"
7178msgstr "git merge-base --fork-point <引用> [<提交>]"
7179
7180#: builtin/merge-base.c:214
7181msgid "output all common ancestors"
7182msgstr "输出所有共同的祖先"
7183
7184#: builtin/merge-base.c:216
7185msgid "find ancestors for a single n-way merge"
7186msgstr "查找一个多路合并的祖先提交"
7187
7188#: builtin/merge-base.c:218
7189msgid "list revs not reachable from others"
7190msgstr "显示不能被其他访问到的版本"
7191
7192#: builtin/merge-base.c:220
7193msgid "is the first one ancestor of the other?"
7194msgstr "第一个是其他的祖先提交么?"
7195
7196#: builtin/merge-base.c:222
7197msgid "find where <commit> forked from reflog of <ref>"
7198msgstr "查找 <提交> 从<引用>日志的何处分支的"
7199
7200#: builtin/merge-file.c:8
7201msgid ""
7202"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
7203"file2"
7204msgstr ""
7205"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
7206
7207#: builtin/merge-file.c:33
7208msgid "send results to standard output"
7209msgstr "将结果发送到标准输出"
7210
7211#: builtin/merge-file.c:34
7212msgid "use a diff3 based merge"
7213msgstr "使用基于 diff3 的合并"
7214
7215#: builtin/merge-file.c:35
7216msgid "for conflicts, use our version"
7217msgstr "如果冲突,使用我们的版本"
7218
7219#: builtin/merge-file.c:37
7220msgid "for conflicts, use their version"
7221msgstr "如果冲突,使用他们的版本"
7222
7223#: builtin/merge-file.c:39
7224msgid "for conflicts, use a union version"
7225msgstr "如果冲突,使用联合版本"
7226
7227#: builtin/merge-file.c:42
7228msgid "for conflicts, use this marker size"
7229msgstr "如果冲突,使用指定长度的标记"
7230
7231#: builtin/merge-file.c:43
7232msgid "do not warn about conflicts"
7233msgstr "不要警告冲突"
7234
7235#: builtin/merge-file.c:45
7236msgid "set labels for file1/orig_file/file2"
7237msgstr "为 file1/orig_file/file2 设置标签"
7238
7239#: builtin/mktree.c:64
7240msgid "git mktree [-z] [--missing] [--batch]"
7241msgstr "git mktree [-z] [--missing] [--batch]"
7242
7243#: builtin/mktree.c:150
7244msgid "input is NUL terminated"
7245msgstr "输入以 NUL 字符终止"
7246
7247#: builtin/mktree.c:151 builtin/write-tree.c:24
7248msgid "allow missing objects"
7249msgstr "允许丢失的对象"
7250
7251#: builtin/mktree.c:152
7252msgid "allow creation of more than one tree"
7253msgstr "允许创建一个以上的树"
7254
7255#: builtin/mv.c:15
7256msgid "git mv [options] <source>... <destination>"
7257msgstr "git mv [选项] <源>... <目标>"
7258
7259#: builtin/mv.c:69
7260#, c-format
7261msgid "Directory %s is in index and no submodule?"
7262msgstr "目录 %s 在索引中并且不是子模组?"
7263
7264#: builtin/mv.c:71
7265msgid "Please stage your changes to .gitmodules or stash them to proceed"
7266msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7267
7268#: builtin/mv.c:89
7269#, c-format
7270msgid "%.*s is in index"
7271msgstr "%.*s 在索引中"
7272
7273#: builtin/mv.c:111
7274msgid "force move/rename even if target exists"
7275msgstr "强制移动/重命令,即使目标存在"
7276
7277#: builtin/mv.c:112
7278msgid "skip move/rename errors"
7279msgstr "跳过移动/重命名错误"
7280
7281#: builtin/mv.c:151
7282#, c-format
7283msgid "destination '%s' is not a directory"
7284msgstr "目标 '%s' 不是一个目录"
7285
7286#: builtin/mv.c:162
7287#, c-format
7288msgid "Checking rename of '%s' to '%s'\n"
7289msgstr "检查 '%s' 到 '%s' 的重命名\n"
7290
7291#: builtin/mv.c:166
7292msgid "bad source"
7293msgstr "坏的源"
7294
7295#: builtin/mv.c:169
7296msgid "can not move directory into itself"
7297msgstr "不能将目录移动到自身"
7298
7299#: builtin/mv.c:172
7300msgid "cannot move directory over file"
7301msgstr "不能将目录移动到文件"
7302
7303#: builtin/mv.c:181
7304msgid "source directory is empty"
7305msgstr "源目录为空"
7306
7307#: builtin/mv.c:206
7308msgid "not under version control"
7309msgstr "不在版本控制之下"
7310
7311#: builtin/mv.c:209
7312msgid "destination exists"
7313msgstr "目标已存在"
7314
7315#: builtin/mv.c:217
7316#, c-format
7317msgid "overwriting '%s'"
7318msgstr "覆盖 '%s'"
7319
7320#: builtin/mv.c:220
7321msgid "Cannot overwrite"
7322msgstr "不能覆盖"
7323
7324#: builtin/mv.c:223
7325msgid "multiple sources for the same target"
7326msgstr "同一目标具有多个源"
7327
7328#: builtin/mv.c:225
7329msgid "destination directory does not exist"
7330msgstr "目标目录不存在"
7331
7332#: builtin/mv.c:232
7333#, c-format
7334msgid "%s, source=%s, destination=%s"
7335msgstr "%s,源=%s,目标=%s"
7336
7337#: builtin/mv.c:253
7338#, c-format
7339msgid "Renaming %s to %s\n"
7340msgstr "重命名 %s 至 %s\n"
7341
7342#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355
7343#, c-format
7344msgid "renaming '%s' failed"
7345msgstr "重命名 '%s' 失败"
7346
7347#: builtin/name-rev.c:255
7348msgid "git name-rev [options] <commit>..."
7349msgstr "git name-rev [选项] <提交>..."
7350
7351#: builtin/name-rev.c:256
7352msgid "git name-rev [options] --all"
7353msgstr "git name-rev [选项] --all"
7354
7355#: builtin/name-rev.c:257
7356msgid "git name-rev [options] --stdin"
7357msgstr "git name-rev [选项] --stdin"
7358
7359#: builtin/name-rev.c:309
7360msgid "print only names (no SHA-1)"
7361msgstr "只打印名称(无 SHA-1)"
7362
7363#: builtin/name-rev.c:310
7364msgid "only use tags to name the commits"
7365msgstr "只使用 tags 来命名提交"
7366
7367#: builtin/name-rev.c:312
7368msgid "only use refs matching <pattern>"
7369msgstr "只使用和 <模式> 相匹配的引用"
7370
7371#: builtin/name-rev.c:314
7372msgid "list all commits reachable from all refs"
7373msgstr "列出可以从所有引用访问的提交"
7374
7375#: builtin/name-rev.c:315
7376msgid "read from stdin"
7377msgstr "从标准输入读取"
7378
7379#: builtin/name-rev.c:316
7380msgid "allow to print `undefined` names (default)"
7381msgstr "允许打印 `未定义` 的名称(默认)"
7382
7383#: builtin/name-rev.c:322
7384msgid "dereference tags in the input (internal use)"
7385msgstr "反向解析输入中的 tags(内部使用)"
7386
7387#: builtin/notes.c:24
7388msgid "git notes [--ref <notes_ref>] [list [<object>]]"
7389msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7390
7391#: builtin/notes.c:25
7392msgid ""
7393"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7394"| (-c | -C) <object>] [<object>]"
7395msgstr ""
7396"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7397"| (-c | -C) <对象>] [<对象>]"
7398
7399#: builtin/notes.c:26
7400msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
7401msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7402
7403#: builtin/notes.c:27
7404msgid ""
7405"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7406"(-c | -C) <object>] [<object>]"
7407msgstr ""
7408"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7409"(-c | -C) <对象>] [<对象>]"
7410
7411#: builtin/notes.c:28
7412msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"
7413msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
7414
7415#: builtin/notes.c:29
7416msgid "git notes [--ref <notes_ref>] show [<object>]"
7417msgstr "git notes [--ref <注解引用>] show [<对象>]"
7418
7419#: builtin/notes.c:30
7420msgid ""
7421"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
7422msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7423
7424#: builtin/notes.c:31
7425msgid "git notes merge --commit [-v | -q]"
7426msgstr "git notes merge --commit [-v | -q]"
7427
7428#: builtin/notes.c:32
7429msgid "git notes merge --abort [-v | -q]"
7430msgstr "git notes merge --abort [-v | -q]"
7431
7432#: builtin/notes.c:33
7433msgid "git notes [--ref <notes_ref>] remove [<object>...]"
7434msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7435
7436#: builtin/notes.c:34
7437msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
7438msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7439
7440#: builtin/notes.c:35
7441msgid "git notes [--ref <notes_ref>] get-ref"
7442msgstr "git notes [--ref <注解引用>] get-ref"
7443
7444#: builtin/notes.c:40
7445msgid "git notes [list [<object>]]"
7446msgstr "git notes [list [<对象>]]"
7447
7448#: builtin/notes.c:45
7449msgid "git notes add [<options>] [<object>]"
7450msgstr "git notes add [<选项>] [<对象>]"
7451
7452#: builtin/notes.c:50
7453msgid "git notes copy [<options>] <from-object> <to-object>"
7454msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7455
7456#: builtin/notes.c:51
7457msgid "git notes copy --stdin [<from-object> <to-object>]..."
7458msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7459
7460#: builtin/notes.c:56
7461msgid "git notes append [<options>] [<object>]"
7462msgstr "git notes append [<选项>] [<对象>]"
7463
7464#: builtin/notes.c:61
7465msgid "git notes edit [<object>]"
7466msgstr "git notes edit [<对象>]"
7467
7468#: builtin/notes.c:66
7469msgid "git notes show [<object>]"
7470msgstr "git notes show [<对象>]"
7471
7472#: builtin/notes.c:71
7473msgid "git notes merge [<options>] <notes_ref>"
7474msgstr "git notes merge [<选项>] <注解引用>"
7475
7476#: builtin/notes.c:72
7477msgid "git notes merge --commit [<options>]"
7478msgstr "git notes merge --commit [<选项>]"
7479
7480#: builtin/notes.c:73
7481msgid "git notes merge --abort [<options>]"
7482msgstr "git notes merge --abort [<选项>]"
7483
7484#: builtin/notes.c:78
7485msgid "git notes remove [<object>]"
7486msgstr "git notes remove [<对象>]"
7487
7488#: builtin/notes.c:83
7489msgid "git notes prune [<options>]"
7490msgstr "git notes prune [<选项>]"
7491
7492#: builtin/notes.c:88
7493msgid "git notes get-ref"
7494msgstr "git notes get-ref"
7495
7496#: builtin/notes.c:146
7497#, c-format
7498msgid "unable to start 'show' for object '%s'"
7499msgstr "不能为对象 '%s' 开始 'show'"
7500
7501#: builtin/notes.c:150
7502msgid "could not read 'show' output"
7503msgstr "不能读取 'show' 的输出"
7504
7505#: builtin/notes.c:158
7506#, c-format
7507msgid "failed to finish 'show' for object '%s'"
7508msgstr "无法为对象 '%s' 完成 'show'"
7509
7510#: builtin/notes.c:173 builtin/tag.c:477
7511#, c-format
7512msgid "could not create file '%s'"
7513msgstr "不能创建文件 '%s'"
7514
7515#: builtin/notes.c:192
7516msgid "Please supply the note contents using either -m or -F option"
7517msgstr "请通过 -m 或 -F 选项为注解提供内容"
7518
7519#: builtin/notes.c:201
7520msgid "unable to write note object"
7521msgstr "不能写注解对象"
7522
7523#: builtin/notes.c:203
7524#, c-format
7525msgid "The note contents have been left in %s"
7526msgstr "注解内容被留在 %s 中"
7527
7528#: builtin/notes.c:231 builtin/tag.c:693
7529#, c-format
7530msgid "cannot read '%s'"
7531msgstr "不能读取 '%s'"
7532
7533#: builtin/notes.c:233 builtin/tag.c:696
7534#, c-format
7535msgid "could not open or read '%s'"
7536msgstr "不能打开或读取 '%s'"
7537
7538#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7539#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7540#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7541#: builtin/notes.c:854 builtin/tag.c:709
7542#, c-format
7543msgid "Failed to resolve '%s' as a valid ref."
7544msgstr "无法解析 '%s' 为一个有效引用。"
7545
7546#: builtin/notes.c:255
7547#, c-format
7548msgid "Failed to read object '%s'."
7549msgstr "无法读取对象 '%s'。"
7550
7551#: builtin/notes.c:259
7552#, c-format
7553msgid "Cannot read note data from non-blob object '%s'."
7554msgstr "不能从非数据对象 '%s' 中读取注解数据"
7555
7556#: builtin/notes.c:299
7557#, c-format
7558msgid "Malformed input line: '%s'."
7559msgstr "非法的输入行:'%s'。"
7560
7561#: builtin/notes.c:314
7562#, c-format
7563msgid "Failed to copy notes from '%s' to '%s'"
7564msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7565
7566#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7567#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7568#: builtin/notes.c:919
7569msgid "too many parameters"
7570msgstr "参数太多"
7571
7572#: builtin/notes.c:371 builtin/notes.c:658
7573#, c-format
7574msgid "No note found for object %s."
7575msgstr "未发现对象 %s 的注解。"
7576
7577#: builtin/notes.c:392 builtin/notes.c:555
7578msgid "note contents as a string"
7579msgstr "注解内容作为一个字符串"
7580
7581#: builtin/notes.c:395 builtin/notes.c:558
7582msgid "note contents in a file"
7583msgstr "注解内容到一个文件中"
7584
7585#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7586#: builtin/notes.c:563 builtin/tag.c:628
7587msgid "object"
7588msgstr "对象"
7589
7590#: builtin/notes.c:398 builtin/notes.c:561
7591msgid "reuse and edit specified note object"
7592msgstr "重用和编辑指定的注解对象"
7593
7594#: builtin/notes.c:401 builtin/notes.c:564
7595msgid "reuse specified note object"
7596msgstr "重用指定的注解对象"
7597
7598#: builtin/notes.c:404 builtin/notes.c:567
7599msgid "allow storing empty note"
7600msgstr "允许保存空白注释"
7601
7602#: builtin/notes.c:405 builtin/notes.c:476
7603msgid "replace existing notes"
7604msgstr "替换已存在的注解"
7605
7606#: builtin/notes.c:430
7607#, c-format
7608msgid ""
7609"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7610"existing notes"
7611msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7612
7613#: builtin/notes.c:445 builtin/notes.c:524
7614#, c-format
7615msgid "Overwriting existing notes for object %s\n"
7616msgstr "覆盖对象 %s 现存注解\n"
7617
7618#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7619#, c-format
7620msgid "Removing note for object %s\n"
7621msgstr "删除对象 %s 的注解\n"
7622
7623#: builtin/notes.c:477
7624msgid "read objects from stdin"
7625msgstr "从标准输入读取对象"
7626
7627#: builtin/notes.c:479
7628msgid "load rewriting config for <command> (implies --stdin)"
7629msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7630
7631#: builtin/notes.c:497
7632msgid "too few parameters"
7633msgstr "参数太少"
7634
7635#: builtin/notes.c:518
7636#, c-format
7637msgid ""
7638"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7639"existing notes"
7640msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7641
7642#: builtin/notes.c:530
7643#, c-format
7644msgid "Missing notes on source object %s. Cannot copy."
7645msgstr "源对象 %s 缺少注解。不能拷贝。"
7646
7647#: builtin/notes.c:582
7648#, c-format
7649msgid ""
7650"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7651"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7652msgstr ""
7653"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7654"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7655
7656#: builtin/notes.c:750
7657msgid "General options"
7658msgstr "通用选项"
7659
7660#: builtin/notes.c:752
7661msgid "Merge options"
7662msgstr "合并选项"
7663
7664#: builtin/notes.c:754
7665msgid ""
7666"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7667"cat_sort_uniq)"
7668msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7669
7670#: builtin/notes.c:756
7671msgid "Committing unmerged notes"
7672msgstr "提交未合并的注解"
7673
7674#: builtin/notes.c:758
7675msgid "finalize notes merge by committing unmerged notes"
7676msgstr "通过提交未合并的注解来完成注解合并"
7677
7678#: builtin/notes.c:760
7679msgid "Aborting notes merge resolution"
7680msgstr "中止注解合并的方案"
7681
7682#: builtin/notes.c:762
7683msgid "abort notes merge"
7684msgstr "中止注解合并"
7685
7686#: builtin/notes.c:857
7687#, c-format
7688msgid "Object %s has no note\n"
7689msgstr "对象 %s 没有注解\n"
7690
7691#: builtin/notes.c:869
7692msgid "attempt to remove non-existent note is not an error"
7693msgstr "尝试删除不存在的注解不是一个错误"
7694
7695#: builtin/notes.c:872
7696msgid "read object names from the standard input"
7697msgstr "从标准输入读取对象名称"
7698
7699#: builtin/notes.c:953
7700msgid "notes-ref"
7701msgstr "注解引用"
7702
7703#: builtin/notes.c:954
7704msgid "use notes from <notes_ref>"
7705msgstr "从 <注解引用> 使用注解"
7706
7707#: builtin/notes.c:989 builtin/remote.c:1621
7708#, c-format
7709msgid "Unknown subcommand: %s"
7710msgstr "未知子命令:%s"
7711
7712#: builtin/pack-objects.c:28
7713msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7714msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7715
7716#: builtin/pack-objects.c:29
7717msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7718msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7719
7720#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
7721#, c-format
7722msgid "deflate error (%d)"
7723msgstr "压缩错误 (%d)"
7724
7725#: builtin/pack-objects.c:773
7726msgid "Writing objects"
7727msgstr "写入对象中"
7728
7729#: builtin/pack-objects.c:1015
7730msgid "disabling bitmap writing, as some objects are not being packed"
7731msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7732
7733#: builtin/pack-objects.c:2175
7734msgid "Compressing objects"
7735msgstr "压缩对象中"
7736
7737#: builtin/pack-objects.c:2572
7738#, c-format
7739msgid "unsupported index version %s"
7740msgstr "不支持的索引版本 %s"
7741
7742#: builtin/pack-objects.c:2576
7743#, c-format
7744msgid "bad index version '%s'"
7745msgstr "坏的索引版本 '%s'"
7746
7747#: builtin/pack-objects.c:2599
7748#, c-format
7749msgid "option %s does not accept negative form"
7750msgstr "选项 %s 不接受否定格式"
7751
7752#: builtin/pack-objects.c:2603
7753#, c-format
7754msgid "unable to parse value '%s' for option %s"
7755msgstr "不能解析选项 %1$s 的值 '%2$s'"
7756
7757#: builtin/pack-objects.c:2623
7758msgid "do not show progress meter"
7759msgstr "不显示进度表"
7760
7761#: builtin/pack-objects.c:2625
7762msgid "show progress meter"
7763msgstr "显示进度表"
7764
7765#: builtin/pack-objects.c:2627
7766msgid "show progress meter during object writing phase"
7767msgstr "在对象写入阶段显示进度表"
7768
7769#: builtin/pack-objects.c:2630
7770msgid "similar to --all-progress when progress meter is shown"
7771msgstr "当进度表显示时类似于 --all-progress"
7772
7773#: builtin/pack-objects.c:2631
7774msgid "version[,offset]"
7775msgstr "版本[,偏移]"
7776
7777#: builtin/pack-objects.c:2632
7778msgid "write the pack index file in the specified idx format version"
7779msgstr "用指定的 idx 格式版本来写包索引文件"
7780
7781#: builtin/pack-objects.c:2635
7782msgid "maximum size of each output pack file"
7783msgstr "每个输出包的最大尺寸"
7784
7785#: builtin/pack-objects.c:2637
7786msgid "ignore borrowed objects from alternate object store"
7787msgstr "忽略从替代对象存储里借用对象"
7788
7789#: builtin/pack-objects.c:2639
7790msgid "ignore packed objects"
7791msgstr "忽略包对象"
7792
7793#: builtin/pack-objects.c:2641
7794msgid "limit pack window by objects"
7795msgstr "限制打包窗口的对象数"
7796
7797#: builtin/pack-objects.c:2643
7798msgid "limit pack window by memory in addition to object limit"
7799msgstr "除对象数量限制外设置打包窗口的内存限制"
7800
7801#: builtin/pack-objects.c:2645
7802msgid "maximum length of delta chain allowed in the resulting pack"
7803msgstr "打包允许的 delta 链的最大长度"
7804
7805#: builtin/pack-objects.c:2647
7806msgid "reuse existing deltas"
7807msgstr "重用已存在的 deltas"
7808
7809#: builtin/pack-objects.c:2649
7810msgid "reuse existing objects"
7811msgstr "重用已存在的对象"
7812
7813#: builtin/pack-objects.c:2651
7814msgid "use OFS_DELTA objects"
7815msgstr "使用 OFS_DELTA 对象"
7816
7817#: builtin/pack-objects.c:2653
7818msgid "use threads when searching for best delta matches"
7819msgstr "使用线程查询最佳 delta 匹配"
7820
7821#: builtin/pack-objects.c:2655
7822msgid "do not create an empty pack output"
7823msgstr "不创建空的包输出"
7824
7825#: builtin/pack-objects.c:2657
7826msgid "read revision arguments from standard input"
7827msgstr "从标准输入读取版本号参数"
7828
7829#: builtin/pack-objects.c:2659
7830msgid "limit the objects to those that are not yet packed"
7831msgstr "限制那些尚未打包的对象"
7832
7833#: builtin/pack-objects.c:2662
7834msgid "include objects reachable from any reference"
7835msgstr "包括可以从任何引用访问到的对象"
7836
7837#: builtin/pack-objects.c:2665
7838msgid "include objects referred by reflog entries"
7839msgstr "包括被引用日志引用到的对象"
7840
7841#: builtin/pack-objects.c:2668
7842msgid "include objects referred to by the index"
7843msgstr "包括被索引引用到的对象"
7844
7845#: builtin/pack-objects.c:2671
7846msgid "output pack to stdout"
7847msgstr "输出包到标准输出"
7848
7849#: builtin/pack-objects.c:2673
7850msgid "include tag objects that refer to objects to be packed"
7851msgstr "包括引用了打包对象的 tag"
7852
7853#: builtin/pack-objects.c:2675
7854msgid "keep unreachable objects"
7855msgstr "维持不可达的对象"
7856
7857#: builtin/pack-objects.c:2676 parse-options.h:140
7858msgid "time"
7859msgstr "时间"
7860
7861#: builtin/pack-objects.c:2677
7862msgid "unpack unreachable objects newer than <time>"
7863msgstr "将比给定 <时间> 新的无法访问的对象解包"
7864
7865#: builtin/pack-objects.c:2680
7866msgid "create thin packs"
7867msgstr "创建精简包"
7868
7869#: builtin/pack-objects.c:2682
7870msgid "create packs suitable for shallow fetches"
7871msgstr "创建适合浅克隆版本库获取的包"
7872
7873#: builtin/pack-objects.c:2684
7874msgid "ignore packs that have companion .keep file"
7875msgstr "忽略配有 .keep 文件的包"
7876
7877#: builtin/pack-objects.c:2686
7878msgid "pack compression level"
7879msgstr "打包压缩级别"
7880
7881#: builtin/pack-objects.c:2688
7882msgid "do not hide commits by grafts"
7883msgstr "显示被嫁接隐藏的提交"
7884
7885#: builtin/pack-objects.c:2690
7886msgid "use a bitmap index if available to speed up counting objects"
7887msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
7888
7889#: builtin/pack-objects.c:2692
7890msgid "write a bitmap index together with the pack index"
7891msgstr "在建立包索引的同时创建 bitmap 索引"
7892
7893#: builtin/pack-objects.c:2783
7894msgid "Counting objects"
7895msgstr "对象计数中"
7896
7897#: builtin/pack-refs.c:6
7898msgid "git pack-refs [options]"
7899msgstr "git pack-refs [选项]"
7900
7901#: builtin/pack-refs.c:14
7902msgid "pack everything"
7903msgstr "打包一切"
7904
7905#: builtin/pack-refs.c:15
7906msgid "prune loose refs (default)"
7907msgstr "清除松散的引用(默认)"
7908
7909#: builtin/prune-packed.c:7
7910msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7911msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
7912
7913#: builtin/prune-packed.c:40
7914msgid "Removing duplicate objects"
7915msgstr "正在删除重复对象"
7916
7917#: builtin/prune.c:12
7918msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7919msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7920
7921#: builtin/prune.c:106
7922msgid "do not remove, show only"
7923msgstr "不删除,只显示"
7924
7925#: builtin/prune.c:107
7926msgid "report pruned objects"
7927msgstr "报告清除的对象"
7928
7929#: builtin/prune.c:110
7930msgid "expire objects older than <time>"
7931msgstr "使早于给定时间的对象过期"
7932
7933#: builtin/push.c:14
7934msgid "git push [<options>] [<repository> [<refspec>...]]"
7935msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7936
7937#: builtin/push.c:85
7938msgid "tag shorthand without <tag>"
7939msgstr "tag 后面未提供 <标签> 参数"
7940
7941#: builtin/push.c:95
7942msgid "--delete only accepts plain target ref names"
7943msgstr "--delete 只接受简单的目标引用名"
7944
7945#: builtin/push.c:139
7946msgid ""
7947"\n"
7948"To choose either option permanently, see push.default in 'git help config'."
7949msgstr ""
7950"\n"
7951"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7952
7953#: builtin/push.c:142
7954#, c-format
7955msgid ""
7956"The upstream branch of your current branch does not match\n"
7957"the name of your current branch. To push to the upstream branch\n"
7958"on the remote, use\n"
7959"\n"
7960" git push %s HEAD:%s\n"
7961"\n"
7962"To push to the branch of the same name on the remote, use\n"
7963"\n"
7964" git push %s %s\n"
7965"%s"
7966msgstr ""
7967"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7968"上游分支,使用\n"
7969"\n"
7970" git push %s HEAD:%s\n"
7971"\n"
7972"为推送至远程同名分支,使用\n"
7973"\n"
7974" git push %s %s\n"
7975"%s"
7976
7977#: builtin/push.c:157
7978#, c-format
7979msgid ""
7980"You are not currently on a branch.\n"
7981"To push the history leading to the current (detached HEAD)\n"
7982"state now, use\n"
7983"\n"
7984" git push %s HEAD:<name-of-remote-branch>\n"
7985msgstr ""
7986"您当前不在一个分支上。\n"
7987"现在为推送当前(分离头指针)的历史,使用\n"
7988"\n"
7989" git push %s HEAD:<远程分支名字>\n"
7990
7991#: builtin/push.c:171
7992#, c-format
7993msgid ""
7994"The current branch %s has no upstream branch.\n"
7995"To push the current branch and set the remote as upstream, use\n"
7996"\n"
7997" git push --set-upstream %s %s\n"
7998msgstr ""
7999"当前分支 %s 没有对应的上游分支。\n"
8000"为推送当前分支并建立与远程上游的跟踪,使用\n"
8001"\n"
8002" git push --set-upstream %s %s\n"
8003
8004#: builtin/push.c:179
8005#, c-format
8006msgid "The current branch %s has multiple upstream branches, refusing to push."
8007msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8008
8009#: builtin/push.c:182
8010#, c-format
8011msgid ""
8012"You are pushing to remote '%s', which is not the upstream of\n"
8013"your current branch '%s', without telling me what to push\n"
8014"to update which remote branch."
8015msgstr ""
8016"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8017"而没有告诉我要推送什么、更新哪个远程分支。"
8018
8019# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
8020#: builtin/push.c:205
8021msgid ""
8022"push.default is unset; its implicit value has changed in\n"
8023"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8024"and maintain the traditional behavior, use:\n"
8025"\n"
8026" git config --global push.default matching\n"
8027"\n"
8028"To squelch this message and adopt the new behavior now, use:\n"
8029"\n"
8030" git config --global push.default simple\n"
8031"\n"
8032"When push.default is set to 'matching', git will push local branches\n"
8033"to the remote branches that already exist with the same name.\n"
8034"\n"
8035"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8036"behavior, which only pushes the current branch to the corresponding\n"
8037"remote branch that 'git pull' uses to update the current branch.\n"
8038"\n"
8039"See 'git help config' and search for 'push.default' for further "
8040"information.\n"
8041"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8042"'current' instead of 'simple' if you sometimes use older versions of Git)"
8043msgstr ""
8044"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
8045"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
8046"\n"
8047" git config --global push.default matching\n"
8048"\n"
8049"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8050"\n"
8051" git config --global push.default simple\n"
8052"\n"
8053"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8054"本地分支。\n"
8055"\n"
8056"从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
8057"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8058"\n"
8059"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8060"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
8061"为保持兼容,请用 'current' 代替 'simple')"
8062
8063#: builtin/push.c:272
8064msgid ""
8065"You didn't specify any refspecs to push, and push.default is \"nothing\"."
8066msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
8067
8068#: builtin/push.c:279
8069msgid ""
8070"Updates were rejected because the tip of your current branch is behind\n"
8071"its remote counterpart. Integrate the remote changes (e.g.\n"
8072"'git pull ...') before pushing again.\n"
8073"See the 'Note about fast-forwards' in 'git push --help' for details."
8074msgstr ""
8075"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
8076"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
8077"'git push --help' 中的 'Note about fast-forwards' 小节。"
8078
8079#: builtin/push.c:285
8080msgid ""
8081"Updates were rejected because a pushed branch tip is behind its remote\n"
8082"counterpart. Check out this branch and integrate the remote changes\n"
8083"(e.g. 'git pull ...') before pushing again.\n"
8084"See the 'Note about fast-forwards' in 'git push --help' for details."
8085msgstr ""
8086"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8087"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
8088"'git push --help' 中的 'Note about fast-forwards' 小节。"
8089
8090#: builtin/push.c:291
8091msgid ""
8092"Updates were rejected because the remote contains work that you do\n"
8093"not have locally. This is usually caused by another repository pushing\n"
8094"to the same ref. You may want to first integrate the remote changes\n"
8095"(e.g., 'git pull ...') before pushing again.\n"
8096"See the 'Note about fast-forwards' in 'git push --help' for details."
8097msgstr ""
8098"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
8099"一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8100"(如 'git pull ...')。\n"
8101"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8102
8103#: builtin/push.c:298
8104msgid "Updates were rejected because the tag already exists in the remote."
8105msgstr "更新被拒绝因为 tag 在远程已经存在。"
8106
8107#: builtin/push.c:301
8108msgid ""
8109"You cannot update a remote ref that points at a non-commit object,\n"
8110"or update a remote ref to make it point at a non-commit object,\n"
8111"without using the '--force' option.\n"
8112msgstr ""
8113"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8114"也不能更新远程引用让其指向一个非提交对象。\n"
8115
8116#: builtin/push.c:360
8117#, c-format
8118msgid "Pushing to %s\n"
8119msgstr "推送到 %s\n"
8120
8121#: builtin/push.c:364
8122#, c-format
8123msgid "failed to push some refs to '%s'"
8124msgstr "无法推送一些引用到 '%s'"
8125
8126#: builtin/push.c:394
8127#, c-format
8128msgid "bad repository '%s'"
8129msgstr "坏的版本库 '%s'"
8130
8131#: builtin/push.c:395
8132msgid ""
8133"No configured push destination.\n"
8134"Either specify the URL from the command-line or configure a remote "
8135"repository using\n"
8136"\n"
8137" git remote add <name> <url>\n"
8138"\n"
8139"and then push using the remote name\n"
8140"\n"
8141" git push <name>\n"
8142msgstr ""
8143"没有配置推送目标。\n"
8144"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
8145"\n"
8146" git remote add <名称> <地址>\n"
8147"\n"
8148"然后使用该远程版本库名执行推送\n"
8149"\n"
8150" git push <名称>\n"
8151
8152#: builtin/push.c:410
8153msgid "--all and --tags are incompatible"
8154msgstr "--all 和 --tags 不兼容"
8155
8156#: builtin/push.c:411
8157msgid "--all can't be combined with refspecs"
8158msgstr "--all 不能和引用规则同时使用"
8159
8160#: builtin/push.c:416
8161msgid "--mirror and --tags are incompatible"
8162msgstr "--mirror 和 --tags 不兼容"
8163
8164#: builtin/push.c:417
8165msgid "--mirror can't be combined with refspecs"
8166msgstr "--mirror 不能和引用规则同时使用"
8167
8168#: builtin/push.c:422
8169msgid "--all and --mirror are incompatible"
8170msgstr "--all 和 --mirror 不兼容"
8171
8172#: builtin/push.c:493
8173msgid "repository"
8174msgstr "版本库"
8175
8176#: builtin/push.c:494
8177msgid "push all refs"
8178msgstr "推送所有引用"
8179
8180#: builtin/push.c:495
8181msgid "mirror all refs"
8182msgstr "镜像所有引用"
8183
8184#: builtin/push.c:497
8185msgid "delete refs"
8186msgstr "删除引用"
8187
8188#: builtin/push.c:498
8189msgid "push tags (can't be used with --all or --mirror)"
8190msgstr "推送 tags(不能使用 --all or --mirror)"
8191
8192#: builtin/push.c:501
8193msgid "force updates"
8194msgstr "强制更新"
8195
8196#: builtin/push.c:503
8197msgid "refname>:<expect"
8198msgstr "引用名>:<期望值"
8199
8200#: builtin/push.c:504
8201msgid "require old value of ref to be at this value"
8202msgstr "要求引用旧的取值为设定值"
8203
8204#: builtin/push.c:507
8205msgid "control recursive pushing of submodules"
8206msgstr "控制子模组的递归推送"
8207
8208#: builtin/push.c:509
8209msgid "use thin pack"
8210msgstr "使用精简打包"
8211
8212#: builtin/push.c:510 builtin/push.c:511
8213msgid "receive pack program"
8214msgstr "接收包程序"
8215
8216#: builtin/push.c:512
8217msgid "set upstream for git pull/status"
8218msgstr "设置 git pull/status 的上游"
8219
8220#: builtin/push.c:515
8221msgid "prune locally removed refs"
8222msgstr "清除本地删除的引用"
8223
8224#: builtin/push.c:517
8225msgid "bypass pre-push hook"
8226msgstr "绕过 pre-push 钩子"
8227
8228#: builtin/push.c:518
8229msgid "push missing but relevant tags"
8230msgstr "推送缺失的有关的 tags"
8231
8232#: builtin/push.c:520
8233msgid "GPG sign the push"
8234msgstr "用 GPG 为推送签名"
8235
8236#: builtin/push.c:529
8237msgid "--delete is incompatible with --all, --mirror and --tags"
8238msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8239
8240#: builtin/push.c:531
8241msgid "--delete doesn't make sense without any refs"
8242msgstr "--delete 未接任何引用没有意义"
8243
8244#: builtin/read-tree.c:37
8245msgid ""
8246"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8247"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8248"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8249msgstr ""
8250"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8251"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8252"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
8253
8254#: builtin/read-tree.c:110
8255msgid "write resulting index to <file>"
8256msgstr "将索引结果写入 <文件>"
8257
8258#: builtin/read-tree.c:113
8259msgid "only empty the index"
8260msgstr "只是清空索引"
8261
8262#: builtin/read-tree.c:115
8263msgid "Merging"
8264msgstr "合并"
8265
8266#: builtin/read-tree.c:117
8267msgid "perform a merge in addition to a read"
8268msgstr "读取之余再执行一个合并"
8269
8270#: builtin/read-tree.c:119
8271msgid "3-way merge if no file level merging required"
8272msgstr "如果没有文件级合并需要,执行三路合并"
8273
8274#: builtin/read-tree.c:121
8275msgid "3-way merge in presence of adds and removes"
8276msgstr "存在添加和删除时,也执行三路合并"
8277
8278#: builtin/read-tree.c:123
8279msgid "same as -m, but discard unmerged entries"
8280msgstr "类似于 -m,但丢弃未合并的条目"
8281
8282#: builtin/read-tree.c:124
8283msgid "<subdirectory>/"
8284msgstr "<子目录>/"
8285
8286#: builtin/read-tree.c:125
8287msgid "read the tree into the index under <subdirectory>/"
8288msgstr "读取树对象到索引的 <子目录>/ 下"
8289
8290#: builtin/read-tree.c:128
8291msgid "update working tree with merge result"
8292msgstr "用合并的结果更新工作区"
8293
8294#: builtin/read-tree.c:130
8295msgid "gitignore"
8296msgstr "gitignore"
8297
8298#: builtin/read-tree.c:131
8299msgid "allow explicitly ignored files to be overwritten"
8300msgstr "允许忽略文件中设定的文件可以被覆盖"
8301
8302#: builtin/read-tree.c:134
8303msgid "don't check the working tree after merging"
8304msgstr "合并后不检查工作区"
8305
8306#: builtin/read-tree.c:135
8307msgid "don't update the index or the work tree"
8308msgstr "不更新索引区和工作区"
8309
8310#: builtin/read-tree.c:137
8311msgid "skip applying sparse checkout filter"
8312msgstr "跳过应用稀疏检出过滤器"
8313
8314#: builtin/read-tree.c:139
8315msgid "debug unpack-trees"
8316msgstr "调试 unpack-trees"
8317
8318#: builtin/reflog.c:499
8319#, c-format
8320msgid "%s' for '%s' is not a valid timestamp"
8321msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8322
8323#: builtin/reflog.c:615 builtin/reflog.c:620
8324#, c-format
8325msgid "'%s' is not a valid timestamp"
8326msgstr "'%s' 不是一个有效的时间戳"
8327
8328#: builtin/remote.c:12
8329msgid "git remote [-v | --verbose]"
8330msgstr "git remote [-v | --verbose]"
8331
8332#: builtin/remote.c:13
8333msgid ""
8334"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
8335"mirror=<fetch|push>] <name> <url>"
8336msgstr ""
8337"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8338"mirror=<fetch|push>] <名称> <地址>"
8339
8340#: builtin/remote.c:14 builtin/remote.c:33
8341msgid "git remote rename <old> <new>"
8342msgstr "git remote rename <旧名称> <新名称>"
8343
8344#: builtin/remote.c:15 builtin/remote.c:38
8345msgid "git remote remove <name>"
8346msgstr "git remote remove <名称>"
8347
8348#: builtin/remote.c:16
8349msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
8350msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
8351
8352#: builtin/remote.c:17
8353msgid "git remote [-v | --verbose] show [-n] <name>"
8354msgstr "git remote [-v | --verbose] show [-n] <名称>"
8355
8356#: builtin/remote.c:18
8357msgid "git remote prune [-n | --dry-run] <name>"
8358msgstr "git remote prune [-n | --dry-run] <名称>"
8359
8360#: builtin/remote.c:19
8361msgid ""
8362"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8363msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8364
8365#: builtin/remote.c:20
8366msgid "git remote set-branches [--add] <name> <branch>..."
8367msgstr "git remote set-branches [--add] <名称> <分支>..."
8368
8369#: builtin/remote.c:21 builtin/remote.c:69
8370msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8371msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8372
8373#: builtin/remote.c:22 builtin/remote.c:70
8374msgid "git remote set-url --add <name> <newurl>"
8375msgstr "git remote set-url --add <名称> <新的地址>"
8376
8377#: builtin/remote.c:23 builtin/remote.c:71
8378msgid "git remote set-url --delete <name> <url>"
8379msgstr "git remote set-url --delete <名称> <地址>"
8380
8381#: builtin/remote.c:28
8382msgid "git remote add [<options>] <name> <url>"
8383msgstr "git remote add [<选项>] <名称> <地址>"
8384
8385#: 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:48
8390msgid "git remote set-branches <name> <branch>..."
8391msgstr "git remote set-branches <名称> <分支>..."
8392
8393#: builtin/remote.c:49
8394msgid "git remote set-branches --add <name> <branch>..."
8395msgstr "git remote set-branches --add <名称> <分支>..."
8396
8397#: builtin/remote.c:54
8398msgid "git remote show [<options>] <name>"
8399msgstr "git remote show [<选项>] <名称>"
8400
8401#: builtin/remote.c:59
8402msgid "git remote prune [<options>] <name>"
8403msgstr "git remote prune [<选项>] <名称>"
8404
8405#: builtin/remote.c:64
8406msgid "git remote update [<options>] [<group> | <remote>]..."
8407msgstr "git remote update [<选项>] [<组> | <远程>]..."
8408
8409#: builtin/remote.c:88
8410#, c-format
8411msgid "Updating %s"
8412msgstr "更新 %s 中"
8413
8414#: builtin/remote.c:120
8415msgid ""
8416"--mirror is dangerous and deprecated; please\n"
8417"\t use --mirror=fetch or --mirror=push instead"
8418msgstr ""
8419"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8420"\t 或 --mirror=push"
8421
8422#: builtin/remote.c:137
8423#, c-format
8424msgid "unknown mirror argument: %s"
8425msgstr "未知的镜像参数:%s"
8426
8427#: builtin/remote.c:153
8428msgid "fetch the remote branches"
8429msgstr "抓取远程的分支"
8430
8431#: builtin/remote.c:155
8432msgid "import all tags and associated objects when fetching"
8433msgstr "抓取时导入所有的 tags 和关联对象"
8434
8435#: builtin/remote.c:158
8436msgid "or do not fetch any tag at all (--no-tags)"
8437msgstr "或不抓取任何 tag(--no-tags)"
8438
8439#: builtin/remote.c:160
8440msgid "branch(es) to track"
8441msgstr "跟踪的分支"
8442
8443#: builtin/remote.c:161
8444msgid "master branch"
8445msgstr "主线分支"
8446
8447#: builtin/remote.c:162
8448msgid "push|fetch"
8449msgstr "push|fetch"
8450
8451#: builtin/remote.c:163
8452msgid "set up remote as a mirror to push to or fetch from"
8453msgstr "把远程设置为用以推送或抓取的镜像"
8454
8455#: builtin/remote.c:175
8456msgid "specifying a master branch makes no sense with --mirror"
8457msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8458
8459#: builtin/remote.c:177
8460msgid "specifying branches to track makes sense only with fetch mirrors"
8461msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8462
8463#: builtin/remote.c:187 builtin/remote.c:643
8464#, c-format
8465msgid "remote %s already exists."
8466msgstr "远程 %s 已经存在。"
8467
8468#: builtin/remote.c:191 builtin/remote.c:647
8469#, c-format
8470msgid "'%s' is not a valid remote name"
8471msgstr "'%s' 不是一个有效的远程名称"
8472
8473#: builtin/remote.c:235
8474#, c-format
8475msgid "Could not setup master '%s'"
8476msgstr "无法设置 master '%s'"
8477
8478#: builtin/remote.c:335
8479#, c-format
8480msgid "Could not get fetch map for refspec %s"
8481msgstr "无法得到引用规则 %s 的获取列表"
8482
8483#: builtin/remote.c:436 builtin/remote.c:444
8484msgid "(matching)"
8485msgstr "(匹配)"
8486
8487#: builtin/remote.c:448
8488msgid "(delete)"
8489msgstr "(删除)"
8490
8491#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604
8492#, c-format
8493msgid "Could not append '%s' to '%s'"
8494msgstr "不能添加 '%s' 至 '%s'"
8495
8496#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895
8497#, c-format
8498msgid "No such remote: %s"
8499msgstr "没有这样的远程:%s"
8500
8501#: builtin/remote.c:653
8502#, c-format
8503msgid "Could not rename config section '%s' to '%s'"
8504msgstr "不能重命名配置小节 '%s' 到 '%s'"
8505
8506#: builtin/remote.c:659 builtin/remote.c:847
8507#, c-format
8508msgid "Could not remove config section '%s'"
8509msgstr "不能移除配置小节 '%s'"
8510
8511#: builtin/remote.c:674
8512#, c-format
8513msgid ""
8514"Not updating non-default fetch refspec\n"
8515"\t%s\n"
8516"\tPlease update the configuration manually if necessary."
8517msgstr ""
8518"没有更新非默认的获取引用规则\n"
8519"\t%s\n"
8520"\t如果必要请手动更新配置。"
8521
8522#: builtin/remote.c:680
8523#, c-format
8524msgid "Could not append '%s'"
8525msgstr "不能追加 '%s'"
8526
8527#: builtin/remote.c:691
8528#, c-format
8529msgid "Could not set '%s'"
8530msgstr "不能设置 '%s'"
8531
8532#: builtin/remote.c:713
8533#, c-format
8534msgid "deleting '%s' failed"
8535msgstr "删除 '%s' 失败"
8536
8537#: builtin/remote.c:747
8538#, c-format
8539msgid "creating '%s' failed"
8540msgstr "创建 '%s' 失败"
8541
8542#: builtin/remote.c:766
8543#, c-format
8544msgid "Could not remove branch %s"
8545msgstr "无法移除分支 %s"
8546
8547#: builtin/remote.c:833
8548msgid ""
8549"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8550"to delete it, use:"
8551msgid_plural ""
8552"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8553"to delete them, use:"
8554msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8555msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8556
8557#: builtin/remote.c:948
8558#, c-format
8559msgid " new (next fetch will store in remotes/%s)"
8560msgstr " 新的(下一次获取将存储于 remotes/%s)"
8561
8562#: builtin/remote.c:951
8563msgid " tracked"
8564msgstr " 已跟踪"
8565
8566#: builtin/remote.c:953
8567msgid " stale (use 'git remote prune' to remove)"
8568msgstr " 过时(使用 'git remote prune' 来移除)"
8569
8570#: builtin/remote.c:955
8571msgid " ???"
8572msgstr " ???"
8573
8574#: builtin/remote.c:996
8575#, c-format
8576msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8577msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8578
8579#: builtin/remote.c:1003
8580#, c-format
8581msgid "rebases onto remote %s"
8582msgstr "变基到远程 %s"
8583
8584#: builtin/remote.c:1006
8585#, c-format
8586msgid " merges with remote %s"
8587msgstr " 与远程 %s 合并"
8588
8589#: builtin/remote.c:1007
8590msgid " and with remote"
8591msgstr " 且有远程"
8592
8593#: builtin/remote.c:1009
8594#, c-format
8595msgid "merges with remote %s"
8596msgstr "与远程 %s 合并"
8597
8598#: builtin/remote.c:1010
8599msgid " and with remote"
8600msgstr " 且有远程"
8601
8602#: builtin/remote.c:1056
8603msgid "create"
8604msgstr "创建"
8605
8606#: builtin/remote.c:1059
8607msgid "delete"
8608msgstr "删除"
8609
8610#: builtin/remote.c:1063
8611msgid "up to date"
8612msgstr "最新"
8613
8614#: builtin/remote.c:1066
8615msgid "fast-forwardable"
8616msgstr "可快进"
8617
8618#: builtin/remote.c:1069
8619msgid "local out of date"
8620msgstr "本地已过时"
8621
8622#: builtin/remote.c:1076
8623#, c-format
8624msgid " %-*s forces to %-*s (%s)"
8625msgstr " %-*s 强制推送至 %-*s (%s)"
8626
8627#: builtin/remote.c:1079
8628#, c-format
8629msgid " %-*s pushes to %-*s (%s)"
8630msgstr " %-*s 推送至 %-*s (%s)"
8631
8632#: builtin/remote.c:1083
8633#, c-format
8634msgid " %-*s forces to %s"
8635msgstr " %-*s 强制推送至 %s"
8636
8637#: builtin/remote.c:1086
8638#, c-format
8639msgid " %-*s pushes to %s"
8640msgstr " %-*s 推送至 %s"
8641
8642#: builtin/remote.c:1154
8643msgid "do not query remotes"
8644msgstr "不查询远程"
8645
8646#: builtin/remote.c:1181
8647#, c-format
8648msgid "* remote %s"
8649msgstr "* 远程 %s"
8650
8651#: builtin/remote.c:1182
8652#, c-format
8653msgid " Fetch URL: %s"
8654msgstr " 获取地址:%s"
8655
8656#: builtin/remote.c:1183 builtin/remote.c:1334
8657msgid "(no URL)"
8658msgstr "(无 URL)"
8659
8660#: builtin/remote.c:1192 builtin/remote.c:1194
8661#, c-format
8662msgid " Push URL: %s"
8663msgstr " 推送地址:%s"
8664
8665#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200
8666#, c-format
8667msgid " HEAD branch: %s"
8668msgstr " HEAD分支:%s"
8669
8670#: builtin/remote.c:1202
8671#, c-format
8672msgid ""
8673" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8674msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8675
8676#: builtin/remote.c:1214
8677#, c-format
8678msgid " Remote branch:%s"
8679msgid_plural " Remote branches:%s"
8680msgstr[0] " 远程分支:%s"
8681msgstr[1] " 远程分支:%s"
8682
8683# 译者:中文字符串拼接,可删除前导空格
8684#: builtin/remote.c:1217 builtin/remote.c:1244
8685msgid " (status not queried)"
8686msgstr "(状态未查询)"
8687
8688#: builtin/remote.c:1226
8689msgid " Local branch configured for 'git pull':"
8690msgid_plural " Local branches configured for 'git pull':"
8691msgstr[0] " 为 'git pull' 配置的本地分支:"
8692msgstr[1] " 为 'git pull' 配置的本地分支:"
8693
8694#: builtin/remote.c:1234
8695msgid " Local refs will be mirrored by 'git push'"
8696msgstr " 本地引用将在 'git push' 时被镜像"
8697
8698#: builtin/remote.c:1241
8699#, c-format
8700msgid " Local ref configured for 'git push'%s:"
8701msgid_plural " Local refs configured for 'git push'%s:"
8702msgstr[0] " 为 'git push' 配置的本地引用%s:"
8703msgstr[1] " 为 'git push' 配置的本地引用%s:"
8704
8705#: builtin/remote.c:1262
8706msgid "set refs/remotes/<name>/HEAD according to remote"
8707msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8708
8709#: builtin/remote.c:1264
8710msgid "delete refs/remotes/<name>/HEAD"
8711msgstr "删除 refs/remotes/<名称>/HEAD"
8712
8713#: builtin/remote.c:1279
8714msgid "Cannot determine remote HEAD"
8715msgstr "无法确定远程 HEAD"
8716
8717#: builtin/remote.c:1281
8718msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8719msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8720
8721#: builtin/remote.c:1291
8722#, c-format
8723msgid "Could not delete %s"
8724msgstr "无法删除 %s"
8725
8726#: builtin/remote.c:1299
8727#, c-format
8728msgid "Not a valid ref: %s"
8729msgstr "不是一个有效引用:%s"
8730
8731#: builtin/remote.c:1301
8732#, c-format
8733msgid "Could not setup %s"
8734msgstr "不能设置 %s"
8735
8736# 译者:注意保持前导空格
8737#: builtin/remote.c:1319
8738#, c-format
8739msgid " %s will become dangling!"
8740msgstr " %s 将成为摇摆状态!"
8741
8742# 译者:注意保持前导空格
8743#: builtin/remote.c:1320
8744#, c-format
8745msgid " %s has become dangling!"
8746msgstr " %s 已成为摇摆状态!"
8747
8748#: builtin/remote.c:1330
8749#, c-format
8750msgid "Pruning %s"
8751msgstr "修剪 %s"
8752
8753#: builtin/remote.c:1331
8754#, c-format
8755msgid "URL: %s"
8756msgstr "URL:%s"
8757
8758#: builtin/remote.c:1354
8759#, c-format
8760msgid " * [would prune] %s"
8761msgstr " * [将删除] %s"
8762
8763#: builtin/remote.c:1357
8764#, c-format
8765msgid " * [pruned] %s"
8766msgstr " * [已删除] %s"
8767
8768#: builtin/remote.c:1402
8769msgid "prune remotes after fetching"
8770msgstr "抓取后清除远程"
8771
8772#: builtin/remote.c:1468 builtin/remote.c:1542
8773#, c-format
8774msgid "No such remote '%s'"
8775msgstr "没有此远程 '%s'"
8776
8777#: builtin/remote.c:1488
8778msgid "add branch"
8779msgstr "添加分支"
8780
8781#: builtin/remote.c:1495
8782msgid "no remote specified"
8783msgstr "未指定远程"
8784
8785#: builtin/remote.c:1517
8786msgid "manipulate push URLs"
8787msgstr "操作推送 URLS"
8788
8789#: builtin/remote.c:1519
8790msgid "add URL"
8791msgstr "添加 URL"
8792
8793#: builtin/remote.c:1521
8794msgid "delete URLs"
8795msgstr "删除 URLS"
8796
8797#: builtin/remote.c:1528
8798msgid "--add --delete doesn't make sense"
8799msgstr "--add --delete 无意义"
8800
8801#: builtin/remote.c:1568
8802#, c-format
8803msgid "Invalid old URL pattern: %s"
8804msgstr "无效的旧URL匹配模版:%s"
8805
8806#: builtin/remote.c:1576
8807#, c-format
8808msgid "No such URL found: %s"
8809msgstr "未找到此URL:%s"
8810
8811#: builtin/remote.c:1578
8812msgid "Will not delete all non-push URLs"
8813msgstr "将不会删除所有非推送URL地址"
8814
8815#: builtin/remote.c:1592
8816msgid "be verbose; must be placed before a subcommand"
8817msgstr "冗长输出;必须置于子命令之前"
8818
8819#: builtin/repack.c:17
8820msgid "git repack [options]"
8821msgstr "git repack [选项]"
8822
8823#: builtin/repack.c:159
8824msgid "pack everything in a single pack"
8825msgstr "所有内容打包到一个包文件中"
8826
8827#: builtin/repack.c:161
8828msgid "same as -a, and turn unreachable objects loose"
8829msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8830
8831#: builtin/repack.c:164
8832msgid "remove redundant packs, and run git-prune-packed"
8833msgstr "删除多余的包,运行 git-prune-packed"
8834
8835#: builtin/repack.c:166
8836msgid "pass --no-reuse-delta to git-pack-objects"
8837msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8838
8839#: builtin/repack.c:168
8840msgid "pass --no-reuse-object to git-pack-objects"
8841msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8842
8843#: builtin/repack.c:170
8844msgid "do not run git-update-server-info"
8845msgstr "不运行 git-update-server-info"
8846
8847#: builtin/repack.c:173
8848msgid "pass --local to git-pack-objects"
8849msgstr "向 git-pack-objects 传递参数 --local"
8850
8851#: builtin/repack.c:175
8852msgid "write bitmap index"
8853msgstr "写 bitmap 索引"
8854
8855#: builtin/repack.c:176
8856msgid "approxidate"
8857msgstr "近似日期"
8858
8859#: builtin/repack.c:177
8860msgid "with -A, do not loosen objects older than this"
8861msgstr "使用 -A,不要将早于给定时间的对象过期"
8862
8863#: builtin/repack.c:179
8864msgid "size of the window used for delta compression"
8865msgstr "用于增量压缩的窗口值"
8866
8867#: builtin/repack.c:180 builtin/repack.c:184
8868msgid "bytes"
8869msgstr "字节"
8870
8871#: builtin/repack.c:181
8872msgid "same as the above, but limit memory size instead of entries count"
8873msgstr "和上面的相似,但限制内存大小而非条目数"
8874
8875#: builtin/repack.c:183
8876msgid "limits the maximum delta depth"
8877msgstr "限制最大增量深度"
8878
8879#: builtin/repack.c:185
8880msgid "maximum size of each packfile"
8881msgstr "每个包的最大尺寸"
8882
8883#: builtin/repack.c:187
8884msgid "repack objects in packs marked with .keep"
8885msgstr "对标记为 .keep 的包中的对象重新打包"
8886
8887#: builtin/repack.c:371
8888#, c-format
8889msgid "removing '%s' failed"
8890msgstr "删除 '%s' 失败"
8891
8892#: builtin/replace.c:19
8893msgid "git replace [-f] <object> <replacement>"
8894msgstr "git replace [-f] <对象> <替换物>"
8895
8896#: builtin/replace.c:20
8897msgid "git replace [-f] --edit <object>"
8898msgstr "git replace [-f] --edit <对象>"
8899
8900#: builtin/replace.c:21
8901msgid "git replace [-f] --graft <commit> [<parent>...]"
8902msgstr "git replace [-f] --graft <提交> [<父提交>...]"
8903
8904#: builtin/replace.c:22
8905msgid "git replace -d <object>..."
8906msgstr "git replace -d <对象>..."
8907
8908#: builtin/replace.c:23
8909msgid "git replace [--format=<format>] [-l [<pattern>]]"
8910msgstr "git replace [--format=<格式>] [-l [<模式>]]"
8911
8912#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
8913#, c-format
8914msgid "Not a valid object name: '%s'"
8915msgstr "不是一个有效的对象名:'%s'"
8916
8917#: builtin/replace.c:355
8918#, c-format
8919msgid "bad mergetag in commit '%s'"
8920msgstr "提交 '%s' 中损坏的 mergetag"
8921
8922#: builtin/replace.c:357
8923#, c-format
8924msgid "malformed mergetag in commit '%s'"
8925msgstr "提交 '%s' 中非法的 mergetag"
8926
8927#: builtin/replace.c:368
8928#, c-format
8929msgid ""
8930"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
8931"instead of --graft"
8932msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft"
8933
8934#: builtin/replace.c:401
8935#, c-format
8936msgid "the original commit '%s' has a gpg signature."
8937msgstr "原始提交 '%s' 中包含一个 GPG 签名"
8938
8939#: builtin/replace.c:402
8940msgid "the signature will be removed in the replacement commit!"
8941msgstr "在替换的提交中签名将被移除!"
8942
8943#: builtin/replace.c:408
8944#, c-format
8945msgid "could not write replacement commit for: '%s'"
8946msgstr "不能为 '%s' 写替换提交"
8947
8948#: builtin/replace.c:432
8949msgid "list replace refs"
8950msgstr "列出替换的引用"
8951
8952#: builtin/replace.c:433
8953msgid "delete replace refs"
8954msgstr "删除替换的引用"
8955
8956#: builtin/replace.c:434
8957msgid "edit existing object"
8958msgstr "编辑现存的对象"
8959
8960#: builtin/replace.c:435
8961msgid "change a commit's parents"
8962msgstr "修改一个提交的父提交"
8963
8964#: builtin/replace.c:436
8965msgid "replace the ref if it exists"
8966msgstr "如果存在则替换引用"
8967
8968#: builtin/replace.c:437
8969msgid "do not pretty-print contents for --edit"
8970msgstr "不要为 --edit 操作美观显示内容"
8971
8972#: builtin/replace.c:438
8973msgid "use this format"
8974msgstr "使用此格式"
8975
8976#: builtin/rerere.c:12
8977msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
8978msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
8979
8980#: builtin/rerere.c:57
8981msgid "register clean resolutions in index"
8982msgstr "在索引中注册干净的解决方案"
8983
8984#: builtin/reset.c:26
8985msgid ""
8986"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8987msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
8988
8989#: builtin/reset.c:27
8990msgid "git reset [-q] <tree-ish> [--] <paths>..."
8991msgstr "git reset [-q] <树或提交> [--] <路径>..."
8992
8993#: builtin/reset.c:28
8994msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8995msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
8996
8997#: builtin/reset.c:34
8998msgid "mixed"
8999msgstr "混杂"
9000
9001#: builtin/reset.c:34
9002msgid "soft"
9003msgstr "软性"
9004
9005#: builtin/reset.c:34
9006msgid "hard"
9007msgstr "硬性"
9008
9009#: builtin/reset.c:34
9010msgid "merge"
9011msgstr "合并"
9012
9013#: builtin/reset.c:34
9014msgid "keep"
9015msgstr "保持"
9016
9017#: builtin/reset.c:74
9018msgid "You do not have a valid HEAD."
9019msgstr "您没有一个有效的 HEAD。"
9020
9021#: builtin/reset.c:76
9022msgid "Failed to find tree of HEAD."
9023msgstr "无法找到 HEAD 指向的树。"
9024
9025#: builtin/reset.c:82
9026#, c-format
9027msgid "Failed to find tree of %s."
9028msgstr "无法找到 %s 指向的树。"
9029
9030#: builtin/reset.c:100
9031#, c-format
9032msgid "HEAD is now at %s"
9033msgstr "HEAD 现在位于 %s"
9034
9035# 译者:汉字之间无空格,故删除%s前后空格
9036#: builtin/reset.c:183
9037#, c-format
9038msgid "Cannot do a %s reset in the middle of a merge."
9039msgstr "在合并过程中不能做%s重置操作。"
9040
9041#: builtin/reset.c:276
9042msgid "be quiet, only report errors"
9043msgstr "安静模式,只报告错误"
9044
9045#: builtin/reset.c:278
9046msgid "reset HEAD and index"
9047msgstr "重置 HEAD 和索引"
9048
9049#: builtin/reset.c:279
9050msgid "reset only HEAD"
9051msgstr "只重置 HEAD"
9052
9053#: builtin/reset.c:281 builtin/reset.c:283
9054msgid "reset HEAD, index and working tree"
9055msgstr "重置 HEAD、索引和工作区"
9056
9057#: builtin/reset.c:285
9058msgid "reset HEAD but keep local changes"
9059msgstr "重置 HEAD 但保存本地变更"
9060
9061#: builtin/reset.c:288
9062msgid "record only the fact that removed paths will be added later"
9063msgstr "将删除的路径标记为稍后添加"
9064
9065#: builtin/reset.c:305
9066#, c-format
9067msgid "Failed to resolve '%s' as a valid revision."
9068msgstr "无法将 '%s' 解析为一个有效的版本。"
9069
9070#: builtin/reset.c:308 builtin/reset.c:316
9071#, c-format
9072msgid "Could not parse object '%s'."
9073msgstr "不能解析对象 '%s'。"
9074
9075#: builtin/reset.c:313
9076#, c-format
9077msgid "Failed to resolve '%s' as a valid tree."
9078msgstr "无法将 '%s' 解析为一个有效的树对象。"
9079
9080#: builtin/reset.c:322
9081msgid "--patch is incompatible with --{hard,mixed,soft}"
9082msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9083
9084#: builtin/reset.c:331
9085msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9086msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
9087
9088# 译者:汉字之间无空格,故删除%s前后空格
9089#: builtin/reset.c:333
9090#, c-format
9091msgid "Cannot do %s reset with paths."
9092msgstr "不能带路径进行%s重置。"
9093
9094# 译者:汉字之间无空格,故删除%s前后空格
9095#: builtin/reset.c:343
9096#, c-format
9097msgid "%s reset is not allowed in a bare repository"
9098msgstr "不能对纯版本库进行%s重置"
9099
9100#: builtin/reset.c:347
9101msgid "-N can only be used with --mixed"
9102msgstr "-N 只能和 --mixed 同时使用"
9103
9104#: builtin/reset.c:364
9105msgid "Unstaged changes after reset:"
9106msgstr "重置后撤出暂存区的变更:"
9107
9108#: builtin/reset.c:370
9109#, c-format
9110msgid "Could not reset index file to revision '%s'."
9111msgstr "不能重置索引文件至版本 '%s'。"
9112
9113#: builtin/reset.c:374
9114msgid "Could not write new index file."
9115msgstr "不能写入新的索引文件。"
9116
9117#: builtin/rev-parse.c:361
9118msgid "git rev-parse --parseopt [options] -- [<args>...]"
9119msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
9120
9121#: builtin/rev-parse.c:366
9122msgid "keep the `--` passed as an arg"
9123msgstr "保持 `--` 作为一个参数传递"
9124
9125#: builtin/rev-parse.c:368
9126msgid "stop parsing after the first non-option argument"
9127msgstr "遇到第一个非选项参数后停止解析"
9128
9129#: builtin/rev-parse.c:371
9130msgid "output in stuck long form"
9131msgstr "以固定长格式输出"
9132
9133#: builtin/rev-parse.c:499
9134msgid ""
9135"git rev-parse --parseopt [options] -- [<args>...]\n"
9136" or: git rev-parse --sq-quote [<arg>...]\n"
9137" or: git rev-parse [options] [<arg>...]\n"
9138"\n"
9139"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9140msgstr ""
9141"git rev-parse --parseopt [选项] -- [<参数>...]\n"
9142" 或者:git rev-parse --sq-quote [<参数>...]\n"
9143" 或者:git rev-parse [选项] [<参数>...]\n"
9144"\n"
9145"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
9146
9147#: builtin/revert.c:22
9148msgid "git revert [options] <commit-ish>..."
9149msgstr "git revert [选项] <提交号>..."
9150
9151#: builtin/revert.c:23
9152msgid "git revert <subcommand>"
9153msgstr "git revert <子命令>"
9154
9155#: builtin/revert.c:28
9156msgid "git cherry-pick [options] <commit-ish>..."
9157msgstr "git cherry-pick [选项] <提交号>..."
9158
9159#: builtin/revert.c:29
9160msgid "git cherry-pick <subcommand>"
9161msgstr "git cherry-pick <子命令>"
9162
9163#: builtin/revert.c:71
9164#, c-format
9165msgid "%s: %s cannot be used with %s"
9166msgstr "%s:%s 不能和 %s 同时使用"
9167
9168#: builtin/revert.c:80
9169msgid "end revert or cherry-pick sequence"
9170msgstr "终止反转或拣选操作"
9171
9172#: builtin/revert.c:81
9173msgid "resume revert or cherry-pick sequence"
9174msgstr "继续反转或拣选操作"
9175
9176#: builtin/revert.c:82
9177msgid "cancel revert or cherry-pick sequence"
9178msgstr "取消反转或拣选操作"
9179
9180#: builtin/revert.c:83
9181msgid "don't automatically commit"
9182msgstr "不要自动提交"
9183
9184#: builtin/revert.c:84
9185msgid "edit the commit message"
9186msgstr "编辑提交说明"
9187
9188#: builtin/revert.c:87
9189msgid "parent number"
9190msgstr "父编号"
9191
9192#: builtin/revert.c:89
9193msgid "merge strategy"
9194msgstr "合并策略"
9195
9196#: builtin/revert.c:90
9197msgid "option"
9198msgstr "选项"
9199
9200#: builtin/revert.c:91
9201msgid "option for merge strategy"
9202msgstr "合并策略的选项"
9203
9204#: builtin/revert.c:104
9205msgid "append commit name"
9206msgstr "追加提交名称"
9207
9208#: builtin/revert.c:105
9209msgid "allow fast-forward"
9210msgstr "允许快进式"
9211
9212#: builtin/revert.c:106
9213msgid "preserve initially empty commits"
9214msgstr "保留初始化的空提交"
9215
9216#: builtin/revert.c:107
9217msgid "allow commits with empty messages"
9218msgstr "允许提交说明为空"
9219
9220#: builtin/revert.c:108
9221msgid "keep redundant, empty commits"
9222msgstr "保持多余的、空的提交"
9223
9224#: builtin/revert.c:112
9225msgid "program error"
9226msgstr "程序错误"
9227
9228#: builtin/revert.c:197
9229msgid "revert failed"
9230msgstr "还原失败"
9231
9232#: builtin/revert.c:212
9233msgid "cherry-pick failed"
9234msgstr "拣选失败"
9235
9236#: builtin/rm.c:17
9237msgid "git rm [options] [--] <file>..."
9238msgstr "git rm [选项] [--] <文件>..."
9239
9240#: builtin/rm.c:65
9241msgid ""
9242"the following submodule (or one of its nested submodules)\n"
9243"uses a .git directory:"
9244msgid_plural ""
9245"the following submodules (or one of their nested submodules)\n"
9246"use a .git directory:"
9247msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9248msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9249
9250#: builtin/rm.c:71
9251msgid ""
9252"\n"
9253"(use 'rm -rf' if you really want to remove it including all of its history)"
9254msgstr ""
9255"\n"
9256"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9257
9258#: builtin/rm.c:231
9259msgid ""
9260"the following file has staged content different from both the\n"
9261"file and the HEAD:"
9262msgid_plural ""
9263"the following files have staged content different from both the\n"
9264"file and the HEAD:"
9265msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9266msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9267
9268#: builtin/rm.c:236
9269msgid ""
9270"\n"
9271"(use -f to force removal)"
9272msgstr ""
9273"\n"
9274"(使用 -f 强制删除)"
9275
9276#: builtin/rm.c:240
9277msgid "the following file has changes staged in the index:"
9278msgid_plural "the following files have changes staged in the index:"
9279msgstr[0] "如下文件相对索引区的内容有修改"
9280msgstr[1] "如下文件相对索引区的内容有修改"
9281
9282#: builtin/rm.c:244 builtin/rm.c:255
9283msgid ""
9284"\n"
9285"(use --cached to keep the file, or -f to force removal)"
9286msgstr ""
9287"\n"
9288"(使用 --cached 保留本地文件,或用 -f 强制删除)"
9289
9290#: builtin/rm.c:252
9291msgid "the following file has local modifications:"
9292msgid_plural "the following files have local modifications:"
9293msgstr[0] "如下文件有本地修改:"
9294msgstr[1] "如下文件有本地修改:"
9295
9296#: builtin/rm.c:270
9297msgid "do not list removed files"
9298msgstr "不列出删除的文件"
9299
9300#: builtin/rm.c:271
9301msgid "only remove from the index"
9302msgstr "只从索引区删除"
9303
9304#: builtin/rm.c:272
9305msgid "override the up-to-date check"
9306msgstr "忽略文件更新状态检查"
9307
9308#: builtin/rm.c:273
9309msgid "allow recursive removal"
9310msgstr "允许递归删除"
9311
9312#: builtin/rm.c:275
9313msgid "exit with a zero status even if nothing matched"
9314msgstr "即使没有匹配,也以零状态退出"
9315
9316#: builtin/rm.c:318
9317msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9318msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9319
9320#: builtin/rm.c:336
9321#, c-format
9322msgid "not removing '%s' recursively without -r"
9323msgstr "未提供 -r 选项不会递归删除 '%s'"
9324
9325#: builtin/rm.c:375
9326#, c-format
9327msgid "git rm: unable to remove %s"
9328msgstr "git rm:不能删除 %s"
9329
9330#: builtin/shortlog.c:13
9331msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
9332msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9333
9334#: builtin/shortlog.c:131
9335#, c-format
9336msgid "Missing author: %s"
9337msgstr "缺少作者:%s"
9338
9339#: builtin/shortlog.c:230
9340msgid "sort output according to the number of commits per author"
9341msgstr "根据每个作者的提交数量排序"
9342
9343#: builtin/shortlog.c:232
9344msgid "Suppress commit descriptions, only provides commit count"
9345msgstr "隐藏提交说明,只提供提交数量"
9346
9347#: builtin/shortlog.c:234
9348msgid "Show the email address of each author"
9349msgstr "显示每个作者的电子邮件地址"
9350
9351#: builtin/shortlog.c:235
9352msgid "w[,i1[,i2]]"
9353msgstr "w[,i1[,i2]]"
9354
9355#: builtin/shortlog.c:236
9356msgid "Linewrap output"
9357msgstr "折行输出"
9358
9359#: builtin/show-branch.c:9
9360msgid ""
9361"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9362"\t\t [--current] [--color[=<when>] | --no-color] [--sparse]\n"
9363"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9364"\t [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9365msgstr ""
9366"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9367"\t\t [--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9368"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9369"\t [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
9370
9371#: builtin/show-branch.c:13
9372msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9373msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<引用>]"
9374
9375#: builtin/show-branch.c:652
9376msgid "show remote-tracking and local branches"
9377msgstr "显示远程跟踪的和本地的分支"
9378
9379#: builtin/show-branch.c:654
9380msgid "show remote-tracking branches"
9381msgstr "显示远程跟踪的分支"
9382
9383#: builtin/show-branch.c:656
9384msgid "color '*!+-' corresponding to the branch"
9385msgstr "着色 '*!+-' 到相应的分支"
9386
9387#: builtin/show-branch.c:658
9388msgid "show <n> more commits after the common ancestor"
9389msgstr "显示共同祖先后的 <n> 个提交"
9390
9391#: builtin/show-branch.c:660
9392msgid "synonym to more=-1"
9393msgstr "和 more=-1 同义"
9394
9395#: builtin/show-branch.c:661
9396msgid "suppress naming strings"
9397msgstr "不显示字符串命名"
9398
9399#: builtin/show-branch.c:663
9400msgid "include the current branch"
9401msgstr "包括当前分支"
9402
9403#: builtin/show-branch.c:665
9404msgid "name commits with their object names"
9405msgstr "以对象名字命名提交"
9406
9407#: builtin/show-branch.c:667
9408msgid "show possible merge bases"
9409msgstr "显示可能合并的基线"
9410
9411#: builtin/show-branch.c:669
9412msgid "show refs unreachable from any other ref"
9413msgstr "显示没有任何引用的的引用"
9414
9415#: builtin/show-branch.c:671
9416msgid "show commits in topological order"
9417msgstr "以拓扑顺序显示提交"
9418
9419#: builtin/show-branch.c:674
9420msgid "show only commits not on the first branch"
9421msgstr "只显示不在第一个分支上的提交"
9422
9423#: builtin/show-branch.c:676
9424msgid "show merges reachable from only one tip"
9425msgstr "显示仅一个分支可访问的合并提交"
9426
9427#: builtin/show-branch.c:678
9428msgid "topologically sort, maintaining date order where possible"
9429msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9430
9431#: builtin/show-branch.c:681
9432msgid "<n>[,<base>]"
9433msgstr "<n>[,<base>]"
9434
9435#: builtin/show-branch.c:682
9436msgid "show <n> most recent ref-log entries starting at base"
9437msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9438
9439#: builtin/show-ref.c:10
9440msgid ""
9441"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9442"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9443msgstr ""
9444"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9445"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9446
9447#: builtin/show-ref.c:11
9448msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9449msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9450
9451#: builtin/show-ref.c:168
9452msgid "only show tags (can be combined with heads)"
9453msgstr "只显示 tags(可以和头共用)"
9454
9455#: builtin/show-ref.c:169
9456msgid "only show heads (can be combined with tags)"
9457msgstr "只显示头(可以和 tags 共用)"
9458
9459#: builtin/show-ref.c:170
9460msgid "stricter reference checking, requires exact ref path"
9461msgstr "更严格的引用检测,需要精确的引用路径"
9462
9463#: builtin/show-ref.c:173 builtin/show-ref.c:175
9464msgid "show the HEAD reference, even if it would be filtered out"
9465msgstr "显示 HEAD 引用,即使被过滤掉"
9466
9467#: builtin/show-ref.c:177
9468msgid "dereference tags into object IDs"
9469msgstr "转换 tags 到对象ID"
9470
9471#: builtin/show-ref.c:179
9472msgid "only show SHA1 hash using <n> digits"
9473msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9474
9475#: builtin/show-ref.c:183
9476msgid "do not print results to stdout (useful with --verify)"
9477msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9478
9479#: builtin/show-ref.c:185
9480msgid "show refs from stdin that aren't in local repository"
9481msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9482
9483#: builtin/symbolic-ref.c:7
9484msgid "git symbolic-ref [options] name [ref]"
9485msgstr "git symbolic-ref [选项] 名称 [引用]"
9486
9487#: builtin/symbolic-ref.c:8
9488msgid "git symbolic-ref -d [-q] name"
9489msgstr "git symbolic-ref -d [-q] 名称"
9490
9491#: builtin/symbolic-ref.c:40
9492msgid "suppress error message for non-symbolic (detached) refs"
9493msgstr "不显示非符号(分离的)引用的错误信息"
9494
9495#: builtin/symbolic-ref.c:41
9496msgid "delete symbolic ref"
9497msgstr "删除符号引用"
9498
9499#: builtin/symbolic-ref.c:42
9500msgid "shorten ref output"
9501msgstr "简短的引用输出"
9502
9503#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9504msgid "reason"
9505msgstr "原因"
9506
9507#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9508msgid "reason of the update"
9509msgstr "更新的原因"
9510
9511#: builtin/tag.c:22
9512msgid ""
9513"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
9514msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
9515
9516#: builtin/tag.c:23
9517msgid "git tag -d <tagname>..."
9518msgstr "git tag -d <标签名>..."
9519
9520#: builtin/tag.c:24
9521msgid ""
9522"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9523"\t\t[<pattern>...]"
9524msgstr ""
9525"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] \n"
9526"\t\t[<模式>...]"
9527
9528#: builtin/tag.c:26
9529msgid "git tag -v <tagname>..."
9530msgstr "git tag -v <标签名>..."
9531
9532#: builtin/tag.c:69
9533#, c-format
9534msgid "malformed object at '%s'"
9535msgstr "非法的对象于 '%s'"
9536
9537#: builtin/tag.c:301
9538#, c-format
9539msgid "tag name too long: %.*s..."
9540msgstr "tag 名字太长:%.*s..."
9541
9542#: builtin/tag.c:306
9543#, c-format
9544msgid "tag '%s' not found."
9545msgstr "tag '%s' 未发现。"
9546
9547#: builtin/tag.c:321
9548#, c-format
9549msgid "Deleted tag '%s' (was %s)\n"
9550msgstr "已删除 tag '%s'(曾为 %s)\n"
9551
9552#: builtin/tag.c:333
9553#, c-format
9554msgid "could not verify the tag '%s'"
9555msgstr "不能校验 tag '%s'"
9556
9557#: builtin/tag.c:343
9558#, c-format
9559msgid ""
9560"\n"
9561"Write a message for tag:\n"
9562" %s\n"
9563"Lines starting with '%c' will be ignored.\n"
9564msgstr ""
9565"\n"
9566"输入一个 tag 说明:\n"
9567" %s\n"
9568"以 '%c' 开头的行将被忽略。\n"
9569
9570#: builtin/tag.c:347
9571#, c-format
9572msgid ""
9573"\n"
9574"Write a message for tag:\n"
9575" %s\n"
9576"Lines starting with '%c' will be kept; you may remove them yourself if you "
9577"want to.\n"
9578msgstr ""
9579"\n"
9580"输入一个 tag 说明:\n"
9581" %s\n"
9582"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9583
9584#: builtin/tag.c:371
9585#, c-format
9586msgid "unsupported sort specification '%s'"
9587msgstr "不支持的排序规格 '%s'"
9588
9589#: builtin/tag.c:373
9590#, c-format
9591msgid "unsupported sort specification '%s' in variable '%s'"
9592msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9593
9594#: builtin/tag.c:428
9595msgid "unable to sign the tag"
9596msgstr "无法签署 tag"
9597
9598#: builtin/tag.c:430
9599msgid "unable to write tag file"
9600msgstr "无法写 tag 文件"
9601
9602#: builtin/tag.c:455
9603msgid "bad object type."
9604msgstr "坏的对象类型。"
9605
9606#: builtin/tag.c:468
9607msgid "tag header too big."
9608msgstr "tag 头信息太大。"
9609
9610#: builtin/tag.c:504
9611msgid "no tag message?"
9612msgstr "无 tag 说明?"
9613
9614#: builtin/tag.c:510
9615#, c-format
9616msgid "The tag message has been left in %s\n"
9617msgstr "tag 说明被保留在 %s\n"
9618
9619#: builtin/tag.c:559
9620msgid "switch 'points-at' requires an object"
9621msgstr "开关 'points-at' 需要一个对象"
9622
9623#: builtin/tag.c:561
9624#, c-format
9625msgid "malformed object name '%s'"
9626msgstr "非法的对象名 '%s'"
9627
9628#: builtin/tag.c:589
9629msgid "list tag names"
9630msgstr "列出tag名称"
9631
9632#: builtin/tag.c:591
9633msgid "print <n> lines of each tag message"
9634msgstr "每个 tag 信息打印 <n> 行"
9635
9636#: builtin/tag.c:593
9637msgid "delete tags"
9638msgstr "删除 tags"
9639
9640#: builtin/tag.c:594
9641msgid "verify tags"
9642msgstr "验证 tags"
9643
9644#: builtin/tag.c:596
9645msgid "Tag creation options"
9646msgstr "Tag 创建选项"
9647
9648#: builtin/tag.c:598
9649msgid "annotated tag, needs a message"
9650msgstr "注解 tag,需要一个说明"
9651
9652#: builtin/tag.c:600
9653msgid "tag message"
9654msgstr "tag 说明"
9655
9656#: builtin/tag.c:602
9657msgid "annotated and GPG-signed tag"
9658msgstr "注解并 GPG 签名的 tag"
9659
9660#: builtin/tag.c:606
9661msgid "use another key to sign the tag"
9662msgstr "使用另外的私钥签名 tag"
9663
9664#: builtin/tag.c:607
9665msgid "replace the tag if exists"
9666msgstr "如果存在,替换现有的 tag"
9667
9668#: builtin/tag.c:608
9669msgid "show tag list in columns"
9670msgstr "以列的方式显示 tag"
9671
9672#: builtin/tag.c:610
9673msgid "sort tags"
9674msgstr "排序 tags"
9675
9676#: builtin/tag.c:614
9677msgid "Tag listing options"
9678msgstr "Tag 列表选项"
9679
9680#: builtin/tag.c:617 builtin/tag.c:623
9681msgid "print only tags that contain the commit"
9682msgstr "只打印包含提交的tags"
9683
9684#: builtin/tag.c:629
9685msgid "print only tags of the object"
9686msgstr "只打印tags对象"
9687
9688#: builtin/tag.c:655
9689msgid "--column and -n are incompatible"
9690msgstr "--column 和 -n 不兼容"
9691
9692#: builtin/tag.c:667
9693msgid "--sort and -n are incompatible"
9694msgstr "--sort 和 -n 不兼容"
9695
9696#: builtin/tag.c:674
9697msgid "-n option is only allowed with -l."
9698msgstr "-n 选项只允许和 -l 同时使用。"
9699
9700#: builtin/tag.c:676
9701msgid "--contains option is only allowed with -l."
9702msgstr "--contains 选项只允许和 -l 同时使用。"
9703
9704#: builtin/tag.c:678
9705msgid "--points-at option is only allowed with -l."
9706msgstr "--points-at 选项只允许和 -l 同时使用。"
9707
9708#: builtin/tag.c:686
9709msgid "only one -F or -m option is allowed."
9710msgstr "只允许一个 -F 或 -m 选项。"
9711
9712#: builtin/tag.c:706
9713msgid "too many params"
9714msgstr "太多参数"
9715
9716#: builtin/tag.c:712
9717#, c-format
9718msgid "'%s' is not a valid tag name."
9719msgstr "'%s' 不是一个有效的tag名称。"
9720
9721#: builtin/tag.c:717
9722#, c-format
9723msgid "tag '%s' already exists"
9724msgstr "tag '%s' 已存在"
9725
9726#: builtin/tag.c:741
9727#, c-format
9728msgid "Updated tag '%s' (was %s)\n"
9729msgstr "已更新tag '%s'(曾为 %s)\n"
9730
9731#: builtin/unpack-objects.c:489
9732msgid "Unpacking objects"
9733msgstr "展开对象中"
9734
9735#: builtin/update-index.c:403
9736msgid "git update-index [options] [--] [<file>...]"
9737msgstr "git update-index [选项] [--] [<文件>...]"
9738
9739#: builtin/update-index.c:756
9740msgid "continue refresh even when index needs update"
9741msgstr "当索引需要更新时继续刷新"
9742
9743#: builtin/update-index.c:759
9744msgid "refresh: ignore submodules"
9745msgstr "刷新:忽略子模组"
9746
9747#: builtin/update-index.c:762
9748msgid "do not ignore new files"
9749msgstr "不忽略新的文件"
9750
9751#: builtin/update-index.c:764
9752msgid "let files replace directories and vice-versa"
9753msgstr "让文件替换目录(反之亦然)"
9754
9755#: builtin/update-index.c:766
9756msgid "notice files missing from worktree"
9757msgstr "通知文件从工作区丢失"
9758
9759#: builtin/update-index.c:768
9760msgid "refresh even if index contains unmerged entries"
9761msgstr "即使索引区包含未合并的条目也执行刷新"
9762
9763#: builtin/update-index.c:771
9764msgid "refresh stat information"
9765msgstr "刷新统计信息"
9766
9767#: builtin/update-index.c:775
9768msgid "like --refresh, but ignore assume-unchanged setting"
9769msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
9770
9771#: builtin/update-index.c:779
9772msgid "<mode>,<object>,<path>"
9773msgstr "<存取模式>,<对象>,<路径>"
9774
9775#: builtin/update-index.c:780
9776msgid "add the specified entry to the index"
9777msgstr "添加指定的条目到索引区"
9778
9779#: builtin/update-index.c:784
9780msgid "(+/-)x"
9781msgstr "(+/-)x"
9782
9783#: builtin/update-index.c:785
9784msgid "override the executable bit of the listed files"
9785msgstr "覆盖列表里文件的可执行位"
9786
9787#: builtin/update-index.c:789
9788msgid "mark files as \"not changing\""
9789msgstr "把文件标记为 \"没有变更\""
9790
9791#: builtin/update-index.c:792
9792msgid "clear assumed-unchanged bit"
9793msgstr "清除 assumed-unchanged 位"
9794
9795#: builtin/update-index.c:795
9796msgid "mark files as \"index-only\""
9797msgstr "把文件标记为 \"仅索引\""
9798
9799#: builtin/update-index.c:798
9800msgid "clear skip-worktree bit"
9801msgstr "清除 skip-worktree 位"
9802
9803#: builtin/update-index.c:801
9804msgid "add to index only; do not add content to object database"
9805msgstr "只添加到索引区;不添加对象到对象库"
9806
9807#: builtin/update-index.c:803
9808msgid "remove named paths even if present in worktree"
9809msgstr "即使存在工作区里,也删除路径"
9810
9811#: builtin/update-index.c:805
9812msgid "with --stdin: input lines are terminated by null bytes"
9813msgstr "携带 --stdin:输入的行以 null 字符终止"
9814
9815#: builtin/update-index.c:807
9816msgid "read list of paths to be updated from standard input"
9817msgstr "从标准输入中读取需要更新的路径列表"
9818
9819#: builtin/update-index.c:811
9820msgid "add entries from standard input to the index"
9821msgstr "从标准输入添加条目到索引区"
9822
9823#: builtin/update-index.c:815
9824msgid "repopulate stages #2 and #3 for the listed paths"
9825msgstr "为指定文件重新生成第2和第3暂存区"
9826
9827#: builtin/update-index.c:819
9828msgid "only update entries that differ from HEAD"
9829msgstr "只更新与 HEAD 不同的条目"
9830
9831#: builtin/update-index.c:823
9832msgid "ignore files missing from worktree"
9833msgstr "忽略工作区丢失的文件"
9834
9835#: builtin/update-index.c:826
9836msgid "report actions to standard output"
9837msgstr "在标准输出显示操作"
9838
9839#: builtin/update-index.c:828
9840msgid "(for porcelains) forget saved unresolved conflicts"
9841msgstr "(for porcelains) 忘记保存的未解决的冲突"
9842
9843#: builtin/update-index.c:832
9844msgid "write index in this format"
9845msgstr "以这种格式写入索引区"
9846
9847#: builtin/update-index.c:834
9848msgid "enable or disable split index"
9849msgstr "启用或禁用索引拆分"
9850
9851#: builtin/update-ref.c:9
9852msgid "git update-ref [options] -d <refname> [<oldval>]"
9853msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
9854
9855#: builtin/update-ref.c:10
9856msgid "git update-ref [options] <refname> <newval> [<oldval>]"
9857msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"
9858
9859#: builtin/update-ref.c:11
9860msgid "git update-ref [options] --stdin [-z]"
9861msgstr "git update-ref [选项] --stdin [-z]"
9862
9863#: builtin/update-ref.c:359
9864msgid "delete the reference"
9865msgstr "删除引用"
9866
9867#: builtin/update-ref.c:361
9868msgid "update <refname> not the one it points to"
9869msgstr "更新 <引用名> 本身而不是它指向的引用"
9870
9871#: builtin/update-ref.c:362
9872msgid "stdin has NUL-terminated arguments"
9873msgstr "标准输入有以 NUL 字符终止的参数"
9874
9875#: builtin/update-ref.c:363
9876msgid "read updates from stdin"
9877msgstr "从标准输入读取更新"
9878
9879#: builtin/update-server-info.c:6
9880msgid "git update-server-info [--force]"
9881msgstr "git update-server-info [--force]"
9882
9883#: builtin/update-server-info.c:14
9884msgid "update the info files from scratch"
9885msgstr "从头开始更新文件信息"
9886
9887#: builtin/verify-commit.c:17
9888msgid "git verify-commit [-v|--verbose] <commit>..."
9889msgstr "git verify-commit [-v|--verbose] <提交>..."
9890
9891#: builtin/verify-commit.c:75
9892msgid "print commit contents"
9893msgstr "打印提交内容"
9894
9895#: builtin/verify-pack.c:54
9896msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9897msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <包>..."
9898
9899#: builtin/verify-pack.c:64
9900msgid "verbose"
9901msgstr "冗长输出"
9902
9903#: builtin/verify-pack.c:66
9904msgid "show statistics only"
9905msgstr "只显示统计"
9906
9907#: builtin/verify-tag.c:17
9908msgid "git verify-tag [-v|--verbose] <tag>..."
9909msgstr "git verify-tag [-v|--verbose] <标签>..."
9910
9911#: builtin/verify-tag.c:73
9912msgid "print tag contents"
9913msgstr "打印 tag 内容"
9914
9915#: builtin/write-tree.c:13
9916msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9917msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
9918
9919#: builtin/write-tree.c:26
9920msgid "<prefix>/"
9921msgstr "<前缀>/"
9922
9923#: builtin/write-tree.c:27
9924msgid "write tree object for a subdirectory <prefix>"
9925msgstr "将 <前缀> 子目录内容写到一个树对象"
9926
9927#: builtin/write-tree.c:30
9928msgid "only useful for debugging"
9929msgstr "只对调试有用"
9930
9931#: credential-cache--daemon.c:267
9932msgid "print debugging messages to stderr"
9933msgstr "调试信息输出到标准错误"
9934
9935#: git.c:14
9936msgid ""
9937"'git help -a' and 'git help -g' list available subcommands and some\n"
9938"concept guides. See 'git help <command>' or 'git help <concept>'\n"
9939"to read about a specific subcommand or concept."
9940msgstr ""
9941"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
9942"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
9943"帮助。"
9944
9945#: common-cmds.h:8
9946msgid "Add file contents to the index"
9947msgstr "添加文件内容至索引"
9948
9949#: common-cmds.h:9
9950msgid "Find by binary search the change that introduced a bug"
9951msgstr "通过二分查找定位引入 bug 的变更"
9952
9953#: common-cmds.h:10
9954msgid "List, create, or delete branches"
9955msgstr "列出、创建或删除分支"
9956
9957#: common-cmds.h:11
9958msgid "Checkout a branch or paths to the working tree"
9959msgstr "检出一个分支或路径到工作区"
9960
9961#: common-cmds.h:12
9962msgid "Clone a repository into a new directory"
9963msgstr "克隆一个版本库到一个新目录"
9964
9965#: common-cmds.h:13
9966msgid "Record changes to the repository"
9967msgstr "记录变更到版本库"
9968
9969#: common-cmds.h:14
9970msgid "Show changes between commits, commit and working tree, etc"
9971msgstr "显示提交之间、提交和工作区之间等的差异"
9972
9973#: common-cmds.h:15
9974msgid "Download objects and refs from another repository"
9975msgstr "从另外一个版本库下载对象和引用"
9976
9977#: common-cmds.h:16
9978msgid "Print lines matching a pattern"
9979msgstr "输出和模式匹配的行"
9980
9981#: common-cmds.h:17
9982msgid "Create an empty Git repository or reinitialize an existing one"
9983msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
9984
9985#: common-cmds.h:18
9986msgid "Show commit logs"
9987msgstr "显示提交日志"
9988
9989#: common-cmds.h:19
9990msgid "Join two or more development histories together"
9991msgstr "合并两个或更多开发历史"
9992
9993#: common-cmds.h:20
9994msgid "Move or rename a file, a directory, or a symlink"
9995msgstr "移动或重命名一个文件、目录或符号链接"
9996
9997#: common-cmds.h:21
9998msgid "Fetch from and integrate with another repository or a local branch"
9999msgstr "获取并整合另外的版本库或一个本地分支"
10000
10001#: common-cmds.h:22
10002msgid "Update remote refs along with associated objects"
10003msgstr "更新远程引用和相关的对象"
10004
10005#: common-cmds.h:23
10006msgid "Forward-port local commits to the updated upstream head"
10007msgstr "本地提交转移至更新后的上游分支中"
10008
10009#: common-cmds.h:24
10010msgid "Reset current HEAD to the specified state"
10011msgstr "重置当前HEAD到指定状态"
10012
10013#: common-cmds.h:25
10014msgid "Remove files from the working tree and from the index"
10015msgstr "从工作区和索引中删除文件"
10016
10017#: common-cmds.h:26
10018msgid "Show various types of objects"
10019msgstr "显示各种类型的对象"
10020
10021#: common-cmds.h:27
10022msgid "Show the working tree status"
10023msgstr "显示工作区状态"
10024
10025#: common-cmds.h:28
10026msgid "Create, list, delete or verify a tag object signed with GPG"
10027msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
10028
10029#: parse-options.h:143
10030msgid "expiry-date"
10031msgstr "到期时间"
10032
10033#: parse-options.h:158
10034msgid "no-op (backward compatibility)"
10035msgstr "空操作(向后兼容)"
10036
10037#: parse-options.h:232
10038msgid "be more verbose"
10039msgstr "更加详细"
10040
10041#: parse-options.h:234
10042msgid "be more quiet"
10043msgstr "更加安静"
10044
10045#: parse-options.h:240
10046msgid "use <n> digits to display SHA-1s"
10047msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10048
10049#: rerere.h:27
10050msgid "update the index with reused conflict resolution if possible"
10051msgstr "如果可能,重用冲突解决更新索引"
10052
10053#: git-am.sh:53
10054msgid "You need to set your committer info first"
10055msgstr "您需要先设置你的提交者信息"
10056
10057#: git-am.sh:98
10058msgid ""
10059"You seem to have moved HEAD since the last 'am' failure.\n"
10060"Not rewinding to ORIG_HEAD"
10061msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
10062
10063#: git-am.sh:108
10064#, sh-format
10065msgid ""
10066"When you have resolved this problem, run \"$cmdline --continue\".\n"
10067"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10068"To restore the original branch and stop patching, run \"$cmdline --abort\"."
10069msgstr ""
10070"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
10071"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10072"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10073
10074#: git-am.sh:124
10075msgid "Cannot fall back to three-way merge."
10076msgstr "无法求助于三路合并。"
10077
10078#: git-am.sh:140
10079msgid "Repository lacks necessary blobs to fall back on 3-way merge."
10080msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
10081
10082#: git-am.sh:142
10083msgid "Using index info to reconstruct a base tree..."
10084msgstr "使用索引来重建一个(三路合并的)基础目录树..."
10085
10086#: git-am.sh:157
10087msgid ""
10088"Did you hand edit your patch?\n"
10089"It does not apply to blobs recorded in its index."
10090msgstr ""
10091"您是否曾手动编辑过您的补丁?\n"
10092"无法应用补丁到索引中的数据(blob)对象上。"
10093
10094#: git-am.sh:166
10095msgid "Falling back to patching base and 3-way merge..."
10096msgstr "转而在基础版本上打补丁及进行三路合并..."
10097
10098#: git-am.sh:182
10099msgid "Failed to merge in the changes."
10100msgstr "无法合并变更。"
10101
10102#: git-am.sh:277
10103msgid "Only one StGIT patch series can be applied at once"
10104msgstr "一次只能有一个 StGIT 补丁队列被应用"
10105
10106#: git-am.sh:364
10107#, sh-format
10108msgid "Patch format $patch_format is not supported."
10109msgstr "不支持 $patch_format 补丁格式。"
10110
10111#: git-am.sh:366
10112msgid "Patch format detection failed."
10113msgstr "补丁格式检测失败。"
10114
10115#: git-am.sh:398
10116msgid ""
10117"The -b/--binary option has been a no-op for long time, and\n"
10118"it will be removed. Please do not use it anymore."
10119msgstr ""
10120"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10121"请不要再使用它了。"
10122
10123#: git-am.sh:496
10124#, sh-format
10125msgid "previous rebase directory $dotest still exists but mbox given."
10126msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
10127
10128#: git-am.sh:501
10129msgid "Please make up your mind. --skip or --abort?"
10130msgstr "请下决心。--skip 或是 --abort ?"
10131
10132#: git-am.sh:537
10133#, sh-format
10134msgid ""
10135"Stray $dotest directory found.\n"
10136"Use \"git am --abort\" to remove it."
10137msgstr ""
10138"发现了错误的 $dotest 目录。\n"
10139"使用 \"git am --abort\" 删除它。"
10140
10141#: git-am.sh:545
10142msgid "Resolve operation not in progress, we are not resuming."
10143msgstr "解决操作未进行,我们不会继续。"
10144
10145#: git-am.sh:612
10146#, sh-format
10147msgid "Dirty index: cannot apply patches (dirty: $files)"
10148msgstr "脏的索引:不能应用补丁(脏文件:$files)"
10149
10150#: git-am.sh:722
10151#, sh-format
10152msgid ""
10153"Patch is empty. Was it split wrong?\n"
10154"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10155"To restore the original branch and stop patching run \"$cmdline --abort\"."
10156msgstr ""
10157"补丁为空。是不是切分错误?\n"
10158"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10159"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10160
10161#: git-am.sh:749
10162msgid "Patch does not have a valid e-mail address."
10163msgstr "补丁中没有一个有效的邮件地址。"
10164
10165#: git-am.sh:796
10166msgid "cannot be interactive without stdin connected to a terminal."
10167msgstr "标准输入没有和终端关联,不能进行交互式操作。"
10168
10169#: git-am.sh:800
10170msgid "Commit Body is:"
10171msgstr "提交内容为:"
10172
10173# 译者:注意保持句尾空格
10174#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10175#. in your translation. The program will only accept English
10176#. input at this point.
10177#: git-am.sh:807
10178msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10179msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10180
10181#: git-am.sh:843
10182#, sh-format
10183msgid "Applying: $FIRSTLINE"
10184msgstr "正应用:$FIRSTLINE"
10185
10186#: git-am.sh:864
10187msgid ""
10188"No changes - did you forget to use 'git add'?\n"
10189"If there is nothing left to stage, chances are that something else\n"
10190"already introduced the same changes; you might want to skip this patch."
10191msgstr ""
10192"没有变更 —— 您是不是忘了执行 'git add'?\n"
10193"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10194"您也许想要跳过这个补丁。"
10195
10196#: git-am.sh:872
10197msgid ""
10198"You still have unmerged paths in your index\n"
10199"did you forget to use 'git add'?"
10200msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
10201
10202#: git-am.sh:888
10203msgid "No changes -- Patch already applied."
10204msgstr "没有变更 —— 补丁已经应用过。"
10205
10206#: git-am.sh:898
10207#, sh-format
10208msgid "Patch failed at $msgnum $FIRSTLINE"
10209msgstr "补丁失败于 $msgnum $FIRSTLINE"
10210
10211#: git-am.sh:901
10212#, sh-format
10213msgid ""
10214"The copy of the patch that failed is found in:\n"
10215" $dotest/patch"
10216msgstr ""
10217"失败的补丁文件副本位于:\n"
10218" $dotest/patch"
10219
10220#: git-am.sh:919
10221msgid "applying to an empty history"
10222msgstr "正应用到一个空历史上"
10223
10224#: git-bisect.sh:48
10225msgid "You need to start by \"git bisect start\""
10226msgstr "您需要执行 \"git bisect start\" 来开始"
10227
10228# 译者:注意保持句尾空格
10229#. TRANSLATORS: Make sure to include [Y] and [n] in your
10230#. translation. The program will only accept English input
10231#. at this point.
10232#: git-bisect.sh:54
10233msgid "Do you want me to do it for you [Y/n]? "
10234msgstr "您想让我为您这样做么[Y/n]? "
10235
10236#: git-bisect.sh:95
10237#, sh-format
10238msgid "unrecognised option: '$arg'"
10239msgstr "未能识别的选项:'$arg'"
10240
10241#: git-bisect.sh:99
10242#, sh-format
10243msgid "'$arg' does not appear to be a valid revision"
10244msgstr "'$arg' 看起来不像是一个有效的版本"
10245
10246#: git-bisect.sh:117
10247msgid "Bad HEAD - I need a HEAD"
10248msgstr "坏的 HEAD - 我需要一个 HEAD"
10249
10250#: git-bisect.sh:130
10251#, sh-format
10252msgid ""
10253"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
10254msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
10255
10256#: git-bisect.sh:140
10257msgid "won't bisect on cg-seek'ed tree"
10258msgstr "不会在做了 cg-seek 的树上做二分查找"
10259
10260#: git-bisect.sh:144
10261msgid "Bad HEAD - strange symbolic ref"
10262msgstr "坏的 HEAD - 奇怪的符号引用"
10263
10264#: git-bisect.sh:189
10265#, sh-format
10266msgid "Bad bisect_write argument: $state"
10267msgstr "坏的 bisect_write 参数:$state"
10268
10269#: git-bisect.sh:218
10270#, sh-format
10271msgid "Bad rev input: $arg"
10272msgstr "输入坏的版本:$arg"
10273
10274#: git-bisect.sh:232
10275msgid "Please call 'bisect_state' with at least one argument."
10276msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10277
10278#: git-bisect.sh:244
10279#, sh-format
10280msgid "Bad rev input: $rev"
10281msgstr "输入坏的版本:$rev"
10282
10283#: git-bisect.sh:253
10284msgid "'git bisect bad' can take only one argument."
10285msgstr "'git bisect bad' 只能带一个参数。"
10286
10287#: git-bisect.sh:276
10288msgid "Warning: bisecting only with a bad commit."
10289msgstr "警告:在仅有一个坏提交下进行二分查找。"
10290
10291# 译者:注意保持句尾空格
10292#. TRANSLATORS: Make sure to include [Y] and [n] in your
10293#. translation. The program will only accept English input
10294#. at this point.
10295#: git-bisect.sh:282
10296msgid "Are you sure [Y/n]? "
10297msgstr "您确认么[Y/n]? "
10298
10299#: git-bisect.sh:292
10300msgid ""
10301"You need to give me at least one good and one bad revision.\n"
10302"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10303msgstr ""
10304"您需要给我至少一个好版本和一个坏版本。\n"
10305"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10306
10307#: git-bisect.sh:295
10308msgid ""
10309"You need to start by \"git bisect start\".\n"
10310"You then need to give me at least one good and one bad revision.\n"
10311"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10312msgstr ""
10313"您需要执行 \"git bisect start\" 来开始。\n"
10314"然后需要提供我至少一个好版本和一个坏版本。\n"
10315"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10316
10317#: git-bisect.sh:366 git-bisect.sh:493
10318msgid "We are not bisecting."
10319msgstr "我们没有在二分查找。"
10320
10321#: git-bisect.sh:373
10322#, sh-format
10323msgid "'$invalid' is not a valid commit"
10324msgstr "'$invalid' 不是一个有效的提交"
10325
10326#: git-bisect.sh:382
10327#, sh-format
10328msgid ""
10329"Could not check out original HEAD '$branch'.\n"
10330"Try 'git bisect reset <commit>'."
10331msgstr ""
10332"不能检出原始 HEAD '$branch'。\n"
10333"尝试 'git bisect reset <提交>'。"
10334
10335#: git-bisect.sh:409
10336msgid "No logfile given"
10337msgstr "未提供日志文件"
10338
10339#: git-bisect.sh:410
10340#, sh-format
10341msgid "cannot read $file for replaying"
10342msgstr "不能读取 $file 来重放"
10343
10344#: git-bisect.sh:427
10345msgid "?? what are you talking about?"
10346msgstr "?? 您在说什么?"
10347
10348#: git-bisect.sh:439
10349#, sh-format
10350msgid "running $command"
10351msgstr "运行 $command"
10352
10353#: git-bisect.sh:446
10354#, sh-format
10355msgid ""
10356"bisect run failed:\n"
10357"exit code $res from '$command' is < 0 or >= 128"
10358msgstr ""
10359"二分查找运行失败:\n"
10360"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10361
10362#: git-bisect.sh:472
10363msgid "bisect run cannot continue any more"
10364msgstr "二分查找不能继续运行"
10365
10366#: git-bisect.sh:478
10367#, sh-format
10368msgid ""
10369"bisect run failed:\n"
10370"'bisect_state $state' exited with error code $res"
10371msgstr ""
10372"二分查找运行失败:\n"
10373"'bisect_state $state' 退出码为 $res"
10374
10375#: git-bisect.sh:485
10376msgid "bisect run success"
10377msgstr "二分查找运行成功"
10378
10379#: git-pull.sh:21
10380msgid ""
10381"Pull is not possible because you have unmerged files.\n"
10382"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10383"as appropriate to mark resolution and make a commit."
10384msgstr ""
10385"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10386"然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
10387
10388#: git-pull.sh:25
10389msgid "Pull is not possible because you have unmerged files."
10390msgstr "Pull 不可用,因为您尚有未合并的文件。"
10391
10392#: git-pull.sh:31
10393msgid ""
10394"You have not concluded your merge (MERGE_HEAD exists).\n"
10395"Please, commit your changes before you can merge."
10396msgstr ""
10397"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10398"请在合并前先提交您的修改。"
10399
10400#: git-pull.sh:245
10401msgid "updating an unborn branch with changes added to the index"
10402msgstr "更新尚未诞生的分支,变更添加至索引"
10403
10404#: git-pull.sh:269
10405#, sh-format
10406msgid ""
10407"Warning: fetch updated the current branch head.\n"
10408"Warning: fast-forwarding your working tree from\n"
10409"Warning: commit $orig_head."
10410msgstr ""
10411"警告:fetch 更新了当前的分支。您的工作区\n"
10412"警告:从原提交 $orig_head 快进。"
10413
10414#: git-pull.sh:294
10415msgid "Cannot merge multiple branches into empty head"
10416msgstr "无法将多个分支合并到空分支"
10417
10418#: git-pull.sh:298
10419msgid "Cannot rebase onto multiple branches"
10420msgstr "无法变基到多个分支"
10421
10422#: git-rebase.sh:57
10423msgid ""
10424"When you have resolved this problem, run \"git rebase --continue\".\n"
10425"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10426"To check out the original branch and stop rebasing, run \"git rebase --abort"
10427"\"."
10428msgstr ""
10429"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10430"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10431"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10432
10433#: git-rebase.sh:165
10434msgid "Applied autostash."
10435msgstr "成功应用 autostash。"
10436
10437#: git-rebase.sh:168
10438#, sh-format
10439msgid "Cannot store $stash_sha1"
10440msgstr "无法保存 $stash_sha1"
10441
10442#: git-rebase.sh:169
10443msgid ""
10444"Applying autostash resulted in conflicts.\n"
10445"Your changes are safe in the stash.\n"
10446"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10447msgstr ""
10448"应用 autostash 导致冲突。\n"
10449"您的修改安全地保存在 stash 中。\n"
10450"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10451
10452#: git-rebase.sh:208
10453msgid "The pre-rebase hook refused to rebase."
10454msgstr "钩子 pre-rebase 拒绝变基操作。"
10455
10456#: git-rebase.sh:213
10457msgid "It looks like git-am is in progress. Cannot rebase."
10458msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10459
10460#: git-rebase.sh:351
10461msgid "The --exec option must be used with the --interactive option"
10462msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10463
10464#: git-rebase.sh:356
10465msgid "No rebase in progress?"
10466msgstr "没有正在进行的变基?"
10467
10468#: git-rebase.sh:367
10469msgid "The --edit-todo action can only be used during interactive rebase."
10470msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10471
10472#: git-rebase.sh:374
10473msgid "Cannot read HEAD"
10474msgstr "不能读取 HEAD"
10475
10476#: git-rebase.sh:377
10477msgid ""
10478"You must edit all merge conflicts and then\n"
10479"mark them as resolved using git add"
10480msgstr ""
10481"您必须编辑所有的合并冲突,然后通过 git add\n"
10482"命令将它们标记为已解决"
10483
10484#: git-rebase.sh:395
10485#, sh-format
10486msgid "Could not move back to $head_name"
10487msgstr "无法移回 $head_name"
10488
10489#: git-rebase.sh:414
10490#, sh-format
10491msgid ""
10492"It seems that there is already a $state_dir_base directory, and\n"
10493"I wonder if you are in the middle of another rebase. If that is the\n"
10494"case, please try\n"
10495"\t$cmd_live_rebase\n"
10496"If that is not the case, please\n"
10497"\t$cmd_clear_stale_rebase\n"
10498"and run me again. I am stopping in case you still have something\n"
10499"valuable there."
10500msgstr ""
10501"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10502"过程中。 如果是这样,请执行\n"
10503"\t$cmd_live_rebase\n"
10504"如果不是这样,请执行\n"
10505"\t$cmd_clear_stale_rebase\n"
10506"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
10507
10508#: git-rebase.sh:465
10509#, sh-format
10510msgid "invalid upstream $upstream_name"
10511msgstr "无效的上游 $upstream_name"
10512
10513#: git-rebase.sh:489
10514#, sh-format
10515msgid "$onto_name: there are more than one merge bases"
10516msgstr "$onto_name: 有一个以上的合并基准"
10517
10518#: git-rebase.sh:492 git-rebase.sh:496
10519#, sh-format
10520msgid "$onto_name: there is no merge base"
10521msgstr "$onto_name: 没有合并基准"
10522
10523#: git-rebase.sh:501
10524#, sh-format
10525msgid "Does not point to a valid commit: $onto_name"
10526msgstr "没有指向一个有效的提交:$onto_name"
10527
10528#: git-rebase.sh:524
10529#, sh-format
10530msgid "fatal: no such branch: $branch_name"
10531msgstr "严重错误:无此分支:$branch_name"
10532
10533#: git-rebase.sh:557
10534msgid "Cannot autostash"
10535msgstr "无法 autostash"
10536
10537#: git-rebase.sh:562
10538#, sh-format
10539msgid "Created autostash: $stash_abbrev"
10540msgstr "创建了 autostash: $stash_abbrev"
10541
10542#: git-rebase.sh:566
10543msgid "Please commit or stash them."
10544msgstr "请提交或为它们保存进度。"
10545
10546#: git-rebase.sh:586
10547#, sh-format
10548msgid "Current branch $branch_name is up to date."
10549msgstr "当前分支 $branch_name 是最新的。"
10550
10551#: git-rebase.sh:590
10552#, sh-format
10553msgid "Current branch $branch_name is up to date, rebase forced."
10554msgstr "当前分支 $branch_name 是最新的,强制变基。"
10555
10556#: git-rebase.sh:601
10557#, sh-format
10558msgid "Changes from $mb to $onto:"
10559msgstr "变更从 $mb 到 $onto:"
10560
10561#: git-rebase.sh:610
10562msgid "First, rewinding head to replay your work on top of it..."
10563msgstr "首先,重置头指针以便在上面重放您的工作..."
10564
10565#: git-rebase.sh:620
10566#, sh-format
10567msgid "Fast-forwarded $branch_name to $onto_name."
10568msgstr "快进 $branch_name 至 $onto_name。"
10569
10570#: git-stash.sh:51
10571msgid "git stash clear with parameters is unimplemented"
10572msgstr "git stash clear 不支持参数"
10573
10574#: git-stash.sh:74
10575msgid "You do not have the initial commit yet"
10576msgstr "您尚未建立初始提交"
10577
10578#: git-stash.sh:89
10579msgid "Cannot save the current index state"
10580msgstr "无法保存当前索引状态"
10581
10582#: git-stash.sh:124 git-stash.sh:137
10583msgid "Cannot save the current worktree state"
10584msgstr "无法保存当前工作区状态"
10585
10586#: git-stash.sh:141
10587msgid "No changes selected"
10588msgstr "没有选择变更"
10589
10590#: git-stash.sh:144
10591msgid "Cannot remove temporary index (can't happen)"
10592msgstr "无法删除临时索引(不应发生)"
10593
10594#: git-stash.sh:157
10595msgid "Cannot record working tree state"
10596msgstr "不能记录工作区状态"
10597
10598#: git-stash.sh:191
10599#, sh-format
10600msgid "Cannot update $ref_stash with $w_commit"
10601msgstr "无法用 $w_commit 更新 $ref_stash"
10602
10603#. TRANSLATORS: $option is an invalid option, like
10604#. `--blah-blah'. The 7 spaces at the beginning of the
10605#. second line correspond to "error: ". So you should line
10606#. up the second line with however many characters the
10607#. translation of "error: " takes in your language. E.g. in
10608#. English this is:
10609#.
10610#. $ git stash save --blah-blah 2>&1 | head -n 2
10611#. error: unknown option for 'stash save': --blah-blah
10612#. To provide a message, use git stash save -- '--blah-blah'
10613#: git-stash.sh:238
10614#, sh-format
10615msgid ""
10616"error: unknown option for 'stash save': $option\n"
10617" To provide a message, use git stash save -- '$option'"
10618msgstr ""
10619"错误:'stash save' 的未知选项:$option\n"
10620" 要提供一个描述信息,使用 git stash save -- '$option'"
10621
10622#: git-stash.sh:259
10623msgid "No local changes to save"
10624msgstr "没有要保存的本地修改"
10625
10626#: git-stash.sh:263
10627msgid "Cannot initialize stash"
10628msgstr "无法初始化 stash"
10629
10630#: git-stash.sh:267
10631msgid "Cannot save the current status"
10632msgstr "无法保存当前状态"
10633
10634#: git-stash.sh:285
10635msgid "Cannot remove worktree changes"
10636msgstr "无法删除工作区变更"
10637
10638#: git-stash.sh:384
10639msgid "No stash found."
10640msgstr "未发现 stash。"
10641
10642#: git-stash.sh:391
10643#, sh-format
10644msgid "Too many revisions specified: $REV"
10645msgstr "指定了太多的版本:$REV"
10646
10647#: git-stash.sh:397
10648#, sh-format
10649msgid "$reference is not a valid reference"
10650msgstr "$reference 不是一个有效的引用"
10651
10652#: git-stash.sh:425
10653#, sh-format
10654msgid "'$args' is not a stash-like commit"
10655msgstr "'$args' 不是 stash 样提交"
10656
10657#: git-stash.sh:436
10658#, sh-format
10659msgid "'$args' is not a stash reference"
10660msgstr "'$args' 不是一个 stash 引用"
10661
10662#: git-stash.sh:444
10663msgid "unable to refresh index"
10664msgstr "无法刷新索引"
10665
10666#: git-stash.sh:448
10667msgid "Cannot apply a stash in the middle of a merge"
10668msgstr "无法在合并过程中恢复进度"
10669
10670#: git-stash.sh:456
10671msgid "Conflicts in index. Try without --index."
10672msgstr "索引中有冲突。尝试不使用 --index。"
10673
10674#: git-stash.sh:458
10675msgid "Could not save index tree"
10676msgstr "不能保存索引树"
10677
10678#: git-stash.sh:492
10679msgid "Cannot unstage modified files"
10680msgstr "无法还原修改的文件"
10681
10682#: git-stash.sh:507
10683msgid "Index was not unstashed."
10684msgstr "索引的进度没有被恢复。"
10685
10686#: git-stash.sh:530
10687#, sh-format
10688msgid "Dropped ${REV} ($s)"
10689msgstr "丢弃了 ${REV} ($s)"
10690
10691#: git-stash.sh:531
10692#, sh-format
10693msgid "${REV}: Could not drop stash entry"
10694msgstr "${REV}:不能丢弃进度条目"
10695
10696#: git-stash.sh:539
10697msgid "No branch name specified"
10698msgstr "未指定分支名"
10699
10700#: git-stash.sh:611
10701msgid "(To restore them type \"git stash apply\")"
10702msgstr "(为恢复数据输入 \"git stash apply\")"
10703
10704#: git-submodule.sh:95
10705#, sh-format
10706msgid "cannot strip one component off url '$remoteurl'"
10707msgstr "无法从 url '$remoteurl' 剥离一个组件"
10708
10709#: git-submodule.sh:237
10710#, sh-format
10711msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10712msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
10713
10714#: git-submodule.sh:287
10715#, sh-format
10716msgid "Clone of '$url' into submodule path '$sm_path' failed"
10717msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
10718
10719#: git-submodule.sh:296
10720#, sh-format
10721msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10722msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
10723
10724#: git-submodule.sh:406
10725msgid "Relative path can only be used from the toplevel of the working tree"
10726msgstr "只能在工作区的顶级目录中使用相对路径"
10727
10728#: git-submodule.sh:416
10729#, sh-format
10730msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10731msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10732
10733#: git-submodule.sh:433
10734#, sh-format
10735msgid "'$sm_path' already exists in the index"
10736msgstr "'$sm_path' 已经存在于索引中"
10737
10738#: git-submodule.sh:437
10739#, sh-format
10740msgid ""
10741"The following path is ignored by one of your .gitignore files:\n"
10742"$sm_path\n"
10743"Use -f if you really want to add it."
10744msgstr ""
10745"以下路径被您的一个 .gitignore 文件所忽略:\n"
10746"$sm_path\n"
10747"如果您确实想添加它,使用 -f 参数。"
10748
10749#: git-submodule.sh:455
10750#, sh-format
10751msgid "Adding existing repo at '$sm_path' to the index"
10752msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10753
10754#: git-submodule.sh:457
10755#, sh-format
10756msgid "'$sm_path' already exists and is not a valid git repo"
10757msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
10758
10759#: git-submodule.sh:465
10760#, sh-format
10761msgid "A git directory for '$sm_name' is found locally with remote(s):"
10762msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10763
10764#: git-submodule.sh:467
10765#, sh-format
10766msgid ""
10767"If you want to reuse this local git directory instead of cloning again from"
10768msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10769
10770#: git-submodule.sh:469
10771#, sh-format
10772msgid ""
10773"use the '--force' option. If the local git directory is not the correct repo"
10774msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10775
10776#: git-submodule.sh:470
10777#, sh-format
10778msgid ""
10779"or you are unsure what this means choose another name with the '--name' "
10780"option."
10781msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10782
10783#: git-submodule.sh:472
10784#, sh-format
10785msgid "Reactivating local git directory for submodule '$sm_name'."
10786msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10787
10788#: git-submodule.sh:484
10789#, sh-format
10790msgid "Unable to checkout submodule '$sm_path'"
10791msgstr "不能检出子模组 '$sm_path'"
10792
10793#: git-submodule.sh:489
10794#, sh-format
10795msgid "Failed to add submodule '$sm_path'"
10796msgstr "无法添加子模组 '$sm_path'"
10797
10798#: git-submodule.sh:498
10799#, sh-format
10800msgid "Failed to register submodule '$sm_path'"
10801msgstr "无法注册子模组 '$sm_path'"
10802
10803#: git-submodule.sh:542
10804#, sh-format
10805msgid "Entering '$prefix$displaypath'"
10806msgstr "正在进入 '$prefix$displaypath'"
10807
10808#: git-submodule.sh:562
10809#, sh-format
10810msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10811msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
10812
10813#: git-submodule.sh:608
10814#, sh-format
10815msgid "No url found for submodule path '$displaypath' in .gitmodules"
10816msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
10817
10818#: git-submodule.sh:617
10819#, sh-format
10820msgid "Failed to register url for submodule path '$displaypath'"
10821msgstr "无法为子模组路径 '$displaypath' 注册 url"
10822
10823#: git-submodule.sh:619
10824#, sh-format
10825msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10826msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10827
10828#: git-submodule.sh:636
10829#, sh-format
10830msgid "Failed to register update mode for submodule path '$displaypath'"
10831msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
10832
10833#: git-submodule.sh:674
10834#, sh-format
10835msgid "Use '.' if you really want to deinitialize all submodules"
10836msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10837
10838#: git-submodule.sh:691
10839#, sh-format
10840msgid "Submodule work tree '$displaypath' contains a .git directory"
10841msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
10842
10843#: git-submodule.sh:692
10844#, sh-format
10845msgid ""
10846"(use 'rm -rf' if you really want to remove it including all of its history)"
10847msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10848
10849#: git-submodule.sh:698
10850#, sh-format
10851msgid ""
10852"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10853"discard them"
10854msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
10855
10856#: git-submodule.sh:701
10857#, sh-format
10858msgid "Cleared directory '$displaypath'"
10859msgstr "已清除目录 '$displaypath'"
10860
10861#: git-submodule.sh:702
10862#, sh-format
10863msgid "Could not remove submodule work tree '$displaypath'"
10864msgstr "无法移除子模组工作区 '$displaypath'"
10865
10866#: git-submodule.sh:705
10867#, sh-format
10868msgid "Could not create empty submodule directory '$displaypath'"
10869msgstr "不能创建空的子模组目录 '$displaypath'"
10870
10871#: git-submodule.sh:714
10872#, sh-format
10873msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10874msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10875
10876#: git-submodule.sh:830
10877#, sh-format
10878msgid ""
10879"Submodule path '$displaypath' not initialized\n"
10880"Maybe you want to use 'update --init'?"
10881msgstr ""
10882"子模组路径 '$displaypath' 没有初始化\n"
10883"也许您想用 'update --init'?"
10884
10885#: git-submodule.sh:843
10886#, sh-format
10887msgid "Unable to find current revision in submodule path '$displaypath'"
10888msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
10889
10890#: git-submodule.sh:852
10891#, sh-format
10892msgid "Unable to fetch in submodule path '$sm_path'"
10893msgstr "无法在子模组路径 '$sm_path' 中获取"
10894
10895#: git-submodule.sh:876
10896#, sh-format
10897msgid "Unable to fetch in submodule path '$displaypath'"
10898msgstr "无法在子模组路径 '$displaypath' 中获取"
10899
10900#: git-submodule.sh:890
10901#, sh-format
10902msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10903msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
10904
10905#: git-submodule.sh:891
10906#, sh-format
10907msgid "Submodule path '$displaypath': checked out '$sha1'"
10908msgstr "子模组路径 '$displaypath':检出 '$sha1'"
10909
10910#: git-submodule.sh:895
10911#, sh-format
10912msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10913msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
10914
10915#: git-submodule.sh:896
10916#, sh-format
10917msgid "Submodule path '$displaypath': rebased into '$sha1'"
10918msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
10919
10920#: git-submodule.sh:901
10921#, sh-format
10922msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10923msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
10924
10925#: git-submodule.sh:902
10926#, sh-format
10927msgid "Submodule path '$displaypath': merged in '$sha1'"
10928msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
10929
10930#: git-submodule.sh:907
10931#, sh-format
10932msgid ""
10933"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10934msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
10935
10936#: git-submodule.sh:908
10937#, sh-format
10938msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10939msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
10940
10941#: git-submodule.sh:938
10942#, sh-format
10943msgid "Failed to recurse into submodule path '$displaypath'"
10944msgstr "无法递归进子模组路径 '$displaypath'"
10945
10946#: git-submodule.sh:1046
10947msgid "The --cached option cannot be used with the --files option"
10948msgstr "选项 --cached 不能和选项 --files 同时使用"
10949
10950#: git-submodule.sh:1098
10951#, sh-format
10952msgid "unexpected mode $mod_dst"
10953msgstr "意外的模式 $mod_dst"
10954
10955# 译者:注意保持前导空格
10956#: git-submodule.sh:1118
10957#, sh-format
10958msgid " Warn: $display_name doesn't contain commit $sha1_src"
10959msgstr " 警告:$display_name 未包含提交 $sha1_src"
10960
10961# 译者:注意保持前导空格
10962#: git-submodule.sh:1121
10963#, sh-format
10964msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10965msgstr " 警告:$display_name 未包含提交 $sha1_dst"
10966
10967# 译者:注意保持前导空格
10968#: git-submodule.sh:1124
10969#, sh-format
10970msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10971msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
10972
10973#: git-submodule.sh:1149
10974msgid "blob"
10975msgstr "数据对象"
10976
10977#: git-submodule.sh:1267
10978#, sh-format
10979msgid "Failed to recurse into submodule path '$sm_path'"
10980msgstr "无法递归进子模组路径 '$sm_path'"
10981
10982#: git-submodule.sh:1331
10983#, sh-format
10984msgid "Synchronizing submodule url for '$displaypath'"
10985msgstr "为 '$displaypath' 同步子模组 url"
10986
10987#~ msgid "no files added"
10988#~ msgstr "没有文件被添加"
10989
10990#~ msgid "force creation (when already exists)"
10991#~ msgstr "强制创建(当已经存在)"
10992
10993#~ msgid "Malformed ident string: '%s'"
10994#~ msgstr "非法的身份字符串:'%s'"
10995
10996#~ msgid "slot"
10997#~ msgstr "slot"
10998
10999#~ msgid "Failed to lock ref for update"
11000#~ msgstr "无法为更新锁定引用"
11001
11002#~ msgid "Failed to write ref"
11003#~ msgstr "不能写引用"
11004
11005#~ msgid "Failed to lock HEAD during fast_forward_to"
11006#~ msgstr "在快进时无法为 HEAD 加锁"
11007
11008#~ msgid "invalid commit: %s"
11009#~ msgstr "无效的提交:%s"
11010
11011#~ msgid "cannot lock HEAD ref"
11012#~ msgstr "无法锁定 HEAD 引用"
11013
11014#~ msgid "cannot update HEAD ref"
11015#~ msgstr "无法更新 HEAD 引用"
11016
11017#~ msgid "Invalid %s: '%s'"
11018#~ msgstr "无效的 %s:'%s'"
11019
11020#~ msgid "cannot tell cwd"
11021#~ msgstr "无法获知当前路径"
11022
11023#~ msgid "%s: cannot lock the ref"
11024#~ msgstr "%s:不能锁定引用"
11025
11026#~ msgid "%s: cannot update the ref"
11027#~ msgstr "%s:不能更新引用"
11028
11029#~ msgid "commit has empty message"
11030#~ msgstr "提交说明为空"
11031
11032#~ msgid "Failed to chdir: %s"
11033#~ msgstr "无法切换目录:%s"
11034
11035#~ msgid "key id"
11036#~ msgstr "key id"
11037
11038#~ msgid "Tracking not set up: name too long: %s"
11039#~ msgstr "跟踪未设置:名字太长:%s"
11040
11041#~ msgid "bug"
11042#~ msgstr "bug"
11043
11044# 译者:注意保持句尾空格
11045#~ msgid "ahead "
11046#~ msgstr "领先 "
11047
11048# 译者:注意保持句尾空格
11049#~ msgid ", behind "
11050#~ msgstr ",落后 "
11051
11052#~ msgid "could not find .gitmodules in index"
11053#~ msgstr "无法在索引中找到 .gitmodules"
11054
11055#~ msgid "reading updated .gitmodules failed"
11056#~ msgstr "读取更新后的 .gitmodules 失败"
11057
11058#~ msgid "unable to stat updated .gitmodules"
11059#~ msgstr "不能枚举更新后的 .gitmodules"
11060
11061#~ msgid "unable to remove .gitmodules from index"
11062#~ msgstr "不能从索引中移除 .gitmodules"
11063
11064#~ msgid "adding updated .gitmodules failed"
11065#~ msgstr "添加更新后的 .gitmodules 失败"
11066
11067# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
11068#~ msgid ""
11069#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
11070#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
11071#~ "anymore.\n"
11072#~ "To add content for the whole tree, run:\n"
11073#~ "\n"
11074#~ " git add %s :/\n"
11075#~ " (or git add %s :/)\n"
11076#~ "\n"
11077#~ "To restrict the command to the current directory, run:\n"
11078#~ "\n"
11079#~ " git add %s .\n"
11080#~ " (or git add %s .)\n"
11081#~ "\n"
11082#~ "With the current Git version, the command is restricted to the current "
11083#~ "directory.\n"
11084#~ msgstr ""
11085#~ "在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
11086#~ "'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
11087#~ "如果要添加整个目录树的内容,执行:\n"
11088#~ "\n"
11089#~ " git add %s :/\n"
11090#~ " (或 git add %s :/)\n"
11091#~ "\n"
11092#~ "如果要限制该命令只作用于当前目录,执行:\n"
11093#~ "\n"
11094#~ " git add %s .\n"
11095#~ " (或 git add %s .)\n"
11096#~ "\n"
11097#~ "对于当前版本的 Git,这条命令只作用于当前目录。\n"
11098
11099#~ msgid ""
11100#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
11101#~ "whose behaviour will change in Git 2.0 with respect to paths you "
11102#~ "removed.\n"
11103#~ "Paths like '%s' that are\n"
11104#~ "removed from your working tree are ignored with this version of Git.\n"
11105#~ "\n"
11106#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
11107#~ " ignores paths you removed from your working tree.\n"
11108#~ "\n"
11109#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
11110#~ "\n"
11111#~ "Run 'git status' to check the paths you removed from your working tree.\n"
11112#~ msgstr ""
11113#~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
11114#~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
11115#~ "像本地工作区移除的路径 '%s'\n"
11116#~ "在此版本的 Git 中被忽略。\n"
11117#~ "\n"
11118#~ "* 'git add --ignore-removal <路径规则>',是当前版本的默认操作,\n"
11119#~ " 忽略您本地工作区中移除的文件。\n"
11120#~ "\n"
11121#~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
11122#~ "\n"
11123#~ "运行 'git status' 来检查您本地工作区中移除的路径。\n"
11124
11125#~ msgid ""
11126#~ "Auto packing the repository for optimum performance. You may also\n"
11127#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
11128#~ msgstr ""
11129#~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
11130#~ "参见 \"git help gc\" 以获取更多信息。\n"
11131
11132#~ msgid ""
11133#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
11134#~ "counterpart. If you did not intend to push that branch, you may want to\n"
11135#~ "specify branches to push or set the 'push.default' configuration "
11136#~ "variable\n"
11137#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
11138#~ msgstr ""
11139#~ "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
11140#~ "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
11141#~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
11142#~ "以便只推送当前分支。"
11143
11144# 译者:为保证在输出中对齐,注意调整句中空格!
11145#~ msgid "copied: %s -> %s"
11146#~ msgstr "拷贝: %s -> %s"
11147
11148# 译者:为保证在输出中对齐,注意调整句中空格!
11149#~ msgid "deleted: %s"
11150#~ msgstr "删除: %s"
11151
11152# 译者:为保证在输出中对齐,注意调整句中空格!
11153#~ msgid "modified: %s"
11154#~ msgstr "修改: %s"
11155
11156# 译者:为保证在输出中对齐,注意调整句中空格!
11157#~ msgid "renamed: %s -> %s"
11158#~ msgstr "重命名: %s -> %s"
11159
11160# 译者:为保证在输出中对齐,注意调整句中空格!
11161#~ msgid "unmerged: %s"
11162#~ msgstr "未合并: %s"
11163
11164# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
11165#~ msgid ""
11166#~ "push.default is unset; its implicit value is changing in\n"
11167#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
11168#~ "and maintain the current behavior after the default changes, use:\n"
11169#~ "\n"
11170#~ " git config --global push.default matching\n"
11171#~ "\n"
11172#~ "To squelch this message and adopt the new behavior now, use:\n"
11173#~ "\n"
11174#~ " git config --global push.default simple\n"
11175#~ "\n"
11176#~ "See 'git help config' and search for 'push.default' for further "
11177#~ "information.\n"
11178#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
11179#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
11180#~ msgstr ""
11181#~ "push.default 未设置,它的默认值将在 Git 2.0 由 'matching'\n"
11182#~ "改变为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
11183#~ "\n"
11184#~ " git config --global push.default matching\n"
11185#~ "\n"
11186#~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
11187#~ "\n"
11188#~ " git config --global push.default simple\n"
11189#~ "\n"
11190#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
11191#~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
11192#~ "为保持兼容,请用 'current' 代替 'simple')"
11193
11194#~ msgid "input paths are terminated by a null character"
11195#~ msgstr "输入路径以null字符终止"
11196
11197#~ msgid ""
11198#~ "The following untracked files would NOT be saved but need to be removed "
11199#~ "by stash save:"
11200#~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:"
11201
11202#~ msgid ""
11203#~ "Aborting. Consider using either the --force or --include-untracked option."
11204#~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
11205
11206#~ msgid ""
11207#~ "the following submodule (or one of its nested submodule)\n"
11208#~ "uses a .git directory:"
11209#~ msgid_plural ""
11210#~ "the following submodules (or one of its nested submodule)\n"
11211#~ "use a .git directory:"
11212#~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
11213#~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
11214
11215# 译者:注意保持前导空格
11216#~ msgid " (fix conflicts and then run \"git am --resolved\")"
11217#~ msgstr " (解决冲突,然后运行 \"git am --resolved\")"
11218
11219# 译者:注意保持前导空格
11220#~ msgid " (all conflicts fixed: run \"git commit\")"
11221#~ msgstr " (解决所有冲突后,执行 \"git commit\")"
11222
11223#~ msgid "more than %d trees given: '%s'"
11224#~ msgstr "提供了超过 %d 个树对象:'%s'"
11225
11226#~ msgid "You cannot combine --no-ff with --ff-only."
11227#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
11228
11229#~ msgid ""
11230#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
11231#~ "(use 'rm -rf' if you really want to remove it including all of its "
11232#~ "history)"
11233#~ msgstr ""
11234#~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
11235#~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11236
11237#~ msgid ""
11238#~ "'%s' has changes staged in the index\n"
11239#~ "(use --cached to keep the file, or -f to force removal)"
11240#~ msgstr ""
11241#~ "'%s' 有变更已暂存至索引中\n"
11242#~ "(使用 --cached 保存文件,或用 -f 强制删除)"
11243
11244#~ msgid "show commits where no parent comes before its children"
11245#~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
11246
11247#~ msgid "show the HEAD reference"
11248#~ msgstr "显示 HEAD 引用"
11249
11250#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
11251#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
11252
11253#~ msgid "Change flags"
11254#~ msgstr "修改参数"
11255
11256#~ msgid ""
11257#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
11258#~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。"
11259
11260#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
11261#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
11262
11263#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
11264#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
11265
11266#~ msgid "See 'git help <command>' for more information on a specific command."
11267#~ msgstr "参见 'git help <命令>' 以获得该特定命令的详细信息。"
11268
11269#~ msgid "BUG: impossible combination of %d and %p"
11270#~ msgstr "BUG: 无法组合 %d 和 %p"
11271
11272# 译者:以下三条实际为一个段落
11273#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
11274#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
11275
11276# 译者:为对齐,下面两句内容有调整
11277#~ msgid "may speed it up, but you have to be careful not to forget to add"
11278#~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
11279
11280#~ msgid "new files yourself (see 'git help status')."
11281#~ msgstr "(参见 'git help status')。"
11282
11283#~ msgid "use any ref in .git/refs"
11284#~ msgstr "使用 .git/refs 里的任意引用"
11285
11286#~ msgid "use any tag in .git/refs/tags"
11287#~ msgstr "使用 .git/refs/tags 里的任意 tag"
11288
11289#~ msgid "bad object %s"
11290#~ msgstr "坏对象 %s"
11291
11292#~ msgid "bogus committer info %s"
11293#~ msgstr "虚假的提交者信息 %s"
11294
11295#~ msgid "can't fdopen 'show' output fd"
11296#~ msgstr "不能打开 'show' 输出文件句柄"
11297
11298#~ msgid "failed to close pipe to 'show' for object '%s'"
11299#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
11300
11301#~ msgid " 0 files changed"
11302#~ msgstr " 0 个文件被修改"
11303
11304#~ msgid " %d file changed"
11305#~ msgid_plural " %d files changed"
11306#~ msgstr[0] " %d 个文件被修改"
11307#~ msgstr[1] " %d 个文件被修改"
11308
11309#~ msgid ", %d insertion(+)"
11310#~ msgid_plural ", %d insertions(+)"
11311#~ msgstr[0] ",插入 %d 行(+)"
11312#~ msgstr[1] ",插入 %d 行(+)"
11313
11314#~ msgid ", %d deletion(-)"
11315#~ msgid_plural ", %d deletions(-)"
11316#~ msgstr[0] ",删除 %d 行(-)"
11317#~ msgstr[1] ",删除 %d 行(-)"
11318
11319#~ msgid "You do not have a valid HEAD"
11320#~ msgstr "您没有一个有效的 HEAD"
11321
11322#~ msgid "oops"
11323#~ msgstr "哎哟"
11324
11325#~ msgid "Would not remove %s\n"
11326#~ msgstr "不会删除 %s\n"
11327
11328#~ msgid "Not removing %s\n"
11329#~ msgstr "未删除 %s\n"
11330
11331#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
11332#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
11333
11334#~ msgid "Could not read index"
11335#~ msgstr "不能读取索引"
11336
11337# 译者:中文字符串拼接,可删除前导空格
11338#~ msgid " (use \"git add\" to track)"
11339#~ msgstr "(使用 \"git add\" 建立跟踪)"
11340
11341#~ msgid "--detach cannot be used with -b/-B/--orphan"
11342#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
11343
11344#~ msgid "--detach cannot be used with -t"
11345#~ msgstr "--detach 不能和 -t 同时使用"
11346
11347#~ msgid "--orphan and -b|-B are mutually exclusive"
11348#~ msgstr "--orphan 和 -b|-B 互斥"
11349
11350#~ msgid "--orphan cannot be used with -t"
11351#~ msgstr "--orphan 不能和 -t 同时使用"
11352
11353#~ msgid "git checkout: -f and -m are incompatible"
11354#~ msgstr "git checkout:-f 和 -m 不兼容"
11355
11356#~ msgid ""
11357#~ "git checkout: updating paths is incompatible with switching branches."
11358#~ msgstr "git checkout:更新路径和切换分支不兼容。"
11359
11360#~ msgid "diff setup failed"
11361#~ msgstr "diff 设置失败"
11362
11363#~ msgid "merge-recursive: disk full?"
11364#~ msgstr "merge-recursive:磁盘已满?"
11365
11366#~ msgid "diff_setup_done failed"
11367#~ msgstr "diff_setup_done 失败"