]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: zh.CN.po: update by msgmerge git.pot
[thirdparty/git.git] / po / zh_CN.po
CommitLineData
c04f5ac3
JX
1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
3# Copyright (C) 2012 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"
8ada9598 15"POT-Creation-Date: 2012-05-21 08:57+0800\n"
c04f5ac3
JX
16"PO-Revision-Date: 2012-01-30 00:00+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=1; plural=0;\n"
24
170e9899 25#: advice.c:40
c04f5ac3
JX
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#.
170e9899 34#: advice.c:70
c04f5ac3
JX
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
8ada9598
JX
45#: bundle.c:36
46#, c-format
47msgid "'%s' does not look like a v2 bundle file"
48msgstr ""
49
50#: bundle.c:63
51#, fuzzy, c-format
52msgid "unrecognized header: %s%s (%d)"
53msgstr "未识别的参数:%s"
54
55#: bundle.c:89 builtin/commit.c:697
56#, c-format
57msgid "could not open '%s'"
58msgstr "不能打开 '%s'"
59
60#: bundle.c:140
61msgid "Repository lacks these prerequisite commits:"
62msgstr ""
63
64#: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289
65#: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347
66#: builtin/shortlog.c:181
67msgid "revision walk setup failed"
68msgstr "版本遍历设置失败"
69
70#: bundle.c:186
71#, c-format
72msgid "The bundle contains %d ref"
73msgid_plural "The bundle contains %d refs"
74msgstr[0] ""
75
76#: bundle.c:192
77#, c-format
78msgid "The bundle requires this ref"
79msgid_plural "The bundle requires these %d refs"
80msgstr[0] ""
81
82#: bundle.c:290
83msgid "rev-list died"
84msgstr ""
85
86#: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284
87#, c-format
88msgid "unrecognized argument: %s"
89msgstr "未识别的参数:%s"
90
91#: bundle.c:331
92#, c-format
93msgid "ref '%s' is excluded by the rev-list options"
94msgstr ""
95
96#: bundle.c:376
97#, fuzzy
98msgid "Refusing to create empty bundle."
99msgstr "不能创建临时索引"
100
101#: bundle.c:394
102#, fuzzy
103msgid "Could not spawn pack-objects"
104msgstr "不能读取对象 %s"
105
106#: bundle.c:412
107msgid "pack-objects died"
108msgstr ""
109
110#: bundle.c:415
111#, fuzzy, c-format
112msgid "cannot create '%s'"
113msgstr "不能读取 '%s'"
114
115#: bundle.c:437
116msgid "index-pack died"
117msgstr ""
118
170e9899 119#: commit.c:48
c04f5ac3
JX
120#, c-format
121msgid "could not parse %s"
122msgstr "不能解析 %s"
123
170e9899 124#: commit.c:50
c04f5ac3
JX
125#, c-format
126msgid "%s %s is not a commit!"
127msgstr "%s %s 不是一个提交!"
128
129#: compat/obstack.c:406 compat/obstack.c:408
130msgid "memory exhausted"
131msgstr "内存耗尽"
132
133#: connected.c:39
134msgid "Could not run 'git rev-list'"
135msgstr "不能执行 'git rev-list'"
136
137#: connected.c:48
138#, c-format
139msgid "failed write to rev-list: %s"
140msgstr "无法写入 rev-list:%s"
141
142#: connected.c:56
143#, c-format
144msgid "failed to close rev-list's stdin: %s"
145msgstr "无法关闭 rev-list 的标准输入:%s"
146
8ada9598
JX
147#: date.c:95
148msgid "in the future"
149msgstr ""
150
151#: date.c:101
152#, c-format
153msgid "%lu second ago"
154msgid_plural "%lu seconds ago"
155msgstr[0] ""
156
157#: date.c:108
158#, c-format
159msgid "%lu minute ago"
160msgid_plural "%lu minutes ago"
161msgstr[0] ""
162
163#: date.c:115
164#, c-format
165msgid "%lu hour ago"
166msgid_plural "%lu hours ago"
167msgstr[0] ""
168
169#: date.c:122
170#, c-format
171msgid "%lu day ago"
172msgid_plural "%lu days ago"
173msgstr[0] ""
174
175#: date.c:128
176#, c-format
177msgid "%lu week ago"
178msgid_plural "%lu weeks ago"
179msgstr[0] ""
180
181#: date.c:135
182#, c-format
183msgid "%lu month ago"
184msgid_plural "%lu months ago"
185msgstr[0] ""
186
187#: date.c:146
188#, c-format
189msgid "%lu year"
190msgid_plural "%lu years"
191msgstr[0] ""
192
193#: date.c:149
194#, c-format
195msgid "%s, %lu month ago"
196msgid_plural "%s, %lu months ago"
197msgstr[0] ""
198
199#: date.c:154 date.c:159
200#, c-format
201msgid "%lu year ago"
202msgid_plural "%lu years ago"
203msgstr[0] ""
204
90e6ef53 205# 译者:注意保持前导空格
14c8bced 206#: diff.c:105
c04f5ac3
JX
207#, c-format
208msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
209msgstr " 无法解析 dirstat 阈值 '%.*s'\n"
210
90e6ef53 211# 译者:注意保持前导空格
14c8bced 212#: diff.c:110
c04f5ac3
JX
213#, c-format
214msgid " Unknown dirstat parameter '%.*s'\n"
215msgstr " 未知 dirstat 参数 '%.*s'\n"
216
14c8bced 217#: diff.c:210
c04f5ac3
JX
218#, c-format
219msgid ""
220"Found errors in 'diff.dirstat' config variable:\n"
221"%s"
222msgstr ""
90e6ef53 223"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
224"%s"
225
73a60cd2 226#: diff.c:1400
7ac1c0ad 227msgid " 0 files changed\n"
90e6ef53 228msgstr " 0 个文件被修改\n"
7ac1c0ad 229
73a60cd2 230#: diff.c:1404
7ac1c0ad
JX
231#, c-format
232msgid " %d file changed"
233msgid_plural " %d files changed"
61bc0753 234msgstr[0] " %d 个文件被修改"
7ac1c0ad 235
73a60cd2 236#: diff.c:1421
7ac1c0ad
JX
237#, c-format
238msgid ", %d insertion(+)"
239msgid_plural ", %d insertions(+)"
8ea38f47 240msgstr[0] ",插入 %d 行(+)"
7ac1c0ad 241
73a60cd2 242#: diff.c:1432
7ac1c0ad
JX
243#, c-format
244msgid ", %d deletion(-)"
245msgid_plural ", %d deletions(-)"
8ea38f47 246msgstr[0] ",删除 %d 行(-)"
7ac1c0ad 247
8ada9598 248#: diff.c:3478
c04f5ac3
JX
249#, c-format
250msgid ""
251"Failed to parse --dirstat/-X option parameter:\n"
252"%s"
253msgstr ""
254"无法解析 --dirstat/-X 选项的参数:\n"
255"%s"
256
257#: gpg-interface.c:59
258msgid "could not run gpg."
259msgstr "不能执行 gpg。"
260
261#: gpg-interface.c:71
262msgid "gpg did not accept the data"
263msgstr "gpg 没有接受数据"
264
265#: gpg-interface.c:82
266msgid "gpg failed to sign the data"
267msgstr "gpg 无法为数据签名"
268
14c8bced 269#: grep.c:1280
7ac1c0ad
JX
270#, c-format
271msgid "'%s': unable to read %s"
272msgstr "'%s':无法读取 %s"
273
14c8bced 274#: grep.c:1297
7ac1c0ad
JX
275#, c-format
276msgid "'%s': %s"
277msgstr "'%s':%s"
278
14c8bced 279#: grep.c:1308
7ac1c0ad
JX
280#, c-format
281msgid "'%s': short read %s"
282msgstr "'%s':读取不完整 %s"
283
8ada9598
JX
284#: help.c:207
285#, fuzzy, c-format
286msgid "available git commands in '%s'"
287msgstr "无法创建链接 '%s'"
288
289#: help.c:214
290msgid "git commands available from elsewhere on your $PATH"
291msgstr ""
292
293#: help.c:270
c04f5ac3
JX
294#, c-format
295msgid ""
296"'%s' appears to be a git command, but we were not\n"
297"able to execute it. Maybe git-%s is broken?"
298msgstr ""
299"'%s' 像是一个 git 命令,但却无法运行。\n"
300"可能是 git-%s 受损?"
301
8ada9598
JX
302#: help.c:327
303msgid "Uh oh. Your system reports no Git commands at all."
304msgstr ""
305
306#: help.c:349
307#, c-format
308msgid ""
309"WARNING: You called a Git command named '%s', which does not exist.\n"
310"Continuing under the assumption that you meant '%s'"
311msgstr ""
312
313#: help.c:354
314#, c-format
315msgid "in %0.1f seconds automatically..."
316msgstr ""
317
318#: help.c:361
319#, c-format
320msgid "git: '%s' is not a git command. See 'git --help'."
321msgstr ""
322
323#: help.c:365
324msgid ""
325"\n"
326"Did you mean this?"
327msgid_plural ""
328"\n"
329"Did you mean one of these?"
330msgstr[0] ""
331
332#: parse-options.c:493
333msgid "..."
334msgstr ""
335
336#: parse-options.c:511
337#, fuzzy, c-format
338msgid "usage: %s"
339msgstr "'%s':%s"
340
341#. TRANSLATORS: the colon here should align with the
342#. one in "usage: %s" translation
343#: parse-options.c:515
344#, fuzzy, c-format
345msgid " or: %s"
346msgstr "HEAD(非分支)"
347
348# 译者:为保证在输出中对齐,注意调整句中空格!
349#: parse-options.c:518
350#, fuzzy, c-format
351msgid " %s"
352msgstr "删除: %s"
353
7ac1c0ad 354#: remote.c:1607
c04f5ac3
JX
355#, c-format
356msgid "Your branch is ahead of '%s' by %d commit.\n"
357msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
358msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
359
7ac1c0ad 360#: remote.c:1613
c04f5ac3
JX
361#, c-format
362msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
363msgid_plural ""
364"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 365msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 366
7ac1c0ad 367#: remote.c:1621
c04f5ac3
JX
368#, c-format
369msgid ""
370"Your branch and '%s' have diverged,\n"
371"and have %d and %d different commit each, respectively.\n"
372msgid_plural ""
373"Your branch and '%s' have diverged,\n"
374"and have %d and %d different commits each, respectively.\n"
375msgstr[0] ""
376"您的分支和 '%s' 出现了偏离,\n"
377"并且各自分别有 %d 和 %d 处不同的提交。\n"
378
8ada9598 379#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
170e9899 380#: builtin/merge.c:1088 builtin/merge.c:1098
c04f5ac3
JX
381#, c-format
382msgid "Could not open '%s' for writing"
90e6ef53 383msgstr "不能为写入打开 '%s'"
c04f5ac3 384
8ada9598 385#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
170e9899 386#: builtin/merge.c:1090 builtin/merge.c:1103
c04f5ac3
JX
387#, c-format
388msgid "Could not write to '%s'"
90e6ef53 389msgstr "不能写入 '%s'"
c04f5ac3 390
8ada9598 391#: sequencer.c:144
14c8bced
JX
392msgid ""
393"after resolving the conflicts, mark the corrected paths\n"
394"with 'git add <paths>' or 'git rm <paths>'"
395msgstr ""
396"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
397"命令标记修正后的文件"
398
8ada9598 399#: sequencer.c:147
c04f5ac3
JX
400msgid ""
401"after resolving the conflicts, mark the corrected paths\n"
402"with 'git add <paths>' or 'git rm <paths>'\n"
403"and commit the result with 'git commit'"
404msgstr ""
405"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
406"对修正后的文件做标记,然后用 'git commit' 提交"
407
8ada9598 408#: sequencer.c:160 sequencer.c:741 sequencer.c:824
c04f5ac3
JX
409#, c-format
410msgid "Could not write to %s"
411msgstr "不能写入 %s"
412
8ada9598 413#: sequencer.c:163
c04f5ac3
JX
414#, c-format
415msgid "Error wrapping up %s"
416msgstr "错误收尾 %s"
417
8ada9598 418#: sequencer.c:178
c04f5ac3
JX
419msgid "Your local changes would be overwritten by cherry-pick."
420msgstr "您的本地修改将被拣选操作覆盖。"
421
8ada9598 422#: sequencer.c:180
c04f5ac3
JX
423msgid "Your local changes would be overwritten by revert."
424msgstr "您的本地修改将被还原操作覆盖。"
425
8ada9598 426#: sequencer.c:183
c04f5ac3
JX
427msgid "Commit your changes or stash them to proceed."
428msgstr "提交您的修改或保存进度后再继续。"
429
430#. TRANSLATORS: %s will be "revert" or "cherry-pick"
8ada9598 431#: sequencer.c:233
c04f5ac3
JX
432#, c-format
433msgid "%s: Unable to write new index file"
90e6ef53 434msgstr "%s:无法写入新索引文件"
c04f5ac3 435
8ada9598
JX
436#: sequencer.c:261
437#, fuzzy
438msgid "Could not resolve HEAD commit\n"
439msgstr "不能解析 HEAD 提交"
440
441#: sequencer.c:282
442#, fuzzy
443msgid "Unable to update cache tree\n"
444msgstr "不能更新本地引用"
445
446#: sequencer.c:323
447#, fuzzy, c-format
448msgid "Could not parse commit %s\n"
449msgstr "不能解析 HEAD 提交"
450
451#: sequencer.c:328
452#, fuzzy, c-format
453msgid "Could not parse parent commit %s\n"
454msgstr "%s:不能解析父提交 %s"
455
456#: sequencer.c:358
c04f5ac3 457msgid "Your index file is unmerged."
90e6ef53 458msgstr "您的索引文件未完成合并。"
c04f5ac3 459
8ada9598 460#: sequencer.c:361
c04f5ac3
JX
461msgid "You do not have a valid HEAD"
462msgstr "您没有一个有效的 HEAD"
463
8ada9598 464#: sequencer.c:376
c04f5ac3
JX
465#, c-format
466msgid "Commit %s is a merge but no -m option was given."
467msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
468
8ada9598 469#: sequencer.c:384
c04f5ac3
JX
470#, c-format
471msgid "Commit %s does not have parent %d"
472msgstr "提交 %s 没有父提交 %d"
473
8ada9598 474#: sequencer.c:388
c04f5ac3
JX
475#, c-format
476msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 477msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
478
479#. TRANSLATORS: The first %s will be "revert" or
480#. "cherry-pick", the second %s a SHA1
8ada9598 481#: sequencer.c:399
c04f5ac3
JX
482#, c-format
483msgid "%s: cannot parse parent commit %s"
484msgstr "%s:不能解析父提交 %s"
485
8ada9598 486#: sequencer.c:403
c04f5ac3
JX
487#, c-format
488msgid "Cannot get commit message for %s"
489msgstr "不能得到 %s 的提交说明"
490
8ada9598 491#: sequencer.c:491
c04f5ac3
JX
492#, c-format
493msgid "could not revert %s... %s"
494msgstr "不能还原 %s... %s"
495
8ada9598 496#: sequencer.c:492
c04f5ac3
JX
497#, c-format
498msgid "could not apply %s... %s"
499msgstr "不能应用 %s... %s"
500
8ada9598 501#: sequencer.c:536
c04f5ac3
JX
502msgid "empty commit set passed"
503msgstr "提供了空的提交集"
504
8ada9598 505#: sequencer.c:544
c04f5ac3
JX
506#, c-format
507msgid "git %s: failed to read the index"
90e6ef53 508msgstr "git %s:无法读取索引"
c04f5ac3 509
8ada9598 510#: sequencer.c:549
c04f5ac3
JX
511#, c-format
512msgid "git %s: failed to refresh the index"
90e6ef53 513msgstr "git %s:无法刷新索引"
c04f5ac3 514
8ada9598 515#: sequencer.c:607
c04f5ac3
JX
516#, c-format
517msgid "Cannot %s during a %s"
90e6ef53 518msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 519
8ada9598 520#: sequencer.c:629
c04f5ac3
JX
521#, c-format
522msgid "Could not parse line %d."
90e6ef53 523msgstr "不能解析第 %d 行。"
c04f5ac3 524
8ada9598 525#: sequencer.c:634
c04f5ac3 526msgid "No commits parsed."
7e238ab7 527msgstr "没有提交被解析。"
c04f5ac3 528
8ada9598 529#: sequencer.c:647
c04f5ac3
JX
530#, c-format
531msgid "Could not open %s"
532msgstr "不能打开 %s"
533
8ada9598 534#: sequencer.c:651
c04f5ac3
JX
535#, c-format
536msgid "Could not read %s."
537msgstr "不能读取 %s。"
538
8ada9598 539#: sequencer.c:658
c04f5ac3
JX
540#, c-format
541msgid "Unusable instruction sheet: %s"
542msgstr "无用的指令表单:%s"
543
8ada9598 544#: sequencer.c:686
c04f5ac3
JX
545#, c-format
546msgid "Invalid key: %s"
547msgstr "无效键名:%s"
548
8ada9598 549#: sequencer.c:689
c04f5ac3
JX
550#, c-format
551msgid "Invalid value for %s: %s"
552msgstr "无效的 %s 值:%s"
553
8ada9598 554#: sequencer.c:701
c04f5ac3
JX
555#, c-format
556msgid "Malformed options sheet: %s"
557msgstr "非法的选项表单:%s"
558
8ada9598 559#: sequencer.c:722
c04f5ac3
JX
560msgid "a cherry-pick or revert is already in progress"
561msgstr "一个拣选或还原操作已在进行"
562
8ada9598 563#: sequencer.c:723
c04f5ac3
JX
564msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
565msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
566
8ada9598 567#: sequencer.c:727
c04f5ac3
JX
568#, c-format
569msgid "Could not create sequencer directory %s"
90e6ef53 570msgstr "不能创建序列目录 %s"
c04f5ac3 571
8ada9598 572#: sequencer.c:743 sequencer.c:828
c04f5ac3
JX
573#, c-format
574msgid "Error wrapping up %s."
575msgstr "错误收尾 %s。"
576
8ada9598 577#: sequencer.c:762 sequencer.c:896
c04f5ac3
JX
578msgid "no cherry-pick or revert in progress"
579msgstr "没有拣选或还原操作在进行"
580
8ada9598 581#: sequencer.c:764
c04f5ac3
JX
582msgid "cannot resolve HEAD"
583msgstr "不能解析 HEAD"
584
8ada9598 585#: sequencer.c:766
c04f5ac3 586msgid "cannot abort from a branch yet to be born"
90e6ef53 587msgstr "不能从尚未建立的分支终止"
c04f5ac3 588
8ada9598 589#: sequencer.c:788 builtin/apply.c:3689
c04f5ac3
JX
590#, c-format
591msgid "cannot open %s: %s"
592msgstr "不能打开 %s:%s"
593
8ada9598 594#: sequencer.c:791
c04f5ac3
JX
595#, c-format
596msgid "cannot read %s: %s"
597msgstr "不能读取 %s:%s"
598
8ada9598 599#: sequencer.c:792
c04f5ac3
JX
600msgid "unexpected end of file"
601msgstr "未预期的文件结束"
602
8ada9598 603#: sequencer.c:798
c04f5ac3
JX
604#, c-format
605msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 606msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 607
8ada9598 608#: sequencer.c:821
c04f5ac3
JX
609#, c-format
610msgid "Could not format %s."
611msgstr "不能格式化 %s。"
612
8ada9598 613#: sequencer.c:983
c04f5ac3
JX
614msgid "Can't revert as initial commit"
615msgstr "不能作为初始提交还原"
616
8ada9598 617#: sequencer.c:984
c04f5ac3
JX
618msgid "Can't cherry-pick into empty head"
619msgstr "不能拣选到空分支"
620
170e9899
JX
621#: sha1_name.c:864
622msgid "HEAD does not point to a branch"
623msgstr "HEAD 没有指向一个分支"
624
625#: sha1_name.c:867
626#, c-format
627msgid "No such branch: '%s'"
628msgstr "没有此分支:'%s'"
629
630#: sha1_name.c:869
631#, c-format
632msgid "No upstream configured for branch '%s'"
633msgstr "尚未给分支 '%s' 设置上游"
634
635#: sha1_name.c:872
636#, c-format
637msgid "Upstream branch '%s' not stored as a remote-tracking branch"
638msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
639
8ada9598 640#: wt-status.c:135
c04f5ac3
JX
641msgid "Unmerged paths:"
642msgstr "未合并的路径:"
643
90e6ef53 644# 译者:注意保持前导空格
8ada9598 645#: wt-status.c:141 wt-status.c:158
c04f5ac3
JX
646#, c-format
647msgid " (use \"git reset %s <file>...\" to unstage)"
648msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
649
90e6ef53 650# 译者:注意保持前导空格
8ada9598 651#: wt-status.c:143 wt-status.c:160
c04f5ac3
JX
652msgid " (use \"git rm --cached <file>...\" to unstage)"
653msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
654
90e6ef53 655# 译者:注意保持前导空格
8ada9598 656#: wt-status.c:144
c04f5ac3
JX
657msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
658msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
659
8ada9598 660#: wt-status.c:152
c04f5ac3
JX
661msgid "Changes to be committed:"
662msgstr "要提交的变更:"
663
8ada9598 664#: wt-status.c:170
c04f5ac3 665msgid "Changes not staged for commit:"
7e238ab7 666msgstr "尚未暂存以备提交的变更:"
c04f5ac3 667
90e6ef53 668# 译者:注意保持前导空格
8ada9598 669#: wt-status.c:174
c04f5ac3
JX
670msgid " (use \"git add <file>...\" to update what will be committed)"
671msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
672
90e6ef53 673# 译者:注意保持前导空格
8ada9598 674#: wt-status.c:176
c04f5ac3
JX
675msgid " (use \"git add/rm <file>...\" to update what will be committed)"
676msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
677
90e6ef53 678# 译者:注意保持前导空格
8ada9598 679#: wt-status.c:177
c04f5ac3
JX
680msgid ""
681" (use \"git checkout -- <file>...\" to discard changes in working directory)"
682msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
683
90e6ef53 684# 译者:注意保持前导空格
8ada9598 685#: wt-status.c:179
c04f5ac3
JX
686msgid " (commit or discard the untracked or modified content in submodules)"
687msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
688
8ada9598 689#: wt-status.c:188
c04f5ac3
JX
690#, c-format
691msgid "%s files:"
692msgstr "%s文件:"
693
90e6ef53 694# 译者:注意保持前导空格
8ada9598 695#: wt-status.c:191
c04f5ac3
JX
696#, c-format
697msgid " (use \"git %s <file>...\" to include in what will be committed)"
90e6ef53 698msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
c04f5ac3 699
8ada9598 700#: wt-status.c:208
c04f5ac3
JX
701msgid "bug"
702msgstr "bug"
703
8ada9598 704#: wt-status.c:213
c04f5ac3
JX
705msgid "both deleted:"
706msgstr "双方删除:"
707
8ada9598 708#: wt-status.c:214
c04f5ac3
JX
709msgid "added by us:"
710msgstr "由我们添加:"
711
8ada9598 712#: wt-status.c:215
c04f5ac3
JX
713msgid "deleted by them:"
714msgstr "由他们删除:"
715
8ada9598 716#: wt-status.c:216
c04f5ac3
JX
717msgid "added by them:"
718msgstr "由他们添加:"
719
8ada9598 720#: wt-status.c:217
c04f5ac3
JX
721msgid "deleted by us:"
722msgstr "由我们删除:"
723
8ada9598 724#: wt-status.c:218
c04f5ac3
JX
725msgid "both added:"
726msgstr "双方添加:"
727
8ada9598 728#: wt-status.c:219
c04f5ac3
JX
729msgid "both modified:"
730msgstr "双方修改:"
731
90e6ef53 732# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
8ada9598 733#: wt-status.c:249
c04f5ac3 734msgid "new commits, "
aa9565f7 735msgstr "新提交, "
c04f5ac3 736
90e6ef53 737# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
8ada9598 738#: wt-status.c:251
c04f5ac3 739msgid "modified content, "
aa9565f7 740msgstr "修改的内容, "
c04f5ac3 741
90e6ef53 742# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
8ada9598 743#: wt-status.c:253
c04f5ac3 744msgid "untracked content, "
aa9565f7 745msgstr "未跟踪的内容, "
c04f5ac3 746
90e6ef53 747# 译者:为保证在输出中对齐,注意调整句中空格!
8ada9598 748#: wt-status.c:267
c04f5ac3
JX
749#, c-format
750msgid "new file: %s"
751msgstr "新文件: %s"
752
90e6ef53 753# 译者:为保证在输出中对齐,注意调整句中空格!
8ada9598 754#: wt-status.c:270
c04f5ac3
JX
755#, c-format
756msgid "copied: %s -> %s"
757msgstr "拷贝: %s -> %s"
758
90e6ef53 759# 译者:为保证在输出中对齐,注意调整句中空格!
8ada9598 760#: wt-status.c:273
c04f5ac3
JX
761#, c-format
762msgid "deleted: %s"
763msgstr "删除: %s"
764
90e6ef53 765# 译者:为保证在输出中对齐,注意调整句中空格!
8ada9598 766#: wt-status.c:276
c04f5ac3
JX
767#, c-format
768msgid "modified: %s"
769msgstr "修改: %s"
770
90e6ef53 771# 译者:为保证在输出中对齐,注意调整句中空格!
8ada9598 772#: wt-status.c:279
c04f5ac3
JX
773#, c-format
774msgid "renamed: %s -> %s"
775msgstr "重命名: %s -> %s"
776
90e6ef53 777# 译者:为保证在输出中对齐,注意调整句中空格!
8ada9598 778#: wt-status.c:282
c04f5ac3
JX
779#, c-format
780msgid "typechange: %s"
781msgstr "类型变更: %s"
782
90e6ef53 783# 译者:为保证在输出中对齐,注意调整句中空格!
8ada9598 784#: wt-status.c:285
c04f5ac3
JX
785#, c-format
786msgid "unknown: %s"
787msgstr "未知: %s"
788
90e6ef53 789# 译者:为保证在输出中对齐,注意调整句中空格!
8ada9598 790#: wt-status.c:288
c04f5ac3
JX
791#, c-format
792msgid "unmerged: %s"
793msgstr "未合并: %s"
794
8ada9598 795#: wt-status.c:291
c04f5ac3
JX
796#, c-format
797msgid "bug: unhandled diff status %c"
90e6ef53 798msgstr "bug:未处理的差异状态 %c"
c04f5ac3 799
8ada9598 800#: wt-status.c:737
c04f5ac3
JX
801msgid "On branch "
802msgstr "位于分支 "
803
8ada9598 804#: wt-status.c:744
c04f5ac3
JX
805msgid "Not currently on any branch."
806msgstr "当前不在任何分支上。"
807
8ada9598 808#: wt-status.c:755
c04f5ac3
JX
809msgid "Initial commit"
810msgstr "初始提交"
811
8ada9598 812#: wt-status.c:769
c04f5ac3
JX
813msgid "Untracked"
814msgstr "未跟踪的"
815
8ada9598 816#: wt-status.c:771
c04f5ac3
JX
817msgid "Ignored"
818msgstr "忽略的"
819
8ada9598 820#: wt-status.c:773
c04f5ac3
JX
821#, c-format
822msgid "Untracked files not listed%s"
823msgstr "未跟踪的文件没有列出%s"
824
7e238ab7 825# 译者:中文字符串拼接,可删除前导空格
8ada9598 826#: wt-status.c:775
c04f5ac3 827msgid " (use -u option to show untracked files)"
7e238ab7 828msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 829
8ada9598 830#: wt-status.c:781
c04f5ac3
JX
831msgid "No changes"
832msgstr "没有修改"
833
8ada9598 834#: wt-status.c:785
c04f5ac3
JX
835#, c-format
836msgid "no changes added to commit%s\n"
837msgstr "修改尚未加入提交%s\n"
838
7e238ab7 839# 译者:中文字符串拼接,可删除前导空格
8ada9598 840#: wt-status.c:787
c04f5ac3 841msgid " (use \"git add\" and/or \"git commit -a\")"
7e238ab7 842msgstr "(使用 \"git add\" 和/或 \"git commit -a\")"
c04f5ac3 843
8ada9598 844#: wt-status.c:789
c04f5ac3
JX
845#, c-format
846msgid "nothing added to commit but untracked files present%s\n"
847msgstr "空提交但存在未跟踪文件%s\n"
848
7e238ab7 849# 译者:中文字符串拼接,可删除前导空格
8ada9598 850#: wt-status.c:791
c04f5ac3 851msgid " (use \"git add\" to track)"
7e238ab7 852msgstr "(使用 \"git add\" 建立跟踪)"
c04f5ac3 853
8ada9598 854#: wt-status.c:793 wt-status.c:796 wt-status.c:799
c04f5ac3
JX
855#, c-format
856msgid "nothing to commit%s\n"
857msgstr "无须提交%s\n"
858
7e238ab7 859# 译者:中文字符串拼接,可删除前导空格
8ada9598 860#: wt-status.c:794
c04f5ac3 861msgid " (create/copy files and use \"git add\" to track)"
7e238ab7 862msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)"
c04f5ac3 863
7e238ab7 864# 译者:中文字符串拼接,可删除前导空格
8ada9598 865#: wt-status.c:797
c04f5ac3 866msgid " (use -u to show untracked files)"
7e238ab7 867msgstr "(使用 -u 显示未跟踪文件)"
c04f5ac3 868
7e238ab7 869# 译者:中文字符串拼接,可删除前导空格
8ada9598 870#: wt-status.c:800
c04f5ac3 871msgid " (working directory clean)"
7e238ab7 872msgstr "(干净的工作区)"
c04f5ac3 873
8ada9598 874#: wt-status.c:908
c04f5ac3 875msgid "HEAD (no branch)"
61bc0753 876msgstr "HEAD(非分支)"
c04f5ac3 877
90e6ef53 878# 译者:注意保持句尾空格
8ada9598 879#: wt-status.c:914
c04f5ac3
JX
880msgid "Initial commit on "
881msgstr "初始提交于 "
882
90e6ef53 883# 译者:注意保持句尾空格
8ada9598 884#: wt-status.c:929
c04f5ac3
JX
885msgid "behind "
886msgstr "落后 "
887
90e6ef53 888# 译者:注意保持句尾空格
8ada9598 889#: wt-status.c:932 wt-status.c:935
c04f5ac3
JX
890msgid "ahead "
891msgstr "领先 "
892
90e6ef53 893# 译者:注意保持句尾空格
8ada9598 894#: wt-status.c:937
c04f5ac3
JX
895msgid ", behind "
896msgstr ",落后 "
897
898#: builtin/add.c:62
899#, c-format
900msgid "unexpected diff status %c"
901msgstr "意外的差异状态 %c"
902
8ada9598 903#: builtin/add.c:67 builtin/commit.c:226
c04f5ac3
JX
904msgid "updating files failed"
905msgstr "更新文件失败"
906
907#: builtin/add.c:77
908#, c-format
909msgid "remove '%s'\n"
910msgstr "删除 '%s'\n"
911
912#: builtin/add.c:176
913#, c-format
914msgid "Path '%s' is in submodule '%.*s'"
915msgstr "路径 '%s' 属于模组 '%.*s'"
916
917#: builtin/add.c:192
918msgid "Unstaged changes after refreshing the index:"
90e6ef53 919msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3
JX
920
921#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
922#, c-format
923msgid "pathspec '%s' did not match any files"
924msgstr "路径 '%s' 未匹配任何文件"
925
926#: builtin/add.c:209
927#, c-format
928msgid "'%s' is beyond a symbolic link"
929msgstr "'%s' 位于符号链接中"
930
931#: builtin/add.c:276
932msgid "Could not read the index"
90e6ef53 933msgstr "不能读取索引"
c04f5ac3
JX
934
935#: builtin/add.c:286
936#, c-format
937msgid "Could not open '%s' for writing."
90e6ef53 938msgstr "不能为写入打开 '%s'。"
c04f5ac3
JX
939
940#: builtin/add.c:290
941msgid "Could not write patch"
90e6ef53 942msgstr "不能写补丁"
c04f5ac3
JX
943
944#: builtin/add.c:295
945#, c-format
946msgid "Could not stat '%s'"
90e6ef53 947msgstr "不能查看文件状态 '%s'"
c04f5ac3
JX
948
949#: builtin/add.c:297
950msgid "Empty patch. Aborted."
951msgstr "空补丁。异常终止。"
952
8ada9598
JX
953#: builtin/add.c:303
954#, c-format
955msgid "Could not apply '%s'"
956msgstr "不能应用 '%s'"
957
958#: builtin/add.c:312
959msgid "The following paths are ignored by one of your .gitignore files:\n"
960msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n"
961
962#: builtin/add.c:352
963#, c-format
964msgid "Use -f if you really want to add them.\n"
965msgstr "使用 -f 参数如果您确实要添加它们。\n"
966
967#: builtin/add.c:353
968msgid "no files added"
969msgstr "没有文件被添加"
970
971#: builtin/add.c:359
972msgid "adding files failed"
973msgstr "添加文件失败"
974
975#: builtin/add.c:391
976msgid "-A and -u are mutually incompatible"
977msgstr "-A 和 -u 选项互斥"
978
979#: builtin/add.c:393
980msgid "Option --ignore-missing can only be used together with --dry-run"
981msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
982
983#: builtin/add.c:413
984#, c-format
985msgid "Nothing specified, nothing added.\n"
986msgstr "没有指定文件,也没有文件被添加。\n"
987
988#: builtin/add.c:414
989#, c-format
990msgid "Maybe you wanted to say 'git add .'?\n"
991msgstr "也许您想要执行 'git add .'?\n"
992
993#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
994#: builtin/rm.c:162
995msgid "index file corrupt"
996msgstr "索引文件损坏"
997
998#: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260
999msgid "Unable to write new index file"
1000msgstr "无法写入新索引文件"
1001
1002#: builtin/apply.c:53
1003msgid "git apply [options] [<patch>...]"
1004msgstr ""
1005
1006#: builtin/apply.c:106
1007#, fuzzy, c-format
1008msgid "unrecognized whitespace option '%s'"
1009msgstr "未识别的选项:'$arg'"
1010
1011#: builtin/apply.c:121
1012#, fuzzy, c-format
1013msgid "unrecognized whitespace ignore option '%s'"
1014msgstr "未识别的选项:'$arg'"
1015
1016#: builtin/apply.c:815
1017#, c-format
1018msgid "Cannot prepare timestamp regexp %s"
1019msgstr ""
1020
1021#: builtin/apply.c:824
1022#, c-format
1023msgid "regexec returned %d for input: %s"
1024msgstr ""
1025
1026#: builtin/apply.c:905
1027#, fuzzy, c-format
1028msgid "unable to find filename in patch at line %d"
1029msgstr "不能处理 %d 类型的文件"
1030
1031#: builtin/apply.c:937
1032#, c-format
1033msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1034msgstr ""
1035
1036#: builtin/apply.c:941
1037#, c-format
1038msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1039msgstr ""
1040
1041#: builtin/apply.c:942
1042#, c-format
1043msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1044msgstr ""
1045
1046#: builtin/apply.c:949
1047#, c-format
1048msgid "git apply: bad git-diff - expected /dev/null on line %d"
1049msgstr ""
1050
1051#: builtin/apply.c:1394
1052#, c-format
1053msgid "recount: unexpected line: %.*s"
1054msgstr ""
1055
1056#: builtin/apply.c:1451
1057#, c-format
1058msgid "patch fragment without header at line %d: %.*s"
1059msgstr ""
1060
1061#: builtin/apply.c:1468
1062#, c-format
1063msgid ""
1064"git diff header lacks filename information when removing %d leading pathname "
1065"component (line %d)"
1066msgid_plural ""
1067"git diff header lacks filename information when removing %d leading pathname "
1068"components (line %d)"
1069msgstr[0] ""
1070
1071#: builtin/apply.c:1628
1072msgid "new file depends on old contents"
1073msgstr ""
1074
1075#: builtin/apply.c:1630
1076msgid "deleted file still has contents"
1077msgstr ""
1078
1079#: builtin/apply.c:1656
1080#, c-format
1081msgid "corrupt patch at line %d"
1082msgstr ""
1083
1084#: builtin/apply.c:1692
1085#, c-format
1086msgid "new file %s depends on old contents"
1087msgstr ""
1088
1089#: builtin/apply.c:1694
1090#, c-format
1091msgid "deleted file %s still has contents"
1092msgstr ""
1093
1094#: builtin/apply.c:1697
1095#, c-format
1096msgid "** warning: file %s becomes empty but is not deleted"
1097msgstr ""
1098
1099#: builtin/apply.c:1843
1100#, c-format
1101msgid "corrupt binary patch at line %d: %.*s"
1102msgstr ""
1103
1104#. there has to be one hunk (forward hunk)
1105#: builtin/apply.c:1872
1106#, c-format
1107msgid "unrecognized binary patch at line %d"
1108msgstr ""
1109
1110#: builtin/apply.c:1958
1111#, c-format
1112msgid "patch with only garbage at line %d"
1113msgstr ""
1114
1115#: builtin/apply.c:2048
1116#, fuzzy, c-format
1117msgid "unable to read symlink %s"
1118msgstr "无法读取树(%s)"
1119
1120#: builtin/apply.c:2052
1121#, fuzzy, c-format
1122msgid "unable to open or read %s"
1123msgstr "不能打开或读取 '%s'"
1124
1125#: builtin/apply.c:2123
1126msgid "oops"
1127msgstr ""
1128
1129#: builtin/apply.c:2645
1130#, fuzzy, c-format
1131msgid "invalid start of line: '%c'"
1132msgstr "无效引用:%s"
1133
1134#: builtin/apply.c:2763
1135#, c-format
1136msgid "Hunk #%d succeeded at %d (offset %d line)."
1137msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1138msgstr[0] ""
1139
1140#: builtin/apply.c:2775
1141#, c-format
1142msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1143msgstr ""
1144
1145#: builtin/apply.c:2781
1146#, c-format
1147msgid ""
1148"while searching for:\n"
1149"%.*s"
1150msgstr ""
1151
1152#: builtin/apply.c:2800
1153#, c-format
1154msgid "missing binary patch data for '%s'"
1155msgstr ""
1156
1157#: builtin/apply.c:2903
1158#, c-format
1159msgid "binary patch does not apply to '%s'"
1160msgstr ""
1161
1162#: builtin/apply.c:2909
1163#, c-format
1164msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1165msgstr ""
1166
1167#: builtin/apply.c:2930
1168#, c-format
1169msgid "patch failed: %s:%ld"
1170msgstr ""
1171
1172#: builtin/apply.c:3045
1173#, c-format
1174msgid "patch %s has been renamed/deleted"
1175msgstr ""
1176
1177#: builtin/apply.c:3052 builtin/apply.c:3069
1178#, fuzzy, c-format
1179msgid "read of %s failed"
1180msgstr "重命名 '%s' 失败"
1181
1182#: builtin/apply.c:3084
1183msgid "removal patch leaves file contents"
1184msgstr ""
1185
1186#: builtin/apply.c:3105
1187#, fuzzy, c-format
1188msgid "%s: already exists in working directory"
1189msgstr "%s 存在且不是一个目录"
1190
1191#: builtin/apply.c:3143
1192#, c-format
1193msgid "%s: has been deleted/renamed"
1194msgstr ""
1195
1196#: builtin/apply.c:3148 builtin/apply.c:3179
1197#, fuzzy, c-format
1198msgid "%s: %s"
1199msgstr "'%s':%s"
1200
1201#: builtin/apply.c:3159
1202#, c-format
1203msgid "%s: does not exist in index"
1204msgstr ""
1205
1206#: builtin/apply.c:3173
1207#, fuzzy, c-format
1208msgid "%s: does not match index"
1209msgstr "不能读取索引"
1210
1211#: builtin/apply.c:3190
1212#, c-format
1213msgid "%s: wrong type"
1214msgstr ""
1215
1216#: builtin/apply.c:3192
1217#, c-format
1218msgid "%s has type %o, expected %o"
1219msgstr ""
1220
1221#: builtin/apply.c:3247
1222#, fuzzy, c-format
1223msgid "%s: already exists in index"
1224msgstr "%s 已经存在"
1225
1226#: builtin/apply.c:3266
1227#, c-format
1228msgid "new mode (%o) of %s does not match old mode (%o)%s%s"
1229msgstr ""
1230
1231#: builtin/apply.c:3272
1232#, c-format
1233msgid "%s: patch does not apply"
1234msgstr ""
1235
1236#: builtin/apply.c:3285
1237#, c-format
1238msgid "Checking patch %s..."
1239msgstr ""
1240
1241#: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158
1242#, c-format
1243msgid "make_cache_entry failed for path '%s'"
1244msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1245
1246#: builtin/apply.c:3483
1247#, fuzzy, c-format
1248msgid "unable to remove %s from index"
1249msgstr "不能移动 %s 至 %s"
1250
1251#: builtin/apply.c:3510
1252#, c-format
1253msgid "corrupt patch for subproject %s"
1254msgstr ""
1255
1256#: builtin/apply.c:3514
1257#, fuzzy, c-format
1258msgid "unable to stat newly created file '%s'"
1259msgstr "不能创建文件 '%s'"
1260
1261#: builtin/apply.c:3519
1262#, c-format
1263msgid "unable to create backing store for newly created file %s"
1264msgstr ""
1265
1266#: builtin/apply.c:3522
1267#, fuzzy, c-format
1268msgid "unable to add cache entry for %s"
1269msgstr "无法为 '%s' 添加合并结果"
1270
1271#: builtin/apply.c:3555
1272#, fuzzy, c-format
1273msgid "closing file '%s'"
1274msgstr "正克隆到 '%s'...\n"
1275
1276#: builtin/apply.c:3604
1277#, fuzzy, c-format
1278msgid "unable to write file '%s' mode %o"
1279msgstr "不能写 %s"
1280
1281#: builtin/apply.c:3660
1282#, c-format
1283msgid "Applied patch %s cleanly."
1284msgstr ""
1285
1286#: builtin/apply.c:3668
1287#, fuzzy
1288msgid "internal error"
1289msgstr "在版本遍历时遇到内部错误"
1290
1291#. Say this even without --verbose
1292#: builtin/apply.c:3671
1293#, c-format
1294msgid "Applying patch %%s with %d reject..."
1295msgid_plural "Applying patch %%s with %d rejects..."
1296msgstr[0] ""
1297
1298#: builtin/apply.c:3681
1299#, c-format
1300msgid "truncating .rej filename to %.*s.rej"
1301msgstr ""
1302
1303#: builtin/apply.c:3702
1304#, c-format
1305msgid "Hunk #%d applied cleanly."
1306msgstr ""
1307
1308#: builtin/apply.c:3705
1309#, c-format
1310msgid "Rejected hunk #%d."
1311msgstr ""
1312
1313#: builtin/apply.c:3836
1314#, fuzzy
1315msgid "unrecognized input"
1316msgstr "未识别的参数:%s"
1317
1318#: builtin/apply.c:3847
1319#, fuzzy
1320msgid "unable to read index file"
1321msgstr "无法写新的索引文件"
1322
1323#: builtin/apply.c:3962 builtin/apply.c:3965
1324msgid "path"
1325msgstr ""
1326
1327#: builtin/apply.c:3963
1328msgid "don't apply changes matching the given path"
1329msgstr ""
1330
1331#: builtin/apply.c:3966
1332msgid "apply changes matching the given path"
1333msgstr ""
1334
1335#: builtin/apply.c:3968
1336msgid "num"
1337msgstr ""
1338
1339#: builtin/apply.c:3969
1340msgid "remove <num> leading slashes from traditional diff paths"
1341msgstr ""
1342
1343#: builtin/apply.c:3972
1344msgid "ignore additions made by the patch"
1345msgstr ""
1346
1347#: builtin/apply.c:3974
1348msgid "instead of applying the patch, output diffstat for the input"
1349msgstr ""
1350
1351#: builtin/apply.c:3978
1352msgid "shows number of added and deleted lines in decimal notation"
1353msgstr ""
1354
1355#: builtin/apply.c:3980
1356msgid "instead of applying the patch, output a summary for the input"
1357msgstr ""
1358
1359#: builtin/apply.c:3982
1360msgid "instead of applying the patch, see if the patch is applicable"
1361msgstr ""
1362
1363#: builtin/apply.c:3984
1364msgid "make sure the patch is applicable to the current index"
1365msgstr ""
1366
1367#: builtin/apply.c:3986
1368msgid "apply a patch without touching the working tree"
1369msgstr ""
1370
1371#: builtin/apply.c:3988
1372msgid "also apply the patch (use with --stat/--summary/--check)"
1373msgstr ""
1374
1375#: builtin/apply.c:3990
1376msgid "build a temporary index based on embedded index information"
1377msgstr ""
1378
1379#: builtin/apply.c:3992
1380msgid "paths are separated with NUL character"
1381msgstr ""
1382
1383#: builtin/apply.c:3995
1384msgid "ensure at least <n> lines of context match"
1385msgstr ""
1386
1387#: builtin/apply.c:3996
1388msgid "action"
1389msgstr ""
1390
1391#: builtin/apply.c:3997
1392msgid "detect new or modified lines that have whitespace errors"
1393msgstr ""
1394
1395#: builtin/apply.c:4000 builtin/apply.c:4003
1396msgid "ignore changes in whitespace when finding context"
1397msgstr ""
1398
1399#: builtin/apply.c:4006
1400msgid "apply the patch in reverse"
1401msgstr ""
1402
1403#: builtin/apply.c:4008
1404msgid "don't expect at least one line of context"
1405msgstr ""
1406
1407#: builtin/apply.c:4010
1408msgid "leave the rejected hunks in corresponding *.rej files"
1409msgstr ""
1410
1411#: builtin/apply.c:4012
1412msgid "allow overlapping hunks"
1413msgstr ""
1414
1415#: builtin/apply.c:4013
1416msgid "be verbose"
1417msgstr ""
c04f5ac3 1418
8ada9598
JX
1419#: builtin/apply.c:4015
1420msgid "tolerate incorrectly detected missing new-line at the end of file"
1421msgstr ""
c04f5ac3 1422
8ada9598
JX
1423#: builtin/apply.c:4018
1424msgid "do not trust the line counts in the hunk headers"
1425msgstr ""
c04f5ac3 1426
8ada9598
JX
1427#: builtin/apply.c:4020
1428msgid "root"
1429msgstr ""
c04f5ac3 1430
8ada9598
JX
1431#: builtin/apply.c:4021
1432msgid "prepend <root> to all filenames"
1433msgstr ""
c04f5ac3 1434
8ada9598
JX
1435#: builtin/apply.c:4042
1436#, fuzzy
1437msgid "--index outside a repository"
1438msgstr "不是一个 git 版本库"
c04f5ac3 1439
8ada9598
JX
1440#: builtin/apply.c:4045
1441#, fuzzy
1442msgid "--cached outside a repository"
1443msgstr "不是一个 git 版本库"
c04f5ac3 1444
8ada9598
JX
1445#: builtin/apply.c:4061
1446#, fuzzy, c-format
1447msgid "can't open patch '%s'"
1448msgstr "不能打开 '%s'"
c04f5ac3 1449
8ada9598 1450#: builtin/apply.c:4075
c04f5ac3 1451#, c-format
8ada9598
JX
1452msgid "squelched %d whitespace error"
1453msgid_plural "squelched %d whitespace errors"
1454msgstr[0] ""
c04f5ac3 1455
8ada9598
JX
1456#: builtin/apply.c:4081 builtin/apply.c:4091
1457#, c-format
1458msgid "%d line adds whitespace errors."
1459msgid_plural "%d lines add whitespace errors."
1460msgstr[0] ""
c04f5ac3
JX
1461
1462#: builtin/archive.c:17
1463#, c-format
1464msgid "could not create archive file '%s'"
90e6ef53 1465msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
1466
1467#: builtin/archive.c:20
1468msgid "could not redirect output"
90e6ef53 1469msgstr "不能输出重定向"
c04f5ac3
JX
1470
1471#: builtin/archive.c:37
1472msgid "git archive: Remote with no URL"
90e6ef53 1473msgstr "git archive:未提供远程URL"
c04f5ac3
JX
1474
1475#: builtin/archive.c:58
1476msgid "git archive: expected ACK/NAK, got EOF"
90e6ef53 1477msgstr "git archive:期待ACK/NACK,却得到EOF"
c04f5ac3
JX
1478
1479#: builtin/archive.c:63
1480#, c-format
1481msgid "git archive: NACK %s"
90e6ef53 1482msgstr "git archive:NACK %s"
c04f5ac3
JX
1483
1484#: builtin/archive.c:65
1485#, c-format
1486msgid "remote error: %s"
1487msgstr "远程错误:%s"
1488
1489#: builtin/archive.c:66
1490msgid "git archive: protocol error"
90e6ef53 1491msgstr "git archive:协议错误"
c04f5ac3
JX
1492
1493#: builtin/archive.c:71
1494msgid "git archive: expected a flush"
90e6ef53 1495msgstr "git archive:预期一个刷新"
c04f5ac3 1496
90e6ef53 1497# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
8ada9598 1498#: builtin/branch.c:144
c04f5ac3
JX
1499#, c-format
1500msgid ""
1501"deleting branch '%s' that has been merged to\n"
1502" '%s', but not yet merged to HEAD."
1503msgstr ""
70fc47bf 1504"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
1505" '%s',但未合并到 HEAD。"
1506
90e6ef53 1507# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
8ada9598 1508#: builtin/branch.c:148
c04f5ac3
JX
1509#, c-format
1510msgid ""
1511"not deleting branch '%s' that is not yet merged to\n"
1512" '%s', even though it is merged to HEAD."
1513msgstr ""
70fc47bf
T
1514"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
1515" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 1516
8ada9598 1517#: builtin/branch.c:180
c04f5ac3
JX
1518msgid "cannot use -a with -d"
1519msgstr "不能将 -a 和 -d 共用"
1520
8ada9598 1521#: builtin/branch.c:186
c04f5ac3
JX
1522msgid "Couldn't look up commit object for HEAD"
1523msgstr "无法查询 HEAD 指向的提交对象"
1524
8ada9598 1525#: builtin/branch.c:191
c04f5ac3
JX
1526#, c-format
1527msgid "Cannot delete the branch '%s' which you are currently on."
1528msgstr "无法删除您当前所在的分支 '%s'。"
1529
8ada9598
JX
1530#: builtin/branch.c:202
1531#, fuzzy, c-format
1532msgid "remote branch '%s' not found."
c04f5ac3
JX
1533msgstr "%s分支 '%s' 未发现。"
1534
8ada9598
JX
1535#: builtin/branch.c:203
1536#, fuzzy, c-format
1537msgid "branch '%s' not found."
1538msgstr "%s分支 '%s' 未发现。"
1539
1540#: builtin/branch.c:210
c04f5ac3
JX
1541#, c-format
1542msgid "Couldn't look up commit object for '%s'"
1543msgstr "无法查询 '%s' 指向的提交对象"
1544
8ada9598 1545#: builtin/branch.c:216
c04f5ac3
JX
1546#, c-format
1547msgid ""
1548"The branch '%s' is not fully merged.\n"
1549"If you are sure you want to delete it, run 'git branch -D %s'."
1550msgstr ""
1551"分支 '%s' 没有完全合并。\n"
1552"如果您确认要删除它,执行 'git branch -D %s'。"
1553
8ada9598
JX
1554#: builtin/branch.c:225
1555#, fuzzy, c-format
1556msgid "Error deleting remote branch '%s'"
90e6ef53 1557msgstr "删除 %s分支 '%s' 时出错"
c04f5ac3 1558
8ada9598
JX
1559#: builtin/branch.c:226
1560#, fuzzy, c-format
1561msgid "Error deleting branch '%s'"
1562msgstr "删除 %s分支 '%s' 时出错"
1563
1564#: builtin/branch.c:233
1565#, fuzzy, c-format
1566msgid "Deleted remote branch %s (was %s).\n"
c04f5ac3
JX
1567msgstr "已删除 %s分支 %s(曾为 %s)。\n"
1568
8ada9598
JX
1569#: builtin/branch.c:234
1570#, fuzzy, c-format
1571msgid "Deleted branch %s (was %s).\n"
1572msgstr "已删除 %s分支 %s(曾为 %s)。\n"
1573
1574#: builtin/branch.c:239
c04f5ac3
JX
1575msgid "Update of config-file failed"
1576msgstr "无法更新 config 文件"
1577
8ada9598 1578#: builtin/branch.c:337
c04f5ac3
JX
1579#, c-format
1580msgid "branch '%s' does not point at a commit"
1581msgstr "分支 '%s' 未指向一个提交"
1582
90e6ef53 1583# 译者:注意保持句尾空格
8ada9598
JX
1584#: builtin/branch.c:409
1585#, fuzzy, c-format
1586msgid "[%s: behind %d]"
c04f5ac3
JX
1587msgstr "落后 %d] "
1588
90e6ef53 1589# 译者:注意保持句尾空格
8ada9598
JX
1590#: builtin/branch.c:411
1591#, fuzzy, c-format
1592msgid "[behind %d]"
1593msgstr "落后 %d] "
1594
1595# 译者:注意保持句尾空格
1596#: builtin/branch.c:415
1597#, fuzzy, c-format
1598msgid "[%s: ahead %d]"
c04f5ac3
JX
1599msgstr "领先 %d] "
1600
90e6ef53 1601# 译者:注意保持句尾空格
8ada9598
JX
1602#: builtin/branch.c:417
1603#, fuzzy, c-format
1604msgid "[ahead %d]"
1605msgstr "领先 %d] "
1606
1607# 译者:注意保持句尾空格
1608#: builtin/branch.c:420
1609#, fuzzy, c-format
1610msgid "[%s: ahead %d, behind %d]"
1611msgstr "领先 %d,落后 %d] "
1612
1613# 译者:注意保持句尾空格
1614#: builtin/branch.c:423
1615#, fuzzy, c-format
1616msgid "[ahead %d, behind %d]"
c04f5ac3
JX
1617msgstr "领先 %d,落后 %d] "
1618
8ada9598 1619#: builtin/branch.c:535
c04f5ac3
JX
1620msgid "(no branch)"
1621msgstr "(非分支)"
1622
8ada9598 1623#: builtin/branch.c:600
c04f5ac3 1624msgid "some refs could not be read"
90e6ef53 1625msgstr "一些引用不能读取"
c04f5ac3 1626
8ada9598 1627#: builtin/branch.c:613
c04f5ac3 1628msgid "cannot rename the current branch while not on any."
90e6ef53 1629msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 1630
8ada9598 1631#: builtin/branch.c:623
c04f5ac3
JX
1632#, c-format
1633msgid "Invalid branch name: '%s'"
1634msgstr "无效的分支名:'%s'"
1635
8ada9598 1636#: builtin/branch.c:638
c04f5ac3
JX
1637msgid "Branch rename failed"
1638msgstr "分支重命名失败"
1639
8ada9598 1640#: builtin/branch.c:642
c04f5ac3
JX
1641#, c-format
1642msgid "Renamed a misnamed branch '%s' away"
1643msgstr "重命名掉一个错误命名的旧分支 '%s'"
1644
8ada9598 1645#: builtin/branch.c:646
c04f5ac3
JX
1646#, c-format
1647msgid "Branch renamed to %s, but HEAD is not updated!"
1648msgstr "分支重命名为 %s,但 HEAD 没有更新!"
1649
8ada9598 1650#: builtin/branch.c:653
c04f5ac3
JX
1651msgid "Branch is renamed, but update of config-file failed"
1652msgstr "分支被重命名,但更新 config 文件失败"
1653
8ada9598 1654#: builtin/branch.c:668
c04f5ac3
JX
1655#, c-format
1656msgid "malformed object name %s"
1657msgstr "非法的对象名 %s"
1658
8ada9598
JX
1659#: builtin/branch.c:692
1660#, fuzzy, c-format
1661msgid "could not write branch description template: %s"
c04f5ac3
JX
1662msgstr "不能写分支描述模版:%s\n"
1663
8ada9598 1664#: builtin/branch.c:783
c04f5ac3
JX
1665msgid "Failed to resolve HEAD as a valid ref."
1666msgstr "无法将 HEAD 解析为有效引用。"
1667
8ada9598 1668#: builtin/branch.c:788 builtin/clone.c:558
c04f5ac3 1669msgid "HEAD not found below refs/heads!"
90e6ef53 1670msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 1671
8ada9598
JX
1672#: builtin/branch.c:808
1673#, fuzzy
1674msgid "--column and --verbose are incompatible"
1675msgstr "--all 和 --mirror 不兼容"
1676
1677#: builtin/branch.c:857
c04f5ac3
JX
1678msgid "-a and -r options to 'git branch' do not make sense with a branch name"
1679msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
1680
1681#: builtin/bundle.c:47
1682#, c-format
1683msgid "%s is okay\n"
1684msgstr "%s 可以\n"
1685
1686#: builtin/bundle.c:56
1687msgid "Need a repository to create a bundle."
90e6ef53 1688msgstr "需要一个版本库来创建包。"
c04f5ac3
JX
1689
1690#: builtin/bundle.c:60
1691msgid "Need a repository to unbundle."
90e6ef53 1692msgstr "需要一个版本库来解包。"
c04f5ac3
JX
1693
1694#: builtin/checkout.c:113 builtin/checkout.c:146
1695#, c-format
1696msgid "path '%s' does not have our version"
1697msgstr "路径 '%s' 没有我们的版本"
1698
1699#: builtin/checkout.c:115 builtin/checkout.c:148
1700#, c-format
1701msgid "path '%s' does not have their version"
1702msgstr "路径 '%s' 没有他们的版本"
1703
1704#: builtin/checkout.c:131
1705#, c-format
1706msgid "path '%s' does not have all necessary versions"
1707msgstr "路径 '%s' 没有全部必须的版本"
1708
1709#: builtin/checkout.c:175
1710#, c-format
1711msgid "path '%s' does not have necessary versions"
1712msgstr "路径 '%s' 没有必须的版本"
1713
1714#: builtin/checkout.c:192
1715#, c-format
1716msgid "path '%s': cannot merge"
90e6ef53 1717msgstr "path '%s':无法合并"
c04f5ac3
JX
1718
1719#: builtin/checkout.c:209
1720#, c-format
1721msgid "Unable to add merge result for '%s'"
1722msgstr "无法为 '%s' 添加合并结果"
1723
c04f5ac3
JX
1724#: builtin/checkout.c:234 builtin/checkout.c:392
1725msgid "corrupt index file"
90e6ef53 1726msgstr "损坏的索引文件"
c04f5ac3
JX
1727
1728#: builtin/checkout.c:264 builtin/checkout.c:271
1729#, c-format
1730msgid "path '%s' is unmerged"
1731msgstr "路径 '%s' 未合并"
1732
7ac1c0ad 1733#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
170e9899 1734#: builtin/merge.c:812
c04f5ac3 1735msgid "unable to write new index file"
90e6ef53 1736msgstr "无法写新的索引文件"
c04f5ac3 1737
14c8bced 1738#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
c04f5ac3
JX
1739msgid "diff_setup_done failed"
1740msgstr "diff_setup_done 失败"
1741
1742#: builtin/checkout.c:414
1743msgid "you need to resolve your current index first"
90e6ef53 1744msgstr "您需要先解决当前索引的冲突"
c04f5ac3
JX
1745
1746#: builtin/checkout.c:533
1747#, c-format
1748msgid "Can not do reflog for '%s'\n"
90e6ef53 1749msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 1750
170e9899 1751#: builtin/checkout.c:566
c04f5ac3
JX
1752msgid "HEAD is now at"
1753msgstr "HEAD 目前位于"
1754
170e9899 1755#: builtin/checkout.c:573
c04f5ac3
JX
1756#, c-format
1757msgid "Reset branch '%s'\n"
1758msgstr "重置分支 '%s'\n"
1759
170e9899 1760#: builtin/checkout.c:576
c04f5ac3
JX
1761#, c-format
1762msgid "Already on '%s'\n"
1763msgstr "已经位于 '%s'\n"
1764
170e9899 1765#: builtin/checkout.c:580
c04f5ac3
JX
1766#, c-format
1767msgid "Switched to and reset branch '%s'\n"
1768msgstr "切换并重置分支 '%s'\n"
1769
170e9899 1770#: builtin/checkout.c:582
c04f5ac3
JX
1771#, c-format
1772msgid "Switched to a new branch '%s'\n"
1773msgstr "切换到一个新分支 '%s'\n"
1774
170e9899 1775#: builtin/checkout.c:584
c04f5ac3
JX
1776#, c-format
1777msgid "Switched to branch '%s'\n"
1778msgstr "切换到分支 '%s'\n"
1779
90e6ef53 1780# 译者:注意保持前导空格
170e9899 1781#: builtin/checkout.c:640
c04f5ac3
JX
1782#, c-format
1783msgid " ... and %d more.\n"
90e6ef53 1784msgstr " ... 及其它 %d 个。\n"
c04f5ac3
JX
1785
1786#. The singular version
170e9899 1787#: builtin/checkout.c:646
c04f5ac3
JX
1788#, c-format
1789msgid ""
1790"Warning: you are leaving %d commit behind, not connected to\n"
1791"any of your branches:\n"
1792"\n"
1793"%s\n"
1794msgid_plural ""
1795"Warning: you are leaving %d commits behind, not connected to\n"
1796"any of your branches:\n"
1797"\n"
1798"%s\n"
1799msgstr[0] ""
1800"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
1801"\n"
1802"%s\n"
1803
170e9899 1804#: builtin/checkout.c:664
c04f5ac3
JX
1805#, c-format
1806msgid ""
1807"If you want to keep them by creating a new branch, this may be a good time\n"
1808"to do so with:\n"
1809"\n"
1810" git branch new_branch_name %s\n"
1811"\n"
1812msgstr ""
1813"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
1814"如下操作:\n"
1815"\n"
1816" git branch new_branch_name %s\n"
1817"\n"
1818
8ada9598 1819#: builtin/checkout.c:694
c04f5ac3
JX
1820msgid "internal error in revision walk"
1821msgstr "在版本遍历时遇到内部错误"
1822
8ada9598 1823#: builtin/checkout.c:698
c04f5ac3
JX
1824msgid "Previous HEAD position was"
1825msgstr "之前的 HEAD 位置是"
1826
8ada9598 1827#: builtin/checkout.c:724
c04f5ac3 1828msgid "You are on a branch yet to be born"
90e6ef53 1829msgstr "您位于一个尚未初始化的分支"
c04f5ac3
JX
1830
1831#. case (1)
8ada9598 1832#: builtin/checkout.c:855
c04f5ac3
JX
1833#, c-format
1834msgid "invalid reference: %s"
1835msgstr "无效引用:%s"
1836
1837#. case (1): want a tree
8ada9598 1838#: builtin/checkout.c:894
c04f5ac3
JX
1839#, c-format
1840msgid "reference is not a tree: %s"
1841msgstr "引用不是一个树:%s"
1842
8ada9598 1843#: builtin/checkout.c:974
c04f5ac3
JX
1844msgid "-B cannot be used with -b"
1845msgstr "-B 不能和 -b 共用"
1846
8ada9598 1847#: builtin/checkout.c:983
c04f5ac3
JX
1848msgid "--patch is incompatible with all other options"
1849msgstr "--patch 选项和其他选项不兼容"
1850
8ada9598 1851#: builtin/checkout.c:986
c04f5ac3
JX
1852msgid "--detach cannot be used with -b/-B/--orphan"
1853msgstr "--detach 不能和 -b/-B/--orphan 共用"
1854
8ada9598 1855#: builtin/checkout.c:988
c04f5ac3
JX
1856msgid "--detach cannot be used with -t"
1857msgstr "--detach 不能和 -t 共用"
1858
8ada9598 1859#: builtin/checkout.c:994
c04f5ac3
JX
1860msgid "--track needs a branch name"
1861msgstr "--track 需要一个分支名"
1862
8ada9598 1863#: builtin/checkout.c:1001
c04f5ac3
JX
1864msgid "Missing branch name; try -b"
1865msgstr "缺少分支名;尝试 -b"
1866
8ada9598 1867#: builtin/checkout.c:1007
c04f5ac3
JX
1868msgid "--orphan and -b|-B are mutually exclusive"
1869msgstr "--orphan 和 -b|-B 互斥"
1870
8ada9598 1871#: builtin/checkout.c:1009
c04f5ac3
JX
1872msgid "--orphan cannot be used with -t"
1873msgstr "--orphan 不能和 -t 共用"
1874
8ada9598 1875#: builtin/checkout.c:1019
c04f5ac3 1876msgid "git checkout: -f and -m are incompatible"
90e6ef53 1877msgstr "git checkout:-f 和 -m 不兼容"
c04f5ac3 1878
8ada9598 1879#: builtin/checkout.c:1053
c04f5ac3 1880msgid "invalid path specification"
90e6ef53 1881msgstr "无效的路径规格"
c04f5ac3 1882
8ada9598 1883#: builtin/checkout.c:1061
c04f5ac3
JX
1884#, c-format
1885msgid ""
1886"git checkout: updating paths is incompatible with switching branches.\n"
1887"Did you intend to checkout '%s' which can not be resolved as commit?"
1888msgstr ""
90e6ef53 1889"git checkout:更新路径和切换分支不兼容。\n"
c04f5ac3
JX
1890"您是想要检出 '%s' 但未能将其解析为提交么?"
1891
8ada9598 1892#: builtin/checkout.c:1063
c04f5ac3 1893msgid "git checkout: updating paths is incompatible with switching branches."
90e6ef53 1894msgstr "git checkout:更新路径和切换分支不兼容。"
c04f5ac3 1895
8ada9598 1896#: builtin/checkout.c:1068
c04f5ac3 1897msgid "git checkout: --detach does not take a path argument"
90e6ef53 1898msgstr "git checkout:--detach 不跟路径参数"
c04f5ac3 1899
8ada9598 1900#: builtin/checkout.c:1071
c04f5ac3
JX
1901msgid ""
1902"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1903"checking out of the index."
1904msgstr ""
90e6ef53 1905"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 1906
8ada9598 1907#: builtin/checkout.c:1090
c04f5ac3
JX
1908msgid "Cannot switch branch to a non-commit."
1909msgstr "无法切换分支到一个非提交。"
1910
8ada9598 1911#: builtin/checkout.c:1093
c04f5ac3
JX
1912msgid "--ours/--theirs is incompatible with switching branches."
1913msgstr "--ours/--theirs 和切换分支不兼容。"
1914
1915#: builtin/clean.c:78
1916msgid "-x and -X cannot be used together"
1917msgstr "-x 和 -X 不能共用"
1918
1919#: builtin/clean.c:82
1920msgid ""
1921"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1922msgstr ""
90e6ef53 1923"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
c04f5ac3
JX
1924
1925#: builtin/clean.c:85
1926msgid ""
1927"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1928"clean"
1929msgstr ""
90e6ef53 1930"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
c04f5ac3
JX
1931
1932#: builtin/clean.c:155 builtin/clean.c:176
1933#, c-format
1934msgid "Would remove %s\n"
1935msgstr "将删除 %s\n"
1936
1937#: builtin/clean.c:159 builtin/clean.c:179
1938#, c-format
1939msgid "Removing %s\n"
1940msgstr "正删除 %s\n"
1941
1942#: builtin/clean.c:162 builtin/clean.c:182
1943#, c-format
1944msgid "failed to remove %s"
1945msgstr "无法删除 %s"
1946
1947#: builtin/clean.c:166
1948#, c-format
1949msgid "Would not remove %s\n"
1950msgstr "不会删除 %s\n"
1951
1952#: builtin/clean.c:168
1953#, c-format
1954msgid "Not removing %s\n"
1955msgstr "未删除 %s\n"
1956
7ac1c0ad 1957#: builtin/clone.c:243
c04f5ac3
JX
1958#, c-format
1959msgid "reference repository '%s' is not a local directory."
1960msgstr "引用版本库 '%s' 不是一个本地目录。"
1961
7ac1c0ad 1962#: builtin/clone.c:302
c04f5ac3
JX
1963#, c-format
1964msgid "failed to open '%s'"
90e6ef53 1965msgstr "无法打开 '%s'"
c04f5ac3 1966
7ac1c0ad 1967#: builtin/clone.c:306
c04f5ac3
JX
1968#, c-format
1969msgid "failed to create directory '%s'"
90e6ef53 1970msgstr "无法创建目录 '%s'"
c04f5ac3 1971
7ac1c0ad 1972#: builtin/clone.c:308 builtin/diff.c:75
c04f5ac3
JX
1973#, c-format
1974msgid "failed to stat '%s'"
90e6ef53 1975msgstr "无法枚举 '%s' 状态"
c04f5ac3 1976
7ac1c0ad 1977#: builtin/clone.c:310
c04f5ac3
JX
1978#, c-format
1979msgid "%s exists and is not a directory"
1980msgstr "%s 存在且不是一个目录"
1981
7ac1c0ad 1982#: builtin/clone.c:324
c04f5ac3
JX
1983#, c-format
1984msgid "failed to stat %s\n"
90e6ef53 1985msgstr "无法枚举 %s 状态\n"
c04f5ac3 1986
7ac1c0ad 1987#: builtin/clone.c:341
c04f5ac3
JX
1988#, c-format
1989msgid "failed to unlink '%s'"
90e6ef53 1990msgstr "无法删除 '%s'"
c04f5ac3 1991
7ac1c0ad 1992#: builtin/clone.c:346
c04f5ac3
JX
1993#, c-format
1994msgid "failed to create link '%s'"
90e6ef53 1995msgstr "无法创建链接 '%s'"
c04f5ac3 1996
7ac1c0ad 1997#: builtin/clone.c:350
c04f5ac3
JX
1998#, c-format
1999msgid "failed to copy file to '%s'"
90e6ef53 2000msgstr "无法拷贝文件至 '%s'"
c04f5ac3 2001
7ac1c0ad 2002#: builtin/clone.c:373
c04f5ac3
JX
2003#, c-format
2004msgid "done.\n"
2005msgstr "完成。\n"
2006
7ac1c0ad 2007#: builtin/clone.c:440
c04f5ac3
JX
2008#, c-format
2009msgid "Could not find remote branch %s to clone."
90e6ef53 2010msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 2011
7ac1c0ad 2012#: builtin/clone.c:549
c04f5ac3
JX
2013msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2014msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
2015
7ac1c0ad 2016#: builtin/clone.c:639
c04f5ac3
JX
2017msgid "Too many arguments."
2018msgstr "太多参数。"
2019
7ac1c0ad 2020#: builtin/clone.c:643
c04f5ac3 2021msgid "You must specify a repository to clone."
90e6ef53 2022msgstr "您必须指定一个版本库来克隆。"
c04f5ac3 2023
7ac1c0ad 2024#: builtin/clone.c:654
c04f5ac3
JX
2025#, c-format
2026msgid "--bare and --origin %s options are incompatible."
2027msgstr "--bare 和 --origin %s 选项不兼容。"
2028
7ac1c0ad 2029#: builtin/clone.c:668
c04f5ac3
JX
2030#, c-format
2031msgid "repository '%s' does not exist"
2032msgstr "版本库 '%s' 不存在"
2033
7ac1c0ad 2034#: builtin/clone.c:673
c04f5ac3
JX
2035msgid "--depth is ignored in local clones; use file:// instead."
2036msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
2037
7ac1c0ad 2038#: builtin/clone.c:683
c04f5ac3
JX
2039#, c-format
2040msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 2041msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 2042
7ac1c0ad 2043#: builtin/clone.c:693
c04f5ac3
JX
2044#, c-format
2045msgid "working tree '%s' already exists."
2046msgstr "工作区 '%s' 已经存在。"
2047
7ac1c0ad 2048#: builtin/clone.c:706 builtin/clone.c:720
c04f5ac3
JX
2049#, c-format
2050msgid "could not create leading directories of '%s'"
90e6ef53 2051msgstr "不能为 '%s' 创建先导目录"
c04f5ac3 2052
7ac1c0ad 2053#: builtin/clone.c:709
c04f5ac3
JX
2054#, c-format
2055msgid "could not create work tree dir '%s'."
90e6ef53 2056msgstr "不能为 '%s' 创建工作区目录。"
c04f5ac3 2057
7ac1c0ad 2058#: builtin/clone.c:728
c04f5ac3
JX
2059#, c-format
2060msgid "Cloning into bare repository '%s'...\n"
2061msgstr "克隆到裸版本库 '%s'...\n"
2062
7ac1c0ad 2063#: builtin/clone.c:730
c04f5ac3
JX
2064#, c-format
2065msgid "Cloning into '%s'...\n"
2066msgstr "正克隆到 '%s'...\n"
2067
7ac1c0ad 2068#: builtin/clone.c:786
c04f5ac3
JX
2069#, c-format
2070msgid "Don't know how to clone %s"
2071msgstr "不知道如何克隆 %s"
2072
7ac1c0ad 2073#: builtin/clone.c:835
c04f5ac3
JX
2074#, c-format
2075msgid "Remote branch %s not found in upstream %s"
2076msgstr "远程分支 %s 在上游 %s 未发现"
2077
7ac1c0ad 2078#: builtin/clone.c:842
c04f5ac3
JX
2079msgid "You appear to have cloned an empty repository."
2080msgstr "您似乎克隆了一个空版本库。"
2081
8ada9598
JX
2082#: builtin/column.c:51
2083msgid "--command must be the first argument"
2084msgstr ""
2085
2086#: builtin/commit.c:43
c04f5ac3
JX
2087msgid ""
2088"Your name and email address were configured automatically based\n"
2089"on your username and hostname. Please check that they are accurate.\n"
2090"You can suppress this message by setting them explicitly:\n"
2091"\n"
2092" git config --global user.name \"Your Name\"\n"
2093" git config --global user.email you@example.com\n"
2094"\n"
2095"After doing this, you may fix the identity used for this commit with:\n"
2096"\n"
2097" git commit --amend --reset-author\n"
2098msgstr ""
90e6ef53
JX
2099"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
2100"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
c04f5ac3
JX
2101"\n"
2102" git config --global user.name \"Your Name\"\n"
2103" git config --global user.email you@example.com\n"
2104"\n"
90e6ef53 2105"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
2106"\n"
2107" git commit --amend --reset-author\n"
2108
8ada9598 2109#: builtin/commit.c:55
c04f5ac3
JX
2110msgid ""
2111"You asked to amend the most recent commit, but doing so would make\n"
2112"it empty. You can repeat your command with --allow-empty, or you can\n"
2113"remove the commit entirely with \"git reset HEAD^\".\n"
2114msgstr ""
1b150dc9
T
2115"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
2116"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 2117
8ada9598 2118#: builtin/commit.c:60
c04f5ac3
JX
2119msgid ""
2120"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2121"If you wish to commit it anyway, use:\n"
2122"\n"
2123" git commit --allow-empty\n"
2124"\n"
2125"Otherwise, please use 'git reset'\n"
2126msgstr ""
a9ce4543
T
2127"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
2128"也要提交,使用命令:\n"
c04f5ac3
JX
2129"\n"
2130" git commit --allow-empty\n"
2131"\n"
a9ce4543 2132"否则,请使用命令 'git reset'\n"
c04f5ac3 2133
8ada9598 2134#: builtin/commit.c:253
c04f5ac3 2135msgid "failed to unpack HEAD tree object"
90e6ef53 2136msgstr "无法解包 HEAD 树对象"
c04f5ac3 2137
8ada9598 2138#: builtin/commit.c:295
c04f5ac3 2139msgid "unable to create temporary index"
90e6ef53 2140msgstr "不能创建临时索引"
c04f5ac3 2141
8ada9598 2142#: builtin/commit.c:301
c04f5ac3
JX
2143msgid "interactive add failed"
2144msgstr "交互式添加失败"
2145
8ada9598 2146#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
c04f5ac3 2147msgid "unable to write new_index file"
90e6ef53 2148msgstr "无法写 new_index 文件"
c04f5ac3 2149
90e6ef53 2150# 译者:%s若翻为中文,前后不需要空格
8ada9598
JX
2151#: builtin/commit.c:386
2152#, fuzzy
2153msgid "cannot do a partial commit during a merge."
c04f5ac3
JX
2154msgstr "在%s过程中不能做部分提交。"
2155
8ada9598
JX
2156# 译者:%s若翻为中文,前后不需要空格
2157#: builtin/commit.c:388
2158#, fuzzy
2159msgid "cannot do a partial commit during a cherry-pick."
2160msgstr "在%s过程中不能做部分提交。"
2161
2162#: builtin/commit.c:398
c04f5ac3 2163msgid "cannot read the index"
90e6ef53 2164msgstr "无法读取索引"
c04f5ac3 2165
8ada9598 2166#: builtin/commit.c:418
c04f5ac3 2167msgid "unable to write temporary index file"
90e6ef53 2168msgstr "无法写临时索引文件"
c04f5ac3 2169
8ada9598 2170#: builtin/commit.c:493 builtin/commit.c:499
c04f5ac3
JX
2171#, c-format
2172msgid "invalid commit: %s"
2173msgstr "无效的提交:%s"
2174
8ada9598 2175#: builtin/commit.c:522
c04f5ac3
JX
2176msgid "malformed --author parameter"
2177msgstr "非法的 --author 参数"
2178
8ada9598 2179#: builtin/commit.c:583
c04f5ac3
JX
2180#, c-format
2181msgid "Malformed ident string: '%s'"
90e6ef53 2182msgstr "非法的身份字符串:'%s'"
c04f5ac3 2183
8ada9598 2184#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968
c04f5ac3
JX
2185#, c-format
2186msgid "could not lookup commit %s"
2187msgstr "不能查询提交 %s"
2188
8ada9598 2189#: builtin/commit.c:633 builtin/shortlog.c:296
c04f5ac3
JX
2190#, c-format
2191msgid "(reading log message from standard input)\n"
90e6ef53 2192msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 2193
8ada9598 2194#: builtin/commit.c:635
c04f5ac3 2195msgid "could not read log from standard input"
90e6ef53 2196msgstr "不能从标准输入中读取日志信息"
c04f5ac3 2197
8ada9598 2198#: builtin/commit.c:639
c04f5ac3
JX
2199#, c-format
2200msgid "could not read log file '%s'"
90e6ef53 2201msgstr "不能读取日志文件 '%s'"
c04f5ac3 2202
8ada9598 2203#: builtin/commit.c:645
c04f5ac3
JX
2204msgid "commit has empty message"
2205msgstr "提交说明为空"
2206
8ada9598 2207#: builtin/commit.c:661
c04f5ac3 2208msgid "could not read MERGE_MSG"
90e6ef53 2209msgstr "不能读取 MERGE_MSG"
c04f5ac3 2210
8ada9598 2211#: builtin/commit.c:665
c04f5ac3 2212msgid "could not read SQUASH_MSG"
90e6ef53 2213msgstr "不能读取 SQUASH_MSG"
c04f5ac3 2214
8ada9598 2215#: builtin/commit.c:669
c04f5ac3
JX
2216#, c-format
2217msgid "could not read '%s'"
90e6ef53 2218msgstr "不能读取 '%s'"
c04f5ac3 2219
8ada9598 2220#: builtin/commit.c:721
c04f5ac3 2221msgid "could not write commit template"
90e6ef53 2222msgstr "不能写提交模版"
c04f5ac3 2223
90e6ef53 2224# 译者:%s若翻为中文,前后不需要空格
8ada9598
JX
2225#: builtin/commit.c:732
2226#, fuzzy, c-format
c04f5ac3
JX
2227msgid ""
2228"\n"
8ada9598 2229"It looks like you may be committing a merge.\n"
c04f5ac3
JX
2230"If this is not correct, please remove the file\n"
2231"\t%s\n"
2232"and try again.\n"
2233msgstr ""
2234"\n"
2235"看起来您正在提交一个%s。\n"
2236"如果不是这样,请删除文件\n"
2237"\t%s\n"
2238"然后重试。\n"
2239
8ada9598
JX
2240# 译者:%s若翻为中文,前后不需要空格
2241#: builtin/commit.c:737
2242#, fuzzy, c-format
2243msgid ""
2244"\n"
2245"It looks like you may be committing a cherry-pick.\n"
2246"If this is not correct, please remove the file\n"
2247"\t%s\n"
2248"and try again.\n"
2249msgstr ""
2250"\n"
2251"看起来您正在提交一个%s。\n"
2252"如果不是这样,请删除文件\n"
2253"\t%s\n"
2254"然后重试。\n"
c04f5ac3 2255
7e238ab7 2256# 译者:中文字符串拼接,可删除前导空格
8ada9598
JX
2257#: builtin/commit.c:749
2258#, fuzzy
c04f5ac3 2259msgid ""
8ada9598 2260"Please enter the commit message for your changes. Lines starting\n"
c04f5ac3
JX
2261"with '#' will be ignored, and an empty message aborts the commit.\n"
2262msgstr ""
2d0dc474
T
2263"以 '#' 开头\n"
2264"的行将被忽略,并且空的提交说明将会中止提交。\n"
c04f5ac3 2265
7e238ab7 2266# 译者:中文字符串拼接,可删除前导空格
8ada9598
JX
2267#: builtin/commit.c:754
2268#, fuzzy
c04f5ac3 2269msgid ""
8ada9598 2270"Please enter the commit message for your changes. Lines starting\n"
c04f5ac3
JX
2271"with '#' will be kept; you may remove them yourself if you want to.\n"
2272"An empty message aborts the commit.\n"
2273msgstr ""
2d0dc474
T
2274"以 '#' 开头\n"
2275"的行将被保留,您可以删除它们如果您想这样做的话。空的提交说明将会\n"
2276"中止提交。\n"
c04f5ac3 2277
90e6ef53 2278# 译者:为保证在输出中对齐,注意调整句中空格!
8ada9598 2279#: builtin/commit.c:767
c04f5ac3
JX
2280#, c-format
2281msgid "%sAuthor: %s"
2282msgstr "%s作者: %s"
2283
90e6ef53 2284# 译者:为保证在输出中对齐,注意调整句中空格!
8ada9598 2285#: builtin/commit.c:774
c04f5ac3
JX
2286#, c-format
2287msgid "%sCommitter: %s"
2288msgstr "%s提交者: %s"
2289
8ada9598 2290#: builtin/commit.c:794
c04f5ac3 2291msgid "Cannot read index"
90e6ef53 2292msgstr "无法读取索引"
c04f5ac3 2293
8ada9598 2294#: builtin/commit.c:831
c04f5ac3
JX
2295msgid "Error building trees"
2296msgstr "无法创建树对象"
2297
8ada9598 2298#: builtin/commit.c:846 builtin/tag.c:361
c04f5ac3
JX
2299#, c-format
2300msgid "Please supply the message using either -m or -F option.\n"
90e6ef53 2301msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
c04f5ac3 2302
8ada9598 2303#: builtin/commit.c:943
c04f5ac3
JX
2304#, c-format
2305msgid "No existing author found with '%s'"
2306msgstr "没有找到匹配 '%s' 的作者"
2307
8ada9598 2308#: builtin/commit.c:958 builtin/commit.c:1158
c04f5ac3
JX
2309#, c-format
2310msgid "Invalid untracked files mode '%s'"
90e6ef53 2311msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 2312
8ada9598 2313#: builtin/commit.c:998
c04f5ac3
JX
2314msgid "Using both --reset-author and --author does not make sense"
2315msgstr "同时使用 --reset-author 和 --author 没有意义"
2316
8ada9598 2317#: builtin/commit.c:1009
c04f5ac3 2318msgid "You have nothing to amend."
90e6ef53 2319msgstr "您没有可修补的提交。"
c04f5ac3 2320
90e6ef53 2321# 译者:%s若翻为中文,前后不需要空格
8ada9598
JX
2322#: builtin/commit.c:1012
2323#, fuzzy
2324msgid "You are in the middle of a merge -- cannot amend."
2325msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
2326
2327# 译者:%s若翻为中文,前后不需要空格
2328#: builtin/commit.c:1014
2329#, fuzzy
2330msgid "You are in the middle of a cherry-pick -- cannot amend."
90e6ef53 2331msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
c04f5ac3 2332
8ada9598 2333#: builtin/commit.c:1017
c04f5ac3
JX
2334msgid "Options --squash and --fixup cannot be used together"
2335msgstr "选项 --squash 和 --fixup 不能共用"
2336
8ada9598 2337#: builtin/commit.c:1027
c04f5ac3
JX
2338msgid "Only one of -c/-C/-F/--fixup can be used."
2339msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
2340
8ada9598 2341#: builtin/commit.c:1029
c04f5ac3
JX
2342msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2343msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
2344
8ada9598 2345#: builtin/commit.c:1037
c04f5ac3 2346msgid "--reset-author can be used only with -C, -c or --amend."
90e6ef53 2347msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
c04f5ac3 2348
8ada9598 2349#: builtin/commit.c:1054
c04f5ac3
JX
2350msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2351msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
2352
8ada9598 2353#: builtin/commit.c:1056
c04f5ac3
JX
2354msgid "No paths with --include/--only does not make sense."
2355msgstr "参数 --include/--only 不跟路径没有意义。"
2356
8ada9598 2357#: builtin/commit.c:1058
c04f5ac3 2358msgid "Clever... amending the last one with dirty index."
90e6ef53 2359msgstr "聪明... 在索引不干净下修补最后的提交。"
c04f5ac3 2360
8ada9598 2361#: builtin/commit.c:1060
c04f5ac3 2362msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
90e6ef53 2363msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
c04f5ac3 2364
8ada9598 2365#: builtin/commit.c:1070 builtin/tag.c:577
c04f5ac3
JX
2366#, c-format
2367msgid "Invalid cleanup mode %s"
2368msgstr "无效的清理模式 %s"
2369
8ada9598 2370#: builtin/commit.c:1075
c04f5ac3
JX
2371msgid "Paths with -a does not make sense."
2372msgstr "路径和 -a 选项共用没有意义。"
2373
8ada9598 2374#: builtin/commit.c:1258
c04f5ac3
JX
2375msgid "couldn't look up newly created commit"
2376msgstr "无法找到新创建的提交"
2377
8ada9598 2378#: builtin/commit.c:1260
c04f5ac3 2379msgid "could not parse newly created commit"
90e6ef53 2380msgstr "不能解析新创建的提交"
c04f5ac3 2381
8ada9598 2382#: builtin/commit.c:1301
c04f5ac3
JX
2383msgid "detached HEAD"
2384msgstr "分离头指针"
2385
7e238ab7 2386# 译者:中文字符串拼接,可删除前导空格
8ada9598 2387#: builtin/commit.c:1303
c04f5ac3 2388msgid " (root-commit)"
7e238ab7 2389msgstr "(根提交)"
c04f5ac3 2390
8ada9598 2391#: builtin/commit.c:1447
c04f5ac3 2392msgid "could not parse HEAD commit"
90e6ef53 2393msgstr "不能解析 HEAD 提交"
c04f5ac3 2394
8ada9598 2395#: builtin/commit.c:1485 builtin/merge.c:509
c04f5ac3
JX
2396#, c-format
2397msgid "could not open '%s' for reading"
90e6ef53 2398msgstr "不能为读入打开 '%s'"
c04f5ac3 2399
8ada9598 2400#: builtin/commit.c:1492
c04f5ac3
JX
2401#, c-format
2402msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 2403msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 2404
8ada9598 2405#: builtin/commit.c:1499
c04f5ac3 2406msgid "could not read MERGE_MODE"
90e6ef53 2407msgstr "不能读取 MERGE_MODE"
c04f5ac3 2408
8ada9598 2409#: builtin/commit.c:1518
c04f5ac3
JX
2410#, c-format
2411msgid "could not read commit message: %s"
90e6ef53 2412msgstr "不能读取提交说明:%s"
c04f5ac3 2413
8ada9598 2414#: builtin/commit.c:1532
73a60cd2
JX
2415#, c-format
2416msgid "Aborting commit; you did not edit the message.\n"
2417msgstr "终止提交;您未更改来自模版的提交说明。\n"
2418
8ada9598 2419#: builtin/commit.c:1537
c04f5ac3
JX
2420#, c-format
2421msgid "Aborting commit due to empty commit message.\n"
2422msgstr "终止提交因为提交说明为空。\n"
2423
8ada9598 2424#: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961
c04f5ac3 2425msgid "failed to write commit object"
90e6ef53 2426msgstr "无法写提交对象"
c04f5ac3 2427
8ada9598 2428#: builtin/commit.c:1573
c04f5ac3
JX
2429msgid "cannot lock HEAD ref"
2430msgstr "无法锁定 HEAD 引用"
2431
8ada9598 2432#: builtin/commit.c:1577
c04f5ac3
JX
2433msgid "cannot update HEAD ref"
2434msgstr "无法更新 HEAD 引用"
2435
8ada9598 2436#: builtin/commit.c:1588
c04f5ac3
JX
2437msgid ""
2438"Repository has been updated, but unable to write\n"
2439"new_index file. Check that disk is not full or quota is\n"
2440"not exceeded, and then \"git reset HEAD\" to recover."
2441msgstr ""
90e6ef53
JX
2442"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
2443"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3
JX
2444
2445#: builtin/describe.c:234
2446#, c-format
2447msgid "annotated tag %s not available"
2448msgstr "注释 tag %s 无效"
2449
2450#: builtin/describe.c:238
2451#, c-format
2452msgid "annotated tag %s has no embedded name"
2453msgstr "注释 tag %s 没有嵌入名称"
2454
2455#: builtin/describe.c:240
2456#, c-format
2457msgid "tag '%s' is really '%s' here"
90e6ef53 2458msgstr "tag '%s' 的确是在 '%s'"
c04f5ac3
JX
2459
2460#: builtin/describe.c:267
2461#, c-format
2462msgid "Not a valid object name %s"
2463msgstr "不是一个有效的对象名 %s"
2464
2465#: builtin/describe.c:270
2466#, c-format
2467msgid "%s is not a valid '%s' object"
2468msgstr "%s 不是一个有效的 '%s' 对象"
2469
2470#: builtin/describe.c:287
2471#, c-format
2472msgid "no tag exactly matches '%s'"
2473msgstr "没有 tag 准确匹配 '%s'"
2474
2475#: builtin/describe.c:289
2476#, c-format
2477msgid "searching to describe %s\n"
2478msgstr "搜索描述 %s\n"
2479
2480#: builtin/describe.c:329
2481#, c-format
2482msgid "finished search at %s\n"
2483msgstr "完成搜索 %s\n"
2484
2485#: builtin/describe.c:353
2486#, c-format
2487msgid ""
2488"No annotated tags can describe '%s'.\n"
2489"However, there were unannotated tags: try --tags."
2490msgstr ""
2491"没有注释 tag 能描述 '%s'。\n"
2492"然而,有非注释 tag:尝试 --tags。"
2493
2494#: builtin/describe.c:357
2495#, c-format
2496msgid ""
2497"No tags can describe '%s'.\n"
2498"Try --always, or create some tags."
2499msgstr ""
2500"没有注释 tag 能描述 '%s'。\n"
90e6ef53 2501"尝试 --always,或者创建一些 tag。"
c04f5ac3
JX
2502
2503#: builtin/describe.c:378
2504#, c-format
2505msgid "traversed %lu commits\n"
2506msgstr "已遍历 %lu 个提交\n"
2507
2508#: builtin/describe.c:381
2509#, c-format
2510msgid ""
2511"more than %i tags found; listed %i most recent\n"
2512"gave up search at %s\n"
2513msgstr ""
90e6ef53
JX
2514"发现多于 %i 个 tag,列出最近的 %i 个\n"
2515"在 %s 放弃搜索\n"
c04f5ac3
JX
2516
2517#: builtin/describe.c:436
2518msgid "--long is incompatible with --abbrev=0"
2519msgstr "--long 与 --abbrev=0 不兼容"
2520
2521#: builtin/describe.c:462
2522msgid "No names found, cannot describe anything."
90e6ef53 2523msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3
JX
2524
2525#: builtin/describe.c:482
2526msgid "--dirty is incompatible with committishes"
2527msgstr "--dirty 不能与提交共用"
2528
2529#: builtin/diff.c:77
2530#, c-format
2531msgid "'%s': not a regular file or symlink"
2532msgstr "'%s':不是一个正规文件或符号链接"
2533
2534#: builtin/diff.c:220
2535#, c-format
2536msgid "invalid option: %s"
2537msgstr "无效选项:%s"
2538
14c8bced 2539#: builtin/diff.c:297
c04f5ac3
JX
2540msgid "Not a git repository"
2541msgstr "不是一个 git 版本库"
2542
14c8bced 2543#: builtin/diff.c:347
c04f5ac3
JX
2544#, c-format
2545msgid "invalid object '%s' given."
2546msgstr "提供了无效对象 '%s'。"
2547
14c8bced 2548#: builtin/diff.c:352
c04f5ac3
JX
2549#, c-format
2550msgid "more than %d trees given: '%s'"
2551msgstr "提供了超过 %d 个树对象:'%s'"
2552
14c8bced 2553#: builtin/diff.c:362
c04f5ac3
JX
2554#, c-format
2555msgid "more than two blobs given: '%s'"
2556msgstr "提供了超过两个 blob 对象:'%s'"
2557
14c8bced 2558#: builtin/diff.c:370
c04f5ac3
JX
2559#, c-format
2560msgid "unhandled object '%s' given."
2561msgstr "提供了无法处理的对象 '%s'。"
2562
2563#: builtin/fetch.c:200
2564msgid "Couldn't find remote ref HEAD"
2565msgstr "无法发现远程 HEAD 引用"
2566
170e9899 2567#: builtin/fetch.c:253
c04f5ac3
JX
2568#, c-format
2569msgid "object %s not found"
2570msgstr "对象 %s 未发现"
2571
170e9899 2572#: builtin/fetch.c:259
c04f5ac3
JX
2573msgid "[up to date]"
2574msgstr "[最新]"
2575
170e9899 2576#: builtin/fetch.c:273
c04f5ac3
JX
2577#, c-format
2578msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2579msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
2580
170e9899 2581#: builtin/fetch.c:274 builtin/fetch.c:360
c04f5ac3
JX
2582msgid "[rejected]"
2583msgstr "[已拒绝]"
2584
170e9899 2585#: builtin/fetch.c:285
c04f5ac3
JX
2586msgid "[tag update]"
2587msgstr "[tag更新]"
2588
90e6ef53 2589# 译者:注意保持前导空格
170e9899 2590#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
c04f5ac3
JX
2591msgid " (unable to update local ref)"
2592msgstr " (不能更新本地引用)"
2593
170e9899 2594#: builtin/fetch.c:305
c04f5ac3
JX
2595msgid "[new tag]"
2596msgstr "[新tag]"
2597
170e9899 2598#: builtin/fetch.c:308
c04f5ac3
JX
2599msgid "[new branch]"
2600msgstr "[新分支]"
2601
170e9899
JX
2602#: builtin/fetch.c:311
2603msgid "[new ref]"
2604msgstr "[新引用]"
2605
2606#: builtin/fetch.c:356
c04f5ac3
JX
2607msgid "unable to update local ref"
2608msgstr "不能更新本地引用"
2609
170e9899 2610#: builtin/fetch.c:356
c04f5ac3
JX
2611msgid "forced update"
2612msgstr "强制更新"
2613
170e9899 2614#: builtin/fetch.c:362
c04f5ac3 2615msgid "(non-fast-forward)"
90e6ef53 2616msgstr "(非快进式)"
c04f5ac3 2617
170e9899 2618#: builtin/fetch.c:393 builtin/fetch.c:685
c04f5ac3
JX
2619#, c-format
2620msgid "cannot open %s: %s\n"
2621msgstr "无法打开 %s:%s\n"
2622
170e9899 2623#: builtin/fetch.c:402
c04f5ac3
JX
2624#, c-format
2625msgid "%s did not send all necessary objects\n"
2626msgstr "%s 未发送所有必须的对象\n"
2627
170e9899 2628#: builtin/fetch.c:488
c04f5ac3
JX
2629#, c-format
2630msgid "From %.*s\n"
2631msgstr "来自 %.*s\n"
2632
170e9899 2633#: builtin/fetch.c:499
c04f5ac3
JX
2634#, c-format
2635msgid ""
2636"some local refs could not be updated; try running\n"
2637" 'git remote prune %s' to remove any old, conflicting branches"
2638msgstr ""
2639"一些本地引用不能被更新;尝试运行\n"
2640" 'git remote prune %s' 来删除旧的、有冲突的分支"
2641
90e6ef53 2642# 译者:注意保持前导空格
170e9899 2643#: builtin/fetch.c:549
8ada9598
JX
2644#, fuzzy, c-format
2645msgid " (%s will become dangling)"
c04f5ac3
JX
2646msgstr " (%s 将成为悬空状态)\n"
2647
90e6ef53 2648# 译者:注意保持前导空格
170e9899 2649#: builtin/fetch.c:550
8ada9598
JX
2650#, fuzzy, c-format
2651msgid " (%s has become dangling)"
c04f5ac3
JX
2652msgstr " (%s 已成为悬空状态)\n"
2653
170e9899 2654#: builtin/fetch.c:557
c04f5ac3
JX
2655msgid "[deleted]"
2656msgstr "[已删除]"
2657
8ada9598 2658#: builtin/fetch.c:558 builtin/remote.c:1055
c04f5ac3
JX
2659msgid "(none)"
2660msgstr "(无)"
2661
170e9899 2662#: builtin/fetch.c:675
c04f5ac3
JX
2663#, c-format
2664msgid "Refusing to fetch into current branch %s of non-bare repository"
2665msgstr "拒绝获取到非裸版本库的当前分支 %s"
2666
170e9899 2667#: builtin/fetch.c:709
c04f5ac3
JX
2668#, c-format
2669msgid "Don't know how to fetch from %s"
2670msgstr "不知道如何从 %s 获取"
2671
170e9899 2672#: builtin/fetch.c:786
c04f5ac3
JX
2673#, c-format
2674msgid "Option \"%s\" value \"%s\" is not valid for %s"
2675msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
2676
170e9899 2677#: builtin/fetch.c:789
c04f5ac3
JX
2678#, c-format
2679msgid "Option \"%s\" is ignored for %s\n"
2680msgstr "选项 \"%s\" 对于 %s 被忽略\n"
2681
170e9899 2682#: builtin/fetch.c:888
c04f5ac3
JX
2683#, c-format
2684msgid "Fetching %s\n"
d4a8e00b 2685msgstr "正在获取 %s\n"
c04f5ac3 2686
8ada9598 2687#: builtin/fetch.c:890 builtin/remote.c:100
c04f5ac3
JX
2688#, c-format
2689msgid "Could not fetch %s"
2690msgstr "不能获取 %s"
2691
170e9899 2692#: builtin/fetch.c:907
c04f5ac3
JX
2693msgid ""
2694"No remote repository specified. Please, specify either a URL or a\n"
2695"remote name from which new revisions should be fetched."
90e6ef53 2696msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
c04f5ac3 2697
170e9899 2698#: builtin/fetch.c:927
c04f5ac3 2699msgid "You need to specify a tag name."
90e6ef53 2700msgstr "您需要指定一个 tag 名称。"
c04f5ac3 2701
170e9899 2702#: builtin/fetch.c:979
c04f5ac3
JX
2703msgid "fetch --all does not take a repository argument"
2704msgstr "fetch --all 不能带一个版本库参数"
2705
170e9899 2706#: builtin/fetch.c:981
c04f5ac3
JX
2707msgid "fetch --all does not make sense with refspecs"
2708msgstr "fetch --all 带引用表达式没有任何意义"
2709
170e9899 2710#: builtin/fetch.c:992
c04f5ac3
JX
2711#, c-format
2712msgid "No such remote or remote group: %s"
2713msgstr "没有这样的远程或远程组:%s"
2714
170e9899 2715#: builtin/fetch.c:1000
c04f5ac3 2716msgid "Fetching a group and specifying refspecs does not make sense"
90e6ef53 2717msgstr "获取组并指定引用表达式没有意义"
c04f5ac3
JX
2718
2719#: builtin/gc.c:63
2720#, c-format
2721msgid "Invalid %s: '%s'"
2722msgstr "无效的 %s:'%s'"
2723
eff6d3a9 2724#: builtin/gc.c:90
c04f5ac3
JX
2725#, c-format
2726msgid "insanely long object directory %.*s"
2727msgstr "不正常的长对象目录 %.*s"
2728
eff6d3a9 2729#: builtin/gc.c:221
c04f5ac3
JX
2730#, c-format
2731msgid "Auto packing the repository for optimum performance.\n"
2732msgstr "自动打包版本库以求最佳性能。\n"
2733
eff6d3a9 2734#: builtin/gc.c:224
c04f5ac3
JX
2735#, c-format
2736msgid ""
2737"Auto packing the repository for optimum performance. You may also\n"
2738"run \"git gc\" manually. See \"git help gc\" for more information.\n"
2739msgstr ""
90e6ef53
JX
2740"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
2741"参见 \"git help gc\" 以获取更多信息。\n"
c04f5ac3 2742
eff6d3a9 2743#: builtin/gc.c:251
c04f5ac3
JX
2744msgid ""
2745"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 2746msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 2747
7ac1c0ad 2748#: builtin/grep.c:216
c04f5ac3
JX
2749#, c-format
2750msgid "grep: failed to create thread: %s"
90e6ef53 2751msgstr "grep:无法创建线程:%s"
c04f5ac3 2752
7ac1c0ad 2753#: builtin/grep.c:402
c04f5ac3
JX
2754#, c-format
2755msgid "Failed to chdir: %s"
2756msgstr "无法切换目录:%s"
2757
7ac1c0ad 2758#: builtin/grep.c:478 builtin/grep.c:512
c04f5ac3
JX
2759#, c-format
2760msgid "unable to read tree (%s)"
90e6ef53 2761msgstr "无法读取树(%s)"
c04f5ac3 2762
7ac1c0ad 2763#: builtin/grep.c:526
c04f5ac3
JX
2764#, c-format
2765msgid "unable to grep from object of type %s"
2766msgstr "无法抓取来自于 %s 类型的对象"
2767
7ac1c0ad 2768#: builtin/grep.c:584
c04f5ac3
JX
2769#, c-format
2770msgid "switch `%c' expects a numerical value"
2771msgstr "开关 `%c' 期望一个数字值"
2772
7ac1c0ad 2773#: builtin/grep.c:601
c04f5ac3
JX
2774#, c-format
2775msgid "cannot open '%s'"
2776msgstr "不能打开 '%s'"
2777
14c8bced 2778#: builtin/grep.c:888
c04f5ac3
JX
2779msgid "no pattern given."
2780msgstr "未提供模式匹配。"
2781
14c8bced 2782#: builtin/grep.c:902
c04f5ac3
JX
2783#, c-format
2784msgid "bad object %s"
2785msgstr "坏对象 %s"
2786
14c8bced 2787#: builtin/grep.c:943
c04f5ac3
JX
2788msgid "--open-files-in-pager only works on the worktree"
2789msgstr "--open-files-in-pager 仅用于工作区"
2790
14c8bced 2791#: builtin/grep.c:966
c04f5ac3 2792msgid "--cached or --untracked cannot be used with --no-index."
90e6ef53 2793msgstr "--cached 或 --untracked 不能与 --no-index 共用。"
c04f5ac3 2794
14c8bced 2795#: builtin/grep.c:971
c04f5ac3
JX
2796msgid "--no-index or --untracked cannot be used with revs."
2797msgstr "--no-index 或 --untracked 不能和版本共用。"
2798
14c8bced 2799#: builtin/grep.c:974
c04f5ac3 2800msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 2801msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 2802
14c8bced 2803#: builtin/grep.c:982
c04f5ac3
JX
2804msgid "both --cached and trees are given."
2805msgstr "同时给出了 --cached 和树对象。"
2806
8ada9598
JX
2807#: builtin/help.c:59
2808#, fuzzy, c-format
2809msgid "unrecognized help format '%s'"
2810msgstr "未识别的参数:%s"
2811
2812#: builtin/help.c:87
2813#, fuzzy
2814msgid "Failed to start emacsclient."
2815msgstr "无法枚举 %s 状态\n"
2816
2817#: builtin/help.c:100
2818#, fuzzy
2819msgid "Failed to parse emacsclient version."
2820msgstr "无法读取对象 '%s'。"
2821
2822#: builtin/help.c:108
2823#, c-format
2824msgid "emacsclient version '%d' too old (< 22)."
2825msgstr ""
2826
2827#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
2828#, fuzzy, c-format
2829msgid "failed to exec '%s': %s"
2830msgstr "无法打开 '%s'"
2831
2832#: builtin/help.c:211
2833#, c-format
2834msgid ""
2835"'%s': path for unsupported man viewer.\n"
2836"Please consider using 'man.<tool>.cmd' instead."
2837msgstr ""
2838
2839#: builtin/help.c:223
2840#, c-format
2841msgid ""
2842"'%s': cmd for supported man viewer.\n"
2843"Please consider using 'man.<tool>.path' instead."
2844msgstr ""
2845
2846#: builtin/help.c:287
2847msgid "The most commonly used git commands are:"
2848msgstr ""
2849
2850#: builtin/help.c:355
2851#, c-format
2852msgid "'%s': unknown man viewer."
2853msgstr ""
2854
2855#: builtin/help.c:372
2856#, fuzzy
2857msgid "no man viewer handled the request"
2858msgstr "没有合并策略处理此合并。\n"
2859
2860#: builtin/help.c:380
2861msgid "no info viewer handled the request"
2862msgstr ""
2863
2864#: builtin/help.c:391
2865#, fuzzy, c-format
2866msgid "'%s': not a documentation directory."
2867msgstr "不能访问当前工作目录"
2868
2869#: builtin/help.c:432 builtin/help.c:439
2870#, c-format
2871msgid "usage: %s%s"
2872msgstr ""
2873
2874#: builtin/help.c:453
2875#, c-format
2876msgid "`git %s' is aliased to `%s'"
2877msgstr ""
2878
2879#: builtin/index-pack.c:169
2880#, c-format
2881msgid "object type mismatch at %s"
2882msgstr ""
2883
2884#: builtin/index-pack.c:189
2885msgid "object of unexpected type"
2886msgstr ""
2887
2888#: builtin/index-pack.c:226
2889#, fuzzy, c-format
2890msgid "cannot fill %d byte"
2891msgid_plural "cannot fill %d bytes"
2892msgstr[0] "无法获知当前路径"
2893
2894#: builtin/index-pack.c:236
2895msgid "early EOF"
2896msgstr ""
2897
2898#: builtin/index-pack.c:237
2899msgid "read error on input"
2900msgstr ""
2901
2902#: builtin/index-pack.c:249
2903msgid "used more bytes than were available"
2904msgstr ""
2905
2906#: builtin/index-pack.c:256
2907msgid "pack too large for current definition of off_t"
2908msgstr ""
2909
2910#: builtin/index-pack.c:272
2911#, fuzzy, c-format
2912msgid "unable to create '%s'"
2913msgstr "不能写 %s"
2914
2915#: builtin/index-pack.c:277
2916#, fuzzy, c-format
2917msgid "cannot open packfile '%s'"
2918msgstr "无法打开补丁文件 %s"
2919
2920#: builtin/index-pack.c:291
2921msgid "pack signature mismatch"
2922msgstr ""
2923
2924#: builtin/index-pack.c:311
2925#, c-format
2926msgid "pack has bad object at offset %lu: %s"
2927msgstr ""
2928
2929#: builtin/index-pack.c:405
2930#, c-format
2931msgid "inflate returned %d"
2932msgstr ""
2933
2934#: builtin/index-pack.c:450
2935msgid "offset value overflow for delta base object"
2936msgstr ""
2937
2938#: builtin/index-pack.c:458
2939msgid "delta base offset is out of bound"
2940msgstr ""
2941
2942#: builtin/index-pack.c:466
2943#, fuzzy, c-format
2944msgid "unknown object type %d"
2945msgstr "未知类型:%d"
2946
2947#: builtin/index-pack.c:495
2948#, fuzzy
2949msgid "cannot pread pack file"
2950msgstr "无法打开补丁文件 %s"
2951
2952#: builtin/index-pack.c:497
2953#, c-format
2954msgid "premature end of pack file, %lu byte missing"
2955msgid_plural "premature end of pack file, %lu bytes missing"
2956msgstr[0] ""
2957
2958#: builtin/index-pack.c:510
2959msgid "serious inflate inconsistency"
2960msgstr ""
2961
2962#: builtin/index-pack.c:583
2963#, fuzzy, c-format
2964msgid "cannot read existing object %s"
2965msgstr "不能读取对象 %s"
2966
2967#: builtin/index-pack.c:586
2968#, c-format
2969msgid "SHA1 COLLISION FOUND WITH %s !"
2970msgstr ""
2971
2972#: builtin/index-pack.c:598
2973#, fuzzy, c-format
2974msgid "invalid blob object %s"
2975msgstr "不是一个有效对象:%s"
2976
2977#: builtin/index-pack.c:610
2978#, fuzzy, c-format
2979msgid "invalid %s"
2980msgstr "无效键名:%s"
2981
2982#: builtin/index-pack.c:612
2983msgid "Error in object"
2984msgstr ""
2985
2986#: builtin/index-pack.c:614
2987#, c-format
2988msgid "Not all child objects of %s are reachable"
2989msgstr ""
2990
2991#: builtin/index-pack.c:687 builtin/index-pack.c:713
2992#, fuzzy
2993msgid "failed to apply delta"
2994msgstr "无法拷贝文件至 '%s'"
2995
2996#: builtin/index-pack.c:850
2997#, fuzzy
2998msgid "Receiving objects"
2999msgstr "删除对象 %s 的注解\n"
3000
3001#: builtin/index-pack.c:850
3002#, fuzzy
3003msgid "Indexing objects"
3004msgstr "坏对象 %s"
3005
3006#: builtin/index-pack.c:872
3007msgid "pack is corrupted (SHA1 mismatch)"
3008msgstr ""
3009
3010#: builtin/index-pack.c:877
3011#, fuzzy
3012msgid "cannot fstat packfile"
3013msgstr "不能枚举模版 '%s' 状态"
3014
3015#: builtin/index-pack.c:880
3016msgid "pack has junk at the end"
3017msgstr ""
3018
3019#: builtin/index-pack.c:903
3020#, fuzzy
3021msgid "Resolving deltas"
3022msgstr "正删除 %s\n"
3023
3024#: builtin/index-pack.c:954
3025msgid "confusion beyond insanity"
3026msgstr ""
3027
3028#: builtin/index-pack.c:973
3029#, c-format
3030msgid "pack has %d unresolved delta"
3031msgid_plural "pack has %d unresolved deltas"
3032msgstr[0] ""
3033
3034#: builtin/index-pack.c:998
3035#, fuzzy, c-format
3036msgid "unable to deflate appended object (%d)"
3037msgstr "不能写注解对象"
3038
3039#: builtin/index-pack.c:1077
3040#, c-format
3041msgid "local object %s is corrupt"
3042msgstr ""
3043
3044#: builtin/index-pack.c:1101
3045msgid "error while closing pack file"
3046msgstr ""
3047
3048#: builtin/index-pack.c:1114
3049#, fuzzy, c-format
3050msgid "cannot write keep file '%s'"
3051msgstr "不能枚举模版 '%s' 状态"
3052
3053#: builtin/index-pack.c:1122
3054#, fuzzy, c-format
3055msgid "cannot close written keep file '%s'"
3056msgstr "不能枚举模版 '%s' 状态"
3057
3058#: builtin/index-pack.c:1135
3059#, fuzzy
3060msgid "cannot store pack file"
3061msgstr "无法打开补丁文件 %s"
3062
3063#: builtin/index-pack.c:1146
3064#, fuzzy
3065msgid "cannot store index file"
3066msgstr "无法读取索引"
3067
3068#: builtin/index-pack.c:1247
3069#, fuzzy, c-format
3070msgid "Cannot open existing pack file '%s'"
3071msgstr "无法打开补丁文件 %s"
3072
3073#: builtin/index-pack.c:1249
3074#, fuzzy, c-format
3075msgid "Cannot open existing pack idx file for '%s'"
3076msgstr "无法打开补丁文件 %s"
3077
3078#: builtin/index-pack.c:1296
3079#, fuzzy, c-format
3080msgid "non delta: %d object"
3081msgid_plural "non delta: %d objects"
3082msgstr[0] "不是一个有效对象:%s"
3083
3084#: builtin/index-pack.c:1303
3085#, c-format
3086msgid "chain length = %d: %lu object"
3087msgid_plural "chain length = %d: %lu objects"
3088msgstr[0] ""
3089
3090#: builtin/index-pack.c:1330
3091msgid "Cannot come back to cwd"
3092msgstr ""
3093
3094#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
3095#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
3096#, fuzzy, c-format
3097msgid "bad %s"
3098msgstr "坏对象 %s"
3099
3100#: builtin/index-pack.c:1407
3101#, fuzzy
3102msgid "--fix-thin cannot be used without --stdin"
3103msgstr "--orphan 不能和 -t 共用"
3104
3105#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
3106#, c-format
3107msgid "packfile name '%s' does not end with '.pack'"
3108msgstr ""
3109
3110#: builtin/index-pack.c:1430
3111msgid "--verify with no packfile name given"
3112msgstr ""
3113
c04f5ac3
JX
3114#: builtin/init-db.c:35
3115#, c-format
3116msgid "Could not make %s writable by group"
3117msgstr "不能设置 %s 为组可写"
3118
3119#: builtin/init-db.c:62
3120#, c-format
3121msgid "insanely long template name %s"
3122msgstr "太长的模版名 %s"
3123
3124#: builtin/init-db.c:67
3125#, c-format
3126msgid "cannot stat '%s'"
3127msgstr "不能枚举 '%s' 状态"
3128
3129#: builtin/init-db.c:73
3130#, c-format
3131msgid "cannot stat template '%s'"
3132msgstr "不能枚举模版 '%s' 状态"
3133
3134#: builtin/init-db.c:80
3135#, c-format
3136msgid "cannot opendir '%s'"
3137msgstr "不能打开目录 '%s'"
3138
3139#: builtin/init-db.c:97
3140#, c-format
3141msgid "cannot readlink '%s'"
3142msgstr "不能读取链接 '%s'"
3143
3144#: builtin/init-db.c:99
3145#, c-format
3146msgid "insanely long symlink %s"
3147msgstr "太长的符号链接 %s"
3148
3149#: builtin/init-db.c:102
3150#, c-format
3151msgid "cannot symlink '%s' '%s'"
90e6ef53 3152msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
3153
3154#: builtin/init-db.c:106
3155#, c-format
3156msgid "cannot copy '%s' to '%s'"
3157msgstr "不能拷贝 '%s' 至 '%s'"
3158
3159#: builtin/init-db.c:110
3160#, c-format
3161msgid "ignoring template %s"
3162msgstr "忽略模版 %s"
3163
3164#: builtin/init-db.c:133
3165#, c-format
3166msgid "insanely long template path %s"
3167msgstr "太长的模版路径 %s"
3168
3169#: builtin/init-db.c:141
3170#, c-format
3171msgid "templates not found %s"
3172msgstr "模版未找到 %s"
3173
3174#: builtin/init-db.c:154
3175#, c-format
3176msgid "not copying templates of a wrong format version %d from '%s'"
3177msgstr "未复制错误版本 %d 的模版自 '%s'"
3178
3179#: builtin/init-db.c:192
3180#, c-format
3181msgid "insane git directory %s"
3182msgstr "不正常的 git 目录 %s"
3183
3184#: builtin/init-db.c:322 builtin/init-db.c:325
3185#, c-format
3186msgid "%s already exists"
3187msgstr "%s 已经存在"
3188
3189#: builtin/init-db.c:354
3190#, c-format
3191msgid "unable to handle file type %d"
3192msgstr "不能处理 %d 类型的文件"
3193
3194#: builtin/init-db.c:357
3195#, c-format
3196msgid "unable to move %s to %s"
3197msgstr "不能移动 %s 至 %s"
3198
3199#: builtin/init-db.c:362
3200#, c-format
3201msgid "Could not create git link %s"
3202msgstr "不能创建 git link %s"
3203
3204#.
3205#. * TRANSLATORS: The first '%s' is either "Reinitialized
3206#. * existing" or "Initialized empty", the second " shared" or
3207#. * "", and the last '%s%s' is the verbatim directory name.
3208#.
3209#: builtin/init-db.c:419
3210#, c-format
3211msgid "%s%s Git repository in %s%s\n"
3212msgstr "%s%s Git 版本库于 %s%s\n"
3213
3214#: builtin/init-db.c:420
3215msgid "Reinitialized existing"
3216msgstr "重新初始化现存的"
3217
3218#: builtin/init-db.c:420
3219msgid "Initialized empty"
3220msgstr "初始化空的"
3221
7e238ab7 3222# 译者:中文字符串拼接,可删除前导空格
c04f5ac3
JX
3223#: builtin/init-db.c:421
3224msgid " shared"
90e6ef53 3225msgstr "共享"
c04f5ac3
JX
3226
3227#: builtin/init-db.c:440
3228msgid "cannot tell cwd"
3229msgstr "无法获知当前路径"
3230
3231#: builtin/init-db.c:521 builtin/init-db.c:528
3232#, c-format
3233msgid "cannot mkdir %s"
3234msgstr "不能创建目录 %s"
3235
3236#: builtin/init-db.c:532
3237#, c-format
3238msgid "cannot chdir to %s"
3239msgstr "不能切换目录到 %s"
3240
3241#: builtin/init-db.c:554
3242#, c-format
3243msgid ""
3244"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3245"dir=<directory>)"
3246msgstr ""
73a60cd2
JX
3247"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
3248"dir=<directory>)"
c04f5ac3
JX
3249
3250#: builtin/init-db.c:578
3251msgid "Cannot access current working directory"
3252msgstr "不能访问当前工作目录"
3253
3254#: builtin/init-db.c:585
3255#, c-format
3256msgid "Cannot access work tree '%s'"
3257msgstr "不能访问工作区 '%s'"
3258
170e9899 3259#: builtin/log.c:188
c04f5ac3
JX
3260#, c-format
3261msgid "Final output: %d %s\n"
3262msgstr "最终输出:%d %s\n"
3263
170e9899 3264#: builtin/log.c:401 builtin/log.c:489
c04f5ac3
JX
3265#, c-format
3266msgid "Could not read object %s"
90e6ef53 3267msgstr "不能读取对象 %s"
c04f5ac3 3268
170e9899 3269#: builtin/log.c:513
c04f5ac3
JX
3270#, c-format
3271msgid "Unknown type: %d"
3272msgstr "未知类型:%d"
3273
170e9899 3274#: builtin/log.c:602
c04f5ac3
JX
3275msgid "format.headers without value"
3276msgstr "format.headers 没有值"
3277
170e9899 3278#: builtin/log.c:675
c04f5ac3
JX
3279msgid "name of output directory is too long"
3280msgstr "输出目录名太长"
3281
170e9899 3282#: builtin/log.c:686
c04f5ac3
JX
3283#, c-format
3284msgid "Cannot open patch file %s"
3285msgstr "无法打开补丁文件 %s"
3286
170e9899 3287#: builtin/log.c:700
c04f5ac3
JX
3288msgid "Need exactly one range."
3289msgstr "只需要一个范围。"
3290
170e9899 3291#: builtin/log.c:708
c04f5ac3
JX
3292msgid "Not a range."
3293msgstr "不是一个范围。"
3294
170e9899 3295#: builtin/log.c:745
c04f5ac3 3296msgid "Could not extract email from committer identity."
90e6ef53 3297msgstr "不能从提交者身份中提取邮件地址。"
c04f5ac3 3298
170e9899 3299#: builtin/log.c:791
c04f5ac3
JX
3300msgid "Cover letter needs email format"
3301msgstr "信封需要邮件地址格式"
3302
170e9899 3303#: builtin/log.c:885
c04f5ac3
JX
3304#, c-format
3305msgid "insane in-reply-to: %s"
3306msgstr "不正常的 in-reply-to:%s"
3307
170e9899 3308#: builtin/log.c:958
c04f5ac3
JX
3309msgid "Two output directories?"
3310msgstr "两个输出目录?"
3311
170e9899 3312#: builtin/log.c:1179
c04f5ac3
JX
3313#, c-format
3314msgid "bogus committer info %s"
3315msgstr "虚假的提交者信息 %s"
3316
170e9899 3317#: builtin/log.c:1224
c04f5ac3
JX
3318msgid "-n and -k are mutually exclusive."
3319msgstr "-n 和 -k 互斥。"
3320
170e9899 3321#: builtin/log.c:1226
c04f5ac3
JX
3322msgid "--subject-prefix and -k are mutually exclusive."
3323msgstr "--subject-prefix 和 -k 互斥。"
3324
170e9899 3325#: builtin/log.c:1234
c04f5ac3
JX
3326msgid "--name-only does not make sense"
3327msgstr "--name-only 无意义"
3328
170e9899 3329#: builtin/log.c:1236
c04f5ac3
JX
3330msgid "--name-status does not make sense"
3331msgstr "--name-status 无意义"
3332
170e9899 3333#: builtin/log.c:1238
c04f5ac3
JX
3334msgid "--check does not make sense"
3335msgstr "--check 无意义"
3336
170e9899 3337#: builtin/log.c:1261
c04f5ac3
JX
3338msgid "standard output, or directory, which one?"
3339msgstr "标准输出或目录,哪一个?"
3340
170e9899 3341#: builtin/log.c:1263
c04f5ac3
JX
3342#, c-format
3343msgid "Could not create directory '%s'"
90e6ef53 3344msgstr "不能创建目录 '%s'"
c04f5ac3 3345
170e9899 3346#: builtin/log.c:1416
c04f5ac3
JX
3347msgid "Failed to create output files"
3348msgstr "无法创建输出文件"
3349
170e9899 3350#: builtin/log.c:1520
c04f5ac3
JX
3351#, c-format
3352msgid ""
3353"Could not find a tracked remote branch, please specify <upstream> manually.\n"
90e6ef53 3354msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
c04f5ac3 3355
170e9899 3356#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550
c04f5ac3
JX
3357#, c-format
3358msgid "Unknown commit %s"
3359msgstr "未知提交 %s"
3360
170e9899 3361#: builtin/merge.c:90
c04f5ac3
JX
3362msgid "switch `m' requires a value"
3363msgstr "开关 `m' 需要一个值"
3364
170e9899 3365#: builtin/merge.c:127
c04f5ac3
JX
3366#, c-format
3367msgid "Could not find merge strategy '%s'.\n"
90e6ef53 3368msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 3369
170e9899 3370#: builtin/merge.c:128
c04f5ac3
JX
3371#, c-format
3372msgid "Available strategies are:"
3373msgstr "可用的策略有:"
3374
170e9899 3375#: builtin/merge.c:133
c04f5ac3
JX
3376#, c-format
3377msgid "Available custom strategies are:"
3378msgstr "可用的自定义策略有:"
3379
170e9899 3380#: builtin/merge.c:240
c04f5ac3
JX
3381msgid "could not run stash."
3382msgstr "不能进行进度保存。"
3383
170e9899 3384#: builtin/merge.c:245
c04f5ac3
JX
3385msgid "stash failed"
3386msgstr "进度保存失败"
3387
170e9899 3388#: builtin/merge.c:250
c04f5ac3
JX
3389#, c-format
3390msgid "not a valid object: %s"
3391msgstr "不是一个有效对象:%s"
3392
170e9899 3393#: builtin/merge.c:269 builtin/merge.c:286
c04f5ac3
JX
3394msgid "read-tree failed"
3395msgstr "读取树失败"
3396
90e6ef53 3397# 译者:注意保持前导空格
170e9899 3398#: builtin/merge.c:316
c04f5ac3
JX
3399msgid " (nothing to squash)"
3400msgstr " (无可压缩)"
3401
170e9899 3402#: builtin/merge.c:329
c04f5ac3
JX
3403#, c-format
3404msgid "Squash commit -- not updating HEAD\n"
3405msgstr "压缩提交 -- 未更新 HEAD\n"
3406
170e9899 3407#: builtin/merge.c:361
c04f5ac3
JX
3408msgid "Writing SQUASH_MSG"
3409msgstr "写入 SQUASH_MSG"
3410
170e9899 3411#: builtin/merge.c:363
c04f5ac3
JX
3412msgid "Finishing SQUASH_MSG"
3413msgstr "完成 SQUASH_MSG"
3414
3415#: builtin/merge.c:386
3416#, c-format
3417msgid "No merge message -- not updating HEAD\n"
3418msgstr "无合并信息 -- 未更新 HEAD\n"
3419
14c8bced 3420#: builtin/merge.c:437
c04f5ac3
JX
3421#, c-format
3422msgid "'%s' does not point to a commit"
3423msgstr "'%s' 没有指向一个提交"
3424
14c8bced 3425#: builtin/merge.c:536
c04f5ac3
JX
3426#, c-format
3427msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 3428msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 3429
14c8bced 3430#: builtin/merge.c:629
c04f5ac3
JX
3431msgid "git write-tree failed to write a tree"
3432msgstr "git write-tree 无法写入一树对象"
3433
14c8bced 3434#: builtin/merge.c:679
c04f5ac3
JX
3435msgid "failed to read the cache"
3436msgstr "无法读取缓存"
3437
170e9899 3438#: builtin/merge.c:697
c04f5ac3 3439msgid "Unable to write index."
90e6ef53 3440msgstr "不能写索引。"
c04f5ac3 3441
170e9899 3442#: builtin/merge.c:710
c04f5ac3
JX
3443msgid "Not handling anything other than two heads merge."
3444msgstr "不能处理两个头合并之外的任何操作。"
3445
170e9899 3446#: builtin/merge.c:724
c04f5ac3
JX
3447#, c-format
3448msgid "Unknown option for merge-recursive: -X%s"
3449msgstr "merge-recursive 的未知选项:-X%s"
3450
170e9899 3451#: builtin/merge.c:738
c04f5ac3
JX
3452#, c-format
3453msgid "unable to write %s"
3454msgstr "不能写 %s"
3455
170e9899 3456#: builtin/merge.c:877
c04f5ac3
JX
3457#, c-format
3458msgid "Could not read from '%s'"
3459msgstr "不能从 '%s' 读取"
3460
170e9899 3461#: builtin/merge.c:886
c04f5ac3
JX
3462#, c-format
3463msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3464msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
3465
170e9899 3466#: builtin/merge.c:892
c04f5ac3
JX
3467msgid ""
3468"Please enter a commit message to explain why this merge is necessary,\n"
3469"especially if it merges an updated upstream into a topic branch.\n"
3470"\n"
3471"Lines starting with '#' will be ignored, and an empty message aborts\n"
3472"the commit.\n"
3473msgstr ""
3474"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
3475"合并到主题分支。\n"
3476"\n"
3477"以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
3478
170e9899 3479#: builtin/merge.c:916
c04f5ac3
JX
3480msgid "Empty commit message."
3481msgstr "空提交信息。"
3482
170e9899 3483#: builtin/merge.c:928
c04f5ac3
JX
3484#, c-format
3485msgid "Wonderful.\n"
3486msgstr "太棒了。\n"
3487
170e9899 3488#: builtin/merge.c:993
c04f5ac3
JX
3489#, c-format
3490msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3491msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
3492
170e9899 3493#: builtin/merge.c:1009
c04f5ac3
JX
3494#, c-format
3495msgid "'%s' is not a commit"
3496msgstr "'%s' 不是一个提交"
3497
170e9899 3498#: builtin/merge.c:1050
c04f5ac3 3499msgid "No current branch."
90e6ef53 3500msgstr "没有当前分支。"
c04f5ac3 3501
170e9899 3502#: builtin/merge.c:1052
c04f5ac3 3503msgid "No remote for the current branch."
90e6ef53 3504msgstr "当前分支没有对应的远程版本库。"
c04f5ac3 3505
170e9899 3506#: builtin/merge.c:1054
c04f5ac3 3507msgid "No default upstream defined for the current branch."
90e6ef53 3508msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 3509
170e9899 3510#: builtin/merge.c:1059
c04f5ac3
JX
3511#, c-format
3512msgid "No remote tracking branch for %s from %s"
3513msgstr "%s 没有来自 %s 的远程跟踪分支"
3514
170e9899
JX
3515#: builtin/merge.c:1146 builtin/merge.c:1303
3516#, c-format
3517msgid "%s - not something we can merge"
3518msgstr "%s - 不能被合并"
3519
3520#: builtin/merge.c:1214
c04f5ac3 3521msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 3522msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 3523
170e9899 3524#: builtin/merge.c:1230 git-pull.sh:31
c04f5ac3
JX
3525msgid ""
3526"You have not concluded your merge (MERGE_HEAD exists).\n"
3527"Please, commit your changes before you can merge."
3528msgstr ""
3529"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 3530"请在合并前先提交您的修改。"
c04f5ac3 3531
170e9899 3532#: builtin/merge.c:1233 git-pull.sh:34
c04f5ac3
JX
3533msgid "You have not concluded your merge (MERGE_HEAD exists)."
3534msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
3535
170e9899 3536#: builtin/merge.c:1237
c04f5ac3
JX
3537msgid ""
3538"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3539"Please, commit your changes before you can merge."
3540msgstr ""
3541"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 3542"请在合并前先提交您的修改。"
c04f5ac3 3543
170e9899 3544#: builtin/merge.c:1240
c04f5ac3
JX
3545msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3546msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
3547
170e9899 3548#: builtin/merge.c:1249
c04f5ac3
JX
3549msgid "You cannot combine --squash with --no-ff."
3550msgstr "您不能将 --squash 与 --no-ff 共用。"
3551
170e9899 3552#: builtin/merge.c:1254
c04f5ac3
JX
3553msgid "You cannot combine --no-ff with --ff-only."
3554msgstr "您不能将 --no-ff 与 --ff-only 共用。"
3555
170e9899 3556#: builtin/merge.c:1261
c04f5ac3 3557msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 3558msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 3559
170e9899 3560#: builtin/merge.c:1293
c04f5ac3 3561msgid "Can merge only exactly one commit into empty head"
90e6ef53 3562msgstr "只能将一个提交合并到空分支上"
c04f5ac3 3563
170e9899 3564#: builtin/merge.c:1296
c04f5ac3
JX
3565msgid "Squash commit into empty head not supported yet"
3566msgstr "尚不支持到空分支的压缩提交"
3567
170e9899 3568#: builtin/merge.c:1298
c04f5ac3
JX
3569msgid "Non-fast-forward commit does not make sense into an empty head"
3570msgstr "到空分支的非快进式提交没有意义"
3571
170e9899 3572#: builtin/merge.c:1413
c04f5ac3
JX
3573#, c-format
3574msgid "Updating %s..%s\n"
3575msgstr "更新 %s..%s\n"
3576
170e9899 3577#: builtin/merge.c:1451
c04f5ac3
JX
3578#, c-format
3579msgid "Trying really trivial in-index merge...\n"
90e6ef53 3580msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 3581
170e9899 3582#: builtin/merge.c:1458
c04f5ac3
JX
3583#, c-format
3584msgid "Nope.\n"
3585msgstr "无。\n"
3586
170e9899 3587#: builtin/merge.c:1490
c04f5ac3 3588msgid "Not possible to fast-forward, aborting."
1aabac65 3589msgstr "无法快进,终止。"
c04f5ac3 3590
170e9899 3591#: builtin/merge.c:1513 builtin/merge.c:1592
c04f5ac3
JX
3592#, c-format
3593msgid "Rewinding the tree to pristine...\n"
3594msgstr "将树回滚至原始状态...\n"
3595
170e9899 3596#: builtin/merge.c:1517
c04f5ac3
JX
3597#, c-format
3598msgid "Trying merge strategy %s...\n"
3599msgstr "尝试合并策略 %s...\n"
3600
170e9899 3601#: builtin/merge.c:1583
c04f5ac3
JX
3602#, c-format
3603msgid "No merge strategy handled the merge.\n"
3604msgstr "没有合并策略处理此合并。\n"
3605
170e9899 3606#: builtin/merge.c:1585
c04f5ac3
JX
3607#, c-format
3608msgid "Merge with strategy %s failed.\n"
3609msgstr "使用策略 %s 合并失败。\n"
3610
170e9899 3611#: builtin/merge.c:1594
c04f5ac3
JX
3612#, c-format
3613msgid "Using the %s to prepare resolving by hand.\n"
3614msgstr "使用 %s 以准备手工解决。\n"
3615
170e9899 3616#: builtin/merge.c:1606
c04f5ac3
JX
3617#, c-format
3618msgid "Automatic merge went well; stopped before committing as requested\n"
3619msgstr "自动合并进展顺利,按要求在提交前停止\n"
3620
3621#: builtin/mv.c:108
3622#, c-format
3623msgid "Checking rename of '%s' to '%s'\n"
3624msgstr "检查 '%s' 到 '%s' 的重命名\n"
3625
3626#: builtin/mv.c:112
3627msgid "bad source"
3628msgstr "坏的源"
3629
3630#: builtin/mv.c:115
3631msgid "can not move directory into itself"
3632msgstr "不能将目录移动到自身"
3633
3634#: builtin/mv.c:118
3635msgid "cannot move directory over file"
3636msgstr "不能将目录移动到文件"
3637
3638#: builtin/mv.c:128
3639#, c-format
3640msgid "Huh? %.*s is in index?"
90e6ef53 3641msgstr "嗯?%.*s 在索引中?"
c04f5ac3
JX
3642
3643#: builtin/mv.c:140
3644msgid "source directory is empty"
3645msgstr "源目录为空"
3646
3647#: builtin/mv.c:171
3648msgid "not under version control"
3649msgstr "不在版本控制之下"
3650
3651#: builtin/mv.c:173
3652msgid "destination exists"
3653msgstr "目标已存在"
3654
3655#: builtin/mv.c:181
3656#, c-format
3657msgid "overwriting '%s'"
3658msgstr "覆盖 '%s'"
3659
3660#: builtin/mv.c:184
3661msgid "Cannot overwrite"
3662msgstr "不能覆盖"
3663
3664#: builtin/mv.c:187
3665msgid "multiple sources for the same target"
3666msgstr "同一目标具有多个源"
3667
3668#: builtin/mv.c:202
3669#, c-format
3670msgid "%s, source=%s, destination=%s"
3671msgstr "%s,源=%s,目标=%s"
3672
3673#: builtin/mv.c:212
3674#, c-format
3675msgid "Renaming %s to %s\n"
3676msgstr "重命名 %s 至 %s\n"
3677
8ada9598 3678#: builtin/mv.c:215 builtin/remote.c:731
c04f5ac3
JX
3679#, c-format
3680msgid "renaming '%s' failed"
3681msgstr "重命名 '%s' 失败"
3682
3683#: builtin/notes.c:139
3684#, c-format
3685msgid "unable to start 'show' for object '%s'"
3686msgstr "不能为对象 '%s' 开始 'show'"
3687
3688#: builtin/notes.c:145
3689msgid "can't fdopen 'show' output fd"
3690msgstr "不能打开 'show' 输出文件句柄"
3691
3692#: builtin/notes.c:155
3693#, c-format
3694msgid "failed to close pipe to 'show' for object '%s'"
3695msgstr "无法为对象 '%s' 的 'show' 关闭管道"
3696
3697#: builtin/notes.c:158
3698#, c-format
3699msgid "failed to finish 'show' for object '%s'"
3700msgstr "无法为对象 '%s' 完成 'show'"
3701
8ada9598 3702#: builtin/notes.c:175 builtin/tag.c:347
c04f5ac3
JX
3703#, c-format
3704msgid "could not create file '%s'"
3705msgstr "不能创建文件 '%s'"
3706
3707#: builtin/notes.c:189
3708msgid "Please supply the note contents using either -m or -F option"
3709msgstr "请通过 -m 或 -F 选项为注解提供内容"
3710
3711#: builtin/notes.c:210 builtin/notes.c:973
3712#, c-format
3713msgid "Removing note for object %s\n"
3714msgstr "删除对象 %s 的注解\n"
3715
3716#: builtin/notes.c:215
3717msgid "unable to write note object"
3718msgstr "不能写注解对象"
3719
3720#: builtin/notes.c:217
3721#, c-format
3722msgid "The note contents has been left in %s"
3723msgstr "注解内容被留在文件 %s 中"
3724
8ada9598 3725#: builtin/notes.c:251 builtin/tag.c:542
c04f5ac3
JX
3726#, c-format
3727msgid "cannot read '%s'"
3728msgstr "不能读取 '%s'"
3729
8ada9598 3730#: builtin/notes.c:253 builtin/tag.c:545
c04f5ac3
JX
3731#, c-format
3732msgid "could not open or read '%s'"
3733msgstr "不能打开或读取 '%s'"
3734
3735#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
3736#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
3737#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
8ada9598 3738#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
c04f5ac3
JX
3739#, c-format
3740msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 3741msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3
JX
3742
3743#: builtin/notes.c:275
3744#, c-format
3745msgid "Failed to read object '%s'."
3746msgstr "无法读取对象 '%s'。"
3747
3748#: builtin/notes.c:299
3749msgid "Cannot commit uninitialized/unreferenced notes tree"
3750msgstr "不能提交未初始化/未引用的注解树"
3751
3752#: builtin/notes.c:340
3753#, c-format
3754msgid "Bad notes.rewriteMode value: '%s'"
90e6ef53 3755msgstr "坏的 notes.rewriteMode 值:'%s'"
c04f5ac3
JX
3756
3757#: builtin/notes.c:350
3758#, c-format
3759msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3760msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
3761
3762#. TRANSLATORS: The first %s is the name of the
3763#. environment variable, the second %s is its value
3764#: builtin/notes.c:377
3765#, c-format
3766msgid "Bad %s value: '%s'"
90e6ef53 3767msgstr "坏的 %s 值:'%s'"
c04f5ac3
JX
3768
3769#: builtin/notes.c:441
3770#, c-format
3771msgid "Malformed input line: '%s'."
3772msgstr "非法的输入行:'%s'。"
3773
3774#: builtin/notes.c:456
3775#, c-format
3776msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 3777msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3
JX
3778
3779#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
3780#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
3781#: builtin/notes.c:1033
3782msgid "too many parameters"
3783msgstr "参数太多"
3784
3785#: builtin/notes.c:513 builtin/notes.c:772
3786#, c-format
3787msgid "No note found for object %s."
3788msgstr "未发现对象 %s 的注解。"
3789
3790#: builtin/notes.c:580
3791#, c-format
3792msgid ""
3793"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
3794"existing notes"
3795msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3796
3797#: builtin/notes.c:585 builtin/notes.c:662
3798#, c-format
3799msgid "Overwriting existing notes for object %s\n"
3800msgstr "覆盖对象 %s 现存注解\n"
3801
3802#: builtin/notes.c:635
3803msgid "too few parameters"
3804msgstr "参数太少"
3805
3806#: builtin/notes.c:656
3807#, c-format
3808msgid ""
3809"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
3810"existing notes"
3811msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3812
3813#: builtin/notes.c:668
3814#, c-format
3815msgid "Missing notes on source object %s. Cannot copy."
3816msgstr "源对象 %s 缺少注解。不能拷贝。"
3817
3818#: builtin/notes.c:717
3819#, c-format
3820msgid ""
3821"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
3822"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
3823msgstr ""
90e6ef53 3824"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
c04f5ac3
JX
3825"请换用 'git notes add -f -m/-F/-c/-C'。\n"
3826
3827#: builtin/notes.c:971
3828#, c-format
3829msgid "Object %s has no note\n"
3830msgstr "对象 %s 没有注解\n"
3831
8ada9598 3832#: builtin/notes.c:1103 builtin/remote.c:1598
c04f5ac3
JX
3833#, c-format
3834msgid "Unknown subcommand: %s"
3835msgstr "未知子命令:%s"
3836
eff6d3a9 3837#: builtin/pack-objects.c:2315
7ac1c0ad
JX
3838#, c-format
3839msgid "unsupported index version %s"
90e6ef53 3840msgstr "不支持的索引版本 %s"
7ac1c0ad 3841
eff6d3a9 3842#: builtin/pack-objects.c:2319
7ac1c0ad
JX
3843#, c-format
3844msgid "bad index version '%s'"
90e6ef53 3845msgstr "坏的索引版本 '%s'"
7ac1c0ad 3846
eff6d3a9 3847#: builtin/pack-objects.c:2342
7ac1c0ad
JX
3848#, c-format
3849msgid "option %s does not accept negative form"
90e6ef53 3850msgstr "选项 %s 不接受否定格式"
7ac1c0ad 3851
eff6d3a9 3852#: builtin/pack-objects.c:2346
7ac1c0ad
JX
3853#, c-format
3854msgid "unable to parse value '%s' for option %s"
3855msgstr "不能解析值 '%s' 针对于选项 %s"
3856
170e9899 3857#: builtin/push.c:45
c04f5ac3
JX
3858msgid "tag shorthand without <tag>"
3859msgstr "tag 简写没有跟 <tag> 参数"
3860
170e9899 3861#: builtin/push.c:64
c04f5ac3 3862msgid "--delete only accepts plain target ref names"
90e6ef53 3863msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 3864
8ada9598
JX
3865#: builtin/push.c:99
3866msgid ""
3867"\n"
3868"To choose either option permanently, see push.default in 'git help config'."
3869msgstr ""
3870
3871#: builtin/push.c:102
3872#, c-format
3873msgid ""
3874"The upstream branch of your current branch does not match\n"
3875"the name of your current branch. To push to the upstream branch\n"
3876"on the remote, use\n"
3877"\n"
3878" git push %s HEAD:%s\n"
3879"\n"
3880"To push to the branch of the same name on the remote, use\n"
3881"\n"
3882" git push %s %s\n"
3883"%s"
3884msgstr ""
3885
3886#: builtin/push.c:121
c04f5ac3
JX
3887#, c-format
3888msgid ""
3889"You are not currently on a branch.\n"
3890"To push the history leading to the current (detached HEAD)\n"
3891"state now, use\n"
3892"\n"
3893" git push %s HEAD:<name-of-remote-branch>\n"
3894msgstr ""
3895"您当前不在一个分支上。\n"
90e6ef53 3896"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3
JX
3897"\n"
3898" git push %s HEAD:<name-of-remote-branch>\n"
3899
8ada9598 3900#: builtin/push.c:128
c04f5ac3
JX
3901#, c-format
3902msgid ""
3903"The current branch %s has no upstream branch.\n"
3904"To push the current branch and set the remote as upstream, use\n"
3905"\n"
3906" git push --set-upstream %s %s\n"
3907msgstr ""
3908"当前分支 %s 没有对应的上游分支。\n"
3909"为推送当前分支并建立与远程上游的跟踪,使用\n"
3910"\n"
3911" git push --set-upstream %s %s\n"
3912
8ada9598 3913#: builtin/push.c:136
c04f5ac3
JX
3914#, c-format
3915msgid "The current branch %s has multiple upstream branches, refusing to push."
3916msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
3917
8ada9598 3918#: builtin/push.c:139
73a60cd2
JX
3919#, c-format
3920msgid ""
3921"You are pushing to remote '%s', which is not the upstream of\n"
3922"your current branch '%s', without telling me what to push\n"
3923"to update which remote branch."
3924msgstr ""
3925"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
3926"而没有告诉我要推送什么、更新哪个远程分支。"
3927
8ada9598 3928#: builtin/push.c:174
c04f5ac3
JX
3929msgid ""
3930"You didn't specify any refspecs to push, and push.default is \"nothing\"."
90e6ef53 3931msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
c04f5ac3 3932
8ada9598 3933#: builtin/push.c:181
170e9899
JX
3934msgid ""
3935"Updates were rejected because the tip of your current branch is behind\n"
3936"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
3937"before pushing again.\n"
3938"See the 'Note about fast-forwards' in 'git push --help' for details."
3939msgstr ""
eff6d3a9
JX
3940"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
3941"再次推送前,先与远程变更合并(如 'git pull')。详见\n"
3942"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 3943
8ada9598 3944#: builtin/push.c:187
170e9899
JX
3945msgid ""
3946"Updates were rejected because a pushed branch tip is behind its remote\n"
3947"counterpart. If you did not intend to push that branch, you may want to\n"
3948"specify branches to push or set the 'push.default' configuration\n"
3949"variable to 'current' or 'upstream' to push only the current branch."
3950msgstr ""
eff6d3a9
JX
3951"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
3952"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
8ada9598 3953"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"
170e9899 3954
8ada9598 3955#: builtin/push.c:193
170e9899
JX
3956msgid ""
3957"Updates were rejected because a pushed branch tip is behind its remote\n"
3958"counterpart. Check out this branch and merge the remote changes\n"
3959"(e.g. 'git pull') before pushing again.\n"
3960"See the 'Note about fast-forwards' in 'git push --help' for details."
3961msgstr ""
eff6d3a9
JX
3962"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
3963"检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
3964"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 3965
8ada9598 3966#: builtin/push.c:233
c04f5ac3
JX
3967#, c-format
3968msgid "Pushing to %s\n"
3969msgstr "推送到 %s\n"
3970
8ada9598 3971#: builtin/push.c:237
c04f5ac3
JX
3972#, c-format
3973msgid "failed to push some refs to '%s'"
3974msgstr "无法推送一些引用到 '%s'"
3975
8ada9598 3976#: builtin/push.c:269
c04f5ac3
JX
3977#, c-format
3978msgid "bad repository '%s'"
90e6ef53 3979msgstr "坏的版本库 '%s'"
c04f5ac3 3980
8ada9598 3981#: builtin/push.c:270
c04f5ac3
JX
3982msgid ""
3983"No configured push destination.\n"
3984"Either specify the URL from the command-line or configure a remote "
3985"repository using\n"
3986"\n"
3987" git remote add <name> <url>\n"
3988"\n"
3989"and then push using the remote name\n"
3990"\n"
3991" git push <name>\n"
3992msgstr ""
90e6ef53
JX
3993"没有配置推送目标。\n"
3994"或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n"
c04f5ac3
JX
3995"\n"
3996" git remote add <name> <url>\n"
3997"\n"
3998"然后使用该远程版本库名执行推送\n"
3999"\n"
4000" git push <name>\n"
4001
8ada9598 4002#: builtin/push.c:285
c04f5ac3
JX
4003msgid "--all and --tags are incompatible"
4004msgstr "--all 和 --tags 不兼容"
4005
8ada9598 4006#: builtin/push.c:286
c04f5ac3
JX
4007msgid "--all can't be combined with refspecs"
4008msgstr "--all 不能和引用表达式共用"
4009
8ada9598 4010#: builtin/push.c:291
c04f5ac3
JX
4011msgid "--mirror and --tags are incompatible"
4012msgstr "--mirror 和 --tags 不兼容"
4013
8ada9598 4014#: builtin/push.c:292
c04f5ac3
JX
4015msgid "--mirror can't be combined with refspecs"
4016msgstr "--mirror 不能和引用表达式共用"
4017
8ada9598 4018#: builtin/push.c:297
c04f5ac3
JX
4019msgid "--all and --mirror are incompatible"
4020msgstr "--all 和 --mirror 不兼容"
4021
8ada9598 4022#: builtin/push.c:385
c04f5ac3
JX
4023msgid "--delete is incompatible with --all, --mirror and --tags"
4024msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
4025
8ada9598 4026#: builtin/push.c:387
c04f5ac3
JX
4027msgid "--delete doesn't make sense without any refs"
4028msgstr "--delete 未接任何引用没有意义"
4029
8ada9598
JX
4030#: builtin/remote.c:98
4031#, fuzzy, c-format
4032msgid "Updating %s"
4033msgstr "更新 %s..%s\n"
4034
4035#: builtin/remote.c:130
4036msgid ""
4037"--mirror is dangerous and deprecated; please\n"
4038"\t use --mirror=fetch or --mirror=push instead"
4039msgstr ""
4040
4041#: builtin/remote.c:147
4042#, fuzzy, c-format
4043msgid "unknown mirror argument: %s"
4044msgstr "未识别的参数:%s"
4045
4046#: builtin/remote.c:185
4047msgid "specifying a master branch makes no sense with --mirror"
4048msgstr ""
4049
4050#: builtin/remote.c:187
4051msgid "specifying branches to track makes sense only with fetch mirrors"
4052msgstr ""
4053
4054#: builtin/remote.c:195 builtin/remote.c:646
4055#, fuzzy, c-format
4056msgid "remote %s already exists."
4057msgstr "%s 已经存在"
4058
4059#: builtin/remote.c:199 builtin/remote.c:650
4060#, fuzzy, c-format
4061msgid "'%s' is not a valid remote name"
4062msgstr "'%s' 不是一个有效的tag名称。"
4063
4064#: builtin/remote.c:243
4065#, fuzzy, c-format
4066msgid "Could not setup master '%s'"
4067msgstr "不能查看文件状态 '%s'"
4068
4069#: builtin/remote.c:299
4070#, fuzzy, c-format
4071msgid "more than one %s"
4072msgstr "提供了超过两个 blob 对象:'%s'"
4073
4074#: builtin/remote.c:339
4075#, fuzzy, c-format
4076msgid "Could not get fetch map for refspec %s"
4077msgstr "不能获取 %s"
4078
4079#: builtin/remote.c:440 builtin/remote.c:448
4080msgid "(matching)"
4081msgstr ""
4082
4083#: builtin/remote.c:452
4084#, fuzzy
4085msgid "(delete)"
4086msgstr "[已删除]"
4087
4088#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
4089#, fuzzy, c-format
4090msgid "Could not append '%s' to '%s'"
4091msgstr "不能应用 '%s'"
4092
4093#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
4094#, fuzzy, c-format
4095msgid "No such remote: %s"
4096msgstr "没有这样的远程或远程组:%s"
4097
4098#: builtin/remote.c:656
4099#, fuzzy, c-format
4100msgid "Could not rename config section '%s' to '%s'"
4101msgstr "不能创建目录 '%s'"
4102
4103#: builtin/remote.c:662 builtin/remote.c:799
4104#, fuzzy, c-format
4105msgid "Could not remove config section '%s'"
4106msgstr "不能创建目录 '%s'"
4107
4108#: builtin/remote.c:677
4109#, c-format
4110msgid ""
4111"Not updating non-default fetch respec\n"
4112"\t%s\n"
4113"\tPlease update the configuration manually if necessary."
4114msgstr ""
4115
4116#: builtin/remote.c:683
4117#, fuzzy, c-format
4118msgid "Could not append '%s'"
4119msgstr "不能应用 '%s'"
4120
4121#: builtin/remote.c:694
4122#, fuzzy, c-format
4123msgid "Could not set '%s'"
4124msgstr "不能查看文件状态 '%s'"
4125
4126#: builtin/remote.c:716
4127#, fuzzy, c-format
4128msgid "deleting '%s' failed"
4129msgstr "重命名 '%s' 失败"
4130
4131#: builtin/remote.c:750
4132#, fuzzy, c-format
4133msgid "creating '%s' failed"
4134msgstr "重命名 '%s' 失败"
4135
4136#: builtin/remote.c:764
4137#, fuzzy, c-format
4138msgid "Could not remove branch %s"
4139msgstr "不会删除 %s\n"
4140
4141#: builtin/remote.c:834
4142msgid ""
4143"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
4144"to delete it, use:"
4145msgid_plural ""
4146"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4147"to delete them, use:"
4148msgstr[0] ""
4149
4150#: builtin/remote.c:943
4151#, c-format
4152msgid " new (next fetch will store in remotes/%s)"
4153msgstr ""
4154
4155#: builtin/remote.c:946
4156#, fuzzy
4157msgid " tracked"
4158msgstr "未跟踪的"
4159
4160#: builtin/remote.c:948
4161msgid " stale (use 'git remote prune' to remove)"
4162msgstr ""
4163
4164#: builtin/remote.c:950
4165msgid " ???"
4166msgstr ""
4167
4168#: builtin/remote.c:991
4169#, c-format
4170msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4171msgstr ""
4172
4173#: builtin/remote.c:998
4174#, fuzzy, c-format
4175msgid "rebases onto remote %s"
4176msgstr "无法删除 %s"
4177
4178#: builtin/remote.c:1001
4179#, fuzzy, c-format
4180msgid " merges with remote %s"
4181msgstr "使用策略 %s 合并失败。\n"
4182
4183#: builtin/remote.c:1002
4184msgid " and with remote"
4185msgstr ""
4186
4187#: builtin/remote.c:1004
4188#, fuzzy, c-format
4189msgid "merges with remote %s"
4190msgstr "使用策略 %s 合并失败。\n"
4191
4192#: builtin/remote.c:1005
4193msgid " and with remote"
4194msgstr ""
4195
4196#: builtin/remote.c:1051
4197msgid "create"
4198msgstr ""
4199
4200#: builtin/remote.c:1054
4201#, fuzzy
4202msgid "delete"
4203msgstr "[已删除]"
4204
4205#: builtin/remote.c:1058
4206#, fuzzy
4207msgid "up to date"
4208msgstr "[最新]"
4209
4210#: builtin/remote.c:1061
4211#, fuzzy
4212msgid "fast-forwardable"
4213msgstr "(非快进式)"
4214
4215#: builtin/remote.c:1064
4216msgid "local out of date"
4217msgstr ""
4218
4219#: builtin/remote.c:1071
4220#, c-format
4221msgid " %-*s forces to %-*s (%s)"
4222msgstr ""
4223
4224#: builtin/remote.c:1074
4225#, c-format
4226msgid " %-*s pushes to %-*s (%s)"
4227msgstr ""
4228
4229#: builtin/remote.c:1078
4230#, c-format
4231msgid " %-*s forces to %s"
4232msgstr ""
4233
4234#: builtin/remote.c:1081
4235#, c-format
4236msgid " %-*s pushes to %s"
4237msgstr ""
4238
4239# 译者:汉字之间无空格,故删除尾部空格
4240#: builtin/remote.c:1118
4241#, fuzzy, c-format
4242msgid "* remote %s"
4243msgstr "远程"
4244
4245#: builtin/remote.c:1119
4246#, c-format
4247msgid " Fetch URL: %s"
4248msgstr ""
4249
4250#: builtin/remote.c:1120 builtin/remote.c:1285
4251msgid "(no URL)"
4252msgstr ""
4253
4254#: builtin/remote.c:1129 builtin/remote.c:1131
4255#, c-format
4256msgid " Push URL: %s"
4257msgstr ""
4258
4259#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4260#, fuzzy, c-format
4261msgid " HEAD branch: %s"
4262msgstr "HEAD(非分支)"
4263
4264#: builtin/remote.c:1139
4265#, c-format
4266msgid ""
4267" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4268msgstr ""
4269
4270#: builtin/remote.c:1151
4271#, fuzzy, c-format
4272msgid " Remote branch:%s"
4273msgid_plural " Remote branches:%s"
4274msgstr[0] "重置分支 '%s'\n"
4275
4276#: builtin/remote.c:1154 builtin/remote.c:1181
4277msgid " (status not queried)"
4278msgstr ""
4279
4280#: builtin/remote.c:1163
4281msgid " Local branch configured for 'git pull':"
4282msgid_plural " Local branches configured for 'git pull':"
4283msgstr[0] ""
4284
4285#: builtin/remote.c:1171
4286msgid " Local refs will be mirrored by 'git push'"
4287msgstr ""
4288
4289#: builtin/remote.c:1178
4290#, fuzzy, c-format
4291msgid " Local ref configured for 'git push'%s:"
4292msgid_plural " Local refs configured for 'git push'%s:"
4293msgstr[0] "尚未给分支 '%s' 设置上游"
4294
4295#: builtin/remote.c:1216
4296#, fuzzy
4297msgid "Cannot determine remote HEAD"
4298msgstr "不能解析 HEAD"
4299
4300#: builtin/remote.c:1218
4301msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4302msgstr ""
4303
4304#: builtin/remote.c:1228
4305#, fuzzy, c-format
4306msgid "Could not delete %s"
4307msgstr "不能获取 %s"
4308
4309#: builtin/remote.c:1236
4310#, fuzzy, c-format
4311msgid "Not a valid ref: %s"
4312msgstr "不是一个有效对象:%s"
4313
4314#: builtin/remote.c:1238
4315#, fuzzy, c-format
4316msgid "Could not setup %s"
4317msgstr "不能获取 %s"
4318
4319# 译者:注意保持前导空格
4320#: builtin/remote.c:1274
4321#, fuzzy, c-format
4322msgid " %s will become dangling!"
4323msgstr " (%s 将成为悬空状态)\n"
4324
4325# 译者:注意保持前导空格
4326#: builtin/remote.c:1275
4327#, fuzzy, c-format
4328msgid " %s has become dangling!"
4329msgstr " (%s 已成为悬空状态)\n"
4330
4331#: builtin/remote.c:1281
4332#, fuzzy, c-format
4333msgid "Pruning %s"
4334msgstr "推送到 %s\n"
4335
4336#: builtin/remote.c:1282
4337#, c-format
4338msgid "URL: %s"
4339msgstr ""
4340
4341#: builtin/remote.c:1295
4342#, c-format
4343msgid " * [would prune] %s"
4344msgstr ""
4345
4346#: builtin/remote.c:1298
4347#, c-format
4348msgid " * [pruned] %s"
4349msgstr ""
4350
4351#: builtin/remote.c:1387 builtin/remote.c:1461
4352#, fuzzy, c-format
4353msgid "No such remote '%s'"
4354msgstr "没有此分支:'%s'"
4355
4356#: builtin/remote.c:1414
4357#, fuzzy
4358msgid "no remote specified"
4359msgstr "未指定分支名"
4360
4361#: builtin/remote.c:1447
4362#, fuzzy
4363msgid "--add --delete doesn't make sense"
4364msgstr "--name-only 无意义"
4365
4366#: builtin/remote.c:1487
4367#, fuzzy, c-format
4368msgid "Invalid old URL pattern: %s"
4369msgstr "无效选项:%s"
4370
4371#: builtin/remote.c:1495
4372#, fuzzy, c-format
4373msgid "No such URL found: %s"
4374msgstr "没有此分支:'%s'"
4375
4376#: builtin/remote.c:1497
4377msgid "Will not delete all non-push URLs"
4378msgstr ""
4379
c04f5ac3
JX
4380#: builtin/reset.c:33
4381msgid "mixed"
4382msgstr "混杂"
4383
4384#: builtin/reset.c:33
4385msgid "soft"
4386msgstr "软性"
4387
4388#: builtin/reset.c:33
4389msgid "hard"
4390msgstr "硬性"
4391
8ada9598
JX
4392#: builtin/reset.c:33
4393msgid "merge"
4394msgstr "合并"
4395
c04f5ac3
JX
4396#: builtin/reset.c:33
4397msgid "keep"
4398msgstr "保持"
4399
4400#: builtin/reset.c:77
4401msgid "You do not have a valid HEAD."
4402msgstr "您没有一个有效的 HEAD。"
4403
4404#: builtin/reset.c:79
4405msgid "Failed to find tree of HEAD."
4406msgstr "无法找到 HEAD 指向的树。"
4407
4408#: builtin/reset.c:85
4409#, c-format
4410msgid "Failed to find tree of %s."
4411msgstr "无法找到 %s 指向的树。"
4412
4413#: builtin/reset.c:96
4414msgid "Could not write new index file."
90e6ef53 4415msgstr "不能写入新的索引文件。"
c04f5ac3
JX
4416
4417#: builtin/reset.c:106
4418#, c-format
4419msgid "HEAD is now at %s"
4420msgstr "HEAD 现在位于 %s"
4421
4422#: builtin/reset.c:130
4423msgid "Could not read index"
90e6ef53 4424msgstr "不能读取索引"
c04f5ac3
JX
4425
4426#: builtin/reset.c:133
4427msgid "Unstaged changes after reset:"
90e6ef53 4428msgstr "重置后撤出暂存区的变更:"
c04f5ac3 4429
90e6ef53 4430# 译者:汉字之间无空格,故删除%s前后空格
c04f5ac3
JX
4431#: builtin/reset.c:223
4432#, c-format
4433msgid "Cannot do a %s reset in the middle of a merge."
4434msgstr "在合并过程中不能做%s重置操作。"
4435
4436#: builtin/reset.c:297
4437#, c-format
4438msgid "Could not parse object '%s'."
4439msgstr "不能解析对象 '%s'。"
4440
4441#: builtin/reset.c:302
4442msgid "--patch is incompatible with --{hard,mixed,soft}"
4443msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
4444
4445#: builtin/reset.c:311
4446msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4447msgstr "--mixed 带路径已弃用,代之以 'git reset -- <paths>'。"
4448
90e6ef53 4449# 译者:汉字之间无空格,故删除%s前后空格
c04f5ac3
JX
4450#: builtin/reset.c:313
4451#, c-format
4452msgid "Cannot do %s reset with paths."
4453msgstr "不能带路径进行%s重置。"
4454
90e6ef53 4455# 译者:汉字之间无空格,故删除%s前后空格
c04f5ac3
JX
4456#: builtin/reset.c:325
4457#, c-format
4458msgid "%s reset is not allowed in a bare repository"
4459msgstr "不能对裸版本库进行%s重置"
4460
4461#: builtin/reset.c:341
4462#, c-format
4463msgid "Could not reset index file to revision '%s'."
90e6ef53 4464msgstr "不能重置索引文件至版本 '%s'。"
c04f5ac3 4465
170e9899 4466#: builtin/revert.c:70 builtin/revert.c:92
c04f5ac3
JX
4467#, c-format
4468msgid "%s: %s cannot be used with %s"
90e6ef53 4469msgstr "%s:%s 不能和 %s 共用"
c04f5ac3 4470
8ada9598 4471#: builtin/revert.c:131
c04f5ac3
JX
4472msgid "program error"
4473msgstr "程序错误"
4474
8ada9598 4475#: builtin/revert.c:221
c04f5ac3
JX
4476msgid "revert failed"
4477msgstr "还原失败"
4478
8ada9598 4479#: builtin/revert.c:236
c04f5ac3
JX
4480msgid "cherry-pick failed"
4481msgstr "拣选失败"
4482
4483#: builtin/rm.c:109
4484#, c-format
4485msgid ""
4486"'%s' has staged content different from both the file and the HEAD\n"
4487"(use -f to force removal)"
4488msgstr ""
90e6ef53 4489"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
c04f5ac3
JX
4490"(使用 -f 强制删除)"
4491
4492#: builtin/rm.c:115
4493#, c-format
4494msgid ""
4495"'%s' has changes staged in the index\n"
4496"(use --cached to keep the file, or -f to force removal)"
4497msgstr ""
90e6ef53 4498"'%s' 有变更已暂存至索引中\n"
c04f5ac3
JX
4499"(使用 --cached 保存文件,或用 -f 强制删除)"
4500
4501#: builtin/rm.c:119
4502#, c-format
4503msgid ""
4504"'%s' has local modifications\n"
4505"(use --cached to keep the file, or -f to force removal)"
4506msgstr ""
4507"'%s' 有本地修改\n"
4508"(使用 --cached 保存文件,或用 -f 强制删除)"
4509
4510#: builtin/rm.c:194
4511#, c-format
4512msgid "not removing '%s' recursively without -r"
4513msgstr "未提供 -r 选项不会递归删除 '%s'"
4514
4515#: builtin/rm.c:230
4516#, c-format
4517msgid "git rm: unable to remove %s"
4518msgstr "git rm:不能删除 %s"
4519
4520#: builtin/shortlog.c:157
4521#, c-format
4522msgid "Missing author: %s"
4523msgstr "缺少作者:%s"
4524
8ada9598 4525#: builtin/tag.c:60
7ac1c0ad
JX
4526#, c-format
4527msgid "malformed object at '%s'"
4528msgstr "非法的对象于 '%s'"
4529
8ada9598 4530#: builtin/tag.c:207
c04f5ac3
JX
4531#, c-format
4532msgid "tag name too long: %.*s..."
4533msgstr "tag 名字太长:%.*s..."
4534
8ada9598 4535#: builtin/tag.c:212
c04f5ac3
JX
4536#, c-format
4537msgid "tag '%s' not found."
4538msgstr "tag '%s' 未发现。"
4539
8ada9598 4540#: builtin/tag.c:227
c04f5ac3
JX
4541#, c-format
4542msgid "Deleted tag '%s' (was %s)\n"
4543msgstr "已删除 tag '%s'(曾为 %s)\n"
4544
8ada9598 4545#: builtin/tag.c:239
c04f5ac3
JX
4546#, c-format
4547msgid "could not verify the tag '%s'"
4548msgstr "不能校验 tag '%s'"
4549
8ada9598 4550#: builtin/tag.c:249
c04f5ac3
JX
4551msgid ""
4552"\n"
4553"#\n"
4554"# Write a tag message\n"
4555"# Lines starting with '#' will be ignored.\n"
4556"#\n"
4557msgstr ""
4558"\n"
4559"#\n"
4560"# 输入一个 tag 说明\n"
4561"# 以 '#' 开头的行将被忽略。\n"
4562"#\n"
4563
8ada9598 4564#: builtin/tag.c:256
c04f5ac3
JX
4565msgid ""
4566"\n"
4567"#\n"
4568"# Write a tag message\n"
4569"# Lines starting with '#' will be kept; you may remove them yourself if you "
4570"want to.\n"
4571"#\n"
4572msgstr ""
4573"\n"
4574"#\n"
4575"# 输入一个 tag 说明\n"
4576"# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
4577"#\n"
4578
8ada9598 4579#: builtin/tag.c:298
c04f5ac3
JX
4580msgid "unable to sign the tag"
4581msgstr "无法签署 tag"
4582
8ada9598 4583#: builtin/tag.c:300
c04f5ac3
JX
4584msgid "unable to write tag file"
4585msgstr "无法写 tag 文件"
4586
8ada9598 4587#: builtin/tag.c:325
c04f5ac3 4588msgid "bad object type."
90e6ef53 4589msgstr "坏的对象类型。"
c04f5ac3 4590
8ada9598 4591#: builtin/tag.c:338
c04f5ac3 4592msgid "tag header too big."
90e6ef53 4593msgstr "tag 头信息太大。"
c04f5ac3 4594
8ada9598 4595#: builtin/tag.c:370
c04f5ac3
JX
4596msgid "no tag message?"
4597msgstr "无 tag 说明?"
4598
8ada9598 4599#: builtin/tag.c:376
c04f5ac3
JX
4600#, c-format
4601msgid "The tag message has been left in %s\n"
4602msgstr "tag 说明被保留在 %s\n"
4603
8ada9598 4604#: builtin/tag.c:425
7ac1c0ad
JX
4605msgid "switch 'points-at' requires an object"
4606msgstr "开关 'points-at' 需要一个对象"
4607
8ada9598 4608#: builtin/tag.c:427
7ac1c0ad
JX
4609#, c-format
4610msgid "malformed object name '%s'"
4611msgstr "非法的对象名 '%s'"
4612
8ada9598
JX
4613#: builtin/tag.c:506
4614#, fuzzy
4615msgid "--column and -n are incompatible"
4616msgstr "--all 和 --tags 不兼容"
4617
4618#: builtin/tag.c:523
c04f5ac3
JX
4619msgid "-n option is only allowed with -l."
4620msgstr "-n 选项只允许和 -l 共用。"
4621
8ada9598 4622#: builtin/tag.c:525
c04f5ac3
JX
4623msgid "--contains option is only allowed with -l."
4624msgstr "--contains 选项只允许和 -l 共用。"
4625
8ada9598 4626#: builtin/tag.c:527
7ac1c0ad
JX
4627msgid "--points-at option is only allowed with -l."
4628msgstr "--points-at 选项只允许和 -l 共用。"
4629
8ada9598 4630#: builtin/tag.c:535
c04f5ac3
JX
4631msgid "only one -F or -m option is allowed."
4632msgstr "只允许一个 -F 或 -m 选项。"
4633
8ada9598 4634#: builtin/tag.c:555
c04f5ac3
JX
4635msgid "too many params"
4636msgstr "太多参数"
4637
8ada9598 4638#: builtin/tag.c:561
c04f5ac3
JX
4639#, c-format
4640msgid "'%s' is not a valid tag name."
90e6ef53 4641msgstr "'%s' 不是一个有效的tag名称。"
c04f5ac3 4642
8ada9598 4643#: builtin/tag.c:566
c04f5ac3
JX
4644#, c-format
4645msgid "tag '%s' already exists"
4646msgstr "tag '%s' 已存在"
4647
8ada9598 4648#: builtin/tag.c:584
c04f5ac3
JX
4649#, c-format
4650msgid "%s: cannot lock the ref"
4651msgstr "%s:不能锁定引用"
4652
8ada9598 4653#: builtin/tag.c:586
c04f5ac3
JX
4654#, c-format
4655msgid "%s: cannot update the ref"
4656msgstr "%s:不能更新引用"
4657
8ada9598 4658#: builtin/tag.c:588
c04f5ac3
JX
4659#, c-format
4660msgid "Updated tag '%s' (was %s)\n"
4661msgstr "已更新tag '%s'(曾为 %s)\n"
4662
8ada9598
JX
4663#: git.c:16
4664msgid "See 'git help <command>' for more information on a specific command."
4665msgstr ""
4666
4667#: parse-options.h:133 parse-options.h:235
4668msgid "n"
4669msgstr ""
4670
4671#: parse-options.h:141
4672msgid "time"
4673msgstr ""
4674
4675#: parse-options.h:149
4676#, fuzzy
4677msgid "file"
4678msgstr "%s文件:"
4679
4680#: parse-options.h:151
4681msgid "when"
4682msgstr ""
4683
4684#: parse-options.h:156
4685msgid "no-op (backward compatibility)"
4686msgstr ""
4687
4688#: parse-options.h:228
4689msgid "be more verbose"
4690msgstr ""
4691
4692#: parse-options.h:230
4693msgid "be more quiet"
4694msgstr ""
4695
4696#: parse-options.h:236
4697msgid "use <n> digits to display SHA-1s"
4698msgstr ""
4699
4700#: common-cmds.h:8
4701msgid "Add file contents to the index"
4702msgstr ""
4703
4704#: common-cmds.h:9
4705msgid "Find by binary search the change that introduced a bug"
4706msgstr ""
4707
4708#: common-cmds.h:10
4709#, fuzzy
4710msgid "List, create, or delete branches"
4711msgstr "无法变基到多个分支"
4712
4713#: common-cmds.h:11
4714msgid "Checkout a branch or paths to the working tree"
4715msgstr ""
4716
4717#: common-cmds.h:12
4718#, fuzzy
4719msgid "Clone a repository into a new directory"
4720msgstr "引用版本库 '%s' 不是一个本地目录。"
4721
4722#: common-cmds.h:13
4723#, fuzzy
4724msgid "Record changes to the repository"
4725msgstr "不是一个 git 版本库"
4726
4727#: common-cmds.h:14
4728msgid "Show changes between commits, commit and working tree, etc"
4729msgstr ""
4730
4731#: common-cmds.h:15
4732msgid "Download objects and refs from another repository"
4733msgstr ""
4734
4735#: common-cmds.h:16
4736msgid "Print lines matching a pattern"
4737msgstr ""
4738
4739#: common-cmds.h:17
4740msgid "Create an empty git repository or reinitialize an existing one"
4741msgstr ""
4742
4743#: common-cmds.h:18
4744#, fuzzy
4745msgid "Show commit logs"
4746msgstr "未知提交 %s"
4747
4748#: common-cmds.h:19
4749msgid "Join two or more development histories together"
4750msgstr ""
4751
4752#: common-cmds.h:20
4753msgid "Move or rename a file, a directory, or a symlink"
4754msgstr ""
4755
4756#: common-cmds.h:21
4757msgid "Fetch from and merge with another repository or a local branch"
4758msgstr ""
4759
4760#: common-cmds.h:22
4761msgid "Update remote refs along with associated objects"
4762msgstr ""
4763
4764#: common-cmds.h:23
4765msgid "Forward-port local commits to the updated upstream head"
4766msgstr ""
4767
4768#: common-cmds.h:24
4769msgid "Reset current HEAD to the specified state"
4770msgstr ""
4771
4772#: common-cmds.h:25
4773msgid "Remove files from the working tree and from the index"
4774msgstr ""
4775
4776#: common-cmds.h:26
4777msgid "Show various types of objects"
4778msgstr ""
4779
4780#: common-cmds.h:27
4781#, fuzzy
4782msgid "Show the working tree status"
4783msgstr "不能记录工作区状态"
4784
4785#: common-cmds.h:28
4786msgid "Create, list, delete or verify a tag object signed with GPG"
4787msgstr ""
4788
170e9899 4789#: git-am.sh:50
c04f5ac3
JX
4790msgid "You need to set your committer info first"
4791msgstr "您需要先设置你的提交者信息"
4792
170e9899 4793#: git-am.sh:137
c04f5ac3
JX
4794msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4795msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
4796
170e9899 4797#: git-am.sh:154
c04f5ac3
JX
4798msgid ""
4799"Did you hand edit your patch?\n"
4800"It does not apply to blobs recorded in its index."
4801msgstr ""
4802"您是否曾手动编辑过您的补丁?\n"
90e6ef53 4803"无法应用补丁到索引中的数据上。"
c04f5ac3 4804
170e9899 4805#: git-am.sh:163
c04f5ac3 4806msgid "Falling back to patching base and 3-way merge..."
90e6ef53 4807msgstr "回退到补丁基础版本并使用三路合并..."
c04f5ac3 4808
170e9899 4809#: git-am.sh:275
c04f5ac3
JX
4810msgid "Only one StGIT patch series can be applied at once"
4811msgstr "一次只能有一个 StGIT 补丁队列被应用"
4812
170e9899 4813#: git-am.sh:362
c04f5ac3
JX
4814#, sh-format
4815msgid "Patch format $patch_format is not supported."
4816msgstr "不支持 $patch_format 补丁格式。"
4817
170e9899 4818#: git-am.sh:364
c04f5ac3
JX
4819msgid "Patch format detection failed."
4820msgstr "补丁格式检测失败。"
4821
170e9899 4822#: git-am.sh:418
c04f5ac3
JX
4823msgid "-d option is no longer supported. Do not use."
4824msgstr "不再支持 -d 选项。不要使用。"
4825
170e9899 4826#: git-am.sh:481
c04f5ac3
JX
4827#, sh-format
4828msgid "previous rebase directory $dotest still exists but mbox given."
4829msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
4830
170e9899 4831#: git-am.sh:486
c04f5ac3
JX
4832msgid "Please make up your mind. --skip or --abort?"
4833msgstr "请下决心。--skip 或是 --abort ?"
4834
170e9899 4835#: git-am.sh:513
c04f5ac3
JX
4836msgid "Resolve operation not in progress, we are not resuming."
4837msgstr "解决操作未进行,我们不会继续。"
4838
170e9899 4839#: git-am.sh:579
c04f5ac3
JX
4840#, sh-format
4841msgid "Dirty index: cannot apply patches (dirty: $files)"
90e6ef53 4842msgstr "脏的索引:不能应用补丁(脏文件:$files)"
c04f5ac3 4843
170e9899 4844#: git-am.sh:755
c04f5ac3 4845msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 4846msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 4847
90e6ef53 4848# 译者:注意保持句尾空格
c04f5ac3
JX
4849#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4850#. in your translation. The program will only accept English
4851#. input at this point.
170e9899 4852#: git-am.sh:766
c04f5ac3
JX
4853msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4854msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4855
170e9899 4856#: git-am.sh:802
c04f5ac3
JX
4857#, sh-format
4858msgid "Applying: $FIRSTLINE"
4859msgstr "正应用:$FIRSTLINE"
4860
170e9899 4861#: git-am.sh:847
c04f5ac3
JX
4862msgid "No changes -- Patch already applied."
4863msgstr "没有变更 -- 补丁已经应用过。"
4864
170e9899 4865#: git-am.sh:873
c04f5ac3
JX
4866msgid "applying to an empty history"
4867msgstr "正应用到一个空历史上"
4868
90e6ef53 4869# 译者:注意保持句尾空格
c04f5ac3
JX
4870#. TRANSLATORS: Make sure to include [Y] and [n] in your
4871#. translation. The program will only accept English input
4872#. at this point.
4873#: git-bisect.sh:54
4874msgid "Do you want me to do it for you [Y/n]? "
4875msgstr "您想让我为您这样做么[Y/n]? "
4876
4877#: git-bisect.sh:95
4878#, sh-format
4879msgid "unrecognised option: '$arg'"
4880msgstr "未识别的选项:'$arg'"
4881
4882#: git-bisect.sh:99
4883#, sh-format
4884msgid "'$arg' does not appear to be a valid revision"
4885msgstr "'$arg' 看起来不像是一个有效的版本"
4886
4887#: git-bisect.sh:117
4888msgid "Bad HEAD - I need a HEAD"
4889msgstr "坏的 HEAD - 我需要一个 HEAD"
4890
4891#: git-bisect.sh:130
4892#, sh-format
4893msgid ""
4894"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
4895msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
4896
4897#: git-bisect.sh:140
4898msgid "won't bisect on seeked tree"
4899msgstr "不会在已查找过的树上二分查找"
4900
4901#: git-bisect.sh:144
4902msgid "Bad HEAD - strange symbolic ref"
90e6ef53 4903msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
4904
4905#: git-bisect.sh:189
4906#, sh-format
4907msgid "Bad bisect_write argument: $state"
90e6ef53 4908msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
4909
4910#: git-bisect.sh:218
4911#, sh-format
4912msgid "Bad rev input: $arg"
90e6ef53 4913msgstr "输入坏的版本:$arg"
c04f5ac3
JX
4914
4915#: git-bisect.sh:232
4916msgid "Please call 'bisect_state' with at least one argument."
4917msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
4918
4919#: git-bisect.sh:244
4920#, sh-format
4921msgid "Bad rev input: $rev"
4922msgstr "输入坏的版本:$rev"
4923
4924#: git-bisect.sh:250
4925msgid "'git bisect bad' can take only one argument."
4926msgstr "'git bisect bad' 只能带一个参数。"
4927
90e6ef53 4928# 译者:注意保持句尾空格
c04f5ac3
JX
4929#. TRANSLATORS: Make sure to include [Y] and [n] in your
4930#. translation. The program will only accept English input
4931#. at this point.
4932#: git-bisect.sh:279
4933msgid "Are you sure [Y/n]? "
4934msgstr "您确认么[Y/n]? "
4935
4936#: git-bisect.sh:354
4937#, sh-format
4938msgid "'$invalid' is not a valid commit"
4939msgstr "'$invalid' 不是一个有效的提交"
4940
4941#: git-bisect.sh:363
4942#, sh-format
4943msgid ""
4944"Could not check out original HEAD '$branch'.\n"
4945"Try 'git bisect reset <commit>'."
4946msgstr ""
4947"不能检出原始 HEAD '$branch'。\n"
4948"尝试 'git bisect reset <commit>'。"
4949
4950#: git-bisect.sh:390
4951msgid "No logfile given"
4952msgstr "未提供日志文件"
4953
4954#: git-bisect.sh:391
4955#, sh-format
4956msgid "cannot read $file for replaying"
4957msgstr "不能读取 $file 来重放"
4958
4959#: git-bisect.sh:408
4960msgid "?? what are you talking about?"
4961msgstr "?? 您在说什么?"
4962
4963#: git-bisect.sh:474
4964msgid "We are not bisecting."
90e6ef53 4965msgstr "我们没有在二分查找。"
c04f5ac3
JX
4966
4967#: git-pull.sh:21
4968msgid ""
4969"Pull is not possible because you have unmerged files.\n"
4970"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
4971"as appropriate to mark resolution, or use 'git commit -a'."
4972msgstr ""
90e6ef53 4973"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
c04f5ac3 4974"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
90e6ef53 4975"或者使用 'git commit -a'。"
c04f5ac3
JX
4976
4977#: git-pull.sh:25
4978msgid "Pull is not possible because you have unmerged files."
90e6ef53 4979msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 4980
7ac1c0ad 4981#: git-pull.sh:197
c04f5ac3 4982msgid "updating an unborn branch with changes added to the index"
90e6ef53 4983msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 4984
7ac1c0ad 4985#: git-pull.sh:253
c04f5ac3
JX
4986msgid "Cannot merge multiple branches into empty head"
4987msgstr "无法将多个分支合并到空分支"
4988
7ac1c0ad 4989#: git-pull.sh:257
c04f5ac3
JX
4990msgid "Cannot rebase onto multiple branches"
4991msgstr "无法变基到多个分支"
4992
4993#: git-stash.sh:51
4994msgid "git stash clear with parameters is unimplemented"
4995msgstr "git stash clear 不支持参数"
4996
4997#: git-stash.sh:74
4998msgid "You do not have the initial commit yet"
4999msgstr "您尚未建立初始提交"
5000
5001#: git-stash.sh:89
5002msgid "Cannot save the current index state"
90e6ef53 5003msgstr "无法保存当前索引状态"
c04f5ac3
JX
5004
5005#: git-stash.sh:123 git-stash.sh:136
5006msgid "Cannot save the current worktree state"
5007msgstr "无法保存当前工作区状态"
5008
5009#: git-stash.sh:140
5010msgid "No changes selected"
90e6ef53 5011msgstr "没有选择变更"
c04f5ac3
JX
5012
5013#: git-stash.sh:143
5014msgid "Cannot remove temporary index (can't happen)"
90e6ef53 5015msgstr "无法删除临时索引(不应发生)"
c04f5ac3
JX
5016
5017#: git-stash.sh:156
5018msgid "Cannot record working tree state"
5019msgstr "不能记录工作区状态"
5020
5021#: git-stash.sh:223
5022msgid "No local changes to save"
5023msgstr "没有要保存的本地修改"
5024
5025#: git-stash.sh:227
5026msgid "Cannot initialize stash"
90e6ef53 5027msgstr "无法初始化 stash"
c04f5ac3
JX
5028
5029#: git-stash.sh:235
5030msgid "Cannot save the current status"
5031msgstr "无法保存当前状态"
5032
5033#: git-stash.sh:253
5034msgid "Cannot remove worktree changes"
5035msgstr "无法删除工作区变更"
5036
5037#: git-stash.sh:352
5038msgid "No stash found."
90e6ef53 5039msgstr "未发现 stash。"
c04f5ac3
JX
5040
5041#: git-stash.sh:359
5042#, sh-format
5043msgid "Too many revisions specified: $REV"
90e6ef53 5044msgstr "指定了太多的版本:$REV"
c04f5ac3
JX
5045
5046#: git-stash.sh:365
5047#, sh-format
5048msgid "$reference is not valid reference"
5049msgstr "$reference 不是有效的引用"
5050
5051#: git-stash.sh:393
5052#, sh-format
5053msgid "'$args' is not a stash-like commit"
90e6ef53 5054msgstr "'$args' 不是 stash 样提交"
c04f5ac3
JX
5055
5056#: git-stash.sh:404
5057#, sh-format
5058msgid "'$args' is not a stash reference"
90e6ef53 5059msgstr "'$args' 不是一个 stash 引用"
c04f5ac3
JX
5060
5061#: git-stash.sh:412
5062msgid "unable to refresh index"
90e6ef53 5063msgstr "无法刷新索引"
c04f5ac3
JX
5064
5065#: git-stash.sh:416
5066msgid "Cannot apply a stash in the middle of a merge"
5067msgstr "无法在合并过程中恢复进度"
5068
5069#: git-stash.sh:424
5070msgid "Conflicts in index. Try without --index."
90e6ef53 5071msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3
JX
5072
5073#: git-stash.sh:426
5074msgid "Could not save index tree"
90e6ef53 5075msgstr "不能保存索引树"
c04f5ac3
JX
5076
5077#: git-stash.sh:460
5078msgid "Cannot unstage modified files"
5079msgstr "无法还原修改的文件"
5080
5081#: git-stash.sh:491
5082#, sh-format
5083msgid "Dropped ${REV} ($s)"
5084msgstr "丢弃了 ${REV} ($s)"
5085
5086#: git-stash.sh:492
5087#, sh-format
5088msgid "${REV}: Could not drop stash entry"
90e6ef53 5089msgstr "${REV}:不能丢弃进度条目"
c04f5ac3
JX
5090
5091#: git-stash.sh:499
5092msgid "No branch name specified"
5093msgstr "未指定分支名"
5094
5095#: git-stash.sh:570
5096msgid "(To restore them type \"git stash apply\")"
5097msgstr "(为恢复数据输入 \"git stash apply\")"
5098
5099#: git-submodule.sh:56
5100#, sh-format
5101msgid "cannot strip one component off url '$remoteurl'"
5102msgstr "无法从 url '$remoteurl' 剥离一个组件"
5103
170e9899 5104#: git-submodule.sh:109
c04f5ac3 5105#, sh-format
170e9899
JX
5106msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5107msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 5108
170e9899 5109#: git-submodule.sh:150
c04f5ac3 5110#, sh-format
170e9899
JX
5111msgid "Clone of '$url' into submodule path '$sm_path' failed"
5112msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 5113
170e9899 5114#: git-submodule.sh:160
dac1de7d
JX
5115#, sh-format
5116msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5117msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
5118
8ada9598 5119#: git-submodule.sh:249
c04f5ac3
JX
5120#, sh-format
5121msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5122msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
5123
8ada9598 5124#: git-submodule.sh:266
c04f5ac3 5125#, sh-format
170e9899
JX
5126msgid "'$sm_path' already exists in the index"
5127msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 5128
8ada9598 5129#: git-submodule.sh:283
c04f5ac3 5130#, sh-format
170e9899
JX
5131msgid "'$sm_path' already exists and is not a valid git repo"
5132msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
c04f5ac3 5133
8ada9598 5134#: git-submodule.sh:297
c04f5ac3 5135#, sh-format
170e9899
JX
5136msgid "Unable to checkout submodule '$sm_path'"
5137msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 5138
8ada9598 5139#: git-submodule.sh:302
c04f5ac3 5140#, sh-format
170e9899
JX
5141msgid "Failed to add submodule '$sm_path'"
5142msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 5143
8ada9598 5144#: git-submodule.sh:307
c04f5ac3 5145#, sh-format
170e9899
JX
5146msgid "Failed to register submodule '$sm_path'"
5147msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 5148
8ada9598 5149#: git-submodule.sh:349
c04f5ac3 5150#, sh-format
170e9899
JX
5151msgid "Entering '$prefix$sm_path'"
5152msgstr "正在进入 '$prefix$sm_path'"
c04f5ac3 5153
8ada9598 5154#: git-submodule.sh:363
c04f5ac3 5155#, sh-format
170e9899
JX
5156msgid "Stopping at '$sm_path'; script returned non-zero status."
5157msgstr "停止于 '$sm_path',脚本返回非零值。"
c04f5ac3 5158
8ada9598 5159#: git-submodule.sh:405
c04f5ac3 5160#, sh-format
170e9899
JX
5161msgid "No url found for submodule path '$sm_path' in .gitmodules"
5162msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
c04f5ac3 5163
8ada9598 5164#: git-submodule.sh:414
c04f5ac3 5165#, sh-format
170e9899
JX
5166msgid "Failed to register url for submodule path '$sm_path'"
5167msgstr "无法为子模组路径 '$sm_path' 注册 url"
c04f5ac3 5168
8ada9598 5169#: git-submodule.sh:422
c04f5ac3 5170#, sh-format
170e9899
JX
5171msgid "Failed to register update mode for submodule path '$sm_path'"
5172msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
c04f5ac3 5173
8ada9598 5174#: git-submodule.sh:424
c04f5ac3 5175#, sh-format
170e9899
JX
5176msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5177msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
c04f5ac3 5178
8ada9598 5179#: git-submodule.sh:523
c04f5ac3
JX
5180#, sh-format
5181msgid ""
170e9899 5182"Submodule path '$sm_path' not initialized\n"
c04f5ac3
JX
5183"Maybe you want to use 'update --init'?"
5184msgstr ""
170e9899 5185"子模组路径 '$sm_path' 没有初始化\n"
90e6ef53 5186"也许您想用 'update --init'?"
c04f5ac3 5187
8ada9598 5188#: git-submodule.sh:536
c04f5ac3 5189#, sh-format
170e9899
JX
5190msgid "Unable to find current revision in submodule path '$sm_path'"
5191msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
c04f5ac3 5192
8ada9598 5193#: git-submodule.sh:555
c04f5ac3 5194#, sh-format
170e9899
JX
5195msgid "Unable to fetch in submodule path '$sm_path'"
5196msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 5197
8ada9598 5198#: git-submodule.sh:569
c04f5ac3 5199#, sh-format
170e9899
JX
5200msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5201msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
c04f5ac3 5202
8ada9598 5203#: git-submodule.sh:570
c04f5ac3 5204#, sh-format
170e9899
JX
5205msgid "Submodule path '$sm_path': rebased into '$sha1'"
5206msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
c04f5ac3 5207
8ada9598 5208#: git-submodule.sh:575
c04f5ac3 5209#, sh-format
170e9899
JX
5210msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5211msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
c04f5ac3 5212
8ada9598 5213#: git-submodule.sh:576
c04f5ac3 5214#, sh-format
170e9899
JX
5215msgid "Submodule path '$sm_path': merged in '$sha1'"
5216msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
c04f5ac3 5217
8ada9598 5218#: git-submodule.sh:581
c04f5ac3 5219#, sh-format
170e9899
JX
5220msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5221msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
c04f5ac3 5222
8ada9598 5223#: git-submodule.sh:582
c04f5ac3 5224#, sh-format
170e9899
JX
5225msgid "Submodule path '$sm_path': checked out '$sha1'"
5226msgstr "子模组路径 '$sm_path':检出 '$sha1'"
c04f5ac3 5227
8ada9598 5228#: git-submodule.sh:604 git-submodule.sh:927
c04f5ac3 5229#, sh-format
170e9899
JX
5230msgid "Failed to recurse into submodule path '$sm_path'"
5231msgstr "无法递归进子模组路径 '$sm_path'"
c04f5ac3 5232
8ada9598 5233#: git-submodule.sh:712
c04f5ac3
JX
5234msgid "--"
5235msgstr "--"
5236
90e6ef53 5237# 译者:注意保持前导空格
8ada9598 5238#: git-submodule.sh:770
c04f5ac3
JX
5239#, sh-format
5240msgid " Warn: $name doesn't contain commit $sha1_src"
5241msgstr " 警告:$name 未包含提交 $sha1_src"
5242
90e6ef53 5243# 译者:注意保持前导空格
8ada9598 5244#: git-submodule.sh:773
c04f5ac3
JX
5245#, sh-format
5246msgid " Warn: $name doesn't contain commit $sha1_dst"
5247msgstr " 警告:$name 未包含提交 $sha1_dst"
5248
90e6ef53 5249# 译者:注意保持前导空格
8ada9598 5250#: git-submodule.sh:776
c04f5ac3
JX
5251#, sh-format
5252msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5253msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
5254
8ada9598 5255#: git-submodule.sh:801
c04f5ac3
JX
5256msgid "blob"
5257msgstr "blob"
5258
8ada9598 5259#: git-submodule.sh:802
c04f5ac3
JX
5260msgid "submodule"
5261msgstr "子模组"
5262
8ada9598 5263#: git-submodule.sh:973
c04f5ac3
JX
5264#, sh-format
5265msgid "Synchronizing submodule url for '$name'"
90e6ef53 5266msgstr "为 '$name' 同步子模组 url"
eff6d3a9 5267
8ada9598
JX
5268#~ msgid "cherry-pick"
5269#~ msgstr "拣选"
5270
5271#~ msgid "Please enter the commit message for your changes."
5272#~ msgstr "请为您的修改输入提交说明。"
5273
eff6d3a9
JX
5274#~ msgid "Too many options specified"
5275#~ msgstr "指定了太多的选项"