1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
4# This file is distributed under the same license as the Git package.
5# Contributers:
6# - Jiang Xin <worldhello.net AT gmail.com>
7# - Riku <lu.riku AT gmail.com>
8# - Zhuang Ya <zhuangya AT me.com>
9# - Lian Cheng <rhythm.mail AT gmail.com>
10#
11msgid ""
12msgstr ""
13"Project-Id-Version: Git\n"
14"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15"POT-Creation-Date: 2013-04-10 15:16+0800\n"
16"PO-Revision-Date: 2013-04-12 09:23+0800\n"
17"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
19"Language: zh_CN\n"
20"MIME-Version: 1.0\n"
21"Content-Type: text/plain; charset=UTF-8\n"
22"Content-Transfer-Encoding: 8bit\n"
23"Plural-Forms: nplurals=2; plural=(n != 1);\n"
24
25#: advice.c:53
26#, c-format
27msgid "hint: %.*s\n"
28msgstr "提示:%.*s\n"
29
30#.
31#. * Message used both when 'git commit' fails and when
32#. * other commands doing a merge do.
33#.
34#: advice.c:83
35msgid ""
36"Fix them up in the work tree,\n"
37"and then use 'git add/rm <file>' as\n"
38"appropriate to mark resolution and make a commit,\n"
39"or use 'git commit -a'."
40msgstr ""
41"请先在工作区改正文件,然后酌情使用\n"
42"'git add/rm <file>' 标记解决方案,\n"
43"或使用 'git commit -a'。"
44
45#: archive.c:10
46msgid "git archive [options] <tree-ish> [<path>...]"
47msgstr "git archive [选项] <树或提交> [<路径>...]"
48
49#: archive.c:11
50msgid "git archive --list"
51msgstr "git archive --list"
52
53#: archive.c:12
54msgid ""
55"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
56msgstr ""
57"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
58
59#: archive.c:13
60msgid "git archive --remote <repo> [--exec <cmd>] --list"
61msgstr "git archive --remote <版本库> [--exec <命令>] --list"
62
63#: archive.c:323
64msgid "fmt"
65msgstr "格式"
66
67#: archive.c:323
68msgid "archive format"
69msgstr "归档格式"
70
71#: archive.c:324 builtin/log.c:1117
72msgid "prefix"
73msgstr "前缀"
74
75#: archive.c:325
76msgid "prepend prefix to each pathname in the archive"
77msgstr "为归档中每个路径名加上前缀"
78
79#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2366
80#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:659
81#: builtin/fast-export.c:661 builtin/grep.c:715 builtin/hash-object.c:77
82#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536
83#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149
84msgid "file"
85msgstr "文件"
86
87#: archive.c:327 builtin/archive.c:89
88msgid "write the archive to this file"
89msgstr "归档写入此文件"
90
91#: archive.c:329
92msgid "read .gitattributes in working directory"
93msgstr "读取工作区中的 .gitattributes"
94
95#: archive.c:330
96msgid "report archived files on stderr"
97msgstr "在标准错误上报告归档文件"
98
99#: archive.c:331
100msgid "store only"
101msgstr "只存储"
102
103#: archive.c:332
104msgid "compress faster"
105msgstr "压缩速度更快"
106
107#: archive.c:340
108msgid "compress better"
109msgstr "压缩效果更好"
110
111#: archive.c:343
112msgid "list supported archive formats"
113msgstr "列出支持的归档格式"
114
115#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86
116msgid "repo"
117msgstr "版本库"
118
119#: archive.c:346 builtin/archive.c:91
120msgid "retrieve the archive from remote repository <repo>"
121msgstr "从远程版本库(<版本库>)提取归档文件"
122
123#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615
124msgid "command"
125msgstr "命令"
126
127#: archive.c:348 builtin/archive.c:93
128msgid "path to the remote git-upload-archive command"
129msgstr "远程 git-upload-archive 命令的路径"
130
131#: attr.c:259
132msgid ""
133"Negative patterns are ignored in git attributes\n"
134"Use '\\!' for literal leading exclamation."
135msgstr ""
136"负值模版在 git attributes 中被忽略\n"
137"当字符串确实要以感叹号开始时,使用 '\\!'。"
138
139#: branch.c:201
140#, c-format
141msgid "Cannot setup tracking information; starting point '%s' is not a branch."
142msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
143
144#: branch.c:203
145#, c-format
146msgid "the requested upstream branch '%s' does not exist"
147msgstr "请求的上游分支 '%s' 不存在"
148
149#: branch.c:205
150msgid ""
151"\n"
152"If you are planning on basing your work on an upstream\n"
153"branch that already exists at the remote, you may need to\n"
154"run \"git fetch\" to retrieve it.\n"
155"\n"
156"If you are planning to push out a new local branch that\n"
157"will track its remote counterpart, you may want to use\n"
158"\"git push -u\" to set the upstream config as you push."
159msgstr ""
160"\n"
161"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
162"您可能需要执行 \"git fetch\" 来获取分支。\n"
163"\n"
164"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
165"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
166
167#: bundle.c:36
168#, c-format
169msgid "'%s' does not look like a v2 bundle file"
170msgstr "'%s' 不像是一个 v2 版本的包文件"
171
172#: bundle.c:63
173#, c-format
174msgid "unrecognized header: %s%s (%d)"
175msgstr "未能识别的包头:%s%s (%d)"
176
177#: bundle.c:89 builtin/commit.c:676
178#, c-format
179msgid "could not open '%s'"
180msgstr "不能打开 '%s'"
181
182#: bundle.c:140
183msgid "Repository lacks these prerequisite commits:"
184msgstr "版本库缺少这些必备的提交:"
185
186#: bundle.c:164 sequencer.c:651 sequencer.c:1083 builtin/log.c:300
187#: builtin/log.c:754 builtin/log.c:1350 builtin/log.c:1566 builtin/merge.c:349
188#: builtin/shortlog.c:157
189msgid "revision walk setup failed"
190msgstr "版本遍历设置失败"
191
192#: bundle.c:186
193#, c-format
194msgid "The bundle contains this ref:"
195msgid_plural "The bundle contains these %d refs:"
196msgstr[0] "这个包中含有这个引用:"
197msgstr[1] "这个包中含有 %d 个引用:"
198
199#: bundle.c:193
200msgid "The bundle records a complete history."
201msgstr "这个包记录一个完整历史。"
202
203#: bundle.c:195
204#, c-format
205msgid "The bundle requires this ref:"
206msgid_plural "The bundle requires these %d refs:"
207msgstr[0] "这个包需要这个引用:"
208msgstr[1] "这个包需要 %d 个引用:"
209
210#: bundle.c:294
211msgid "rev-list died"
212msgstr "rev-list 终止"
213
214#: bundle.c:300 builtin/log.c:1246 builtin/shortlog.c:260
215#, c-format
216msgid "unrecognized argument: %s"
217msgstr "未能识别的参数:%s"
218
219#: bundle.c:335
220#, c-format
221msgid "ref '%s' is excluded by the rev-list options"
222msgstr "引用 '%s' 被 rev-list 选项排除"
223
224#: bundle.c:380
225msgid "Refusing to create empty bundle."
226msgstr "不能创建空包。"
227
228#: bundle.c:398
229msgid "Could not spawn pack-objects"
230msgstr "不能生成 pack-objects 进程"
231
232#: bundle.c:416
233msgid "pack-objects died"
234msgstr "pack-objects 终止"
235
236#: bundle.c:419
237#, c-format
238msgid "cannot create '%s'"
239msgstr "不能创建 '%s'"
240
241#: bundle.c:441
242msgid "index-pack died"
243msgstr "index-pack 终止"
244
245#: commit.c:50
246#, c-format
247msgid "could not parse %s"
248msgstr "不能解析 %s"
249
250#: commit.c:52
251#, c-format
252msgid "%s %s is not a commit!"
253msgstr "%s %s 不是一个提交!"
254
255#: compat/obstack.c:406 compat/obstack.c:408
256msgid "memory exhausted"
257msgstr "内存耗尽"
258
259#: connected.c:39
260msgid "Could not run 'git rev-list'"
261msgstr "不能执行 'git rev-list'"
262
263#: connected.c:48
264#, c-format
265msgid "failed write to rev-list: %s"
266msgstr "无法写入 rev-list:%s"
267
268#: connected.c:56
269#, c-format
270msgid "failed to close rev-list's stdin: %s"
271msgstr "无法关闭 rev-list 的标准输入:%s"
272
273#: date.c:95
274msgid "in the future"
275msgstr "在将来"
276
277#: date.c:101
278#, c-format
279msgid "%lu second ago"
280msgid_plural "%lu seconds ago"
281msgstr[0] "%lu 秒钟之前"
282msgstr[1] "%lu 秒钟之前"
283
284#: date.c:108
285#, c-format
286msgid "%lu minute ago"
287msgid_plural "%lu minutes ago"
288msgstr[0] "%lu 分钟之前"
289msgstr[1] "%lu 分钟之前"
290
291#: date.c:115
292#, c-format
293msgid "%lu hour ago"
294msgid_plural "%lu hours ago"
295msgstr[0] "%lu 小时之前"
296msgstr[1] "%lu 小时之前"
297
298#: date.c:122
299#, c-format
300msgid "%lu day ago"
301msgid_plural "%lu days ago"
302msgstr[0] "%lu 天之前"
303msgstr[1] "%lu 天之前"
304
305#: date.c:128
306#, c-format
307msgid "%lu week ago"
308msgid_plural "%lu weeks ago"
309msgstr[0] "%lu 周之前"
310msgstr[1] "%lu 周之前"
311
312#: date.c:135
313#, c-format
314msgid "%lu month ago"
315msgid_plural "%lu months ago"
316msgstr[0] "%lu 个月之前"
317msgstr[1] "%lu 个月之前"
318
319#: date.c:146
320#, c-format
321msgid "%lu year"
322msgid_plural "%lu years"
323msgstr[0] "%lu 年"
324msgstr[1] "%lu 年"
325
326#: date.c:149
327#, c-format
328msgid "%s, %lu month ago"
329msgid_plural "%s, %lu months ago"
330msgstr[0] "%s,%lu 个月之前"
331msgstr[1] "%s,%lu 个月之前"
332
333#: date.c:154 date.c:159
334#, c-format
335msgid "%lu year ago"
336msgid_plural "%lu years ago"
337msgstr[0] "%lu 年前"
338msgstr[1] "%lu 年前"
339
340# 译者:注意保持前导空格
341#: diff.c:112
342#, c-format
343msgid " Failed to parse dirstat cut-off percentage '%s'\n"
344msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
345
346# 译者:注意保持前导空格
347#: diff.c:117
348#, c-format
349msgid " Unknown dirstat parameter '%s'\n"
350msgstr " 未知的 dirstat 参数 '%s'\n"
351
352#: diff.c:210
353#, c-format
354msgid "Unknown value for 'diff.submodule' config variable: '%s'"
355msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
356
357#: diff.c:260
358#, c-format
359msgid ""
360"Found errors in 'diff.dirstat' config variable:\n"
361"%s"
362msgstr ""
363"发现配置变量 'diff.dirstat' 中的错误:\n"
364"%s"
365
366#: diff.c:3480
367#, c-format
368msgid ""
369"Failed to parse --dirstat/-X option parameter:\n"
370"%s"
371msgstr ""
372"无法解析 --dirstat/-X 选项的参数:\n"
373"%s"
374
375#: diff.c:3494
376#, c-format
377msgid "Failed to parse --submodule option parameter: '%s'"
378msgstr "无法解析 --submodule 选项的参数:'%s'"
379
380#: gpg-interface.c:59 gpg-interface.c:131
381msgid "could not run gpg."
382msgstr "不能执行 gpg。"
383
384#: gpg-interface.c:71
385msgid "gpg did not accept the data"
386msgstr "gpg 没有接受数据"
387
388#: gpg-interface.c:82
389msgid "gpg failed to sign the data"
390msgstr "gpg 无法为数据签名"
391
392#: gpg-interface.c:115
393#, c-format
394msgid "could not create temporary file '%s': %s"
395msgstr "不能创建临时文件 '%s':%s"
396
397#: gpg-interface.c:118
398#, c-format
399msgid "failed writing detached signature to '%s': %s"
400msgstr "无法将分离式签名写入 '%s':%s"
401
402#: grep.c:1623
403#, c-format
404msgid "'%s': unable to read %s"
405msgstr "'%s':无法读取 %s"
406
407#: grep.c:1640
408#, c-format
409msgid "'%s': %s"
410msgstr "'%s':%s"
411
412#: grep.c:1651
413#, c-format
414msgid "'%s': short read %s"
415msgstr "'%s':读取不完整 %s"
416
417#: help.c:212
418#, c-format
419msgid "available git commands in '%s'"
420msgstr "在 '%s' 下可用的 git 命令"
421
422#: help.c:219
423msgid "git commands available from elsewhere on your $PATH"
424msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
425
426#: help.c:235
427msgid "The most commonly used git commands are:"
428msgstr "最常用的 git 命令有:"
429
430#: help.c:292
431#, c-format
432msgid ""
433"'%s' appears to be a git command, but we were not\n"
434"able to execute it. Maybe git-%s is broken?"
435msgstr ""
436"'%s' 像是一个 git 命令,但却无法运行。\n"
437"可能是 git-%s 受损?"
438
439#: help.c:349
440msgid "Uh oh. Your system reports no Git commands at all."
441msgstr "唉呀,您的系统中未发现 Git 命令。"
442
443#: help.c:371
444#, c-format
445msgid ""
446"WARNING: You called a Git command named '%s', which does not exist.\n"
447"Continuing under the assumption that you meant '%s'"
448msgstr ""
449"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
450"是 '%s'"
451
452#: help.c:376
453#, c-format
454msgid "in %0.1f seconds automatically..."
455msgstr "在 %0.1f 秒钟后自动运行..."
456
457#: help.c:383
458#, c-format
459msgid "git: '%s' is not a git command. See 'git --help'."
460msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
461
462#: help.c:387
463msgid ""
464"\n"
465"Did you mean this?"
466msgid_plural ""
467"\n"
468"Did you mean one of these?"
469msgstr[0] ""
470"\n"
471"您指的是这个么?"
472msgstr[1] ""
473"\n"
474"您指的是这其中的某一个么?"
475
476#: merge.c:56
477msgid "failed to read the cache"
478msgstr "无法读取缓存"
479
480#: merge.c:110 builtin/checkout.c:362 builtin/checkout.c:563
481#: builtin/clone.c:635
482msgid "unable to write new index file"
483msgstr "无法写新的索引文件"
484
485#: merge-recursive.c:190
486#, c-format
487msgid "(bad commit)\n"
488msgstr "(坏提交)\n"
489
490#: merge-recursive.c:206
491#, c-format
492msgid "addinfo_cache failed for path '%s'"
493msgstr "为路径 '%s' addinfo_cache 失败"
494
495#: merge-recursive.c:268
496msgid "error building trees"
497msgstr "无法创建树"
498
499#: merge-recursive.c:672
500#, c-format
501msgid "failed to create path '%s'%s"
502msgstr "无法创建路径 '%s'%s"
503
504#: merge-recursive.c:683
505#, c-format
506msgid "Removing %s to make room for subdirectory\n"
507msgstr "删除 %s 以便为子目录留出空间\n"
508
509#. something else exists
510#. .. but not some other error (who really cares what?)
511#: merge-recursive.c:697 merge-recursive.c:718
512msgid ": perhaps a D/F conflict?"
513msgstr ":可能是一个目录/文件冲突?"
514
515#: merge-recursive.c:708
516#, c-format
517msgid "refusing to lose untracked file at '%s'"
518msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
519
520#: merge-recursive.c:748
521#, c-format
522msgid "cannot read object %s '%s'"
523msgstr "不能读取对象 %s '%s'"
524
525#: merge-recursive.c:750
526#, c-format
527msgid "blob expected for %s '%s'"
528msgstr "%s '%s' 应为数据(blob)对象"
529
530#: merge-recursive.c:773 builtin/clone.c:303
531#, c-format
532msgid "failed to open '%s'"
533msgstr "无法打开 '%s'"
534
535#: merge-recursive.c:781
536#, c-format
537msgid "failed to symlink '%s'"
538msgstr "无法创建符号链接 '%s'"
539
540#: merge-recursive.c:784
541#, c-format
542msgid "do not know what to do with %06o %s '%s'"
543msgstr "不知道如何处理 %06o %s '%s'"
544
545#: merge-recursive.c:922
546msgid "Failed to execute internal merge"
547msgstr "无法执行内部合并"
548
549#: merge-recursive.c:926
550#, c-format
551msgid "Unable to add %s to database"
552msgstr "不能添加 %s 至对象库"
553
554#: merge-recursive.c:942
555msgid "unsupported object type in the tree"
556msgstr "在树中有不支持的对象类型"
557
558#: merge-recursive.c:1021 merge-recursive.c:1035
559#, c-format
560msgid ""
561"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
562"in tree."
563msgstr ""
564"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
565"的版本被保留。"
566
567#: merge-recursive.c:1027 merge-recursive.c:1040
568#, c-format
569msgid ""
570"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
571"in tree at %s."
572msgstr ""
573"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
574"的版本保留于 %8$s 中。"
575
576#: merge-recursive.c:1081
577msgid "rename"
578msgstr "重命名"
579
580#: merge-recursive.c:1081
581msgid "renamed"
582msgstr "重命名"
583
584#: merge-recursive.c:1137
585#, c-format
586msgid "%s is a directory in %s adding as %s instead"
587msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
588
589#: merge-recursive.c:1159
590#, c-format
591msgid ""
592"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
593"\"->\"%s\" in \"%s\"%s"
594msgstr ""
595"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
596"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
597
598#: merge-recursive.c:1164
599msgid " (left unresolved)"
600msgstr "(留下未解决)"
601
602#: merge-recursive.c:1218
603#, c-format
604msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
605msgstr ""
606"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
607"%5$s"
608
609#: merge-recursive.c:1248
610#, c-format
611msgid "Renaming %s to %s and %s to %s instead"
612msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
613
614#: merge-recursive.c:1447
615#, c-format
616msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
617msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
618
619#: merge-recursive.c:1457
620#, c-format
621msgid "Adding merged %s"
622msgstr "添加合并后的 %s"
623
624#: merge-recursive.c:1462 merge-recursive.c:1660
625#, c-format
626msgid "Adding as %s instead"
627msgstr "而是以 %s 为名添加"
628
629#: merge-recursive.c:1513
630#, c-format
631msgid "cannot read object %s"
632msgstr "不能读取对象 %s"
633
634#: merge-recursive.c:1516
635#, c-format
636msgid "object %s is not a blob"
637msgstr "对象 %s 不是一个数据(blob)对象"
638
639#: merge-recursive.c:1564
640msgid "modify"
641msgstr "修改"
642
643#: merge-recursive.c:1564
644msgid "modified"
645msgstr "修改"
646
647#: merge-recursive.c:1574
648msgid "content"
649msgstr "内容"
650
651#: merge-recursive.c:1581
652msgid "add/add"
653msgstr "添加/添加"
654
655#: merge-recursive.c:1615
656#, c-format
657msgid "Skipped %s (merged same as existing)"
658msgstr "略过 %s(已经做过相同合并)"
659
660#: merge-recursive.c:1629
661#, c-format
662msgid "Auto-merging %s"
663msgstr "自动合并 %s"
664
665#: merge-recursive.c:1633 git-submodule.sh:1029
666msgid "submodule"
667msgstr "子模组"
668
669#: merge-recursive.c:1634
670#, c-format
671msgid "CONFLICT (%s): Merge conflict in %s"
672msgstr "冲突(%s):合并冲突于 %s"
673
674#: merge-recursive.c:1724
675#, c-format
676msgid "Removing %s"
677msgstr "删除 %s"
678
679#: merge-recursive.c:1749
680msgid "file/directory"
681msgstr "文件/目录"
682
683#: merge-recursive.c:1755
684msgid "directory/file"
685msgstr "目录/文件"
686
687#: merge-recursive.c:1760
688#, c-format
689msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
690msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
691
692#: merge-recursive.c:1770
693#, c-format
694msgid "Adding %s"
695msgstr "添加 %s"
696
697#: merge-recursive.c:1787
698msgid "Fatal merge failure, shouldn't happen."
699msgstr "严重的合并错误,不应发生。"
700
701#: merge-recursive.c:1806
702msgid "Already up-to-date!"
703msgstr "已经是最新的!"
704
705#: merge-recursive.c:1815
706#, c-format
707msgid "merging of trees %s and %s failed"
708msgstr "无法合并树 %s 和 %s"
709
710#: merge-recursive.c:1845
711#, c-format
712msgid "Unprocessed path??? %s"
713msgstr "未处理的路径??? %s"
714
715#: merge-recursive.c:1890
716msgid "Merging:"
717msgstr "合并:"
718
719#: merge-recursive.c:1903
720#, c-format
721msgid "found %u common ancestor:"
722msgid_plural "found %u common ancestors:"
723msgstr[0] "发现 %u 个共同祖先:"
724msgstr[1] "发现 %u 个共同祖先:"
725
726#: merge-recursive.c:1940
727msgid "merge returned no commit"
728msgstr "合并未返回提交"
729
730#: merge-recursive.c:1997
731#, c-format
732msgid "Could not parse object '%s'"
733msgstr "不能解析对象 '%s'"
734
735#: merge-recursive.c:2009 builtin/merge.c:658
736msgid "Unable to write index."
737msgstr "不能写入索引。"
738
739#: object.c:195
740#, c-format
741msgid "unable to parse object: %s"
742msgstr "不能解析对象:%s"
743
744#: parse-options.c:489
745msgid "..."
746msgstr "..."
747
748#: parse-options.c:507
749#, c-format
750msgid "usage: %s"
751msgstr "用法:%s"
752
753#. TRANSLATORS: the colon here should align with the
754#. one in "usage: %s" translation
755#: parse-options.c:511
756#, c-format
757msgid " or: %s"
758msgstr " 或:%s"
759
760# 译者:为保证在输出中对齐,注意调整句中空格!
761#: parse-options.c:514
762#, c-format
763msgid " %s"
764msgstr " %s"
765
766#: parse-options.c:548
767msgid "-NUM"
768msgstr "-数字"
769
770#: pathspec.c:83
771#, c-format
772msgid "Path '%s' is in submodule '%.*s'"
773msgstr "路径 '%s' 属于模组 '%.*s'"
774
775#: pathspec.c:99
776#, c-format
777msgid "'%s' is beyond a symbolic link"
778msgstr "'%s' 位于符号链接中"
779
780#: remote.c:1781
781#, c-format
782msgid "Your branch is ahead of '%s' by %d commit.\n"
783msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
784msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
785msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
786
787#: remote.c:1787
788msgid " (use \"git push\" to publish your local commits)\n"
789msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
790
791#: remote.c:1790
792#, c-format
793msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
794msgid_plural ""
795"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
796msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
797msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
798
799# 译者:注意保持前导空格
800#: remote.c:1798
801msgid " (use \"git pull\" to update your local branch)\n"
802msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
803
804#: remote.c:1801
805#, c-format
806msgid ""
807"Your branch and '%s' have diverged,\n"
808"and have %d and %d different commit each, respectively.\n"
809msgid_plural ""
810"Your branch and '%s' have diverged,\n"
811"and have %d and %d different commits each, respectively.\n"
812msgstr[0] ""
813"您的分支和 '%s' 出现了偏离,\n"
814"并且分别有 %d 和 %d 处不同的提交。\n"
815msgstr[1] ""
816"您的分支和 '%s' 出现了偏离,\n"
817"并且分别有 %d 和 %d 处不同的提交。\n"
818
819# 译者:注意保持前导空格
820#: remote.c:1811
821msgid " (use \"git pull\" to merge the remote branch into yours)\n"
822msgstr " (使用 \"git pull\" 来合并远程分支)\n"
823
824#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999
825#: builtin/merge.c:1009
826#, c-format
827msgid "Could not open '%s' for writing"
828msgstr "不能为写入打开 '%s'"
829
830#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779
831#: builtin/merge.c:1001 builtin/merge.c:1014
832#, c-format
833msgid "Could not write to '%s'"
834msgstr "不能写入 '%s'"
835
836#: sequencer.c:229
837msgid ""
838"after resolving the conflicts, mark the corrected paths\n"
839"with 'git add <paths>' or 'git rm <paths>'"
840msgstr ""
841"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
842"命令标记修正后的文件"
843
844#: sequencer.c:232
845msgid ""
846"after resolving the conflicts, mark the corrected paths\n"
847"with 'git add <paths>' or 'git rm <paths>'\n"
848"and commit the result with 'git commit'"
849msgstr ""
850"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
851"对修正后的文件做标记,然后用 'git commit' 提交"
852
853#: sequencer.c:245 sequencer.c:859 sequencer.c:942
854#, c-format
855msgid "Could not write to %s"
856msgstr "不能写入 %s"
857
858#: sequencer.c:248
859#, c-format
860msgid "Error wrapping up %s"
861msgstr "错误收尾 %s"
862
863#: sequencer.c:263
864msgid "Your local changes would be overwritten by cherry-pick."
865msgstr "您的本地修改将被拣选操作覆盖。"
866
867#: sequencer.c:265
868msgid "Your local changes would be overwritten by revert."
869msgstr "您的本地修改将被还原操作覆盖。"
870
871#: sequencer.c:268
872msgid "Commit your changes or stash them to proceed."
873msgstr "提交您的修改或保存进度后再继续。"
874
875#. TRANSLATORS: %s will be "revert" or "cherry-pick"
876#: sequencer.c:319
877#, c-format
878msgid "%s: Unable to write new index file"
879msgstr "%s:无法写入新索引文件"
880
881#: sequencer.c:350
882msgid "Could not resolve HEAD commit\n"
883msgstr "不能解析 HEAD 提交\n"
884
885#: sequencer.c:371
886msgid "Unable to update cache tree\n"
887msgstr "不能更新缓存\n"
888
889#: sequencer.c:416
890#, c-format
891msgid "Could not parse commit %s\n"
892msgstr "不能解析提交 %s\n"
893
894#: sequencer.c:421
895#, c-format
896msgid "Could not parse parent commit %s\n"
897msgstr "不能解析父提交 %s\n"
898
899#: sequencer.c:487
900msgid "Your index file is unmerged."
901msgstr "您的索引文件未完成合并。"
902
903#: sequencer.c:506
904#, c-format
905msgid "Commit %s is a merge but no -m option was given."
906msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
907
908#: sequencer.c:514
909#, c-format
910msgid "Commit %s does not have parent %d"
911msgstr "提交 %s 没有父提交 %d"
912
913#: sequencer.c:518
914#, c-format
915msgid "Mainline was specified but commit %s is not a merge."
916msgstr "指定了主线但提交 %s 不是一个合并。"
917
918#. TRANSLATORS: The first %s will be "revert" or
919#. "cherry-pick", the second %s a SHA1
920#: sequencer.c:531
921#, c-format
922msgid "%s: cannot parse parent commit %s"
923msgstr "%s:不能解析父提交 %s"
924
925#: sequencer.c:535
926#, c-format
927msgid "Cannot get commit message for %s"
928msgstr "不能得到 %s 的提交说明"
929
930#: sequencer.c:621
931#, c-format
932msgid "could not revert %s... %s"
933msgstr "不能还原 %s... %s"
934
935#: sequencer.c:622
936#, c-format
937msgid "could not apply %s... %s"
938msgstr "不能应用 %s... %s"
939
940#: sequencer.c:654
941msgid "empty commit set passed"
942msgstr "提供了空的提交集"
943
944#: sequencer.c:662
945#, c-format
946msgid "git %s: failed to read the index"
947msgstr "git %s:无法读取索引"
948
949#: sequencer.c:667
950#, c-format
951msgid "git %s: failed to refresh the index"
952msgstr "git %s:无法刷新索引"
953
954#: sequencer.c:725
955#, c-format
956msgid "Cannot %s during a %s"
957msgstr "无法 %s 在一个 %s 过程中"
958
959#: sequencer.c:747
960#, c-format
961msgid "Could not parse line %d."
962msgstr "不能解析第 %d 行。"
963
964#: sequencer.c:752
965msgid "No commits parsed."
966msgstr "没有提交被解析。"
967
968#: sequencer.c:765
969#, c-format
970msgid "Could not open %s"
971msgstr "不能打开 %s"
972
973#: sequencer.c:769
974#, c-format
975msgid "Could not read %s."
976msgstr "不能读取 %s。"
977
978#: sequencer.c:776
979#, c-format
980msgid "Unusable instruction sheet: %s"
981msgstr "无用的指令表单:%s"
982
983#: sequencer.c:804
984#, c-format
985msgid "Invalid key: %s"
986msgstr "无效键名:%s"
987
988#: sequencer.c:807
989#, c-format
990msgid "Invalid value for %s: %s"
991msgstr "%s 的值无效:%s"
992
993#: sequencer.c:819
994#, c-format
995msgid "Malformed options sheet: %s"
996msgstr "非法的选项表单:%s"
997
998#: sequencer.c:840
999msgid "a cherry-pick or revert is already in progress"
1000msgstr "一个拣选或还原操作已在进行"
1001
1002#: sequencer.c:841
1003msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1004msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1005
1006#: sequencer.c:845
1007#, c-format
1008msgid "Could not create sequencer directory %s"
1009msgstr "不能创建序列目录 %s"
1010
1011#: sequencer.c:861 sequencer.c:946
1012#, c-format
1013msgid "Error wrapping up %s."
1014msgstr "错误收尾 %s。"
1015
1016#: sequencer.c:880 sequencer.c:1014
1017msgid "no cherry-pick or revert in progress"
1018msgstr "拣选或还原操作并未进行"
1019
1020#: sequencer.c:882
1021msgid "cannot resolve HEAD"
1022msgstr "不能解析 HEAD"
1023
1024#: sequencer.c:884
1025msgid "cannot abort from a branch yet to be born"
1026msgstr "不能从尚未建立的分支终止"
1027
1028#: sequencer.c:906 builtin/apply.c:4060
1029#, c-format
1030msgid "cannot open %s: %s"
1031msgstr "不能打开 %s:%s"
1032
1033#: sequencer.c:909
1034#, c-format
1035msgid "cannot read %s: %s"
1036msgstr "不能读取 %s:%s"
1037
1038#: sequencer.c:910
1039msgid "unexpected end of file"
1040msgstr "意外的文件结束"
1041
1042#: sequencer.c:916
1043#, c-format
1044msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1045msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1046
1047#: sequencer.c:939
1048#, c-format
1049msgid "Could not format %s."
1050msgstr "不能格式化 %s。"
1051
1052#: sequencer.c:1101
1053msgid "Can't revert as initial commit"
1054msgstr "不能作为初始提交还原"
1055
1056#: sequencer.c:1102
1057msgid "Can't cherry-pick into empty head"
1058msgstr "不能拣选到空分支"
1059
1060#: sha1_name.c:1036
1061msgid "HEAD does not point to a branch"
1062msgstr "HEAD 没有指向一个分支"
1063
1064#: sha1_name.c:1039
1065#, c-format
1066msgid "No such branch: '%s'"
1067msgstr "没有此分支:'%s'"
1068
1069#: sha1_name.c:1041
1070#, c-format
1071msgid "No upstream configured for branch '%s'"
1072msgstr "尚未给分支 '%s' 设置上游"
1073
1074#: sha1_name.c:1044
1075#, c-format
1076msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1077msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1078
1079#: wrapper.c:408
1080#, c-format
1081msgid "unable to access '%s': %s"
1082msgstr "不能访问 '%s':%s"
1083
1084#: wrapper.c:423
1085#, c-format
1086msgid "unable to access '%s'"
1087msgstr "不能访问 '%s'"
1088
1089#: wrapper.c:434
1090#, c-format
1091msgid "unable to look up current user in the passwd file: %s"
1092msgstr "无法在口令文件中查询到当前用户:%s"
1093
1094#: wrapper.c:435
1095msgid "no such user"
1096msgstr "无此用户"
1097
1098#: wt-status.c:140
1099msgid "Unmerged paths:"
1100msgstr "未合并的路径:"
1101
1102# 译者:注意保持前导空格
1103#: wt-status.c:167 wt-status.c:194
1104#, c-format
1105msgid " (use \"git reset %s <file>...\" to unstage)"
1106msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1107
1108# 译者:注意保持前导空格
1109#: wt-status.c:169 wt-status.c:196
1110msgid " (use \"git rm --cached <file>...\" to unstage)"
1111msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1112
1113# 译者:注意保持前导空格
1114#: wt-status.c:173
1115msgid " (use \"git add <file>...\" to mark resolution)"
1116msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1117
1118# 译者:注意保持前导空格
1119#: wt-status.c:175 wt-status.c:179
1120msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1121msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1122
1123# 译者:注意保持前导空格
1124#: wt-status.c:177
1125msgid " (use \"git rm <file>...\" to mark resolution)"
1126msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1127
1128#: wt-status.c:188
1129msgid "Changes to be committed:"
1130msgstr "要提交的变更:"
1131
1132#: wt-status.c:206
1133msgid "Changes not staged for commit:"
1134msgstr "尚未暂存以备提交的变更:"
1135
1136# 译者:注意保持前导空格
1137#: wt-status.c:210
1138msgid " (use \"git add <file>...\" to update what will be committed)"
1139msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1140
1141# 译者:注意保持前导空格
1142#: wt-status.c:212
1143msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1144msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1145
1146# 译者:注意保持前导空格
1147#: wt-status.c:213
1148msgid ""
1149" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1150msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1151
1152# 译者:注意保持前导空格
1153#: wt-status.c:215
1154msgid " (commit or discard the untracked or modified content in submodules)"
1155msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1156
1157# 译者:注意保持前导空格
1158#: wt-status.c:227
1159#, c-format
1160msgid " (use \"git %s <file>...\" to include in what will be committed)"
1161msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
1162
1163#: wt-status.c:244
1164msgid "bug"
1165msgstr "bug"
1166
1167#: wt-status.c:249
1168msgid "both deleted:"
1169msgstr "双方删除:"
1170
1171#: wt-status.c:250
1172msgid "added by us:"
1173msgstr "由我们添加:"
1174
1175#: wt-status.c:251
1176msgid "deleted by them:"
1177msgstr "由他们删除:"
1178
1179#: wt-status.c:252
1180msgid "added by them:"
1181msgstr "由他们添加:"
1182
1183#: wt-status.c:253
1184msgid "deleted by us:"
1185msgstr "由我们删除:"
1186
1187#: wt-status.c:254
1188msgid "both added:"
1189msgstr "双方添加:"
1190
1191#: wt-status.c:255
1192msgid "both modified:"
1193msgstr "双方修改:"
1194
1195# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1196#: wt-status.c:285
1197msgid "new commits, "
1198msgstr "新提交, "
1199
1200# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1201#: wt-status.c:287
1202msgid "modified content, "
1203msgstr "修改的内容, "
1204
1205# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1206#: wt-status.c:289
1207msgid "untracked content, "
1208msgstr "未跟踪的内容, "
1209
1210# 译者:为保证在输出中对齐,注意调整句中空格!
1211#: wt-status.c:306
1212#, c-format
1213msgid "new file: %s"
1214msgstr "新文件: %s"
1215
1216# 译者:为保证在输出中对齐,注意调整句中空格!
1217#: wt-status.c:309
1218#, c-format
1219msgid "copied: %s -> %s"
1220msgstr "拷贝: %s -> %s"
1221
1222# 译者:为保证在输出中对齐,注意调整句中空格!
1223#: wt-status.c:312
1224#, c-format
1225msgid "deleted: %s"
1226msgstr "删除: %s"
1227
1228# 译者:为保证在输出中对齐,注意调整句中空格!
1229#: wt-status.c:315
1230#, c-format
1231msgid "modified: %s"
1232msgstr "修改: %s"
1233
1234# 译者:为保证在输出中对齐,注意调整句中空格!
1235#: wt-status.c:318
1236#, c-format
1237msgid "renamed: %s -> %s"
1238msgstr "重命名: %s -> %s"
1239
1240# 译者:为保证在输出中对齐,注意调整句中空格!
1241#: wt-status.c:321
1242#, c-format
1243msgid "typechange: %s"
1244msgstr "类型变更: %s"
1245
1246# 译者:为保证在输出中对齐,注意调整句中空格!
1247#: wt-status.c:324
1248#, c-format
1249msgid "unknown: %s"
1250msgstr "未知: %s"
1251
1252# 译者:为保证在输出中对齐,注意调整句中空格!
1253#: wt-status.c:327
1254#, c-format
1255msgid "unmerged: %s"
1256msgstr "未合并: %s"
1257
1258#: wt-status.c:330
1259#, c-format
1260msgid "bug: unhandled diff status %c"
1261msgstr "bug:未处理的差异状态 %c"
1262
1263#: wt-status.c:805
1264msgid "You have unmerged paths."
1265msgstr "您有尚未合并的路径。"
1266
1267# 译者:注意保持前导空格
1268#: wt-status.c:808 wt-status.c:960
1269msgid " (fix conflicts and run \"git commit\")"
1270msgstr " (解决冲突并运行 \"git commit\")"
1271
1272#: wt-status.c:811
1273msgid "All conflicts fixed but you are still merging."
1274msgstr "所有冲突已解决但您仍处于合并中。"
1275
1276# 译者:注意保持前导空格
1277#: wt-status.c:814
1278msgid " (use \"git commit\" to conclude merge)"
1279msgstr " (使用 \"git commit\" 结束合并)"
1280
1281#: wt-status.c:824
1282msgid "You are in the middle of an am session."
1283msgstr "您正处于一个 am 过程中。"
1284
1285#: wt-status.c:827
1286msgid "The current patch is empty."
1287msgstr "当前的补丁为空。"
1288
1289# 译者:注意保持前导空格
1290#: wt-status.c:831
1291msgid " (fix conflicts and then run \"git am --resolved\")"
1292msgstr " (解决冲突,然后运行 \"git am --resolved\")"
1293
1294# 译者:注意保持前导空格
1295#: wt-status.c:833
1296msgid " (use \"git am --skip\" to skip this patch)"
1297msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1298
1299# 译者:注意保持前导空格
1300#: wt-status.c:835
1301msgid " (use \"git am --abort\" to restore the original branch)"
1302msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1303
1304#: wt-status.c:895 wt-status.c:912
1305#, c-format
1306msgid "You are currently rebasing branch '%s' on '%s'."
1307msgstr "您正在将分支 '%s' 变基到 '%s'。"
1308
1309#: wt-status.c:900 wt-status.c:917
1310msgid "You are currently rebasing."
1311msgstr "您正在变基。"
1312
1313# 译者:注意保持前导空格
1314#: wt-status.c:903
1315msgid " (fix conflicts and then run \"git rebase --continue\")"
1316msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1317
1318# 译者:注意保持前导空格
1319#: wt-status.c:905
1320msgid " (use \"git rebase --skip\" to skip this patch)"
1321msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1322
1323# 译者:注意保持前导空格
1324#: wt-status.c:907
1325msgid " (use \"git rebase --abort\" to check out the original branch)"
1326msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1327
1328# 译者:注意保持前导空格
1329#: wt-status.c:920
1330msgid " (all conflicts fixed: run \"git rebase --continue\")"
1331msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1332
1333#: wt-status.c:924
1334#, c-format
1335msgid ""
1336"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1337msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
1338
1339#: wt-status.c:929
1340msgid "You are currently splitting a commit during a rebase."
1341msgstr "您正在变基过程中拆分一个提交。"
1342
1343# 译者:注意保持前导空格
1344#: wt-status.c:932
1345msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1346msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1347
1348#: wt-status.c:936
1349#, c-format
1350msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1351msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
1352
1353#: wt-status.c:941
1354msgid "You are currently editing a commit during a rebase."
1355msgstr "您正在变基过程中编辑一个提交。"
1356
1357# 译者:注意保持前导空格
1358#: wt-status.c:944
1359msgid " (use \"git commit --amend\" to amend the current commit)"
1360msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1361
1362# 译者:注意保持前导空格
1363#: wt-status.c:946
1364msgid ""
1365" (use \"git rebase --continue\" once you are satisfied with your changes)"
1366msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1367
1368#: wt-status.c:956
1369msgid "You are currently cherry-picking."
1370msgstr "您正在做拣选操作。"
1371
1372# 译者:注意保持前导空格
1373#: wt-status.c:963
1374msgid " (all conflicts fixed: run \"git commit\")"
1375msgstr " (解决所有冲突后,执行 \"git commit\")"
1376
1377#: wt-status.c:972
1378#, c-format
1379msgid "You are currently reverting commit %s."
1380msgstr "您正在反转提交 %s 。"
1381
1382# 译者:注意保持前导空格
1383#: wt-status.c:977
1384msgid " (fix conflicts and run \"git revert --continue\")"
1385msgstr " (解决冲突并运行 \"git revert --continue\")"
1386
1387# 译者:注意保持前导空格
1388#: wt-status.c:980
1389msgid " (all conflicts fixed: run \"git revert --continue\")"
1390msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1391
1392# 译者:注意保持前导空格
1393#: wt-status.c:982
1394msgid " (use \"git revert --abort\" to cancel the revert operation)"
1395msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1396
1397#: wt-status.c:993
1398#, c-format
1399msgid "You are currently bisecting, started from branch '%s'."
1400msgstr "您正在从分支 '%s' 开始做二分查找。"
1401
1402#: wt-status.c:997
1403msgid "You are currently bisecting."
1404msgstr "您正在做二分查找。"
1405
1406# 译者:注意保持前导空格
1407#: wt-status.c:1000
1408msgid " (use \"git bisect reset\" to get back to the original branch)"
1409msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1410
1411#: wt-status.c:1175
1412msgid "On branch "
1413msgstr "位于分支 "
1414
1415#: wt-status.c:1186
1416msgid "HEAD detached at "
1417msgstr "头指针分离于 "
1418
1419#: wt-status.c:1188
1420msgid "HEAD detached from "
1421msgstr "头指针分离自 "
1422
1423#: wt-status.c:1191
1424msgid "Not currently on any branch."
1425msgstr "当前不在任何分支上。"
1426
1427#: wt-status.c:1208
1428msgid "Initial commit"
1429msgstr "初始提交"
1430
1431#: wt-status.c:1222
1432msgid "Untracked files"
1433msgstr "未跟踪的文件"
1434
1435#: wt-status.c:1224
1436msgid "Ignored files"
1437msgstr "忽略的文件"
1438
1439# 译者:以下三条实际为一个段落
1440#: wt-status.c:1228
1441#, c-format
1442msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
1443msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
1444
1445# 译者:为对齐,下面两句内容有调整
1446#: wt-status.c:1232
1447msgid "may speed it up, but you have to be careful not to forget to add"
1448msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
1449
1450#: wt-status.c:1235
1451msgid "new files yourself (see 'git help status')."
1452msgstr "(参见 'git help status')。"
1453
1454#: wt-status.c:1238
1455#, c-format
1456msgid "Untracked files not listed%s"
1457msgstr "未跟踪的文件没有列出%s"
1458
1459# 译者:中文字符串拼接,可删除前导空格
1460#: wt-status.c:1240
1461msgid " (use -u option to show untracked files)"
1462msgstr "(使用 -u 参数显示未跟踪的文件)"
1463
1464#: wt-status.c:1246
1465msgid "No changes"
1466msgstr "没有修改"
1467
1468#: wt-status.c:1251
1469#, c-format
1470msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1471msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1472
1473#: wt-status.c:1254
1474#, c-format
1475msgid "no changes added to commit\n"
1476msgstr "修改尚未加入提交\n"
1477
1478#: wt-status.c:1257
1479#, c-format
1480msgid ""
1481"nothing added to commit but untracked files present (use \"git add\" to "
1482"track)\n"
1483msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1484
1485#: wt-status.c:1260
1486#, c-format
1487msgid "nothing added to commit but untracked files present\n"
1488msgstr "提交为空,但是存在尚未跟踪的文件\n"
1489
1490# 译者:中文字符串拼接,可删除前导空格
1491#: wt-status.c:1263
1492#, c-format
1493msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1494msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1495
1496#: wt-status.c:1266 wt-status.c:1271
1497#, c-format
1498msgid "nothing to commit\n"
1499msgstr "无文件要提交\n"
1500
1501# 译者:中文字符串拼接,可删除前导空格
1502#: wt-status.c:1269
1503#, c-format
1504msgid "nothing to commit (use -u to show untracked files)\n"
1505msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1506
1507# 译者:中文字符串拼接,可删除前导空格
1508#: wt-status.c:1273
1509#, c-format
1510msgid "nothing to commit, working directory clean\n"
1511msgstr "无文件要提交,干净的工作区\n"
1512
1513#: wt-status.c:1381
1514msgid "HEAD (no branch)"
1515msgstr "HEAD(非分支)"
1516
1517# 译者:注意保持句尾空格
1518#: wt-status.c:1387
1519msgid "Initial commit on "
1520msgstr "初始提交于 "
1521
1522# 译者:注意保持句尾空格
1523#: wt-status.c:1402
1524msgid "behind "
1525msgstr "落后 "
1526
1527# 译者:注意保持句尾空格
1528#: wt-status.c:1405 wt-status.c:1408
1529msgid "ahead "
1530msgstr "领先 "
1531
1532# 译者:注意保持句尾空格
1533#: wt-status.c:1410
1534msgid ", behind "
1535msgstr ",落后 "
1536
1537#: compat/precompose_utf8.c:58 builtin/clone.c:342
1538#, c-format
1539msgid "failed to unlink '%s'"
1540msgstr "无法删除 '%s'"
1541
1542#: builtin/add.c:20
1543msgid "git add [options] [--] <pathspec>..."
1544msgstr "git add [选项] [--] <路径匹配>..."
1545
1546#: builtin/add.c:63
1547#, c-format
1548msgid "unexpected diff status %c"
1549msgstr "意外的差异状态 %c"
1550
1551#: builtin/add.c:68 builtin/commit.c:233
1552msgid "updating files failed"
1553msgstr "更新文件失败"
1554
1555#: builtin/add.c:78
1556#, c-format
1557msgid "remove '%s'\n"
1558msgstr "删除 '%s'\n"
1559
1560#: builtin/add.c:148
1561msgid "Unstaged changes after refreshing the index:"
1562msgstr "刷新索引之后尚未被暂存的变更:"
1563
1564#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
1565#, c-format
1566msgid "pathspec '%s' did not match any files"
1567msgstr "路径 '%s' 未匹配任何文件"
1568
1569#: builtin/add.c:234
1570msgid "Could not read the index"
1571msgstr "不能读取索引"
1572
1573#: builtin/add.c:244
1574#, c-format
1575msgid "Could not open '%s' for writing."
1576msgstr "不能打开 '%s' 以写入。"
1577
1578#: builtin/add.c:248
1579msgid "Could not write patch"
1580msgstr "不能生成补丁"
1581
1582#: builtin/add.c:253
1583#, c-format
1584msgid "Could not stat '%s'"
1585msgstr "不能查看文件状态 '%s'"
1586
1587#: builtin/add.c:255
1588msgid "Empty patch. Aborted."
1589msgstr "空补丁。异常终止。"
1590
1591#: builtin/add.c:261
1592#, c-format
1593msgid "Could not apply '%s'"
1594msgstr "不能应用 '%s'"
1595
1596#: builtin/add.c:271
1597msgid "The following paths are ignored by one of your .gitignore files:\n"
1598msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
1599
1600#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1601#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
1602#: builtin/rm.c:206
1603msgid "dry run"
1604msgstr "演习"
1605
1606#: builtin/add.c:278 builtin/apply.c:4409 builtin/check-ignore.c:19
1607#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613
1608#: builtin/log.c:1514 builtin/mv.c:62 builtin/read-tree.c:112
1609msgid "be verbose"
1610msgstr "冗长输出"
1611
1612#: builtin/add.c:280
1613msgid "interactive picking"
1614msgstr "交互式拣选"
1615
1616#: builtin/add.c:281 builtin/checkout.c:1060 builtin/reset.c:258
1617msgid "select hunks interactively"
1618msgstr "交互式挑选数据块"
1619
1620#: builtin/add.c:282
1621msgid "edit current diff and apply"
1622msgstr "编辑当前差异并应用"
1623
1624#: builtin/add.c:283
1625msgid "allow adding otherwise ignored files"
1626msgstr "允许添加忽略的文件"
1627
1628#: builtin/add.c:284
1629msgid "update tracked files"
1630msgstr "更新已跟踪的文件"
1631
1632#: builtin/add.c:285
1633msgid "record only the fact that the path will be added later"
1634msgstr "只记录,该路径稍后再添加"
1635
1636#: builtin/add.c:286
1637msgid "add changes from all tracked and untracked files"
1638msgstr "添加所有改变的已跟踪文件和未跟踪文件"
1639
1640#: builtin/add.c:287
1641msgid "don't add, only refresh the index"
1642msgstr "不添加,只刷新索引"
1643
1644#: builtin/add.c:288
1645msgid "just skip files which cannot be added because of errors"
1646msgstr "跳过因出错不能添加的文件"
1647
1648#: builtin/add.c:289
1649msgid "check if - even missing - files are ignored in dry run"
1650msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
1651
1652#: builtin/add.c:311
1653#, c-format
1654msgid "Use -f if you really want to add them.\n"
1655msgstr "使用 -f 参数如果您确实要添加它们。\n"
1656
1657#: builtin/add.c:312
1658msgid "no files added"
1659msgstr "没有文件被添加"
1660
1661#: builtin/add.c:318
1662msgid "adding files failed"
1663msgstr "添加文件失败"
1664
1665# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1666#.
1667#. * To be consistent with "git add -p" and most Git
1668#. * commands, we should default to being tree-wide, but
1669#. * this is not the original behavior and can't be
1670#. * changed until users trained themselves not to type
1671#. * "git add -u" or "git add -A". For now, we warn and
1672#. * keep the old behavior. Later, the behavior can be changed
1673#. * to tree-wide, keeping the warning for a while, and
1674#. * eventually we can drop the warning.
1675#.
1676#: builtin/add.c:335
1677#, c-format
1678msgid ""
1679"The behavior of 'git add %s (or %s)' with no path argument from a\n"
1680"subdirectory of the tree will change in Git 2.0 and should not be used "
1681"anymore.\n"
1682"To add content for the whole tree, run:\n"
1683"\n"
1684" git add %s :/\n"
1685" (or git add %s :/)\n"
1686"\n"
1687"To restrict the command to the current directory, run:\n"
1688"\n"
1689" git add %s .\n"
1690" (or git add %s .)\n"
1691"\n"
1692"With the current Git version, the command is restricted to the current "
1693"directory."
1694msgstr ""
1695"在 Git 2.0 版本,将不再允许在一个子目录下不带任何路径参数地执行\n"
1696"命令 'git add %s (或 %s)'。所以不要再继续使用了。\n"
1697"如果要添加整个目录树的内容,执行:\n"
1698"\n"
1699" git add %s :/\n"
1700" (或 git add %s :/)\n"
1701"\n"
1702"如果要限制该命令只作用于当前目录,执行:\n"
1703"\n"
1704" git add %s .\n"
1705" (或 git add %s .)\n"
1706"\n"
1707"对于当前版本的 Git,这条命令只作用于当前目录。"
1708
1709#: builtin/add.c:381
1710msgid "-A and -u are mutually incompatible"
1711msgstr "-A 和 -u 选项互斥"
1712
1713#: builtin/add.c:383
1714msgid "Option --ignore-missing can only be used together with --dry-run"
1715msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
1716
1717#: builtin/add.c:414
1718#, c-format
1719msgid "Nothing specified, nothing added.\n"
1720msgstr "没有指定文件,也没有文件被添加。\n"
1721
1722#: builtin/add.c:415
1723#, c-format
1724msgid "Maybe you wanted to say 'git add .'?\n"
1725msgstr "也许您想要执行 'git add .'?\n"
1726
1727#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
1728#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235
1729msgid "index file corrupt"
1730msgstr "索引文件损坏"
1731
1732#: builtin/add.c:481 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370
1733msgid "Unable to write new index file"
1734msgstr "无法写入新索引文件"
1735
1736#: builtin/apply.c:57
1737msgid "git apply [options] [<patch>...]"
1738msgstr "git apply [选项] [<补丁>...]"
1739
1740#: builtin/apply.c:110
1741#, c-format
1742msgid "unrecognized whitespace option '%s'"
1743msgstr "未能识别的空白字符选项 '%s'"
1744
1745#: builtin/apply.c:125
1746#, c-format
1747msgid "unrecognized whitespace ignore option '%s'"
1748msgstr "未能识别的空白字符忽略选项 '%s'"
1749
1750#: builtin/apply.c:823
1751#, c-format
1752msgid "Cannot prepare timestamp regexp %s"
1753msgstr "无法准备时间戳正则表达式 %s"
1754
1755#: builtin/apply.c:832
1756#, c-format
1757msgid "regexec returned %d for input: %s"
1758msgstr "regexec 返回 %d,输入为:%s"
1759
1760#: builtin/apply.c:913
1761#, c-format
1762msgid "unable to find filename in patch at line %d"
1763msgstr "不能在补丁的第 %d 行找到文件名"
1764
1765#: builtin/apply.c:945
1766#, c-format
1767msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1768msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
1769
1770#: builtin/apply.c:949
1771#, c-format
1772msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1773msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
1774
1775#: builtin/apply.c:950
1776#, c-format
1777msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1778msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
1779
1780#: builtin/apply.c:957
1781#, c-format
1782msgid "git apply: bad git-diff - expected /dev/null on line %d"
1783msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
1784
1785#: builtin/apply.c:1422
1786#, c-format
1787msgid "recount: unexpected line: %.*s"
1788msgstr "recount:意外的行:%.*s"
1789
1790#: builtin/apply.c:1479
1791#, c-format
1792msgid "patch fragment without header at line %d: %.*s"
1793msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1794
1795#: builtin/apply.c:1496
1796#, c-format
1797msgid ""
1798"git diff header lacks filename information when removing %d leading pathname "
1799"component (line %d)"
1800msgid_plural ""
1801"git diff header lacks filename information when removing %d leading pathname "
1802"components (line %d)"
1803msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1804msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1805
1806#: builtin/apply.c:1656
1807msgid "new file depends on old contents"
1808msgstr "新文件依赖旧内容"
1809
1810#: builtin/apply.c:1658
1811msgid "deleted file still has contents"
1812msgstr "删除的文件仍有内容"
1813
1814#: builtin/apply.c:1684
1815#, c-format
1816msgid "corrupt patch at line %d"
1817msgstr "补丁在第 %d 行损坏"
1818
1819#: builtin/apply.c:1720
1820#, c-format
1821msgid "new file %s depends on old contents"
1822msgstr "新文件 %s 依赖旧内容"
1823
1824#: builtin/apply.c:1722
1825#, c-format
1826msgid "deleted file %s still has contents"
1827msgstr "删除的文件 %s 仍有内容"
1828
1829#: builtin/apply.c:1725
1830#, c-format
1831msgid "** warning: file %s becomes empty but is not deleted"
1832msgstr "** 警告:文件 %s 成为空文件但并未删除"
1833
1834#: builtin/apply.c:1871
1835#, c-format
1836msgid "corrupt binary patch at line %d: %.*s"
1837msgstr "二进制补丁在第 %d 行损坏:%.*s"
1838
1839#. there has to be one hunk (forward hunk)
1840#: builtin/apply.c:1900
1841#, c-format
1842msgid "unrecognized binary patch at line %d"
1843msgstr "未能识别的二进制补丁位于第 %d 行"
1844
1845#: builtin/apply.c:1986
1846#, c-format
1847msgid "patch with only garbage at line %d"
1848msgstr "补丁文件的第 %d 行只有垃圾数据"
1849
1850#: builtin/apply.c:2076
1851#, c-format
1852msgid "unable to read symlink %s"
1853msgstr "无法读取符号链接 %s"
1854
1855#: builtin/apply.c:2080
1856#, c-format
1857msgid "unable to open or read %s"
1858msgstr "不能打开或读取 %s"
1859
1860#: builtin/apply.c:2688
1861#, c-format
1862msgid "invalid start of line: '%c'"
1863msgstr "无效的行首字符:'%c'"
1864
1865#: builtin/apply.c:2806
1866#, c-format
1867msgid "Hunk #%d succeeded at %d (offset %d line)."
1868msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1869msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1870msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
1871
1872#: builtin/apply.c:2818
1873#, c-format
1874msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1875msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1876
1877#: builtin/apply.c:2824
1878#, c-format
1879msgid ""
1880"while searching for:\n"
1881"%.*s"
1882msgstr ""
1883"当查询:\n"
1884"%.*s"
1885
1886#: builtin/apply.c:2843
1887#, c-format
1888msgid "missing binary patch data for '%s'"
1889msgstr "缺失 '%s' 的二进制补丁数据"
1890
1891#: builtin/apply.c:2946
1892#, c-format
1893msgid "binary patch does not apply to '%s'"
1894msgstr "二进制补丁未应用到 '%s'"
1895
1896#: builtin/apply.c:2952
1897#, c-format
1898msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1899msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
1900
1901#: builtin/apply.c:2973
1902#, c-format
1903msgid "patch failed: %s:%ld"
1904msgstr "打补丁失败:%s:%ld"
1905
1906#: builtin/apply.c:3095
1907#, c-format
1908msgid "cannot checkout %s"
1909msgstr "不能检出 %s"
1910
1911#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193
1912#, c-format
1913msgid "read of %s failed"
1914msgstr "读取 %s 失败"
1915
1916#: builtin/apply.c:3173 builtin/apply.c:3395
1917#, c-format
1918msgid "path %s has been renamed/deleted"
1919msgstr "路径 %s 已经被重命名/删除"
1920
1921#: builtin/apply.c:3254 builtin/apply.c:3409
1922#, c-format
1923msgid "%s: does not exist in index"
1924msgstr "%s:不存在于索引中"
1925
1926#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423
1927#, c-format
1928msgid "%s: %s"
1929msgstr "%s:%s"
1930
1931#: builtin/apply.c:3263 builtin/apply.c:3417
1932#, c-format
1933msgid "%s: does not match index"
1934msgstr "%s:和索引不匹配"
1935
1936#: builtin/apply.c:3365
1937msgid "removal patch leaves file contents"
1938msgstr "移除补丁仍留下了文件内容"
1939
1940#: builtin/apply.c:3434
1941#, c-format
1942msgid "%s: wrong type"
1943msgstr "%s:错误类型"
1944
1945#: builtin/apply.c:3436
1946#, c-format
1947msgid "%s has type %o, expected %o"
1948msgstr "%s 的类型是 %o,应为 %o"
1949
1950#: builtin/apply.c:3537
1951#, c-format
1952msgid "%s: already exists in index"
1953msgstr "%s:已经存在于索引中"
1954
1955#: builtin/apply.c:3540
1956#, c-format
1957msgid "%s: already exists in working directory"
1958msgstr "%s:已经存在于工作区中"
1959
1960#: builtin/apply.c:3560
1961#, c-format
1962msgid "new mode (%o) of %s does not match old mode (%o)"
1963msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1964
1965#: builtin/apply.c:3565
1966#, c-format
1967msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1968msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1969
1970#: builtin/apply.c:3573
1971#, c-format
1972msgid "%s: patch does not apply"
1973msgstr "%s:补丁未应用"
1974
1975#: builtin/apply.c:3586
1976#, c-format
1977msgid "Checking patch %s..."
1978msgstr "检查补丁 %s..."
1979
1980#: builtin/apply.c:3679 builtin/checkout.c:215 builtin/reset.c:124
1981#, c-format
1982msgid "make_cache_entry failed for path '%s'"
1983msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1984
1985#: builtin/apply.c:3822
1986#, c-format
1987msgid "unable to remove %s from index"
1988msgstr "不能从索引中移除 %s"
1989
1990#: builtin/apply.c:3850
1991#, c-format
1992msgid "corrupt patch for subproject %s"
1993msgstr "子项目 %s 损坏的补丁"
1994
1995#: builtin/apply.c:3854
1996#, c-format
1997msgid "unable to stat newly created file '%s'"
1998msgstr "不能枚举新建文件 '%s' 的状态"
1999
2000#: builtin/apply.c:3859
2001#, c-format
2002msgid "unable to create backing store for newly created file %s"
2003msgstr "不能为新建文件 %s 创建后端存储"
2004
2005#: builtin/apply.c:3862 builtin/apply.c:3970
2006#, c-format
2007msgid "unable to add cache entry for %s"
2008msgstr "无法为 %s 添加缓存条目"
2009
2010#: builtin/apply.c:3895
2011#, c-format
2012msgid "closing file '%s'"
2013msgstr "关闭文件 '%s'"
2014
2015#: builtin/apply.c:3944
2016#, c-format
2017msgid "unable to write file '%s' mode %o"
2018msgstr "不能写文件 '%s' 权限 %o"
2019
2020#: builtin/apply.c:4031
2021#, c-format
2022msgid "Applied patch %s cleanly."
2023msgstr "成功应用补丁 %s。"
2024
2025#: builtin/apply.c:4039
2026msgid "internal error"
2027msgstr "内部错误"
2028
2029#. Say this even without --verbose
2030#: builtin/apply.c:4042
2031#, c-format
2032msgid "Applying patch %%s with %d reject..."
2033msgid_plural "Applying patch %%s with %d rejects..."
2034msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2035msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2036
2037#: builtin/apply.c:4052
2038#, c-format
2039msgid "truncating .rej filename to %.*s.rej"
2040msgstr "截短 .rej 文件名为 %.*s.rej"
2041
2042#: builtin/apply.c:4073
2043#, c-format
2044msgid "Hunk #%d applied cleanly."
2045msgstr "第 #%d 个片段成功应用。"
2046
2047#: builtin/apply.c:4076
2048#, c-format
2049msgid "Rejected hunk #%d."
2050msgstr "拒绝第 #%d 个片段。"
2051
2052#: builtin/apply.c:4226
2053msgid "unrecognized input"
2054msgstr "未能识别的输入"
2055
2056#: builtin/apply.c:4237
2057msgid "unable to read index file"
2058msgstr "无法读取索引文件"
2059
2060#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92
2061#: builtin/fetch.c:63
2062msgid "path"
2063msgstr "路径"
2064
2065#: builtin/apply.c:4357
2066msgid "don't apply changes matching the given path"
2067msgstr "不要应用与给出路径向匹配的变更"
2068
2069#: builtin/apply.c:4360
2070msgid "apply changes matching the given path"
2071msgstr "应用与给出路径向匹配的变更"
2072
2073#: builtin/apply.c:4362
2074msgid "num"
2075msgstr "数字"
2076
2077#: builtin/apply.c:4363
2078msgid "remove <num> leading slashes from traditional diff paths"
2079msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2080
2081#: builtin/apply.c:4366
2082msgid "ignore additions made by the patch"
2083msgstr "忽略补丁中的添加的文件"
2084
2085#: builtin/apply.c:4368
2086msgid "instead of applying the patch, output diffstat for the input"
2087msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2088
2089#: builtin/apply.c:4372
2090msgid "show number of added and deleted lines in decimal notation"
2091msgstr "以十进制数显示添加和删除的行数"
2092
2093#: builtin/apply.c:4374
2094msgid "instead of applying the patch, output a summary for the input"
2095msgstr "不应用补丁,而是显示输入的概要"
2096
2097#: builtin/apply.c:4376
2098msgid "instead of applying the patch, see if the patch is applicable"
2099msgstr "不应用补丁,而是查看补丁是否可应用"
2100
2101#: builtin/apply.c:4378
2102msgid "make sure the patch is applicable to the current index"
2103msgstr "确认补丁可以应用到当前索引"
2104
2105#: builtin/apply.c:4380
2106msgid "apply a patch without touching the working tree"
2107msgstr "应用补丁而不修改工作区"
2108
2109#: builtin/apply.c:4382
2110msgid "also apply the patch (use with --stat/--summary/--check)"
2111msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2112
2113#: builtin/apply.c:4384
2114msgid "attempt three-way merge if a patch does not apply"
2115msgstr "如果一个补丁不能应用则尝试三路合并"
2116
2117#: builtin/apply.c:4386
2118msgid "build a temporary index based on embedded index information"
2119msgstr "创建一个临时索引基于嵌入的索引信息"
2120
2121#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:463
2122msgid "paths are separated with NUL character"
2123msgstr "路径以 NUL 字符分隔"
2124
2125#: builtin/apply.c:4391
2126msgid "ensure at least <n> lines of context match"
2127msgstr "确保至少匹配 <n> 行上下文"
2128
2129#: builtin/apply.c:4392
2130msgid "action"
2131msgstr "动作"
2132
2133#: builtin/apply.c:4393
2134msgid "detect new or modified lines that have whitespace errors"
2135msgstr "检查新增和修改的行中间的空白字符滥用"
2136
2137#: builtin/apply.c:4396 builtin/apply.c:4399
2138msgid "ignore changes in whitespace when finding context"
2139msgstr "查找上下文时忽略空白字符的变更"
2140
2141#: builtin/apply.c:4402
2142msgid "apply the patch in reverse"
2143msgstr "反向应用补丁"
2144
2145#: builtin/apply.c:4404
2146msgid "don't expect at least one line of context"
2147msgstr "无需至少一行上下文"
2148
2149#: builtin/apply.c:4406
2150msgid "leave the rejected hunks in corresponding *.rej files"
2151msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2152
2153#: builtin/apply.c:4408
2154msgid "allow overlapping hunks"
2155msgstr "允许重叠的补丁片段"
2156
2157#: builtin/apply.c:4411
2158msgid "tolerate incorrectly detected missing new-line at the end of file"
2159msgstr "允许不正确的文件末尾换行符"
2160
2161#: builtin/apply.c:4414
2162msgid "do not trust the line counts in the hunk headers"
2163msgstr "不信任补丁片段的头信息中的行号"
2164
2165#: builtin/apply.c:4416
2166msgid "root"
2167msgstr "根目录"
2168
2169#: builtin/apply.c:4417
2170msgid "prepend <root> to all filenames"
2171msgstr "为所有文件名前添加 <根目录>"
2172
2173#: builtin/apply.c:4439
2174msgid "--3way outside a repository"
2175msgstr "--3way 在一个版本库之外"
2176
2177#: builtin/apply.c:4447
2178msgid "--index outside a repository"
2179msgstr "--index 在一个版本库之外"
2180
2181#: builtin/apply.c:4450
2182msgid "--cached outside a repository"
2183msgstr "--cached 在一个版本库之外"
2184
2185#: builtin/apply.c:4466
2186#, c-format
2187msgid "can't open patch '%s'"
2188msgstr "不能打开补丁 '%s'"
2189
2190#: builtin/apply.c:4480
2191#, c-format
2192msgid "squelched %d whitespace error"
2193msgid_plural "squelched %d whitespace errors"
2194msgstr[0] "抑制下仍有 %d 个空白字符误用"
2195msgstr[1] "抑制下仍有 %d 个空白字符误用"
2196
2197#: builtin/apply.c:4486 builtin/apply.c:4496
2198#, c-format
2199msgid "%d line adds whitespace errors."
2200msgid_plural "%d lines add whitespace errors."
2201msgstr[0] "%d 行有空白字符误用。"
2202msgstr[1] "%d 行有空白字符误用。"
2203
2204#: builtin/archive.c:17
2205#, c-format
2206msgid "could not create archive file '%s'"
2207msgstr "不能创建归档文件 '%s'"
2208
2209#: builtin/archive.c:20
2210msgid "could not redirect output"
2211msgstr "不能重定向输出"
2212
2213#: builtin/archive.c:37
2214msgid "git archive: Remote with no URL"
2215msgstr "git archive:未提供远程URL"
2216
2217#: builtin/archive.c:58
2218msgid "git archive: expected ACK/NAK, got EOF"
2219msgstr "git archive:应为ACK/NACK,却得到EOF"
2220
2221#: builtin/archive.c:61
2222#, c-format
2223msgid "git archive: NACK %s"
2224msgstr "git archive:NACK %s"
2225
2226#: builtin/archive.c:63
2227#, c-format
2228msgid "remote error: %s"
2229msgstr "远程错误:%s"
2230
2231#: builtin/archive.c:64
2232msgid "git archive: protocol error"
2233msgstr "git archive:协议错误"
2234
2235#: builtin/archive.c:68
2236msgid "git archive: expected a flush"
2237msgstr "git archive:应为刷新"
2238
2239#: builtin/bisect--helper.c:7
2240msgid "git bisect--helper --next-all [--no-checkout]"
2241msgstr "git bisect--helper --next-all [--no-checkout]"
2242
2243#: builtin/bisect--helper.c:17
2244msgid "perform 'git bisect next'"
2245msgstr "执行 'git bisect next'"
2246
2247#: builtin/bisect--helper.c:19
2248msgid "update BISECT_HEAD instead of checking out the current commit"
2249msgstr "更新 BISECT_HEAD 而非检出当前提交"
2250
2251#: builtin/blame.c:25
2252msgid "git blame [options] [rev-opts] [rev] [--] file"
2253msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2254
2255#: builtin/blame.c:30 builtin/shortlog.c:15
2256msgid "[rev-opts] are documented in git-rev-list(1)"
2257msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2258
2259#: builtin/blame.c:2350
2260msgid "Show blame entries as we find them, incrementally"
2261msgstr "增量式地显示发现的 blame 条目"
2262
2263#: builtin/blame.c:2351
2264msgid "Show blank SHA-1 for boundary commits (Default: off)"
2265msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2266
2267#: builtin/blame.c:2352
2268msgid "Do not treat root commits as boundaries (Default: off)"
2269msgstr "不把根提交作为边界(默认:关闭)"
2270
2271#: builtin/blame.c:2353
2272msgid "Show work cost statistics"
2273msgstr "显示命令消耗统计"
2274
2275#: builtin/blame.c:2354
2276msgid "Show output score for blame entries"
2277msgstr "显示判断 blame 条目位移的得分诊断信息"
2278
2279#: builtin/blame.c:2355
2280msgid "Show original filename (Default: auto)"
2281msgstr "显示原始文件名(默认:自动)"
2282
2283#: builtin/blame.c:2356
2284msgid "Show original linenumber (Default: off)"
2285msgstr "显示原始的行号(默认:关闭)"
2286
2287#: builtin/blame.c:2357
2288msgid "Show in a format designed for machine consumption"
2289msgstr "显示为一个适合机器读取的格式"
2290
2291#: builtin/blame.c:2358
2292msgid "Show porcelain format with per-line commit information"
2293msgstr "为每一行显示机器适用的提交信息"
2294
2295#: builtin/blame.c:2359
2296msgid "Use the same output mode as git-annotate (Default: off)"
2297msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2298
2299#: builtin/blame.c:2360
2300msgid "Show raw timestamp (Default: off)"
2301msgstr "显示原始时间戳(默认:关闭)"
2302
2303#: builtin/blame.c:2361
2304msgid "Show long commit SHA1 (Default: off)"
2305msgstr "显示长的SHA1提交号(默认:关闭)"
2306
2307#: builtin/blame.c:2362
2308msgid "Suppress author name and timestamp (Default: off)"
2309msgstr "隐藏作者名字和时间戳(默认:关闭)"
2310
2311#: builtin/blame.c:2363
2312msgid "Show author email instead of name (Default: off)"
2313msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2314
2315#: builtin/blame.c:2364
2316msgid "Ignore whitespace differences"
2317msgstr "忽略空白差异"
2318
2319#: builtin/blame.c:2365
2320msgid "Spend extra cycles to find better match"
2321msgstr "花费额外的循环来找到更好的匹配"
2322
2323#: builtin/blame.c:2366
2324msgid "Use revisions from <file> instead of calling git-rev-list"
2325msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2326
2327#: builtin/blame.c:2367
2328msgid "Use <file>'s contents as the final image"
2329msgstr "使用 <file> 的内容作为最终的图片"
2330
2331#: builtin/blame.c:2368 builtin/blame.c:2369
2332msgid "score"
2333msgstr "得分"
2334
2335#: builtin/blame.c:2368
2336msgid "Find line copies within and across files"
2337msgstr "找到文件内及跨文件的行拷贝"
2338
2339#: builtin/blame.c:2369
2340msgid "Find line movements within and across files"
2341msgstr "找到文件内及跨文件的行移动"
2342
2343#: builtin/blame.c:2370
2344msgid "n,m"
2345msgstr "n,m"
2346
2347#: builtin/blame.c:2370
2348msgid "Process only line range n,m, counting from 1"
2349msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2350
2351#: builtin/branch.c:24
2352msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2353msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2354
2355#: builtin/branch.c:25
2356msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2357msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2358
2359#: builtin/branch.c:26
2360msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2361msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2362
2363#: builtin/branch.c:27
2364msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2365msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2366
2367# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2368#: builtin/branch.c:146
2369#, c-format
2370msgid ""
2371"deleting branch '%s' that has been merged to\n"
2372" '%s', but not yet merged to HEAD."
2373msgstr ""
2374"将要删除的分支 '%s' 已经被合并到\n"
2375" '%s',但未合并到 HEAD。"
2376
2377# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2378#: builtin/branch.c:150
2379#, c-format
2380msgid ""
2381"not deleting branch '%s' that is not yet merged to\n"
2382" '%s', even though it is merged to HEAD."
2383msgstr ""
2384"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2385" 然而却尚未被合并到分支 '%s' 。"
2386
2387#: builtin/branch.c:164
2388#, c-format
2389msgid "Couldn't look up commit object for '%s'"
2390msgstr "无法查询 '%s' 指向的提交对象"
2391
2392#: builtin/branch.c:168
2393#, c-format
2394msgid ""
2395"The branch '%s' is not fully merged.\n"
2396"If you are sure you want to delete it, run 'git branch -D %s'."
2397msgstr ""
2398"分支 '%s' 没有完全合并。\n"
2399"如果您确认要删除它,执行 'git branch -D %s'。"
2400
2401#: builtin/branch.c:181
2402msgid "Update of config-file failed"
2403msgstr "无法更新 config 文件"
2404
2405#: builtin/branch.c:209
2406msgid "cannot use -a with -d"
2407msgstr "不能将 -a 和 -d 同时使用"
2408
2409#: builtin/branch.c:215
2410msgid "Couldn't look up commit object for HEAD"
2411msgstr "无法查询 HEAD 指向的提交对象"
2412
2413#: builtin/branch.c:223
2414#, c-format
2415msgid "Cannot delete the branch '%s' which you are currently on."
2416msgstr "无法删除您当前所在的分支 '%s'。"
2417
2418#: builtin/branch.c:236
2419#, c-format
2420msgid "remote branch '%s' not found."
2421msgstr "远程分支 '%s' 未发现。"
2422
2423#: builtin/branch.c:237
2424#, c-format
2425msgid "branch '%s' not found."
2426msgstr "分支 '%s' 未发现。"
2427
2428#: builtin/branch.c:251
2429#, c-format
2430msgid "Error deleting remote branch '%s'"
2431msgstr "删除远程分支 '%s' 时出错"
2432
2433#: builtin/branch.c:252
2434#, c-format
2435msgid "Error deleting branch '%s'"
2436msgstr "删除分支 '%s' 时出错"
2437
2438#: builtin/branch.c:259
2439#, c-format
2440msgid "Deleted remote branch %s (was %s).\n"
2441msgstr "已删除远程分支 %s(曾为 %s)。\n"
2442
2443#: builtin/branch.c:260
2444#, c-format
2445msgid "Deleted branch %s (was %s).\n"
2446msgstr "已删除分支 %s(曾为 %s)。\n"
2447
2448#: builtin/branch.c:362
2449#, c-format
2450msgid "branch '%s' does not point at a commit"
2451msgstr "分支 '%s' 未指向一个提交"
2452
2453#: builtin/branch.c:434
2454#, c-format
2455msgid "[%s: behind %d]"
2456msgstr "[%s:落后 %d]"
2457
2458#: builtin/branch.c:436
2459#, c-format
2460msgid "[behind %d]"
2461msgstr "[落后 %d]"
2462
2463#: builtin/branch.c:440
2464#, c-format
2465msgid "[%s: ahead %d]"
2466msgstr "[%s:领先 %d]"
2467
2468#: builtin/branch.c:442
2469#, c-format
2470msgid "[ahead %d]"
2471msgstr "[领先 %d]"
2472
2473#: builtin/branch.c:445
2474#, c-format
2475msgid "[%s: ahead %d, behind %d]"
2476msgstr "[%s:领先 %d,落后 %d]"
2477
2478#: builtin/branch.c:448
2479#, c-format
2480msgid "[ahead %d, behind %d]"
2481msgstr "[领先 %d,落后 %d]"
2482
2483#: builtin/branch.c:470
2484msgid " **** invalid ref ****"
2485msgstr " **** 无效引用 ****"
2486
2487#: builtin/branch.c:562
2488#, c-format
2489msgid "(no branch, rebasing %s)"
2490msgstr "(非分支,正变基 %s)"
2491
2492#: builtin/branch.c:565
2493#, c-format
2494msgid "(no branch, bisect started on %s)"
2495msgstr "(非分支,二分查找开始于 %s)"
2496
2497#: builtin/branch.c:568
2498#, c-format
2499msgid "(detached from %s)"
2500msgstr "(分离自 %s)"
2501
2502#: builtin/branch.c:571
2503msgid "(no branch)"
2504msgstr "(非分支)"
2505
2506#: builtin/branch.c:617
2507#, c-format
2508msgid "object '%s' does not point to a commit"
2509msgstr "对象 '%s' 没有指向一个提交"
2510
2511#: builtin/branch.c:649
2512msgid "some refs could not be read"
2513msgstr "一些引用不能读取"
2514
2515#: builtin/branch.c:662
2516msgid "cannot rename the current branch while not on any."
2517msgstr "无法重命名当前分支因为不处于任何分支上。"
2518
2519#: builtin/branch.c:672
2520#, c-format
2521msgid "Invalid branch name: '%s'"
2522msgstr "无效的分支名:'%s'"
2523
2524#: builtin/branch.c:687
2525msgid "Branch rename failed"
2526msgstr "分支重命名失败"
2527
2528#: builtin/branch.c:691
2529#, c-format
2530msgid "Renamed a misnamed branch '%s' away"
2531msgstr "重命名掉一个错误命名的旧分支 '%s'"
2532
2533#: builtin/branch.c:695
2534#, c-format
2535msgid "Branch renamed to %s, but HEAD is not updated!"
2536msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2537
2538#: builtin/branch.c:702
2539msgid "Branch is renamed, but update of config-file failed"
2540msgstr "分支被重命名,但更新 config 文件失败"
2541
2542#: builtin/branch.c:717
2543#, c-format
2544msgid "malformed object name %s"
2545msgstr "非法的对象名 %s"
2546
2547#: builtin/branch.c:741
2548#, c-format
2549msgid "could not write branch description template: %s"
2550msgstr "不能写分支描述模版:%s"
2551
2552#: builtin/branch.c:771
2553msgid "Generic options"
2554msgstr "通用选项"
2555
2556#: builtin/branch.c:773
2557msgid "show hash and subject, give twice for upstream branch"
2558msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2559
2560#: builtin/branch.c:774
2561msgid "suppress informational messages"
2562msgstr "不显示信息"
2563
2564#: builtin/branch.c:775
2565msgid "set up tracking mode (see git-pull(1))"
2566msgstr "设置跟踪模式(参见 git-pull(1))"
2567
2568#: builtin/branch.c:777
2569msgid "change upstream info"
2570msgstr "改变上游信息"
2571
2572#: builtin/branch.c:781
2573msgid "use colored output"
2574msgstr "使用彩色输出"
2575
2576#: builtin/branch.c:782
2577msgid "act on remote-tracking branches"
2578msgstr "作用于远程跟踪分支"
2579
2580#: builtin/branch.c:785 builtin/branch.c:791 builtin/branch.c:812
2581#: builtin/branch.c:818 builtin/commit.c:1368 builtin/commit.c:1369
2582#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468
2583msgid "commit"
2584msgstr "提交"
2585
2586#: builtin/branch.c:786 builtin/branch.c:792
2587msgid "print only branches that contain the commit"
2588msgstr "只打印包含该提交的分支"
2589
2590#: builtin/branch.c:798
2591msgid "Specific git-branch actions:"
2592msgstr "具体的 git-branch 动作:"
2593
2594#: builtin/branch.c:799
2595msgid "list both remote-tracking and local branches"
2596msgstr "列出远程跟踪及本地分支"
2597
2598#: builtin/branch.c:801
2599msgid "delete fully merged branch"
2600msgstr "删除完全合并的分支"
2601
2602#: builtin/branch.c:802
2603msgid "delete branch (even if not merged)"
2604msgstr "删除分支(即使没有合并)"
2605
2606#: builtin/branch.c:803
2607msgid "move/rename a branch and its reflog"
2608msgstr "移动/重命名一个分支,以及它的引用日志"
2609
2610#: builtin/branch.c:804
2611msgid "move/rename a branch, even if target exists"
2612msgstr "移动/重命名一个分支,即使目标已存在"
2613
2614#: builtin/branch.c:805
2615msgid "list branch names"
2616msgstr "列出分支名"
2617
2618#: builtin/branch.c:806
2619msgid "create the branch's reflog"
2620msgstr "创建分支的引用日志"
2621
2622#: builtin/branch.c:808
2623msgid "edit the description for the branch"
2624msgstr "标记分支的描述"
2625
2626#: builtin/branch.c:809
2627msgid "force creation (when already exists)"
2628msgstr "强制创建(当已经存在)"
2629
2630#: builtin/branch.c:812
2631msgid "print only not merged branches"
2632msgstr "只打印没有合并的分支"
2633
2634#: builtin/branch.c:818
2635msgid "print only merged branches"
2636msgstr "只打印合并的分支"
2637
2638#: builtin/branch.c:822
2639msgid "list branches in columns"
2640msgstr "以列的方式显示分支"
2641
2642#: builtin/branch.c:835
2643msgid "Failed to resolve HEAD as a valid ref."
2644msgstr "无法将 HEAD 解析为有效引用。"
2645
2646#: builtin/branch.c:840 builtin/clone.c:609
2647msgid "HEAD not found below refs/heads!"
2648msgstr "HEAD 没有位于 /refs/heads 之下!"
2649
2650#: builtin/branch.c:863
2651msgid "--column and --verbose are incompatible"
2652msgstr "--column 和 --verbose 不兼容"
2653
2654#: builtin/branch.c:869 builtin/branch.c:908
2655msgid "branch name required"
2656msgstr "必须提供分支名"
2657
2658#: builtin/branch.c:884
2659msgid "Cannot give description to detached HEAD"
2660msgstr "不能向分离头指针提供描述"
2661
2662#: builtin/branch.c:889
2663msgid "cannot edit description of more than one branch"
2664msgstr "不能为一个以上的分支编辑描述"
2665
2666#: builtin/branch.c:896
2667#, c-format
2668msgid "No commit on branch '%s' yet."
2669msgstr "分支 '%s' 尚无提交。"
2670
2671#: builtin/branch.c:899
2672#, c-format
2673msgid "No branch named '%s'."
2674msgstr "没有分支 '%s'。"
2675
2676#: builtin/branch.c:914
2677msgid "too many branches for a rename operation"
2678msgstr "为重命名操作提供了太多的分支名"
2679
2680#: builtin/branch.c:919
2681msgid "too many branches to set new upstream"
2682msgstr "为设置新上游提供了太多的分支名"
2683
2684#: builtin/branch.c:923
2685#, c-format
2686msgid ""
2687"could not set upstream of HEAD to %s when it does not point to any branch."
2688msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
2689
2690#: builtin/branch.c:926 builtin/branch.c:948 builtin/branch.c:970
2691#, c-format
2692msgid "no such branch '%s'"
2693msgstr "没有此分支 '%s'"
2694
2695#: builtin/branch.c:930
2696#, c-format
2697msgid "branch '%s' does not exist"
2698msgstr "分支 '%s' 不存在"
2699
2700#: builtin/branch.c:942
2701msgid "too many branches to unset upstream"
2702msgstr "为取消上游设置操作提供了太多的分支名"
2703
2704#: builtin/branch.c:946
2705msgid "could not unset upstream of HEAD when it does not point to any branch."
2706msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
2707
2708#: builtin/branch.c:952
2709#, c-format
2710msgid "Branch '%s' has no upstream information"
2711msgstr "分支 '%s' 没有上游信息"
2712
2713#: builtin/branch.c:967
2714msgid "it does not make sense to create 'HEAD' manually"
2715msgstr "手工创建 'HEAD' 没有意义"
2716
2717#: builtin/branch.c:973
2718msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2719msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2720
2721#: builtin/branch.c:976
2722#, c-format
2723msgid ""
2724"The --set-upstream flag is deprecated and will be removed. Consider using --"
2725"track or --set-upstream-to\n"
2726msgstr ""
2727"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
2728
2729#: builtin/branch.c:993
2730#, c-format
2731msgid ""
2732"\n"
2733"If you wanted to make '%s' track '%s', do this:\n"
2734"\n"
2735msgstr ""
2736"\n"
2737"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
2738"\n"
2739
2740#: builtin/branch.c:994
2741#, c-format
2742msgid " git branch -d %s\n"
2743msgstr " git branch -d %s\n"
2744
2745#: builtin/branch.c:995
2746#, c-format
2747msgid " git branch --set-upstream-to %s\n"
2748msgstr " git branch --set-upstream-to %s\n"
2749
2750#: builtin/bundle.c:47
2751#, c-format
2752msgid "%s is okay\n"
2753msgstr "%s 可以\n"
2754
2755#: builtin/bundle.c:56
2756msgid "Need a repository to create a bundle."
2757msgstr "需要一个版本库来创建包。"
2758
2759#: builtin/bundle.c:60
2760msgid "Need a repository to unbundle."
2761msgstr "需要一个版本库来解包。"
2762
2763#: builtin/cat-file.c:247
2764msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2765msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
2766
2767#: builtin/cat-file.c:248
2768msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2769msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
2770
2771#: builtin/cat-file.c:266
2772msgid "<type> can be one of: blob, tree, commit, tag"
2773msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
2774
2775#: builtin/cat-file.c:267
2776msgid "show object type"
2777msgstr "显示对象类型"
2778
2779#: builtin/cat-file.c:268
2780msgid "show object size"
2781msgstr "显示对象大小"
2782
2783#: builtin/cat-file.c:270
2784msgid "exit with zero when there's no error"
2785msgstr "当没有错误时退出并返回零"
2786
2787#: builtin/cat-file.c:271
2788msgid "pretty-print object's content"
2789msgstr "美观地打印对象的内容"
2790
2791#: builtin/cat-file.c:273
2792msgid "for blob objects, run textconv on object's content"
2793msgstr "对于数据(blob)对象,对其内容执行 textconv"
2794
2795#: builtin/cat-file.c:275
2796msgid "show info and content of objects fed from the standard input"
2797msgstr "显示从标准输入提供的对象的信息和内容"
2798
2799#: builtin/cat-file.c:278
2800msgid "show info about objects fed from the standard input"
2801msgstr "显示从标准输入提供的对象的信息"
2802
2803#: builtin/check-attr.c:11
2804msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2805msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
2806
2807#: builtin/check-attr.c:12
2808msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2809msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
2810
2811#: builtin/check-attr.c:19
2812msgid "report all attributes set on file"
2813msgstr "报告设置在文件上的所有属性"
2814
2815#: builtin/check-attr.c:20
2816msgid "use .gitattributes only from the index"
2817msgstr "只使用索引中的 .gitattributes"
2818
2819#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
2820msgid "read file names from stdin"
2821msgstr "从标准输入读出文件名"
2822
2823#: builtin/check-attr.c:23 builtin/check-ignore.c:24
2824msgid "input paths are terminated by a null character"
2825msgstr "输入路径以null字符终止"
2826
2827#: builtin/check-ignore.c:18 builtin/checkout.c:1041 builtin/gc.c:177
2828msgid "suppress progress reporting"
2829msgstr "不显示进度报告"
2830
2831#: builtin/check-ignore.c:151
2832msgid "cannot specify pathnames with --stdin"
2833msgstr "不能同时提供路径及 --stdin 参数"
2834
2835#: builtin/check-ignore.c:154
2836msgid "-z only makes sense with --stdin"
2837msgstr "-z 需要和 --stdin 参数共用才有意义"
2838
2839#: builtin/check-ignore.c:156
2840msgid "no path specified"
2841msgstr "未指定路径"
2842
2843#: builtin/check-ignore.c:160
2844msgid "--quiet is only valid with a single pathname"
2845msgstr "参数 --quiet 只在提供一个路径名时有效"
2846
2847#: builtin/check-ignore.c:162
2848msgid "cannot have both --quiet and --verbose"
2849msgstr "不能同时提供 --quiet 和 --verbose 参数"
2850
2851#: builtin/checkout-index.c:126
2852msgid "git checkout-index [options] [--] [<file>...]"
2853msgstr "git checkout-index [选项] [--] [<文件>...]"
2854
2855#: builtin/checkout-index.c:187
2856msgid "check out all files in the index"
2857msgstr "检出索引区的所有文件"
2858
2859#: builtin/checkout-index.c:188
2860msgid "force overwrite of existing files"
2861msgstr "强制覆盖现有的文件"
2862
2863#: builtin/checkout-index.c:190
2864msgid "no warning for existing files and files not in index"
2865msgstr "存在或不在索引中的文件都没有警告"
2866
2867#: builtin/checkout-index.c:192
2868msgid "don't checkout new files"
2869msgstr "不检出新文件"
2870
2871#: builtin/checkout-index.c:194
2872msgid "update stat information in the index file"
2873msgstr "更新索引中文件的状态信息"
2874
2875#: builtin/checkout-index.c:200
2876msgid "read list of paths from the standard input"
2877msgstr "从标准输入读取路径列表"
2878
2879#: builtin/checkout-index.c:202
2880msgid "write the content to temporary files"
2881msgstr "将内容写入临时文件"
2882
2883#: builtin/checkout-index.c:203 builtin/column.c:30
2884msgid "string"
2885msgstr "字符串"
2886
2887#: builtin/checkout-index.c:204
2888msgid "when creating files, prepend <string>"
2889msgstr "在创建文件时,在前面加上<字符串>"
2890
2891#: builtin/checkout-index.c:207
2892msgid "copy out the files from named stage"
2893msgstr "从指定暂存区中拷出文件"
2894
2895#: builtin/checkout.c:25
2896msgid "git checkout [options] <branch>"
2897msgstr "git checkout [选项] <分支>"
2898
2899#: builtin/checkout.c:26
2900msgid "git checkout [options] [<branch>] -- <file>..."
2901msgstr "git checkout [选项] [<分支>] -- <文件>..."
2902
2903#: builtin/checkout.c:116 builtin/checkout.c:149
2904#, c-format
2905msgid "path '%s' does not have our version"
2906msgstr "路径 '%s' 没有我们的版本"
2907
2908#: builtin/checkout.c:118 builtin/checkout.c:151
2909#, c-format
2910msgid "path '%s' does not have their version"
2911msgstr "路径 '%s' 没有他们的版本"
2912
2913#: builtin/checkout.c:134
2914#, c-format
2915msgid "path '%s' does not have all necessary versions"
2916msgstr "路径 '%s' 没有全部必须的版本"
2917
2918#: builtin/checkout.c:178
2919#, c-format
2920msgid "path '%s' does not have necessary versions"
2921msgstr "路径 '%s' 没有必须的版本"
2922
2923#: builtin/checkout.c:195
2924#, c-format
2925msgid "path '%s': cannot merge"
2926msgstr "path '%s':无法合并"
2927
2928#: builtin/checkout.c:212
2929#, c-format
2930msgid "Unable to add merge result for '%s'"
2931msgstr "无法为 '%s' 添加合并结果"
2932
2933#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2934#: builtin/checkout.c:245
2935#, c-format
2936msgid "'%s' cannot be used with updating paths"
2937msgstr "'%s' 不能在更新路径时使用"
2938
2939#: builtin/checkout.c:248 builtin/checkout.c:251
2940#, c-format
2941msgid "'%s' cannot be used with %s"
2942msgstr "'%s' 不能和 %s 同时使用"
2943
2944#: builtin/checkout.c:254
2945#, c-format
2946msgid "Cannot update paths and switch to branch '%s' at the same time."
2947msgstr "不能同时更新路径并切换到分支'%s'。"
2948
2949#: builtin/checkout.c:265 builtin/checkout.c:455
2950msgid "corrupt index file"
2951msgstr "损坏的索引文件"
2952
2953#: builtin/checkout.c:326 builtin/checkout.c:333
2954#, c-format
2955msgid "path '%s' is unmerged"
2956msgstr "路径 '%s' 未合并"
2957
2958#: builtin/checkout.c:477
2959msgid "you need to resolve your current index first"
2960msgstr "您需要先解决当前索引的冲突"
2961
2962#: builtin/checkout.c:598
2963#, c-format
2964msgid "Can not do reflog for '%s'\n"
2965msgstr "不能对 '%s' 执行 reflog 操作\n"
2966
2967#: builtin/checkout.c:631
2968msgid "HEAD is now at"
2969msgstr "HEAD 目前位于"
2970
2971#: builtin/checkout.c:638
2972#, c-format
2973msgid "Reset branch '%s'\n"
2974msgstr "重置分支 '%s'\n"
2975
2976#: builtin/checkout.c:641
2977#, c-format
2978msgid "Already on '%s'\n"
2979msgstr "已经位于 '%s'\n"
2980
2981#: builtin/checkout.c:645
2982#, c-format
2983msgid "Switched to and reset branch '%s'\n"
2984msgstr "切换并重置分支 '%s'\n"
2985
2986#: builtin/checkout.c:647 builtin/checkout.c:984
2987#, c-format
2988msgid "Switched to a new branch '%s'\n"
2989msgstr "切换到一个新分支 '%s'\n"
2990
2991#: builtin/checkout.c:649
2992#, c-format
2993msgid "Switched to branch '%s'\n"
2994msgstr "切换到分支 '%s'\n"
2995
2996# 译者:注意保持前导空格
2997#: builtin/checkout.c:705
2998#, c-format
2999msgid " ... and %d more.\n"
3000msgstr " ... 及其它 %d 个。\n"
3001
3002#. The singular version
3003#: builtin/checkout.c:711
3004#, c-format
3005msgid ""
3006"Warning: you are leaving %d commit behind, not connected to\n"
3007"any of your branches:\n"
3008"\n"
3009"%s\n"
3010msgid_plural ""
3011"Warning: you are leaving %d commits behind, not connected to\n"
3012"any of your branches:\n"
3013"\n"
3014"%s\n"
3015msgstr[0] ""
3016"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3017"\n"
3018"%s\n"
3019msgstr[1] ""
3020"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3021"\n"
3022"%s\n"
3023
3024#: builtin/checkout.c:729
3025#, c-format
3026msgid ""
3027"If you want to keep them by creating a new branch, this may be a good time\n"
3028"to do so with:\n"
3029"\n"
3030" git branch new_branch_name %s\n"
3031"\n"
3032msgstr ""
3033"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3034"如下操作:\n"
3035"\n"
3036" git branch new_branch_name %s\n"
3037"\n"
3038
3039#: builtin/checkout.c:759
3040msgid "internal error in revision walk"
3041msgstr "在版本遍历时遇到内部错误"
3042
3043#: builtin/checkout.c:763
3044msgid "Previous HEAD position was"
3045msgstr "之前的 HEAD 位置是"
3046
3047#: builtin/checkout.c:790 builtin/checkout.c:979
3048msgid "You are on a branch yet to be born"
3049msgstr "您位于一个尚未初始化的分支"
3050
3051#. case (1)
3052#: builtin/checkout.c:915
3053#, c-format
3054msgid "invalid reference: %s"
3055msgstr "无效引用:%s"
3056
3057#. case (1): want a tree
3058#: builtin/checkout.c:954
3059#, c-format
3060msgid "reference is not a tree: %s"
3061msgstr "引用不是一个树:%s"
3062
3063#: builtin/checkout.c:993
3064msgid "paths cannot be used with switching branches"
3065msgstr "路径不能和切换分支同时使用"
3066
3067#: builtin/checkout.c:996 builtin/checkout.c:1000
3068#, c-format
3069msgid "'%s' cannot be used with switching branches"
3070msgstr "'%s' 不能和切换分支同时使用"
3071
3072#: builtin/checkout.c:1004 builtin/checkout.c:1007 builtin/checkout.c:1012
3073#: builtin/checkout.c:1015
3074#, c-format
3075msgid "'%s' cannot be used with '%s'"
3076msgstr "'%s' 不能和 '%s' 同时使用"
3077
3078#: builtin/checkout.c:1020
3079#, c-format
3080msgid "Cannot switch branch to a non-commit '%s'"
3081msgstr "不能切换分支到一个非提交 '%s'"
3082
3083#: builtin/checkout.c:1042 builtin/checkout.c:1044 builtin/clone.c:90
3084#: builtin/remote.c:169 builtin/remote.c:171
3085msgid "branch"
3086msgstr "分支"
3087
3088#: builtin/checkout.c:1043
3089msgid "create and checkout a new branch"
3090msgstr "创建并检出一个新的分支"
3091
3092#: builtin/checkout.c:1045
3093msgid "create/reset and checkout a branch"
3094msgstr "创建/重置并检出一个分支"
3095
3096#: builtin/checkout.c:1046
3097msgid "create reflog for new branch"
3098msgstr "为新的分支创建引用日志"
3099
3100#: builtin/checkout.c:1047
3101msgid "detach the HEAD at named commit"
3102msgstr "成为指向该提交的分离头指针"
3103
3104#: builtin/checkout.c:1048
3105msgid "set upstream info for new branch"
3106msgstr "为新的分支设置上游信息"
3107
3108#: builtin/checkout.c:1050
3109msgid "new branch"
3110msgstr "新分支"
3111
3112#: builtin/checkout.c:1050
3113msgid "new unparented branch"
3114msgstr "新的没有父提交的分支"
3115
3116#: builtin/checkout.c:1051
3117msgid "checkout our version for unmerged files"
3118msgstr "对尚未合并的文件检出我们的版本"
3119
3120#: builtin/checkout.c:1053
3121msgid "checkout their version for unmerged files"
3122msgstr "对尚未合并的文件检出他们的版本"
3123
3124#: builtin/checkout.c:1055
3125msgid "force checkout (throw away local modifications)"
3126msgstr "强制检出(丢弃本地修改)"
3127
3128#: builtin/checkout.c:1056
3129msgid "perform a 3-way merge with the new branch"
3130msgstr "和新的分支执行三路合并"
3131
3132#: builtin/checkout.c:1057 builtin/merge.c:217
3133msgid "update ignored files (default)"
3134msgstr "更新忽略的文件(默认)"
3135
3136#: builtin/checkout.c:1058 builtin/log.c:1149 parse-options.h:245
3137msgid "style"
3138msgstr "风格"
3139
3140#: builtin/checkout.c:1059
3141msgid "conflict style (merge or diff3)"
3142msgstr "冲突输出风格(merge 或 diff3)"
3143
3144#: builtin/checkout.c:1062
3145msgid "second guess 'git checkout no-such-branch'"
3146msgstr "再者猜测'git checkout no-such-branch'"
3147
3148#: builtin/checkout.c:1086
3149msgid "-b, -B and --orphan are mutually exclusive"
3150msgstr "-b、-B 和 --orphan 是互斥的"
3151
3152#: builtin/checkout.c:1103
3153msgid "--track needs a branch name"
3154msgstr "--track 需要一个分支名"
3155
3156#: builtin/checkout.c:1110
3157msgid "Missing branch name; try -b"
3158msgstr "缺少分支名;尝试 -b"
3159
3160#: builtin/checkout.c:1145
3161msgid "invalid path specification"
3162msgstr "无效的路径规格"
3163
3164#: builtin/checkout.c:1152
3165#, c-format
3166msgid ""
3167"Cannot update paths and switch to branch '%s' at the same time.\n"
3168"Did you intend to checkout '%s' which can not be resolved as commit?"
3169msgstr ""
3170"不能同时更新路径并切换到分支'%s'。\n"
3171"您是想要检出 '%s' 但其未能解析为提交么?"
3172
3173#: builtin/checkout.c:1157
3174#, c-format
3175msgid "git checkout: --detach does not take a path argument '%s'"
3176msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3177
3178#: builtin/checkout.c:1161
3179msgid ""
3180"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3181"checking out of the index."
3182msgstr ""
3183"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3184
3185#: builtin/clean.c:20
3186msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3187msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3188
3189#: builtin/clean.c:24
3190#, c-format
3191msgid "Removing %s\n"
3192msgstr "正删除 %s\n"
3193
3194#: builtin/clean.c:25
3195#, c-format
3196msgid "Would remove %s\n"
3197msgstr "将删除 %s\n"
3198
3199#: builtin/clean.c:26
3200#, c-format
3201msgid "Skipping repository %s\n"
3202msgstr "忽略版本库 %s\n"
3203
3204#: builtin/clean.c:27
3205#, c-format
3206msgid "Would skip repository %s\n"
3207msgstr "将忽略版本库 %s\n"
3208
3209#: builtin/clean.c:28
3210#, c-format
3211msgid "failed to remove %s"
3212msgstr "无法删除 %s"
3213
3214#: builtin/clean.c:160
3215msgid "do not print names of files removed"
3216msgstr "不打印删除文件的名称"
3217
3218#: builtin/clean.c:162
3219msgid "force"
3220msgstr "强制"
3221
3222#: builtin/clean.c:164
3223msgid "remove whole directories"
3224msgstr "删除整个目录"
3225
3226#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717
3227#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182
3228msgid "pattern"
3229msgstr "模式"
3230
3231#: builtin/clean.c:166
3232msgid "add <pattern> to ignore rules"
3233msgstr "添加<模式>到忽略规则"
3234
3235#: builtin/clean.c:167
3236msgid "remove ignored files, too"
3237msgstr "也删除忽略的文件"
3238
3239#: builtin/clean.c:169
3240msgid "remove only ignored files"
3241msgstr "只删除忽略的文件"
3242
3243#: builtin/clean.c:187
3244msgid "-x and -X cannot be used together"
3245msgstr "-x 和 -X 不能同时使用"
3246
3247#: builtin/clean.c:191
3248msgid ""
3249"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
3250msgstr ""
3251"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3252
3253#: builtin/clean.c:194
3254msgid ""
3255"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
3256"clean"
3257msgstr ""
3258"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3259
3260#: builtin/clone.c:37
3261msgid "git clone [options] [--] <repo> [<dir>]"
3262msgstr "git clone [选项] [--] <版本库> [<路径>]"
3263
3264#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214
3265#: builtin/push.c:436
3266msgid "force progress reporting"
3267msgstr "强制显示进度报告"
3268
3269#: builtin/clone.c:67
3270msgid "don't create a checkout"
3271msgstr "不创建一个检出"
3272
3273#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488
3274msgid "create a bare repository"
3275msgstr "创建一个裸版本库"
3276
3277#: builtin/clone.c:73
3278msgid "create a mirror repository (implies bare)"
3279msgstr "创建一个镜像版本库(也是裸版本库)"
3280
3281#: builtin/clone.c:75
3282msgid "to clone from a local repository"
3283msgstr "从本地版本库克隆"
3284
3285#: builtin/clone.c:77
3286msgid "don't use local hardlinks, always copy"
3287msgstr "不使用本地硬链接,始终复制"
3288
3289#: builtin/clone.c:79
3290msgid "setup as shared repository"
3291msgstr "设置为共享版本库"
3292
3293#: builtin/clone.c:81 builtin/clone.c:83
3294msgid "initialize submodules in the clone"
3295msgstr "在克隆时初始化子模组"
3296
3297#: builtin/clone.c:84 builtin/init-db.c:485
3298msgid "template-directory"
3299msgstr "模板目录"
3300
3301#: builtin/clone.c:85 builtin/init-db.c:486
3302msgid "directory from which templates will be used"
3303msgstr "模板目录将被使用"
3304
3305#: builtin/clone.c:87
3306msgid "reference repository"
3307msgstr "引用版本库"
3308
3309#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
3310msgid "name"
3311msgstr "名称"
3312
3313#: builtin/clone.c:89
3314msgid "use <name> instead of 'origin' to track upstream"
3315msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3316
3317#: builtin/clone.c:91
3318msgid "checkout <branch> instead of the remote's HEAD"
3319msgstr "检出<分支>而不是远程HEAD"
3320
3321#: builtin/clone.c:93
3322msgid "path to git-upload-pack on the remote"
3323msgstr "远程 git-upload-pack 路径"
3324
3325#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662
3326msgid "depth"
3327msgstr "深度"
3328
3329#: builtin/clone.c:95
3330msgid "create a shallow clone of that depth"
3331msgstr "创建一个指定深度的浅克隆"
3332
3333#: builtin/clone.c:97
3334msgid "clone only one branch, HEAD or --branch"
3335msgstr "只克隆一个分支、HEAD 或 --branch"
3336
3337#: builtin/clone.c:98 builtin/init-db.c:494
3338msgid "gitdir"
3339msgstr "git目录"
3340
3341#: builtin/clone.c:99 builtin/init-db.c:495
3342msgid "separate git dir from working tree"
3343msgstr "git目录和工作区分离"
3344
3345#: builtin/clone.c:100
3346msgid "key=value"
3347msgstr "key=value"
3348
3349#: builtin/clone.c:101
3350msgid "set config inside the new repository"
3351msgstr "在新版本库中设置配置信息"
3352
3353#: builtin/clone.c:244
3354#, c-format
3355msgid "reference repository '%s' is not a local directory."
3356msgstr "引用版本库 '%s' 不是一个本地目录。"
3357
3358#: builtin/clone.c:307
3359#, c-format
3360msgid "failed to create directory '%s'"
3361msgstr "无法创建目录 '%s'"
3362
3363#: builtin/clone.c:309 builtin/diff.c:77
3364#, c-format
3365msgid "failed to stat '%s'"
3366msgstr "无法枚举 '%s' 状态"
3367
3368#: builtin/clone.c:311
3369#, c-format
3370msgid "%s exists and is not a directory"
3371msgstr "%s 存在且不是一个目录"
3372
3373#: builtin/clone.c:325
3374#, c-format
3375msgid "failed to stat %s\n"
3376msgstr "无法枚举 %s 状态\n"
3377
3378#: builtin/clone.c:347
3379#, c-format
3380msgid "failed to create link '%s'"
3381msgstr "无法创建链接 '%s'"
3382
3383#: builtin/clone.c:351
3384#, c-format
3385msgid "failed to copy file to '%s'"
3386msgstr "无法拷贝文件至 '%s'"
3387
3388#: builtin/clone.c:374
3389#, c-format
3390msgid "done.\n"
3391msgstr "完成。\n"
3392
3393#: builtin/clone.c:387
3394msgid ""
3395"Clone succeeded, but checkout failed.\n"
3396"You can inspect what was checked out with 'git status'\n"
3397"and retry the checkout with 'git checkout -f HEAD'\n"
3398msgstr ""
3399"克隆成功,但是检出失败。\n"
3400"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3401"'git checkout -f HEAD' 重试\n"
3402
3403#: builtin/clone.c:466
3404#, c-format
3405msgid "Could not find remote branch %s to clone."
3406msgstr "不能发现要克隆的远程分支 %s。"
3407
3408#: builtin/clone.c:540
3409msgid "remote did not send all necessary objects"
3410msgstr "远程没有发送所有必须的对象"
3411
3412#: builtin/clone.c:600
3413msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3414msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3415
3416#: builtin/clone.c:631
3417msgid "unable to checkout working tree"
3418msgstr "不能检出工作区"
3419
3420#: builtin/clone.c:739
3421msgid "Too many arguments."
3422msgstr "太多参数。"
3423
3424#: builtin/clone.c:743
3425msgid "You must specify a repository to clone."
3426msgstr "您必须指定一个版本库来克隆。"
3427
3428#: builtin/clone.c:754
3429#, c-format
3430msgid "--bare and --origin %s options are incompatible."
3431msgstr "--bare 和 --origin %s 选项不兼容。"
3432
3433#: builtin/clone.c:757
3434msgid "--bare and --separate-git-dir are incompatible."
3435msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3436
3437#: builtin/clone.c:770
3438#, c-format
3439msgid "repository '%s' does not exist"
3440msgstr "版本库 '%s' 不存在"
3441
3442#: builtin/clone.c:775
3443msgid "--depth is ignored in local clones; use file:// instead."
3444msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3445
3446#: builtin/clone.c:785
3447#, c-format
3448msgid "destination path '%s' already exists and is not an empty directory."
3449msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
3450
3451#: builtin/clone.c:795
3452#, c-format
3453msgid "working tree '%s' already exists."
3454msgstr "工作区 '%s' 已经存在。"
3455
3456#: builtin/clone.c:808 builtin/clone.c:820
3457#, c-format
3458msgid "could not create leading directories of '%s'"
3459msgstr "不能为 '%s' 创建先导目录"
3460
3461#: builtin/clone.c:811
3462#, c-format
3463msgid "could not create work tree dir '%s'."
3464msgstr "不能为 '%s' 创建工作区目录。"
3465
3466#: builtin/clone.c:830
3467#, c-format
3468msgid "Cloning into bare repository '%s'...\n"
3469msgstr "克隆到裸版本库 '%s'...\n"
3470
3471#: builtin/clone.c:832
3472#, c-format
3473msgid "Cloning into '%s'...\n"
3474msgstr "正克隆到 '%s'...\n"
3475
3476#: builtin/clone.c:867
3477#, c-format
3478msgid "Don't know how to clone %s"
3479msgstr "不知道如何克隆 %s"
3480
3481#: builtin/clone.c:916
3482#, c-format
3483msgid "Remote branch %s not found in upstream %s"
3484msgstr "远程分支 %s 在上游 %s 未发现"
3485
3486#: builtin/clone.c:923
3487msgid "You appear to have cloned an empty repository."
3488msgstr "您似乎克隆了一个空版本库。"
3489
3490#: builtin/column.c:9
3491msgid "git column [options]"
3492msgstr "git column [选项]"
3493
3494#: builtin/column.c:26
3495msgid "lookup config vars"
3496msgstr "查找配置变量"
3497
3498#: builtin/column.c:27 builtin/column.c:28
3499msgid "layout to use"
3500msgstr "要使用的布局"
3501
3502#: builtin/column.c:29
3503msgid "Maximum width"
3504msgstr "最大宽度"
3505
3506#: builtin/column.c:30
3507msgid "Padding space on left border"
3508msgstr "左边框的填充空间"
3509
3510#: builtin/column.c:31
3511msgid "Padding space on right border"
3512msgstr "右边框的填充空间"
3513
3514#: builtin/column.c:32
3515msgid "Padding space between columns"
3516msgstr "两列之间的填充空间"
3517
3518#: builtin/column.c:51
3519msgid "--command must be the first argument"
3520msgstr "--command 必须是第一个参数"
3521
3522#: builtin/commit.c:34
3523msgid "git commit [options] [--] <pathspec>..."
3524msgstr "git commit [选项] [--] <路径匹配>..."
3525
3526#: builtin/commit.c:39
3527msgid "git status [options] [--] <pathspec>..."
3528msgstr "git status [选项] [--] <路径匹配>..."
3529
3530#: builtin/commit.c:44
3531msgid ""
3532"Your name and email address were configured automatically based\n"
3533"on your username and hostname. Please check that they are accurate.\n"
3534"You can suppress this message by setting them explicitly:\n"
3535"\n"
3536" git config --global user.name \"Your Name\"\n"
3537" git config --global user.email you@example.com\n"
3538"\n"
3539"After doing this, you may fix the identity used for this commit with:\n"
3540"\n"
3541" git commit --amend --reset-author\n"
3542msgstr ""
3543"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3544"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
3545"\n"
3546" git config --global user.name \"Your Name\"\n"
3547" git config --global user.email you@example.com\n"
3548"\n"
3549"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
3550"\n"
3551" git commit --amend --reset-author\n"
3552
3553#: builtin/commit.c:56
3554msgid ""
3555"You asked to amend the most recent commit, but doing so would make\n"
3556"it empty. You can repeat your command with --allow-empty, or you can\n"
3557"remove the commit entirely with \"git reset HEAD^\".\n"
3558msgstr ""
3559"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
3560"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
3561
3562#: builtin/commit.c:61
3563msgid ""
3564"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3565"If you wish to commit it anyway, use:\n"
3566"\n"
3567" git commit --allow-empty\n"
3568"\n"
3569"Otherwise, please use 'git reset'\n"
3570msgstr ""
3571"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
3572"也要提交,使用命令:\n"
3573"\n"
3574" git commit --allow-empty\n"
3575"\n"
3576"否则,请使用命令 'git reset'\n"
3577
3578#: builtin/commit.c:260
3579msgid "failed to unpack HEAD tree object"
3580msgstr "无法解包 HEAD 树对象"
3581
3582#: builtin/commit.c:302
3583msgid "unable to create temporary index"
3584msgstr "不能创建临时索引"
3585
3586#: builtin/commit.c:308
3587msgid "interactive add failed"
3588msgstr "交互式添加失败"
3589
3590#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412
3591msgid "unable to write new_index file"
3592msgstr "无法写 new_index 文件"
3593
3594#: builtin/commit.c:393
3595msgid "cannot do a partial commit during a merge."
3596msgstr "在合并过程中不能做部分提交。"
3597
3598#: builtin/commit.c:395
3599msgid "cannot do a partial commit during a cherry-pick."
3600msgstr "在拣选过程中不能做部分提交。"
3601
3602#: builtin/commit.c:405
3603msgid "cannot read the index"
3604msgstr "无法读取索引"
3605
3606#: builtin/commit.c:425
3607msgid "unable to write temporary index file"
3608msgstr "无法写临时索引文件"
3609
3610#: builtin/commit.c:513 builtin/commit.c:519
3611#, c-format
3612msgid "invalid commit: %s"
3613msgstr "无效的提交:%s"
3614
3615#: builtin/commit.c:542
3616msgid "malformed --author parameter"
3617msgstr "非法的 --author 参数"
3618
3619#: builtin/commit.c:562
3620#, c-format
3621msgid "Malformed ident string: '%s'"
3622msgstr "非法的身份字符串:'%s'"
3623
3624#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956
3625#, c-format
3626msgid "could not lookup commit %s"
3627msgstr "不能查询提交 %s"
3628
3629#: builtin/commit.c:612 builtin/shortlog.c:272
3630#, c-format
3631msgid "(reading log message from standard input)\n"
3632msgstr "(正从标准输入中读取日志信息)\n"
3633
3634#: builtin/commit.c:614
3635msgid "could not read log from standard input"
3636msgstr "不能从标准输入中读取日志信息"
3637
3638#: builtin/commit.c:618
3639#, c-format
3640msgid "could not read log file '%s'"
3641msgstr "不能读取日志文件 '%s'"
3642
3643#: builtin/commit.c:624
3644msgid "commit has empty message"
3645msgstr "提交说明为空"
3646
3647#: builtin/commit.c:640
3648msgid "could not read MERGE_MSG"
3649msgstr "不能读取 MERGE_MSG"
3650
3651#: builtin/commit.c:644
3652msgid "could not read SQUASH_MSG"
3653msgstr "不能读取 SQUASH_MSG"
3654
3655#: builtin/commit.c:648
3656#, c-format
3657msgid "could not read '%s'"
3658msgstr "不能读取 '%s'"
3659
3660#: builtin/commit.c:709
3661msgid "could not write commit template"
3662msgstr "不能写提交模版"
3663
3664#: builtin/commit.c:720
3665#, c-format
3666msgid ""
3667"\n"
3668"It looks like you may be committing a merge.\n"
3669"If this is not correct, please remove the file\n"
3670"\t%s\n"
3671"and try again.\n"
3672msgstr ""
3673"\n"
3674"似乎您正在做一个合并提交。如果不对,请删除文件\n"
3675"\t%s\n"
3676"然后重试。\n"
3677
3678#: builtin/commit.c:725
3679#, c-format
3680msgid ""
3681"\n"
3682"It looks like you may be committing a cherry-pick.\n"
3683"If this is not correct, please remove the file\n"
3684"\t%s\n"
3685"and try again.\n"
3686msgstr ""
3687"\n"
3688"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
3689"\t%s\n"
3690"然后重试。\n"
3691
3692#: builtin/commit.c:737
3693#, c-format
3694msgid ""
3695"Please enter the commit message for your changes. Lines starting\n"
3696"with '%c' will be ignored, and an empty message aborts the commit.\n"
3697msgstr ""
3698"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
3699"说明将会终止提交。\n"
3700
3701#: builtin/commit.c:742
3702#, c-format
3703msgid ""
3704"Please enter the commit message for your changes. Lines starting\n"
3705"with '%c' will be kept; you may remove them yourself if you want to.\n"
3706"An empty message aborts the commit.\n"
3707msgstr ""
3708"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
3709"也可以删除它们。一个空的提交说明将会终止提交。\n"
3710
3711# 译者:为保证在输出中对齐,注意调整句中空格!
3712#: builtin/commit.c:755
3713#, c-format
3714msgid "%sAuthor: %s"
3715msgstr "%s作者: %s"
3716
3717# 译者:为保证在输出中对齐,注意调整句中空格!
3718#: builtin/commit.c:762
3719#, c-format
3720msgid "%sCommitter: %s"
3721msgstr "%s提交者: %s"
3722
3723#: builtin/commit.c:782
3724msgid "Cannot read index"
3725msgstr "无法读取索引"
3726
3727#: builtin/commit.c:819
3728msgid "Error building trees"
3729msgstr "无法创建树对象"
3730
3731#: builtin/commit.c:834 builtin/tag.c:359
3732#, c-format
3733msgid "Please supply the message using either -m or -F option.\n"
3734msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
3735
3736#: builtin/commit.c:931
3737#, c-format
3738msgid "No existing author found with '%s'"
3739msgstr "没有找到匹配 '%s' 的作者"
3740
3741#: builtin/commit.c:946 builtin/commit.c:1140
3742#, c-format
3743msgid "Invalid untracked files mode '%s'"
3744msgstr "无效的未追踪文件参数 '%s'"
3745
3746#: builtin/commit.c:976
3747msgid "Using both --reset-author and --author does not make sense"
3748msgstr "同时使用 --reset-author 和 --author 没有意义"
3749
3750#: builtin/commit.c:987
3751msgid "You have nothing to amend."
3752msgstr "您没有可修补的提交。"
3753
3754#: builtin/commit.c:990
3755msgid "You are in the middle of a merge -- cannot amend."
3756msgstr "您正处于一个合并过程中 -- 无法修补提交。"
3757
3758#: builtin/commit.c:992
3759msgid "You are in the middle of a cherry-pick -- cannot amend."
3760msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
3761
3762#: builtin/commit.c:995
3763msgid "Options --squash and --fixup cannot be used together"
3764msgstr "选项 --squash 和 --fixup 不能同时使用"
3765
3766#: builtin/commit.c:1005
3767msgid "Only one of -c/-C/-F/--fixup can be used."
3768msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
3769
3770#: builtin/commit.c:1007
3771msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3772msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
3773
3774#: builtin/commit.c:1015
3775msgid "--reset-author can be used only with -C, -c or --amend."
3776msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
3777
3778#: builtin/commit.c:1032
3779msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3780msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
3781
3782#: builtin/commit.c:1034
3783msgid "No paths with --include/--only does not make sense."
3784msgstr "参数 --include/--only 不跟路径没有意义。"
3785
3786#: builtin/commit.c:1036
3787msgid "Clever... amending the last one with dirty index."
3788msgstr "聪明... 在索引不干净下修补最后的提交。"
3789
3790#: builtin/commit.c:1038
3791msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3792msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
3793
3794#: builtin/commit.c:1048 builtin/tag.c:575
3795#, c-format
3796msgid "Invalid cleanup mode %s"
3797msgstr "无效的清理模式 %s"
3798
3799#: builtin/commit.c:1053
3800msgid "Paths with -a does not make sense."
3801msgstr "路径和 -a 选项同时使用没有意义。"
3802
3803#: builtin/commit.c:1059 builtin/commit.c:1194
3804msgid "--long and -z are incompatible"
3805msgstr "--long 和 -z 选项不兼容"
3806
3807#: builtin/commit.c:1154 builtin/commit.c:1390
3808msgid "show status concisely"
3809msgstr "以简洁的格式显示状态"
3810
3811#: builtin/commit.c:1156 builtin/commit.c:1392
3812msgid "show branch information"
3813msgstr "显示分支信息"
3814
3815#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426
3816msgid "machine-readable output"
3817msgstr "机器可读的输出"
3818
3819#: builtin/commit.c:1161 builtin/commit.c:1396
3820msgid "show status in long format (default)"
3821msgstr "以长格式显示状态(默认)"
3822
3823#: builtin/commit.c:1164 builtin/commit.c:1399
3824msgid "terminate entries with NUL"
3825msgstr "条目以NUL字符结尾"
3826
3827#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:653
3828#: builtin/fast-export.c:656 builtin/tag.c:459
3829msgid "mode"
3830msgstr "模式"
3831
3832#: builtin/commit.c:1167 builtin/commit.c:1402
3833msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3834msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
3835
3836#: builtin/commit.c:1170
3837msgid "show ignored files"
3838msgstr "显示忽略的文件"
3839
3840#: builtin/commit.c:1171 parse-options.h:151
3841msgid "when"
3842msgstr "何时"
3843
3844#: builtin/commit.c:1172
3845msgid ""
3846"ignore changes to submodules, optional when: all, dirty, untracked. "
3847"(Default: all)"
3848msgstr ""
3849"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
3850
3851#: builtin/commit.c:1174
3852msgid "list untracked files in columns"
3853msgstr "以列的方式显示未跟踪的文件"
3854
3855#: builtin/commit.c:1248
3856msgid "couldn't look up newly created commit"
3857msgstr "无法找到新创建的提交"
3858
3859#: builtin/commit.c:1250
3860msgid "could not parse newly created commit"
3861msgstr "不能解析新创建的提交"
3862
3863#: builtin/commit.c:1291
3864msgid "detached HEAD"
3865msgstr "分离头指针"
3866
3867# 译者:中文字符串拼接,可删除前导空格
3868#: builtin/commit.c:1293
3869msgid " (root-commit)"
3870msgstr "(根提交)"
3871
3872#: builtin/commit.c:1360
3873msgid "suppress summary after successful commit"
3874msgstr "提交成功后不显示概述信息"
3875
3876#: builtin/commit.c:1361
3877msgid "show diff in commit message template"
3878msgstr "在提交说明模板里显示差异"
3879
3880#: builtin/commit.c:1363
3881msgid "Commit message options"
3882msgstr "提交说明选项"
3883
3884#: builtin/commit.c:1364 builtin/tag.c:457
3885msgid "read message from file"
3886msgstr "从文件中读取提交说明"
3887
3888#: builtin/commit.c:1365
3889msgid "author"
3890msgstr "作者"
3891
3892#: builtin/commit.c:1365
3893msgid "override author for commit"
3894msgstr "提交时覆盖作者"
3895
3896#: builtin/commit.c:1366 builtin/gc.c:178
3897msgid "date"
3898msgstr "日期"
3899
3900#: builtin/commit.c:1366
3901msgid "override date for commit"
3902msgstr "提交时覆盖日期"
3903
3904#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533
3905#: builtin/notes.c:690 builtin/tag.c:455
3906msgid "message"
3907msgstr "说明"
3908
3909#: builtin/commit.c:1367
3910msgid "commit message"
3911msgstr "提交说明"
3912
3913#: builtin/commit.c:1368
3914msgid "reuse and edit message from specified commit"
3915msgstr "重用并编辑指定提交的提交说明"
3916
3917#: builtin/commit.c:1369
3918msgid "reuse message from specified commit"
3919msgstr "重用指定提交的提交说明"
3920
3921#: builtin/commit.c:1370
3922msgid "use autosquash formatted message to fixup specified commit"
3923msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
3924
3925#: builtin/commit.c:1371
3926msgid "use autosquash formatted message to squash specified commit"
3927msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
3928
3929#: builtin/commit.c:1372
3930msgid "the commit is authored by me now (used with -C/-c/--amend)"
3931msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
3932
3933#: builtin/commit.c:1373 builtin/log.c:1104 builtin/revert.c:109
3934msgid "add Signed-off-by:"
3935msgstr "添加 Signed-off-by: 签名"
3936
3937#: builtin/commit.c:1374
3938msgid "use specified template file"
3939msgstr "使用指定的模板文件"
3940
3941#: builtin/commit.c:1375
3942msgid "force edit of commit"
3943msgstr "强制编辑提交"
3944
3945# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
3946#: builtin/commit.c:1376
3947msgid "default"
3948msgstr "default"
3949
3950#: builtin/commit.c:1376 builtin/tag.c:460
3951msgid "how to strip spaces and #comments from message"
3952msgstr "设置如何删除提交说明里的空格和#注释"
3953
3954#: builtin/commit.c:1377
3955msgid "include status in commit message template"
3956msgstr "在提交说明模板里包含状态信息"
3957
3958#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461
3959msgid "key id"
3960msgstr "key id"
3961
3962#: builtin/commit.c:1379 builtin/merge.c:216
3963msgid "GPG sign commit"
3964msgstr "GPG 提交签名"
3965
3966#. end commit message options
3967#: builtin/commit.c:1382
3968msgid "Commit contents options"
3969msgstr "提交内容选项"
3970
3971#: builtin/commit.c:1383
3972msgid "commit all changed files"
3973msgstr "提交所有改动的文件"
3974
3975#: builtin/commit.c:1384
3976msgid "add specified files to index for commit"
3977msgstr "添加指定的文件到索引区等待提交"
3978
3979#: builtin/commit.c:1385
3980msgid "interactively add files"
3981msgstr "交互式添加文件"
3982
3983#: builtin/commit.c:1386
3984msgid "interactively add changes"
3985msgstr "交互式添加变更"
3986
3987#: builtin/commit.c:1387
3988msgid "commit only specified files"
3989msgstr "只提交指定的文件"
3990
3991#: builtin/commit.c:1388
3992msgid "bypass pre-commit hook"
3993msgstr "绕过 pre-commit 钩子"
3994
3995#: builtin/commit.c:1389
3996msgid "show what would be committed"
3997msgstr "显示将要提交的内容"
3998
3999#: builtin/commit.c:1400
4000msgid "amend previous commit"
4001msgstr "修改先前的提交"
4002
4003#: builtin/commit.c:1401
4004msgid "bypass post-rewrite hook"
4005msgstr "绕过 post-rewrite 钩子"
4006
4007#: builtin/commit.c:1406
4008msgid "ok to record an empty change"
4009msgstr "允许一个空提交"
4010
4011#: builtin/commit.c:1409
4012msgid "ok to record a change with an empty message"
4013msgstr "允许空的提交说明"
4014
4015#: builtin/commit.c:1441
4016msgid "could not parse HEAD commit"
4017msgstr "不能解析 HEAD 提交"
4018
4019#: builtin/commit.c:1479 builtin/merge.c:510
4020#, c-format
4021msgid "could not open '%s' for reading"
4022msgstr "不能为读入打开 '%s'"
4023
4024#: builtin/commit.c:1486
4025#, c-format
4026msgid "Corrupt MERGE_HEAD file (%s)"
4027msgstr "损坏的 MERGE_HEAD 文件(%s)"
4028
4029#: builtin/commit.c:1493
4030msgid "could not read MERGE_MODE"
4031msgstr "不能读取 MERGE_MODE"
4032
4033#: builtin/commit.c:1512
4034#, c-format
4035msgid "could not read commit message: %s"
4036msgstr "不能读取提交说明:%s"
4037
4038#: builtin/commit.c:1526
4039#, c-format
4040msgid "Aborting commit; you did not edit the message.\n"
4041msgstr "终止提交;您未更改来自模版的提交说明。\n"
4042
4043#: builtin/commit.c:1531
4044#, c-format
4045msgid "Aborting commit due to empty commit message.\n"
4046msgstr "终止提交因为提交说明为空。\n"
4047
4048#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872
4049msgid "failed to write commit object"
4050msgstr "无法写提交对象"
4051
4052#: builtin/commit.c:1567
4053msgid "cannot lock HEAD ref"
4054msgstr "无法锁定 HEAD 引用"
4055
4056#: builtin/commit.c:1571
4057msgid "cannot update HEAD ref"
4058msgstr "无法更新 HEAD 引用"
4059
4060#: builtin/commit.c:1582
4061msgid ""
4062"Repository has been updated, but unable to write\n"
4063"new_index file. Check that disk is not full or quota is\n"
4064"not exceeded, and then \"git reset HEAD\" to recover."
4065msgstr ""
4066"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4067"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4068
4069#: builtin/config.c:7
4070msgid "git config [options]"
4071msgstr "git config [选项]"
4072
4073#: builtin/config.c:51
4074msgid "Config file location"
4075msgstr "配置文件位置"
4076
4077#: builtin/config.c:52
4078msgid "use global config file"
4079msgstr "使用全局配置文件"
4080
4081#: builtin/config.c:53
4082msgid "use system config file"
4083msgstr "使用系统级配置文件"
4084
4085#: builtin/config.c:54
4086msgid "use repository config file"
4087msgstr "使用版本库级配置文件"
4088
4089#: builtin/config.c:55
4090msgid "use given config file"
4091msgstr "使用指定的配置文件"
4092
4093#: builtin/config.c:56
4094msgid "Action"
4095msgstr "操作"
4096
4097#: builtin/config.c:57
4098msgid "get value: name [value-regex]"
4099msgstr "获取值:name [value-regex]"
4100
4101#: builtin/config.c:58
4102msgid "get all values: key [value-regex]"
4103msgstr "获得所有的值:key [value-regex]"
4104
4105#: builtin/config.c:59
4106msgid "get values for regexp: name-regex [value-regex]"
4107msgstr "根据正则表达式获得值:name-regex [value-regex]"
4108
4109#: builtin/config.c:60
4110msgid "replace all matching variables: name value [value_regex]"
4111msgstr "替换所有匹配的变量:name value [value_regex]"
4112
4113#: builtin/config.c:61
4114msgid "add a new variable: name value"
4115msgstr "添加一个新的变量:name value"
4116
4117#: builtin/config.c:62
4118msgid "remove a variable: name [value-regex]"
4119msgstr "删除一个变量:name [value-regex]"
4120
4121#: builtin/config.c:63
4122msgid "remove all matches: name [value-regex]"
4123msgstr "删除所有匹配项:name [value-regex]"
4124
4125#: builtin/config.c:64
4126msgid "rename section: old-name new-name"
4127msgstr "重命名小节:old-name new-name"
4128
4129#: builtin/config.c:65
4130msgid "remove a section: name"
4131msgstr "删除一个小节:name"
4132
4133#: builtin/config.c:66
4134msgid "list all"
4135msgstr "列出所有"
4136
4137#: builtin/config.c:67
4138msgid "open an editor"
4139msgstr "打开一个编辑器"
4140
4141#: builtin/config.c:68 builtin/config.c:69
4142msgid "slot"
4143msgstr "slot"
4144
4145#: builtin/config.c:68
4146msgid "find the color configured: [default]"
4147msgstr "找到配置的颜色:[默认]"
4148
4149#: builtin/config.c:69
4150msgid "find the color setting: [stdout-is-tty]"
4151msgstr "找到颜色设置:[stdout-is-tty]"
4152
4153#: builtin/config.c:70
4154msgid "Type"
4155msgstr "类型"
4156
4157#: builtin/config.c:71
4158msgid "value is \"true\" or \"false\""
4159msgstr "值是 \"true\" 或 \"false\""
4160
4161#: builtin/config.c:72
4162msgid "value is decimal number"
4163msgstr "值是十进制数"
4164
4165#: builtin/config.c:73
4166msgid "value is --bool or --int"
4167msgstr "值是 --bool or --int"
4168
4169#: builtin/config.c:74
4170msgid "value is a path (file or directory name)"
4171msgstr "值是一个路径(文件或目录名)"
4172
4173#: builtin/config.c:75
4174msgid "Other"
4175msgstr "其它"
4176
4177#: builtin/config.c:76
4178msgid "terminate values with NUL byte"
4179msgstr "终止值是NUL字节"
4180
4181#: builtin/config.c:77
4182msgid "respect include directives on lookup"
4183msgstr "查询时参照 include 指令递归查找"
4184
4185#: builtin/count-objects.c:82
4186msgid "git count-objects [-v]"
4187msgstr "git count-objects [-v]"
4188
4189#: builtin/describe.c:15
4190msgid "git describe [options] <committish>*"
4191msgstr "git describe [选项] <提交号>*"
4192
4193#: builtin/describe.c:16
4194msgid "git describe [options] --dirty"
4195msgstr "git describe [选项] --dirty"
4196
4197#: builtin/describe.c:233
4198#, c-format
4199msgid "annotated tag %s not available"
4200msgstr "注释 tag %s 无效"
4201
4202#: builtin/describe.c:237
4203#, c-format
4204msgid "annotated tag %s has no embedded name"
4205msgstr "注释 tag %s 没有嵌入名称"
4206
4207#: builtin/describe.c:239
4208#, c-format
4209msgid "tag '%s' is really '%s' here"
4210msgstr "tag '%s' 的确是在 '%s'"
4211
4212#: builtin/describe.c:266
4213#, c-format
4214msgid "Not a valid object name %s"
4215msgstr "不是一个有效的对象名 %s"
4216
4217#: builtin/describe.c:269
4218#, c-format
4219msgid "%s is not a valid '%s' object"
4220msgstr "%s 不是一个有效的 '%s' 对象"
4221
4222#: builtin/describe.c:286
4223#, c-format
4224msgid "no tag exactly matches '%s'"
4225msgstr "没有 tag 准确匹配 '%s'"
4226
4227#: builtin/describe.c:288
4228#, c-format
4229msgid "searching to describe %s\n"
4230msgstr "搜索描述 %s\n"
4231
4232#: builtin/describe.c:328
4233#, c-format
4234msgid "finished search at %s\n"
4235msgstr "完成搜索 %s\n"
4236
4237#: builtin/describe.c:352
4238#, c-format
4239msgid ""
4240"No annotated tags can describe '%s'.\n"
4241"However, there were unannotated tags: try --tags."
4242msgstr ""
4243"没有注释 tag 能描述 '%s'。\n"
4244"然而,有非注释 tag:尝试 --tags。"
4245
4246#: builtin/describe.c:356
4247#, c-format
4248msgid ""
4249"No tags can describe '%s'.\n"
4250"Try --always, or create some tags."
4251msgstr ""
4252"没有注释 tag 能描述 '%s'。\n"
4253"尝试 --always,或者创建一些 tag。"
4254
4255#: builtin/describe.c:377
4256#, c-format
4257msgid "traversed %lu commits\n"
4258msgstr "已遍历 %lu 个提交\n"
4259
4260#: builtin/describe.c:380
4261#, c-format
4262msgid ""
4263"more than %i tags found; listed %i most recent\n"
4264"gave up search at %s\n"
4265msgstr ""
4266"发现多于 %i 个 tag,列出最近的 %i 个\n"
4267"在 %s 放弃搜索\n"
4268
4269#: builtin/describe.c:402
4270msgid "find the tag that comes after the commit"
4271msgstr "寻找提交之后的 tag(用于描述提交)"
4272
4273#: builtin/describe.c:403
4274msgid "debug search strategy on stderr"
4275msgstr "在标准错误上调试搜索策略"
4276
4277#: builtin/describe.c:404
4278msgid "use any ref"
4279msgstr "使用任意引用"
4280
4281#: builtin/describe.c:405
4282msgid "use any tag, even unannotated"
4283msgstr "使用任意 tag,即使未带注解"
4284
4285#: builtin/describe.c:406
4286msgid "always use long format"
4287msgstr "始终使用长提交号格式"
4288
4289#: builtin/describe.c:409
4290msgid "only output exact matches"
4291msgstr "只输出精确匹配"
4292
4293#: builtin/describe.c:411
4294msgid "consider <n> most recent tags (default: 10)"
4295msgstr "考虑最近 <n> 个 tags(默认:10)"
4296
4297#: builtin/describe.c:413
4298msgid "only consider tags matching <pattern>"
4299msgstr "只考虑匹配 <模式> 的 tags"
4300
4301#: builtin/describe.c:415 builtin/name-rev.c:238
4302msgid "show abbreviated commit object as fallback"
4303msgstr "显示简写的提交号作为后备"
4304
4305#: builtin/describe.c:416
4306msgid "mark"
4307msgstr "标记"
4308
4309#: builtin/describe.c:417
4310msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4311msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
4312
4313#: builtin/describe.c:435
4314msgid "--long is incompatible with --abbrev=0"
4315msgstr "--long 与 --abbrev=0 不兼容"
4316
4317#: builtin/describe.c:461
4318msgid "No names found, cannot describe anything."
4319msgstr "没有发现名称,无法描述任何东西。"
4320
4321#: builtin/describe.c:481
4322msgid "--dirty is incompatible with committishes"
4323msgstr "--dirty 不能与提交同时使用"
4324
4325#: builtin/diff.c:79
4326#, c-format
4327msgid "'%s': not a regular file or symlink"
4328msgstr "'%s':不是一个正规文件或符号链接"
4329
4330#: builtin/diff.c:228
4331#, c-format
4332msgid "invalid option: %s"
4333msgstr "无效选项:%s"
4334
4335#: builtin/diff.c:305
4336msgid "Not a git repository"
4337msgstr "不是一个 git 版本库"
4338
4339#: builtin/diff.c:348
4340#, c-format
4341msgid "invalid object '%s' given."
4342msgstr "提供了无效对象 '%s'。"
4343
4344#: builtin/diff.c:353
4345#, c-format
4346msgid "more than %d trees given: '%s'"
4347msgstr "提供了超过 %d 个树对象:'%s'"
4348
4349#: builtin/diff.c:363
4350#, c-format
4351msgid "more than two blobs given: '%s'"
4352msgstr "提供了超过两个数据(blob)对象:'%s'"
4353
4354#: builtin/diff.c:371
4355#, c-format
4356msgid "unhandled object '%s' given."
4357msgstr "提供了无法处理的对象 '%s'。"
4358
4359#: builtin/fast-export.c:22
4360msgid "git fast-export [rev-list-opts]"
4361msgstr "git fast-export [rev-list-opts]"
4362
4363#: builtin/fast-export.c:652
4364msgid "show progress after <n> objects"
4365msgstr "在 <n> 个对象之后显示进度"
4366
4367#: builtin/fast-export.c:654
4368msgid "select handling of signed tags"
4369msgstr "选择如何处理签名 tags"
4370
4371#: builtin/fast-export.c:657
4372msgid "select handling of tags that tag filtered objects"
4373msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
4374
4375#: builtin/fast-export.c:660
4376msgid "Dump marks to this file"
4377msgstr "把标记存储到这个文件"
4378
4379#: builtin/fast-export.c:662
4380msgid "Import marks from this file"
4381msgstr "从这个文件导入标记"
4382
4383#: builtin/fast-export.c:664
4384msgid "Fake a tagger when tags lack one"
4385msgstr "当 tags 缺少标记者字段时,假装提供一个"
4386
4387#: builtin/fast-export.c:666
4388msgid "Output full tree for each commit"
4389msgstr "每次提交都输出整个树"
4390
4391#: builtin/fast-export.c:668
4392msgid "Use the done feature to terminate the stream"
4393msgstr "使用 done 功能来终止流"
4394
4395#: builtin/fast-export.c:669
4396msgid "Skip output of blob data"
4397msgstr "跳过数据对象的输出"
4398
4399#: builtin/fetch.c:20
4400msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4401msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
4402
4403#: builtin/fetch.c:21
4404msgid "git fetch [<options>] <group>"
4405msgstr "git fetch [<选项>] <组>"
4406
4407#: builtin/fetch.c:22
4408msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4409msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
4410
4411#: builtin/fetch.c:23
4412msgid "git fetch --all [<options>]"
4413msgstr "git fetch --all [<选项>]"
4414
4415#: builtin/fetch.c:60
4416msgid "fetch from all remotes"
4417msgstr "从所有的远程抓取"
4418
4419#: builtin/fetch.c:62
4420msgid "append to .git/FETCH_HEAD instead of overwriting"
4421msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
4422
4423#: builtin/fetch.c:64
4424msgid "path to upload pack on remote end"
4425msgstr "上传包到远程的路径"
4426
4427#: builtin/fetch.c:65
4428msgid "force overwrite of local branch"
4429msgstr "强制覆盖本地分支"
4430
4431#: builtin/fetch.c:67
4432msgid "fetch from multiple remotes"
4433msgstr "从多个远程抓取"
4434
4435#: builtin/fetch.c:69
4436msgid "fetch all tags and associated objects"
4437msgstr "抓取所有的 tags 和关联对象"
4438
4439#: builtin/fetch.c:71
4440msgid "do not fetch all tags (--no-tags)"
4441msgstr "不抓取任何 tags (--no-tags)"
4442
4443#: builtin/fetch.c:73
4444msgid "prune remote-tracking branches no longer on remote"
4445msgstr "清除远程已经不存在的分支的跟踪分支"
4446
4447# 译者:可选值,不能翻译
4448#: builtin/fetch.c:74
4449msgid "on-demand"
4450msgstr "on-demand"
4451
4452#: builtin/fetch.c:75
4453msgid "control recursive fetching of submodules"
4454msgstr "控制子模组的递归抓取"
4455
4456#: builtin/fetch.c:79
4457msgid "keep downloaded pack"
4458msgstr "保持下载包"
4459
4460#: builtin/fetch.c:81
4461msgid "allow updating of HEAD ref"
4462msgstr "允许更新 HEAD 引用"
4463
4464#: builtin/fetch.c:84
4465msgid "deepen history of shallow clone"
4466msgstr "深化浅克隆的历史"
4467
4468#: builtin/fetch.c:86
4469msgid "convert to a complete repository"
4470msgstr "转换为一个完整的版本库"
4471
4472#: builtin/fetch.c:88 builtin/log.c:1121
4473msgid "dir"
4474msgstr "目录"
4475
4476#: builtin/fetch.c:89
4477msgid "prepend this to submodule path output"
4478msgstr "在子模组路径输出的前面加上此目录"
4479
4480#: builtin/fetch.c:92
4481msgid "default mode for recursion"
4482msgstr "递归的默认模式"
4483
4484#: builtin/fetch.c:204
4485msgid "Couldn't find remote ref HEAD"
4486msgstr "无法发现远程 HEAD 引用"
4487
4488#: builtin/fetch.c:257
4489#, c-format
4490msgid "object %s not found"
4491msgstr "对象 %s 未发现"
4492
4493#: builtin/fetch.c:262
4494msgid "[up to date]"
4495msgstr "[最新]"
4496
4497#: builtin/fetch.c:276
4498#, c-format
4499msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4500msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
4501
4502#: builtin/fetch.c:277 builtin/fetch.c:363
4503msgid "[rejected]"
4504msgstr "[已拒绝]"
4505
4506#: builtin/fetch.c:288
4507msgid "[tag update]"
4508msgstr "[tag更新]"
4509
4510# 译者:注意保持前导空格
4511#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
4512msgid " (unable to update local ref)"
4513msgstr " (不能更新本地引用)"
4514
4515#: builtin/fetch.c:308
4516msgid "[new tag]"
4517msgstr "[新tag]"
4518
4519#: builtin/fetch.c:311
4520msgid "[new branch]"
4521msgstr "[新分支]"
4522
4523#: builtin/fetch.c:314
4524msgid "[new ref]"
4525msgstr "[新引用]"
4526
4527#: builtin/fetch.c:359
4528msgid "unable to update local ref"
4529msgstr "不能更新本地引用"
4530
4531#: builtin/fetch.c:359
4532msgid "forced update"
4533msgstr "强制更新"
4534
4535#: builtin/fetch.c:365
4536msgid "(non-fast-forward)"
4537msgstr "(非快进式)"
4538
4539#: builtin/fetch.c:396 builtin/fetch.c:688
4540#, c-format
4541msgid "cannot open %s: %s\n"
4542msgstr "无法打开 %s:%s\n"
4543
4544#: builtin/fetch.c:405
4545#, c-format
4546msgid "%s did not send all necessary objects\n"
4547msgstr "%s 未发送所有必须的对象\n"
4548
4549#: builtin/fetch.c:491
4550#, c-format
4551msgid "From %.*s\n"
4552msgstr "来自 %.*s\n"
4553
4554#: builtin/fetch.c:502
4555#, c-format
4556msgid ""
4557"some local refs could not be updated; try running\n"
4558" 'git remote prune %s' to remove any old, conflicting branches"
4559msgstr ""
4560"一些本地引用不能被更新;尝试运行\n"
4561" 'git remote prune %s' 来删除旧的、有冲突的分支"
4562
4563# 译者:注意保持前导空格
4564#: builtin/fetch.c:552
4565#, c-format
4566msgid " (%s will become dangling)"
4567msgstr " (%s 将成为摇摆状态)"
4568
4569# 译者:注意保持前导空格
4570#: builtin/fetch.c:553
4571#, c-format
4572msgid " (%s has become dangling)"
4573msgstr " (%s 已成为摇摆状态)"
4574
4575#: builtin/fetch.c:560
4576msgid "[deleted]"
4577msgstr "[已删除]"
4578
4579#: builtin/fetch.c:561 builtin/remote.c:1055
4580msgid "(none)"
4581msgstr "(无)"
4582
4583#: builtin/fetch.c:678
4584#, c-format
4585msgid "Refusing to fetch into current branch %s of non-bare repository"
4586msgstr "拒绝获取到非裸版本库的当前分支 %s"
4587
4588#: builtin/fetch.c:712
4589#, c-format
4590msgid "Don't know how to fetch from %s"
4591msgstr "不知道如何从 %s 获取"
4592
4593#: builtin/fetch.c:789
4594#, c-format
4595msgid "Option \"%s\" value \"%s\" is not valid for %s"
4596msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
4597
4598#: builtin/fetch.c:792
4599#, c-format
4600msgid "Option \"%s\" is ignored for %s\n"
4601msgstr "选项 \"%s\" 为 %s 所忽略\n"
4602
4603#: builtin/fetch.c:894
4604#, c-format
4605msgid "Fetching %s\n"
4606msgstr "正在获取 %s\n"
4607
4608#: builtin/fetch.c:896 builtin/remote.c:100
4609#, c-format
4610msgid "Could not fetch %s"
4611msgstr "不能获取 %s"
4612
4613#: builtin/fetch.c:915
4614msgid ""
4615"No remote repository specified. Please, specify either a URL or a\n"
4616"remote name from which new revisions should be fetched."
4617msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
4618
4619#: builtin/fetch.c:935
4620msgid "You need to specify a tag name."
4621msgstr "您需要指定一个 tag 名称。"
4622
4623#: builtin/fetch.c:981
4624msgid "--depth and --unshallow cannot be used together"
4625msgstr "--depth 和 --unshallow 不能同时使用"
4626
4627#: builtin/fetch.c:983
4628msgid "--unshallow on a complete repository does not make sense"
4629msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
4630
4631#: builtin/fetch.c:1002
4632msgid "fetch --all does not take a repository argument"
4633msgstr "fetch --all 不能带一个版本库参数"
4634
4635#: builtin/fetch.c:1004
4636msgid "fetch --all does not make sense with refspecs"
4637msgstr "fetch --all 带引用表达式没有任何意义"
4638
4639#: builtin/fetch.c:1015
4640#, c-format
4641msgid "No such remote or remote group: %s"
4642msgstr "没有这样的远程或远程组:%s"
4643
4644#: builtin/fetch.c:1023
4645msgid "Fetching a group and specifying refspecs does not make sense"
4646msgstr "获取组并指定引用表达式没有意义"
4647
4648#: builtin/fmt-merge-msg.c:13
4649msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4650msgstr ""
4651"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4652
4653#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4654#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4655#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
4656msgid "n"
4657msgstr "n"
4658
4659#: builtin/fmt-merge-msg.c:660
4660msgid "populate log with at most <n> entries from shortlog"
4661msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
4662
4663#: builtin/fmt-merge-msg.c:663
4664msgid "alias for --log (deprecated)"
4665msgstr "参数 --log 的别名(已弃用)"
4666
4667#: builtin/fmt-merge-msg.c:666
4668msgid "text"
4669msgstr "文本"
4670
4671#: builtin/fmt-merge-msg.c:667
4672msgid "use <text> as start of message"
4673msgstr "使用 <文本> 作为提交说明的开始"
4674
4675#: builtin/fmt-merge-msg.c:668
4676msgid "file to read from"
4677msgstr "从文件中读取"
4678
4679#: builtin/for-each-ref.c:979
4680msgid "git for-each-ref [options] [<pattern>]"
4681msgstr "git for-each-ref [选项] [<模式>]"
4682
4683#: builtin/for-each-ref.c:994
4684msgid "quote placeholders suitably for shells"
4685msgstr "引用占位符适用于 shells"
4686
4687#: builtin/for-each-ref.c:996
4688msgid "quote placeholders suitably for perl"
4689msgstr "引用占位符适用于 perl"
4690
4691#: builtin/for-each-ref.c:998
4692msgid "quote placeholders suitably for python"
4693msgstr "引用占位符适用于 python"
4694
4695#: builtin/for-each-ref.c:1000
4696msgid "quote placeholders suitably for tcl"
4697msgstr "引用占位符适用于 tcl"
4698
4699#: builtin/for-each-ref.c:1003
4700msgid "show only <n> matched refs"
4701msgstr "只显示 <n> 个匹配的引用"
4702
4703#: builtin/for-each-ref.c:1004
4704msgid "format"
4705msgstr "格式"
4706
4707#: builtin/for-each-ref.c:1004
4708msgid "format to use for the output"
4709msgstr "输出格式"
4710
4711#: builtin/for-each-ref.c:1005
4712msgid "key"
4713msgstr "key"
4714
4715#: builtin/for-each-ref.c:1006
4716msgid "field name to sort on"
4717msgstr "排序的字段名"
4718
4719#: builtin/fsck.c:608
4720msgid "git fsck [options] [<object>...]"
4721msgstr "git fsck [选项] [<对象>...]"
4722
4723#: builtin/fsck.c:614
4724msgid "show unreachable objects"
4725msgstr "显示不可达的对象"
4726
4727#: builtin/fsck.c:615
4728msgid "show dangling objects"
4729msgstr "显示摇摆的对象"
4730
4731#: builtin/fsck.c:616
4732msgid "report tags"
4733msgstr "报告 tags"
4734
4735#: builtin/fsck.c:617
4736msgid "report root nodes"
4737msgstr "报告根节点"
4738
4739#: builtin/fsck.c:618
4740msgid "make index objects head nodes"
4741msgstr "将索引亦作为检查的头节点"
4742
4743#: builtin/fsck.c:619
4744msgid "make reflogs head nodes (default)"
4745msgstr "将引用日志作为检查的头节点(默认)"
4746
4747#: builtin/fsck.c:620
4748msgid "also consider packs and alternate objects"
4749msgstr "也考虑包和备用对象"
4750
4751#: builtin/fsck.c:621
4752msgid "enable more strict checking"
4753msgstr "启用更严格的检查"
4754
4755#: builtin/fsck.c:623
4756msgid "write dangling objects in .git/lost-found"
4757msgstr "将摇摆对象写入 .git/lost-found 中"
4758
4759#: builtin/fsck.c:624 builtin/prune.c:134
4760msgid "show progress"
4761msgstr "显示进度"
4762
4763#: builtin/gc.c:22
4764msgid "git gc [options]"
4765msgstr "git gc [选项]"
4766
4767#: builtin/gc.c:63
4768#, c-format
4769msgid "Invalid %s: '%s'"
4770msgstr "无效的 %s:'%s'"
4771
4772#: builtin/gc.c:90
4773#, c-format
4774msgid "insanely long object directory %.*s"
4775msgstr "不正常的长对象目录 %.*s"
4776
4777#: builtin/gc.c:179
4778msgid "prune unreferenced objects"
4779msgstr "清除未引用的对象"
4780
4781#: builtin/gc.c:181
4782msgid "be more thorough (increased runtime)"
4783msgstr "更彻底(增加运行时间)"
4784
4785#: builtin/gc.c:182
4786msgid "enable auto-gc mode"
4787msgstr "启用自动垃圾回收模式"
4788
4789#: builtin/gc.c:222
4790#, c-format
4791msgid ""
4792"Auto packing the repository for optimum performance. You may also\n"
4793"run \"git gc\" manually. See \"git help gc\" for more information.\n"
4794msgstr ""
4795"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
4796"参见 \"git help gc\" 以获取更多信息。\n"
4797
4798#: builtin/gc.c:249
4799msgid ""
4800"There are too many unreachable loose objects; run 'git prune' to remove them."
4801msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
4802
4803#: builtin/grep.c:22
4804msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4805msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
4806
4807#: builtin/grep.c:217
4808#, c-format
4809msgid "grep: failed to create thread: %s"
4810msgstr "grep:无法创建线程:%s"
4811
4812#: builtin/grep.c:365
4813#, c-format
4814msgid "Failed to chdir: %s"
4815msgstr "无法切换目录:%s"
4816
4817#: builtin/grep.c:443 builtin/grep.c:478
4818#, c-format
4819msgid "unable to read tree (%s)"
4820msgstr "无法读取树(%s)"
4821
4822#: builtin/grep.c:493
4823#, c-format
4824msgid "unable to grep from object of type %s"
4825msgstr "无法抓取来自于 %s 类型的对象"
4826
4827#: builtin/grep.c:551
4828#, c-format
4829msgid "switch `%c' expects a numerical value"
4830msgstr "开关 `%c' 期望一个数字值"
4831
4832#: builtin/grep.c:568
4833#, c-format
4834msgid "cannot open '%s'"
4835msgstr "不能打开 '%s'"
4836
4837#: builtin/grep.c:643
4838msgid "search in index instead of in the work tree"
4839msgstr "在索引区搜索而不是在工作区"
4840
4841#: builtin/grep.c:645
4842msgid "find in contents not managed by git"
4843msgstr "在未被 git 管理的内容中查找"
4844
4845# 译者:中文字符串拼接,可删除前导空格
4846#: builtin/grep.c:647
4847msgid "search in both tracked and untracked files"
4848msgstr "在跟踪和未跟踪的文件中搜索"
4849
4850#: builtin/grep.c:649
4851msgid "search also in ignored files"
4852msgstr "也在忽略的文件中搜索"
4853
4854#: builtin/grep.c:652
4855msgid "show non-matching lines"
4856msgstr "显示未匹配的行"
4857
4858#: builtin/grep.c:654
4859msgid "case insensitive matching"
4860msgstr "不区分大小写匹配"
4861
4862#: builtin/grep.c:656
4863msgid "match patterns only at word boundaries"
4864msgstr "只在单词边界匹配模式"
4865
4866#: builtin/grep.c:658
4867msgid "process binary files as text"
4868msgstr "把二进制文件当做文本处理"
4869
4870#: builtin/grep.c:660
4871msgid "don't match patterns in binary files"
4872msgstr "不在二进制文件中匹配模式"
4873
4874#: builtin/grep.c:663
4875msgid "descend at most <depth> levels"
4876msgstr "最多以指定的深度向下寻找"
4877
4878#: builtin/grep.c:667
4879msgid "use extended POSIX regular expressions"
4880msgstr "使用扩展的 POSIX 正则表达式"
4881
4882#: builtin/grep.c:670
4883msgid "use basic POSIX regular expressions (default)"
4884msgstr "使用基本的 POSIX 正则表达式(默认)"
4885
4886#: builtin/grep.c:673
4887msgid "interpret patterns as fixed strings"
4888msgstr "把模式解析为固定的字符串"
4889
4890#: builtin/grep.c:676
4891msgid "use Perl-compatible regular expressions"
4892msgstr "使用 Perl 兼容的正则表达式"
4893
4894#: builtin/grep.c:679
4895msgid "show line numbers"
4896msgstr "显示行号"
4897
4898#: builtin/grep.c:680
4899msgid "don't show filenames"
4900msgstr "不显示文件名"
4901
4902#: builtin/grep.c:681
4903msgid "show filenames"
4904msgstr "显示文件名"
4905
4906#: builtin/grep.c:683
4907msgid "show filenames relative to top directory"
4908msgstr "显示相对于顶级目录的文件名"
4909
4910#: builtin/grep.c:685
4911msgid "show only filenames instead of matching lines"
4912msgstr "只显示文件名而不显示匹配的行"
4913
4914#: builtin/grep.c:687
4915msgid "synonym for --files-with-matches"
4916msgstr "和 --files-with-matches 同义"
4917
4918#: builtin/grep.c:690
4919msgid "show only the names of files without match"
4920msgstr "只显示未匹配的文件名"
4921
4922#: builtin/grep.c:692
4923msgid "print NUL after filenames"
4924msgstr "在文件名后输出 NUL 字符"
4925
4926#: builtin/grep.c:694
4927msgid "show the number of matches instead of matching lines"
4928msgstr "显示总匹配行数,而不显示匹配的行"
4929
4930#: builtin/grep.c:695
4931msgid "highlight matches"
4932msgstr "高亮显示匹配项"
4933
4934#: builtin/grep.c:697
4935msgid "print empty line between matches from different files"
4936msgstr "在不同文件的匹配项之间打印空行"
4937
4938#: builtin/grep.c:699
4939msgid "show filename only once above matches from same file"
4940msgstr "只在同一文件的匹配项的上面显示一次文件名"
4941
4942#: builtin/grep.c:702
4943msgid "show <n> context lines before and after matches"
4944msgstr "显示匹配项前后的 <n> 行上下文"
4945
4946#: builtin/grep.c:705
4947msgid "show <n> context lines before matches"
4948msgstr "显示匹配项前 <n> 行上下文"
4949
4950#: builtin/grep.c:707
4951msgid "show <n> context lines after matches"
4952msgstr "显示匹配项后 <n> 行上下文"
4953
4954#: builtin/grep.c:708
4955msgid "shortcut for -C NUM"
4956msgstr "快捷键 -C 数字"
4957
4958#: builtin/grep.c:711
4959msgid "show a line with the function name before matches"
4960msgstr "在匹配的前面显示一行函数名"
4961
4962#: builtin/grep.c:713
4963msgid "show the surrounding function"
4964msgstr "显示所在函数的前后内容"
4965
4966#: builtin/grep.c:716
4967msgid "read patterns from file"
4968msgstr "从文件读取模式"
4969
4970#: builtin/grep.c:718
4971msgid "match <pattern>"
4972msgstr "匹配 <模式>"
4973
4974#: builtin/grep.c:720
4975msgid "combine patterns specified with -e"
4976msgstr "组合用 -e 参数设定的模式"
4977
4978#: builtin/grep.c:732
4979msgid "indicate hit with exit status without output"
4980msgstr "不输出,而用退出码标识命中状态"
4981
4982#: builtin/grep.c:734
4983msgid "show only matches from files that match all patterns"
4984msgstr "只显示匹配所有模式的文件中的匹配"
4985
4986#: builtin/grep.c:736
4987msgid "show parse tree for grep expression"
4988msgstr "显示 grep 表达式的解析树"
4989
4990#: builtin/grep.c:740
4991msgid "pager"
4992msgstr "分页"
4993
4994#: builtin/grep.c:740
4995msgid "show matching files in the pager"
4996msgstr "分页显示匹配的文件"
4997
4998#: builtin/grep.c:743
4999msgid "allow calling of grep(1) (ignored by this build)"
5000msgstr "允许调用 grep(1)(本次构建忽略)"
5001
5002#: builtin/grep.c:744 builtin/show-ref.c:184
5003msgid "show usage"
5004msgstr "显示用法"
5005
5006#: builtin/grep.c:811
5007msgid "no pattern given."
5008msgstr "未提供模式匹配。"
5009
5010#: builtin/grep.c:866
5011msgid "--open-files-in-pager only works on the worktree"
5012msgstr "--open-files-in-pager 仅用于工作区"
5013
5014#: builtin/grep.c:889
5015msgid "--cached or --untracked cannot be used with --no-index."
5016msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5017
5018#: builtin/grep.c:894
5019msgid "--no-index or --untracked cannot be used with revs."
5020msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5021
5022#: builtin/grep.c:897
5023msgid "--[no-]exclude-standard cannot be used for tracked contents."
5024msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5025
5026#: builtin/grep.c:905
5027msgid "both --cached and trees are given."
5028msgstr "同时给出了 --cached 和树对象。"
5029
5030#: builtin/hash-object.c:60
5031msgid ""
5032"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5033"<file>..."
5034msgstr ""
5035"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5036"<文件>..."
5037
5038#: builtin/hash-object.c:61
5039msgid "git hash-object --stdin-paths < <list-of-paths>"
5040msgstr "git hash-object --stdin-paths < <路径列表>"
5041
5042#: builtin/hash-object.c:72
5043msgid "type"
5044msgstr "类型"
5045
5046#: builtin/hash-object.c:72
5047msgid "object type"
5048msgstr "对象类型"
5049
5050#: builtin/hash-object.c:73
5051msgid "write the object into the object database"
5052msgstr "将对象写入对象数据库"
5053
5054#: builtin/hash-object.c:74
5055msgid "read the object from stdin"
5056msgstr "从标准输入读取对象"
5057
5058#: builtin/hash-object.c:76
5059msgid "store file as is without filters"
5060msgstr "原样存储文件不使用过滤器"
5061
5062#: builtin/hash-object.c:77
5063msgid "process file as it were from this path"
5064msgstr "处理文件并假设其来自于此路径"
5065
5066#: builtin/help.c:42
5067msgid "print all available commands"
5068msgstr "打印所有可用的命令"
5069
5070#: builtin/help.c:43
5071msgid "show man page"
5072msgstr "显示 man 手册"
5073
5074#: builtin/help.c:44
5075msgid "show manual in web browser"
5076msgstr "在 web 浏览器中显示手册"
5077
5078#: builtin/help.c:46
5079msgid "show info page"
5080msgstr "显示 info 手册"
5081
5082#: builtin/help.c:52
5083msgid "git help [--all] [--man|--web|--info] [command]"
5084msgstr "git help [--all] [--man|--web|--info] [命令]"
5085
5086#: builtin/help.c:64
5087#, c-format
5088msgid "unrecognized help format '%s'"
5089msgstr "未能识别的帮助格式 '%s'"
5090
5091#: builtin/help.c:92
5092msgid "Failed to start emacsclient."
5093msgstr "无法启动 emacsclient。"
5094
5095#: builtin/help.c:105
5096msgid "Failed to parse emacsclient version."
5097msgstr "无法解析 emacsclient 版本。"
5098
5099#: builtin/help.c:113
5100#, c-format
5101msgid "emacsclient version '%d' too old (< 22)."
5102msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5103
5104#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
5105#, c-format
5106msgid "failed to exec '%s': %s"
5107msgstr "无法执行 '%s':%s"
5108
5109#: builtin/help.c:216
5110#, c-format
5111msgid ""
5112"'%s': path for unsupported man viewer.\n"
5113"Please consider using 'man.<tool>.cmd' instead."
5114msgstr ""
5115"'%s':不支持的 man 手册查看器的路径。\n"
5116"请使用 'man.<tool>.cmd'。"
5117
5118#: builtin/help.c:228
5119#, c-format
5120msgid ""
5121"'%s': cmd for supported man viewer.\n"
5122"Please consider using 'man.<tool>.path' instead."
5123msgstr ""
5124"'%s': 支持的 man 手册查看器命令。\n"
5125"请使用 'man.<tool>.path'。"
5126
5127#: builtin/help.c:349
5128#, c-format
5129msgid "'%s': unknown man viewer."
5130msgstr "'%s':未知的 man 查看器。"
5131
5132#: builtin/help.c:366
5133msgid "no man viewer handled the request"
5134msgstr "没有 man 查看器处理此请求"
5135
5136#: builtin/help.c:374
5137msgid "no info viewer handled the request"
5138msgstr "没有 info 查看器处理此请求"
5139
5140#: builtin/help.c:429 builtin/help.c:436
5141#, c-format
5142msgid "usage: %s%s"
5143msgstr "用法:%s%s"
5144
5145#: builtin/help.c:452
5146#, c-format
5147msgid "`git %s' is aliased to `%s'"
5148msgstr "`git %s' 是 `%s' 的别名"
5149
5150#: builtin/index-pack.c:182
5151#, c-format
5152msgid "object type mismatch at %s"
5153msgstr "%s 的对象类型不匹配"
5154
5155#: builtin/index-pack.c:202
5156msgid "object of unexpected type"
5157msgstr "意外的类型的对象"
5158
5159#: builtin/index-pack.c:239
5160#, c-format
5161msgid "cannot fill %d byte"
5162msgid_plural "cannot fill %d bytes"
5163msgstr[0] "无法填充 %d 字节"
5164msgstr[1] "无法填充 %d 字节"
5165
5166#: builtin/index-pack.c:249
5167msgid "early EOF"
5168msgstr "过早的文件结束符(EOF)"
5169
5170#: builtin/index-pack.c:250
5171msgid "read error on input"
5172msgstr "输入上的读错误"
5173
5174#: builtin/index-pack.c:262
5175msgid "used more bytes than were available"
5176msgstr "用掉了超过可用的字节"
5177
5178#: builtin/index-pack.c:269
5179msgid "pack too large for current definition of off_t"
5180msgstr "包太大超过了当前 off_t 的定义"
5181
5182#: builtin/index-pack.c:285
5183#, c-format
5184msgid "unable to create '%s'"
5185msgstr "不能创建 '%s'"
5186
5187#: builtin/index-pack.c:290
5188#, c-format
5189msgid "cannot open packfile '%s'"
5190msgstr "无法打开包文件 '%s'"
5191
5192#: builtin/index-pack.c:304
5193msgid "pack signature mismatch"
5194msgstr "包签名不匹配"
5195
5196#: builtin/index-pack.c:306
5197#, c-format
5198msgid "pack version %<PRIu32> unsupported"
5199msgstr "不支持包版本 %<PRIu32>"
5200
5201#: builtin/index-pack.c:324
5202#, c-format
5203msgid "pack has bad object at offset %lu: %s"
5204msgstr "包中有错误的对象位于 %lu:%s"
5205
5206#: builtin/index-pack.c:446
5207#, c-format
5208msgid "inflate returned %d"
5209msgstr "解压缩返回 %d"
5210
5211#: builtin/index-pack.c:495
5212msgid "offset value overflow for delta base object"
5213msgstr "偏移值覆盖了 delta 基准对象"
5214
5215#: builtin/index-pack.c:503
5216msgid "delta base offset is out of bound"
5217msgstr "delta 基准偏移越界"
5218
5219#: builtin/index-pack.c:511
5220#, c-format
5221msgid "unknown object type %d"
5222msgstr "未知对象类型 %d"
5223
5224#: builtin/index-pack.c:542
5225msgid "cannot pread pack file"
5226msgstr "无法读取包文件"
5227
5228#: builtin/index-pack.c:544
5229#, c-format
5230msgid "premature end of pack file, %lu byte missing"
5231msgid_plural "premature end of pack file, %lu bytes missing"
5232msgstr[0] "包文件过早结束,缺少 %lu 字节"
5233msgstr[1] "包文件过早结束,缺少 %lu 字节"
5234
5235#: builtin/index-pack.c:570
5236msgid "serious inflate inconsistency"
5237msgstr "解压缩严重的不一致"
5238
5239#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690
5240#: builtin/index-pack.c:724 builtin/index-pack.c:733
5241#, c-format
5242msgid "SHA1 COLLISION FOUND WITH %s !"
5243msgstr "发现 %s 出现 SHA1 冲突!"
5244
5245#: builtin/index-pack.c:664 builtin/pack-objects.c:170
5246#: builtin/pack-objects.c:262
5247#, c-format
5248msgid "unable to read %s"
5249msgstr "不能读 %s"
5250
5251#: builtin/index-pack.c:730
5252#, c-format
5253msgid "cannot read existing object %s"
5254msgstr "不能读取现存对象 %s"
5255
5256#: builtin/index-pack.c:744
5257#, c-format
5258msgid "invalid blob object %s"
5259msgstr "无效的数据(blob)对象 %s"
5260
5261#: builtin/index-pack.c:759
5262#, c-format
5263msgid "invalid %s"
5264msgstr "无效的 %s"
5265
5266#: builtin/index-pack.c:761
5267msgid "Error in object"
5268msgstr "对象中出错"
5269
5270#: builtin/index-pack.c:763
5271#, c-format
5272msgid "Not all child objects of %s are reachable"
5273msgstr "%s 的所有子对象并非都可达"
5274
5275#: builtin/index-pack.c:833 builtin/index-pack.c:863
5276msgid "failed to apply delta"
5277msgstr "无法应用 delta"
5278
5279#: builtin/index-pack.c:1004
5280msgid "Receiving objects"
5281msgstr "接收对象中"
5282
5283#: builtin/index-pack.c:1004
5284msgid "Indexing objects"
5285msgstr "索引对象中"
5286
5287#: builtin/index-pack.c:1030
5288msgid "pack is corrupted (SHA1 mismatch)"
5289msgstr "包冲突(SHA1 不匹配)"
5290
5291#: builtin/index-pack.c:1035
5292msgid "cannot fstat packfile"
5293msgstr "不能枚举包文件状态"
5294
5295#: builtin/index-pack.c:1038
5296msgid "pack has junk at the end"
5297msgstr "包的结尾有垃圾数据"
5298
5299#: builtin/index-pack.c:1049
5300msgid "confusion beyond insanity in parse_pack_objects()"
5301msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5302
5303#: builtin/index-pack.c:1072
5304msgid "Resolving deltas"
5305msgstr "处理 delta 中"
5306
5307#: builtin/index-pack.c:1082
5308#, c-format
5309msgid "unable to create thread: %s"
5310msgstr "不能创建线程:%s"
5311
5312#: builtin/index-pack.c:1124
5313msgid "confusion beyond insanity"
5314msgstr "不可理喻"
5315
5316#: builtin/index-pack.c:1132
5317#, c-format
5318msgid "completed with %d local objects"
5319msgstr "完成 %d 个本地对象"
5320
5321#: builtin/index-pack.c:1142
5322#, c-format
5323msgid "Unexpected tail checksum for %s (disk corruption?)"
5324msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
5325
5326#: builtin/index-pack.c:1146
5327#, c-format
5328msgid "pack has %d unresolved delta"
5329msgid_plural "pack has %d unresolved deltas"
5330msgstr[0] "包有 %d 个未解决的 delta"
5331msgstr[1] "包有 %d 个未解决的 delta"
5332
5333#: builtin/index-pack.c:1171
5334#, c-format
5335msgid "unable to deflate appended object (%d)"
5336msgstr "不能压缩附加对象(%d)"
5337
5338#: builtin/index-pack.c:1250
5339#, c-format
5340msgid "local object %s is corrupt"
5341msgstr "本地对象 %s 已损坏"
5342
5343#: builtin/index-pack.c:1274
5344msgid "error while closing pack file"
5345msgstr "关闭包文件时出错"
5346
5347#: builtin/index-pack.c:1287
5348#, c-format
5349msgid "cannot write keep file '%s'"
5350msgstr "无法写保留文件 '%s'"
5351
5352#: builtin/index-pack.c:1295
5353#, c-format
5354msgid "cannot close written keep file '%s'"
5355msgstr "无法关闭保留文件 '%s'"
5356
5357#: builtin/index-pack.c:1308
5358msgid "cannot store pack file"
5359msgstr "无法存储包文件"
5360
5361#: builtin/index-pack.c:1319
5362msgid "cannot store index file"
5363msgstr "无法存储索引文件"
5364
5365#: builtin/index-pack.c:1352
5366#, c-format
5367msgid "bad pack.indexversion=%<PRIu32>"
5368msgstr "坏的 pack.indexversion=%<PRIu32>"
5369
5370#: builtin/index-pack.c:1358
5371#, c-format
5372msgid "invalid number of threads specified (%d)"
5373msgstr "指定的线程数无效(%d)"
5374
5375#: builtin/index-pack.c:1362 builtin/index-pack.c:1535
5376#, c-format
5377msgid "no threads support, ignoring %s"
5378msgstr "没有线程支持,忽略 %s"
5379
5380#: builtin/index-pack.c:1420
5381#, c-format
5382msgid "Cannot open existing pack file '%s'"
5383msgstr "无法打开现存包文件 '%s'"
5384
5385#: builtin/index-pack.c:1422
5386#, c-format
5387msgid "Cannot open existing pack idx file for '%s'"
5388msgstr "无法为 %s 打开包索引文件"
5389
5390#: builtin/index-pack.c:1469
5391#, c-format
5392msgid "non delta: %d object"
5393msgid_plural "non delta: %d objects"
5394msgstr[0] "非 delta:%d 个对象"
5395msgstr[1] "非 delta:%d 个对象"
5396
5397#: builtin/index-pack.c:1476
5398#, c-format
5399msgid "chain length = %d: %lu object"
5400msgid_plural "chain length = %d: %lu objects"
5401msgstr[0] "链长 = %d: %lu 对象"
5402msgstr[1] "链长 = %d: %lu 对象"
5403
5404#: builtin/index-pack.c:1503
5405msgid "Cannot come back to cwd"
5406msgstr "无法返回当前工作目录"
5407
5408#: builtin/index-pack.c:1547 builtin/index-pack.c:1550
5409#: builtin/index-pack.c:1562 builtin/index-pack.c:1566
5410#, c-format
5411msgid "bad %s"
5412msgstr "错误选项 %s"
5413
5414#: builtin/index-pack.c:1580
5415msgid "--fix-thin cannot be used without --stdin"
5416msgstr "--fix-thin 不能和 --stdin 同时使用"
5417
5418#: builtin/index-pack.c:1584 builtin/index-pack.c:1594
5419#, c-format
5420msgid "packfile name '%s' does not end with '.pack'"
5421msgstr "包名 '%s' 没有以 '.pack' 结尾"
5422
5423#: builtin/index-pack.c:1603
5424msgid "--verify with no packfile name given"
5425msgstr "--verify 没有提供包名参数"
5426
5427#: builtin/init-db.c:35
5428#, c-format
5429msgid "Could not make %s writable by group"
5430msgstr "不能设置 %s 为组可写"
5431
5432#: builtin/init-db.c:62
5433#, c-format
5434msgid "insanely long template name %s"
5435msgstr "太长的模版名 %s"
5436
5437#: builtin/init-db.c:67
5438#, c-format
5439msgid "cannot stat '%s'"
5440msgstr "不能枚举 '%s' 状态"
5441
5442#: builtin/init-db.c:73
5443#, c-format
5444msgid "cannot stat template '%s'"
5445msgstr "不能枚举模版 '%s' 状态"
5446
5447#: builtin/init-db.c:80
5448#, c-format
5449msgid "cannot opendir '%s'"
5450msgstr "不能打开目录 '%s'"
5451
5452#: builtin/init-db.c:97
5453#, c-format
5454msgid "cannot readlink '%s'"
5455msgstr "不能读取链接 '%s'"
5456
5457#: builtin/init-db.c:99
5458#, c-format
5459msgid "insanely long symlink %s"
5460msgstr "太长的符号链接 %s"
5461
5462#: builtin/init-db.c:102
5463#, c-format
5464msgid "cannot symlink '%s' '%s'"
5465msgstr "不能自 '%s' 到 '%s' 创建符号链接"
5466
5467#: builtin/init-db.c:106
5468#, c-format
5469msgid "cannot copy '%s' to '%s'"
5470msgstr "不能拷贝 '%s' 至 '%s'"
5471
5472#: builtin/init-db.c:110
5473#, c-format
5474msgid "ignoring template %s"
5475msgstr "忽略模版 %s"
5476
5477#: builtin/init-db.c:133
5478#, c-format
5479msgid "insanely long template path %s"
5480msgstr "太长的模版路径 %s"
5481
5482#: builtin/init-db.c:141
5483#, c-format
5484msgid "templates not found %s"
5485msgstr "模版未找到 %s"
5486
5487#: builtin/init-db.c:154
5488#, c-format
5489msgid "not copying templates of a wrong format version %d from '%s'"
5490msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
5491
5492#: builtin/init-db.c:192
5493#, c-format
5494msgid "insane git directory %s"
5495msgstr "不正常的 git 目录 %s"
5496
5497#: builtin/init-db.c:323 builtin/init-db.c:326
5498#, c-format
5499msgid "%s already exists"
5500msgstr "%s 已经存在"
5501
5502#: builtin/init-db.c:355
5503#, c-format
5504msgid "unable to handle file type %d"
5505msgstr "不能处理 %d 类型的文件"
5506
5507#: builtin/init-db.c:358
5508#, c-format
5509msgid "unable to move %s to %s"
5510msgstr "不能移动 %s 至 %s"
5511
5512#: builtin/init-db.c:363
5513#, c-format
5514msgid "Could not create git link %s"
5515msgstr "不能创建 git link %s"
5516
5517#.
5518#. * TRANSLATORS: The first '%s' is either "Reinitialized
5519#. * existing" or "Initialized empty", the second " shared" or
5520#. * "", and the last '%s%s' is the verbatim directory name.
5521#.
5522#: builtin/init-db.c:420
5523#, c-format
5524msgid "%s%s Git repository in %s%s\n"
5525msgstr "%s%s Git 版本库于 %s%s\n"
5526
5527#: builtin/init-db.c:421
5528msgid "Reinitialized existing"
5529msgstr "重新初始化现存的"
5530
5531#: builtin/init-db.c:421
5532msgid "Initialized empty"
5533msgstr "初始化空的"
5534
5535# 译者:中文字符串拼接,可删除前导空格
5536#: builtin/init-db.c:422
5537msgid " shared"
5538msgstr "共享"
5539
5540#: builtin/init-db.c:441
5541msgid "cannot tell cwd"
5542msgstr "无法获知当前路径"
5543
5544#: builtin/init-db.c:467
5545msgid ""
5546"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5547"shared[=<permissions>]] [directory]"
5548msgstr ""
5549"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
5550"[目录]"
5551
5552#: builtin/init-db.c:490
5553msgid "permissions"
5554msgstr "权限"
5555
5556#: builtin/init-db.c:491
5557msgid "specify that the git repository is to be shared amongst several users"
5558msgstr "指定 git 版本库是多个用户之间共享的"
5559
5560#: builtin/init-db.c:493 builtin/prune-packed.c:77
5561msgid "be quiet"
5562msgstr "保持安静"
5563
5564#: builtin/init-db.c:522 builtin/init-db.c:529
5565#, c-format
5566msgid "cannot mkdir %s"
5567msgstr "不能创建目录 %s"
5568
5569#: builtin/init-db.c:533
5570#, c-format
5571msgid "cannot chdir to %s"
5572msgstr "不能切换目录到 %s"
5573
5574#: builtin/init-db.c:555
5575#, c-format
5576msgid ""
5577"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5578"dir=<directory>)"
5579msgstr ""
5580"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
5581"dir=<directory>)"
5582
5583#: builtin/init-db.c:579
5584msgid "Cannot access current working directory"
5585msgstr "不能访问当前工作目录"
5586
5587#: builtin/init-db.c:586
5588#, c-format
5589msgid "Cannot access work tree '%s'"
5590msgstr "不能访问工作区 '%s'"
5591
5592#: builtin/log.c:40
5593msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5594msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"
5595
5596#: builtin/log.c:41
5597msgid " or: git show [options] <object>..."
5598msgstr " 或者:git show [选项] <对象>..."
5599
5600#: builtin/log.c:103
5601msgid "suppress diff output"
5602msgstr "不显示差异输出"
5603
5604#: builtin/log.c:104
5605msgid "show source"
5606msgstr "显示源"
5607
5608#: builtin/log.c:105
5609msgid "Use mail map file"
5610msgstr "使用邮件映射文件"
5611
5612#: builtin/log.c:106
5613msgid "decorate options"
5614msgstr "修饰选项"
5615
5616#: builtin/log.c:199
5617#, c-format
5618msgid "Final output: %d %s\n"
5619msgstr "最终输出:%d %s\n"
5620
5621#: builtin/log.c:422 builtin/log.c:514
5622#, c-format
5623msgid "Could not read object %s"
5624msgstr "不能读取对象 %s"
5625
5626#: builtin/log.c:538
5627#, c-format
5628msgid "Unknown type: %d"
5629msgstr "未知类型:%d"
5630
5631#: builtin/log.c:630
5632msgid "format.headers without value"
5633msgstr "format.headers 没有值"
5634
5635#: builtin/log.c:704
5636msgid "name of output directory is too long"
5637msgstr "输出目录名太长"
5638
5639#: builtin/log.c:720
5640#, c-format
5641msgid "Cannot open patch file %s"
5642msgstr "无法打开补丁文件 %s"
5643
5644#: builtin/log.c:734
5645msgid "Need exactly one range."
5646msgstr "只需要一个范围。"
5647
5648#: builtin/log.c:742
5649msgid "Not a range."
5650msgstr "不是一个范围。"
5651
5652#: builtin/log.c:815
5653msgid "Cover letter needs email format"
5654msgstr "信封需要邮件地址格式"
5655
5656#: builtin/log.c:888
5657#, c-format
5658msgid "insane in-reply-to: %s"
5659msgstr "不正常的 in-reply-to:%s"
5660
5661#: builtin/log.c:916
5662msgid "git format-patch [options] [<since> | <revision range>]"
5663msgstr "git format-patch [选项] [<从> | <修订集范围>]"
5664
5665#: builtin/log.c:961
5666msgid "Two output directories?"
5667msgstr "两个输出目录?"
5668
5669#: builtin/log.c:1099
5670msgid "use [PATCH n/m] even with a single patch"
5671msgstr "使用 [PATCH n/m],即使只有一个补丁"
5672
5673#: builtin/log.c:1102
5674msgid "use [PATCH] even with multiple patches"
5675msgstr "使用 [PATCH],即使有多个补丁"
5676
5677#: builtin/log.c:1106
5678msgid "print patches to standard out"
5679msgstr "打印补丁到标准输出"
5680
5681#: builtin/log.c:1108
5682msgid "generate a cover letter"
5683msgstr "生成一封附信"
5684
5685#: builtin/log.c:1110
5686msgid "use simple number sequence for output file names"
5687msgstr "使用简单的数字序列作为输出文件名"
5688
5689#: builtin/log.c:1111
5690msgid "sfx"
5691msgstr "后缀"
5692
5693#: builtin/log.c:1112
5694msgid "use <sfx> instead of '.patch'"
5695msgstr "使用 <后缀> 代替 '.patch'"
5696
5697#: builtin/log.c:1114
5698msgid "start numbering patches at <n> instead of 1"
5699msgstr "补丁以 <n> 开始编号,而不是1"
5700
5701#: builtin/log.c:1116
5702msgid "mark the series as Nth re-roll"
5703msgstr "标记补丁系列是第几次重制"
5704
5705#: builtin/log.c:1118
5706msgid "Use [<prefix>] instead of [PATCH]"
5707msgstr "使用 [<前缀>] 代替 [PATCH]"
5708
5709#: builtin/log.c:1121
5710msgid "store resulting files in <dir>"
5711msgstr "把结果文件存储在 <dir>"
5712
5713#: builtin/log.c:1124
5714msgid "don't strip/add [PATCH]"
5715msgstr "不删除/添加 [PATCH]"
5716
5717#: builtin/log.c:1127
5718msgid "don't output binary diffs"
5719msgstr "不输出二进制差异"
5720
5721#: builtin/log.c:1129
5722msgid "don't include a patch matching a commit upstream"
5723msgstr "不包含已在上游提交中的补丁"
5724
5725#: builtin/log.c:1131
5726msgid "show patch format instead of default (patch + stat)"
5727msgstr "显示纯补丁格式而非默认的(补丁+状态)"
5728
5729#: builtin/log.c:1133
5730msgid "Messaging"
5731msgstr "邮件发送"
5732
5733#: builtin/log.c:1134
5734msgid "header"
5735msgstr "header"
5736
5737#: builtin/log.c:1135
5738msgid "add email header"
5739msgstr "添加邮件头"
5740
5741#: builtin/log.c:1136 builtin/log.c:1138
5742msgid "email"
5743msgstr "邮件地址"
5744
5745#: builtin/log.c:1136
5746msgid "add To: header"
5747msgstr "添加收件人"
5748
5749#: builtin/log.c:1138
5750msgid "add Cc: header"
5751msgstr "添加抄送"
5752
5753#: builtin/log.c:1140
5754msgid "message-id"
5755msgstr "message-id"
5756
5757#: builtin/log.c:1141
5758msgid "make first mail a reply to <message-id>"
5759msgstr "使第一封邮件作为对 <message-id> 的回复"
5760
5761#: builtin/log.c:1142 builtin/log.c:1145
5762msgid "boundary"
5763msgstr "边界"
5764
5765#: builtin/log.c:1143
5766msgid "attach the patch"
5767msgstr "附件方式添加补丁"
5768
5769#: builtin/log.c:1146
5770msgid "inline the patch"
5771msgstr "内联显示补丁"
5772
5773#: builtin/log.c:1150
5774msgid "enable message threading, styles: shallow, deep"
5775msgstr "启用邮件线索,风格:浅,深"
5776
5777#: builtin/log.c:1152
5778msgid "signature"
5779msgstr "签名"
5780
5781#: builtin/log.c:1153
5782msgid "add a signature"
5783msgstr "添加一个签名"
5784
5785#: builtin/log.c:1155
5786msgid "don't print the patch filenames"
5787msgstr "不要打印补丁文件名"
5788
5789#: builtin/log.c:1239
5790msgid "-n and -k are mutually exclusive."
5791msgstr "-n 和 -k 互斥。"
5792
5793#: builtin/log.c:1241
5794msgid "--subject-prefix and -k are mutually exclusive."
5795msgstr "--subject-prefix 和 -k 互斥。"
5796
5797#: builtin/log.c:1249
5798msgid "--name-only does not make sense"
5799msgstr "--name-only 无意义"
5800
5801#: builtin/log.c:1251
5802msgid "--name-status does not make sense"
5803msgstr "--name-status 无意义"
5804
5805#: builtin/log.c:1253
5806msgid "--check does not make sense"
5807msgstr "--check 无意义"
5808
5809#: builtin/log.c:1276
5810msgid "standard output, or directory, which one?"
5811msgstr "标准输出或目录,哪一个?"
5812
5813#: builtin/log.c:1278
5814#, c-format
5815msgid "Could not create directory '%s'"
5816msgstr "不能创建目录 '%s'"
5817
5818#: builtin/log.c:1431
5819msgid "Failed to create output files"
5820msgstr "无法创建输出文件"
5821
5822#: builtin/log.c:1480
5823msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5824msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
5825
5826#: builtin/log.c:1535
5827#, c-format
5828msgid ""
5829"Could not find a tracked remote branch, please specify <upstream> manually.\n"
5830msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
5831
5832#: builtin/log.c:1548 builtin/log.c:1550 builtin/log.c:1562
5833#, c-format
5834msgid "Unknown commit %s"
5835msgstr "未知提交 %s"
5836
5837#: builtin/ls-files.c:409
5838msgid "git ls-files [options] [<file>...]"
5839msgstr "git ls-files [选项] [<文件>...]"
5840
5841#: builtin/ls-files.c:466
5842msgid "identify the file status with tags"
5843msgstr "用标签标识文件的状态"
5844
5845#: builtin/ls-files.c:468
5846msgid "use lowercase letters for 'assume unchanged' files"
5847msgstr "使用小写字母表示 '假设未改变的' 文件"
5848
5849#: builtin/ls-files.c:470
5850msgid "show cached files in the output (default)"
5851msgstr "显示缓存的文件(默认)"
5852
5853#: builtin/ls-files.c:472
5854msgid "show deleted files in the output"
5855msgstr "显示已删除的文件"
5856
5857#: builtin/ls-files.c:474
5858msgid "show modified files in the output"
5859msgstr "显示已修改的文件"
5860
5861#: builtin/ls-files.c:476
5862msgid "show other files in the output"
5863msgstr "显示其它文件"
5864
5865#: builtin/ls-files.c:478
5866msgid "show ignored files in the output"
5867msgstr "显示忽略的文件"
5868
5869#: builtin/ls-files.c:481
5870msgid "show staged contents' object name in the output"
5871msgstr "显示暂存区内容的对象名称"
5872
5873#: builtin/ls-files.c:483
5874msgid "show files on the filesystem that need to be removed"
5875msgstr "显示文件系统需要删除的文件"
5876
5877#: builtin/ls-files.c:485
5878msgid "show 'other' directories' name only"
5879msgstr "只显示“其他”目录的名称"
5880
5881#: builtin/ls-files.c:488
5882msgid "don't show empty directories"
5883msgstr "不显示空目录"
5884
5885#: builtin/ls-files.c:491
5886msgid "show unmerged files in the output"
5887msgstr "显示未合并的文件"
5888
5889#: builtin/ls-files.c:493
5890msgid "show resolve-undo information"
5891msgstr "显示 resolve-undo 信息"
5892
5893#: builtin/ls-files.c:495
5894msgid "skip files matching pattern"
5895msgstr "匹配排除文件的模式"
5896
5897#: builtin/ls-files.c:498
5898msgid "exclude patterns are read from <file>"
5899msgstr "从 <文件> 中读取排除模式"
5900
5901#: builtin/ls-files.c:501
5902msgid "read additional per-directory exclude patterns in <file>"
5903msgstr "从 <文件> 读取额外的每个目录的排除模式"
5904
5905#: builtin/ls-files.c:503
5906msgid "add the standard git exclusions"
5907msgstr "添加标准的 git 排除"
5908
5909#: builtin/ls-files.c:506
5910msgid "make the output relative to the project top directory"
5911msgstr "显示相对于顶级目录的文件名"
5912
5913#: builtin/ls-files.c:509
5914msgid "if any <file> is not in the index, treat this as an error"
5915msgstr "如果任何 <文件> 都不在索引区,视为错误"
5916
5917#: builtin/ls-files.c:510
5918msgid "tree-ish"
5919msgstr "树或提交"
5920
5921#: builtin/ls-files.c:511
5922msgid "pretend that paths removed since <tree-ish> are still present"
5923msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
5924
5925#: builtin/ls-files.c:513
5926msgid "show debugging data"
5927msgstr "显示调试数据"
5928
5929#: builtin/ls-tree.c:27
5930msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5931msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
5932
5933#: builtin/ls-tree.c:125
5934msgid "only show trees"
5935msgstr "只显示树"
5936
5937#: builtin/ls-tree.c:127
5938msgid "recurse into subtrees"
5939msgstr "递归到子树"
5940
5941#: builtin/ls-tree.c:129
5942msgid "show trees when recursing"
5943msgstr "当递归时显示树"
5944
5945#: builtin/ls-tree.c:132
5946msgid "terminate entries with NUL byte"
5947msgstr "条目以NUL字符终止"
5948
5949#: builtin/ls-tree.c:133
5950msgid "include object size"
5951msgstr "包括对象大小"
5952
5953#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5954msgid "list only filenames"
5955msgstr "只列出文件名"
5956
5957#: builtin/ls-tree.c:140
5958msgid "use full path names"
5959msgstr "使用文件的全路径"
5960
5961#: builtin/ls-tree.c:142
5962msgid "list entire tree; not just current directory (implies --full-name)"
5963msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
5964
5965#: builtin/merge.c:43
5966msgid "git merge [options] [<commit>...]"
5967msgstr "git merge [选项] [<提交>...]"
5968
5969#: builtin/merge.c:44
5970msgid "git merge [options] <msg> HEAD <commit>"
5971msgstr "git merge [选项] <说明> HEAD <提交>"
5972
5973#: builtin/merge.c:45
5974msgid "git merge --abort"
5975msgstr "git merge --abort"
5976
5977#: builtin/merge.c:90
5978msgid "switch `m' requires a value"
5979msgstr "开关 `m' 需要一个值"
5980
5981#: builtin/merge.c:127
5982#, c-format
5983msgid "Could not find merge strategy '%s'.\n"
5984msgstr "不能找到合并策略 '%s'。\n"
5985
5986#: builtin/merge.c:128
5987#, c-format
5988msgid "Available strategies are:"
5989msgstr "可用的策略有:"
5990
5991#: builtin/merge.c:133
5992#, c-format
5993msgid "Available custom strategies are:"
5994msgstr "可用的自定义策略有:"
5995
5996#: builtin/merge.c:183
5997msgid "do not show a diffstat at the end of the merge"
5998msgstr "在合并的最后不显示差异统计"
5999
6000#: builtin/merge.c:186
6001msgid "show a diffstat at the end of the merge"
6002msgstr "在合并的最后显示差异统计"
6003
6004#: builtin/merge.c:187
6005msgid "(synonym to --stat)"
6006msgstr "(和 --stat 同义)"
6007
6008#: builtin/merge.c:189
6009msgid "add (at most <n>) entries from shortlog to merge commit message"
6010msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6011
6012#: builtin/merge.c:192
6013msgid "create a single commit instead of doing a merge"
6014msgstr "创建一个单独的提交而不是做一次合并"
6015
6016#: builtin/merge.c:194
6017msgid "perform a commit if the merge succeeds (default)"
6018msgstr "如果合并成功,执行一次提交(默认)"
6019
6020#: builtin/merge.c:196
6021msgid "edit message before committing"
6022msgstr "在提交前编辑提交说明"
6023
6024#: builtin/merge.c:198
6025msgid "allow fast-forward (default)"
6026msgstr "允许快进(默认)"
6027
6028#: builtin/merge.c:200
6029msgid "abort if fast-forward is not possible"
6030msgstr "如果不能快进就放弃合并"
6031
6032#: builtin/merge.c:203
6033msgid "Verify that the named commit has a valid GPG signature"
6034msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6035
6036#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112
6037msgid "strategy"
6038msgstr "策略"
6039
6040#: builtin/merge.c:205
6041msgid "merge strategy to use"
6042msgstr "要使用的合并策略"
6043
6044#: builtin/merge.c:206
6045msgid "option=value"
6046msgstr "option=value"
6047
6048#: builtin/merge.c:207
6049msgid "option for selected merge strategy"
6050msgstr "所选的合并策略的选项"
6051
6052#: builtin/merge.c:209
6053msgid "merge commit message (for a non-fast-forward merge)"
6054msgstr "合并的提交说明(针对非快进式合并)"
6055
6056#: builtin/merge.c:213
6057msgid "abort the current in-progress merge"
6058msgstr "放弃当前正在进行的合并"
6059
6060#: builtin/merge.c:242
6061msgid "could not run stash."
6062msgstr "不能进行进度保存。"
6063
6064#: builtin/merge.c:247
6065msgid "stash failed"
6066msgstr "进度保存失败"
6067
6068#: builtin/merge.c:252
6069#, c-format
6070msgid "not a valid object: %s"
6071msgstr "不是一个有效对象:%s"
6072
6073#: builtin/merge.c:271 builtin/merge.c:288
6074msgid "read-tree failed"
6075msgstr "读取树失败"
6076
6077# 译者:注意保持前导空格
6078#: builtin/merge.c:318
6079msgid " (nothing to squash)"
6080msgstr " (无可压缩)"
6081
6082#: builtin/merge.c:331
6083#, c-format
6084msgid "Squash commit -- not updating HEAD\n"
6085msgstr "压缩提交 -- 未更新 HEAD\n"
6086
6087#: builtin/merge.c:363
6088msgid "Writing SQUASH_MSG"
6089msgstr "写入 SQUASH_MSG"
6090
6091#: builtin/merge.c:365
6092msgid "Finishing SQUASH_MSG"
6093msgstr "完成 SQUASH_MSG"
6094
6095#: builtin/merge.c:388
6096#, c-format
6097msgid "No merge message -- not updating HEAD\n"
6098msgstr "无合并信息 -- 未更新 HEAD\n"
6099
6100#: builtin/merge.c:438
6101#, c-format
6102msgid "'%s' does not point to a commit"
6103msgstr "'%s' 没有指向一个提交"
6104
6105#: builtin/merge.c:550
6106#, c-format
6107msgid "Bad branch.%s.mergeoptions string: %s"
6108msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6109
6110#: builtin/merge.c:643
6111msgid "git write-tree failed to write a tree"
6112msgstr "git write-tree 无法写入一树对象"
6113
6114#: builtin/merge.c:671
6115msgid "Not handling anything other than two heads merge."
6116msgstr "不能处理两个头合并之外的任何操作。"
6117
6118#: builtin/merge.c:685
6119#, c-format
6120msgid "Unknown option for merge-recursive: -X%s"
6121msgstr "merge-recursive 的未知选项:-X%s"
6122
6123#: builtin/merge.c:699
6124#, c-format
6125msgid "unable to write %s"
6126msgstr "不能写 %s"
6127
6128#: builtin/merge.c:788
6129#, c-format
6130msgid "Could not read from '%s'"
6131msgstr "不能从 '%s' 读取"
6132
6133#: builtin/merge.c:797
6134#, c-format
6135msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6136msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6137
6138#: builtin/merge.c:803
6139#, c-format
6140msgid ""
6141"Please enter a commit message to explain why this merge is necessary,\n"
6142"especially if it merges an updated upstream into a topic branch.\n"
6143"\n"
6144"Lines starting with '%c' will be ignored, and an empty message aborts\n"
6145"the commit.\n"
6146msgstr ""
6147"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6148"合并到主题分支。\n"
6149"\n"
6150"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
6151
6152#: builtin/merge.c:827
6153msgid "Empty commit message."
6154msgstr "空提交信息。"
6155
6156#: builtin/merge.c:839
6157#, c-format
6158msgid "Wonderful.\n"
6159msgstr "太棒了。\n"
6160
6161#: builtin/merge.c:904
6162#, c-format
6163msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6164msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6165
6166#: builtin/merge.c:920
6167#, c-format
6168msgid "'%s' is not a commit"
6169msgstr "'%s' 不是一个提交"
6170
6171#: builtin/merge.c:961
6172msgid "No current branch."
6173msgstr "没有当前分支。"
6174
6175#: builtin/merge.c:963
6176msgid "No remote for the current branch."
6177msgstr "当前分支没有对应的远程版本库。"
6178
6179#: builtin/merge.c:965
6180msgid "No default upstream defined for the current branch."
6181msgstr "当前分支没有定义默认的上游分支。"
6182
6183#: builtin/merge.c:970
6184#, c-format
6185msgid "No remote tracking branch for %s from %s"
6186msgstr "%s 没有来自 %s 的远程跟踪分支"
6187
6188#: builtin/merge.c:1057 builtin/merge.c:1214
6189#, c-format
6190msgid "%s - not something we can merge"
6191msgstr "%s - 不能被合并"
6192
6193#: builtin/merge.c:1125
6194msgid "There is no merge to abort (MERGE_HEAD missing)."
6195msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
6196
6197#: builtin/merge.c:1141 git-pull.sh:31
6198msgid ""
6199"You have not concluded your merge (MERGE_HEAD exists).\n"
6200"Please, commit your changes before you can merge."
6201msgstr ""
6202"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
6203"请在合并前先提交您的修改。"
6204
6205#: builtin/merge.c:1144 git-pull.sh:34
6206msgid "You have not concluded your merge (MERGE_HEAD exists)."
6207msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6208
6209#: builtin/merge.c:1148
6210msgid ""
6211"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6212"Please, commit your changes before you can merge."
6213msgstr ""
6214"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
6215"请在合并前先提交您的修改。"
6216
6217#: builtin/merge.c:1151
6218msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6219msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6220
6221#: builtin/merge.c:1160
6222msgid "You cannot combine --squash with --no-ff."
6223msgstr "您不能将 --squash 与 --no-ff 同时使用。"
6224
6225#: builtin/merge.c:1165
6226msgid "You cannot combine --no-ff with --ff-only."
6227msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
6228
6229#: builtin/merge.c:1172
6230msgid "No commit specified and merge.defaultToUpstream not set."
6231msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
6232
6233#: builtin/merge.c:1204
6234msgid "Can merge only exactly one commit into empty head"
6235msgstr "只能将一个提交合并到空分支上"
6236
6237#: builtin/merge.c:1207
6238msgid "Squash commit into empty head not supported yet"
6239msgstr "尚不支持到空分支的压缩提交"
6240
6241#: builtin/merge.c:1209
6242msgid "Non-fast-forward commit does not make sense into an empty head"
6243msgstr "到空分支的非快进式提交没有意义"
6244
6245#: builtin/merge.c:1265
6246#, c-format
6247msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6248msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
6249
6250#: builtin/merge.c:1268
6251#, c-format
6252msgid "Commit %s has a bad GPG signature allegedly by %s."
6253msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
6254
6255#. 'N'
6256#: builtin/merge.c:1271
6257#, c-format
6258msgid "Commit %s does not have a GPG signature."
6259msgstr "提交 %s 没有一个 GPG 签名。"
6260
6261#: builtin/merge.c:1274
6262#, c-format
6263msgid "Commit %s has a good GPG signature by %s\n"
6264msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
6265
6266#: builtin/merge.c:1358
6267#, c-format
6268msgid "Updating %s..%s\n"
6269msgstr "更新 %s..%s\n"
6270
6271#: builtin/merge.c:1397
6272#, c-format
6273msgid "Trying really trivial in-index merge...\n"
6274msgstr "尝试非常小的索引内合并...\n"
6275
6276#: builtin/merge.c:1404
6277#, c-format
6278msgid "Nope.\n"
6279msgstr "无。\n"
6280
6281#: builtin/merge.c:1436
6282msgid "Not possible to fast-forward, aborting."
6283msgstr "无法快进,终止。"
6284
6285#: builtin/merge.c:1459 builtin/merge.c:1538
6286#, c-format
6287msgid "Rewinding the tree to pristine...\n"
6288msgstr "将树回滚至原始状态...\n"
6289
6290#: builtin/merge.c:1463
6291#, c-format
6292msgid "Trying merge strategy %s...\n"
6293msgstr "尝试合并策略 %s...\n"
6294
6295#: builtin/merge.c:1529
6296#, c-format
6297msgid "No merge strategy handled the merge.\n"
6298msgstr "没有合并策略处理此合并。\n"
6299
6300#: builtin/merge.c:1531
6301#, c-format
6302msgid "Merge with strategy %s failed.\n"
6303msgstr "使用策略 %s 合并失败。\n"
6304
6305#: builtin/merge.c:1540
6306#, c-format
6307msgid "Using the %s to prepare resolving by hand.\n"
6308msgstr "使用 %s 以准备手工解决。\n"
6309
6310#: builtin/merge.c:1552
6311#, c-format
6312msgid "Automatic merge went well; stopped before committing as requested\n"
6313msgstr "自动合并进展顺利,按要求在提交前停止\n"
6314
6315#: builtin/merge-base.c:26
6316msgid "git merge-base [-a|--all] <commit> <commit>..."
6317msgstr "git merge-base [-a|--all] <提交> <提交>..."
6318
6319#: builtin/merge-base.c:27
6320msgid "git merge-base [-a|--all] --octopus <commit>..."
6321msgstr "git merge-base [-a|--all] --octopus <提交>..."
6322
6323#: builtin/merge-base.c:28
6324msgid "git merge-base --independent <commit>..."
6325msgstr "git merge-base --independent <提交>..."
6326
6327#: builtin/merge-base.c:29
6328msgid "git merge-base --is-ancestor <commit> <commit>"
6329msgstr "git merge-base --is-ancestor <提交> <提交>"
6330
6331#: builtin/merge-base.c:98
6332msgid "output all common ancestors"
6333msgstr "输出所有共同的祖先"
6334
6335#: builtin/merge-base.c:99
6336msgid "find ancestors for a single n-way merge"
6337msgstr "查找一个多路合并的祖先提交"
6338
6339#: builtin/merge-base.c:100
6340msgid "list revs not reachable from others"
6341msgstr "显示不能被其他访问到的版本"
6342
6343#: builtin/merge-base.c:102
6344msgid "is the first one ancestor of the other?"
6345msgstr "第一个是其他的祖先提交么?"
6346
6347#: builtin/merge-file.c:8
6348msgid ""
6349"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6350"file2"
6351msgstr ""
6352"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
6353
6354#: builtin/merge-file.c:33
6355msgid "send results to standard output"
6356msgstr "将结果发送到标准输出"
6357
6358#: builtin/merge-file.c:34
6359msgid "use a diff3 based merge"
6360msgstr "使用基于 diff3 的合并"
6361
6362#: builtin/merge-file.c:35
6363msgid "for conflicts, use our version"
6364msgstr "如果冲突,使用我们的版本"
6365
6366#: builtin/merge-file.c:37
6367msgid "for conflicts, use their version"
6368msgstr "如果冲突,使用他们的版本"
6369
6370#: builtin/merge-file.c:39
6371msgid "for conflicts, use a union version"
6372msgstr "如果冲突,使用联合版本"
6373
6374#: builtin/merge-file.c:42
6375msgid "for conflicts, use this marker size"
6376msgstr "如果冲突,使用指定长度的标记"
6377
6378#: builtin/merge-file.c:43
6379msgid "do not warn about conflicts"
6380msgstr "不要警告冲突"
6381
6382#: builtin/merge-file.c:45
6383msgid "set labels for file1/orig_file/file2"
6384msgstr "为 file1/orig_file/file2 设置标签"
6385
6386#: builtin/mktree.c:67
6387msgid "git mktree [-z] [--missing] [--batch]"
6388msgstr "git mktree [-z] [--missing] [--batch]"
6389
6390#: builtin/mktree.c:153
6391msgid "input is NUL terminated"
6392msgstr "输入以 NUL 字符终止"
6393
6394#: builtin/mktree.c:154 builtin/write-tree.c:24
6395msgid "allow missing objects"
6396msgstr "允许丢失的对象"
6397
6398#: builtin/mktree.c:155
6399msgid "allow creation of more than one tree"
6400msgstr "允许创建一个以上的树"
6401
6402#: builtin/mv.c:14
6403msgid "git mv [options] <source>... <destination>"
6404msgstr "git mv [选项] <源>... <目标>"
6405
6406#: builtin/mv.c:64
6407msgid "force move/rename even if target exists"
6408msgstr "强制移动/重命令,即使目标存在"
6409
6410#: builtin/mv.c:65
6411msgid "skip move/rename errors"
6412msgstr "跳过移动/重命名错误"
6413
6414#: builtin/mv.c:108
6415#, c-format
6416msgid "Checking rename of '%s' to '%s'\n"
6417msgstr "检查 '%s' 到 '%s' 的重命名\n"
6418
6419#: builtin/mv.c:112
6420msgid "bad source"
6421msgstr "坏的源"
6422
6423#: builtin/mv.c:115
6424msgid "can not move directory into itself"
6425msgstr "不能将目录移动到自身"
6426
6427#: builtin/mv.c:118
6428msgid "cannot move directory over file"
6429msgstr "不能将目录移动到文件"
6430
6431#: builtin/mv.c:128
6432#, c-format
6433msgid "Huh? %.*s is in index?"
6434msgstr "嗯?%.*s 在索引中?"
6435
6436#: builtin/mv.c:140
6437msgid "source directory is empty"
6438msgstr "源目录为空"
6439
6440#: builtin/mv.c:171
6441msgid "not under version control"
6442msgstr "不在版本控制之下"
6443
6444#: builtin/mv.c:173
6445msgid "destination exists"
6446msgstr "目标已存在"
6447
6448#: builtin/mv.c:181
6449#, c-format
6450msgid "overwriting '%s'"
6451msgstr "覆盖 '%s'"
6452
6453#: builtin/mv.c:184
6454msgid "Cannot overwrite"
6455msgstr "不能覆盖"
6456
6457#: builtin/mv.c:187
6458msgid "multiple sources for the same target"
6459msgstr "同一目标具有多个源"
6460
6461#: builtin/mv.c:202
6462#, c-format
6463msgid "%s, source=%s, destination=%s"
6464msgstr "%s,源=%s,目标=%s"
6465
6466#: builtin/mv.c:212
6467#, c-format
6468msgid "Renaming %s to %s\n"
6469msgstr "重命名 %s 至 %s\n"
6470
6471#: builtin/mv.c:215 builtin/remote.c:731
6472#, c-format
6473msgid "renaming '%s' failed"
6474msgstr "重命名 '%s' 失败"
6475
6476#: builtin/name-rev.c:175
6477msgid "git name-rev [options] <commit>..."
6478msgstr "git name-rev [选项] <提交>..."
6479
6480#: builtin/name-rev.c:176
6481msgid "git name-rev [options] --all"
6482msgstr "git name-rev [选项] --all"
6483
6484#: builtin/name-rev.c:177
6485msgid "git name-rev [options] --stdin"
6486msgstr "git name-rev [选项] --stdin"
6487
6488#: builtin/name-rev.c:229
6489msgid "print only names (no SHA-1)"
6490msgstr "只打印名称(无 SHA-1)"
6491
6492#: builtin/name-rev.c:230
6493msgid "only use tags to name the commits"
6494msgstr "只使用 tags 来命名提交"
6495
6496#: builtin/name-rev.c:232
6497msgid "only use refs matching <pattern>"
6498msgstr "只使用和 <模式> 相匹配的引用"
6499
6500#: builtin/name-rev.c:234
6501msgid "list all commits reachable from all refs"
6502msgstr "列出可以从所有引用访问的提交"
6503
6504#: builtin/name-rev.c:235
6505msgid "read from stdin"
6506msgstr "从标准输入读取"
6507
6508#: builtin/name-rev.c:236
6509msgid "allow to print `undefined` names"
6510msgstr "允许打印 `未定义` 的名称"
6511
6512#: builtin/notes.c:26
6513msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6514msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
6515
6516#: builtin/notes.c:27
6517msgid ""
6518"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6519"<object>] [<object>]"
6520msgstr ""
6521"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
6522"象>] [<对象>]"
6523
6524#: builtin/notes.c:28
6525msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6526msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
6527
6528#: builtin/notes.c:29
6529msgid ""
6530"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6531"<object>] [<object>]"
6532msgstr ""
6533"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
6534">] [<对象>]"
6535
6536#: builtin/notes.c:30
6537msgid "git notes [--ref <notes_ref>] edit [<object>]"
6538msgstr "git notes [--ref <注解引用>] edit [<对象>]"
6539
6540#: builtin/notes.c:31
6541msgid "git notes [--ref <notes_ref>] show [<object>]"
6542msgstr "git notes [--ref <注解引用>] show [<对象>]"
6543
6544#: builtin/notes.c:32
6545msgid ""
6546"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6547msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
6548
6549#: builtin/notes.c:33
6550msgid "git notes merge --commit [-v | -q]"
6551msgstr "git notes merge --commit [-v | -q]"
6552
6553#: builtin/notes.c:34
6554msgid "git notes merge --abort [-v | -q]"
6555msgstr "git notes merge --abort [-v | -q]"
6556
6557#: builtin/notes.c:35
6558msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6559msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
6560
6561#: builtin/notes.c:36
6562msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6563msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
6564
6565#: builtin/notes.c:37
6566msgid "git notes [--ref <notes_ref>] get-ref"
6567msgstr "git notes [--ref <注解引用>] get-ref"
6568
6569#: builtin/notes.c:42
6570msgid "git notes [list [<object>]]"
6571msgstr "git notes [list [<对象>]]"
6572
6573#: builtin/notes.c:47
6574msgid "git notes add [<options>] [<object>]"
6575msgstr "git notes add [<选项>] [<对象>]"
6576
6577#: builtin/notes.c:52
6578msgid "git notes copy [<options>] <from-object> <to-object>"
6579msgstr "git notes copy [<选项>] <源对象> <目标对象>"
6580
6581#: builtin/notes.c:53
6582msgid "git notes copy --stdin [<from-object> <to-object>]..."
6583msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
6584
6585#: builtin/notes.c:58
6586msgid "git notes append [<options>] [<object>]"
6587msgstr "git notes append [<选项>] [<对象>]"
6588
6589#: builtin/notes.c:63
6590msgid "git notes edit [<object>]"
6591msgstr "git notes edit [<对象>]"
6592
6593#: builtin/notes.c:68
6594msgid "git notes show [<object>]"
6595msgstr "git notes show [<对象>]"
6596
6597#: builtin/notes.c:73
6598msgid "git notes merge [<options>] <notes_ref>"
6599msgstr "git notes merge [<选项>] <注解引用>"
6600
6601#: builtin/notes.c:74
6602msgid "git notes merge --commit [<options>]"
6603msgstr "git notes merge --commit [<选项>]"
6604
6605#: builtin/notes.c:75
6606msgid "git notes merge --abort [<options>]"
6607msgstr "git notes merge --abort [<选项>]"
6608
6609#: builtin/notes.c:80
6610msgid "git notes remove [<object>]"
6611msgstr "git notes remove [<对象>]"
6612
6613#: builtin/notes.c:85
6614msgid "git notes prune [<options>]"
6615msgstr "git notes prune [<选项>]"
6616
6617#: builtin/notes.c:90
6618msgid "git notes get-ref"
6619msgstr "git notes get-ref"
6620
6621#: builtin/notes.c:139
6622#, c-format
6623msgid "unable to start 'show' for object '%s'"
6624msgstr "不能为对象 '%s' 开始 'show'"
6625
6626#: builtin/notes.c:143
6627msgid "could not read 'show' output"
6628msgstr "不能读取 'show' 的输出"
6629
6630#: builtin/notes.c:151
6631#, c-format
6632msgid "failed to finish 'show' for object '%s'"
6633msgstr "无法为对象 '%s' 完成 'show'"
6634
6635#: builtin/notes.c:169 builtin/tag.c:341
6636#, c-format
6637msgid "could not create file '%s'"
6638msgstr "不能创建文件 '%s'"
6639
6640#: builtin/notes.c:188
6641msgid "Please supply the note contents using either -m or -F option"
6642msgstr "请通过 -m 或 -F 选项为注解提供内容"
6643
6644#: builtin/notes.c:209 builtin/notes.c:972
6645#, c-format
6646msgid "Removing note for object %s\n"
6647msgstr "删除对象 %s 的注解\n"
6648
6649#: builtin/notes.c:214
6650msgid "unable to write note object"
6651msgstr "不能写注解对象"
6652
6653#: builtin/notes.c:216
6654#, c-format
6655msgid "The note contents has been left in %s"
6656msgstr "注解内容被留在文件 %s 中"
6657
6658#: builtin/notes.c:250 builtin/tag.c:540
6659#, c-format
6660msgid "cannot read '%s'"
6661msgstr "不能读取 '%s'"
6662
6663#: builtin/notes.c:252 builtin/tag.c:543
6664#, c-format
6665msgid "could not open or read '%s'"
6666msgstr "不能打开或读取 '%s'"
6667
6668#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6669#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6670#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6671#: builtin/notes.c:967 builtin/tag.c:556
6672#, c-format
6673msgid "Failed to resolve '%s' as a valid ref."
6674msgstr "无法解析 '%s' 为一个有效引用。"
6675
6676#: builtin/notes.c:274
6677#, c-format
6678msgid "Failed to read object '%s'."
6679msgstr "无法读取对象 '%s'。"
6680
6681#: builtin/notes.c:298
6682msgid "Cannot commit uninitialized/unreferenced notes tree"
6683msgstr "不能提交未初始化/未引用的注解树"
6684
6685#: builtin/notes.c:339
6686#, c-format
6687msgid "Bad notes.rewriteMode value: '%s'"
6688msgstr "坏的 notes.rewriteMode 值:'%s'"
6689
6690#: builtin/notes.c:349
6691#, c-format
6692msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6693msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
6694
6695#. TRANSLATORS: The first %s is the name of the
6696#. environment variable, the second %s is its value
6697#: builtin/notes.c:376
6698#, c-format
6699msgid "Bad %s value: '%s'"
6700msgstr "坏的 %s 值:'%s'"
6701
6702#: builtin/notes.c:440
6703#, c-format
6704msgid "Malformed input line: '%s'."
6705msgstr "非法的输入行:'%s'。"
6706
6707#: builtin/notes.c:455
6708#, c-format
6709msgid "Failed to copy notes from '%s' to '%s'"
6710msgstr "无法从 '%s' 到 '%s' 拷贝注解"
6711
6712#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6713#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6714#: builtin/notes.c:1032
6715msgid "too many parameters"
6716msgstr "参数太多"
6717
6718#: builtin/notes.c:512 builtin/notes.c:771
6719#, c-format
6720msgid "No note found for object %s."
6721msgstr "未发现对象 %s 的注解。"
6722
6723#: builtin/notes.c:534 builtin/notes.c:691
6724msgid "note contents as a string"
6725msgstr "注解内容作为一个字符串"
6726
6727#: builtin/notes.c:537 builtin/notes.c:694
6728msgid "note contents in a file"
6729msgstr "注解内容到一个文件中"
6730
6731#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6732#: builtin/notes.c:699 builtin/tag.c:474
6733msgid "object"
6734msgstr "对象"
6735
6736#: builtin/notes.c:540 builtin/notes.c:697
6737msgid "reuse and edit specified note object"
6738msgstr "重用和编辑指定的注解对象"
6739
6740#: builtin/notes.c:543 builtin/notes.c:700
6741msgid "reuse specified note object"
6742msgstr "重用指定的注解对象"
6743
6744#: builtin/notes.c:545 builtin/notes.c:613
6745msgid "replace existing notes"
6746msgstr "替换已存在的注解"
6747
6748#: builtin/notes.c:579
6749#, c-format
6750msgid ""
6751"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6752"existing notes"
6753msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6754
6755#: builtin/notes.c:584 builtin/notes.c:661
6756#, c-format
6757msgid "Overwriting existing notes for object %s\n"
6758msgstr "覆盖对象 %s 现存注解\n"
6759
6760#: builtin/notes.c:614
6761msgid "read objects from stdin"
6762msgstr "从标准输入读取对象"
6763
6764#: builtin/notes.c:616
6765msgid "load rewriting config for <command> (implies --stdin)"
6766msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
6767
6768#: builtin/notes.c:634
6769msgid "too few parameters"
6770msgstr "参数太少"
6771
6772#: builtin/notes.c:655
6773#, c-format
6774msgid ""
6775"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6776"existing notes"
6777msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6778
6779#: builtin/notes.c:667
6780#, c-format
6781msgid "Missing notes on source object %s. Cannot copy."
6782msgstr "源对象 %s 缺少注解。不能拷贝。"
6783
6784#: builtin/notes.c:716
6785#, c-format
6786msgid ""
6787"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6788"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6789msgstr ""
6790"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
6791"请换用 'git notes add -f -m/-F/-c/-C'。\n"
6792
6793#: builtin/notes.c:863
6794msgid "General options"
6795msgstr "通用选项"
6796
6797#: builtin/notes.c:865
6798msgid "Merge options"
6799msgstr "合并选项"
6800
6801#: builtin/notes.c:867
6802msgid ""
6803"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6804"cat_sort_uniq)"
6805msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
6806
6807#: builtin/notes.c:869
6808msgid "Committing unmerged notes"
6809msgstr "提交未合并的注解"
6810
6811#: builtin/notes.c:871
6812msgid "finalize notes merge by committing unmerged notes"
6813msgstr "通过提交未合并的注解来完成注解合并"
6814
6815#: builtin/notes.c:873
6816msgid "Aborting notes merge resolution"
6817msgstr "中止注解合并的方案"
6818
6819#: builtin/notes.c:875
6820msgid "abort notes merge"
6821msgstr "中止注解合并"
6822
6823#: builtin/notes.c:970
6824#, c-format
6825msgid "Object %s has no note\n"
6826msgstr "对象 %s 没有注解\n"
6827
6828#: builtin/notes.c:982
6829msgid "attempt to remove non-existent note is not an error"
6830msgstr "尝试删除不存在的注解不是一个错误"
6831
6832#: builtin/notes.c:985
6833msgid "read object names from the standard input"
6834msgstr "从标准输入读取对象名称"
6835
6836#: builtin/notes.c:1066
6837msgid "notes_ref"
6838msgstr "注解引用"
6839
6840#: builtin/notes.c:1067
6841msgid "use notes from <notes_ref>"
6842msgstr "从 <注解引用> 使用注解"
6843
6844#: builtin/notes.c:1102 builtin/remote.c:1598
6845#, c-format
6846msgid "Unknown subcommand: %s"
6847msgstr "未知子命令:%s"
6848
6849#: builtin/pack-objects.c:23
6850msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6851msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
6852
6853#: builtin/pack-objects.c:24
6854msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6855msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
6856
6857#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6858#, c-format
6859msgid "deflate error (%d)"
6860msgstr "压缩错误 (%d)"
6861
6862#: builtin/pack-objects.c:2397
6863#, c-format
6864msgid "unsupported index version %s"
6865msgstr "不支持的索引版本 %s"
6866
6867#: builtin/pack-objects.c:2401
6868#, c-format
6869msgid "bad index version '%s'"
6870msgstr "坏的索引版本 '%s'"
6871
6872#: builtin/pack-objects.c:2424
6873#, c-format
6874msgid "option %s does not accept negative form"
6875msgstr "选项 %s 不接受否定格式"
6876
6877#: builtin/pack-objects.c:2428
6878#, c-format
6879msgid "unable to parse value '%s' for option %s"
6880msgstr "不能解析选项 %1$s 的值 '%2$s'"
6881
6882#: builtin/pack-objects.c:2447
6883msgid "do not show progress meter"
6884msgstr "不显示进度表"
6885
6886#: builtin/pack-objects.c:2449
6887msgid "show progress meter"
6888msgstr "显示进度表"
6889
6890#: builtin/pack-objects.c:2451
6891msgid "show progress meter during object writing phase"
6892msgstr "在对象写入阶段显示进度表"
6893
6894#: builtin/pack-objects.c:2454
6895msgid "similar to --all-progress when progress meter is shown"
6896msgstr "当进度表显示时类似于 --all-progress"
6897
6898#: builtin/pack-objects.c:2455
6899msgid "version[,offset]"
6900msgstr "版本[,偏移]"
6901
6902#: builtin/pack-objects.c:2456
6903msgid "write the pack index file in the specified idx format version"
6904msgstr "用指定的 idx 格式版本来写包索引文件"
6905
6906#: builtin/pack-objects.c:2459
6907msgid "maximum size of each output pack file"
6908msgstr "每个输出包的最大尺寸"
6909
6910#: builtin/pack-objects.c:2461
6911msgid "ignore borrowed objects from alternate object store"
6912msgstr "忽略从替代对象存储里借用对象"
6913
6914#: builtin/pack-objects.c:2463
6915msgid "ignore packed objects"
6916msgstr "忽略包对象"
6917
6918#: builtin/pack-objects.c:2465
6919msgid "limit pack window by objects"
6920msgstr "限制打包窗口的对象数"
6921
6922#: builtin/pack-objects.c:2467
6923msgid "limit pack window by memory in addition to object limit"
6924msgstr "除对象数量限制外设置打包窗口的内存限制"
6925
6926#: builtin/pack-objects.c:2469
6927msgid "maximum length of delta chain allowed in the resulting pack"
6928msgstr "打包允许的 delta 链的最大长度"
6929
6930#: builtin/pack-objects.c:2471
6931msgid "reuse existing deltas"
6932msgstr "重用已存在的 deltas"
6933
6934#: builtin/pack-objects.c:2473
6935msgid "reuse existing objects"
6936msgstr "重用已存在的对象"
6937
6938#: builtin/pack-objects.c:2475
6939msgid "use OFS_DELTA objects"
6940msgstr "使用 OFS_DELTA 对象"
6941
6942#: builtin/pack-objects.c:2477
6943msgid "use threads when searching for best delta matches"
6944msgstr "使用线程查询最佳 delta 匹配"
6945
6946#: builtin/pack-objects.c:2479
6947msgid "do not create an empty pack output"
6948msgstr "不创建空的包输出"
6949
6950#: builtin/pack-objects.c:2481
6951msgid "read revision arguments from standard input"
6952msgstr "从标准输入读取修订号参数"
6953
6954#: builtin/pack-objects.c:2483
6955msgid "limit the objects to those that are not yet packed"
6956msgstr "限制那些尚未打包的对象"
6957
6958#: builtin/pack-objects.c:2486
6959msgid "include objects reachable from any reference"
6960msgstr "包括可以从任何引用访问到的对象"
6961
6962#: builtin/pack-objects.c:2489
6963msgid "include objects referred by reflog entries"
6964msgstr "包括被引用日志引用到的对象"
6965
6966#: builtin/pack-objects.c:2492
6967msgid "output pack to stdout"
6968msgstr "输出包到标准输出"
6969
6970#: builtin/pack-objects.c:2494
6971msgid "include tag objects that refer to objects to be packed"
6972msgstr "包括引用了打包对象的 tag"
6973
6974#: builtin/pack-objects.c:2496
6975msgid "keep unreachable objects"
6976msgstr "维持不可达的对象"
6977
6978#: builtin/pack-objects.c:2497 parse-options.h:141
6979msgid "time"
6980msgstr "时间"
6981
6982#: builtin/pack-objects.c:2498
6983msgid "unpack unreachable objects newer than <time>"
6984msgstr "将比给定 <时间> 新的无法访问的对象解包"
6985
6986#: builtin/pack-objects.c:2501
6987msgid "create thin packs"
6988msgstr "创建精简包"
6989
6990#: builtin/pack-objects.c:2503
6991msgid "ignore packs that have companion .keep file"
6992msgstr "忽略配有 .keep 文件的包"
6993
6994#: builtin/pack-objects.c:2505
6995msgid "pack compression level"
6996msgstr "打包压缩级别"
6997
6998#: builtin/pack-objects.c:2507
6999msgid "do not hide commits by grafts"
7000msgstr "不隐藏移植覆盖的提交"
7001
7002#: builtin/pack-refs.c:6
7003msgid "git pack-refs [options]"
7004msgstr "git pack-refs [选项]"
7005
7006#: builtin/pack-refs.c:14
7007msgid "pack everything"
7008msgstr "打包一切"
7009
7010#: builtin/pack-refs.c:15
7011msgid "prune loose refs (default)"
7012msgstr "清除松散的引用(默认)"
7013
7014#: builtin/prune-packed.c:7
7015msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7016msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
7017
7018#: builtin/prune.c:12
7019msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7020msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7021
7022#: builtin/prune.c:132
7023msgid "do not remove, show only"
7024msgstr "不删除,只显示"
7025
7026#: builtin/prune.c:133
7027msgid "report pruned objects"
7028msgstr "报告清除的对象"
7029
7030#: builtin/prune.c:136
7031msgid "expire objects older than <time>"
7032msgstr "使早于给定时间的对象过期"
7033
7034#: builtin/push.c:14
7035msgid "git push [<options>] [<repository> [<refspec>...]]"
7036msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
7037
7038#: builtin/push.c:45
7039msgid "tag shorthand without <tag>"
7040msgstr "tag 简写没有跟 <tag> 参数"
7041
7042#: builtin/push.c:64
7043msgid "--delete only accepts plain target ref names"
7044msgstr "--delete 只接受简单的目标引用名"
7045
7046#: builtin/push.c:99
7047msgid ""
7048"\n"
7049"To choose either option permanently, see push.default in 'git help config'."
7050msgstr ""
7051"\n"
7052"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7053
7054#: builtin/push.c:102
7055#, c-format
7056msgid ""
7057"The upstream branch of your current branch does not match\n"
7058"the name of your current branch. To push to the upstream branch\n"
7059"on the remote, use\n"
7060"\n"
7061" git push %s HEAD:%s\n"
7062"\n"
7063"To push to the branch of the same name on the remote, use\n"
7064"\n"
7065" git push %s %s\n"
7066"%s"
7067msgstr ""
7068"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7069"上游分支,使用\n"
7070"\n"
7071" git push %s HEAD:%s\n"
7072"\n"
7073"为推送至远程同名分支,使用\n"
7074"\n"
7075" git push %s %s\n"
7076"%s"
7077
7078#: builtin/push.c:121
7079#, c-format
7080msgid ""
7081"You are not currently on a branch.\n"
7082"To push the history leading to the current (detached HEAD)\n"
7083"state now, use\n"
7084"\n"
7085" git push %s HEAD:<name-of-remote-branch>\n"
7086msgstr ""
7087"您当前不在一个分支上。\n"
7088"现在为推送当前(分离头指针)的历史,使用\n"
7089"\n"
7090" git push %s HEAD:<name-of-remote-branch>\n"
7091
7092#: builtin/push.c:128
7093#, c-format
7094msgid ""
7095"The current branch %s has no upstream branch.\n"
7096"To push the current branch and set the remote as upstream, use\n"
7097"\n"
7098" git push --set-upstream %s %s\n"
7099msgstr ""
7100"当前分支 %s 没有对应的上游分支。\n"
7101"为推送当前分支并建立与远程上游的跟踪,使用\n"
7102"\n"
7103" git push --set-upstream %s %s\n"
7104
7105#: builtin/push.c:136
7106#, c-format
7107msgid "The current branch %s has multiple upstream branches, refusing to push."
7108msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7109
7110#: builtin/push.c:139
7111#, c-format
7112msgid ""
7113"You are pushing to remote '%s', which is not the upstream of\n"
7114"your current branch '%s', without telling me what to push\n"
7115"to update which remote branch."
7116msgstr ""
7117"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
7118"而没有告诉我要推送什么、更新哪个远程分支。"
7119
7120# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
7121#: builtin/push.c:151
7122msgid ""
7123"push.default is unset; its implicit value is changing in\n"
7124"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7125"and maintain the current behavior after the default changes, use:\n"
7126"\n"
7127" git config --global push.default matching\n"
7128"\n"
7129"To squelch this message and adopt the new behavior now, use:\n"
7130"\n"
7131" git config --global push.default simple\n"
7132"\n"
7133"See 'git help config' and search for 'push.default' for further "
7134"information.\n"
7135"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7136"'current' instead of 'simple' if you sometimes use older versions of Git)"
7137msgstr ""
7138"push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n"
7139"修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n"
7140"进行如下设置:\n"
7141"\n"
7142" git config --global push.default matching\n"
7143"\n"
7144"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
7145"\n"
7146" git config --global push.default simple\n"
7147"\n"
7148"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
7149"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
7150"为保持兼容,请用 'current' 代替 'simple' 模式)"
7151
7152#: builtin/push.c:199
7153msgid ""
7154"You didn't specify any refspecs to push, and push.default is \"nothing\"."
7155msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
7156
7157#: builtin/push.c:206
7158msgid ""
7159"Updates were rejected because the tip of your current branch is behind\n"
7160"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
7161"before pushing again.\n"
7162"See the 'Note about fast-forwards' in 'git push --help' for details."
7163msgstr ""
7164"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
7165"再次推送前,先与远程变更合并(如 'git pull')。详见\n"
7166"'git push --help' 中的 'Note about fast-forwards' 小节。"
7167
7168#: builtin/push.c:212
7169msgid ""
7170"Updates were rejected because a pushed branch tip is behind its remote\n"
7171"counterpart. If you did not intend to push that branch, you may want to\n"
7172"specify branches to push or set the 'push.default' configuration variable\n"
7173"to 'simple', 'current' or 'upstream' to push only the current branch."
7174msgstr ""
7175"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7176"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
7177"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7178"以便只推送当前分支。"
7179
7180#: builtin/push.c:218
7181msgid ""
7182"Updates were rejected because a pushed branch tip is behind its remote\n"
7183"counterpart. Check out this branch and merge the remote changes\n"
7184"(e.g. 'git pull') before pushing again.\n"
7185"See the 'Note about fast-forwards' in 'git push --help' for details."
7186msgstr ""
7187"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7188"检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
7189"'git push --help' 中的 'Note about fast-forwards' 小节。"
7190
7191#: builtin/push.c:224
7192msgid ""
7193"Updates were rejected because the remote contains work that you do\n"
7194"not have locally. This is usually caused by another repository pushing\n"
7195"to the same ref. You may want to first merge the remote changes (e.g.,\n"
7196"'git pull') before pushing again.\n"
7197"See the 'Note about fast-forwards' in 'git push --help' for details."
7198msgstr ""
7199"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7200"一个版本库已推送了相同的引用。再次推送前,您可能需要先合并远程变更\n"
7201"(如 'git pull')。\n"
7202"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7203
7204#: builtin/push.c:231
7205msgid "Updates were rejected because the tag already exists in the remote."
7206msgstr "更新被拒绝因为 tag 在远程已经存在。"
7207
7208#: builtin/push.c:234
7209msgid ""
7210"You cannot update a remote ref that points at a non-commit object,\n"
7211"or update a remote ref to make it point at a non-commit object,\n"
7212"without using the '--force' option.\n"
7213msgstr ""
7214"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7215"也不能更新远程引用让其指向一个非提交对象。\n"
7216
7217#: builtin/push.c:294
7218#, c-format
7219msgid "Pushing to %s\n"
7220msgstr "推送到 %s\n"
7221
7222#: builtin/push.c:298
7223#, c-format
7224msgid "failed to push some refs to '%s'"
7225msgstr "无法推送一些引用到 '%s'"
7226
7227#: builtin/push.c:331
7228#, c-format
7229msgid "bad repository '%s'"
7230msgstr "坏的版本库 '%s'"
7231
7232#: builtin/push.c:332
7233msgid ""
7234"No configured push destination.\n"
7235"Either specify the URL from the command-line or configure a remote "
7236"repository using\n"
7237"\n"
7238" git remote add <name> <url>\n"
7239"\n"
7240"and then push using the remote name\n"
7241"\n"
7242" git push <name>\n"
7243msgstr ""
7244"没有配置推送目标。\n"
7245"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
7246"\n"
7247" git remote add <name> <url>\n"
7248"\n"
7249"然后使用该远程版本库名执行推送\n"
7250"\n"
7251" git push <name>\n"
7252
7253#: builtin/push.c:347
7254msgid "--all and --tags are incompatible"
7255msgstr "--all 和 --tags 不兼容"
7256
7257#: builtin/push.c:348
7258msgid "--all can't be combined with refspecs"
7259msgstr "--all 不能和引用表达式同时使用"
7260
7261#: builtin/push.c:353
7262msgid "--mirror and --tags are incompatible"
7263msgstr "--mirror 和 --tags 不兼容"
7264
7265#: builtin/push.c:354
7266msgid "--mirror can't be combined with refspecs"
7267msgstr "--mirror 不能和引用表达式同时使用"
7268
7269#: builtin/push.c:359
7270msgid "--all and --mirror are incompatible"
7271msgstr "--all 和 --mirror 不兼容"
7272
7273#: builtin/push.c:419
7274msgid "repository"
7275msgstr "版本库"
7276
7277#: builtin/push.c:420
7278msgid "push all refs"
7279msgstr "推送所有引用"
7280
7281#: builtin/push.c:421
7282msgid "mirror all refs"
7283msgstr "镜像所有引用"
7284
7285#: builtin/push.c:423
7286msgid "delete refs"
7287msgstr "删除引用"
7288
7289#: builtin/push.c:424
7290msgid "push tags (can't be used with --all or --mirror)"
7291msgstr "推送 tags(不能使用 --all or --mirror)"
7292
7293#: builtin/push.c:427
7294msgid "force updates"
7295msgstr "强制更新"
7296
7297#: builtin/push.c:428
7298msgid "check"
7299msgstr "检查"
7300
7301#: builtin/push.c:429
7302msgid "control recursive pushing of submodules"
7303msgstr "控制子模组的递归推送"
7304
7305#: builtin/push.c:431
7306msgid "use thin pack"
7307msgstr "使用精简打包"
7308
7309#: builtin/push.c:432 builtin/push.c:433
7310msgid "receive pack program"
7311msgstr "接收包程序"
7312
7313#: builtin/push.c:434
7314msgid "set upstream for git pull/status"
7315msgstr "设置 git pull/status 的上游"
7316
7317#: builtin/push.c:437
7318msgid "prune locally removed refs"
7319msgstr "清除本地删除的引用"
7320
7321#: builtin/push.c:439
7322msgid "bypass pre-push hook"
7323msgstr "绕过 pre-push 钩子"
7324
7325#: builtin/push.c:440
7326msgid "push missing but relevant tags"
7327msgstr "推送缺失的有关的 tags"
7328
7329#: builtin/push.c:450
7330msgid "--delete is incompatible with --all, --mirror and --tags"
7331msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7332
7333#: builtin/push.c:452
7334msgid "--delete doesn't make sense without any refs"
7335msgstr "--delete 未接任何引用没有意义"
7336
7337#: builtin/read-tree.c:36
7338msgid ""
7339"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7340"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7341"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7342msgstr ""
7343"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7344"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7345"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
7346
7347#: builtin/read-tree.c:108
7348msgid "write resulting index to <file>"
7349msgstr "将索引结果写入 <file>"
7350
7351#: builtin/read-tree.c:111
7352msgid "only empty the index"
7353msgstr "只是清空索引"
7354
7355#: builtin/read-tree.c:113
7356msgid "Merging"
7357msgstr "合并"
7358
7359#: builtin/read-tree.c:115
7360msgid "perform a merge in addition to a read"
7361msgstr "读取之余再执行一个合并"
7362
7363#: builtin/read-tree.c:117
7364msgid "3-way merge if no file level merging required"
7365msgstr "如果没有文件级合并需要,执行三路合并"
7366
7367#: builtin/read-tree.c:119
7368msgid "3-way merge in presence of adds and removes"
7369msgstr "存在添加和删除时,也执行三路合并"
7370
7371#: builtin/read-tree.c:121
7372msgid "same as -m, but discard unmerged entries"
7373msgstr "类似于 -m,但丢弃未合并的条目"
7374
7375#: builtin/read-tree.c:122
7376msgid "<subdirectory>/"
7377msgstr "<子目录>/"
7378
7379#: builtin/read-tree.c:123
7380msgid "read the tree into the index under <subdirectory>/"
7381msgstr "读取树对象到索引的 <子目录>/ 下"
7382
7383#: builtin/read-tree.c:126
7384msgid "update working tree with merge result"
7385msgstr "用合并的结果更新工作区"
7386
7387#: builtin/read-tree.c:128
7388msgid "gitignore"
7389msgstr "gitignore"
7390
7391#: builtin/read-tree.c:129
7392msgid "allow explicitly ignored files to be overwritten"
7393msgstr "允许忽略文件中设定的文件可以被覆盖"
7394
7395#: builtin/read-tree.c:132
7396msgid "don't check the working tree after merging"
7397msgstr "合并后不检查工作区"
7398
7399#: builtin/read-tree.c:133
7400msgid "don't update the index or the work tree"
7401msgstr "不更新索引区和工作区"
7402
7403#: builtin/read-tree.c:135
7404msgid "skip applying sparse checkout filter"
7405msgstr "跳过应用稀疏检出过滤器"
7406
7407#: builtin/read-tree.c:137
7408msgid "debug unpack-trees"
7409msgstr "调试 unpack-trees"
7410
7411#: builtin/remote.c:11
7412msgid "git remote [-v | --verbose]"
7413msgstr "git remote [-v | --verbose]"
7414
7415#: builtin/remote.c:12
7416msgid ""
7417"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7418"mirror=<fetch|push>] <name> <url>"
7419msgstr ""
7420"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
7421"mirror=<fetch|push>] <名称> <url>"
7422
7423#: builtin/remote.c:13 builtin/remote.c:32
7424msgid "git remote rename <old> <new>"
7425msgstr "git remote rename <旧名称> <新名称>"
7426
7427#: builtin/remote.c:14 builtin/remote.c:37
7428msgid "git remote remove <name>"
7429msgstr "git remote remove <名称>"
7430
7431#: builtin/remote.c:15 builtin/remote.c:42
7432msgid "git remote set-head <name> (-a | -d | <branch>)"
7433msgstr "git remote set-head <名称> (-a | -d | <分支>)"
7434
7435#: builtin/remote.c:16
7436msgid "git remote [-v | --verbose] show [-n] <name>"
7437msgstr "git remote [-v | --verbose] show [-n] <名称>"
7438
7439#: builtin/remote.c:17
7440msgid "git remote prune [-n | --dry-run] <name>"
7441msgstr "git remote prune [-n | --dry-run] <名称>"
7442
7443#: builtin/remote.c:18
7444msgid ""
7445"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7446msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
7447
7448#: builtin/remote.c:19
7449msgid "git remote set-branches [--add] <name> <branch>..."
7450msgstr "git remote set-branches [--add] <名称> <分支>..."
7451
7452#: builtin/remote.c:20 builtin/remote.c:68
7453msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7454msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
7455
7456#: builtin/remote.c:21 builtin/remote.c:69
7457msgid "git remote set-url --add <name> <newurl>"
7458msgstr "git remote set-url --add <名称> <新的地址>"
7459
7460#: builtin/remote.c:22 builtin/remote.c:70
7461msgid "git remote set-url --delete <name> <url>"
7462msgstr "git remote set-url --delete <名称> <地址>"
7463
7464#: builtin/remote.c:27
7465msgid "git remote add [<options>] <name> <url>"
7466msgstr "git remote add [<选项>] <名称> <地址>"
7467
7468#: builtin/remote.c:47
7469msgid "git remote set-branches <name> <branch>..."
7470msgstr "git remote set-branches <名称> <分支>..."
7471
7472#: builtin/remote.c:48
7473msgid "git remote set-branches --add <name> <branch>..."
7474msgstr "git remote set-branches --add <名称> <分支>..."
7475
7476#: builtin/remote.c:53
7477msgid "git remote show [<options>] <name>"
7478msgstr "git remote show [<选项>] <名称>"
7479
7480#: builtin/remote.c:58
7481msgid "git remote prune [<options>] <name>"
7482msgstr "git remote prune [<选项>] <名称>"
7483
7484#: builtin/remote.c:63
7485msgid "git remote update [<options>] [<group> | <remote>]..."
7486msgstr "git remote update [<选项>] [<组> | <远程>]..."
7487
7488#: builtin/remote.c:98
7489#, c-format
7490msgid "Updating %s"
7491msgstr "更新 %s 中"
7492
7493#: builtin/remote.c:130
7494msgid ""
7495"--mirror is dangerous and deprecated; please\n"
7496"\t use --mirror=fetch or --mirror=push instead"
7497msgstr ""
7498"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
7499"\t 或 --mirror=push"
7500
7501#: builtin/remote.c:147
7502#, c-format
7503msgid "unknown mirror argument: %s"
7504msgstr "未知的镜像参数:%s"
7505
7506#: builtin/remote.c:163
7507msgid "fetch the remote branches"
7508msgstr "抓取远程的分支"
7509
7510#: builtin/remote.c:165
7511msgid "import all tags and associated objects when fetching"
7512msgstr "抓取时导入所有的 tags 和关联对象"
7513
7514#: builtin/remote.c:168
7515msgid "or do not fetch any tag at all (--no-tags)"
7516msgstr "或不抓取任何 tag(--no-tags)"
7517
7518#: builtin/remote.c:170
7519msgid "branch(es) to track"
7520msgstr "跟踪的分支"
7521
7522#: builtin/remote.c:171
7523msgid "master branch"
7524msgstr "主线分支"
7525
7526#: builtin/remote.c:172
7527msgid "push|fetch"
7528msgstr "push|fetch"
7529
7530#: builtin/remote.c:173
7531msgid "set up remote as a mirror to push to or fetch from"
7532msgstr "把远程设置为用以推送或抓取的镜像"
7533
7534#: builtin/remote.c:185
7535msgid "specifying a master branch makes no sense with --mirror"
7536msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
7537
7538#: builtin/remote.c:187
7539msgid "specifying branches to track makes sense only with fetch mirrors"
7540msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
7541
7542#: builtin/remote.c:195 builtin/remote.c:646
7543#, c-format
7544msgid "remote %s already exists."
7545msgstr "远程 %s 已经存在。"
7546
7547#: builtin/remote.c:199 builtin/remote.c:650
7548#, c-format
7549msgid "'%s' is not a valid remote name"
7550msgstr "'%s' 不是一个有效的远程名称"
7551
7552#: builtin/remote.c:243
7553#, c-format
7554msgid "Could not setup master '%s'"
7555msgstr "无法设置 master '%s'"
7556
7557#: builtin/remote.c:299
7558#, c-format
7559msgid "more than one %s"
7560msgstr "多于一个 %s"
7561
7562#: builtin/remote.c:339
7563#, c-format
7564msgid "Could not get fetch map for refspec %s"
7565msgstr "无法得到引用表达式 %s 的获取列表"
7566
7567#: builtin/remote.c:440 builtin/remote.c:448
7568msgid "(matching)"
7569msgstr "(匹配)"
7570
7571#: builtin/remote.c:452
7572msgid "(delete)"
7573msgstr "(删除)"
7574
7575#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7576#, c-format
7577msgid "Could not append '%s' to '%s'"
7578msgstr "不能添加 '%s' 至 '%s'"
7579
7580#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7581#, c-format
7582msgid "No such remote: %s"
7583msgstr "没有这样的远程:%s"
7584
7585#: builtin/remote.c:656
7586#, c-format
7587msgid "Could not rename config section '%s' to '%s'"
7588msgstr "不能重命名配置小节 '%s' 到 '%s'"
7589
7590#: builtin/remote.c:662 builtin/remote.c:799
7591#, c-format
7592msgid "Could not remove config section '%s'"
7593msgstr "不能移除配置小节 '%s'"
7594
7595#: builtin/remote.c:677
7596#, c-format
7597msgid ""
7598"Not updating non-default fetch refspec\n"
7599"\t%s\n"
7600"\tPlease update the configuration manually if necessary."
7601msgstr ""
7602"没有更新非默认的获取引用表达式\n"
7603"\t%s\n"
7604"\t如果必要请手动更新配置。"
7605
7606#: builtin/remote.c:683
7607#, c-format
7608msgid "Could not append '%s'"
7609msgstr "不能追加 '%s'"
7610
7611#: builtin/remote.c:694
7612#, c-format
7613msgid "Could not set '%s'"
7614msgstr "不能设置 '%s'"
7615
7616#: builtin/remote.c:716
7617#, c-format
7618msgid "deleting '%s' failed"
7619msgstr "删除 '%s' 失败"
7620
7621#: builtin/remote.c:750
7622#, c-format
7623msgid "creating '%s' failed"
7624msgstr "创建 '%s' 失败"
7625
7626#: builtin/remote.c:764
7627#, c-format
7628msgid "Could not remove branch %s"
7629msgstr "无法移除分支 %s"
7630
7631#: builtin/remote.c:834
7632msgid ""
7633"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7634"to delete it, use:"
7635msgid_plural ""
7636"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7637"to delete them, use:"
7638msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
7639msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
7640
7641#: builtin/remote.c:943
7642#, c-format
7643msgid " new (next fetch will store in remotes/%s)"
7644msgstr " 新的(下一次获取将存储于 remotes/%s)"
7645
7646#: builtin/remote.c:946
7647msgid " tracked"
7648msgstr " 已跟踪"
7649
7650#: builtin/remote.c:948
7651msgid " stale (use 'git remote prune' to remove)"
7652msgstr " 过时(使用 'git remote prune' 来移除)"
7653
7654#: builtin/remote.c:950
7655msgid " ???"
7656msgstr " ???"
7657
7658#: builtin/remote.c:991
7659#, c-format
7660msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7661msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
7662
7663#: builtin/remote.c:998
7664#, c-format
7665msgid "rebases onto remote %s"
7666msgstr "变基到远程 %s"
7667
7668#: builtin/remote.c:1001
7669#, c-format
7670msgid " merges with remote %s"
7671msgstr " 与远程 %s 合并"
7672
7673#: builtin/remote.c:1002
7674msgid " and with remote"
7675msgstr " 且有远程"
7676
7677#: builtin/remote.c:1004
7678#, c-format
7679msgid "merges with remote %s"
7680msgstr "与远程 %s 合并"
7681
7682#: builtin/remote.c:1005
7683msgid " and with remote"
7684msgstr " 且有远程"
7685
7686#: builtin/remote.c:1051
7687msgid "create"
7688msgstr "创建"
7689
7690#: builtin/remote.c:1054
7691msgid "delete"
7692msgstr "删除"
7693
7694#: builtin/remote.c:1058
7695msgid "up to date"
7696msgstr "最新"
7697
7698#: builtin/remote.c:1061
7699msgid "fast-forwardable"
7700msgstr "可快进"
7701
7702#: builtin/remote.c:1064
7703msgid "local out of date"
7704msgstr "本地已过时"
7705
7706#: builtin/remote.c:1071
7707#, c-format
7708msgid " %-*s forces to %-*s (%s)"
7709msgstr " %-*s 强制推送至 %-*s (%s)"
7710
7711#: builtin/remote.c:1074
7712#, c-format
7713msgid " %-*s pushes to %-*s (%s)"
7714msgstr " %-*s 推送至 %-*s (%s)"
7715
7716#: builtin/remote.c:1078
7717#, c-format
7718msgid " %-*s forces to %s"
7719msgstr " %-*s 强制推送至 %s"
7720
7721#: builtin/remote.c:1081
7722#, c-format
7723msgid " %-*s pushes to %s"
7724msgstr " %-*s 推送至 %s"
7725
7726#: builtin/remote.c:1091
7727msgid "do not query remotes"
7728msgstr "不查询远程"
7729
7730#: builtin/remote.c:1118
7731#, c-format
7732msgid "* remote %s"
7733msgstr "* 远程 %s"
7734
7735#: builtin/remote.c:1119
7736#, c-format
7737msgid " Fetch URL: %s"
7738msgstr " 获取地址:%s"
7739
7740#: builtin/remote.c:1120 builtin/remote.c:1285
7741msgid "(no URL)"
7742msgstr "(无 URL)"
7743
7744#: builtin/remote.c:1129 builtin/remote.c:1131
7745#, c-format
7746msgid " Push URL: %s"
7747msgstr " 推送地址:%s"
7748
7749#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7750#, c-format
7751msgid " HEAD branch: %s"
7752msgstr " HEAD分支:%s"
7753
7754#: builtin/remote.c:1139
7755#, c-format
7756msgid ""
7757" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7758msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
7759
7760#: builtin/remote.c:1151
7761#, c-format
7762msgid " Remote branch:%s"
7763msgid_plural " Remote branches:%s"
7764msgstr[0] " 远程分支:%s"
7765msgstr[1] " 远程分支:%s"
7766
7767# 译者:中文字符串拼接,可删除前导空格
7768#: builtin/remote.c:1154 builtin/remote.c:1181
7769msgid " (status not queried)"
7770msgstr "(状态未查询)"
7771
7772#: builtin/remote.c:1163
7773msgid " Local branch configured for 'git pull':"
7774msgid_plural " Local branches configured for 'git pull':"
7775msgstr[0] " 为 'git pull' 配置的本地分支:"
7776msgstr[1] " 为 'git pull' 配置的本地分支:"
7777
7778#: builtin/remote.c:1171
7779msgid " Local refs will be mirrored by 'git push'"
7780msgstr " 本地引用将在 'git push' 时被镜像"
7781
7782#: builtin/remote.c:1178
7783#, c-format
7784msgid " Local ref configured for 'git push'%s:"
7785msgid_plural " Local refs configured for 'git push'%s:"
7786msgstr[0] " 为 'git push' 配置的本地引用%s:"
7787msgstr[1] " 为 'git push' 配置的本地引用%s:"
7788
7789#: builtin/remote.c:1199
7790msgid "set refs/remotes/<name>/HEAD according to remote"
7791msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
7792
7793#: builtin/remote.c:1201
7794msgid "delete refs/remotes/<name>/HEAD"
7795msgstr "删除 refs/remotes/<名称>/HEAD"
7796
7797#: builtin/remote.c:1216
7798msgid "Cannot determine remote HEAD"
7799msgstr "无法确定远程 HEAD"
7800
7801#: builtin/remote.c:1218
7802msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7803msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
7804
7805#: builtin/remote.c:1228
7806#, c-format
7807msgid "Could not delete %s"
7808msgstr "无法删除 %s"
7809
7810#: builtin/remote.c:1236
7811#, c-format
7812msgid "Not a valid ref: %s"
7813msgstr "不是一个有效引用:%s"
7814
7815#: builtin/remote.c:1238
7816#, c-format
7817msgid "Could not setup %s"
7818msgstr "不能设置 %s"
7819
7820# 译者:注意保持前导空格
7821#: builtin/remote.c:1274
7822#, c-format
7823msgid " %s will become dangling!"
7824msgstr " %s 将成为摇摆状态!"
7825
7826# 译者:注意保持前导空格
7827#: builtin/remote.c:1275
7828#, c-format
7829msgid " %s has become dangling!"
7830msgstr " %s 已成为摇摆状态!"
7831
7832#: builtin/remote.c:1281
7833#, c-format
7834msgid "Pruning %s"
7835msgstr "修剪 %s"
7836
7837#: builtin/remote.c:1282
7838#, c-format
7839msgid "URL: %s"
7840msgstr "URL:%s"
7841
7842#: builtin/remote.c:1295
7843#, c-format
7844msgid " * [would prune] %s"
7845msgstr " * [将删除] %s"
7846
7847#: builtin/remote.c:1298
7848#, c-format
7849msgid " * [pruned] %s"
7850msgstr " * [已删除] %s"
7851
7852#: builtin/remote.c:1321
7853msgid "prune remotes after fetching"
7854msgstr "抓取后清除远程"
7855
7856#: builtin/remote.c:1387 builtin/remote.c:1461
7857#, c-format
7858msgid "No such remote '%s'"
7859msgstr "没有此远程 '%s'"
7860
7861#: builtin/remote.c:1407
7862msgid "add branch"
7863msgstr "添加分支"
7864
7865#: builtin/remote.c:1414
7866msgid "no remote specified"
7867msgstr "未指定远程"
7868
7869#: builtin/remote.c:1436
7870msgid "manipulate push URLs"
7871msgstr "操作推送 URLS"
7872
7873#: builtin/remote.c:1438
7874msgid "add URL"
7875msgstr "添加 URL"
7876
7877#: builtin/remote.c:1440
7878msgid "delete URLs"
7879msgstr "删除 URLS"
7880
7881#: builtin/remote.c:1447
7882msgid "--add --delete doesn't make sense"
7883msgstr "--add --delete 无意义"
7884
7885#: builtin/remote.c:1487
7886#, c-format
7887msgid "Invalid old URL pattern: %s"
7888msgstr "无效的旧URL匹配模版:%s"
7889
7890#: builtin/remote.c:1495
7891#, c-format
7892msgid "No such URL found: %s"
7893msgstr "未找到此URL:%s"
7894
7895#: builtin/remote.c:1497
7896msgid "Will not delete all non-push URLs"
7897msgstr "将不会删除所有非推送URL地址"
7898
7899#: builtin/remote.c:1569
7900msgid "be verbose; must be placed before a subcommand"
7901msgstr "冗长输出;必须置于子命令之前"
7902
7903#: builtin/replace.c:17
7904msgid "git replace [-f] <object> <replacement>"
7905msgstr "git replace [-f] <对象> <替换物>"
7906
7907#: builtin/replace.c:18
7908msgid "git replace -d <object>..."
7909msgstr "git replace -d <对象>..."
7910
7911#: builtin/replace.c:19
7912msgid "git replace -l [<pattern>]"
7913msgstr "git replace -l [<模式>]"
7914
7915#: builtin/replace.c:121
7916msgid "list replace refs"
7917msgstr "列出替换的引用"
7918
7919#: builtin/replace.c:122
7920msgid "delete replace refs"
7921msgstr "删除替换的引用"
7922
7923#: builtin/replace.c:123
7924msgid "replace the ref if it exists"
7925msgstr "如果存在则替换引用"
7926
7927#: builtin/rerere.c:11
7928msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7929msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
7930
7931#: builtin/rerere.c:56
7932msgid "register clean resolutions in index"
7933msgstr "在索引中注册干净的解决方案"
7934
7935#: builtin/reset.c:25
7936msgid ""
7937"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7938msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
7939
7940#: builtin/reset.c:26
7941msgid "git reset [-q] <tree-ish> [--] <paths>..."
7942msgstr "git reset [-q] <树或提交> [--] <路径>..."
7943
7944#: builtin/reset.c:27
7945msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7946msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
7947
7948#: builtin/reset.c:33
7949msgid "mixed"
7950msgstr "混杂"
7951
7952#: builtin/reset.c:33
7953msgid "soft"
7954msgstr "软性"
7955
7956#: builtin/reset.c:33
7957msgid "hard"
7958msgstr "硬性"
7959
7960#: builtin/reset.c:33
7961msgid "merge"
7962msgstr "合并"
7963
7964#: builtin/reset.c:33
7965msgid "keep"
7966msgstr "保持"
7967
7968#: builtin/reset.c:73
7969msgid "You do not have a valid HEAD."
7970msgstr "您没有一个有效的 HEAD。"
7971
7972#: builtin/reset.c:75
7973msgid "Failed to find tree of HEAD."
7974msgstr "无法找到 HEAD 指向的树。"
7975
7976#: builtin/reset.c:81
7977#, c-format
7978msgid "Failed to find tree of %s."
7979msgstr "无法找到 %s 指向的树。"
7980
7981#: builtin/reset.c:98
7982#, c-format
7983msgid "HEAD is now at %s"
7984msgstr "HEAD 现在位于 %s"
7985
7986# 译者:汉字之间无空格,故删除%s前后空格
7987#: builtin/reset.c:169
7988#, c-format
7989msgid "Cannot do a %s reset in the middle of a merge."
7990msgstr "在合并过程中不能做%s重置操作。"
7991
7992#: builtin/reset.c:248
7993msgid "be quiet, only report errors"
7994msgstr "安静模式,只报告错误"
7995
7996#: builtin/reset.c:250
7997msgid "reset HEAD and index"
7998msgstr "重置 HEAD 和索引"
7999
8000#: builtin/reset.c:251
8001msgid "reset only HEAD"
8002msgstr "只重置 HEAD"
8003
8004#: builtin/reset.c:253 builtin/reset.c:255
8005msgid "reset HEAD, index and working tree"
8006msgstr "重置 HEAD、索引和工作区"
8007
8008#: builtin/reset.c:257
8009msgid "reset HEAD but keep local changes"
8010msgstr "重置 HEAD 但保存本地变更"
8011
8012#: builtin/reset.c:275
8013#, c-format
8014msgid "Failed to resolve '%s' as a valid revision."
8015msgstr "无法将 '%s' 解析为一个有效的版本。"
8016
8017#: builtin/reset.c:278 builtin/reset.c:286
8018#, c-format
8019msgid "Could not parse object '%s'."
8020msgstr "不能解析对象 '%s'。"
8021
8022#: builtin/reset.c:283
8023#, c-format
8024msgid "Failed to resolve '%s' as a valid tree."
8025msgstr "无法将 '%s' 解析为一个有效的树对象。"
8026
8027#: builtin/reset.c:292
8028msgid "--patch is incompatible with --{hard,mixed,soft}"
8029msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
8030
8031#: builtin/reset.c:301
8032msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8033msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
8034
8035# 译者:汉字之间无空格,故删除%s前后空格
8036#: builtin/reset.c:303
8037#, c-format
8038msgid "Cannot do %s reset with paths."
8039msgstr "不能带路径进行%s重置。"
8040
8041# 译者:汉字之间无空格,故删除%s前后空格
8042#: builtin/reset.c:313
8043#, c-format
8044msgid "%s reset is not allowed in a bare repository"
8045msgstr "不能对裸版本库进行%s重置"
8046
8047#: builtin/reset.c:333
8048#, c-format
8049msgid "Could not reset index file to revision '%s'."
8050msgstr "不能重置索引文件至版本 '%s'。"
8051
8052#: builtin/reset.c:339
8053msgid "Unstaged changes after reset:"
8054msgstr "重置后撤出暂存区的变更:"
8055
8056#: builtin/reset.c:344
8057msgid "Could not write new index file."
8058msgstr "不能写入新的索引文件。"
8059
8060#: builtin/rev-parse.c:339
8061msgid "git rev-parse --parseopt [options] -- [<args>...]"
8062msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
8063
8064#: builtin/rev-parse.c:344
8065msgid "keep the `--` passed as an arg"
8066msgstr "保持 `--` 作为一个参数传递"
8067
8068#: builtin/rev-parse.c:346
8069msgid "stop parsing after the first non-option argument"
8070msgstr "遇到第一个非选项参数后停止解析"
8071
8072#: builtin/rev-parse.c:464
8073msgid ""
8074"git rev-parse --parseopt [options] -- [<args>...]\n"
8075" or: git rev-parse --sq-quote [<arg>...]\n"
8076" or: git rev-parse [options] [<arg>...]\n"
8077"\n"
8078"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8079msgstr ""
8080"git rev-parse --parseopt [选项] -- [<参数>...]\n"
8081" 或者:git rev-parse --sq-quote [<选项>...]\n"
8082" 或者:git rev-parse [options] [<选项>...]\n"
8083"\n"
8084"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
8085
8086#: builtin/revert.c:22
8087msgid "git revert [options] <commit-ish>"
8088msgstr "git revert [选项] <提交号>"
8089
8090#: builtin/revert.c:23
8091msgid "git revert <subcommand>"
8092msgstr "git revert <子命令>"
8093
8094#: builtin/revert.c:28
8095msgid "git cherry-pick [options] <commit-ish>"
8096msgstr "git cherry-pick [选项] <提交号>"
8097
8098#: builtin/revert.c:29
8099msgid "git cherry-pick <subcommand>"
8100msgstr "git cherry-pick <子命令>"
8101
8102#: builtin/revert.c:70 builtin/revert.c:92
8103#, c-format
8104msgid "%s: %s cannot be used with %s"
8105msgstr "%s:%s 不能和 %s 同时使用"
8106
8107#: builtin/revert.c:103
8108msgid "end revert or cherry-pick sequence"
8109msgstr "终止反转或拣选操作"
8110
8111#: builtin/revert.c:104
8112msgid "resume revert or cherry-pick sequence"
8113msgstr "继续反转或拣选操作"
8114
8115#: builtin/revert.c:105
8116msgid "cancel revert or cherry-pick sequence"
8117msgstr "取消反转或拣选操作"
8118
8119#: builtin/revert.c:106
8120msgid "don't automatically commit"
8121msgstr "不要自动提交"
8122
8123#: builtin/revert.c:107
8124msgid "edit the commit message"
8125msgstr "编辑提交说明"
8126
8127#: builtin/revert.c:110
8128msgid "parent number"
8129msgstr "父编号"
8130
8131#: builtin/revert.c:112
8132msgid "merge strategy"
8133msgstr "合并策略"
8134
8135#: builtin/revert.c:113
8136msgid "option"
8137msgstr "选项"
8138
8139#: builtin/revert.c:114
8140msgid "option for merge strategy"
8141msgstr "合并策略的选项"
8142
8143#: builtin/revert.c:125
8144msgid "append commit name"
8145msgstr "追加提交名称"
8146
8147#: builtin/revert.c:126
8148msgid "allow fast-forward"
8149msgstr "允许快进式"
8150
8151#: builtin/revert.c:127
8152msgid "preserve initially empty commits"
8153msgstr "保留初始化的空提交"
8154
8155#: builtin/revert.c:128
8156msgid "allow commits with empty messages"
8157msgstr "允许提交说明为空"
8158
8159#: builtin/revert.c:129
8160msgid "keep redundant, empty commits"
8161msgstr "保持多余的、空的提交"
8162
8163#: builtin/revert.c:133
8164msgid "program error"
8165msgstr "程序错误"
8166
8167#: builtin/revert.c:223
8168msgid "revert failed"
8169msgstr "还原失败"
8170
8171#: builtin/revert.c:238
8172msgid "cherry-pick failed"
8173msgstr "拣选失败"
8174
8175#: builtin/rm.c:15
8176msgid "git rm [options] [--] <file>..."
8177msgstr "git rm [选项] [--] <文件>..."
8178
8179#: builtin/rm.c:64 builtin/rm.c:186
8180#, c-format
8181msgid ""
8182"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
8183"(use 'rm -rf' if you really want to remove it including all of its history)"
8184msgstr ""
8185"子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
8186"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
8187
8188#: builtin/rm.c:174
8189#, c-format
8190msgid ""
8191"'%s' has staged content different from both the file and the HEAD\n"
8192"(use -f to force removal)"
8193msgstr ""
8194"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
8195"(使用 -f 强制删除)"
8196
8197#: builtin/rm.c:180
8198#, c-format
8199msgid ""
8200"'%s' has changes staged in the index\n"
8201"(use --cached to keep the file, or -f to force removal)"
8202msgstr ""
8203"'%s' 有变更已暂存至索引中\n"
8204"(使用 --cached 保存文件,或用 -f 强制删除)"
8205
8206#: builtin/rm.c:191
8207#, c-format
8208msgid ""
8209"'%s' has local modifications\n"
8210"(use --cached to keep the file, or -f to force removal)"
8211msgstr ""
8212"'%s' 有本地修改\n"
8213"(使用 --cached 保存文件,或用 -f 强制删除)"
8214
8215#: builtin/rm.c:207
8216msgid "do not list removed files"
8217msgstr "不列出删除的文件"
8218
8219#: builtin/rm.c:208
8220msgid "only remove from the index"
8221msgstr "只从索引区删除"
8222
8223#: builtin/rm.c:209
8224msgid "override the up-to-date check"
8225msgstr "忽略文件更新状态检查"
8226
8227#: builtin/rm.c:210
8228msgid "allow recursive removal"
8229msgstr "允许递归删除"
8230
8231#: builtin/rm.c:212
8232msgid "exit with a zero status even if nothing matched"
8233msgstr "即使没有匹配,也以零状态退出"
8234
8235#: builtin/rm.c:283
8236#, c-format
8237msgid "not removing '%s' recursively without -r"
8238msgstr "未提供 -r 选项不会递归删除 '%s'"
8239
8240#: builtin/rm.c:322
8241#, c-format
8242msgid "git rm: unable to remove %s"
8243msgstr "git rm:不能删除 %s"
8244
8245#: builtin/shortlog.c:13
8246msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
8247msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
8248
8249#: builtin/shortlog.c:133
8250#, c-format
8251msgid "Missing author: %s"
8252msgstr "缺少作者:%s"
8253
8254#: builtin/shortlog.c:229
8255msgid "sort output according to the number of commits per author"
8256msgstr "根据每个作者的提交数量排序"
8257
8258#: builtin/shortlog.c:231
8259msgid "Suppress commit descriptions, only provides commit count"
8260msgstr "隐藏提交说明,只提供提交数量"
8261
8262#: builtin/shortlog.c:233
8263msgid "Show the email address of each author"
8264msgstr "显示每个作者的电子邮件地址"
8265
8266#: builtin/shortlog.c:234
8267msgid "w[,i1[,i2]]"
8268msgstr "w[,i1[,i2]]"
8269
8270#: builtin/shortlog.c:235
8271msgid "Linewrap output"
8272msgstr "折行输出"
8273
8274#: builtin/show-branch.c:9
8275msgid ""
8276"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8277"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8278"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8279"<glob>)...]"
8280msgstr ""
8281"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8282"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8283"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8284"<glob>)...]"
8285
8286#: builtin/show-branch.c:10
8287msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8288msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8289
8290#: builtin/show-branch.c:651
8291msgid "show remote-tracking and local branches"
8292msgstr "显示远程跟踪的和本地的分支"
8293
8294#: builtin/show-branch.c:653
8295msgid "show remote-tracking branches"
8296msgstr "显示远程跟踪的分支"
8297
8298#: builtin/show-branch.c:655
8299msgid "color '*!+-' corresponding to the branch"
8300msgstr "着色 '*!+-' 到相应的分支"
8301
8302#: builtin/show-branch.c:657
8303msgid "show <n> more commits after the common ancestor"
8304msgstr "显示共同祖先后的 <n> 个提交"
8305
8306#: builtin/show-branch.c:659
8307msgid "synonym to more=-1"
8308msgstr "和 more=-1 同义"
8309
8310#: builtin/show-branch.c:660
8311msgid "suppress naming strings"
8312msgstr "不显示字符串命名"
8313
8314#: builtin/show-branch.c:662
8315msgid "include the current branch"
8316msgstr "包括当前分支"
8317
8318#: builtin/show-branch.c:664
8319msgid "name commits with their object names"
8320msgstr "以对象名字命名提交"
8321
8322#: builtin/show-branch.c:666
8323msgid "show possible merge bases"
8324msgstr "显示可能合并的基线"
8325
8326#: builtin/show-branch.c:668
8327msgid "show refs unreachable from any other ref"
8328msgstr "显示没有任何引用的的引用"
8329
8330#: builtin/show-branch.c:670
8331msgid "show commits in topological order"
8332msgstr "以拓扑顺序显示提交"
8333
8334#: builtin/show-branch.c:672
8335msgid "show only commits not on the first branch"
8336msgstr "只显示不在第一个分支上的提交"
8337
8338#: builtin/show-branch.c:674
8339msgid "show merges reachable from only one tip"
8340msgstr "显示仅一个分支可访问的合并提交"
8341
8342#: builtin/show-branch.c:676
8343msgid "show commits where no parent comes before its children"
8344msgstr "显示提交时以时间为序且父提交不能领先子提交"
8345
8346#: builtin/show-branch.c:678
8347msgid "<n>[,<base>]"
8348msgstr "<n>[,<base>]"
8349
8350#: builtin/show-branch.c:679
8351msgid "show <n> most recent ref-log entries starting at base"
8352msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
8353
8354#: builtin/show-ref.c:10
8355msgid ""
8356"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8357"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8358msgstr ""
8359"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8360"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8361
8362#: builtin/show-ref.c:11
8363msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8364msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
8365
8366#: builtin/show-ref.c:165
8367msgid "only show tags (can be combined with heads)"
8368msgstr "只显示 tags(可以和头共用)"
8369
8370#: builtin/show-ref.c:166
8371msgid "only show heads (can be combined with tags)"
8372msgstr "只显示头(可以和 tags 共用)"
8373
8374#: builtin/show-ref.c:167
8375msgid "stricter reference checking, requires exact ref path"
8376msgstr "更严格的引用检测,需要精确的引用路径"
8377
8378#: builtin/show-ref.c:170 builtin/show-ref.c:172
8379msgid "show the HEAD reference"
8380msgstr "显示 HEAD 引用"
8381
8382#: builtin/show-ref.c:174
8383msgid "dereference tags into object IDs"
8384msgstr "转换 tags 到对象ID"
8385
8386#: builtin/show-ref.c:176
8387msgid "only show SHA1 hash using <n> digits"
8388msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
8389
8390#: builtin/show-ref.c:180
8391msgid "do not print results to stdout (useful with --verify)"
8392msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
8393
8394#: builtin/show-ref.c:182
8395msgid "show refs from stdin that aren't in local repository"
8396msgstr "显示从标准输入中读入的不在本地版本库中的引用"
8397
8398#: builtin/symbolic-ref.c:7
8399msgid "git symbolic-ref [options] name [ref]"
8400msgstr "git symbolic-ref [选项] 名称 [引用]"
8401
8402#: builtin/symbolic-ref.c:8
8403msgid "git symbolic-ref -d [-q] name"
8404msgstr "git symbolic-ref -d [-q] 名称"
8405
8406#: builtin/symbolic-ref.c:40
8407msgid "suppress error message for non-symbolic (detached) refs"
8408msgstr "不显示非符号(分离的)引用的错误信息"
8409
8410#: builtin/symbolic-ref.c:41
8411msgid "delete symbolic ref"
8412msgstr "删除符号引用"
8413
8414#: builtin/symbolic-ref.c:42
8415msgid "shorten ref output"
8416msgstr "简短的引用输出"
8417
8418#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8419msgid "reason"
8420msgstr "原因"
8421
8422#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8423msgid "reason of the update"
8424msgstr "更新的原因"
8425
8426#: builtin/tag.c:22
8427msgid ""
8428"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8429msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
8430
8431#: builtin/tag.c:23
8432msgid "git tag -d <tagname>..."
8433msgstr "git tag -d <标签名>..."
8434
8435#: builtin/tag.c:24
8436msgid ""
8437"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8438"\t\t[<pattern>...]"
8439msgstr ""
8440"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
8441"\t\t[<模式>...]"
8442
8443#: builtin/tag.c:26
8444msgid "git tag -v <tagname>..."
8445msgstr "git tag -v <标签名>..."
8446
8447#: builtin/tag.c:60
8448#, c-format
8449msgid "malformed object at '%s'"
8450msgstr "非法的对象于 '%s'"
8451
8452#: builtin/tag.c:207
8453#, c-format
8454msgid "tag name too long: %.*s..."
8455msgstr "tag 名字太长:%.*s..."
8456
8457#: builtin/tag.c:212
8458#, c-format
8459msgid "tag '%s' not found."
8460msgstr "tag '%s' 未发现。"
8461
8462#: builtin/tag.c:227
8463#, c-format
8464msgid "Deleted tag '%s' (was %s)\n"
8465msgstr "已删除 tag '%s'(曾为 %s)\n"
8466
8467#: builtin/tag.c:239
8468#, c-format
8469msgid "could not verify the tag '%s'"
8470msgstr "不能校验 tag '%s'"
8471
8472#: builtin/tag.c:249
8473#, c-format
8474msgid ""
8475"\n"
8476"Write a tag message\n"
8477"Lines starting with '%c' will be ignored.\n"
8478msgstr ""
8479"\n"
8480"输入一个 tag 说明\n"
8481"以 '%c' 开头的行将被忽略。\n"
8482
8483#: builtin/tag.c:253
8484#, c-format
8485msgid ""
8486"\n"
8487"Write a tag message\n"
8488"Lines starting with '%c' will be kept; you may remove them yourself if you "
8489"want to.\n"
8490msgstr ""
8491"\n"
8492"输入一个 tag 说明\n"
8493"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
8494
8495#: builtin/tag.c:292
8496msgid "unable to sign the tag"
8497msgstr "无法签署 tag"
8498
8499#: builtin/tag.c:294
8500msgid "unable to write tag file"
8501msgstr "无法写 tag 文件"
8502
8503#: builtin/tag.c:319
8504msgid "bad object type."
8505msgstr "坏的对象类型。"
8506
8507#: builtin/tag.c:332
8508msgid "tag header too big."
8509msgstr "tag 头信息太大。"
8510
8511#: builtin/tag.c:368
8512msgid "no tag message?"
8513msgstr "无 tag 说明?"
8514
8515#: builtin/tag.c:374
8516#, c-format
8517msgid "The tag message has been left in %s\n"
8518msgstr "tag 说明被保留在 %s\n"
8519
8520#: builtin/tag.c:423
8521msgid "switch 'points-at' requires an object"
8522msgstr "开关 'points-at' 需要一个对象"
8523
8524#: builtin/tag.c:425
8525#, c-format
8526msgid "malformed object name '%s'"
8527msgstr "非法的对象名 '%s'"
8528
8529#: builtin/tag.c:445
8530msgid "list tag names"
8531msgstr "列出tag名称"
8532
8533#: builtin/tag.c:447
8534msgid "print <n> lines of each tag message"
8535msgstr "每个 tag 信息打印 <n> 行"
8536
8537#: builtin/tag.c:449
8538msgid "delete tags"
8539msgstr "删除 tags"
8540
8541#: builtin/tag.c:450
8542msgid "verify tags"
8543msgstr "验证 tags"
8544
8545#: builtin/tag.c:452
8546msgid "Tag creation options"
8547msgstr "Tag 创建选项"
8548
8549#: builtin/tag.c:454
8550msgid "annotated tag, needs a message"
8551msgstr "注解 tag,需要一个说明"
8552
8553#: builtin/tag.c:456
8554msgid "tag message"
8555msgstr "tag 说明"
8556
8557#: builtin/tag.c:458
8558msgid "annotated and GPG-signed tag"
8559msgstr "注解并 GPG 签名的 tag"
8560
8561#: builtin/tag.c:462
8562msgid "use another key to sign the tag"
8563msgstr "使用另外的私钥签名 tag"
8564
8565#: builtin/tag.c:463
8566msgid "replace the tag if exists"
8567msgstr "如果存在,替换现有的 tag"
8568
8569#: builtin/tag.c:464
8570msgid "show tag list in columns"
8571msgstr "以列的方式显示 tag"
8572
8573#: builtin/tag.c:466
8574msgid "Tag listing options"
8575msgstr "Tag 列表选项"
8576
8577#: builtin/tag.c:469
8578msgid "print only tags that contain the commit"
8579msgstr "只打印包含提交的tags"
8580
8581#: builtin/tag.c:475
8582msgid "print only tags of the object"
8583msgstr "只打印tags对象"
8584
8585#: builtin/tag.c:504
8586msgid "--column and -n are incompatible"
8587msgstr "--column 和 -n 不兼容"
8588
8589#: builtin/tag.c:521
8590msgid "-n option is only allowed with -l."
8591msgstr "-n 选项只允许和 -l 同时使用。"
8592
8593#: builtin/tag.c:523
8594msgid "--contains option is only allowed with -l."
8595msgstr "--contains 选项只允许和 -l 同时使用。"
8596
8597#: builtin/tag.c:525
8598msgid "--points-at option is only allowed with -l."
8599msgstr "--points-at 选项只允许和 -l 同时使用。"
8600
8601#: builtin/tag.c:533
8602msgid "only one -F or -m option is allowed."
8603msgstr "只允许一个 -F 或 -m 选项。"
8604
8605#: builtin/tag.c:553
8606msgid "too many params"
8607msgstr "太多参数"
8608
8609#: builtin/tag.c:559
8610#, c-format
8611msgid "'%s' is not a valid tag name."
8612msgstr "'%s' 不是一个有效的tag名称。"
8613
8614#: builtin/tag.c:564
8615#, c-format
8616msgid "tag '%s' already exists"
8617msgstr "tag '%s' 已存在"
8618
8619#: builtin/tag.c:582
8620#, c-format
8621msgid "%s: cannot lock the ref"
8622msgstr "%s:不能锁定引用"
8623
8624#: builtin/tag.c:584
8625#, c-format
8626msgid "%s: cannot update the ref"
8627msgstr "%s:不能更新引用"
8628
8629#: builtin/tag.c:586
8630#, c-format
8631msgid "Updated tag '%s' (was %s)\n"
8632msgstr "已更新tag '%s'(曾为 %s)\n"
8633
8634#: builtin/update-index.c:401
8635msgid "git update-index [options] [--] [<file>...]"
8636msgstr "git update-index [选项] [--] [<文件>...]"
8637
8638#: builtin/update-index.c:718
8639msgid "continue refresh even when index needs update"
8640msgstr "当索引需要更新时继续刷新"
8641
8642#: builtin/update-index.c:721
8643msgid "refresh: ignore submodules"
8644msgstr "刷新:忽略子模组"
8645
8646#: builtin/update-index.c:724
8647msgid "do not ignore new files"
8648msgstr "不忽略新的文件"
8649
8650#: builtin/update-index.c:726
8651msgid "let files replace directories and vice-versa"
8652msgstr "让文件替换目录(反之亦然)"
8653
8654#: builtin/update-index.c:728
8655msgid "notice files missing from worktree"
8656msgstr "通知文件从工作区丢失"
8657
8658#: builtin/update-index.c:730
8659msgid "refresh even if index contains unmerged entries"
8660msgstr "即使索引区包含未合并的条目也执行刷新"
8661
8662#: builtin/update-index.c:733
8663msgid "refresh stat information"
8664msgstr "刷新统计信息"
8665
8666#: builtin/update-index.c:737
8667msgid "like --refresh, but ignore assume-unchanged setting"
8668msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
8669
8670#: builtin/update-index.c:741
8671msgid "<mode> <object> <path>"
8672msgstr "<mode> <object> <path>"
8673
8674#: builtin/update-index.c:742
8675msgid "add the specified entry to the index"
8676msgstr "添加指定的条目到索引区"
8677
8678#: builtin/update-index.c:746
8679msgid "(+/-)x"
8680msgstr "(+/-)x"
8681
8682#: builtin/update-index.c:747
8683msgid "override the executable bit of the listed files"
8684msgstr "覆盖列表里文件的可执行位"
8685
8686#: builtin/update-index.c:751
8687msgid "mark files as \"not changing\""
8688msgstr "把文件标记为 \"没有变更\""
8689
8690#: builtin/update-index.c:754
8691msgid "clear assumed-unchanged bit"
8692msgstr "清除 assumed-unchanged 位"
8693
8694#: builtin/update-index.c:757
8695msgid "mark files as \"index-only\""
8696msgstr "把文件标记为 \"仅索引\""
8697
8698#: builtin/update-index.c:760
8699msgid "clear skip-worktree bit"
8700msgstr "清除 skip-worktree 位"
8701
8702#: builtin/update-index.c:763
8703msgid "add to index only; do not add content to object database"
8704msgstr "只添加到索引区;不添加对象到对象库"
8705
8706#: builtin/update-index.c:765
8707msgid "remove named paths even if present in worktree"
8708msgstr "即使存在工作区里,也删除路径"
8709
8710#: builtin/update-index.c:767
8711msgid "with --stdin: input lines are terminated by null bytes"
8712msgstr "携带 --stdin:输入的行以 null 字符终止"
8713
8714#: builtin/update-index.c:769
8715msgid "read list of paths to be updated from standard input"
8716msgstr "从标准输入中读取需要更新的路径列表"
8717
8718#: builtin/update-index.c:773
8719msgid "add entries from standard input to the index"
8720msgstr "从标准输入添加条目到索引区"
8721
8722#: builtin/update-index.c:777
8723msgid "repopulate stages #2 and #3 for the listed paths"
8724msgstr "为指定文件重新生成第2和第3暂存区"
8725
8726#: builtin/update-index.c:781
8727msgid "only update entries that differ from HEAD"
8728msgstr "只更新与 HEAD 不同的条目"
8729
8730#: builtin/update-index.c:785
8731msgid "ignore files missing from worktree"
8732msgstr "忽略工作区丢失的文件"
8733
8734#: builtin/update-index.c:788
8735msgid "report actions to standard output"
8736msgstr "在标准输出显示操作"
8737
8738#: builtin/update-index.c:790
8739msgid "(for porcelains) forget saved unresolved conflicts"
8740msgstr "(for porcelains) 忘记保存的未解决的冲突"
8741
8742#: builtin/update-index.c:794
8743msgid "write index in this format"
8744msgstr "以这种格式写入索引区"
8745
8746#: builtin/update-ref.c:7
8747msgid "git update-ref [options] -d <refname> [<oldval>]"
8748msgstr "git update-ref [options] -d <引用名> [<旧值>]"
8749
8750#: builtin/update-ref.c:8
8751msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8752msgstr "git update-ref [options] <引用名> <新值> [<旧值>]"
8753
8754#: builtin/update-ref.c:19
8755msgid "delete the reference"
8756msgstr "删除引用"
8757
8758#: builtin/update-ref.c:21
8759msgid "update <refname> not the one it points to"
8760msgstr "更新 <引用名> 本身而不是它指向的引用"
8761
8762#: builtin/update-server-info.c:6
8763msgid "git update-server-info [--force]"
8764msgstr "git update-server-info [--force]"
8765
8766#: builtin/update-server-info.c:14
8767msgid "update the info files from scratch"
8768msgstr "从头开始更新文件信息"
8769
8770#: builtin/verify-pack.c:56
8771msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8772msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8773
8774#: builtin/verify-pack.c:66
8775msgid "verbose"
8776msgstr "冗长输出"
8777
8778#: builtin/verify-pack.c:68
8779msgid "show statistics only"
8780msgstr "只显示统计"
8781
8782#: builtin/verify-tag.c:17
8783msgid "git verify-tag [-v|--verbose] <tag>..."
8784msgstr "git verify-tag [-v|--verbose] <tag>..."
8785
8786#: builtin/verify-tag.c:73
8787msgid "print tag contents"
8788msgstr "打印 tag 内容"
8789
8790#: builtin/write-tree.c:13
8791msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8792msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
8793
8794#: builtin/write-tree.c:26
8795msgid "<prefix>/"
8796msgstr "<前缀>/"
8797
8798#: builtin/write-tree.c:27
8799msgid "write tree object for a subdirectory <prefix>"
8800msgstr "将 <前缀> 子目录内容写到一个树对象"
8801
8802#: builtin/write-tree.c:30
8803msgid "only useful for debugging"
8804msgstr "只对调试有用"
8805
8806#: git.c:16
8807msgid "See 'git help <command>' for more information on a specific command."
8808msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
8809
8810#: parse-options.h:156
8811msgid "no-op (backward compatibility)"
8812msgstr "空操作(向后兼容)"
8813
8814#: parse-options.h:232
8815msgid "be more verbose"
8816msgstr "更加详细"
8817
8818#: parse-options.h:234
8819msgid "be more quiet"
8820msgstr "更加安静"
8821
8822#: parse-options.h:240
8823msgid "use <n> digits to display SHA-1s"
8824msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8825
8826#: common-cmds.h:8
8827msgid "Add file contents to the index"
8828msgstr "添加文件内容至索引"
8829
8830#: common-cmds.h:9
8831msgid "Find by binary search the change that introduced a bug"
8832msgstr "通过二分查找定位引入 bug 的变更"
8833
8834#: common-cmds.h:10
8835msgid "List, create, or delete branches"
8836msgstr "列出、创建或删除分支"
8837
8838#: common-cmds.h:11
8839msgid "Checkout a branch or paths to the working tree"
8840msgstr "检出一个分支或路径到工作区"
8841
8842#: common-cmds.h:12
8843msgid "Clone a repository into a new directory"
8844msgstr "克隆一个版本库到一个新目录"
8845
8846#: common-cmds.h:13
8847msgid "Record changes to the repository"
8848msgstr "记录变更到版本库"
8849
8850#: common-cmds.h:14
8851msgid "Show changes between commits, commit and working tree, etc"
8852msgstr "显示提交之间、提交和工作区之间等的差异"
8853
8854#: common-cmds.h:15
8855msgid "Download objects and refs from another repository"
8856msgstr "从另外一个版本库下载对象和引用"
8857
8858#: common-cmds.h:16
8859msgid "Print lines matching a pattern"
8860msgstr "输出和模式匹配的行"
8861
8862#: common-cmds.h:17
8863msgid "Create an empty Git repository or reinitialize an existing one"
8864msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8865
8866#: common-cmds.h:18
8867msgid "Show commit logs"
8868msgstr "显示提交日志"
8869
8870#: common-cmds.h:19
8871msgid "Join two or more development histories together"
8872msgstr "合并两个或更多开发历史"
8873
8874#: common-cmds.h:20
8875msgid "Move or rename a file, a directory, or a symlink"
8876msgstr "移动或重命名一个文件、目录或符号链接"
8877
8878#: common-cmds.h:21
8879msgid "Fetch from and merge with another repository or a local branch"
8880msgstr "获取并合并另外的版本库或一个本地分支"
8881
8882#: common-cmds.h:22
8883msgid "Update remote refs along with associated objects"
8884msgstr "更新远程引用和相关的对象"
8885
8886#: common-cmds.h:23
8887msgid "Forward-port local commits to the updated upstream head"
8888msgstr "本地提交转移至更新后的上游分支中"
8889
8890#: common-cmds.h:24
8891msgid "Reset current HEAD to the specified state"
8892msgstr "重置当前HEAD到指定状态"
8893
8894#: common-cmds.h:25
8895msgid "Remove files from the working tree and from the index"
8896msgstr "从工作区和索引中删除文件"
8897
8898#: common-cmds.h:26
8899msgid "Show various types of objects"
8900msgstr "显示各种类型的对象"
8901
8902#: common-cmds.h:27
8903msgid "Show the working tree status"
8904msgstr "显示工作区状态"
8905
8906#: common-cmds.h:28
8907msgid "Create, list, delete or verify a tag object signed with GPG"
8908msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8909
8910#: git-am.sh:50
8911msgid "You need to set your committer info first"
8912msgstr "您需要先设置你的提交者信息"
8913
8914#: git-am.sh:95
8915msgid ""
8916"You seem to have moved HEAD since the last 'am' failure.\n"
8917"Not rewinding to ORIG_HEAD"
8918msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8919
8920#: git-am.sh:105
8921#, sh-format
8922msgid ""
8923"When you have resolved this problem, run \"$cmdline --resolved\".\n"
8924"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8925"To restore the original branch and stop patching, run \"$cmdline --abort\"."
8926msgstr ""
8927"当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
8928"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
8929"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8930
8931#: git-am.sh:121
8932msgid "Cannot fall back to three-way merge."
8933msgstr "无法求助于三路合并。"
8934
8935#: git-am.sh:137
8936msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8937msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
8938
8939#: git-am.sh:139
8940msgid "Using index info to reconstruct a base tree..."
8941msgstr "使用索引来重建一个(三路合并的)基础目录树..."
8942
8943#: git-am.sh:154
8944msgid ""
8945"Did you hand edit your patch?\n"
8946"It does not apply to blobs recorded in its index."
8947msgstr ""
8948"您是否曾手动编辑过您的补丁?\n"
8949"无法应用补丁到索引中的数据(blob)对象上。"
8950
8951#: git-am.sh:163
8952msgid "Falling back to patching base and 3-way merge..."
8953msgstr "转而在基础版本上打补丁及进行三路合并..."
8954
8955#: git-am.sh:179
8956msgid "Failed to merge in the changes."
8957msgstr "无法合并变更。"
8958
8959#: git-am.sh:274
8960msgid "Only one StGIT patch series can be applied at once"
8961msgstr "一次只能有一个 StGIT 补丁队列被应用"
8962
8963#: git-am.sh:361
8964#, sh-format
8965msgid "Patch format $patch_format is not supported."
8966msgstr "不支持 $patch_format 补丁格式。"
8967
8968#: git-am.sh:363
8969msgid "Patch format detection failed."
8970msgstr "补丁格式检测失败。"
8971
8972#: git-am.sh:389
8973msgid ""
8974"The -b/--binary option has been a no-op for long time, and\n"
8975"it will be removed. Please do not use it anymore."
8976msgstr ""
8977"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
8978"请不要再使用它了。"
8979
8980#: git-am.sh:477
8981#, sh-format
8982msgid "previous rebase directory $dotest still exists but mbox given."
8983msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
8984
8985#: git-am.sh:482
8986msgid "Please make up your mind. --skip or --abort?"
8987msgstr "请下决心。--skip 或是 --abort ?"
8988
8989#: git-am.sh:509
8990msgid "Resolve operation not in progress, we are not resuming."
8991msgstr "解决操作未进行,我们不会继续。"
8992
8993#: git-am.sh:575
8994#, sh-format
8995msgid "Dirty index: cannot apply patches (dirty: $files)"
8996msgstr "脏的索引:不能应用补丁(脏文件:$files)"
8997
8998#: git-am.sh:679
8999#, sh-format
9000msgid ""
9001"Patch is empty. Was it split wrong?\n"
9002"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9003"To restore the original branch and stop patching run \"$cmdline --abort\"."
9004msgstr ""
9005"补丁为空。是不是切分错误?\n"
9006"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
9007"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9008
9009#: git-am.sh:706
9010msgid "Patch does not have a valid e-mail address."
9011msgstr "补丁中没有一个有效的邮件地址。"
9012
9013#: git-am.sh:753
9014msgid "cannot be interactive without stdin connected to a terminal."
9015msgstr "标准输入没有和终端关联,不能进行交互式操作。"
9016
9017#: git-am.sh:757
9018msgid "Commit Body is:"
9019msgstr "提交内容为:"
9020
9021# 译者:注意保持句尾空格
9022#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9023#. in your translation. The program will only accept English
9024#. input at this point.
9025#: git-am.sh:764
9026msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9027msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9028
9029#: git-am.sh:800
9030#, sh-format
9031msgid "Applying: $FIRSTLINE"
9032msgstr "正应用:$FIRSTLINE"
9033
9034#: git-am.sh:821
9035msgid ""
9036"No changes - did you forget to use 'git add'?\n"
9037"If there is nothing left to stage, chances are that something else\n"
9038"already introduced the same changes; you might want to skip this patch."
9039msgstr ""
9040"没有变更 —— 您是不是忘了执行 'git add'?\n"
9041"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9042"您也许想要跳过这个补丁。"
9043
9044#: git-am.sh:829
9045msgid ""
9046"You still have unmerged paths in your index\n"
9047"did you forget to use 'git add'?"
9048msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
9049
9050#: git-am.sh:845
9051msgid "No changes -- Patch already applied."
9052msgstr "没有变更 —— 补丁已经应用过。"
9053
9054#: git-am.sh:855
9055#, sh-format
9056msgid "Patch failed at $msgnum $FIRSTLINE"
9057msgstr "补丁失败于 $msgnum $FIRSTLINE"
9058
9059#: git-am.sh:858
9060#, sh-format
9061msgid ""
9062"The copy of the patch that failed is found in:\n"
9063" $dotest/patch"
9064msgstr ""
9065"失败的补丁文件副本位于:\n"
9066" $dotest/patch"
9067
9068#: git-am.sh:876
9069msgid "applying to an empty history"
9070msgstr "正应用到一个空历史上"
9071
9072#: git-bisect.sh:48
9073msgid "You need to start by \"git bisect start\""
9074msgstr "您需要执行 \"git bisect start\" 来开始"
9075
9076# 译者:注意保持句尾空格
9077#. TRANSLATORS: Make sure to include [Y] and [n] in your
9078#. translation. The program will only accept English input
9079#. at this point.
9080#: git-bisect.sh:54
9081msgid "Do you want me to do it for you [Y/n]? "
9082msgstr "您想让我为您这样做么[Y/n]? "
9083
9084#: git-bisect.sh:95
9085#, sh-format
9086msgid "unrecognised option: '$arg'"
9087msgstr "未能识别的选项:'$arg'"
9088
9089#: git-bisect.sh:99
9090#, sh-format
9091msgid "'$arg' does not appear to be a valid revision"
9092msgstr "'$arg' 看起来不像是一个有效的版本"
9093
9094#: git-bisect.sh:117
9095msgid "Bad HEAD - I need a HEAD"
9096msgstr "坏的 HEAD - 我需要一个 HEAD"
9097
9098#: git-bisect.sh:130
9099#, sh-format
9100msgid ""
9101"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9102msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
9103
9104#: git-bisect.sh:140
9105msgid "won't bisect on seeked tree"
9106msgstr "不会在已查找过的树上二分查找"
9107
9108#: git-bisect.sh:144
9109msgid "Bad HEAD - strange symbolic ref"
9110msgstr "坏的 HEAD - 奇怪的符号引用"
9111
9112#: git-bisect.sh:189
9113#, sh-format
9114msgid "Bad bisect_write argument: $state"
9115msgstr "坏的 bisect_write 参数:$state"
9116
9117#: git-bisect.sh:218
9118#, sh-format
9119msgid "Bad rev input: $arg"
9120msgstr "输入坏的版本:$arg"
9121
9122#: git-bisect.sh:232
9123msgid "Please call 'bisect_state' with at least one argument."
9124msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
9125
9126#: git-bisect.sh:244
9127#, sh-format
9128msgid "Bad rev input: $rev"
9129msgstr "输入坏的版本:$rev"
9130
9131#: git-bisect.sh:250
9132msgid "'git bisect bad' can take only one argument."
9133msgstr "'git bisect bad' 只能带一个参数。"
9134
9135#. have bad but not good. we could bisect although
9136#. this is less optimum.
9137#: git-bisect.sh:273
9138msgid "Warning: bisecting only with a bad commit."
9139msgstr "警告:在仅有一个坏提交下进行二分查找。"
9140
9141# 译者:注意保持句尾空格
9142#. TRANSLATORS: Make sure to include [Y] and [n] in your
9143#. translation. The program will only accept English input
9144#. at this point.
9145#: git-bisect.sh:279
9146msgid "Are you sure [Y/n]? "
9147msgstr "您确认么[Y/n]? "
9148
9149#: git-bisect.sh:289
9150msgid ""
9151"You need to give me at least one good and one bad revisions.\n"
9152"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9153msgstr ""
9154"您需要给我至少一个好版本和一个坏版本。\n"
9155"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9156
9157#: git-bisect.sh:292
9158msgid ""
9159"You need to start by \"git bisect start\".\n"
9160"You then need to give me at least one good and one bad revisions.\n"
9161"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9162msgstr ""
9163"您需要执行 \"git bisect start\" 来开始。\n"
9164"然后需要提供我至少一个好版本和一个坏版本。\n"
9165"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9166
9167#: git-bisect.sh:347 git-bisect.sh:474
9168msgid "We are not bisecting."
9169msgstr "我们没有在二分查找。"
9170
9171#: git-bisect.sh:354
9172#, sh-format
9173msgid "'$invalid' is not a valid commit"
9174msgstr "'$invalid' 不是一个有效的提交"
9175
9176#: git-bisect.sh:363
9177#, sh-format
9178msgid ""
9179"Could not check out original HEAD '$branch'.\n"
9180"Try 'git bisect reset <commit>'."
9181msgstr ""
9182"不能检出原始 HEAD '$branch'。\n"
9183"尝试 'git bisect reset <提交>'。"
9184
9185#: git-bisect.sh:390
9186msgid "No logfile given"
9187msgstr "未提供日志文件"
9188
9189#: git-bisect.sh:391
9190#, sh-format
9191msgid "cannot read $file for replaying"
9192msgstr "不能读取 $file 来重放"
9193
9194#: git-bisect.sh:408
9195msgid "?? what are you talking about?"
9196msgstr "?? 您在说什么?"
9197
9198#: git-bisect.sh:420
9199#, sh-format
9200msgid "running $command"
9201msgstr "运行 $command"
9202
9203#: git-bisect.sh:427
9204#, sh-format
9205msgid ""
9206"bisect run failed:\n"
9207"exit code $res from '$command' is < 0 or >= 128"
9208msgstr ""
9209"二分查找运行失败:\n"
9210"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
9211
9212#: git-bisect.sh:453
9213msgid "bisect run cannot continue any more"
9214msgstr "二分查找不能继续运行"
9215
9216#: git-bisect.sh:459
9217#, sh-format
9218msgid ""
9219"bisect run failed:\n"
9220"'bisect_state $state' exited with error code $res"
9221msgstr ""
9222"二分查找运行失败:\n"
9223"'bisect_state $state' 退出码为 $res"
9224
9225#: git-bisect.sh:466
9226msgid "bisect run success"
9227msgstr "二分查找运行成功"
9228
9229#: git-pull.sh:21
9230msgid ""
9231"Pull is not possible because you have unmerged files.\n"
9232"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9233"as appropriate to mark resolution, or use 'git commit -a'."
9234msgstr ""
9235"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
9236"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
9237"或者使用 'git commit -a'。"
9238
9239#: git-pull.sh:25
9240msgid "Pull is not possible because you have unmerged files."
9241msgstr "Pull 不可用,因为您尚有未合并的文件。"
9242
9243#: git-pull.sh:203
9244msgid "updating an unborn branch with changes added to the index"
9245msgstr "更新尚未诞生的分支,变更添加至索引"
9246
9247#. The fetch involved updating the current branch.
9248#. The working tree and the index file is still based on the
9249#. $orig_head commit, but we are merging into $curr_head.
9250#. First update the working tree to match $curr_head.
9251#: git-pull.sh:235
9252#, sh-format
9253msgid ""
9254"Warning: fetch updated the current branch head.\n"
9255"Warning: fast-forwarding your working tree from\n"
9256"Warning: commit $orig_head."
9257msgstr ""
9258"警告:fetch 更新了当前的分支。您的工作区\n"
9259"警告:从原提交 $orig_head 快进。"
9260
9261#: git-pull.sh:260
9262msgid "Cannot merge multiple branches into empty head"
9263msgstr "无法将多个分支合并到空分支"
9264
9265#: git-pull.sh:264
9266msgid "Cannot rebase onto multiple branches"
9267msgstr "无法变基到多个分支"
9268
9269#: git-rebase.sh:53
9270msgid ""
9271"When you have resolved this problem, run \"git rebase --continue\".\n"
9272"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9273"To check out the original branch and stop rebasing, run \"git rebase --abort"
9274"\"."
9275msgstr ""
9276"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
9277"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
9278"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
9279
9280#: git-rebase.sh:160
9281msgid "The pre-rebase hook refused to rebase."
9282msgstr "钩子 pre-rebase 拒绝变基。"
9283
9284#: git-rebase.sh:165
9285msgid "It looks like git-am is in progress. Cannot rebase."
9286msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
9287
9288#: git-rebase.sh:296
9289msgid "The --exec option must be used with the --interactive option"
9290msgstr "选项 --exec 必须和选项 --interactive 同时使用"
9291
9292#: git-rebase.sh:301
9293msgid "No rebase in progress?"
9294msgstr "没有正在进行的变基?"
9295
9296#: git-rebase.sh:312
9297msgid "The --edit-todo action can only be used during interactive rebase."
9298msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
9299
9300#: git-rebase.sh:319
9301msgid "Cannot read HEAD"
9302msgstr "不能读取 HEAD"
9303
9304#: git-rebase.sh:322
9305msgid ""
9306"You must edit all merge conflicts and then\n"
9307"mark them as resolved using git add"
9308msgstr ""
9309"您必须编辑所有的合并冲突,然后通过 git add\n"
9310"命令将它们标记为已解决"
9311
9312#: git-rebase.sh:340
9313#, sh-format
9314msgid "Could not move back to $head_name"
9315msgstr "无法移回 $head_name"
9316
9317#: git-rebase.sh:359
9318#, sh-format
9319msgid ""
9320"It seems that there is already a $state_dir_base directory, and\n"
9321"I wonder if you are in the middle of another rebase. If that is the\n"
9322"case, please try\n"
9323"\t$cmd_live_rebase\n"
9324"If that is not the case, please\n"
9325"\t$cmd_clear_stale_rebase\n"
9326"and run me again. I am stopping in case you still have something\n"
9327"valuable there."
9328msgstr ""
9329"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
9330"如果是这样,请尝试执行\n"
9331"\t$cmd_live_rebase\n"
9332"如果不是这样,请执行\n"
9333"\t$cmd_clear_stale_rebase\n"
9334"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
9335
9336#: git-rebase.sh:404
9337#, sh-format
9338msgid "invalid upstream $upstream_name"
9339msgstr "无效的上游 $upstream_name"
9340
9341#: git-rebase.sh:428
9342#, sh-format
9343msgid "$onto_name: there are more than one merge bases"
9344msgstr "$onto_name: 有一个以上的合并基准"
9345
9346#: git-rebase.sh:431 git-rebase.sh:435
9347#, sh-format
9348msgid "$onto_name: there is no merge base"
9349msgstr "$onto_name: 没有合并基准"
9350
9351#: git-rebase.sh:440
9352#, sh-format
9353msgid "Does not point to a valid commit: $onto_name"
9354msgstr "没有指向一个有效的提交:$onto_name"
9355
9356#: git-rebase.sh:463
9357#, sh-format
9358msgid "fatal: no such branch: $branch_name"
9359msgstr "严重错误:无此分支:$branch_name"
9360
9361#: git-rebase.sh:483
9362msgid "Please commit or stash them."
9363msgstr "请提交或为它们保存进度。"
9364
9365#: git-rebase.sh:501
9366#, sh-format
9367msgid "Current branch $branch_name is up to date."
9368msgstr "当前分支 $branch_name 是最新的。"
9369
9370#: git-rebase.sh:504
9371#, sh-format
9372msgid "Current branch $branch_name is up to date, rebase forced."
9373msgstr "当前分支 $branch_name 是最新的,强制变基。"
9374
9375#: git-rebase.sh:515
9376#, sh-format
9377msgid "Changes from $mb to $onto:"
9378msgstr "变更从 $mb 到 $onto:"
9379
9380#. Detach HEAD and reset the tree
9381#: git-rebase.sh:524
9382msgid "First, rewinding head to replay your work on top of it..."
9383msgstr "首先,重置头指针以便在上面重放您的工作..."
9384
9385#: git-rebase.sh:532
9386#, sh-format
9387msgid "Fast-forwarded $branch_name to $onto_name."
9388msgstr "快进 $branch_name 至 $onto_name。"
9389
9390#: git-stash.sh:51
9391msgid "git stash clear with parameters is unimplemented"
9392msgstr "git stash clear 不支持参数"
9393
9394#: git-stash.sh:74
9395msgid "You do not have the initial commit yet"
9396msgstr "您尚未建立初始提交"
9397
9398#: git-stash.sh:89
9399msgid "Cannot save the current index state"
9400msgstr "无法保存当前索引状态"
9401
9402#: git-stash.sh:123 git-stash.sh:136
9403msgid "Cannot save the current worktree state"
9404msgstr "无法保存当前工作区状态"
9405
9406#: git-stash.sh:140
9407msgid "No changes selected"
9408msgstr "没有选择变更"
9409
9410#: git-stash.sh:143
9411msgid "Cannot remove temporary index (can't happen)"
9412msgstr "无法删除临时索引(不应发生)"
9413
9414#: git-stash.sh:156
9415msgid "Cannot record working tree state"
9416msgstr "不能记录工作区状态"
9417
9418#. TRANSLATORS: $option is an invalid option, like
9419#. `--blah-blah'. The 7 spaces at the beginning of the
9420#. second line correspond to "error: ". So you should line
9421#. up the second line with however many characters the
9422#. translation of "error: " takes in your language. E.g. in
9423#. English this is:
9424#.
9425#. $ git stash save --blah-blah 2>&1 | head -n 2
9426#. error: unknown option for 'stash save': --blah-blah
9427#. To provide a message, use git stash save -- '--blah-blah'
9428#: git-stash.sh:202
9429#, sh-format
9430msgid ""
9431"error: unknown option for 'stash save': $option\n"
9432" To provide a message, use git stash save -- '$option'"
9433msgstr ""
9434"错误:'stash save' 的未知选项:$option\n"
9435" 要提供一个描述信息,使用 git stash save -- '$option'"
9436
9437#: git-stash.sh:223
9438msgid "No local changes to save"
9439msgstr "没有要保存的本地修改"
9440
9441#: git-stash.sh:227
9442msgid "Cannot initialize stash"
9443msgstr "无法初始化 stash"
9444
9445#: git-stash.sh:235
9446msgid "Cannot save the current status"
9447msgstr "无法保存当前状态"
9448
9449#: git-stash.sh:253
9450msgid "Cannot remove worktree changes"
9451msgstr "无法删除工作区变更"
9452
9453#: git-stash.sh:352
9454msgid "No stash found."
9455msgstr "未发现 stash。"
9456
9457#: git-stash.sh:359
9458#, sh-format
9459msgid "Too many revisions specified: $REV"
9460msgstr "指定了太多的版本:$REV"
9461
9462#: git-stash.sh:365
9463#, sh-format
9464msgid "$reference is not valid reference"
9465msgstr "$reference 不是有效的引用"
9466
9467#: git-stash.sh:393
9468#, sh-format
9469msgid "'$args' is not a stash-like commit"
9470msgstr "'$args' 不是 stash 样提交"
9471
9472#: git-stash.sh:404
9473#, sh-format
9474msgid "'$args' is not a stash reference"
9475msgstr "'$args' 不是一个 stash 引用"
9476
9477#: git-stash.sh:412
9478msgid "unable to refresh index"
9479msgstr "无法刷新索引"
9480
9481#: git-stash.sh:416
9482msgid "Cannot apply a stash in the middle of a merge"
9483msgstr "无法在合并过程中恢复进度"
9484
9485#: git-stash.sh:424
9486msgid "Conflicts in index. Try without --index."
9487msgstr "索引中有冲突。尝试不使用 --index。"
9488
9489#: git-stash.sh:426
9490msgid "Could not save index tree"
9491msgstr "不能保存索引树"
9492
9493#: git-stash.sh:460
9494msgid "Cannot unstage modified files"
9495msgstr "无法还原修改的文件"
9496
9497#: git-stash.sh:475
9498msgid "Index was not unstashed."
9499msgstr "索引的进度没有被恢复。"
9500
9501#: git-stash.sh:492
9502#, sh-format
9503msgid "Dropped ${REV} ($s)"
9504msgstr "丢弃了 ${REV} ($s)"
9505
9506#: git-stash.sh:493
9507#, sh-format
9508msgid "${REV}: Could not drop stash entry"
9509msgstr "${REV}:不能丢弃进度条目"
9510
9511#: git-stash.sh:500
9512msgid "No branch name specified"
9513msgstr "未指定分支名"
9514
9515#: git-stash.sh:571
9516msgid "(To restore them type \"git stash apply\")"
9517msgstr "(为恢复数据输入 \"git stash apply\")"
9518
9519#: git-submodule.sh:91
9520#, sh-format
9521msgid "cannot strip one component off url '$remoteurl'"
9522msgstr "无法从 url '$remoteurl' 剥离一个组件"
9523
9524#: git-submodule.sh:196
9525#, sh-format
9526msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9527msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
9528
9529#: git-submodule.sh:239
9530#, sh-format
9531msgid "Clone of '$url' into submodule path '$sm_path' failed"
9532msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
9533
9534#: git-submodule.sh:251
9535#, sh-format
9536msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9537msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
9538
9539#: git-submodule.sh:349
9540#, sh-format
9541msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9542msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
9543
9544#: git-submodule.sh:366
9545#, sh-format
9546msgid "'$sm_path' already exists in the index"
9547msgstr "'$sm_path' 已经存在于索引中"
9548
9549#: git-submodule.sh:370
9550#, sh-format
9551msgid ""
9552"The following path is ignored by one of your .gitignore files:\n"
9553"$sm_path\n"
9554"Use -f if you really want to add it."
9555msgstr ""
9556"以下路径被您的一个 .gitignore 文件所忽略:\n"
9557"$sm_path\n"
9558"如果您确实想添加它,使用 -f 参数。"
9559
9560#: git-submodule.sh:388
9561#, sh-format
9562msgid "Adding existing repo at '$sm_path' to the index"
9563msgstr "添加位于 '$sm_path' 的现存版本库到索引"
9564
9565#: git-submodule.sh:390
9566#, sh-format
9567msgid "'$sm_path' already exists and is not a valid git repo"
9568msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
9569
9570#: git-submodule.sh:398
9571#, sh-format
9572msgid "A git directory for '$sm_name' is found locally with remote(s):"
9573msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
9574
9575#: git-submodule.sh:400
9576#, sh-format
9577msgid ""
9578"If you want to reuse this local git directory instead of cloning again from"
9579msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
9580
9581#: git-submodule.sh:402
9582#, sh-format
9583msgid ""
9584"use the '--force' option. If the local git directory is not the correct repo"
9585msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
9586
9587#: git-submodule.sh:403
9588#, sh-format
9589msgid ""
9590"or you are unsure what this means choose another name with the '--name' "
9591"option."
9592msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
9593
9594#: git-submodule.sh:405
9595#, sh-format
9596msgid "Reactivating local git directory for submodule '$sm_name'."
9597msgstr "激活本地 git 目录到子模组 '$sm_name'。"
9598
9599#: git-submodule.sh:417
9600#, sh-format
9601msgid "Unable to checkout submodule '$sm_path'"
9602msgstr "不能检出子模组 '$sm_path'"
9603
9604#: git-submodule.sh:422
9605#, sh-format
9606msgid "Failed to add submodule '$sm_path'"
9607msgstr "无法添加子模组 '$sm_path'"
9608
9609#: git-submodule.sh:431
9610#, sh-format
9611msgid "Failed to register submodule '$sm_path'"
9612msgstr "无法注册子模组 '$sm_path'"
9613
9614#: git-submodule.sh:474
9615#, sh-format
9616msgid "Entering '$prefix$sm_path'"
9617msgstr "正在进入 '$prefix$sm_path'"
9618
9619#: git-submodule.sh:488
9620#, sh-format
9621msgid "Stopping at '$sm_path'; script returned non-zero status."
9622msgstr "停止于 '$sm_path',脚本返回非零值。"
9623
9624#: git-submodule.sh:532
9625#, sh-format
9626msgid "No url found for submodule path '$sm_path' in .gitmodules"
9627msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
9628
9629#: git-submodule.sh:541
9630#, sh-format
9631msgid "Failed to register url for submodule path '$sm_path'"
9632msgstr "无法为子模组路径 '$sm_path' 注册 url"
9633
9634#: git-submodule.sh:543
9635#, sh-format
9636msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9637msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
9638
9639#: git-submodule.sh:551
9640#, sh-format
9641msgid "Failed to register update mode for submodule path '$sm_path'"
9642msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
9643
9644#: git-submodule.sh:588
9645#, sh-format
9646msgid "Use '.' if you really want to deinitialize all submodules"
9647msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
9648
9649#: git-submodule.sh:603
9650#, sh-format
9651msgid "Submodule work tree '$sm_path' contains a .git directory"
9652msgstr "子模组工作区 '$sm_path' 包含一个 .git 目录"
9653
9654#: git-submodule.sh:604
9655#, sh-format
9656msgid ""
9657"(use 'rm -rf' if you really want to remove it including all of its history)"
9658msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9659
9660#: git-submodule.sh:610
9661#, sh-format
9662msgid ""
9663"Submodule work tree '$sm_path' contains local modifications; use '-f' to "
9664"discard them"
9665msgstr "子模组工作区 '$sm_path' 包含本地修改;使用 '-f' 丢弃它们"
9666
9667#: git-submodule.sh:613
9668#, sh-format
9669msgid "Cleared directory '$sm_path'"
9670msgstr "已清除目录 '$sm_path'"
9671
9672#: git-submodule.sh:614
9673#, sh-format
9674msgid "Could not remove submodule work tree '$sm_path'"
9675msgstr "无法移除子模组工作区 '$sm_path'"
9676
9677#: git-submodule.sh:617
9678#, sh-format
9679msgid "Could not create empty submodule directory '$sm_path'"
9680msgstr "不能创建空的子模组目录 '$sm_path'"
9681
9682#: git-submodule.sh:626
9683#, sh-format
9684msgid "Submodule '$name' ($url) unregistered for path '$sm_path'"
9685msgstr "子模组 '$name' ($url) 未对路径 '$sm_path' 注册"
9686
9687#: git-submodule.sh:731
9688#, sh-format
9689msgid ""
9690"Submodule path '$prefix$sm_path' not initialized\n"
9691"Maybe you want to use 'update --init'?"
9692msgstr ""
9693"子模组路径 '$prefix$sm_path' 没有初始化\n"
9694"也许您想用 'update --init'?"
9695
9696#: git-submodule.sh:744
9697#, sh-format
9698msgid "Unable to find current revision in submodule path '$prefix$sm_path'"
9699msgstr "无法在子模组路径 '$prefix$sm_path' 中找到当前版本"
9700
9701#: git-submodule.sh:753
9702#, sh-format
9703msgid "Unable to fetch in submodule path '$sm_path'"
9704msgstr "无法在子模组路径 '$sm_path' 中获取"
9705
9706#: git-submodule.sh:777
9707#, sh-format
9708msgid "Unable to fetch in submodule path '$prefix$sm_path'"
9709msgstr "无法在子模组路径 '$prefix$sm_path' 中获取"
9710
9711#: git-submodule.sh:791
9712#, sh-format
9713msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'"
9714msgstr "无法在子模组路径 '$prefix$sm_path' 中变基 '$sha1'"
9715
9716#: git-submodule.sh:792
9717#, sh-format
9718msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'"
9719msgstr "子模组路径 '$prefix$sm_path':变基至 '$sha1'"
9720
9721#: git-submodule.sh:797
9722#, sh-format
9723msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'"
9724msgstr "无法合并 '$sha1' 到子模组路径 '$prefix$sm_path' 中"
9725
9726#: git-submodule.sh:798
9727#, sh-format
9728msgid "Submodule path '$prefix$sm_path': merged in '$sha1'"
9729msgstr "子模组路径 '$prefix$sm_path':已合并入 '$sha1'"
9730
9731#: git-submodule.sh:803
9732#, sh-format
9733msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'"
9734msgstr "无法在子模组路径 '$prefix$sm_path' 中检出 '$sha1'"
9735
9736#: git-submodule.sh:804
9737#, sh-format
9738msgid "Submodule path '$prefix$sm_path': checked out '$sha1'"
9739msgstr "子模组路径 '$prefix$sm_path':检出 '$sha1'"
9740
9741#: git-submodule.sh:831
9742#, sh-format
9743msgid "Failed to recurse into submodule path '$prefix$sm_path'"
9744msgstr "无法递归进子模组路径 '$prefix$sm_path'"
9745
9746#: git-submodule.sh:939
9747msgid "The --cached option cannot be used with the --files option"
9748msgstr "选项 --cached 不能和选项 --files 同时使用"
9749
9750#. unexpected type
9751#: git-submodule.sh:979
9752#, sh-format
9753msgid "unexpected mode $mod_dst"
9754msgstr "意外的模式 $mod_dst"
9755
9756# 译者:注意保持前导空格
9757#: git-submodule.sh:997
9758#, sh-format
9759msgid " Warn: $name doesn't contain commit $sha1_src"
9760msgstr " 警告:$name 未包含提交 $sha1_src"
9761
9762# 译者:注意保持前导空格
9763#: git-submodule.sh:1000
9764#, sh-format
9765msgid " Warn: $name doesn't contain commit $sha1_dst"
9766msgstr " 警告:$name 未包含提交 $sha1_dst"
9767
9768# 译者:注意保持前导空格
9769#: git-submodule.sh:1003
9770#, sh-format
9771msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9772msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
9773
9774#: git-submodule.sh:1028
9775msgid "blob"
9776msgstr "数据对象"
9777
9778#: git-submodule.sh:1066
9779msgid "Submodules changed but not updated:"
9780msgstr "子模组已修改但尚未更新:"
9781
9782#: git-submodule.sh:1068
9783msgid "Submodule changes to be committed:"
9784msgstr "要提交的子模组变更:"
9785
9786#: git-submodule.sh:1153
9787#, sh-format
9788msgid "Failed to recurse into submodule path '$sm_path'"
9789msgstr "无法递归进子模组路径 '$sm_path'"
9790
9791#: git-submodule.sh:1216
9792#, sh-format
9793msgid "Synchronizing submodule url for '$prefix$sm_path'"
9794msgstr "为 '$prefix$sm_path' 同步子模组 url"
9795
9796#, fuzzy
9797#~ msgid "aaaSynchronizing submodule url for '$prefix$sm_path'"
9798#~ msgstr "为 '$prefix$sm_path' 同步子模组 url"
9799
9800#~ msgid "use any ref in .git/refs"
9801#~ msgstr "使用 .git/refs 里的任意引用"
9802
9803#~ msgid "use any tag in .git/refs/tags"
9804#~ msgstr "使用 .git/refs/tags 里的任意 tag"
9805
9806#~ msgid "bad object %s"
9807#~ msgstr "坏对象 %s"
9808
9809#~ msgid "bogus committer info %s"
9810#~ msgstr "虚假的提交者信息 %s"
9811
9812#~ msgid "can't fdopen 'show' output fd"
9813#~ msgstr "不能打开 'show' 输出文件句柄"
9814
9815#~ msgid "failed to close pipe to 'show' for object '%s'"
9816#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
9817
9818#~ msgid " 0 files changed"
9819#~ msgstr " 0 个文件被修改"
9820
9821#~ msgid " %d file changed"
9822#~ msgid_plural " %d files changed"
9823#~ msgstr[0] " %d 个文件被修改"
9824#~ msgstr[1] " %d 个文件被修改"
9825
9826#~ msgid ", %d insertion(+)"
9827#~ msgid_plural ", %d insertions(+)"
9828#~ msgstr[0] ",插入 %d 行(+)"
9829#~ msgstr[1] ",插入 %d 行(+)"
9830
9831#~ msgid ", %d deletion(-)"
9832#~ msgid_plural ", %d deletions(-)"
9833#~ msgstr[0] ",删除 %d 行(-)"
9834#~ msgstr[1] ",删除 %d 行(-)"
9835
9836#~ msgid "You do not have a valid HEAD"
9837#~ msgstr "您没有一个有效的 HEAD"
9838
9839#~ msgid "oops"
9840#~ msgstr "哎哟"
9841
9842#~ msgid "Would not remove %s\n"
9843#~ msgstr "不会删除 %s\n"
9844
9845#~ msgid "Not removing %s\n"
9846#~ msgstr "未删除 %s\n"
9847
9848#~ msgid "Auto packing the repository for optimum performance.\n"
9849#~ msgstr "自动打包版本库以求最佳性能。\n"
9850
9851#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
9852#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
9853
9854#~ msgid "Could not read index"
9855#~ msgstr "不能读取索引"
9856
9857# 译者:中文字符串拼接,可删除前导空格
9858#~ msgid " (use \"git add\" to track)"
9859#~ msgstr "(使用 \"git add\" 建立跟踪)"
9860
9861#~ msgid "-B cannot be used with -b"
9862#~ msgstr "-B 不能和 -b 同时使用"
9863
9864#~ msgid "--patch is incompatible with all other options"
9865#~ msgstr "--patch 选项和其他选项不兼容"
9866
9867#~ msgid "--detach cannot be used with -b/-B/--orphan"
9868#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
9869
9870#~ msgid "--detach cannot be used with -t"
9871#~ msgstr "--detach 不能和 -t 同时使用"
9872
9873#~ msgid "--orphan and -b|-B are mutually exclusive"
9874#~ msgstr "--orphan 和 -b|-B 互斥"
9875
9876#~ msgid "--orphan cannot be used with -t"
9877#~ msgstr "--orphan 不能和 -t 同时使用"
9878
9879#~ msgid "git checkout: -f and -m are incompatible"
9880#~ msgstr "git checkout:-f 和 -m 不兼容"
9881
9882#~ msgid ""
9883#~ "git checkout: updating paths is incompatible with switching branches."
9884#~ msgstr "git checkout:更新路径和切换分支不兼容。"
9885
9886#~ msgid "diff setup failed"
9887#~ msgstr "diff 设置失败"
9888
9889#~ msgid "merge-recursive: disk full?"
9890#~ msgstr "merge-recursive:磁盘已满?"
9891
9892#~ msgid "diff_setup_done failed"
9893#~ msgstr "diff_setup_done 失败"