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