i18n: fix auto detection of gettext scheme for shell scripts
[git/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-02-28 09:17+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:34
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:64
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 #: commit.c:47
46 #, c-format
47 msgid "could not parse %s"
48 msgstr "不能解析 %s"
49
50 #: commit.c:49
51 #, c-format
52 msgid "%s %s is not a commit!"
53 msgstr "%s %s 不是一个提交!"
54
55 #: compat/obstack.c:406 compat/obstack.c:408
56 msgid "memory exhausted"
57 msgstr "内存耗尽"
58
59 #: connected.c:39
60 msgid "Could not run 'git rev-list'"
61 msgstr "不能执行 'git rev-list'"
62
63 #: connected.c:48
64 #, c-format
65 msgid "failed write to rev-list: %s"
66 msgstr "无法写入 rev-list:%s"
67
68 #: connected.c:56
69 #, c-format
70 msgid "failed to close rev-list's stdin: %s"
71 msgstr "无法关闭 rev-list 的标准输入:%s"
72
73 # 注意保持前导空格
74 #: diff.c:104
75 #, c-format
76 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
77 msgstr " 无法解析 dirstat 阈值 '%.*s'\n"
78
79 # 注意保持前导空格
80 #: diff.c:109
81 #, c-format
82 msgid " Unknown dirstat parameter '%.*s'\n"
83 msgstr " 未知 dirstat 参数 '%.*s'\n"
84
85 #: diff.c:205
86 #, c-format
87 msgid ""
88 "Found errors in 'diff.dirstat' config variable:\n"
89 "%s"
90 msgstr ""
91 "配置变量 'diff.dirstat' 出错:\n"
92 "%s"
93
94 #: diff.c:1331
95 msgid " 0 files changed\n"
96 msgstr "0 个文件被修改\n"
97
98 #: diff.c:1335
99 #, c-format
100 msgid " %d file changed"
101 msgid_plural " %d files changed"
102 msgstr[0] " %d 个文件被修改"
103
104 #: diff.c:1352
105 #, c-format
106 msgid ", %d insertion(+)"
107 msgid_plural ", %d insertions(+)"
108 msgstr[0] ",%d 行插入(+)"
109
110 #: diff.c:1363
111 #, c-format
112 msgid ", %d deletion(-)"
113 msgid_plural ", %d deletions(-)"
114 msgstr[0] ",%d 行删除(-)"
115
116 #: diff.c:3364
117 #, c-format
118 msgid ""
119 "Failed to parse --dirstat/-X option parameter:\n"
120 "%s"
121 msgstr ""
122 "无法解析 --dirstat/-X 选项的参数:\n"
123 "%s"
124
125 #: gpg-interface.c:59
126 msgid "could not run gpg."
127 msgstr "不能执行 gpg。"
128
129 #: gpg-interface.c:71
130 msgid "gpg did not accept the data"
131 msgstr "gpg 没有接受数据"
132
133 #: gpg-interface.c:82
134 msgid "gpg failed to sign the data"
135 msgstr "gpg 无法为数据签名"
136
137 #: grep.c:1285
138 #, c-format
139 msgid "'%s': unable to read %s"
140 msgstr "'%s':无法读取 %s"
141
142 #: grep.c:1302
143 #, c-format
144 msgid "'%s': %s"
145 msgstr "'%s':%s"
146
147 #: grep.c:1313
148 #, c-format
149 msgid "'%s': short read %s"
150 msgstr "'%s':读取不完整 %s"
151
152 #: help.c:287
153 #, c-format
154 msgid ""
155 "'%s' appears to be a git command, but we were not\n"
156 "able to execute it. Maybe git-%s is broken?"
157 msgstr ""
158 "'%s' 像是一个 git 命令,但却无法运行。\n"
159 "可能是 git-%s 受损?"
160
161 #: remote.c:1607
162 #, c-format
163 msgid "Your branch is ahead of '%s' by %d commit.\n"
164 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
165 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
166
167 #: remote.c:1613
168 #, c-format
169 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
170 msgid_plural ""
171 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
172 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,且可以快进。\n"
173
174 #: remote.c:1621
175 #, c-format
176 msgid ""
177 "Your branch and '%s' have diverged,\n"
178 "and have %d and %d different commit each, respectively.\n"
179 msgid_plural ""
180 "Your branch and '%s' have diverged,\n"
181 "and have %d and %d different commits each, respectively.\n"
182 msgstr[0] ""
183 "您的分支和 '%s' 出现了偏离,\n"
184 "并且各自分别有 %d 和 %d 处不同的提交。\n"
185
186 #: sequencer.c:120 builtin/merge.c:862 builtin/merge.c:983
187 #: builtin/merge.c:1093 builtin/merge.c:1103
188 #, c-format
189 msgid "Could not open '%s' for writing"
190 msgstr "无法打开 '%s' 以写入"
191
192 #: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865
193 #: builtin/merge.c:1095 builtin/merge.c:1108
194 #, c-format
195 msgid "Could not write to '%s'"
196 msgstr "无法写入 '%s'"
197
198 #: sequencer.c:142
199 msgid ""
200 "after resolving the conflicts, mark the corrected paths\n"
201 "with 'git add <paths>' or 'git rm <paths>'\n"
202 "and commit the result with 'git commit'"
203 msgstr ""
204 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
205 "对修正后的文件做标记,然后用 'git commit' 提交"
206
207 #: sequencer.c:154 sequencer.c:680 sequencer.c:763
208 #, c-format
209 msgid "Could not write to %s"
210 msgstr "不能写入 %s"
211
212 #: sequencer.c:157
213 #, c-format
214 msgid "Error wrapping up %s"
215 msgstr "错误收尾 %s"
216
217 #: sequencer.c:172
218 msgid "Your local changes would be overwritten by cherry-pick."
219 msgstr "您的本地修改将被拣选操作覆盖。"
220
221 #: sequencer.c:174
222 msgid "Your local changes would be overwritten by revert."
223 msgstr "您的本地修改将被还原操作覆盖。"
224
225 #: sequencer.c:177
226 msgid "Commit your changes or stash them to proceed."
227 msgstr "提交您的修改或保存进度后再继续。"
228
229 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
230 #: sequencer.c:227
231 #, c-format
232 msgid "%s: Unable to write new index file"
233 msgstr "%s:无法写入新暂存区文件"
234
235 #: sequencer.c:293
236 msgid "Your index file is unmerged."
237 msgstr "您的暂存区文件未完成合并。"
238
239 #: sequencer.c:296
240 msgid "You do not have a valid HEAD"
241 msgstr "您没有一个有效的 HEAD"
242
243 #: sequencer.c:311
244 #, c-format
245 msgid "Commit %s is a merge but no -m option was given."
246 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
247
248 #: sequencer.c:319
249 #, c-format
250 msgid "Commit %s does not have parent %d"
251 msgstr "提交 %s 没有父提交 %d"
252
253 #: sequencer.c:323
254 #, c-format
255 msgid "Mainline was specified but commit %s is not a merge."
256 msgstr "提供了主线但提交 %s 不是一个合并。"
257
258 #. TRANSLATORS: The first %s will be "revert" or
259 #. "cherry-pick", the second %s a SHA1
260 #: sequencer.c:334
261 #, c-format
262 msgid "%s: cannot parse parent commit %s"
263 msgstr "%s:不能解析父提交 %s"
264
265 #: sequencer.c:338
266 #, c-format
267 msgid "Cannot get commit message for %s"
268 msgstr "不能得到 %s 的提交说明"
269
270 #: sequencer.c:422
271 #, c-format
272 msgid "could not revert %s... %s"
273 msgstr "不能还原 %s... %s"
274
275 #: sequencer.c:423
276 #, c-format
277 msgid "could not apply %s... %s"
278 msgstr "不能应用 %s... %s"
279
280 #: sequencer.c:445 sequencer.c:904 builtin/log.c:286 builtin/log.c:709
281 #: builtin/log.c:1325 builtin/log.c:1544 builtin/merge.c:348
282 #: builtin/shortlog.c:181
283 msgid "revision walk setup failed"
284 msgstr "版本遍历设置失败"
285
286 #: sequencer.c:448
287 msgid "empty commit set passed"
288 msgstr "提供了空的提交集"
289
290 #: sequencer.c:456
291 #, c-format
292 msgid "git %s: failed to read the index"
293 msgstr "git %s: 无法读取暂存区"
294
295 #: sequencer.c:461
296 #, c-format
297 msgid "git %s: failed to refresh the index"
298 msgstr "git %s: 无法刷新暂存区"
299
300 #: sequencer.c:546
301 #, c-format
302 msgid "Cannot %s during a %s"
303 msgstr "无法 %s 在 %s 过程中"
304
305 #: sequencer.c:568
306 #, c-format
307 msgid "Could not parse line %d."
308 msgstr "无法解析第 %d 行。"
309
310 #: sequencer.c:573
311 msgid "No commits parsed."
312 msgstr "未有提交被解析。"
313
314 #: sequencer.c:586
315 #, c-format
316 msgid "Could not open %s"
317 msgstr "不能打开 %s"
318
319 #: sequencer.c:590
320 #, c-format
321 msgid "Could not read %s."
322 msgstr "不能读取 %s。"
323
324 #: sequencer.c:597
325 #, c-format
326 msgid "Unusable instruction sheet: %s"
327 msgstr "无用的指令表单:%s"
328
329 #: sequencer.c:625
330 #, c-format
331 msgid "Invalid key: %s"
332 msgstr "无效键名:%s"
333
334 #: sequencer.c:628
335 #, c-format
336 msgid "Invalid value for %s: %s"
337 msgstr "无效的 %s 值:%s"
338
339 #: sequencer.c:640
340 #, c-format
341 msgid "Malformed options sheet: %s"
342 msgstr "非法的选项表单:%s"
343
344 #: sequencer.c:661
345 msgid "a cherry-pick or revert is already in progress"
346 msgstr "一个拣选或还原操作已在进行"
347
348 #: sequencer.c:662
349 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
350 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
351
352 #: sequencer.c:666
353 #, c-format
354 msgid "Could not create sequencer directory %s"
355 msgstr "无法创建序列目录 %s"
356
357 #: sequencer.c:682 sequencer.c:767
358 #, c-format
359 msgid "Error wrapping up %s."
360 msgstr "错误收尾 %s。"
361
362 #: sequencer.c:701 sequencer.c:835
363 msgid "no cherry-pick or revert in progress"
364 msgstr "没有拣选或还原操作在进行"
365
366 #: sequencer.c:703
367 msgid "cannot resolve HEAD"
368 msgstr "不能解析 HEAD"
369
370 #: sequencer.c:705
371 msgid "cannot abort from a branch yet to be born"
372 msgstr "不能从未初始分支终止"
373
374 #: sequencer.c:727
375 #, c-format
376 msgid "cannot open %s: %s"
377 msgstr "不能打开 %s:%s"
378
379 #: sequencer.c:730
380 #, c-format
381 msgid "cannot read %s: %s"
382 msgstr "不能读取 %s:%s"
383
384 #: sequencer.c:731
385 msgid "unexpected end of file"
386 msgstr "未预期的文件结束"
387
388 #: sequencer.c:737
389 #, c-format
390 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
391 msgstr "保存预拣选提交的 HEAD 文件 '%s' 损坏"
392
393 #: sequencer.c:760
394 #, c-format
395 msgid "Could not format %s."
396 msgstr "不能格式化 %s。"
397
398 #: sequencer.c:922
399 msgid "Can't revert as initial commit"
400 msgstr "不能作为初始提交还原"
401
402 #: sequencer.c:923
403 msgid "Can't cherry-pick into empty head"
404 msgstr "不能拣选到空分支"
405
406 #: wt-status.c:134
407 msgid "Unmerged paths:"
408 msgstr "未合并的路径:"
409
410 # 注意保持前导空格
411 #: wt-status.c:140 wt-status.c:157
412 #, c-format
413 msgid " (use \"git reset %s <file>...\" to unstage)"
414 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
415
416 # 注意保持前导空格
417 #: wt-status.c:142 wt-status.c:159
418 msgid " (use \"git rm --cached <file>...\" to unstage)"
419 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
420
421 # 注意保持前导空格
422 #: wt-status.c:143
423 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
424 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
425
426 #: wt-status.c:151
427 msgid "Changes to be committed:"
428 msgstr "要提交的变更:"
429
430 #: wt-status.c:169
431 msgid "Changes not staged for commit:"
432 msgstr "未暂存至提交的变更:"
433
434 # 注意保持前导空格
435 #: wt-status.c:173
436 msgid " (use \"git add <file>...\" to update what will be committed)"
437 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
438
439 # 注意保持前导空格
440 #: wt-status.c:175
441 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
442 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
443
444 # 注意保持前导空格
445 #: wt-status.c:176
446 msgid ""
447 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
448 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
449
450 # 注意保持前导空格
451 #: wt-status.c:178
452 msgid " (commit or discard the untracked or modified content in submodules)"
453 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
454
455 #: wt-status.c:187
456 #, c-format
457 msgid "%s files:"
458 msgstr "%s文件:"
459
460 # 注意保持前导空格
461 #: wt-status.c:190
462 #, c-format
463 msgid " (use \"git %s <file>...\" to include in what will be committed)"
464 msgstr " (使用 \"git %s <file>...\" 包含到提交列表)"
465
466 #: wt-status.c:207
467 msgid "bug"
468 msgstr "bug"
469
470 #: wt-status.c:212
471 msgid "both deleted:"
472 msgstr "双方删除:"
473
474 #: wt-status.c:213
475 msgid "added by us:"
476 msgstr "由我们添加:"
477
478 #: wt-status.c:214
479 msgid "deleted by them:"
480 msgstr "由他们删除:"
481
482 #: wt-status.c:215
483 msgid "added by them:"
484 msgstr "由他们添加:"
485
486 #: wt-status.c:216
487 msgid "deleted by us:"
488 msgstr "由我们删除:"
489
490 #: wt-status.c:217
491 msgid "both added:"
492 msgstr "双方添加:"
493
494 #: wt-status.c:218
495 msgid "both modified:"
496 msgstr "双方修改:"
497
498 #: wt-status.c:248
499 msgid "new commits, "
500 msgstr "新提交,"
501
502 #: wt-status.c:250
503 msgid "modified content, "
504 msgstr "修改的内容,"
505
506 #: wt-status.c:252
507 msgid "untracked content, "
508 msgstr "未跟踪的内容,"
509
510 # 为保证在输出中对齐,注意调整句中空格!
511 #: wt-status.c:266
512 #, c-format
513 msgid "new file: %s"
514 msgstr "新文件: %s"
515
516 # 为保证在输出中对齐,注意调整句中空格!
517 #: wt-status.c:269
518 #, c-format
519 msgid "copied: %s -> %s"
520 msgstr "拷贝: %s -> %s"
521
522 # 为保证在输出中对齐,注意调整句中空格!
523 #: wt-status.c:272
524 #, c-format
525 msgid "deleted: %s"
526 msgstr "删除: %s"
527
528 # 为保证在输出中对齐,注意调整句中空格!
529 #: wt-status.c:275
530 #, c-format
531 msgid "modified: %s"
532 msgstr "修改: %s"
533
534 # 为保证在输出中对齐,注意调整句中空格!
535 #: wt-status.c:278
536 #, c-format
537 msgid "renamed: %s -> %s"
538 msgstr "重命名: %s -> %s"
539
540 # 为保证在输出中对齐,注意调整句中空格!
541 #: wt-status.c:281
542 #, c-format
543 msgid "typechange: %s"
544 msgstr "类型变更: %s"
545
546 # 为保证在输出中对齐,注意调整句中空格!
547 #: wt-status.c:284
548 #, c-format
549 msgid "unknown: %s"
550 msgstr "未知: %s"
551
552 # 为保证在输出中对齐,注意调整句中空格!
553 #: wt-status.c:287
554 #, c-format
555 msgid "unmerged: %s"
556 msgstr "未合并: %s"
557
558 #: wt-status.c:290
559 #, c-format
560 msgid "bug: unhandled diff status %c"
561 msgstr "bug: 未处理的差异状态 %c"
562
563 #: wt-status.c:713
564 msgid "On branch "
565 msgstr "位于分支 "
566
567 #: wt-status.c:720
568 msgid "Not currently on any branch."
569 msgstr "当前不在任何分支上。"
570
571 #: wt-status.c:731
572 msgid "Initial commit"
573 msgstr "初始提交"
574
575 #: wt-status.c:745
576 msgid "Untracked"
577 msgstr "未跟踪的"
578
579 #: wt-status.c:747
580 msgid "Ignored"
581 msgstr "忽略的"
582
583 #: wt-status.c:749
584 #, c-format
585 msgid "Untracked files not listed%s"
586 msgstr "未跟踪的文件没有列出%s"
587
588 # 注意保持前导空格
589 #: wt-status.c:751
590 msgid " (use -u option to show untracked files)"
591 msgstr " (使用 -u 参数显示未跟踪的文件)"
592
593 #: wt-status.c:757
594 msgid "No changes"
595 msgstr "没有修改"
596
597 #: wt-status.c:761
598 #, c-format
599 msgid "no changes added to commit%s\n"
600 msgstr "修改尚未加入提交%s\n"
601
602 # 注意保持前导空格
603 #: wt-status.c:763
604 msgid " (use \"git add\" and/or \"git commit -a\")"
605 msgstr " (使用 \"git add\" 和/或 \"git commit -a\")"
606
607 #: wt-status.c:765
608 #, c-format
609 msgid "nothing added to commit but untracked files present%s\n"
610 msgstr "空提交但存在未跟踪文件%s\n"
611
612 # 注意保持前导空格
613 #: wt-status.c:767
614 msgid " (use \"git add\" to track)"
615 msgstr " (使用 \"git add\" 建立跟踪)"
616
617 #: wt-status.c:769 wt-status.c:772 wt-status.c:775
618 #, c-format
619 msgid "nothing to commit%s\n"
620 msgstr "无须提交%s\n"
621
622 # 注意保持前导空格
623 #: wt-status.c:770
624 msgid " (create/copy files and use \"git add\" to track)"
625 msgstr " (新建/拷贝的文件使用 \"git add\" 建立跟踪)"
626
627 # 注意保持前导空格
628 #: wt-status.c:773
629 msgid " (use -u to show untracked files)"
630 msgstr " (使用 -u 显示未跟踪文件)"
631
632 # 注意保持前导空格
633 #: wt-status.c:776
634 msgid " (working directory clean)"
635 msgstr " (干净的工作区)"
636
637 #: wt-status.c:884
638 msgid "HEAD (no branch)"
639 msgstr "HEAD(非分支)"
640
641 # 注意保持句尾空格
642 #: wt-status.c:890
643 msgid "Initial commit on "
644 msgstr "初始提交于 "
645
646 # 注意保持句尾空格
647 #: wt-status.c:905
648 msgid "behind "
649 msgstr "落后 "
650
651 # 注意保持句尾空格
652 #: wt-status.c:908 wt-status.c:911
653 msgid "ahead "
654 msgstr "领先 "
655
656 # 注意保持句尾空格
657 #: wt-status.c:913
658 msgid ", behind "
659 msgstr ",落后 "
660
661 #: builtin/add.c:62
662 #, c-format
663 msgid "unexpected diff status %c"
664 msgstr "意外的差异状态 %c"
665
666 #: builtin/add.c:67 builtin/commit.c:298
667 msgid "updating files failed"
668 msgstr "更新文件失败"
669
670 #: builtin/add.c:77
671 #, c-format
672 msgid "remove '%s'\n"
673 msgstr "删除 '%s'\n"
674
675 #: builtin/add.c:176
676 #, c-format
677 msgid "Path '%s' is in submodule '%.*s'"
678 msgstr "路径 '%s' 属于模组 '%.*s'"
679
680 #: builtin/add.c:192
681 msgid "Unstaged changes after refreshing the index:"
682 msgstr "刷新暂存区后未暂存的变更:"
683
684 #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
685 #, c-format
686 msgid "pathspec '%s' did not match any files"
687 msgstr "路径 '%s' 未匹配任何文件"
688
689 #: builtin/add.c:209
690 #, c-format
691 msgid "'%s' is beyond a symbolic link"
692 msgstr "'%s' 位于符号链接中"
693
694 #: builtin/add.c:276
695 msgid "Could not read the index"
696 msgstr "无法读取暂存区"
697
698 #: builtin/add.c:286
699 #, c-format
700 msgid "Could not open '%s' for writing."
701 msgstr "无法打开 '%s' 以写入。"
702
703 #: builtin/add.c:290
704 msgid "Could not write patch"
705 msgstr "无法写补丁"
706
707 #: builtin/add.c:295
708 #, c-format
709 msgid "Could not stat '%s'"
710 msgstr "无法查看文件状态 '%s'"
711
712 #: builtin/add.c:297
713 msgid "Empty patch. Aborted."
714 msgstr "空补丁。异常终止。"
715
716 #: builtin/add.c:303
717 #, c-format
718 msgid "Could not apply '%s'"
719 msgstr "无法应用 '%s'"
720
721 #: builtin/add.c:312
722 msgid "The following paths are ignored by one of your .gitignore files:\n"
723 msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n"
724
725 #: builtin/add.c:352
726 #, c-format
727 msgid "Use -f if you really want to add them.\n"
728 msgstr "使用 -f 参数如果你确实要添加它们。\n"
729
730 #: builtin/add.c:353
731 msgid "no files added"
732 msgstr "没有文件被添加"
733
734 #: builtin/add.c:359
735 msgid "adding files failed"
736 msgstr "添加文件失败"
737
738 #: builtin/add.c:391
739 msgid "-A and -u are mutually incompatible"
740 msgstr "-A 和 -u 选项互斥"
741
742 #: builtin/add.c:393
743 msgid "Option --ignore-missing can only be used together with --dry-run"
744 msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
745
746 #: builtin/add.c:413
747 #, c-format
748 msgid "Nothing specified, nothing added.\n"
749 msgstr "未提供参数,没有文件被添加。\n"
750
751 #: builtin/add.c:414
752 #, c-format
753 msgid "Maybe you wanted to say 'git add .'?\n"
754 msgstr "也许您想要执行 'git add .'?\n"
755
756 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82
757 #: builtin/rm.c:162
758 msgid "index file corrupt"
759 msgstr "暂存区文件损坏"
760
761 #: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260
762 msgid "Unable to write new index file"
763 msgstr "无法写入新暂存区文件"
764
765 #: builtin/archive.c:17
766 #, c-format
767 msgid "could not create archive file '%s'"
768 msgstr "无法创建归档文件 '%s'"
769
770 #: builtin/archive.c:20
771 msgid "could not redirect output"
772 msgstr "无法重定向输出"
773
774 #: builtin/archive.c:37
775 msgid "git archive: Remote with no URL"
776 msgstr "git archive: 未提供远程URL"
777
778 #: builtin/archive.c:58
779 msgid "git archive: expected ACK/NAK, got EOF"
780 msgstr "git archive: 期待ACK/NACK,却得到EOF"
781
782 #: builtin/archive.c:63
783 #, c-format
784 msgid "git archive: NACK %s"
785 msgstr "git archive: NACK %s"
786
787 #: builtin/archive.c:65
788 #, c-format
789 msgid "remote error: %s"
790 msgstr "远程错误:%s"
791
792 #: builtin/archive.c:66
793 msgid "git archive: protocol error"
794 msgstr "git archive: 协议错误"
795
796 #: builtin/archive.c:71
797 msgid "git archive: expected a flush"
798 msgstr "git archive: 预期一个刷新"
799
800 #: builtin/branch.c:137
801 #, c-format
802 msgid ""
803 "deleting branch '%s' that has been merged to\n"
804 " '%s', but not yet merged to HEAD."
805 msgstr ""
806 "要删除的分支 '%s' 已经合并到\n"
807 " '%s',但未合并到 HEAD。"
808
809 #: builtin/branch.c:141
810 #, c-format
811 msgid ""
812 "not deleting branch '%s' that is not yet merged to\n"
813 " '%s', even though it is merged to HEAD."
814 msgstr ""
815 "不要删除分支 '%s' 其尚未合并到\n"
816 " '%s',虽然它已经合并到 HEAD。"
817
818 # 汉字之间无空格,故删除尾部空格
819 #. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
820 #: builtin/branch.c:163
821 msgid "remote "
822 msgstr "远程"
823
824 #: builtin/branch.c:171
825 msgid "cannot use -a with -d"
826 msgstr "不能将 -a 和 -d 共用"
827
828 #: builtin/branch.c:177
829 msgid "Couldn't look up commit object for HEAD"
830 msgstr "无法查询 HEAD 指向的提交对象"
831
832 #: builtin/branch.c:182
833 #, c-format
834 msgid "Cannot delete the branch '%s' which you are currently on."
835 msgstr "无法删除您当前所在的分支 '%s'。"
836
837 #: builtin/branch.c:192
838 #, c-format
839 msgid "%sbranch '%s' not found."
840 msgstr "%s分支 '%s' 未发现。"
841
842 #: builtin/branch.c:200
843 #, c-format
844 msgid "Couldn't look up commit object for '%s'"
845 msgstr "无法查询 '%s' 指向的提交对象"
846
847 #: builtin/branch.c:206
848 #, c-format
849 msgid ""
850 "The branch '%s' is not fully merged.\n"
851 "If you are sure you want to delete it, run 'git branch -D %s'."
852 msgstr ""
853 "分支 '%s' 没有完全合并。\n"
854 "如果您确认要删除它,执行 'git branch -D %s'。"
855
856 #: builtin/branch.c:214
857 #, c-format
858 msgid "Error deleting %sbranch '%s'"
859 msgstr "删除 %s分支 '%s' 时错误"
860
861 #: builtin/branch.c:219
862 #, c-format
863 msgid "Deleted %sbranch %s (was %s).\n"
864 msgstr "已删除 %s分支 %s(曾为 %s)。\n"
865
866 #: builtin/branch.c:224
867 msgid "Update of config-file failed"
868 msgstr "无法更新 config 文件"
869
870 #: builtin/branch.c:322
871 #, c-format
872 msgid "branch '%s' does not point at a commit"
873 msgstr "分支 '%s' 未指向一个提交"
874
875 # 注意保持句尾空格
876 #: builtin/branch.c:394
877 #, c-format
878 msgid "behind %d] "
879 msgstr "落后 %d] "
880
881 # 注意保持句尾空格
882 #: builtin/branch.c:396
883 #, c-format
884 msgid "ahead %d] "
885 msgstr "领先 %d] "
886
887 # 注意保持句尾空格
888 #: builtin/branch.c:398
889 #, c-format
890 msgid "ahead %d, behind %d] "
891 msgstr "领先 %d,落后 %d] "
892
893 #: builtin/branch.c:501
894 msgid "(no branch)"
895 msgstr "(非分支)"
896
897 #: builtin/branch.c:562
898 msgid "some refs could not be read"
899 msgstr "一些引用无法读取"
900
901 #: builtin/branch.c:575
902 msgid "cannot rename the current branch while not on any."
903 msgstr "无法重命名不存在的当前分支。"
904
905 #: builtin/branch.c:585
906 #, c-format
907 msgid "Invalid branch name: '%s'"
908 msgstr "无效的分支名:'%s'"
909
910 #: builtin/branch.c:600
911 msgid "Branch rename failed"
912 msgstr "分支重命名失败"
913
914 #: builtin/branch.c:604
915 #, c-format
916 msgid "Renamed a misnamed branch '%s' away"
917 msgstr "重命名掉一个错误命名的旧分支 '%s'"
918
919 #: builtin/branch.c:608
920 #, c-format
921 msgid "Branch renamed to %s, but HEAD is not updated!"
922 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
923
924 #: builtin/branch.c:615
925 msgid "Branch is renamed, but update of config-file failed"
926 msgstr "分支被重命名,但更新 config 文件失败"
927
928 #: builtin/branch.c:630
929 #, c-format
930 msgid "malformed object name %s"
931 msgstr "非法的对象名 %s"
932
933 #: builtin/branch.c:654
934 #, c-format
935 msgid "could not write branch description template: %s\n"
936 msgstr "不能写分支描述模版:%s\n"
937
938 #: builtin/branch.c:742
939 msgid "Failed to resolve HEAD as a valid ref."
940 msgstr "无法将 HEAD 解析为有效引用。"
941
942 #: builtin/branch.c:747 builtin/clone.c:558
943 msgid "HEAD not found below refs/heads!"
944 msgstr "未在 /refs/heads 下发现 HEAD!"
945
946 #: builtin/branch.c:805
947 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
948 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
949
950 #: builtin/bundle.c:47
951 #, c-format
952 msgid "%s is okay\n"
953 msgstr "%s 可以\n"
954
955 #: builtin/bundle.c:56
956 msgid "Need a repository to create a bundle."
957 msgstr "需要一个版本库来创建包"
958
959 #: builtin/bundle.c:60
960 msgid "Need a repository to unbundle."
961 msgstr "需要一个版本库来解包"
962
963 #: builtin/checkout.c:113 builtin/checkout.c:146
964 #, c-format
965 msgid "path '%s' does not have our version"
966 msgstr "路径 '%s' 没有我们的版本"
967
968 #: builtin/checkout.c:115 builtin/checkout.c:148
969 #, c-format
970 msgid "path '%s' does not have their version"
971 msgstr "路径 '%s' 没有他们的版本"
972
973 #: builtin/checkout.c:131
974 #, c-format
975 msgid "path '%s' does not have all necessary versions"
976 msgstr "路径 '%s' 没有全部必须的版本"
977
978 #: builtin/checkout.c:175
979 #, c-format
980 msgid "path '%s' does not have necessary versions"
981 msgstr "路径 '%s' 没有必须的版本"
982
983 #: builtin/checkout.c:192
984 #, c-format
985 msgid "path '%s': cannot merge"
986 msgstr "path '%s': 无法合并"
987
988 #: builtin/checkout.c:209
989 #, c-format
990 msgid "Unable to add merge result for '%s'"
991 msgstr "无法为 '%s' 添加合并结果"
992
993 #: builtin/checkout.c:212 builtin/reset.c:158
994 #, c-format
995 msgid "make_cache_entry failed for path '%s'"
996 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
997
998 #: builtin/checkout.c:234 builtin/checkout.c:392
999 msgid "corrupt index file"
1000 msgstr "冲突的暂存区文件"
1001
1002 #: builtin/checkout.c:264 builtin/checkout.c:271
1003 #, c-format
1004 msgid "path '%s' is unmerged"
1005 msgstr "路径 '%s' 未合并"
1006
1007 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1008 #: builtin/merge.c:809
1009 msgid "unable to write new index file"
1010 msgstr "无法写新的暂存区文件"
1011
1012 #: builtin/checkout.c:319 builtin/diff.c:298 builtin/merge.c:406
1013 msgid "diff_setup_done failed"
1014 msgstr "diff_setup_done 失败"
1015
1016 #: builtin/checkout.c:414
1017 msgid "you need to resolve your current index first"
1018 msgstr "您需要先解决当前暂存区的冲突"
1019
1020 #: builtin/checkout.c:533
1021 #, c-format
1022 msgid "Can not do reflog for '%s'\n"
1023 msgstr "不能对 '%s' 保存引用日志\n"
1024
1025 #: builtin/checkout.c:565
1026 msgid "HEAD is now at"
1027 msgstr "HEAD 目前位于"
1028
1029 #: builtin/checkout.c:572
1030 #, c-format
1031 msgid "Reset branch '%s'\n"
1032 msgstr "重置分支 '%s'\n"
1033
1034 #: builtin/checkout.c:575
1035 #, c-format
1036 msgid "Already on '%s'\n"
1037 msgstr "已经位于 '%s'\n"
1038
1039 #: builtin/checkout.c:579
1040 #, c-format
1041 msgid "Switched to and reset branch '%s'\n"
1042 msgstr "切换并重置分支 '%s'\n"
1043
1044 #: builtin/checkout.c:581
1045 #, c-format
1046 msgid "Switched to a new branch '%s'\n"
1047 msgstr "切换到一个新分支 '%s'\n"
1048
1049 #: builtin/checkout.c:583
1050 #, c-format
1051 msgid "Switched to branch '%s'\n"
1052 msgstr "切换到分支 '%s'\n"
1053
1054 # 注意保持前导空格
1055 #: builtin/checkout.c:639
1056 #, c-format
1057 msgid " ... and %d more.\n"
1058 msgstr " ... 及 %d 更多。\n"
1059
1060 #. The singular version
1061 #: builtin/checkout.c:645
1062 #, c-format
1063 msgid ""
1064 "Warning: you are leaving %d commit behind, not connected to\n"
1065 "any of your branches:\n"
1066 "\n"
1067 "%s\n"
1068 msgid_plural ""
1069 "Warning: you are leaving %d commits behind, not connected to\n"
1070 "any of your branches:\n"
1071 "\n"
1072 "%s\n"
1073 msgstr[0] ""
1074 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
1075 "\n"
1076 "%s\n"
1077
1078 #: builtin/checkout.c:663
1079 #, c-format
1080 msgid ""
1081 "If you want to keep them by creating a new branch, this may be a good time\n"
1082 "to do so with:\n"
1083 "\n"
1084 " git branch new_branch_name %s\n"
1085 "\n"
1086 msgstr ""
1087 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
1088 "如下操作:\n"
1089 "\n"
1090 " git branch new_branch_name %s\n"
1091 "\n"
1092
1093 #: builtin/checkout.c:692
1094 msgid "internal error in revision walk"
1095 msgstr "在版本遍历时遇到内部错误"
1096
1097 #: builtin/checkout.c:696
1098 msgid "Previous HEAD position was"
1099 msgstr "之前的 HEAD 位置是"
1100
1101 #: builtin/checkout.c:722
1102 msgid "You are on a branch yet to be born"
1103 msgstr "您位于一个未初始化的分支"
1104
1105 #. case (1)
1106 #: builtin/checkout.c:853
1107 #, c-format
1108 msgid "invalid reference: %s"
1109 msgstr "无效引用:%s"
1110
1111 #. case (1): want a tree
1112 #: builtin/checkout.c:892
1113 #, c-format
1114 msgid "reference is not a tree: %s"
1115 msgstr "引用不是一个树:%s"
1116
1117 #: builtin/checkout.c:972
1118 msgid "-B cannot be used with -b"
1119 msgstr "-B 不能和 -b 共用"
1120
1121 #: builtin/checkout.c:981
1122 msgid "--patch is incompatible with all other options"
1123 msgstr "--patch 选项和其他选项不兼容"
1124
1125 #: builtin/checkout.c:984
1126 msgid "--detach cannot be used with -b/-B/--orphan"
1127 msgstr "--detach 不能和 -b/-B/--orphan 共用"
1128
1129 #: builtin/checkout.c:986
1130 msgid "--detach cannot be used with -t"
1131 msgstr "--detach 不能和 -t 共用"
1132
1133 #: builtin/checkout.c:992
1134 msgid "--track needs a branch name"
1135 msgstr "--track 需要一个分支名"
1136
1137 #: builtin/checkout.c:999
1138 msgid "Missing branch name; try -b"
1139 msgstr "缺少分支名;尝试 -b"
1140
1141 #: builtin/checkout.c:1005
1142 msgid "--orphan and -b|-B are mutually exclusive"
1143 msgstr "--orphan 和 -b|-B 互斥"
1144
1145 #: builtin/checkout.c:1007
1146 msgid "--orphan cannot be used with -t"
1147 msgstr "--orphan 不能和 -t 共用"
1148
1149 #: builtin/checkout.c:1017
1150 msgid "git checkout: -f and -m are incompatible"
1151 msgstr "git checkout: -f 和 -m 不兼容"
1152
1153 #: builtin/checkout.c:1051
1154 msgid "invalid path specification"
1155 msgstr "无效的路径"
1156
1157 #: builtin/checkout.c:1059
1158 #, c-format
1159 msgid ""
1160 "git checkout: updating paths is incompatible with switching branches.\n"
1161 "Did you intend to checkout '%s' which can not be resolved as commit?"
1162 msgstr ""
1163 "git checkout: 更新路径和切换分支不兼容。\n"
1164 "您是想要检出 '%s' 但未能将其解析为提交么?"
1165
1166 #: builtin/checkout.c:1061
1167 msgid "git checkout: updating paths is incompatible with switching branches."
1168 msgstr "git checkout: 更新路径和切换分支不兼容。"
1169
1170 #: builtin/checkout.c:1066
1171 msgid "git checkout: --detach does not take a path argument"
1172 msgstr "git checkout: --detach 不跟路径参数"
1173
1174 #: builtin/checkout.c:1069
1175 msgid ""
1176 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1177 "checking out of the index."
1178 msgstr ""
1179 "git checkout: --ours/--theirs, --force 和 --merge 不兼容当\n"
1180 "检出暂存区时。"
1181
1182 #: builtin/checkout.c:1088
1183 msgid "Cannot switch branch to a non-commit."
1184 msgstr "无法切换分支到一个非提交。"
1185
1186 #: builtin/checkout.c:1091
1187 msgid "--ours/--theirs is incompatible with switching branches."
1188 msgstr "--ours/--theirs 和切换分支不兼容。"
1189
1190 #: builtin/clean.c:78
1191 msgid "-x and -X cannot be used together"
1192 msgstr "-x 和 -X 不能共用"
1193
1194 #: builtin/clean.c:82
1195 msgid ""
1196 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1197 msgstr ""
1198 "clean.requireForce 设置为 true,若未提供 -n 或 -f 选项,拒绝执行清理动作"
1199
1200 #: builtin/clean.c:85
1201 msgid ""
1202 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1203 "clean"
1204 msgstr ""
1205 "clean.requireForce 默认为 true,若未提供 -n 或 -f 选项,拒绝执行清理动作"
1206
1207 #: builtin/clean.c:155 builtin/clean.c:176
1208 #, c-format
1209 msgid "Would remove %s\n"
1210 msgstr "将删除 %s\n"
1211
1212 #: builtin/clean.c:159 builtin/clean.c:179
1213 #, c-format
1214 msgid "Removing %s\n"
1215 msgstr "正删除 %s\n"
1216
1217 #: builtin/clean.c:162 builtin/clean.c:182
1218 #, c-format
1219 msgid "failed to remove %s"
1220 msgstr "无法删除 %s"
1221
1222 #: builtin/clean.c:166
1223 #, c-format
1224 msgid "Would not remove %s\n"
1225 msgstr "不会删除 %s\n"
1226
1227 #: builtin/clean.c:168
1228 #, c-format
1229 msgid "Not removing %s\n"
1230 msgstr "未删除 %s\n"
1231
1232 #: builtin/clone.c:243
1233 #, c-format
1234 msgid "reference repository '%s' is not a local directory."
1235 msgstr "引用版本库 '%s' 不是一个本地目录。"
1236
1237 #: builtin/clone.c:302
1238 #, c-format
1239 msgid "failed to open '%s'"
1240 msgstr "打开 '%s' 失败"
1241
1242 #: builtin/clone.c:306
1243 #, c-format
1244 msgid "failed to create directory '%s'"
1245 msgstr "创建目录 '%s' 失败"
1246
1247 #: builtin/clone.c:308 builtin/diff.c:75
1248 #, c-format
1249 msgid "failed to stat '%s'"
1250 msgstr "枚举 '%s' 状态失败"
1251
1252 #: builtin/clone.c:310
1253 #, c-format
1254 msgid "%s exists and is not a directory"
1255 msgstr "%s 存在且不是一个目录"
1256
1257 #: builtin/clone.c:324
1258 #, c-format
1259 msgid "failed to stat %s\n"
1260 msgstr "枚举 %s 状态失败\n"
1261
1262 #: builtin/clone.c:341
1263 #, c-format
1264 msgid "failed to unlink '%s'"
1265 msgstr "删除 '%s' 失败"
1266
1267 #: builtin/clone.c:346
1268 #, c-format
1269 msgid "failed to create link '%s'"
1270 msgstr "创建链接 '%s' 失败"
1271
1272 #: builtin/clone.c:350
1273 #, c-format
1274 msgid "failed to copy file to '%s'"
1275 msgstr "拷贝文件至 '%s' 失败"
1276
1277 #: builtin/clone.c:373
1278 #, c-format
1279 msgid "done.\n"
1280 msgstr "完成。\n"
1281
1282 #: builtin/clone.c:440
1283 #, c-format
1284 msgid "Could not find remote branch %s to clone."
1285 msgstr "无法发现要克隆的远程分支 %s。"
1286
1287 #: builtin/clone.c:549
1288 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
1289 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
1290
1291 #: builtin/clone.c:639
1292 msgid "Too many arguments."
1293 msgstr "太多参数。"
1294
1295 #: builtin/clone.c:643
1296 msgid "You must specify a repository to clone."
1297 msgstr "你必须指定一个版本库来克隆"
1298
1299 #: builtin/clone.c:654
1300 #, c-format
1301 msgid "--bare and --origin %s options are incompatible."
1302 msgstr "--bare 和 --origin %s 选项不兼容。"
1303
1304 #: builtin/clone.c:668
1305 #, c-format
1306 msgid "repository '%s' does not exist"
1307 msgstr "版本库 '%s' 不存在"
1308
1309 #: builtin/clone.c:673
1310 msgid "--depth is ignored in local clones; use file:// instead."
1311 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
1312
1313 #: builtin/clone.c:683
1314 #, c-format
1315 msgid "destination path '%s' already exists and is not an empty directory."
1316 msgstr "目标路径 '%s' 已经存在且不是一个空目录。"
1317
1318 #: builtin/clone.c:693
1319 #, c-format
1320 msgid "working tree '%s' already exists."
1321 msgstr "工作区 '%s' 已经存在。"
1322
1323 #: builtin/clone.c:706 builtin/clone.c:720
1324 #, c-format
1325 msgid "could not create leading directories of '%s'"
1326 msgstr "无法为 '%s' 创建目录"
1327
1328 #: builtin/clone.c:709
1329 #, c-format
1330 msgid "could not create work tree dir '%s'."
1331 msgstr "无法为 '%s' 创建工作区目录。"
1332
1333 #: builtin/clone.c:728
1334 #, c-format
1335 msgid "Cloning into bare repository '%s'...\n"
1336 msgstr "克隆到裸版本库 '%s'...\n"
1337
1338 #: builtin/clone.c:730
1339 #, c-format
1340 msgid "Cloning into '%s'...\n"
1341 msgstr "正克隆到 '%s'...\n"
1342
1343 #: builtin/clone.c:786
1344 #, c-format
1345 msgid "Don't know how to clone %s"
1346 msgstr "不知道如何克隆 %s"
1347
1348 #: builtin/clone.c:835
1349 #, c-format
1350 msgid "Remote branch %s not found in upstream %s"
1351 msgstr "远程分支 %s 在上游 %s 未发现"
1352
1353 #: builtin/clone.c:842
1354 msgid "You appear to have cloned an empty repository."
1355 msgstr "您似乎克隆了一个空版本库。"
1356
1357 #: builtin/commit.c:42
1358 msgid ""
1359 "Your name and email address were configured automatically based\n"
1360 "on your username and hostname. Please check that they are accurate.\n"
1361 "You can suppress this message by setting them explicitly:\n"
1362 "\n"
1363 " git config --global user.name \"Your Name\"\n"
1364 " git config --global user.email you@example.com\n"
1365 "\n"
1366 "After doing this, you may fix the identity used for this commit with:\n"
1367 "\n"
1368 " git commit --amend --reset-author\n"
1369 msgstr ""
1370 "您的姓名和邮件地址会基于您的用户名和主机地址自动配置。请检查它们\n"
1371 "正确与否。您可通过下面命令对其显式声明以避免重复出现类似提示:\n"
1372 "\n"
1373 " git config --global user.name \"Your Name\"\n"
1374 " git config --global user.email you@example.com\n"
1375 "\n"
1376 "设置完毕后,您可用下面命令来更改此次提交所使用的用户ID:\n"
1377 "\n"
1378 " git commit --amend --reset-author\n"
1379
1380 #: builtin/commit.c:54
1381 msgid ""
1382 "You asked to amend the most recent commit, but doing so would make\n"
1383 "it empty. You can repeat your command with --allow-empty, or you can\n"
1384 "remove the commit entirely with \"git reset HEAD^\".\n"
1385 msgstr ""
1386 "您要求修补最近的提交,但这么做会造成空提交。您可重复您的命令并带上\n"
1387 "--allow-empty 选项,或者您可以整个删除该提交用 \"git reset HEAD^\"。\n"
1388
1389 #: builtin/commit.c:59
1390 msgid ""
1391 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
1392 "If you wish to commit it anyway, use:\n"
1393 "\n"
1394 " git commit --allow-empty\n"
1395 "\n"
1396 "Otherwise, please use 'git reset'\n"
1397 msgstr ""
1398 "之前的拣选操作现在为空,可能是由冲突解决导致的。如果您想继续提交,用:\n"
1399 "\n"
1400 " git commit --allow-empty\n"
1401 "\n"
1402 "否则,请用 'git reset'\n"
1403
1404 #: builtin/commit.c:205 builtin/reset.c:33
1405 msgid "merge"
1406 msgstr "合并"
1407
1408 #: builtin/commit.c:208
1409 msgid "cherry-pick"
1410 msgstr "拣选"
1411
1412 #: builtin/commit.c:325
1413 msgid "failed to unpack HEAD tree object"
1414 msgstr "解包 HEAD 树对象失败"
1415
1416 #: builtin/commit.c:367
1417 msgid "unable to create temporary index"
1418 msgstr "不能创建临时暂存区"
1419
1420 #: builtin/commit.c:373
1421 msgid "interactive add failed"
1422 msgstr "交互式添加失败"
1423
1424 #: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473
1425 msgid "unable to write new_index file"
1426 msgstr "无法写入新暂存区文件"
1427
1428 # %s若翻为中文,前后不需要空格
1429 #: builtin/commit.c:457
1430 #, c-format
1431 msgid "cannot do a partial commit during a %s."
1432 msgstr "在%s过程中不能做部分提交。"
1433
1434 #: builtin/commit.c:466
1435 msgid "cannot read the index"
1436 msgstr "无法读取暂存区"
1437
1438 #: builtin/commit.c:486
1439 msgid "unable to write temporary index file"
1440 msgstr "无法写临时暂存区文件"
1441
1442 #: builtin/commit.c:550 builtin/commit.c:556
1443 #, c-format
1444 msgid "invalid commit: %s"
1445 msgstr "无效的提交:%s"
1446
1447 #: builtin/commit.c:579
1448 msgid "malformed --author parameter"
1449 msgstr "非法的 --author 参数"
1450
1451 #: builtin/commit.c:635
1452 #, c-format
1453 msgid "Malformed ident string: '%s'"
1454 msgstr "非法的识别字串:'%s'"
1455
1456 #: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000
1457 #, c-format
1458 msgid "could not lookup commit %s"
1459 msgstr "不能查询提交 %s"
1460
1461 #: builtin/commit.c:682 builtin/shortlog.c:296
1462 #, c-format
1463 msgid "(reading log message from standard input)\n"
1464 msgstr "(正从标准输入中读取说明信息)\n"
1465
1466 #: builtin/commit.c:684
1467 msgid "could not read log from standard input"
1468 msgstr "无法从标准输入中读取说明信息"
1469
1470 #: builtin/commit.c:688
1471 #, c-format
1472 msgid "could not read log file '%s'"
1473 msgstr "无法读取说明文件 '%s'"
1474
1475 #: builtin/commit.c:694
1476 msgid "commit has empty message"
1477 msgstr "提交说明为空"
1478
1479 #: builtin/commit.c:710
1480 msgid "could not read MERGE_MSG"
1481 msgstr "无法读取 MERGE_MSG"
1482
1483 #: builtin/commit.c:714
1484 msgid "could not read SQUASH_MSG"
1485 msgstr "无法读取 SQUASH_MSG"
1486
1487 #: builtin/commit.c:718
1488 #, c-format
1489 msgid "could not read '%s'"
1490 msgstr "无法读取 '%s'"
1491
1492 #: builtin/commit.c:746
1493 #, c-format
1494 msgid "could not open '%s'"
1495 msgstr "无法打开 '%s'"
1496
1497 #: builtin/commit.c:770
1498 msgid "could not write commit template"
1499 msgstr "无法写提交模版"
1500
1501 # %s若翻为中文,前后不需要空格
1502 #: builtin/commit.c:783
1503 #, c-format
1504 msgid ""
1505 "\n"
1506 "It looks like you may be committing a %s.\n"
1507 "If this is not correct, please remove the file\n"
1508 "\t%s\n"
1509 "and try again.\n"
1510 msgstr ""
1511 "\n"
1512 "看起来您正在提交一个%s。\n"
1513 "如果不是这样,请删除文件\n"
1514 "\t%s\n"
1515 "然后重试。\n"
1516
1517 # 注意保持前导空格
1518 #: builtin/commit.c:796
1519 msgid "Please enter the commit message for your changes."
1520 msgstr "请为您的修改输入提交说明。"
1521
1522 #: builtin/commit.c:799
1523 msgid ""
1524 " Lines starting\n"
1525 "with '#' will be ignored, and an empty message aborts the commit.\n"
1526 msgstr ""
1527 " 以 '#' 开头\n"
1528 "的行将被忽略,而且空提交说明将会终止提交。\n"
1529
1530 # 注意保持前导空格
1531 #: builtin/commit.c:804
1532 msgid ""
1533 " Lines starting\n"
1534 "with '#' will be kept; you may remove them yourself if you want to.\n"
1535 "An empty message aborts the commit.\n"
1536 msgstr ""
1537 " 以 '#' 开头\n"
1538 "的行将被保留,您可以删除它们如果您想这样做。空提交说明将会终止提交。\n"
1539
1540 # 为保证在输出中对齐,注意调整句中空格!
1541 #: builtin/commit.c:816
1542 #, c-format
1543 msgid "%sAuthor: %s"
1544 msgstr "%s作者: %s"
1545
1546 # 为保证在输出中对齐,注意调整句中空格!
1547 #: builtin/commit.c:823
1548 #, c-format
1549 msgid "%sCommitter: %s"
1550 msgstr "%s提交者: %s"
1551
1552 #: builtin/commit.c:843
1553 msgid "Cannot read index"
1554 msgstr "无法读取暂存区"
1555
1556 #: builtin/commit.c:880
1557 msgid "Error building trees"
1558 msgstr "无法创建树对象"
1559
1560 #: builtin/commit.c:895 builtin/tag.c:357
1561 #, c-format
1562 msgid "Please supply the message using either -m or -F option.\n"
1563 msgstr "请使用 -m 或者 -F 选项提供说明。\n"
1564
1565 #: builtin/commit.c:975
1566 #, c-format
1567 msgid "No existing author found with '%s'"
1568 msgstr "没有找到匹配 '%s' 的作者"
1569
1570 #: builtin/commit.c:990 builtin/commit.c:1182
1571 #, c-format
1572 msgid "Invalid untracked files mode '%s'"
1573 msgstr "无效的非追踪文件参数 '%s'"
1574
1575 #: builtin/commit.c:1030
1576 msgid "Using both --reset-author and --author does not make sense"
1577 msgstr "同时使用 --reset-author 和 --author 没有意义"
1578
1579 #: builtin/commit.c:1041
1580 msgid "You have nothing to amend."
1581 msgstr "您没有要修补。"
1582
1583 # %s若翻为中文,前后不需要空格
1584 #: builtin/commit.c:1043
1585 #, c-format
1586 msgid "You are in the middle of a %s -- cannot amend."
1587 msgstr "您正处于一个%s过程中 -- 无法修补提交。"
1588
1589 #: builtin/commit.c:1045
1590 msgid "Options --squash and --fixup cannot be used together"
1591 msgstr "选项 --squash 和 --fixup 不能共用"
1592
1593 #: builtin/commit.c:1055
1594 msgid "Only one of -c/-C/-F/--fixup can be used."
1595 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
1596
1597 #: builtin/commit.c:1057
1598 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
1599 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
1600
1601 #: builtin/commit.c:1063
1602 msgid "--reset-author can be used only with -C, -c or --amend."
1603 msgstr "--reset-author 只能和 -C, -c 或 --amend 共用。"
1604
1605 #: builtin/commit.c:1080
1606 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
1607 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
1608
1609 #: builtin/commit.c:1082
1610 msgid "No paths with --include/--only does not make sense."
1611 msgstr "参数 --include/--only 不跟路径没有意义。"
1612
1613 #: builtin/commit.c:1084
1614 msgid "Clever... amending the last one with dirty index."
1615 msgstr "聪明... 在暂存区不干净下修补最后的提交。"
1616
1617 #: builtin/commit.c:1086
1618 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
1619 msgstr "没有用 -i 或 -o 选项而显式地提供路径,认为是 --only paths..."
1620
1621 #: builtin/commit.c:1096 builtin/tag.c:556
1622 #, c-format
1623 msgid "Invalid cleanup mode %s"
1624 msgstr "无效的清理模式 %s"
1625
1626 #: builtin/commit.c:1101
1627 msgid "Paths with -a does not make sense."
1628 msgstr "路径和 -a 选项共用没有意义。"
1629
1630 #: builtin/commit.c:1280
1631 msgid "couldn't look up newly created commit"
1632 msgstr "无法找到新创建的提交"
1633
1634 #: builtin/commit.c:1282
1635 msgid "could not parse newly created commit"
1636 msgstr "无法解析新创建的提交"
1637
1638 #: builtin/commit.c:1323
1639 msgid "detached HEAD"
1640 msgstr "分离头指针"
1641
1642 # 注意保持前导空格
1643 #: builtin/commit.c:1325
1644 msgid " (root-commit)"
1645 msgstr " (根提交)"
1646
1647 #: builtin/commit.c:1415
1648 msgid "could not parse HEAD commit"
1649 msgstr "无法解析 HEAD 提交"
1650
1651 #: builtin/commit.c:1452 builtin/merge.c:507
1652 #, c-format
1653 msgid "could not open '%s' for reading"
1654 msgstr "无法打开 '%s' 读取"
1655
1656 #: builtin/commit.c:1459
1657 #, c-format
1658 msgid "Corrupt MERGE_HEAD file (%s)"
1659 msgstr "损坏的 MERGE_HEAD 文件 (%s)"
1660
1661 #: builtin/commit.c:1466
1662 msgid "could not read MERGE_MODE"
1663 msgstr "无法读取 MERGE_MODE"
1664
1665 #: builtin/commit.c:1485
1666 #, c-format
1667 msgid "could not read commit message: %s"
1668 msgstr "无法读取提交说明:%s"
1669
1670 #: builtin/commit.c:1499
1671 #, c-format
1672 msgid "Aborting commit due to empty commit message.\n"
1673 msgstr "终止提交因为提交说明为空。\n"
1674
1675 #: builtin/commit.c:1514 builtin/merge.c:933 builtin/merge.c:966
1676 msgid "failed to write commit object"
1677 msgstr "写提交对象失败"
1678
1679 #: builtin/commit.c:1535
1680 msgid "cannot lock HEAD ref"
1681 msgstr "无法锁定 HEAD 引用"
1682
1683 #: builtin/commit.c:1539
1684 msgid "cannot update HEAD ref"
1685 msgstr "无法更新 HEAD 引用"
1686
1687 #: builtin/commit.c:1550
1688 msgid ""
1689 "Repository has been updated, but unable to write\n"
1690 "new_index file. Check that disk is not full or quota is\n"
1691 "not exceeded, and then \"git reset HEAD\" to recover."
1692 msgstr ""
1693 "版本库已被更新,但无法写入新暂存区文件。检查是否磁盘\n"
1694 "已满或磁盘配额耗尽,然后执行 \"git reset HEAD\" 恢复。"
1695
1696 #: builtin/describe.c:234
1697 #, c-format
1698 msgid "annotated tag %s not available"
1699 msgstr "注释 tag %s 无效"
1700
1701 #: builtin/describe.c:238
1702 #, c-format
1703 msgid "annotated tag %s has no embedded name"
1704 msgstr "注释 tag %s 没有嵌入名称"
1705
1706 #: builtin/describe.c:240
1707 #, c-format
1708 msgid "tag '%s' is really '%s' here"
1709 msgstr "tag '%s' 确是在 '%s'"
1710
1711 #: builtin/describe.c:267
1712 #, c-format
1713 msgid "Not a valid object name %s"
1714 msgstr "不是一个有效的对象名 %s"
1715
1716 #: builtin/describe.c:270
1717 #, c-format
1718 msgid "%s is not a valid '%s' object"
1719 msgstr "%s 不是一个有效的 '%s' 对象"
1720
1721 #: builtin/describe.c:287
1722 #, c-format
1723 msgid "no tag exactly matches '%s'"
1724 msgstr "没有 tag 准确匹配 '%s'"
1725
1726 #: builtin/describe.c:289
1727 #, c-format
1728 msgid "searching to describe %s\n"
1729 msgstr "搜索描述 %s\n"
1730
1731 #: builtin/describe.c:329
1732 #, c-format
1733 msgid "finished search at %s\n"
1734 msgstr "完成搜索 %s\n"
1735
1736 #: builtin/describe.c:353
1737 #, c-format
1738 msgid ""
1739 "No annotated tags can describe '%s'.\n"
1740 "However, there were unannotated tags: try --tags."
1741 msgstr ""
1742 "没有注释 tag 能描述 '%s'。\n"
1743 "然而,有非注释 tag:尝试 --tags。"
1744
1745 #: builtin/describe.c:357
1746 #, c-format
1747 msgid ""
1748 "No tags can describe '%s'.\n"
1749 "Try --always, or create some tags."
1750 msgstr ""
1751 "没有注释 tag 能描述 '%s'。\n"
1752 "尝试 --always,或创建一些 tag。"
1753
1754 #: builtin/describe.c:378
1755 #, c-format
1756 msgid "traversed %lu commits\n"
1757 msgstr "已遍历 %lu 个提交\n"
1758
1759 #: builtin/describe.c:381
1760 #, c-format
1761 msgid ""
1762 "more than %i tags found; listed %i most recent\n"
1763 "gave up search at %s\n"
1764 msgstr ""
1765 "发现多于 %i 个 tag;列出最近的 %i 个\n"
1766 "放弃搜索 %s\n"
1767
1768 #: builtin/describe.c:436
1769 msgid "--long is incompatible with --abbrev=0"
1770 msgstr "--long 与 --abbrev=0 不兼容"
1771
1772 #: builtin/describe.c:462
1773 msgid "No names found, cannot describe anything."
1774 msgstr "没有发现名称,无法描述任何东西"
1775
1776 #: builtin/describe.c:482
1777 msgid "--dirty is incompatible with committishes"
1778 msgstr "--dirty 不能与提交共用"
1779
1780 #: builtin/diff.c:77
1781 #, c-format
1782 msgid "'%s': not a regular file or symlink"
1783 msgstr "'%s':不是一个正规文件或符号链接"
1784
1785 #: builtin/diff.c:220
1786 #, c-format
1787 msgid "invalid option: %s"
1788 msgstr "无效选项:%s"
1789
1790 #: builtin/diff.c:293
1791 msgid "Not a git repository"
1792 msgstr "不是一个 git 版本库"
1793
1794 #: builtin/diff.c:343
1795 #, c-format
1796 msgid "invalid object '%s' given."
1797 msgstr "提供了无效对象 '%s'。"
1798
1799 #: builtin/diff.c:348
1800 #, c-format
1801 msgid "more than %d trees given: '%s'"
1802 msgstr "提供了超过 %d 个树对象:'%s'"
1803
1804 #: builtin/diff.c:358
1805 #, c-format
1806 msgid "more than two blobs given: '%s'"
1807 msgstr "提供了超过两个 blob 对象:'%s'"
1808
1809 #: builtin/diff.c:366
1810 #, c-format
1811 msgid "unhandled object '%s' given."
1812 msgstr "提供了无法处理的对象 '%s'。"
1813
1814 #: builtin/fetch.c:200
1815 msgid "Couldn't find remote ref HEAD"
1816 msgstr "无法发现远程 HEAD 引用"
1817
1818 #: builtin/fetch.c:252
1819 #, c-format
1820 msgid "object %s not found"
1821 msgstr "对象 %s 未发现"
1822
1823 #: builtin/fetch.c:258
1824 msgid "[up to date]"
1825 msgstr "[最新]"
1826
1827 #: builtin/fetch.c:272
1828 #, c-format
1829 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
1830 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
1831
1832 #: builtin/fetch.c:273 builtin/fetch.c:351
1833 msgid "[rejected]"
1834 msgstr "[已拒绝]"
1835
1836 #: builtin/fetch.c:284
1837 msgid "[tag update]"
1838 msgstr "[tag更新]"
1839
1840 # 注意保持前导空格
1841 #: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331
1842 msgid " (unable to update local ref)"
1843 msgstr " (不能更新本地引用)"
1844
1845 #: builtin/fetch.c:298
1846 msgid "[new tag]"
1847 msgstr "[新tag]"
1848
1849 #: builtin/fetch.c:302
1850 msgid "[new branch]"
1851 msgstr "[新分支]"
1852
1853 #: builtin/fetch.c:347
1854 msgid "unable to update local ref"
1855 msgstr "不能更新本地引用"
1856
1857 #: builtin/fetch.c:347
1858 msgid "forced update"
1859 msgstr "强制更新"
1860
1861 #: builtin/fetch.c:353
1862 msgid "(non-fast-forward)"
1863 msgstr "(非快进式推送)"
1864
1865 #: builtin/fetch.c:384 builtin/fetch.c:676
1866 #, c-format
1867 msgid "cannot open %s: %s\n"
1868 msgstr "无法打开 %s:%s\n"
1869
1870 #: builtin/fetch.c:393
1871 #, c-format
1872 msgid "%s did not send all necessary objects\n"
1873 msgstr "%s 未发送所有必须的对象\n"
1874
1875 #: builtin/fetch.c:479
1876 #, c-format
1877 msgid "From %.*s\n"
1878 msgstr "来自 %.*s\n"
1879
1880 #: builtin/fetch.c:490
1881 #, c-format
1882 msgid ""
1883 "some local refs could not be updated; try running\n"
1884 " 'git remote prune %s' to remove any old, conflicting branches"
1885 msgstr ""
1886 "一些本地引用不能被更新;尝试运行\n"
1887 " 'git remote prune %s' 来删除旧的、有冲突的分支"
1888
1889 # 注意保持前导空格
1890 #: builtin/fetch.c:540
1891 #, c-format
1892 msgid " (%s will become dangling)\n"
1893 msgstr " (%s 将成为悬空状态)\n"
1894
1895 # 注意保持前导空格
1896 #: builtin/fetch.c:541
1897 #, c-format
1898 msgid " (%s has become dangling)\n"
1899 msgstr " (%s 已成为悬空状态)\n"
1900
1901 #: builtin/fetch.c:548
1902 msgid "[deleted]"
1903 msgstr "[已删除]"
1904
1905 #: builtin/fetch.c:549
1906 msgid "(none)"
1907 msgstr "(无)"
1908
1909 #: builtin/fetch.c:666
1910 #, c-format
1911 msgid "Refusing to fetch into current branch %s of non-bare repository"
1912 msgstr "拒绝获取到非裸版本库的当前分支 %s"
1913
1914 #: builtin/fetch.c:700
1915 #, c-format
1916 msgid "Don't know how to fetch from %s"
1917 msgstr "不知道如何从 %s 获取"
1918
1919 #: builtin/fetch.c:777
1920 #, c-format
1921 msgid "Option \"%s\" value \"%s\" is not valid for %s"
1922 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
1923
1924 #: builtin/fetch.c:780
1925 #, c-format
1926 msgid "Option \"%s\" is ignored for %s\n"
1927 msgstr "选项 \"%s\" 对于 %s 被忽略\n"
1928
1929 #: builtin/fetch.c:879
1930 #, c-format
1931 msgid "Fetching %s\n"
1932 msgstr "正在获取 %s\n"
1933
1934 #: builtin/fetch.c:881
1935 #, c-format
1936 msgid "Could not fetch %s"
1937 msgstr "不能获取 %s"
1938
1939 #: builtin/fetch.c:898
1940 msgid ""
1941 "No remote repository specified. Please, specify either a URL or a\n"
1942 "remote name from which new revisions should be fetched."
1943 msgstr "未提供远程版本库。请提供一个URL或远程版本库名,用于获取新版本。"
1944
1945 #: builtin/fetch.c:918
1946 msgid "You need to specify a tag name."
1947 msgstr "你需要提供一个 tag 名称"
1948
1949 #: builtin/fetch.c:970
1950 msgid "fetch --all does not take a repository argument"
1951 msgstr "fetch --all 不能带一个版本库参数"
1952
1953 #: builtin/fetch.c:972
1954 msgid "fetch --all does not make sense with refspecs"
1955 msgstr "fetch --all 带引用表达式没有任何意义"
1956
1957 #: builtin/fetch.c:983
1958 #, c-format
1959 msgid "No such remote or remote group: %s"
1960 msgstr "没有这样的远程或远程组:%s"
1961
1962 #: builtin/fetch.c:991
1963 msgid "Fetching a group and specifying refspecs does not make sense"
1964 msgstr "获取组并提供引用表达式没有意义"
1965
1966 #: builtin/gc.c:63
1967 #, c-format
1968 msgid "Invalid %s: '%s'"
1969 msgstr "无效的 %s:'%s'"
1970
1971 #: builtin/gc.c:78
1972 msgid "Too many options specified"
1973 msgstr "提供了太多的选项"
1974
1975 #: builtin/gc.c:103
1976 #, c-format
1977 msgid "insanely long object directory %.*s"
1978 msgstr "不正常的长对象目录 %.*s"
1979
1980 #: builtin/gc.c:223
1981 #, c-format
1982 msgid "Auto packing the repository for optimum performance.\n"
1983 msgstr "自动打包版本库以求最佳性能。\n"
1984
1985 #: builtin/gc.c:226
1986 #, c-format
1987 msgid ""
1988 "Auto packing the repository for optimum performance. You may also\n"
1989 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
1990 msgstr ""
1991 "自动打包版本库以求最佳性能。你还可以\n"
1992 "手动运行 \"git gc\"。 参见 \"git help gc\" 获取更多信息。\n"
1993
1994 #: builtin/gc.c:256
1995 msgid ""
1996 "There are too many unreachable loose objects; run 'git prune' to remove them."
1997 msgstr "有太多无指向的松散对象,运行 'git prune' 删除它们。"
1998
1999 #: builtin/grep.c:216
2000 #, c-format
2001 msgid "grep: failed to create thread: %s"
2002 msgstr "grep: 无法创建线程:%s"
2003
2004 #: builtin/grep.c:402
2005 #, c-format
2006 msgid "Failed to chdir: %s"
2007 msgstr "无法切换目录:%s"
2008
2009 #: builtin/grep.c:478 builtin/grep.c:512
2010 #, c-format
2011 msgid "unable to read tree (%s)"
2012 msgstr "无法读取代码树(%s)"
2013
2014 #: builtin/grep.c:526
2015 #, c-format
2016 msgid "unable to grep from object of type %s"
2017 msgstr "无法抓取来自于 %s 类型的对象"
2018
2019 #: builtin/grep.c:584
2020 #, c-format
2021 msgid "switch `%c' expects a numerical value"
2022 msgstr "开关 `%c' 期望一个数字值"
2023
2024 #: builtin/grep.c:601
2025 #, c-format
2026 msgid "cannot open '%s'"
2027 msgstr "不能打开 '%s'"
2028
2029 #: builtin/grep.c:889
2030 msgid "no pattern given."
2031 msgstr "未提供模式匹配。"
2032
2033 #: builtin/grep.c:903
2034 #, c-format
2035 msgid "bad object %s"
2036 msgstr "坏对象 %s"
2037
2038 #: builtin/grep.c:944
2039 msgid "--open-files-in-pager only works on the worktree"
2040 msgstr "--open-files-in-pager 仅用于工作区"
2041
2042 #: builtin/grep.c:967
2043 msgid "--cached or --untracked cannot be used with --no-index."
2044 msgstr "--cached 或 --untracked 不能与 --no-index 共用"
2045
2046 #: builtin/grep.c:972
2047 msgid "--no-index or --untracked cannot be used with revs."
2048 msgstr "--no-index 或 --untracked 不能和版本共用。"
2049
2050 #: builtin/grep.c:975
2051 msgid "--[no-]exclude-standard cannot be used for tracked contents."
2052 msgstr "--[no-]exclude-standard 不能用于跟踪内容。"
2053
2054 #: builtin/grep.c:983
2055 msgid "both --cached and trees are given."
2056 msgstr "同时给出了 --cached 和树对象。"
2057
2058 #: builtin/init-db.c:35
2059 #, c-format
2060 msgid "Could not make %s writable by group"
2061 msgstr "不能设置 %s 为组可写"
2062
2063 #: builtin/init-db.c:62
2064 #, c-format
2065 msgid "insanely long template name %s"
2066 msgstr "太长的模版名 %s"
2067
2068 #: builtin/init-db.c:67
2069 #, c-format
2070 msgid "cannot stat '%s'"
2071 msgstr "不能枚举 '%s' 状态"
2072
2073 #: builtin/init-db.c:73
2074 #, c-format
2075 msgid "cannot stat template '%s'"
2076 msgstr "不能枚举模版 '%s' 状态"
2077
2078 #: builtin/init-db.c:80
2079 #, c-format
2080 msgid "cannot opendir '%s'"
2081 msgstr "不能打开目录 '%s'"
2082
2083 #: builtin/init-db.c:97
2084 #, c-format
2085 msgid "cannot readlink '%s'"
2086 msgstr "不能读取链接 '%s'"
2087
2088 #: builtin/init-db.c:99
2089 #, c-format
2090 msgid "insanely long symlink %s"
2091 msgstr "太长的符号链接 %s"
2092
2093 #: builtin/init-db.c:102
2094 #, c-format
2095 msgid "cannot symlink '%s' '%s'"
2096 msgstr "不能创建符号链接 '%s' 到 '%s'"
2097
2098 #: builtin/init-db.c:106
2099 #, c-format
2100 msgid "cannot copy '%s' to '%s'"
2101 msgstr "不能拷贝 '%s' 至 '%s'"
2102
2103 #: builtin/init-db.c:110
2104 #, c-format
2105 msgid "ignoring template %s"
2106 msgstr "忽略模版 %s"
2107
2108 #: builtin/init-db.c:133
2109 #, c-format
2110 msgid "insanely long template path %s"
2111 msgstr "太长的模版路径 %s"
2112
2113 #: builtin/init-db.c:141
2114 #, c-format
2115 msgid "templates not found %s"
2116 msgstr "模版未找到 %s"
2117
2118 #: builtin/init-db.c:154
2119 #, c-format
2120 msgid "not copying templates of a wrong format version %d from '%s'"
2121 msgstr "未复制错误版本 %d 的模版自 '%s'"
2122
2123 #: builtin/init-db.c:192
2124 #, c-format
2125 msgid "insane git directory %s"
2126 msgstr "不正常的 git 目录 %s"
2127
2128 #: builtin/init-db.c:322 builtin/init-db.c:325
2129 #, c-format
2130 msgid "%s already exists"
2131 msgstr "%s 已经存在"
2132
2133 #: builtin/init-db.c:354
2134 #, c-format
2135 msgid "unable to handle file type %d"
2136 msgstr "不能处理 %d 类型的文件"
2137
2138 #: builtin/init-db.c:357
2139 #, c-format
2140 msgid "unable to move %s to %s"
2141 msgstr "不能移动 %s 至 %s"
2142
2143 #: builtin/init-db.c:362
2144 #, c-format
2145 msgid "Could not create git link %s"
2146 msgstr "不能创建 git link %s"
2147
2148 #.
2149 #. * TRANSLATORS: The first '%s' is either "Reinitialized
2150 #. * existing" or "Initialized empty", the second " shared" or
2151 #. * "", and the last '%s%s' is the verbatim directory name.
2152 #.
2153 #: builtin/init-db.c:419
2154 #, c-format
2155 msgid "%s%s Git repository in %s%s\n"
2156 msgstr "%s%s Git 版本库于 %s%s\n"
2157
2158 #: builtin/init-db.c:420
2159 msgid "Reinitialized existing"
2160 msgstr "重新初始化现存的"
2161
2162 #: builtin/init-db.c:420
2163 msgid "Initialized empty"
2164 msgstr "初始化空的"
2165
2166 # 汉字字串合并,之间无空格,故删除前导空格
2167 #: builtin/init-db.c:421
2168 msgid " shared"
2169 msgstr "共享的"
2170
2171 #: builtin/init-db.c:440
2172 msgid "cannot tell cwd"
2173 msgstr "无法获知当前路径"
2174
2175 #: builtin/init-db.c:521 builtin/init-db.c:528
2176 #, c-format
2177 msgid "cannot mkdir %s"
2178 msgstr "不能创建目录 %s"
2179
2180 #: builtin/init-db.c:532
2181 #, c-format
2182 msgid "cannot chdir to %s"
2183 msgstr "不能切换目录到 %s"
2184
2185 #: builtin/init-db.c:554
2186 #, c-format
2187 msgid ""
2188 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
2189 "dir=<directory>)"
2190 msgstr ""
2191 "不允许 %s(或 --work-tree=<directory>)而没有 %s(或 --git-dir=<directory>)"
2192
2193 #: builtin/init-db.c:578
2194 msgid "Cannot access current working directory"
2195 msgstr "不能访问当前工作目录"
2196
2197 #: builtin/init-db.c:585
2198 #, c-format
2199 msgid "Cannot access work tree '%s'"
2200 msgstr "不能访问工作区 '%s'"
2201
2202 #: builtin/log.c:185
2203 #, c-format
2204 msgid "Final output: %d %s\n"
2205 msgstr "最终输出:%d %s\n"
2206
2207 #: builtin/log.c:393 builtin/log.c:479
2208 #, c-format
2209 msgid "Could not read object %s"
2210 msgstr "无法读取对象 %s"
2211
2212 #: builtin/log.c:503
2213 #, c-format
2214 msgid "Unknown type: %d"
2215 msgstr "未知类型:%d"
2216
2217 #: builtin/log.c:592
2218 msgid "format.headers without value"
2219 msgstr "format.headers 没有值"
2220
2221 #: builtin/log.c:665
2222 msgid "name of output directory is too long"
2223 msgstr "输出目录名太长"
2224
2225 #: builtin/log.c:676
2226 #, c-format
2227 msgid "Cannot open patch file %s"
2228 msgstr "无法打开补丁文件 %s"
2229
2230 #: builtin/log.c:690
2231 msgid "Need exactly one range."
2232 msgstr "只需要一个范围。"
2233
2234 #: builtin/log.c:698
2235 msgid "Not a range."
2236 msgstr "不是一个范围。"
2237
2238 #: builtin/log.c:735
2239 msgid "Could not extract email from committer identity."
2240 msgstr "无法从提交者身份中提取邮件地址。"
2241
2242 #: builtin/log.c:781
2243 msgid "Cover letter needs email format"
2244 msgstr "信封需要邮件地址格式"
2245
2246 #: builtin/log.c:875
2247 #, c-format
2248 msgid "insane in-reply-to: %s"
2249 msgstr "不正常的 in-reply-to:%s"
2250
2251 #: builtin/log.c:948
2252 msgid "Two output directories?"
2253 msgstr "两个输出目录?"
2254
2255 #: builtin/log.c:1169
2256 #, c-format
2257 msgid "bogus committer info %s"
2258 msgstr "虚假的提交者信息 %s"
2259
2260 #: builtin/log.c:1214
2261 msgid "-n and -k are mutually exclusive."
2262 msgstr "-n 和 -k 互斥。"
2263
2264 #: builtin/log.c:1216
2265 msgid "--subject-prefix and -k are mutually exclusive."
2266 msgstr "--subject-prefix 和 -k 互斥。"
2267
2268 #: builtin/log.c:1221 builtin/shortlog.c:284
2269 #, c-format
2270 msgid "unrecognized argument: %s"
2271 msgstr "未识别的参数:%s"
2272
2273 #: builtin/log.c:1224
2274 msgid "--name-only does not make sense"
2275 msgstr "--name-only 无意义"
2276
2277 #: builtin/log.c:1226
2278 msgid "--name-status does not make sense"
2279 msgstr "--name-status 无意义"
2280
2281 #: builtin/log.c:1228
2282 msgid "--check does not make sense"
2283 msgstr "--check 无意义"
2284
2285 #: builtin/log.c:1251
2286 msgid "standard output, or directory, which one?"
2287 msgstr "标准输出或目录,哪一个?"
2288
2289 #: builtin/log.c:1253
2290 #, c-format
2291 msgid "Could not create directory '%s'"
2292 msgstr "无法创建目录 '%s'"
2293
2294 #: builtin/log.c:1406
2295 msgid "Failed to create output files"
2296 msgstr "无法创建输出文件"
2297
2298 #: builtin/log.c:1510
2299 #, c-format
2300 msgid ""
2301 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
2302 msgstr "无法找到跟踪的远程分支,请手工提供 <upstream>。\n"
2303
2304 #: builtin/log.c:1526 builtin/log.c:1528 builtin/log.c:1540
2305 #, c-format
2306 msgid "Unknown commit %s"
2307 msgstr "未知提交 %s"
2308
2309 #: builtin/merge.c:91
2310 msgid "switch `m' requires a value"
2311 msgstr "开关 `m' 需要一个值"
2312
2313 #: builtin/merge.c:128
2314 #, c-format
2315 msgid "Could not find merge strategy '%s'.\n"
2316 msgstr "无法找到合并策略 '%s'。\n"
2317
2318 #: builtin/merge.c:129
2319 #, c-format
2320 msgid "Available strategies are:"
2321 msgstr "可用的策略有:"
2322
2323 #: builtin/merge.c:134
2324 #, c-format
2325 msgid "Available custom strategies are:"
2326 msgstr "可用的自定义策略有:"
2327
2328 #: builtin/merge.c:241
2329 msgid "could not run stash."
2330 msgstr "不能进行进度保存。"
2331
2332 #: builtin/merge.c:246
2333 msgid "stash failed"
2334 msgstr "进度保存失败"
2335
2336 #: builtin/merge.c:251
2337 #, c-format
2338 msgid "not a valid object: %s"
2339 msgstr "不是一个有效对象:%s"
2340
2341 #: builtin/merge.c:270 builtin/merge.c:287
2342 msgid "read-tree failed"
2343 msgstr "读取树失败"
2344
2345 # 注意保持前导空格
2346 #: builtin/merge.c:317
2347 msgid " (nothing to squash)"
2348 msgstr " (无可压缩)"
2349
2350 #: builtin/merge.c:330
2351 #, c-format
2352 msgid "Squash commit -- not updating HEAD\n"
2353 msgstr "压缩提交 -- 未更新 HEAD\n"
2354
2355 #: builtin/merge.c:362
2356 msgid "Writing SQUASH_MSG"
2357 msgstr "写入 SQUASH_MSG"
2358
2359 #: builtin/merge.c:364
2360 msgid "Finishing SQUASH_MSG"
2361 msgstr "完成 SQUASH_MSG"
2362
2363 #: builtin/merge.c:386
2364 #, c-format
2365 msgid "No merge message -- not updating HEAD\n"
2366 msgstr "无合并信息 -- 未更新 HEAD\n"
2367
2368 #: builtin/merge.c:435
2369 #, c-format
2370 msgid "'%s' does not point to a commit"
2371 msgstr "'%s' 没有指向一个提交"
2372
2373 #: builtin/merge.c:534
2374 #, c-format
2375 msgid "Bad branch.%s.mergeoptions string: %s"
2376 msgstr "错的 branch.%s.mergeoptions 字串:%s"
2377
2378 #: builtin/merge.c:627
2379 msgid "git write-tree failed to write a tree"
2380 msgstr "git write-tree 无法写入一树对象"
2381
2382 #: builtin/merge.c:677
2383 msgid "failed to read the cache"
2384 msgstr "无法读取缓存"
2385
2386 #: builtin/merge.c:694
2387 msgid "Unable to write index."
2388 msgstr "不能写暂存区。"
2389
2390 #: builtin/merge.c:707
2391 msgid "Not handling anything other than two heads merge."
2392 msgstr "不能处理两个头合并之外的任何操作。"
2393
2394 #: builtin/merge.c:721
2395 #, c-format
2396 msgid "Unknown option for merge-recursive: -X%s"
2397 msgstr "merge-recursive 的未知选项:-X%s"
2398
2399 #: builtin/merge.c:735
2400 #, c-format
2401 msgid "unable to write %s"
2402 msgstr "不能写 %s"
2403
2404 #: builtin/merge.c:874
2405 #, c-format
2406 msgid "Could not read from '%s'"
2407 msgstr "不能从 '%s' 读取"
2408
2409 #: builtin/merge.c:883
2410 #, c-format
2411 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
2412 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
2413
2414 #: builtin/merge.c:889
2415 msgid ""
2416 "Please enter a commit message to explain why this merge is necessary,\n"
2417 "especially if it merges an updated upstream into a topic branch.\n"
2418 "\n"
2419 "Lines starting with '#' will be ignored, and an empty message aborts\n"
2420 "the commit.\n"
2421 msgstr ""
2422 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
2423 "合并到主题分支。\n"
2424 "\n"
2425 "以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
2426
2427 #: builtin/merge.c:913
2428 msgid "Empty commit message."
2429 msgstr "空提交信息。"
2430
2431 #: builtin/merge.c:925
2432 #, c-format
2433 msgid "Wonderful.\n"
2434 msgstr "太棒了。\n"
2435
2436 #: builtin/merge.c:998
2437 #, c-format
2438 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
2439 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
2440
2441 #: builtin/merge.c:1014
2442 #, c-format
2443 msgid "'%s' is not a commit"
2444 msgstr "'%s' 不是一个提交"
2445
2446 #: builtin/merge.c:1055
2447 msgid "No current branch."
2448 msgstr "当前不在分支上。"
2449
2450 #: builtin/merge.c:1057
2451 msgid "No remote for the current branch."
2452 msgstr "当前分支没有远程版本库。"
2453
2454 #: builtin/merge.c:1059
2455 msgid "No default upstream defined for the current branch."
2456 msgstr "当前分支未定义默认上游分支。"
2457
2458 #: builtin/merge.c:1064
2459 #, c-format
2460 msgid "No remote tracking branch for %s from %s"
2461 msgstr "%s 没有来自 %s 的远程跟踪分支"
2462
2463 #: builtin/merge.c:1186
2464 msgid "There is no merge to abort (MERGE_HEAD missing)."
2465 msgstr "没有要终止的合并(MERGE_HEAD 丢失)"
2466
2467 #: builtin/merge.c:1202 git-pull.sh:31
2468 msgid ""
2469 "You have not concluded your merge (MERGE_HEAD exists).\n"
2470 "Please, commit your changes before you can merge."
2471 msgstr ""
2472 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
2473 "请先提交您的修改,您才能合并。"
2474
2475 #: builtin/merge.c:1205 git-pull.sh:34
2476 msgid "You have not concluded your merge (MERGE_HEAD exists)."
2477 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
2478
2479 #: builtin/merge.c:1209
2480 msgid ""
2481 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
2482 "Please, commit your changes before you can merge."
2483 msgstr ""
2484 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
2485 "请先提交您的修改,您才能合并。"
2486
2487 #: builtin/merge.c:1212
2488 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
2489 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
2490
2491 #: builtin/merge.c:1221
2492 msgid "You cannot combine --squash with --no-ff."
2493 msgstr "您不能将 --squash 与 --no-ff 共用。"
2494
2495 #: builtin/merge.c:1226
2496 msgid "You cannot combine --no-ff with --ff-only."
2497 msgstr "您不能将 --no-ff 与 --ff-only 共用。"
2498
2499 #: builtin/merge.c:1233
2500 msgid "No commit specified and merge.defaultToUpstream not set."
2501 msgstr "未指出提交并且 merge.defaultToUpstream 未设置。"
2502
2503 #: builtin/merge.c:1264
2504 msgid "Can merge only exactly one commit into empty head"
2505 msgstr "只可将一个提交合并到空分支上"
2506
2507 #: builtin/merge.c:1267
2508 msgid "Squash commit into empty head not supported yet"
2509 msgstr "尚不支持到空分支的压缩提交"
2510
2511 #: builtin/merge.c:1269
2512 msgid "Non-fast-forward commit does not make sense into an empty head"
2513 msgstr "到空分支的非快进式提交没有意义"
2514
2515 #: builtin/merge.c:1273 builtin/merge.c:1317
2516 #, c-format
2517 msgid "%s - not something we can merge"
2518 msgstr "%s - 不是我们可以合并的东西"
2519
2520 #: builtin/merge.c:1383
2521 #, c-format
2522 msgid "Updating %s..%s\n"
2523 msgstr "更新 %s..%s\n"
2524
2525 #: builtin/merge.c:1421
2526 #, c-format
2527 msgid "Trying really trivial in-index merge...\n"
2528 msgstr "尝试非常小的暂存区内合并...\n"
2529
2530 #: builtin/merge.c:1428
2531 #, c-format
2532 msgid "Nope.\n"
2533 msgstr "无。\n"
2534
2535 #: builtin/merge.c:1460
2536 msgid "Not possible to fast-forward, aborting."
2537 msgstr "不可能快进式,终止。"
2538
2539 #: builtin/merge.c:1483 builtin/merge.c:1560
2540 #, c-format
2541 msgid "Rewinding the tree to pristine...\n"
2542 msgstr "将树回滚至原始状态...\n"
2543
2544 #: builtin/merge.c:1487
2545 #, c-format
2546 msgid "Trying merge strategy %s...\n"
2547 msgstr "尝试合并策略 %s...\n"
2548
2549 #: builtin/merge.c:1551
2550 #, c-format
2551 msgid "No merge strategy handled the merge.\n"
2552 msgstr "没有合并策略处理此合并。\n"
2553
2554 #: builtin/merge.c:1553
2555 #, c-format
2556 msgid "Merge with strategy %s failed.\n"
2557 msgstr "使用策略 %s 合并失败。\n"
2558
2559 #: builtin/merge.c:1562
2560 #, c-format
2561 msgid "Using the %s to prepare resolving by hand.\n"
2562 msgstr "使用 %s 以准备手工解决。\n"
2563
2564 #: builtin/merge.c:1573
2565 #, c-format
2566 msgid "Automatic merge went well; stopped before committing as requested\n"
2567 msgstr "自动合并进展顺利,按要求在提交前停止\n"
2568
2569 #: builtin/mv.c:108
2570 #, c-format
2571 msgid "Checking rename of '%s' to '%s'\n"
2572 msgstr "检查 '%s' 到 '%s' 的重命名\n"
2573
2574 #: builtin/mv.c:112
2575 msgid "bad source"
2576 msgstr "坏的源"
2577
2578 #: builtin/mv.c:115
2579 msgid "can not move directory into itself"
2580 msgstr "不能将目录移动到自身"
2581
2582 #: builtin/mv.c:118
2583 msgid "cannot move directory over file"
2584 msgstr "不能将目录移动到文件"
2585
2586 #: builtin/mv.c:128
2587 #, c-format
2588 msgid "Huh? %.*s is in index?"
2589 msgstr "嗯?%.*s 在暂存区中?"
2590
2591 #: builtin/mv.c:140
2592 msgid "source directory is empty"
2593 msgstr "源目录为空"
2594
2595 #: builtin/mv.c:171
2596 msgid "not under version control"
2597 msgstr "不在版本控制之下"
2598
2599 #: builtin/mv.c:173
2600 msgid "destination exists"
2601 msgstr "目标已存在"
2602
2603 #: builtin/mv.c:181
2604 #, c-format
2605 msgid "overwriting '%s'"
2606 msgstr "覆盖 '%s'"
2607
2608 #: builtin/mv.c:184
2609 msgid "Cannot overwrite"
2610 msgstr "不能覆盖"
2611
2612 #: builtin/mv.c:187
2613 msgid "multiple sources for the same target"
2614 msgstr "同一目标具有多个源"
2615
2616 #: builtin/mv.c:202
2617 #, c-format
2618 msgid "%s, source=%s, destination=%s"
2619 msgstr "%s,源=%s,目标=%s"
2620
2621 #: builtin/mv.c:212
2622 #, c-format
2623 msgid "Renaming %s to %s\n"
2624 msgstr "重命名 %s 至 %s\n"
2625
2626 #: builtin/mv.c:215
2627 #, c-format
2628 msgid "renaming '%s' failed"
2629 msgstr "重命名 '%s' 失败"
2630
2631 #: builtin/notes.c:139
2632 #, c-format
2633 msgid "unable to start 'show' for object '%s'"
2634 msgstr "不能为对象 '%s' 开始 'show'"
2635
2636 #: builtin/notes.c:145
2637 msgid "can't fdopen 'show' output fd"
2638 msgstr "不能打开 'show' 输出文件句柄"
2639
2640 #: builtin/notes.c:155
2641 #, c-format
2642 msgid "failed to close pipe to 'show' for object '%s'"
2643 msgstr "无法为对象 '%s' 的 'show' 关闭管道"
2644
2645 #: builtin/notes.c:158
2646 #, c-format
2647 msgid "failed to finish 'show' for object '%s'"
2648 msgstr "无法为对象 '%s' 完成 'show'"
2649
2650 #: builtin/notes.c:175 builtin/tag.c:343
2651 #, c-format
2652 msgid "could not create file '%s'"
2653 msgstr "不能创建文件 '%s'"
2654
2655 #: builtin/notes.c:189
2656 msgid "Please supply the note contents using either -m or -F option"
2657 msgstr "请通过 -m 或 -F 选项为注解提供内容"
2658
2659 #: builtin/notes.c:210 builtin/notes.c:973
2660 #, c-format
2661 msgid "Removing note for object %s\n"
2662 msgstr "删除对象 %s 的注解\n"
2663
2664 #: builtin/notes.c:215
2665 msgid "unable to write note object"
2666 msgstr "不能写注解对象"
2667
2668 #: builtin/notes.c:217
2669 #, c-format
2670 msgid "The note contents has been left in %s"
2671 msgstr "注解内容被留在文件 %s 中"
2672
2673 #: builtin/notes.c:251 builtin/tag.c:521
2674 #, c-format
2675 msgid "cannot read '%s'"
2676 msgstr "不能读取 '%s'"
2677
2678 #: builtin/notes.c:253 builtin/tag.c:524
2679 #, c-format
2680 msgid "could not open or read '%s'"
2681 msgstr "不能打开或读取 '%s'"
2682
2683 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
2684 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
2685 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
2686 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
2687 #, c-format
2688 msgid "Failed to resolve '%s' as a valid ref."
2689 msgstr "无法解析 '%s' 为一个有效引用"
2690
2691 #: builtin/notes.c:275
2692 #, c-format
2693 msgid "Failed to read object '%s'."
2694 msgstr "无法读取对象 '%s'。"
2695
2696 #: builtin/notes.c:299
2697 msgid "Cannot commit uninitialized/unreferenced notes tree"
2698 msgstr "不能提交未初始化/未引用的注解树"
2699
2700 #: builtin/notes.c:340
2701 #, c-format
2702 msgid "Bad notes.rewriteMode value: '%s'"
2703 msgstr "错误的 notes.rewriteMode 值:'%s'"
2704
2705 #: builtin/notes.c:350
2706 #, c-format
2707 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2708 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
2709
2710 #. TRANSLATORS: The first %s is the name of the
2711 #. environment variable, the second %s is its value
2712 #: builtin/notes.c:377
2713 #, c-format
2714 msgid "Bad %s value: '%s'"
2715 msgstr "错误的 %s 值:'%s'"
2716
2717 #: builtin/notes.c:441
2718 #, c-format
2719 msgid "Malformed input line: '%s'."
2720 msgstr "非法的输入行:'%s'。"
2721
2722 #: builtin/notes.c:456
2723 #, c-format
2724 msgid "Failed to copy notes from '%s' to '%s'"
2725 msgstr "无法从 '%s' 拷贝注解到 '%s'"
2726
2727 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
2728 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
2729 #: builtin/notes.c:1033
2730 msgid "too many parameters"
2731 msgstr "参数太多"
2732
2733 #: builtin/notes.c:513 builtin/notes.c:772
2734 #, c-format
2735 msgid "No note found for object %s."
2736 msgstr "未发现对象 %s 的注解。"
2737
2738 #: builtin/notes.c:580
2739 #, c-format
2740 msgid ""
2741 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
2742 "existing notes"
2743 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
2744
2745 #: builtin/notes.c:585 builtin/notes.c:662
2746 #, c-format
2747 msgid "Overwriting existing notes for object %s\n"
2748 msgstr "覆盖对象 %s 现存注解\n"
2749
2750 #: builtin/notes.c:635
2751 msgid "too few parameters"
2752 msgstr "参数太少"
2753
2754 #: builtin/notes.c:656
2755 #, c-format
2756 msgid ""
2757 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
2758 "existing notes"
2759 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
2760
2761 #: builtin/notes.c:668
2762 #, c-format
2763 msgid "Missing notes on source object %s. Cannot copy."
2764 msgstr "源对象 %s 缺少注解。不能拷贝。"
2765
2766 #: builtin/notes.c:717
2767 #, c-format
2768 msgid ""
2769 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
2770 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
2771 msgstr ""
2772 "选项 -m/-F/-c/-C 已为 'edit' 子命令废弃。\n"
2773 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
2774
2775 #: builtin/notes.c:971
2776 #, c-format
2777 msgid "Object %s has no note\n"
2778 msgstr "对象 %s 没有注解\n"
2779
2780 #: builtin/notes.c:1103
2781 #, c-format
2782 msgid "Unknown subcommand: %s"
2783 msgstr "未知子命令:%s"
2784
2785 #: builtin/pack-objects.c:2310
2786 #, c-format
2787 msgid "unsupported index version %s"
2788 msgstr "不支持的暂存区版本 %s"
2789
2790 #: builtin/pack-objects.c:2314
2791 #, c-format
2792 msgid "bad index version '%s'"
2793 msgstr "错误的暂存区版本 '%s'"
2794
2795 #: builtin/pack-objects.c:2322
2796 #, c-format
2797 msgid "option %s does not accept negative form"
2798 msgstr "选项 '%s' 不接受否定格式"
2799
2800 #: builtin/pack-objects.c:2326
2801 #, c-format
2802 msgid "unable to parse value '%s' for option %s"
2803 msgstr "不能解析值 '%s' 针对于选项 %s"
2804
2805 #: builtin/push.c:44
2806 msgid "tag shorthand without <tag>"
2807 msgstr "tag 简写没有跟 <tag> 参数"
2808
2809 #: builtin/push.c:63
2810 msgid "--delete only accepts plain target ref names"
2811 msgstr "--delete 只接受简单的引用名称"
2812
2813 #: builtin/push.c:73
2814 #, c-format
2815 msgid ""
2816 "You are not currently on a branch.\n"
2817 "To push the history leading to the current (detached HEAD)\n"
2818 "state now, use\n"
2819 "\n"
2820 " git push %s HEAD:<name-of-remote-branch>\n"
2821 msgstr ""
2822 "您当前不在一个分支上。\n"
2823 "现在为推送当前历史(分离头指针),使用\n"
2824 "\n"
2825 " git push %s HEAD:<name-of-remote-branch>\n"
2826
2827 #: builtin/push.c:80
2828 #, c-format
2829 msgid ""
2830 "The current branch %s has no upstream branch.\n"
2831 "To push the current branch and set the remote as upstream, use\n"
2832 "\n"
2833 " git push --set-upstream %s %s\n"
2834 msgstr ""
2835 "当前分支 %s 没有对应的上游分支。\n"
2836 "为推送当前分支并建立与远程上游的跟踪,使用\n"
2837 "\n"
2838 " git push --set-upstream %s %s\n"
2839
2840 #: builtin/push.c:88
2841 #, c-format
2842 msgid "The current branch %s has multiple upstream branches, refusing to push."
2843 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
2844
2845 #: builtin/push.c:111
2846 msgid ""
2847 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
2848 msgstr "您没有为推送提供任何引用表达式,并且 push.default 为 \"nothing\"。"
2849
2850 #: builtin/push.c:131
2851 #, c-format
2852 msgid "Pushing to %s\n"
2853 msgstr "推送到 %s\n"
2854
2855 #: builtin/push.c:135
2856 #, c-format
2857 msgid "failed to push some refs to '%s'"
2858 msgstr "无法推送一些引用到 '%s'"
2859
2860 #: builtin/push.c:143
2861 #, c-format
2862 msgid ""
2863 "To prevent you from losing history, non-fast-forward updates were rejected\n"
2864 "Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
2865 "'Note about fast-forwards' section of 'git push --help' for details.\n"
2866 msgstr ""
2867 "为防止您丢失提交历史,禁止非快进式推送。\n"
2868 "再次推送前先与远程变更合并(如 'git pull')。详见\n"
2869 "'git push --help' 中的 'Note about fast-forwards' 小节。\n"
2870
2871 #: builtin/push.c:160
2872 #, c-format
2873 msgid "bad repository '%s'"
2874 msgstr "错误的版本库 '%s'"
2875
2876 #: builtin/push.c:161
2877 msgid ""
2878 "No configured push destination.\n"
2879 "Either specify the URL from the command-line or configure a remote "
2880 "repository using\n"
2881 "\n"
2882 " git remote add <name> <url>\n"
2883 "\n"
2884 "and then push using the remote name\n"
2885 "\n"
2886 " git push <name>\n"
2887 msgstr ""
2888 "未配置推送目标。\n"
2889 "或者通过命令行提供URL,或者用下面命令配置一个远程版本库\n"
2890 "\n"
2891 " git remote add <name> <url>\n"
2892 "\n"
2893 "然后使用该远程版本库名执行推送\n"
2894 "\n"
2895 " git push <name>\n"
2896
2897 #: builtin/push.c:176
2898 msgid "--all and --tags are incompatible"
2899 msgstr "--all 和 --tags 不兼容"
2900
2901 #: builtin/push.c:177
2902 msgid "--all can't be combined with refspecs"
2903 msgstr "--all 不能和引用表达式共用"
2904
2905 #: builtin/push.c:182
2906 msgid "--mirror and --tags are incompatible"
2907 msgstr "--mirror 和 --tags 不兼容"
2908
2909 #: builtin/push.c:183
2910 msgid "--mirror can't be combined with refspecs"
2911 msgstr "--mirror 不能和引用表达式共用"
2912
2913 #: builtin/push.c:188
2914 msgid "--all and --mirror are incompatible"
2915 msgstr "--all 和 --mirror 不兼容"
2916
2917 #: builtin/push.c:274
2918 msgid "--delete is incompatible with --all, --mirror and --tags"
2919 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
2920
2921 #: builtin/push.c:276
2922 msgid "--delete doesn't make sense without any refs"
2923 msgstr "--delete 未接任何引用没有意义"
2924
2925 #: builtin/reset.c:33
2926 msgid "mixed"
2927 msgstr "混杂"
2928
2929 #: builtin/reset.c:33
2930 msgid "soft"
2931 msgstr "软性"
2932
2933 #: builtin/reset.c:33
2934 msgid "hard"
2935 msgstr "硬性"
2936
2937 #: builtin/reset.c:33
2938 msgid "keep"
2939 msgstr "保持"
2940
2941 #: builtin/reset.c:77
2942 msgid "You do not have a valid HEAD."
2943 msgstr "您没有一个有效的 HEAD。"
2944
2945 #: builtin/reset.c:79
2946 msgid "Failed to find tree of HEAD."
2947 msgstr "无法找到 HEAD 指向的树。"
2948
2949 #: builtin/reset.c:85
2950 #, c-format
2951 msgid "Failed to find tree of %s."
2952 msgstr "无法找到 %s 指向的树。"
2953
2954 #: builtin/reset.c:96
2955 msgid "Could not write new index file."
2956 msgstr "无法写入新的暂存区文件。"
2957
2958 #: builtin/reset.c:106
2959 #, c-format
2960 msgid "HEAD is now at %s"
2961 msgstr "HEAD 现在位于 %s"
2962
2963 #: builtin/reset.c:130
2964 msgid "Could not read index"
2965 msgstr "不能读取暂存区"
2966
2967 #: builtin/reset.c:133
2968 msgid "Unstaged changes after reset:"
2969 msgstr "重置后变更撤出暂存区:"
2970
2971 # 汉字之间无空格,故删除%s前后空格
2972 #: builtin/reset.c:223
2973 #, c-format
2974 msgid "Cannot do a %s reset in the middle of a merge."
2975 msgstr "在合并过程中不能做%s重置操作。"
2976
2977 #: builtin/reset.c:297
2978 #, c-format
2979 msgid "Could not parse object '%s'."
2980 msgstr "不能解析对象 '%s'。"
2981
2982 #: builtin/reset.c:302
2983 msgid "--patch is incompatible with --{hard,mixed,soft}"
2984 msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
2985
2986 #: builtin/reset.c:311
2987 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
2988 msgstr "--mixed 带路径已弃用,代之以 'git reset -- <paths>'。"
2989
2990 # 汉字之间无空格,故删除%s前后空格
2991 #: builtin/reset.c:313
2992 #, c-format
2993 msgid "Cannot do %s reset with paths."
2994 msgstr "不能带路径进行%s重置。"
2995
2996 # 汉字之间无空格,故删除%s前后空格
2997 #: builtin/reset.c:325
2998 #, c-format
2999 msgid "%s reset is not allowed in a bare repository"
3000 msgstr "不能对裸版本库进行%s重置"
3001
3002 #: builtin/reset.c:341
3003 #, c-format
3004 msgid "Could not reset index file to revision '%s'."
3005 msgstr "不能重置暂存区至版本 '%s'。"
3006
3007 #: builtin/revert.c:70 builtin/revert.c:91
3008 #, c-format
3009 msgid "%s: %s cannot be used with %s"
3010 msgstr "%s: %s 不能和 %s 共用"
3011
3012 #: builtin/revert.c:126
3013 msgid "program error"
3014 msgstr "程序错误"
3015
3016 #: builtin/revert.c:209
3017 msgid "revert failed"
3018 msgstr "还原失败"
3019
3020 #: builtin/revert.c:224
3021 msgid "cherry-pick failed"
3022 msgstr "拣选失败"
3023
3024 #: builtin/rm.c:109
3025 #, c-format
3026 msgid ""
3027 "'%s' has staged content different from both the file and the HEAD\n"
3028 "(use -f to force removal)"
3029 msgstr ""
3030 "'%s' 暂存的内容和工作区文件及 HEAD 中的都不一样\n"
3031 "(使用 -f 强制删除)"
3032
3033 #: builtin/rm.c:115
3034 #, c-format
3035 msgid ""
3036 "'%s' has changes staged in the index\n"
3037 "(use --cached to keep the file, or -f to force removal)"
3038 msgstr ""
3039 "'%s' 有变更已加入暂存区中\n"
3040 "(使用 --cached 保存文件,或用 -f 强制删除)"
3041
3042 #: builtin/rm.c:119
3043 #, c-format
3044 msgid ""
3045 "'%s' has local modifications\n"
3046 "(use --cached to keep the file, or -f to force removal)"
3047 msgstr ""
3048 "'%s' 有本地修改\n"
3049 "(使用 --cached 保存文件,或用 -f 强制删除)"
3050
3051 #: builtin/rm.c:194
3052 #, c-format
3053 msgid "not removing '%s' recursively without -r"
3054 msgstr "未提供 -r 选项不会递归删除 '%s'"
3055
3056 #: builtin/rm.c:230
3057 #, c-format
3058 msgid "git rm: unable to remove %s"
3059 msgstr "git rm:不能删除 %s"
3060
3061 #: builtin/shortlog.c:157
3062 #, c-format
3063 msgid "Missing author: %s"
3064 msgstr "缺少作者:%s"
3065
3066 #: builtin/tag.c:58
3067 #, c-format
3068 msgid "malformed object at '%s'"
3069 msgstr "非法的对象于 '%s'"
3070
3071 #: builtin/tag.c:205
3072 #, c-format
3073 msgid "tag name too long: %.*s..."
3074 msgstr "tag 名字太长:%.*s..."
3075
3076 #: builtin/tag.c:210
3077 #, c-format
3078 msgid "tag '%s' not found."
3079 msgstr "tag '%s' 未发现。"
3080
3081 #: builtin/tag.c:225
3082 #, c-format
3083 msgid "Deleted tag '%s' (was %s)\n"
3084 msgstr "已删除 tag '%s'(曾为 %s)\n"
3085
3086 #: builtin/tag.c:237
3087 #, c-format
3088 msgid "could not verify the tag '%s'"
3089 msgstr "不能校验 tag '%s'"
3090
3091 #: builtin/tag.c:247
3092 msgid ""
3093 "\n"
3094 "#\n"
3095 "# Write a tag message\n"
3096 "# Lines starting with '#' will be ignored.\n"
3097 "#\n"
3098 msgstr ""
3099 "\n"
3100 "#\n"
3101 "# 输入一个 tag 说明\n"
3102 "# 以 '#' 开头的行将被忽略。\n"
3103 "#\n"
3104
3105 #: builtin/tag.c:254
3106 msgid ""
3107 "\n"
3108 "#\n"
3109 "# Write a tag message\n"
3110 "# Lines starting with '#' will be kept; you may remove them yourself if you "
3111 "want to.\n"
3112 "#\n"
3113 msgstr ""
3114 "\n"
3115 "#\n"
3116 "# 输入一个 tag 说明\n"
3117 "# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
3118 "#\n"
3119
3120 #: builtin/tag.c:294
3121 msgid "unable to sign the tag"
3122 msgstr "无法签署 tag"
3123
3124 #: builtin/tag.c:296
3125 msgid "unable to write tag file"
3126 msgstr "无法写 tag 文件"
3127
3128 #: builtin/tag.c:321
3129 msgid "bad object type."
3130 msgstr "无效的对象类型"
3131
3132 #: builtin/tag.c:334
3133 msgid "tag header too big."
3134 msgstr "tag 头信息太大"
3135
3136 #: builtin/tag.c:366
3137 msgid "no tag message?"
3138 msgstr "无 tag 说明?"
3139
3140 #: builtin/tag.c:372
3141 #, c-format
3142 msgid "The tag message has been left in %s\n"
3143 msgstr "tag 说明被保留在 %s\n"
3144
3145 #: builtin/tag.c:421
3146 msgid "switch 'points-at' requires an object"
3147 msgstr "开关 'points-at' 需要一个对象"
3148
3149 #: builtin/tag.c:423
3150 #, c-format
3151 msgid "malformed object name '%s'"
3152 msgstr "非法的对象名 '%s'"
3153
3154 #: builtin/tag.c:502
3155 msgid "-n option is only allowed with -l."
3156 msgstr "-n 选项只允许和 -l 共用。"
3157
3158 #: builtin/tag.c:504
3159 msgid "--contains option is only allowed with -l."
3160 msgstr "--contains 选项只允许和 -l 共用。"
3161
3162 #: builtin/tag.c:506
3163 msgid "--points-at option is only allowed with -l."
3164 msgstr "--points-at 选项只允许和 -l 共用。"
3165
3166 #: builtin/tag.c:514
3167 msgid "only one -F or -m option is allowed."
3168 msgstr "只允许一个 -F 或 -m 选项。"
3169
3170 #: builtin/tag.c:534
3171 msgid "too many params"
3172 msgstr "太多参数"
3173
3174 #: builtin/tag.c:540
3175 #, c-format
3176 msgid "'%s' is not a valid tag name."
3177 msgstr "'%s' 不是一个有效的tag名称"
3178
3179 #: builtin/tag.c:545
3180 #, c-format
3181 msgid "tag '%s' already exists"
3182 msgstr "tag '%s' 已存在"
3183
3184 #: builtin/tag.c:563
3185 #, c-format
3186 msgid "%s: cannot lock the ref"
3187 msgstr "%s:不能锁定引用"
3188
3189 #: builtin/tag.c:565
3190 #, c-format
3191 msgid "%s: cannot update the ref"
3192 msgstr "%s:不能更新引用"
3193
3194 #: builtin/tag.c:567
3195 #, c-format
3196 msgid "Updated tag '%s' (was %s)\n"
3197 msgstr "已更新tag '%s'(曾为 %s)\n"
3198
3199 #: git-am.sh:49
3200 msgid "You need to set your committer info first"
3201 msgstr "您需要先设置你的提交者信息"
3202
3203 #: git-am.sh:135
3204 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
3205 msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
3206
3207 #: git-am.sh:144
3208 msgid ""
3209 "Did you hand edit your patch?\n"
3210 "It does not apply to blobs recorded in its index."
3211 msgstr ""
3212 "您是否曾手动编辑过您的补丁?\n"
3213 "无法应用补丁到暂存区的数据中。"
3214
3215 #: git-am.sh:153
3216 msgid "Falling back to patching base and 3-way merge..."
3217 msgstr "转而使用补丁应用的基础版本和三路合并..."
3218
3219 #: git-am.sh:265
3220 msgid "Only one StGIT patch series can be applied at once"
3221 msgstr "一次只能有一个 StGIT 补丁队列被应用"
3222
3223 #: git-am.sh:352
3224 #, sh-format
3225 msgid "Patch format $patch_format is not supported."
3226 msgstr "不支持 $patch_format 补丁格式。"
3227
3228 #: git-am.sh:354
3229 msgid "Patch format detection failed."
3230 msgstr "补丁格式检测失败。"
3231
3232 #: git-am.sh:406
3233 msgid "-d option is no longer supported. Do not use."
3234 msgstr "不再支持 -d 选项。不要使用。"
3235
3236 #: git-am.sh:469
3237 #, sh-format
3238 msgid "previous rebase directory $dotest still exists but mbox given."
3239 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
3240
3241 #: git-am.sh:474
3242 msgid "Please make up your mind. --skip or --abort?"
3243 msgstr "请下决心。--skip 或是 --abort ?"
3244
3245 #: git-am.sh:501
3246 msgid "Resolve operation not in progress, we are not resuming."
3247 msgstr "解决操作未进行,我们不会继续。"
3248
3249 #: git-am.sh:567
3250 #, sh-format
3251 msgid "Dirty index: cannot apply patches (dirty: $files)"
3252 msgstr "脏的暂存区:不能应用补丁(脏文件:$files)"
3253
3254 #: git-am.sh:743
3255 msgid "cannot be interactive without stdin connected to a terminal."
3256 msgstr "没有和终端关联的标准输入不能进行交互式操作。"
3257
3258 # 注意保持句尾空格
3259 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3260 #. in your translation. The program will only accept English
3261 #. input at this point.
3262 #: git-am.sh:754
3263 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3264 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3265
3266 #: git-am.sh:790
3267 #, sh-format
3268 msgid "Applying: $FIRSTLINE"
3269 msgstr "正应用:$FIRSTLINE"
3270
3271 #: git-am.sh:835
3272 msgid "No changes -- Patch already applied."
3273 msgstr "没有变更 -- 补丁已经应用过。"
3274
3275 #: git-am.sh:861
3276 msgid "applying to an empty history"
3277 msgstr "正应用到一个空历史上"
3278
3279 # 注意保持句尾空格
3280 #. TRANSLATORS: Make sure to include [Y] and [n] in your
3281 #. translation. The program will only accept English input
3282 #. at this point.
3283 #: git-bisect.sh:54
3284 msgid "Do you want me to do it for you [Y/n]? "
3285 msgstr "您想让我为您这样做么[Y/n]? "
3286
3287 #: git-bisect.sh:95
3288 #, sh-format
3289 msgid "unrecognised option: '$arg'"
3290 msgstr "未识别的选项:'$arg'"
3291
3292 #: git-bisect.sh:99
3293 #, sh-format
3294 msgid "'$arg' does not appear to be a valid revision"
3295 msgstr "'$arg' 看起来不像是一个有效的版本"
3296
3297 #: git-bisect.sh:117
3298 msgid "Bad HEAD - I need a HEAD"
3299 msgstr "坏的 HEAD - 我需要一个 HEAD"
3300
3301 #: git-bisect.sh:130
3302 #, sh-format
3303 msgid ""
3304 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
3305 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
3306
3307 #: git-bisect.sh:140
3308 msgid "won't bisect on seeked tree"
3309 msgstr "不会在已查找过的树上二分查找"
3310
3311 #: git-bisect.sh:144
3312 msgid "Bad HEAD - strange symbolic ref"
3313 msgstr "错误的 HEAD - 奇怪的符号引用"
3314
3315 #: git-bisect.sh:189
3316 #, sh-format
3317 msgid "Bad bisect_write argument: $state"
3318 msgstr "错误的bisect_write参数:$state"
3319
3320 #: git-bisect.sh:218
3321 #, sh-format
3322 msgid "Bad rev input: $arg"
3323 msgstr "输入错误版本:$arg"
3324
3325 #: git-bisect.sh:232
3326 msgid "Please call 'bisect_state' with at least one argument."
3327 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
3328
3329 #: git-bisect.sh:244
3330 #, sh-format
3331 msgid "Bad rev input: $rev"
3332 msgstr "输入坏的版本:$rev"
3333
3334 #: git-bisect.sh:250
3335 msgid "'git bisect bad' can take only one argument."
3336 msgstr "'git bisect bad' 只能带一个参数。"
3337
3338 # 注意保持句尾空格
3339 #. TRANSLATORS: Make sure to include [Y] and [n] in your
3340 #. translation. The program will only accept English input
3341 #. at this point.
3342 #: git-bisect.sh:279
3343 msgid "Are you sure [Y/n]? "
3344 msgstr "您确认么[Y/n]? "
3345
3346 #: git-bisect.sh:354
3347 #, sh-format
3348 msgid "'$invalid' is not a valid commit"
3349 msgstr "'$invalid' 不是一个有效的提交"
3350
3351 #: git-bisect.sh:363
3352 #, sh-format
3353 msgid ""
3354 "Could not check out original HEAD '$branch'.\n"
3355 "Try 'git bisect reset <commit>'."
3356 msgstr ""
3357 "不能检出原始 HEAD '$branch'。\n"
3358 "尝试 'git bisect reset <commit>'。"
3359
3360 #: git-bisect.sh:390
3361 msgid "No logfile given"
3362 msgstr "未提供日志文件"
3363
3364 #: git-bisect.sh:391
3365 #, sh-format
3366 msgid "cannot read $file for replaying"
3367 msgstr "不能读取 $file 来重放"
3368
3369 #: git-bisect.sh:408
3370 msgid "?? what are you talking about?"
3371 msgstr "?? 您在说什么?"
3372
3373 #: git-bisect.sh:474
3374 msgid "We are not bisecting."
3375 msgstr "我们没有进行二分查找。"
3376
3377 #: git-pull.sh:21
3378 msgid ""
3379 "Pull is not possible because you have unmerged files.\n"
3380 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
3381 "as appropriate to mark resolution, or use 'git commit -a'."
3382 msgstr ""
3383 "Pull 不可用,因为你尚有未合并的文件。请先在工作区改正文件,\n"
3384 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
3385 "或使用 'git commit -a'。"
3386
3387 #: git-pull.sh:25
3388 msgid "Pull is not possible because you have unmerged files."
3389 msgstr "Pull 不可用,因为你尚有未合并的文件。"
3390
3391 #: git-pull.sh:197
3392 msgid "updating an unborn branch with changes added to the index"
3393 msgstr "更新尚未诞生的分支,变更添加至暂存区"
3394
3395 #: git-pull.sh:253
3396 msgid "Cannot merge multiple branches into empty head"
3397 msgstr "无法将多个分支合并到空分支"
3398
3399 #: git-pull.sh:257
3400 msgid "Cannot rebase onto multiple branches"
3401 msgstr "无法变基到多个分支"
3402
3403 #: git-stash.sh:51
3404 msgid "git stash clear with parameters is unimplemented"
3405 msgstr "git stash clear 不支持参数"
3406
3407 #: git-stash.sh:74
3408 msgid "You do not have the initial commit yet"
3409 msgstr "您尚未建立初始提交"
3410
3411 #: git-stash.sh:89
3412 msgid "Cannot save the current index state"
3413 msgstr "无法保存当前暂存区状态"
3414
3415 #: git-stash.sh:123 git-stash.sh:136
3416 msgid "Cannot save the current worktree state"
3417 msgstr "无法保存当前工作区状态"
3418
3419 #: git-stash.sh:140
3420 msgid "No changes selected"
3421 msgstr "没有修改被选择"
3422
3423 #: git-stash.sh:143
3424 msgid "Cannot remove temporary index (can't happen)"
3425 msgstr "无法删除临时暂存区(不应发生)"
3426
3427 #: git-stash.sh:156
3428 msgid "Cannot record working tree state"
3429 msgstr "不能记录工作区状态"
3430
3431 #: git-stash.sh:223
3432 msgid "No local changes to save"
3433 msgstr "没有要保存的本地修改"
3434
3435 #: git-stash.sh:227
3436 msgid "Cannot initialize stash"
3437 msgstr "无法初始化stash"
3438
3439 #: git-stash.sh:235
3440 msgid "Cannot save the current status"
3441 msgstr "无法保存当前状态"
3442
3443 #: git-stash.sh:253
3444 msgid "Cannot remove worktree changes"
3445 msgstr "无法删除工作区变更"
3446
3447 #: git-stash.sh:352
3448 msgid "No stash found."
3449 msgstr "未发现stash。"
3450
3451 #: git-stash.sh:359
3452 #, sh-format
3453 msgid "Too many revisions specified: $REV"
3454 msgstr "提供太多的版本:$REV"
3455
3456 #: git-stash.sh:365
3457 #, sh-format
3458 msgid "$reference is not valid reference"
3459 msgstr "$reference 不是有效的引用"
3460
3461 #: git-stash.sh:393
3462 #, sh-format
3463 msgid "'$args' is not a stash-like commit"
3464 msgstr "'$args' 不是stash样提交"
3465
3466 #: git-stash.sh:404
3467 #, sh-format
3468 msgid "'$args' is not a stash reference"
3469 msgstr "'$args' 不是一个stash引用"
3470
3471 #: git-stash.sh:412
3472 msgid "unable to refresh index"
3473 msgstr "无法刷新暂存区"
3474
3475 #: git-stash.sh:416
3476 msgid "Cannot apply a stash in the middle of a merge"
3477 msgstr "无法在合并过程中恢复进度"
3478
3479 #: git-stash.sh:424
3480 msgid "Conflicts in index. Try without --index."
3481 msgstr "暂存区冲突。尝试不用 --index。"
3482
3483 #: git-stash.sh:426
3484 msgid "Could not save index tree"
3485 msgstr "无法保存暂存区"
3486
3487 #: git-stash.sh:460
3488 msgid "Cannot unstage modified files"
3489 msgstr "无法还原修改的文件"
3490
3491 #: git-stash.sh:491
3492 #, sh-format
3493 msgid "Dropped ${REV} ($s)"
3494 msgstr "丢弃了 ${REV} ($s)"
3495
3496 #: git-stash.sh:492
3497 #, sh-format
3498 msgid "${REV}: Could not drop stash entry"
3499 msgstr "${REV}: 无法丢弃进度条目"
3500
3501 #: git-stash.sh:499
3502 msgid "No branch name specified"
3503 msgstr "未指定分支名"
3504
3505 #: git-stash.sh:570
3506 msgid "(To restore them type \"git stash apply\")"
3507 msgstr "(为恢复数据输入 \"git stash apply\")"
3508
3509 #: git-submodule.sh:56
3510 #, sh-format
3511 msgid "cannot strip one component off url '$remoteurl'"
3512 msgstr "无法从 url '$remoteurl' 剥离一个组件"
3513
3514 #: git-submodule.sh:108
3515 #, sh-format
3516 msgid "No submodule mapping found in .gitmodules for path '$path'"
3517 msgstr "未在 .gitmodules 中发现路径 '$path' 的子模组映射"
3518
3519 #: git-submodule.sh:173
3520 #, sh-format
3521 msgid "Clone of '$url' into submodule path '$path' failed"
3522 msgstr "克隆 '$url' 到子模组路径 '$path' 失败"
3523
3524 #: git-submodule.sh:247
3525 #, sh-format
3526 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
3527 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
3528
3529 #: git-submodule.sh:264
3530 #, sh-format
3531 msgid "'$path' already exists in the index"
3532 msgstr "'$path' 已经存在于暂存区中"
3533
3534 #: git-submodule.sh:281
3535 #, sh-format
3536 msgid "'$path' already exists and is not a valid git repo"
3537 msgstr "'$path' 已存在且不是一个有效的 git 版本库"
3538
3539 #: git-submodule.sh:295
3540 #, sh-format
3541 msgid "Unable to checkout submodule '$path'"
3542 msgstr "不能检出子模组 '$path'"
3543
3544 #: git-submodule.sh:300
3545 #, sh-format
3546 msgid "Failed to add submodule '$path'"
3547 msgstr "无法添加子模组 '$path'"
3548
3549 #: git-submodule.sh:305
3550 #, sh-format
3551 msgid "Failed to register submodule '$path'"
3552 msgstr "无法注册子模组 '$path'"
3553
3554 #: git-submodule.sh:347
3555 #, sh-format
3556 msgid "Entering '$prefix$path'"
3557 msgstr "正在进入 '$prefix$path'"
3558
3559 #: git-submodule.sh:359
3560 #, sh-format
3561 msgid "Stopping at '$path'; script returned non-zero status."
3562 msgstr "停止于 '$path',脚本返回非零值。"
3563
3564 #: git-submodule.sh:401
3565 #, sh-format
3566 msgid "No url found for submodule path '$path' in .gitmodules"
3567 msgstr "在 .gitmodules 中未找到子模组路径 '$path' 的url"
3568
3569 #: git-submodule.sh:410
3570 #, sh-format
3571 msgid "Failed to register url for submodule path '$path'"
3572 msgstr "无法为子模组路径 '$path' 注册 url"
3573
3574 #: git-submodule.sh:418
3575 #, sh-format
3576 msgid "Failed to register update mode for submodule path '$path'"
3577 msgstr "无法为子模组路径 '$path' 注册更新模式"
3578
3579 #: git-submodule.sh:420
3580 #, sh-format
3581 msgid "Submodule '$name' ($url) registered for path '$path'"
3582 msgstr "子模组 '$name' ($url) 已为路径 '$path' 注册"
3583
3584 #: git-submodule.sh:519
3585 #, sh-format
3586 msgid ""
3587 "Submodule path '$path' not initialized\n"
3588 "Maybe you want to use 'update --init'?"
3589 msgstr ""
3590 "子模组路径 '$path' 没有初始化\n"
3591 "也许你想用 'update --init'?"
3592
3593 #: git-submodule.sh:532
3594 #, sh-format
3595 msgid "Unable to find current revision in submodule path '$path'"
3596 msgstr "无法在子模组路径 '$path' 中找到当前版本"
3597
3598 #: git-submodule.sh:551
3599 #, sh-format
3600 msgid "Unable to fetch in submodule path '$path'"
3601 msgstr "无法在子模组路径 '$path' 中获取"
3602
3603 #: git-submodule.sh:565
3604 #, sh-format
3605 msgid "Unable to rebase '$sha1' in submodule path '$path'"
3606 msgstr "无法在子模组路径 '$path' 中变基 '$sha1'"
3607
3608 #: git-submodule.sh:566
3609 #, sh-format
3610 msgid "Submodule path '$path': rebased into '$sha1'"
3611 msgstr "子模组路径 '$path':变基至 '$sha1'"
3612
3613 #: git-submodule.sh:571
3614 #, sh-format
3615 msgid "Unable to merge '$sha1' in submodule path '$path'"
3616 msgstr "无法合并 '$sha1' 到子模组路径 '$path' 中"
3617
3618 #: git-submodule.sh:572
3619 #, sh-format
3620 msgid "Submodule path '$path': merged in '$sha1'"
3621 msgstr "子模组路径 '$path':已合并入 '$sha1'"
3622
3623 #: git-submodule.sh:577
3624 #, sh-format
3625 msgid "Unable to checkout '$sha1' in submodule path '$path'"
3626 msgstr "无法在子模组路径 '$path' 中检出 '$sha1'"
3627
3628 #: git-submodule.sh:578
3629 #, sh-format
3630 msgid "Submodule path '$path': checked out '$sha1'"
3631 msgstr "子模组路径 '$path':检出 '$sha1'"
3632
3633 #: git-submodule.sh:600 git-submodule.sh:923
3634 #, sh-format
3635 msgid "Failed to recurse into submodule path '$path'"
3636 msgstr "无法递归进子模组路径 '$path'"
3637
3638 #: git-submodule.sh:708
3639 msgid "--"
3640 msgstr "--"
3641
3642 # 注意保持前导空格
3643 #: git-submodule.sh:766
3644 #, sh-format
3645 msgid " Warn: $name doesn't contain commit $sha1_src"
3646 msgstr " 警告:$name 未包含提交 $sha1_src"
3647
3648 # 注意保持前导空格
3649 #: git-submodule.sh:769
3650 #, sh-format
3651 msgid " Warn: $name doesn't contain commit $sha1_dst"
3652 msgstr " 警告:$name 未包含提交 $sha1_dst"
3653
3654 # 注意保持前导空格
3655 #: git-submodule.sh:772
3656 #, sh-format
3657 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
3658 msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
3659
3660 #: git-submodule.sh:797
3661 msgid "blob"
3662 msgstr "blob"
3663
3664 #: git-submodule.sh:798
3665 msgid "submodule"
3666 msgstr "子模组"
3667
3668 #: git-submodule.sh:969
3669 #, sh-format
3670 msgid "Synchronizing submodule url for '$name'"
3671 msgstr "为 '$name' 同步子模组url"