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