b701086e3bfc8d751a467bfc8acef9255a835716
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-11-02 08:06+0800\n"
16"PO-Revision-Date: 2013-11-02 08:14+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:57
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:87
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:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328
64#, c-format
65msgid "pathspec '%s' did not match any files"
66msgstr "路径规则 '%s' 未匹配任何文件"
67
68#: archive.c:327
69msgid "fmt"
70msgstr "格式"
71
72#: archive.c:327
73msgid "archive format"
74msgstr "归档格式"
75
76#: archive.c:328 builtin/log.c:1193
77msgid "prefix"
78msgstr "前缀"
79
80#: archive.c:329
81msgid "prepend prefix to each pathname in the archive"
82msgstr "为归档中每个路径名加上前缀"
83
84#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264
85#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680
86#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
87#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
88#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
89msgid "file"
90msgstr "文件"
91
92#: archive.c:331 builtin/archive.c:89
93msgid "write the archive to this file"
94msgstr "归档写入此文件"
95
96#: archive.c:333
97msgid "read .gitattributes in working directory"
98msgstr "读取工作区中的 .gitattributes"
99
100#: archive.c:334
101msgid "report archived files on stderr"
102msgstr "在标准错误上报告归档文件"
103
104#: archive.c:335
105msgid "store only"
106msgstr "只存储"
107
108#: archive.c:336
109msgid "compress faster"
110msgstr "压缩速度更快"
111
112#: archive.c:344
113msgid "compress better"
114msgstr "压缩效果更好"
115
116#: archive.c:347
117msgid "list supported archive formats"
118msgstr "列出支持的归档格式"
119
120#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
121msgid "repo"
122msgstr "版本库"
123
124#: archive.c:350 builtin/archive.c:91
125msgid "retrieve the archive from remote repository <repo>"
126msgstr "从远程版本库(<版本库>)提取归档文件"
127
128#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
129msgid "command"
130msgstr "命令"
131
132#: archive.c:352 builtin/archive.c:93
133msgid "path to the remote git-upload-archive command"
134msgstr "远程 git-upload-archive 命令的路径"
135
136#: attr.c:259
137msgid ""
138"Negative patterns are ignored in git attributes\n"
139"Use '\\!' for literal leading exclamation."
140msgstr ""
141"负值模版在 git attributes 中被忽略\n"
142"当字符串确实要以感叹号开始时,使用 '\\!'。"
143
144#: branch.c:60
145#, c-format
146msgid "Not setting branch %s as its own upstream."
147msgstr "未设置分支 %s 作为它自己的上游。"
148
149#: branch.c:82
150#, c-format
151msgid "Branch %s set up to track remote branch %s from %s by rebasing."
152msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
153
154#: branch.c:83
155#, c-format
156msgid "Branch %s set up to track remote branch %s from %s."
157msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
158
159#: branch.c:87
160#, c-format
161msgid "Branch %s set up to track local branch %s by rebasing."
162msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
163
164#: branch.c:88
165#, c-format
166msgid "Branch %s set up to track local branch %s."
167msgstr "分支 %s 设置为跟踪本地分支 %s。"
168
169#: branch.c:92
170#, c-format
171msgid "Branch %s set up to track remote ref %s by rebasing."
172msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
173
174#: branch.c:93
175#, c-format
176msgid "Branch %s set up to track remote ref %s."
177msgstr "分支 %s 设置为跟踪远程引用 %s。"
178
179#: branch.c:97
180#, c-format
181msgid "Branch %s set up to track local ref %s by rebasing."
182msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
183
184#: branch.c:98
185#, c-format
186msgid "Branch %s set up to track local ref %s."
187msgstr "分支 %s 设置为跟踪本地引用 %s。"
188
189#: branch.c:118
190#, c-format
191msgid "Tracking not set up: name too long: %s"
192msgstr "跟踪未设置:名字太长:%s"
193
194#: branch.c:137
195#, c-format
196msgid "Not tracking: ambiguous information for ref %s"
197msgstr "未跟踪:引用 %s 有歧义"
198
199#: branch.c:182
200#, c-format
201msgid "'%s' is not a valid branch name."
202msgstr "'%s' 不是一个有效的分支名称。"
203
204#: branch.c:187
205#, c-format
206msgid "A branch named '%s' already exists."
207msgstr "一个分支名 '%s' 已经存在。"
208
209#: branch.c:195
210msgid "Cannot force update the current branch."
211msgstr "无法强制更新当前分支。"
212
213#: branch.c:215
214#, c-format
215msgid "Cannot setup tracking information; starting point '%s' is not a branch."
216msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
217
218#: branch.c:217
219#, c-format
220msgid "the requested upstream branch '%s' does not exist"
221msgstr "请求的上游分支 '%s' 不存在"
222
223#: branch.c:219
224msgid ""
225"\n"
226"If you are planning on basing your work on an upstream\n"
227"branch that already exists at the remote, you may need to\n"
228"run \"git fetch\" to retrieve it.\n"
229"\n"
230"If you are planning to push out a new local branch that\n"
231"will track its remote counterpart, you may want to use\n"
232"\"git push -u\" to set the upstream config as you push."
233msgstr ""
234"\n"
235"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
236"您可能需要执行 \"git fetch\" 来获取分支。\n"
237"\n"
238"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
239"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
240
241#: branch.c:264
242#, c-format
243msgid "Not a valid object name: '%s'."
244msgstr "不是一个有效的对象名:'%s'。"
245
246#: branch.c:284
247#, c-format
248msgid "Ambiguous object name: '%s'."
249msgstr "歧义的对象名:'%s'。"
250
251#: branch.c:289
252#, c-format
253msgid "Not a valid branch point: '%s'."
254msgstr "无效的分支点:'%s'。"
255
256#: branch.c:295
257msgid "Failed to lock ref for update"
258msgstr "无法为更新锁定引用"
259
260#: branch.c:313
261msgid "Failed to write ref"
262msgstr "不能写引用"
263
264#: bundle.c:36
265#, c-format
266msgid "'%s' does not look like a v2 bundle file"
267msgstr "'%s' 不像是一个 v2 版本的包文件"
268
269#: bundle.c:63
270#, c-format
271msgid "unrecognized header: %s%s (%d)"
272msgstr "未能识别的包头:%s%s (%d)"
273
274#: bundle.c:89 builtin/commit.c:706
275#, c-format
276msgid "could not open '%s'"
277msgstr "不能打开 '%s'"
278
279#: bundle.c:140
280msgid "Repository lacks these prerequisite commits:"
281msgstr "版本库缺少这些必备的提交:"
282
283#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
284#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364
285#: builtin/shortlog.c:158
286msgid "revision walk setup failed"
287msgstr "版本遍历设置失败"
288
289#: bundle.c:186
290#, c-format
291msgid "The bundle contains this ref:"
292msgid_plural "The bundle contains these %d refs:"
293msgstr[0] "这个包中含有这个引用:"
294msgstr[1] "这个包中含有 %d 个引用:"
295
296#: bundle.c:193
297msgid "The bundle records a complete history."
298msgstr "这个包记录一个完整历史。"
299
300#: bundle.c:195
301#, c-format
302msgid "The bundle requires this ref:"
303msgid_plural "The bundle requires these %d refs:"
304msgstr[0] "这个包需要这个引用:"
305msgstr[1] "这个包需要 %d 个引用:"
306
307#: bundle.c:294
308msgid "rev-list died"
309msgstr "rev-list 终止"
310
311#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261
312#, c-format
313msgid "unrecognized argument: %s"
314msgstr "未能识别的参数:%s"
315
316#: bundle.c:335
317#, c-format
318msgid "ref '%s' is excluded by the rev-list options"
319msgstr "引用 '%s' 被 rev-list 选项排除"
320
321#: bundle.c:380
322msgid "Refusing to create empty bundle."
323msgstr "不能创建空包。"
324
325#: bundle.c:398
326msgid "Could not spawn pack-objects"
327msgstr "不能生成 pack-objects 进程"
328
329#: bundle.c:416
330msgid "pack-objects died"
331msgstr "pack-objects 终止"
332
333#: bundle.c:419
334#, c-format
335msgid "cannot create '%s'"
336msgstr "不能创建 '%s'"
337
338#: bundle.c:441
339msgid "index-pack died"
340msgstr "index-pack 终止"
341
342#: commit.c:53
343#, c-format
344msgid "could not parse %s"
345msgstr "不能解析 %s"
346
347#: commit.c:55
348#, c-format
349msgid "%s %s is not a commit!"
350msgstr "%s %s 不是一个提交!"
351
352#: compat/obstack.c:406 compat/obstack.c:408
353msgid "memory exhausted"
354msgstr "内存耗尽"
355
356#: connected.c:60
357msgid "Could not run 'git rev-list'"
358msgstr "不能执行 'git rev-list'"
359
360#: connected.c:80
361#, c-format
362msgid "failed write to rev-list: %s"
363msgstr "无法写入 rev-list:%s"
364
365#: connected.c:88
366#, c-format
367msgid "failed to close rev-list's stdin: %s"
368msgstr "无法关闭 rev-list 的标准输入:%s"
369
370#: date.c:95
371msgid "in the future"
372msgstr "在将来"
373
374#: date.c:101
375#, c-format
376msgid "%lu second ago"
377msgid_plural "%lu seconds ago"
378msgstr[0] "%lu 秒钟之前"
379msgstr[1] "%lu 秒钟之前"
380
381#: date.c:108
382#, c-format
383msgid "%lu minute ago"
384msgid_plural "%lu minutes ago"
385msgstr[0] "%lu 分钟之前"
386msgstr[1] "%lu 分钟之前"
387
388#: date.c:115
389#, c-format
390msgid "%lu hour ago"
391msgid_plural "%lu hours ago"
392msgstr[0] "%lu 小时之前"
393msgstr[1] "%lu 小时之前"
394
395#: date.c:122
396#, c-format
397msgid "%lu day ago"
398msgid_plural "%lu days ago"
399msgstr[0] "%lu 天之前"
400msgstr[1] "%lu 天之前"
401
402#: date.c:128
403#, c-format
404msgid "%lu week ago"
405msgid_plural "%lu weeks ago"
406msgstr[0] "%lu 周之前"
407msgstr[1] "%lu 周之前"
408
409#: date.c:135
410#, c-format
411msgid "%lu month ago"
412msgid_plural "%lu months ago"
413msgstr[0] "%lu 个月之前"
414msgstr[1] "%lu 个月之前"
415
416#: date.c:146
417#, c-format
418msgid "%lu year"
419msgid_plural "%lu years"
420msgstr[0] "%lu 年"
421msgstr[1] "%lu 年"
422
423#: date.c:149
424#, c-format
425msgid "%s, %lu month ago"
426msgid_plural "%s, %lu months ago"
427msgstr[0] "%s,%lu 个月之前"
428msgstr[1] "%s,%lu 个月之前"
429
430#: date.c:154 date.c:159
431#, c-format
432msgid "%lu year ago"
433msgid_plural "%lu years ago"
434msgstr[0] "%lu 年前"
435msgstr[1] "%lu 年前"
436
437# 译者:注意保持前导空格
438#: diff.c:112
439#, c-format
440msgid " Failed to parse dirstat cut-off percentage '%s'\n"
441msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
442
443# 译者:注意保持前导空格
444#: diff.c:117
445#, c-format
446msgid " Unknown dirstat parameter '%s'\n"
447msgstr " 未知的 dirstat 参数 '%s'\n"
448
449#: diff.c:210
450#, c-format
451msgid "Unknown value for 'diff.submodule' config variable: '%s'"
452msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
453
454#: diff.c:260
455#, c-format
456msgid ""
457"Found errors in 'diff.dirstat' config variable:\n"
458"%s"
459msgstr ""
460"发现配置变量 'diff.dirstat' 中的错误:\n"
461"%s"
462
463#: diff.c:3490
464#, c-format
465msgid ""
466"Failed to parse --dirstat/-X option parameter:\n"
467"%s"
468msgstr ""
469"无法解析 --dirstat/-X 选项的参数:\n"
470"%s"
471
472#: diff.c:3504
473#, c-format
474msgid "Failed to parse --submodule option parameter: '%s'"
475msgstr "无法解析 --submodule 选项的参数:'%s'"
476
477#: gpg-interface.c:59 gpg-interface.c:131
478msgid "could not run gpg."
479msgstr "不能执行 gpg。"
480
481#: gpg-interface.c:71
482msgid "gpg did not accept the data"
483msgstr "gpg 没有接受数据"
484
485#: gpg-interface.c:82
486msgid "gpg failed to sign the data"
487msgstr "gpg 无法为数据签名"
488
489#: gpg-interface.c:115
490#, c-format
491msgid "could not create temporary file '%s': %s"
492msgstr "不能创建临时文件 '%s':%s"
493
494#: gpg-interface.c:118
495#, c-format
496msgid "failed writing detached signature to '%s': %s"
497msgstr "无法将分离式签名写入 '%s':%s"
498
499#: grep.c:1695
500#, c-format
501msgid "'%s': unable to read %s"
502msgstr "'%s':无法读取 %s"
503
504#: grep.c:1712
505#, c-format
506msgid "'%s': %s"
507msgstr "'%s':%s"
508
509#: grep.c:1723
510#, c-format
511msgid "'%s': short read %s"
512msgstr "'%s':读取不完整 %s"
513
514#: help.c:210
515#, c-format
516msgid "available git commands in '%s'"
517msgstr "在 '%s' 下可用的 git 命令"
518
519#: help.c:217
520msgid "git commands available from elsewhere on your $PATH"
521msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
522
523#: help.c:233
524msgid "The most commonly used git commands are:"
525msgstr "最常用的 git 命令有:"
526
527#: help.c:290
528#, c-format
529msgid ""
530"'%s' appears to be a git command, but we were not\n"
531"able to execute it. Maybe git-%s is broken?"
532msgstr ""
533"'%s' 像是一个 git 命令,但却无法运行。\n"
534"可能是 git-%s 受损?"
535
536#: help.c:347
537msgid "Uh oh. Your system reports no Git commands at all."
538msgstr "唉呀,您的系统中未发现 Git 命令。"
539
540#: help.c:369
541#, c-format
542msgid ""
543"WARNING: You called a Git command named '%s', which does not exist.\n"
544"Continuing under the assumption that you meant '%s'"
545msgstr ""
546"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
547"是 '%s'"
548
549#: help.c:374
550#, c-format
551msgid "in %0.1f seconds automatically..."
552msgstr "在 %0.1f 秒钟后自动运行..."
553
554#: help.c:381
555#, c-format
556msgid "git: '%s' is not a git command. See 'git --help'."
557msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
558
559#: help.c:385 help.c:444
560msgid ""
561"\n"
562"Did you mean this?"
563msgid_plural ""
564"\n"
565"Did you mean one of these?"
566msgstr[0] ""
567"\n"
568"您指的是这个么?"
569msgstr[1] ""
570"\n"
571"您指的是这其中的某一个么?"
572
573#: help.c:440
574#, c-format
575msgid "%s: %s - %s"
576msgstr "%s:%s - %s"
577
578#: merge.c:56
579msgid "failed to read the cache"
580msgstr "无法读取缓存"
581
582#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
583#: builtin/clone.c:655
584msgid "unable to write new index file"
585msgstr "无法写新的索引文件"
586
587#: merge-recursive.c:190
588#, c-format
589msgid "(bad commit)\n"
590msgstr "(坏提交)\n"
591
592#: merge-recursive.c:206
593#, c-format
594msgid "addinfo_cache failed for path '%s'"
595msgstr "为路径 '%s' addinfo_cache 失败"
596
597#: merge-recursive.c:269
598msgid "error building trees"
599msgstr "无法创建树"
600
601#: merge-recursive.c:673
602#, c-format
603msgid "failed to create path '%s'%s"
604msgstr "无法创建路径 '%s'%s"
605
606#: merge-recursive.c:684
607#, c-format
608msgid "Removing %s to make room for subdirectory\n"
609msgstr "删除 %s 以便为子目录留出空间\n"
610
611#. something else exists
612#. .. but not some other error (who really cares what?)
613#: merge-recursive.c:698 merge-recursive.c:719
614msgid ": perhaps a D/F conflict?"
615msgstr ":可能是一个目录/文件冲突?"
616
617#: merge-recursive.c:709
618#, c-format
619msgid "refusing to lose untracked file at '%s'"
620msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
621
622#: merge-recursive.c:749
623#, c-format
624msgid "cannot read object %s '%s'"
625msgstr "不能读取对象 %s '%s'"
626
627#: merge-recursive.c:751
628#, c-format
629msgid "blob expected for %s '%s'"
630msgstr "%s '%s' 应为数据(blob)对象"
631
632#: merge-recursive.c:774 builtin/clone.c:311
633#, c-format
634msgid "failed to open '%s'"
635msgstr "无法打开 '%s'"
636
637#: merge-recursive.c:782
638#, c-format
639msgid "failed to symlink '%s'"
640msgstr "无法创建符号链接 '%s'"
641
642#: merge-recursive.c:785
643#, c-format
644msgid "do not know what to do with %06o %s '%s'"
645msgstr "不知道如何处理 %06o %s '%s'"
646
647#: merge-recursive.c:923
648msgid "Failed to execute internal merge"
649msgstr "无法执行内部合并"
650
651#: merge-recursive.c:927
652#, c-format
653msgid "Unable to add %s to database"
654msgstr "不能添加 %s 至对象库"
655
656#: merge-recursive.c:943
657msgid "unsupported object type in the tree"
658msgstr "在树中有不支持的对象类型"
659
660#: merge-recursive.c:1022 merge-recursive.c:1036
661#, c-format
662msgid ""
663"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
664"in tree."
665msgstr ""
666"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
667"的版本被保留。"
668
669#: merge-recursive.c:1028 merge-recursive.c:1041
670#, c-format
671msgid ""
672"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
673"in tree at %s."
674msgstr ""
675"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
676"的版本保留于 %8$s 中。"
677
678#: merge-recursive.c:1082
679msgid "rename"
680msgstr "重命名"
681
682#: merge-recursive.c:1082
683msgid "renamed"
684msgstr "重命名"
685
686#: merge-recursive.c:1138
687#, c-format
688msgid "%s is a directory in %s adding as %s instead"
689msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
690
691#: merge-recursive.c:1160
692#, c-format
693msgid ""
694"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
695"\"->\"%s\" in \"%s\"%s"
696msgstr ""
697"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
698"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
699
700#: merge-recursive.c:1165
701msgid " (left unresolved)"
702msgstr "(留下未解决)"
703
704#: merge-recursive.c:1219
705#, c-format
706msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
707msgstr ""
708"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
709"%5$s"
710
711#: merge-recursive.c:1249
712#, c-format
713msgid "Renaming %s to %s and %s to %s instead"
714msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
715
716#: merge-recursive.c:1448
717#, c-format
718msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
719msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
720
721#: merge-recursive.c:1458
722#, c-format
723msgid "Adding merged %s"
724msgstr "添加合并后的 %s"
725
726#: merge-recursive.c:1463 merge-recursive.c:1661
727#, c-format
728msgid "Adding as %s instead"
729msgstr "而是以 %s 为名添加"
730
731#: merge-recursive.c:1514
732#, c-format
733msgid "cannot read object %s"
734msgstr "不能读取对象 %s"
735
736#: merge-recursive.c:1517
737#, c-format
738msgid "object %s is not a blob"
739msgstr "对象 %s 不是一个数据(blob)对象"
740
741#: merge-recursive.c:1565
742msgid "modify"
743msgstr "修改"
744
745#: merge-recursive.c:1565
746msgid "modified"
747msgstr "修改"
748
749#: merge-recursive.c:1575
750msgid "content"
751msgstr "内容"
752
753#: merge-recursive.c:1582
754msgid "add/add"
755msgstr "添加/添加"
756
757#: merge-recursive.c:1616
758#, c-format
759msgid "Skipped %s (merged same as existing)"
760msgstr "略过 %s(已经做过相同合并)"
761
762#: merge-recursive.c:1630
763#, c-format
764msgid "Auto-merging %s"
765msgstr "自动合并 %s"
766
767#: merge-recursive.c:1634 git-submodule.sh:1125
768msgid "submodule"
769msgstr "子模组"
770
771#: merge-recursive.c:1635
772#, c-format
773msgid "CONFLICT (%s): Merge conflict in %s"
774msgstr "冲突(%s):合并冲突于 %s"
775
776#: merge-recursive.c:1725
777#, c-format
778msgid "Removing %s"
779msgstr "删除 %s"
780
781#: merge-recursive.c:1750
782msgid "file/directory"
783msgstr "文件/目录"
784
785#: merge-recursive.c:1756
786msgid "directory/file"
787msgstr "目录/文件"
788
789#: merge-recursive.c:1761
790#, c-format
791msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
792msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
793
794#: merge-recursive.c:1771
795#, c-format
796msgid "Adding %s"
797msgstr "添加 %s"
798
799#: merge-recursive.c:1788
800msgid "Fatal merge failure, shouldn't happen."
801msgstr "严重的合并错误,不应发生。"
802
803#: merge-recursive.c:1807
804msgid "Already up-to-date!"
805msgstr "已经是最新的!"
806
807#: merge-recursive.c:1816
808#, c-format
809msgid "merging of trees %s and %s failed"
810msgstr "无法合并树 %s 和 %s"
811
812#: merge-recursive.c:1846
813#, c-format
814msgid "Unprocessed path??? %s"
815msgstr "未处理的路径??? %s"
816
817#: merge-recursive.c:1891
818msgid "Merging:"
819msgstr "合并:"
820
821#: merge-recursive.c:1904
822#, c-format
823msgid "found %u common ancestor:"
824msgid_plural "found %u common ancestors:"
825msgstr[0] "发现 %u 个共同祖先:"
826msgstr[1] "发现 %u 个共同祖先:"
827
828#: merge-recursive.c:1941
829msgid "merge returned no commit"
830msgstr "合并未返回提交"
831
832#: merge-recursive.c:1998
833#, c-format
834msgid "Could not parse object '%s'"
835msgstr "不能解析对象 '%s'"
836
837#: merge-recursive.c:2010 builtin/merge.c:672
838msgid "Unable to write index."
839msgstr "不能写入索引。"
840
841#: notes-utils.c:40
842msgid "Cannot commit uninitialized/unreferenced notes tree"
843msgstr "不能提交未初始化/未引用的注解树"
844
845#: notes-utils.c:81
846#, c-format
847msgid "Bad notes.rewriteMode value: '%s'"
848msgstr "坏的 notes.rewriteMode 值:'%s'"
849
850#: notes-utils.c:91
851#, c-format
852msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
853msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
854
855#. TRANSLATORS: The first %s is the name of the
856#. environment variable, the second %s is its value
857#: notes-utils.c:118
858#, c-format
859msgid "Bad %s value: '%s'"
860msgstr "坏的 %s 值:'%s'"
861
862#: object.c:202
863#, c-format
864msgid "unable to parse object: %s"
865msgstr "不能解析对象:%s"
866
867#: parse-options.c:537
868msgid "..."
869msgstr "..."
870
871#: parse-options.c:555
872#, c-format
873msgid "usage: %s"
874msgstr "用法:%s"
875
876#. TRANSLATORS: the colon here should align with the
877#. one in "usage: %s" translation
878#: parse-options.c:559
879#, c-format
880msgid " or: %s"
881msgstr " 或:%s"
882
883# 译者:为保证在输出中对齐,注意调整句中空格!
884#: parse-options.c:562
885#, c-format
886msgid " %s"
887msgstr " %s"
888
889#: parse-options.c:596
890msgid "-NUM"
891msgstr "-数字"
892
893#: pathspec.c:118
894msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
895msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
896
897#: pathspec.c:128
898msgid ""
899"global 'literal' pathspec setting is incompatible with all other global "
900"pathspec settings"
901msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
902
903#: pathspec.c:158
904msgid "invalid parameter for pathspec magic 'prefix'"
905msgstr "路径规则包含无效的神奇前缀"
906
907#: pathspec.c:164
908#, c-format
909msgid "Invalid pathspec magic '%.*s' in '%s'"
910msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
911
912#: pathspec.c:168
913#, c-format
914msgid "Missing ')' at the end of pathspec magic in '%s'"
915msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
916
917#: pathspec.c:186
918#, c-format
919msgid "Unimplemented pathspec magic '%c' in '%s'"
920msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
921
922#: pathspec.c:211
923#, c-format
924msgid "%s: 'literal' and 'glob' are incompatible"
925msgstr "%s:'literal' 和 'glob' 不兼容"
926
927#: pathspec.c:222
928#, c-format
929msgid "%s: '%s' is outside repository"
930msgstr "%s:'%s' 在版本库之外"
931
932#: pathspec.c:278
933#, c-format
934msgid "Pathspec '%s' is in submodule '%.*s'"
935msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
936
937#.
938#. * We may want to substitute "this command" with a command
939#. * name. E.g. when add--interactive dies when running
940#. * "checkout -p"
941#.
942#: pathspec.c:340
943#, c-format
944msgid "%s: pathspec magic not supported by this command: %s"
945msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
946
947#: pathspec.c:415
948#, c-format
949msgid "pathspec '%s' is beyond a symbolic link"
950msgstr "路径规则 '%s' 位于符号链接中"
951
952#: remote.c:1833
953#, c-format
954msgid "Your branch is based on '%s', but the upstream is gone.\n"
955msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
956
957#: remote.c:1837
958msgid " (use \"git branch --unset-upstream\" to fixup)\n"
959msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
960
961#: remote.c:1840
962#, c-format
963msgid "Your branch is up-to-date with '%s'.\n"
964msgstr "您的分支与上游分支 '%s' 一致。\n"
965
966#: remote.c:1844
967#, c-format
968msgid "Your branch is ahead of '%s' by %d commit.\n"
969msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
970msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
971msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
972
973#: remote.c:1850
974msgid " (use \"git push\" to publish your local commits)\n"
975msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
976
977#: remote.c:1853
978#, c-format
979msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
980msgid_plural ""
981"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
982msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
983msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
984
985# 译者:注意保持前导空格
986#: remote.c:1861
987msgid " (use \"git pull\" to update your local branch)\n"
988msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
989
990#: remote.c:1864
991#, c-format
992msgid ""
993"Your branch and '%s' have diverged,\n"
994"and have %d and %d different commit each, respectively.\n"
995msgid_plural ""
996"Your branch and '%s' have diverged,\n"
997"and have %d and %d different commits each, respectively.\n"
998msgstr[0] ""
999"您的分支和 '%s' 出现了偏离,\n"
1000"并且分别有 %d 和 %d 处不同的提交。\n"
1001msgstr[1] ""
1002"您的分支和 '%s' 出现了偏离,\n"
1003"并且分别有 %d 和 %d 处不同的提交。\n"
1004
1005# 译者:注意保持前导空格
1006#: remote.c:1874
1007msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1008msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1009
1010#: run-command.c:80
1011msgid "open /dev/null failed"
1012msgstr "不能打开 /dev/null"
1013
1014#: run-command.c:82
1015#, c-format
1016msgid "dup2(%d,%d) failed"
1017msgstr "不能调用 dup2(%d,%d)"
1018
1019#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903
1020#: builtin/merge.c:1013 builtin/merge.c:1023
1021#, c-format
1022msgid "Could not open '%s' for writing"
1023msgstr "不能为写入打开 '%s'"
1024
1025#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793
1026#: builtin/merge.c:1015 builtin/merge.c:1028
1027#, c-format
1028msgid "Could not write to '%s'"
1029msgstr "不能写入 '%s'"
1030
1031#: sequencer.c:229
1032msgid ""
1033"after resolving the conflicts, mark the corrected paths\n"
1034"with 'git add <paths>' or 'git rm <paths>'"
1035msgstr ""
1036"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1037"命令标记修正后的文件"
1038
1039#: sequencer.c:232
1040msgid ""
1041"after resolving the conflicts, mark the corrected paths\n"
1042"with 'git add <paths>' or 'git rm <paths>'\n"
1043"and commit the result with 'git commit'"
1044msgstr ""
1045"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1046"对修正后的文件做标记,然后用 'git commit' 提交"
1047
1048#: sequencer.c:245 sequencer.c:870 sequencer.c:953
1049#, c-format
1050msgid "Could not write to %s"
1051msgstr "不能写入 %s"
1052
1053#: sequencer.c:248
1054#, c-format
1055msgid "Error wrapping up %s"
1056msgstr "错误收尾 %s"
1057
1058#: sequencer.c:263
1059msgid "Your local changes would be overwritten by cherry-pick."
1060msgstr "您的本地修改将被拣选操作覆盖。"
1061
1062#: sequencer.c:265
1063msgid "Your local changes would be overwritten by revert."
1064msgstr "您的本地修改将被还原操作覆盖。"
1065
1066#: sequencer.c:268
1067msgid "Commit your changes or stash them to proceed."
1068msgstr "提交您的修改或保存进度后再继续。"
1069
1070#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1071#: sequencer.c:325
1072#, c-format
1073msgid "%s: Unable to write new index file"
1074msgstr "%s:无法写入新索引文件"
1075
1076#: sequencer.c:356
1077msgid "Could not resolve HEAD commit\n"
1078msgstr "不能解析 HEAD 提交\n"
1079
1080#: sequencer.c:378
1081msgid "Unable to update cache tree\n"
1082msgstr "不能更新缓存\n"
1083
1084#: sequencer.c:423
1085#, c-format
1086msgid "Could not parse commit %s\n"
1087msgstr "不能解析提交 %s\n"
1088
1089#: sequencer.c:428
1090#, c-format
1091msgid "Could not parse parent commit %s\n"
1092msgstr "不能解析父提交 %s\n"
1093
1094#: sequencer.c:494
1095msgid "Your index file is unmerged."
1096msgstr "您的索引文件未完成合并。"
1097
1098#: sequencer.c:513
1099#, c-format
1100msgid "Commit %s is a merge but no -m option was given."
1101msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1102
1103#: sequencer.c:521
1104#, c-format
1105msgid "Commit %s does not have parent %d"
1106msgstr "提交 %s 没有父提交 %d"
1107
1108#: sequencer.c:525
1109#, c-format
1110msgid "Mainline was specified but commit %s is not a merge."
1111msgstr "指定了主线但提交 %s 不是一个合并。"
1112
1113#. TRANSLATORS: The first %s will be "revert" or
1114#. "cherry-pick", the second %s a SHA1
1115#: sequencer.c:538
1116#, c-format
1117msgid "%s: cannot parse parent commit %s"
1118msgstr "%s:不能解析父提交 %s"
1119
1120#: sequencer.c:542
1121#, c-format
1122msgid "Cannot get commit message for %s"
1123msgstr "不能得到 %s 的提交说明"
1124
1125#: sequencer.c:628
1126#, c-format
1127msgid "could not revert %s... %s"
1128msgstr "不能还原 %s... %s"
1129
1130#: sequencer.c:629
1131#, c-format
1132msgid "could not apply %s... %s"
1133msgstr "不能应用 %s... %s"
1134
1135#: sequencer.c:665
1136msgid "empty commit set passed"
1137msgstr "提供了空的提交集"
1138
1139#: sequencer.c:673
1140#, c-format
1141msgid "git %s: failed to read the index"
1142msgstr "git %s:无法读取索引"
1143
1144#: sequencer.c:678
1145#, c-format
1146msgid "git %s: failed to refresh the index"
1147msgstr "git %s:无法刷新索引"
1148
1149#: sequencer.c:736
1150#, c-format
1151msgid "Cannot %s during a %s"
1152msgstr "无法 %s 在一个 %s 过程中"
1153
1154#: sequencer.c:758
1155#, c-format
1156msgid "Could not parse line %d."
1157msgstr "不能解析第 %d 行。"
1158
1159#: sequencer.c:763
1160msgid "No commits parsed."
1161msgstr "没有提交被解析。"
1162
1163#: sequencer.c:776
1164#, c-format
1165msgid "Could not open %s"
1166msgstr "不能打开 %s"
1167
1168#: sequencer.c:780
1169#, c-format
1170msgid "Could not read %s."
1171msgstr "不能读取 %s。"
1172
1173#: sequencer.c:787
1174#, c-format
1175msgid "Unusable instruction sheet: %s"
1176msgstr "无用的指令表单:%s"
1177
1178#: sequencer.c:815
1179#, c-format
1180msgid "Invalid key: %s"
1181msgstr "无效键名:%s"
1182
1183#: sequencer.c:818
1184#, c-format
1185msgid "Invalid value for %s: %s"
1186msgstr "%s 的值无效:%s"
1187
1188#: sequencer.c:830
1189#, c-format
1190msgid "Malformed options sheet: %s"
1191msgstr "非法的选项表单:%s"
1192
1193#: sequencer.c:851
1194msgid "a cherry-pick or revert is already in progress"
1195msgstr "一个拣选或还原操作已在进行"
1196
1197#: sequencer.c:852
1198msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1199msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1200
1201#: sequencer.c:856
1202#, c-format
1203msgid "Could not create sequencer directory %s"
1204msgstr "不能创建序列目录 %s"
1205
1206#: sequencer.c:872 sequencer.c:957
1207#, c-format
1208msgid "Error wrapping up %s."
1209msgstr "错误收尾 %s。"
1210
1211#: sequencer.c:891 sequencer.c:1025
1212msgid "no cherry-pick or revert in progress"
1213msgstr "拣选或还原操作并未进行"
1214
1215#: sequencer.c:893
1216msgid "cannot resolve HEAD"
1217msgstr "不能解析 HEAD"
1218
1219#: sequencer.c:895
1220msgid "cannot abort from a branch yet to be born"
1221msgstr "不能从尚未建立的分支终止"
1222
1223#: sequencer.c:917 builtin/apply.c:4061
1224#, c-format
1225msgid "cannot open %s: %s"
1226msgstr "不能打开 %s:%s"
1227
1228#: sequencer.c:920
1229#, c-format
1230msgid "cannot read %s: %s"
1231msgstr "不能读取 %s:%s"
1232
1233#: sequencer.c:921
1234msgid "unexpected end of file"
1235msgstr "意外的文件结束"
1236
1237#: sequencer.c:927
1238#, c-format
1239msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1240msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1241
1242#: sequencer.c:950
1243#, c-format
1244msgid "Could not format %s."
1245msgstr "不能格式化 %s。"
1246
1247#: sequencer.c:1093
1248#, c-format
1249msgid "%s: can't cherry-pick a %s"
1250msgstr "%s:不能拣选一个%s"
1251
1252#: sequencer.c:1096
1253#, c-format
1254msgid "%s: bad revision"
1255msgstr "%s:错误的版本"
1256
1257#: sequencer.c:1130
1258msgid "Can't revert as initial commit"
1259msgstr "不能作为初始提交还原"
1260
1261#: sequencer.c:1131
1262msgid "Can't cherry-pick into empty head"
1263msgstr "不能拣选到空分支"
1264
1265#: sha1_name.c:440
1266msgid ""
1267"Git normally never creates a ref that ends with 40 hex characters\n"
1268"because it will be ignored when you just specify 40-hex. These refs\n"
1269"may be created by mistake. For example,\n"
1270"\n"
1271" git checkout -b $br $(git rev-parse ...)\n"
1272"\n"
1273"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1274"examine these refs and maybe delete them. Turn this message off by\n"
1275"running \"git config advice.objectNameWarning false\""
1276msgstr ""
1277"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1278"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1279"\n"
1280" git checkout -b $br $(git rev-parse ...)\n"
1281"\n"
1282"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1283"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1284"命令关闭本消息通知。"
1285
1286#: sha1_name.c:1112
1287msgid "HEAD does not point to a branch"
1288msgstr "HEAD 没有指向一个分支"
1289
1290#: sha1_name.c:1115
1291#, c-format
1292msgid "No such branch: '%s'"
1293msgstr "没有此分支:'%s'"
1294
1295#: sha1_name.c:1117
1296#, c-format
1297msgid "No upstream configured for branch '%s'"
1298msgstr "尚未给分支 '%s' 设置上游"
1299
1300#: sha1_name.c:1121
1301#, c-format
1302msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1303msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1304
1305#: submodule.c:64 submodule.c:98
1306msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1307msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1308
1309#: submodule.c:68 submodule.c:102
1310#, c-format
1311msgid "Could not find section in .gitmodules where path=%s"
1312msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1313
1314#. Maybe the user already did that, don't error out here
1315#: submodule.c:76
1316#, c-format
1317msgid "Could not update .gitmodules entry %s"
1318msgstr "不能更新 .gitmodules 条目 %s"
1319
1320#. Maybe the user already did that, don't error out here
1321#: submodule.c:109
1322#, c-format
1323msgid "Could not remove .gitmodules entry for %s"
1324msgstr "无法移除 %s 的 .gitmodules 条目"
1325
1326#: submodule.c:127
1327msgid "could not find .gitmodules in index"
1328msgstr "无法在索引中找到 .gitmodules"
1329
1330#: submodule.c:133
1331msgid "reading updated .gitmodules failed"
1332msgstr "读取更新后的 .gitmodules 失败"
1333
1334#: submodule.c:135
1335msgid "unable to stat updated .gitmodules"
1336msgstr "不能枚举更新后的 .gitmodules"
1337
1338#: submodule.c:139
1339msgid "unable to remove .gitmodules from index"
1340msgstr "不能从索引中移除 .gitmodules"
1341
1342#: submodule.c:141
1343msgid "adding updated .gitmodules failed"
1344msgstr "添加更新后的 .gitmodules 失败"
1345
1346#: submodule.c:143
1347msgid "staging updated .gitmodules failed"
1348msgstr "将更新后 .gitmodules 添加暂存区失败"
1349
1350#: submodule.c:1144 builtin/init-db.c:363
1351#, c-format
1352msgid "Could not create git link %s"
1353msgstr "不能创建 git link %s"
1354
1355#: submodule.c:1155
1356#, c-format
1357msgid "Could not set core.worktree in %s"
1358msgstr "不能在 %s 中设置 core.worktree"
1359
1360#: urlmatch.c:120
1361msgid "invalid URL scheme name or missing '://' suffix"
1362msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1363
1364#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1365#, c-format
1366msgid "invalid %XX escape sequence"
1367msgstr "无效的 %XX 转义序列"
1368
1369#: urlmatch.c:172
1370msgid "missing host and scheme is not 'file:'"
1371msgstr "缺失主机名且URL方案不是 'file:'"
1372
1373#: urlmatch.c:189
1374msgid "a 'file:' URL may not have a port number"
1375msgstr "一个 'file:' URL 不应该包含端口号"
1376
1377#: urlmatch.c:199
1378msgid "invalid characters in host name"
1379msgstr "主机名中包含无效的字符"
1380
1381#: urlmatch.c:244 urlmatch.c:255
1382msgid "invalid port number"
1383msgstr "无效的端口号"
1384
1385#: urlmatch.c:322
1386msgid "invalid '..' path segment"
1387msgstr "无效的 '..' 路径片段"
1388
1389#: wrapper.c:422
1390#, c-format
1391msgid "unable to access '%s': %s"
1392msgstr "不能访问 '%s':%s"
1393
1394#: wrapper.c:443
1395#, c-format
1396msgid "unable to access '%s'"
1397msgstr "不能访问 '%s'"
1398
1399#: wrapper.c:454
1400#, c-format
1401msgid "unable to look up current user in the passwd file: %s"
1402msgstr "无法在口令文件中查询到当前用户:%s"
1403
1404#: wrapper.c:455
1405msgid "no such user"
1406msgstr "无此用户"
1407
1408#: wt-status.c:146
1409msgid "Unmerged paths:"
1410msgstr "未合并的路径:"
1411
1412# 译者:注意保持前导空格
1413#: wt-status.c:173 wt-status.c:200
1414#, c-format
1415msgid " (use \"git reset %s <file>...\" to unstage)"
1416msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1417
1418# 译者:注意保持前导空格
1419#: wt-status.c:175 wt-status.c:202
1420msgid " (use \"git rm --cached <file>...\" to unstage)"
1421msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1422
1423# 译者:注意保持前导空格
1424#: wt-status.c:179
1425msgid " (use \"git add <file>...\" to mark resolution)"
1426msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1427
1428# 译者:注意保持前导空格
1429#: wt-status.c:181 wt-status.c:185
1430msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1431msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1432
1433# 译者:注意保持前导空格
1434#: wt-status.c:183
1435msgid " (use \"git rm <file>...\" to mark resolution)"
1436msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1437
1438#: wt-status.c:194
1439msgid "Changes to be committed:"
1440msgstr "要提交的变更:"
1441
1442#: wt-status.c:212
1443msgid "Changes not staged for commit:"
1444msgstr "尚未暂存以备提交的变更:"
1445
1446# 译者:注意保持前导空格
1447#: wt-status.c:216
1448msgid " (use \"git add <file>...\" to update what will be committed)"
1449msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1450
1451# 译者:注意保持前导空格
1452#: wt-status.c:218
1453msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1454msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1455
1456# 译者:注意保持前导空格
1457#: wt-status.c:219
1458msgid ""
1459" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1460msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1461
1462# 译者:注意保持前导空格
1463#: wt-status.c:221
1464msgid " (commit or discard the untracked or modified content in submodules)"
1465msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1466
1467# 译者:注意保持前导空格
1468#: wt-status.c:233
1469#, c-format
1470msgid " (use \"git %s <file>...\" to include in what will be committed)"
1471msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
1472
1473#: wt-status.c:250
1474msgid "bug"
1475msgstr "bug"
1476
1477#: wt-status.c:255
1478msgid "both deleted:"
1479msgstr "双方删除:"
1480
1481#: wt-status.c:256
1482msgid "added by us:"
1483msgstr "由我们添加:"
1484
1485#: wt-status.c:257
1486msgid "deleted by them:"
1487msgstr "由他们删除:"
1488
1489#: wt-status.c:258
1490msgid "added by them:"
1491msgstr "由他们添加:"
1492
1493#: wt-status.c:259
1494msgid "deleted by us:"
1495msgstr "由我们删除:"
1496
1497#: wt-status.c:260
1498msgid "both added:"
1499msgstr "双方添加:"
1500
1501#: wt-status.c:261
1502msgid "both modified:"
1503msgstr "双方修改:"
1504
1505# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1506#: wt-status.c:291
1507msgid "new commits, "
1508msgstr "新提交, "
1509
1510# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1511#: wt-status.c:293
1512msgid "modified content, "
1513msgstr "修改的内容, "
1514
1515# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1516#: wt-status.c:295
1517msgid "untracked content, "
1518msgstr "未跟踪的内容, "
1519
1520# 译者:为保证在输出中对齐,注意调整句中空格!
1521#: wt-status.c:312
1522#, c-format
1523msgid "new file: %s"
1524msgstr "新文件: %s"
1525
1526# 译者:为保证在输出中对齐,注意调整句中空格!
1527#: wt-status.c:315
1528#, c-format
1529msgid "copied: %s -> %s"
1530msgstr "拷贝: %s -> %s"
1531
1532# 译者:为保证在输出中对齐,注意调整句中空格!
1533#: wt-status.c:318
1534#, c-format
1535msgid "deleted: %s"
1536msgstr "删除: %s"
1537
1538# 译者:为保证在输出中对齐,注意调整句中空格!
1539#: wt-status.c:321
1540#, c-format
1541msgid "modified: %s"
1542msgstr "修改: %s"
1543
1544# 译者:为保证在输出中对齐,注意调整句中空格!
1545#: wt-status.c:324
1546#, c-format
1547msgid "renamed: %s -> %s"
1548msgstr "重命名: %s -> %s"
1549
1550# 译者:为保证在输出中对齐,注意调整句中空格!
1551#: wt-status.c:327
1552#, c-format
1553msgid "typechange: %s"
1554msgstr "类型变更: %s"
1555
1556# 译者:为保证在输出中对齐,注意调整句中空格!
1557#: wt-status.c:330
1558#, c-format
1559msgid "unknown: %s"
1560msgstr "未知: %s"
1561
1562# 译者:为保证在输出中对齐,注意调整句中空格!
1563#: wt-status.c:333
1564#, c-format
1565msgid "unmerged: %s"
1566msgstr "未合并: %s"
1567
1568#: wt-status.c:336
1569#, c-format
1570msgid "bug: unhandled diff status %c"
1571msgstr "bug:未处理的差异状态 %c"
1572
1573#: wt-status.c:703
1574msgid "Submodules changed but not updated:"
1575msgstr "子模组已修改但尚未更新:"
1576
1577#: wt-status.c:705
1578msgid "Submodule changes to be committed:"
1579msgstr "要提交的子模组变更:"
1580
1581#: wt-status.c:848
1582msgid "You have unmerged paths."
1583msgstr "您有尚未合并的路径。"
1584
1585# 译者:注意保持前导空格
1586#: wt-status.c:851
1587msgid " (fix conflicts and run \"git commit\")"
1588msgstr " (解决冲突并运行 \"git commit\")"
1589
1590#: wt-status.c:854
1591msgid "All conflicts fixed but you are still merging."
1592msgstr "所有冲突已解决但您仍处于合并中。"
1593
1594# 译者:注意保持前导空格
1595#: wt-status.c:857
1596msgid " (use \"git commit\" to conclude merge)"
1597msgstr " (使用 \"git commit\" 结束合并)"
1598
1599#: wt-status.c:867
1600msgid "You are in the middle of an am session."
1601msgstr "您正处于一个 am 过程中。"
1602
1603#: wt-status.c:870
1604msgid "The current patch is empty."
1605msgstr "当前的补丁为空。"
1606
1607# 译者:注意保持前导空格
1608#: wt-status.c:874
1609msgid " (fix conflicts and then run \"git am --continue\")"
1610msgstr " (解决冲突,然后运行 \"git am --continue\")"
1611
1612# 译者:注意保持前导空格
1613#: wt-status.c:876
1614msgid " (use \"git am --skip\" to skip this patch)"
1615msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1616
1617# 译者:注意保持前导空格
1618#: wt-status.c:878
1619msgid " (use \"git am --abort\" to restore the original branch)"
1620msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1621
1622#: wt-status.c:938 wt-status.c:955
1623#, c-format
1624msgid "You are currently rebasing branch '%s' on '%s'."
1625msgstr "您正在将分支 '%s' 变基到 '%s'。"
1626
1627#: wt-status.c:943 wt-status.c:960
1628msgid "You are currently rebasing."
1629msgstr "您正在变基。"
1630
1631# 译者:注意保持前导空格
1632#: wt-status.c:946
1633msgid " (fix conflicts and then run \"git rebase --continue\")"
1634msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1635
1636# 译者:注意保持前导空格
1637#: wt-status.c:948
1638msgid " (use \"git rebase --skip\" to skip this patch)"
1639msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1640
1641# 译者:注意保持前导空格
1642#: wt-status.c:950
1643msgid " (use \"git rebase --abort\" to check out the original branch)"
1644msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1645
1646# 译者:注意保持前导空格
1647#: wt-status.c:963
1648msgid " (all conflicts fixed: run \"git rebase --continue\")"
1649msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1650
1651#: wt-status.c:967
1652#, c-format
1653msgid ""
1654"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1655msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
1656
1657#: wt-status.c:972
1658msgid "You are currently splitting a commit during a rebase."
1659msgstr "您正在变基过程中拆分一个提交。"
1660
1661# 译者:注意保持前导空格
1662#: wt-status.c:975
1663msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1664msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1665
1666#: wt-status.c:979
1667#, c-format
1668msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1669msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
1670
1671#: wt-status.c:984
1672msgid "You are currently editing a commit during a rebase."
1673msgstr "您正在变基过程中编辑一个提交。"
1674
1675# 译者:注意保持前导空格
1676#: wt-status.c:987
1677msgid " (use \"git commit --amend\" to amend the current commit)"
1678msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1679
1680# 译者:注意保持前导空格
1681#: wt-status.c:989
1682msgid ""
1683" (use \"git rebase --continue\" once you are satisfied with your changes)"
1684msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1685
1686#: wt-status.c:999
1687#, c-format
1688msgid "You are currently cherry-picking commit %s."
1689msgstr "您正在做拣选提交 %s。"
1690
1691# 译者:注意保持前导空格
1692#: wt-status.c:1004
1693msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1694msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1695
1696# 译者:注意保持前导空格
1697#: wt-status.c:1007
1698msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1699msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1700
1701# 译者:注意保持前导空格
1702#: wt-status.c:1009
1703msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1704msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1705
1706#: wt-status.c:1018
1707#, c-format
1708msgid "You are currently reverting commit %s."
1709msgstr "您正在反转提交 %s 。"
1710
1711# 译者:注意保持前导空格
1712#: wt-status.c:1023
1713msgid " (fix conflicts and run \"git revert --continue\")"
1714msgstr " (解决冲突并运行 \"git revert --continue\")"
1715
1716# 译者:注意保持前导空格
1717#: wt-status.c:1026
1718msgid " (all conflicts fixed: run \"git revert --continue\")"
1719msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1720
1721# 译者:注意保持前导空格
1722#: wt-status.c:1028
1723msgid " (use \"git revert --abort\" to cancel the revert operation)"
1724msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1725
1726#: wt-status.c:1039
1727#, c-format
1728msgid "You are currently bisecting, started from branch '%s'."
1729msgstr "您正在从分支 '%s' 开始做二分查找。"
1730
1731#: wt-status.c:1043
1732msgid "You are currently bisecting."
1733msgstr "您正在做二分查找。"
1734
1735# 译者:注意保持前导空格
1736#: wt-status.c:1046
1737msgid " (use \"git bisect reset\" to get back to the original branch)"
1738msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1739
1740#: wt-status.c:1221
1741msgid "On branch "
1742msgstr "位于分支 "
1743
1744#: wt-status.c:1228
1745msgid "rebase in progress; onto "
1746msgstr "变基正在进行中;至 "
1747
1748#: wt-status.c:1235
1749msgid "HEAD detached at "
1750msgstr "头指针分离于 "
1751
1752#: wt-status.c:1237
1753msgid "HEAD detached from "
1754msgstr "头指针分离自 "
1755
1756#: wt-status.c:1240
1757msgid "Not currently on any branch."
1758msgstr "当前不在任何分支上。"
1759
1760#: wt-status.c:1257
1761msgid "Initial commit"
1762msgstr "初始提交"
1763
1764#: wt-status.c:1271
1765msgid "Untracked files"
1766msgstr "未跟踪的文件"
1767
1768#: wt-status.c:1273
1769msgid "Ignored files"
1770msgstr "忽略的文件"
1771
1772#: wt-status.c:1277
1773#, c-format
1774msgid ""
1775"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1776"may speed it up, but you have to be careful not to forget to add\n"
1777"new files yourself (see 'git help status')."
1778msgstr ""
1779"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1780"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1781
1782#: wt-status.c:1283
1783#, c-format
1784msgid "Untracked files not listed%s"
1785msgstr "未跟踪的文件没有列出%s"
1786
1787# 译者:中文字符串拼接,可删除前导空格
1788#: wt-status.c:1285
1789msgid " (use -u option to show untracked files)"
1790msgstr "(使用 -u 参数显示未跟踪的文件)"
1791
1792#: wt-status.c:1291
1793msgid "No changes"
1794msgstr "没有修改"
1795
1796#: wt-status.c:1296
1797#, c-format
1798msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1799msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1800
1801#: wt-status.c:1299
1802#, c-format
1803msgid "no changes added to commit\n"
1804msgstr "修改尚未加入提交\n"
1805
1806#: wt-status.c:1302
1807#, c-format
1808msgid ""
1809"nothing added to commit but untracked files present (use \"git add\" to "
1810"track)\n"
1811msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1812
1813#: wt-status.c:1305
1814#, c-format
1815msgid "nothing added to commit but untracked files present\n"
1816msgstr "提交为空,但是存在尚未跟踪的文件\n"
1817
1818# 译者:中文字符串拼接,可删除前导空格
1819#: wt-status.c:1308
1820#, c-format
1821msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1822msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1823
1824#: wt-status.c:1311 wt-status.c:1316
1825#, c-format
1826msgid "nothing to commit\n"
1827msgstr "无文件要提交\n"
1828
1829# 译者:中文字符串拼接,可删除前导空格
1830#: wt-status.c:1314
1831#, c-format
1832msgid "nothing to commit (use -u to show untracked files)\n"
1833msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1834
1835# 译者:中文字符串拼接,可删除前导空格
1836#: wt-status.c:1318
1837#, c-format
1838msgid "nothing to commit, working directory clean\n"
1839msgstr "无文件要提交,干净的工作区\n"
1840
1841#: wt-status.c:1427
1842msgid "HEAD (no branch)"
1843msgstr "HEAD(非分支)"
1844
1845# 译者:注意保持句尾空格
1846#: wt-status.c:1433
1847msgid "Initial commit on "
1848msgstr "初始提交于 "
1849
1850#: wt-status.c:1463
1851msgid "gone"
1852msgstr "丢失"
1853
1854# 译者:注意保持句尾空格
1855#: wt-status.c:1465
1856msgid "behind "
1857msgstr "落后 "
1858
1859# 译者:注意保持句尾空格
1860#: wt-status.c:1468 wt-status.c:1471
1861msgid "ahead "
1862msgstr "领先 "
1863
1864# 译者:注意保持句尾空格
1865#: wt-status.c:1473
1866msgid ", behind "
1867msgstr ",落后 "
1868
1869#: compat/precompose_utf8.c:55 builtin/clone.c:350
1870#, c-format
1871msgid "failed to unlink '%s'"
1872msgstr "无法删除 '%s'"
1873
1874#: builtin/add.c:20
1875msgid "git add [options] [--] <pathspec>..."
1876msgstr "git add [选项] [--] <路径规则>..."
1877
1878# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1879#.
1880#. * To be consistent with "git add -p" and most Git
1881#. * commands, we should default to being tree-wide, but
1882#. * this is not the original behavior and can't be
1883#. * changed until users trained themselves not to type
1884#. * "git add -u" or "git add -A". For now, we warn and
1885#. * keep the old behavior. Later, the behavior can be changed
1886#. * to tree-wide, keeping the warning for a while, and
1887#. * eventually we can drop the warning.
1888#.
1889#: builtin/add.c:58
1890#, c-format
1891msgid ""
1892"The behavior of 'git add %s (or %s)' with no path argument from a\n"
1893"subdirectory of the tree will change in Git 2.0 and should not be used "
1894"anymore.\n"
1895"To add content for the whole tree, run:\n"
1896"\n"
1897" git add %s :/\n"
1898" (or git add %s :/)\n"
1899"\n"
1900"To restrict the command to the current directory, run:\n"
1901"\n"
1902" git add %s .\n"
1903" (or git add %s .)\n"
1904"\n"
1905"With the current Git version, the command is restricted to the current "
1906"directory.\n"
1907msgstr ""
1908"在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
1909"'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
1910"如果要添加整个目录树的内容,执行:\n"
1911"\n"
1912" git add %s :/\n"
1913" (或 git add %s :/)\n"
1914"\n"
1915"如果要限制该命令只作用于当前目录,执行:\n"
1916"\n"
1917" git add %s .\n"
1918" (或 git add %s .)\n"
1919"\n"
1920"对于当前版本的 Git,这条命令只作用于当前目录。\n"
1921
1922#: builtin/add.c:100
1923#, c-format
1924msgid ""
1925"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
1926"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
1927"Paths like '%s' that are\n"
1928"removed from your working tree are ignored with this version of Git.\n"
1929"\n"
1930"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
1931" ignores paths you removed from your working tree.\n"
1932"\n"
1933"* 'git add --all <pathspec>' will let you also record the removals.\n"
1934"\n"
1935"Run 'git status' to check the paths you removed from your working tree.\n"
1936msgstr ""
1937"您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
1938"针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
1939"像本地工作区移除的路径 '%s'\n"
1940"在此版本的 Git 中被忽略。\n"
1941"\n"
1942"* 'git add --ignore-removal <路径规则>',是当前版本的默认操作,\n"
1943" 忽略您本地工作区中移除的文件。\n"
1944"\n"
1945"* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
1946"\n"
1947"运行 'git status' 来检查您本地工作区中移除的路径。\n"
1948
1949#: builtin/add.c:144
1950#, c-format
1951msgid "unexpected diff status %c"
1952msgstr "意外的差异状态 %c"
1953
1954#: builtin/add.c:149 builtin/commit.c:260
1955msgid "updating files failed"
1956msgstr "更新文件失败"
1957
1958#: builtin/add.c:163
1959#, c-format
1960msgid "remove '%s'\n"
1961msgstr "删除 '%s'\n"
1962
1963#: builtin/add.c:237
1964msgid "Unstaged changes after refreshing the index:"
1965msgstr "刷新索引之后尚未被暂存的变更:"
1966
1967#: builtin/add.c:299
1968msgid "Could not read the index"
1969msgstr "不能读取索引"
1970
1971#: builtin/add.c:310
1972#, c-format
1973msgid "Could not open '%s' for writing."
1974msgstr "不能打开 '%s' 以写入。"
1975
1976#: builtin/add.c:314
1977msgid "Could not write patch"
1978msgstr "不能生成补丁"
1979
1980#: builtin/add.c:319
1981#, c-format
1982msgid "Could not stat '%s'"
1983msgstr "不能查看文件状态 '%s'"
1984
1985#: builtin/add.c:321
1986msgid "Empty patch. Aborted."
1987msgstr "空补丁。异常终止。"
1988
1989#: builtin/add.c:327
1990#, c-format
1991msgid "Could not apply '%s'"
1992msgstr "不能应用 '%s'"
1993
1994#: builtin/add.c:337
1995msgid "The following paths are ignored by one of your .gitignore files:\n"
1996msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
1997
1998#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66
1999#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253
2000#: builtin/rm.c:269
2001msgid "dry run"
2002msgstr "演习"
2003
2004#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
2005#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
2006#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113
2007msgid "be verbose"
2008msgstr "冗长输出"
2009
2010#: builtin/add.c:357
2011msgid "interactive picking"
2012msgstr "交互式拣选"
2013
2014#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
2015msgid "select hunks interactively"
2016msgstr "交互式挑选数据块"
2017
2018#: builtin/add.c:359
2019msgid "edit current diff and apply"
2020msgstr "编辑当前差异并应用"
2021
2022#: builtin/add.c:360
2023msgid "allow adding otherwise ignored files"
2024msgstr "允许添加忽略的文件"
2025
2026#: builtin/add.c:361
2027msgid "update tracked files"
2028msgstr "更新已跟踪的文件"
2029
2030#: builtin/add.c:362
2031msgid "record only the fact that the path will be added later"
2032msgstr "只记录,该路径稍后再添加"
2033
2034#: builtin/add.c:363
2035msgid "add changes from all tracked and untracked files"
2036msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2037
2038#. takes no arguments
2039#: builtin/add.c:366
2040msgid "ignore paths removed in the working tree (same as --no-all)"
2041msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2042
2043#: builtin/add.c:368
2044msgid "don't add, only refresh the index"
2045msgstr "不添加,只刷新索引"
2046
2047#: builtin/add.c:369
2048msgid "just skip files which cannot be added because of errors"
2049msgstr "跳过因出错不能添加的文件"
2050
2051#: builtin/add.c:370
2052msgid "check if - even missing - files are ignored in dry run"
2053msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2054
2055#: builtin/add.c:392
2056#, c-format
2057msgid "Use -f if you really want to add them.\n"
2058msgstr "使用 -f 参数如果您确实要添加它们。\n"
2059
2060#: builtin/add.c:393
2061msgid "no files added"
2062msgstr "没有文件被添加"
2063
2064#: builtin/add.c:399
2065msgid "adding files failed"
2066msgstr "添加文件失败"
2067
2068#: builtin/add.c:438
2069msgid "-A and -u are mutually incompatible"
2070msgstr "-A 和 -u 选项互斥"
2071
2072#: builtin/add.c:456
2073msgid "Option --ignore-missing can only be used together with --dry-run"
2074msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2075
2076#: builtin/add.c:486
2077#, c-format
2078msgid "Nothing specified, nothing added.\n"
2079msgstr "没有指定文件,也没有文件被添加。\n"
2080
2081#: builtin/add.c:487
2082#, c-format
2083msgid "Maybe you wanted to say 'git add .'?\n"
2084msgstr "也许您想要执行 'git add .'?\n"
2085
2086#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
2087#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299
2088msgid "index file corrupt"
2089msgstr "索引文件损坏"
2090
2091#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432
2092msgid "Unable to write new index file"
2093msgstr "无法写入新索引文件"
2094
2095#: builtin/apply.c:57
2096msgid "git apply [options] [<patch>...]"
2097msgstr "git apply [选项] [<补丁>...]"
2098
2099#: builtin/apply.c:110
2100#, c-format
2101msgid "unrecognized whitespace option '%s'"
2102msgstr "未能识别的空白字符选项 '%s'"
2103
2104#: builtin/apply.c:125
2105#, c-format
2106msgid "unrecognized whitespace ignore option '%s'"
2107msgstr "未能识别的空白字符忽略选项 '%s'"
2108
2109#: builtin/apply.c:823
2110#, c-format
2111msgid "Cannot prepare timestamp regexp %s"
2112msgstr "无法准备时间戳正则表达式 %s"
2113
2114#: builtin/apply.c:832
2115#, c-format
2116msgid "regexec returned %d for input: %s"
2117msgstr "regexec 返回 %d,输入为:%s"
2118
2119#: builtin/apply.c:913
2120#, c-format
2121msgid "unable to find filename in patch at line %d"
2122msgstr "不能在补丁的第 %d 行找到文件名"
2123
2124#: builtin/apply.c:945
2125#, c-format
2126msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2127msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2128
2129#: builtin/apply.c:949
2130#, c-format
2131msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2132msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2133
2134#: builtin/apply.c:950
2135#, c-format
2136msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2137msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2138
2139#: builtin/apply.c:957
2140#, c-format
2141msgid "git apply: bad git-diff - expected /dev/null on line %d"
2142msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2143
2144#: builtin/apply.c:1422
2145#, c-format
2146msgid "recount: unexpected line: %.*s"
2147msgstr "recount:意外的行:%.*s"
2148
2149#: builtin/apply.c:1479
2150#, c-format
2151msgid "patch fragment without header at line %d: %.*s"
2152msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2153
2154#: builtin/apply.c:1496
2155#, c-format
2156msgid ""
2157"git diff header lacks filename information when removing %d leading pathname "
2158"component (line %d)"
2159msgid_plural ""
2160"git diff header lacks filename information when removing %d leading pathname "
2161"components (line %d)"
2162msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2163msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2164
2165#: builtin/apply.c:1656
2166msgid "new file depends on old contents"
2167msgstr "新文件依赖旧内容"
2168
2169#: builtin/apply.c:1658
2170msgid "deleted file still has contents"
2171msgstr "删除的文件仍有内容"
2172
2173#: builtin/apply.c:1684
2174#, c-format
2175msgid "corrupt patch at line %d"
2176msgstr "补丁在第 %d 行损坏"
2177
2178#: builtin/apply.c:1720
2179#, c-format
2180msgid "new file %s depends on old contents"
2181msgstr "新文件 %s 依赖旧内容"
2182
2183#: builtin/apply.c:1722
2184#, c-format
2185msgid "deleted file %s still has contents"
2186msgstr "删除的文件 %s 仍有内容"
2187
2188#: builtin/apply.c:1725
2189#, c-format
2190msgid "** warning: file %s becomes empty but is not deleted"
2191msgstr "** 警告:文件 %s 成为空文件但并未删除"
2192
2193#: builtin/apply.c:1871
2194#, c-format
2195msgid "corrupt binary patch at line %d: %.*s"
2196msgstr "二进制补丁在第 %d 行损坏:%.*s"
2197
2198#. there has to be one hunk (forward hunk)
2199#: builtin/apply.c:1900
2200#, c-format
2201msgid "unrecognized binary patch at line %d"
2202msgstr "未能识别的二进制补丁位于第 %d 行"
2203
2204#: builtin/apply.c:1986
2205#, c-format
2206msgid "patch with only garbage at line %d"
2207msgstr "补丁文件的第 %d 行只有垃圾数据"
2208
2209#: builtin/apply.c:2076
2210#, c-format
2211msgid "unable to read symlink %s"
2212msgstr "无法读取符号链接 %s"
2213
2214#: builtin/apply.c:2080
2215#, c-format
2216msgid "unable to open or read %s"
2217msgstr "不能打开或读取 %s"
2218
2219#: builtin/apply.c:2688
2220#, c-format
2221msgid "invalid start of line: '%c'"
2222msgstr "无效的行首字符:'%c'"
2223
2224#: builtin/apply.c:2806
2225#, c-format
2226msgid "Hunk #%d succeeded at %d (offset %d line)."
2227msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2228msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2229msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2230
2231#: builtin/apply.c:2818
2232#, c-format
2233msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2234msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2235
2236#: builtin/apply.c:2824
2237#, c-format
2238msgid ""
2239"while searching for:\n"
2240"%.*s"
2241msgstr ""
2242"当查询:\n"
2243"%.*s"
2244
2245#: builtin/apply.c:2843
2246#, c-format
2247msgid "missing binary patch data for '%s'"
2248msgstr "缺失 '%s' 的二进制补丁数据"
2249
2250#: builtin/apply.c:2946
2251#, c-format
2252msgid "binary patch does not apply to '%s'"
2253msgstr "二进制补丁未应用到 '%s'"
2254
2255#: builtin/apply.c:2952
2256#, c-format
2257msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2258msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2259
2260#: builtin/apply.c:2973
2261#, c-format
2262msgid "patch failed: %s:%ld"
2263msgstr "打补丁失败:%s:%ld"
2264
2265#: builtin/apply.c:3095
2266#, c-format
2267msgid "cannot checkout %s"
2268msgstr "不能检出 %s"
2269
2270#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
2271#, c-format
2272msgid "read of %s failed"
2273msgstr "读取 %s 失败"
2274
2275#: builtin/apply.c:3174 builtin/apply.c:3396
2276#, c-format
2277msgid "path %s has been renamed/deleted"
2278msgstr "路径 %s 已经被重命名/删除"
2279
2280#: builtin/apply.c:3255 builtin/apply.c:3410
2281#, c-format
2282msgid "%s: does not exist in index"
2283msgstr "%s:不存在于索引中"
2284
2285#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
2286#, c-format
2287msgid "%s: %s"
2288msgstr "%s:%s"
2289
2290#: builtin/apply.c:3264 builtin/apply.c:3418
2291#, c-format
2292msgid "%s: does not match index"
2293msgstr "%s:和索引不匹配"
2294
2295#: builtin/apply.c:3366
2296msgid "removal patch leaves file contents"
2297msgstr "移除补丁仍留下了文件内容"
2298
2299#: builtin/apply.c:3435
2300#, c-format
2301msgid "%s: wrong type"
2302msgstr "%s:错误类型"
2303
2304#: builtin/apply.c:3437
2305#, c-format
2306msgid "%s has type %o, expected %o"
2307msgstr "%s 的类型是 %o,应为 %o"
2308
2309#: builtin/apply.c:3538
2310#, c-format
2311msgid "%s: already exists in index"
2312msgstr "%s:已经存在于索引中"
2313
2314#: builtin/apply.c:3541
2315#, c-format
2316msgid "%s: already exists in working directory"
2317msgstr "%s:已经存在于工作区中"
2318
2319#: builtin/apply.c:3561
2320#, c-format
2321msgid "new mode (%o) of %s does not match old mode (%o)"
2322msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2323
2324#: builtin/apply.c:3566
2325#, c-format
2326msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2327msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2328
2329#: builtin/apply.c:3574
2330#, c-format
2331msgid "%s: patch does not apply"
2332msgstr "%s:补丁未应用"
2333
2334#: builtin/apply.c:3587
2335#, c-format
2336msgid "Checking patch %s..."
2337msgstr "检查补丁 %s..."
2338
2339#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
2340#, c-format
2341msgid "make_cache_entry failed for path '%s'"
2342msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2343
2344#: builtin/apply.c:3823
2345#, c-format
2346msgid "unable to remove %s from index"
2347msgstr "不能从索引中移除 %s"
2348
2349#: builtin/apply.c:3851
2350#, c-format
2351msgid "corrupt patch for submodule %s"
2352msgstr "子模组 %s 损坏的补丁"
2353
2354#: builtin/apply.c:3855
2355#, c-format
2356msgid "unable to stat newly created file '%s'"
2357msgstr "不能枚举新建文件 '%s' 的状态"
2358
2359#: builtin/apply.c:3860
2360#, c-format
2361msgid "unable to create backing store for newly created file %s"
2362msgstr "不能为新建文件 %s 创建后端存储"
2363
2364#: builtin/apply.c:3863 builtin/apply.c:3971
2365#, c-format
2366msgid "unable to add cache entry for %s"
2367msgstr "无法为 %s 添加缓存条目"
2368
2369#: builtin/apply.c:3896
2370#, c-format
2371msgid "closing file '%s'"
2372msgstr "关闭文件 '%s'"
2373
2374#: builtin/apply.c:3945
2375#, c-format
2376msgid "unable to write file '%s' mode %o"
2377msgstr "不能写文件 '%s' 权限 %o"
2378
2379#: builtin/apply.c:4032
2380#, c-format
2381msgid "Applied patch %s cleanly."
2382msgstr "成功应用补丁 %s。"
2383
2384#: builtin/apply.c:4040
2385msgid "internal error"
2386msgstr "内部错误"
2387
2388#. Say this even without --verbose
2389#: builtin/apply.c:4043
2390#, c-format
2391msgid "Applying patch %%s with %d reject..."
2392msgid_plural "Applying patch %%s with %d rejects..."
2393msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2394msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2395
2396#: builtin/apply.c:4053
2397#, c-format
2398msgid "truncating .rej filename to %.*s.rej"
2399msgstr "截短 .rej 文件名为 %.*s.rej"
2400
2401#: builtin/apply.c:4074
2402#, c-format
2403msgid "Hunk #%d applied cleanly."
2404msgstr "第 #%d 个片段成功应用。"
2405
2406#: builtin/apply.c:4077
2407#, c-format
2408msgid "Rejected hunk #%d."
2409msgstr "拒绝第 #%d 个片段。"
2410
2411#: builtin/apply.c:4227
2412msgid "unrecognized input"
2413msgstr "未能识别的输入"
2414
2415#: builtin/apply.c:4238
2416msgid "unable to read index file"
2417msgstr "无法读取索引文件"
2418
2419#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
2420#: builtin/fetch.c:77
2421msgid "path"
2422msgstr "路径"
2423
2424#: builtin/apply.c:4358
2425msgid "don't apply changes matching the given path"
2426msgstr "不要应用与给出路径向匹配的变更"
2427
2428#: builtin/apply.c:4361
2429msgid "apply changes matching the given path"
2430msgstr "应用与给出路径向匹配的变更"
2431
2432#: builtin/apply.c:4363
2433msgid "num"
2434msgstr "数字"
2435
2436#: builtin/apply.c:4364
2437msgid "remove <num> leading slashes from traditional diff paths"
2438msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2439
2440#: builtin/apply.c:4367
2441msgid "ignore additions made by the patch"
2442msgstr "忽略补丁中的添加的文件"
2443
2444#: builtin/apply.c:4369
2445msgid "instead of applying the patch, output diffstat for the input"
2446msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2447
2448#: builtin/apply.c:4373
2449msgid "show number of added and deleted lines in decimal notation"
2450msgstr "以十进制数显示添加和删除的行数"
2451
2452#: builtin/apply.c:4375
2453msgid "instead of applying the patch, output a summary for the input"
2454msgstr "不应用补丁,而是显示输入的概要"
2455
2456#: builtin/apply.c:4377
2457msgid "instead of applying the patch, see if the patch is applicable"
2458msgstr "不应用补丁,而是查看补丁是否可应用"
2459
2460#: builtin/apply.c:4379
2461msgid "make sure the patch is applicable to the current index"
2462msgstr "确认补丁可以应用到当前索引"
2463
2464#: builtin/apply.c:4381
2465msgid "apply a patch without touching the working tree"
2466msgstr "应用补丁而不修改工作区"
2467
2468#: builtin/apply.c:4383
2469msgid "also apply the patch (use with --stat/--summary/--check)"
2470msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2471
2472#: builtin/apply.c:4385
2473msgid "attempt three-way merge if a patch does not apply"
2474msgstr "如果一个补丁不能应用则尝试三路合并"
2475
2476#: builtin/apply.c:4387
2477msgid "build a temporary index based on embedded index information"
2478msgstr "创建一个临时索引基于嵌入的索引信息"
2479
2480#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
2481msgid "paths are separated with NUL character"
2482msgstr "路径以 NUL 字符分隔"
2483
2484#: builtin/apply.c:4392
2485msgid "ensure at least <n> lines of context match"
2486msgstr "确保至少匹配 <n> 行上下文"
2487
2488#: builtin/apply.c:4393
2489msgid "action"
2490msgstr "动作"
2491
2492#: builtin/apply.c:4394
2493msgid "detect new or modified lines that have whitespace errors"
2494msgstr "检查新增和修改的行中间的空白字符滥用"
2495
2496#: builtin/apply.c:4397 builtin/apply.c:4400
2497msgid "ignore changes in whitespace when finding context"
2498msgstr "查找上下文时忽略空白字符的变更"
2499
2500#: builtin/apply.c:4403
2501msgid "apply the patch in reverse"
2502msgstr "反向应用补丁"
2503
2504#: builtin/apply.c:4405
2505msgid "don't expect at least one line of context"
2506msgstr "无需至少一行上下文"
2507
2508#: builtin/apply.c:4407
2509msgid "leave the rejected hunks in corresponding *.rej files"
2510msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2511
2512#: builtin/apply.c:4409
2513msgid "allow overlapping hunks"
2514msgstr "允许重叠的补丁片段"
2515
2516#: builtin/apply.c:4412
2517msgid "tolerate incorrectly detected missing new-line at the end of file"
2518msgstr "允许不正确的文件末尾换行符"
2519
2520#: builtin/apply.c:4415
2521msgid "do not trust the line counts in the hunk headers"
2522msgstr "不信任补丁片段的头信息中的行号"
2523
2524#: builtin/apply.c:4417
2525msgid "root"
2526msgstr "根目录"
2527
2528#: builtin/apply.c:4418
2529msgid "prepend <root> to all filenames"
2530msgstr "为所有文件名前添加 <根目录>"
2531
2532#: builtin/apply.c:4440
2533msgid "--3way outside a repository"
2534msgstr "--3way 在一个版本库之外"
2535
2536#: builtin/apply.c:4448
2537msgid "--index outside a repository"
2538msgstr "--index 在一个版本库之外"
2539
2540#: builtin/apply.c:4451
2541msgid "--cached outside a repository"
2542msgstr "--cached 在一个版本库之外"
2543
2544#: builtin/apply.c:4467
2545#, c-format
2546msgid "can't open patch '%s'"
2547msgstr "不能打开补丁 '%s'"
2548
2549#: builtin/apply.c:4481
2550#, c-format
2551msgid "squelched %d whitespace error"
2552msgid_plural "squelched %d whitespace errors"
2553msgstr[0] "抑制下仍有 %d 个空白字符误用"
2554msgstr[1] "抑制下仍有 %d 个空白字符误用"
2555
2556#: builtin/apply.c:4487 builtin/apply.c:4497
2557#, c-format
2558msgid "%d line adds whitespace errors."
2559msgid_plural "%d lines add whitespace errors."
2560msgstr[0] "%d 行有空白字符误用。"
2561msgstr[1] "%d 行有空白字符误用。"
2562
2563#: builtin/archive.c:17
2564#, c-format
2565msgid "could not create archive file '%s'"
2566msgstr "不能创建归档文件 '%s'"
2567
2568#: builtin/archive.c:20
2569msgid "could not redirect output"
2570msgstr "不能重定向输出"
2571
2572#: builtin/archive.c:37
2573msgid "git archive: Remote with no URL"
2574msgstr "git archive:未提供远程URL"
2575
2576#: builtin/archive.c:58
2577msgid "git archive: expected ACK/NAK, got EOF"
2578msgstr "git archive:应为ACK/NACK,却得到EOF"
2579
2580#: builtin/archive.c:61
2581#, c-format
2582msgid "git archive: NACK %s"
2583msgstr "git archive:NACK %s"
2584
2585#: builtin/archive.c:63
2586#, c-format
2587msgid "remote error: %s"
2588msgstr "远程错误:%s"
2589
2590#: builtin/archive.c:64
2591msgid "git archive: protocol error"
2592msgstr "git archive:协议错误"
2593
2594#: builtin/archive.c:68
2595msgid "git archive: expected a flush"
2596msgstr "git archive:应为刷新"
2597
2598#: builtin/bisect--helper.c:7
2599msgid "git bisect--helper --next-all [--no-checkout]"
2600msgstr "git bisect--helper --next-all [--no-checkout]"
2601
2602#: builtin/bisect--helper.c:17
2603msgid "perform 'git bisect next'"
2604msgstr "执行 'git bisect next'"
2605
2606#: builtin/bisect--helper.c:19
2607msgid "update BISECT_HEAD instead of checking out the current commit"
2608msgstr "更新 BISECT_HEAD 而非检出当前提交"
2609
2610#: builtin/blame.c:27
2611msgid "git blame [options] [rev-opts] [rev] [--] file"
2612msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2613
2614#: builtin/blame.c:32
2615msgid "[rev-opts] are documented in git-rev-list(1)"
2616msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2617
2618#: builtin/blame.c:2248
2619msgid "Show blame entries as we find them, incrementally"
2620msgstr "增量式地显示发现的 blame 条目"
2621
2622#: builtin/blame.c:2249
2623msgid "Show blank SHA-1 for boundary commits (Default: off)"
2624msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2625
2626#: builtin/blame.c:2250
2627msgid "Do not treat root commits as boundaries (Default: off)"
2628msgstr "不把根提交作为边界(默认:关闭)"
2629
2630#: builtin/blame.c:2251
2631msgid "Show work cost statistics"
2632msgstr "显示命令消耗统计"
2633
2634#: builtin/blame.c:2252
2635msgid "Show output score for blame entries"
2636msgstr "显示判断 blame 条目位移的得分诊断信息"
2637
2638#: builtin/blame.c:2253
2639msgid "Show original filename (Default: auto)"
2640msgstr "显示原始文件名(默认:自动)"
2641
2642#: builtin/blame.c:2254
2643msgid "Show original linenumber (Default: off)"
2644msgstr "显示原始的行号(默认:关闭)"
2645
2646#: builtin/blame.c:2255
2647msgid "Show in a format designed for machine consumption"
2648msgstr "显示为一个适合机器读取的格式"
2649
2650#: builtin/blame.c:2256
2651msgid "Show porcelain format with per-line commit information"
2652msgstr "为每一行显示机器适用的提交信息"
2653
2654#: builtin/blame.c:2257
2655msgid "Use the same output mode as git-annotate (Default: off)"
2656msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2657
2658#: builtin/blame.c:2258
2659msgid "Show raw timestamp (Default: off)"
2660msgstr "显示原始时间戳(默认:关闭)"
2661
2662#: builtin/blame.c:2259
2663msgid "Show long commit SHA1 (Default: off)"
2664msgstr "显示长的SHA1提交号(默认:关闭)"
2665
2666#: builtin/blame.c:2260
2667msgid "Suppress author name and timestamp (Default: off)"
2668msgstr "隐藏作者名字和时间戳(默认:关闭)"
2669
2670#: builtin/blame.c:2261
2671msgid "Show author email instead of name (Default: off)"
2672msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2673
2674#: builtin/blame.c:2262
2675msgid "Ignore whitespace differences"
2676msgstr "忽略空白差异"
2677
2678#: builtin/blame.c:2263
2679msgid "Spend extra cycles to find better match"
2680msgstr "花费额外的循环来找到更好的匹配"
2681
2682#: builtin/blame.c:2264
2683msgid "Use revisions from <file> instead of calling git-rev-list"
2684msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2685
2686#: builtin/blame.c:2265
2687msgid "Use <file>'s contents as the final image"
2688msgstr "使用 <file> 的内容作为最终的图片"
2689
2690#: builtin/blame.c:2266 builtin/blame.c:2267
2691msgid "score"
2692msgstr "得分"
2693
2694#: builtin/blame.c:2266
2695msgid "Find line copies within and across files"
2696msgstr "找到文件内及跨文件的行拷贝"
2697
2698#: builtin/blame.c:2267
2699msgid "Find line movements within and across files"
2700msgstr "找到文件内及跨文件的行移动"
2701
2702#: builtin/blame.c:2268
2703msgid "n,m"
2704msgstr "n,m"
2705
2706#: builtin/blame.c:2268
2707msgid "Process only line range n,m, counting from 1"
2708msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2709
2710#: builtin/branch.c:24
2711msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2712msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2713
2714#: builtin/branch.c:25
2715msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2716msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2717
2718#: builtin/branch.c:26
2719msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2720msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2721
2722#: builtin/branch.c:27
2723msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2724msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2725
2726# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2727#: builtin/branch.c:150
2728#, c-format
2729msgid ""
2730"deleting branch '%s' that has been merged to\n"
2731" '%s', but not yet merged to HEAD."
2732msgstr ""
2733"将要删除的分支 '%s' 已经被合并到\n"
2734" '%s',但未合并到 HEAD。"
2735
2736# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2737#: builtin/branch.c:154
2738#, c-format
2739msgid ""
2740"not deleting branch '%s' that is not yet merged to\n"
2741" '%s', even though it is merged to HEAD."
2742msgstr ""
2743"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2744" 然而却尚未被合并到分支 '%s' 。"
2745
2746#: builtin/branch.c:168
2747#, c-format
2748msgid "Couldn't look up commit object for '%s'"
2749msgstr "无法查询 '%s' 指向的提交对象"
2750
2751#: builtin/branch.c:172
2752#, c-format
2753msgid ""
2754"The branch '%s' is not fully merged.\n"
2755"If you are sure you want to delete it, run 'git branch -D %s'."
2756msgstr ""
2757"分支 '%s' 没有完全合并。\n"
2758"如果您确认要删除它,执行 'git branch -D %s'。"
2759
2760#: builtin/branch.c:185
2761msgid "Update of config-file failed"
2762msgstr "无法更新 config 文件"
2763
2764#: builtin/branch.c:213
2765msgid "cannot use -a with -d"
2766msgstr "不能将 -a 和 -d 同时使用"
2767
2768#: builtin/branch.c:219
2769msgid "Couldn't look up commit object for HEAD"
2770msgstr "无法查询 HEAD 指向的提交对象"
2771
2772#: builtin/branch.c:227
2773#, c-format
2774msgid "Cannot delete the branch '%s' which you are currently on."
2775msgstr "无法删除您当前所在的分支 '%s'。"
2776
2777#: builtin/branch.c:240
2778#, c-format
2779msgid "remote branch '%s' not found."
2780msgstr "远程分支 '%s' 未发现。"
2781
2782#: builtin/branch.c:241
2783#, c-format
2784msgid "branch '%s' not found."
2785msgstr "分支 '%s' 未发现。"
2786
2787#: builtin/branch.c:255
2788#, c-format
2789msgid "Error deleting remote branch '%s'"
2790msgstr "删除远程分支 '%s' 时出错"
2791
2792#: builtin/branch.c:256
2793#, c-format
2794msgid "Error deleting branch '%s'"
2795msgstr "删除分支 '%s' 时出错"
2796
2797#: builtin/branch.c:263
2798#, c-format
2799msgid "Deleted remote branch %s (was %s).\n"
2800msgstr "已删除远程分支 %s(曾为 %s)。\n"
2801
2802#: builtin/branch.c:264
2803#, c-format
2804msgid "Deleted branch %s (was %s).\n"
2805msgstr "已删除分支 %s(曾为 %s)。\n"
2806
2807#: builtin/branch.c:366
2808#, c-format
2809msgid "branch '%s' does not point at a commit"
2810msgstr "分支 '%s' 未指向一个提交"
2811
2812#: builtin/branch.c:453
2813#, c-format
2814msgid "[%s: gone]"
2815msgstr "[%s: 丢失]"
2816
2817#: builtin/branch.c:456
2818#, c-format
2819msgid "[%s]"
2820msgstr "[%s]"
2821
2822#: builtin/branch.c:459
2823#, c-format
2824msgid "[%s: behind %d]"
2825msgstr "[%s:落后 %d]"
2826
2827#: builtin/branch.c:461
2828#, c-format
2829msgid "[behind %d]"
2830msgstr "[落后 %d]"
2831
2832#: builtin/branch.c:465
2833#, c-format
2834msgid "[%s: ahead %d]"
2835msgstr "[%s:领先 %d]"
2836
2837#: builtin/branch.c:467
2838#, c-format
2839msgid "[ahead %d]"
2840msgstr "[领先 %d]"
2841
2842#: builtin/branch.c:470
2843#, c-format
2844msgid "[%s: ahead %d, behind %d]"
2845msgstr "[%s:领先 %d,落后 %d]"
2846
2847#: builtin/branch.c:473
2848#, c-format
2849msgid "[ahead %d, behind %d]"
2850msgstr "[领先 %d,落后 %d]"
2851
2852#: builtin/branch.c:496
2853msgid " **** invalid ref ****"
2854msgstr " **** 无效引用 ****"
2855
2856#: builtin/branch.c:588
2857#, c-format
2858msgid "(no branch, rebasing %s)"
2859msgstr "(非分支,正变基 %s)"
2860
2861#: builtin/branch.c:591
2862#, c-format
2863msgid "(no branch, bisect started on %s)"
2864msgstr "(非分支,二分查找开始于 %s)"
2865
2866#: builtin/branch.c:594
2867#, c-format
2868msgid "(detached from %s)"
2869msgstr "(分离自 %s)"
2870
2871#: builtin/branch.c:597
2872msgid "(no branch)"
2873msgstr "(非分支)"
2874
2875#: builtin/branch.c:643
2876#, c-format
2877msgid "object '%s' does not point to a commit"
2878msgstr "对象 '%s' 没有指向一个提交"
2879
2880#: builtin/branch.c:675
2881msgid "some refs could not be read"
2882msgstr "一些引用不能读取"
2883
2884#: builtin/branch.c:688
2885msgid "cannot rename the current branch while not on any."
2886msgstr "无法重命名当前分支因为不处于任何分支上。"
2887
2888#: builtin/branch.c:698
2889#, c-format
2890msgid "Invalid branch name: '%s'"
2891msgstr "无效的分支名:'%s'"
2892
2893#: builtin/branch.c:713
2894msgid "Branch rename failed"
2895msgstr "分支重命名失败"
2896
2897#: builtin/branch.c:717
2898#, c-format
2899msgid "Renamed a misnamed branch '%s' away"
2900msgstr "重命名掉一个错误命名的旧分支 '%s'"
2901
2902#: builtin/branch.c:721
2903#, c-format
2904msgid "Branch renamed to %s, but HEAD is not updated!"
2905msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2906
2907#: builtin/branch.c:728
2908msgid "Branch is renamed, but update of config-file failed"
2909msgstr "分支被重命名,但更新 config 文件失败"
2910
2911#: builtin/branch.c:743
2912#, c-format
2913msgid "malformed object name %s"
2914msgstr "非法的对象名 %s"
2915
2916#: builtin/branch.c:767
2917#, c-format
2918msgid "could not write branch description template: %s"
2919msgstr "不能写分支描述模版:%s"
2920
2921#: builtin/branch.c:797
2922msgid "Generic options"
2923msgstr "通用选项"
2924
2925#: builtin/branch.c:799
2926msgid "show hash and subject, give twice for upstream branch"
2927msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2928
2929#: builtin/branch.c:800
2930msgid "suppress informational messages"
2931msgstr "不显示信息"
2932
2933#: builtin/branch.c:801
2934msgid "set up tracking mode (see git-pull(1))"
2935msgstr "设置跟踪模式(参见 git-pull(1))"
2936
2937#: builtin/branch.c:803
2938msgid "change upstream info"
2939msgstr "改变上游信息"
2940
2941#: builtin/branch.c:807
2942msgid "use colored output"
2943msgstr "使用彩色输出"
2944
2945#: builtin/branch.c:808
2946msgid "act on remote-tracking branches"
2947msgstr "作用于远程跟踪分支"
2948
2949#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838
2950#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461
2951#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
2952msgid "commit"
2953msgstr "提交"
2954
2955#: builtin/branch.c:812 builtin/branch.c:818
2956msgid "print only branches that contain the commit"
2957msgstr "只打印包含该提交的分支"
2958
2959#: builtin/branch.c:824
2960msgid "Specific git-branch actions:"
2961msgstr "具体的 git-branch 动作:"
2962
2963#: builtin/branch.c:825
2964msgid "list both remote-tracking and local branches"
2965msgstr "列出远程跟踪及本地分支"
2966
2967#: builtin/branch.c:827
2968msgid "delete fully merged branch"
2969msgstr "删除完全合并的分支"
2970
2971#: builtin/branch.c:828
2972msgid "delete branch (even if not merged)"
2973msgstr "删除分支(即使没有合并)"
2974
2975#: builtin/branch.c:829
2976msgid "move/rename a branch and its reflog"
2977msgstr "移动/重命名一个分支,以及它的引用日志"
2978
2979#: builtin/branch.c:830
2980msgid "move/rename a branch, even if target exists"
2981msgstr "移动/重命名一个分支,即使目标已存在"
2982
2983#: builtin/branch.c:831
2984msgid "list branch names"
2985msgstr "列出分支名"
2986
2987#: builtin/branch.c:832
2988msgid "create the branch's reflog"
2989msgstr "创建分支的引用日志"
2990
2991#: builtin/branch.c:834
2992msgid "edit the description for the branch"
2993msgstr "标记分支的描述"
2994
2995#: builtin/branch.c:835
2996msgid "force creation (when already exists)"
2997msgstr "强制创建(当已经存在)"
2998
2999#: builtin/branch.c:838
3000msgid "print only not merged branches"
3001msgstr "只打印没有合并的分支"
3002
3003#: builtin/branch.c:844
3004msgid "print only merged branches"
3005msgstr "只打印合并的分支"
3006
3007#: builtin/branch.c:848
3008msgid "list branches in columns"
3009msgstr "以列的方式显示分支"
3010
3011#: builtin/branch.c:861
3012msgid "Failed to resolve HEAD as a valid ref."
3013msgstr "无法将 HEAD 解析为有效引用。"
3014
3015#: builtin/branch.c:866 builtin/clone.c:629
3016msgid "HEAD not found below refs/heads!"
3017msgstr "HEAD 没有位于 /refs/heads 之下!"
3018
3019#: builtin/branch.c:890
3020msgid "--column and --verbose are incompatible"
3021msgstr "--column 和 --verbose 不兼容"
3022
3023#: builtin/branch.c:896 builtin/branch.c:935
3024msgid "branch name required"
3025msgstr "必须提供分支名"
3026
3027#: builtin/branch.c:911
3028msgid "Cannot give description to detached HEAD"
3029msgstr "不能向分离头指针提供描述"
3030
3031#: builtin/branch.c:916
3032msgid "cannot edit description of more than one branch"
3033msgstr "不能为一个以上的分支编辑描述"
3034
3035#: builtin/branch.c:923
3036#, c-format
3037msgid "No commit on branch '%s' yet."
3038msgstr "分支 '%s' 尚无提交。"
3039
3040#: builtin/branch.c:926
3041#, c-format
3042msgid "No branch named '%s'."
3043msgstr "没有分支 '%s'。"
3044
3045#: builtin/branch.c:941
3046msgid "too many branches for a rename operation"
3047msgstr "为重命名操作提供了太多的分支名"
3048
3049#: builtin/branch.c:946
3050msgid "too many branches to set new upstream"
3051msgstr "为设置新上游提供了太多的分支名"
3052
3053#: builtin/branch.c:950
3054#, c-format
3055msgid ""
3056"could not set upstream of HEAD to %s when it does not point to any branch."
3057msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3058
3059#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997
3060#, c-format
3061msgid "no such branch '%s'"
3062msgstr "没有此分支 '%s'"
3063
3064#: builtin/branch.c:957
3065#, c-format
3066msgid "branch '%s' does not exist"
3067msgstr "分支 '%s' 不存在"
3068
3069#: builtin/branch.c:969
3070msgid "too many branches to unset upstream"
3071msgstr "为取消上游设置操作提供了太多的分支名"
3072
3073#: builtin/branch.c:973
3074msgid "could not unset upstream of HEAD when it does not point to any branch."
3075msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3076
3077#: builtin/branch.c:979
3078#, c-format
3079msgid "Branch '%s' has no upstream information"
3080msgstr "分支 '%s' 没有上游信息"
3081
3082#: builtin/branch.c:994
3083msgid "it does not make sense to create 'HEAD' manually"
3084msgstr "手工创建 'HEAD' 没有意义"
3085
3086#: builtin/branch.c:1000
3087msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3088msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3089
3090#: builtin/branch.c:1003
3091#, c-format
3092msgid ""
3093"The --set-upstream flag is deprecated and will be removed. Consider using --"
3094"track or --set-upstream-to\n"
3095msgstr ""
3096"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3097
3098#: builtin/branch.c:1020
3099#, c-format
3100msgid ""
3101"\n"
3102"If you wanted to make '%s' track '%s', do this:\n"
3103"\n"
3104msgstr ""
3105"\n"
3106"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3107"\n"
3108
3109#: builtin/branch.c:1021
3110#, c-format
3111msgid " git branch -d %s\n"
3112msgstr " git branch -d %s\n"
3113
3114#: builtin/branch.c:1022
3115#, c-format
3116msgid " git branch --set-upstream-to %s\n"
3117msgstr " git branch --set-upstream-to %s\n"
3118
3119#: builtin/bundle.c:47
3120#, c-format
3121msgid "%s is okay\n"
3122msgstr "%s 可以\n"
3123
3124#: builtin/bundle.c:56
3125msgid "Need a repository to create a bundle."
3126msgstr "需要一个版本库来创建包。"
3127
3128#: builtin/bundle.c:60
3129msgid "Need a repository to unbundle."
3130msgstr "需要一个版本库来解包。"
3131
3132#: builtin/cat-file.c:312
3133msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
3134msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
3135
3136#: builtin/cat-file.c:313
3137msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
3138msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
3139
3140#: builtin/cat-file.c:350
3141msgid "<type> can be one of: blob, tree, commit, tag"
3142msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3143
3144#: builtin/cat-file.c:351
3145msgid "show object type"
3146msgstr "显示对象类型"
3147
3148#: builtin/cat-file.c:352
3149msgid "show object size"
3150msgstr "显示对象大小"
3151
3152#: builtin/cat-file.c:354
3153msgid "exit with zero when there's no error"
3154msgstr "当没有错误时退出并返回零"
3155
3156#: builtin/cat-file.c:355
3157msgid "pretty-print object's content"
3158msgstr "美观地打印对象的内容"
3159
3160#: builtin/cat-file.c:357
3161msgid "for blob objects, run textconv on object's content"
3162msgstr "对于数据(blob)对象,对其内容执行 textconv"
3163
3164#: builtin/cat-file.c:359
3165msgid "show info and content of objects fed from the standard input"
3166msgstr "显示从标准输入提供的对象的信息和内容"
3167
3168#: builtin/cat-file.c:362
3169msgid "show info about objects fed from the standard input"
3170msgstr "显示从标准输入提供的对象的信息"
3171
3172#: builtin/check-attr.c:11
3173msgid "git check-attr [-a | --all | attr...] [--] pathname..."
3174msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
3175
3176#: builtin/check-attr.c:12
3177msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3178msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
3179
3180#: builtin/check-attr.c:19
3181msgid "report all attributes set on file"
3182msgstr "报告设置在文件上的所有属性"
3183
3184#: builtin/check-attr.c:20
3185msgid "use .gitattributes only from the index"
3186msgstr "只使用索引中的 .gitattributes"
3187
3188#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
3189msgid "read file names from stdin"
3190msgstr "从标准输入读出文件名"
3191
3192#: builtin/check-attr.c:23 builtin/check-ignore.c:24
3193msgid "terminate input and output records by a NUL character"
3194msgstr "输入和输出的记录使用 NUL 字符终结"
3195
3196#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259
3197msgid "suppress progress reporting"
3198msgstr "不显示进度报告"
3199
3200#: builtin/check-ignore.c:26
3201msgid "show non-matching input paths"
3202msgstr "显示未匹配的输入路径"
3203
3204#: builtin/check-ignore.c:28
3205msgid "ignore index when checking"
3206msgstr "检查时忽略索引"
3207
3208#: builtin/check-ignore.c:154
3209msgid "cannot specify pathnames with --stdin"
3210msgstr "不能同时提供路径及 --stdin 参数"
3211
3212#: builtin/check-ignore.c:157
3213msgid "-z only makes sense with --stdin"
3214msgstr "-z 需要和 --stdin 参数共用才有意义"
3215
3216#: builtin/check-ignore.c:159
3217msgid "no path specified"
3218msgstr "未指定路径"
3219
3220#: builtin/check-ignore.c:163
3221msgid "--quiet is only valid with a single pathname"
3222msgstr "参数 --quiet 只在提供一个路径名时有效"
3223
3224#: builtin/check-ignore.c:165
3225msgid "cannot have both --quiet and --verbose"
3226msgstr "不能同时提供 --quiet 和 --verbose 参数"
3227
3228#: builtin/check-ignore.c:168
3229msgid "--non-matching is only valid with --verbose"
3230msgstr "--non-matching 选项只在使用 --verbose 时有效"
3231
3232#: builtin/check-mailmap.c:8
3233msgid "git check-mailmap [options] <contact>..."
3234msgstr "git check-mailmap [选项] <联系地址>..."
3235
3236#: builtin/check-mailmap.c:13
3237msgid "also read contacts from stdin"
3238msgstr "还从标准输入读取联系地址"
3239
3240#: builtin/check-mailmap.c:24
3241#, c-format
3242msgid "unable to parse contact: %s"
3243msgstr "不能解析联系地址:%s"
3244
3245#: builtin/check-mailmap.c:47
3246msgid "no contacts specified"
3247msgstr "未指定联系地址"
3248
3249#: builtin/checkout-index.c:126
3250msgid "git checkout-index [options] [--] [<file>...]"
3251msgstr "git checkout-index [选项] [--] [<文件>...]"
3252
3253#: builtin/checkout-index.c:187
3254msgid "check out all files in the index"
3255msgstr "检出索引区的所有文件"
3256
3257#: builtin/checkout-index.c:188
3258msgid "force overwrite of existing files"
3259msgstr "强制覆盖现有的文件"
3260
3261#: builtin/checkout-index.c:190
3262msgid "no warning for existing files and files not in index"
3263msgstr "存在或不在索引中的文件都没有警告"
3264
3265#: builtin/checkout-index.c:192
3266msgid "don't checkout new files"
3267msgstr "不检出新文件"
3268
3269#: builtin/checkout-index.c:194
3270msgid "update stat information in the index file"
3271msgstr "更新索引中文件的状态信息"
3272
3273#: builtin/checkout-index.c:200
3274msgid "read list of paths from the standard input"
3275msgstr "从标准输入读取路径列表"
3276
3277#: builtin/checkout-index.c:202
3278msgid "write the content to temporary files"
3279msgstr "将内容写入临时文件"
3280
3281#: builtin/checkout-index.c:203 builtin/column.c:30
3282msgid "string"
3283msgstr "字符串"
3284
3285#: builtin/checkout-index.c:204
3286msgid "when creating files, prepend <string>"
3287msgstr "在创建文件时,在前面加上<字符串>"
3288
3289#: builtin/checkout-index.c:207
3290msgid "copy out the files from named stage"
3291msgstr "从指定暂存区中拷出文件"
3292
3293#: builtin/checkout.c:25
3294msgid "git checkout [options] <branch>"
3295msgstr "git checkout [选项] <分支>"
3296
3297#: builtin/checkout.c:26
3298msgid "git checkout [options] [<branch>] -- <file>..."
3299msgstr "git checkout [选项] [<分支>] -- <文件>..."
3300
3301#: builtin/checkout.c:114 builtin/checkout.c:147
3302#, c-format
3303msgid "path '%s' does not have our version"
3304msgstr "路径 '%s' 没有我们的版本"
3305
3306#: builtin/checkout.c:116 builtin/checkout.c:149
3307#, c-format
3308msgid "path '%s' does not have their version"
3309msgstr "路径 '%s' 没有他们的版本"
3310
3311#: builtin/checkout.c:132
3312#, c-format
3313msgid "path '%s' does not have all necessary versions"
3314msgstr "路径 '%s' 没有全部必须的版本"
3315
3316#: builtin/checkout.c:176
3317#, c-format
3318msgid "path '%s' does not have necessary versions"
3319msgstr "路径 '%s' 没有必须的版本"
3320
3321#: builtin/checkout.c:193
3322#, c-format
3323msgid "path '%s': cannot merge"
3324msgstr "path '%s':无法合并"
3325
3326#: builtin/checkout.c:210
3327#, c-format
3328msgid "Unable to add merge result for '%s'"
3329msgstr "无法为 '%s' 添加合并结果"
3330
3331#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
3332#: builtin/checkout.c:241
3333#, c-format
3334msgid "'%s' cannot be used with updating paths"
3335msgstr "'%s' 不能在更新路径时使用"
3336
3337#: builtin/checkout.c:244 builtin/checkout.c:247
3338#, c-format
3339msgid "'%s' cannot be used with %s"
3340msgstr "'%s' 不能和 %s 同时使用"
3341
3342#: builtin/checkout.c:250
3343#, c-format
3344msgid "Cannot update paths and switch to branch '%s' at the same time."
3345msgstr "不能同时更新路径并切换到分支'%s'。"
3346
3347#: builtin/checkout.c:261 builtin/checkout.c:451
3348msgid "corrupt index file"
3349msgstr "损坏的索引文件"
3350
3351#: builtin/checkout.c:322 builtin/checkout.c:329
3352#, c-format
3353msgid "path '%s' is unmerged"
3354msgstr "路径 '%s' 未合并"
3355
3356#: builtin/checkout.c:473
3357msgid "you need to resolve your current index first"
3358msgstr "您需要先解决当前索引的冲突"
3359
3360#: builtin/checkout.c:594
3361#, c-format
3362msgid "Can not do reflog for '%s'\n"
3363msgstr "不能对 '%s' 执行 reflog 操作\n"
3364
3365#: builtin/checkout.c:632
3366msgid "HEAD is now at"
3367msgstr "HEAD 目前位于"
3368
3369#: builtin/checkout.c:639
3370#, c-format
3371msgid "Reset branch '%s'\n"
3372msgstr "重置分支 '%s'\n"
3373
3374#: builtin/checkout.c:642
3375#, c-format
3376msgid "Already on '%s'\n"
3377msgstr "已经位于 '%s'\n"
3378
3379#: builtin/checkout.c:646
3380#, c-format
3381msgid "Switched to and reset branch '%s'\n"
3382msgstr "切换并重置分支 '%s'\n"
3383
3384#: builtin/checkout.c:648 builtin/checkout.c:1033
3385#, c-format
3386msgid "Switched to a new branch '%s'\n"
3387msgstr "切换到一个新分支 '%s'\n"
3388
3389#: builtin/checkout.c:650
3390#, c-format
3391msgid "Switched to branch '%s'\n"
3392msgstr "切换到分支 '%s'\n"
3393
3394# 译者:注意保持前导空格
3395#: builtin/checkout.c:706
3396#, c-format
3397msgid " ... and %d more.\n"
3398msgstr " ... 及其它 %d 个。\n"
3399
3400#. The singular version
3401#: builtin/checkout.c:712
3402#, c-format
3403msgid ""
3404"Warning: you are leaving %d commit behind, not connected to\n"
3405"any of your branches:\n"
3406"\n"
3407"%s\n"
3408msgid_plural ""
3409"Warning: you are leaving %d commits behind, not connected to\n"
3410"any of your branches:\n"
3411"\n"
3412"%s\n"
3413msgstr[0] ""
3414"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3415"\n"
3416"%s\n"
3417msgstr[1] ""
3418"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3419"\n"
3420"%s\n"
3421
3422#: builtin/checkout.c:730
3423#, c-format
3424msgid ""
3425"If you want to keep them by creating a new branch, this may be a good time\n"
3426"to do so with:\n"
3427"\n"
3428" git branch new_branch_name %s\n"
3429"\n"
3430msgstr ""
3431"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3432"如下操作:\n"
3433"\n"
3434" git branch new_branch_name %s\n"
3435"\n"
3436
3437#: builtin/checkout.c:760
3438msgid "internal error in revision walk"
3439msgstr "在版本遍历时遇到内部错误"
3440
3441#: builtin/checkout.c:764
3442msgid "Previous HEAD position was"
3443msgstr "之前的 HEAD 位置是"
3444
3445#: builtin/checkout.c:791 builtin/checkout.c:1028
3446msgid "You are on a branch yet to be born"
3447msgstr "您位于一个尚未初始化的分支"
3448
3449#: builtin/checkout.c:935
3450#, c-format
3451msgid "only one reference expected, %d given."
3452msgstr "只要一个引用,却给出了 %d 个"
3453
3454#: builtin/checkout.c:974
3455#, c-format
3456msgid "invalid reference: %s"
3457msgstr "无效引用:%s"
3458
3459#. case (1): want a tree
3460#: builtin/checkout.c:1003
3461#, c-format
3462msgid "reference is not a tree: %s"
3463msgstr "引用不是一个树:%s"
3464
3465#: builtin/checkout.c:1042
3466msgid "paths cannot be used with switching branches"
3467msgstr "路径不能和切换分支同时使用"
3468
3469#: builtin/checkout.c:1045 builtin/checkout.c:1049
3470#, c-format
3471msgid "'%s' cannot be used with switching branches"
3472msgstr "'%s' 不能和切换分支同时使用"
3473
3474#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
3475#: builtin/checkout.c:1064
3476#, c-format
3477msgid "'%s' cannot be used with '%s'"
3478msgstr "'%s' 不能和 '%s' 同时使用"
3479
3480#: builtin/checkout.c:1069
3481#, c-format
3482msgid "Cannot switch branch to a non-commit '%s'"
3483msgstr "不能切换分支到一个非提交 '%s'"
3484
3485#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
3486#: builtin/remote.c:169 builtin/remote.c:171
3487msgid "branch"
3488msgstr "分支"
3489
3490#: builtin/checkout.c:1092
3491msgid "create and checkout a new branch"
3492msgstr "创建并检出一个新的分支"
3493
3494#: builtin/checkout.c:1094
3495msgid "create/reset and checkout a branch"
3496msgstr "创建/重置并检出一个分支"
3497
3498#: builtin/checkout.c:1095
3499msgid "create reflog for new branch"
3500msgstr "为新的分支创建引用日志"
3501
3502#: builtin/checkout.c:1096
3503msgid "detach the HEAD at named commit"
3504msgstr "成为指向该提交的分离头指针"
3505
3506#: builtin/checkout.c:1097
3507msgid "set upstream info for new branch"
3508msgstr "为新的分支设置上游信息"
3509
3510#: builtin/checkout.c:1099
3511msgid "new branch"
3512msgstr "新分支"
3513
3514#: builtin/checkout.c:1099
3515msgid "new unparented branch"
3516msgstr "新的没有父提交的分支"
3517
3518#: builtin/checkout.c:1100
3519msgid "checkout our version for unmerged files"
3520msgstr "对尚未合并的文件检出我们的版本"
3521
3522#: builtin/checkout.c:1102
3523msgid "checkout their version for unmerged files"
3524msgstr "对尚未合并的文件检出他们的版本"
3525
3526#: builtin/checkout.c:1104
3527msgid "force checkout (throw away local modifications)"
3528msgstr "强制检出(丢弃本地修改)"
3529
3530#: builtin/checkout.c:1105
3531msgid "perform a 3-way merge with the new branch"
3532msgstr "和新的分支执行三路合并"
3533
3534#: builtin/checkout.c:1106 builtin/merge.c:232
3535msgid "update ignored files (default)"
3536msgstr "更新忽略的文件(默认)"
3537
3538#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251
3539msgid "style"
3540msgstr "风格"
3541
3542#: builtin/checkout.c:1108
3543msgid "conflict style (merge or diff3)"
3544msgstr "冲突输出风格(merge 或 diff3)"
3545
3546#: builtin/checkout.c:1111
3547msgid "do not limit pathspecs to sparse entries only"
3548msgstr "对路径不做稀疏检出的限制"
3549
3550#: builtin/checkout.c:1113
3551msgid "second guess 'git checkout no-such-branch'"
3552msgstr "再者猜测'git checkout no-such-branch'"
3553
3554#: builtin/checkout.c:1136
3555msgid "-b, -B and --orphan are mutually exclusive"
3556msgstr "-b、-B 和 --orphan 是互斥的"
3557
3558#: builtin/checkout.c:1153
3559msgid "--track needs a branch name"
3560msgstr "--track 需要一个分支名"
3561
3562#: builtin/checkout.c:1160
3563msgid "Missing branch name; try -b"
3564msgstr "缺少分支名;尝试 -b"
3565
3566#: builtin/checkout.c:1197
3567msgid "invalid path specification"
3568msgstr "无效的路径规格"
3569
3570#: builtin/checkout.c:1204
3571#, c-format
3572msgid ""
3573"Cannot update paths and switch to branch '%s' at the same time.\n"
3574"Did you intend to checkout '%s' which can not be resolved as commit?"
3575msgstr ""
3576"不能同时更新路径并切换到分支'%s'。\n"
3577"您是想要检出 '%s' 但其未能解析为提交么?"
3578
3579#: builtin/checkout.c:1209
3580#, c-format
3581msgid "git checkout: --detach does not take a path argument '%s'"
3582msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3583
3584#: builtin/checkout.c:1213
3585msgid ""
3586"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3587"checking out of the index."
3588msgstr ""
3589"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3590
3591#: builtin/clean.c:26
3592msgid ""
3593"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3594msgstr ""
3595"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3596
3597#: builtin/clean.c:30
3598#, c-format
3599msgid "Removing %s\n"
3600msgstr "正删除 %s\n"
3601
3602#: builtin/clean.c:31
3603#, c-format
3604msgid "Would remove %s\n"
3605msgstr "将删除 %s\n"
3606
3607#: builtin/clean.c:32
3608#, c-format
3609msgid "Skipping repository %s\n"
3610msgstr "忽略版本库 %s\n"
3611
3612#: builtin/clean.c:33
3613#, c-format
3614msgid "Would skip repository %s\n"
3615msgstr "将忽略版本库 %s\n"
3616
3617#: builtin/clean.c:34
3618#, c-format
3619msgid "failed to remove %s"
3620msgstr "无法删除 %s"
3621
3622#: builtin/clean.c:294
3623msgid ""
3624"Prompt help:\n"
3625"1 - select a numbered item\n"
3626"foo - select item based on unique prefix\n"
3627" - (empty) select nothing"
3628msgstr ""
3629"帮助:\n"
3630"1 - 通过编号选择一个选项\n"
3631"foo - 通过标题选择一个选项\n"
3632" - (空)什么也不选择"
3633
3634#: builtin/clean.c:298
3635msgid ""
3636"Prompt help:\n"
3637"1 - select a single item\n"
3638"3-5 - select a range of items\n"
3639"2-3,6-9 - select multiple ranges\n"
3640"foo - select item based on unique prefix\n"
3641"-... - unselect specified items\n"
3642"* - choose all items\n"
3643" - (empty) finish selecting"
3644msgstr ""
3645"帮助:\n"
3646"1 - 选择一个选项\n"
3647"3-5 - 选择一个范围内的所有选项\n"
3648"2-3,6-9 - 选择多个范围内的所有选项\n"
3649"foo - 通过标题选择一个选项\n"
3650"-... - 反选特定的选项\n"
3651"* - 选择所有选项\n"
3652" - (空)结束选择"
3653
3654#: builtin/clean.c:516
3655#, c-format
3656msgid "Huh (%s)?"
3657msgstr "嗯(%s)?"
3658
3659#: builtin/clean.c:659
3660#, c-format
3661msgid "Input ignore patterns>> "
3662msgstr "输入模版以排除条目>> "
3663
3664#: builtin/clean.c:696
3665#, c-format
3666msgid "WARNING: Cannot find items matched by: %s"
3667msgstr "警告:无法找到和 %s 匹配的条目"
3668
3669#: builtin/clean.c:717
3670msgid "Select items to delete"
3671msgstr "选择要删除的条目"
3672
3673#: builtin/clean.c:757
3674#, c-format
3675msgid "remove %s? "
3676msgstr "删除 %s?"
3677
3678#: builtin/clean.c:782
3679msgid "Bye."
3680msgstr "再见。"
3681
3682#: builtin/clean.c:790
3683msgid ""
3684"clean - start cleaning\n"
3685"filter by pattern - exclude items from deletion\n"
3686"select by numbers - select items to be deleted by numbers\n"
3687"ask each - confirm each deletion (like \"rm -i\")\n"
3688"quit - stop cleaning\n"
3689"help - this screen\n"
3690"? - help for prompt selection"
3691msgstr ""
3692"clean - 开始清理\n"
3693"filter by pattern - 通过模版排除要删除的条目\n"
3694"select by numbers - 通过数字选择要删除的条目\n"
3695"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3696"quit - 停止删除并退出\n"
3697"help - 显示本帮助\n"
3698"? - 显示如何在提示符下选择的帮助"
3699
3700#: builtin/clean.c:817
3701msgid "*** Commands ***"
3702msgstr "*** 命令 ***"
3703
3704#: builtin/clean.c:818
3705msgid "What now"
3706msgstr "请选择"
3707
3708#: builtin/clean.c:826
3709msgid "Would remove the following item:"
3710msgid_plural "Would remove the following items:"
3711msgstr[0] "将删除如下条目:"
3712msgstr[1] "将删除如下条目:"
3713
3714#: builtin/clean.c:843
3715msgid "No more files to clean, exiting."
3716msgstr "没有要清理的文件,退出。"
3717
3718#: builtin/clean.c:874
3719msgid "do not print names of files removed"
3720msgstr "不打印删除文件的名称"
3721
3722#: builtin/clean.c:876
3723msgid "force"
3724msgstr "强制"
3725
3726#: builtin/clean.c:877
3727msgid "interactive cleaning"
3728msgstr "交互式清除"
3729
3730#: builtin/clean.c:879
3731msgid "remove whole directories"
3732msgstr "删除整个目录"
3733
3734#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
3735#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185
3736msgid "pattern"
3737msgstr "模式"
3738
3739#: builtin/clean.c:881
3740msgid "add <pattern> to ignore rules"
3741msgstr "添加<模式>到忽略规则"
3742
3743#: builtin/clean.c:882
3744msgid "remove ignored files, too"
3745msgstr "也删除忽略的文件"
3746
3747#: builtin/clean.c:884
3748msgid "remove only ignored files"
3749msgstr "只删除忽略的文件"
3750
3751#: builtin/clean.c:902
3752msgid "-x and -X cannot be used together"
3753msgstr "-x 和 -X 不能同时使用"
3754
3755#: builtin/clean.c:906
3756msgid ""
3757"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
3758"clean"
3759msgstr ""
3760"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3761
3762#: builtin/clean.c:909
3763msgid ""
3764"clean.requireForce defaults to true and neither -i, -n nor -f given; "
3765"refusing to clean"
3766msgstr ""
3767"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3768
3769#: builtin/clone.c:36
3770msgid "git clone [options] [--] <repo> [<dir>]"
3771msgstr "git clone [选项] [--] <版本库> [<路径>]"
3772
3773#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229
3774#: builtin/push.c:474
3775msgid "force progress reporting"
3776msgstr "强制显示进度报告"
3777
3778#: builtin/clone.c:66
3779msgid "don't create a checkout"
3780msgstr "不创建一个检出"
3781
3782#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
3783msgid "create a bare repository"
3784msgstr "创建一个裸版本库"
3785
3786#: builtin/clone.c:71
3787msgid "create a mirror repository (implies bare)"
3788msgstr "创建一个镜像版本库(也是裸版本库)"
3789
3790#: builtin/clone.c:73
3791msgid "to clone from a local repository"
3792msgstr "从本地版本库克隆"
3793
3794#: builtin/clone.c:75
3795msgid "don't use local hardlinks, always copy"
3796msgstr "不使用本地硬链接,始终复制"
3797
3798#: builtin/clone.c:77
3799msgid "setup as shared repository"
3800msgstr "设置为共享版本库"
3801
3802#: builtin/clone.c:79 builtin/clone.c:81
3803msgid "initialize submodules in the clone"
3804msgstr "在克隆时初始化子模组"
3805
3806#: builtin/clone.c:82 builtin/init-db.c:485
3807msgid "template-directory"
3808msgstr "模板目录"
3809
3810#: builtin/clone.c:83 builtin/init-db.c:486
3811msgid "directory from which templates will be used"
3812msgstr "模板目录将被使用"
3813
3814#: builtin/clone.c:85
3815msgid "reference repository"
3816msgstr "引用版本库"
3817
3818#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
3819msgid "name"
3820msgstr "名称"
3821
3822#: builtin/clone.c:87
3823msgid "use <name> instead of 'origin' to track upstream"
3824msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3825
3826#: builtin/clone.c:89
3827msgid "checkout <branch> instead of the remote's HEAD"
3828msgstr "检出<分支>而不是远程HEAD"
3829
3830#: builtin/clone.c:91
3831msgid "path to git-upload-pack on the remote"
3832msgstr "远程 git-upload-pack 路径"
3833
3834#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663
3835msgid "depth"
3836msgstr "深度"
3837
3838#: builtin/clone.c:93
3839msgid "create a shallow clone of that depth"
3840msgstr "创建一个指定深度的浅克隆"
3841
3842#: builtin/clone.c:95
3843msgid "clone only one branch, HEAD or --branch"
3844msgstr "只克隆一个分支、HEAD 或 --branch"
3845
3846#: builtin/clone.c:96 builtin/init-db.c:494
3847msgid "gitdir"
3848msgstr "git目录"
3849
3850#: builtin/clone.c:97 builtin/init-db.c:495
3851msgid "separate git dir from working tree"
3852msgstr "git目录和工作区分离"
3853
3854#: builtin/clone.c:98
3855msgid "key=value"
3856msgstr "key=value"
3857
3858#: builtin/clone.c:99
3859msgid "set config inside the new repository"
3860msgstr "在新版本库中设置配置信息"
3861
3862#: builtin/clone.c:252
3863#, c-format
3864msgid "reference repository '%s' is not a local repository."
3865msgstr "引用版本库 '%s' 不是一个本地版本库。"
3866
3867#: builtin/clone.c:315
3868#, c-format
3869msgid "failed to create directory '%s'"
3870msgstr "无法创建目录 '%s'"
3871
3872#: builtin/clone.c:317 builtin/diff.c:77
3873#, c-format
3874msgid "failed to stat '%s'"
3875msgstr "无法枚举 '%s' 状态"
3876
3877#: builtin/clone.c:319
3878#, c-format
3879msgid "%s exists and is not a directory"
3880msgstr "%s 存在且不是一个目录"
3881
3882#: builtin/clone.c:333
3883#, c-format
3884msgid "failed to stat %s\n"
3885msgstr "无法枚举 %s 状态\n"
3886
3887#: builtin/clone.c:355
3888#, c-format
3889msgid "failed to create link '%s'"
3890msgstr "无法创建链接 '%s'"
3891
3892#: builtin/clone.c:359
3893#, c-format
3894msgid "failed to copy file to '%s'"
3895msgstr "无法拷贝文件至 '%s'"
3896
3897#: builtin/clone.c:382 builtin/clone.c:559
3898#, c-format
3899msgid "done.\n"
3900msgstr "完成。\n"
3901
3902#: builtin/clone.c:395
3903msgid ""
3904"Clone succeeded, but checkout failed.\n"
3905"You can inspect what was checked out with 'git status'\n"
3906"and retry the checkout with 'git checkout -f HEAD'\n"
3907msgstr ""
3908"克隆成功,但是检出失败。\n"
3909"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3910"'git checkout -f HEAD' 重试\n"
3911
3912#: builtin/clone.c:474
3913#, c-format
3914msgid "Could not find remote branch %s to clone."
3915msgstr "不能发现要克隆的远程分支 %s。"
3916
3917#: builtin/clone.c:554
3918#, c-format
3919msgid "Checking connectivity... "
3920msgstr "检查连接... "
3921
3922#: builtin/clone.c:557
3923msgid "remote did not send all necessary objects"
3924msgstr "远程没有发送所有必须的对象"
3925
3926#: builtin/clone.c:620
3927msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3928msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3929
3930#: builtin/clone.c:651
3931msgid "unable to checkout working tree"
3932msgstr "不能检出工作区"
3933
3934#: builtin/clone.c:759
3935msgid "Too many arguments."
3936msgstr "太多参数。"
3937
3938#: builtin/clone.c:763
3939msgid "You must specify a repository to clone."
3940msgstr "您必须指定一个版本库来克隆。"
3941
3942#: builtin/clone.c:774
3943#, c-format
3944msgid "--bare and --origin %s options are incompatible."
3945msgstr "--bare 和 --origin %s 选项不兼容。"
3946
3947#: builtin/clone.c:777
3948msgid "--bare and --separate-git-dir are incompatible."
3949msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3950
3951#: builtin/clone.c:790
3952#, c-format
3953msgid "repository '%s' does not exist"
3954msgstr "版本库 '%s' 不存在"
3955
3956#: builtin/clone.c:795
3957msgid "--depth is ignored in local clones; use file:// instead."
3958msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3959
3960#: builtin/clone.c:797
3961msgid "--local is ignored"
3962msgstr "--local 被忽略"
3963
3964#: builtin/clone.c:807
3965#, c-format
3966msgid "destination path '%s' already exists and is not an empty directory."
3967msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
3968
3969#: builtin/clone.c:817
3970#, c-format
3971msgid "working tree '%s' already exists."
3972msgstr "工作区 '%s' 已经存在。"
3973
3974#: builtin/clone.c:830 builtin/clone.c:842
3975#, c-format
3976msgid "could not create leading directories of '%s'"
3977msgstr "不能为 '%s' 创建先导目录"
3978
3979#: builtin/clone.c:833
3980#, c-format
3981msgid "could not create work tree dir '%s'."
3982msgstr "不能为 '%s' 创建工作区目录。"
3983
3984#: builtin/clone.c:852
3985#, c-format
3986msgid "Cloning into bare repository '%s'...\n"
3987msgstr "克隆到裸版本库 '%s'...\n"
3988
3989#: builtin/clone.c:854
3990#, c-format
3991msgid "Cloning into '%s'...\n"
3992msgstr "正克隆到 '%s'...\n"
3993
3994#: builtin/clone.c:888
3995#, c-format
3996msgid "Don't know how to clone %s"
3997msgstr "不知道如何克隆 %s"
3998
3999#: builtin/clone.c:939 builtin/clone.c:947
4000#, c-format
4001msgid "Remote branch %s not found in upstream %s"
4002msgstr "远程分支 %s 在上游 %s 未发现"
4003
4004#: builtin/clone.c:950
4005msgid "You appear to have cloned an empty repository."
4006msgstr "您似乎克隆了一个空版本库。"
4007
4008#: builtin/column.c:9
4009msgid "git column [options]"
4010msgstr "git column [选项]"
4011
4012#: builtin/column.c:26
4013msgid "lookup config vars"
4014msgstr "查找配置变量"
4015
4016#: builtin/column.c:27 builtin/column.c:28
4017msgid "layout to use"
4018msgstr "要使用的布局"
4019
4020#: builtin/column.c:29
4021msgid "Maximum width"
4022msgstr "最大宽度"
4023
4024#: builtin/column.c:30
4025msgid "Padding space on left border"
4026msgstr "左边框的填充空间"
4027
4028#: builtin/column.c:31
4029msgid "Padding space on right border"
4030msgstr "右边框的填充空间"
4031
4032#: builtin/column.c:32
4033msgid "Padding space between columns"
4034msgstr "两列之间的填充空间"
4035
4036#: builtin/column.c:51
4037msgid "--command must be the first argument"
4038msgstr "--command 必须是第一个参数"
4039
4040#: builtin/commit.c:36
4041msgid "git commit [options] [--] <pathspec>..."
4042msgstr "git commit [选项] [--] <路径规则>..."
4043
4044#: builtin/commit.c:41
4045msgid "git status [options] [--] <pathspec>..."
4046msgstr "git status [选项] [--] <路径规则>..."
4047
4048#: builtin/commit.c:46
4049msgid ""
4050"Your name and email address were configured automatically based\n"
4051"on your username and hostname. Please check that they are accurate.\n"
4052"You can suppress this message by setting them explicitly:\n"
4053"\n"
4054" git config --global user.name \"Your Name\"\n"
4055" git config --global user.email you@example.com\n"
4056"\n"
4057"After doing this, you may fix the identity used for this commit with:\n"
4058"\n"
4059" git commit --amend --reset-author\n"
4060msgstr ""
4061"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4062"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
4063"\n"
4064" git config --global user.name \"Your Name\"\n"
4065" git config --global user.email you@example.com\n"
4066"\n"
4067"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4068"\n"
4069" git commit --amend --reset-author\n"
4070
4071#: builtin/commit.c:58
4072msgid ""
4073"You asked to amend the most recent commit, but doing so would make\n"
4074"it empty. You can repeat your command with --allow-empty, or you can\n"
4075"remove the commit entirely with \"git reset HEAD^\".\n"
4076msgstr ""
4077"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4078"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4079
4080#: builtin/commit.c:63
4081msgid ""
4082"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4083"If you wish to commit it anyway, use:\n"
4084"\n"
4085" git commit --allow-empty\n"
4086"\n"
4087msgstr ""
4088"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4089"也要提交,使用命令:\n"
4090"\n"
4091" git commit --allow-empty\n"
4092"\n"
4093
4094#: builtin/commit.c:70
4095msgid "Otherwise, please use 'git reset'\n"
4096msgstr "否则,请使用命令 'git reset'\n"
4097
4098#: builtin/commit.c:73
4099msgid ""
4100"If you wish to skip this commit, use:\n"
4101"\n"
4102" git reset\n"
4103"\n"
4104"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4105"the remaining commits.\n"
4106msgstr ""
4107"如果您想跳过这个提交,使用命令:\n"
4108"\n"
4109" git reset\n"
4110"\n"
4111"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4112"操作。\n"
4113
4114#: builtin/commit.c:287
4115msgid "failed to unpack HEAD tree object"
4116msgstr "无法解包 HEAD 树对象"
4117
4118#: builtin/commit.c:329
4119msgid "unable to create temporary index"
4120msgstr "不能创建临时索引"
4121
4122#: builtin/commit.c:335
4123msgid "interactive add failed"
4124msgstr "交互式添加失败"
4125
4126#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
4127msgid "unable to write new_index file"
4128msgstr "无法写 new_index 文件"
4129
4130#: builtin/commit.c:420
4131msgid "cannot do a partial commit during a merge."
4132msgstr "在合并过程中不能做部分提交。"
4133
4134#: builtin/commit.c:422
4135msgid "cannot do a partial commit during a cherry-pick."
4136msgstr "在拣选过程中不能做部分提交。"
4137
4138#: builtin/commit.c:432
4139msgid "cannot read the index"
4140msgstr "无法读取索引"
4141
4142#: builtin/commit.c:452
4143msgid "unable to write temporary index file"
4144msgstr "无法写临时索引文件"
4145
4146#: builtin/commit.c:543 builtin/commit.c:549
4147#, c-format
4148msgid "invalid commit: %s"
4149msgstr "无效的提交:%s"
4150
4151#: builtin/commit.c:571
4152msgid "malformed --author parameter"
4153msgstr "非法的 --author 参数"
4154
4155#: builtin/commit.c:591
4156#, c-format
4157msgid "Malformed ident string: '%s'"
4158msgstr "非法的身份字符串:'%s'"
4159
4160#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
4161#, c-format
4162msgid "could not lookup commit %s"
4163msgstr "不能查询提交 %s"
4164
4165#: builtin/commit.c:642 builtin/shortlog.c:273
4166#, c-format
4167msgid "(reading log message from standard input)\n"
4168msgstr "(正从标准输入中读取日志信息)\n"
4169
4170#: builtin/commit.c:644
4171msgid "could not read log from standard input"
4172msgstr "不能从标准输入中读取日志信息"
4173
4174#: builtin/commit.c:648
4175#, c-format
4176msgid "could not read log file '%s'"
4177msgstr "不能读取日志文件 '%s'"
4178
4179#: builtin/commit.c:654
4180msgid "commit has empty message"
4181msgstr "提交说明为空"
4182
4183#: builtin/commit.c:670
4184msgid "could not read MERGE_MSG"
4185msgstr "不能读取 MERGE_MSG"
4186
4187#: builtin/commit.c:674
4188msgid "could not read SQUASH_MSG"
4189msgstr "不能读取 SQUASH_MSG"
4190
4191#: builtin/commit.c:678
4192#, c-format
4193msgid "could not read '%s'"
4194msgstr "不能读取 '%s'"
4195
4196#: builtin/commit.c:749
4197msgid "could not write commit template"
4198msgstr "不能写提交模版"
4199
4200#: builtin/commit.c:760
4201#, c-format
4202msgid ""
4203"\n"
4204"It looks like you may be committing a merge.\n"
4205"If this is not correct, please remove the file\n"
4206"\t%s\n"
4207"and try again.\n"
4208msgstr ""
4209"\n"
4210"似乎您正在做一个合并提交。如果不对,请删除文件\n"
4211"\t%s\n"
4212"然后重试。\n"
4213
4214#: builtin/commit.c:765
4215#, c-format
4216msgid ""
4217"\n"
4218"It looks like you may be committing a cherry-pick.\n"
4219"If this is not correct, please remove the file\n"
4220"\t%s\n"
4221"and try again.\n"
4222msgstr ""
4223"\n"
4224"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4225"\t%s\n"
4226"然后重试。\n"
4227
4228#: builtin/commit.c:777
4229#, c-format
4230msgid ""
4231"Please enter the commit message for your changes. Lines starting\n"
4232"with '%c' will be ignored, and an empty message aborts the commit.\n"
4233msgstr ""
4234"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4235"说明将会终止提交。\n"
4236
4237#: builtin/commit.c:782
4238#, c-format
4239msgid ""
4240"Please enter the commit message for your changes. Lines starting\n"
4241"with '%c' will be kept; you may remove them yourself if you want to.\n"
4242"An empty message aborts the commit.\n"
4243msgstr ""
4244"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4245"也可以删除它们。一个空的提交说明将会终止提交。\n"
4246
4247# 译者:为保证在输出中对齐,注意调整句中空格!
4248#: builtin/commit.c:795
4249#, c-format
4250msgid "%sAuthor: %s"
4251msgstr "%s作者: %s"
4252
4253# 译者:为保证在输出中对齐,注意调整句中空格!
4254#: builtin/commit.c:802
4255#, c-format
4256msgid "%sCommitter: %s"
4257msgstr "%s提交者: %s"
4258
4259#: builtin/commit.c:822
4260msgid "Cannot read index"
4261msgstr "无法读取索引"
4262
4263#: builtin/commit.c:865
4264msgid "Error building trees"
4265msgstr "无法创建树对象"
4266
4267#: builtin/commit.c:880 builtin/tag.c:359
4268#, c-format
4269msgid "Please supply the message using either -m or -F option.\n"
4270msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4271
4272#: builtin/commit.c:982
4273#, c-format
4274msgid "No existing author found with '%s'"
4275msgstr "没有找到匹配 '%s' 的作者"
4276
4277#: builtin/commit.c:997 builtin/commit.c:1237
4278#, c-format
4279msgid "Invalid untracked files mode '%s'"
4280msgstr "无效的未追踪文件参数 '%s'"
4281
4282#: builtin/commit.c:1034
4283msgid "--long and -z are incompatible"
4284msgstr "--long 和 -z 选项不兼容"
4285
4286#: builtin/commit.c:1064
4287msgid "Using both --reset-author and --author does not make sense"
4288msgstr "同时使用 --reset-author 和 --author 没有意义"
4289
4290#: builtin/commit.c:1075
4291msgid "You have nothing to amend."
4292msgstr "您没有可修补的提交。"
4293
4294#: builtin/commit.c:1078
4295msgid "You are in the middle of a merge -- cannot amend."
4296msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4297
4298#: builtin/commit.c:1080
4299msgid "You are in the middle of a cherry-pick -- cannot amend."
4300msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4301
4302#: builtin/commit.c:1083
4303msgid "Options --squash and --fixup cannot be used together"
4304msgstr "选项 --squash 和 --fixup 不能同时使用"
4305
4306#: builtin/commit.c:1093
4307msgid "Only one of -c/-C/-F/--fixup can be used."
4308msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4309
4310#: builtin/commit.c:1095
4311msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4312msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4313
4314#: builtin/commit.c:1103
4315msgid "--reset-author can be used only with -C, -c or --amend."
4316msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4317
4318#: builtin/commit.c:1120
4319msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4320msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4321
4322#: builtin/commit.c:1122
4323msgid "No paths with --include/--only does not make sense."
4324msgstr "参数 --include/--only 不跟路径没有意义。"
4325
4326#: builtin/commit.c:1124
4327msgid "Clever... amending the last one with dirty index."
4328msgstr "聪明... 在索引不干净下修补最后的提交。"
4329
4330#: builtin/commit.c:1126
4331msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
4332msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
4333
4334#: builtin/commit.c:1136 builtin/tag.c:572
4335#, c-format
4336msgid "Invalid cleanup mode %s"
4337msgstr "无效的清理模式 %s"
4338
4339#: builtin/commit.c:1141
4340msgid "Paths with -a does not make sense."
4341msgstr "路径和 -a 选项同时使用没有意义。"
4342
4343#: builtin/commit.c:1251 builtin/commit.c:1482
4344msgid "show status concisely"
4345msgstr "以简洁的格式显示状态"
4346
4347#: builtin/commit.c:1253 builtin/commit.c:1484
4348msgid "show branch information"
4349msgstr "显示分支信息"
4350
4351#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460
4352msgid "machine-readable output"
4353msgstr "机器可读的输出"
4354
4355#: builtin/commit.c:1258 builtin/commit.c:1488
4356msgid "show status in long format (default)"
4357msgstr "以长格式显示状态(默认)"
4358
4359#: builtin/commit.c:1261 builtin/commit.c:1491
4360msgid "terminate entries with NUL"
4361msgstr "条目以NUL字符结尾"
4362
4363#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
4364#: builtin/fast-export.c:677 builtin/tag.c:459
4365msgid "mode"
4366msgstr "模式"
4367
4368#: builtin/commit.c:1264 builtin/commit.c:1494
4369msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4370msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4371
4372#: builtin/commit.c:1267
4373msgid "show ignored files"
4374msgstr "显示忽略的文件"
4375
4376#: builtin/commit.c:1268 parse-options.h:156
4377msgid "when"
4378msgstr "何时"
4379
4380#: builtin/commit.c:1269
4381msgid ""
4382"ignore changes to submodules, optional when: all, dirty, untracked. "
4383"(Default: all)"
4384msgstr ""
4385"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4386
4387#: builtin/commit.c:1271
4388msgid "list untracked files in columns"
4389msgstr "以列的方式显示未跟踪的文件"
4390
4391#: builtin/commit.c:1340
4392msgid "couldn't look up newly created commit"
4393msgstr "无法找到新创建的提交"
4394
4395#: builtin/commit.c:1342
4396msgid "could not parse newly created commit"
4397msgstr "不能解析新创建的提交"
4398
4399#: builtin/commit.c:1383
4400msgid "detached HEAD"
4401msgstr "分离头指针"
4402
4403# 译者:中文字符串拼接,可删除前导空格
4404#: builtin/commit.c:1385
4405msgid " (root-commit)"
4406msgstr "(根提交)"
4407
4408#: builtin/commit.c:1452
4409msgid "suppress summary after successful commit"
4410msgstr "提交成功后不显示概述信息"
4411
4412#: builtin/commit.c:1453
4413msgid "show diff in commit message template"
4414msgstr "在提交说明模板里显示差异"
4415
4416#: builtin/commit.c:1455
4417msgid "Commit message options"
4418msgstr "提交说明选项"
4419
4420#: builtin/commit.c:1456 builtin/tag.c:457
4421msgid "read message from file"
4422msgstr "从文件中读取提交说明"
4423
4424#: builtin/commit.c:1457
4425msgid "author"
4426msgstr "作者"
4427
4428#: builtin/commit.c:1457
4429msgid "override author for commit"
4430msgstr "提交时覆盖作者"
4431
4432#: builtin/commit.c:1458 builtin/gc.c:260
4433msgid "date"
4434msgstr "日期"
4435
4436#: builtin/commit.c:1458
4437msgid "override date for commit"
4438msgstr "提交时覆盖日期"
4439
4440#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405
4441#: builtin/notes.c:562 builtin/tag.c:455
4442msgid "message"
4443msgstr "说明"
4444
4445#: builtin/commit.c:1459
4446msgid "commit message"
4447msgstr "提交说明"
4448
4449#: builtin/commit.c:1460
4450msgid "reuse and edit message from specified commit"
4451msgstr "重用并编辑指定提交的提交说明"
4452
4453#: builtin/commit.c:1461
4454msgid "reuse message from specified commit"
4455msgstr "重用指定提交的提交说明"
4456
4457#: builtin/commit.c:1462
4458msgid "use autosquash formatted message to fixup specified commit"
4459msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4460
4461#: builtin/commit.c:1463
4462msgid "use autosquash formatted message to squash specified commit"
4463msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4464
4465#: builtin/commit.c:1464
4466msgid "the commit is authored by me now (used with -C/-c/--amend)"
4467msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4468
4469#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
4470msgid "add Signed-off-by:"
4471msgstr "添加 Signed-off-by: 签名"
4472
4473#: builtin/commit.c:1466
4474msgid "use specified template file"
4475msgstr "使用指定的模板文件"
4476
4477#: builtin/commit.c:1467
4478msgid "force edit of commit"
4479msgstr "强制编辑提交"
4480
4481# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4482#: builtin/commit.c:1468
4483msgid "default"
4484msgstr "default"
4485
4486#: builtin/commit.c:1468 builtin/tag.c:460
4487msgid "how to strip spaces and #comments from message"
4488msgstr "设置如何删除提交说明里的空格和#注释"
4489
4490#: builtin/commit.c:1469
4491msgid "include status in commit message template"
4492msgstr "在提交说明模板里包含状态信息"
4493
4494#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461
4495msgid "key id"
4496msgstr "key id"
4497
4498#: builtin/commit.c:1471 builtin/merge.c:231
4499msgid "GPG sign commit"
4500msgstr "GPG 提交签名"
4501
4502#. end commit message options
4503#: builtin/commit.c:1474
4504msgid "Commit contents options"
4505msgstr "提交内容选项"
4506
4507#: builtin/commit.c:1475
4508msgid "commit all changed files"
4509msgstr "提交所有改动的文件"
4510
4511#: builtin/commit.c:1476
4512msgid "add specified files to index for commit"
4513msgstr "添加指定的文件到索引区等待提交"
4514
4515#: builtin/commit.c:1477
4516msgid "interactively add files"
4517msgstr "交互式添加文件"
4518
4519#: builtin/commit.c:1478
4520msgid "interactively add changes"
4521msgstr "交互式添加变更"
4522
4523#: builtin/commit.c:1479
4524msgid "commit only specified files"
4525msgstr "只提交指定的文件"
4526
4527#: builtin/commit.c:1480
4528msgid "bypass pre-commit hook"
4529msgstr "绕过 pre-commit 钩子"
4530
4531#: builtin/commit.c:1481
4532msgid "show what would be committed"
4533msgstr "显示将要提交的内容"
4534
4535#: builtin/commit.c:1492
4536msgid "amend previous commit"
4537msgstr "修改先前的提交"
4538
4539#: builtin/commit.c:1493
4540msgid "bypass post-rewrite hook"
4541msgstr "绕过 post-rewrite 钩子"
4542
4543#: builtin/commit.c:1498
4544msgid "ok to record an empty change"
4545msgstr "允许一个空提交"
4546
4547#: builtin/commit.c:1500
4548msgid "ok to record a change with an empty message"
4549msgstr "允许空的提交说明"
4550
4551#: builtin/commit.c:1529
4552msgid "could not parse HEAD commit"
4553msgstr "不能解析 HEAD 提交"
4554
4555#: builtin/commit.c:1567 builtin/merge.c:525
4556#, c-format
4557msgid "could not open '%s' for reading"
4558msgstr "不能为读入打开 '%s'"
4559
4560#: builtin/commit.c:1574
4561#, c-format
4562msgid "Corrupt MERGE_HEAD file (%s)"
4563msgstr "损坏的 MERGE_HEAD 文件(%s)"
4564
4565#: builtin/commit.c:1581
4566msgid "could not read MERGE_MODE"
4567msgstr "不能读取 MERGE_MODE"
4568
4569#: builtin/commit.c:1600
4570#, c-format
4571msgid "could not read commit message: %s"
4572msgstr "不能读取提交说明:%s"
4573
4574#: builtin/commit.c:1614
4575#, c-format
4576msgid "Aborting commit; you did not edit the message.\n"
4577msgstr "终止提交;您未更改来自模版的提交说明。\n"
4578
4579#: builtin/commit.c:1619
4580#, c-format
4581msgid "Aborting commit due to empty commit message.\n"
4582msgstr "终止提交因为提交说明为空。\n"
4583
4584#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886
4585msgid "failed to write commit object"
4586msgstr "无法写提交对象"
4587
4588#: builtin/commit.c:1655
4589msgid "cannot lock HEAD ref"
4590msgstr "无法锁定 HEAD 引用"
4591
4592#: builtin/commit.c:1659
4593msgid "cannot update HEAD ref"
4594msgstr "无法更新 HEAD 引用"
4595
4596#: builtin/commit.c:1670
4597msgid ""
4598"Repository has been updated, but unable to write\n"
4599"new_index file. Check that disk is not full or quota is\n"
4600"not exceeded, and then \"git reset HEAD\" to recover."
4601msgstr ""
4602"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4603"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4604
4605#: builtin/config.c:8
4606msgid "git config [options]"
4607msgstr "git config [选项]"
4608
4609#: builtin/config.c:54
4610msgid "Config file location"
4611msgstr "配置文件位置"
4612
4613#: builtin/config.c:55
4614msgid "use global config file"
4615msgstr "使用全局配置文件"
4616
4617#: builtin/config.c:56
4618msgid "use system config file"
4619msgstr "使用系统级配置文件"
4620
4621#: builtin/config.c:57
4622msgid "use repository config file"
4623msgstr "使用版本库级配置文件"
4624
4625#: builtin/config.c:58
4626msgid "use given config file"
4627msgstr "使用指定的配置文件"
4628
4629#: builtin/config.c:59
4630msgid "blob-id"
4631msgstr "数据对象ID"
4632
4633#: builtin/config.c:59
4634msgid "read config from given blob object"
4635msgstr "从给定的数据对象读取配置"
4636
4637#: builtin/config.c:60
4638msgid "Action"
4639msgstr "操作"
4640
4641#: builtin/config.c:61
4642msgid "get value: name [value-regex]"
4643msgstr "获取值:name [value-regex]"
4644
4645#: builtin/config.c:62
4646msgid "get all values: key [value-regex]"
4647msgstr "获得所有的值:key [value-regex]"
4648
4649#: builtin/config.c:63
4650msgid "get values for regexp: name-regex [value-regex]"
4651msgstr "根据正则表达式获得值:name-regex [value-regex]"
4652
4653#: builtin/config.c:64
4654msgid "get value specific for the URL: section[.var] URL"
4655msgstr "获得 URL 取值:section[.var] URL"
4656
4657#: builtin/config.c:65
4658msgid "replace all matching variables: name value [value_regex]"
4659msgstr "替换所有匹配的变量:name value [value_regex]"
4660
4661#: builtin/config.c:66
4662msgid "add a new variable: name value"
4663msgstr "添加一个新的变量:name value"
4664
4665#: builtin/config.c:67
4666msgid "remove a variable: name [value-regex]"
4667msgstr "删除一个变量:name [value-regex]"
4668
4669#: builtin/config.c:68
4670msgid "remove all matches: name [value-regex]"
4671msgstr "删除所有匹配项:name [value-regex]"
4672
4673#: builtin/config.c:69
4674msgid "rename section: old-name new-name"
4675msgstr "重命名小节:old-name new-name"
4676
4677#: builtin/config.c:70
4678msgid "remove a section: name"
4679msgstr "删除一个小节:name"
4680
4681#: builtin/config.c:71
4682msgid "list all"
4683msgstr "列出所有"
4684
4685#: builtin/config.c:72
4686msgid "open an editor"
4687msgstr "打开一个编辑器"
4688
4689#: builtin/config.c:73 builtin/config.c:74
4690msgid "slot"
4691msgstr "slot"
4692
4693#: builtin/config.c:73
4694msgid "find the color configured: [default]"
4695msgstr "找到配置的颜色:[默认]"
4696
4697#: builtin/config.c:74
4698msgid "find the color setting: [stdout-is-tty]"
4699msgstr "找到颜色设置:[stdout-is-tty]"
4700
4701#: builtin/config.c:75
4702msgid "Type"
4703msgstr "类型"
4704
4705#: builtin/config.c:76
4706msgid "value is \"true\" or \"false\""
4707msgstr "值是 \"true\" 或 \"false\""
4708
4709#: builtin/config.c:77
4710msgid "value is decimal number"
4711msgstr "值是十进制数"
4712
4713#: builtin/config.c:78
4714msgid "value is --bool or --int"
4715msgstr "值是 --bool or --int"
4716
4717#: builtin/config.c:79
4718msgid "value is a path (file or directory name)"
4719msgstr "值是一个路径(文件或目录名)"
4720
4721#: builtin/config.c:80
4722msgid "Other"
4723msgstr "其它"
4724
4725#: builtin/config.c:81
4726msgid "terminate values with NUL byte"
4727msgstr "终止值是NUL字节"
4728
4729#: builtin/config.c:82
4730msgid "respect include directives on lookup"
4731msgstr "查询时参照 include 指令递归查找"
4732
4733#: builtin/count-objects.c:82
4734msgid "git count-objects [-v] [-H | --human-readable]"
4735msgstr "git count-objects [-v] [-H | --human-readable]"
4736
4737#: builtin/count-objects.c:97
4738msgid "print sizes in human readable format"
4739msgstr "以用户可读的格式显示大小"
4740
4741#: builtin/describe.c:16
4742msgid "git describe [options] <commit-ish>*"
4743msgstr "git describe [选项] <提交号>*"
4744
4745#: builtin/describe.c:17
4746msgid "git describe [options] --dirty"
4747msgstr "git describe [选项] --dirty"
4748
4749#: builtin/describe.c:237
4750#, c-format
4751msgid "annotated tag %s not available"
4752msgstr "注释 tag %s 无效"
4753
4754#: builtin/describe.c:241
4755#, c-format
4756msgid "annotated tag %s has no embedded name"
4757msgstr "注释 tag %s 没有嵌入名称"
4758
4759#: builtin/describe.c:243
4760#, c-format
4761msgid "tag '%s' is really '%s' here"
4762msgstr "tag '%s' 的确是在 '%s'"
4763
4764#: builtin/describe.c:270
4765#, c-format
4766msgid "Not a valid object name %s"
4767msgstr "不是一个有效的对象名 %s"
4768
4769#: builtin/describe.c:273
4770#, c-format
4771msgid "%s is not a valid '%s' object"
4772msgstr "%s 不是一个有效的 '%s' 对象"
4773
4774#: builtin/describe.c:290
4775#, c-format
4776msgid "no tag exactly matches '%s'"
4777msgstr "没有 tag 准确匹配 '%s'"
4778
4779#: builtin/describe.c:292
4780#, c-format
4781msgid "searching to describe %s\n"
4782msgstr "搜索描述 %s\n"
4783
4784#: builtin/describe.c:332
4785#, c-format
4786msgid "finished search at %s\n"
4787msgstr "完成搜索 %s\n"
4788
4789#: builtin/describe.c:359
4790#, c-format
4791msgid ""
4792"No annotated tags can describe '%s'.\n"
4793"However, there were unannotated tags: try --tags."
4794msgstr ""
4795"没有注释 tag 能描述 '%s'。\n"
4796"然而,有非注释 tag:尝试 --tags。"
4797
4798#: builtin/describe.c:363
4799#, c-format
4800msgid ""
4801"No tags can describe '%s'.\n"
4802"Try --always, or create some tags."
4803msgstr ""
4804"没有注释 tag 能描述 '%s'。\n"
4805"尝试 --always,或者创建一些 tag。"
4806
4807#: builtin/describe.c:384
4808#, c-format
4809msgid "traversed %lu commits\n"
4810msgstr "已遍历 %lu 个提交\n"
4811
4812#: builtin/describe.c:387
4813#, c-format
4814msgid ""
4815"more than %i tags found; listed %i most recent\n"
4816"gave up search at %s\n"
4817msgstr ""
4818"发现多于 %i 个 tag,列出最近的 %i 个\n"
4819"在 %s 放弃搜索\n"
4820
4821#: builtin/describe.c:409
4822msgid "find the tag that comes after the commit"
4823msgstr "寻找提交之后的 tag(用于描述提交)"
4824
4825#: builtin/describe.c:410
4826msgid "debug search strategy on stderr"
4827msgstr "在标准错误上调试搜索策略"
4828
4829#: builtin/describe.c:411
4830msgid "use any ref"
4831msgstr "使用任意引用"
4832
4833#: builtin/describe.c:412
4834msgid "use any tag, even unannotated"
4835msgstr "使用任意 tag,即使未带注解"
4836
4837#: builtin/describe.c:413
4838msgid "always use long format"
4839msgstr "始终使用长提交号格式"
4840
4841#: builtin/describe.c:414
4842msgid "only follow first parent"
4843msgstr "只跟随第一个父提交"
4844
4845#: builtin/describe.c:417
4846msgid "only output exact matches"
4847msgstr "只输出精确匹配"
4848
4849#: builtin/describe.c:419
4850msgid "consider <n> most recent tags (default: 10)"
4851msgstr "考虑最近 <n> 个 tags(默认:10)"
4852
4853#: builtin/describe.c:421
4854msgid "only consider tags matching <pattern>"
4855msgstr "只考虑匹配 <模式> 的 tags"
4856
4857#: builtin/describe.c:423 builtin/name-rev.c:322
4858msgid "show abbreviated commit object as fallback"
4859msgstr "显示简写的提交号作为后备"
4860
4861#: builtin/describe.c:424
4862msgid "mark"
4863msgstr "标记"
4864
4865#: builtin/describe.c:425
4866msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4867msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
4868
4869#: builtin/describe.c:443
4870msgid "--long is incompatible with --abbrev=0"
4871msgstr "--long 与 --abbrev=0 不兼容"
4872
4873#: builtin/describe.c:469
4874msgid "No names found, cannot describe anything."
4875msgstr "没有发现名称,无法描述任何东西。"
4876
4877#: builtin/describe.c:489
4878msgid "--dirty is incompatible with commit-ishes"
4879msgstr "--dirty 不能与提交同时使用"
4880
4881#: builtin/diff.c:79
4882#, c-format
4883msgid "'%s': not a regular file or symlink"
4884msgstr "'%s':不是一个正规文件或符号链接"
4885
4886#: builtin/diff.c:230
4887#, c-format
4888msgid "invalid option: %s"
4889msgstr "无效选项:%s"
4890
4891#: builtin/diff.c:307
4892msgid "Not a git repository"
4893msgstr "不是一个 git 版本库"
4894
4895#: builtin/diff.c:350
4896#, c-format
4897msgid "invalid object '%s' given."
4898msgstr "提供了无效对象 '%s'。"
4899
4900#: builtin/diff.c:359
4901#, c-format
4902msgid "more than two blobs given: '%s'"
4903msgstr "提供了超过两个数据(blob)对象:'%s'"
4904
4905#: builtin/diff.c:366
4906#, c-format
4907msgid "unhandled object '%s' given."
4908msgstr "提供了无法处理的对象 '%s'。"
4909
4910#: builtin/fast-export.c:22
4911msgid "git fast-export [rev-list-opts]"
4912msgstr "git fast-export [rev-list-opts]"
4913
4914#: builtin/fast-export.c:673
4915msgid "show progress after <n> objects"
4916msgstr "在 <n> 个对象之后显示进度"
4917
4918#: builtin/fast-export.c:675
4919msgid "select handling of signed tags"
4920msgstr "选择如何处理签名 tags"
4921
4922#: builtin/fast-export.c:678
4923msgid "select handling of tags that tag filtered objects"
4924msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
4925
4926#: builtin/fast-export.c:681
4927msgid "Dump marks to this file"
4928msgstr "把标记存储到这个文件"
4929
4930#: builtin/fast-export.c:683
4931msgid "Import marks from this file"
4932msgstr "从这个文件导入标记"
4933
4934#: builtin/fast-export.c:685
4935msgid "Fake a tagger when tags lack one"
4936msgstr "当 tags 缺少标记者字段时,假装提供一个"
4937
4938#: builtin/fast-export.c:687
4939msgid "Output full tree for each commit"
4940msgstr "每次提交都输出整个树"
4941
4942#: builtin/fast-export.c:689
4943msgid "Use the done feature to terminate the stream"
4944msgstr "使用 done 功能来终止流"
4945
4946#: builtin/fast-export.c:690
4947msgid "Skip output of blob data"
4948msgstr "跳过数据对象的输出"
4949
4950#: builtin/fetch.c:20
4951msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4952msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
4953
4954#: builtin/fetch.c:21
4955msgid "git fetch [<options>] <group>"
4956msgstr "git fetch [<选项>] <组>"
4957
4958#: builtin/fetch.c:22
4959msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4960msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
4961
4962#: builtin/fetch.c:23
4963msgid "git fetch --all [<options>]"
4964msgstr "git fetch --all [<选项>]"
4965
4966#: builtin/fetch.c:74
4967msgid "fetch from all remotes"
4968msgstr "从所有的远程抓取"
4969
4970#: builtin/fetch.c:76
4971msgid "append to .git/FETCH_HEAD instead of overwriting"
4972msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
4973
4974#: builtin/fetch.c:78
4975msgid "path to upload pack on remote end"
4976msgstr "上传包到远程的路径"
4977
4978#: builtin/fetch.c:79
4979msgid "force overwrite of local branch"
4980msgstr "强制覆盖本地分支"
4981
4982#: builtin/fetch.c:81
4983msgid "fetch from multiple remotes"
4984msgstr "从多个远程抓取"
4985
4986#: builtin/fetch.c:83
4987msgid "fetch all tags and associated objects"
4988msgstr "抓取所有的 tags 和关联对象"
4989
4990#: builtin/fetch.c:85
4991msgid "do not fetch all tags (--no-tags)"
4992msgstr "不抓取任何 tags (--no-tags)"
4993
4994#: builtin/fetch.c:87
4995msgid "prune remote-tracking branches no longer on remote"
4996msgstr "清除远程已经不存在的分支的跟踪分支"
4997
4998# 译者:可选值,不能翻译
4999#: builtin/fetch.c:88
5000msgid "on-demand"
5001msgstr "on-demand"
5002
5003#: builtin/fetch.c:89
5004msgid "control recursive fetching of submodules"
5005msgstr "控制子模组的递归抓取"
5006
5007#: builtin/fetch.c:93
5008msgid "keep downloaded pack"
5009msgstr "保持下载包"
5010
5011#: builtin/fetch.c:95
5012msgid "allow updating of HEAD ref"
5013msgstr "允许更新 HEAD 引用"
5014
5015#: builtin/fetch.c:98
5016msgid "deepen history of shallow clone"
5017msgstr "深化浅克隆的历史"
5018
5019#: builtin/fetch.c:100
5020msgid "convert to a complete repository"
5021msgstr "转换为一个完整的版本库"
5022
5023#: builtin/fetch.c:102 builtin/log.c:1197
5024msgid "dir"
5025msgstr "目录"
5026
5027#: builtin/fetch.c:103
5028msgid "prepend this to submodule path output"
5029msgstr "在子模组路径输出的前面加上此目录"
5030
5031#: builtin/fetch.c:106
5032msgid "default mode for recursion"
5033msgstr "递归的默认模式"
5034
5035#: builtin/fetch.c:236
5036msgid "Couldn't find remote ref HEAD"
5037msgstr "无法发现远程 HEAD 引用"
5038
5039#: builtin/fetch.c:290
5040#, c-format
5041msgid "object %s not found"
5042msgstr "对象 %s 未发现"
5043
5044#: builtin/fetch.c:295
5045msgid "[up to date]"
5046msgstr "[最新]"
5047
5048#: builtin/fetch.c:309
5049#, c-format
5050msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5051msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5052
5053#: builtin/fetch.c:310 builtin/fetch.c:396
5054msgid "[rejected]"
5055msgstr "[已拒绝]"
5056
5057#: builtin/fetch.c:321
5058msgid "[tag update]"
5059msgstr "[tag更新]"
5060
5061# 译者:注意保持前导空格
5062#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376
5063msgid " (unable to update local ref)"
5064msgstr " (不能更新本地引用)"
5065
5066#: builtin/fetch.c:341
5067msgid "[new tag]"
5068msgstr "[新tag]"
5069
5070#: builtin/fetch.c:344
5071msgid "[new branch]"
5072msgstr "[新分支]"
5073
5074#: builtin/fetch.c:347
5075msgid "[new ref]"
5076msgstr "[新引用]"
5077
5078#: builtin/fetch.c:392
5079msgid "unable to update local ref"
5080msgstr "不能更新本地引用"
5081
5082#: builtin/fetch.c:392
5083msgid "forced update"
5084msgstr "强制更新"
5085
5086#: builtin/fetch.c:398
5087msgid "(non-fast-forward)"
5088msgstr "(非快进式)"
5089
5090#: builtin/fetch.c:429 builtin/fetch.c:735
5091#, c-format
5092msgid "cannot open %s: %s\n"
5093msgstr "无法打开 %s:%s\n"
5094
5095#: builtin/fetch.c:438
5096#, c-format
5097msgid "%s did not send all necessary objects\n"
5098msgstr "%s 未发送所有必须的对象\n"
5099
5100#: builtin/fetch.c:537
5101#, c-format
5102msgid "From %.*s\n"
5103msgstr "来自 %.*s\n"
5104
5105#: builtin/fetch.c:548
5106#, c-format
5107msgid ""
5108"some local refs could not be updated; try running\n"
5109" 'git remote prune %s' to remove any old, conflicting branches"
5110msgstr ""
5111"一些本地引用不能被更新;尝试运行\n"
5112" 'git remote prune %s' 来删除旧的、有冲突的分支"
5113
5114# 译者:注意保持前导空格
5115#: builtin/fetch.c:598
5116#, c-format
5117msgid " (%s will become dangling)"
5118msgstr " (%s 将成为摇摆状态)"
5119
5120# 译者:注意保持前导空格
5121#: builtin/fetch.c:599
5122#, c-format
5123msgid " (%s has become dangling)"
5124msgstr " (%s 已成为摇摆状态)"
5125
5126#: builtin/fetch.c:606
5127msgid "[deleted]"
5128msgstr "[已删除]"
5129
5130#: builtin/fetch.c:607 builtin/remote.c:1055
5131msgid "(none)"
5132msgstr "(无)"
5133
5134#: builtin/fetch.c:725
5135#, c-format
5136msgid "Refusing to fetch into current branch %s of non-bare repository"
5137msgstr "拒绝获取到非裸版本库的当前分支 %s"
5138
5139#: builtin/fetch.c:744
5140#, c-format
5141msgid "Option \"%s\" value \"%s\" is not valid for %s"
5142msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5143
5144#: builtin/fetch.c:747
5145#, c-format
5146msgid "Option \"%s\" is ignored for %s\n"
5147msgstr "选项 \"%s\" 为 %s 所忽略\n"
5148
5149#: builtin/fetch.c:801
5150#, c-format
5151msgid "Don't know how to fetch from %s"
5152msgstr "不知道如何从 %s 获取"
5153
5154#: builtin/fetch.c:976
5155#, c-format
5156msgid "Fetching %s\n"
5157msgstr "正在获取 %s\n"
5158
5159#: builtin/fetch.c:978 builtin/remote.c:100
5160#, c-format
5161msgid "Could not fetch %s"
5162msgstr "不能获取 %s"
5163
5164#: builtin/fetch.c:997
5165msgid ""
5166"No remote repository specified. Please, specify either a URL or a\n"
5167"remote name from which new revisions should be fetched."
5168msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
5169
5170#: builtin/fetch.c:1020
5171msgid "You need to specify a tag name."
5172msgstr "您需要指定一个 tag 名称。"
5173
5174#: builtin/fetch.c:1068
5175msgid "--depth and --unshallow cannot be used together"
5176msgstr "--depth 和 --unshallow 不能同时使用"
5177
5178#: builtin/fetch.c:1070
5179msgid "--unshallow on a complete repository does not make sense"
5180msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5181
5182#: builtin/fetch.c:1089
5183msgid "fetch --all does not take a repository argument"
5184msgstr "fetch --all 不能带一个版本库参数"
5185
5186#: builtin/fetch.c:1091
5187msgid "fetch --all does not make sense with refspecs"
5188msgstr "fetch --all 带引用规则没有任何意义"
5189
5190#: builtin/fetch.c:1102
5191#, c-format
5192msgid "No such remote or remote group: %s"
5193msgstr "没有这样的远程或远程组:%s"
5194
5195#: builtin/fetch.c:1110
5196msgid "Fetching a group and specifying refspecs does not make sense"
5197msgstr "获取组并指定引用规则没有意义"
5198
5199#: builtin/fmt-merge-msg.c:13
5200msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5201msgstr ""
5202"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5203
5204#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
5205#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178
5206#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245
5207msgid "n"
5208msgstr "n"
5209
5210#: builtin/fmt-merge-msg.c:664
5211msgid "populate log with at most <n> entries from shortlog"
5212msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5213
5214#: builtin/fmt-merge-msg.c:667
5215msgid "alias for --log (deprecated)"
5216msgstr "参数 --log 的别名(已弃用)"
5217
5218#: builtin/fmt-merge-msg.c:670
5219msgid "text"
5220msgstr "文本"
5221
5222#: builtin/fmt-merge-msg.c:671
5223msgid "use <text> as start of message"
5224msgstr "使用 <文本> 作为提交说明的开始"
5225
5226#: builtin/fmt-merge-msg.c:672
5227msgid "file to read from"
5228msgstr "从文件中读取"
5229
5230#: builtin/for-each-ref.c:995
5231msgid "git for-each-ref [options] [<pattern>]"
5232msgstr "git for-each-ref [选项] [<模式>]"
5233
5234#: builtin/for-each-ref.c:1010
5235msgid "quote placeholders suitably for shells"
5236msgstr "引用占位符适用于 shells"
5237
5238#: builtin/for-each-ref.c:1012
5239msgid "quote placeholders suitably for perl"
5240msgstr "引用占位符适用于 perl"
5241
5242#: builtin/for-each-ref.c:1014
5243msgid "quote placeholders suitably for python"
5244msgstr "引用占位符适用于 python"
5245
5246#: builtin/for-each-ref.c:1016
5247msgid "quote placeholders suitably for tcl"
5248msgstr "引用占位符适用于 tcl"
5249
5250#: builtin/for-each-ref.c:1019
5251msgid "show only <n> matched refs"
5252msgstr "只显示 <n> 个匹配的引用"
5253
5254#: builtin/for-each-ref.c:1020
5255msgid "format"
5256msgstr "格式"
5257
5258#: builtin/for-each-ref.c:1020
5259msgid "format to use for the output"
5260msgstr "输出格式"
5261
5262#: builtin/for-each-ref.c:1021
5263msgid "key"
5264msgstr "key"
5265
5266#: builtin/for-each-ref.c:1022
5267msgid "field name to sort on"
5268msgstr "排序的字段名"
5269
5270#: builtin/fsck.c:607
5271msgid "git fsck [options] [<object>...]"
5272msgstr "git fsck [选项] [<对象>...]"
5273
5274#: builtin/fsck.c:613
5275msgid "show unreachable objects"
5276msgstr "显示不可达的对象"
5277
5278#: builtin/fsck.c:614
5279msgid "show dangling objects"
5280msgstr "显示摇摆的对象"
5281
5282#: builtin/fsck.c:615
5283msgid "report tags"
5284msgstr "报告 tags"
5285
5286#: builtin/fsck.c:616
5287msgid "report root nodes"
5288msgstr "报告根节点"
5289
5290#: builtin/fsck.c:617
5291msgid "make index objects head nodes"
5292msgstr "将索引亦作为检查的头节点"
5293
5294#: builtin/fsck.c:618
5295msgid "make reflogs head nodes (default)"
5296msgstr "将引用日志作为检查的头节点(默认)"
5297
5298#: builtin/fsck.c:619
5299msgid "also consider packs and alternate objects"
5300msgstr "也考虑包和备用对象"
5301
5302#: builtin/fsck.c:620
5303msgid "enable more strict checking"
5304msgstr "启用更严格的检查"
5305
5306#: builtin/fsck.c:622
5307msgid "write dangling objects in .git/lost-found"
5308msgstr "将摇摆对象写入 .git/lost-found 中"
5309
5310#: builtin/fsck.c:623 builtin/prune.c:134
5311msgid "show progress"
5312msgstr "显示进度"
5313
5314#: builtin/gc.c:23
5315msgid "git gc [options]"
5316msgstr "git gc [选项]"
5317
5318#: builtin/gc.c:79
5319#, c-format
5320msgid "Invalid %s: '%s'"
5321msgstr "无效的 %s:'%s'"
5322
5323#: builtin/gc.c:106
5324#, c-format
5325msgid "insanely long object directory %.*s"
5326msgstr "不正常的长对象目录 %.*s"
5327
5328#: builtin/gc.c:261
5329msgid "prune unreferenced objects"
5330msgstr "清除未引用的对象"
5331
5332#: builtin/gc.c:263
5333msgid "be more thorough (increased runtime)"
5334msgstr "更彻底(增加运行时间)"
5335
5336#: builtin/gc.c:264
5337msgid "enable auto-gc mode"
5338msgstr "启用自动垃圾回收模式"
5339
5340#: builtin/gc.c:265
5341msgid "force running gc even if there may be another gc running"
5342msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5343
5344#: builtin/gc.c:305
5345#, c-format
5346msgid ""
5347"Auto packing the repository for optimum performance. You may also\n"
5348"run \"git gc\" manually. See \"git help gc\" for more information.\n"
5349msgstr ""
5350"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
5351"参见 \"git help gc\" 以获取更多信息。\n"
5352
5353#. be quiet on --auto
5354#: builtin/gc.c:315
5355#, c-format
5356msgid ""
5357"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5358msgstr ""
5359"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5360
5361#: builtin/gc.c:340
5362msgid ""
5363"There are too many unreachable loose objects; run 'git prune' to remove them."
5364msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5365
5366#: builtin/grep.c:23
5367msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
5368msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
5369
5370#: builtin/grep.c:218
5371#, c-format
5372msgid "grep: failed to create thread: %s"
5373msgstr "grep:无法创建线程:%s"
5374
5375#: builtin/grep.c:365
5376#, c-format
5377msgid "Failed to chdir: %s"
5378msgstr "无法切换目录:%s"
5379
5380#: builtin/grep.c:443 builtin/grep.c:478
5381#, c-format
5382msgid "unable to read tree (%s)"
5383msgstr "无法读取树(%s)"
5384
5385#: builtin/grep.c:493
5386#, c-format
5387msgid "unable to grep from object of type %s"
5388msgstr "无法抓取来自于 %s 类型的对象"
5389
5390#: builtin/grep.c:551
5391#, c-format
5392msgid "switch `%c' expects a numerical value"
5393msgstr "开关 `%c' 期望一个数字值"
5394
5395#: builtin/grep.c:568
5396#, c-format
5397msgid "cannot open '%s'"
5398msgstr "不能打开 '%s'"
5399
5400#: builtin/grep.c:642
5401msgid "search in index instead of in the work tree"
5402msgstr "在索引区搜索而不是在工作区"
5403
5404#: builtin/grep.c:644
5405msgid "find in contents not managed by git"
5406msgstr "在未被 git 管理的内容中查找"
5407
5408# 译者:中文字符串拼接,可删除前导空格
5409#: builtin/grep.c:646
5410msgid "search in both tracked and untracked files"
5411msgstr "在跟踪和未跟踪的文件中搜索"
5412
5413#: builtin/grep.c:648
5414msgid "search also in ignored files"
5415msgstr "也在忽略的文件中搜索"
5416
5417#: builtin/grep.c:651
5418msgid "show non-matching lines"
5419msgstr "显示未匹配的行"
5420
5421#: builtin/grep.c:653
5422msgid "case insensitive matching"
5423msgstr "不区分大小写匹配"
5424
5425#: builtin/grep.c:655
5426msgid "match patterns only at word boundaries"
5427msgstr "只在单词边界匹配模式"
5428
5429#: builtin/grep.c:657
5430msgid "process binary files as text"
5431msgstr "把二进制文件当做文本处理"
5432
5433#: builtin/grep.c:659
5434msgid "don't match patterns in binary files"
5435msgstr "不在二进制文件中匹配模式"
5436
5437#: builtin/grep.c:662
5438msgid "process binary files with textconv filters"
5439msgstr "用 textconv 过滤器处理二进制文件"
5440
5441#: builtin/grep.c:664
5442msgid "descend at most <depth> levels"
5443msgstr "最多以指定的深度向下寻找"
5444
5445#: builtin/grep.c:668
5446msgid "use extended POSIX regular expressions"
5447msgstr "使用扩展的 POSIX 正则表达式"
5448
5449#: builtin/grep.c:671
5450msgid "use basic POSIX regular expressions (default)"
5451msgstr "使用基本的 POSIX 正则表达式(默认)"
5452
5453#: builtin/grep.c:674
5454msgid "interpret patterns as fixed strings"
5455msgstr "把模式解析为固定的字符串"
5456
5457#: builtin/grep.c:677
5458msgid "use Perl-compatible regular expressions"
5459msgstr "使用 Perl 兼容的正则表达式"
5460
5461#: builtin/grep.c:680
5462msgid "show line numbers"
5463msgstr "显示行号"
5464
5465#: builtin/grep.c:681
5466msgid "don't show filenames"
5467msgstr "不显示文件名"
5468
5469#: builtin/grep.c:682
5470msgid "show filenames"
5471msgstr "显示文件名"
5472
5473#: builtin/grep.c:684
5474msgid "show filenames relative to top directory"
5475msgstr "显示相对于顶级目录的文件名"
5476
5477#: builtin/grep.c:686
5478msgid "show only filenames instead of matching lines"
5479msgstr "只显示文件名而不显示匹配的行"
5480
5481#: builtin/grep.c:688
5482msgid "synonym for --files-with-matches"
5483msgstr "和 --files-with-matches 同义"
5484
5485#: builtin/grep.c:691
5486msgid "show only the names of files without match"
5487msgstr "只显示未匹配的文件名"
5488
5489#: builtin/grep.c:693
5490msgid "print NUL after filenames"
5491msgstr "在文件名后输出 NUL 字符"
5492
5493#: builtin/grep.c:695
5494msgid "show the number of matches instead of matching lines"
5495msgstr "显示总匹配行数,而不显示匹配的行"
5496
5497#: builtin/grep.c:696
5498msgid "highlight matches"
5499msgstr "高亮显示匹配项"
5500
5501#: builtin/grep.c:698
5502msgid "print empty line between matches from different files"
5503msgstr "在不同文件的匹配项之间打印空行"
5504
5505#: builtin/grep.c:700
5506msgid "show filename only once above matches from same file"
5507msgstr "只在同一文件的匹配项的上面显示一次文件名"
5508
5509#: builtin/grep.c:703
5510msgid "show <n> context lines before and after matches"
5511msgstr "显示匹配项前后的 <n> 行上下文"
5512
5513#: builtin/grep.c:706
5514msgid "show <n> context lines before matches"
5515msgstr "显示匹配项前 <n> 行上下文"
5516
5517#: builtin/grep.c:708
5518msgid "show <n> context lines after matches"
5519msgstr "显示匹配项后 <n> 行上下文"
5520
5521#: builtin/grep.c:709
5522msgid "shortcut for -C NUM"
5523msgstr "快捷键 -C 数字"
5524
5525#: builtin/grep.c:712
5526msgid "show a line with the function name before matches"
5527msgstr "在匹配的前面显示一行函数名"
5528
5529#: builtin/grep.c:714
5530msgid "show the surrounding function"
5531msgstr "显示所在函数的前后内容"
5532
5533#: builtin/grep.c:717
5534msgid "read patterns from file"
5535msgstr "从文件读取模式"
5536
5537#: builtin/grep.c:719
5538msgid "match <pattern>"
5539msgstr "匹配 <模式>"
5540
5541#: builtin/grep.c:721
5542msgid "combine patterns specified with -e"
5543msgstr "组合用 -e 参数设定的模式"
5544
5545#: builtin/grep.c:733
5546msgid "indicate hit with exit status without output"
5547msgstr "不输出,而用退出码标识命中状态"
5548
5549#: builtin/grep.c:735
5550msgid "show only matches from files that match all patterns"
5551msgstr "只显示匹配所有模式的文件中的匹配"
5552
5553#: builtin/grep.c:737
5554msgid "show parse tree for grep expression"
5555msgstr "显示 grep 表达式的解析树"
5556
5557#: builtin/grep.c:741
5558msgid "pager"
5559msgstr "分页"
5560
5561#: builtin/grep.c:741
5562msgid "show matching files in the pager"
5563msgstr "分页显示匹配的文件"
5564
5565#: builtin/grep.c:744
5566msgid "allow calling of grep(1) (ignored by this build)"
5567msgstr "允许调用 grep(1)(本次构建忽略)"
5568
5569#: builtin/grep.c:745 builtin/show-ref.c:187
5570msgid "show usage"
5571msgstr "显示用法"
5572
5573#: builtin/grep.c:812
5574msgid "no pattern given."
5575msgstr "未提供模式匹配。"
5576
5577#: builtin/grep.c:870
5578msgid "--open-files-in-pager only works on the worktree"
5579msgstr "--open-files-in-pager 仅用于工作区"
5580
5581#: builtin/grep.c:893
5582msgid "--cached or --untracked cannot be used with --no-index."
5583msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5584
5585#: builtin/grep.c:898
5586msgid "--no-index or --untracked cannot be used with revs."
5587msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5588
5589#: builtin/grep.c:901
5590msgid "--[no-]exclude-standard cannot be used for tracked contents."
5591msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5592
5593#: builtin/grep.c:909
5594msgid "both --cached and trees are given."
5595msgstr "同时给出了 --cached 和树对象。"
5596
5597#: builtin/hash-object.c:60
5598msgid ""
5599"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5600"<file>..."
5601msgstr ""
5602"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5603"<文件>..."
5604
5605#: builtin/hash-object.c:61
5606msgid "git hash-object --stdin-paths < <list-of-paths>"
5607msgstr "git hash-object --stdin-paths < <路径列表>"
5608
5609#: builtin/hash-object.c:72
5610msgid "type"
5611msgstr "类型"
5612
5613#: builtin/hash-object.c:72
5614msgid "object type"
5615msgstr "对象类型"
5616
5617#: builtin/hash-object.c:73
5618msgid "write the object into the object database"
5619msgstr "将对象写入对象数据库"
5620
5621#: builtin/hash-object.c:74
5622msgid "read the object from stdin"
5623msgstr "从标准输入读取对象"
5624
5625#: builtin/hash-object.c:76
5626msgid "store file as is without filters"
5627msgstr "原样存储文件不使用过滤器"
5628
5629#: builtin/hash-object.c:77
5630msgid "process file as it were from this path"
5631msgstr "处理文件并假设其来自于此路径"
5632
5633#: builtin/help.c:41
5634msgid "print all available commands"
5635msgstr "打印所有可用的命令"
5636
5637#: builtin/help.c:42
5638msgid "print list of useful guides"
5639msgstr "显示有用的指南列表"
5640
5641#: builtin/help.c:43
5642msgid "show man page"
5643msgstr "显示 man 手册"
5644
5645#: builtin/help.c:44
5646msgid "show manual in web browser"
5647msgstr "在 web 浏览器中显示手册"
5648
5649#: builtin/help.c:46
5650msgid "show info page"
5651msgstr "显示 info 手册"
5652
5653#: builtin/help.c:52
5654msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5655msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
5656
5657#: builtin/help.c:64
5658#, c-format
5659msgid "unrecognized help format '%s'"
5660msgstr "未能识别的帮助格式 '%s'"
5661
5662#: builtin/help.c:92
5663msgid "Failed to start emacsclient."
5664msgstr "无法启动 emacsclient。"
5665
5666#: builtin/help.c:105
5667msgid "Failed to parse emacsclient version."
5668msgstr "无法解析 emacsclient 版本。"
5669
5670#: builtin/help.c:113
5671#, c-format
5672msgid "emacsclient version '%d' too old (< 22)."
5673msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5674
5675#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
5676#, c-format
5677msgid "failed to exec '%s': %s"
5678msgstr "无法执行 '%s':%s"
5679
5680#: builtin/help.c:216
5681#, c-format
5682msgid ""
5683"'%s': path for unsupported man viewer.\n"
5684"Please consider using 'man.<tool>.cmd' instead."
5685msgstr ""
5686"'%s':不支持的 man 手册查看器的路径。\n"
5687"请使用 'man.<tool>.cmd'。"
5688
5689#: builtin/help.c:228
5690#, c-format
5691msgid ""
5692"'%s': cmd for supported man viewer.\n"
5693"Please consider using 'man.<tool>.path' instead."
5694msgstr ""
5695"'%s': 支持的 man 手册查看器命令。\n"
5696"请使用 'man.<tool>.path'。"
5697
5698#: builtin/help.c:349
5699#, c-format
5700msgid "'%s': unknown man viewer."
5701msgstr "'%s':未知的 man 查看器。"
5702
5703#: builtin/help.c:366
5704msgid "no man viewer handled the request"
5705msgstr "没有 man 查看器处理此请求"
5706
5707#: builtin/help.c:374
5708msgid "no info viewer handled the request"
5709msgstr "没有 info 查看器处理此请求"
5710
5711#: builtin/help.c:420
5712msgid "Defining attributes per path"
5713msgstr "定义路径的属性"
5714
5715#: builtin/help.c:421
5716msgid "A Git glossary"
5717msgstr "Git 词汇表"
5718
5719#: builtin/help.c:422
5720msgid "Specifies intentionally untracked files to ignore"
5721msgstr "忽略指定的未跟踪文件"
5722
5723#: builtin/help.c:423
5724msgid "Defining submodule properties"
5725msgstr "定义子模组属性"
5726
5727#: builtin/help.c:424
5728msgid "Specifying revisions and ranges for Git"
5729msgstr "指定 Git 的版本和版本范围"
5730
5731#: builtin/help.c:425
5732msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5733msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5734
5735#: builtin/help.c:426
5736msgid "An overview of recommended workflows with Git"
5737msgstr "Git 推荐的工作流概览"
5738
5739#: builtin/help.c:438
5740msgid "The common Git guides are:\n"
5741msgstr "最常用的 Git 向导有:\n"
5742
5743#: builtin/help.c:460 builtin/help.c:476
5744#, c-format
5745msgid "usage: %s%s"
5746msgstr "用法:%s%s"
5747
5748#: builtin/help.c:492
5749#, c-format
5750msgid "`git %s' is aliased to `%s'"
5751msgstr "`git %s' 是 `%s' 的别名"
5752
5753#: builtin/index-pack.c:184
5754#, c-format
5755msgid "object type mismatch at %s"
5756msgstr "%s 的对象类型不匹配"
5757
5758#: builtin/index-pack.c:204
5759msgid "object of unexpected type"
5760msgstr "意外的类型的对象"
5761
5762#: builtin/index-pack.c:244
5763#, c-format
5764msgid "cannot fill %d byte"
5765msgid_plural "cannot fill %d bytes"
5766msgstr[0] "无法填充 %d 字节"
5767msgstr[1] "无法填充 %d 字节"
5768
5769#: builtin/index-pack.c:254
5770msgid "early EOF"
5771msgstr "过早的文件结束符(EOF)"
5772
5773#: builtin/index-pack.c:255
5774msgid "read error on input"
5775msgstr "输入上的读错误"
5776
5777#: builtin/index-pack.c:267
5778msgid "used more bytes than were available"
5779msgstr "用掉了超过可用的字节"
5780
5781#: builtin/index-pack.c:274
5782msgid "pack too large for current definition of off_t"
5783msgstr "包太大超过了当前 off_t 的定义"
5784
5785#: builtin/index-pack.c:290
5786#, c-format
5787msgid "unable to create '%s'"
5788msgstr "不能创建 '%s'"
5789
5790#: builtin/index-pack.c:295
5791#, c-format
5792msgid "cannot open packfile '%s'"
5793msgstr "无法打开包文件 '%s'"
5794
5795#: builtin/index-pack.c:309
5796msgid "pack signature mismatch"
5797msgstr "包签名不匹配"
5798
5799#: builtin/index-pack.c:311
5800#, c-format
5801msgid "pack version %<PRIu32> unsupported"
5802msgstr "不支持包版本 %<PRIu32>"
5803
5804#: builtin/index-pack.c:329
5805#, c-format
5806msgid "pack has bad object at offset %lu: %s"
5807msgstr "包中有错误的对象位于 %lu:%s"
5808
5809#: builtin/index-pack.c:451
5810#, c-format
5811msgid "inflate returned %d"
5812msgstr "解压缩返回 %d"
5813
5814#: builtin/index-pack.c:500
5815msgid "offset value overflow for delta base object"
5816msgstr "偏移值覆盖了 delta 基准对象"
5817
5818#: builtin/index-pack.c:508
5819msgid "delta base offset is out of bound"
5820msgstr "delta 基准偏移越界"
5821
5822#: builtin/index-pack.c:516
5823#, c-format
5824msgid "unknown object type %d"
5825msgstr "未知对象类型 %d"
5826
5827#: builtin/index-pack.c:547
5828msgid "cannot pread pack file"
5829msgstr "无法读取包文件"
5830
5831#: builtin/index-pack.c:549
5832#, c-format
5833msgid "premature end of pack file, %lu byte missing"
5834msgid_plural "premature end of pack file, %lu bytes missing"
5835msgstr[0] "包文件过早结束,缺少 %lu 字节"
5836msgstr[1] "包文件过早结束,缺少 %lu 字节"
5837
5838#: builtin/index-pack.c:575
5839msgid "serious inflate inconsistency"
5840msgstr "解压缩严重的不一致"
5841
5842#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
5843#: builtin/index-pack.c:729 builtin/index-pack.c:738
5844#, c-format
5845msgid "SHA1 COLLISION FOUND WITH %s !"
5846msgstr "发现 %s 出现 SHA1 冲突!"
5847
5848#: builtin/index-pack.c:669 builtin/pack-objects.c:171
5849#: builtin/pack-objects.c:263
5850#, c-format
5851msgid "unable to read %s"
5852msgstr "不能读 %s"
5853
5854#: builtin/index-pack.c:735
5855#, c-format
5856msgid "cannot read existing object %s"
5857msgstr "不能读取现存对象 %s"
5858
5859#: builtin/index-pack.c:749
5860#, c-format
5861msgid "invalid blob object %s"
5862msgstr "无效的数据(blob)对象 %s"
5863
5864#: builtin/index-pack.c:763
5865#, c-format
5866msgid "invalid %s"
5867msgstr "无效的 %s"
5868
5869#: builtin/index-pack.c:766
5870msgid "Error in object"
5871msgstr "对象中出错"
5872
5873#: builtin/index-pack.c:768
5874#, c-format
5875msgid "Not all child objects of %s are reachable"
5876msgstr "%s 的所有子对象并非都可达"
5877
5878#: builtin/index-pack.c:839 builtin/index-pack.c:869
5879msgid "failed to apply delta"
5880msgstr "无法应用 delta"
5881
5882#: builtin/index-pack.c:1010
5883msgid "Receiving objects"
5884msgstr "接收对象中"
5885
5886#: builtin/index-pack.c:1010
5887msgid "Indexing objects"
5888msgstr "索引对象中"
5889
5890#: builtin/index-pack.c:1036
5891msgid "pack is corrupted (SHA1 mismatch)"
5892msgstr "包冲突(SHA1 不匹配)"
5893
5894#: builtin/index-pack.c:1041
5895msgid "cannot fstat packfile"
5896msgstr "不能枚举包文件状态"
5897
5898#: builtin/index-pack.c:1044
5899msgid "pack has junk at the end"
5900msgstr "包的结尾有垃圾数据"
5901
5902#: builtin/index-pack.c:1055
5903msgid "confusion beyond insanity in parse_pack_objects()"
5904msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5905
5906#: builtin/index-pack.c:1078
5907msgid "Resolving deltas"
5908msgstr "处理 delta 中"
5909
5910#: builtin/index-pack.c:1088
5911#, c-format
5912msgid "unable to create thread: %s"
5913msgstr "不能创建线程:%s"
5914
5915#: builtin/index-pack.c:1130
5916msgid "confusion beyond insanity"
5917msgstr "不可理喻"
5918
5919#: builtin/index-pack.c:1138
5920#, c-format
5921msgid "completed with %d local objects"
5922msgstr "完成 %d 个本地对象"
5923
5924#: builtin/index-pack.c:1148
5925#, c-format
5926msgid "Unexpected tail checksum for %s (disk corruption?)"
5927msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
5928
5929#: builtin/index-pack.c:1152
5930#, c-format
5931msgid "pack has %d unresolved delta"
5932msgid_plural "pack has %d unresolved deltas"
5933msgstr[0] "包有 %d 个未解决的 delta"
5934msgstr[1] "包有 %d 个未解决的 delta"
5935
5936#: builtin/index-pack.c:1177
5937#, c-format
5938msgid "unable to deflate appended object (%d)"
5939msgstr "不能压缩附加对象(%d)"
5940
5941#: builtin/index-pack.c:1256
5942#, c-format
5943msgid "local object %s is corrupt"
5944msgstr "本地对象 %s 已损坏"
5945
5946#: builtin/index-pack.c:1280
5947msgid "error while closing pack file"
5948msgstr "关闭包文件时出错"
5949
5950#: builtin/index-pack.c:1293
5951#, c-format
5952msgid "cannot write keep file '%s'"
5953msgstr "无法写保留文件 '%s'"
5954
5955#: builtin/index-pack.c:1301
5956#, c-format
5957msgid "cannot close written keep file '%s'"
5958msgstr "无法关闭保留文件 '%s'"
5959
5960#: builtin/index-pack.c:1314
5961msgid "cannot store pack file"
5962msgstr "无法存储包文件"
5963
5964#: builtin/index-pack.c:1325
5965msgid "cannot store index file"
5966msgstr "无法存储索引文件"
5967
5968#: builtin/index-pack.c:1358
5969#, c-format
5970msgid "bad pack.indexversion=%<PRIu32>"
5971msgstr "坏的 pack.indexversion=%<PRIu32>"
5972
5973#: builtin/index-pack.c:1364
5974#, c-format
5975msgid "invalid number of threads specified (%d)"
5976msgstr "指定的线程数无效(%d)"
5977
5978#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
5979#, c-format
5980msgid "no threads support, ignoring %s"
5981msgstr "没有线程支持,忽略 %s"
5982
5983#: builtin/index-pack.c:1426
5984#, c-format
5985msgid "Cannot open existing pack file '%s'"
5986msgstr "无法打开现存包文件 '%s'"
5987
5988#: builtin/index-pack.c:1428
5989#, c-format
5990msgid "Cannot open existing pack idx file for '%s'"
5991msgstr "无法为 %s 打开包索引文件"
5992
5993#: builtin/index-pack.c:1475
5994#, c-format
5995msgid "non delta: %d object"
5996msgid_plural "non delta: %d objects"
5997msgstr[0] "非 delta:%d 个对象"
5998msgstr[1] "非 delta:%d 个对象"
5999
6000#: builtin/index-pack.c:1482
6001#, c-format
6002msgid "chain length = %d: %lu object"
6003msgid_plural "chain length = %d: %lu objects"
6004msgstr[0] "链长 = %d: %lu 对象"
6005msgstr[1] "链长 = %d: %lu 对象"
6006
6007#: builtin/index-pack.c:1510
6008msgid "Cannot come back to cwd"
6009msgstr "无法返回当前工作目录"
6010
6011#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
6012#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
6013#, c-format
6014msgid "bad %s"
6015msgstr "错误选项 %s"
6016
6017#: builtin/index-pack.c:1591
6018msgid "--fix-thin cannot be used without --stdin"
6019msgstr "--fix-thin 不能和 --stdin 同时使用"
6020
6021#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
6022#, c-format
6023msgid "packfile name '%s' does not end with '.pack'"
6024msgstr "包名 '%s' 没有以 '.pack' 结尾"
6025
6026#: builtin/index-pack.c:1614
6027msgid "--verify with no packfile name given"
6028msgstr "--verify 没有提供包名参数"
6029
6030#: builtin/init-db.c:35
6031#, c-format
6032msgid "Could not make %s writable by group"
6033msgstr "不能设置 %s 为组可写"
6034
6035#: builtin/init-db.c:62
6036#, c-format
6037msgid "insanely long template name %s"
6038msgstr "太长的模版名 %s"
6039
6040#: builtin/init-db.c:67
6041#, c-format
6042msgid "cannot stat '%s'"
6043msgstr "不能枚举 '%s' 状态"
6044
6045#: builtin/init-db.c:73
6046#, c-format
6047msgid "cannot stat template '%s'"
6048msgstr "不能枚举模版 '%s' 状态"
6049
6050#: builtin/init-db.c:80
6051#, c-format
6052msgid "cannot opendir '%s'"
6053msgstr "不能打开目录 '%s'"
6054
6055#: builtin/init-db.c:97
6056#, c-format
6057msgid "cannot readlink '%s'"
6058msgstr "不能读取链接 '%s'"
6059
6060#: builtin/init-db.c:99
6061#, c-format
6062msgid "insanely long symlink %s"
6063msgstr "太长的符号链接 %s"
6064
6065#: builtin/init-db.c:102
6066#, c-format
6067msgid "cannot symlink '%s' '%s'"
6068msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6069
6070#: builtin/init-db.c:106
6071#, c-format
6072msgid "cannot copy '%s' to '%s'"
6073msgstr "不能拷贝 '%s' 至 '%s'"
6074
6075#: builtin/init-db.c:110
6076#, c-format
6077msgid "ignoring template %s"
6078msgstr "忽略模版 %s"
6079
6080#: builtin/init-db.c:133
6081#, c-format
6082msgid "insanely long template path %s"
6083msgstr "太长的模版路径 %s"
6084
6085#: builtin/init-db.c:141
6086#, c-format
6087msgid "templates not found %s"
6088msgstr "模版未找到 %s"
6089
6090#: builtin/init-db.c:154
6091#, c-format
6092msgid "not copying templates of a wrong format version %d from '%s'"
6093msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6094
6095#: builtin/init-db.c:192
6096#, c-format
6097msgid "insane git directory %s"
6098msgstr "不正常的 git 目录 %s"
6099
6100#: builtin/init-db.c:323 builtin/init-db.c:326
6101#, c-format
6102msgid "%s already exists"
6103msgstr "%s 已经存在"
6104
6105#: builtin/init-db.c:355
6106#, c-format
6107msgid "unable to handle file type %d"
6108msgstr "不能处理 %d 类型的文件"
6109
6110#: builtin/init-db.c:358
6111#, c-format
6112msgid "unable to move %s to %s"
6113msgstr "不能移动 %s 至 %s"
6114
6115#.
6116#. * TRANSLATORS: The first '%s' is either "Reinitialized
6117#. * existing" or "Initialized empty", the second " shared" or
6118#. * "", and the last '%s%s' is the verbatim directory name.
6119#.
6120#: builtin/init-db.c:420
6121#, c-format
6122msgid "%s%s Git repository in %s%s\n"
6123msgstr "%s%s Git 版本库于 %s%s\n"
6124
6125#: builtin/init-db.c:421
6126msgid "Reinitialized existing"
6127msgstr "重新初始化现存的"
6128
6129#: builtin/init-db.c:421
6130msgid "Initialized empty"
6131msgstr "初始化空的"
6132
6133# 译者:中文字符串拼接,可删除前导空格
6134#: builtin/init-db.c:422
6135msgid " shared"
6136msgstr "共享"
6137
6138#: builtin/init-db.c:441
6139msgid "cannot tell cwd"
6140msgstr "无法获知当前路径"
6141
6142#: builtin/init-db.c:467
6143msgid ""
6144"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6145"shared[=<permissions>]] [directory]"
6146msgstr ""
6147"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6148"[目录]"
6149
6150#: builtin/init-db.c:490
6151msgid "permissions"
6152msgstr "权限"
6153
6154#: builtin/init-db.c:491
6155msgid "specify that the git repository is to be shared amongst several users"
6156msgstr "指定 git 版本库是多个用户之间共享的"
6157
6158#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155
6159msgid "be quiet"
6160msgstr "保持安静"
6161
6162#: builtin/init-db.c:522 builtin/init-db.c:529
6163#, c-format
6164msgid "cannot mkdir %s"
6165msgstr "不能创建目录 %s"
6166
6167#: builtin/init-db.c:533
6168#, c-format
6169msgid "cannot chdir to %s"
6170msgstr "不能切换目录到 %s"
6171
6172#: builtin/init-db.c:555
6173#, c-format
6174msgid ""
6175"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6176"dir=<directory>)"
6177msgstr ""
6178"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
6179"dir=<directory>)"
6180
6181#: builtin/init-db.c:579
6182msgid "Cannot access current working directory"
6183msgstr "不能访问当前工作目录"
6184
6185#: builtin/init-db.c:586
6186#, c-format
6187msgid "Cannot access work tree '%s'"
6188msgstr "不能访问工作区 '%s'"
6189
6190#: builtin/log.c:41
6191msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
6192msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
6193
6194#: builtin/log.c:42
6195msgid " or: git show [options] <object>..."
6196msgstr " 或者:git show [选项] <对象>..."
6197
6198#: builtin/log.c:125
6199msgid "suppress diff output"
6200msgstr "不显示差异输出"
6201
6202#: builtin/log.c:126
6203msgid "show source"
6204msgstr "显示源"
6205
6206#: builtin/log.c:127
6207msgid "Use mail map file"
6208msgstr "使用邮件映射文件"
6209
6210#: builtin/log.c:128
6211msgid "decorate options"
6212msgstr "修饰选项"
6213
6214#: builtin/log.c:231
6215#, c-format
6216msgid "Final output: %d %s\n"
6217msgstr "最终输出:%d %s\n"
6218
6219#: builtin/log.c:473 builtin/log.c:565
6220#, c-format
6221msgid "Could not read object %s"
6222msgstr "不能读取对象 %s"
6223
6224#: builtin/log.c:589
6225#, c-format
6226msgid "Unknown type: %d"
6227msgstr "未知类型:%d"
6228
6229#: builtin/log.c:689
6230msgid "format.headers without value"
6231msgstr "format.headers 没有值"
6232
6233#: builtin/log.c:771
6234msgid "name of output directory is too long"
6235msgstr "输出目录名太长"
6236
6237#: builtin/log.c:787
6238#, c-format
6239msgid "Cannot open patch file %s"
6240msgstr "无法打开补丁文件 %s"
6241
6242#: builtin/log.c:801
6243msgid "Need exactly one range."
6244msgstr "只需要一个范围。"
6245
6246#: builtin/log.c:809
6247msgid "Not a range."
6248msgstr "不是一个范围。"
6249
6250#: builtin/log.c:911
6251msgid "Cover letter needs email format"
6252msgstr "信封需要邮件地址格式"
6253
6254#: builtin/log.c:987
6255#, c-format
6256msgid "insane in-reply-to: %s"
6257msgstr "不正常的 in-reply-to:%s"
6258
6259#: builtin/log.c:1015
6260msgid "git format-patch [options] [<since> | <revision range>]"
6261msgstr "git format-patch [选项] [<从> | <修订集范围>]"
6262
6263#: builtin/log.c:1060
6264msgid "Two output directories?"
6265msgstr "两个输出目录?"
6266
6267#: builtin/log.c:1175
6268msgid "use [PATCH n/m] even with a single patch"
6269msgstr "使用 [PATCH n/m],即使只有一个补丁"
6270
6271#: builtin/log.c:1178
6272msgid "use [PATCH] even with multiple patches"
6273msgstr "使用 [PATCH],即使有多个补丁"
6274
6275#: builtin/log.c:1182
6276msgid "print patches to standard out"
6277msgstr "打印补丁到标准输出"
6278
6279#: builtin/log.c:1184
6280msgid "generate a cover letter"
6281msgstr "生成一封附信"
6282
6283#: builtin/log.c:1186
6284msgid "use simple number sequence for output file names"
6285msgstr "使用简单的数字序列作为输出文件名"
6286
6287#: builtin/log.c:1187
6288msgid "sfx"
6289msgstr "后缀"
6290
6291#: builtin/log.c:1188
6292msgid "use <sfx> instead of '.patch'"
6293msgstr "使用 <后缀> 代替 '.patch'"
6294
6295#: builtin/log.c:1190
6296msgid "start numbering patches at <n> instead of 1"
6297msgstr "补丁以 <n> 开始编号,而不是1"
6298
6299#: builtin/log.c:1192
6300msgid "mark the series as Nth re-roll"
6301msgstr "标记补丁系列是第几次重制"
6302
6303#: builtin/log.c:1194
6304msgid "Use [<prefix>] instead of [PATCH]"
6305msgstr "使用 [<前缀>] 代替 [PATCH]"
6306
6307#: builtin/log.c:1197
6308msgid "store resulting files in <dir>"
6309msgstr "把结果文件存储在 <dir>"
6310
6311#: builtin/log.c:1200
6312msgid "don't strip/add [PATCH]"
6313msgstr "不删除/添加 [PATCH]"
6314
6315#: builtin/log.c:1203
6316msgid "don't output binary diffs"
6317msgstr "不输出二进制差异"
6318
6319#: builtin/log.c:1205
6320msgid "don't include a patch matching a commit upstream"
6321msgstr "不包含已在上游提交中的补丁"
6322
6323#: builtin/log.c:1207
6324msgid "show patch format instead of default (patch + stat)"
6325msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6326
6327#: builtin/log.c:1209
6328msgid "Messaging"
6329msgstr "邮件发送"
6330
6331#: builtin/log.c:1210
6332msgid "header"
6333msgstr "header"
6334
6335#: builtin/log.c:1211
6336msgid "add email header"
6337msgstr "添加邮件头"
6338
6339#: builtin/log.c:1212 builtin/log.c:1214
6340msgid "email"
6341msgstr "邮件地址"
6342
6343#: builtin/log.c:1212
6344msgid "add To: header"
6345msgstr "添加收件人"
6346
6347#: builtin/log.c:1214
6348msgid "add Cc: header"
6349msgstr "添加抄送"
6350
6351#: builtin/log.c:1216
6352msgid "ident"
6353msgstr "ident"
6354
6355#: builtin/log.c:1217
6356msgid "set From address to <ident> (or committer ident if absent)"
6357msgstr "设置 From 地址为 <ident>(如若不提供,用提交者ID做为地址)"
6358
6359#: builtin/log.c:1219
6360msgid "message-id"
6361msgstr "message-id"
6362
6363#: builtin/log.c:1220
6364msgid "make first mail a reply to <message-id>"
6365msgstr "使第一封邮件作为对 <message-id> 的回复"
6366
6367#: builtin/log.c:1221 builtin/log.c:1224
6368msgid "boundary"
6369msgstr "边界"
6370
6371#: builtin/log.c:1222
6372msgid "attach the patch"
6373msgstr "附件方式添加补丁"
6374
6375#: builtin/log.c:1225
6376msgid "inline the patch"
6377msgstr "内联显示补丁"
6378
6379#: builtin/log.c:1229
6380msgid "enable message threading, styles: shallow, deep"
6381msgstr "启用邮件线索,风格:浅,深"
6382
6383#: builtin/log.c:1231
6384msgid "signature"
6385msgstr "签名"
6386
6387#: builtin/log.c:1232
6388msgid "add a signature"
6389msgstr "添加一个签名"
6390
6391#: builtin/log.c:1233
6392msgid "don't print the patch filenames"
6393msgstr "不要打印补丁文件名"
6394
6395#: builtin/log.c:1307
6396#, c-format
6397msgid "invalid ident line: %s"
6398msgstr "包含无效的身份标识:%s"
6399
6400#: builtin/log.c:1322
6401msgid "-n and -k are mutually exclusive."
6402msgstr "-n 和 -k 互斥。"
6403
6404#: builtin/log.c:1324
6405msgid "--subject-prefix and -k are mutually exclusive."
6406msgstr "--subject-prefix 和 -k 互斥。"
6407
6408#: builtin/log.c:1332
6409msgid "--name-only does not make sense"
6410msgstr "--name-only 无意义"
6411
6412#: builtin/log.c:1334
6413msgid "--name-status does not make sense"
6414msgstr "--name-status 无意义"
6415
6416#: builtin/log.c:1336
6417msgid "--check does not make sense"
6418msgstr "--check 无意义"
6419
6420#: builtin/log.c:1359
6421msgid "standard output, or directory, which one?"
6422msgstr "标准输出或目录,哪一个?"
6423
6424#: builtin/log.c:1361
6425#, c-format
6426msgid "Could not create directory '%s'"
6427msgstr "不能创建目录 '%s'"
6428
6429#: builtin/log.c:1509
6430msgid "Failed to create output files"
6431msgstr "无法创建输出文件"
6432
6433#: builtin/log.c:1558
6434msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6435msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6436
6437#: builtin/log.c:1613
6438#, c-format
6439msgid ""
6440"Could not find a tracked remote branch, please specify <upstream> manually.\n"
6441msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
6442
6443#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
6444#, c-format
6445msgid "Unknown commit %s"
6446msgstr "未知提交 %s"
6447
6448#: builtin/ls-files.c:398
6449msgid "git ls-files [options] [<file>...]"
6450msgstr "git ls-files [选项] [<文件>...]"
6451
6452#: builtin/ls-files.c:455
6453msgid "identify the file status with tags"
6454msgstr "用标签标识文件的状态"
6455
6456#: builtin/ls-files.c:457
6457msgid "use lowercase letters for 'assume unchanged' files"
6458msgstr "使用小写字母表示 '假设未改变的' 文件"
6459
6460#: builtin/ls-files.c:459
6461msgid "show cached files in the output (default)"
6462msgstr "显示缓存的文件(默认)"
6463
6464#: builtin/ls-files.c:461
6465msgid "show deleted files in the output"
6466msgstr "显示已删除的文件"
6467
6468#: builtin/ls-files.c:463
6469msgid "show modified files in the output"
6470msgstr "显示已修改的文件"
6471
6472#: builtin/ls-files.c:465
6473msgid "show other files in the output"
6474msgstr "显示其它文件"
6475
6476#: builtin/ls-files.c:467
6477msgid "show ignored files in the output"
6478msgstr "显示忽略的文件"
6479
6480#: builtin/ls-files.c:470
6481msgid "show staged contents' object name in the output"
6482msgstr "显示暂存区内容的对象名称"
6483
6484#: builtin/ls-files.c:472
6485msgid "show files on the filesystem that need to be removed"
6486msgstr "显示文件系统需要删除的文件"
6487
6488#: builtin/ls-files.c:474
6489msgid "show 'other' directories' name only"
6490msgstr "只显示“其他”目录的名称"
6491
6492#: builtin/ls-files.c:477
6493msgid "don't show empty directories"
6494msgstr "不显示空目录"
6495
6496#: builtin/ls-files.c:480
6497msgid "show unmerged files in the output"
6498msgstr "显示未合并的文件"
6499
6500#: builtin/ls-files.c:482
6501msgid "show resolve-undo information"
6502msgstr "显示 resolve-undo 信息"
6503
6504#: builtin/ls-files.c:484
6505msgid "skip files matching pattern"
6506msgstr "匹配排除文件的模式"
6507
6508#: builtin/ls-files.c:487
6509msgid "exclude patterns are read from <file>"
6510msgstr "从 <文件> 中读取排除模式"
6511
6512#: builtin/ls-files.c:490
6513msgid "read additional per-directory exclude patterns in <file>"
6514msgstr "从 <文件> 读取额外的每个目录的排除模式"
6515
6516#: builtin/ls-files.c:492
6517msgid "add the standard git exclusions"
6518msgstr "添加标准的 git 排除"
6519
6520#: builtin/ls-files.c:495
6521msgid "make the output relative to the project top directory"
6522msgstr "显示相对于顶级目录的文件名"
6523
6524#: builtin/ls-files.c:498
6525msgid "if any <file> is not in the index, treat this as an error"
6526msgstr "如果任何 <文件> 都不在索引区,视为错误"
6527
6528#: builtin/ls-files.c:499
6529msgid "tree-ish"
6530msgstr "树或提交"
6531
6532#: builtin/ls-files.c:500
6533msgid "pretend that paths removed since <tree-ish> are still present"
6534msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6535
6536#: builtin/ls-files.c:502
6537msgid "show debugging data"
6538msgstr "显示调试数据"
6539
6540#: builtin/ls-tree.c:28
6541msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6542msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6543
6544#: builtin/ls-tree.c:126
6545msgid "only show trees"
6546msgstr "只显示树"
6547
6548#: builtin/ls-tree.c:128
6549msgid "recurse into subtrees"
6550msgstr "递归到子树"
6551
6552#: builtin/ls-tree.c:130
6553msgid "show trees when recursing"
6554msgstr "当递归时显示树"
6555
6556#: builtin/ls-tree.c:133
6557msgid "terminate entries with NUL byte"
6558msgstr "条目以NUL字符终止"
6559
6560#: builtin/ls-tree.c:134
6561msgid "include object size"
6562msgstr "包括对象大小"
6563
6564#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
6565msgid "list only filenames"
6566msgstr "只列出文件名"
6567
6568#: builtin/ls-tree.c:141
6569msgid "use full path names"
6570msgstr "使用文件的全路径"
6571
6572#: builtin/ls-tree.c:143
6573msgid "list entire tree; not just current directory (implies --full-name)"
6574msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6575
6576#: builtin/merge.c:43
6577msgid "git merge [options] [<commit>...]"
6578msgstr "git merge [选项] [<提交>...]"
6579
6580#: builtin/merge.c:44
6581msgid "git merge [options] <msg> HEAD <commit>"
6582msgstr "git merge [选项] <说明> HEAD <提交>"
6583
6584#: builtin/merge.c:45
6585msgid "git merge --abort"
6586msgstr "git merge --abort"
6587
6588#: builtin/merge.c:98
6589msgid "switch `m' requires a value"
6590msgstr "开关 `m' 需要一个值"
6591
6592#: builtin/merge.c:135
6593#, c-format
6594msgid "Could not find merge strategy '%s'.\n"
6595msgstr "不能找到合并策略 '%s'。\n"
6596
6597#: builtin/merge.c:136
6598#, c-format
6599msgid "Available strategies are:"
6600msgstr "可用的策略有:"
6601
6602#: builtin/merge.c:141
6603#, c-format
6604msgid "Available custom strategies are:"
6605msgstr "可用的自定义策略有:"
6606
6607#: builtin/merge.c:198
6608msgid "do not show a diffstat at the end of the merge"
6609msgstr "在合并的最后不显示差异统计"
6610
6611#: builtin/merge.c:201
6612msgid "show a diffstat at the end of the merge"
6613msgstr "在合并的最后显示差异统计"
6614
6615#: builtin/merge.c:202
6616msgid "(synonym to --stat)"
6617msgstr "(和 --stat 同义)"
6618
6619#: builtin/merge.c:204
6620msgid "add (at most <n>) entries from shortlog to merge commit message"
6621msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6622
6623#: builtin/merge.c:207
6624msgid "create a single commit instead of doing a merge"
6625msgstr "创建一个单独的提交而不是做一次合并"
6626
6627#: builtin/merge.c:209
6628msgid "perform a commit if the merge succeeds (default)"
6629msgstr "如果合并成功,执行一次提交(默认)"
6630
6631#: builtin/merge.c:211
6632msgid "edit message before committing"
6633msgstr "在提交前编辑提交说明"
6634
6635#: builtin/merge.c:212
6636msgid "allow fast-forward (default)"
6637msgstr "允许快进(默认)"
6638
6639#: builtin/merge.c:214
6640msgid "abort if fast-forward is not possible"
6641msgstr "如果不能快进就放弃合并"
6642
6643#: builtin/merge.c:218
6644msgid "Verify that the named commit has a valid GPG signature"
6645msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6646
6647#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89
6648msgid "strategy"
6649msgstr "策略"
6650
6651#: builtin/merge.c:220
6652msgid "merge strategy to use"
6653msgstr "要使用的合并策略"
6654
6655#: builtin/merge.c:221
6656msgid "option=value"
6657msgstr "option=value"
6658
6659#: builtin/merge.c:222
6660msgid "option for selected merge strategy"
6661msgstr "所选的合并策略的选项"
6662
6663#: builtin/merge.c:224
6664msgid "merge commit message (for a non-fast-forward merge)"
6665msgstr "合并的提交说明(针对非快进式合并)"
6666
6667#: builtin/merge.c:228
6668msgid "abort the current in-progress merge"
6669msgstr "放弃当前正在进行的合并"
6670
6671#: builtin/merge.c:257
6672msgid "could not run stash."
6673msgstr "不能进行进度保存。"
6674
6675#: builtin/merge.c:262
6676msgid "stash failed"
6677msgstr "进度保存失败"
6678
6679#: builtin/merge.c:267
6680#, c-format
6681msgid "not a valid object: %s"
6682msgstr "不是一个有效对象:%s"
6683
6684#: builtin/merge.c:286 builtin/merge.c:303
6685msgid "read-tree failed"
6686msgstr "读取树失败"
6687
6688# 译者:注意保持前导空格
6689#: builtin/merge.c:333
6690msgid " (nothing to squash)"
6691msgstr " (无可压缩)"
6692
6693#: builtin/merge.c:346
6694#, c-format
6695msgid "Squash commit -- not updating HEAD\n"
6696msgstr "压缩提交 -- 未更新 HEAD\n"
6697
6698#: builtin/merge.c:378
6699msgid "Writing SQUASH_MSG"
6700msgstr "写入 SQUASH_MSG"
6701
6702#: builtin/merge.c:380
6703msgid "Finishing SQUASH_MSG"
6704msgstr "完成 SQUASH_MSG"
6705
6706#: builtin/merge.c:403
6707#, c-format
6708msgid "No merge message -- not updating HEAD\n"
6709msgstr "无合并信息 -- 未更新 HEAD\n"
6710
6711#: builtin/merge.c:453
6712#, c-format
6713msgid "'%s' does not point to a commit"
6714msgstr "'%s' 没有指向一个提交"
6715
6716#: builtin/merge.c:565
6717#, c-format
6718msgid "Bad branch.%s.mergeoptions string: %s"
6719msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6720
6721#: builtin/merge.c:657
6722msgid "git write-tree failed to write a tree"
6723msgstr "git write-tree 无法写入一树对象"
6724
6725#: builtin/merge.c:685
6726msgid "Not handling anything other than two heads merge."
6727msgstr "不能处理两个头合并之外的任何操作。"
6728
6729#: builtin/merge.c:699
6730#, c-format
6731msgid "Unknown option for merge-recursive: -X%s"
6732msgstr "merge-recursive 的未知选项:-X%s"
6733
6734#: builtin/merge.c:713
6735#, c-format
6736msgid "unable to write %s"
6737msgstr "不能写 %s"
6738
6739#: builtin/merge.c:802
6740#, c-format
6741msgid "Could not read from '%s'"
6742msgstr "不能从 '%s' 读取"
6743
6744#: builtin/merge.c:811
6745#, c-format
6746msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6747msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6748
6749#: builtin/merge.c:817
6750#, c-format
6751msgid ""
6752"Please enter a commit message to explain why this merge is necessary,\n"
6753"especially if it merges an updated upstream into a topic branch.\n"
6754"\n"
6755"Lines starting with '%c' will be ignored, and an empty message aborts\n"
6756"the commit.\n"
6757msgstr ""
6758"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6759"合并到主题分支。\n"
6760"\n"
6761"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
6762
6763#: builtin/merge.c:841
6764msgid "Empty commit message."
6765msgstr "空提交信息。"
6766
6767#: builtin/merge.c:853
6768#, c-format
6769msgid "Wonderful.\n"
6770msgstr "太棒了。\n"
6771
6772#: builtin/merge.c:918
6773#, c-format
6774msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6775msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6776
6777#: builtin/merge.c:934
6778#, c-format
6779msgid "'%s' is not a commit"
6780msgstr "'%s' 不是一个提交"
6781
6782#: builtin/merge.c:975
6783msgid "No current branch."
6784msgstr "没有当前分支。"
6785
6786#: builtin/merge.c:977
6787msgid "No remote for the current branch."
6788msgstr "当前分支没有对应的远程版本库。"
6789
6790#: builtin/merge.c:979
6791msgid "No default upstream defined for the current branch."
6792msgstr "当前分支没有定义默认的上游分支。"
6793
6794#: builtin/merge.c:984
6795#, c-format
6796msgid "No remote-tracking branch for %s from %s"
6797msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
6798
6799#: builtin/merge.c:1140
6800msgid "There is no merge to abort (MERGE_HEAD missing)."
6801msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
6802
6803#: builtin/merge.c:1156 git-pull.sh:31
6804msgid ""
6805"You have not concluded your merge (MERGE_HEAD exists).\n"
6806"Please, commit your changes before you can merge."
6807msgstr ""
6808"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
6809"请在合并前先提交您的修改。"
6810
6811#: builtin/merge.c:1159 git-pull.sh:34
6812msgid "You have not concluded your merge (MERGE_HEAD exists)."
6813msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6814
6815#: builtin/merge.c:1163
6816msgid ""
6817"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6818"Please, commit your changes before you can merge."
6819msgstr ""
6820"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
6821"请在合并前先提交您的修改。"
6822
6823#: builtin/merge.c:1166
6824msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6825msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6826
6827#: builtin/merge.c:1175
6828msgid "You cannot combine --squash with --no-ff."
6829msgstr "您不能将 --squash 与 --no-ff 同时使用。"
6830
6831#: builtin/merge.c:1184
6832msgid "No commit specified and merge.defaultToUpstream not set."
6833msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
6834
6835#: builtin/merge.c:1216
6836msgid "Can merge only exactly one commit into empty head"
6837msgstr "只能将一个提交合并到空分支上"
6838
6839#: builtin/merge.c:1219
6840msgid "Squash commit into empty head not supported yet"
6841msgstr "尚不支持到空分支的压缩提交"
6842
6843#: builtin/merge.c:1221
6844msgid "Non-fast-forward commit does not make sense into an empty head"
6845msgstr "到空分支的非快进式提交没有意义"
6846
6847#: builtin/merge.c:1226
6848#, c-format
6849msgid "%s - not something we can merge"
6850msgstr "%s - 不能被合并"
6851
6852#: builtin/merge.c:1277
6853#, c-format
6854msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6855msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
6856
6857#: builtin/merge.c:1280
6858#, c-format
6859msgid "Commit %s has a bad GPG signature allegedly by %s."
6860msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
6861
6862#. 'N'
6863#: builtin/merge.c:1283
6864#, c-format
6865msgid "Commit %s does not have a GPG signature."
6866msgstr "提交 %s 没有一个 GPG 签名。"
6867
6868#: builtin/merge.c:1286
6869#, c-format
6870msgid "Commit %s has a good GPG signature by %s\n"
6871msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
6872
6873#: builtin/merge.c:1370
6874#, c-format
6875msgid "Updating %s..%s\n"
6876msgstr "更新 %s..%s\n"
6877
6878#: builtin/merge.c:1409
6879#, c-format
6880msgid "Trying really trivial in-index merge...\n"
6881msgstr "尝试非常小的索引内合并...\n"
6882
6883#: builtin/merge.c:1416
6884#, c-format
6885msgid "Nope.\n"
6886msgstr "无。\n"
6887
6888#: builtin/merge.c:1448
6889msgid "Not possible to fast-forward, aborting."
6890msgstr "无法快进,终止。"
6891
6892#: builtin/merge.c:1471 builtin/merge.c:1550
6893#, c-format
6894msgid "Rewinding the tree to pristine...\n"
6895msgstr "将树回滚至原始状态...\n"
6896
6897#: builtin/merge.c:1475
6898#, c-format
6899msgid "Trying merge strategy %s...\n"
6900msgstr "尝试合并策略 %s...\n"
6901
6902#: builtin/merge.c:1541
6903#, c-format
6904msgid "No merge strategy handled the merge.\n"
6905msgstr "没有合并策略处理此合并。\n"
6906
6907#: builtin/merge.c:1543
6908#, c-format
6909msgid "Merge with strategy %s failed.\n"
6910msgstr "使用策略 %s 合并失败。\n"
6911
6912#: builtin/merge.c:1552
6913#, c-format
6914msgid "Using the %s to prepare resolving by hand.\n"
6915msgstr "使用 %s 以准备手工解决。\n"
6916
6917#: builtin/merge.c:1564
6918#, c-format
6919msgid "Automatic merge went well; stopped before committing as requested\n"
6920msgstr "自动合并进展顺利,按要求在提交前停止\n"
6921
6922#: builtin/merge-base.c:26
6923msgid "git merge-base [-a|--all] <commit> <commit>..."
6924msgstr "git merge-base [-a|--all] <提交> <提交>..."
6925
6926#: builtin/merge-base.c:27
6927msgid "git merge-base [-a|--all] --octopus <commit>..."
6928msgstr "git merge-base [-a|--all] --octopus <提交>..."
6929
6930#: builtin/merge-base.c:28
6931msgid "git merge-base --independent <commit>..."
6932msgstr "git merge-base --independent <提交>..."
6933
6934#: builtin/merge-base.c:29
6935msgid "git merge-base --is-ancestor <commit> <commit>"
6936msgstr "git merge-base --is-ancestor <提交> <提交>"
6937
6938#: builtin/merge-base.c:98
6939msgid "output all common ancestors"
6940msgstr "输出所有共同的祖先"
6941
6942#: builtin/merge-base.c:99
6943msgid "find ancestors for a single n-way merge"
6944msgstr "查找一个多路合并的祖先提交"
6945
6946#: builtin/merge-base.c:100
6947msgid "list revs not reachable from others"
6948msgstr "显示不能被其他访问到的版本"
6949
6950#: builtin/merge-base.c:102
6951msgid "is the first one ancestor of the other?"
6952msgstr "第一个是其他的祖先提交么?"
6953
6954#: builtin/merge-file.c:8
6955msgid ""
6956"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6957"file2"
6958msgstr ""
6959"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
6960
6961#: builtin/merge-file.c:33
6962msgid "send results to standard output"
6963msgstr "将结果发送到标准输出"
6964
6965#: builtin/merge-file.c:34
6966msgid "use a diff3 based merge"
6967msgstr "使用基于 diff3 的合并"
6968
6969#: builtin/merge-file.c:35
6970msgid "for conflicts, use our version"
6971msgstr "如果冲突,使用我们的版本"
6972
6973#: builtin/merge-file.c:37
6974msgid "for conflicts, use their version"
6975msgstr "如果冲突,使用他们的版本"
6976
6977#: builtin/merge-file.c:39
6978msgid "for conflicts, use a union version"
6979msgstr "如果冲突,使用联合版本"
6980
6981#: builtin/merge-file.c:42
6982msgid "for conflicts, use this marker size"
6983msgstr "如果冲突,使用指定长度的标记"
6984
6985#: builtin/merge-file.c:43
6986msgid "do not warn about conflicts"
6987msgstr "不要警告冲突"
6988
6989#: builtin/merge-file.c:45
6990msgid "set labels for file1/orig_file/file2"
6991msgstr "为 file1/orig_file/file2 设置标签"
6992
6993#: builtin/mktree.c:67
6994msgid "git mktree [-z] [--missing] [--batch]"
6995msgstr "git mktree [-z] [--missing] [--batch]"
6996
6997#: builtin/mktree.c:153
6998msgid "input is NUL terminated"
6999msgstr "输入以 NUL 字符终止"
7000
7001#: builtin/mktree.c:154 builtin/write-tree.c:24
7002msgid "allow missing objects"
7003msgstr "允许丢失的对象"
7004
7005#: builtin/mktree.c:155
7006msgid "allow creation of more than one tree"
7007msgstr "允许创建一个以上的树"
7008
7009#: builtin/mv.c:15
7010msgid "git mv [options] <source>... <destination>"
7011msgstr "git mv [选项] <源>... <目标>"
7012
7013#: builtin/mv.c:67
7014msgid "force move/rename even if target exists"
7015msgstr "强制移动/重命令,即使目标存在"
7016
7017#: builtin/mv.c:68
7018msgid "skip move/rename errors"
7019msgstr "跳过移动/重命名错误"
7020
7021#: builtin/mv.c:113
7022#, c-format
7023msgid "Checking rename of '%s' to '%s'\n"
7024msgstr "检查 '%s' 到 '%s' 的重命名\n"
7025
7026#: builtin/mv.c:117
7027msgid "bad source"
7028msgstr "坏的源"
7029
7030#: builtin/mv.c:120
7031msgid "can not move directory into itself"
7032msgstr "不能将目录移动到自身"
7033
7034#: builtin/mv.c:123
7035msgid "cannot move directory over file"
7036msgstr "不能将目录移动到文件"
7037
7038#: builtin/mv.c:129
7039#, c-format
7040msgid "Huh? Directory %s is in index and no submodule?"
7041msgstr "嗯?目录 %s 在索引中并且不是子模组?"
7042
7043#: builtin/mv.c:131 builtin/rm.c:318
7044msgid "Please, stage your changes to .gitmodules or stash them to proceed"
7045msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7046
7047#: builtin/mv.c:147
7048#, c-format
7049msgid "Huh? %.*s is in index?"
7050msgstr "嗯?%.*s 在索引中?"
7051
7052#: builtin/mv.c:159
7053msgid "source directory is empty"
7054msgstr "源目录为空"
7055
7056#: builtin/mv.c:191
7057msgid "not under version control"
7058msgstr "不在版本控制之下"
7059
7060#: builtin/mv.c:193
7061msgid "destination exists"
7062msgstr "目标已存在"
7063
7064#: builtin/mv.c:201
7065#, c-format
7066msgid "overwriting '%s'"
7067msgstr "覆盖 '%s'"
7068
7069#: builtin/mv.c:204
7070msgid "Cannot overwrite"
7071msgstr "不能覆盖"
7072
7073#: builtin/mv.c:207
7074msgid "multiple sources for the same target"
7075msgstr "同一目标具有多个源"
7076
7077#: builtin/mv.c:222
7078#, c-format
7079msgid "%s, source=%s, destination=%s"
7080msgstr "%s,源=%s,目标=%s"
7081
7082#: builtin/mv.c:232
7083#, c-format
7084msgid "Renaming %s to %s\n"
7085msgstr "重命名 %s 至 %s\n"
7086
7087#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330
7088#, c-format
7089msgid "renaming '%s' failed"
7090msgstr "重命名 '%s' 失败"
7091
7092#: builtin/name-rev.c:259
7093msgid "git name-rev [options] <commit>..."
7094msgstr "git name-rev [选项] <提交>..."
7095
7096#: builtin/name-rev.c:260
7097msgid "git name-rev [options] --all"
7098msgstr "git name-rev [选项] --all"
7099
7100#: builtin/name-rev.c:261
7101msgid "git name-rev [options] --stdin"
7102msgstr "git name-rev [选项] --stdin"
7103
7104#: builtin/name-rev.c:313
7105msgid "print only names (no SHA-1)"
7106msgstr "只打印名称(无 SHA-1)"
7107
7108#: builtin/name-rev.c:314
7109msgid "only use tags to name the commits"
7110msgstr "只使用 tags 来命名提交"
7111
7112#: builtin/name-rev.c:316
7113msgid "only use refs matching <pattern>"
7114msgstr "只使用和 <模式> 相匹配的引用"
7115
7116#: builtin/name-rev.c:318
7117msgid "list all commits reachable from all refs"
7118msgstr "列出可以从所有引用访问的提交"
7119
7120#: builtin/name-rev.c:319
7121msgid "read from stdin"
7122msgstr "从标准输入读取"
7123
7124#: builtin/name-rev.c:320
7125msgid "allow to print `undefined` names (default)"
7126msgstr "允许打印 `未定义` 的名称(默认)"
7127
7128#: builtin/name-rev.c:326
7129msgid "dereference tags in the input (internal use)"
7130msgstr "反向解析输入中的 tags(内部使用)"
7131
7132#: builtin/notes.c:24
7133msgid "git notes [--ref <notes_ref>] [list [<object>]]"
7134msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7135
7136#: builtin/notes.c:25
7137msgid ""
7138"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
7139"<object>] [<object>]"
7140msgstr ""
7141"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
7142"象>] [<对象>]"
7143
7144#: builtin/notes.c:26
7145msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
7146msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7147
7148#: builtin/notes.c:27
7149msgid ""
7150"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
7151"<object>] [<object>]"
7152msgstr ""
7153"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
7154">] [<对象>]"
7155
7156#: builtin/notes.c:28
7157msgid "git notes [--ref <notes_ref>] edit [<object>]"
7158msgstr "git notes [--ref <注解引用>] edit [<对象>]"
7159
7160#: builtin/notes.c:29
7161msgid "git notes [--ref <notes_ref>] show [<object>]"
7162msgstr "git notes [--ref <注解引用>] show [<对象>]"
7163
7164#: builtin/notes.c:30
7165msgid ""
7166"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
7167msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7168
7169#: builtin/notes.c:31
7170msgid "git notes merge --commit [-v | -q]"
7171msgstr "git notes merge --commit [-v | -q]"
7172
7173#: builtin/notes.c:32
7174msgid "git notes merge --abort [-v | -q]"
7175msgstr "git notes merge --abort [-v | -q]"
7176
7177#: builtin/notes.c:33
7178msgid "git notes [--ref <notes_ref>] remove [<object>...]"
7179msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7180
7181#: builtin/notes.c:34
7182msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
7183msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7184
7185#: builtin/notes.c:35
7186msgid "git notes [--ref <notes_ref>] get-ref"
7187msgstr "git notes [--ref <注解引用>] get-ref"
7188
7189#: builtin/notes.c:40
7190msgid "git notes [list [<object>]]"
7191msgstr "git notes [list [<对象>]]"
7192
7193#: builtin/notes.c:45
7194msgid "git notes add [<options>] [<object>]"
7195msgstr "git notes add [<选项>] [<对象>]"
7196
7197#: builtin/notes.c:50
7198msgid "git notes copy [<options>] <from-object> <to-object>"
7199msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7200
7201#: builtin/notes.c:51
7202msgid "git notes copy --stdin [<from-object> <to-object>]..."
7203msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7204
7205#: builtin/notes.c:56
7206msgid "git notes append [<options>] [<object>]"
7207msgstr "git notes append [<选项>] [<对象>]"
7208
7209#: builtin/notes.c:61
7210msgid "git notes edit [<object>]"
7211msgstr "git notes edit [<对象>]"
7212
7213#: builtin/notes.c:66
7214msgid "git notes show [<object>]"
7215msgstr "git notes show [<对象>]"
7216
7217#: builtin/notes.c:71
7218msgid "git notes merge [<options>] <notes_ref>"
7219msgstr "git notes merge [<选项>] <注解引用>"
7220
7221#: builtin/notes.c:72
7222msgid "git notes merge --commit [<options>]"
7223msgstr "git notes merge --commit [<选项>]"
7224
7225#: builtin/notes.c:73
7226msgid "git notes merge --abort [<options>]"
7227msgstr "git notes merge --abort [<选项>]"
7228
7229#: builtin/notes.c:78
7230msgid "git notes remove [<object>]"
7231msgstr "git notes remove [<对象>]"
7232
7233#: builtin/notes.c:83
7234msgid "git notes prune [<options>]"
7235msgstr "git notes prune [<选项>]"
7236
7237#: builtin/notes.c:88
7238msgid "git notes get-ref"
7239msgstr "git notes get-ref"
7240
7241#: builtin/notes.c:137
7242#, c-format
7243msgid "unable to start 'show' for object '%s'"
7244msgstr "不能为对象 '%s' 开始 'show'"
7245
7246#: builtin/notes.c:141
7247msgid "could not read 'show' output"
7248msgstr "不能读取 'show' 的输出"
7249
7250#: builtin/notes.c:149
7251#, c-format
7252msgid "failed to finish 'show' for object '%s'"
7253msgstr "无法为对象 '%s' 完成 'show'"
7254
7255#: builtin/notes.c:167 builtin/tag.c:341
7256#, c-format
7257msgid "could not create file '%s'"
7258msgstr "不能创建文件 '%s'"
7259
7260#: builtin/notes.c:186
7261msgid "Please supply the note contents using either -m or -F option"
7262msgstr "请通过 -m 或 -F 选项为注解提供内容"
7263
7264#: builtin/notes.c:207 builtin/notes.c:844
7265#, c-format
7266msgid "Removing note for object %s\n"
7267msgstr "删除对象 %s 的注解\n"
7268
7269#: builtin/notes.c:212
7270msgid "unable to write note object"
7271msgstr "不能写注解对象"
7272
7273#: builtin/notes.c:214
7274#, c-format
7275msgid "The note contents has been left in %s"
7276msgstr "注解内容被留在文件 %s 中"
7277
7278#: builtin/notes.c:248 builtin/tag.c:537
7279#, c-format
7280msgid "cannot read '%s'"
7281msgstr "不能读取 '%s'"
7282
7283#: builtin/notes.c:250 builtin/tag.c:540
7284#, c-format
7285msgid "could not open or read '%s'"
7286msgstr "不能打开或读取 '%s'"
7287
7288#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
7289#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
7290#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
7291#: builtin/notes.c:839 builtin/tag.c:553
7292#, c-format
7293msgid "Failed to resolve '%s' as a valid ref."
7294msgstr "无法解析 '%s' 为一个有效引用。"
7295
7296#: builtin/notes.c:272
7297#, c-format
7298msgid "Failed to read object '%s'."
7299msgstr "无法读取对象 '%s'。"
7300
7301#: builtin/notes.c:312
7302#, c-format
7303msgid "Malformed input line: '%s'."
7304msgstr "非法的输入行:'%s'。"
7305
7306#: builtin/notes.c:327
7307#, c-format
7308msgid "Failed to copy notes from '%s' to '%s'"
7309msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7310
7311#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498
7312#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630
7313#: builtin/notes.c:904
7314msgid "too many parameters"
7315msgstr "参数太多"
7316
7317#: builtin/notes.c:384 builtin/notes.c:643
7318#, c-format
7319msgid "No note found for object %s."
7320msgstr "未发现对象 %s 的注解。"
7321
7322#: builtin/notes.c:406 builtin/notes.c:563
7323msgid "note contents as a string"
7324msgstr "注解内容作为一个字符串"
7325
7326#: builtin/notes.c:409 builtin/notes.c:566
7327msgid "note contents in a file"
7328msgstr "注解内容到一个文件中"
7329
7330#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568
7331#: builtin/notes.c:571 builtin/tag.c:474
7332msgid "object"
7333msgstr "对象"
7334
7335#: builtin/notes.c:412 builtin/notes.c:569
7336msgid "reuse and edit specified note object"
7337msgstr "重用和编辑指定的注解对象"
7338
7339#: builtin/notes.c:415 builtin/notes.c:572
7340msgid "reuse specified note object"
7341msgstr "重用指定的注解对象"
7342
7343#: builtin/notes.c:417 builtin/notes.c:485
7344msgid "replace existing notes"
7345msgstr "替换已存在的注解"
7346
7347#: builtin/notes.c:451
7348#, c-format
7349msgid ""
7350"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7351"existing notes"
7352msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7353
7354#: builtin/notes.c:456 builtin/notes.c:533
7355#, c-format
7356msgid "Overwriting existing notes for object %s\n"
7357msgstr "覆盖对象 %s 现存注解\n"
7358
7359#: builtin/notes.c:486
7360msgid "read objects from stdin"
7361msgstr "从标准输入读取对象"
7362
7363#: builtin/notes.c:488
7364msgid "load rewriting config for <command> (implies --stdin)"
7365msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7366
7367#: builtin/notes.c:506
7368msgid "too few parameters"
7369msgstr "参数太少"
7370
7371#: builtin/notes.c:527
7372#, c-format
7373msgid ""
7374"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7375"existing notes"
7376msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7377
7378#: builtin/notes.c:539
7379#, c-format
7380msgid "Missing notes on source object %s. Cannot copy."
7381msgstr "源对象 %s 缺少注解。不能拷贝。"
7382
7383#: builtin/notes.c:588
7384#, c-format
7385msgid ""
7386"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7387"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7388msgstr ""
7389"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7390"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7391
7392#: builtin/notes.c:735
7393msgid "General options"
7394msgstr "通用选项"
7395
7396#: builtin/notes.c:737
7397msgid "Merge options"
7398msgstr "合并选项"
7399
7400#: builtin/notes.c:739
7401msgid ""
7402"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7403"cat_sort_uniq)"
7404msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7405
7406#: builtin/notes.c:741
7407msgid "Committing unmerged notes"
7408msgstr "提交未合并的注解"
7409
7410#: builtin/notes.c:743
7411msgid "finalize notes merge by committing unmerged notes"
7412msgstr "通过提交未合并的注解来完成注解合并"
7413
7414#: builtin/notes.c:745
7415msgid "Aborting notes merge resolution"
7416msgstr "中止注解合并的方案"
7417
7418#: builtin/notes.c:747
7419msgid "abort notes merge"
7420msgstr "中止注解合并"
7421
7422#: builtin/notes.c:842
7423#, c-format
7424msgid "Object %s has no note\n"
7425msgstr "对象 %s 没有注解\n"
7426
7427#: builtin/notes.c:854
7428msgid "attempt to remove non-existent note is not an error"
7429msgstr "尝试删除不存在的注解不是一个错误"
7430
7431#: builtin/notes.c:857
7432msgid "read object names from the standard input"
7433msgstr "从标准输入读取对象名称"
7434
7435#: builtin/notes.c:938
7436msgid "notes_ref"
7437msgstr "注解引用"
7438
7439#: builtin/notes.c:939
7440msgid "use notes from <notes_ref>"
7441msgstr "从 <注解引用> 使用注解"
7442
7443#: builtin/notes.c:974 builtin/remote.c:1598
7444#, c-format
7445msgid "Unknown subcommand: %s"
7446msgstr "未知子命令:%s"
7447
7448#: builtin/pack-objects.c:23
7449msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7450msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7451
7452#: builtin/pack-objects.c:24
7453msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7454msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7455
7456#: builtin/pack-objects.c:184 builtin/pack-objects.c:187
7457#, c-format
7458msgid "deflate error (%d)"
7459msgstr "压缩错误 (%d)"
7460
7461#: builtin/pack-objects.c:2398
7462#, c-format
7463msgid "unsupported index version %s"
7464msgstr "不支持的索引版本 %s"
7465
7466#: builtin/pack-objects.c:2402
7467#, c-format
7468msgid "bad index version '%s'"
7469msgstr "坏的索引版本 '%s'"
7470
7471#: builtin/pack-objects.c:2425
7472#, c-format
7473msgid "option %s does not accept negative form"
7474msgstr "选项 %s 不接受否定格式"
7475
7476#: builtin/pack-objects.c:2429
7477#, c-format
7478msgid "unable to parse value '%s' for option %s"
7479msgstr "不能解析选项 %1$s 的值 '%2$s'"
7480
7481#: builtin/pack-objects.c:2448
7482msgid "do not show progress meter"
7483msgstr "不显示进度表"
7484
7485#: builtin/pack-objects.c:2450
7486msgid "show progress meter"
7487msgstr "显示进度表"
7488
7489#: builtin/pack-objects.c:2452
7490msgid "show progress meter during object writing phase"
7491msgstr "在对象写入阶段显示进度表"
7492
7493#: builtin/pack-objects.c:2455
7494msgid "similar to --all-progress when progress meter is shown"
7495msgstr "当进度表显示时类似于 --all-progress"
7496
7497#: builtin/pack-objects.c:2456
7498msgid "version[,offset]"
7499msgstr "版本[,偏移]"
7500
7501#: builtin/pack-objects.c:2457
7502msgid "write the pack index file in the specified idx format version"
7503msgstr "用指定的 idx 格式版本来写包索引文件"
7504
7505#: builtin/pack-objects.c:2460
7506msgid "maximum size of each output pack file"
7507msgstr "每个输出包的最大尺寸"
7508
7509#: builtin/pack-objects.c:2462
7510msgid "ignore borrowed objects from alternate object store"
7511msgstr "忽略从替代对象存储里借用对象"
7512
7513#: builtin/pack-objects.c:2464
7514msgid "ignore packed objects"
7515msgstr "忽略包对象"
7516
7517#: builtin/pack-objects.c:2466
7518msgid "limit pack window by objects"
7519msgstr "限制打包窗口的对象数"
7520
7521#: builtin/pack-objects.c:2468
7522msgid "limit pack window by memory in addition to object limit"
7523msgstr "除对象数量限制外设置打包窗口的内存限制"
7524
7525#: builtin/pack-objects.c:2470
7526msgid "maximum length of delta chain allowed in the resulting pack"
7527msgstr "打包允许的 delta 链的最大长度"
7528
7529#: builtin/pack-objects.c:2472
7530msgid "reuse existing deltas"
7531msgstr "重用已存在的 deltas"
7532
7533#: builtin/pack-objects.c:2474
7534msgid "reuse existing objects"
7535msgstr "重用已存在的对象"
7536
7537#: builtin/pack-objects.c:2476
7538msgid "use OFS_DELTA objects"
7539msgstr "使用 OFS_DELTA 对象"
7540
7541#: builtin/pack-objects.c:2478
7542msgid "use threads when searching for best delta matches"
7543msgstr "使用线程查询最佳 delta 匹配"
7544
7545#: builtin/pack-objects.c:2480
7546msgid "do not create an empty pack output"
7547msgstr "不创建空的包输出"
7548
7549#: builtin/pack-objects.c:2482
7550msgid "read revision arguments from standard input"
7551msgstr "从标准输入读取修订号参数"
7552
7553#: builtin/pack-objects.c:2484
7554msgid "limit the objects to those that are not yet packed"
7555msgstr "限制那些尚未打包的对象"
7556
7557#: builtin/pack-objects.c:2487
7558msgid "include objects reachable from any reference"
7559msgstr "包括可以从任何引用访问到的对象"
7560
7561#: builtin/pack-objects.c:2490
7562msgid "include objects referred by reflog entries"
7563msgstr "包括被引用日志引用到的对象"
7564
7565#: builtin/pack-objects.c:2493
7566msgid "output pack to stdout"
7567msgstr "输出包到标准输出"
7568
7569#: builtin/pack-objects.c:2495
7570msgid "include tag objects that refer to objects to be packed"
7571msgstr "包括引用了打包对象的 tag"
7572
7573#: builtin/pack-objects.c:2497
7574msgid "keep unreachable objects"
7575msgstr "维持不可达的对象"
7576
7577#: builtin/pack-objects.c:2498 parse-options.h:143
7578msgid "time"
7579msgstr "时间"
7580
7581#: builtin/pack-objects.c:2499
7582msgid "unpack unreachable objects newer than <time>"
7583msgstr "将比给定 <时间> 新的无法访问的对象解包"
7584
7585#: builtin/pack-objects.c:2502
7586msgid "create thin packs"
7587msgstr "创建精简包"
7588
7589#: builtin/pack-objects.c:2504
7590msgid "ignore packs that have companion .keep file"
7591msgstr "忽略配有 .keep 文件的包"
7592
7593#: builtin/pack-objects.c:2506
7594msgid "pack compression level"
7595msgstr "打包压缩级别"
7596
7597#: builtin/pack-objects.c:2508
7598msgid "do not hide commits by grafts"
7599msgstr "不隐藏移植覆盖的提交"
7600
7601#: builtin/pack-refs.c:6
7602msgid "git pack-refs [options]"
7603msgstr "git pack-refs [选项]"
7604
7605#: builtin/pack-refs.c:14
7606msgid "pack everything"
7607msgstr "打包一切"
7608
7609#: builtin/pack-refs.c:15
7610msgid "prune loose refs (default)"
7611msgstr "清除松散的引用(默认)"
7612
7613#: builtin/prune-packed.c:7
7614msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7615msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
7616
7617#: builtin/prune.c:12
7618msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7619msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7620
7621#: builtin/prune.c:132
7622msgid "do not remove, show only"
7623msgstr "不删除,只显示"
7624
7625#: builtin/prune.c:133
7626msgid "report pruned objects"
7627msgstr "报告清除的对象"
7628
7629#: builtin/prune.c:136
7630msgid "expire objects older than <time>"
7631msgstr "使早于给定时间的对象过期"
7632
7633#: builtin/push.c:14
7634msgid "git push [<options>] [<repository> [<refspec>...]]"
7635msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7636
7637#: builtin/push.c:47
7638msgid "tag shorthand without <tag>"
7639msgstr "tag 简写没有跟 <tag> 参数"
7640
7641#: builtin/push.c:66
7642msgid "--delete only accepts plain target ref names"
7643msgstr "--delete 只接受简单的目标引用名"
7644
7645#: builtin/push.c:101
7646msgid ""
7647"\n"
7648"To choose either option permanently, see push.default in 'git help config'."
7649msgstr ""
7650"\n"
7651"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7652
7653#: builtin/push.c:104
7654#, c-format
7655msgid ""
7656"The upstream branch of your current branch does not match\n"
7657"the name of your current branch. To push to the upstream branch\n"
7658"on the remote, use\n"
7659"\n"
7660" git push %s HEAD:%s\n"
7661"\n"
7662"To push to the branch of the same name on the remote, use\n"
7663"\n"
7664" git push %s %s\n"
7665"%s"
7666msgstr ""
7667"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7668"上游分支,使用\n"
7669"\n"
7670" git push %s HEAD:%s\n"
7671"\n"
7672"为推送至远程同名分支,使用\n"
7673"\n"
7674" git push %s %s\n"
7675"%s"
7676
7677#: builtin/push.c:119
7678#, c-format
7679msgid ""
7680"You are not currently on a branch.\n"
7681"To push the history leading to the current (detached HEAD)\n"
7682"state now, use\n"
7683"\n"
7684" git push %s HEAD:<name-of-remote-branch>\n"
7685msgstr ""
7686"您当前不在一个分支上。\n"
7687"现在为推送当前(分离头指针)的历史,使用\n"
7688"\n"
7689" git push %s HEAD:<name-of-remote-branch>\n"
7690
7691#: builtin/push.c:133
7692#, c-format
7693msgid ""
7694"The current branch %s has no upstream branch.\n"
7695"To push the current branch and set the remote as upstream, use\n"
7696"\n"
7697" git push --set-upstream %s %s\n"
7698msgstr ""
7699"当前分支 %s 没有对应的上游分支。\n"
7700"为推送当前分支并建立与远程上游的跟踪,使用\n"
7701"\n"
7702" git push --set-upstream %s %s\n"
7703
7704#: builtin/push.c:141
7705#, c-format
7706msgid "The current branch %s has multiple upstream branches, refusing to push."
7707msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7708
7709#: builtin/push.c:144
7710#, c-format
7711msgid ""
7712"You are pushing to remote '%s', which is not the upstream of\n"
7713"your current branch '%s', without telling me what to push\n"
7714"to update which remote branch."
7715msgstr ""
7716"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
7717"而没有告诉我要推送什么、更新哪个远程分支。"
7718
7719# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
7720#: builtin/push.c:167
7721msgid ""
7722"push.default is unset; its implicit value is changing in\n"
7723"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7724"and maintain the current behavior after the default changes, use:\n"
7725"\n"
7726" git config --global push.default matching\n"
7727"\n"
7728"To squelch this message and adopt the new behavior now, use:\n"
7729"\n"
7730" git config --global push.default simple\n"
7731"\n"
7732"See 'git help config' and search for 'push.default' for further "
7733"information.\n"
7734"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7735"'current' instead of 'simple' if you sometimes use older versions of Git)"
7736msgstr ""
7737"push.default 未设置,它的默认值将在 Git 2.0 由 'matching'\n"
7738"改变为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
7739"\n"
7740" git config --global push.default matching\n"
7741"\n"
7742"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
7743"\n"
7744" git config --global push.default simple\n"
7745"\n"
7746"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
7747"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
7748"为保持兼容,请用 'current' 代替 'simple')"
7749
7750#: builtin/push.c:227
7751msgid ""
7752"You didn't specify any refspecs to push, and push.default is \"nothing\"."
7753msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
7754
7755#: builtin/push.c:234
7756msgid ""
7757"Updates were rejected because the tip of your current branch is behind\n"
7758"its remote counterpart. Integrate the remote changes (e.g.\n"
7759"'git pull ...') before pushing again.\n"
7760"See the 'Note about fast-forwards' in 'git push --help' for details."
7761msgstr ""
7762"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
7763"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
7764"'git push --help' 中的 'Note about fast-forwards' 小节。"
7765
7766#: builtin/push.c:240
7767msgid ""
7768"Updates were rejected because a pushed branch tip is behind its remote\n"
7769"counterpart. If you did not intend to push that branch, you may want to\n"
7770"specify branches to push or set the 'push.default' configuration variable\n"
7771"to 'simple', 'current' or 'upstream' to push only the current branch."
7772msgstr ""
7773"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7774"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
7775"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7776"以便只推送当前分支。"
7777
7778#: builtin/push.c:246
7779msgid ""
7780"Updates were rejected because a pushed branch tip is behind its remote\n"
7781"counterpart. Check out this branch and integrate the remote changes\n"
7782"(e.g. 'git pull ...') before pushing again.\n"
7783"See the 'Note about fast-forwards' in 'git push --help' for details."
7784msgstr ""
7785"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7786"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
7787"'git push --help' 中的 'Note about fast-forwards' 小节。"
7788
7789#: builtin/push.c:252
7790msgid ""
7791"Updates were rejected because the remote contains work that you do\n"
7792"not have locally. This is usually caused by another repository pushing\n"
7793"to the same ref. You may want to first integrate the remote changes\n"
7794"(e.g., 'git pull ...') before pushing again.\n"
7795"See the 'Note about fast-forwards' in 'git push --help' for details."
7796msgstr ""
7797"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7798"一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
7799"(如 'git pull ...')。\n"
7800"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7801
7802#: builtin/push.c:259
7803msgid "Updates were rejected because the tag already exists in the remote."
7804msgstr "更新被拒绝因为 tag 在远程已经存在。"
7805
7806#: builtin/push.c:262
7807msgid ""
7808"You cannot update a remote ref that points at a non-commit object,\n"
7809"or update a remote ref to make it point at a non-commit object,\n"
7810"without using the '--force' option.\n"
7811msgstr ""
7812"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7813"也不能更新远程引用让其指向一个非提交对象。\n"
7814
7815#: builtin/push.c:328
7816#, c-format
7817msgid "Pushing to %s\n"
7818msgstr "推送到 %s\n"
7819
7820#: builtin/push.c:332
7821#, c-format
7822msgid "failed to push some refs to '%s'"
7823msgstr "无法推送一些引用到 '%s'"
7824
7825#: builtin/push.c:365
7826#, c-format
7827msgid "bad repository '%s'"
7828msgstr "坏的版本库 '%s'"
7829
7830#: builtin/push.c:366
7831msgid ""
7832"No configured push destination.\n"
7833"Either specify the URL from the command-line or configure a remote "
7834"repository using\n"
7835"\n"
7836" git remote add <name> <url>\n"
7837"\n"
7838"and then push using the remote name\n"
7839"\n"
7840" git push <name>\n"
7841msgstr ""
7842"没有配置推送目标。\n"
7843"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
7844"\n"
7845" git remote add <name> <url>\n"
7846"\n"
7847"然后使用该远程版本库名执行推送\n"
7848"\n"
7849" git push <name>\n"
7850
7851#: builtin/push.c:381
7852msgid "--all and --tags are incompatible"
7853msgstr "--all 和 --tags 不兼容"
7854
7855#: builtin/push.c:382
7856msgid "--all can't be combined with refspecs"
7857msgstr "--all 不能和引用规则同时使用"
7858
7859#: builtin/push.c:387
7860msgid "--mirror and --tags are incompatible"
7861msgstr "--mirror 和 --tags 不兼容"
7862
7863#: builtin/push.c:388
7864msgid "--mirror can't be combined with refspecs"
7865msgstr "--mirror 不能和引用规则同时使用"
7866
7867#: builtin/push.c:393
7868msgid "--all and --mirror are incompatible"
7869msgstr "--all 和 --mirror 不兼容"
7870
7871#: builtin/push.c:453
7872msgid "repository"
7873msgstr "版本库"
7874
7875#: builtin/push.c:454
7876msgid "push all refs"
7877msgstr "推送所有引用"
7878
7879#: builtin/push.c:455
7880msgid "mirror all refs"
7881msgstr "镜像所有引用"
7882
7883#: builtin/push.c:457
7884msgid "delete refs"
7885msgstr "删除引用"
7886
7887#: builtin/push.c:458
7888msgid "push tags (can't be used with --all or --mirror)"
7889msgstr "推送 tags(不能使用 --all or --mirror)"
7890
7891#: builtin/push.c:461
7892msgid "force updates"
7893msgstr "强制更新"
7894
7895#: builtin/push.c:463
7896msgid "refname>:<expect"
7897msgstr "引用名>:<期望值"
7898
7899#: builtin/push.c:464
7900msgid "require old value of ref to be at this value"
7901msgstr "要求引用旧的取值为设定值"
7902
7903#: builtin/push.c:466
7904msgid "check"
7905msgstr "检查"
7906
7907#: builtin/push.c:467
7908msgid "control recursive pushing of submodules"
7909msgstr "控制子模组的递归推送"
7910
7911#: builtin/push.c:469
7912msgid "use thin pack"
7913msgstr "使用精简打包"
7914
7915#: builtin/push.c:470 builtin/push.c:471
7916msgid "receive pack program"
7917msgstr "接收包程序"
7918
7919#: builtin/push.c:472
7920msgid "set upstream for git pull/status"
7921msgstr "设置 git pull/status 的上游"
7922
7923#: builtin/push.c:475
7924msgid "prune locally removed refs"
7925msgstr "清除本地删除的引用"
7926
7927#: builtin/push.c:477
7928msgid "bypass pre-push hook"
7929msgstr "绕过 pre-push 钩子"
7930
7931#: builtin/push.c:478
7932msgid "push missing but relevant tags"
7933msgstr "推送缺失的有关的 tags"
7934
7935#: builtin/push.c:488
7936msgid "--delete is incompatible with --all, --mirror and --tags"
7937msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7938
7939#: builtin/push.c:490
7940msgid "--delete doesn't make sense without any refs"
7941msgstr "--delete 未接任何引用没有意义"
7942
7943#: builtin/read-tree.c:36
7944msgid ""
7945"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7946"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7947"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7948msgstr ""
7949"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7950"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7951"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
7952
7953#: builtin/read-tree.c:109
7954msgid "write resulting index to <file>"
7955msgstr "将索引结果写入 <file>"
7956
7957#: builtin/read-tree.c:112
7958msgid "only empty the index"
7959msgstr "只是清空索引"
7960
7961#: builtin/read-tree.c:114
7962msgid "Merging"
7963msgstr "合并"
7964
7965#: builtin/read-tree.c:116
7966msgid "perform a merge in addition to a read"
7967msgstr "读取之余再执行一个合并"
7968
7969#: builtin/read-tree.c:118
7970msgid "3-way merge if no file level merging required"
7971msgstr "如果没有文件级合并需要,执行三路合并"
7972
7973#: builtin/read-tree.c:120
7974msgid "3-way merge in presence of adds and removes"
7975msgstr "存在添加和删除时,也执行三路合并"
7976
7977#: builtin/read-tree.c:122
7978msgid "same as -m, but discard unmerged entries"
7979msgstr "类似于 -m,但丢弃未合并的条目"
7980
7981#: builtin/read-tree.c:123
7982msgid "<subdirectory>/"
7983msgstr "<子目录>/"
7984
7985#: builtin/read-tree.c:124
7986msgid "read the tree into the index under <subdirectory>/"
7987msgstr "读取树对象到索引的 <子目录>/ 下"
7988
7989#: builtin/read-tree.c:127
7990msgid "update working tree with merge result"
7991msgstr "用合并的结果更新工作区"
7992
7993#: builtin/read-tree.c:129
7994msgid "gitignore"
7995msgstr "gitignore"
7996
7997#: builtin/read-tree.c:130
7998msgid "allow explicitly ignored files to be overwritten"
7999msgstr "允许忽略文件中设定的文件可以被覆盖"
8000
8001#: builtin/read-tree.c:133
8002msgid "don't check the working tree after merging"
8003msgstr "合并后不检查工作区"
8004
8005#: builtin/read-tree.c:134
8006msgid "don't update the index or the work tree"
8007msgstr "不更新索引区和工作区"
8008
8009#: builtin/read-tree.c:136
8010msgid "skip applying sparse checkout filter"
8011msgstr "跳过应用稀疏检出过滤器"
8012
8013#: builtin/read-tree.c:138
8014msgid "debug unpack-trees"
8015msgstr "调试 unpack-trees"
8016
8017#: builtin/reflog.c:499
8018#, c-format
8019msgid "%s' for '%s' is not a valid timestamp"
8020msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8021
8022#: builtin/reflog.c:615 builtin/reflog.c:620
8023#, c-format
8024msgid "'%s' is not a valid timestamp"
8025msgstr "'%s' 不是一个有效的时间戳"
8026
8027#: builtin/remote.c:11
8028msgid "git remote [-v | --verbose]"
8029msgstr "git remote [-v | --verbose]"
8030
8031#: builtin/remote.c:12
8032msgid ""
8033"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
8034"mirror=<fetch|push>] <name> <url>"
8035msgstr ""
8036"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8037"mirror=<fetch|push>] <名称> <url>"
8038
8039#: builtin/remote.c:13 builtin/remote.c:32
8040msgid "git remote rename <old> <new>"
8041msgstr "git remote rename <旧名称> <新名称>"
8042
8043#: builtin/remote.c:14 builtin/remote.c:37
8044msgid "git remote remove <name>"
8045msgstr "git remote remove <名称>"
8046
8047#: builtin/remote.c:15
8048msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
8049msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
8050
8051#: builtin/remote.c:16
8052msgid "git remote [-v | --verbose] show [-n] <name>"
8053msgstr "git remote [-v | --verbose] show [-n] <名称>"
8054
8055#: builtin/remote.c:17
8056msgid "git remote prune [-n | --dry-run] <name>"
8057msgstr "git remote prune [-n | --dry-run] <名称>"
8058
8059#: builtin/remote.c:18
8060msgid ""
8061"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8062msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8063
8064#: builtin/remote.c:19
8065msgid "git remote set-branches [--add] <name> <branch>..."
8066msgstr "git remote set-branches [--add] <名称> <分支>..."
8067
8068#: builtin/remote.c:20 builtin/remote.c:68
8069msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8070msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8071
8072#: builtin/remote.c:21 builtin/remote.c:69
8073msgid "git remote set-url --add <name> <newurl>"
8074msgstr "git remote set-url --add <名称> <新的地址>"
8075
8076#: builtin/remote.c:22 builtin/remote.c:70
8077msgid "git remote set-url --delete <name> <url>"
8078msgstr "git remote set-url --delete <名称> <地址>"
8079
8080#: builtin/remote.c:27
8081msgid "git remote add [<options>] <name> <url>"
8082msgstr "git remote add [<选项>] <名称> <地址>"
8083
8084#: builtin/remote.c:42
8085msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8086msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8087
8088#: builtin/remote.c:47
8089msgid "git remote set-branches <name> <branch>..."
8090msgstr "git remote set-branches <名称> <分支>..."
8091
8092#: builtin/remote.c:48
8093msgid "git remote set-branches --add <name> <branch>..."
8094msgstr "git remote set-branches --add <名称> <分支>..."
8095
8096#: builtin/remote.c:53
8097msgid "git remote show [<options>] <name>"
8098msgstr "git remote show [<选项>] <名称>"
8099
8100#: builtin/remote.c:58
8101msgid "git remote prune [<options>] <name>"
8102msgstr "git remote prune [<选项>] <名称>"
8103
8104#: builtin/remote.c:63
8105msgid "git remote update [<options>] [<group> | <remote>]..."
8106msgstr "git remote update [<选项>] [<组> | <远程>]..."
8107
8108#: builtin/remote.c:98
8109#, c-format
8110msgid "Updating %s"
8111msgstr "更新 %s 中"
8112
8113#: builtin/remote.c:130
8114msgid ""
8115"--mirror is dangerous and deprecated; please\n"
8116"\t use --mirror=fetch or --mirror=push instead"
8117msgstr ""
8118"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8119"\t 或 --mirror=push"
8120
8121#: builtin/remote.c:147
8122#, c-format
8123msgid "unknown mirror argument: %s"
8124msgstr "未知的镜像参数:%s"
8125
8126#: builtin/remote.c:163
8127msgid "fetch the remote branches"
8128msgstr "抓取远程的分支"
8129
8130#: builtin/remote.c:165
8131msgid "import all tags and associated objects when fetching"
8132msgstr "抓取时导入所有的 tags 和关联对象"
8133
8134#: builtin/remote.c:168
8135msgid "or do not fetch any tag at all (--no-tags)"
8136msgstr "或不抓取任何 tag(--no-tags)"
8137
8138#: builtin/remote.c:170
8139msgid "branch(es) to track"
8140msgstr "跟踪的分支"
8141
8142#: builtin/remote.c:171
8143msgid "master branch"
8144msgstr "主线分支"
8145
8146#: builtin/remote.c:172
8147msgid "push|fetch"
8148msgstr "push|fetch"
8149
8150#: builtin/remote.c:173
8151msgid "set up remote as a mirror to push to or fetch from"
8152msgstr "把远程设置为用以推送或抓取的镜像"
8153
8154#: builtin/remote.c:185
8155msgid "specifying a master branch makes no sense with --mirror"
8156msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8157
8158#: builtin/remote.c:187
8159msgid "specifying branches to track makes sense only with fetch mirrors"
8160msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8161
8162#: builtin/remote.c:195 builtin/remote.c:646
8163#, c-format
8164msgid "remote %s already exists."
8165msgstr "远程 %s 已经存在。"
8166
8167#: builtin/remote.c:199 builtin/remote.c:650
8168#, c-format
8169msgid "'%s' is not a valid remote name"
8170msgstr "'%s' 不是一个有效的远程名称"
8171
8172#: builtin/remote.c:243
8173#, c-format
8174msgid "Could not setup master '%s'"
8175msgstr "无法设置 master '%s'"
8176
8177#: builtin/remote.c:299
8178#, c-format
8179msgid "more than one %s"
8180msgstr "多于一个 %s"
8181
8182#: builtin/remote.c:339
8183#, c-format
8184msgid "Could not get fetch map for refspec %s"
8185msgstr "无法得到引用规则 %s 的获取列表"
8186
8187#: builtin/remote.c:440 builtin/remote.c:448
8188msgid "(matching)"
8189msgstr "(匹配)"
8190
8191#: builtin/remote.c:452
8192msgid "(delete)"
8193msgstr "(删除)"
8194
8195#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
8196#, c-format
8197msgid "Could not append '%s' to '%s'"
8198msgstr "不能添加 '%s' 至 '%s'"
8199
8200#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
8201#, c-format
8202msgid "No such remote: %s"
8203msgstr "没有这样的远程:%s"
8204
8205#: builtin/remote.c:656
8206#, c-format
8207msgid "Could not rename config section '%s' to '%s'"
8208msgstr "不能重命名配置小节 '%s' 到 '%s'"
8209
8210#: builtin/remote.c:662 builtin/remote.c:799
8211#, c-format
8212msgid "Could not remove config section '%s'"
8213msgstr "不能移除配置小节 '%s'"
8214
8215#: builtin/remote.c:677
8216#, c-format
8217msgid ""
8218"Not updating non-default fetch refspec\n"
8219"\t%s\n"
8220"\tPlease update the configuration manually if necessary."
8221msgstr ""
8222"没有更新非默认的获取引用规则\n"
8223"\t%s\n"
8224"\t如果必要请手动更新配置。"
8225
8226#: builtin/remote.c:683
8227#, c-format
8228msgid "Could not append '%s'"
8229msgstr "不能追加 '%s'"
8230
8231#: builtin/remote.c:694
8232#, c-format
8233msgid "Could not set '%s'"
8234msgstr "不能设置 '%s'"
8235
8236#: builtin/remote.c:716
8237#, c-format
8238msgid "deleting '%s' failed"
8239msgstr "删除 '%s' 失败"
8240
8241#: builtin/remote.c:750
8242#, c-format
8243msgid "creating '%s' failed"
8244msgstr "创建 '%s' 失败"
8245
8246#: builtin/remote.c:764
8247#, c-format
8248msgid "Could not remove branch %s"
8249msgstr "无法移除分支 %s"
8250
8251#: builtin/remote.c:834
8252msgid ""
8253"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8254"to delete it, use:"
8255msgid_plural ""
8256"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8257"to delete them, use:"
8258msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8259msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8260
8261#: builtin/remote.c:943
8262#, c-format
8263msgid " new (next fetch will store in remotes/%s)"
8264msgstr " 新的(下一次获取将存储于 remotes/%s)"
8265
8266#: builtin/remote.c:946
8267msgid " tracked"
8268msgstr " 已跟踪"
8269
8270#: builtin/remote.c:948
8271msgid " stale (use 'git remote prune' to remove)"
8272msgstr " 过时(使用 'git remote prune' 来移除)"
8273
8274#: builtin/remote.c:950
8275msgid " ???"
8276msgstr " ???"
8277
8278#: builtin/remote.c:991
8279#, c-format
8280msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8281msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8282
8283#: builtin/remote.c:998
8284#, c-format
8285msgid "rebases onto remote %s"
8286msgstr "变基到远程 %s"
8287
8288#: builtin/remote.c:1001
8289#, c-format
8290msgid " merges with remote %s"
8291msgstr " 与远程 %s 合并"
8292
8293#: builtin/remote.c:1002
8294msgid " and with remote"
8295msgstr " 且有远程"
8296
8297#: builtin/remote.c:1004
8298#, c-format
8299msgid "merges with remote %s"
8300msgstr "与远程 %s 合并"
8301
8302#: builtin/remote.c:1005
8303msgid " and with remote"
8304msgstr " 且有远程"
8305
8306#: builtin/remote.c:1051
8307msgid "create"
8308msgstr "创建"
8309
8310#: builtin/remote.c:1054
8311msgid "delete"
8312msgstr "删除"
8313
8314#: builtin/remote.c:1058
8315msgid "up to date"
8316msgstr "最新"
8317
8318#: builtin/remote.c:1061
8319msgid "fast-forwardable"
8320msgstr "可快进"
8321
8322#: builtin/remote.c:1064
8323msgid "local out of date"
8324msgstr "本地已过时"
8325
8326#: builtin/remote.c:1071
8327#, c-format
8328msgid " %-*s forces to %-*s (%s)"
8329msgstr " %-*s 强制推送至 %-*s (%s)"
8330
8331#: builtin/remote.c:1074
8332#, c-format
8333msgid " %-*s pushes to %-*s (%s)"
8334msgstr " %-*s 推送至 %-*s (%s)"
8335
8336#: builtin/remote.c:1078
8337#, c-format
8338msgid " %-*s forces to %s"
8339msgstr " %-*s 强制推送至 %s"
8340
8341#: builtin/remote.c:1081
8342#, c-format
8343msgid " %-*s pushes to %s"
8344msgstr " %-*s 推送至 %s"
8345
8346#: builtin/remote.c:1091
8347msgid "do not query remotes"
8348msgstr "不查询远程"
8349
8350#: builtin/remote.c:1118
8351#, c-format
8352msgid "* remote %s"
8353msgstr "* 远程 %s"
8354
8355#: builtin/remote.c:1119
8356#, c-format
8357msgid " Fetch URL: %s"
8358msgstr " 获取地址:%s"
8359
8360#: builtin/remote.c:1120 builtin/remote.c:1285
8361msgid "(no URL)"
8362msgstr "(无 URL)"
8363
8364#: builtin/remote.c:1129 builtin/remote.c:1131
8365#, c-format
8366msgid " Push URL: %s"
8367msgstr " 推送地址:%s"
8368
8369#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
8370#, c-format
8371msgid " HEAD branch: %s"
8372msgstr " HEAD分支:%s"
8373
8374#: builtin/remote.c:1139
8375#, c-format
8376msgid ""
8377" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8378msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8379
8380#: builtin/remote.c:1151
8381#, c-format
8382msgid " Remote branch:%s"
8383msgid_plural " Remote branches:%s"
8384msgstr[0] " 远程分支:%s"
8385msgstr[1] " 远程分支:%s"
8386
8387# 译者:中文字符串拼接,可删除前导空格
8388#: builtin/remote.c:1154 builtin/remote.c:1181
8389msgid " (status not queried)"
8390msgstr "(状态未查询)"
8391
8392#: builtin/remote.c:1163
8393msgid " Local branch configured for 'git pull':"
8394msgid_plural " Local branches configured for 'git pull':"
8395msgstr[0] " 为 'git pull' 配置的本地分支:"
8396msgstr[1] " 为 'git pull' 配置的本地分支:"
8397
8398#: builtin/remote.c:1171
8399msgid " Local refs will be mirrored by 'git push'"
8400msgstr " 本地引用将在 'git push' 时被镜像"
8401
8402#: builtin/remote.c:1178
8403#, c-format
8404msgid " Local ref configured for 'git push'%s:"
8405msgid_plural " Local refs configured for 'git push'%s:"
8406msgstr[0] " 为 'git push' 配置的本地引用%s:"
8407msgstr[1] " 为 'git push' 配置的本地引用%s:"
8408
8409#: builtin/remote.c:1199
8410msgid "set refs/remotes/<name>/HEAD according to remote"
8411msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8412
8413#: builtin/remote.c:1201
8414msgid "delete refs/remotes/<name>/HEAD"
8415msgstr "删除 refs/remotes/<名称>/HEAD"
8416
8417#: builtin/remote.c:1216
8418msgid "Cannot determine remote HEAD"
8419msgstr "无法确定远程 HEAD"
8420
8421#: builtin/remote.c:1218
8422msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8423msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8424
8425#: builtin/remote.c:1228
8426#, c-format
8427msgid "Could not delete %s"
8428msgstr "无法删除 %s"
8429
8430#: builtin/remote.c:1236
8431#, c-format
8432msgid "Not a valid ref: %s"
8433msgstr "不是一个有效引用:%s"
8434
8435#: builtin/remote.c:1238
8436#, c-format
8437msgid "Could not setup %s"
8438msgstr "不能设置 %s"
8439
8440# 译者:注意保持前导空格
8441#: builtin/remote.c:1274
8442#, c-format
8443msgid " %s will become dangling!"
8444msgstr " %s 将成为摇摆状态!"
8445
8446# 译者:注意保持前导空格
8447#: builtin/remote.c:1275
8448#, c-format
8449msgid " %s has become dangling!"
8450msgstr " %s 已成为摇摆状态!"
8451
8452#: builtin/remote.c:1281
8453#, c-format
8454msgid "Pruning %s"
8455msgstr "修剪 %s"
8456
8457#: builtin/remote.c:1282
8458#, c-format
8459msgid "URL: %s"
8460msgstr "URL:%s"
8461
8462#: builtin/remote.c:1295
8463#, c-format
8464msgid " * [would prune] %s"
8465msgstr " * [将删除] %s"
8466
8467#: builtin/remote.c:1298
8468#, c-format
8469msgid " * [pruned] %s"
8470msgstr " * [已删除] %s"
8471
8472#: builtin/remote.c:1321
8473msgid "prune remotes after fetching"
8474msgstr "抓取后清除远程"
8475
8476#: builtin/remote.c:1387 builtin/remote.c:1461
8477#, c-format
8478msgid "No such remote '%s'"
8479msgstr "没有此远程 '%s'"
8480
8481#: builtin/remote.c:1407
8482msgid "add branch"
8483msgstr "添加分支"
8484
8485#: builtin/remote.c:1414
8486msgid "no remote specified"
8487msgstr "未指定远程"
8488
8489#: builtin/remote.c:1436
8490msgid "manipulate push URLs"
8491msgstr "操作推送 URLS"
8492
8493#: builtin/remote.c:1438
8494msgid "add URL"
8495msgstr "添加 URL"
8496
8497#: builtin/remote.c:1440
8498msgid "delete URLs"
8499msgstr "删除 URLS"
8500
8501#: builtin/remote.c:1447
8502msgid "--add --delete doesn't make sense"
8503msgstr "--add --delete 无意义"
8504
8505#: builtin/remote.c:1487
8506#, c-format
8507msgid "Invalid old URL pattern: %s"
8508msgstr "无效的旧URL匹配模版:%s"
8509
8510#: builtin/remote.c:1495
8511#, c-format
8512msgid "No such URL found: %s"
8513msgstr "未找到此URL:%s"
8514
8515#: builtin/remote.c:1497
8516msgid "Will not delete all non-push URLs"
8517msgstr "将不会删除所有非推送URL地址"
8518
8519#: builtin/remote.c:1569
8520msgid "be verbose; must be placed before a subcommand"
8521msgstr "冗长输出;必须置于子命令之前"
8522
8523#: builtin/repack.c:15
8524msgid "git repack [options]"
8525msgstr "git repack [选项]"
8526
8527#: builtin/repack.c:143
8528msgid "pack everything in a single pack"
8529msgstr "所有内容打包到一个包文件中"
8530
8531#: builtin/repack.c:145
8532msgid "same as -a, and turn unreachable objects loose"
8533msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8534
8535#: builtin/repack.c:148
8536msgid "remove redundant packs, and run git-prune-packed"
8537msgstr "删除多余的包,运行 git-prune-packed"
8538
8539#: builtin/repack.c:150
8540msgid "pass --no-reuse-delta to git-pack-objects"
8541msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8542
8543#: builtin/repack.c:152
8544msgid "pass --no-reuse-object to git-pack-objects"
8545msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8546
8547#: builtin/repack.c:154
8548msgid "do not run git-update-server-info"
8549msgstr "不运行 git-update-server-info"
8550
8551#: builtin/repack.c:157
8552msgid "pass --local to git-pack-objects"
8553msgstr "向 git-pack-objects 传递参数 --local"
8554
8555#: builtin/repack.c:158
8556msgid "approxidate"
8557msgstr "近似日期"
8558
8559#: builtin/repack.c:159
8560msgid "with -A, do not loosen objects older than this"
8561msgstr "使用 -A,不要将早于给定时间的对象过期"
8562
8563#: builtin/repack.c:161
8564msgid "size of the window used for delta compression"
8565msgstr "用于增量压缩的窗口值"
8566
8567#: builtin/repack.c:163
8568msgid "same as the above, but limit memory size instead of entries count"
8569msgstr "和上面的相似,但限制内存大小而非条目数"
8570
8571#: builtin/repack.c:165
8572msgid "limits the maximum delta depth"
8573msgstr "限制最大增量深度"
8574
8575#: builtin/repack.c:167
8576msgid "maximum size of each packfile"
8577msgstr "每个包的最大尺寸"
8578
8579#: builtin/repack.c:345
8580#, c-format
8581msgid "removing '%s' failed"
8582msgstr "删除 '%s' 失败"
8583
8584#: builtin/replace.c:17
8585msgid "git replace [-f] <object> <replacement>"
8586msgstr "git replace [-f] <对象> <替换物>"
8587
8588#: builtin/replace.c:18
8589msgid "git replace -d <object>..."
8590msgstr "git replace -d <对象>..."
8591
8592#: builtin/replace.c:19
8593msgid "git replace -l [<pattern>]"
8594msgstr "git replace -l [<模式>]"
8595
8596#: builtin/replace.c:131
8597msgid "list replace refs"
8598msgstr "列出替换的引用"
8599
8600#: builtin/replace.c:132
8601msgid "delete replace refs"
8602msgstr "删除替换的引用"
8603
8604#: builtin/replace.c:133
8605msgid "replace the ref if it exists"
8606msgstr "如果存在则替换引用"
8607
8608#: builtin/rerere.c:12
8609msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
8610msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
8611
8612#: builtin/rerere.c:57
8613msgid "register clean resolutions in index"
8614msgstr "在索引中注册干净的解决方案"
8615
8616#: builtin/reset.c:25
8617msgid ""
8618"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8619msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
8620
8621#: builtin/reset.c:26
8622msgid "git reset [-q] <tree-ish> [--] <paths>..."
8623msgstr "git reset [-q] <树或提交> [--] <路径>..."
8624
8625#: builtin/reset.c:27
8626msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8627msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
8628
8629#: builtin/reset.c:33
8630msgid "mixed"
8631msgstr "混杂"
8632
8633#: builtin/reset.c:33
8634msgid "soft"
8635msgstr "软性"
8636
8637#: builtin/reset.c:33
8638msgid "hard"
8639msgstr "硬性"
8640
8641#: builtin/reset.c:33
8642msgid "merge"
8643msgstr "合并"
8644
8645#: builtin/reset.c:33
8646msgid "keep"
8647msgstr "保持"
8648
8649#: builtin/reset.c:73
8650msgid "You do not have a valid HEAD."
8651msgstr "您没有一个有效的 HEAD。"
8652
8653#: builtin/reset.c:75
8654msgid "Failed to find tree of HEAD."
8655msgstr "无法找到 HEAD 指向的树。"
8656
8657#: builtin/reset.c:81
8658#, c-format
8659msgid "Failed to find tree of %s."
8660msgstr "无法找到 %s 指向的树。"
8661
8662#: builtin/reset.c:99
8663#, c-format
8664msgid "HEAD is now at %s"
8665msgstr "HEAD 现在位于 %s"
8666
8667# 译者:汉字之间无空格,故删除%s前后空格
8668#: builtin/reset.c:172
8669#, c-format
8670msgid "Cannot do a %s reset in the middle of a merge."
8671msgstr "在合并过程中不能做%s重置操作。"
8672
8673#: builtin/reset.c:262
8674msgid "be quiet, only report errors"
8675msgstr "安静模式,只报告错误"
8676
8677#: builtin/reset.c:264
8678msgid "reset HEAD and index"
8679msgstr "重置 HEAD 和索引"
8680
8681#: builtin/reset.c:265
8682msgid "reset only HEAD"
8683msgstr "只重置 HEAD"
8684
8685#: builtin/reset.c:267 builtin/reset.c:269
8686msgid "reset HEAD, index and working tree"
8687msgstr "重置 HEAD、索引和工作区"
8688
8689#: builtin/reset.c:271
8690msgid "reset HEAD but keep local changes"
8691msgstr "重置 HEAD 但保存本地变更"
8692
8693#: builtin/reset.c:289
8694#, c-format
8695msgid "Failed to resolve '%s' as a valid revision."
8696msgstr "无法将 '%s' 解析为一个有效的版本。"
8697
8698#: builtin/reset.c:292 builtin/reset.c:300
8699#, c-format
8700msgid "Could not parse object '%s'."
8701msgstr "不能解析对象 '%s'。"
8702
8703#: builtin/reset.c:297
8704#, c-format
8705msgid "Failed to resolve '%s' as a valid tree."
8706msgstr "无法将 '%s' 解析为一个有效的树对象。"
8707
8708#: builtin/reset.c:306
8709msgid "--patch is incompatible with --{hard,mixed,soft}"
8710msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
8711
8712#: builtin/reset.c:315
8713msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8714msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
8715
8716# 译者:汉字之间无空格,故删除%s前后空格
8717#: builtin/reset.c:317
8718#, c-format
8719msgid "Cannot do %s reset with paths."
8720msgstr "不能带路径进行%s重置。"
8721
8722# 译者:汉字之间无空格,故删除%s前后空格
8723#: builtin/reset.c:327
8724#, c-format
8725msgid "%s reset is not allowed in a bare repository"
8726msgstr "不能对裸版本库进行%s重置"
8727
8728#: builtin/reset.c:344
8729msgid "Unstaged changes after reset:"
8730msgstr "重置后撤出暂存区的变更:"
8731
8732#: builtin/reset.c:350
8733#, c-format
8734msgid "Could not reset index file to revision '%s'."
8735msgstr "不能重置索引文件至版本 '%s'。"
8736
8737#: builtin/reset.c:355
8738msgid "Could not write new index file."
8739msgstr "不能写入新的索引文件。"
8740
8741#: builtin/rev-parse.c:345
8742msgid "git rev-parse --parseopt [options] -- [<args>...]"
8743msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
8744
8745#: builtin/rev-parse.c:350
8746msgid "keep the `--` passed as an arg"
8747msgstr "保持 `--` 作为一个参数传递"
8748
8749#: builtin/rev-parse.c:352
8750msgid "stop parsing after the first non-option argument"
8751msgstr "遇到第一个非选项参数后停止解析"
8752
8753#: builtin/rev-parse.c:470
8754msgid ""
8755"git rev-parse --parseopt [options] -- [<args>...]\n"
8756" or: git rev-parse --sq-quote [<arg>...]\n"
8757" or: git rev-parse [options] [<arg>...]\n"
8758"\n"
8759"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8760msgstr ""
8761"git rev-parse --parseopt [选项] -- [<参数>...]\n"
8762" 或者:git rev-parse --sq-quote [<参数>...]\n"
8763" 或者:git rev-parse [选项] [<参数>...]\n"
8764"\n"
8765"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
8766
8767#: builtin/revert.c:22
8768msgid "git revert [options] <commit-ish>..."
8769msgstr "git revert [选项] <提交号>..."
8770
8771#: builtin/revert.c:23
8772msgid "git revert <subcommand>"
8773msgstr "git revert <子命令>"
8774
8775#: builtin/revert.c:28
8776msgid "git cherry-pick [options] <commit-ish>..."
8777msgstr "git cherry-pick [选项] <提交号>..."
8778
8779#: builtin/revert.c:29
8780msgid "git cherry-pick <subcommand>"
8781msgstr "git cherry-pick <子命令>"
8782
8783#: builtin/revert.c:71
8784#, c-format
8785msgid "%s: %s cannot be used with %s"
8786msgstr "%s:%s 不能和 %s 同时使用"
8787
8788#: builtin/revert.c:80
8789msgid "end revert or cherry-pick sequence"
8790msgstr "终止反转或拣选操作"
8791
8792#: builtin/revert.c:81
8793msgid "resume revert or cherry-pick sequence"
8794msgstr "继续反转或拣选操作"
8795
8796#: builtin/revert.c:82
8797msgid "cancel revert or cherry-pick sequence"
8798msgstr "取消反转或拣选操作"
8799
8800#: builtin/revert.c:83
8801msgid "don't automatically commit"
8802msgstr "不要自动提交"
8803
8804#: builtin/revert.c:84
8805msgid "edit the commit message"
8806msgstr "编辑提交说明"
8807
8808#: builtin/revert.c:87
8809msgid "parent number"
8810msgstr "父编号"
8811
8812#: builtin/revert.c:89
8813msgid "merge strategy"
8814msgstr "合并策略"
8815
8816#: builtin/revert.c:90
8817msgid "option"
8818msgstr "选项"
8819
8820#: builtin/revert.c:91
8821msgid "option for merge strategy"
8822msgstr "合并策略的选项"
8823
8824#: builtin/revert.c:102
8825msgid "append commit name"
8826msgstr "追加提交名称"
8827
8828#: builtin/revert.c:103
8829msgid "allow fast-forward"
8830msgstr "允许快进式"
8831
8832#: builtin/revert.c:104
8833msgid "preserve initially empty commits"
8834msgstr "保留初始化的空提交"
8835
8836#: builtin/revert.c:105
8837msgid "allow commits with empty messages"
8838msgstr "允许提交说明为空"
8839
8840#: builtin/revert.c:106
8841msgid "keep redundant, empty commits"
8842msgstr "保持多余的、空的提交"
8843
8844#: builtin/revert.c:110
8845msgid "program error"
8846msgstr "程序错误"
8847
8848#: builtin/revert.c:195
8849msgid "revert failed"
8850msgstr "还原失败"
8851
8852#: builtin/revert.c:210
8853msgid "cherry-pick failed"
8854msgstr "拣选失败"
8855
8856#: builtin/rm.c:17
8857msgid "git rm [options] [--] <file>..."
8858msgstr "git rm [选项] [--] <文件>..."
8859
8860#: builtin/rm.c:65
8861msgid ""
8862"the following submodule (or one of its nested submodules)\n"
8863"uses a .git directory:"
8864msgid_plural ""
8865"the following submodules (or one of its nested submodules)\n"
8866"use a .git directory:"
8867msgstr[0] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
8868msgstr[1] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
8869
8870#: builtin/rm.c:71
8871msgid ""
8872"\n"
8873"(use 'rm -rf' if you really want to remove it including all of its history)"
8874msgstr ""
8875"\n"
8876"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
8877
8878#: builtin/rm.c:231
8879msgid ""
8880"the following file has staged content different from both the\n"
8881"file and the HEAD:"
8882msgid_plural ""
8883"the following files have staged content different from both the\n"
8884"file and the HEAD:"
8885msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
8886msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
8887
8888#: builtin/rm.c:236
8889msgid ""
8890"\n"
8891"(use -f to force removal)"
8892msgstr ""
8893"\n"
8894"(使用 -f 强制删除)"
8895
8896#: builtin/rm.c:240
8897msgid "the following file has changes staged in the index:"
8898msgid_plural "the following files have changes staged in the index:"
8899msgstr[0] "如下文件相对索引区的内容有修改"
8900msgstr[1] "如下文件相对索引区的内容有修改"
8901
8902#: builtin/rm.c:244 builtin/rm.c:255
8903msgid ""
8904"\n"
8905"(use --cached to keep the file, or -f to force removal)"
8906msgstr ""
8907"\n"
8908"(使用 --cached 保留本地文件,或用 -f 强制删除)"
8909
8910#: builtin/rm.c:252
8911msgid "the following file has local modifications:"
8912msgid_plural "the following files have local modifications:"
8913msgstr[0] "如下文件有本地修改:"
8914msgstr[1] "如下文件有本地修改:"
8915
8916#: builtin/rm.c:270
8917msgid "do not list removed files"
8918msgstr "不列出删除的文件"
8919
8920#: builtin/rm.c:271
8921msgid "only remove from the index"
8922msgstr "只从索引区删除"
8923
8924#: builtin/rm.c:272
8925msgid "override the up-to-date check"
8926msgstr "忽略文件更新状态检查"
8927
8928#: builtin/rm.c:273
8929msgid "allow recursive removal"
8930msgstr "允许递归删除"
8931
8932#: builtin/rm.c:275
8933msgid "exit with a zero status even if nothing matched"
8934msgstr "即使没有匹配,也以零状态退出"
8935
8936#: builtin/rm.c:336
8937#, c-format
8938msgid "not removing '%s' recursively without -r"
8939msgstr "未提供 -r 选项不会递归删除 '%s'"
8940
8941#: builtin/rm.c:375
8942#, c-format
8943msgid "git rm: unable to remove %s"
8944msgstr "git rm:不能删除 %s"
8945
8946#: builtin/shortlog.c:13
8947msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
8948msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
8949
8950#: builtin/shortlog.c:131
8951#, c-format
8952msgid "Missing author: %s"
8953msgstr "缺少作者:%s"
8954
8955#: builtin/shortlog.c:230
8956msgid "sort output according to the number of commits per author"
8957msgstr "根据每个作者的提交数量排序"
8958
8959#: builtin/shortlog.c:232
8960msgid "Suppress commit descriptions, only provides commit count"
8961msgstr "隐藏提交说明,只提供提交数量"
8962
8963#: builtin/shortlog.c:234
8964msgid "Show the email address of each author"
8965msgstr "显示每个作者的电子邮件地址"
8966
8967#: builtin/shortlog.c:235
8968msgid "w[,i1[,i2]]"
8969msgstr "w[,i1[,i2]]"
8970
8971#: builtin/shortlog.c:236
8972msgid "Linewrap output"
8973msgstr "折行输出"
8974
8975#: builtin/show-branch.c:9
8976msgid ""
8977"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8978"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8979"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8980"<glob>)...]"
8981msgstr ""
8982"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8983"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8984"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8985"<glob>)...]"
8986
8987#: builtin/show-branch.c:10
8988msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8989msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8990
8991#: builtin/show-branch.c:650
8992msgid "show remote-tracking and local branches"
8993msgstr "显示远程跟踪的和本地的分支"
8994
8995#: builtin/show-branch.c:652
8996msgid "show remote-tracking branches"
8997msgstr "显示远程跟踪的分支"
8998
8999#: builtin/show-branch.c:654
9000msgid "color '*!+-' corresponding to the branch"
9001msgstr "着色 '*!+-' 到相应的分支"
9002
9003#: builtin/show-branch.c:656
9004msgid "show <n> more commits after the common ancestor"
9005msgstr "显示共同祖先后的 <n> 个提交"
9006
9007#: builtin/show-branch.c:658
9008msgid "synonym to more=-1"
9009msgstr "和 more=-1 同义"
9010
9011#: builtin/show-branch.c:659
9012msgid "suppress naming strings"
9013msgstr "不显示字符串命名"
9014
9015#: builtin/show-branch.c:661
9016msgid "include the current branch"
9017msgstr "包括当前分支"
9018
9019#: builtin/show-branch.c:663
9020msgid "name commits with their object names"
9021msgstr "以对象名字命名提交"
9022
9023#: builtin/show-branch.c:665
9024msgid "show possible merge bases"
9025msgstr "显示可能合并的基线"
9026
9027#: builtin/show-branch.c:667
9028msgid "show refs unreachable from any other ref"
9029msgstr "显示没有任何引用的的引用"
9030
9031#: builtin/show-branch.c:669
9032msgid "show commits in topological order"
9033msgstr "以拓扑顺序显示提交"
9034
9035#: builtin/show-branch.c:672
9036msgid "show only commits not on the first branch"
9037msgstr "只显示不在第一个分支上的提交"
9038
9039#: builtin/show-branch.c:674
9040msgid "show merges reachable from only one tip"
9041msgstr "显示仅一个分支可访问的合并提交"
9042
9043#: builtin/show-branch.c:676
9044msgid "topologically sort, maintaining date order where possible"
9045msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9046
9047#: builtin/show-branch.c:679
9048msgid "<n>[,<base>]"
9049msgstr "<n>[,<base>]"
9050
9051#: builtin/show-branch.c:680
9052msgid "show <n> most recent ref-log entries starting at base"
9053msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9054
9055#: builtin/show-ref.c:10
9056msgid ""
9057"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9058"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9059msgstr ""
9060"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9061"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9062
9063#: builtin/show-ref.c:11
9064msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9065msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9066
9067#: builtin/show-ref.c:168
9068msgid "only show tags (can be combined with heads)"
9069msgstr "只显示 tags(可以和头共用)"
9070
9071#: builtin/show-ref.c:169
9072msgid "only show heads (can be combined with tags)"
9073msgstr "只显示头(可以和 tags 共用)"
9074
9075#: builtin/show-ref.c:170
9076msgid "stricter reference checking, requires exact ref path"
9077msgstr "更严格的引用检测,需要精确的引用路径"
9078
9079#: builtin/show-ref.c:173 builtin/show-ref.c:175
9080msgid "show the HEAD reference, even if it would be filtered out"
9081msgstr "显示 HEAD 引用,即使被过滤掉"
9082
9083#: builtin/show-ref.c:177
9084msgid "dereference tags into object IDs"
9085msgstr "转换 tags 到对象ID"
9086
9087#: builtin/show-ref.c:179
9088msgid "only show SHA1 hash using <n> digits"
9089msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9090
9091#: builtin/show-ref.c:183
9092msgid "do not print results to stdout (useful with --verify)"
9093msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9094
9095#: builtin/show-ref.c:185
9096msgid "show refs from stdin that aren't in local repository"
9097msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9098
9099#: builtin/symbolic-ref.c:7
9100msgid "git symbolic-ref [options] name [ref]"
9101msgstr "git symbolic-ref [选项] 名称 [引用]"
9102
9103#: builtin/symbolic-ref.c:8
9104msgid "git symbolic-ref -d [-q] name"
9105msgstr "git symbolic-ref -d [-q] 名称"
9106
9107#: builtin/symbolic-ref.c:40
9108msgid "suppress error message for non-symbolic (detached) refs"
9109msgstr "不显示非符号(分离的)引用的错误信息"
9110
9111#: builtin/symbolic-ref.c:41
9112msgid "delete symbolic ref"
9113msgstr "删除符号引用"
9114
9115#: builtin/symbolic-ref.c:42
9116msgid "shorten ref output"
9117msgstr "简短的引用输出"
9118
9119#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
9120msgid "reason"
9121msgstr "原因"
9122
9123#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
9124msgid "reason of the update"
9125msgstr "更新的原因"
9126
9127#: builtin/tag.c:22
9128msgid ""
9129"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
9130msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
9131
9132#: builtin/tag.c:23
9133msgid "git tag -d <tagname>..."
9134msgstr "git tag -d <标签名>..."
9135
9136#: builtin/tag.c:24
9137msgid ""
9138"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9139"\t\t[<pattern>...]"
9140msgstr ""
9141"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
9142"\t\t[<模式>...]"
9143
9144#: builtin/tag.c:26
9145msgid "git tag -v <tagname>..."
9146msgstr "git tag -v <标签名>..."
9147
9148#: builtin/tag.c:60
9149#, c-format
9150msgid "malformed object at '%s'"
9151msgstr "非法的对象于 '%s'"
9152
9153#: builtin/tag.c:207
9154#, c-format
9155msgid "tag name too long: %.*s..."
9156msgstr "tag 名字太长:%.*s..."
9157
9158#: builtin/tag.c:212
9159#, c-format
9160msgid "tag '%s' not found."
9161msgstr "tag '%s' 未发现。"
9162
9163#: builtin/tag.c:227
9164#, c-format
9165msgid "Deleted tag '%s' (was %s)\n"
9166msgstr "已删除 tag '%s'(曾为 %s)\n"
9167
9168#: builtin/tag.c:239
9169#, c-format
9170msgid "could not verify the tag '%s'"
9171msgstr "不能校验 tag '%s'"
9172
9173#: builtin/tag.c:249
9174#, c-format
9175msgid ""
9176"\n"
9177"Write a tag message\n"
9178"Lines starting with '%c' will be ignored.\n"
9179msgstr ""
9180"\n"
9181"输入一个 tag 说明\n"
9182"以 '%c' 开头的行将被忽略。\n"
9183
9184#: builtin/tag.c:253
9185#, c-format
9186msgid ""
9187"\n"
9188"Write a tag message\n"
9189"Lines starting with '%c' will be kept; you may remove them yourself if you "
9190"want to.\n"
9191msgstr ""
9192"\n"
9193"输入一个 tag 说明\n"
9194"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9195
9196#: builtin/tag.c:292
9197msgid "unable to sign the tag"
9198msgstr "无法签署 tag"
9199
9200#: builtin/tag.c:294
9201msgid "unable to write tag file"
9202msgstr "无法写 tag 文件"
9203
9204#: builtin/tag.c:319
9205msgid "bad object type."
9206msgstr "坏的对象类型。"
9207
9208#: builtin/tag.c:332
9209msgid "tag header too big."
9210msgstr "tag 头信息太大。"
9211
9212#: builtin/tag.c:368
9213msgid "no tag message?"
9214msgstr "无 tag 说明?"
9215
9216#: builtin/tag.c:374
9217#, c-format
9218msgid "The tag message has been left in %s\n"
9219msgstr "tag 说明被保留在 %s\n"
9220
9221#: builtin/tag.c:423
9222msgid "switch 'points-at' requires an object"
9223msgstr "开关 'points-at' 需要一个对象"
9224
9225#: builtin/tag.c:425
9226#, c-format
9227msgid "malformed object name '%s'"
9228msgstr "非法的对象名 '%s'"
9229
9230#: builtin/tag.c:445
9231msgid "list tag names"
9232msgstr "列出tag名称"
9233
9234#: builtin/tag.c:447
9235msgid "print <n> lines of each tag message"
9236msgstr "每个 tag 信息打印 <n> 行"
9237
9238#: builtin/tag.c:449
9239msgid "delete tags"
9240msgstr "删除 tags"
9241
9242#: builtin/tag.c:450
9243msgid "verify tags"
9244msgstr "验证 tags"
9245
9246#: builtin/tag.c:452
9247msgid "Tag creation options"
9248msgstr "Tag 创建选项"
9249
9250#: builtin/tag.c:454
9251msgid "annotated tag, needs a message"
9252msgstr "注解 tag,需要一个说明"
9253
9254#: builtin/tag.c:456
9255msgid "tag message"
9256msgstr "tag 说明"
9257
9258#: builtin/tag.c:458
9259msgid "annotated and GPG-signed tag"
9260msgstr "注解并 GPG 签名的 tag"
9261
9262#: builtin/tag.c:462
9263msgid "use another key to sign the tag"
9264msgstr "使用另外的私钥签名 tag"
9265
9266#: builtin/tag.c:463
9267msgid "replace the tag if exists"
9268msgstr "如果存在,替换现有的 tag"
9269
9270#: builtin/tag.c:464
9271msgid "show tag list in columns"
9272msgstr "以列的方式显示 tag"
9273
9274#: builtin/tag.c:466
9275msgid "Tag listing options"
9276msgstr "Tag 列表选项"
9277
9278#: builtin/tag.c:469
9279msgid "print only tags that contain the commit"
9280msgstr "只打印包含提交的tags"
9281
9282#: builtin/tag.c:475
9283msgid "print only tags of the object"
9284msgstr "只打印tags对象"
9285
9286#: builtin/tag.c:501
9287msgid "--column and -n are incompatible"
9288msgstr "--column 和 -n 不兼容"
9289
9290#: builtin/tag.c:518
9291msgid "-n option is only allowed with -l."
9292msgstr "-n 选项只允许和 -l 同时使用。"
9293
9294#: builtin/tag.c:520
9295msgid "--contains option is only allowed with -l."
9296msgstr "--contains 选项只允许和 -l 同时使用。"
9297
9298#: builtin/tag.c:522
9299msgid "--points-at option is only allowed with -l."
9300msgstr "--points-at 选项只允许和 -l 同时使用。"
9301
9302#: builtin/tag.c:530
9303msgid "only one -F or -m option is allowed."
9304msgstr "只允许一个 -F 或 -m 选项。"
9305
9306#: builtin/tag.c:550
9307msgid "too many params"
9308msgstr "太多参数"
9309
9310#: builtin/tag.c:556
9311#, c-format
9312msgid "'%s' is not a valid tag name."
9313msgstr "'%s' 不是一个有效的tag名称。"
9314
9315#: builtin/tag.c:561
9316#, c-format
9317msgid "tag '%s' already exists"
9318msgstr "tag '%s' 已存在"
9319
9320#: builtin/tag.c:579
9321#, c-format
9322msgid "%s: cannot lock the ref"
9323msgstr "%s:不能锁定引用"
9324
9325#: builtin/tag.c:581
9326#, c-format
9327msgid "%s: cannot update the ref"
9328msgstr "%s:不能更新引用"
9329
9330#: builtin/tag.c:583
9331#, c-format
9332msgid "Updated tag '%s' (was %s)\n"
9333msgstr "已更新tag '%s'(曾为 %s)\n"
9334
9335#: builtin/update-index.c:402
9336msgid "git update-index [options] [--] [<file>...]"
9337msgstr "git update-index [选项] [--] [<文件>...]"
9338
9339#: builtin/update-index.c:720
9340msgid "continue refresh even when index needs update"
9341msgstr "当索引需要更新时继续刷新"
9342
9343#: builtin/update-index.c:723
9344msgid "refresh: ignore submodules"
9345msgstr "刷新:忽略子模组"
9346
9347#: builtin/update-index.c:726
9348msgid "do not ignore new files"
9349msgstr "不忽略新的文件"
9350
9351#: builtin/update-index.c:728
9352msgid "let files replace directories and vice-versa"
9353msgstr "让文件替换目录(反之亦然)"
9354
9355#: builtin/update-index.c:730
9356msgid "notice files missing from worktree"
9357msgstr "通知文件从工作区丢失"
9358
9359#: builtin/update-index.c:732
9360msgid "refresh even if index contains unmerged entries"
9361msgstr "即使索引区包含未合并的条目也执行刷新"
9362
9363#: builtin/update-index.c:735
9364msgid "refresh stat information"
9365msgstr "刷新统计信息"
9366
9367#: builtin/update-index.c:739
9368msgid "like --refresh, but ignore assume-unchanged setting"
9369msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
9370
9371#: builtin/update-index.c:743
9372msgid "<mode> <object> <path>"
9373msgstr "<mode> <object> <path>"
9374
9375#: builtin/update-index.c:744
9376msgid "add the specified entry to the index"
9377msgstr "添加指定的条目到索引区"
9378
9379#: builtin/update-index.c:748
9380msgid "(+/-)x"
9381msgstr "(+/-)x"
9382
9383#: builtin/update-index.c:749
9384msgid "override the executable bit of the listed files"
9385msgstr "覆盖列表里文件的可执行位"
9386
9387#: builtin/update-index.c:753
9388msgid "mark files as \"not changing\""
9389msgstr "把文件标记为 \"没有变更\""
9390
9391#: builtin/update-index.c:756
9392msgid "clear assumed-unchanged bit"
9393msgstr "清除 assumed-unchanged 位"
9394
9395#: builtin/update-index.c:759
9396msgid "mark files as \"index-only\""
9397msgstr "把文件标记为 \"仅索引\""
9398
9399#: builtin/update-index.c:762
9400msgid "clear skip-worktree bit"
9401msgstr "清除 skip-worktree 位"
9402
9403#: builtin/update-index.c:765
9404msgid "add to index only; do not add content to object database"
9405msgstr "只添加到索引区;不添加对象到对象库"
9406
9407#: builtin/update-index.c:767
9408msgid "remove named paths even if present in worktree"
9409msgstr "即使存在工作区里,也删除路径"
9410
9411#: builtin/update-index.c:769
9412msgid "with --stdin: input lines are terminated by null bytes"
9413msgstr "携带 --stdin:输入的行以 null 字符终止"
9414
9415#: builtin/update-index.c:771
9416msgid "read list of paths to be updated from standard input"
9417msgstr "从标准输入中读取需要更新的路径列表"
9418
9419#: builtin/update-index.c:775
9420msgid "add entries from standard input to the index"
9421msgstr "从标准输入添加条目到索引区"
9422
9423#: builtin/update-index.c:779
9424msgid "repopulate stages #2 and #3 for the listed paths"
9425msgstr "为指定文件重新生成第2和第3暂存区"
9426
9427#: builtin/update-index.c:783
9428msgid "only update entries that differ from HEAD"
9429msgstr "只更新与 HEAD 不同的条目"
9430
9431#: builtin/update-index.c:787
9432msgid "ignore files missing from worktree"
9433msgstr "忽略工作区丢失的文件"
9434
9435#: builtin/update-index.c:790
9436msgid "report actions to standard output"
9437msgstr "在标准输出显示操作"
9438
9439#: builtin/update-index.c:792
9440msgid "(for porcelains) forget saved unresolved conflicts"
9441msgstr "(for porcelains) 忘记保存的未解决的冲突"
9442
9443#: builtin/update-index.c:796
9444msgid "write index in this format"
9445msgstr "以这种格式写入索引区"
9446
9447#: builtin/update-ref.c:9
9448msgid "git update-ref [options] -d <refname> [<oldval>]"
9449msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
9450
9451#: builtin/update-ref.c:10
9452msgid "git update-ref [options] <refname> <newval> [<oldval>]"
9453msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"
9454
9455#: builtin/update-ref.c:11
9456msgid "git update-ref [options] --stdin [-z]"
9457msgstr "git update-ref [选项] --stdin [-z]"
9458
9459#: builtin/update-ref.c:255
9460msgid "delete the reference"
9461msgstr "删除引用"
9462
9463#: builtin/update-ref.c:257
9464msgid "update <refname> not the one it points to"
9465msgstr "更新 <引用名> 本身而不是它指向的引用"
9466
9467#: builtin/update-ref.c:258
9468msgid "stdin has NUL-terminated arguments"
9469msgstr "标准输入有以 NUL 字符终止的参数"
9470
9471#: builtin/update-ref.c:259
9472msgid "read updates from stdin"
9473msgstr "从标准输入读取更新"
9474
9475#: builtin/update-server-info.c:6
9476msgid "git update-server-info [--force]"
9477msgstr "git update-server-info [--force]"
9478
9479#: builtin/update-server-info.c:14
9480msgid "update the info files from scratch"
9481msgstr "从头开始更新文件信息"
9482
9483#: builtin/verify-pack.c:56
9484msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9485msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9486
9487#: builtin/verify-pack.c:66
9488msgid "verbose"
9489msgstr "冗长输出"
9490
9491#: builtin/verify-pack.c:68
9492msgid "show statistics only"
9493msgstr "只显示统计"
9494
9495#: builtin/verify-tag.c:17
9496msgid "git verify-tag [-v|--verbose] <tag>..."
9497msgstr "git verify-tag [-v|--verbose] <tag>..."
9498
9499#: builtin/verify-tag.c:73
9500msgid "print tag contents"
9501msgstr "打印 tag 内容"
9502
9503#: builtin/write-tree.c:13
9504msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9505msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
9506
9507#: builtin/write-tree.c:26
9508msgid "<prefix>/"
9509msgstr "<前缀>/"
9510
9511#: builtin/write-tree.c:27
9512msgid "write tree object for a subdirectory <prefix>"
9513msgstr "将 <前缀> 子目录内容写到一个树对象"
9514
9515#: builtin/write-tree.c:30
9516msgid "only useful for debugging"
9517msgstr "只对调试有用"
9518
9519#: git.c:17
9520msgid ""
9521"'git help -a' and 'git help -g' lists available subcommands and some\n"
9522"concept guides. See 'git help <command>' or 'git help <concept>'\n"
9523"to read about a specific subcommand or concept."
9524msgstr ""
9525"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
9526"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
9527
9528#: parse-options.h:146
9529msgid "expiry date"
9530msgstr "逾期日期"
9531
9532#: parse-options.h:161
9533msgid "no-op (backward compatibility)"
9534msgstr "空操作(向后兼容)"
9535
9536#: parse-options.h:238
9537msgid "be more verbose"
9538msgstr "更加详细"
9539
9540#: parse-options.h:240
9541msgid "be more quiet"
9542msgstr "更加安静"
9543
9544#: parse-options.h:246
9545msgid "use <n> digits to display SHA-1s"
9546msgstr "用 <n> 位数字显示 SHA-1 哈希值"
9547
9548#: common-cmds.h:8
9549msgid "Add file contents to the index"
9550msgstr "添加文件内容至索引"
9551
9552#: common-cmds.h:9
9553msgid "Find by binary search the change that introduced a bug"
9554msgstr "通过二分查找定位引入 bug 的变更"
9555
9556#: common-cmds.h:10
9557msgid "List, create, or delete branches"
9558msgstr "列出、创建或删除分支"
9559
9560#: common-cmds.h:11
9561msgid "Checkout a branch or paths to the working tree"
9562msgstr "检出一个分支或路径到工作区"
9563
9564#: common-cmds.h:12
9565msgid "Clone a repository into a new directory"
9566msgstr "克隆一个版本库到一个新目录"
9567
9568#: common-cmds.h:13
9569msgid "Record changes to the repository"
9570msgstr "记录变更到版本库"
9571
9572#: common-cmds.h:14
9573msgid "Show changes between commits, commit and working tree, etc"
9574msgstr "显示提交之间、提交和工作区之间等的差异"
9575
9576#: common-cmds.h:15
9577msgid "Download objects and refs from another repository"
9578msgstr "从另外一个版本库下载对象和引用"
9579
9580#: common-cmds.h:16
9581msgid "Print lines matching a pattern"
9582msgstr "输出和模式匹配的行"
9583
9584#: common-cmds.h:17
9585msgid "Create an empty Git repository or reinitialize an existing one"
9586msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
9587
9588#: common-cmds.h:18
9589msgid "Show commit logs"
9590msgstr "显示提交日志"
9591
9592#: common-cmds.h:19
9593msgid "Join two or more development histories together"
9594msgstr "合并两个或更多开发历史"
9595
9596#: common-cmds.h:20
9597msgid "Move or rename a file, a directory, or a symlink"
9598msgstr "移动或重命名一个文件、目录或符号链接"
9599
9600#: common-cmds.h:21
9601msgid "Fetch from and integrate with another repository or a local branch"
9602msgstr "获取并整合另外的版本库或一个本地分支"
9603
9604#: common-cmds.h:22
9605msgid "Update remote refs along with associated objects"
9606msgstr "更新远程引用和相关的对象"
9607
9608#: common-cmds.h:23
9609msgid "Forward-port local commits to the updated upstream head"
9610msgstr "本地提交转移至更新后的上游分支中"
9611
9612#: common-cmds.h:24
9613msgid "Reset current HEAD to the specified state"
9614msgstr "重置当前HEAD到指定状态"
9615
9616#: common-cmds.h:25
9617msgid "Remove files from the working tree and from the index"
9618msgstr "从工作区和索引中删除文件"
9619
9620#: common-cmds.h:26
9621msgid "Show various types of objects"
9622msgstr "显示各种类型的对象"
9623
9624#: common-cmds.h:27
9625msgid "Show the working tree status"
9626msgstr "显示工作区状态"
9627
9628#: common-cmds.h:28
9629msgid "Create, list, delete or verify a tag object signed with GPG"
9630msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
9631
9632#: git-am.sh:50
9633msgid "You need to set your committer info first"
9634msgstr "您需要先设置你的提交者信息"
9635
9636#: git-am.sh:95
9637msgid ""
9638"You seem to have moved HEAD since the last 'am' failure.\n"
9639"Not rewinding to ORIG_HEAD"
9640msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
9641
9642#: git-am.sh:105
9643#, sh-format
9644msgid ""
9645"When you have resolved this problem, run \"$cmdline --continue\".\n"
9646"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
9647"To restore the original branch and stop patching, run \"$cmdline --abort\"."
9648msgstr ""
9649"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
9650"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
9651"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9652
9653#: git-am.sh:121
9654msgid "Cannot fall back to three-way merge."
9655msgstr "无法求助于三路合并。"
9656
9657#: git-am.sh:137
9658msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9659msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
9660
9661#: git-am.sh:139
9662msgid "Using index info to reconstruct a base tree..."
9663msgstr "使用索引来重建一个(三路合并的)基础目录树..."
9664
9665#: git-am.sh:154
9666msgid ""
9667"Did you hand edit your patch?\n"
9668"It does not apply to blobs recorded in its index."
9669msgstr ""
9670"您是否曾手动编辑过您的补丁?\n"
9671"无法应用补丁到索引中的数据(blob)对象上。"
9672
9673#: git-am.sh:163
9674msgid "Falling back to patching base and 3-way merge..."
9675msgstr "转而在基础版本上打补丁及进行三路合并..."
9676
9677#: git-am.sh:179
9678msgid "Failed to merge in the changes."
9679msgstr "无法合并变更。"
9680
9681#: git-am.sh:274
9682msgid "Only one StGIT patch series can be applied at once"
9683msgstr "一次只能有一个 StGIT 补丁队列被应用"
9684
9685#: git-am.sh:361
9686#, sh-format
9687msgid "Patch format $patch_format is not supported."
9688msgstr "不支持 $patch_format 补丁格式。"
9689
9690#: git-am.sh:363
9691msgid "Patch format detection failed."
9692msgstr "补丁格式检测失败。"
9693
9694#: git-am.sh:389
9695msgid ""
9696"The -b/--binary option has been a no-op for long time, and\n"
9697"it will be removed. Please do not use it anymore."
9698msgstr ""
9699"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
9700"请不要再使用它了。"
9701
9702#: git-am.sh:479
9703#, sh-format
9704msgid "previous rebase directory $dotest still exists but mbox given."
9705msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
9706
9707#: git-am.sh:484
9708msgid "Please make up your mind. --skip or --abort?"
9709msgstr "请下决心。--skip 或是 --abort ?"
9710
9711#: git-am.sh:520
9712#, sh-format
9713msgid ""
9714"Stray $dotest directory found.\n"
9715"Use \"git am --abort\" to remove it."
9716msgstr ""
9717"发现了错误的 $dotest 目录。\n"
9718"使用 \"git am --abort\" 删除它。"
9719
9720#: git-am.sh:528
9721msgid "Resolve operation not in progress, we are not resuming."
9722msgstr "解决操作未进行,我们不会继续。"
9723
9724#: git-am.sh:594
9725#, sh-format
9726msgid "Dirty index: cannot apply patches (dirty: $files)"
9727msgstr "脏的索引:不能应用补丁(脏文件:$files)"
9728
9729#: git-am.sh:698
9730#, sh-format
9731msgid ""
9732"Patch is empty. Was it split wrong?\n"
9733"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9734"To restore the original branch and stop patching run \"$cmdline --abort\"."
9735msgstr ""
9736"补丁为空。是不是切分错误?\n"
9737"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
9738"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9739
9740#: git-am.sh:725
9741msgid "Patch does not have a valid e-mail address."
9742msgstr "补丁中没有一个有效的邮件地址。"
9743
9744#: git-am.sh:772
9745msgid "cannot be interactive without stdin connected to a terminal."
9746msgstr "标准输入没有和终端关联,不能进行交互式操作。"
9747
9748#: git-am.sh:776
9749msgid "Commit Body is:"
9750msgstr "提交内容为:"
9751
9752# 译者:注意保持句尾空格
9753#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9754#. in your translation. The program will only accept English
9755#. input at this point.
9756#: git-am.sh:783
9757msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9758msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9759
9760#: git-am.sh:819
9761#, sh-format
9762msgid "Applying: $FIRSTLINE"
9763msgstr "正应用:$FIRSTLINE"
9764
9765#: git-am.sh:840
9766msgid ""
9767"No changes - did you forget to use 'git add'?\n"
9768"If there is nothing left to stage, chances are that something else\n"
9769"already introduced the same changes; you might want to skip this patch."
9770msgstr ""
9771"没有变更 —— 您是不是忘了执行 'git add'?\n"
9772"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9773"您也许想要跳过这个补丁。"
9774
9775#: git-am.sh:848
9776msgid ""
9777"You still have unmerged paths in your index\n"
9778"did you forget to use 'git add'?"
9779msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
9780
9781#: git-am.sh:864
9782msgid "No changes -- Patch already applied."
9783msgstr "没有变更 —— 补丁已经应用过。"
9784
9785#: git-am.sh:874
9786#, sh-format
9787msgid "Patch failed at $msgnum $FIRSTLINE"
9788msgstr "补丁失败于 $msgnum $FIRSTLINE"
9789
9790#: git-am.sh:877
9791#, sh-format
9792msgid ""
9793"The copy of the patch that failed is found in:\n"
9794" $dotest/patch"
9795msgstr ""
9796"失败的补丁文件副本位于:\n"
9797" $dotest/patch"
9798
9799#: git-am.sh:895
9800msgid "applying to an empty history"
9801msgstr "正应用到一个空历史上"
9802
9803#: git-bisect.sh:48
9804msgid "You need to start by \"git bisect start\""
9805msgstr "您需要执行 \"git bisect start\" 来开始"
9806
9807# 译者:注意保持句尾空格
9808#. TRANSLATORS: Make sure to include [Y] and [n] in your
9809#. translation. The program will only accept English input
9810#. at this point.
9811#: git-bisect.sh:54
9812msgid "Do you want me to do it for you [Y/n]? "
9813msgstr "您想让我为您这样做么[Y/n]? "
9814
9815#: git-bisect.sh:95
9816#, sh-format
9817msgid "unrecognised option: '$arg'"
9818msgstr "未能识别的选项:'$arg'"
9819
9820#: git-bisect.sh:99
9821#, sh-format
9822msgid "'$arg' does not appear to be a valid revision"
9823msgstr "'$arg' 看起来不像是一个有效的版本"
9824
9825#: git-bisect.sh:117
9826msgid "Bad HEAD - I need a HEAD"
9827msgstr "坏的 HEAD - 我需要一个 HEAD"
9828
9829#: git-bisect.sh:130
9830#, sh-format
9831msgid ""
9832"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9833msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
9834
9835#: git-bisect.sh:140
9836msgid "won't bisect on seeked tree"
9837msgstr "不会在已查找过的树上二分查找"
9838
9839#: git-bisect.sh:144
9840msgid "Bad HEAD - strange symbolic ref"
9841msgstr "坏的 HEAD - 奇怪的符号引用"
9842
9843#: git-bisect.sh:189
9844#, sh-format
9845msgid "Bad bisect_write argument: $state"
9846msgstr "坏的 bisect_write 参数:$state"
9847
9848#: git-bisect.sh:218
9849#, sh-format
9850msgid "Bad rev input: $arg"
9851msgstr "输入坏的版本:$arg"
9852
9853#: git-bisect.sh:232
9854msgid "Please call 'bisect_state' with at least one argument."
9855msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
9856
9857#: git-bisect.sh:244
9858#, sh-format
9859msgid "Bad rev input: $rev"
9860msgstr "输入坏的版本:$rev"
9861
9862#: git-bisect.sh:250
9863msgid "'git bisect bad' can take only one argument."
9864msgstr "'git bisect bad' 只能带一个参数。"
9865
9866#. have bad but not good. we could bisect although
9867#. this is less optimum.
9868#: git-bisect.sh:273
9869msgid "Warning: bisecting only with a bad commit."
9870msgstr "警告:在仅有一个坏提交下进行二分查找。"
9871
9872# 译者:注意保持句尾空格
9873#. TRANSLATORS: Make sure to include [Y] and [n] in your
9874#. translation. The program will only accept English input
9875#. at this point.
9876#: git-bisect.sh:279
9877msgid "Are you sure [Y/n]? "
9878msgstr "您确认么[Y/n]? "
9879
9880#: git-bisect.sh:289
9881msgid ""
9882"You need to give me at least one good and one bad revisions.\n"
9883"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9884msgstr ""
9885"您需要给我至少一个好版本和一个坏版本。\n"
9886"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9887
9888#: git-bisect.sh:292
9889msgid ""
9890"You need to start by \"git bisect start\".\n"
9891"You then need to give me at least one good and one bad revisions.\n"
9892"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9893msgstr ""
9894"您需要执行 \"git bisect start\" 来开始。\n"
9895"然后需要提供我至少一个好版本和一个坏版本。\n"
9896"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9897
9898#: git-bisect.sh:363 git-bisect.sh:490
9899msgid "We are not bisecting."
9900msgstr "我们没有在二分查找。"
9901
9902#: git-bisect.sh:370
9903#, sh-format
9904msgid "'$invalid' is not a valid commit"
9905msgstr "'$invalid' 不是一个有效的提交"
9906
9907#: git-bisect.sh:379
9908#, sh-format
9909msgid ""
9910"Could not check out original HEAD '$branch'.\n"
9911"Try 'git bisect reset <commit>'."
9912msgstr ""
9913"不能检出原始 HEAD '$branch'。\n"
9914"尝试 'git bisect reset <提交>'。"
9915
9916#: git-bisect.sh:406
9917msgid "No logfile given"
9918msgstr "未提供日志文件"
9919
9920#: git-bisect.sh:407
9921#, sh-format
9922msgid "cannot read $file for replaying"
9923msgstr "不能读取 $file 来重放"
9924
9925#: git-bisect.sh:424
9926msgid "?? what are you talking about?"
9927msgstr "?? 您在说什么?"
9928
9929#: git-bisect.sh:436
9930#, sh-format
9931msgid "running $command"
9932msgstr "运行 $command"
9933
9934#: git-bisect.sh:443
9935#, sh-format
9936msgid ""
9937"bisect run failed:\n"
9938"exit code $res from '$command' is < 0 or >= 128"
9939msgstr ""
9940"二分查找运行失败:\n"
9941"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
9942
9943#: git-bisect.sh:469
9944msgid "bisect run cannot continue any more"
9945msgstr "二分查找不能继续运行"
9946
9947#: git-bisect.sh:475
9948#, sh-format
9949msgid ""
9950"bisect run failed:\n"
9951"'bisect_state $state' exited with error code $res"
9952msgstr ""
9953"二分查找运行失败:\n"
9954"'bisect_state $state' 退出码为 $res"
9955
9956#: git-bisect.sh:482
9957msgid "bisect run success"
9958msgstr "二分查找运行成功"
9959
9960#: git-pull.sh:21
9961msgid ""
9962"Pull is not possible because you have unmerged files.\n"
9963"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9964"as appropriate to mark resolution, or use 'git commit -a'."
9965msgstr ""
9966"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
9967"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
9968"或者使用 'git commit -a'。"
9969
9970#: git-pull.sh:25
9971msgid "Pull is not possible because you have unmerged files."
9972msgstr "Pull 不可用,因为您尚有未合并的文件。"
9973
9974#: git-pull.sh:223
9975msgid "updating an unborn branch with changes added to the index"
9976msgstr "更新尚未诞生的分支,变更添加至索引"
9977
9978#. The fetch involved updating the current branch.
9979#. The working tree and the index file is still based on the
9980#. $orig_head commit, but we are merging into $curr_head.
9981#. First update the working tree to match $curr_head.
9982#: git-pull.sh:255
9983#, sh-format
9984msgid ""
9985"Warning: fetch updated the current branch head.\n"
9986"Warning: fast-forwarding your working tree from\n"
9987"Warning: commit $orig_head."
9988msgstr ""
9989"警告:fetch 更新了当前的分支。您的工作区\n"
9990"警告:从原提交 $orig_head 快进。"
9991
9992#: git-pull.sh:280
9993msgid "Cannot merge multiple branches into empty head"
9994msgstr "无法将多个分支合并到空分支"
9995
9996#: git-pull.sh:284
9997msgid "Cannot rebase onto multiple branches"
9998msgstr "无法变基到多个分支"
9999
10000#: git-rebase.sh:54
10001msgid ""
10002"When you have resolved this problem, run \"git rebase --continue\".\n"
10003"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10004"To check out the original branch and stop rebasing, run \"git rebase --abort"
10005"\"."
10006msgstr ""
10007"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10008"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10009"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10010
10011#: git-rebase.sh:156
10012msgid "Applied autostash."
10013msgstr "成功应用 autostash。"
10014
10015#: git-rebase.sh:159
10016#, sh-format
10017msgid "Cannot store $stash_sha1"
10018msgstr "无法保存 $stash_sha1"
10019
10020#: git-rebase.sh:160
10021msgid ""
10022"Applying autostash resulted in conflicts.\n"
10023"Your changes are safe in the stash.\n"
10024"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10025msgstr ""
10026"应用 autostash 导致冲突。\n"
10027"您的修改安全地保存在 stash 中。\n"
10028"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10029
10030#: git-rebase.sh:199
10031msgid "The pre-rebase hook refused to rebase."
10032msgstr "钩子 pre-rebase 拒绝变基。"
10033
10034#: git-rebase.sh:204
10035msgid "It looks like git-am is in progress. Cannot rebase."
10036msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10037
10038#: git-rebase.sh:338
10039msgid "The --exec option must be used with the --interactive option"
10040msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10041
10042#: git-rebase.sh:343
10043msgid "No rebase in progress?"
10044msgstr "没有正在进行的变基?"
10045
10046#: git-rebase.sh:354
10047msgid "The --edit-todo action can only be used during interactive rebase."
10048msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10049
10050#: git-rebase.sh:361
10051msgid "Cannot read HEAD"
10052msgstr "不能读取 HEAD"
10053
10054#: git-rebase.sh:364
10055msgid ""
10056"You must edit all merge conflicts and then\n"
10057"mark them as resolved using git add"
10058msgstr ""
10059"您必须编辑所有的合并冲突,然后通过 git add\n"
10060"命令将它们标记为已解决"
10061
10062#: git-rebase.sh:382
10063#, sh-format
10064msgid "Could not move back to $head_name"
10065msgstr "无法移回 $head_name"
10066
10067#: git-rebase.sh:401
10068#, sh-format
10069msgid ""
10070"It seems that there is already a $state_dir_base directory, and\n"
10071"I wonder if you are in the middle of another rebase. If that is the\n"
10072"case, please try\n"
10073"\t$cmd_live_rebase\n"
10074"If that is not the case, please\n"
10075"\t$cmd_clear_stale_rebase\n"
10076"and run me again. I am stopping in case you still have something\n"
10077"valuable there."
10078msgstr ""
10079"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
10080"如果是这样,请尝试执行\n"
10081"\t$cmd_live_rebase\n"
10082"如果不是这样,请执行\n"
10083"\t$cmd_clear_stale_rebase\n"
10084"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
10085
10086#: git-rebase.sh:446
10087#, sh-format
10088msgid "invalid upstream $upstream_name"
10089msgstr "无效的上游 $upstream_name"
10090
10091#: git-rebase.sh:470
10092#, sh-format
10093msgid "$onto_name: there are more than one merge bases"
10094msgstr "$onto_name: 有一个以上的合并基准"
10095
10096#: git-rebase.sh:473 git-rebase.sh:477
10097#, sh-format
10098msgid "$onto_name: there is no merge base"
10099msgstr "$onto_name: 没有合并基准"
10100
10101#: git-rebase.sh:482
10102#, sh-format
10103msgid "Does not point to a valid commit: $onto_name"
10104msgstr "没有指向一个有效的提交:$onto_name"
10105
10106#: git-rebase.sh:505
10107#, sh-format
10108msgid "fatal: no such branch: $branch_name"
10109msgstr "严重错误:无此分支:$branch_name"
10110
10111#: git-rebase.sh:528
10112msgid "Cannot autostash"
10113msgstr "无法 autostash"
10114
10115#: git-rebase.sh:533
10116#, sh-format
10117msgid "Created autostash: $stash_abbrev"
10118msgstr "创建了 autostash: $stash_abbrev"
10119
10120#: git-rebase.sh:537
10121msgid "Please commit or stash them."
10122msgstr "请提交或为它们保存进度。"
10123
10124#: git-rebase.sh:557
10125#, sh-format
10126msgid "Current branch $branch_name is up to date."
10127msgstr "当前分支 $branch_name 是最新的。"
10128
10129#: git-rebase.sh:561
10130#, sh-format
10131msgid "Current branch $branch_name is up to date, rebase forced."
10132msgstr "当前分支 $branch_name 是最新的,强制变基。"
10133
10134#: git-rebase.sh:572
10135#, sh-format
10136msgid "Changes from $mb to $onto:"
10137msgstr "变更从 $mb 到 $onto:"
10138
10139#. Detach HEAD and reset the tree
10140#: git-rebase.sh:581
10141msgid "First, rewinding head to replay your work on top of it..."
10142msgstr "首先,重置头指针以便在上面重放您的工作..."
10143
10144#: git-rebase.sh:591
10145#, sh-format
10146msgid "Fast-forwarded $branch_name to $onto_name."
10147msgstr "快进 $branch_name 至 $onto_name。"
10148
10149#: git-stash.sh:51
10150msgid "git stash clear with parameters is unimplemented"
10151msgstr "git stash clear 不支持参数"
10152
10153#: git-stash.sh:74
10154msgid "You do not have the initial commit yet"
10155msgstr "您尚未建立初始提交"
10156
10157#: git-stash.sh:89
10158msgid "Cannot save the current index state"
10159msgstr "无法保存当前索引状态"
10160
10161#: git-stash.sh:123 git-stash.sh:136
10162msgid "Cannot save the current worktree state"
10163msgstr "无法保存当前工作区状态"
10164
10165#: git-stash.sh:140
10166msgid "No changes selected"
10167msgstr "没有选择变更"
10168
10169#: git-stash.sh:143
10170msgid "Cannot remove temporary index (can't happen)"
10171msgstr "无法删除临时索引(不应发生)"
10172
10173#: git-stash.sh:156
10174msgid "Cannot record working tree state"
10175msgstr "不能记录工作区状态"
10176
10177#: git-stash.sh:190
10178#, sh-format
10179msgid "Cannot update $ref_stash with $w_commit"
10180msgstr "无法用 $w_commit 更新 $ref_stash"
10181
10182#. TRANSLATORS: $option is an invalid option, like
10183#. `--blah-blah'. The 7 spaces at the beginning of the
10184#. second line correspond to "error: ". So you should line
10185#. up the second line with however many characters the
10186#. translation of "error: " takes in your language. E.g. in
10187#. English this is:
10188#.
10189#. $ git stash save --blah-blah 2>&1 | head -n 2
10190#. error: unknown option for 'stash save': --blah-blah
10191#. To provide a message, use git stash save -- '--blah-blah'
10192#: git-stash.sh:237
10193#, sh-format
10194msgid ""
10195"error: unknown option for 'stash save': $option\n"
10196" To provide a message, use git stash save -- '$option'"
10197msgstr ""
10198"错误:'stash save' 的未知选项:$option\n"
10199" 要提供一个描述信息,使用 git stash save -- '$option'"
10200
10201#: git-stash.sh:258
10202msgid "No local changes to save"
10203msgstr "没有要保存的本地修改"
10204
10205#: git-stash.sh:262
10206msgid "Cannot initialize stash"
10207msgstr "无法初始化 stash"
10208
10209#: git-stash.sh:266
10210msgid "Cannot save the current status"
10211msgstr "无法保存当前状态"
10212
10213#: git-stash.sh:284
10214msgid "Cannot remove worktree changes"
10215msgstr "无法删除工作区变更"
10216
10217#: git-stash.sh:383
10218msgid "No stash found."
10219msgstr "未发现 stash。"
10220
10221#: git-stash.sh:390
10222#, sh-format
10223msgid "Too many revisions specified: $REV"
10224msgstr "指定了太多的版本:$REV"
10225
10226#: git-stash.sh:396
10227#, sh-format
10228msgid "$reference is not valid reference"
10229msgstr "$reference 不是有效的引用"
10230
10231#: git-stash.sh:424
10232#, sh-format
10233msgid "'$args' is not a stash-like commit"
10234msgstr "'$args' 不是 stash 样提交"
10235
10236#: git-stash.sh:435
10237#, sh-format
10238msgid "'$args' is not a stash reference"
10239msgstr "'$args' 不是一个 stash 引用"
10240
10241#: git-stash.sh:443
10242msgid "unable to refresh index"
10243msgstr "无法刷新索引"
10244
10245#: git-stash.sh:447
10246msgid "Cannot apply a stash in the middle of a merge"
10247msgstr "无法在合并过程中恢复进度"
10248
10249#: git-stash.sh:455
10250msgid "Conflicts in index. Try without --index."
10251msgstr "索引中有冲突。尝试不使用 --index。"
10252
10253#: git-stash.sh:457
10254msgid "Could not save index tree"
10255msgstr "不能保存索引树"
10256
10257#: git-stash.sh:491
10258msgid "Cannot unstage modified files"
10259msgstr "无法还原修改的文件"
10260
10261#: git-stash.sh:506
10262msgid "Index was not unstashed."
10263msgstr "索引的进度没有被恢复。"
10264
10265#: git-stash.sh:523
10266#, sh-format
10267msgid "Dropped ${REV} ($s)"
10268msgstr "丢弃了 ${REV} ($s)"
10269
10270#: git-stash.sh:524
10271#, sh-format
10272msgid "${REV}: Could not drop stash entry"
10273msgstr "${REV}:不能丢弃进度条目"
10274
10275#: git-stash.sh:531
10276msgid "No branch name specified"
10277msgstr "未指定分支名"
10278
10279#: git-stash.sh:603
10280msgid "(To restore them type \"git stash apply\")"
10281msgstr "(为恢复数据输入 \"git stash apply\")"
10282
10283#: git-submodule.sh:95
10284#, sh-format
10285msgid "cannot strip one component off url '$remoteurl'"
10286msgstr "无法从 url '$remoteurl' 剥离一个组件"
10287
10288#: git-submodule.sh:237
10289#, sh-format
10290msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10291msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
10292
10293#: git-submodule.sh:281
10294#, sh-format
10295msgid "Clone of '$url' into submodule path '$sm_path' failed"
10296msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
10297
10298#: git-submodule.sh:293
10299#, sh-format
10300msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10301msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
10302
10303#: git-submodule.sh:403
10304msgid "Relative path can only be used from the toplevel of the working tree"
10305msgstr "只能在工作区的顶级目录中使用相对路径"
10306
10307#: git-submodule.sh:413
10308#, sh-format
10309msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10310msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10311
10312#: git-submodule.sh:430
10313#, sh-format
10314msgid "'$sm_path' already exists in the index"
10315msgstr "'$sm_path' 已经存在于索引中"
10316
10317#: git-submodule.sh:434
10318#, sh-format
10319msgid ""
10320"The following path is ignored by one of your .gitignore files:\n"
10321"$sm_path\n"
10322"Use -f if you really want to add it."
10323msgstr ""
10324"以下路径被您的一个 .gitignore 文件所忽略:\n"
10325"$sm_path\n"
10326"如果您确实想添加它,使用 -f 参数。"
10327
10328#: git-submodule.sh:452
10329#, sh-format
10330msgid "Adding existing repo at '$sm_path' to the index"
10331msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10332
10333#: git-submodule.sh:454
10334#, sh-format
10335msgid "'$sm_path' already exists and is not a valid git repo"
10336msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
10337
10338#: git-submodule.sh:462
10339#, sh-format
10340msgid "A git directory for '$sm_name' is found locally with remote(s):"
10341msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10342
10343#: git-submodule.sh:464
10344#, sh-format
10345msgid ""
10346"If you want to reuse this local git directory instead of cloning again from"
10347msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10348
10349#: git-submodule.sh:466
10350#, sh-format
10351msgid ""
10352"use the '--force' option. If the local git directory is not the correct repo"
10353msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10354
10355#: git-submodule.sh:467
10356#, sh-format
10357msgid ""
10358"or you are unsure what this means choose another name with the '--name' "
10359"option."
10360msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10361
10362#: git-submodule.sh:469
10363#, sh-format
10364msgid "Reactivating local git directory for submodule '$sm_name'."
10365msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10366
10367#: git-submodule.sh:481
10368#, sh-format
10369msgid "Unable to checkout submodule '$sm_path'"
10370msgstr "不能检出子模组 '$sm_path'"
10371
10372#: git-submodule.sh:486
10373#, sh-format
10374msgid "Failed to add submodule '$sm_path'"
10375msgstr "无法添加子模组 '$sm_path'"
10376
10377#: git-submodule.sh:495
10378#, sh-format
10379msgid "Failed to register submodule '$sm_path'"
10380msgstr "无法注册子模组 '$sm_path'"
10381
10382#: git-submodule.sh:539
10383#, sh-format
10384msgid "Entering '$prefix$displaypath'"
10385msgstr "正在进入 '$prefix$displaypath'"
10386
10387#: git-submodule.sh:554
10388#, sh-format
10389msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10390msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
10391
10392#: git-submodule.sh:600
10393#, sh-format
10394msgid "No url found for submodule path '$displaypath' in .gitmodules"
10395msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
10396
10397#: git-submodule.sh:609
10398#, sh-format
10399msgid "Failed to register url for submodule path '$displaypath'"
10400msgstr "无法为子模组路径 '$displaypath' 注册 url"
10401
10402#: git-submodule.sh:611
10403#, sh-format
10404msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10405msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10406
10407#: git-submodule.sh:619
10408#, sh-format
10409msgid "Failed to register update mode for submodule path '$displaypath'"
10410msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
10411
10412#: git-submodule.sh:656
10413#, sh-format
10414msgid "Use '.' if you really want to deinitialize all submodules"
10415msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10416
10417#: git-submodule.sh:673
10418#, sh-format
10419msgid "Submodule work tree '$displaypath' contains a .git directory"
10420msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
10421
10422#: git-submodule.sh:674
10423#, sh-format
10424msgid ""
10425"(use 'rm -rf' if you really want to remove it including all of its history)"
10426msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10427
10428#: git-submodule.sh:680
10429#, sh-format
10430msgid ""
10431"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10432"discard them"
10433msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
10434
10435#: git-submodule.sh:683
10436#, sh-format
10437msgid "Cleared directory '$displaypath'"
10438msgstr "已清除目录 '$displaypath'"
10439
10440#: git-submodule.sh:684
10441#, sh-format
10442msgid "Could not remove submodule work tree '$displaypath'"
10443msgstr "无法移除子模组工作区 '$displaypath'"
10444
10445#: git-submodule.sh:687
10446#, sh-format
10447msgid "Could not create empty submodule directory '$displaypath'"
10448msgstr "不能创建空的子模组目录 '$displaypath'"
10449
10450#: git-submodule.sh:696
10451#, sh-format
10452msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10453msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10454
10455#: git-submodule.sh:811
10456#, sh-format
10457msgid ""
10458"Submodule path '$displaypath' not initialized\n"
10459"Maybe you want to use 'update --init'?"
10460msgstr ""
10461"子模组路径 '$displaypath' 没有初始化\n"
10462"也许您想用 'update --init'?"
10463
10464#: git-submodule.sh:824
10465#, sh-format
10466msgid "Unable to find current revision in submodule path '$displaypath'"
10467msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
10468
10469#: git-submodule.sh:833
10470#, sh-format
10471msgid "Unable to fetch in submodule path '$sm_path'"
10472msgstr "无法在子模组路径 '$sm_path' 中获取"
10473
10474#: git-submodule.sh:857
10475#, sh-format
10476msgid "Unable to fetch in submodule path '$displaypath'"
10477msgstr "无法在子模组路径 '$displaypath' 中获取"
10478
10479#: git-submodule.sh:871
10480#, sh-format
10481msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10482msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
10483
10484#: git-submodule.sh:872
10485#, sh-format
10486msgid "Submodule path '$displaypath': rebased into '$sha1'"
10487msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
10488
10489#: git-submodule.sh:877
10490#, sh-format
10491msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10492msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
10493
10494#: git-submodule.sh:878
10495#, sh-format
10496msgid "Submodule path '$displaypath': merged in '$sha1'"
10497msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
10498
10499#: git-submodule.sh:883
10500#, sh-format
10501msgid ""
10502"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10503msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
10504
10505#: git-submodule.sh:884
10506#, sh-format
10507msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10508msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
10509
10510#: git-submodule.sh:889
10511#, sh-format
10512msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10513msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
10514
10515#: git-submodule.sh:890
10516#, sh-format
10517msgid "Submodule path '$displaypath': checked out '$sha1'"
10518msgstr "子模组路径 '$displaypath':检出 '$sha1'"
10519
10520#: git-submodule.sh:917
10521#, sh-format
10522msgid "Failed to recurse into submodule path '$displaypath'"
10523msgstr "无法递归进子模组路径 '$displaypath'"
10524
10525#: git-submodule.sh:1025
10526msgid "The --cached option cannot be used with the --files option"
10527msgstr "选项 --cached 不能和选项 --files 同时使用"
10528
10529#. unexpected type
10530#: git-submodule.sh:1073
10531#, sh-format
10532msgid "unexpected mode $mod_dst"
10533msgstr "意外的模式 $mod_dst"
10534
10535# 译者:注意保持前导空格
10536#: git-submodule.sh:1093
10537#, sh-format
10538msgid " Warn: $display_name doesn't contain commit $sha1_src"
10539msgstr " 警告:$display_name 未包含提交 $sha1_src"
10540
10541# 译者:注意保持前导空格
10542#: git-submodule.sh:1096
10543#, sh-format
10544msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10545msgstr " 警告:$display_name 未包含提交 $sha1_dst"
10546
10547# 译者:注意保持前导空格
10548#: git-submodule.sh:1099
10549#, sh-format
10550msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10551msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
10552
10553#: git-submodule.sh:1124
10554msgid "blob"
10555msgstr "数据对象"
10556
10557#: git-submodule.sh:1238
10558#, sh-format
10559msgid "Failed to recurse into submodule path '$sm_path'"
10560msgstr "无法递归进子模组路径 '$sm_path'"
10561
10562#: git-submodule.sh:1302
10563#, sh-format
10564msgid "Synchronizing submodule url for '$displaypath'"
10565msgstr "为 '$displaypath' 同步子模组 url"
10566
10567#~ msgid "done\n"
10568#~ msgstr "完成\n"
10569
10570#~ msgid "input paths are terminated by a null character"
10571#~ msgstr "输入路径以null字符终止"
10572
10573#~ msgid ""
10574#~ "The following untracked files would NOT be saved but need to be removed "
10575#~ "by stash save:"
10576#~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:"
10577
10578#~ msgid ""
10579#~ "Aborting. Consider using either the --force or --include-untracked option."
10580#~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
10581
10582#~ msgid ""
10583#~ "the following submodule (or one of its nested submodule)\n"
10584#~ "uses a .git directory:"
10585#~ msgid_plural ""
10586#~ "the following submodules (or one of its nested submodule)\n"
10587#~ "use a .git directory:"
10588#~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10589#~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10590
10591# 译者:注意保持前导空格
10592#~ msgid " (fix conflicts and then run \"git am --resolved\")"
10593#~ msgstr " (解决冲突,然后运行 \"git am --resolved\")"
10594
10595# 译者:注意保持前导空格
10596#~ msgid " (all conflicts fixed: run \"git commit\")"
10597#~ msgstr " (解决所有冲突后,执行 \"git commit\")"
10598
10599#~ msgid "more than %d trees given: '%s'"
10600#~ msgstr "提供了超过 %d 个树对象:'%s'"
10601
10602#~ msgid "You cannot combine --no-ff with --ff-only."
10603#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
10604
10605#~ msgid ""
10606#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
10607#~ "(use 'rm -rf' if you really want to remove it including all of its "
10608#~ "history)"
10609#~ msgstr ""
10610#~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
10611#~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10612
10613#~ msgid ""
10614#~ "'%s' has changes staged in the index\n"
10615#~ "(use --cached to keep the file, or -f to force removal)"
10616#~ msgstr ""
10617#~ "'%s' 有变更已暂存至索引中\n"
10618#~ "(使用 --cached 保存文件,或用 -f 强制删除)"
10619
10620#~ msgid "show commits where no parent comes before its children"
10621#~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
10622
10623#~ msgid "show the HEAD reference"
10624#~ msgstr "显示 HEAD 引用"
10625
10626#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
10627#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
10628
10629#~ msgid "Change flags"
10630#~ msgstr "修改参数"
10631
10632#~ msgid ""
10633#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
10634#~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。"
10635
10636#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
10637#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
10638
10639#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
10640#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
10641
10642#~ msgid "See 'git help <command>' for more information on a specific command."
10643#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
10644
10645#~ msgid "BUG: impossible combination of %d and %p"
10646#~ msgstr "BUG: 无法组合 %d 和 %p"
10647
10648# 译者:以下三条实际为一个段落
10649#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
10650#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
10651
10652# 译者:为对齐,下面两句内容有调整
10653#~ msgid "may speed it up, but you have to be careful not to forget to add"
10654#~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
10655
10656#~ msgid "new files yourself (see 'git help status')."
10657#~ msgstr "(参见 'git help status')。"
10658
10659#~ msgid "use any ref in .git/refs"
10660#~ msgstr "使用 .git/refs 里的任意引用"
10661
10662#~ msgid "use any tag in .git/refs/tags"
10663#~ msgstr "使用 .git/refs/tags 里的任意 tag"
10664
10665#~ msgid "bad object %s"
10666#~ msgstr "坏对象 %s"
10667
10668#~ msgid "bogus committer info %s"
10669#~ msgstr "虚假的提交者信息 %s"
10670
10671#~ msgid "can't fdopen 'show' output fd"
10672#~ msgstr "不能打开 'show' 输出文件句柄"
10673
10674#~ msgid "failed to close pipe to 'show' for object '%s'"
10675#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
10676
10677#~ msgid " 0 files changed"
10678#~ msgstr " 0 个文件被修改"
10679
10680#~ msgid " %d file changed"
10681#~ msgid_plural " %d files changed"
10682#~ msgstr[0] " %d 个文件被修改"
10683#~ msgstr[1] " %d 个文件被修改"
10684
10685#~ msgid ", %d insertion(+)"
10686#~ msgid_plural ", %d insertions(+)"
10687#~ msgstr[0] ",插入 %d 行(+)"
10688#~ msgstr[1] ",插入 %d 行(+)"
10689
10690#~ msgid ", %d deletion(-)"
10691#~ msgid_plural ", %d deletions(-)"
10692#~ msgstr[0] ",删除 %d 行(-)"
10693#~ msgstr[1] ",删除 %d 行(-)"
10694
10695#~ msgid "You do not have a valid HEAD"
10696#~ msgstr "您没有一个有效的 HEAD"
10697
10698#~ msgid "oops"
10699#~ msgstr "哎哟"
10700
10701#~ msgid "Would not remove %s\n"
10702#~ msgstr "不会删除 %s\n"
10703
10704#~ msgid "Not removing %s\n"
10705#~ msgstr "未删除 %s\n"
10706
10707#~ msgid "Auto packing the repository for optimum performance.\n"
10708#~ msgstr "自动打包版本库以求最佳性能。\n"
10709
10710#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
10711#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
10712
10713#~ msgid "Could not read index"
10714#~ msgstr "不能读取索引"
10715
10716# 译者:中文字符串拼接,可删除前导空格
10717#~ msgid " (use \"git add\" to track)"
10718#~ msgstr "(使用 \"git add\" 建立跟踪)"
10719
10720#~ msgid "-B cannot be used with -b"
10721#~ msgstr "-B 不能和 -b 同时使用"
10722
10723#~ msgid "--detach cannot be used with -b/-B/--orphan"
10724#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
10725
10726#~ msgid "--detach cannot be used with -t"
10727#~ msgstr "--detach 不能和 -t 同时使用"
10728
10729#~ msgid "--orphan and -b|-B are mutually exclusive"
10730#~ msgstr "--orphan 和 -b|-B 互斥"
10731
10732#~ msgid "--orphan cannot be used with -t"
10733#~ msgstr "--orphan 不能和 -t 同时使用"
10734
10735#~ msgid "git checkout: -f and -m are incompatible"
10736#~ msgstr "git checkout:-f 和 -m 不兼容"
10737
10738#~ msgid ""
10739#~ "git checkout: updating paths is incompatible with switching branches."
10740#~ msgstr "git checkout:更新路径和切换分支不兼容。"
10741
10742#~ msgid "diff setup failed"
10743#~ msgstr "diff 设置失败"
10744
10745#~ msgid "merge-recursive: disk full?"
10746#~ msgstr "merge-recursive:磁盘已满?"
10747
10748#~ msgid "diff_setup_done failed"
10749#~ msgstr "diff_setup_done 失败"