]> git.ipfire.org Git - thirdparty/git.git/blame_incremental - po/zh_CN.po
l10n: zh_CN: for git v2.5.0 l10n round 2
[thirdparty/git.git] / po / zh_CN.po
... / ...
CommitLineData
1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
4# This file is distributed under the same license as the Git package.
5# Contributors:
6# - Jiang Xin <worldhello.net AT gmail.com>
7# - Riku <lu.riku AT gmail.com>
8# - Zhuang Ya <zhuangya AT me.com>
9# - Lian Cheng <rhythm.mail AT gmail.com>
10#
11msgid ""
12msgstr ""
13"Project-Id-Version: Git\n"
14"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15"POT-Creation-Date: 2015-07-14 07:19+0800\n"
16"PO-Revision-Date: 2015-07-14 07:32+0800\n"
17"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18"Language-Team: GitHub <https://github.com/jiangxin/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:428 builtin/rm.c:327
57#, c-format
58msgid "pathspec '%s' did not match any files"
59msgstr "路径规则 '%s' 未匹配任何文件"
60
61#: archive.c:427
62msgid "fmt"
63msgstr "格式"
64
65#: archive.c:427
66msgid "archive format"
67msgstr "归档格式"
68
69#: archive.c:428 builtin/log.c:1204
70msgid "prefix"
71msgstr "前缀"
72
73#: archive.c:429
74msgid "prepend prefix to each pathname in the archive"
75msgstr "为归档中每个路径名加上前缀"
76
77#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
78#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
79#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
80#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
81#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
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:77
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:265
130msgid ""
131"Negative patterns are ignored in git attributes\n"
132"Use '\\!' for literal leading exclamation."
133msgstr ""
134"负值模版在 git attributes 中被忽略\n"
135"当字符串确实要以感叹号开始时,使用 '\\!'。"
136
137#: branch.c:60
138#, c-format
139msgid "Not setting branch %s as its own upstream."
140msgstr "未设置分支 %s 作为它自己的上游。"
141
142#: branch.c:83
143#, c-format
144msgid "Branch %s set up to track remote branch %s from %s by rebasing."
145msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
146
147#: branch.c:84
148#, c-format
149msgid "Branch %s set up to track remote branch %s from %s."
150msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
151
152#: branch.c:88
153#, c-format
154msgid "Branch %s set up to track local branch %s by rebasing."
155msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
156
157#: branch.c:89
158#, c-format
159msgid "Branch %s set up to track local branch %s."
160msgstr "分支 %s 设置为跟踪本地分支 %s。"
161
162#: branch.c:94
163#, c-format
164msgid "Branch %s set up to track remote ref %s by rebasing."
165msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
166
167#: branch.c:95
168#, c-format
169msgid "Branch %s set up to track remote ref %s."
170msgstr "分支 %s 设置为跟踪远程引用 %s。"
171
172#: branch.c:99
173#, c-format
174msgid "Branch %s set up to track local ref %s by rebasing."
175msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
176
177#: branch.c:100
178#, c-format
179msgid "Branch %s set up to track local ref %s."
180msgstr "分支 %s 设置为跟踪本地引用 %s。"
181
182#: branch.c:133
183#, c-format
184msgid "Not tracking: ambiguous information for ref %s"
185msgstr "未跟踪:引用 %s 有歧义"
186
187#: branch.c:162
188#, c-format
189msgid "'%s' is not a valid branch name."
190msgstr "'%s' 不是一个有效的分支名称。"
191
192#: branch.c:167
193#, c-format
194msgid "A branch named '%s' already exists."
195msgstr "一个分支名 '%s' 已经存在。"
196
197#: branch.c:175
198msgid "Cannot force update the current branch."
199msgstr "无法强制更新当前分支。"
200
201#: branch.c:195
202#, c-format
203msgid "Cannot setup tracking information; starting point '%s' is not a branch."
204msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
205
206#: branch.c:197
207#, c-format
208msgid "the requested upstream branch '%s' does not exist"
209msgstr "请求的上游分支 '%s' 不存在"
210
211#: branch.c:199
212msgid ""
213"\n"
214"If you are planning on basing your work on an upstream\n"
215"branch that already exists at the remote, you may need to\n"
216"run \"git fetch\" to retrieve it.\n"
217"\n"
218"If you are planning to push out a new local branch that\n"
219"will track its remote counterpart, you may want to use\n"
220"\"git push -u\" to set the upstream config as you push."
221msgstr ""
222"\n"
223"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
224"您可能需要执行 \"git fetch\" 来获取分支。\n"
225"\n"
226"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
227"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
228
229#: branch.c:243
230#, c-format
231msgid "Not a valid object name: '%s'."
232msgstr "不是一个有效的对象名:'%s'。"
233
234#: branch.c:263
235#, c-format
236msgid "Ambiguous object name: '%s'."
237msgstr "歧义的对象名:'%s'。"
238
239#: branch.c:268
240#, c-format
241msgid "Not a valid branch point: '%s'."
242msgstr "无效的分支点:'%s'。"
243
244#: bundle.c:34
245#, c-format
246msgid "'%s' does not look like a v2 bundle file"
247msgstr "'%s' 不像是一个 v2 版本的包文件"
248
249#: bundle.c:61
250#, c-format
251msgid "unrecognized header: %s%s (%d)"
252msgstr "未能识别的包头:%s%s (%d)"
253
254#: bundle.c:87 builtin/commit.c:766
255#, c-format
256msgid "could not open '%s'"
257msgstr "不能打开 '%s'"
258
259#: bundle.c:139
260msgid "Repository lacks these prerequisite commits:"
261msgstr "版本库缺少这些必备的提交:"
262
263#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
264#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
265#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358
266#: builtin/shortlog.c:158
267msgid "revision walk setup failed"
268msgstr "版本遍历设置失败"
269
270#: bundle.c:185
271#, c-format
272msgid "The bundle contains this ref:"
273msgid_plural "The bundle contains these %d refs:"
274msgstr[0] "这个包中含有这个引用:"
275msgstr[1] "这个包中含有 %d 个引用:"
276
277#: bundle.c:192
278msgid "The bundle records a complete history."
279msgstr "这个包记录一个完整历史。"
280
281#: bundle.c:194
282#, c-format
283msgid "The bundle requires this ref:"
284msgid_plural "The bundle requires these %d refs:"
285msgstr[0] "这个包需要这个引用:"
286msgstr[1] "这个包需要 %d 个引用:"
287
288#: bundle.c:251
289msgid "Could not spawn pack-objects"
290msgstr "不能生成 pack-objects 进程"
291
292#: bundle.c:269
293msgid "pack-objects died"
294msgstr "pack-objects 终止"
295
296#: bundle.c:309
297msgid "rev-list died"
298msgstr "rev-list 终止"
299
300#: bundle.c:358
301#, c-format
302msgid "ref '%s' is excluded by the rev-list options"
303msgstr "引用 '%s' 被 rev-list 选项排除"
304
305#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
306#, c-format
307msgid "unrecognized argument: %s"
308msgstr "未能识别的参数:%s"
309
310#: bundle.c:443
311msgid "Refusing to create empty bundle."
312msgstr "不能创建空包。"
313
314#: bundle.c:453
315#, c-format
316msgid "cannot create '%s'"
317msgstr "不能创建 '%s'"
318
319#: bundle.c:474
320msgid "index-pack died"
321msgstr "index-pack 终止"
322
323#: color.c:260
324#, c-format
325msgid "invalid color value: %.*s"
326msgstr "无效的颜色值:%.*s"
327
328#: commit.c:40
329#, c-format
330msgid "could not parse %s"
331msgstr "不能解析 %s"
332
333#: commit.c:42
334#, c-format
335msgid "%s %s is not a commit!"
336msgstr "%s %s 不是一个提交!"
337
338#: compat/obstack.c:406 compat/obstack.c:408
339msgid "memory exhausted"
340msgstr "内存耗尽"
341
342#: config.c:474 config.c:476
343#, c-format
344msgid "bad config file line %d in %s"
345msgstr "配置文件 %2$s 出错于第 %1$d 行"
346
347#: config.c:592
348#, c-format
349msgid "bad numeric config value '%s' for '%s' in %s: %s"
350msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
351
352#: config.c:594
353#, c-format
354msgid "bad numeric config value '%s' for '%s': %s"
355msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
356
357#: config.c:679
358#, c-format
359msgid "failed to expand user dir in: '%s'"
360msgstr "无法扩展 '%s' 中的用户目录"
361
362#: config.c:757 config.c:768
363#, c-format
364msgid "bad zlib compression level %d"
365msgstr "错误的 zlib 压缩级别 %d"
366
367#: config.c:890
368#, c-format
369msgid "invalid mode for object creation: %s"
370msgstr "无效的对象创建模式:%s"
371
372#: config.c:1216
373msgid "unable to parse command-line config"
374msgstr "无法解析命令行中的配置"
375
376#: config.c:1277
377msgid "unknown error occured while reading the configuration files"
378msgstr "在读取配置文件时遇到未知错误"
379
380#: config.c:1601
381#, c-format
382msgid "unable to parse '%s' from command-line config"
383msgstr "无法解析命令行配置中的 '%s'"
384
385#: config.c:1603
386#, c-format
387msgid "bad config variable '%s' in file '%s' at line %d"
388msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
389
390#: config.c:1662
391#, c-format
392msgid "%s has multiple values"
393msgstr "%s 有多个取值"
394
395#: connected.c:69
396msgid "Could not run 'git rev-list'"
397msgstr "不能执行 'git rev-list'"
398
399#: connected.c:89
400#, c-format
401msgid "failed write to rev-list: %s"
402msgstr "无法写入 rev-list:%s"
403
404#: connected.c:97
405#, c-format
406msgid "failed to close rev-list's stdin: %s"
407msgstr "无法关闭 rev-list 的标准输入:%s"
408
409#: date.c:95
410msgid "in the future"
411msgstr "在将来"
412
413#: date.c:101
414#, c-format
415msgid "%lu second ago"
416msgid_plural "%lu seconds ago"
417msgstr[0] "%lu 秒钟前"
418msgstr[1] "%lu 秒钟前"
419
420#: date.c:108
421#, c-format
422msgid "%lu minute ago"
423msgid_plural "%lu minutes ago"
424msgstr[0] "%lu 分钟前"
425msgstr[1] "%lu 分钟前"
426
427#: date.c:115
428#, c-format
429msgid "%lu hour ago"
430msgid_plural "%lu hours ago"
431msgstr[0] "%lu 小时前"
432msgstr[1] "%lu 小时前"
433
434#: date.c:122
435#, c-format
436msgid "%lu day ago"
437msgid_plural "%lu days ago"
438msgstr[0] "%lu 天前"
439msgstr[1] "%lu 天前"
440
441#: date.c:128
442#, c-format
443msgid "%lu week ago"
444msgid_plural "%lu weeks ago"
445msgstr[0] "%lu 周前"
446msgstr[1] "%lu 周前"
447
448#: date.c:135
449#, c-format
450msgid "%lu month ago"
451msgid_plural "%lu months ago"
452msgstr[0] "%lu 个月前"
453msgstr[1] "%lu 个月前"
454
455#: date.c:146
456#, c-format
457msgid "%lu year"
458msgid_plural "%lu years"
459msgstr[0] "%lu 年"
460msgstr[1] "%lu 年"
461
462#. TRANSLATORS: "%s" is "<n> years"
463#: date.c:149
464#, c-format
465msgid "%s, %lu month ago"
466msgid_plural "%s, %lu months ago"
467msgstr[0] "%s %lu 个月前"
468msgstr[1] "%s %lu 个月前"
469
470#: date.c:154 date.c:159
471#, c-format
472msgid "%lu year ago"
473msgid_plural "%lu years ago"
474msgstr[0] "%lu 年前"
475msgstr[1] "%lu 年前"
476
477#: diffcore-order.c:24
478#, c-format
479msgid "failed to read orderfile '%s'"
480msgstr "无法读取排序文件 '%s'"
481
482#: diffcore-rename.c:536
483msgid "Performing inexact rename detection"
484msgstr "正在进行非精确的重命名检测"
485
486# 译者:注意保持前导空格
487#: diff.c:114
488#, c-format
489msgid " Failed to parse dirstat cut-off percentage '%s'\n"
490msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
491
492# 译者:注意保持前导空格
493#: diff.c:119
494#, c-format
495msgid " Unknown dirstat parameter '%s'\n"
496msgstr " 未知的 dirstat 参数 '%s'\n"
497
498#: diff.c:214
499#, c-format
500msgid "Unknown value for 'diff.submodule' config variable: '%s'"
501msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
502
503#: diff.c:266
504#, c-format
505msgid ""
506"Found errors in 'diff.dirstat' config variable:\n"
507"%s"
508msgstr ""
509"发现配置变量 'diff.dirstat' 中的错误:\n"
510"%s"
511
512#: diff.c:2997
513#, c-format
514msgid "external diff died, stopping at %s"
515msgstr "外部 diff 退出,停止在 %s"
516
517#: diff.c:3393
518msgid "--follow requires exactly one pathspec"
519msgstr "--follow 参数后只跟一个 pathspec"
520
521#: diff.c:3556
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:3570
531#, c-format
532msgid "Failed to parse --submodule option parameter: '%s'"
533msgstr "无法解析 --submodule 选项的参数:'%s'"
534
535#: dir.c:1852
536msgid "failed to get kernel name and information"
537msgstr "无法获得内核名称和信息"
538
539#: dir.c:1945
540msgid "Untracked cache is disabled on this system."
541msgstr "缓存未跟踪文件在本系统被禁用"
542
543#: gpg-interface.c:129 gpg-interface.c:200
544msgid "could not run gpg."
545msgstr "不能执行 gpg。"
546
547#: gpg-interface.c:141
548msgid "gpg did not accept the data"
549msgstr "gpg 没有接受数据"
550
551#: gpg-interface.c:152
552msgid "gpg failed to sign the data"
553msgstr "gpg 无法为数据签名"
554
555#: gpg-interface.c:185
556#, c-format
557msgid "could not create temporary file '%s': %s"
558msgstr "不能创建临时文件 '%s':%s"
559
560#: gpg-interface.c:188
561#, c-format
562msgid "failed writing detached signature to '%s': %s"
563msgstr "无法将分离式签名写入 '%s':%s"
564
565#: grep.c:1718
566#, c-format
567msgid "'%s': unable to read %s"
568msgstr "'%s':无法读取 %s"
569
570#: grep.c:1735
571#, c-format
572msgid "'%s': %s"
573msgstr "'%s':%s"
574
575#: grep.c:1746
576#, c-format
577msgid "'%s': short read %s"
578msgstr "'%s':读取不完整 %s"
579
580#: help.c:207
581#, c-format
582msgid "available git commands in '%s'"
583msgstr "在 '%s' 下可用的 git 命令"
584
585#: help.c:214
586msgid "git commands available from elsewhere on your $PATH"
587msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
588
589#: help.c:246
590msgid "These are common Git commands used in various situations:"
591msgstr "这些是各种场合常见的 Git 命令:"
592
593#: help.c:311
594#, c-format
595msgid ""
596"'%s' appears to be a git command, but we were not\n"
597"able to execute it. Maybe git-%s is broken?"
598msgstr ""
599"'%s' 像是一个 git 命令,但却无法运行。\n"
600"可能是 git-%s 受损?"
601
602#: help.c:368
603msgid "Uh oh. Your system reports no Git commands at all."
604msgstr "唉呀,您的系统中未发现 Git 命令。"
605
606#: help.c:390
607#, c-format
608msgid ""
609"WARNING: You called a Git command named '%s', which does not exist.\n"
610"Continuing under the assumption that you meant '%s'"
611msgstr ""
612"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
613"是 '%s'"
614
615#: help.c:395
616#, c-format
617msgid "in %0.1f seconds automatically..."
618msgstr "在 %0.1f 秒钟后自动运行..."
619
620#: help.c:402
621#, c-format
622msgid "git: '%s' is not a git command. See 'git --help'."
623msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
624
625#: help.c:406 help.c:466
626msgid ""
627"\n"
628"Did you mean this?"
629msgid_plural ""
630"\n"
631"Did you mean one of these?"
632msgstr[0] ""
633"\n"
634"您指的是这个么?"
635msgstr[1] ""
636"\n"
637"您指的是这其中的某一个么?"
638
639#: help.c:462
640#, c-format
641msgid "%s: %s - %s"
642msgstr "%s:%s - %s"
643
644#: lockfile.c:345
645msgid "BUG: reopen a lockfile that is still open"
646msgstr "BUG: 重新打开一个仍打开着的锁文件"
647
648#: lockfile.c:347
649msgid "BUG: reopen a lockfile that has been committed"
650msgstr "BUG: 重新打开一个已提交的锁文件"
651
652#: merge.c:41
653msgid "failed to read the cache"
654msgstr "无法读取缓存"
655
656#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
657#: builtin/clone.c:647
658msgid "unable to write new index file"
659msgstr "无法写新的索引文件"
660
661#: merge-recursive.c:189
662#, c-format
663msgid "(bad commit)\n"
664msgstr "(坏提交)\n"
665
666#: merge-recursive.c:209
667#, c-format
668msgid "addinfo_cache failed for path '%s'"
669msgstr "为路径 '%s' addinfo_cache 失败"
670
671#: merge-recursive.c:270
672msgid "error building trees"
673msgstr "无法创建树"
674
675#: merge-recursive.c:687
676#, c-format
677msgid "failed to create path '%s'%s"
678msgstr "无法创建路径 '%s'%s"
679
680#: merge-recursive.c:698
681#, c-format
682msgid "Removing %s to make room for subdirectory\n"
683msgstr "删除 %s 以便为子目录留出空间\n"
684
685#: merge-recursive.c:712 merge-recursive.c:733
686msgid ": perhaps a D/F conflict?"
687msgstr ":可能是一个目录/文件冲突?"
688
689#: merge-recursive.c:723
690#, c-format
691msgid "refusing to lose untracked file at '%s'"
692msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
693
694#: merge-recursive.c:763
695#, c-format
696msgid "cannot read object %s '%s'"
697msgstr "不能读取对象 %s '%s'"
698
699#: merge-recursive.c:765
700#, c-format
701msgid "blob expected for %s '%s'"
702msgstr "%s '%s' 应为数据(blob)对象"
703
704#: merge-recursive.c:788 builtin/clone.c:306
705#, c-format
706msgid "failed to open '%s'"
707msgstr "无法打开 '%s'"
708
709#: merge-recursive.c:796
710#, c-format
711msgid "failed to symlink '%s'"
712msgstr "无法创建符号链接 '%s'"
713
714#: merge-recursive.c:799
715#, c-format
716msgid "do not know what to do with %06o %s '%s'"
717msgstr "不知道如何处理 %06o %s '%s'"
718
719#: merge-recursive.c:937
720msgid "Failed to execute internal merge"
721msgstr "无法执行内部合并"
722
723#: merge-recursive.c:941
724#, c-format
725msgid "Unable to add %s to database"
726msgstr "不能添加 %s 至对象库"
727
728#: merge-recursive.c:957
729msgid "unsupported object type in the tree"
730msgstr "在树中有不支持的对象类型"
731
732#: merge-recursive.c:1032 merge-recursive.c:1046
733#, c-format
734msgid ""
735"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
736"in tree."
737msgstr ""
738"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
739"的版本被保留。"
740
741#: merge-recursive.c:1038 merge-recursive.c:1051
742#, c-format
743msgid ""
744"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
745"in tree at %s."
746msgstr ""
747"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
748"的版本保留于 %8$s 中。"
749
750#: merge-recursive.c:1092
751msgid "rename"
752msgstr "重命名"
753
754#: merge-recursive.c:1092
755msgid "renamed"
756msgstr "重命名"
757
758#: merge-recursive.c:1148
759#, c-format
760msgid "%s is a directory in %s adding as %s instead"
761msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
762
763#: merge-recursive.c:1170
764#, c-format
765msgid ""
766"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
767"\"->\"%s\" in \"%s\"%s"
768msgstr ""
769"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
770"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
771
772#: merge-recursive.c:1175
773msgid " (left unresolved)"
774msgstr "(留下未解决)"
775
776#: merge-recursive.c:1229
777#, c-format
778msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
779msgstr ""
780"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
781"%5$s"
782
783#: merge-recursive.c:1259
784#, c-format
785msgid "Renaming %s to %s and %s to %s instead"
786msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
787
788#: merge-recursive.c:1458
789#, c-format
790msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
791msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
792
793#: merge-recursive.c:1468
794#, c-format
795msgid "Adding merged %s"
796msgstr "添加合并后的 %s"
797
798#: merge-recursive.c:1473 merge-recursive.c:1671
799#, c-format
800msgid "Adding as %s instead"
801msgstr "而是以 %s 为名添加"
802
803#: merge-recursive.c:1524
804#, c-format
805msgid "cannot read object %s"
806msgstr "不能读取对象 %s"
807
808#: merge-recursive.c:1527
809#, c-format
810msgid "object %s is not a blob"
811msgstr "对象 %s 不是一个数据(blob)对象"
812
813#: merge-recursive.c:1575
814msgid "modify"
815msgstr "修改"
816
817#: merge-recursive.c:1575
818msgid "modified"
819msgstr "修改"
820
821#: merge-recursive.c:1585
822msgid "content"
823msgstr "内容"
824
825#: merge-recursive.c:1592
826msgid "add/add"
827msgstr "添加/添加"
828
829#: merge-recursive.c:1626
830#, c-format
831msgid "Skipped %s (merged same as existing)"
832msgstr "略过 %s(已经做过相同合并)"
833
834#: merge-recursive.c:1640
835#, c-format
836msgid "Auto-merging %s"
837msgstr "自动合并 %s"
838
839#: merge-recursive.c:1644 git-submodule.sh:1150
840msgid "submodule"
841msgstr "子模组"
842
843#: merge-recursive.c:1645
844#, c-format
845msgid "CONFLICT (%s): Merge conflict in %s"
846msgstr "冲突(%s):合并冲突于 %s"
847
848#: merge-recursive.c:1731
849#, c-format
850msgid "Removing %s"
851msgstr "删除 %s"
852
853#: merge-recursive.c:1756
854msgid "file/directory"
855msgstr "文件/目录"
856
857#: merge-recursive.c:1762
858msgid "directory/file"
859msgstr "目录/文件"
860
861#: merge-recursive.c:1767
862#, c-format
863msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
864msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
865
866#: merge-recursive.c:1777
867#, c-format
868msgid "Adding %s"
869msgstr "添加 %s"
870
871#: merge-recursive.c:1794
872msgid "Fatal merge failure, shouldn't happen."
873msgstr "严重的合并错误,不应发生。"
874
875#: merge-recursive.c:1813
876msgid "Already up-to-date!"
877msgstr "已经是最新的!"
878
879#: merge-recursive.c:1822
880#, c-format
881msgid "merging of trees %s and %s failed"
882msgstr "无法合并树 %s 和 %s"
883
884#: merge-recursive.c:1852
885#, c-format
886msgid "Unprocessed path??? %s"
887msgstr "未处理的路径??? %s"
888
889#: merge-recursive.c:1900
890msgid "Merging:"
891msgstr "合并:"
892
893#: merge-recursive.c:1913
894#, c-format
895msgid "found %u common ancestor:"
896msgid_plural "found %u common ancestors:"
897msgstr[0] "发现 %u 个共同祖先:"
898msgstr[1] "发现 %u 个共同祖先:"
899
900#: merge-recursive.c:1950
901msgid "merge returned no commit"
902msgstr "合并未返回提交"
903
904#: merge-recursive.c:2007
905#, c-format
906msgid "Could not parse object '%s'"
907msgstr "不能解析对象 '%s'"
908
909#: merge-recursive.c:2018 builtin/merge.c:645
910msgid "Unable to write index."
911msgstr "不能写入索引。"
912
913#: notes-utils.c:41
914msgid "Cannot commit uninitialized/unreferenced notes tree"
915msgstr "不能提交未初始化/未引用的注解树"
916
917#: notes-utils.c:82
918#, c-format
919msgid "Bad notes.rewriteMode value: '%s'"
920msgstr "坏的 notes.rewriteMode 值:'%s'"
921
922#: notes-utils.c:92
923#, c-format
924msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
925msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
926
927#. TRANSLATORS: The first %s is the name of the
928#. environment variable, the second %s is its value
929#: notes-utils.c:119
930#, c-format
931msgid "Bad %s value: '%s'"
932msgstr "坏的 %s 值:'%s'"
933
934#: object.c:242
935#, c-format
936msgid "unable to parse object: %s"
937msgstr "不能解析对象:%s"
938
939#: parse-options.c:546
940msgid "..."
941msgstr "..."
942
943#: parse-options.c:564
944#, c-format
945msgid "usage: %s"
946msgstr "用法:%s"
947
948#. TRANSLATORS: the colon here should align with the
949#. one in "usage: %s" translation
950#: parse-options.c:568
951#, c-format
952msgid " or: %s"
953msgstr " 或:%s"
954
955# 译者:为保证在输出中对齐,注意调整句中空格!
956#: parse-options.c:571
957#, c-format
958msgid " %s"
959msgstr " %s"
960
961#: parse-options.c:605
962msgid "-NUM"
963msgstr "-数字"
964
965#: pathspec.c:133
966msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
967msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
968
969#: pathspec.c:143
970msgid ""
971"global 'literal' pathspec setting is incompatible with all other global "
972"pathspec settings"
973msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
974
975#: pathspec.c:177
976msgid "invalid parameter for pathspec magic 'prefix'"
977msgstr "路径规则包含无效的神奇前缀"
978
979#: pathspec.c:183
980#, c-format
981msgid "Invalid pathspec magic '%.*s' in '%s'"
982msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
983
984#: pathspec.c:187
985#, c-format
986msgid "Missing ')' at the end of pathspec magic in '%s'"
987msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
988
989#: pathspec.c:205
990#, c-format
991msgid "Unimplemented pathspec magic '%c' in '%s'"
992msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
993
994#: pathspec.c:230
995#, c-format
996msgid "%s: 'literal' and 'glob' are incompatible"
997msgstr "%s:'literal' 和 'glob' 不兼容"
998
999#: pathspec.c:241
1000#, c-format
1001msgid "%s: '%s' is outside repository"
1002msgstr "%s:'%s' 在版本库之外"
1003
1004#: pathspec.c:291
1005#, c-format
1006msgid "Pathspec '%s' is in submodule '%.*s'"
1007msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
1008
1009#: pathspec.c:353
1010#, c-format
1011msgid "%s: pathspec magic not supported by this command: %s"
1012msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
1013
1014#: pathspec.c:432
1015#, c-format
1016msgid "pathspec '%s' is beyond a symbolic link"
1017msgstr "路径规则 '%s' 位于符号链接中"
1018
1019#: pathspec.c:441
1020msgid ""
1021"There is nothing to exclude from by :(exclude) patterns.\n"
1022"Perhaps you forgot to add either ':/' or '.' ?"
1023msgstr ""
1024"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1025"添加 ':/' 或 '.' ?"
1026
1027#: pretty.c:968
1028msgid "unable to parse --pretty format"
1029msgstr "不能解析 --pretty 格式"
1030
1031#: progress.c:236
1032msgid "done"
1033msgstr "完成"
1034
1035#: read-cache.c:1295
1036#, c-format
1037msgid ""
1038"index.version set, but the value is invalid.\n"
1039"Using version %i"
1040msgstr ""
1041"设置了 index.version,但是取值无效。\n"
1042"使用版本 %i"
1043
1044#: read-cache.c:1305
1045#, c-format
1046msgid ""
1047"GIT_INDEX_VERSION set, but the value is invalid.\n"
1048"Using version %i"
1049msgstr ""
1050"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1051"使用版本 %i"
1052
1053#: remote.c:792
1054#, c-format
1055msgid "Cannot fetch both %s and %s to %s"
1056msgstr "不能同时获取 %s 和 %s 至 %s"
1057
1058#: remote.c:796
1059#, c-format
1060msgid "%s usually tracks %s, not %s"
1061msgstr "%s 通常跟踪 %s,而非 %s"
1062
1063#: remote.c:800
1064#, c-format
1065msgid "%s tracks both %s and %s"
1066msgstr "%s 同时跟踪 %s 和 %s"
1067
1068#: remote.c:808
1069msgid "Internal error"
1070msgstr "内部错误"
1071
1072#: remote.c:1723 remote.c:1766
1073msgid "HEAD does not point to a branch"
1074msgstr "HEAD 没有指向一个分支"
1075
1076#: remote.c:1732
1077#, c-format
1078msgid "no such branch: '%s'"
1079msgstr "没有此分支:'%s'"
1080
1081#: remote.c:1735
1082#, c-format
1083msgid "no upstream configured for branch '%s'"
1084msgstr "尚未给分支 '%s' 设置上游"
1085
1086#: remote.c:1741
1087#, c-format
1088msgid "upstream branch '%s' not stored as a remote-tracking branch"
1089msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1090
1091#: remote.c:1756
1092#, c-format
1093msgid "push destination '%s' on remote '%s' has no local tracking branch"
1094msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1095
1096#: remote.c:1771
1097#, c-format
1098msgid "branch '%s' has no remote for pushing"
1099msgstr "分支 '%s' 没有设置要推送的远程服务器"
1100
1101#: remote.c:1782
1102#, c-format
1103msgid "push refspecs for '%s' do not include '%s'"
1104msgstr "向 '%s' 推送引用表达式未包含 '%s'"
1105
1106#: remote.c:1795
1107msgid "push has no destination (push.default is 'nothing')"
1108msgstr "推送无目标(push.default 是 'nothing')"
1109
1110#: remote.c:1817
1111msgid "cannot resolve 'simple' push to a single destination"
1112msgstr "无法解析 'simple' 推送至一个单独的目标"
1113
1114#: remote.c:2124
1115#, c-format
1116msgid "Your branch is based on '%s', but the upstream is gone.\n"
1117msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1118
1119#: remote.c:2128
1120msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1121msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1122
1123#: remote.c:2131
1124#, c-format
1125msgid "Your branch is up-to-date with '%s'.\n"
1126msgstr "您的分支与上游分支 '%s' 一致。\n"
1127
1128#: remote.c:2135
1129#, c-format
1130msgid "Your branch is ahead of '%s' by %d commit.\n"
1131msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1132msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1133msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1134
1135#: remote.c:2141
1136msgid " (use \"git push\" to publish your local commits)\n"
1137msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1138
1139#: remote.c:2144
1140#, c-format
1141msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1142msgid_plural ""
1143"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1144msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1145msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1146
1147# 译者:注意保持前导空格
1148#: remote.c:2152
1149msgid " (use \"git pull\" to update your local branch)\n"
1150msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1151
1152#: remote.c:2155
1153#, c-format
1154msgid ""
1155"Your branch and '%s' have diverged,\n"
1156"and have %d and %d different commit each, respectively.\n"
1157msgid_plural ""
1158"Your branch and '%s' have diverged,\n"
1159"and have %d and %d different commits each, respectively.\n"
1160msgstr[0] ""
1161"您的分支和 '%s' 出现了偏离,\n"
1162"并且分别有 %d 和 %d 处不同的提交。\n"
1163msgstr[1] ""
1164"您的分支和 '%s' 出现了偏离,\n"
1165"并且分别有 %d 和 %d 处不同的提交。\n"
1166
1167# 译者:注意保持前导空格
1168#: remote.c:2165
1169msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1170msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1171
1172#: revision.c:2366
1173msgid "--first-parent is incompatible with --bisect"
1174msgstr "--first-parent 与 --bisect 不兼容"
1175
1176#: run-command.c:83
1177msgid "open /dev/null failed"
1178msgstr "不能打开 /dev/null"
1179
1180#: run-command.c:85
1181#, c-format
1182msgid "dup2(%d,%d) failed"
1183msgstr "不能调用 dup2(%d,%d)"
1184
1185#: send-pack.c:272
1186msgid "failed to sign the push certificate"
1187msgstr "无法为推送证书签名"
1188
1189#: send-pack.c:378
1190msgid "the receiving end does not support --signed push"
1191msgstr "接收端不支持签名推送"
1192
1193#: send-pack.c:389
1194msgid "the receiving end does not support --atomic push"
1195msgstr "接收端不支持原子推送"
1196
1197#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1198#: builtin/merge.c:983
1199#, c-format
1200msgid "Could not open '%s' for writing"
1201msgstr "不能为写入打开 '%s'"
1202
1203#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
1204#: builtin/merge.c:988
1205#, c-format
1206msgid "Could not write to '%s'"
1207msgstr "不能写入 '%s'"
1208
1209#: sequencer.c:195
1210msgid ""
1211"after resolving the conflicts, mark the corrected paths\n"
1212"with 'git add <paths>' or 'git rm <paths>'"
1213msgstr ""
1214"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1215"命令标记修正后的文件"
1216
1217#: sequencer.c:198
1218msgid ""
1219"after resolving the conflicts, mark the corrected paths\n"
1220"with 'git add <paths>' or 'git rm <paths>'\n"
1221"and commit the result with 'git commit'"
1222msgstr ""
1223"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1224"对修正后的文件做标记,然后用 'git commit' 提交"
1225
1226#: sequencer.c:211 sequencer.c:861 sequencer.c:944
1227#, c-format
1228msgid "Could not write to %s"
1229msgstr "不能写入 %s"
1230
1231#: sequencer.c:214
1232#, c-format
1233msgid "Error wrapping up %s"
1234msgstr "错误收尾 %s"
1235
1236#: sequencer.c:229
1237msgid "Your local changes would be overwritten by cherry-pick."
1238msgstr "您的本地修改将被拣选操作覆盖。"
1239
1240#: sequencer.c:231
1241msgid "Your local changes would be overwritten by revert."
1242msgstr "您的本地修改将被还原操作覆盖。"
1243
1244#: sequencer.c:234
1245msgid "Commit your changes or stash them to proceed."
1246msgstr "提交您的修改或保存进度后再继续。"
1247
1248#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1249#: sequencer.c:321
1250#, c-format
1251msgid "%s: Unable to write new index file"
1252msgstr "%s:无法写入新索引文件"
1253
1254#: sequencer.c:339
1255msgid "Could not resolve HEAD commit\n"
1256msgstr "不能解析 HEAD 提交\n"
1257
1258#: sequencer.c:359
1259msgid "Unable to update cache tree\n"
1260msgstr "不能更新缓存\n"
1261
1262#: sequencer.c:411
1263#, c-format
1264msgid "Could not parse commit %s\n"
1265msgstr "不能解析提交 %s\n"
1266
1267#: sequencer.c:416
1268#, c-format
1269msgid "Could not parse parent commit %s\n"
1270msgstr "不能解析父提交 %s\n"
1271
1272#: sequencer.c:482
1273msgid "Your index file is unmerged."
1274msgstr "您的索引文件未完成合并。"
1275
1276#: sequencer.c:501
1277#, c-format
1278msgid "Commit %s is a merge but no -m option was given."
1279msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1280
1281#: sequencer.c:509
1282#, c-format
1283msgid "Commit %s does not have parent %d"
1284msgstr "提交 %s 没有父提交 %d"
1285
1286#: sequencer.c:513
1287#, c-format
1288msgid "Mainline was specified but commit %s is not a merge."
1289msgstr "指定了主线但提交 %s 不是一个合并。"
1290
1291#. TRANSLATORS: The first %s will be "revert" or
1292#. "cherry-pick", the second %s a SHA1
1293#: sequencer.c:526
1294#, c-format
1295msgid "%s: cannot parse parent commit %s"
1296msgstr "%s:不能解析父提交 %s"
1297
1298#: sequencer.c:530
1299#, c-format
1300msgid "Cannot get commit message for %s"
1301msgstr "不能得到 %s 的提交说明"
1302
1303#: sequencer.c:616
1304#, c-format
1305msgid "could not revert %s... %s"
1306msgstr "不能还原 %s... %s"
1307
1308#: sequencer.c:617
1309#, c-format
1310msgid "could not apply %s... %s"
1311msgstr "不能应用 %s... %s"
1312
1313#: sequencer.c:653
1314msgid "empty commit set passed"
1315msgstr "提供了空的提交集"
1316
1317#: sequencer.c:661
1318#, c-format
1319msgid "git %s: failed to read the index"
1320msgstr "git %s:无法读取索引"
1321
1322#: sequencer.c:665
1323#, c-format
1324msgid "git %s: failed to refresh the index"
1325msgstr "git %s:无法刷新索引"
1326
1327#: sequencer.c:725
1328#, c-format
1329msgid "Cannot %s during a %s"
1330msgstr "无法 %s 在一个 %s 过程中"
1331
1332#: sequencer.c:747
1333#, c-format
1334msgid "Could not parse line %d."
1335msgstr "不能解析第 %d 行。"
1336
1337#: sequencer.c:752
1338msgid "No commits parsed."
1339msgstr "没有提交被解析。"
1340
1341#: sequencer.c:765
1342#, c-format
1343msgid "Could not open %s"
1344msgstr "不能打开 %s"
1345
1346#: sequencer.c:769
1347#, c-format
1348msgid "Could not read %s."
1349msgstr "不能读取 %s。"
1350
1351#: sequencer.c:776
1352#, c-format
1353msgid "Unusable instruction sheet: %s"
1354msgstr "无用的指令表单:%s"
1355
1356#: sequencer.c:806
1357#, c-format
1358msgid "Invalid key: %s"
1359msgstr "无效键名:%s"
1360
1361#: sequencer.c:809
1362#, c-format
1363msgid "Invalid value for %s: %s"
1364msgstr "%s 的值无效:%s"
1365
1366#: sequencer.c:821
1367#, c-format
1368msgid "Malformed options sheet: %s"
1369msgstr "非法的选项表单:%s"
1370
1371#: sequencer.c:842
1372msgid "a cherry-pick or revert is already in progress"
1373msgstr "一个拣选或还原操作已在进行"
1374
1375#: sequencer.c:843
1376msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1377msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1378
1379#: sequencer.c:847
1380#, c-format
1381msgid "Could not create sequencer directory %s"
1382msgstr "不能创建序列目录 %s"
1383
1384#: sequencer.c:863 sequencer.c:948
1385#, c-format
1386msgid "Error wrapping up %s."
1387msgstr "错误收尾 %s。"
1388
1389#: sequencer.c:882 sequencer.c:1018
1390msgid "no cherry-pick or revert in progress"
1391msgstr "拣选或还原操作并未进行"
1392
1393#: sequencer.c:884
1394msgid "cannot resolve HEAD"
1395msgstr "不能解析 HEAD"
1396
1397#: sequencer.c:886
1398msgid "cannot abort from a branch yet to be born"
1399msgstr "不能从尚未建立的分支终止"
1400
1401#: sequencer.c:908 builtin/apply.c:4291
1402#, c-format
1403msgid "cannot open %s: %s"
1404msgstr "不能打开 %s:%s"
1405
1406#: sequencer.c:911
1407#, c-format
1408msgid "cannot read %s: %s"
1409msgstr "不能读取 %s:%s"
1410
1411#: sequencer.c:912
1412msgid "unexpected end of file"
1413msgstr "意外的文件结束"
1414
1415#: sequencer.c:918
1416#, c-format
1417msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1418msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1419
1420#: sequencer.c:941
1421#, c-format
1422msgid "Could not format %s."
1423msgstr "不能格式化 %s。"
1424
1425#: sequencer.c:1086
1426#, c-format
1427msgid "%s: can't cherry-pick a %s"
1428msgstr "%s:不能拣选一个%s"
1429
1430#: sequencer.c:1089
1431#, c-format
1432msgid "%s: bad revision"
1433msgstr "%s:错误的版本"
1434
1435#: sequencer.c:1123
1436msgid "Can't revert as initial commit"
1437msgstr "不能作为初始提交还原"
1438
1439#: sequencer.c:1124
1440msgid "Can't cherry-pick into empty head"
1441msgstr "不能拣选到空分支"
1442
1443#: setup.c:243
1444#, c-format
1445msgid "failed to read %s"
1446msgstr "无法读取 %s"
1447
1448#: sha1_name.c:453
1449msgid ""
1450"Git normally never creates a ref that ends with 40 hex characters\n"
1451"because it will be ignored when you just specify 40-hex. These refs\n"
1452"may be created by mistake. For example,\n"
1453"\n"
1454" git checkout -b $br $(git rev-parse ...)\n"
1455"\n"
1456"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1457"examine these refs and maybe delete them. Turn this message off by\n"
1458"running \"git config advice.objectNameWarning false\""
1459msgstr ""
1460"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1461"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1462"\n"
1463" git checkout -b $br $(git rev-parse ...)\n"
1464"\n"
1465"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1466"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1467"命令关闭本消息通知。"
1468
1469#: submodule.c:64 submodule.c:98
1470msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1471msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1472
1473#: submodule.c:68 submodule.c:102
1474#, c-format
1475msgid "Could not find section in .gitmodules where path=%s"
1476msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1477
1478#: submodule.c:76
1479#, c-format
1480msgid "Could not update .gitmodules entry %s"
1481msgstr "不能更新 .gitmodules 条目 %s"
1482
1483#: submodule.c:109
1484#, c-format
1485msgid "Could not remove .gitmodules entry for %s"
1486msgstr "无法移除 %s 的 .gitmodules 条目"
1487
1488#: submodule.c:120
1489msgid "staging updated .gitmodules failed"
1490msgstr "将更新后 .gitmodules 添加暂存区失败"
1491
1492#: submodule.c:1115
1493#, c-format
1494msgid "Could not set core.worktree in %s"
1495msgstr "不能在 %s 中设置 core.worktree"
1496
1497#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1498#: trailer.c:561
1499#, c-format
1500msgid "unknown value '%s' for key '%s'"
1501msgstr "键 '%2$s' 的未知取值 '%1$s'"
1502
1503#: trailer.c:543 trailer.c:548 builtin/remote.c:290
1504#, c-format
1505msgid "more than one %s"
1506msgstr "多于一个 %s"
1507
1508#: trailer.c:581
1509#, c-format
1510msgid "empty trailer token in trailer '%.*s'"
1511msgstr "签名 '%.*s' 的键为空"
1512
1513#: trailer.c:701
1514#, c-format
1515msgid "could not read input file '%s'"
1516msgstr "不能读取输入文件 '%s'"
1517
1518#: trailer.c:704
1519msgid "could not read from stdin"
1520msgstr "不能自标准输入读取"
1521
1522#: unpack-trees.c:203
1523msgid "Checking out files"
1524msgstr "正在检出文件"
1525
1526#: urlmatch.c:120
1527msgid "invalid URL scheme name or missing '://' suffix"
1528msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1529
1530#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1531#, c-format
1532msgid "invalid %XX escape sequence"
1533msgstr "无效的 %XX 转义序列"
1534
1535#: urlmatch.c:172
1536msgid "missing host and scheme is not 'file:'"
1537msgstr "缺失主机名且URL方案不是 'file:'"
1538
1539#: urlmatch.c:189
1540msgid "a 'file:' URL may not have a port number"
1541msgstr "一个 'file:' URL 不应该包含端口号"
1542
1543#: urlmatch.c:199
1544msgid "invalid characters in host name"
1545msgstr "主机名中包含无效的字符"
1546
1547#: urlmatch.c:244 urlmatch.c:255
1548msgid "invalid port number"
1549msgstr "无效的端口号"
1550
1551#: urlmatch.c:322
1552msgid "invalid '..' path segment"
1553msgstr "无效的 '..' 路径片段"
1554
1555#: wrapper.c:523
1556#, c-format
1557msgid "unable to access '%s': %s"
1558msgstr "不能访问 '%s':%s"
1559
1560#: wrapper.c:544
1561#, c-format
1562msgid "unable to access '%s'"
1563msgstr "不能访问 '%s'"
1564
1565#: wrapper.c:555
1566#, c-format
1567msgid "unable to look up current user in the passwd file: %s"
1568msgstr "无法在口令文件中查询到当前用户:%s"
1569
1570#: wrapper.c:556
1571msgid "no such user"
1572msgstr "无此用户"
1573
1574#: wrapper.c:564
1575msgid "unable to get current working directory"
1576msgstr "不能获取当前工作目录"
1577
1578#: wrapper.c:575
1579#, c-format
1580msgid "could not open %s for writing"
1581msgstr "不能写入 %s"
1582
1583#: wrapper.c:587
1584#, c-format
1585msgid "could not write to %s"
1586msgstr "不能写入 %s"
1587
1588#: wrapper.c:593
1589#, c-format
1590msgid "could not close %s"
1591msgstr "不能关闭 %s"
1592
1593#: wt-status.c:150
1594msgid "Unmerged paths:"
1595msgstr "未合并的路径:"
1596
1597# 译者:注意保持前导空格
1598#: wt-status.c:177 wt-status.c:204
1599#, c-format
1600msgid " (use \"git reset %s <file>...\" to unstage)"
1601msgstr " (使用 \"git reset %s <文件>...\" 撤出暂存区)"
1602
1603# 译者:注意保持前导空格
1604#: wt-status.c:179 wt-status.c:206
1605msgid " (use \"git rm --cached <file>...\" to unstage)"
1606msgstr " (使用 \"git rm --cached <文件>...\" 撤出暂存区)"
1607
1608# 译者:注意保持前导空格
1609#: wt-status.c:183
1610msgid " (use \"git add <file>...\" to mark resolution)"
1611msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
1612
1613# 译者:注意保持前导空格
1614#: wt-status.c:185 wt-status.c:189
1615msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1616msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1617
1618# 译者:注意保持前导空格
1619#: wt-status.c:187
1620msgid " (use \"git rm <file>...\" to mark resolution)"
1621msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
1622
1623#: wt-status.c:198 wt-status.c:881
1624msgid "Changes to be committed:"
1625msgstr "要提交的变更:"
1626
1627#: wt-status.c:216 wt-status.c:890
1628msgid "Changes not staged for commit:"
1629msgstr "尚未暂存以备提交的变更:"
1630
1631# 译者:注意保持前导空格
1632#: wt-status.c:220
1633msgid " (use \"git add <file>...\" to update what will be committed)"
1634msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
1635
1636# 译者:注意保持前导空格
1637#: wt-status.c:222
1638msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1639msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
1640
1641# 译者:注意保持前导空格
1642#: wt-status.c:223
1643msgid ""
1644" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1645msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
1646
1647# 译者:注意保持前导空格
1648#: wt-status.c:225
1649msgid " (commit or discard the untracked or modified content in submodules)"
1650msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1651
1652# 译者:注意保持前导空格
1653#: wt-status.c:237
1654#, c-format
1655msgid " (use \"git %s <file>...\" to include in what will be committed)"
1656msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
1657
1658#: wt-status.c:252
1659msgid "both deleted:"
1660msgstr "双方删除:"
1661
1662#: wt-status.c:254
1663msgid "added by us:"
1664msgstr "由我们添加:"
1665
1666#: wt-status.c:256
1667msgid "deleted by them:"
1668msgstr "由他们删除:"
1669
1670#: wt-status.c:258
1671msgid "added by them:"
1672msgstr "由他们添加:"
1673
1674#: wt-status.c:260
1675msgid "deleted by us:"
1676msgstr "由我们删除:"
1677
1678#: wt-status.c:262
1679msgid "both added:"
1680msgstr "双方添加:"
1681
1682#: wt-status.c:264
1683msgid "both modified:"
1684msgstr "双方修改:"
1685
1686#: wt-status.c:266
1687#, c-format
1688msgid "bug: unhandled unmerged status %x"
1689msgstr "bug:无法处理的未合并状态 %x"
1690
1691#: wt-status.c:274
1692msgid "new file:"
1693msgstr "新文件:"
1694
1695#: wt-status.c:276
1696msgid "copied:"
1697msgstr "拷贝:"
1698
1699#: wt-status.c:278
1700msgid "deleted:"
1701msgstr "删除:"
1702
1703#: wt-status.c:280
1704msgid "modified:"
1705msgstr "修改:"
1706
1707#: wt-status.c:282
1708msgid "renamed:"
1709msgstr "重命名:"
1710
1711#: wt-status.c:284
1712msgid "typechange:"
1713msgstr "类型变更:"
1714
1715#: wt-status.c:286
1716msgid "unknown:"
1717msgstr "未知:"
1718
1719#: wt-status.c:288
1720msgid "unmerged:"
1721msgstr "未合并:"
1722
1723# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1724#: wt-status.c:370
1725msgid "new commits, "
1726msgstr "新提交, "
1727
1728# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1729#: wt-status.c:372
1730msgid "modified content, "
1731msgstr "修改的内容, "
1732
1733# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1734#: wt-status.c:374
1735msgid "untracked content, "
1736msgstr "未跟踪的内容, "
1737
1738#: wt-status.c:391
1739#, c-format
1740msgid "bug: unhandled diff status %c"
1741msgstr "bug:无法处理的差异状态 %c"
1742
1743#: wt-status.c:755
1744msgid "Submodules changed but not updated:"
1745msgstr "子模组已修改但尚未更新:"
1746
1747#: wt-status.c:757
1748msgid "Submodule changes to be committed:"
1749msgstr "要提交的子模组变更:"
1750
1751#: wt-status.c:838
1752msgid ""
1753"Do not touch the line above.\n"
1754"Everything below will be removed."
1755msgstr ""
1756"不要改动上面的一行。\n"
1757"下面的所有内容均将被删除。"
1758
1759#: wt-status.c:949
1760msgid "You have unmerged paths."
1761msgstr "您有尚未合并的路径。"
1762
1763# 译者:注意保持前导空格
1764#: wt-status.c:952
1765msgid " (fix conflicts and run \"git commit\")"
1766msgstr " (解决冲突并运行 \"git commit\")"
1767
1768#: wt-status.c:955
1769msgid "All conflicts fixed but you are still merging."
1770msgstr "所有冲突已解决但您仍处于合并中。"
1771
1772# 译者:注意保持前导空格
1773#: wt-status.c:958
1774msgid " (use \"git commit\" to conclude merge)"
1775msgstr " (使用 \"git commit\" 结束合并)"
1776
1777#: wt-status.c:968
1778msgid "You are in the middle of an am session."
1779msgstr "您正处于 am 操作过程中。"
1780
1781#: wt-status.c:971
1782msgid "The current patch is empty."
1783msgstr "当前的补丁为空。"
1784
1785# 译者:注意保持前导空格
1786#: wt-status.c:975
1787msgid " (fix conflicts and then run \"git am --continue\")"
1788msgstr " (解决冲突,然后运行 \"git am --continue\")"
1789
1790# 译者:注意保持前导空格
1791#: wt-status.c:977
1792msgid " (use \"git am --skip\" to skip this patch)"
1793msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1794
1795# 译者:注意保持前导空格
1796#: wt-status.c:979
1797msgid " (use \"git am --abort\" to restore the original branch)"
1798msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1799
1800#: wt-status.c:1039 wt-status.c:1056
1801#, c-format
1802msgid "You are currently rebasing branch '%s' on '%s'."
1803msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1804
1805#: wt-status.c:1044 wt-status.c:1061
1806msgid "You are currently rebasing."
1807msgstr "您在执行变基操作。"
1808
1809# 译者:注意保持前导空格
1810#: wt-status.c:1047
1811msgid " (fix conflicts and then run \"git rebase --continue\")"
1812msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1813
1814# 译者:注意保持前导空格
1815#: wt-status.c:1049
1816msgid " (use \"git rebase --skip\" to skip this patch)"
1817msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1818
1819# 译者:注意保持前导空格
1820#: wt-status.c:1051
1821msgid " (use \"git rebase --abort\" to check out the original branch)"
1822msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1823
1824# 译者:注意保持前导空格
1825#: wt-status.c:1064
1826msgid " (all conflicts fixed: run \"git rebase --continue\")"
1827msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1828
1829#: wt-status.c:1068
1830#, c-format
1831msgid ""
1832"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1833msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1834
1835#: wt-status.c:1073
1836msgid "You are currently splitting a commit during a rebase."
1837msgstr "您在执行变基操作时拆分提交。"
1838
1839# 译者:注意保持前导空格
1840#: wt-status.c:1076
1841msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1842msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1843
1844#: wt-status.c:1080
1845#, c-format
1846msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1847msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1848
1849#: wt-status.c:1085
1850msgid "You are currently editing a commit during a rebase."
1851msgstr "您在执行变基操作时编辑提交。"
1852
1853# 译者:注意保持前导空格
1854#: wt-status.c:1088
1855msgid " (use \"git commit --amend\" to amend the current commit)"
1856msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1857
1858# 译者:注意保持前导空格
1859#: wt-status.c:1090
1860msgid ""
1861" (use \"git rebase --continue\" once you are satisfied with your changes)"
1862msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1863
1864#: wt-status.c:1100
1865#, c-format
1866msgid "You are currently cherry-picking commit %s."
1867msgstr "您在执行拣选提交 %s 的操作。"
1868
1869# 译者:注意保持前导空格
1870#: wt-status.c:1105
1871msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1872msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1873
1874# 译者:注意保持前导空格
1875#: wt-status.c:1108
1876msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1877msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1878
1879# 译者:注意保持前导空格
1880#: wt-status.c:1110
1881msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1882msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1883
1884#: wt-status.c:1119
1885#, c-format
1886msgid "You are currently reverting commit %s."
1887msgstr "您在执行反转提交 %s 的操作。"
1888
1889# 译者:注意保持前导空格
1890#: wt-status.c:1124
1891msgid " (fix conflicts and run \"git revert --continue\")"
1892msgstr " (解决冲突并运行 \"git revert --continue\")"
1893
1894# 译者:注意保持前导空格
1895#: wt-status.c:1127
1896msgid " (all conflicts fixed: run \"git revert --continue\")"
1897msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1898
1899# 译者:注意保持前导空格
1900#: wt-status.c:1129
1901msgid " (use \"git revert --abort\" to cancel the revert operation)"
1902msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1903
1904#: wt-status.c:1140
1905#, c-format
1906msgid "You are currently bisecting, started from branch '%s'."
1907msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1908
1909#: wt-status.c:1144
1910msgid "You are currently bisecting."
1911msgstr "您在执行二分查找操作。"
1912
1913# 译者:注意保持前导空格
1914#: wt-status.c:1147
1915msgid " (use \"git bisect reset\" to get back to the original branch)"
1916msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1917
1918#: wt-status.c:1324
1919msgid "On branch "
1920msgstr "位于分支 "
1921
1922#: wt-status.c:1331
1923msgid "rebase in progress; onto "
1924msgstr "变基操作正在进行中;至 "
1925
1926#: wt-status.c:1336
1927msgid "HEAD detached at "
1928msgstr "头指针分离于 "
1929
1930#: wt-status.c:1338
1931msgid "HEAD detached from "
1932msgstr "头指针分离自 "
1933
1934#: wt-status.c:1341
1935msgid "Not currently on any branch."
1936msgstr "当前不在任何分支上。"
1937
1938#: wt-status.c:1358
1939msgid "Initial commit"
1940msgstr "初始提交"
1941
1942#: wt-status.c:1372
1943msgid "Untracked files"
1944msgstr "未跟踪的文件"
1945
1946#: wt-status.c:1374
1947msgid "Ignored files"
1948msgstr "忽略的文件"
1949
1950#: wt-status.c:1378
1951#, c-format
1952msgid ""
1953"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1954"may speed it up, but you have to be careful not to forget to add\n"
1955"new files yourself (see 'git help status')."
1956msgstr ""
1957"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1958"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1959
1960#: wt-status.c:1384
1961#, c-format
1962msgid "Untracked files not listed%s"
1963msgstr "未跟踪的文件没有列出%s"
1964
1965# 译者:中文字符串拼接,可删除前导空格
1966#: wt-status.c:1386
1967msgid " (use -u option to show untracked files)"
1968msgstr "(使用 -u 参数显示未跟踪的文件)"
1969
1970#: wt-status.c:1392
1971msgid "No changes"
1972msgstr "没有修改"
1973
1974#: wt-status.c:1397
1975#, c-format
1976msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1977msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1978
1979#: wt-status.c:1400
1980#, c-format
1981msgid "no changes added to commit\n"
1982msgstr "修改尚未加入提交\n"
1983
1984#: wt-status.c:1403
1985#, c-format
1986msgid ""
1987"nothing added to commit but untracked files present (use \"git add\" to "
1988"track)\n"
1989msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1990
1991#: wt-status.c:1406
1992#, c-format
1993msgid "nothing added to commit but untracked files present\n"
1994msgstr "提交为空,但是存在尚未跟踪的文件\n"
1995
1996# 译者:中文字符串拼接,可删除前导空格
1997#: wt-status.c:1409
1998#, c-format
1999msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2000msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
2001
2002#: wt-status.c:1412 wt-status.c:1417
2003#, c-format
2004msgid "nothing to commit\n"
2005msgstr "无文件要提交\n"
2006
2007# 译者:中文字符串拼接,可删除前导空格
2008#: wt-status.c:1415
2009#, c-format
2010msgid "nothing to commit (use -u to show untracked files)\n"
2011msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
2012
2013# 译者:中文字符串拼接,可删除前导空格
2014#: wt-status.c:1419
2015#, c-format
2016msgid "nothing to commit, working directory clean\n"
2017msgstr "无文件要提交,干净的工作区\n"
2018
2019#: wt-status.c:1528
2020msgid "HEAD (no branch)"
2021msgstr "HEAD(非分支)"
2022
2023# 译者:注意保持句尾空格
2024#: wt-status.c:1534
2025msgid "Initial commit on "
2026msgstr "初始提交于 "
2027
2028#: wt-status.c:1561
2029msgid "gone"
2030msgstr "丢失"
2031
2032# 译者:注意保持句尾空格
2033#: wt-status.c:1563 wt-status.c:1571
2034msgid "behind "
2035msgstr "落后 "
2036
2037#: compat/precompose_utf8.c:55 builtin/clone.c:345
2038#, c-format
2039msgid "failed to unlink '%s'"
2040msgstr "无法删除 '%s'"
2041
2042#: builtin/add.c:22
2043msgid "git add [<options>] [--] <pathspec>..."
2044msgstr "git add [<选项>] [--] <路径规则>..."
2045
2046#: builtin/add.c:65
2047#, c-format
2048msgid "unexpected diff status %c"
2049msgstr "意外的差异状态 %c"
2050
2051#: builtin/add.c:70 builtin/commit.c:277
2052msgid "updating files failed"
2053msgstr "更新文件失败"
2054
2055#: builtin/add.c:80
2056#, c-format
2057msgid "remove '%s'\n"
2058msgstr "删除 '%s'\n"
2059
2060#: builtin/add.c:134
2061msgid "Unstaged changes after refreshing the index:"
2062msgstr "刷新索引之后尚未被暂存的变更:"
2063
2064#: builtin/add.c:194 builtin/rev-parse.c:796
2065msgid "Could not read the index"
2066msgstr "不能读取索引"
2067
2068#: builtin/add.c:205
2069#, c-format
2070msgid "Could not open '%s' for writing."
2071msgstr "不能打开 '%s' 以写入。"
2072
2073#: builtin/add.c:209
2074msgid "Could not write patch"
2075msgstr "不能生成补丁"
2076
2077#: builtin/add.c:212
2078msgid "editing patch failed"
2079msgstr "编辑补丁失败"
2080
2081#: builtin/add.c:215
2082#, c-format
2083msgid "Could not stat '%s'"
2084msgstr "不能查看文件状态 '%s'"
2085
2086#: builtin/add.c:217
2087msgid "Empty patch. Aborted."
2088msgstr "空补丁。异常终止。"
2089
2090#: builtin/add.c:222
2091#, c-format
2092msgid "Could not apply '%s'"
2093msgstr "不能应用 '%s'"
2094
2095#: builtin/add.c:232
2096msgid "The following paths are ignored by one of your .gitignore files:\n"
2097msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2098
2099#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
2100#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
2101#: builtin/rm.c:268
2102msgid "dry run"
2103msgstr "演习"
2104
2105#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
2106#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
2107#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2108msgid "be verbose"
2109msgstr "冗长输出"
2110
2111#: builtin/add.c:252
2112msgid "interactive picking"
2113msgstr "交互式拣选"
2114
2115#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
2116msgid "select hunks interactively"
2117msgstr "交互式挑选数据块"
2118
2119#: builtin/add.c:254
2120msgid "edit current diff and apply"
2121msgstr "编辑当前差异并应用"
2122
2123#: builtin/add.c:255
2124msgid "allow adding otherwise ignored files"
2125msgstr "允许添加忽略的文件"
2126
2127#: builtin/add.c:256
2128msgid "update tracked files"
2129msgstr "更新已跟踪的文件"
2130
2131#: builtin/add.c:257
2132msgid "record only the fact that the path will be added later"
2133msgstr "只记录,该路径稍后再添加"
2134
2135#: builtin/add.c:258
2136msgid "add changes from all tracked and untracked files"
2137msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2138
2139#: builtin/add.c:261
2140msgid "ignore paths removed in the working tree (same as --no-all)"
2141msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2142
2143#: builtin/add.c:263
2144msgid "don't add, only refresh the index"
2145msgstr "不添加,只刷新索引"
2146
2147#: builtin/add.c:264
2148msgid "just skip files which cannot be added because of errors"
2149msgstr "跳过因出错不能添加的文件"
2150
2151#: builtin/add.c:265
2152msgid "check if - even missing - files are ignored in dry run"
2153msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2154
2155#: builtin/add.c:287
2156#, c-format
2157msgid "Use -f if you really want to add them.\n"
2158msgstr "使用 -f 参数如果您确实要添加它们。\n"
2159
2160#: builtin/add.c:294
2161msgid "adding files failed"
2162msgstr "添加文件失败"
2163
2164#: builtin/add.c:330
2165msgid "-A and -u are mutually incompatible"
2166msgstr "-A 和 -u 选项互斥"
2167
2168#: builtin/add.c:337
2169msgid "Option --ignore-missing can only be used together with --dry-run"
2170msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2171
2172#: builtin/add.c:358
2173#, c-format
2174msgid "Nothing specified, nothing added.\n"
2175msgstr "没有指定文件,也没有文件被添加。\n"
2176
2177#: builtin/add.c:359
2178#, c-format
2179msgid "Maybe you wanted to say 'git add .'?\n"
2180msgstr "也许您想要执行 'git add .'?\n"
2181
2182#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918
2183#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
2184msgid "index file corrupt"
2185msgstr "索引文件损坏"
2186
2187#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
2188msgid "Unable to write new index file"
2189msgstr "无法写入新索引文件"
2190
2191#: builtin/apply.c:59
2192msgid "git apply [<options>] [<patch>...]"
2193msgstr "git apply [<选项>] [<补丁>...]"
2194
2195#: builtin/apply.c:112
2196#, c-format
2197msgid "unrecognized whitespace option '%s'"
2198msgstr "未能识别的空白字符选项 '%s'"
2199
2200#: builtin/apply.c:127
2201#, c-format
2202msgid "unrecognized whitespace ignore option '%s'"
2203msgstr "未能识别的空白字符忽略选项 '%s'"
2204
2205#: builtin/apply.c:822
2206#, c-format
2207msgid "Cannot prepare timestamp regexp %s"
2208msgstr "无法准备时间戳正则表达式 %s"
2209
2210#: builtin/apply.c:831
2211#, c-format
2212msgid "regexec returned %d for input: %s"
2213msgstr "regexec 返回 %d,输入为:%s"
2214
2215#: builtin/apply.c:912
2216#, c-format
2217msgid "unable to find filename in patch at line %d"
2218msgstr "不能在补丁的第 %d 行找到文件名"
2219
2220#: builtin/apply.c:944
2221#, c-format
2222msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2223msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2224
2225#: builtin/apply.c:948
2226#, c-format
2227msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2228msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2229
2230#: builtin/apply.c:949
2231#, c-format
2232msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2233msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2234
2235#: builtin/apply.c:956
2236#, c-format
2237msgid "git apply: bad git-diff - expected /dev/null on line %d"
2238msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2239
2240#: builtin/apply.c:1419
2241#, c-format
2242msgid "recount: unexpected line: %.*s"
2243msgstr "recount:意外的行:%.*s"
2244
2245#: builtin/apply.c:1476
2246#, c-format
2247msgid "patch fragment without header at line %d: %.*s"
2248msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2249
2250#: builtin/apply.c:1493
2251#, c-format
2252msgid ""
2253"git diff header lacks filename information when removing %d leading pathname "
2254"component (line %d)"
2255msgid_plural ""
2256"git diff header lacks filename information when removing %d leading pathname "
2257"components (line %d)"
2258msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2259msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2260
2261#: builtin/apply.c:1659
2262msgid "new file depends on old contents"
2263msgstr "新文件依赖旧内容"
2264
2265#: builtin/apply.c:1661
2266msgid "deleted file still has contents"
2267msgstr "删除的文件仍有内容"
2268
2269#: builtin/apply.c:1687
2270#, c-format
2271msgid "corrupt patch at line %d"
2272msgstr "补丁在第 %d 行损坏"
2273
2274#: builtin/apply.c:1723
2275#, c-format
2276msgid "new file %s depends on old contents"
2277msgstr "新文件 %s 依赖旧内容"
2278
2279#: builtin/apply.c:1725
2280#, c-format
2281msgid "deleted file %s still has contents"
2282msgstr "删除的文件 %s 仍有内容"
2283
2284#: builtin/apply.c:1728
2285#, c-format
2286msgid "** warning: file %s becomes empty but is not deleted"
2287msgstr "** 警告:文件 %s 成为空文件但并未删除"
2288
2289#: builtin/apply.c:1874
2290#, c-format
2291msgid "corrupt binary patch at line %d: %.*s"
2292msgstr "二进制补丁在第 %d 行损坏:%.*s"
2293
2294#: builtin/apply.c:1903
2295#, c-format
2296msgid "unrecognized binary patch at line %d"
2297msgstr "未能识别的二进制补丁位于第 %d 行"
2298
2299#: builtin/apply.c:2054
2300#, c-format
2301msgid "patch with only garbage at line %d"
2302msgstr "补丁文件的第 %d 行只有垃圾数据"
2303
2304#: builtin/apply.c:2144
2305#, c-format
2306msgid "unable to read symlink %s"
2307msgstr "无法读取符号链接 %s"
2308
2309#: builtin/apply.c:2148
2310#, c-format
2311msgid "unable to open or read %s"
2312msgstr "不能打开或读取 %s"
2313
2314#: builtin/apply.c:2781
2315#, c-format
2316msgid "invalid start of line: '%c'"
2317msgstr "无效的行首字符:'%c'"
2318
2319#: builtin/apply.c:2900
2320#, c-format
2321msgid "Hunk #%d succeeded at %d (offset %d line)."
2322msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2323msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2324msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2325
2326#: builtin/apply.c:2912
2327#, c-format
2328msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2329msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2330
2331#: builtin/apply.c:2918
2332#, c-format
2333msgid ""
2334"while searching for:\n"
2335"%.*s"
2336msgstr ""
2337"当查询:\n"
2338"%.*s"
2339
2340#: builtin/apply.c:2938
2341#, c-format
2342msgid "missing binary patch data for '%s'"
2343msgstr "缺失 '%s' 的二进制补丁数据"
2344
2345#: builtin/apply.c:3039
2346#, c-format
2347msgid "binary patch does not apply to '%s'"
2348msgstr "二进制补丁未应用到 '%s'"
2349
2350#: builtin/apply.c:3045
2351#, c-format
2352msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2353msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2354
2355#: builtin/apply.c:3066
2356#, c-format
2357msgid "patch failed: %s:%ld"
2358msgstr "打补丁失败:%s:%ld"
2359
2360#: builtin/apply.c:3190
2361#, c-format
2362msgid "cannot checkout %s"
2363msgstr "不能检出 %s"
2364
2365#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
2366#, c-format
2367msgid "read of %s failed"
2368msgstr "读取 %s 失败"
2369
2370#: builtin/apply.c:3243
2371#, c-format
2372msgid "reading from '%s' beyond a symbolic link"
2373msgstr "读取位于符号链接中的 '%s'"
2374
2375#: builtin/apply.c:3271 builtin/apply.c:3493
2376#, c-format
2377msgid "path %s has been renamed/deleted"
2378msgstr "路径 %s 已经被重命名/删除"
2379
2380#: builtin/apply.c:3352 builtin/apply.c:3507
2381#, c-format
2382msgid "%s: does not exist in index"
2383msgstr "%s:不存在于索引中"
2384
2385#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
2386#, c-format
2387msgid "%s: %s"
2388msgstr "%s:%s"
2389
2390#: builtin/apply.c:3361 builtin/apply.c:3515
2391#, c-format
2392msgid "%s: does not match index"
2393msgstr "%s:和索引不匹配"
2394
2395#: builtin/apply.c:3463
2396msgid "removal patch leaves file contents"
2397msgstr "移除补丁仍留下了文件内容"
2398
2399#: builtin/apply.c:3532
2400#, c-format
2401msgid "%s: wrong type"
2402msgstr "%s:错误类型"
2403
2404#: builtin/apply.c:3534
2405#, c-format
2406msgid "%s has type %o, expected %o"
2407msgstr "%s 的类型是 %o,应为 %o"
2408
2409#: builtin/apply.c:3693 builtin/apply.c:3695
2410#, c-format
2411msgid "invalid path '%s'"
2412msgstr "无效路径 '%s'"
2413
2414#: builtin/apply.c:3750
2415#, c-format
2416msgid "%s: already exists in index"
2417msgstr "%s:已经存在于索引中"
2418
2419#: builtin/apply.c:3753
2420#, c-format
2421msgid "%s: already exists in working directory"
2422msgstr "%s:已经存在于工作区中"
2423
2424#: builtin/apply.c:3773
2425#, c-format
2426msgid "new mode (%o) of %s does not match old mode (%o)"
2427msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2428
2429#: builtin/apply.c:3778
2430#, c-format
2431msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2432msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2433
2434#: builtin/apply.c:3798
2435#, c-format
2436msgid "affected file '%s' is beyond a symbolic link"
2437msgstr "受影响的文件 '%s' 位于符号链接中"
2438
2439#: builtin/apply.c:3802
2440#, c-format
2441msgid "%s: patch does not apply"
2442msgstr "%s:补丁未应用"
2443
2444#: builtin/apply.c:3816
2445#, c-format
2446msgid "Checking patch %s..."
2447msgstr "检查补丁 %s..."
2448
2449#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
2450#, c-format
2451msgid "make_cache_entry failed for path '%s'"
2452msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2453
2454#: builtin/apply.c:4052
2455#, c-format
2456msgid "unable to remove %s from index"
2457msgstr "不能从索引中移除 %s"
2458
2459#: builtin/apply.c:4081
2460#, c-format
2461msgid "corrupt patch for submodule %s"
2462msgstr "子模组 %s 损坏的补丁"
2463
2464#: builtin/apply.c:4085
2465#, c-format
2466msgid "unable to stat newly created file '%s'"
2467msgstr "不能枚举新建文件 '%s' 的状态"
2468
2469#: builtin/apply.c:4090
2470#, c-format
2471msgid "unable to create backing store for newly created file %s"
2472msgstr "不能为新建文件 %s 创建后端存储"
2473
2474#: builtin/apply.c:4093 builtin/apply.c:4201
2475#, c-format
2476msgid "unable to add cache entry for %s"
2477msgstr "无法为 %s 添加缓存条目"
2478
2479#: builtin/apply.c:4126
2480#, c-format
2481msgid "closing file '%s'"
2482msgstr "关闭文件 '%s'"
2483
2484#: builtin/apply.c:4175
2485#, c-format
2486msgid "unable to write file '%s' mode %o"
2487msgstr "不能写文件 '%s' 权限 %o"
2488
2489#: builtin/apply.c:4262
2490#, c-format
2491msgid "Applied patch %s cleanly."
2492msgstr "成功应用补丁 %s。"
2493
2494#: builtin/apply.c:4270
2495msgid "internal error"
2496msgstr "内部错误"
2497
2498#: builtin/apply.c:4273
2499#, c-format
2500msgid "Applying patch %%s with %d reject..."
2501msgid_plural "Applying patch %%s with %d rejects..."
2502msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2503msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2504
2505#: builtin/apply.c:4283
2506#, c-format
2507msgid "truncating .rej filename to %.*s.rej"
2508msgstr "截短 .rej 文件名为 %.*s.rej"
2509
2510#: builtin/apply.c:4304
2511#, c-format
2512msgid "Hunk #%d applied cleanly."
2513msgstr "第 #%d 个片段成功应用。"
2514
2515#: builtin/apply.c:4307
2516#, c-format
2517msgid "Rejected hunk #%d."
2518msgstr "拒绝第 #%d 个片段。"
2519
2520#: builtin/apply.c:4397
2521msgid "unrecognized input"
2522msgstr "未能识别的输入"
2523
2524#: builtin/apply.c:4408
2525msgid "unable to read index file"
2526msgstr "无法读取索引文件"
2527
2528#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
2529#: builtin/fetch.c:92
2530msgid "path"
2531msgstr "路径"
2532
2533#: builtin/apply.c:4526
2534msgid "don't apply changes matching the given path"
2535msgstr "不要应用与给出路径向匹配的变更"
2536
2537#: builtin/apply.c:4529
2538msgid "apply changes matching the given path"
2539msgstr "应用与给出路径向匹配的变更"
2540
2541#: builtin/apply.c:4531
2542msgid "num"
2543msgstr "数字"
2544
2545#: builtin/apply.c:4532
2546msgid "remove <num> leading slashes from traditional diff paths"
2547msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2548
2549#: builtin/apply.c:4535
2550msgid "ignore additions made by the patch"
2551msgstr "忽略补丁中的添加的文件"
2552
2553#: builtin/apply.c:4537
2554msgid "instead of applying the patch, output diffstat for the input"
2555msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2556
2557#: builtin/apply.c:4541
2558msgid "show number of added and deleted lines in decimal notation"
2559msgstr "以十进制数显示添加和删除的行数"
2560
2561#: builtin/apply.c:4543
2562msgid "instead of applying the patch, output a summary for the input"
2563msgstr "不应用补丁,而是显示输入的概要"
2564
2565#: builtin/apply.c:4545
2566msgid "instead of applying the patch, see if the patch is applicable"
2567msgstr "不应用补丁,而是查看补丁是否可应用"
2568
2569#: builtin/apply.c:4547
2570msgid "make sure the patch is applicable to the current index"
2571msgstr "确认补丁可以应用到当前索引"
2572
2573#: builtin/apply.c:4549
2574msgid "apply a patch without touching the working tree"
2575msgstr "应用补丁而不修改工作区"
2576
2577#: builtin/apply.c:4551
2578msgid "accept a patch that touches outside the working area"
2579msgstr "接受修改工作区之外文件的补丁"
2580
2581#: builtin/apply.c:4553
2582msgid "also apply the patch (use with --stat/--summary/--check)"
2583msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2584
2585#: builtin/apply.c:4555
2586msgid "attempt three-way merge if a patch does not apply"
2587msgstr "如果一个补丁不能应用则尝试三路合并"
2588
2589#: builtin/apply.c:4557
2590msgid "build a temporary index based on embedded index information"
2591msgstr "创建一个临时索引基于嵌入的索引信息"
2592
2593#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
2594msgid "paths are separated with NUL character"
2595msgstr "路径以 NUL 字符分隔"
2596
2597#: builtin/apply.c:4562
2598msgid "ensure at least <n> lines of context match"
2599msgstr "确保至少匹配 <n> 行上下文"
2600
2601#: builtin/apply.c:4563
2602msgid "action"
2603msgstr "动作"
2604
2605#: builtin/apply.c:4564
2606msgid "detect new or modified lines that have whitespace errors"
2607msgstr "检查新增和修改的行中间的空白字符滥用"
2608
2609#: builtin/apply.c:4567 builtin/apply.c:4570
2610msgid "ignore changes in whitespace when finding context"
2611msgstr "查找上下文时忽略空白字符的变更"
2612
2613#: builtin/apply.c:4573
2614msgid "apply the patch in reverse"
2615msgstr "反向应用补丁"
2616
2617#: builtin/apply.c:4575
2618msgid "don't expect at least one line of context"
2619msgstr "无需至少一行上下文"
2620
2621#: builtin/apply.c:4577
2622msgid "leave the rejected hunks in corresponding *.rej files"
2623msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2624
2625#: builtin/apply.c:4579
2626msgid "allow overlapping hunks"
2627msgstr "允许重叠的补丁片段"
2628
2629#: builtin/apply.c:4582
2630msgid "tolerate incorrectly detected missing new-line at the end of file"
2631msgstr "允许不正确的文件末尾换行符"
2632
2633#: builtin/apply.c:4585
2634msgid "do not trust the line counts in the hunk headers"
2635msgstr "不信任补丁片段的头信息中的行号"
2636
2637#: builtin/apply.c:4587
2638msgid "root"
2639msgstr "根目录"
2640
2641#: builtin/apply.c:4588
2642msgid "prepend <root> to all filenames"
2643msgstr "为所有文件名前添加 <根目录>"
2644
2645#: builtin/apply.c:4610
2646msgid "--3way outside a repository"
2647msgstr "--3way 在一个版本库之外"
2648
2649#: builtin/apply.c:4618
2650msgid "--index outside a repository"
2651msgstr "--index 在一个版本库之外"
2652
2653#: builtin/apply.c:4621
2654msgid "--cached outside a repository"
2655msgstr "--cached 在一个版本库之外"
2656
2657#: builtin/apply.c:4640
2658#, c-format
2659msgid "can't open patch '%s'"
2660msgstr "不能打开补丁 '%s'"
2661
2662#: builtin/apply.c:4654
2663#, c-format
2664msgid "squelched %d whitespace error"
2665msgid_plural "squelched %d whitespace errors"
2666msgstr[0] "抑制下仍有 %d 个空白字符误用"
2667msgstr[1] "抑制下仍有 %d 个空白字符误用"
2668
2669#: builtin/apply.c:4660 builtin/apply.c:4670
2670#, c-format
2671msgid "%d line adds whitespace errors."
2672msgid_plural "%d lines add whitespace errors."
2673msgstr[0] "%d 行有空白字符误用。"
2674msgstr[1] "%d 行有空白字符误用。"
2675
2676#: builtin/archive.c:17
2677#, c-format
2678msgid "could not create archive file '%s'"
2679msgstr "不能创建归档文件 '%s'"
2680
2681#: builtin/archive.c:20
2682msgid "could not redirect output"
2683msgstr "不能重定向输出"
2684
2685#: builtin/archive.c:37
2686msgid "git archive: Remote with no URL"
2687msgstr "git archive:未提供远程URL"
2688
2689#: builtin/archive.c:58
2690msgid "git archive: expected ACK/NAK, got EOF"
2691msgstr "git archive:应为ACK/NACK,却得到EOF"
2692
2693#: builtin/archive.c:61
2694#, c-format
2695msgid "git archive: NACK %s"
2696msgstr "git archive:NACK %s"
2697
2698#: builtin/archive.c:63
2699#, c-format
2700msgid "remote error: %s"
2701msgstr "远程错误:%s"
2702
2703#: builtin/archive.c:64
2704msgid "git archive: protocol error"
2705msgstr "git archive:协议错误"
2706
2707#: builtin/archive.c:68
2708msgid "git archive: expected a flush"
2709msgstr "git archive:应为刷新"
2710
2711#: builtin/bisect--helper.c:7
2712msgid "git bisect--helper --next-all [--no-checkout]"
2713msgstr "git bisect--helper --next-all [--no-checkout]"
2714
2715#: builtin/bisect--helper.c:17
2716msgid "perform 'git bisect next'"
2717msgstr "执行 'git bisect next'"
2718
2719#: builtin/bisect--helper.c:19
2720msgid "update BISECT_HEAD instead of checking out the current commit"
2721msgstr "更新 BISECT_HEAD 而非检出当前提交"
2722
2723#: builtin/blame.c:31
2724msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
2725msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
2726
2727#: builtin/blame.c:36
2728msgid "<rev-opts> are documented in git-rev-list(1)"
2729msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
2730
2731#: builtin/blame.c:2500
2732msgid "Show blame entries as we find them, incrementally"
2733msgstr "增量式地显示发现的 blame 条目"
2734
2735#: builtin/blame.c:2501
2736msgid "Show blank SHA-1 for boundary commits (Default: off)"
2737msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2738
2739#: builtin/blame.c:2502
2740msgid "Do not treat root commits as boundaries (Default: off)"
2741msgstr "不把根提交作为边界(默认:关闭)"
2742
2743#: builtin/blame.c:2503
2744msgid "Show work cost statistics"
2745msgstr "显示命令消耗统计"
2746
2747#: builtin/blame.c:2504
2748msgid "Show output score for blame entries"
2749msgstr "显示判断 blame 条目位移的得分诊断信息"
2750
2751#: builtin/blame.c:2505
2752msgid "Show original filename (Default: auto)"
2753msgstr "显示原始文件名(默认:自动)"
2754
2755#: builtin/blame.c:2506
2756msgid "Show original linenumber (Default: off)"
2757msgstr "显示原始的行号(默认:关闭)"
2758
2759#: builtin/blame.c:2507
2760msgid "Show in a format designed for machine consumption"
2761msgstr "显示为一个适合机器读取的格式"
2762
2763#: builtin/blame.c:2508
2764msgid "Show porcelain format with per-line commit information"
2765msgstr "为每一行显示机器适用的提交信息"
2766
2767#: builtin/blame.c:2509
2768msgid "Use the same output mode as git-annotate (Default: off)"
2769msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2770
2771#: builtin/blame.c:2510
2772msgid "Show raw timestamp (Default: off)"
2773msgstr "显示原始时间戳(默认:关闭)"
2774
2775#: builtin/blame.c:2511
2776msgid "Show long commit SHA1 (Default: off)"
2777msgstr "显示长的SHA1提交号(默认:关闭)"
2778
2779#: builtin/blame.c:2512
2780msgid "Suppress author name and timestamp (Default: off)"
2781msgstr "隐藏作者名字和时间戳(默认:关闭)"
2782
2783#: builtin/blame.c:2513
2784msgid "Show author email instead of name (Default: off)"
2785msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2786
2787#: builtin/blame.c:2514
2788msgid "Ignore whitespace differences"
2789msgstr "忽略空白差异"
2790
2791#: builtin/blame.c:2515
2792msgid "Spend extra cycles to find better match"
2793msgstr "花费额外的循环来找到更好的匹配"
2794
2795#: builtin/blame.c:2516
2796msgid "Use revisions from <file> instead of calling git-rev-list"
2797msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
2798
2799#: builtin/blame.c:2517
2800msgid "Use <file>'s contents as the final image"
2801msgstr "使用 <文件> 的内容作为最终的图片"
2802
2803#: builtin/blame.c:2518 builtin/blame.c:2519
2804msgid "score"
2805msgstr "得分"
2806
2807#: builtin/blame.c:2518
2808msgid "Find line copies within and across files"
2809msgstr "找到文件内及跨文件的行拷贝"
2810
2811#: builtin/blame.c:2519
2812msgid "Find line movements within and across files"
2813msgstr "找到文件内及跨文件的行移动"
2814
2815#: builtin/blame.c:2520
2816msgid "n,m"
2817msgstr "n,m"
2818
2819#: builtin/blame.c:2520
2820msgid "Process only line range n,m, counting from 1"
2821msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2822
2823#. TRANSLATORS: This string is used to tell us the maximum
2824#. display width for a relative timestamp in "git blame"
2825#. output. For C locale, "4 years, 11 months ago", which
2826#. takes 22 places, is the longest among various forms of
2827#. relative timestamps, but your language may need more or
2828#. fewer display columns.
2829#: builtin/blame.c:2601
2830msgid "4 years, 11 months ago"
2831msgstr "4 年 11 个月前"
2832
2833#: builtin/branch.c:24
2834msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2835msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
2836
2837#: builtin/branch.c:25
2838msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2839msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
2840
2841#: builtin/branch.c:26
2842msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2843msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
2844
2845#: builtin/branch.c:27
2846msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2847msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
2848
2849# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2850#: builtin/branch.c:150
2851#, c-format
2852msgid ""
2853"deleting branch '%s' that has been merged to\n"
2854" '%s', but not yet merged to HEAD."
2855msgstr ""
2856"将要删除的分支 '%s' 已经被合并到\n"
2857" '%s',但未合并到 HEAD。"
2858
2859# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2860#: builtin/branch.c:154
2861#, c-format
2862msgid ""
2863"not deleting branch '%s' that is not yet merged to\n"
2864" '%s', even though it is merged to HEAD."
2865msgstr ""
2866"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2867" 然而却尚未被合并到分支 '%s' 。"
2868
2869#: builtin/branch.c:168
2870#, c-format
2871msgid "Couldn't look up commit object for '%s'"
2872msgstr "无法查询 '%s' 指向的提交对象"
2873
2874#: builtin/branch.c:172
2875#, c-format
2876msgid ""
2877"The branch '%s' is not fully merged.\n"
2878"If you are sure you want to delete it, run 'git branch -D %s'."
2879msgstr ""
2880"分支 '%s' 没有完全合并。\n"
2881"如果您确认要删除它,执行 'git branch -D %s'。"
2882
2883#: builtin/branch.c:185
2884msgid "Update of config-file failed"
2885msgstr "无法更新 config 文件"
2886
2887#: builtin/branch.c:213
2888msgid "cannot use -a with -d"
2889msgstr "不能将 -a 和 -d 同时使用"
2890
2891#: builtin/branch.c:219
2892msgid "Couldn't look up commit object for HEAD"
2893msgstr "无法查询 HEAD 指向的提交对象"
2894
2895#: builtin/branch.c:227
2896#, c-format
2897msgid "Cannot delete the branch '%s' which you are currently on."
2898msgstr "无法删除您当前所在的分支 '%s'。"
2899
2900#: builtin/branch.c:243
2901#, c-format
2902msgid "remote-tracking branch '%s' not found."
2903msgstr "未能找到远程跟踪分支 '%s'。"
2904
2905#: builtin/branch.c:244
2906#, c-format
2907msgid "branch '%s' not found."
2908msgstr "分支 '%s' 未发现。"
2909
2910#: builtin/branch.c:258
2911#, c-format
2912msgid "Error deleting remote-tracking branch '%s'"
2913msgstr "无法删除远程跟踪分支 '%s'"
2914
2915#: builtin/branch.c:259
2916#, c-format
2917msgid "Error deleting branch '%s'"
2918msgstr "无法删除分支 '%s'"
2919
2920#: builtin/branch.c:266
2921#, c-format
2922msgid "Deleted remote-tracking branch %s (was %s).\n"
2923msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
2924
2925#: builtin/branch.c:267
2926#, c-format
2927msgid "Deleted branch %s (was %s).\n"
2928msgstr "已删除分支 %s(曾为 %s)。\n"
2929
2930#: builtin/branch.c:368
2931#, c-format
2932msgid "branch '%s' does not point at a commit"
2933msgstr "分支 '%s' 未指向一个提交"
2934
2935#: builtin/branch.c:451
2936#, c-format
2937msgid "[%s: gone]"
2938msgstr "[%s: 丢失]"
2939
2940#: builtin/branch.c:456
2941#, c-format
2942msgid "[%s]"
2943msgstr "[%s]"
2944
2945#: builtin/branch.c:461
2946#, c-format
2947msgid "[%s: behind %d]"
2948msgstr "[%s:落后 %d]"
2949
2950#: builtin/branch.c:463
2951#, c-format
2952msgid "[behind %d]"
2953msgstr "[落后 %d]"
2954
2955#: builtin/branch.c:467
2956#, c-format
2957msgid "[%s: ahead %d]"
2958msgstr "[%s:领先 %d]"
2959
2960#: builtin/branch.c:469
2961#, c-format
2962msgid "[ahead %d]"
2963msgstr "[领先 %d]"
2964
2965#: builtin/branch.c:472
2966#, c-format
2967msgid "[%s: ahead %d, behind %d]"
2968msgstr "[%s:领先 %d,落后 %d]"
2969
2970#: builtin/branch.c:475
2971#, c-format
2972msgid "[ahead %d, behind %d]"
2973msgstr "[领先 %d,落后 %d]"
2974
2975#: builtin/branch.c:488
2976msgid " **** invalid ref ****"
2977msgstr " **** 无效引用 ****"
2978
2979#: builtin/branch.c:579
2980#, c-format
2981msgid "(no branch, rebasing %s)"
2982msgstr "(非分支,正变基 %s)"
2983
2984#: builtin/branch.c:582
2985#, c-format
2986msgid "(no branch, bisect started on %s)"
2987msgstr "(非分支,二分查找开始于 %s)"
2988
2989#: builtin/branch.c:588
2990#, c-format
2991msgid "(HEAD detached at %s)"
2992msgstr "(头指针分离于 %s)"
2993
2994#: builtin/branch.c:591
2995#, c-format
2996msgid "(HEAD detached from %s)"
2997msgstr "(头指针分离自 %s)"
2998
2999#: builtin/branch.c:595
3000msgid "(no branch)"
3001msgstr "(非分支)"
3002
3003#: builtin/branch.c:642
3004#, c-format
3005msgid "object '%s' does not point to a commit"
3006msgstr "对象 '%s' 没有指向一个提交"
3007
3008#: builtin/branch.c:690
3009msgid "some refs could not be read"
3010msgstr "一些引用不能读取"
3011
3012#: builtin/branch.c:703
3013msgid "cannot rename the current branch while not on any."
3014msgstr "无法重命名当前分支因为不处于任何分支上。"
3015
3016#: builtin/branch.c:713
3017#, c-format
3018msgid "Invalid branch name: '%s'"
3019msgstr "无效的分支名:'%s'"
3020
3021#: builtin/branch.c:728
3022msgid "Branch rename failed"
3023msgstr "分支重命名失败"
3024
3025#: builtin/branch.c:732
3026#, c-format
3027msgid "Renamed a misnamed branch '%s' away"
3028msgstr "重命名掉一个错误命名的旧分支 '%s'"
3029
3030#: builtin/branch.c:736
3031#, c-format
3032msgid "Branch renamed to %s, but HEAD is not updated!"
3033msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3034
3035#: builtin/branch.c:743
3036msgid "Branch is renamed, but update of config-file failed"
3037msgstr "分支被重命名,但更新 config 文件失败"
3038
3039#: builtin/branch.c:758
3040#, c-format
3041msgid "malformed object name %s"
3042msgstr "非法的对象名 %s"
3043
3044#: builtin/branch.c:780
3045#, c-format
3046msgid "could not write branch description template: %s"
3047msgstr "不能写分支描述模版:%s"
3048
3049#: builtin/branch.c:810
3050msgid "Generic options"
3051msgstr "通用选项"
3052
3053#: builtin/branch.c:812
3054msgid "show hash and subject, give twice for upstream branch"
3055msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3056
3057#: builtin/branch.c:813
3058msgid "suppress informational messages"
3059msgstr "不显示信息"
3060
3061#: builtin/branch.c:814
3062msgid "set up tracking mode (see git-pull(1))"
3063msgstr "设置跟踪模式(参见 git-pull(1))"
3064
3065#: builtin/branch.c:816
3066msgid "change upstream info"
3067msgstr "改变上游信息"
3068
3069#: builtin/branch.c:820
3070msgid "use colored output"
3071msgstr "使用彩色输出"
3072
3073#: builtin/branch.c:821
3074msgid "act on remote-tracking branches"
3075msgstr "作用于远程跟踪分支"
3076
3077#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
3078#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
3079#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
3080#: builtin/tag.c:622
3081msgid "commit"
3082msgstr "提交"
3083
3084#: builtin/branch.c:825 builtin/branch.c:831
3085msgid "print only branches that contain the commit"
3086msgstr "只打印包含该提交的分支"
3087
3088#: builtin/branch.c:837
3089msgid "Specific git-branch actions:"
3090msgstr "具体的 git-branch 动作:"
3091
3092#: builtin/branch.c:838
3093msgid "list both remote-tracking and local branches"
3094msgstr "列出远程跟踪及本地分支"
3095
3096#: builtin/branch.c:840
3097msgid "delete fully merged branch"
3098msgstr "删除完全合并的分支"
3099
3100#: builtin/branch.c:841
3101msgid "delete branch (even if not merged)"
3102msgstr "删除分支(即使没有合并)"
3103
3104#: builtin/branch.c:842
3105msgid "move/rename a branch and its reflog"
3106msgstr "移动/重命名一个分支,以及它的引用日志"
3107
3108#: builtin/branch.c:843
3109msgid "move/rename a branch, even if target exists"
3110msgstr "移动/重命名一个分支,即使目标已存在"
3111
3112#: builtin/branch.c:844
3113msgid "list branch names"
3114msgstr "列出分支名"
3115
3116#: builtin/branch.c:845
3117msgid "create the branch's reflog"
3118msgstr "创建分支的引用日志"
3119
3120#: builtin/branch.c:847
3121msgid "edit the description for the branch"
3122msgstr "标记分支的描述"
3123
3124#: builtin/branch.c:848
3125msgid "force creation, move/rename, deletion"
3126msgstr "强制创建、移动/重命名、删除"
3127
3128#: builtin/branch.c:851
3129msgid "print only not merged branches"
3130msgstr "只打印没有合并的分支"
3131
3132#: builtin/branch.c:857
3133msgid "print only merged branches"
3134msgstr "只打印合并的分支"
3135
3136#: builtin/branch.c:861
3137msgid "list branches in columns"
3138msgstr "以列的方式显示分支"
3139
3140#: builtin/branch.c:874
3141msgid "Failed to resolve HEAD as a valid ref."
3142msgstr "无法将 HEAD 解析为有效引用。"
3143
3144#: builtin/branch.c:878 builtin/clone.c:622
3145msgid "HEAD not found below refs/heads!"
3146msgstr "HEAD 没有位于 /refs/heads 之下!"
3147
3148#: builtin/branch.c:900
3149msgid "--column and --verbose are incompatible"
3150msgstr "--column 和 --verbose 不兼容"
3151
3152#: builtin/branch.c:911 builtin/branch.c:950
3153msgid "branch name required"
3154msgstr "必须提供分支名"
3155
3156#: builtin/branch.c:926
3157msgid "Cannot give description to detached HEAD"
3158msgstr "不能向分离头指针提供描述"
3159
3160#: builtin/branch.c:931
3161msgid "cannot edit description of more than one branch"
3162msgstr "不能为一个以上的分支编辑描述"
3163
3164#: builtin/branch.c:938
3165#, c-format
3166msgid "No commit on branch '%s' yet."
3167msgstr "分支 '%s' 尚无提交。"
3168
3169#: builtin/branch.c:941
3170#, c-format
3171msgid "No branch named '%s'."
3172msgstr "没有分支 '%s'。"
3173
3174#: builtin/branch.c:956
3175msgid "too many branches for a rename operation"
3176msgstr "为重命名操作提供了太多的分支名"
3177
3178#: builtin/branch.c:961
3179msgid "too many branches to set new upstream"
3180msgstr "为设置新上游提供了太多的分支名"
3181
3182#: builtin/branch.c:965
3183#, c-format
3184msgid ""
3185"could not set upstream of HEAD to %s when it does not point to any branch."
3186msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3187
3188#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011
3189#, c-format
3190msgid "no such branch '%s'"
3191msgstr "没有此分支 '%s'"
3192
3193#: builtin/branch.c:972
3194#, c-format
3195msgid "branch '%s' does not exist"
3196msgstr "分支 '%s' 不存在"
3197
3198#: builtin/branch.c:984
3199msgid "too many branches to unset upstream"
3200msgstr "为取消上游设置操作提供了太多的分支名"
3201
3202#: builtin/branch.c:988
3203msgid "could not unset upstream of HEAD when it does not point to any branch."
3204msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3205
3206#: builtin/branch.c:994
3207#, c-format
3208msgid "Branch '%s' has no upstream information"
3209msgstr "分支 '%s' 没有上游信息"
3210
3211#: builtin/branch.c:1008
3212msgid "it does not make sense to create 'HEAD' manually"
3213msgstr "手工创建 'HEAD' 没有意义"
3214
3215#: builtin/branch.c:1014
3216msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3217msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3218
3219#: builtin/branch.c:1017
3220#, c-format
3221msgid ""
3222"The --set-upstream flag is deprecated and will be removed. Consider using --"
3223"track or --set-upstream-to\n"
3224msgstr ""
3225"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3226
3227#: builtin/branch.c:1034
3228#, c-format
3229msgid ""
3230"\n"
3231"If you wanted to make '%s' track '%s', do this:\n"
3232"\n"
3233msgstr ""
3234"\n"
3235"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3236"\n"
3237
3238#: builtin/branch.c:1035
3239#, c-format
3240msgid " git branch -d %s\n"
3241msgstr " git branch -d %s\n"
3242
3243#: builtin/branch.c:1036
3244#, c-format
3245msgid " git branch --set-upstream-to %s\n"
3246msgstr " git branch --set-upstream-to %s\n"
3247
3248#: builtin/bundle.c:51
3249#, c-format
3250msgid "%s is okay\n"
3251msgstr "%s 可以\n"
3252
3253#: builtin/bundle.c:64
3254msgid "Need a repository to create a bundle."
3255msgstr "需要一个版本库来创建包。"
3256
3257#: builtin/bundle.c:68
3258msgid "Need a repository to unbundle."
3259msgstr "需要一个版本库来解包。"
3260
3261#: builtin/cat-file.c:369
3262msgid ""
3263"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3264"<type>|--textconv) <object>"
3265msgstr ""
3266"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3267">|--textconv) <对象>"
3268
3269#: builtin/cat-file.c:370
3270msgid ""
3271"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
3272"objects>"
3273msgstr ""
3274"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
3275
3276#: builtin/cat-file.c:407
3277msgid "<type> can be one of: blob, tree, commit, tag"
3278msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3279
3280#: builtin/cat-file.c:408
3281msgid "show object type"
3282msgstr "显示对象类型"
3283
3284#: builtin/cat-file.c:409
3285msgid "show object size"
3286msgstr "显示对象大小"
3287
3288#: builtin/cat-file.c:411
3289msgid "exit with zero when there's no error"
3290msgstr "当没有错误时退出并返回零"
3291
3292#: builtin/cat-file.c:412
3293msgid "pretty-print object's content"
3294msgstr "美观地打印对象的内容"
3295
3296#: builtin/cat-file.c:414
3297msgid "for blob objects, run textconv on object's content"
3298msgstr "对于数据(blob)对象,对其内容执行 textconv"
3299
3300#: builtin/cat-file.c:416
3301msgid "allow -s and -t to work with broken/corrupt objects"
3302msgstr "允许 -s 和 -t 对损坏的对象生效"
3303
3304#: builtin/cat-file.c:418
3305msgid "show info and content of objects fed from the standard input"
3306msgstr "显示从标准输入提供的对象的信息和内容"
3307
3308#: builtin/cat-file.c:421
3309msgid "show info about objects fed from the standard input"
3310msgstr "显示从标准输入提供的对象的信息"
3311
3312#: builtin/cat-file.c:424
3313msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3314msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3315
3316#: builtin/check-attr.c:11
3317msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3318msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
3319
3320#: builtin/check-attr.c:12
3321msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3322msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
3323
3324#: builtin/check-attr.c:19
3325msgid "report all attributes set on file"
3326msgstr "报告设置在文件上的所有属性"
3327
3328#: builtin/check-attr.c:20
3329msgid "use .gitattributes only from the index"
3330msgstr "只使用索引中的 .gitattributes"
3331
3332#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
3333msgid "read file names from stdin"
3334msgstr "从标准输入读出文件名"
3335
3336#: builtin/check-attr.c:23 builtin/check-ignore.c:24
3337msgid "terminate input and output records by a NUL character"
3338msgstr "输入和输出的记录使用 NUL 字符终结"
3339
3340#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
3341msgid "suppress progress reporting"
3342msgstr "不显示进度报告"
3343
3344#: builtin/check-ignore.c:26
3345msgid "show non-matching input paths"
3346msgstr "显示未匹配的输入路径"
3347
3348#: builtin/check-ignore.c:28
3349msgid "ignore index when checking"
3350msgstr "检查时忽略索引"
3351
3352#: builtin/check-ignore.c:154
3353msgid "cannot specify pathnames with --stdin"
3354msgstr "不能同时提供路径及 --stdin 参数"
3355
3356#: builtin/check-ignore.c:157
3357msgid "-z only makes sense with --stdin"
3358msgstr "-z 需要和 --stdin 参数共用才有意义"
3359
3360#: builtin/check-ignore.c:159
3361msgid "no path specified"
3362msgstr "未指定路径"
3363
3364#: builtin/check-ignore.c:163
3365msgid "--quiet is only valid with a single pathname"
3366msgstr "参数 --quiet 只在提供一个路径名时有效"
3367
3368#: builtin/check-ignore.c:165
3369msgid "cannot have both --quiet and --verbose"
3370msgstr "不能同时提供 --quiet 和 --verbose 参数"
3371
3372#: builtin/check-ignore.c:168
3373msgid "--non-matching is only valid with --verbose"
3374msgstr "--non-matching 选项只在使用 --verbose 时有效"
3375
3376#: builtin/check-mailmap.c:8
3377msgid "git check-mailmap [<options>] <contact>..."
3378msgstr "git check-mailmap [<选项>] <联系地址>..."
3379
3380#: builtin/check-mailmap.c:13
3381msgid "also read contacts from stdin"
3382msgstr "还从标准输入读取联系地址"
3383
3384#: builtin/check-mailmap.c:24
3385#, c-format
3386msgid "unable to parse contact: %s"
3387msgstr "不能解析联系地址:%s"
3388
3389#: builtin/check-mailmap.c:47
3390msgid "no contacts specified"
3391msgstr "未指定联系地址"
3392
3393#: builtin/checkout-index.c:126
3394msgid "git checkout-index [<options>] [--] [<file>...]"
3395msgstr "git checkout-index [<选项>] [--] [<文件>...]"
3396
3397#: builtin/checkout-index.c:188
3398msgid "check out all files in the index"
3399msgstr "检出索引区的所有文件"
3400
3401#: builtin/checkout-index.c:189
3402msgid "force overwrite of existing files"
3403msgstr "强制覆盖现有的文件"
3404
3405#: builtin/checkout-index.c:191
3406msgid "no warning for existing files and files not in index"
3407msgstr "存在或不在索引中的文件都没有警告"
3408
3409#: builtin/checkout-index.c:193
3410msgid "don't checkout new files"
3411msgstr "不检出新文件"
3412
3413#: builtin/checkout-index.c:195
3414msgid "update stat information in the index file"
3415msgstr "更新索引中文件的状态信息"
3416
3417#: builtin/checkout-index.c:201
3418msgid "read list of paths from the standard input"
3419msgstr "从标准输入读取路径列表"
3420
3421#: builtin/checkout-index.c:203
3422msgid "write the content to temporary files"
3423msgstr "将内容写入临时文件"
3424
3425#: builtin/checkout-index.c:204 builtin/column.c:30
3426msgid "string"
3427msgstr "字符串"
3428
3429#: builtin/checkout-index.c:205
3430msgid "when creating files, prepend <string>"
3431msgstr "在创建文件时,在前面加上<字符串>"
3432
3433#: builtin/checkout-index.c:208
3434msgid "copy out the files from named stage"
3435msgstr "从指定暂存区中拷出文件"
3436
3437#: builtin/checkout.c:24
3438msgid "git checkout [<options>] <branch>"
3439msgstr "git checkout [<选项>] <分支>"
3440
3441#: builtin/checkout.c:25
3442msgid "git checkout [<options>] [<branch>] -- <file>..."
3443msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
3444
3445#: builtin/checkout.c:134 builtin/checkout.c:167
3446#, c-format
3447msgid "path '%s' does not have our version"
3448msgstr "路径 '%s' 没有我们的版本"
3449
3450#: builtin/checkout.c:136 builtin/checkout.c:169
3451#, c-format
3452msgid "path '%s' does not have their version"
3453msgstr "路径 '%s' 没有他们的版本"
3454
3455#: builtin/checkout.c:152
3456#, c-format
3457msgid "path '%s' does not have all necessary versions"
3458msgstr "路径 '%s' 没有全部必须的版本"
3459
3460#: builtin/checkout.c:196
3461#, c-format
3462msgid "path '%s' does not have necessary versions"
3463msgstr "路径 '%s' 没有必须的版本"
3464
3465#: builtin/checkout.c:213
3466#, c-format
3467msgid "path '%s': cannot merge"
3468msgstr "path '%s':无法合并"
3469
3470#: builtin/checkout.c:230
3471#, c-format
3472msgid "Unable to add merge result for '%s'"
3473msgstr "无法为 '%s' 添加合并结果"
3474
3475#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
3476#: builtin/checkout.c:260
3477#, c-format
3478msgid "'%s' cannot be used with updating paths"
3479msgstr "'%s' 不能在更新路径时使用"
3480
3481#: builtin/checkout.c:263 builtin/checkout.c:266
3482#, c-format
3483msgid "'%s' cannot be used with %s"
3484msgstr "'%s' 不能和 %s 同时使用"
3485
3486#: builtin/checkout.c:269
3487#, c-format
3488msgid "Cannot update paths and switch to branch '%s' at the same time."
3489msgstr "不能同时更新路径并切换到分支'%s'。"
3490
3491#: builtin/checkout.c:280 builtin/checkout.c:474
3492msgid "corrupt index file"
3493msgstr "损坏的索引文件"
3494
3495#: builtin/checkout.c:340 builtin/checkout.c:347
3496#, c-format
3497msgid "path '%s' is unmerged"
3498msgstr "路径 '%s' 未合并"
3499
3500#: builtin/checkout.c:496
3501msgid "you need to resolve your current index first"
3502msgstr "您需要先解决当前索引的冲突"
3503
3504#: builtin/checkout.c:627
3505#, c-format
3506msgid "Can not do reflog for '%s'\n"
3507msgstr "不能对 '%s' 执行 reflog 操作\n"
3508
3509#: builtin/checkout.c:663
3510msgid "HEAD is now at"
3511msgstr "HEAD 目前位于"
3512
3513#: builtin/checkout.c:670
3514#, c-format
3515msgid "Reset branch '%s'\n"
3516msgstr "重置分支 '%s'\n"
3517
3518#: builtin/checkout.c:673
3519#, c-format
3520msgid "Already on '%s'\n"
3521msgstr "已经位于 '%s'\n"
3522
3523#: builtin/checkout.c:677
3524#, c-format
3525msgid "Switched to and reset branch '%s'\n"
3526msgstr "切换并重置分支 '%s'\n"
3527
3528#: builtin/checkout.c:679 builtin/checkout.c:1134
3529#, c-format
3530msgid "Switched to a new branch '%s'\n"
3531msgstr "切换到一个新分支 '%s'\n"
3532
3533#: builtin/checkout.c:681
3534#, c-format
3535msgid "Switched to branch '%s'\n"
3536msgstr "切换到分支 '%s'\n"
3537
3538# 译者:注意保持前导空格
3539#: builtin/checkout.c:733
3540#, c-format
3541msgid " ... and %d more.\n"
3542msgstr " ... 及其它 %d 个。\n"
3543
3544#: builtin/checkout.c:739
3545#, c-format
3546msgid ""
3547"Warning: you are leaving %d commit behind, not connected to\n"
3548"any of your branches:\n"
3549"\n"
3550"%s\n"
3551msgid_plural ""
3552"Warning: you are leaving %d commits behind, not connected to\n"
3553"any of your branches:\n"
3554"\n"
3555"%s\n"
3556msgstr[0] ""
3557"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3558"\n"
3559"%s\n"
3560msgstr[1] ""
3561"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3562"\n"
3563"%s\n"
3564
3565#: builtin/checkout.c:758
3566#, c-format
3567msgid ""
3568"If you want to keep it by creating a new branch, this may be a good time\n"
3569"to do so with:\n"
3570"\n"
3571" git branch <new-branch-name> %s\n"
3572"\n"
3573msgid_plural ""
3574"If you want to keep them by creating a new branch, this may be a good time\n"
3575"to do so with:\n"
3576"\n"
3577" git branch <new-branch-name> %s\n"
3578"\n"
3579msgstr[0] ""
3580"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
3581"如下操作:\n"
3582"\n"
3583" git branch <新分支名> %s\n"
3584"\n"
3585msgstr[1] ""
3586"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
3587"如下操作:\n"
3588"\n"
3589" git branch <新分支名> %s\n"
3590"\n"
3591
3592#: builtin/checkout.c:794
3593msgid "internal error in revision walk"
3594msgstr "在版本遍历时遇到内部错误"
3595
3596#: builtin/checkout.c:798
3597msgid "Previous HEAD position was"
3598msgstr "之前的 HEAD 位置是"
3599
3600#: builtin/checkout.c:825 builtin/checkout.c:1129
3601msgid "You are on a branch yet to be born"
3602msgstr "您位于一个尚未初始化的分支"
3603
3604#: builtin/checkout.c:931
3605#, c-format
3606msgid "'%s' is already checked out at '%s'"
3607msgstr "'%s' 已经检出到 '%s'"
3608
3609#: builtin/checkout.c:1036
3610#, c-format
3611msgid "only one reference expected, %d given."
3612msgstr "只要一个引用,却给出了 %d 个"
3613
3614#: builtin/checkout.c:1075
3615#, c-format
3616msgid "invalid reference: %s"
3617msgstr "无效引用:%s"
3618
3619#: builtin/checkout.c:1104
3620#, c-format
3621msgid "reference is not a tree: %s"
3622msgstr "引用不是一个树:%s"
3623
3624#: builtin/checkout.c:1143
3625msgid "paths cannot be used with switching branches"
3626msgstr "路径不能和切换分支同时使用"
3627
3628#: builtin/checkout.c:1146 builtin/checkout.c:1150
3629#, c-format
3630msgid "'%s' cannot be used with switching branches"
3631msgstr "'%s' 不能和切换分支同时使用"
3632
3633#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
3634#: builtin/checkout.c:1165
3635#, c-format
3636msgid "'%s' cannot be used with '%s'"
3637msgstr "'%s' 不能和 '%s' 同时使用"
3638
3639#: builtin/checkout.c:1170
3640#, c-format
3641msgid "Cannot switch branch to a non-commit '%s'"
3642msgstr "不能切换分支到一个非提交 '%s'"
3643
3644#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
3645#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
3646#: builtin/worktree.c:284
3647msgid "branch"
3648msgstr "分支"
3649
3650#: builtin/checkout.c:1204
3651msgid "create and checkout a new branch"
3652msgstr "创建并检出一个新的分支"
3653
3654#: builtin/checkout.c:1206
3655msgid "create/reset and checkout a branch"
3656msgstr "创建/重置并检出一个分支"
3657
3658#: builtin/checkout.c:1207
3659msgid "create reflog for new branch"
3660msgstr "为新的分支创建引用日志"
3661
3662#: builtin/checkout.c:1208
3663msgid "detach the HEAD at named commit"
3664msgstr "成为指向该提交的分离头指针"
3665
3666#: builtin/checkout.c:1209
3667msgid "set upstream info for new branch"
3668msgstr "为新的分支设置上游信息"
3669
3670#: builtin/checkout.c:1211
3671msgid "new-branch"
3672msgstr "新分支"
3673
3674#: builtin/checkout.c:1211
3675msgid "new unparented branch"
3676msgstr "新的没有父提交的分支"
3677
3678#: builtin/checkout.c:1212
3679msgid "checkout our version for unmerged files"
3680msgstr "对尚未合并的文件检出我们的版本"
3681
3682#: builtin/checkout.c:1214
3683msgid "checkout their version for unmerged files"
3684msgstr "对尚未合并的文件检出他们的版本"
3685
3686#: builtin/checkout.c:1216
3687msgid "force checkout (throw away local modifications)"
3688msgstr "强制检出(丢弃本地修改)"
3689
3690#: builtin/checkout.c:1217
3691msgid "perform a 3-way merge with the new branch"
3692msgstr "和新的分支执行三路合并"
3693
3694#: builtin/checkout.c:1218 builtin/merge.c:227
3695msgid "update ignored files (default)"
3696msgstr "更新忽略的文件(默认)"
3697
3698#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
3699msgid "style"
3700msgstr "风格"
3701
3702#: builtin/checkout.c:1220
3703msgid "conflict style (merge or diff3)"
3704msgstr "冲突输出风格(merge 或 diff3)"
3705
3706#: builtin/checkout.c:1223
3707msgid "do not limit pathspecs to sparse entries only"
3708msgstr "对路径不做稀疏检出的限制"
3709
3710#: builtin/checkout.c:1225
3711msgid "second guess 'git checkout <no-such-branch>'"
3712msgstr "二次猜测'git checkout <无此分支>'"
3713
3714#: builtin/checkout.c:1227
3715msgid "do not check if another worktree is holding the given ref"
3716msgstr "不检查指定的引用是否被其他工作区所占用"
3717
3718#: builtin/checkout.c:1252
3719msgid "-b, -B and --orphan are mutually exclusive"
3720msgstr "-b、-B 和 --orphan 是互斥的"
3721
3722#: builtin/checkout.c:1269
3723msgid "--track needs a branch name"
3724msgstr "--track 需要一个分支名"
3725
3726#: builtin/checkout.c:1274
3727msgid "Missing branch name; try -b"
3728msgstr "缺少分支名;尝试 -b"
3729
3730#: builtin/checkout.c:1310
3731msgid "invalid path specification"
3732msgstr "无效的路径规格"
3733
3734#: builtin/checkout.c:1317
3735#, c-format
3736msgid ""
3737"Cannot update paths and switch to branch '%s' at the same time.\n"
3738"Did you intend to checkout '%s' which can not be resolved as commit?"
3739msgstr ""
3740"不能同时更新路径并切换到分支'%s'。\n"
3741"您是想要检出 '%s' 但其未能解析为提交么?"
3742
3743#: builtin/checkout.c:1322
3744#, c-format
3745msgid "git checkout: --detach does not take a path argument '%s'"
3746msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3747
3748#: builtin/checkout.c:1326
3749msgid ""
3750"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3751"checking out of the index."
3752msgstr ""
3753"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3754
3755#: builtin/clean.c:26
3756msgid ""
3757"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3758msgstr ""
3759"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3760
3761#: builtin/clean.c:30
3762#, c-format
3763msgid "Removing %s\n"
3764msgstr "正删除 %s\n"
3765
3766#: builtin/clean.c:31
3767#, c-format
3768msgid "Would remove %s\n"
3769msgstr "将删除 %s\n"
3770
3771#: builtin/clean.c:32
3772#, c-format
3773msgid "Skipping repository %s\n"
3774msgstr "忽略版本库 %s\n"
3775
3776#: builtin/clean.c:33
3777#, c-format
3778msgid "Would skip repository %s\n"
3779msgstr "将忽略版本库 %s\n"
3780
3781#: builtin/clean.c:34
3782#, c-format
3783msgid "failed to remove %s"
3784msgstr "无法删除 %s"
3785
3786#: builtin/clean.c:295
3787msgid ""
3788"Prompt help:\n"
3789"1 - select a numbered item\n"
3790"foo - select item based on unique prefix\n"
3791" - (empty) select nothing"
3792msgstr ""
3793"帮助:\n"
3794"1 - 通过编号选择一个选项\n"
3795"foo - 通过标题选择一个选项\n"
3796" - (空)什么也不选择"
3797
3798#: builtin/clean.c:299
3799msgid ""
3800"Prompt help:\n"
3801"1 - select a single item\n"
3802"3-5 - select a range of items\n"
3803"2-3,6-9 - select multiple ranges\n"
3804"foo - select item based on unique prefix\n"
3805"-... - unselect specified items\n"
3806"* - choose all items\n"
3807" - (empty) finish selecting"
3808msgstr ""
3809"帮助:\n"
3810"1 - 选择一个选项\n"
3811"3-5 - 选择一个范围内的所有选项\n"
3812"2-3,6-9 - 选择多个范围内的所有选项\n"
3813"foo - 通过标题选择一个选项\n"
3814"-... - 反选特定的选项\n"
3815"* - 选择所有选项\n"
3816" - (空)结束选择"
3817
3818#: builtin/clean.c:515
3819#, c-format
3820msgid "Huh (%s)?"
3821msgstr "嗯(%s)?"
3822
3823#: builtin/clean.c:657
3824#, c-format
3825msgid "Input ignore patterns>> "
3826msgstr "输入模版以排除条目>> "
3827
3828#: builtin/clean.c:694
3829#, c-format
3830msgid "WARNING: Cannot find items matched by: %s"
3831msgstr "警告:无法找到和 %s 匹配的条目"
3832
3833#: builtin/clean.c:715
3834msgid "Select items to delete"
3835msgstr "选择要删除的条目"
3836
3837#. TRANSLATORS: Make sure to keep [y/N] as is
3838#: builtin/clean.c:756
3839#, c-format
3840msgid "Remove %s [y/N]? "
3841msgstr "删除 %s [y/N]?"
3842
3843#: builtin/clean.c:781
3844msgid "Bye."
3845msgstr "再见。"
3846
3847#: builtin/clean.c:789
3848msgid ""
3849"clean - start cleaning\n"
3850"filter by pattern - exclude items from deletion\n"
3851"select by numbers - select items to be deleted by numbers\n"
3852"ask each - confirm each deletion (like \"rm -i\")\n"
3853"quit - stop cleaning\n"
3854"help - this screen\n"
3855"? - help for prompt selection"
3856msgstr ""
3857"clean - 开始清理\n"
3858"filter by pattern - 通过模版排除要删除的条目\n"
3859"select by numbers - 通过数字选择要删除的条目\n"
3860"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3861"quit - 停止删除并退出\n"
3862"help - 显示本帮助\n"
3863"? - 显示如何在提示符下选择的帮助"
3864
3865#: builtin/clean.c:816
3866msgid "*** Commands ***"
3867msgstr "*** 命令 ***"
3868
3869#: builtin/clean.c:817
3870msgid "What now"
3871msgstr "请选择"
3872
3873#: builtin/clean.c:825
3874msgid "Would remove the following item:"
3875msgid_plural "Would remove the following items:"
3876msgstr[0] "将删除如下条目:"
3877msgstr[1] "将删除如下条目:"
3878
3879#: builtin/clean.c:842
3880msgid "No more files to clean, exiting."
3881msgstr "没有要清理的文件,退出。"
3882
3883#: builtin/clean.c:873
3884msgid "do not print names of files removed"
3885msgstr "不打印删除文件的名称"
3886
3887#: builtin/clean.c:875
3888msgid "force"
3889msgstr "强制"
3890
3891#: builtin/clean.c:876
3892msgid "interactive cleaning"
3893msgstr "交互式清除"
3894
3895#: builtin/clean.c:878
3896msgid "remove whole directories"
3897msgstr "删除整个目录"
3898
3899#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714
3900#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
3901msgid "pattern"
3902msgstr "模式"
3903
3904#: builtin/clean.c:880
3905msgid "add <pattern> to ignore rules"
3906msgstr "添加<模式>到忽略规则"
3907
3908#: builtin/clean.c:881
3909msgid "remove ignored files, too"
3910msgstr "也删除忽略的文件"
3911
3912#: builtin/clean.c:883
3913msgid "remove only ignored files"
3914msgstr "只删除忽略的文件"
3915
3916#: builtin/clean.c:901
3917msgid "-x and -X cannot be used together"
3918msgstr "-x 和 -X 不能同时使用"
3919
3920#: builtin/clean.c:905
3921msgid ""
3922"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3923"clean"
3924msgstr ""
3925"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3926
3927#: builtin/clean.c:908
3928msgid ""
3929"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3930"refusing to clean"
3931msgstr ""
3932"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3933
3934#: builtin/clone.c:37
3935msgid "git clone [<options>] [--] <repo> [<dir>]"
3936msgstr "git clone [<选项>] [--] <版本库> [<路径>]"
3937
3938#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
3939#: builtin/push.c:523
3940msgid "force progress reporting"
3941msgstr "强制显示进度报告"
3942
3943#: builtin/clone.c:59
3944msgid "don't create a checkout"
3945msgstr "不创建一个检出"
3946
3947#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
3948msgid "create a bare repository"
3949msgstr "创建一个纯版本库"
3950
3951#: builtin/clone.c:64
3952msgid "create a mirror repository (implies bare)"
3953msgstr "创建一个镜像版本库(也是纯版本库)"
3954
3955#: builtin/clone.c:66
3956msgid "to clone from a local repository"
3957msgstr "从本地版本库克隆"
3958
3959#: builtin/clone.c:68
3960msgid "don't use local hardlinks, always copy"
3961msgstr "不使用本地硬链接,始终复制"
3962
3963#: builtin/clone.c:70
3964msgid "setup as shared repository"
3965msgstr "设置为共享版本库"
3966
3967#: builtin/clone.c:72 builtin/clone.c:74
3968msgid "initialize submodules in the clone"
3969msgstr "在克隆时初始化子模组"
3970
3971#: builtin/clone.c:75 builtin/init-db.c:500
3972msgid "template-directory"
3973msgstr "模板目录"
3974
3975#: builtin/clone.c:76 builtin/init-db.c:501
3976msgid "directory from which templates will be used"
3977msgstr "模板目录将被使用"
3978
3979#: builtin/clone.c:78
3980msgid "reference repository"
3981msgstr "参考版本库"
3982
3983#: builtin/clone.c:80
3984msgid "use --reference only while cloning"
3985msgstr "仅在克隆时参考 --reference 指向的本地版本库"
3986
3987#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
3988msgid "name"
3989msgstr "名称"
3990
3991#: builtin/clone.c:82
3992msgid "use <name> instead of 'origin' to track upstream"
3993msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3994
3995#: builtin/clone.c:84
3996msgid "checkout <branch> instead of the remote's HEAD"
3997msgstr "检出<分支>而不是远程HEAD"
3998
3999#: builtin/clone.c:86
4000msgid "path to git-upload-pack on the remote"
4001msgstr "远程 git-upload-pack 路径"
4002
4003#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
4004msgid "depth"
4005msgstr "深度"
4006
4007#: builtin/clone.c:88
4008msgid "create a shallow clone of that depth"
4009msgstr "创建一个指定深度的浅克隆"
4010
4011#: builtin/clone.c:90
4012msgid "clone only one branch, HEAD or --branch"
4013msgstr "只克隆一个分支、HEAD 或 --branch"
4014
4015#: builtin/clone.c:91 builtin/init-db.c:509
4016msgid "gitdir"
4017msgstr "git目录"
4018
4019#: builtin/clone.c:92 builtin/init-db.c:510
4020msgid "separate git dir from working tree"
4021msgstr "git目录和工作区分离"
4022
4023#: builtin/clone.c:93
4024msgid "key=value"
4025msgstr "key=value"
4026
4027#: builtin/clone.c:94
4028msgid "set config inside the new repository"
4029msgstr "在新版本库中设置配置信息"
4030
4031#: builtin/clone.c:240
4032#, c-format
4033msgid "reference repository '%s' is not a local repository."
4034msgstr "参考版本库 '%s' 不是一个本地版本库。"
4035
4036#: builtin/clone.c:244
4037#, c-format
4038msgid "reference repository '%s' is shallow"
4039msgstr "参考版本库 '%s' 是一个浅克隆"
4040
4041#: builtin/clone.c:247
4042#, c-format
4043msgid "reference repository '%s' is grafted"
4044msgstr "参考版本库 '%s' 已被嫁接"
4045
4046#: builtin/clone.c:310
4047#, c-format
4048msgid "failed to create directory '%s'"
4049msgstr "无法创建目录 '%s'"
4050
4051#: builtin/clone.c:312 builtin/diff.c:84
4052#, c-format
4053msgid "failed to stat '%s'"
4054msgstr "无法枚举 '%s' 状态"
4055
4056#: builtin/clone.c:314
4057#, c-format
4058msgid "%s exists and is not a directory"
4059msgstr "%s 存在且不是一个目录"
4060
4061#: builtin/clone.c:328
4062#, c-format
4063msgid "failed to stat %s\n"
4064msgstr "无法枚举 %s 状态\n"
4065
4066#: builtin/clone.c:350
4067#, c-format
4068msgid "failed to create link '%s'"
4069msgstr "无法创建链接 '%s'"
4070
4071#: builtin/clone.c:354
4072#, c-format
4073msgid "failed to copy file to '%s'"
4074msgstr "无法拷贝文件至 '%s'"
4075
4076#: builtin/clone.c:377 builtin/clone.c:551
4077#, c-format
4078msgid "done.\n"
4079msgstr "完成。\n"
4080
4081#: builtin/clone.c:389
4082msgid ""
4083"Clone succeeded, but checkout failed.\n"
4084"You can inspect what was checked out with 'git status'\n"
4085"and retry the checkout with 'git checkout -f HEAD'\n"
4086msgstr ""
4087"克隆成功,但是检出失败。\n"
4088"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4089"'git checkout -f HEAD' 重试\n"
4090
4091#: builtin/clone.c:466
4092#, c-format
4093msgid "Could not find remote branch %s to clone."
4094msgstr "不能发现要克隆的远程分支 %s。"
4095
4096#: builtin/clone.c:546
4097#, c-format
4098msgid "Checking connectivity... "
4099msgstr "检查连接... "
4100
4101#: builtin/clone.c:549
4102msgid "remote did not send all necessary objects"
4103msgstr "远程没有发送所有必须的对象"
4104
4105#: builtin/clone.c:613
4106msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4107msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4108
4109#: builtin/clone.c:644
4110msgid "unable to checkout working tree"
4111msgstr "不能检出工作区"
4112
4113#: builtin/clone.c:731
4114msgid "cannot repack to clean up"
4115msgstr "无法执行 repack 来清理"
4116
4117#: builtin/clone.c:733
4118msgid "cannot unlink temporary alternates file"
4119msgstr "无法删除临时的 alternates 文件"
4120
4121#: builtin/clone.c:763
4122msgid "Too many arguments."
4123msgstr "太多参数。"
4124
4125#: builtin/clone.c:767
4126msgid "You must specify a repository to clone."
4127msgstr "您必须指定一个版本库来克隆。"
4128
4129#: builtin/clone.c:778
4130#, c-format
4131msgid "--bare and --origin %s options are incompatible."
4132msgstr "--bare 和 --origin %s 选项不兼容。"
4133
4134#: builtin/clone.c:781
4135msgid "--bare and --separate-git-dir are incompatible."
4136msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4137
4138#: builtin/clone.c:794
4139#, c-format
4140msgid "repository '%s' does not exist"
4141msgstr "版本库 '%s' 不存在"
4142
4143#: builtin/clone.c:800 builtin/fetch.c:1160
4144#, c-format
4145msgid "depth %s is not a positive number"
4146msgstr "深度 %s 不是一个正数"
4147
4148#: builtin/clone.c:810
4149#, c-format
4150msgid "destination path '%s' already exists and is not an empty directory."
4151msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4152
4153#: builtin/clone.c:820
4154#, c-format
4155msgid "working tree '%s' already exists."
4156msgstr "工作区 '%s' 已经存在。"
4157
4158#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
4159#: builtin/worktree.c:220
4160#, c-format
4161msgid "could not create leading directories of '%s'"
4162msgstr "不能为 '%s' 创建先导目录"
4163
4164#: builtin/clone.c:838
4165#, c-format
4166msgid "could not create work tree dir '%s'"
4167msgstr "不能创建工作区目录 '%s'"
4168
4169#: builtin/clone.c:856
4170#, c-format
4171msgid "Cloning into bare repository '%s'...\n"
4172msgstr "克隆到纯版本库 '%s'...\n"
4173
4174#: builtin/clone.c:858
4175#, c-format
4176msgid "Cloning into '%s'...\n"
4177msgstr "正克隆到 '%s'...\n"
4178
4179#: builtin/clone.c:883
4180msgid "--dissociate given, but there is no --reference"
4181msgstr "提供了参数 --dissociate,但未提供 --reference"
4182
4183#: builtin/clone.c:900
4184msgid "--depth is ignored in local clones; use file:// instead."
4185msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4186
4187#: builtin/clone.c:903
4188msgid "source repository is shallow, ignoring --local"
4189msgstr "源版本库是浅克隆,忽略 --local"
4190
4191#: builtin/clone.c:908
4192msgid "--local is ignored"
4193msgstr "--local 被忽略"
4194
4195#: builtin/clone.c:912
4196#, c-format
4197msgid "Don't know how to clone %s"
4198msgstr "不知道如何克隆 %s"
4199
4200#: builtin/clone.c:961 builtin/clone.c:969
4201#, c-format
4202msgid "Remote branch %s not found in upstream %s"
4203msgstr "远程分支 %s 在上游 %s 未发现"
4204
4205#: builtin/clone.c:972
4206msgid "You appear to have cloned an empty repository."
4207msgstr "您似乎克隆了一个空版本库。"
4208
4209#: builtin/column.c:9
4210msgid "git column [<options>]"
4211msgstr "git column [<选项>]"
4212
4213#: builtin/column.c:26
4214msgid "lookup config vars"
4215msgstr "查找配置变量"
4216
4217#: builtin/column.c:27 builtin/column.c:28
4218msgid "layout to use"
4219msgstr "要使用的布局"
4220
4221#: builtin/column.c:29
4222msgid "Maximum width"
4223msgstr "最大宽度"
4224
4225#: builtin/column.c:30
4226msgid "Padding space on left border"
4227msgstr "左边框的填充空间"
4228
4229#: builtin/column.c:31
4230msgid "Padding space on right border"
4231msgstr "右边框的填充空间"
4232
4233#: builtin/column.c:32
4234msgid "Padding space between columns"
4235msgstr "两列之间的填充空间"
4236
4237#: builtin/column.c:51
4238msgid "--command must be the first argument"
4239msgstr "--command 必须是第一个参数"
4240
4241#: builtin/commit.c:37
4242msgid "git commit [<options>] [--] <pathspec>..."
4243msgstr "git commit [<选项>] [--] <路径规则>..."
4244
4245#: builtin/commit.c:42
4246msgid "git status [<options>] [--] <pathspec>..."
4247msgstr "git status [<选项>] [--] <路径规则>..."
4248
4249#: builtin/commit.c:47
4250msgid ""
4251"Your name and email address were configured automatically based\n"
4252"on your username and hostname. Please check that they are accurate.\n"
4253"You can suppress this message by setting them explicitly. Run the\n"
4254"following command and follow the instructions in your editor to edit\n"
4255"your configuration file:\n"
4256"\n"
4257" git config --global --edit\n"
4258"\n"
4259"After doing this, you may fix the identity used for this commit with:\n"
4260"\n"
4261" git commit --amend --reset-author\n"
4262msgstr ""
4263"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4264"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4265"中编辑您的配置文件:\n"
4266"\n"
4267" git config --global --edit\n"
4268"\n"
4269"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4270"\n"
4271" git commit --amend --reset-author\n"
4272
4273#: builtin/commit.c:60
4274msgid ""
4275"Your name and email address were configured automatically based\n"
4276"on your username and hostname. Please check that they are accurate.\n"
4277"You can suppress this message by setting them explicitly:\n"
4278"\n"
4279" git config --global user.name \"Your Name\"\n"
4280" git config --global user.email you@example.com\n"
4281"\n"
4282"After doing this, you may fix the identity used for this commit with:\n"
4283"\n"
4284" git commit --amend --reset-author\n"
4285msgstr ""
4286"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4287"与否。您可以对其进行设置以免再出现本提示信息:\n"
4288"\n"
4289" git config --global user.name \"Your Name\"\n"
4290" git config --global user.email you@example.com\n"
4291"\n"
4292"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4293"\n"
4294" git commit --amend --reset-author\n"
4295
4296#: builtin/commit.c:72
4297msgid ""
4298"You asked to amend the most recent commit, but doing so would make\n"
4299"it empty. You can repeat your command with --allow-empty, or you can\n"
4300"remove the commit entirely with \"git reset HEAD^\".\n"
4301msgstr ""
4302"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4303"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4304
4305#: builtin/commit.c:77
4306msgid ""
4307"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4308"If you wish to commit it anyway, use:\n"
4309"\n"
4310" git commit --allow-empty\n"
4311"\n"
4312msgstr ""
4313"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4314"也要提交,使用命令:\n"
4315"\n"
4316" git commit --allow-empty\n"
4317"\n"
4318
4319#: builtin/commit.c:84
4320msgid "Otherwise, please use 'git reset'\n"
4321msgstr "否则,请使用命令 'git reset'\n"
4322
4323#: builtin/commit.c:87
4324msgid ""
4325"If you wish to skip this commit, use:\n"
4326"\n"
4327" git reset\n"
4328"\n"
4329"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4330"the remaining commits.\n"
4331msgstr ""
4332"如果您想跳过这个提交,使用命令:\n"
4333"\n"
4334" git reset\n"
4335"\n"
4336"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4337"操作。\n"
4338
4339#: builtin/commit.c:304
4340msgid "failed to unpack HEAD tree object"
4341msgstr "无法解包 HEAD 树对象"
4342
4343#: builtin/commit.c:344
4344msgid "unable to create temporary index"
4345msgstr "不能创建临时索引"
4346
4347#: builtin/commit.c:350
4348msgid "interactive add failed"
4349msgstr "交互式添加失败"
4350
4351#: builtin/commit.c:361
4352msgid "unable to write index file"
4353msgstr "无法写入索引文件"
4354
4355#: builtin/commit.c:363
4356msgid "unable to update temporary index"
4357msgstr "无法更新临时索引"
4358
4359#: builtin/commit.c:365
4360msgid "Failed to update main cache tree"
4361msgstr "不能更新树的主缓存"
4362
4363#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
4364msgid "unable to write new_index file"
4365msgstr "无法写 new_index 文件"
4366
4367#: builtin/commit.c:445
4368msgid "cannot do a partial commit during a merge."
4369msgstr "在合并过程中不能做部分提交。"
4370
4371#: builtin/commit.c:447
4372msgid "cannot do a partial commit during a cherry-pick."
4373msgstr "在拣选过程中不能做部分提交。"
4374
4375#: builtin/commit.c:456
4376msgid "cannot read the index"
4377msgstr "无法读取索引"
4378
4379#: builtin/commit.c:475
4380msgid "unable to write temporary index file"
4381msgstr "无法写临时索引文件"
4382
4383#: builtin/commit.c:580
4384#, c-format
4385msgid "commit '%s' lacks author header"
4386msgstr "提交 '%s' 缺少作者信息"
4387
4388#: builtin/commit.c:582
4389#, c-format
4390msgid "commit '%s' has malformed author line"
4391msgstr "提交 '%s' 有非法的作者信息"
4392
4393#: builtin/commit.c:601
4394msgid "malformed --author parameter"
4395msgstr "非法的 --author 参数"
4396
4397#: builtin/commit.c:609
4398#, c-format
4399msgid "invalid date format: %s"
4400msgstr "无效的日期格式:%s"
4401
4402#: builtin/commit.c:653
4403msgid ""
4404"unable to select a comment character that is not used\n"
4405"in the current commit message"
4406msgstr "无法选择一个未被当前提交说明使用的注释字符"
4407
4408#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4409#, c-format
4410msgid "could not lookup commit %s"
4411msgstr "不能查询提交 %s"
4412
4413#: builtin/commit.c:702 builtin/shortlog.c:273
4414#, c-format
4415msgid "(reading log message from standard input)\n"
4416msgstr "(正从标准输入中读取日志信息)\n"
4417
4418#: builtin/commit.c:704
4419msgid "could not read log from standard input"
4420msgstr "不能从标准输入中读取日志信息"
4421
4422#: builtin/commit.c:708
4423#, c-format
4424msgid "could not read log file '%s'"
4425msgstr "不能读取日志文件 '%s'"
4426
4427#: builtin/commit.c:730
4428msgid "could not read MERGE_MSG"
4429msgstr "不能读取 MERGE_MSG"
4430
4431#: builtin/commit.c:734
4432msgid "could not read SQUASH_MSG"
4433msgstr "不能读取 SQUASH_MSG"
4434
4435#: builtin/commit.c:738 builtin/merge.c:1079
4436#, c-format
4437msgid "could not read '%s'"
4438msgstr "不能读取 '%s'"
4439
4440#: builtin/commit.c:785
4441msgid "could not write commit template"
4442msgstr "不能写提交模版"
4443
4444#: builtin/commit.c:803
4445#, c-format
4446msgid ""
4447"\n"
4448"It looks like you may be committing a merge.\n"
4449"If this is not correct, please remove the file\n"
4450"\t%s\n"
4451"and try again.\n"
4452msgstr ""
4453"\n"
4454"似乎您正在做一个合并提交。如果不对,请删除文件\n"
4455"\t%s\n"
4456"然后重试。\n"
4457
4458#: builtin/commit.c:808
4459#, c-format
4460msgid ""
4461"\n"
4462"It looks like you may be committing a cherry-pick.\n"
4463"If this is not correct, please remove the file\n"
4464"\t%s\n"
4465"and try again.\n"
4466msgstr ""
4467"\n"
4468"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4469"\t%s\n"
4470"然后重试。\n"
4471
4472#: builtin/commit.c:821
4473#, c-format
4474msgid ""
4475"Please enter the commit message for your changes. Lines starting\n"
4476"with '%c' will be ignored, and an empty message aborts the commit.\n"
4477msgstr ""
4478"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4479"说明将会终止提交。\n"
4480
4481#: builtin/commit.c:828
4482#, c-format
4483msgid ""
4484"Please enter the commit message for your changes. Lines starting\n"
4485"with '%c' will be kept; you may remove them yourself if you want to.\n"
4486"An empty message aborts the commit.\n"
4487msgstr ""
4488"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4489"也可以删除它们。一个空的提交说明将会终止提交。\n"
4490
4491# 译者:为保证在输出中对齐,注意调整句中空格!
4492#: builtin/commit.c:848
4493#, c-format
4494msgid "%sAuthor: %.*s <%.*s>"
4495msgstr "%s作者: %.*s <%.*s>"
4496
4497# 译者:为保证在输出中对齐,注意调整句中空格!
4498#: builtin/commit.c:856
4499#, c-format
4500msgid "%sDate: %s"
4501msgstr "%s日期: %s"
4502
4503# 译者:为保证在输出中对齐,注意调整句中空格!
4504#: builtin/commit.c:863
4505#, c-format
4506msgid "%sCommitter: %.*s <%.*s>"
4507msgstr "%s提交者:%.*s <%.*s>"
4508
4509#: builtin/commit.c:881
4510msgid "Cannot read index"
4511msgstr "无法读取索引"
4512
4513#: builtin/commit.c:938
4514msgid "Error building trees"
4515msgstr "无法创建树对象"
4516
4517#: builtin/commit.c:953 builtin/tag.c:495
4518#, c-format
4519msgid "Please supply the message using either -m or -F option.\n"
4520msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4521
4522#: builtin/commit.c:1055
4523#, c-format
4524msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4525msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
4526
4527#: builtin/commit.c:1070 builtin/commit.c:1310
4528#, c-format
4529msgid "Invalid untracked files mode '%s'"
4530msgstr "无效的未追踪文件参数 '%s'"
4531
4532#: builtin/commit.c:1107
4533msgid "--long and -z are incompatible"
4534msgstr "--long 和 -z 选项不兼容"
4535
4536#: builtin/commit.c:1137
4537msgid "Using both --reset-author and --author does not make sense"
4538msgstr "同时使用 --reset-author 和 --author 没有意义"
4539
4540#: builtin/commit.c:1146
4541msgid "You have nothing to amend."
4542msgstr "您没有可修补的提交。"
4543
4544#: builtin/commit.c:1149
4545msgid "You are in the middle of a merge -- cannot amend."
4546msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4547
4548#: builtin/commit.c:1151
4549msgid "You are in the middle of a cherry-pick -- cannot amend."
4550msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4551
4552#: builtin/commit.c:1154
4553msgid "Options --squash and --fixup cannot be used together"
4554msgstr "选项 --squash 和 --fixup 不能同时使用"
4555
4556#: builtin/commit.c:1164
4557msgid "Only one of -c/-C/-F/--fixup can be used."
4558msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4559
4560#: builtin/commit.c:1166
4561msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4562msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4563
4564#: builtin/commit.c:1174
4565msgid "--reset-author can be used only with -C, -c or --amend."
4566msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4567
4568#: builtin/commit.c:1191
4569msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4570msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4571
4572#: builtin/commit.c:1193
4573msgid "No paths with --include/--only does not make sense."
4574msgstr "参数 --include/--only 不跟路径没有意义。"
4575
4576#: builtin/commit.c:1195
4577msgid "Clever... amending the last one with dirty index."
4578msgstr "聪明... 在索引不干净下修补最后的提交。"
4579
4580#: builtin/commit.c:1197
4581msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4582msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
4583
4584#: builtin/commit.c:1209 builtin/tag.c:728
4585#, c-format
4586msgid "Invalid cleanup mode %s"
4587msgstr "无效的清理模式 %s"
4588
4589#: builtin/commit.c:1214
4590msgid "Paths with -a does not make sense."
4591msgstr "路径和 -a 选项同时使用没有意义。"
4592
4593#: builtin/commit.c:1324 builtin/commit.c:1603
4594msgid "show status concisely"
4595msgstr "以简洁的格式显示状态"
4596
4597#: builtin/commit.c:1326 builtin/commit.c:1605
4598msgid "show branch information"
4599msgstr "显示分支信息"
4600
4601#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
4602msgid "machine-readable output"
4603msgstr "机器可读的输出"
4604
4605#: builtin/commit.c:1331 builtin/commit.c:1609
4606msgid "show status in long format (default)"
4607msgstr "以长格式显示状态(默认)"
4608
4609#: builtin/commit.c:1334 builtin/commit.c:1612
4610msgid "terminate entries with NUL"
4611msgstr "条目以NUL字符结尾"
4612
4613#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
4614#: builtin/fast-export.c:983 builtin/tag.c:603
4615msgid "mode"
4616msgstr "模式"
4617
4618#: builtin/commit.c:1337 builtin/commit.c:1615
4619msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4620msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4621
4622#: builtin/commit.c:1340
4623msgid "show ignored files"
4624msgstr "显示忽略的文件"
4625
4626#: builtin/commit.c:1341 parse-options.h:152
4627msgid "when"
4628msgstr "何时"
4629
4630#: builtin/commit.c:1342
4631msgid ""
4632"ignore changes to submodules, optional when: all, dirty, untracked. "
4633"(Default: all)"
4634msgstr ""
4635"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4636
4637#: builtin/commit.c:1344
4638msgid "list untracked files in columns"
4639msgstr "以列的方式显示未跟踪的文件"
4640
4641#: builtin/commit.c:1430
4642msgid "couldn't look up newly created commit"
4643msgstr "无法找到新创建的提交"
4644
4645#: builtin/commit.c:1432
4646msgid "could not parse newly created commit"
4647msgstr "不能解析新创建的提交"
4648
4649#: builtin/commit.c:1477
4650msgid "detached HEAD"
4651msgstr "分离头指针"
4652
4653# 译者:中文字符串拼接,可删除前导空格
4654#: builtin/commit.c:1480
4655msgid " (root-commit)"
4656msgstr "(根提交)"
4657
4658#: builtin/commit.c:1573
4659msgid "suppress summary after successful commit"
4660msgstr "提交成功后不显示概述信息"
4661
4662#: builtin/commit.c:1574
4663msgid "show diff in commit message template"
4664msgstr "在提交说明模板里显示差异"
4665
4666#: builtin/commit.c:1576
4667msgid "Commit message options"
4668msgstr "提交说明选项"
4669
4670#: builtin/commit.c:1577 builtin/tag.c:601
4671msgid "read message from file"
4672msgstr "从文件中读取提交说明"
4673
4674#: builtin/commit.c:1578
4675msgid "author"
4676msgstr "作者"
4677
4678#: builtin/commit.c:1578
4679msgid "override author for commit"
4680msgstr "提交时覆盖作者"
4681
4682#: builtin/commit.c:1579 builtin/gc.c:280
4683msgid "date"
4684msgstr "日期"
4685
4686#: builtin/commit.c:1579
4687msgid "override date for commit"
4688msgstr "提交时覆盖日期"
4689
4690#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
4691#: builtin/notes.c:554 builtin/tag.c:599
4692msgid "message"
4693msgstr "说明"
4694
4695#: builtin/commit.c:1580
4696msgid "commit message"
4697msgstr "提交说明"
4698
4699#: builtin/commit.c:1581
4700msgid "reuse and edit message from specified commit"
4701msgstr "重用并编辑指定提交的提交说明"
4702
4703#: builtin/commit.c:1582
4704msgid "reuse message from specified commit"
4705msgstr "重用指定提交的提交说明"
4706
4707#: builtin/commit.c:1583
4708msgid "use autosquash formatted message to fixup specified commit"
4709msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4710
4711#: builtin/commit.c:1584
4712msgid "use autosquash formatted message to squash specified commit"
4713msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4714
4715#: builtin/commit.c:1585
4716msgid "the commit is authored by me now (used with -C/-c/--amend)"
4717msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4718
4719#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
4720msgid "add Signed-off-by:"
4721msgstr "添加 Signed-off-by: 签名"
4722
4723#: builtin/commit.c:1587
4724msgid "use specified template file"
4725msgstr "使用指定的模板文件"
4726
4727#: builtin/commit.c:1588
4728msgid "force edit of commit"
4729msgstr "强制编辑提交"
4730
4731# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4732#: builtin/commit.c:1589
4733msgid "default"
4734msgstr "default"
4735
4736#: builtin/commit.c:1589 builtin/tag.c:604
4737msgid "how to strip spaces and #comments from message"
4738msgstr "设置如何删除提交说明里的空格和#注释"
4739
4740#: builtin/commit.c:1590
4741msgid "include status in commit message template"
4742msgstr "在提交说明模板里包含状态信息"
4743
4744#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92
4745#: builtin/tag.c:605
4746msgid "key-id"
4747msgstr "key-id"
4748
4749#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93
4750msgid "GPG sign commit"
4751msgstr "GPG 提交签名"
4752
4753#: builtin/commit.c:1595
4754msgid "Commit contents options"
4755msgstr "提交内容选项"
4756
4757#: builtin/commit.c:1596
4758msgid "commit all changed files"
4759msgstr "提交所有改动的文件"
4760
4761#: builtin/commit.c:1597
4762msgid "add specified files to index for commit"
4763msgstr "添加指定的文件到索引区等待提交"
4764
4765#: builtin/commit.c:1598
4766msgid "interactively add files"
4767msgstr "交互式添加文件"
4768
4769#: builtin/commit.c:1599
4770msgid "interactively add changes"
4771msgstr "交互式添加变更"
4772
4773#: builtin/commit.c:1600
4774msgid "commit only specified files"
4775msgstr "只提交指定的文件"
4776
4777#: builtin/commit.c:1601
4778msgid "bypass pre-commit hook"
4779msgstr "绕过 pre-commit 钩子"
4780
4781#: builtin/commit.c:1602
4782msgid "show what would be committed"
4783msgstr "显示将要提交的内容"
4784
4785#: builtin/commit.c:1613
4786msgid "amend previous commit"
4787msgstr "修改先前的提交"
4788
4789#: builtin/commit.c:1614
4790msgid "bypass post-rewrite hook"
4791msgstr "绕过 post-rewrite 钩子"
4792
4793#: builtin/commit.c:1619
4794msgid "ok to record an empty change"
4795msgstr "允许一个空提交"
4796
4797#: builtin/commit.c:1621
4798msgid "ok to record a change with an empty message"
4799msgstr "允许空的提交说明"
4800
4801#: builtin/commit.c:1650
4802msgid "could not parse HEAD commit"
4803msgstr "不能解析 HEAD 提交"
4804
4805#: builtin/commit.c:1689 builtin/merge.c:1076
4806#, c-format
4807msgid "could not open '%s' for reading"
4808msgstr "不能为读入打开 '%s'"
4809
4810#: builtin/commit.c:1696
4811#, c-format
4812msgid "Corrupt MERGE_HEAD file (%s)"
4813msgstr "损坏的 MERGE_HEAD 文件(%s)"
4814
4815#: builtin/commit.c:1703
4816msgid "could not read MERGE_MODE"
4817msgstr "不能读取 MERGE_MODE"
4818
4819#: builtin/commit.c:1722
4820#, c-format
4821msgid "could not read commit message: %s"
4822msgstr "不能读取提交说明:%s"
4823
4824#: builtin/commit.c:1733
4825#, c-format
4826msgid "Aborting commit; you did not edit the message.\n"
4827msgstr "终止提交;您未更改来自模版的提交说明。\n"
4828
4829#: builtin/commit.c:1738
4830#, c-format
4831msgid "Aborting commit due to empty commit message.\n"
4832msgstr "终止提交因为提交说明为空。\n"
4833
4834#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854
4835msgid "failed to write commit object"
4836msgstr "无法写提交对象"
4837
4838#: builtin/commit.c:1786
4839msgid ""
4840"Repository has been updated, but unable to write\n"
4841"new_index file. Check that disk is not full and quota is\n"
4842"not exceeded, and then \"git reset HEAD\" to recover."
4843msgstr ""
4844"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4845"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4846
4847#: builtin/config.c:8
4848msgid "git config [<options>]"
4849msgstr "git config [<选项>]"
4850
4851#: builtin/config.c:53
4852msgid "Config file location"
4853msgstr "配置文件位置"
4854
4855#: builtin/config.c:54
4856msgid "use global config file"
4857msgstr "使用全局配置文件"
4858
4859#: builtin/config.c:55
4860msgid "use system config file"
4861msgstr "使用系统级配置文件"
4862
4863#: builtin/config.c:56
4864msgid "use repository config file"
4865msgstr "使用版本库级配置文件"
4866
4867#: builtin/config.c:57
4868msgid "use given config file"
4869msgstr "使用指定的配置文件"
4870
4871#: builtin/config.c:58
4872msgid "blob-id"
4873msgstr "数据对象ID"
4874
4875#: builtin/config.c:58
4876msgid "read config from given blob object"
4877msgstr "从给定的数据对象读取配置"
4878
4879#: builtin/config.c:59
4880msgid "Action"
4881msgstr "操作"
4882
4883#: builtin/config.c:60
4884msgid "get value: name [value-regex]"
4885msgstr "获取值:name [value-regex]"
4886
4887#: builtin/config.c:61
4888msgid "get all values: key [value-regex]"
4889msgstr "获得所有的值:key [value-regex]"
4890
4891#: builtin/config.c:62
4892msgid "get values for regexp: name-regex [value-regex]"
4893msgstr "根据正则表达式获得值:name-regex [value-regex]"
4894
4895#: builtin/config.c:63
4896msgid "get value specific for the URL: section[.var] URL"
4897msgstr "获得 URL 取值:section[.var] URL"
4898
4899#: builtin/config.c:64
4900msgid "replace all matching variables: name value [value_regex]"
4901msgstr "替换所有匹配的变量:name value [value_regex]"
4902
4903#: builtin/config.c:65
4904msgid "add a new variable: name value"
4905msgstr "添加一个新的变量:name value"
4906
4907#: builtin/config.c:66
4908msgid "remove a variable: name [value-regex]"
4909msgstr "删除一个变量:name [value-regex]"
4910
4911#: builtin/config.c:67
4912msgid "remove all matches: name [value-regex]"
4913msgstr "删除所有匹配项:name [value-regex]"
4914
4915#: builtin/config.c:68
4916msgid "rename section: old-name new-name"
4917msgstr "重命名小节:old-name new-name"
4918
4919#: builtin/config.c:69
4920msgid "remove a section: name"
4921msgstr "删除一个小节:name"
4922
4923#: builtin/config.c:70
4924msgid "list all"
4925msgstr "列出所有"
4926
4927#: builtin/config.c:71
4928msgid "open an editor"
4929msgstr "打开一个编辑器"
4930
4931#: builtin/config.c:72
4932msgid "find the color configured: slot [default]"
4933msgstr "获得配置的颜色:配置 [默认]"
4934
4935#: builtin/config.c:73
4936msgid "find the color setting: slot [stdout-is-tty]"
4937msgstr "获得颜色设置:配置 [stdout-is-tty]"
4938
4939#: builtin/config.c:74
4940msgid "Type"
4941msgstr "类型"
4942
4943#: builtin/config.c:75
4944msgid "value is \"true\" or \"false\""
4945msgstr "值是 \"true\" 或 \"false\""
4946
4947#: builtin/config.c:76
4948msgid "value is decimal number"
4949msgstr "值是十进制数"
4950
4951#: builtin/config.c:77
4952msgid "value is --bool or --int"
4953msgstr "值是 --bool or --int"
4954
4955#: builtin/config.c:78
4956msgid "value is a path (file or directory name)"
4957msgstr "值是一个路径(文件或目录名)"
4958
4959#: builtin/config.c:79
4960msgid "Other"
4961msgstr "其它"
4962
4963#: builtin/config.c:80
4964msgid "terminate values with NUL byte"
4965msgstr "终止值是NUL字节"
4966
4967#: builtin/config.c:81
4968msgid "respect include directives on lookup"
4969msgstr "查询时参照 include 指令递归查找"
4970
4971#: builtin/config.c:316
4972msgid "unable to parse default color value"
4973msgstr "不能解析缺省的颜色值"
4974
4975#: builtin/config.c:457
4976#, c-format
4977msgid ""
4978"# This is Git's per-user configuration file.\n"
4979"[user]\n"
4980"# Please adapt and uncomment the following lines:\n"
4981"#\tname = %s\n"
4982"#\temail = %s\n"
4983msgstr ""
4984"# This is Git's per-user configuration file.\n"
4985"[user]\n"
4986"# Please adapt and uncomment the following lines:\n"
4987"#\tname = %s\n"
4988"#\temail = %s\n"
4989
4990#: builtin/config.c:587
4991#, c-format
4992msgid "cannot create configuration file %s"
4993msgstr "不能创建配置文件 %s"
4994
4995#: builtin/count-objects.c:55
4996msgid "git count-objects [-v] [-H | --human-readable]"
4997msgstr "git count-objects [-v] [-H | --human-readable]"
4998
4999#: builtin/count-objects.c:65
5000msgid "print sizes in human readable format"
5001msgstr "以用户可读的格式显示大小"
5002
5003#: builtin/describe.c:17
5004msgid "git describe [<options>] [<commit-ish>...]"
5005msgstr "git describe [<选项>] [<提交号>...]"
5006
5007#: builtin/describe.c:18
5008msgid "git describe [<options>] --dirty"
5009msgstr "git describe [<选项>] --dirty"
5010
5011#: builtin/describe.c:217
5012#, c-format
5013msgid "annotated tag %s not available"
5014msgstr "注释 tag %s 无效"
5015
5016#: builtin/describe.c:221
5017#, c-format
5018msgid "annotated tag %s has no embedded name"
5019msgstr "注释 tag %s 没有嵌入名称"
5020
5021#: builtin/describe.c:223
5022#, c-format
5023msgid "tag '%s' is really '%s' here"
5024msgstr "tag '%s' 的确是在 '%s'"
5025
5026#: builtin/describe.c:250 builtin/log.c:452
5027#, c-format
5028msgid "Not a valid object name %s"
5029msgstr "不是一个有效的对象名 %s"
5030
5031#: builtin/describe.c:253
5032#, c-format
5033msgid "%s is not a valid '%s' object"
5034msgstr "%s 不是一个有效的 '%s' 对象"
5035
5036#: builtin/describe.c:270
5037#, c-format
5038msgid "no tag exactly matches '%s'"
5039msgstr "没有 tag 准确匹配 '%s'"
5040
5041#: builtin/describe.c:272
5042#, c-format
5043msgid "searching to describe %s\n"
5044msgstr "搜索描述 %s\n"
5045
5046#: builtin/describe.c:319
5047#, c-format
5048msgid "finished search at %s\n"
5049msgstr "完成搜索 %s\n"
5050
5051#: builtin/describe.c:346
5052#, c-format
5053msgid ""
5054"No annotated tags can describe '%s'.\n"
5055"However, there were unannotated tags: try --tags."
5056msgstr ""
5057"没有注释 tag 能描述 '%s'。\n"
5058"然而,有非注释 tag:尝试 --tags。"
5059
5060#: builtin/describe.c:350
5061#, c-format
5062msgid ""
5063"No tags can describe '%s'.\n"
5064"Try --always, or create some tags."
5065msgstr ""
5066"没有注释 tag 能描述 '%s'。\n"
5067"尝试 --always,或者创建一些 tag。"
5068
5069#: builtin/describe.c:371
5070#, c-format
5071msgid "traversed %lu commits\n"
5072msgstr "已遍历 %lu 个提交\n"
5073
5074#: builtin/describe.c:374
5075#, c-format
5076msgid ""
5077"more than %i tags found; listed %i most recent\n"
5078"gave up search at %s\n"
5079msgstr ""
5080"发现多于 %i 个 tag,列出最近的 %i 个\n"
5081"在 %s 放弃搜索\n"
5082
5083#: builtin/describe.c:396
5084msgid "find the tag that comes after the commit"
5085msgstr "寻找提交之后的 tag(用于描述提交)"
5086
5087#: builtin/describe.c:397
5088msgid "debug search strategy on stderr"
5089msgstr "在标准错误上调试搜索策略"
5090
5091#: builtin/describe.c:398
5092msgid "use any ref"
5093msgstr "使用任意引用"
5094
5095#: builtin/describe.c:399
5096msgid "use any tag, even unannotated"
5097msgstr "使用任意 tag,即使未带注解"
5098
5099#: builtin/describe.c:400
5100msgid "always use long format"
5101msgstr "始终使用长提交号格式"
5102
5103#: builtin/describe.c:401
5104msgid "only follow first parent"
5105msgstr "只跟随第一个父提交"
5106
5107#: builtin/describe.c:404
5108msgid "only output exact matches"
5109msgstr "只输出精确匹配"
5110
5111#: builtin/describe.c:406
5112msgid "consider <n> most recent tags (default: 10)"
5113msgstr "考虑最近 <n> 个 tags(默认:10)"
5114
5115#: builtin/describe.c:408
5116msgid "only consider tags matching <pattern>"
5117msgstr "只考虑匹配 <模式> 的 tags"
5118
5119#: builtin/describe.c:410 builtin/name-rev.c:318
5120msgid "show abbreviated commit object as fallback"
5121msgstr "显示简写的提交号作为后备"
5122
5123#: builtin/describe.c:411
5124msgid "mark"
5125msgstr "标记"
5126
5127#: builtin/describe.c:412
5128msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5129msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
5130
5131#: builtin/describe.c:430
5132msgid "--long is incompatible with --abbrev=0"
5133msgstr "--long 与 --abbrev=0 不兼容"
5134
5135#: builtin/describe.c:456
5136msgid "No names found, cannot describe anything."
5137msgstr "没有发现名称,无法描述任何东西。"
5138
5139#: builtin/describe.c:476
5140msgid "--dirty is incompatible with commit-ishes"
5141msgstr "--dirty 不能与提交同时使用"
5142
5143#: builtin/diff.c:86
5144#, c-format
5145msgid "'%s': not a regular file or symlink"
5146msgstr "'%s':不是一个正规文件或符号链接"
5147
5148#: builtin/diff.c:237
5149#, c-format
5150msgid "invalid option: %s"
5151msgstr "无效选项:%s"
5152
5153#: builtin/diff.c:358
5154msgid "Not a git repository"
5155msgstr "不是一个 git 版本库"
5156
5157#: builtin/diff.c:401
5158#, c-format
5159msgid "invalid object '%s' given."
5160msgstr "提供了无效对象 '%s'。"
5161
5162#: builtin/diff.c:410
5163#, c-format
5164msgid "more than two blobs given: '%s'"
5165msgstr "提供了超过两个数据(blob)对象:'%s'"
5166
5167#: builtin/diff.c:417
5168#, c-format
5169msgid "unhandled object '%s' given."
5170msgstr "无法处理的对象 '%s'。"
5171
5172#: builtin/fast-export.c:24
5173msgid "git fast-export [rev-list-opts]"
5174msgstr "git fast-export [rev-list-opts]"
5175
5176#: builtin/fast-export.c:979
5177msgid "show progress after <n> objects"
5178msgstr "在 <n> 个对象之后显示进度"
5179
5180#: builtin/fast-export.c:981
5181msgid "select handling of signed tags"
5182msgstr "选择如何处理签名 tags"
5183
5184#: builtin/fast-export.c:984
5185msgid "select handling of tags that tag filtered objects"
5186msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
5187
5188#: builtin/fast-export.c:987
5189msgid "Dump marks to this file"
5190msgstr "把标记存储到这个文件"
5191
5192#: builtin/fast-export.c:989
5193msgid "Import marks from this file"
5194msgstr "从这个文件导入标记"
5195
5196#: builtin/fast-export.c:991
5197msgid "Fake a tagger when tags lack one"
5198msgstr "当 tags 缺少标记者字段时,假装提供一个"
5199
5200#: builtin/fast-export.c:993
5201msgid "Output full tree for each commit"
5202msgstr "每次提交都输出整个树"
5203
5204#: builtin/fast-export.c:995
5205msgid "Use the done feature to terminate the stream"
5206msgstr "使用 done 功能来终止流"
5207
5208#: builtin/fast-export.c:996
5209msgid "Skip output of blob data"
5210msgstr "跳过数据对象的输出"
5211
5212#: builtin/fast-export.c:997
5213msgid "refspec"
5214msgstr "引用表达式"
5215
5216#: builtin/fast-export.c:998
5217msgid "Apply refspec to exported refs"
5218msgstr "对导出的引用应用引用表达式"
5219
5220#: builtin/fast-export.c:999
5221msgid "anonymize output"
5222msgstr "匿名输出"
5223
5224#: builtin/fetch.c:19
5225msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5226msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
5227
5228#: builtin/fetch.c:20
5229msgid "git fetch [<options>] <group>"
5230msgstr "git fetch [<选项>] <组>"
5231
5232#: builtin/fetch.c:21
5233msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5234msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
5235
5236#: builtin/fetch.c:22
5237msgid "git fetch --all [<options>]"
5238msgstr "git fetch --all [<选项>]"
5239
5240#: builtin/fetch.c:89
5241msgid "fetch from all remotes"
5242msgstr "从所有的远程抓取"
5243
5244#: builtin/fetch.c:91
5245msgid "append to .git/FETCH_HEAD instead of overwriting"
5246msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5247
5248#: builtin/fetch.c:93
5249msgid "path to upload pack on remote end"
5250msgstr "上传包到远程的路径"
5251
5252#: builtin/fetch.c:94
5253msgid "force overwrite of local branch"
5254msgstr "强制覆盖本地分支"
5255
5256#: builtin/fetch.c:96
5257msgid "fetch from multiple remotes"
5258msgstr "从多个远程抓取"
5259
5260#: builtin/fetch.c:98
5261msgid "fetch all tags and associated objects"
5262msgstr "抓取所有的 tags 和关联对象"
5263
5264#: builtin/fetch.c:100
5265msgid "do not fetch all tags (--no-tags)"
5266msgstr "不抓取任何 tags (--no-tags)"
5267
5268#: builtin/fetch.c:102
5269msgid "prune remote-tracking branches no longer on remote"
5270msgstr "清除远程已经不存在的分支的跟踪分支"
5271
5272# 译者:可选值,不能翻译
5273#: builtin/fetch.c:103
5274msgid "on-demand"
5275msgstr "on-demand"
5276
5277#: builtin/fetch.c:104
5278msgid "control recursive fetching of submodules"
5279msgstr "控制子模组的递归抓取"
5280
5281#: builtin/fetch.c:108
5282msgid "keep downloaded pack"
5283msgstr "保持下载包"
5284
5285#: builtin/fetch.c:110
5286msgid "allow updating of HEAD ref"
5287msgstr "允许更新 HEAD 引用"
5288
5289#: builtin/fetch.c:113
5290msgid "deepen history of shallow clone"
5291msgstr "深化浅克隆的历史"
5292
5293#: builtin/fetch.c:115
5294msgid "convert to a complete repository"
5295msgstr "转换为一个完整的版本库"
5296
5297#: builtin/fetch.c:117 builtin/log.c:1208
5298msgid "dir"
5299msgstr "目录"
5300
5301#: builtin/fetch.c:118
5302msgid "prepend this to submodule path output"
5303msgstr "在子模组路径输出的前面加上此目录"
5304
5305#: builtin/fetch.c:121
5306msgid "default mode for recursion"
5307msgstr "递归的默认模式"
5308
5309#: builtin/fetch.c:123
5310msgid "accept refs that update .git/shallow"
5311msgstr "接受更新 .git/shallow 的引用"
5312
5313#: builtin/fetch.c:124
5314msgid "refmap"
5315msgstr "引用映射"
5316
5317#: builtin/fetch.c:125
5318msgid "specify fetch refmap"
5319msgstr "指定获取操作的引用映射"
5320
5321#: builtin/fetch.c:377
5322msgid "Couldn't find remote ref HEAD"
5323msgstr "无法发现远程 HEAD 引用"
5324
5325#: builtin/fetch.c:457
5326#, c-format
5327msgid "object %s not found"
5328msgstr "对象 %s 未发现"
5329
5330#: builtin/fetch.c:462
5331msgid "[up to date]"
5332msgstr "[最新]"
5333
5334#: builtin/fetch.c:476
5335#, c-format
5336msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5337msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5338
5339#: builtin/fetch.c:477 builtin/fetch.c:563
5340msgid "[rejected]"
5341msgstr "[已拒绝]"
5342
5343#: builtin/fetch.c:488
5344msgid "[tag update]"
5345msgstr "[tag更新]"
5346
5347# 译者:注意保持前导空格
5348#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
5349msgid " (unable to update local ref)"
5350msgstr " (不能更新本地引用)"
5351
5352#: builtin/fetch.c:508
5353msgid "[new tag]"
5354msgstr "[新tag]"
5355
5356#: builtin/fetch.c:511
5357msgid "[new branch]"
5358msgstr "[新分支]"
5359
5360#: builtin/fetch.c:514
5361msgid "[new ref]"
5362msgstr "[新引用]"
5363
5364#: builtin/fetch.c:559
5365msgid "unable to update local ref"
5366msgstr "不能更新本地引用"
5367
5368#: builtin/fetch.c:559
5369msgid "forced update"
5370msgstr "强制更新"
5371
5372#: builtin/fetch.c:565
5373msgid "(non-fast-forward)"
5374msgstr "(非快进式)"
5375
5376#: builtin/fetch.c:599 builtin/fetch.c:832
5377#, c-format
5378msgid "cannot open %s: %s\n"
5379msgstr "无法打开 %s:%s\n"
5380
5381#: builtin/fetch.c:608
5382#, c-format
5383msgid "%s did not send all necessary objects\n"
5384msgstr "%s 未发送所有必须的对象\n"
5385
5386#: builtin/fetch.c:626
5387#, c-format
5388msgid "reject %s because shallow roots are not allowed to be updated"
5389msgstr "拒绝 %s 因为浅克隆不允许被更新"
5390
5391#: builtin/fetch.c:714 builtin/fetch.c:797
5392#, c-format
5393msgid "From %.*s\n"
5394msgstr "来自 %.*s\n"
5395
5396#: builtin/fetch.c:725
5397#, c-format
5398msgid ""
5399"some local refs could not be updated; try running\n"
5400" 'git remote prune %s' to remove any old, conflicting branches"
5401msgstr ""
5402"一些本地引用不能被更新;尝试运行\n"
5403" 'git remote prune %s' 来删除旧的、有冲突的分支"
5404
5405# 译者:注意保持前导空格
5406#: builtin/fetch.c:777
5407#, c-format
5408msgid " (%s will become dangling)"
5409msgstr " (%s 将成为摇摆状态)"
5410
5411# 译者:注意保持前导空格
5412#: builtin/fetch.c:778
5413#, c-format
5414msgid " (%s has become dangling)"
5415msgstr " (%s 已成为摇摆状态)"
5416
5417#: builtin/fetch.c:802
5418msgid "[deleted]"
5419msgstr "[已删除]"
5420
5421#: builtin/fetch.c:803 builtin/remote.c:1057
5422msgid "(none)"
5423msgstr "(无)"
5424
5425#: builtin/fetch.c:822
5426#, c-format
5427msgid "Refusing to fetch into current branch %s of non-bare repository"
5428msgstr "拒绝获取到非纯版本库的当前分支 %s"
5429
5430#: builtin/fetch.c:841
5431#, c-format
5432msgid "Option \"%s\" value \"%s\" is not valid for %s"
5433msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5434
5435#: builtin/fetch.c:844
5436#, c-format
5437msgid "Option \"%s\" is ignored for %s\n"
5438msgstr "选项 \"%s\" 为 %s 所忽略\n"
5439
5440#: builtin/fetch.c:900
5441#, c-format
5442msgid "Don't know how to fetch from %s"
5443msgstr "不知道如何从 %s 获取"
5444
5445#: builtin/fetch.c:1063
5446#, c-format
5447msgid "Fetching %s\n"
5448msgstr "正在获取 %s\n"
5449
5450#: builtin/fetch.c:1065 builtin/remote.c:90
5451#, c-format
5452msgid "Could not fetch %s"
5453msgstr "不能获取 %s"
5454
5455#: builtin/fetch.c:1083
5456msgid ""
5457"No remote repository specified. Please, specify either a URL or a\n"
5458"remote name from which new revisions should be fetched."
5459msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
5460
5461#: builtin/fetch.c:1106
5462msgid "You need to specify a tag name."
5463msgstr "您需要指定一个 tag 名称。"
5464
5465#: builtin/fetch.c:1148
5466msgid "--depth and --unshallow cannot be used together"
5467msgstr "--depth 和 --unshallow 不能同时使用"
5468
5469#: builtin/fetch.c:1150
5470msgid "--unshallow on a complete repository does not make sense"
5471msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5472
5473#: builtin/fetch.c:1173
5474msgid "fetch --all does not take a repository argument"
5475msgstr "fetch --all 不能带一个版本库参数"
5476
5477#: builtin/fetch.c:1175
5478msgid "fetch --all does not make sense with refspecs"
5479msgstr "fetch --all 带引用规则没有任何意义"
5480
5481#: builtin/fetch.c:1186
5482#, c-format
5483msgid "No such remote or remote group: %s"
5484msgstr "没有这样的远程或远程组:%s"
5485
5486#: builtin/fetch.c:1194
5487msgid "Fetching a group and specifying refspecs does not make sense"
5488msgstr "获取组并指定引用规则没有意义"
5489
5490#: builtin/fmt-merge-msg.c:13
5491msgid ""
5492"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5493msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
5494
5495#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698
5496#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
5497#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590
5498#: parse-options.h:131 parse-options.h:238
5499msgid "n"
5500msgstr "n"
5501
5502#: builtin/fmt-merge-msg.c:669
5503msgid "populate log with at most <n> entries from shortlog"
5504msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5505
5506#: builtin/fmt-merge-msg.c:672
5507msgid "alias for --log (deprecated)"
5508msgstr "参数 --log 的别名(已弃用)"
5509
5510#: builtin/fmt-merge-msg.c:675
5511msgid "text"
5512msgstr "文本"
5513
5514#: builtin/fmt-merge-msg.c:676
5515msgid "use <text> as start of message"
5516msgstr "使用 <文本> 作为提交说明的开始"
5517
5518#: builtin/fmt-merge-msg.c:677
5519msgid "file to read from"
5520msgstr "从文件中读取"
5521
5522#: builtin/for-each-ref.c:687
5523msgid "unable to parse format"
5524msgstr "不能解析格式"
5525
5526#: builtin/for-each-ref.c:1083
5527msgid "git for-each-ref [<options>] [<pattern>]"
5528msgstr "git for-each-ref [<选项>] [<模式>]"
5529
5530#: builtin/for-each-ref.c:1098
5531msgid "quote placeholders suitably for shells"
5532msgstr "引用占位符适用于 shells"
5533
5534#: builtin/for-each-ref.c:1100
5535msgid "quote placeholders suitably for perl"
5536msgstr "引用占位符适用于 perl"
5537
5538#: builtin/for-each-ref.c:1102
5539msgid "quote placeholders suitably for python"
5540msgstr "引用占位符适用于 python"
5541
5542#: builtin/for-each-ref.c:1104
5543msgid "quote placeholders suitably for Tcl"
5544msgstr "引用占位符适用于 Tcl"
5545
5546#: builtin/for-each-ref.c:1107
5547msgid "show only <n> matched refs"
5548msgstr "只显示 <n> 个匹配的引用"
5549
5550#: builtin/for-each-ref.c:1108 builtin/replace.c:438
5551msgid "format"
5552msgstr "格式"
5553
5554#: builtin/for-each-ref.c:1108
5555msgid "format to use for the output"
5556msgstr "输出格式"
5557
5558#: builtin/for-each-ref.c:1109
5559msgid "key"
5560msgstr "key"
5561
5562#: builtin/for-each-ref.c:1110
5563msgid "field name to sort on"
5564msgstr "排序的字段名"
5565
5566#: builtin/fsck.c:147 builtin/prune.c:137
5567msgid "Checking connectivity"
5568msgstr "检查连接中"
5569
5570#: builtin/fsck.c:548
5571msgid "Checking object directories"
5572msgstr "检查对象目录中"
5573
5574#: builtin/fsck.c:611
5575msgid "git fsck [<options>] [<object>...]"
5576msgstr "git fsck [<选项>] [<对象>...]"
5577
5578#: builtin/fsck.c:617
5579msgid "show unreachable objects"
5580msgstr "显示不可达的对象"
5581
5582#: builtin/fsck.c:618
5583msgid "show dangling objects"
5584msgstr "显示摇摆的对象"
5585
5586#: builtin/fsck.c:619
5587msgid "report tags"
5588msgstr "报告 tags"
5589
5590#: builtin/fsck.c:620
5591msgid "report root nodes"
5592msgstr "报告根节点"
5593
5594#: builtin/fsck.c:621
5595msgid "make index objects head nodes"
5596msgstr "将索引亦作为检查的头节点"
5597
5598#: builtin/fsck.c:622
5599msgid "make reflogs head nodes (default)"
5600msgstr "将引用日志作为检查的头节点(默认)"
5601
5602#: builtin/fsck.c:623
5603msgid "also consider packs and alternate objects"
5604msgstr "也考虑包和备用对象"
5605
5606#: builtin/fsck.c:624
5607msgid "enable more strict checking"
5608msgstr "启用更严格的检查"
5609
5610#: builtin/fsck.c:626
5611msgid "write dangling objects in .git/lost-found"
5612msgstr "将摇摆对象写入 .git/lost-found 中"
5613
5614#: builtin/fsck.c:627 builtin/prune.c:107
5615msgid "show progress"
5616msgstr "显示进度"
5617
5618#: builtin/fsck.c:677
5619msgid "Checking objects"
5620msgstr "检查对象中"
5621
5622#: builtin/gc.c:24
5623msgid "git gc [<options>]"
5624msgstr "git gc [<选项>]"
5625
5626#: builtin/gc.c:67
5627#, c-format
5628msgid "Invalid %s: '%s'"
5629msgstr "无效 %s:'%s'"
5630
5631#: builtin/gc.c:112
5632#, c-format
5633msgid "insanely long object directory %.*s"
5634msgstr "不正常的长对象目录 %.*s"
5635
5636#: builtin/gc.c:281
5637msgid "prune unreferenced objects"
5638msgstr "清除未引用的对象"
5639
5640#: builtin/gc.c:283
5641msgid "be more thorough (increased runtime)"
5642msgstr "更彻底(增加运行时间)"
5643
5644#: builtin/gc.c:284
5645msgid "enable auto-gc mode"
5646msgstr "启用自动垃圾回收模式"
5647
5648#: builtin/gc.c:285
5649msgid "force running gc even if there may be another gc running"
5650msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5651
5652#: builtin/gc.c:327
5653#, c-format
5654msgid "Auto packing the repository in background for optimum performance.\n"
5655msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5656
5657#: builtin/gc.c:329
5658#, c-format
5659msgid "Auto packing the repository for optimum performance.\n"
5660msgstr "自动打包版本库以求最佳性能。\n"
5661
5662#: builtin/gc.c:330
5663#, c-format
5664msgid "See \"git help gc\" for manual housekeeping.\n"
5665msgstr "手工维护参见 \"git help gc\"。\n"
5666
5667#: builtin/gc.c:348
5668#, c-format
5669msgid ""
5670"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5671msgstr ""
5672"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5673
5674#: builtin/gc.c:376
5675msgid ""
5676"There are too many unreachable loose objects; run 'git prune' to remove them."
5677msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5678
5679#: builtin/grep.c:23
5680msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5681msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
5682
5683#: builtin/grep.c:218
5684#, c-format
5685msgid "grep: failed to create thread: %s"
5686msgstr "grep:无法创建线程:%s"
5687
5688#: builtin/grep.c:441 builtin/grep.c:476
5689#, c-format
5690msgid "unable to read tree (%s)"
5691msgstr "无法读取树(%s)"
5692
5693#: builtin/grep.c:491
5694#, c-format
5695msgid "unable to grep from object of type %s"
5696msgstr "无法抓取来自于 %s 类型的对象"
5697
5698#: builtin/grep.c:547
5699#, c-format
5700msgid "switch `%c' expects a numerical value"
5701msgstr "开关 `%c' 期望一个数字值"
5702
5703#: builtin/grep.c:564
5704#, c-format
5705msgid "cannot open '%s'"
5706msgstr "不能打开 '%s'"
5707
5708#: builtin/grep.c:638
5709msgid "search in index instead of in the work tree"
5710msgstr "在索引区搜索而不是在工作区"
5711
5712#: builtin/grep.c:640
5713msgid "find in contents not managed by git"
5714msgstr "在未被 git 管理的内容中查找"
5715
5716# 译者:中文字符串拼接,可删除前导空格
5717#: builtin/grep.c:642
5718msgid "search in both tracked and untracked files"
5719msgstr "在跟踪和未跟踪的文件中搜索"
5720
5721#: builtin/grep.c:644
5722msgid "ignore files specified via '.gitignore'"
5723msgstr "忽略 '.gitignore' 包含的文件"
5724
5725#: builtin/grep.c:647
5726msgid "show non-matching lines"
5727msgstr "显示未匹配的行"
5728
5729#: builtin/grep.c:649
5730msgid "case insensitive matching"
5731msgstr "不区分大小写匹配"
5732
5733#: builtin/grep.c:651
5734msgid "match patterns only at word boundaries"
5735msgstr "只在单词边界匹配模式"
5736
5737#: builtin/grep.c:653
5738msgid "process binary files as text"
5739msgstr "把二进制文件当做文本处理"
5740
5741#: builtin/grep.c:655
5742msgid "don't match patterns in binary files"
5743msgstr "不在二进制文件中匹配模式"
5744
5745#: builtin/grep.c:658
5746msgid "process binary files with textconv filters"
5747msgstr "用 textconv 过滤器处理二进制文件"
5748
5749#: builtin/grep.c:660
5750msgid "descend at most <depth> levels"
5751msgstr "最多以指定的深度向下寻找"
5752
5753#: builtin/grep.c:664
5754msgid "use extended POSIX regular expressions"
5755msgstr "使用扩展的 POSIX 正则表达式"
5756
5757#: builtin/grep.c:667
5758msgid "use basic POSIX regular expressions (default)"
5759msgstr "使用基本的 POSIX 正则表达式(默认)"
5760
5761#: builtin/grep.c:670
5762msgid "interpret patterns as fixed strings"
5763msgstr "把模式解析为固定的字符串"
5764
5765#: builtin/grep.c:673
5766msgid "use Perl-compatible regular expressions"
5767msgstr "使用 Perl 兼容的正则表达式"
5768
5769#: builtin/grep.c:676
5770msgid "show line numbers"
5771msgstr "显示行号"
5772
5773#: builtin/grep.c:677
5774msgid "don't show filenames"
5775msgstr "不显示文件名"
5776
5777#: builtin/grep.c:678
5778msgid "show filenames"
5779msgstr "显示文件名"
5780
5781#: builtin/grep.c:680
5782msgid "show filenames relative to top directory"
5783msgstr "显示相对于顶级目录的文件名"
5784
5785#: builtin/grep.c:682
5786msgid "show only filenames instead of matching lines"
5787msgstr "只显示文件名而不显示匹配的行"
5788
5789#: builtin/grep.c:684
5790msgid "synonym for --files-with-matches"
5791msgstr "和 --files-with-matches 同义"
5792
5793#: builtin/grep.c:687
5794msgid "show only the names of files without match"
5795msgstr "只显示未匹配的文件名"
5796
5797#: builtin/grep.c:689
5798msgid "print NUL after filenames"
5799msgstr "在文件名后输出 NUL 字符"
5800
5801#: builtin/grep.c:691
5802msgid "show the number of matches instead of matching lines"
5803msgstr "显示总匹配行数,而不显示匹配的行"
5804
5805#: builtin/grep.c:692
5806msgid "highlight matches"
5807msgstr "高亮显示匹配项"
5808
5809#: builtin/grep.c:694
5810msgid "print empty line between matches from different files"
5811msgstr "在不同文件的匹配项之间打印空行"
5812
5813#: builtin/grep.c:696
5814msgid "show filename only once above matches from same file"
5815msgstr "只在同一文件的匹配项的上面显示一次文件名"
5816
5817#: builtin/grep.c:699
5818msgid "show <n> context lines before and after matches"
5819msgstr "显示匹配项前后的 <n> 行上下文"
5820
5821#: builtin/grep.c:702
5822msgid "show <n> context lines before matches"
5823msgstr "显示匹配项前 <n> 行上下文"
5824
5825#: builtin/grep.c:704
5826msgid "show <n> context lines after matches"
5827msgstr "显示匹配项后 <n> 行上下文"
5828
5829#: builtin/grep.c:705
5830msgid "shortcut for -C NUM"
5831msgstr "快捷键 -C 数字"
5832
5833#: builtin/grep.c:708
5834msgid "show a line with the function name before matches"
5835msgstr "在匹配的前面显示一行函数名"
5836
5837#: builtin/grep.c:710
5838msgid "show the surrounding function"
5839msgstr "显示所在函数的前后内容"
5840
5841#: builtin/grep.c:713
5842msgid "read patterns from file"
5843msgstr "从文件读取模式"
5844
5845#: builtin/grep.c:715
5846msgid "match <pattern>"
5847msgstr "匹配 <模式>"
5848
5849#: builtin/grep.c:717
5850msgid "combine patterns specified with -e"
5851msgstr "组合用 -e 参数设定的模式"
5852
5853#: builtin/grep.c:729
5854msgid "indicate hit with exit status without output"
5855msgstr "不输出,而用退出码标识命中状态"
5856
5857#: builtin/grep.c:731
5858msgid "show only matches from files that match all patterns"
5859msgstr "只显示匹配所有模式的文件中的匹配"
5860
5861#: builtin/grep.c:733
5862msgid "show parse tree for grep expression"
5863msgstr "显示 grep 表达式的解析树"
5864
5865#: builtin/grep.c:737
5866msgid "pager"
5867msgstr "分页"
5868
5869#: builtin/grep.c:737
5870msgid "show matching files in the pager"
5871msgstr "分页显示匹配的文件"
5872
5873#: builtin/grep.c:740
5874msgid "allow calling of grep(1) (ignored by this build)"
5875msgstr "允许调用 grep(1)(本次构建忽略)"
5876
5877#: builtin/grep.c:741 builtin/show-ref.c:189
5878msgid "show usage"
5879msgstr "显示用法"
5880
5881#: builtin/grep.c:808
5882msgid "no pattern given."
5883msgstr "未提供模式匹配。"
5884
5885#: builtin/grep.c:866
5886msgid "--open-files-in-pager only works on the worktree"
5887msgstr "--open-files-in-pager 仅用于工作区"
5888
5889#: builtin/grep.c:892
5890msgid "--cached or --untracked cannot be used with --no-index."
5891msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5892
5893#: builtin/grep.c:897
5894msgid "--no-index or --untracked cannot be used with revs."
5895msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5896
5897#: builtin/grep.c:900
5898msgid "--[no-]exclude-standard cannot be used for tracked contents."
5899msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5900
5901#: builtin/grep.c:908
5902msgid "both --cached and trees are given."
5903msgstr "同时给出了 --cached 和树对象。"
5904
5905#: builtin/hash-object.c:80
5906msgid ""
5907"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
5908"[--] <file>..."
5909msgstr ""
5910"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
5911"[--] <文件>..."
5912
5913#: builtin/hash-object.c:81
5914msgid "git hash-object --stdin-paths < <list-of-paths>"
5915msgstr "git hash-object --stdin-paths < <路径列表>"
5916
5917#: builtin/hash-object.c:92 builtin/tag.c:612
5918msgid "type"
5919msgstr "类型"
5920
5921#: builtin/hash-object.c:92
5922msgid "object type"
5923msgstr "对象类型"
5924
5925#: builtin/hash-object.c:93
5926msgid "write the object into the object database"
5927msgstr "将对象写入对象数据库"
5928
5929#: builtin/hash-object.c:95
5930msgid "read the object from stdin"
5931msgstr "从标准输入读取对象"
5932
5933#: builtin/hash-object.c:97
5934msgid "store file as is without filters"
5935msgstr "原样存储文件不使用过滤器"
5936
5937#: builtin/hash-object.c:98
5938msgid ""
5939"just hash any random garbage to create corrupt objects for debugging Git"
5940msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
5941
5942#: builtin/hash-object.c:99
5943msgid "process file as it were from this path"
5944msgstr "处理文件并假设其来自于此路径"
5945
5946#: builtin/help.c:41
5947msgid "print all available commands"
5948msgstr "打印所有可用的命令"
5949
5950#: builtin/help.c:42
5951msgid "print list of useful guides"
5952msgstr "显示有用的指南列表"
5953
5954#: builtin/help.c:43
5955msgid "show man page"
5956msgstr "显示 man 手册"
5957
5958#: builtin/help.c:44
5959msgid "show manual in web browser"
5960msgstr "在 web 浏览器中显示手册"
5961
5962#: builtin/help.c:46
5963msgid "show info page"
5964msgstr "显示 info 手册"
5965
5966#: builtin/help.c:52
5967msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
5968msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
5969
5970#: builtin/help.c:64
5971#, c-format
5972msgid "unrecognized help format '%s'"
5973msgstr "未能识别的帮助格式 '%s'"
5974
5975#: builtin/help.c:91
5976msgid "Failed to start emacsclient."
5977msgstr "无法启动 emacsclient。"
5978
5979#: builtin/help.c:104
5980msgid "Failed to parse emacsclient version."
5981msgstr "无法解析 emacsclient 版本。"
5982
5983#: builtin/help.c:112
5984#, c-format
5985msgid "emacsclient version '%d' too old (< 22)."
5986msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5987
5988#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
5989#, c-format
5990msgid "failed to exec '%s': %s"
5991msgstr "无法执行 '%s':%s"
5992
5993#: builtin/help.c:215
5994#, c-format
5995msgid ""
5996"'%s': path for unsupported man viewer.\n"
5997"Please consider using 'man.<tool>.cmd' instead."
5998msgstr ""
5999"'%s':不支持的 man 手册查看器的路径。\n"
6000"请使用 'man.<工具>.cmd'。"
6001
6002#: builtin/help.c:227
6003#, c-format
6004msgid ""
6005"'%s': cmd for supported man viewer.\n"
6006"Please consider using 'man.<tool>.path' instead."
6007msgstr ""
6008"'%s': 支持的 man 手册查看器命令。\n"
6009"请使用 'man.<工具>.path'。"
6010
6011#: builtin/help.c:354
6012#, c-format
6013msgid "'%s': unknown man viewer."
6014msgstr "'%s':未知的 man 查看器。"
6015
6016#: builtin/help.c:371
6017msgid "no man viewer handled the request"
6018msgstr "没有 man 查看器处理此请求"
6019
6020#: builtin/help.c:379
6021msgid "no info viewer handled the request"
6022msgstr "没有 info 查看器处理此请求"
6023
6024#: builtin/help.c:428
6025msgid "Defining attributes per path"
6026msgstr "定义路径的属性"
6027
6028#: builtin/help.c:429
6029msgid "Everyday Git With 20 Commands Or So"
6030msgstr "每一天 Git 常用的约 20 条命令"
6031
6032#: builtin/help.c:430
6033msgid "A Git glossary"
6034msgstr "Git 词汇表"
6035
6036#: builtin/help.c:431
6037msgid "Specifies intentionally untracked files to ignore"
6038msgstr "忽略指定的未跟踪文件"
6039
6040#: builtin/help.c:432
6041msgid "Defining submodule properties"
6042msgstr "定义子模组属性"
6043
6044#: builtin/help.c:433
6045msgid "Specifying revisions and ranges for Git"
6046msgstr "指定 Git 的版本和版本范围"
6047
6048#: builtin/help.c:434
6049msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6050msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6051
6052#: builtin/help.c:435
6053msgid "An overview of recommended workflows with Git"
6054msgstr "Git 推荐的工作流概览"
6055
6056#: builtin/help.c:447
6057msgid "The common Git guides are:\n"
6058msgstr "最常用的 Git 向导有:\n"
6059
6060#: builtin/help.c:468 builtin/help.c:485
6061#, c-format
6062msgid "usage: %s%s"
6063msgstr "用法:%s%s"
6064
6065#: builtin/help.c:501
6066#, c-format
6067msgid "`git %s' is aliased to `%s'"
6068msgstr "`git %s' 是 `%s' 的别名"
6069
6070#: builtin/index-pack.c:151
6071#, c-format
6072msgid "unable to open %s"
6073msgstr "不能打开 %s"
6074
6075#: builtin/index-pack.c:201
6076#, c-format
6077msgid "object type mismatch at %s"
6078msgstr "%s 的对象类型不匹配"
6079
6080#: builtin/index-pack.c:221
6081#, c-format
6082msgid "did not receive expected object %s"
6083msgstr "未能获取期望的对象 %s"
6084
6085#: builtin/index-pack.c:224
6086#, c-format
6087msgid "object %s: expected type %s, found %s"
6088msgstr "对象 %s:期待类型 %s,却是 %s"
6089
6090#: builtin/index-pack.c:266
6091#, c-format
6092msgid "cannot fill %d byte"
6093msgid_plural "cannot fill %d bytes"
6094msgstr[0] "无法填充 %d 字节"
6095msgstr[1] "无法填充 %d 字节"
6096
6097#: builtin/index-pack.c:276
6098msgid "early EOF"
6099msgstr "过早的文件结束符(EOF)"
6100
6101#: builtin/index-pack.c:277
6102msgid "read error on input"
6103msgstr "输入上的读错误"
6104
6105#: builtin/index-pack.c:289
6106msgid "used more bytes than were available"
6107msgstr "用掉了超过可用的字节"
6108
6109#: builtin/index-pack.c:296
6110msgid "pack too large for current definition of off_t"
6111msgstr "包太大超过了当前 off_t 的定义"
6112
6113#: builtin/index-pack.c:312
6114#, c-format
6115msgid "unable to create '%s'"
6116msgstr "不能创建 '%s'"
6117
6118#: builtin/index-pack.c:317
6119#, c-format
6120msgid "cannot open packfile '%s'"
6121msgstr "无法打开包文件 '%s'"
6122
6123#: builtin/index-pack.c:331
6124msgid "pack signature mismatch"
6125msgstr "包签名不匹配"
6126
6127#: builtin/index-pack.c:333
6128#, c-format
6129msgid "pack version %<PRIu32> unsupported"
6130msgstr "不支持包版本 %<PRIu32>"
6131
6132#: builtin/index-pack.c:351
6133#, c-format
6134msgid "pack has bad object at offset %lu: %s"
6135msgstr "包中有错误的对象位于 %lu:%s"
6136
6137#: builtin/index-pack.c:472
6138#, c-format
6139msgid "inflate returned %d"
6140msgstr "解压缩返回 %d"
6141
6142#: builtin/index-pack.c:521
6143msgid "offset value overflow for delta base object"
6144msgstr "偏移值覆盖了 delta 基准对象"
6145
6146#: builtin/index-pack.c:529
6147msgid "delta base offset is out of bound"
6148msgstr "delta 基准偏移越界"
6149
6150#: builtin/index-pack.c:537
6151#, c-format
6152msgid "unknown object type %d"
6153msgstr "未知对象类型 %d"
6154
6155#: builtin/index-pack.c:568
6156msgid "cannot pread pack file"
6157msgstr "无法读取包文件"
6158
6159#: builtin/index-pack.c:570
6160#, c-format
6161msgid "premature end of pack file, %lu byte missing"
6162msgid_plural "premature end of pack file, %lu bytes missing"
6163msgstr[0] "包文件过早结束,缺少 %lu 字节"
6164msgstr[1] "包文件过早结束,缺少 %lu 字节"
6165
6166#: builtin/index-pack.c:596
6167msgid "serious inflate inconsistency"
6168msgstr "解压缩严重的不一致"
6169
6170#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
6171#: builtin/index-pack.c:805 builtin/index-pack.c:814
6172#, c-format
6173msgid "SHA1 COLLISION FOUND WITH %s !"
6174msgstr "发现 %s 出现 SHA1 冲突!"
6175
6176#: builtin/index-pack.c:745 builtin/pack-objects.c:162
6177#: builtin/pack-objects.c:254
6178#, c-format
6179msgid "unable to read %s"
6180msgstr "不能读 %s"
6181
6182#: builtin/index-pack.c:811
6183#, c-format
6184msgid "cannot read existing object %s"
6185msgstr "不能读取现存对象 %s"
6186
6187#: builtin/index-pack.c:825
6188#, c-format
6189msgid "invalid blob object %s"
6190msgstr "无效的数据(blob)对象 %s"
6191
6192#: builtin/index-pack.c:839
6193#, c-format
6194msgid "invalid %s"
6195msgstr "无效的 %s"
6196
6197#: builtin/index-pack.c:843
6198msgid "Error in object"
6199msgstr "对象中出错"
6200
6201#: builtin/index-pack.c:845
6202#, c-format
6203msgid "Not all child objects of %s are reachable"
6204msgstr "%s 的所有子对象并非都可达"
6205
6206#: builtin/index-pack.c:917 builtin/index-pack.c:948
6207msgid "failed to apply delta"
6208msgstr "无法应用 delta"
6209
6210#: builtin/index-pack.c:1118
6211msgid "Receiving objects"
6212msgstr "接收对象中"
6213
6214#: builtin/index-pack.c:1118
6215msgid "Indexing objects"
6216msgstr "索引对象中"
6217
6218#: builtin/index-pack.c:1150
6219msgid "pack is corrupted (SHA1 mismatch)"
6220msgstr "包冲突(SHA1 不匹配)"
6221
6222#: builtin/index-pack.c:1155
6223msgid "cannot fstat packfile"
6224msgstr "不能枚举包文件状态"
6225
6226#: builtin/index-pack.c:1158
6227msgid "pack has junk at the end"
6228msgstr "包的结尾有垃圾数据"
6229
6230#: builtin/index-pack.c:1169
6231msgid "confusion beyond insanity in parse_pack_objects()"
6232msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6233
6234#: builtin/index-pack.c:1194
6235msgid "Resolving deltas"
6236msgstr "处理 delta 中"
6237
6238#: builtin/index-pack.c:1205
6239#, c-format
6240msgid "unable to create thread: %s"
6241msgstr "不能创建线程:%s"
6242
6243#: builtin/index-pack.c:1247
6244msgid "confusion beyond insanity"
6245msgstr "不可理喻"
6246
6247#: builtin/index-pack.c:1253
6248#, c-format
6249msgid "completed with %d local objects"
6250msgstr "完成 %d 个本地对象"
6251
6252#: builtin/index-pack.c:1263
6253#, c-format
6254msgid "Unexpected tail checksum for %s (disk corruption?)"
6255msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
6256
6257#: builtin/index-pack.c:1267
6258#, c-format
6259msgid "pack has %d unresolved delta"
6260msgid_plural "pack has %d unresolved deltas"
6261msgstr[0] "包有 %d 个未解决的 delta"
6262msgstr[1] "包有 %d 个未解决的 delta"
6263
6264#: builtin/index-pack.c:1291
6265#, c-format
6266msgid "unable to deflate appended object (%d)"
6267msgstr "不能压缩附加对象(%d)"
6268
6269#: builtin/index-pack.c:1367
6270#, c-format
6271msgid "local object %s is corrupt"
6272msgstr "本地对象 %s 已损坏"
6273
6274#: builtin/index-pack.c:1391
6275msgid "error while closing pack file"
6276msgstr "关闭包文件时出错"
6277
6278#: builtin/index-pack.c:1404
6279#, c-format
6280msgid "cannot write keep file '%s'"
6281msgstr "无法写保留文件 '%s'"
6282
6283#: builtin/index-pack.c:1412
6284#, c-format
6285msgid "cannot close written keep file '%s'"
6286msgstr "无法关闭保留文件 '%s'"
6287
6288#: builtin/index-pack.c:1425
6289msgid "cannot store pack file"
6290msgstr "无法存储包文件"
6291
6292#: builtin/index-pack.c:1436
6293msgid "cannot store index file"
6294msgstr "无法存储索引文件"
6295
6296#: builtin/index-pack.c:1469
6297#, c-format
6298msgid "bad pack.indexversion=%<PRIu32>"
6299msgstr "坏的 pack.indexversion=%<PRIu32>"
6300
6301#: builtin/index-pack.c:1475
6302#, c-format
6303msgid "invalid number of threads specified (%d)"
6304msgstr "指定的线程数无效(%d)"
6305
6306#: builtin/index-pack.c:1479 builtin/index-pack.c:1658
6307#, c-format
6308msgid "no threads support, ignoring %s"
6309msgstr "没有线程支持,忽略 %s"
6310
6311#: builtin/index-pack.c:1537
6312#, c-format
6313msgid "Cannot open existing pack file '%s'"
6314msgstr "无法打开现存包文件 '%s'"
6315
6316#: builtin/index-pack.c:1539
6317#, c-format
6318msgid "Cannot open existing pack idx file for '%s'"
6319msgstr "无法为 %s 打开包索引文件"
6320
6321#: builtin/index-pack.c:1586
6322#, c-format
6323msgid "non delta: %d object"
6324msgid_plural "non delta: %d objects"
6325msgstr[0] "非 delta:%d 个对象"
6326msgstr[1] "非 delta:%d 个对象"
6327
6328#: builtin/index-pack.c:1593
6329#, c-format
6330msgid "chain length = %d: %lu object"
6331msgid_plural "chain length = %d: %lu objects"
6332msgstr[0] "链长 = %d: %lu 对象"
6333msgstr[1] "链长 = %d: %lu 对象"
6334
6335#: builtin/index-pack.c:1622
6336msgid "Cannot come back to cwd"
6337msgstr "无法返回当前工作目录"
6338
6339#: builtin/index-pack.c:1670 builtin/index-pack.c:1673
6340#: builtin/index-pack.c:1685 builtin/index-pack.c:1689
6341#, c-format
6342msgid "bad %s"
6343msgstr "错误选项 %s"
6344
6345#: builtin/index-pack.c:1703
6346msgid "--fix-thin cannot be used without --stdin"
6347msgstr "--fix-thin 不能和 --stdin 同时使用"
6348
6349#: builtin/index-pack.c:1707 builtin/index-pack.c:1716
6350#, c-format
6351msgid "packfile name '%s' does not end with '.pack'"
6352msgstr "包名 '%s' 没有以 '.pack' 结尾"
6353
6354#: builtin/index-pack.c:1724
6355msgid "--verify with no packfile name given"
6356msgstr "--verify 没有提供包名参数"
6357
6358#: builtin/init-db.c:35
6359#, c-format
6360msgid "Could not make %s writable by group"
6361msgstr "不能设置 %s 为组可写"
6362
6363#: builtin/init-db.c:62
6364#, c-format
6365msgid "insanely long template name %s"
6366msgstr "太长的模版名 %s"
6367
6368#: builtin/init-db.c:67
6369#, c-format
6370msgid "cannot stat '%s'"
6371msgstr "不能枚举 '%s' 状态"
6372
6373#: builtin/init-db.c:73
6374#, c-format
6375msgid "cannot stat template '%s'"
6376msgstr "不能枚举模版 '%s' 状态"
6377
6378#: builtin/init-db.c:80
6379#, c-format
6380msgid "cannot opendir '%s'"
6381msgstr "不能打开目录 '%s'"
6382
6383#: builtin/init-db.c:97
6384#, c-format
6385msgid "cannot readlink '%s'"
6386msgstr "不能读取链接 '%s'"
6387
6388#: builtin/init-db.c:99
6389#, c-format
6390msgid "insanely long symlink %s"
6391msgstr "太长的符号链接 %s"
6392
6393#: builtin/init-db.c:102
6394#, c-format
6395msgid "cannot symlink '%s' '%s'"
6396msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6397
6398#: builtin/init-db.c:106
6399#, c-format
6400msgid "cannot copy '%s' to '%s'"
6401msgstr "不能拷贝 '%s' 至 '%s'"
6402
6403#: builtin/init-db.c:110
6404#, c-format
6405msgid "ignoring template %s"
6406msgstr "忽略模版 %s"
6407
6408#: builtin/init-db.c:136
6409#, c-format
6410msgid "insanely long template path %s"
6411msgstr "太长的模版路径 %s"
6412
6413#: builtin/init-db.c:144
6414#, c-format
6415msgid "templates not found %s"
6416msgstr "模版未找到 %s"
6417
6418#: builtin/init-db.c:157
6419#, c-format
6420msgid "not copying templates of a wrong format version %d from '%s'"
6421msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6422
6423#: builtin/init-db.c:211
6424#, c-format
6425msgid "insane git directory %s"
6426msgstr "不正常的 git 目录 %s"
6427
6428#: builtin/init-db.c:343 builtin/init-db.c:346
6429#, c-format
6430msgid "%s already exists"
6431msgstr "%s 已经存在"
6432
6433#: builtin/init-db.c:374
6434#, c-format
6435msgid "unable to handle file type %d"
6436msgstr "不能处理 %d 类型的文件"
6437
6438#: builtin/init-db.c:377
6439#, c-format
6440msgid "unable to move %s to %s"
6441msgstr "不能移动 %s 至 %s"
6442
6443#. TRANSLATORS: The first '%s' is either "Reinitialized
6444#. existing" or "Initialized empty", the second " shared" or
6445#. "", and the last '%s%s' is the verbatim directory name.
6446#: builtin/init-db.c:433
6447#, c-format
6448msgid "%s%s Git repository in %s%s\n"
6449msgstr "%s%s Git 版本库于 %s%s\n"
6450
6451#: builtin/init-db.c:434
6452msgid "Reinitialized existing"
6453msgstr "重新初始化现存的"
6454
6455#: builtin/init-db.c:434
6456msgid "Initialized empty"
6457msgstr "初始化空的"
6458
6459# 译者:中文字符串拼接,可删除前导空格
6460#: builtin/init-db.c:435
6461msgid " shared"
6462msgstr "共享"
6463
6464#: builtin/init-db.c:482
6465msgid ""
6466"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6467"shared[=<permissions>]] [<directory>]"
6468msgstr ""
6469"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6470"[<目录>]"
6471
6472#: builtin/init-db.c:505
6473msgid "permissions"
6474msgstr "权限"
6475
6476#: builtin/init-db.c:506
6477msgid "specify that the git repository is to be shared amongst several users"
6478msgstr "指定 git 版本库是多个用户之间共享的"
6479
6480#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
6481msgid "be quiet"
6482msgstr "保持安静"
6483
6484#: builtin/init-db.c:540 builtin/init-db.c:545
6485#, c-format
6486msgid "cannot mkdir %s"
6487msgstr "不能创建目录 %s"
6488
6489#: builtin/init-db.c:549
6490#, c-format
6491msgid "cannot chdir to %s"
6492msgstr "不能切换目录到 %s"
6493
6494#: builtin/init-db.c:570
6495#, c-format
6496msgid ""
6497"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6498"dir=<directory>)"
6499msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
6500
6501#: builtin/init-db.c:598
6502#, c-format
6503msgid "Cannot access work tree '%s'"
6504msgstr "不能访问工作区 '%s'"
6505
6506#: builtin/interpret-trailers.c:15
6507msgid ""
6508"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6509"[<file>...]"
6510msgstr ""
6511"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6512">...]"
6513
6514#: builtin/interpret-trailers.c:25
6515msgid "trim empty trailers"
6516msgstr "删除空签名"
6517
6518#: builtin/interpret-trailers.c:26
6519msgid "trailer"
6520msgstr "签名"
6521
6522#: builtin/interpret-trailers.c:27
6523msgid "trailer(s) to add"
6524msgstr "要添加的签名"
6525
6526#: builtin/log.c:41
6527msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
6528msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
6529
6530#: builtin/log.c:42
6531msgid "git show [<options>] <object>..."
6532msgstr "git show [<选项>] <对象>..."
6533
6534#: builtin/log.c:81
6535#, c-format
6536msgid "invalid --decorate option: %s"
6537msgstr "无效的 --decorate 选项:%s"
6538
6539#: builtin/log.c:127
6540msgid "suppress diff output"
6541msgstr "不显示差异输出"
6542
6543#: builtin/log.c:128
6544msgid "show source"
6545msgstr "显示源"
6546
6547#: builtin/log.c:129
6548msgid "Use mail map file"
6549msgstr "使用邮件映射文件"
6550
6551#: builtin/log.c:130
6552msgid "decorate options"
6553msgstr "修饰选项"
6554
6555#: builtin/log.c:133
6556msgid "Process line range n,m in file, counting from 1"
6557msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6558
6559#: builtin/log.c:229
6560#, c-format
6561msgid "Final output: %d %s\n"
6562msgstr "最终输出:%d %s\n"
6563
6564#: builtin/log.c:458
6565#, c-format
6566msgid "git show %s: bad file"
6567msgstr "git show %s: 损坏的文件"
6568
6569#: builtin/log.c:472 builtin/log.c:564
6570#, c-format
6571msgid "Could not read object %s"
6572msgstr "不能读取对象 %s"
6573
6574#: builtin/log.c:588
6575#, c-format
6576msgid "Unknown type: %d"
6577msgstr "未知类型:%d"
6578
6579#: builtin/log.c:689
6580msgid "format.headers without value"
6581msgstr "format.headers 没有值"
6582
6583#: builtin/log.c:773
6584msgid "name of output directory is too long"
6585msgstr "输出目录名太长"
6586
6587#: builtin/log.c:789
6588#, c-format
6589msgid "Cannot open patch file %s"
6590msgstr "无法打开补丁文件 %s"
6591
6592#: builtin/log.c:803
6593msgid "Need exactly one range."
6594msgstr "只需要一个范围。"
6595
6596#: builtin/log.c:813
6597msgid "Not a range."
6598msgstr "不是一个范围。"
6599
6600#: builtin/log.c:919
6601msgid "Cover letter needs email format"
6602msgstr "信封需要邮件地址格式"
6603
6604#: builtin/log.c:998
6605#, c-format
6606msgid "insane in-reply-to: %s"
6607msgstr "不正常的 in-reply-to:%s"
6608
6609#: builtin/log.c:1026
6610msgid "git format-patch [<options>] [<since> | <revision-range>]"
6611msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
6612
6613#: builtin/log.c:1071
6614msgid "Two output directories?"
6615msgstr "两个输出目录?"
6616
6617#: builtin/log.c:1186
6618msgid "use [PATCH n/m] even with a single patch"
6619msgstr "使用 [PATCH n/m],即使只有一个补丁"
6620
6621#: builtin/log.c:1189
6622msgid "use [PATCH] even with multiple patches"
6623msgstr "使用 [PATCH],即使有多个补丁"
6624
6625#: builtin/log.c:1193
6626msgid "print patches to standard out"
6627msgstr "打印补丁到标准输出"
6628
6629#: builtin/log.c:1195
6630msgid "generate a cover letter"
6631msgstr "生成一封附信"
6632
6633#: builtin/log.c:1197
6634msgid "use simple number sequence for output file names"
6635msgstr "使用简单的数字序列作为输出文件名"
6636
6637#: builtin/log.c:1198
6638msgid "sfx"
6639msgstr "后缀"
6640
6641#: builtin/log.c:1199
6642msgid "use <sfx> instead of '.patch'"
6643msgstr "使用 <后缀> 代替 '.patch'"
6644
6645#: builtin/log.c:1201
6646msgid "start numbering patches at <n> instead of 1"
6647msgstr "补丁以 <n> 开始编号,而不是1"
6648
6649#: builtin/log.c:1203
6650msgid "mark the series as Nth re-roll"
6651msgstr "标记补丁系列是第几次重制"
6652
6653#: builtin/log.c:1205
6654msgid "Use [<prefix>] instead of [PATCH]"
6655msgstr "使用 [<前缀>] 代替 [PATCH]"
6656
6657#: builtin/log.c:1208
6658msgid "store resulting files in <dir>"
6659msgstr "把结果文件存储在 <目录>"
6660
6661#: builtin/log.c:1211
6662msgid "don't strip/add [PATCH]"
6663msgstr "不删除/添加 [PATCH]"
6664
6665#: builtin/log.c:1214
6666msgid "don't output binary diffs"
6667msgstr "不输出二进制差异"
6668
6669#: builtin/log.c:1216
6670msgid "don't include a patch matching a commit upstream"
6671msgstr "不包含已在上游提交中的补丁"
6672
6673#: builtin/log.c:1218
6674msgid "show patch format instead of default (patch + stat)"
6675msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6676
6677#: builtin/log.c:1220
6678msgid "Messaging"
6679msgstr "邮件发送"
6680
6681#: builtin/log.c:1221
6682msgid "header"
6683msgstr "header"
6684
6685#: builtin/log.c:1222
6686msgid "add email header"
6687msgstr "添加邮件头"
6688
6689#: builtin/log.c:1223 builtin/log.c:1225
6690msgid "email"
6691msgstr "邮件地址"
6692
6693#: builtin/log.c:1223
6694msgid "add To: header"
6695msgstr "添加收件人"
6696
6697#: builtin/log.c:1225
6698msgid "add Cc: header"
6699msgstr "添加抄送"
6700
6701#: builtin/log.c:1227
6702msgid "ident"
6703msgstr "标识"
6704
6705#: builtin/log.c:1228
6706msgid "set From address to <ident> (or committer ident if absent)"
6707msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者ID做为地址)"
6708
6709#: builtin/log.c:1230
6710msgid "message-id"
6711msgstr "邮件标识"
6712
6713#: builtin/log.c:1231
6714msgid "make first mail a reply to <message-id>"
6715msgstr "使第一封邮件作为对 <邮件标识> 的回复"
6716
6717#: builtin/log.c:1232 builtin/log.c:1235
6718msgid "boundary"
6719msgstr "边界"
6720
6721#: builtin/log.c:1233
6722msgid "attach the patch"
6723msgstr "附件方式添加补丁"
6724
6725#: builtin/log.c:1236
6726msgid "inline the patch"
6727msgstr "内联显示补丁"
6728
6729#: builtin/log.c:1240
6730msgid "enable message threading, styles: shallow, deep"
6731msgstr "启用邮件线索,风格:浅,深"
6732
6733#: builtin/log.c:1242
6734msgid "signature"
6735msgstr "签名"
6736
6737#: builtin/log.c:1243
6738msgid "add a signature"
6739msgstr "添加一个签名"
6740
6741#: builtin/log.c:1245
6742msgid "add a signature from a file"
6743msgstr "从文件添加一个签名"
6744
6745#: builtin/log.c:1246
6746msgid "don't print the patch filenames"
6747msgstr "不要打印补丁文件名"
6748
6749#: builtin/log.c:1320
6750#, c-format
6751msgid "invalid ident line: %s"
6752msgstr "包含无效的身份标识:%s"
6753
6754#: builtin/log.c:1335
6755msgid "-n and -k are mutually exclusive."
6756msgstr "-n 和 -k 互斥。"
6757
6758#: builtin/log.c:1337
6759msgid "--subject-prefix and -k are mutually exclusive."
6760msgstr "--subject-prefix 和 -k 互斥。"
6761
6762#: builtin/log.c:1345
6763msgid "--name-only does not make sense"
6764msgstr "--name-only 无意义"
6765
6766#: builtin/log.c:1347
6767msgid "--name-status does not make sense"
6768msgstr "--name-status 无意义"
6769
6770#: builtin/log.c:1349
6771msgid "--check does not make sense"
6772msgstr "--check 无意义"
6773
6774#: builtin/log.c:1372
6775msgid "standard output, or directory, which one?"
6776msgstr "标准输出或目录,哪一个?"
6777
6778#: builtin/log.c:1374
6779#, c-format
6780msgid "Could not create directory '%s'"
6781msgstr "不能创建目录 '%s'"
6782
6783#: builtin/log.c:1472
6784#, c-format
6785msgid "unable to read signature file '%s'"
6786msgstr "无法读取签名文件 '%s'"
6787
6788#: builtin/log.c:1535
6789msgid "Failed to create output files"
6790msgstr "无法创建输出文件"
6791
6792#: builtin/log.c:1583
6793msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6794msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6795
6796#: builtin/log.c:1637
6797#, c-format
6798msgid ""
6799"Could not find a tracked remote branch, please specify <upstream> manually.\n"
6800msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
6801
6802#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
6803#, c-format
6804msgid "Unknown commit %s"
6805msgstr "未知提交 %s"
6806
6807#: builtin/ls-files.c:358
6808msgid "git ls-files [<options>] [<file>...]"
6809msgstr "git ls-files [<选项>] [<文件>...]"
6810
6811#: builtin/ls-files.c:415
6812msgid "identify the file status with tags"
6813msgstr "用标签标识文件的状态"
6814
6815#: builtin/ls-files.c:417
6816msgid "use lowercase letters for 'assume unchanged' files"
6817msgstr "使用小写字母表示 '假设未改变的' 文件"
6818
6819#: builtin/ls-files.c:419
6820msgid "show cached files in the output (default)"
6821msgstr "显示缓存的文件(默认)"
6822
6823#: builtin/ls-files.c:421
6824msgid "show deleted files in the output"
6825msgstr "显示已删除的文件"
6826
6827#: builtin/ls-files.c:423
6828msgid "show modified files in the output"
6829msgstr "显示已修改的文件"
6830
6831#: builtin/ls-files.c:425
6832msgid "show other files in the output"
6833msgstr "显示其它文件"
6834
6835#: builtin/ls-files.c:427
6836msgid "show ignored files in the output"
6837msgstr "显示忽略的文件"
6838
6839#: builtin/ls-files.c:430
6840msgid "show staged contents' object name in the output"
6841msgstr "显示暂存区内容的对象名称"
6842
6843#: builtin/ls-files.c:432
6844msgid "show files on the filesystem that need to be removed"
6845msgstr "显示文件系统需要删除的文件"
6846
6847#: builtin/ls-files.c:434
6848msgid "show 'other' directories' names only"
6849msgstr "只显示“其他”目录的名称"
6850
6851#: builtin/ls-files.c:437
6852msgid "don't show empty directories"
6853msgstr "不显示空目录"
6854
6855#: builtin/ls-files.c:440
6856msgid "show unmerged files in the output"
6857msgstr "显示未合并的文件"
6858
6859#: builtin/ls-files.c:442
6860msgid "show resolve-undo information"
6861msgstr "显示 resolve-undo 信息"
6862
6863#: builtin/ls-files.c:444
6864msgid "skip files matching pattern"
6865msgstr "匹配排除文件的模式"
6866
6867#: builtin/ls-files.c:447
6868msgid "exclude patterns are read from <file>"
6869msgstr "从 <文件> 中读取排除模式"
6870
6871#: builtin/ls-files.c:450
6872msgid "read additional per-directory exclude patterns in <file>"
6873msgstr "从 <文件> 读取额外的每个目录的排除模式"
6874
6875#: builtin/ls-files.c:452
6876msgid "add the standard git exclusions"
6877msgstr "添加标准的 git 排除"
6878
6879#: builtin/ls-files.c:455
6880msgid "make the output relative to the project top directory"
6881msgstr "显示相对于顶级目录的文件名"
6882
6883#: builtin/ls-files.c:458
6884msgid "if any <file> is not in the index, treat this as an error"
6885msgstr "如果任何 <文件> 都不在索引区,视为错误"
6886
6887#: builtin/ls-files.c:459
6888msgid "tree-ish"
6889msgstr "树或提交"
6890
6891#: builtin/ls-files.c:460
6892msgid "pretend that paths removed since <tree-ish> are still present"
6893msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6894
6895#: builtin/ls-files.c:462
6896msgid "show debugging data"
6897msgstr "显示调试数据"
6898
6899#: builtin/ls-tree.c:28
6900msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6901msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6902
6903#: builtin/ls-tree.c:127
6904msgid "only show trees"
6905msgstr "只显示树"
6906
6907#: builtin/ls-tree.c:129
6908msgid "recurse into subtrees"
6909msgstr "递归到子树"
6910
6911#: builtin/ls-tree.c:131
6912msgid "show trees when recursing"
6913msgstr "当递归时显示树"
6914
6915#: builtin/ls-tree.c:134
6916msgid "terminate entries with NUL byte"
6917msgstr "条目以NUL字符终止"
6918
6919#: builtin/ls-tree.c:135
6920msgid "include object size"
6921msgstr "包括对象大小"
6922
6923#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
6924msgid "list only filenames"
6925msgstr "只列出文件名"
6926
6927#: builtin/ls-tree.c:142
6928msgid "use full path names"
6929msgstr "使用文件的全路径"
6930
6931#: builtin/ls-tree.c:144
6932msgid "list entire tree; not just current directory (implies --full-name)"
6933msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6934
6935#: builtin/merge.c:45
6936msgid "git merge [<options>] [<commit>...]"
6937msgstr "git merge [<选项>] [<提交>...]"
6938
6939#: builtin/merge.c:46
6940msgid "git merge [<options>] <msg> HEAD <commit>"
6941msgstr "git merge [<选项>] <说明> HEAD <提交>"
6942
6943#: builtin/merge.c:47
6944msgid "git merge --abort"
6945msgstr "git merge --abort"
6946
6947#: builtin/merge.c:100
6948msgid "switch `m' requires a value"
6949msgstr "开关 `m' 需要一个值"
6950
6951#: builtin/merge.c:137
6952#, c-format
6953msgid "Could not find merge strategy '%s'.\n"
6954msgstr "不能找到合并策略 '%s'。\n"
6955
6956#: builtin/merge.c:138
6957#, c-format
6958msgid "Available strategies are:"
6959msgstr "可用的策略有:"
6960
6961#: builtin/merge.c:143
6962#, c-format
6963msgid "Available custom strategies are:"
6964msgstr "可用的自定义策略有:"
6965
6966#: builtin/merge.c:193
6967msgid "do not show a diffstat at the end of the merge"
6968msgstr "在合并的最后不显示差异统计"
6969
6970#: builtin/merge.c:196
6971msgid "show a diffstat at the end of the merge"
6972msgstr "在合并的最后显示差异统计"
6973
6974#: builtin/merge.c:197
6975msgid "(synonym to --stat)"
6976msgstr "(和 --stat 同义)"
6977
6978#: builtin/merge.c:199
6979msgid "add (at most <n>) entries from shortlog to merge commit message"
6980msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6981
6982#: builtin/merge.c:202
6983msgid "create a single commit instead of doing a merge"
6984msgstr "创建一个单独的提交而不是做一次合并"
6985
6986#: builtin/merge.c:204
6987msgid "perform a commit if the merge succeeds (default)"
6988msgstr "如果合并成功,执行一次提交(默认)"
6989
6990#: builtin/merge.c:206
6991msgid "edit message before committing"
6992msgstr "在提交前编辑提交说明"
6993
6994#: builtin/merge.c:207
6995msgid "allow fast-forward (default)"
6996msgstr "允许快进(默认)"
6997
6998#: builtin/merge.c:209
6999msgid "abort if fast-forward is not possible"
7000msgstr "如果不能快进就放弃合并"
7001
7002#: builtin/merge.c:213
7003msgid "Verify that the named commit has a valid GPG signature"
7004msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7005
7006#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
7007msgid "strategy"
7008msgstr "策略"
7009
7010#: builtin/merge.c:215
7011msgid "merge strategy to use"
7012msgstr "要使用的合并策略"
7013
7014#: builtin/merge.c:216
7015msgid "option=value"
7016msgstr "option=value"
7017
7018#: builtin/merge.c:217
7019msgid "option for selected merge strategy"
7020msgstr "所选的合并策略的选项"
7021
7022#: builtin/merge.c:219
7023msgid "merge commit message (for a non-fast-forward merge)"
7024msgstr "合并的提交说明(针对非快进式合并)"
7025
7026#: builtin/merge.c:223
7027msgid "abort the current in-progress merge"
7028msgstr "放弃当前正在进行的合并"
7029
7030#: builtin/merge.c:251
7031msgid "could not run stash."
7032msgstr "不能进行进度保存。"
7033
7034#: builtin/merge.c:256
7035msgid "stash failed"
7036msgstr "进度保存失败"
7037
7038#: builtin/merge.c:261
7039#, c-format
7040msgid "not a valid object: %s"
7041msgstr "不是一个有效对象:%s"
7042
7043#: builtin/merge.c:280 builtin/merge.c:297
7044msgid "read-tree failed"
7045msgstr "读取树失败"
7046
7047# 译者:注意保持前导空格
7048#: builtin/merge.c:327
7049msgid " (nothing to squash)"
7050msgstr " (无可压缩)"
7051
7052#: builtin/merge.c:340
7053#, c-format
7054msgid "Squash commit -- not updating HEAD\n"
7055msgstr "压缩提交 -- 未更新 HEAD\n"
7056
7057#: builtin/merge.c:372
7058msgid "Writing SQUASH_MSG"
7059msgstr "写入 SQUASH_MSG"
7060
7061#: builtin/merge.c:374
7062msgid "Finishing SQUASH_MSG"
7063msgstr "完成 SQUASH_MSG"
7064
7065#: builtin/merge.c:397
7066#, c-format
7067msgid "No merge message -- not updating HEAD\n"
7068msgstr "无合并信息 -- 未更新 HEAD\n"
7069
7070#: builtin/merge.c:447
7071#, c-format
7072msgid "'%s' does not point to a commit"
7073msgstr "'%s' 没有指向一个提交"
7074
7075#: builtin/merge.c:537
7076#, c-format
7077msgid "Bad branch.%s.mergeoptions string: %s"
7078msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
7079
7080#: builtin/merge.c:632
7081msgid "git write-tree failed to write a tree"
7082msgstr "git write-tree 无法写入一树对象"
7083
7084#: builtin/merge.c:656
7085msgid "Not handling anything other than two heads merge."
7086msgstr "不能处理两个头合并之外的任何操作。"
7087
7088#: builtin/merge.c:670
7089#, c-format
7090msgid "Unknown option for merge-recursive: -X%s"
7091msgstr "merge-recursive 的未知选项:-X%s"
7092
7093#: builtin/merge.c:683
7094#, c-format
7095msgid "unable to write %s"
7096msgstr "不能写 %s"
7097
7098#: builtin/merge.c:772
7099#, c-format
7100msgid "Could not read from '%s'"
7101msgstr "不能从 '%s' 读取"
7102
7103#: builtin/merge.c:781
7104#, c-format
7105msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7106msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7107
7108#: builtin/merge.c:787
7109#, c-format
7110msgid ""
7111"Please enter a commit message to explain why this merge is necessary,\n"
7112"especially if it merges an updated upstream into a topic branch.\n"
7113"\n"
7114"Lines starting with '%c' will be ignored, and an empty message aborts\n"
7115"the commit.\n"
7116msgstr ""
7117"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7118"合并到主题分支。\n"
7119"\n"
7120"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
7121
7122#: builtin/merge.c:811
7123msgid "Empty commit message."
7124msgstr "空提交信息。"
7125
7126#: builtin/merge.c:823
7127#, c-format
7128msgid "Wonderful.\n"
7129msgstr "太棒了。\n"
7130
7131#: builtin/merge.c:878
7132#, c-format
7133msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7134msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7135
7136#: builtin/merge.c:894
7137#, c-format
7138msgid "'%s' is not a commit"
7139msgstr "'%s' 不是一个提交"
7140
7141#: builtin/merge.c:935
7142msgid "No current branch."
7143msgstr "没有当前分支。"
7144
7145#: builtin/merge.c:937
7146msgid "No remote for the current branch."
7147msgstr "当前分支没有对应的远程版本库。"
7148
7149#: builtin/merge.c:939
7150msgid "No default upstream defined for the current branch."
7151msgstr "当前分支没有定义默认的上游分支。"
7152
7153#: builtin/merge.c:944
7154#, c-format
7155msgid "No remote-tracking branch for %s from %s"
7156msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7157
7158#: builtin/merge.c:1081
7159#, c-format
7160msgid "could not close '%s'"
7161msgstr "不能关闭 '%s'"
7162
7163#: builtin/merge.c:1208
7164msgid "There is no merge to abort (MERGE_HEAD missing)."
7165msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7166
7167#: builtin/merge.c:1224
7168msgid ""
7169"You have not concluded your merge (MERGE_HEAD exists).\n"
7170"Please, commit your changes before you merge."
7171msgstr ""
7172"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7173"请在合并前先提交您的修改。"
7174
7175#: builtin/merge.c:1227 git-pull.sh:74
7176msgid "You have not concluded your merge (MERGE_HEAD exists)."
7177msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7178
7179#: builtin/merge.c:1231
7180msgid ""
7181"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7182"Please, commit your changes before you merge."
7183msgstr ""
7184"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7185"请在合并前先提交您的修改。"
7186
7187#: builtin/merge.c:1234
7188msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7189msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7190
7191#: builtin/merge.c:1243
7192msgid "You cannot combine --squash with --no-ff."
7193msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7194
7195#: builtin/merge.c:1251
7196msgid "No commit specified and merge.defaultToUpstream not set."
7197msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7198
7199#: builtin/merge.c:1268
7200msgid "Squash commit into empty head not supported yet"
7201msgstr "尚不支持到空分支的压缩提交"
7202
7203#: builtin/merge.c:1270
7204msgid "Non-fast-forward commit does not make sense into an empty head"
7205msgstr "到空分支的非快进式提交没有意义"
7206
7207#: builtin/merge.c:1276
7208#, c-format
7209msgid "%s - not something we can merge"
7210msgstr "%s - 不能被合并"
7211
7212#: builtin/merge.c:1278
7213msgid "Can merge only exactly one commit into empty head"
7214msgstr "只能将一个提交合并到空分支上"
7215
7216#: builtin/merge.c:1333
7217#, c-format
7218msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7219msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7220
7221#: builtin/merge.c:1336
7222#, c-format
7223msgid "Commit %s has a bad GPG signature allegedly by %s."
7224msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7225
7226#: builtin/merge.c:1339
7227#, c-format
7228msgid "Commit %s does not have a GPG signature."
7229msgstr "提交 %s 没有一个 GPG 签名。"
7230
7231#: builtin/merge.c:1342
7232#, c-format
7233msgid "Commit %s has a good GPG signature by %s\n"
7234msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7235
7236#: builtin/merge.c:1423
7237#, c-format
7238msgid "Updating %s..%s\n"
7239msgstr "更新 %s..%s\n"
7240
7241#: builtin/merge.c:1462
7242#, c-format
7243msgid "Trying really trivial in-index merge...\n"
7244msgstr "尝试非常小的索引内合并...\n"
7245
7246#: builtin/merge.c:1469
7247#, c-format
7248msgid "Nope.\n"
7249msgstr "无。\n"
7250
7251#: builtin/merge.c:1501
7252msgid "Not possible to fast-forward, aborting."
7253msgstr "无法快进,终止。"
7254
7255#: builtin/merge.c:1524 builtin/merge.c:1603
7256#, c-format
7257msgid "Rewinding the tree to pristine...\n"
7258msgstr "将树回滚至原始状态...\n"
7259
7260#: builtin/merge.c:1528
7261#, c-format
7262msgid "Trying merge strategy %s...\n"
7263msgstr "尝试合并策略 %s...\n"
7264
7265#: builtin/merge.c:1594
7266#, c-format
7267msgid "No merge strategy handled the merge.\n"
7268msgstr "没有合并策略处理此合并。\n"
7269
7270#: builtin/merge.c:1596
7271#, c-format
7272msgid "Merge with strategy %s failed.\n"
7273msgstr "使用策略 %s 合并失败。\n"
7274
7275#: builtin/merge.c:1605
7276#, c-format
7277msgid "Using the %s to prepare resolving by hand.\n"
7278msgstr "使用 %s 以准备手工解决。\n"
7279
7280#: builtin/merge.c:1617
7281#, c-format
7282msgid "Automatic merge went well; stopped before committing as requested\n"
7283msgstr "自动合并进展顺利,按要求在提交前停止\n"
7284
7285#: builtin/merge-base.c:29
7286msgid "git merge-base [-a | --all] <commit> <commit>..."
7287msgstr "git merge-base [-a | --all] <提交> <提交>..."
7288
7289#: builtin/merge-base.c:30
7290msgid "git merge-base [-a | --all] --octopus <commit>..."
7291msgstr "git merge-base [-a | --all] --octopus <提交>..."
7292
7293#: builtin/merge-base.c:31
7294msgid "git merge-base --independent <commit>..."
7295msgstr "git merge-base --independent <提交>..."
7296
7297#: builtin/merge-base.c:32
7298msgid "git merge-base --is-ancestor <commit> <commit>"
7299msgstr "git merge-base --is-ancestor <提交> <提交>"
7300
7301#: builtin/merge-base.c:33
7302msgid "git merge-base --fork-point <ref> [<commit>]"
7303msgstr "git merge-base --fork-point <引用> [<提交>]"
7304
7305#: builtin/merge-base.c:214
7306msgid "output all common ancestors"
7307msgstr "输出所有共同的祖先"
7308
7309#: builtin/merge-base.c:216
7310msgid "find ancestors for a single n-way merge"
7311msgstr "查找一个多路合并的祖先提交"
7312
7313#: builtin/merge-base.c:218
7314msgid "list revs not reachable from others"
7315msgstr "显示不能被其他访问到的版本"
7316
7317#: builtin/merge-base.c:220
7318msgid "is the first one ancestor of the other?"
7319msgstr "第一个是其他的祖先提交么?"
7320
7321#: builtin/merge-base.c:222
7322msgid "find where <commit> forked from reflog of <ref>"
7323msgstr "查找 <提交> 从<引用>日志的何处分支的"
7324
7325#: builtin/merge-file.c:8
7326msgid ""
7327"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7328"<orig-file> <file2>"
7329msgstr ""
7330"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7331"件> <文件2>"
7332
7333#: builtin/merge-file.c:33
7334msgid "send results to standard output"
7335msgstr "将结果发送到标准输出"
7336
7337#: builtin/merge-file.c:34
7338msgid "use a diff3 based merge"
7339msgstr "使用基于 diff3 的合并"
7340
7341#: builtin/merge-file.c:35
7342msgid "for conflicts, use our version"
7343msgstr "如果冲突,使用我们的版本"
7344
7345#: builtin/merge-file.c:37
7346msgid "for conflicts, use their version"
7347msgstr "如果冲突,使用他们的版本"
7348
7349#: builtin/merge-file.c:39
7350msgid "for conflicts, use a union version"
7351msgstr "如果冲突,使用联合版本"
7352
7353#: builtin/merge-file.c:42
7354msgid "for conflicts, use this marker size"
7355msgstr "如果冲突,使用指定长度的标记"
7356
7357#: builtin/merge-file.c:43
7358msgid "do not warn about conflicts"
7359msgstr "不要警告冲突"
7360
7361#: builtin/merge-file.c:45
7362msgid "set labels for file1/orig-file/file2"
7363msgstr "为 文件1/初始文件/文件2 设置标签"
7364
7365#: builtin/mktree.c:64
7366msgid "git mktree [-z] [--missing] [--batch]"
7367msgstr "git mktree [-z] [--missing] [--batch]"
7368
7369#: builtin/mktree.c:150
7370msgid "input is NUL terminated"
7371msgstr "输入以 NUL 字符终止"
7372
7373#: builtin/mktree.c:151 builtin/write-tree.c:24
7374msgid "allow missing objects"
7375msgstr "允许丢失的对象"
7376
7377#: builtin/mktree.c:152
7378msgid "allow creation of more than one tree"
7379msgstr "允许创建一个以上的树"
7380
7381#: builtin/mv.c:15
7382msgid "git mv [<options>] <source>... <destination>"
7383msgstr "git mv [<选项>] <源>... <目标>"
7384
7385#: builtin/mv.c:69
7386#, c-format
7387msgid "Directory %s is in index and no submodule?"
7388msgstr "目录 %s 在索引中并且不是子模组?"
7389
7390#: builtin/mv.c:71
7391msgid "Please stage your changes to .gitmodules or stash them to proceed"
7392msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7393
7394#: builtin/mv.c:89
7395#, c-format
7396msgid "%.*s is in index"
7397msgstr "%.*s 在索引中"
7398
7399#: builtin/mv.c:111
7400msgid "force move/rename even if target exists"
7401msgstr "强制移动/重命令,即使目标存在"
7402
7403#: builtin/mv.c:112
7404msgid "skip move/rename errors"
7405msgstr "跳过移动/重命名错误"
7406
7407#: builtin/mv.c:151
7408#, c-format
7409msgid "destination '%s' is not a directory"
7410msgstr "目标 '%s' 不是一个目录"
7411
7412#: builtin/mv.c:162
7413#, c-format
7414msgid "Checking rename of '%s' to '%s'\n"
7415msgstr "检查 '%s' 到 '%s' 的重命名\n"
7416
7417#: builtin/mv.c:166
7418msgid "bad source"
7419msgstr "坏的源"
7420
7421#: builtin/mv.c:169
7422msgid "can not move directory into itself"
7423msgstr "不能将目录移动到自身"
7424
7425#: builtin/mv.c:172
7426msgid "cannot move directory over file"
7427msgstr "不能将目录移动到文件"
7428
7429#: builtin/mv.c:181
7430msgid "source directory is empty"
7431msgstr "源目录为空"
7432
7433#: builtin/mv.c:206
7434msgid "not under version control"
7435msgstr "不在版本控制之下"
7436
7437#: builtin/mv.c:209
7438msgid "destination exists"
7439msgstr "目标已存在"
7440
7441#: builtin/mv.c:217
7442#, c-format
7443msgid "overwriting '%s'"
7444msgstr "覆盖 '%s'"
7445
7446#: builtin/mv.c:220
7447msgid "Cannot overwrite"
7448msgstr "不能覆盖"
7449
7450#: builtin/mv.c:223
7451msgid "multiple sources for the same target"
7452msgstr "同一目标具有多个源"
7453
7454#: builtin/mv.c:225
7455msgid "destination directory does not exist"
7456msgstr "目标目录不存在"
7457
7458#: builtin/mv.c:232
7459#, c-format
7460msgid "%s, source=%s, destination=%s"
7461msgstr "%s,源=%s,目标=%s"
7462
7463#: builtin/mv.c:253
7464#, c-format
7465msgid "Renaming %s to %s\n"
7466msgstr "重命名 %s 至 %s\n"
7467
7468#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361
7469#, c-format
7470msgid "renaming '%s' failed"
7471msgstr "重命名 '%s' 失败"
7472
7473#: builtin/name-rev.c:255
7474msgid "git name-rev [<options>] <commit>..."
7475msgstr "git name-rev [<选项>] <提交>..."
7476
7477#: builtin/name-rev.c:256
7478msgid "git name-rev [<options>] --all"
7479msgstr "git name-rev [<选项>] --all"
7480
7481#: builtin/name-rev.c:257
7482msgid "git name-rev [<options>] --stdin"
7483msgstr "git name-rev [<选项>] --stdin"
7484
7485#: builtin/name-rev.c:309
7486msgid "print only names (no SHA-1)"
7487msgstr "只打印名称(无 SHA-1)"
7488
7489#: builtin/name-rev.c:310
7490msgid "only use tags to name the commits"
7491msgstr "只使用 tags 来命名提交"
7492
7493#: builtin/name-rev.c:312
7494msgid "only use refs matching <pattern>"
7495msgstr "只使用和 <模式> 相匹配的引用"
7496
7497#: builtin/name-rev.c:314
7498msgid "list all commits reachable from all refs"
7499msgstr "列出可以从所有引用访问的提交"
7500
7501#: builtin/name-rev.c:315
7502msgid "read from stdin"
7503msgstr "从标准输入读取"
7504
7505#: builtin/name-rev.c:316
7506msgid "allow to print `undefined` names (default)"
7507msgstr "允许打印 `未定义` 的名称(默认)"
7508
7509#: builtin/name-rev.c:322
7510msgid "dereference tags in the input (internal use)"
7511msgstr "反向解析输入中的 tags(内部使用)"
7512
7513#: builtin/notes.c:24
7514msgid "git notes [--ref <notes-ref>] [list [<object>]]"
7515msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7516
7517#: builtin/notes.c:25
7518msgid ""
7519"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7520"| (-c | -C) <object>] [<object>]"
7521msgstr ""
7522"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7523"| (-c | -C) <对象>] [<对象>]"
7524
7525#: builtin/notes.c:26
7526msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
7527msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7528
7529#: builtin/notes.c:27
7530msgid ""
7531"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7532"(-c | -C) <object>] [<object>]"
7533msgstr ""
7534"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7535"(-c | -C) <对象>] [<对象>]"
7536
7537#: builtin/notes.c:28
7538msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
7539msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
7540
7541#: builtin/notes.c:29
7542msgid "git notes [--ref <notes-ref>] show [<object>]"
7543msgstr "git notes [--ref <注解引用>] show [<对象>]"
7544
7545#: builtin/notes.c:30
7546msgid ""
7547"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
7548msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7549
7550#: builtin/notes.c:31
7551msgid "git notes merge --commit [-v | -q]"
7552msgstr "git notes merge --commit [-v | -q]"
7553
7554#: builtin/notes.c:32
7555msgid "git notes merge --abort [-v | -q]"
7556msgstr "git notes merge --abort [-v | -q]"
7557
7558#: builtin/notes.c:33
7559msgid "git notes [--ref <notes-ref>] remove [<object>...]"
7560msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7561
7562#: builtin/notes.c:34
7563msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
7564msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7565
7566#: builtin/notes.c:35
7567msgid "git notes [--ref <notes-ref>] get-ref"
7568msgstr "git notes [--ref <注解引用>] get-ref"
7569
7570#: builtin/notes.c:40
7571msgid "git notes [list [<object>]]"
7572msgstr "git notes [list [<对象>]]"
7573
7574#: builtin/notes.c:45
7575msgid "git notes add [<options>] [<object>]"
7576msgstr "git notes add [<选项>] [<对象>]"
7577
7578#: builtin/notes.c:50
7579msgid "git notes copy [<options>] <from-object> <to-object>"
7580msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7581
7582#: builtin/notes.c:51
7583msgid "git notes copy --stdin [<from-object> <to-object>]..."
7584msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7585
7586#: builtin/notes.c:56
7587msgid "git notes append [<options>] [<object>]"
7588msgstr "git notes append [<选项>] [<对象>]"
7589
7590#: builtin/notes.c:61
7591msgid "git notes edit [<object>]"
7592msgstr "git notes edit [<对象>]"
7593
7594#: builtin/notes.c:66
7595msgid "git notes show [<object>]"
7596msgstr "git notes show [<对象>]"
7597
7598#: builtin/notes.c:71
7599msgid "git notes merge [<options>] <notes-ref>"
7600msgstr "git notes merge [<选项>] <注解引用>"
7601
7602#: builtin/notes.c:72
7603msgid "git notes merge --commit [<options>]"
7604msgstr "git notes merge --commit [<选项>]"
7605
7606#: builtin/notes.c:73
7607msgid "git notes merge --abort [<options>]"
7608msgstr "git notes merge --abort [<选项>]"
7609
7610#: builtin/notes.c:78
7611msgid "git notes remove [<object>]"
7612msgstr "git notes remove [<对象>]"
7613
7614#: builtin/notes.c:83
7615msgid "git notes prune [<options>]"
7616msgstr "git notes prune [<选项>]"
7617
7618#: builtin/notes.c:88
7619msgid "git notes get-ref"
7620msgstr "git notes get-ref"
7621
7622#: builtin/notes.c:146
7623#, c-format
7624msgid "unable to start 'show' for object '%s'"
7625msgstr "不能为对象 '%s' 开始 'show'"
7626
7627#: builtin/notes.c:150
7628msgid "could not read 'show' output"
7629msgstr "不能读取 'show' 的输出"
7630
7631#: builtin/notes.c:158
7632#, c-format
7633msgid "failed to finish 'show' for object '%s'"
7634msgstr "无法为对象 '%s' 完成 'show'"
7635
7636#: builtin/notes.c:173 builtin/tag.c:477
7637#, c-format
7638msgid "could not create file '%s'"
7639msgstr "不能创建文件 '%s'"
7640
7641#: builtin/notes.c:192
7642msgid "Please supply the note contents using either -m or -F option"
7643msgstr "请通过 -m 或 -F 选项为注解提供内容"
7644
7645#: builtin/notes.c:201
7646msgid "unable to write note object"
7647msgstr "不能写注解对象"
7648
7649#: builtin/notes.c:203
7650#, c-format
7651msgid "The note contents have been left in %s"
7652msgstr "注解内容被留在 %s 中"
7653
7654#: builtin/notes.c:231 builtin/tag.c:693
7655#, c-format
7656msgid "cannot read '%s'"
7657msgstr "不能读取 '%s'"
7658
7659#: builtin/notes.c:233 builtin/tag.c:696
7660#, c-format
7661msgid "could not open or read '%s'"
7662msgstr "不能打开或读取 '%s'"
7663
7664#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7665#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7666#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7667#: builtin/notes.c:854 builtin/tag.c:709
7668#, c-format
7669msgid "Failed to resolve '%s' as a valid ref."
7670msgstr "无法解析 '%s' 为一个有效引用。"
7671
7672#: builtin/notes.c:255
7673#, c-format
7674msgid "Failed to read object '%s'."
7675msgstr "无法读取对象 '%s'。"
7676
7677#: builtin/notes.c:259
7678#, c-format
7679msgid "Cannot read note data from non-blob object '%s'."
7680msgstr "不能从非数据对象 '%s' 中读取注解数据"
7681
7682#: builtin/notes.c:299
7683#, c-format
7684msgid "Malformed input line: '%s'."
7685msgstr "非法的输入行:'%s'。"
7686
7687#: builtin/notes.c:314
7688#, c-format
7689msgid "Failed to copy notes from '%s' to '%s'"
7690msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7691
7692#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7693#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7694#: builtin/notes.c:919
7695msgid "too many parameters"
7696msgstr "参数太多"
7697
7698#: builtin/notes.c:371 builtin/notes.c:658
7699#, c-format
7700msgid "No note found for object %s."
7701msgstr "未发现对象 %s 的注解。"
7702
7703#: builtin/notes.c:392 builtin/notes.c:555
7704msgid "note contents as a string"
7705msgstr "注解内容作为一个字符串"
7706
7707#: builtin/notes.c:395 builtin/notes.c:558
7708msgid "note contents in a file"
7709msgstr "注解内容到一个文件中"
7710
7711#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7712#: builtin/notes.c:563 builtin/tag.c:628
7713msgid "object"
7714msgstr "对象"
7715
7716#: builtin/notes.c:398 builtin/notes.c:561
7717msgid "reuse and edit specified note object"
7718msgstr "重用和编辑指定的注解对象"
7719
7720#: builtin/notes.c:401 builtin/notes.c:564
7721msgid "reuse specified note object"
7722msgstr "重用指定的注解对象"
7723
7724#: builtin/notes.c:404 builtin/notes.c:567
7725msgid "allow storing empty note"
7726msgstr "允许保存空白注释"
7727
7728#: builtin/notes.c:405 builtin/notes.c:476
7729msgid "replace existing notes"
7730msgstr "替换已存在的注解"
7731
7732#: builtin/notes.c:430
7733#, c-format
7734msgid ""
7735"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7736"existing notes"
7737msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7738
7739#: builtin/notes.c:445 builtin/notes.c:524
7740#, c-format
7741msgid "Overwriting existing notes for object %s\n"
7742msgstr "覆盖对象 %s 现存注解\n"
7743
7744#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7745#, c-format
7746msgid "Removing note for object %s\n"
7747msgstr "删除对象 %s 的注解\n"
7748
7749#: builtin/notes.c:477
7750msgid "read objects from stdin"
7751msgstr "从标准输入读取对象"
7752
7753#: builtin/notes.c:479
7754msgid "load rewriting config for <command> (implies --stdin)"
7755msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7756
7757#: builtin/notes.c:497
7758msgid "too few parameters"
7759msgstr "参数太少"
7760
7761#: builtin/notes.c:518
7762#, c-format
7763msgid ""
7764"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7765"existing notes"
7766msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7767
7768#: builtin/notes.c:530
7769#, c-format
7770msgid "Missing notes on source object %s. Cannot copy."
7771msgstr "源对象 %s 缺少注解。不能拷贝。"
7772
7773#: builtin/notes.c:582
7774#, c-format
7775msgid ""
7776"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7777"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7778msgstr ""
7779"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7780"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7781
7782#: builtin/notes.c:750
7783msgid "General options"
7784msgstr "通用选项"
7785
7786#: builtin/notes.c:752
7787msgid "Merge options"
7788msgstr "合并选项"
7789
7790#: builtin/notes.c:754
7791msgid ""
7792"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7793"cat_sort_uniq)"
7794msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7795
7796#: builtin/notes.c:756
7797msgid "Committing unmerged notes"
7798msgstr "提交未合并的注解"
7799
7800#: builtin/notes.c:758
7801msgid "finalize notes merge by committing unmerged notes"
7802msgstr "通过提交未合并的注解来完成注解合并"
7803
7804#: builtin/notes.c:760
7805msgid "Aborting notes merge resolution"
7806msgstr "中止注解合并的方案"
7807
7808#: builtin/notes.c:762
7809msgid "abort notes merge"
7810msgstr "中止注解合并"
7811
7812#: builtin/notes.c:857
7813#, c-format
7814msgid "Object %s has no note\n"
7815msgstr "对象 %s 没有注解\n"
7816
7817#: builtin/notes.c:869
7818msgid "attempt to remove non-existent note is not an error"
7819msgstr "尝试删除不存在的注解不是一个错误"
7820
7821#: builtin/notes.c:872
7822msgid "read object names from the standard input"
7823msgstr "从标准输入读取对象名称"
7824
7825#: builtin/notes.c:953
7826msgid "notes-ref"
7827msgstr "注解引用"
7828
7829#: builtin/notes.c:954
7830msgid "use notes from <notes-ref>"
7831msgstr "从 <注解引用> 使用注解"
7832
7833#: builtin/notes.c:989 builtin/remote.c:1618
7834#, c-format
7835msgid "Unknown subcommand: %s"
7836msgstr "未知子命令:%s"
7837
7838#: builtin/pack-objects.c:28
7839msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7840msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7841
7842#: builtin/pack-objects.c:29
7843msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7844msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7845
7846#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7847#, c-format
7848msgid "deflate error (%d)"
7849msgstr "压缩错误 (%d)"
7850
7851#: builtin/pack-objects.c:771
7852msgid "Writing objects"
7853msgstr "写入对象中"
7854
7855#: builtin/pack-objects.c:1011
7856msgid "disabling bitmap writing, as some objects are not being packed"
7857msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7858
7859#: builtin/pack-objects.c:2171
7860msgid "Compressing objects"
7861msgstr "压缩对象中"
7862
7863#: builtin/pack-objects.c:2568
7864#, c-format
7865msgid "unsupported index version %s"
7866msgstr "不支持的索引版本 %s"
7867
7868#: builtin/pack-objects.c:2572
7869#, c-format
7870msgid "bad index version '%s'"
7871msgstr "坏的索引版本 '%s'"
7872
7873#: builtin/pack-objects.c:2595
7874#, c-format
7875msgid "option %s does not accept negative form"
7876msgstr "选项 %s 不接受否定格式"
7877
7878#: builtin/pack-objects.c:2599
7879#, c-format
7880msgid "unable to parse value '%s' for option %s"
7881msgstr "不能解析选项 %1$s 的值 '%2$s'"
7882
7883#: builtin/pack-objects.c:2619
7884msgid "do not show progress meter"
7885msgstr "不显示进度表"
7886
7887#: builtin/pack-objects.c:2621
7888msgid "show progress meter"
7889msgstr "显示进度表"
7890
7891#: builtin/pack-objects.c:2623
7892msgid "show progress meter during object writing phase"
7893msgstr "在对象写入阶段显示进度表"
7894
7895#: builtin/pack-objects.c:2626
7896msgid "similar to --all-progress when progress meter is shown"
7897msgstr "当进度表显示时类似于 --all-progress"
7898
7899#: builtin/pack-objects.c:2627
7900msgid "version[,offset]"
7901msgstr "版本[,偏移]"
7902
7903#: builtin/pack-objects.c:2628
7904msgid "write the pack index file in the specified idx format version"
7905msgstr "用指定的 idx 格式版本来写包索引文件"
7906
7907#: builtin/pack-objects.c:2631
7908msgid "maximum size of each output pack file"
7909msgstr "每个输出包的最大尺寸"
7910
7911#: builtin/pack-objects.c:2633
7912msgid "ignore borrowed objects from alternate object store"
7913msgstr "忽略从替代对象存储里借用对象"
7914
7915#: builtin/pack-objects.c:2635
7916msgid "ignore packed objects"
7917msgstr "忽略包对象"
7918
7919#: builtin/pack-objects.c:2637
7920msgid "limit pack window by objects"
7921msgstr "限制打包窗口的对象数"
7922
7923#: builtin/pack-objects.c:2639
7924msgid "limit pack window by memory in addition to object limit"
7925msgstr "除对象数量限制外设置打包窗口的内存限制"
7926
7927#: builtin/pack-objects.c:2641
7928msgid "maximum length of delta chain allowed in the resulting pack"
7929msgstr "打包允许的 delta 链的最大长度"
7930
7931#: builtin/pack-objects.c:2643
7932msgid "reuse existing deltas"
7933msgstr "重用已存在的 deltas"
7934
7935#: builtin/pack-objects.c:2645
7936msgid "reuse existing objects"
7937msgstr "重用已存在的对象"
7938
7939#: builtin/pack-objects.c:2647
7940msgid "use OFS_DELTA objects"
7941msgstr "使用 OFS_DELTA 对象"
7942
7943#: builtin/pack-objects.c:2649
7944msgid "use threads when searching for best delta matches"
7945msgstr "使用线程查询最佳 delta 匹配"
7946
7947#: builtin/pack-objects.c:2651
7948msgid "do not create an empty pack output"
7949msgstr "不创建空的包输出"
7950
7951#: builtin/pack-objects.c:2653
7952msgid "read revision arguments from standard input"
7953msgstr "从标准输入读取版本号参数"
7954
7955#: builtin/pack-objects.c:2655
7956msgid "limit the objects to those that are not yet packed"
7957msgstr "限制那些尚未打包的对象"
7958
7959#: builtin/pack-objects.c:2658
7960msgid "include objects reachable from any reference"
7961msgstr "包括可以从任何引用访问到的对象"
7962
7963#: builtin/pack-objects.c:2661
7964msgid "include objects referred by reflog entries"
7965msgstr "包括被引用日志引用到的对象"
7966
7967#: builtin/pack-objects.c:2664
7968msgid "include objects referred to by the index"
7969msgstr "包括被索引引用到的对象"
7970
7971#: builtin/pack-objects.c:2667
7972msgid "output pack to stdout"
7973msgstr "输出包到标准输出"
7974
7975#: builtin/pack-objects.c:2669
7976msgid "include tag objects that refer to objects to be packed"
7977msgstr "包括引用了打包对象的 tag"
7978
7979#: builtin/pack-objects.c:2671
7980msgid "keep unreachable objects"
7981msgstr "维持不可达的对象"
7982
7983#: builtin/pack-objects.c:2672 parse-options.h:139
7984msgid "time"
7985msgstr "时间"
7986
7987#: builtin/pack-objects.c:2673
7988msgid "unpack unreachable objects newer than <time>"
7989msgstr "将比给定 <时间> 新的无法访问的对象解包"
7990
7991#: builtin/pack-objects.c:2676
7992msgid "create thin packs"
7993msgstr "创建精简包"
7994
7995#: builtin/pack-objects.c:2678
7996msgid "create packs suitable for shallow fetches"
7997msgstr "创建适合浅克隆版本库获取的包"
7998
7999#: builtin/pack-objects.c:2680
8000msgid "ignore packs that have companion .keep file"
8001msgstr "忽略配有 .keep 文件的包"
8002
8003#: builtin/pack-objects.c:2682
8004msgid "pack compression level"
8005msgstr "打包压缩级别"
8006
8007#: builtin/pack-objects.c:2684
8008msgid "do not hide commits by grafts"
8009msgstr "显示被嫁接隐藏的提交"
8010
8011#: builtin/pack-objects.c:2686
8012msgid "use a bitmap index if available to speed up counting objects"
8013msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8014
8015#: builtin/pack-objects.c:2688
8016msgid "write a bitmap index together with the pack index"
8017msgstr "在建立包索引的同时创建 bitmap 索引"
8018
8019#: builtin/pack-objects.c:2779
8020msgid "Counting objects"
8021msgstr "对象计数中"
8022
8023#: builtin/pack-refs.c:6
8024msgid "git pack-refs [<options>]"
8025msgstr "git pack-refs [<选项>]"
8026
8027#: builtin/pack-refs.c:14
8028msgid "pack everything"
8029msgstr "打包一切"
8030
8031#: builtin/pack-refs.c:15
8032msgid "prune loose refs (default)"
8033msgstr "清除松散的引用(默认)"
8034
8035#: builtin/prune-packed.c:7
8036msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8037msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8038
8039#: builtin/prune-packed.c:40
8040msgid "Removing duplicate objects"
8041msgstr "正在删除重复对象"
8042
8043#: builtin/prune.c:11
8044msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8045msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8046
8047#: builtin/prune.c:105 builtin/worktree.c:112
8048msgid "do not remove, show only"
8049msgstr "不删除,只显示"
8050
8051#: builtin/prune.c:106 builtin/worktree.c:113
8052msgid "report pruned objects"
8053msgstr "报告清除的对象"
8054
8055#: builtin/prune.c:109 builtin/worktree.c:115
8056msgid "expire objects older than <time>"
8057msgstr "使早于给定时间的对象过期"
8058
8059#: builtin/push.c:14
8060msgid "git push [<options>] [<repository> [<refspec>...]]"
8061msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
8062
8063#: builtin/push.c:85
8064msgid "tag shorthand without <tag>"
8065msgstr "tag 后面未提供 <标签> 参数"
8066
8067#: builtin/push.c:95
8068msgid "--delete only accepts plain target ref names"
8069msgstr "--delete 只接受简单的目标引用名"
8070
8071#: builtin/push.c:139
8072msgid ""
8073"\n"
8074"To choose either option permanently, see push.default in 'git help config'."
8075msgstr ""
8076"\n"
8077"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8078
8079#: builtin/push.c:142
8080#, c-format
8081msgid ""
8082"The upstream branch of your current branch does not match\n"
8083"the name of your current branch. To push to the upstream branch\n"
8084"on the remote, use\n"
8085"\n"
8086" git push %s HEAD:%s\n"
8087"\n"
8088"To push to the branch of the same name on the remote, use\n"
8089"\n"
8090" git push %s %s\n"
8091"%s"
8092msgstr ""
8093"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8094"上游分支,使用\n"
8095"\n"
8096" git push %s HEAD:%s\n"
8097"\n"
8098"为推送至远程同名分支,使用\n"
8099"\n"
8100" git push %s %s\n"
8101"%s"
8102
8103#: builtin/push.c:157
8104#, c-format
8105msgid ""
8106"You are not currently on a branch.\n"
8107"To push the history leading to the current (detached HEAD)\n"
8108"state now, use\n"
8109"\n"
8110" git push %s HEAD:<name-of-remote-branch>\n"
8111msgstr ""
8112"您当前不在一个分支上。\n"
8113"现在为推送当前(分离头指针)的历史,使用\n"
8114"\n"
8115" git push %s HEAD:<远程分支名字>\n"
8116
8117#: builtin/push.c:171
8118#, c-format
8119msgid ""
8120"The current branch %s has no upstream branch.\n"
8121"To push the current branch and set the remote as upstream, use\n"
8122"\n"
8123" git push --set-upstream %s %s\n"
8124msgstr ""
8125"当前分支 %s 没有对应的上游分支。\n"
8126"为推送当前分支并建立与远程上游的跟踪,使用\n"
8127"\n"
8128" git push --set-upstream %s %s\n"
8129
8130#: builtin/push.c:179
8131#, c-format
8132msgid "The current branch %s has multiple upstream branches, refusing to push."
8133msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8134
8135#: builtin/push.c:182
8136#, c-format
8137msgid ""
8138"You are pushing to remote '%s', which is not the upstream of\n"
8139"your current branch '%s', without telling me what to push\n"
8140"to update which remote branch."
8141msgstr ""
8142"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8143"而没有告诉我要推送什么、更新哪个远程分支。"
8144
8145# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
8146#: builtin/push.c:205
8147msgid ""
8148"push.default is unset; its implicit value has changed in\n"
8149"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8150"and maintain the traditional behavior, use:\n"
8151"\n"
8152" git config --global push.default matching\n"
8153"\n"
8154"To squelch this message and adopt the new behavior now, use:\n"
8155"\n"
8156" git config --global push.default simple\n"
8157"\n"
8158"When push.default is set to 'matching', git will push local branches\n"
8159"to the remote branches that already exist with the same name.\n"
8160"\n"
8161"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8162"behavior, which only pushes the current branch to the corresponding\n"
8163"remote branch that 'git pull' uses to update the current branch.\n"
8164"\n"
8165"See 'git help config' and search for 'push.default' for further "
8166"information.\n"
8167"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8168"'current' instead of 'simple' if you sometimes use older versions of Git)"
8169msgstr ""
8170"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
8171"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
8172"\n"
8173" git config --global push.default matching\n"
8174"\n"
8175"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8176"\n"
8177" git config --global push.default simple\n"
8178"\n"
8179"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8180"本地分支。\n"
8181"\n"
8182"从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
8183"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8184"\n"
8185"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8186"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
8187"为保持兼容,请用 'current' 代替 'simple')"
8188
8189#: builtin/push.c:272
8190msgid ""
8191"You didn't specify any refspecs to push, and push.default is \"nothing\"."
8192msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
8193
8194#: builtin/push.c:279
8195msgid ""
8196"Updates were rejected because the tip of your current branch is behind\n"
8197"its remote counterpart. Integrate the remote changes (e.g.\n"
8198"'git pull ...') before pushing again.\n"
8199"See the 'Note about fast-forwards' in 'git push --help' for details."
8200msgstr ""
8201"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
8202"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
8203"'git push --help' 中的 'Note about fast-forwards' 小节。"
8204
8205#: builtin/push.c:285
8206msgid ""
8207"Updates were rejected because a pushed branch tip is behind its remote\n"
8208"counterpart. Check out this branch and integrate the remote changes\n"
8209"(e.g. 'git pull ...') before pushing again.\n"
8210"See the 'Note about fast-forwards' in 'git push --help' for details."
8211msgstr ""
8212"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8213"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
8214"'git push --help' 中的 'Note about fast-forwards' 小节。"
8215
8216#: builtin/push.c:291
8217msgid ""
8218"Updates were rejected because the remote contains work that you do\n"
8219"not have locally. This is usually caused by another repository pushing\n"
8220"to the same ref. You may want to first integrate the remote changes\n"
8221"(e.g., 'git pull ...') before pushing again.\n"
8222"See the 'Note about fast-forwards' in 'git push --help' for details."
8223msgstr ""
8224"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
8225"一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8226"(如 'git pull ...')。\n"
8227"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8228
8229#: builtin/push.c:298
8230msgid "Updates were rejected because the tag already exists in the remote."
8231msgstr "更新被拒绝因为 tag 在远程已经存在。"
8232
8233#: builtin/push.c:301
8234msgid ""
8235"You cannot update a remote ref that points at a non-commit object,\n"
8236"or update a remote ref to make it point at a non-commit object,\n"
8237"without using the '--force' option.\n"
8238msgstr ""
8239"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8240"也不能更新远程引用让其指向一个非提交对象。\n"
8241
8242#: builtin/push.c:360
8243#, c-format
8244msgid "Pushing to %s\n"
8245msgstr "推送到 %s\n"
8246
8247#: builtin/push.c:364
8248#, c-format
8249msgid "failed to push some refs to '%s'"
8250msgstr "无法推送一些引用到 '%s'"
8251
8252#: builtin/push.c:394
8253#, c-format
8254msgid "bad repository '%s'"
8255msgstr "坏的版本库 '%s'"
8256
8257#: builtin/push.c:395
8258msgid ""
8259"No configured push destination.\n"
8260"Either specify the URL from the command-line or configure a remote "
8261"repository using\n"
8262"\n"
8263" git remote add <name> <url>\n"
8264"\n"
8265"and then push using the remote name\n"
8266"\n"
8267" git push <name>\n"
8268msgstr ""
8269"没有配置推送目标。\n"
8270"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
8271"\n"
8272" git remote add <名称> <地址>\n"
8273"\n"
8274"然后使用该远程版本库名执行推送\n"
8275"\n"
8276" git push <名称>\n"
8277
8278#: builtin/push.c:410
8279msgid "--all and --tags are incompatible"
8280msgstr "--all 和 --tags 不兼容"
8281
8282#: builtin/push.c:411
8283msgid "--all can't be combined with refspecs"
8284msgstr "--all 不能和引用规则同时使用"
8285
8286#: builtin/push.c:416
8287msgid "--mirror and --tags are incompatible"
8288msgstr "--mirror 和 --tags 不兼容"
8289
8290#: builtin/push.c:417
8291msgid "--mirror can't be combined with refspecs"
8292msgstr "--mirror 不能和引用规则同时使用"
8293
8294#: builtin/push.c:422
8295msgid "--all and --mirror are incompatible"
8296msgstr "--all 和 --mirror 不兼容"
8297
8298#: builtin/push.c:502
8299msgid "repository"
8300msgstr "版本库"
8301
8302#: builtin/push.c:503
8303msgid "push all refs"
8304msgstr "推送所有引用"
8305
8306#: builtin/push.c:504
8307msgid "mirror all refs"
8308msgstr "镜像所有引用"
8309
8310#: builtin/push.c:506
8311msgid "delete refs"
8312msgstr "删除引用"
8313
8314#: builtin/push.c:507
8315msgid "push tags (can't be used with --all or --mirror)"
8316msgstr "推送 tags(不能使用 --all or --mirror)"
8317
8318#: builtin/push.c:510
8319msgid "force updates"
8320msgstr "强制更新"
8321
8322#: builtin/push.c:512
8323msgid "refname>:<expect"
8324msgstr "引用名>:<期望值"
8325
8326#: builtin/push.c:513
8327msgid "require old value of ref to be at this value"
8328msgstr "要求引用旧的取值为设定值"
8329
8330#: builtin/push.c:516
8331msgid "control recursive pushing of submodules"
8332msgstr "控制子模组的递归推送"
8333
8334#: builtin/push.c:518
8335msgid "use thin pack"
8336msgstr "使用精简打包"
8337
8338#: builtin/push.c:519 builtin/push.c:520
8339msgid "receive pack program"
8340msgstr "接收包程序"
8341
8342#: builtin/push.c:521
8343msgid "set upstream for git pull/status"
8344msgstr "设置 git pull/status 的上游"
8345
8346#: builtin/push.c:524
8347msgid "prune locally removed refs"
8348msgstr "清除本地删除的引用"
8349
8350#: builtin/push.c:526
8351msgid "bypass pre-push hook"
8352msgstr "绕过 pre-push 钩子"
8353
8354#: builtin/push.c:527
8355msgid "push missing but relevant tags"
8356msgstr "推送缺失的有关的 tags"
8357
8358#: builtin/push.c:529
8359msgid "GPG sign the push"
8360msgstr "用 GPG 为推送签名"
8361
8362#: builtin/push.c:530
8363msgid "request atomic transaction on remote side"
8364msgstr "需要远端支持原子事务"
8365
8366#: builtin/push.c:539
8367msgid "--delete is incompatible with --all, --mirror and --tags"
8368msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8369
8370#: builtin/push.c:541
8371msgid "--delete doesn't make sense without any refs"
8372msgstr "--delete 未接任何引用没有意义"
8373
8374#: builtin/read-tree.c:37
8375msgid ""
8376"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8377"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8378"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8379msgstr ""
8380"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8381"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8382"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
8383
8384#: builtin/read-tree.c:110
8385msgid "write resulting index to <file>"
8386msgstr "将索引结果写入 <文件>"
8387
8388#: builtin/read-tree.c:113
8389msgid "only empty the index"
8390msgstr "只是清空索引"
8391
8392#: builtin/read-tree.c:115
8393msgid "Merging"
8394msgstr "合并"
8395
8396#: builtin/read-tree.c:117
8397msgid "perform a merge in addition to a read"
8398msgstr "读取之余再执行一个合并"
8399
8400#: builtin/read-tree.c:119
8401msgid "3-way merge if no file level merging required"
8402msgstr "如果没有文件级合并需要,执行三路合并"
8403
8404#: builtin/read-tree.c:121
8405msgid "3-way merge in presence of adds and removes"
8406msgstr "存在添加和删除时,也执行三路合并"
8407
8408#: builtin/read-tree.c:123
8409msgid "same as -m, but discard unmerged entries"
8410msgstr "类似于 -m,但丢弃未合并的条目"
8411
8412#: builtin/read-tree.c:124
8413msgid "<subdirectory>/"
8414msgstr "<子目录>/"
8415
8416#: builtin/read-tree.c:125
8417msgid "read the tree into the index under <subdirectory>/"
8418msgstr "读取树对象到索引的 <子目录>/ 下"
8419
8420#: builtin/read-tree.c:128
8421msgid "update working tree with merge result"
8422msgstr "用合并的结果更新工作区"
8423
8424#: builtin/read-tree.c:130
8425msgid "gitignore"
8426msgstr "gitignore"
8427
8428#: builtin/read-tree.c:131
8429msgid "allow explicitly ignored files to be overwritten"
8430msgstr "允许忽略文件中设定的文件可以被覆盖"
8431
8432#: builtin/read-tree.c:134
8433msgid "don't check the working tree after merging"
8434msgstr "合并后不检查工作区"
8435
8436#: builtin/read-tree.c:135
8437msgid "don't update the index or the work tree"
8438msgstr "不更新索引区和工作区"
8439
8440#: builtin/read-tree.c:137
8441msgid "skip applying sparse checkout filter"
8442msgstr "跳过应用稀疏检出过滤器"
8443
8444#: builtin/read-tree.c:139
8445msgid "debug unpack-trees"
8446msgstr "调试 unpack-trees"
8447
8448#: builtin/reflog.c:430
8449#, c-format
8450msgid "%s' for '%s' is not a valid timestamp"
8451msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8452
8453#: builtin/reflog.c:547 builtin/reflog.c:552
8454#, c-format
8455msgid "'%s' is not a valid timestamp"
8456msgstr "'%s' 不是一个有效的时间戳"
8457
8458#: builtin/remote.c:12
8459msgid "git remote [-v | --verbose]"
8460msgstr "git remote [-v | --verbose]"
8461
8462#: builtin/remote.c:13
8463msgid ""
8464"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
8465"mirror=<fetch|push>] <name> <url>"
8466msgstr ""
8467"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
8468"mirror=<fetch|push>] <名称> <地址>"
8469
8470#: builtin/remote.c:14 builtin/remote.c:33
8471msgid "git remote rename <old> <new>"
8472msgstr "git remote rename <旧名称> <新名称>"
8473
8474#: builtin/remote.c:15 builtin/remote.c:38
8475msgid "git remote remove <name>"
8476msgstr "git remote remove <名称>"
8477
8478#: builtin/remote.c:16 builtin/remote.c:43
8479msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8480msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8481
8482#: builtin/remote.c:17
8483msgid "git remote [-v | --verbose] show [-n] <name>"
8484msgstr "git remote [-v | --verbose] show [-n] <名称>"
8485
8486#: builtin/remote.c:18
8487msgid "git remote prune [-n | --dry-run] <name>"
8488msgstr "git remote prune [-n | --dry-run] <名称>"
8489
8490#: builtin/remote.c:19
8491msgid ""
8492"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8493msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8494
8495#: builtin/remote.c:20
8496msgid "git remote set-branches [--add] <name> <branch>..."
8497msgstr "git remote set-branches [--add] <名称> <分支>..."
8498
8499#: builtin/remote.c:21 builtin/remote.c:69
8500msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8501msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8502
8503#: builtin/remote.c:22 builtin/remote.c:70
8504msgid "git remote set-url --add <name> <newurl>"
8505msgstr "git remote set-url --add <名称> <新的地址>"
8506
8507#: builtin/remote.c:23 builtin/remote.c:71
8508msgid "git remote set-url --delete <name> <url>"
8509msgstr "git remote set-url --delete <名称> <地址>"
8510
8511#: builtin/remote.c:28
8512msgid "git remote add [<options>] <name> <url>"
8513msgstr "git remote add [<选项>] <名称> <地址>"
8514
8515#: builtin/remote.c:48
8516msgid "git remote set-branches <name> <branch>..."
8517msgstr "git remote set-branches <名称> <分支>..."
8518
8519#: builtin/remote.c:49
8520msgid "git remote set-branches --add <name> <branch>..."
8521msgstr "git remote set-branches --add <名称> <分支>..."
8522
8523#: builtin/remote.c:54
8524msgid "git remote show [<options>] <name>"
8525msgstr "git remote show [<选项>] <名称>"
8526
8527#: builtin/remote.c:59
8528msgid "git remote prune [<options>] <name>"
8529msgstr "git remote prune [<选项>] <名称>"
8530
8531#: builtin/remote.c:64
8532msgid "git remote update [<options>] [<group> | <remote>]..."
8533msgstr "git remote update [<选项>] [<组> | <远程>]..."
8534
8535#: builtin/remote.c:88
8536#, c-format
8537msgid "Updating %s"
8538msgstr "更新 %s 中"
8539
8540#: builtin/remote.c:120
8541msgid ""
8542"--mirror is dangerous and deprecated; please\n"
8543"\t use --mirror=fetch or --mirror=push instead"
8544msgstr ""
8545"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8546"\t 或 --mirror=push"
8547
8548#: builtin/remote.c:137
8549#, c-format
8550msgid "unknown mirror argument: %s"
8551msgstr "未知的镜像参数:%s"
8552
8553#: builtin/remote.c:153
8554msgid "fetch the remote branches"
8555msgstr "抓取远程的分支"
8556
8557#: builtin/remote.c:155
8558msgid "import all tags and associated objects when fetching"
8559msgstr "抓取时导入所有的 tags 和关联对象"
8560
8561#: builtin/remote.c:158
8562msgid "or do not fetch any tag at all (--no-tags)"
8563msgstr "或不抓取任何 tag(--no-tags)"
8564
8565#: builtin/remote.c:160
8566msgid "branch(es) to track"
8567msgstr "跟踪的分支"
8568
8569#: builtin/remote.c:161
8570msgid "master branch"
8571msgstr "主线分支"
8572
8573#: builtin/remote.c:162
8574msgid "push|fetch"
8575msgstr "push|fetch"
8576
8577#: builtin/remote.c:163
8578msgid "set up remote as a mirror to push to or fetch from"
8579msgstr "把远程设置为用以推送或抓取的镜像"
8580
8581#: builtin/remote.c:175
8582msgid "specifying a master branch makes no sense with --mirror"
8583msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8584
8585#: builtin/remote.c:177
8586msgid "specifying branches to track makes sense only with fetch mirrors"
8587msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8588
8589#: builtin/remote.c:187 builtin/remote.c:640
8590#, c-format
8591msgid "remote %s already exists."
8592msgstr "远程 %s 已经存在。"
8593
8594#: builtin/remote.c:191 builtin/remote.c:644
8595#, c-format
8596msgid "'%s' is not a valid remote name"
8597msgstr "'%s' 不是一个有效的远程名称"
8598
8599#: builtin/remote.c:235
8600#, c-format
8601msgid "Could not setup master '%s'"
8602msgstr "无法设置 master '%s'"
8603
8604#: builtin/remote.c:335
8605#, c-format
8606msgid "Could not get fetch map for refspec %s"
8607msgstr "无法得到引用规则 %s 的获取列表"
8608
8609#: builtin/remote.c:436 builtin/remote.c:444
8610msgid "(matching)"
8611msgstr "(匹配)"
8612
8613#: builtin/remote.c:448
8614msgid "(delete)"
8615msgstr "(删除)"
8616
8617#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
8618#, c-format
8619msgid "Could not append '%s' to '%s'"
8620msgstr "不能添加 '%s' 至 '%s'"
8621
8622#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892
8623#, c-format
8624msgid "No such remote: %s"
8625msgstr "没有这样的远程:%s"
8626
8627#: builtin/remote.c:650
8628#, c-format
8629msgid "Could not rename config section '%s' to '%s'"
8630msgstr "不能重命名配置小节 '%s' 到 '%s'"
8631
8632#: builtin/remote.c:656 builtin/remote.c:844
8633#, c-format
8634msgid "Could not remove config section '%s'"
8635msgstr "不能移除配置小节 '%s'"
8636
8637#: builtin/remote.c:671
8638#, c-format
8639msgid ""
8640"Not updating non-default fetch refspec\n"
8641"\t%s\n"
8642"\tPlease update the configuration manually if necessary."
8643msgstr ""
8644"没有更新非默认的获取引用规则\n"
8645"\t%s\n"
8646"\t如果必要请手动更新配置。"
8647
8648#: builtin/remote.c:677
8649#, c-format
8650msgid "Could not append '%s'"
8651msgstr "不能追加 '%s'"
8652
8653#: builtin/remote.c:688
8654#, c-format
8655msgid "Could not set '%s'"
8656msgstr "不能设置 '%s'"
8657
8658#: builtin/remote.c:710
8659#, c-format
8660msgid "deleting '%s' failed"
8661msgstr "删除 '%s' 失败"
8662
8663#: builtin/remote.c:744
8664#, c-format
8665msgid "creating '%s' failed"
8666msgstr "创建 '%s' 失败"
8667
8668#: builtin/remote.c:763
8669#, c-format
8670msgid "Could not remove branch %s"
8671msgstr "无法移除分支 %s"
8672
8673#: builtin/remote.c:830
8674msgid ""
8675"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8676"to delete it, use:"
8677msgid_plural ""
8678"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8679"to delete them, use:"
8680msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8681msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8682
8683#: builtin/remote.c:945
8684#, c-format
8685msgid " new (next fetch will store in remotes/%s)"
8686msgstr " 新的(下一次获取将存储于 remotes/%s)"
8687
8688#: builtin/remote.c:948
8689msgid " tracked"
8690msgstr " 已跟踪"
8691
8692#: builtin/remote.c:950
8693msgid " stale (use 'git remote prune' to remove)"
8694msgstr " 过时(使用 'git remote prune' 来移除)"
8695
8696#: builtin/remote.c:952
8697msgid " ???"
8698msgstr " ???"
8699
8700#: builtin/remote.c:993
8701#, c-format
8702msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8703msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8704
8705#: builtin/remote.c:1000
8706#, c-format
8707msgid "rebases onto remote %s"
8708msgstr "变基到远程 %s"
8709
8710#: builtin/remote.c:1003
8711#, c-format
8712msgid " merges with remote %s"
8713msgstr " 与远程 %s 合并"
8714
8715#: builtin/remote.c:1004
8716msgid " and with remote"
8717msgstr " 且有远程"
8718
8719#: builtin/remote.c:1006
8720#, c-format
8721msgid "merges with remote %s"
8722msgstr "与远程 %s 合并"
8723
8724#: builtin/remote.c:1007
8725msgid " and with remote"
8726msgstr " 且有远程"
8727
8728#: builtin/remote.c:1053
8729msgid "create"
8730msgstr "创建"
8731
8732#: builtin/remote.c:1056
8733msgid "delete"
8734msgstr "删除"
8735
8736#: builtin/remote.c:1060
8737msgid "up to date"
8738msgstr "最新"
8739
8740#: builtin/remote.c:1063
8741msgid "fast-forwardable"
8742msgstr "可快进"
8743
8744#: builtin/remote.c:1066
8745msgid "local out of date"
8746msgstr "本地已过时"
8747
8748#: builtin/remote.c:1073
8749#, c-format
8750msgid " %-*s forces to %-*s (%s)"
8751msgstr " %-*s 强制推送至 %-*s (%s)"
8752
8753#: builtin/remote.c:1076
8754#, c-format
8755msgid " %-*s pushes to %-*s (%s)"
8756msgstr " %-*s 推送至 %-*s (%s)"
8757
8758#: builtin/remote.c:1080
8759#, c-format
8760msgid " %-*s forces to %s"
8761msgstr " %-*s 强制推送至 %s"
8762
8763#: builtin/remote.c:1083
8764#, c-format
8765msgid " %-*s pushes to %s"
8766msgstr " %-*s 推送至 %s"
8767
8768#: builtin/remote.c:1151
8769msgid "do not query remotes"
8770msgstr "不查询远程"
8771
8772#: builtin/remote.c:1178
8773#, c-format
8774msgid "* remote %s"
8775msgstr "* 远程 %s"
8776
8777#: builtin/remote.c:1179
8778#, c-format
8779msgid " Fetch URL: %s"
8780msgstr " 获取地址:%s"
8781
8782#: builtin/remote.c:1180 builtin/remote.c:1331
8783msgid "(no URL)"
8784msgstr "(无 URL)"
8785
8786#: builtin/remote.c:1189 builtin/remote.c:1191
8787#, c-format
8788msgid " Push URL: %s"
8789msgstr " 推送地址:%s"
8790
8791#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
8792#, c-format
8793msgid " HEAD branch: %s"
8794msgstr " HEAD分支:%s"
8795
8796#: builtin/remote.c:1199
8797#, c-format
8798msgid ""
8799" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8800msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8801
8802#: builtin/remote.c:1211
8803#, c-format
8804msgid " Remote branch:%s"
8805msgid_plural " Remote branches:%s"
8806msgstr[0] " 远程分支:%s"
8807msgstr[1] " 远程分支:%s"
8808
8809# 译者:中文字符串拼接,可删除前导空格
8810#: builtin/remote.c:1214 builtin/remote.c:1241
8811msgid " (status not queried)"
8812msgstr "(状态未查询)"
8813
8814#: builtin/remote.c:1223
8815msgid " Local branch configured for 'git pull':"
8816msgid_plural " Local branches configured for 'git pull':"
8817msgstr[0] " 为 'git pull' 配置的本地分支:"
8818msgstr[1] " 为 'git pull' 配置的本地分支:"
8819
8820#: builtin/remote.c:1231
8821msgid " Local refs will be mirrored by 'git push'"
8822msgstr " 本地引用将在 'git push' 时被镜像"
8823
8824#: builtin/remote.c:1238
8825#, c-format
8826msgid " Local ref configured for 'git push'%s:"
8827msgid_plural " Local refs configured for 'git push'%s:"
8828msgstr[0] " 为 'git push' 配置的本地引用%s:"
8829msgstr[1] " 为 'git push' 配置的本地引用%s:"
8830
8831#: builtin/remote.c:1259
8832msgid "set refs/remotes/<name>/HEAD according to remote"
8833msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8834
8835#: builtin/remote.c:1261
8836msgid "delete refs/remotes/<name>/HEAD"
8837msgstr "删除 refs/remotes/<名称>/HEAD"
8838
8839#: builtin/remote.c:1276
8840msgid "Cannot determine remote HEAD"
8841msgstr "无法确定远程 HEAD"
8842
8843#: builtin/remote.c:1278
8844msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8845msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8846
8847#: builtin/remote.c:1288
8848#, c-format
8849msgid "Could not delete %s"
8850msgstr "无法删除 %s"
8851
8852#: builtin/remote.c:1296
8853#, c-format
8854msgid "Not a valid ref: %s"
8855msgstr "不是一个有效引用:%s"
8856
8857#: builtin/remote.c:1298
8858#, c-format
8859msgid "Could not setup %s"
8860msgstr "不能设置 %s"
8861
8862# 译者:注意保持前导空格
8863#: builtin/remote.c:1316
8864#, c-format
8865msgid " %s will become dangling!"
8866msgstr " %s 将成为摇摆状态!"
8867
8868# 译者:注意保持前导空格
8869#: builtin/remote.c:1317
8870#, c-format
8871msgid " %s has become dangling!"
8872msgstr " %s 已成为摇摆状态!"
8873
8874#: builtin/remote.c:1327
8875#, c-format
8876msgid "Pruning %s"
8877msgstr "修剪 %s"
8878
8879#: builtin/remote.c:1328
8880#, c-format
8881msgid "URL: %s"
8882msgstr "URL:%s"
8883
8884#: builtin/remote.c:1351
8885#, c-format
8886msgid " * [would prune] %s"
8887msgstr " * [将删除] %s"
8888
8889#: builtin/remote.c:1354
8890#, c-format
8891msgid " * [pruned] %s"
8892msgstr " * [已删除] %s"
8893
8894#: builtin/remote.c:1399
8895msgid "prune remotes after fetching"
8896msgstr "抓取后清除远程"
8897
8898#: builtin/remote.c:1465 builtin/remote.c:1539
8899#, c-format
8900msgid "No such remote '%s'"
8901msgstr "没有此远程 '%s'"
8902
8903#: builtin/remote.c:1485
8904msgid "add branch"
8905msgstr "添加分支"
8906
8907#: builtin/remote.c:1492
8908msgid "no remote specified"
8909msgstr "未指定远程"
8910
8911#: builtin/remote.c:1514
8912msgid "manipulate push URLs"
8913msgstr "操作推送 URLS"
8914
8915#: builtin/remote.c:1516
8916msgid "add URL"
8917msgstr "添加 URL"
8918
8919#: builtin/remote.c:1518
8920msgid "delete URLs"
8921msgstr "删除 URLS"
8922
8923#: builtin/remote.c:1525
8924msgid "--add --delete doesn't make sense"
8925msgstr "--add --delete 无意义"
8926
8927#: builtin/remote.c:1565
8928#, c-format
8929msgid "Invalid old URL pattern: %s"
8930msgstr "无效的旧URL匹配模版:%s"
8931
8932#: builtin/remote.c:1573
8933#, c-format
8934msgid "No such URL found: %s"
8935msgstr "未找到此URL:%s"
8936
8937#: builtin/remote.c:1575
8938msgid "Will not delete all non-push URLs"
8939msgstr "将不会删除所有非推送URL地址"
8940
8941#: builtin/remote.c:1589
8942msgid "be verbose; must be placed before a subcommand"
8943msgstr "冗长输出;必须置于子命令之前"
8944
8945#: builtin/repack.c:17
8946msgid "git repack [<options>]"
8947msgstr "git repack [<选项>]"
8948
8949#: builtin/repack.c:159
8950msgid "pack everything in a single pack"
8951msgstr "所有内容打包到一个包文件中"
8952
8953#: builtin/repack.c:161
8954msgid "same as -a, and turn unreachable objects loose"
8955msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8956
8957#: builtin/repack.c:164
8958msgid "remove redundant packs, and run git-prune-packed"
8959msgstr "删除多余的包,运行 git-prune-packed"
8960
8961#: builtin/repack.c:166
8962msgid "pass --no-reuse-delta to git-pack-objects"
8963msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8964
8965#: builtin/repack.c:168
8966msgid "pass --no-reuse-object to git-pack-objects"
8967msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8968
8969#: builtin/repack.c:170
8970msgid "do not run git-update-server-info"
8971msgstr "不运行 git-update-server-info"
8972
8973#: builtin/repack.c:173
8974msgid "pass --local to git-pack-objects"
8975msgstr "向 git-pack-objects 传递参数 --local"
8976
8977#: builtin/repack.c:175
8978msgid "write bitmap index"
8979msgstr "写 bitmap 索引"
8980
8981#: builtin/repack.c:176
8982msgid "approxidate"
8983msgstr "近似日期"
8984
8985#: builtin/repack.c:177
8986msgid "with -A, do not loosen objects older than this"
8987msgstr "使用 -A,不要将早于给定时间的对象过期"
8988
8989#: builtin/repack.c:179
8990msgid "size of the window used for delta compression"
8991msgstr "用于增量压缩的窗口值"
8992
8993#: builtin/repack.c:180 builtin/repack.c:184
8994msgid "bytes"
8995msgstr "字节"
8996
8997#: builtin/repack.c:181
8998msgid "same as the above, but limit memory size instead of entries count"
8999msgstr "和上面的相似,但限制内存大小而非条目数"
9000
9001#: builtin/repack.c:183
9002msgid "limits the maximum delta depth"
9003msgstr "限制最大增量深度"
9004
9005#: builtin/repack.c:185
9006msgid "maximum size of each packfile"
9007msgstr "每个包的最大尺寸"
9008
9009#: builtin/repack.c:187
9010msgid "repack objects in packs marked with .keep"
9011msgstr "对标记为 .keep 的包中的对象重新打包"
9012
9013#: builtin/repack.c:377
9014#, c-format
9015msgid "removing '%s' failed"
9016msgstr "删除 '%s' 失败"
9017
9018#: builtin/replace.c:19
9019msgid "git replace [-f] <object> <replacement>"
9020msgstr "git replace [-f] <对象> <替换物>"
9021
9022#: builtin/replace.c:20
9023msgid "git replace [-f] --edit <object>"
9024msgstr "git replace [-f] --edit <对象>"
9025
9026#: builtin/replace.c:21
9027msgid "git replace [-f] --graft <commit> [<parent>...]"
9028msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9029
9030#: builtin/replace.c:22
9031msgid "git replace -d <object>..."
9032msgstr "git replace -d <对象>..."
9033
9034#: builtin/replace.c:23
9035msgid "git replace [--format=<format>] [-l [<pattern>]]"
9036msgstr "git replace [--format=<格式>] [-l [<模式>]]"
9037
9038#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9039#, c-format
9040msgid "Not a valid object name: '%s'"
9041msgstr "不是一个有效的对象名:'%s'"
9042
9043#: builtin/replace.c:355
9044#, c-format
9045msgid "bad mergetag in commit '%s'"
9046msgstr "提交 '%s' 中损坏的 mergetag"
9047
9048#: builtin/replace.c:357
9049#, c-format
9050msgid "malformed mergetag in commit '%s'"
9051msgstr "提交 '%s' 中非法的 mergetag"
9052
9053#: builtin/replace.c:368
9054#, c-format
9055msgid ""
9056"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9057"instead of --graft"
9058msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft"
9059
9060#: builtin/replace.c:401
9061#, c-format
9062msgid "the original commit '%s' has a gpg signature."
9063msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9064
9065#: builtin/replace.c:402
9066msgid "the signature will be removed in the replacement commit!"
9067msgstr "在替换的提交中签名将被移除!"
9068
9069#: builtin/replace.c:408
9070#, c-format
9071msgid "could not write replacement commit for: '%s'"
9072msgstr "不能为 '%s' 写替换提交"
9073
9074#: builtin/replace.c:432
9075msgid "list replace refs"
9076msgstr "列出替换的引用"
9077
9078#: builtin/replace.c:433
9079msgid "delete replace refs"
9080msgstr "删除替换的引用"
9081
9082#: builtin/replace.c:434
9083msgid "edit existing object"
9084msgstr "编辑现存的对象"
9085
9086#: builtin/replace.c:435
9087msgid "change a commit's parents"
9088msgstr "修改一个提交的父提交"
9089
9090#: builtin/replace.c:436
9091msgid "replace the ref if it exists"
9092msgstr "如果存在则替换引用"
9093
9094#: builtin/replace.c:437
9095msgid "do not pretty-print contents for --edit"
9096msgstr "不要为 --edit 操作美观显示内容"
9097
9098#: builtin/replace.c:438
9099msgid "use this format"
9100msgstr "使用此格式"
9101
9102#: builtin/rerere.c:12
9103msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9104msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9105
9106#: builtin/rerere.c:57
9107msgid "register clean resolutions in index"
9108msgstr "在索引中注册干净的解决方案"
9109
9110#: builtin/reset.c:26
9111msgid ""
9112"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9113msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
9114
9115#: builtin/reset.c:27
9116msgid "git reset [-q] <tree-ish> [--] <paths>..."
9117msgstr "git reset [-q] <树或提交> [--] <路径>..."
9118
9119#: builtin/reset.c:28
9120msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9121msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
9122
9123#: builtin/reset.c:34
9124msgid "mixed"
9125msgstr "混杂"
9126
9127#: builtin/reset.c:34
9128msgid "soft"
9129msgstr "软性"
9130
9131#: builtin/reset.c:34
9132msgid "hard"
9133msgstr "硬性"
9134
9135#: builtin/reset.c:34
9136msgid "merge"
9137msgstr "合并"
9138
9139#: builtin/reset.c:34
9140msgid "keep"
9141msgstr "保持"
9142
9143#: builtin/reset.c:74
9144msgid "You do not have a valid HEAD."
9145msgstr "您没有一个有效的 HEAD。"
9146
9147#: builtin/reset.c:76
9148msgid "Failed to find tree of HEAD."
9149msgstr "无法找到 HEAD 指向的树。"
9150
9151#: builtin/reset.c:82
9152#, c-format
9153msgid "Failed to find tree of %s."
9154msgstr "无法找到 %s 指向的树。"
9155
9156#: builtin/reset.c:100
9157#, c-format
9158msgid "HEAD is now at %s"
9159msgstr "HEAD 现在位于 %s"
9160
9161# 译者:汉字之间无空格,故删除%s前后空格
9162#: builtin/reset.c:183
9163#, c-format
9164msgid "Cannot do a %s reset in the middle of a merge."
9165msgstr "在合并过程中不能做%s重置操作。"
9166
9167#: builtin/reset.c:276
9168msgid "be quiet, only report errors"
9169msgstr "安静模式,只报告错误"
9170
9171#: builtin/reset.c:278
9172msgid "reset HEAD and index"
9173msgstr "重置 HEAD 和索引"
9174
9175#: builtin/reset.c:279
9176msgid "reset only HEAD"
9177msgstr "只重置 HEAD"
9178
9179#: builtin/reset.c:281 builtin/reset.c:283
9180msgid "reset HEAD, index and working tree"
9181msgstr "重置 HEAD、索引和工作区"
9182
9183#: builtin/reset.c:285
9184msgid "reset HEAD but keep local changes"
9185msgstr "重置 HEAD 但保存本地变更"
9186
9187#: builtin/reset.c:288
9188msgid "record only the fact that removed paths will be added later"
9189msgstr "将删除的路径标记为稍后添加"
9190
9191#: builtin/reset.c:305
9192#, c-format
9193msgid "Failed to resolve '%s' as a valid revision."
9194msgstr "无法将 '%s' 解析为一个有效的版本。"
9195
9196#: builtin/reset.c:308 builtin/reset.c:316
9197#, c-format
9198msgid "Could not parse object '%s'."
9199msgstr "不能解析对象 '%s'。"
9200
9201#: builtin/reset.c:313
9202#, c-format
9203msgid "Failed to resolve '%s' as a valid tree."
9204msgstr "无法将 '%s' 解析为一个有效的树对象。"
9205
9206#: builtin/reset.c:322
9207msgid "--patch is incompatible with --{hard,mixed,soft}"
9208msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9209
9210#: builtin/reset.c:331
9211msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9212msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
9213
9214# 译者:汉字之间无空格,故删除%s前后空格
9215#: builtin/reset.c:333
9216#, c-format
9217msgid "Cannot do %s reset with paths."
9218msgstr "不能带路径进行%s重置。"
9219
9220# 译者:汉字之间无空格,故删除%s前后空格
9221#: builtin/reset.c:343
9222#, c-format
9223msgid "%s reset is not allowed in a bare repository"
9224msgstr "不能对纯版本库进行%s重置"
9225
9226#: builtin/reset.c:347
9227msgid "-N can only be used with --mixed"
9228msgstr "-N 只能和 --mixed 同时使用"
9229
9230#: builtin/reset.c:364
9231msgid "Unstaged changes after reset:"
9232msgstr "重置后撤出暂存区的变更:"
9233
9234#: builtin/reset.c:370
9235#, c-format
9236msgid "Could not reset index file to revision '%s'."
9237msgstr "不能重置索引文件至版本 '%s'。"
9238
9239#: builtin/reset.c:374
9240msgid "Could not write new index file."
9241msgstr "不能写入新的索引文件。"
9242
9243#: builtin/rev-parse.c:361
9244msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9245msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
9246
9247#: builtin/rev-parse.c:366
9248msgid "keep the `--` passed as an arg"
9249msgstr "保持 `--` 作为一个参数传递"
9250
9251#: builtin/rev-parse.c:368
9252msgid "stop parsing after the first non-option argument"
9253msgstr "遇到第一个非选项参数后停止解析"
9254
9255#: builtin/rev-parse.c:371
9256msgid "output in stuck long form"
9257msgstr "以固定长格式输出"
9258
9259#: builtin/rev-parse.c:499
9260msgid ""
9261"git rev-parse --parseopt [<options>] -- [<args>...]\n"
9262" or: git rev-parse --sq-quote [<arg>...]\n"
9263" or: git rev-parse [<options>] [<arg>...]\n"
9264"\n"
9265"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9266msgstr ""
9267"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
9268" 或者:git rev-parse --sq-quote [<参数>...]\n"
9269" 或者:git rev-parse [<选项>] [<参数>...]\n"
9270"\n"
9271"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
9272
9273#: builtin/revert.c:22
9274msgid "git revert [<options>] <commit-ish>..."
9275msgstr "git revert [<选项>] <提交号>..."
9276
9277#: builtin/revert.c:23
9278msgid "git revert <subcommand>"
9279msgstr "git revert <子命令>"
9280
9281#: builtin/revert.c:28
9282msgid "git cherry-pick [<options>] <commit-ish>..."
9283msgstr "git cherry-pick [<选项>] <提交号>..."
9284
9285#: builtin/revert.c:29
9286msgid "git cherry-pick <subcommand>"
9287msgstr "git cherry-pick <子命令>"
9288
9289#: builtin/revert.c:71
9290#, c-format
9291msgid "%s: %s cannot be used with %s"
9292msgstr "%s:%s 不能和 %s 同时使用"
9293
9294#: builtin/revert.c:80
9295msgid "end revert or cherry-pick sequence"
9296msgstr "终止反转或拣选操作"
9297
9298#: builtin/revert.c:81
9299msgid "resume revert or cherry-pick sequence"
9300msgstr "继续反转或拣选操作"
9301
9302#: builtin/revert.c:82
9303msgid "cancel revert or cherry-pick sequence"
9304msgstr "取消反转或拣选操作"
9305
9306#: builtin/revert.c:83
9307msgid "don't automatically commit"
9308msgstr "不要自动提交"
9309
9310#: builtin/revert.c:84
9311msgid "edit the commit message"
9312msgstr "编辑提交说明"
9313
9314#: builtin/revert.c:87
9315msgid "parent number"
9316msgstr "父编号"
9317
9318#: builtin/revert.c:89
9319msgid "merge strategy"
9320msgstr "合并策略"
9321
9322#: builtin/revert.c:90
9323msgid "option"
9324msgstr "选项"
9325
9326#: builtin/revert.c:91
9327msgid "option for merge strategy"
9328msgstr "合并策略的选项"
9329
9330#: builtin/revert.c:104
9331msgid "append commit name"
9332msgstr "追加提交名称"
9333
9334#: builtin/revert.c:105
9335msgid "allow fast-forward"
9336msgstr "允许快进式"
9337
9338#: builtin/revert.c:106
9339msgid "preserve initially empty commits"
9340msgstr "保留初始化的空提交"
9341
9342#: builtin/revert.c:107
9343msgid "allow commits with empty messages"
9344msgstr "允许提交说明为空"
9345
9346#: builtin/revert.c:108
9347msgid "keep redundant, empty commits"
9348msgstr "保持多余的、空的提交"
9349
9350#: builtin/revert.c:112
9351msgid "program error"
9352msgstr "程序错误"
9353
9354#: builtin/revert.c:197
9355msgid "revert failed"
9356msgstr "还原失败"
9357
9358#: builtin/revert.c:212
9359msgid "cherry-pick failed"
9360msgstr "拣选失败"
9361
9362#: builtin/rm.c:17
9363msgid "git rm [<options>] [--] <file>..."
9364msgstr "git rm [<选项>] [--] <文件>..."
9365
9366#: builtin/rm.c:65
9367msgid ""
9368"the following submodule (or one of its nested submodules)\n"
9369"uses a .git directory:"
9370msgid_plural ""
9371"the following submodules (or one of their nested submodules)\n"
9372"use a .git directory:"
9373msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9374msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9375
9376#: builtin/rm.c:71
9377msgid ""
9378"\n"
9379"(use 'rm -rf' if you really want to remove it including all of its history)"
9380msgstr ""
9381"\n"
9382"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9383
9384#: builtin/rm.c:230
9385msgid ""
9386"the following file has staged content different from both the\n"
9387"file and the HEAD:"
9388msgid_plural ""
9389"the following files have staged content different from both the\n"
9390"file and the HEAD:"
9391msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9392msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9393
9394#: builtin/rm.c:235
9395msgid ""
9396"\n"
9397"(use -f to force removal)"
9398msgstr ""
9399"\n"
9400"(使用 -f 强制删除)"
9401
9402#: builtin/rm.c:239
9403msgid "the following file has changes staged in the index:"
9404msgid_plural "the following files have changes staged in the index:"
9405msgstr[0] "如下文件相对索引区的内容有修改"
9406msgstr[1] "如下文件相对索引区的内容有修改"
9407
9408#: builtin/rm.c:243 builtin/rm.c:254
9409msgid ""
9410"\n"
9411"(use --cached to keep the file, or -f to force removal)"
9412msgstr ""
9413"\n"
9414"(使用 --cached 保留本地文件,或用 -f 强制删除)"
9415
9416#: builtin/rm.c:251
9417msgid "the following file has local modifications:"
9418msgid_plural "the following files have local modifications:"
9419msgstr[0] "如下文件有本地修改:"
9420msgstr[1] "如下文件有本地修改:"
9421
9422#: builtin/rm.c:269
9423msgid "do not list removed files"
9424msgstr "不列出删除的文件"
9425
9426#: builtin/rm.c:270
9427msgid "only remove from the index"
9428msgstr "只从索引区删除"
9429
9430#: builtin/rm.c:271
9431msgid "override the up-to-date check"
9432msgstr "忽略文件更新状态检查"
9433
9434#: builtin/rm.c:272
9435msgid "allow recursive removal"
9436msgstr "允许递归删除"
9437
9438#: builtin/rm.c:274
9439msgid "exit with a zero status even if nothing matched"
9440msgstr "即使没有匹配,也以零状态退出"
9441
9442#: builtin/rm.c:317
9443msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9444msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9445
9446#: builtin/rm.c:335
9447#, c-format
9448msgid "not removing '%s' recursively without -r"
9449msgstr "未提供 -r 选项不会递归删除 '%s'"
9450
9451#: builtin/rm.c:374
9452#, c-format
9453msgid "git rm: unable to remove %s"
9454msgstr "git rm:不能删除 %s"
9455
9456#: builtin/shortlog.c:13
9457msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
9458msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9459
9460#: builtin/shortlog.c:131
9461#, c-format
9462msgid "Missing author: %s"
9463msgstr "缺少作者:%s"
9464
9465#: builtin/shortlog.c:230
9466msgid "sort output according to the number of commits per author"
9467msgstr "根据每个作者的提交数量排序"
9468
9469#: builtin/shortlog.c:232
9470msgid "Suppress commit descriptions, only provides commit count"
9471msgstr "隐藏提交说明,只提供提交数量"
9472
9473#: builtin/shortlog.c:234
9474msgid "Show the email address of each author"
9475msgstr "显示每个作者的电子邮件地址"
9476
9477#: builtin/shortlog.c:235
9478msgid "w[,i1[,i2]]"
9479msgstr "w[,i1[,i2]]"
9480
9481#: builtin/shortlog.c:236
9482msgid "Linewrap output"
9483msgstr "折行输出"
9484
9485#: builtin/show-branch.c:9
9486msgid ""
9487"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9488"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9489"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9490"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9491msgstr ""
9492"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9493"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9494"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9495"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
9496
9497#: builtin/show-branch.c:13
9498msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9499msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
9500
9501#: builtin/show-branch.c:659
9502msgid "show remote-tracking and local branches"
9503msgstr "显示远程跟踪的和本地的分支"
9504
9505#: builtin/show-branch.c:661
9506msgid "show remote-tracking branches"
9507msgstr "显示远程跟踪的分支"
9508
9509#: builtin/show-branch.c:663
9510msgid "color '*!+-' corresponding to the branch"
9511msgstr "着色 '*!+-' 到相应的分支"
9512
9513#: builtin/show-branch.c:665
9514msgid "show <n> more commits after the common ancestor"
9515msgstr "显示共同祖先后的 <n> 个提交"
9516
9517#: builtin/show-branch.c:667
9518msgid "synonym to more=-1"
9519msgstr "和 more=-1 同义"
9520
9521#: builtin/show-branch.c:668
9522msgid "suppress naming strings"
9523msgstr "不显示字符串命名"
9524
9525#: builtin/show-branch.c:670
9526msgid "include the current branch"
9527msgstr "包括当前分支"
9528
9529#: builtin/show-branch.c:672
9530msgid "name commits with their object names"
9531msgstr "以对象名字命名提交"
9532
9533#: builtin/show-branch.c:674
9534msgid "show possible merge bases"
9535msgstr "显示可能合并的基线"
9536
9537#: builtin/show-branch.c:676
9538msgid "show refs unreachable from any other ref"
9539msgstr "显示没有任何引用的的引用"
9540
9541#: builtin/show-branch.c:678
9542msgid "show commits in topological order"
9543msgstr "以拓扑顺序显示提交"
9544
9545#: builtin/show-branch.c:681
9546msgid "show only commits not on the first branch"
9547msgstr "只显示不在第一个分支上的提交"
9548
9549#: builtin/show-branch.c:683
9550msgid "show merges reachable from only one tip"
9551msgstr "显示仅一个分支可访问的合并提交"
9552
9553#: builtin/show-branch.c:685
9554msgid "topologically sort, maintaining date order where possible"
9555msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9556
9557#: builtin/show-branch.c:688
9558msgid "<n>[,<base>]"
9559msgstr "<n>[,<base>]"
9560
9561#: builtin/show-branch.c:689
9562msgid "show <n> most recent ref-log entries starting at base"
9563msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9564
9565#: builtin/show-ref.c:10
9566msgid ""
9567"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9568"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
9569msgstr ""
9570"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9571"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
9572
9573#: builtin/show-ref.c:11
9574msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9575msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9576
9577#: builtin/show-ref.c:170
9578msgid "only show tags (can be combined with heads)"
9579msgstr "只显示 tags(可以和头共用)"
9580
9581#: builtin/show-ref.c:171
9582msgid "only show heads (can be combined with tags)"
9583msgstr "只显示头(可以和 tags 共用)"
9584
9585#: builtin/show-ref.c:172
9586msgid "stricter reference checking, requires exact ref path"
9587msgstr "更严格的引用检测,需要精确的引用路径"
9588
9589#: builtin/show-ref.c:175 builtin/show-ref.c:177
9590msgid "show the HEAD reference, even if it would be filtered out"
9591msgstr "显示 HEAD 引用,即使被过滤掉"
9592
9593#: builtin/show-ref.c:179
9594msgid "dereference tags into object IDs"
9595msgstr "转换 tags 到对象ID"
9596
9597#: builtin/show-ref.c:181
9598msgid "only show SHA1 hash using <n> digits"
9599msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9600
9601#: builtin/show-ref.c:185
9602msgid "do not print results to stdout (useful with --verify)"
9603msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9604
9605#: builtin/show-ref.c:187
9606msgid "show refs from stdin that aren't in local repository"
9607msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9608
9609#: builtin/symbolic-ref.c:7
9610msgid "git symbolic-ref [<options>] <name> [<ref>]"
9611msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
9612
9613#: builtin/symbolic-ref.c:8
9614msgid "git symbolic-ref -d [-q] <name>"
9615msgstr "git symbolic-ref -d [-q] <名称>"
9616
9617#: builtin/symbolic-ref.c:40
9618msgid "suppress error message for non-symbolic (detached) refs"
9619msgstr "不显示非符号(分离的)引用的错误信息"
9620
9621#: builtin/symbolic-ref.c:41
9622msgid "delete symbolic ref"
9623msgstr "删除符号引用"
9624
9625#: builtin/symbolic-ref.c:42
9626msgid "shorten ref output"
9627msgstr "简短的引用输出"
9628
9629#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9630msgid "reason"
9631msgstr "原因"
9632
9633#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9634msgid "reason of the update"
9635msgstr "更新的原因"
9636
9637#: builtin/tag.c:22
9638msgid ""
9639"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9640"[<head>]"
9641msgstr ""
9642"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
9643
9644#: builtin/tag.c:23
9645msgid "git tag -d <tagname>..."
9646msgstr "git tag -d <标签名>..."
9647
9648#: builtin/tag.c:24
9649msgid ""
9650"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
9651"\t\t[<pattern>...]"
9652msgstr ""
9653"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
9654
9655#: builtin/tag.c:26
9656msgid "git tag -v <tagname>..."
9657msgstr "git tag -v <标签名>..."
9658
9659#: builtin/tag.c:69
9660#, c-format
9661msgid "malformed object at '%s'"
9662msgstr "非法的对象于 '%s'"
9663
9664#: builtin/tag.c:301
9665#, c-format
9666msgid "tag name too long: %.*s..."
9667msgstr "tag 名字太长:%.*s..."
9668
9669#: builtin/tag.c:306
9670#, c-format
9671msgid "tag '%s' not found."
9672msgstr "tag '%s' 未发现。"
9673
9674#: builtin/tag.c:321
9675#, c-format
9676msgid "Deleted tag '%s' (was %s)\n"
9677msgstr "已删除 tag '%s'(曾为 %s)\n"
9678
9679#: builtin/tag.c:333
9680#, c-format
9681msgid "could not verify the tag '%s'"
9682msgstr "不能校验 tag '%s'"
9683
9684#: builtin/tag.c:343
9685#, c-format
9686msgid ""
9687"\n"
9688"Write a message for tag:\n"
9689" %s\n"
9690"Lines starting with '%c' will be ignored.\n"
9691msgstr ""
9692"\n"
9693"输入一个 tag 说明:\n"
9694" %s\n"
9695"以 '%c' 开头的行将被忽略。\n"
9696
9697#: builtin/tag.c:347
9698#, c-format
9699msgid ""
9700"\n"
9701"Write a message for tag:\n"
9702" %s\n"
9703"Lines starting with '%c' will be kept; you may remove them yourself if you "
9704"want to.\n"
9705msgstr ""
9706"\n"
9707"输入一个 tag 说明:\n"
9708" %s\n"
9709"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9710
9711#: builtin/tag.c:371
9712#, c-format
9713msgid "unsupported sort specification '%s'"
9714msgstr "不支持的排序规格 '%s'"
9715
9716#: builtin/tag.c:373
9717#, c-format
9718msgid "unsupported sort specification '%s' in variable '%s'"
9719msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9720
9721#: builtin/tag.c:428
9722msgid "unable to sign the tag"
9723msgstr "无法签署 tag"
9724
9725#: builtin/tag.c:430
9726msgid "unable to write tag file"
9727msgstr "无法写 tag 文件"
9728
9729#: builtin/tag.c:455
9730msgid "bad object type."
9731msgstr "坏的对象类型。"
9732
9733#: builtin/tag.c:468
9734msgid "tag header too big."
9735msgstr "tag 头信息太大。"
9736
9737#: builtin/tag.c:504
9738msgid "no tag message?"
9739msgstr "无 tag 说明?"
9740
9741#: builtin/tag.c:510
9742#, c-format
9743msgid "The tag message has been left in %s\n"
9744msgstr "tag 说明被保留在 %s\n"
9745
9746#: builtin/tag.c:559
9747msgid "switch 'points-at' requires an object"
9748msgstr "开关 'points-at' 需要一个对象"
9749
9750#: builtin/tag.c:561
9751#, c-format
9752msgid "malformed object name '%s'"
9753msgstr "非法的对象名 '%s'"
9754
9755#: builtin/tag.c:589
9756msgid "list tag names"
9757msgstr "列出tag名称"
9758
9759#: builtin/tag.c:591
9760msgid "print <n> lines of each tag message"
9761msgstr "每个 tag 信息打印 <n> 行"
9762
9763#: builtin/tag.c:593
9764msgid "delete tags"
9765msgstr "删除 tags"
9766
9767#: builtin/tag.c:594
9768msgid "verify tags"
9769msgstr "验证 tags"
9770
9771#: builtin/tag.c:596
9772msgid "Tag creation options"
9773msgstr "Tag 创建选项"
9774
9775#: builtin/tag.c:598
9776msgid "annotated tag, needs a message"
9777msgstr "注解 tag,需要一个说明"
9778
9779#: builtin/tag.c:600
9780msgid "tag message"
9781msgstr "tag 说明"
9782
9783#: builtin/tag.c:602
9784msgid "annotated and GPG-signed tag"
9785msgstr "注解并 GPG 签名的 tag"
9786
9787#: builtin/tag.c:606
9788msgid "use another key to sign the tag"
9789msgstr "使用另外的私钥签名 tag"
9790
9791#: builtin/tag.c:607
9792msgid "replace the tag if exists"
9793msgstr "如果存在,替换现有的 tag"
9794
9795#: builtin/tag.c:609
9796msgid "Tag listing options"
9797msgstr "Tag 列表选项"
9798
9799#: builtin/tag.c:610
9800msgid "show tag list in columns"
9801msgstr "以列的方式显示 tag"
9802
9803#: builtin/tag.c:612
9804msgid "sort tags"
9805msgstr "排序 tags"
9806
9807#: builtin/tag.c:617 builtin/tag.c:623
9808msgid "print only tags that contain the commit"
9809msgstr "只打印包含提交的tags"
9810
9811#: builtin/tag.c:629
9812msgid "print only tags of the object"
9813msgstr "只打印tags对象"
9814
9815#: builtin/tag.c:655
9816msgid "--column and -n are incompatible"
9817msgstr "--column 和 -n 不兼容"
9818
9819#: builtin/tag.c:667
9820msgid "--sort and -n are incompatible"
9821msgstr "--sort 和 -n 不兼容"
9822
9823#: builtin/tag.c:674
9824msgid "-n option is only allowed with -l."
9825msgstr "-n 选项只允许和 -l 同时使用。"
9826
9827#: builtin/tag.c:676
9828msgid "--contains option is only allowed with -l."
9829msgstr "--contains 选项只允许和 -l 同时使用。"
9830
9831#: builtin/tag.c:678
9832msgid "--points-at option is only allowed with -l."
9833msgstr "--points-at 选项只允许和 -l 同时使用。"
9834
9835#: builtin/tag.c:686
9836msgid "only one -F or -m option is allowed."
9837msgstr "只允许一个 -F 或 -m 选项。"
9838
9839#: builtin/tag.c:706
9840msgid "too many params"
9841msgstr "太多参数"
9842
9843#: builtin/tag.c:712
9844#, c-format
9845msgid "'%s' is not a valid tag name."
9846msgstr "'%s' 不是一个有效的tag名称。"
9847
9848#: builtin/tag.c:717
9849#, c-format
9850msgid "tag '%s' already exists"
9851msgstr "tag '%s' 已存在"
9852
9853#: builtin/tag.c:741
9854#, c-format
9855msgid "Updated tag '%s' (was %s)\n"
9856msgstr "已更新tag '%s'(曾为 %s)\n"
9857
9858#: builtin/unpack-objects.c:489
9859msgid "Unpacking objects"
9860msgstr "展开对象中"
9861
9862#: builtin/update-index.c:70
9863#, c-format
9864msgid "failed to create directory %s"
9865msgstr "无法创建目录 %s"
9866
9867#: builtin/update-index.c:76
9868#, c-format
9869msgid "failed to stat %s"
9870msgstr "无法枚举 %s 状态"
9871
9872#: builtin/update-index.c:86
9873#, c-format
9874msgid "failed to create file %s"
9875msgstr "无法创建文件 %s"
9876
9877#: builtin/update-index.c:94
9878#, c-format
9879msgid "failed to delete file %s"
9880msgstr "无法删除文件 %s"
9881
9882#: builtin/update-index.c:101 builtin/update-index.c:203
9883#, c-format
9884msgid "failed to delete directory %s"
9885msgstr "无法删除目录 %s"
9886
9887#: builtin/update-index.c:124
9888#, c-format
9889msgid "Testing "
9890msgstr "正在测试 "
9891
9892#: builtin/update-index.c:136
9893msgid "directory stat info does not change after adding a new file"
9894msgstr "添加一个新文件后,目录的状态信息未改变"
9895
9896#: builtin/update-index.c:149
9897msgid "directory stat info does not change after adding a new directory"
9898msgstr "添加一个新目录后,目录的状态信息未改变"
9899
9900#: builtin/update-index.c:162
9901msgid "directory stat info changes after updating a file"
9902msgstr "更新一个文件后,目录的状态信息被修改"
9903
9904#: builtin/update-index.c:173
9905msgid "directory stat info changes after adding a file inside subdirectory"
9906msgstr "在子目录中添加文件后,目录的状态信息被修改"
9907
9908#: builtin/update-index.c:184
9909msgid "directory stat info does not change after deleting a file"
9910msgstr "删除一个文件后,目录的状态信息未改变"
9911
9912#: builtin/update-index.c:197
9913msgid "directory stat info does not change after deleting a directory"
9914msgstr "删除一个目录后,目录的状态信息未改变"
9915
9916#: builtin/update-index.c:204
9917msgid " OK"
9918msgstr " OK"
9919
9920#: builtin/update-index.c:564
9921msgid "git update-index [<options>] [--] [<file>...]"
9922msgstr "git update-index [<选项>] [--] [<文件>...]"
9923
9924#: builtin/update-index.c:918
9925msgid "continue refresh even when index needs update"
9926msgstr "当索引需要更新时继续刷新"
9927
9928#: builtin/update-index.c:921
9929msgid "refresh: ignore submodules"
9930msgstr "刷新:忽略子模组"
9931
9932#: builtin/update-index.c:924
9933msgid "do not ignore new files"
9934msgstr "不忽略新的文件"
9935
9936#: builtin/update-index.c:926
9937msgid "let files replace directories and vice-versa"
9938msgstr "让文件替换目录(反之亦然)"
9939
9940#: builtin/update-index.c:928
9941msgid "notice files missing from worktree"
9942msgstr "通知文件从工作区丢失"
9943
9944#: builtin/update-index.c:930
9945msgid "refresh even if index contains unmerged entries"
9946msgstr "即使索引区包含未合并的条目也执行刷新"
9947
9948#: builtin/update-index.c:933
9949msgid "refresh stat information"
9950msgstr "刷新统计信息"
9951
9952#: builtin/update-index.c:937
9953msgid "like --refresh, but ignore assume-unchanged setting"
9954msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
9955
9956#: builtin/update-index.c:941
9957msgid "<mode>,<object>,<path>"
9958msgstr "<存取模式>,<对象>,<路径>"
9959
9960#: builtin/update-index.c:942
9961msgid "add the specified entry to the index"
9962msgstr "添加指定的条目到索引区"
9963
9964#: builtin/update-index.c:946
9965msgid "(+/-)x"
9966msgstr "(+/-)x"
9967
9968#: builtin/update-index.c:947
9969msgid "override the executable bit of the listed files"
9970msgstr "覆盖列表里文件的可执行位"
9971
9972#: builtin/update-index.c:951
9973msgid "mark files as \"not changing\""
9974msgstr "把文件标记为 \"没有变更\""
9975
9976#: builtin/update-index.c:954
9977msgid "clear assumed-unchanged bit"
9978msgstr "清除 assumed-unchanged 位"
9979
9980#: builtin/update-index.c:957
9981msgid "mark files as \"index-only\""
9982msgstr "把文件标记为 \"仅索引\""
9983
9984#: builtin/update-index.c:960
9985msgid "clear skip-worktree bit"
9986msgstr "清除 skip-worktree 位"
9987
9988#: builtin/update-index.c:963
9989msgid "add to index only; do not add content to object database"
9990msgstr "只添加到索引区;不添加对象到对象库"
9991
9992#: builtin/update-index.c:965
9993msgid "remove named paths even if present in worktree"
9994msgstr "即使存在工作区里,也删除路径"
9995
9996#: builtin/update-index.c:967
9997msgid "with --stdin: input lines are terminated by null bytes"
9998msgstr "携带 --stdin:输入的行以 null 字符终止"
9999
10000#: builtin/update-index.c:969
10001msgid "read list of paths to be updated from standard input"
10002msgstr "从标准输入中读取需要更新的路径列表"
10003
10004#: builtin/update-index.c:973
10005msgid "add entries from standard input to the index"
10006msgstr "从标准输入添加条目到索引区"
10007
10008#: builtin/update-index.c:977
10009msgid "repopulate stages #2 and #3 for the listed paths"
10010msgstr "为指定文件重新生成第2和第3暂存区"
10011
10012#: builtin/update-index.c:981
10013msgid "only update entries that differ from HEAD"
10014msgstr "只更新与 HEAD 不同的条目"
10015
10016#: builtin/update-index.c:985
10017msgid "ignore files missing from worktree"
10018msgstr "忽略工作区丢失的文件"
10019
10020#: builtin/update-index.c:988
10021msgid "report actions to standard output"
10022msgstr "在标准输出显示操作"
10023
10024#: builtin/update-index.c:990
10025msgid "(for porcelains) forget saved unresolved conflicts"
10026msgstr "(for porcelains) 忘记保存的未解决的冲突"
10027
10028#: builtin/update-index.c:994
10029msgid "write index in this format"
10030msgstr "以这种格式写入索引区"
10031
10032#: builtin/update-index.c:996
10033msgid "enable or disable split index"
10034msgstr "启用或禁用索引拆分"
10035
10036#: builtin/update-index.c:998
10037msgid "enable/disable untracked cache"
10038msgstr "启用/禁用对未跟踪文件的缓存"
10039
10040#: builtin/update-index.c:1000
10041msgid "enable untracked cache without testing the filesystem"
10042msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10043
10044#: builtin/update-ref.c:9
10045msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10046msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
10047
10048#: builtin/update-ref.c:10
10049msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10050msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
10051
10052#: builtin/update-ref.c:11
10053msgid "git update-ref [<options>] --stdin [-z]"
10054msgstr "git update-ref [<选项>] --stdin [-z]"
10055
10056#: builtin/update-ref.c:359
10057msgid "delete the reference"
10058msgstr "删除引用"
10059
10060#: builtin/update-ref.c:361
10061msgid "update <refname> not the one it points to"
10062msgstr "更新 <引用名> 本身而不是它指向的引用"
10063
10064#: builtin/update-ref.c:362
10065msgid "stdin has NUL-terminated arguments"
10066msgstr "标准输入有以 NUL 字符终止的参数"
10067
10068#: builtin/update-ref.c:363
10069msgid "read updates from stdin"
10070msgstr "从标准输入读取更新"
10071
10072#: builtin/update-server-info.c:6
10073msgid "git update-server-info [--force]"
10074msgstr "git update-server-info [--force]"
10075
10076#: builtin/update-server-info.c:14
10077msgid "update the info files from scratch"
10078msgstr "从头开始更新文件信息"
10079
10080#: builtin/verify-commit.c:17
10081msgid "git verify-commit [-v | --verbose] <commit>..."
10082msgstr "git verify-commit [-v | --verbose] <提交>..."
10083
10084#: builtin/verify-commit.c:75
10085msgid "print commit contents"
10086msgstr "打印提交内容"
10087
10088#: builtin/verify-pack.c:54
10089msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10090msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
10091
10092#: builtin/verify-pack.c:64
10093msgid "verbose"
10094msgstr "冗长输出"
10095
10096#: builtin/verify-pack.c:66
10097msgid "show statistics only"
10098msgstr "只显示统计"
10099
10100#: builtin/verify-tag.c:17
10101msgid "git verify-tag [-v | --verbose] <tag>..."
10102msgstr "git verify-tag [-v | --verbose] <标签>..."
10103
10104#: builtin/verify-tag.c:73
10105msgid "print tag contents"
10106msgstr "打印 tag 内容"
10107
10108#: builtin/worktree.c:11
10109msgid "git worktree add [<options>] <path> <branch>"
10110msgstr "git worktree add [<选项>] <路径> <分支>"
10111
10112#: builtin/worktree.c:12
10113msgid "git worktree prune [<options>]"
10114msgstr "git worktree prune [<选项>]"
10115
10116#: builtin/worktree.c:27
10117#, c-format
10118msgid "Removing worktrees/%s: not a valid directory"
10119msgstr "删除工作区/%s:不是一个有效的目录"
10120
10121#: builtin/worktree.c:33
10122#, c-format
10123msgid "Removing worktrees/%s: gitdir file does not exist"
10124msgstr "删除 worktrees/%s:gitdir 文件不存在"
10125
10126#: builtin/worktree.c:38
10127#, c-format
10128msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
10129msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
10130
10131#: builtin/worktree.c:49
10132#, c-format
10133msgid "Removing worktrees/%s: invalid gitdir file"
10134msgstr "删除 worktrees/%s:无效的 gitdir 文件"
10135
10136#: builtin/worktree.c:65
10137#, c-format
10138msgid "Removing worktrees/%s: gitdir file points to non-existent location"
10139msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
10140
10141#: builtin/worktree.c:100
10142#, c-format
10143msgid "failed to remove: %s"
10144msgstr "无法删除:%s"
10145
10146#: builtin/worktree.c:186
10147#, c-format
10148msgid "'%s' already exists"
10149msgstr "'%s' 已经存在"
10150
10151#: builtin/worktree.c:207
10152#, c-format
10153msgid "could not create directory of '%s'"
10154msgstr "不能创建目录 '%s'"
10155
10156#: builtin/worktree.c:241
10157msgid "unable to resolve HEAD"
10158msgstr "不能解析 HEAD"
10159
10160#: builtin/worktree.c:249
10161#, c-format
10162msgid "Enter %s (identifier %s)"
10163msgstr "输入 %s (标识符 %s)"
10164
10165#: builtin/worktree.c:281
10166msgid "checkout <branch> even if already checked out in other worktree"
10167msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
10168
10169#: builtin/worktree.c:283
10170msgid "create a new branch"
10171msgstr "创建一个新分支"
10172
10173#: builtin/worktree.c:285
10174msgid "create or reset a branch"
10175msgstr "创建或重置一个分支"
10176
10177#: builtin/worktree.c:286
10178msgid "detach HEAD at named commit"
10179msgstr "HEAD 从指定的提交分离"
10180
10181#: builtin/worktree.c:292
10182msgid "-b and -B are mutually exclusive"
10183msgstr "-b 和 -B 互斥"
10184
10185#: builtin/write-tree.c:13
10186msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
10187msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
10188
10189#: builtin/write-tree.c:26
10190msgid "<prefix>/"
10191msgstr "<前缀>/"
10192
10193#: builtin/write-tree.c:27
10194msgid "write tree object for a subdirectory <prefix>"
10195msgstr "将 <前缀> 子目录内容写到一个树对象"
10196
10197#: builtin/write-tree.c:30
10198msgid "only useful for debugging"
10199msgstr "只对调试有用"
10200
10201#: credential-cache--daemon.c:267
10202msgid "print debugging messages to stderr"
10203msgstr "调试信息输出到标准错误"
10204
10205#: git.c:14
10206msgid ""
10207"'git help -a' and 'git help -g' list available subcommands and some\n"
10208"concept guides. See 'git help <command>' or 'git help <concept>'\n"
10209"to read about a specific subcommand or concept."
10210msgstr ""
10211"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
10212"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
10213"帮助。"
10214
10215#: common-cmds.h:10
10216msgid "start a working area (see also: git help tutorial)"
10217msgstr "开始一个工作区(参见:git help tutorial)"
10218
10219#: common-cmds.h:11
10220msgid "work on the current change (see also: git help everyday)"
10221msgstr "在当前变更上工作(参见:git help everyday)"
10222
10223#: common-cmds.h:12
10224msgid "examine the history and state (see also: git help revisions)"
10225msgstr "检查历史和状态(参见:git help revisions)"
10226
10227#: common-cmds.h:13
10228msgid "grow, mark and tweak your common history"
10229msgstr "扩展、标记和调校您的历史记录"
10230
10231#: common-cmds.h:14
10232msgid "collaborate (see also: git help workflows)"
10233msgstr "协同(参见:git help workflows)"
10234
10235#: common-cmds.h:18
10236msgid "Add file contents to the index"
10237msgstr "添加文件内容至索引"
10238
10239#: common-cmds.h:19
10240msgid "Find by binary search the change that introduced a bug"
10241msgstr "通过二分查找定位引入 bug 的变更"
10242
10243#: common-cmds.h:20
10244msgid "List, create, or delete branches"
10245msgstr "列出、创建或删除分支"
10246
10247#: common-cmds.h:21
10248msgid "Switch branches or restore working tree files"
10249msgstr "切换分支或恢复工作区文件"
10250
10251#: common-cmds.h:22
10252msgid "Clone a repository into a new directory"
10253msgstr "克隆一个版本库到一个新目录"
10254
10255#: common-cmds.h:23
10256msgid "Record changes to the repository"
10257msgstr "记录变更到版本库"
10258
10259#: common-cmds.h:24
10260msgid "Show changes between commits, commit and working tree, etc"
10261msgstr "显示提交之间、提交和工作区之间等的差异"
10262
10263#: common-cmds.h:25
10264msgid "Download objects and refs from another repository"
10265msgstr "从另外一个版本库下载对象和引用"
10266
10267#: common-cmds.h:26
10268msgid "Print lines matching a pattern"
10269msgstr "输出和模式匹配的行"
10270
10271#: common-cmds.h:27
10272msgid "Create an empty Git repository or reinitialize an existing one"
10273msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
10274
10275#: common-cmds.h:28
10276msgid "Show commit logs"
10277msgstr "显示提交日志"
10278
10279#: common-cmds.h:29
10280msgid "Join two or more development histories together"
10281msgstr "合并两个或更多开发历史"
10282
10283#: common-cmds.h:30
10284msgid "Move or rename a file, a directory, or a symlink"
10285msgstr "移动或重命名一个文件、目录或符号链接"
10286
10287#: common-cmds.h:31
10288msgid "Fetch from and integrate with another repository or a local branch"
10289msgstr "获取并整合另外的版本库或一个本地分支"
10290
10291#: common-cmds.h:32
10292msgid "Update remote refs along with associated objects"
10293msgstr "更新远程引用和相关的对象"
10294
10295#: common-cmds.h:33
10296msgid "Forward-port local commits to the updated upstream head"
10297msgstr "本地提交转移至更新后的上游分支中"
10298
10299#: common-cmds.h:34
10300msgid "Reset current HEAD to the specified state"
10301msgstr "重置当前HEAD到指定状态"
10302
10303#: common-cmds.h:35
10304msgid "Remove files from the working tree and from the index"
10305msgstr "从工作区和索引中删除文件"
10306
10307#: common-cmds.h:36
10308msgid "Show various types of objects"
10309msgstr "显示各种类型的对象"
10310
10311#: common-cmds.h:37
10312msgid "Show the working tree status"
10313msgstr "显示工作区状态"
10314
10315#: common-cmds.h:38
10316msgid "Create, list, delete or verify a tag object signed with GPG"
10317msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
10318
10319#: parse-options.h:142
10320msgid "expiry-date"
10321msgstr "到期时间"
10322
10323#: parse-options.h:157
10324msgid "no-op (backward compatibility)"
10325msgstr "空操作(向后兼容)"
10326
10327#: parse-options.h:231
10328msgid "be more verbose"
10329msgstr "更加详细"
10330
10331#: parse-options.h:233
10332msgid "be more quiet"
10333msgstr "更加安静"
10334
10335#: parse-options.h:239
10336msgid "use <n> digits to display SHA-1s"
10337msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10338
10339#: rerere.h:27
10340msgid "update the index with reused conflict resolution if possible"
10341msgstr "如果可能,重用冲突解决更新索引"
10342
10343#: git-am.sh:53
10344msgid "You need to set your committer info first"
10345msgstr "您需要先设置你的提交者信息"
10346
10347#: git-am.sh:100
10348msgid ""
10349"You seem to have moved HEAD since the last 'am' failure.\n"
10350"Not rewinding to ORIG_HEAD"
10351msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
10352
10353#: git-am.sh:110
10354#, sh-format
10355msgid ""
10356"When you have resolved this problem, run \"$cmdline --continue\".\n"
10357"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10358"To restore the original branch and stop patching, run \"$cmdline --abort\"."
10359msgstr ""
10360"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
10361"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10362"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10363
10364#: git-am.sh:126
10365msgid "Cannot fall back to three-way merge."
10366msgstr "无法求助于三路合并。"
10367
10368#: git-am.sh:142
10369msgid "Repository lacks necessary blobs to fall back on 3-way merge."
10370msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
10371
10372#: git-am.sh:144
10373msgid "Using index info to reconstruct a base tree..."
10374msgstr "使用索引来重建一个(三路合并的)基础目录树..."
10375
10376#: git-am.sh:159
10377msgid ""
10378"Did you hand edit your patch?\n"
10379"It does not apply to blobs recorded in its index."
10380msgstr ""
10381"您是否曾手动编辑过您的补丁?\n"
10382"无法应用补丁到索引中的数据(blob)对象上。"
10383
10384#: git-am.sh:168
10385msgid "Falling back to patching base and 3-way merge..."
10386msgstr "转而在基础版本上打补丁及进行三路合并..."
10387
10388#: git-am.sh:185
10389msgid "Failed to merge in the changes."
10390msgstr "无法合并变更。"
10391
10392#: git-am.sh:280
10393msgid "Only one StGIT patch series can be applied at once"
10394msgstr "一次只能有一个 StGIT 补丁队列被应用"
10395
10396#: git-am.sh:367
10397#, sh-format
10398msgid "Patch format $patch_format is not supported."
10399msgstr "不支持 $patch_format 补丁格式。"
10400
10401#: git-am.sh:369
10402msgid "Patch format detection failed."
10403msgstr "补丁格式检测失败。"
10404
10405#: git-am.sh:407
10406msgid ""
10407"The -b/--binary option has been a no-op for long time, and\n"
10408"it will be removed. Please do not use it anymore."
10409msgstr ""
10410"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10411"请不要再使用它了。"
10412
10413#: git-am.sh:507
10414#, sh-format
10415msgid "previous rebase directory $dotest still exists but mbox given."
10416msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
10417
10418#: git-am.sh:512
10419msgid "Please make up your mind. --skip or --abort?"
10420msgstr "请下决心。--skip 或是 --abort ?"
10421
10422#: git-am.sh:560
10423#, sh-format
10424msgid ""
10425"Stray $dotest directory found.\n"
10426"Use \"git am --abort\" to remove it."
10427msgstr ""
10428"发现了错误的 $dotest 目录。\n"
10429"使用 \"git am --abort\" 删除它。"
10430
10431#: git-am.sh:568
10432msgid "Resolve operation not in progress, we are not resuming."
10433msgstr "解决操作未进行,我们不会继续。"
10434
10435#: git-am.sh:635
10436#, sh-format
10437msgid "Dirty index: cannot apply patches (dirty: $files)"
10438msgstr "脏的索引:不能应用补丁(脏文件:$files)"
10439
10440#: git-am.sh:747
10441#, sh-format
10442msgid ""
10443"Patch is empty. Was it split wrong?\n"
10444"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10445"To restore the original branch and stop patching run \"$cmdline --abort\"."
10446msgstr ""
10447"补丁为空。是不是切分错误?\n"
10448"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10449"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10450
10451#: git-am.sh:774
10452msgid "Patch does not have a valid e-mail address."
10453msgstr "补丁中没有一个有效的邮件地址。"
10454
10455#: git-am.sh:821
10456msgid "cannot be interactive without stdin connected to a terminal."
10457msgstr "标准输入没有和终端关联,不能进行交互式操作。"
10458
10459#: git-am.sh:825
10460msgid "Commit Body is:"
10461msgstr "提交内容为:"
10462
10463# 译者:注意保持句尾空格
10464#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10465#. in your translation. The program will only accept English
10466#. input at this point.
10467#: git-am.sh:832
10468msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10469msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10470
10471#: git-am.sh:868
10472#, sh-format
10473msgid "Applying: $FIRSTLINE"
10474msgstr "正应用:$FIRSTLINE"
10475
10476#: git-am.sh:889
10477msgid ""
10478"No changes - did you forget to use 'git add'?\n"
10479"If there is nothing left to stage, chances are that something else\n"
10480"already introduced the same changes; you might want to skip this patch."
10481msgstr ""
10482"没有变更 —— 您是不是忘了执行 'git add'?\n"
10483"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10484"您也许想要跳过这个补丁。"
10485
10486#: git-am.sh:897
10487msgid ""
10488"You still have unmerged paths in your index\n"
10489"did you forget to use 'git add'?"
10490msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
10491
10492#: git-am.sh:913
10493msgid "No changes -- Patch already applied."
10494msgstr "没有变更 —— 补丁已经应用过。"
10495
10496#: git-am.sh:923
10497#, sh-format
10498msgid "Patch failed at $msgnum $FIRSTLINE"
10499msgstr "补丁失败于 $msgnum $FIRSTLINE"
10500
10501#: git-am.sh:926
10502#, sh-format
10503msgid ""
10504"The copy of the patch that failed is found in:\n"
10505" $dotest/patch"
10506msgstr ""
10507"失败的补丁文件副本位于:\n"
10508" $dotest/patch"
10509
10510#: git-am.sh:945
10511msgid "applying to an empty history"
10512msgstr "正应用到一个空历史上"
10513
10514#: git-bisect.sh:48
10515msgid "You need to start by \"git bisect start\""
10516msgstr "您需要执行 \"git bisect start\" 来开始"
10517
10518# 译者:注意保持句尾空格
10519#. TRANSLATORS: Make sure to include [Y] and [n] in your
10520#. translation. The program will only accept English input
10521#. at this point.
10522#: git-bisect.sh:54
10523msgid "Do you want me to do it for you [Y/n]? "
10524msgstr "您想让我为您这样做么[Y/n]? "
10525
10526#: git-bisect.sh:95
10527#, sh-format
10528msgid "unrecognised option: '$arg'"
10529msgstr "未能识别的选项:'$arg'"
10530
10531#: git-bisect.sh:99
10532#, sh-format
10533msgid "'$arg' does not appear to be a valid revision"
10534msgstr "'$arg' 看起来不像是一个有效的版本"
10535
10536#: git-bisect.sh:117
10537msgid "Bad HEAD - I need a HEAD"
10538msgstr "坏的 HEAD - 我需要一个 HEAD"
10539
10540#: git-bisect.sh:130
10541#, sh-format
10542msgid ""
10543"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
10544msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
10545
10546#: git-bisect.sh:140
10547msgid "won't bisect on cg-seek'ed tree"
10548msgstr "不会在做了 cg-seek 的树上做二分查找"
10549
10550#: git-bisect.sh:144
10551msgid "Bad HEAD - strange symbolic ref"
10552msgstr "坏的 HEAD - 奇怪的符号引用"
10553
10554#: git-bisect.sh:189
10555#, sh-format
10556msgid "Bad bisect_write argument: $state"
10557msgstr "坏的 bisect_write 参数:$state"
10558
10559#: git-bisect.sh:218
10560#, sh-format
10561msgid "Bad rev input: $arg"
10562msgstr "输入坏的版本:$arg"
10563
10564#: git-bisect.sh:232
10565msgid "Please call 'bisect_state' with at least one argument."
10566msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10567
10568#: git-bisect.sh:244
10569#, sh-format
10570msgid "Bad rev input: $rev"
10571msgstr "输入坏的版本:$rev"
10572
10573#: git-bisect.sh:253
10574msgid "'git bisect bad' can take only one argument."
10575msgstr "'git bisect bad' 只能带一个参数。"
10576
10577#: git-bisect.sh:276
10578msgid "Warning: bisecting only with a bad commit."
10579msgstr "警告:在仅有一个坏提交下进行二分查找。"
10580
10581# 译者:注意保持句尾空格
10582#. TRANSLATORS: Make sure to include [Y] and [n] in your
10583#. translation. The program will only accept English input
10584#. at this point.
10585#: git-bisect.sh:282
10586msgid "Are you sure [Y/n]? "
10587msgstr "您确认么[Y/n]? "
10588
10589#: git-bisect.sh:292
10590msgid ""
10591"You need to give me at least one good and one bad revision.\n"
10592"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10593msgstr ""
10594"您需要给我至少一个好版本和一个坏版本。\n"
10595"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10596
10597#: git-bisect.sh:295
10598msgid ""
10599"You need to start by \"git bisect start\".\n"
10600"You then need to give me at least one good and one bad revision.\n"
10601"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10602msgstr ""
10603"您需要执行 \"git bisect start\" 来开始。\n"
10604"然后需要提供我至少一个好版本和一个坏版本。\n"
10605"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10606
10607#: git-bisect.sh:366 git-bisect.sh:493
10608msgid "We are not bisecting."
10609msgstr "我们没有在二分查找。"
10610
10611#: git-bisect.sh:373
10612#, sh-format
10613msgid "'$invalid' is not a valid commit"
10614msgstr "'$invalid' 不是一个有效的提交"
10615
10616#: git-bisect.sh:382
10617#, sh-format
10618msgid ""
10619"Could not check out original HEAD '$branch'.\n"
10620"Try 'git bisect reset <commit>'."
10621msgstr ""
10622"不能检出原始 HEAD '$branch'。\n"
10623"尝试 'git bisect reset <提交>'。"
10624
10625#: git-bisect.sh:409
10626msgid "No logfile given"
10627msgstr "未提供日志文件"
10628
10629#: git-bisect.sh:410
10630#, sh-format
10631msgid "cannot read $file for replaying"
10632msgstr "不能读取 $file 来重放"
10633
10634#: git-bisect.sh:427
10635msgid "?? what are you talking about?"
10636msgstr "?? 您在说什么?"
10637
10638#: git-bisect.sh:439
10639#, sh-format
10640msgid "running $command"
10641msgstr "运行 $command"
10642
10643#: git-bisect.sh:446
10644#, sh-format
10645msgid ""
10646"bisect run failed:\n"
10647"exit code $res from '$command' is < 0 or >= 128"
10648msgstr ""
10649"二分查找运行失败:\n"
10650"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10651
10652#: git-bisect.sh:472
10653msgid "bisect run cannot continue any more"
10654msgstr "二分查找不能继续运行"
10655
10656#: git-bisect.sh:478
10657#, sh-format
10658msgid ""
10659"bisect run failed:\n"
10660"'bisect_state $state' exited with error code $res"
10661msgstr ""
10662"二分查找运行失败:\n"
10663"'bisect_state $state' 退出码为 $res"
10664
10665#: git-bisect.sh:485
10666msgid "bisect run success"
10667msgstr "二分查找运行成功"
10668
10669#: git-pull.sh:61
10670msgid ""
10671"Pull is not possible because you have unmerged files.\n"
10672"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10673"as appropriate to mark resolution and make a commit."
10674msgstr ""
10675"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10676"然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
10677
10678#: git-pull.sh:65
10679msgid "Pull is not possible because you have unmerged files."
10680msgstr "Pull 不可用,因为您尚有未合并的文件。"
10681
10682#: git-pull.sh:71
10683msgid ""
10684"You have not concluded your merge (MERGE_HEAD exists).\n"
10685"Please, commit your changes before you can merge."
10686msgstr ""
10687"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10688"请在合并前先提交您的修改。"
10689
10690#: git-pull.sh:285
10691msgid "updating an unborn branch with changes added to the index"
10692msgstr "更新尚未诞生的分支,变更添加至索引"
10693
10694#: git-pull.sh:311
10695#, sh-format
10696msgid ""
10697"Warning: fetch updated the current branch head.\n"
10698"Warning: fast-forwarding your working tree from\n"
10699"Warning: commit $orig_head."
10700msgstr ""
10701"警告:fetch 更新了当前的分支。您的工作区\n"
10702"警告:从原提交 $orig_head 快进。"
10703
10704#: git-pull.sh:336
10705msgid "Cannot merge multiple branches into empty head"
10706msgstr "无法将多个分支合并到空分支"
10707
10708#: git-pull.sh:340
10709msgid "Cannot rebase onto multiple branches"
10710msgstr "无法变基到多个分支"
10711
10712#: git-rebase.sh:57
10713msgid ""
10714"When you have resolved this problem, run \"git rebase --continue\".\n"
10715"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10716"To check out the original branch and stop rebasing, run \"git rebase --abort"
10717"\"."
10718msgstr ""
10719"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10720"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10721"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10722
10723#: git-rebase.sh:165
10724msgid "Applied autostash."
10725msgstr "成功应用 autostash。"
10726
10727#: git-rebase.sh:168
10728#, sh-format
10729msgid "Cannot store $stash_sha1"
10730msgstr "无法保存 $stash_sha1"
10731
10732#: git-rebase.sh:169
10733msgid ""
10734"Applying autostash resulted in conflicts.\n"
10735"Your changes are safe in the stash.\n"
10736"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10737msgstr ""
10738"应用 autostash 导致冲突。\n"
10739"您的修改安全地保存在 stash 中。\n"
10740"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10741
10742#: git-rebase.sh:208
10743msgid "The pre-rebase hook refused to rebase."
10744msgstr "钩子 pre-rebase 拒绝变基操作。"
10745
10746#: git-rebase.sh:213
10747msgid "It looks like git-am is in progress. Cannot rebase."
10748msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10749
10750#: git-rebase.sh:351
10751msgid "The --exec option must be used with the --interactive option"
10752msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10753
10754#: git-rebase.sh:356
10755msgid "No rebase in progress?"
10756msgstr "没有正在进行的变基?"
10757
10758#: git-rebase.sh:367
10759msgid "The --edit-todo action can only be used during interactive rebase."
10760msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10761
10762#: git-rebase.sh:374
10763msgid "Cannot read HEAD"
10764msgstr "不能读取 HEAD"
10765
10766#: git-rebase.sh:377
10767msgid ""
10768"You must edit all merge conflicts and then\n"
10769"mark them as resolved using git add"
10770msgstr ""
10771"您必须编辑所有的合并冲突,然后通过 git add\n"
10772"命令将它们标记为已解决"
10773
10774#: git-rebase.sh:395
10775#, sh-format
10776msgid "Could not move back to $head_name"
10777msgstr "无法移回 $head_name"
10778
10779#: git-rebase.sh:414
10780#, sh-format
10781msgid ""
10782"It seems that there is already a $state_dir_base directory, and\n"
10783"I wonder if you are in the middle of another rebase. If that is the\n"
10784"case, please try\n"
10785"\t$cmd_live_rebase\n"
10786"If that is not the case, please\n"
10787"\t$cmd_clear_stale_rebase\n"
10788"and run me again. I am stopping in case you still have something\n"
10789"valuable there."
10790msgstr ""
10791"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10792"过程中。 如果是这样,请执行\n"
10793"\t$cmd_live_rebase\n"
10794"如果不是这样,请执行\n"
10795"\t$cmd_clear_stale_rebase\n"
10796"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
10797
10798#: git-rebase.sh:465
10799#, sh-format
10800msgid "invalid upstream $upstream_name"
10801msgstr "无效的上游 $upstream_name"
10802
10803#: git-rebase.sh:489
10804#, sh-format
10805msgid "$onto_name: there are more than one merge bases"
10806msgstr "$onto_name: 有一个以上的合并基准"
10807
10808#: git-rebase.sh:492 git-rebase.sh:496
10809#, sh-format
10810msgid "$onto_name: there is no merge base"
10811msgstr "$onto_name: 没有合并基准"
10812
10813#: git-rebase.sh:501
10814#, sh-format
10815msgid "Does not point to a valid commit: $onto_name"
10816msgstr "没有指向一个有效的提交:$onto_name"
10817
10818#: git-rebase.sh:524
10819#, sh-format
10820msgid "fatal: no such branch: $branch_name"
10821msgstr "严重错误:无此分支:$branch_name"
10822
10823#: git-rebase.sh:557
10824msgid "Cannot autostash"
10825msgstr "无法 autostash"
10826
10827#: git-rebase.sh:562
10828#, sh-format
10829msgid "Created autostash: $stash_abbrev"
10830msgstr "创建了 autostash: $stash_abbrev"
10831
10832#: git-rebase.sh:566
10833msgid "Please commit or stash them."
10834msgstr "请提交或为它们保存进度。"
10835
10836#: git-rebase.sh:586
10837#, sh-format
10838msgid "Current branch $branch_name is up to date."
10839msgstr "当前分支 $branch_name 是最新的。"
10840
10841#: git-rebase.sh:590
10842#, sh-format
10843msgid "Current branch $branch_name is up to date, rebase forced."
10844msgstr "当前分支 $branch_name 是最新的,强制变基。"
10845
10846#: git-rebase.sh:601
10847#, sh-format
10848msgid "Changes from $mb to $onto:"
10849msgstr "变更从 $mb 到 $onto:"
10850
10851#: git-rebase.sh:610
10852msgid "First, rewinding head to replay your work on top of it..."
10853msgstr "首先,重置头指针以便在上面重放您的工作..."
10854
10855#: git-rebase.sh:620
10856#, sh-format
10857msgid "Fast-forwarded $branch_name to $onto_name."
10858msgstr "快进 $branch_name 至 $onto_name。"
10859
10860#: git-stash.sh:51
10861msgid "git stash clear with parameters is unimplemented"
10862msgstr "git stash clear 不支持参数"
10863
10864#: git-stash.sh:74
10865msgid "You do not have the initial commit yet"
10866msgstr "您尚未建立初始提交"
10867
10868#: git-stash.sh:89
10869msgid "Cannot save the current index state"
10870msgstr "无法保存当前索引状态"
10871
10872#: git-stash.sh:124 git-stash.sh:137
10873msgid "Cannot save the current worktree state"
10874msgstr "无法保存当前工作区状态"
10875
10876#: git-stash.sh:141
10877msgid "No changes selected"
10878msgstr "没有选择变更"
10879
10880#: git-stash.sh:144
10881msgid "Cannot remove temporary index (can't happen)"
10882msgstr "无法删除临时索引(不应发生)"
10883
10884#: git-stash.sh:157
10885msgid "Cannot record working tree state"
10886msgstr "不能记录工作区状态"
10887
10888#: git-stash.sh:191
10889#, sh-format
10890msgid "Cannot update $ref_stash with $w_commit"
10891msgstr "无法用 $w_commit 更新 $ref_stash"
10892
10893#. TRANSLATORS: $option is an invalid option, like
10894#. `--blah-blah'. The 7 spaces at the beginning of the
10895#. second line correspond to "error: ". So you should line
10896#. up the second line with however many characters the
10897#. translation of "error: " takes in your language. E.g. in
10898#. English this is:
10899#.
10900#. $ git stash save --blah-blah 2>&1 | head -n 2
10901#. error: unknown option for 'stash save': --blah-blah
10902#. To provide a message, use git stash save -- '--blah-blah'
10903#: git-stash.sh:241
10904#, sh-format
10905msgid ""
10906"error: unknown option for 'stash save': $option\n"
10907" To provide a message, use git stash save -- '$option'"
10908msgstr ""
10909"错误:'stash save' 的未知选项:$option\n"
10910" 要提供一个描述信息,使用 git stash save -- '$option'"
10911
10912#: git-stash.sh:262
10913msgid "No local changes to save"
10914msgstr "没有要保存的本地修改"
10915
10916#: git-stash.sh:266
10917msgid "Cannot initialize stash"
10918msgstr "无法初始化 stash"
10919
10920#: git-stash.sh:270
10921msgid "Cannot save the current status"
10922msgstr "无法保存当前状态"
10923
10924#: git-stash.sh:288
10925msgid "Cannot remove worktree changes"
10926msgstr "无法删除工作区变更"
10927
10928#: git-stash.sh:389
10929#, sh-format
10930msgid "unknown option: $opt"
10931msgstr "未知选项: $opt"
10932
10933#: git-stash.sh:399
10934msgid "No stash found."
10935msgstr "未发现 stash。"
10936
10937#: git-stash.sh:406
10938#, sh-format
10939msgid "Too many revisions specified: $REV"
10940msgstr "指定了太多的版本:$REV"
10941
10942#: git-stash.sh:412
10943#, sh-format
10944msgid "$reference is not a valid reference"
10945msgstr "$reference 不是一个有效的引用"
10946
10947#: git-stash.sh:440
10948#, sh-format
10949msgid "'$args' is not a stash-like commit"
10950msgstr "'$args' 不是 stash 样提交"
10951
10952#: git-stash.sh:451
10953#, sh-format
10954msgid "'$args' is not a stash reference"
10955msgstr "'$args' 不是一个 stash 引用"
10956
10957#: git-stash.sh:459
10958msgid "unable to refresh index"
10959msgstr "无法刷新索引"
10960
10961#: git-stash.sh:463
10962msgid "Cannot apply a stash in the middle of a merge"
10963msgstr "无法在合并过程中恢复进度"
10964
10965#: git-stash.sh:471
10966msgid "Conflicts in index. Try without --index."
10967msgstr "索引中有冲突。尝试不使用 --index。"
10968
10969#: git-stash.sh:473
10970msgid "Could not save index tree"
10971msgstr "不能保存索引树"
10972
10973#: git-stash.sh:507
10974msgid "Cannot unstage modified files"
10975msgstr "无法还原修改的文件"
10976
10977#: git-stash.sh:522
10978msgid "Index was not unstashed."
10979msgstr "索引的进度没有被恢复。"
10980
10981#: git-stash.sh:545
10982#, sh-format
10983msgid "Dropped ${REV} ($s)"
10984msgstr "丢弃了 ${REV} ($s)"
10985
10986#: git-stash.sh:546
10987#, sh-format
10988msgid "${REV}: Could not drop stash entry"
10989msgstr "${REV}:不能丢弃进度条目"
10990
10991#: git-stash.sh:554
10992msgid "No branch name specified"
10993msgstr "未指定分支名"
10994
10995#: git-stash.sh:626
10996msgid "(To restore them type \"git stash apply\")"
10997msgstr "(为恢复数据输入 \"git stash apply\")"
10998
10999#: git-submodule.sh:95
11000#, sh-format
11001msgid "cannot strip one component off url '$remoteurl'"
11002msgstr "无法从 url '$remoteurl' 剥离一个组件"
11003
11004#: git-submodule.sh:237
11005#, sh-format
11006msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
11007msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
11008
11009#: git-submodule.sh:287
11010#, sh-format
11011msgid "Clone of '$url' into submodule path '$sm_path' failed"
11012msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
11013
11014#: git-submodule.sh:296
11015#, sh-format
11016msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
11017msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
11018
11019#: git-submodule.sh:406
11020msgid "Relative path can only be used from the toplevel of the working tree"
11021msgstr "只能在工作区的顶级目录中使用相对路径"
11022
11023#: git-submodule.sh:416
11024#, sh-format
11025msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11026msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11027
11028#: git-submodule.sh:433
11029#, sh-format
11030msgid "'$sm_path' already exists in the index"
11031msgstr "'$sm_path' 已经存在于索引中"
11032
11033#: git-submodule.sh:437
11034#, sh-format
11035msgid ""
11036"The following path is ignored by one of your .gitignore files:\n"
11037"$sm_path\n"
11038"Use -f if you really want to add it."
11039msgstr ""
11040"以下路径被您的一个 .gitignore 文件所忽略:\n"
11041"$sm_path\n"
11042"如果您确实想添加它,使用 -f 参数。"
11043
11044#: git-submodule.sh:455
11045#, sh-format
11046msgid "Adding existing repo at '$sm_path' to the index"
11047msgstr "添加位于 '$sm_path' 的现存版本库到索引"
11048
11049#: git-submodule.sh:457
11050#, sh-format
11051msgid "'$sm_path' already exists and is not a valid git repo"
11052msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
11053
11054#: git-submodule.sh:465
11055#, sh-format
11056msgid "A git directory for '$sm_name' is found locally with remote(s):"
11057msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
11058
11059#: git-submodule.sh:467
11060#, sh-format
11061msgid ""
11062"If you want to reuse this local git directory instead of cloning again from"
11063msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11064
11065#: git-submodule.sh:469
11066#, sh-format
11067msgid ""
11068"use the '--force' option. If the local git directory is not the correct repo"
11069msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
11070
11071#: git-submodule.sh:470
11072#, sh-format
11073msgid ""
11074"or you are unsure what this means choose another name with the '--name' "
11075"option."
11076msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11077
11078#: git-submodule.sh:472
11079#, sh-format
11080msgid "Reactivating local git directory for submodule '$sm_name'."
11081msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11082
11083#: git-submodule.sh:484
11084#, sh-format
11085msgid "Unable to checkout submodule '$sm_path'"
11086msgstr "不能检出子模组 '$sm_path'"
11087
11088#: git-submodule.sh:489
11089#, sh-format
11090msgid "Failed to add submodule '$sm_path'"
11091msgstr "无法添加子模组 '$sm_path'"
11092
11093#: git-submodule.sh:498
11094#, sh-format
11095msgid "Failed to register submodule '$sm_path'"
11096msgstr "无法注册子模组 '$sm_path'"
11097
11098#: git-submodule.sh:542
11099#, sh-format
11100msgid "Entering '$prefix$displaypath'"
11101msgstr "正在进入 '$prefix$displaypath'"
11102
11103#: git-submodule.sh:562
11104#, sh-format
11105msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11106msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
11107
11108#: git-submodule.sh:608
11109#, sh-format
11110msgid "No url found for submodule path '$displaypath' in .gitmodules"
11111msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
11112
11113#: git-submodule.sh:617
11114#, sh-format
11115msgid "Failed to register url for submodule path '$displaypath'"
11116msgstr "无法为子模组路径 '$displaypath' 注册 url"
11117
11118#: git-submodule.sh:619
11119#, sh-format
11120msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11121msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11122
11123#: git-submodule.sh:636
11124#, sh-format
11125msgid "Failed to register update mode for submodule path '$displaypath'"
11126msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
11127
11128#: git-submodule.sh:674
11129#, sh-format
11130msgid "Use '.' if you really want to deinitialize all submodules"
11131msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11132
11133#: git-submodule.sh:691
11134#, sh-format
11135msgid "Submodule work tree '$displaypath' contains a .git directory"
11136msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
11137
11138#: git-submodule.sh:692
11139#, sh-format
11140msgid ""
11141"(use 'rm -rf' if you really want to remove it including all of its history)"
11142msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11143
11144#: git-submodule.sh:698
11145#, sh-format
11146msgid ""
11147"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11148"discard them"
11149msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
11150
11151#: git-submodule.sh:701
11152#, sh-format
11153msgid "Cleared directory '$displaypath'"
11154msgstr "已清除目录 '$displaypath'"
11155
11156#: git-submodule.sh:702
11157#, sh-format
11158msgid "Could not remove submodule work tree '$displaypath'"
11159msgstr "无法移除子模组工作区 '$displaypath'"
11160
11161#: git-submodule.sh:705
11162#, sh-format
11163msgid "Could not create empty submodule directory '$displaypath'"
11164msgstr "不能创建空的子模组目录 '$displaypath'"
11165
11166#: git-submodule.sh:714
11167#, sh-format
11168msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11169msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11170
11171#: git-submodule.sh:830
11172#, sh-format
11173msgid ""
11174"Submodule path '$displaypath' not initialized\n"
11175"Maybe you want to use 'update --init'?"
11176msgstr ""
11177"子模组路径 '$displaypath' 没有初始化\n"
11178"也许您想用 'update --init'?"
11179
11180#: git-submodule.sh:843
11181#, sh-format
11182msgid "Unable to find current revision in submodule path '$displaypath'"
11183msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
11184
11185#: git-submodule.sh:852
11186#, sh-format
11187msgid "Unable to fetch in submodule path '$sm_path'"
11188msgstr "无法在子模组路径 '$sm_path' 中获取"
11189
11190#: git-submodule.sh:876
11191#, sh-format
11192msgid "Unable to fetch in submodule path '$displaypath'"
11193msgstr "无法在子模组路径 '$displaypath' 中获取"
11194
11195#: git-submodule.sh:890
11196#, sh-format
11197msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11198msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11199
11200#: git-submodule.sh:891
11201#, sh-format
11202msgid "Submodule path '$displaypath': checked out '$sha1'"
11203msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11204
11205#: git-submodule.sh:895
11206#, sh-format
11207msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11208msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
11209
11210#: git-submodule.sh:896
11211#, sh-format
11212msgid "Submodule path '$displaypath': rebased into '$sha1'"
11213msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
11214
11215#: git-submodule.sh:901
11216#, sh-format
11217msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11218msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
11219
11220#: git-submodule.sh:902
11221#, sh-format
11222msgid "Submodule path '$displaypath': merged in '$sha1'"
11223msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
11224
11225#: git-submodule.sh:907
11226#, sh-format
11227msgid ""
11228"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11229msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
11230
11231#: git-submodule.sh:908
11232#, sh-format
11233msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11234msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
11235
11236#: git-submodule.sh:938
11237#, sh-format
11238msgid "Failed to recurse into submodule path '$displaypath'"
11239msgstr "无法递归进子模组路径 '$displaypath'"
11240
11241#: git-submodule.sh:1046
11242msgid "The --cached option cannot be used with the --files option"
11243msgstr "选项 --cached 不能和选项 --files 同时使用"
11244
11245#: git-submodule.sh:1098
11246#, sh-format
11247msgid "unexpected mode $mod_dst"
11248msgstr "意外的模式 $mod_dst"
11249
11250# 译者:注意保持前导空格
11251#: git-submodule.sh:1118
11252#, sh-format
11253msgid " Warn: $display_name doesn't contain commit $sha1_src"
11254msgstr " 警告:$display_name 未包含提交 $sha1_src"
11255
11256# 译者:注意保持前导空格
11257#: git-submodule.sh:1121
11258#, sh-format
11259msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11260msgstr " 警告:$display_name 未包含提交 $sha1_dst"
11261
11262# 译者:注意保持前导空格
11263#: git-submodule.sh:1124
11264#, sh-format
11265msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11266msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
11267
11268#: git-submodule.sh:1149
11269msgid "blob"
11270msgstr "数据对象"
11271
11272#: git-submodule.sh:1267
11273#, sh-format
11274msgid "Failed to recurse into submodule path '$sm_path'"
11275msgstr "无法递归进子模组路径 '$sm_path'"
11276
11277#: git-submodule.sh:1331
11278#, sh-format
11279msgid "Synchronizing submodule url for '$displaypath'"
11280msgstr "为 '$displaypath' 同步子模组 url"