]> git.ipfire.org Git - thirdparty/git.git/blob - po/zh_CN.po
l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)
[thirdparty/git.git] / po / zh_CN.po
1 # Chinese translations for Git package
2 # Git 软件包的简体中文翻译.
3 # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
4 # This file is distributed under the same license as the Git package.
5 # Contributors:
6 # - Jiang Xin <worldhello.net AT gmail.com>
7 # - Lian Cheng <rhythm.mail AT gmail.com>
8 # - Ray Chen <oldsharp AT gmail.com>
9 # - Riku <lu.riku AT gmail.com>
10 # - Thynson <lanxingcan AT gmail.com>
11 # - ws3389 <willsmith3389 AT gmail.com>
12 # - Wang Sheng <wangsheng2008love AT 163.com>
13 # - Yichao Yu <yyc1992 AT gmail.com>
14 # - Zhuang Ya <zhuangya AT me.com>
15 #
16 # Git glossary for Chinese translators
17 #
18 # English | Chinese
19 # ---------------------------------+--------------------------------------
20 # 3-way merge | 三方合并
21 # abbreviate | 简写(的 SHA-1 值)
22 # alternate object database | 备用对象库
23 # amend | 修补
24 # ancestor | 祖先,祖先提交
25 # annotated tag | 附注标签
26 # bare repository | 纯仓库
27 # bisect | 二分查找
28 # blob object | 数据对象
29 # branch | 分支
30 # bundle | 包
31 # bypass | 绕过
32 # cache | 索引(的别称)
33 # chain | (提交)链
34 # changeset | 变更集
35 # checkout | 检出
36 # checksum | 校验,校验和
37 # cherry-picking | 拣选
38 # clean | 干净(的工作区)
39 # clone | 克隆
40 # commit | 提交
41 # commit message | 提交说明
42 # commit object | 提交对象
43 # commit-ish (also committish) | 提交号
44 # conflict | 冲突
45 # core Git | 核心 Git 工具
46 # DAG | 有向无环图
47 # dangling object | 摇摆对象
48 # detached HEAD | 分离头指针
49 # directory | 目录
50 # dirty | 脏(的工作区)
51 # dumb HTTP protocol | 哑 HTTP 协议
52 # evil merge | 坏合并(合并引入了父提交没有的修改)
53 # fast-forward | 快进
54 # fetch | 获取
55 # file system | 文件系统
56 # fork | 派生
57 # Git archive | 仓库(对于 arch 用户)
58 # gitfile | gitfile(仓库链接文件)
59 # grafts | (提交)嫁接
60 # hash | 哈希值
61 # HEAD | HEAD(头指针,亦即当前分支)
62 # head | 头、分支
63 # head ref | 分支
64 # header | 头信息
65 # hook | 钩子
66 # hunk | 补丁片段
67 # index | 索引
68 # index entry | 索引条目
69 # loose object | 松散对象
70 # loose refs | 松散引用
71 # master | master(默认分支名)
72 # merge | 合并
73 # object | 对象
74 # object database | 对象库
75 # object identifier | 对象标识符
76 # object name | 对象名称
77 # object type | 对象类型
78 # octopus | 章鱼式合并(两分支以上的合并)
79 # origin | origin(默认的远程名称)
80 # pack | 包
81 # pack index | 包索引
82 # packfile | 包文件
83 # parent | 父提交
84 # patch | 补丁
85 # pathspec | 路径规格
86 # pattern | 模式
87 # pickaxe | 挖掘
88 # plumbing | 管件(Git 底层核心命令的别称)
89 # porcelain | 瓷件(Git 上层封装命令的别称)
90 # precious-objects repo | 珍品仓库
91 # prune | 清除
92 # pull | 拉,拉取
93 # push | 推,推送
94 # reachable | 可达
95 # rebase | 变基
96 # ref | 引用
97 # reflog | 引用日志
98 # refspec | 引用规格
99 # remote | 远程,远程仓库
100 # remote-tracking branch | 远程跟踪分支
101 # replay | 重放
102 # repo | 仓库
103 # repository | 仓库
104 # resolve | (冲突)解决
105 # revert | 还原
106 # revision | 版本
107 # rewind | 回退
108 # SCM | 源代码管理(工具)
109 # SHA-1 | SHA-1(安全哈希算法1)
110 # shallow repository | 浅(克隆)仓库
111 # signed tag | 签名标签
112 # smart HTTP protocol | 智能 HTTP 协议
113 # squash | 压缩
114 # stage | n. 暂存区(即索引); v. 暂存
115 # stash | n. 进度保存; v. 保存进度
116 # submodule | 子模组
117 # symref | 符号引用
118 # tag | n. 标签; v. 打标签
119 # tag object | 标签对象
120 # tagger | 打标签者
121 # topic branch | 主题分支
122 # track | 跟踪
123 # tree | 树(工作区或树对象)
124 # tree object | 树对象
125 # tree-ish (also treeish) | 树对象(或可以解析为一树对象)
126 # unmerged index | 未合并索引
127 # unpack | 解包
128 # unreachable object | 不可达对象
129 # unstage | 取消暂存
130 # upstream | 上游
131 # upstream branch | 上游分支
132 # working tree | 工作区
133 #
134 msgid ""
135 msgstr ""
136 "Project-Id-Version: Git\n"
137 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
138 "POT-Creation-Date: 2016-11-01 21:35+0800\n"
139 "PO-Revision-Date: 2016-11-21 23:14+0800\n"
140 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
141 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
142 "Language: zh_CN\n"
143 "MIME-Version: 1.0\n"
144 "Content-Type: text/plain; charset=UTF-8\n"
145 "Content-Transfer-Encoding: 8bit\n"
146 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
147
148 #: advice.c:55
149 #, c-format
150 msgid "hint: %.*s\n"
151 msgstr "提示:%.*s\n"
152
153 #: advice.c:83
154 msgid "Cherry-picking is not possible because you have unmerged files."
155 msgstr "无法拣选,因为您有未合并的文件。"
156
157 #: advice.c:85
158 msgid "Committing is not possible because you have unmerged files."
159 msgstr "无法提交,因为您有未合并的文件。"
160
161 #: advice.c:87
162 msgid "Merging is not possible because you have unmerged files."
163 msgstr "无法合并,因为您有未合并的文件。"
164
165 #: advice.c:89
166 msgid "Pulling is not possible because you have unmerged files."
167 msgstr "无法拉取,因为您有未合并的文件。"
168
169 #: advice.c:91
170 msgid "Reverting is not possible because you have unmerged files."
171 msgstr "无法回退,因为您有未合并的文件。"
172
173 #: advice.c:93
174 #, c-format
175 msgid "It is not possible to %s because you have unmerged files."
176 msgstr "无法 %s,因为您有未合并的文件。"
177
178 #: advice.c:101
179 msgid ""
180 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
181 "as appropriate to mark resolution and make a commit."
182 msgstr ""
183 "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
184 "解决方案并提交。"
185
186 #: advice.c:109
187 msgid "Exiting because of an unresolved conflict."
188 msgstr "因为存在未解决的冲突而退出。"
189
190 #: advice.c:114 builtin/merge.c:1181
191 msgid "You have not concluded your merge (MERGE_HEAD exists)."
192 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
193
194 #: advice.c:116
195 msgid "Please, commit your changes before merging."
196 msgstr "请在合并前先提交您的修改。"
197
198 #: advice.c:117
199 msgid "Exiting because of unfinished merge."
200 msgstr "因为存在未完成的合并而退出。"
201
202 #: advice.c:123
203 #, c-format
204 msgid ""
205 "Note: checking out '%s'.\n"
206 "\n"
207 "You are in 'detached HEAD' state. You can look around, make experimental\n"
208 "changes and commit them, and you can discard any commits you make in this\n"
209 "state without impacting any branches by performing another checkout.\n"
210 "\n"
211 "If you want to create a new branch to retain commits you create, you may\n"
212 "do so (now or later) by using -b with the checkout command again. Example:\n"
213 "\n"
214 " git checkout -b <new-branch-name>\n"
215 "\n"
216 msgstr ""
217 "注意:正在检出 '%s'。\n"
218 "\n"
219 "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
220 "外\n"
221 "的检出分支操作丢弃在这个状态下所做的任何提交。\n"
222 "\n"
223 "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
224 "参数 -b 来实现(现在或稍后)。例如:\n"
225 "\n"
226 " git checkout -b <new-branch-name>\n"
227 "\n"
228
229 #: apply.c:57
230 #, c-format
231 msgid "unrecognized whitespace option '%s'"
232 msgstr "未能识别的空白字符选项 '%s'"
233
234 #: apply.c:73
235 #, c-format
236 msgid "unrecognized whitespace ignore option '%s'"
237 msgstr "未能识别的空白字符忽略选项 '%s'"
238
239 #: apply.c:125
240 msgid "--reject and --3way cannot be used together."
241 msgstr "--reject 和 --3say 不能同时使用。"
242
243 #: apply.c:127
244 msgid "--cached and --3way cannot be used together."
245 msgstr "--cached 和 --3way 不能同时使用。"
246
247 #: apply.c:130
248 msgid "--3way outside a repository"
249 msgstr "--3way 在一个仓库之外"
250
251 #: apply.c:141
252 msgid "--index outside a repository"
253 msgstr "--index 在一个仓库之外"
254
255 #: apply.c:144
256 msgid "--cached outside a repository"
257 msgstr "--cached 在一个仓库之外"
258
259 #: apply.c:845
260 #, c-format
261 msgid "Cannot prepare timestamp regexp %s"
262 msgstr "无法准备时间戳正则表达式 %s"
263
264 #: apply.c:854
265 #, c-format
266 msgid "regexec returned %d for input: %s"
267 msgstr "regexec 返回 %d,输入为:%s"
268
269 #: apply.c:938
270 #, c-format
271 msgid "unable to find filename in patch at line %d"
272 msgstr "不能在补丁的第 %d 行找到文件名"
273
274 #: apply.c:977
275 #, c-format
276 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
277 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
278
279 #: apply.c:983
280 #, c-format
281 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
282 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
283
284 #: apply.c:984
285 #, c-format
286 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
287 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
288
289 #: apply.c:990
290 #, c-format
291 msgid "git apply: bad git-diff - expected /dev/null on line %d"
292 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
293
294 #: apply.c:1488
295 #, c-format
296 msgid "recount: unexpected line: %.*s"
297 msgstr "recount:意外的行:%.*s"
298
299 #: apply.c:1557
300 #, c-format
301 msgid "patch fragment without header at line %d: %.*s"
302 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
303
304 #: apply.c:1577
305 #, c-format
306 msgid ""
307 "git diff header lacks filename information when removing %d leading pathname "
308 "component (line %d)"
309 msgid_plural ""
310 "git diff header lacks filename information when removing %d leading pathname "
311 "components (line %d)"
312 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
313 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
314
315 #: apply.c:1589
316 #, c-format
317 msgid "git diff header lacks filename information (line %d)"
318 msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
319
320 #: apply.c:1759
321 msgid "new file depends on old contents"
322 msgstr "新文件依赖旧内容"
323
324 #: apply.c:1761
325 msgid "deleted file still has contents"
326 msgstr "删除的文件仍有内容"
327
328 #: apply.c:1795
329 #, c-format
330 msgid "corrupt patch at line %d"
331 msgstr "补丁在第 %d 行损坏"
332
333 #: apply.c:1832
334 #, c-format
335 msgid "new file %s depends on old contents"
336 msgstr "新文件 %s 依赖旧内容"
337
338 #: apply.c:1834
339 #, c-format
340 msgid "deleted file %s still has contents"
341 msgstr "删除的文件 %s 仍有内容"
342
343 #: apply.c:1837
344 #, c-format
345 msgid "** warning: file %s becomes empty but is not deleted"
346 msgstr "** 警告:文件 %s 成为空文件但并未删除"
347
348 #: apply.c:1984
349 #, c-format
350 msgid "corrupt binary patch at line %d: %.*s"
351 msgstr "二进制补丁在第 %d 行损坏:%.*s"
352
353 #: apply.c:2021
354 #, c-format
355 msgid "unrecognized binary patch at line %d"
356 msgstr "未能识别的二进制补丁位于第 %d 行"
357
358 #: apply.c:2182
359 #, c-format
360 msgid "patch with only garbage at line %d"
361 msgstr "补丁文件的第 %d 行只有垃圾数据"
362
363 #: apply.c:2274
364 #, c-format
365 msgid "unable to read symlink %s"
366 msgstr "无法读取符号链接 %s"
367
368 #: apply.c:2278
369 #, c-format
370 msgid "unable to open or read %s"
371 msgstr "不能打开或读取 %s"
372
373 #: apply.c:2931
374 #, c-format
375 msgid "invalid start of line: '%c'"
376 msgstr "无效的行首字符:'%c'"
377
378 #: apply.c:3050
379 #, c-format
380 msgid "Hunk #%d succeeded at %d (offset %d line)."
381 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
382 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
383 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
384
385 #: apply.c:3062
386 #, c-format
387 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
388 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
389
390 #: apply.c:3068
391 #, c-format
392 msgid ""
393 "while searching for:\n"
394 "%.*s"
395 msgstr ""
396 "当查询:\n"
397 "%.*s"
398
399 #: apply.c:3090
400 #, c-format
401 msgid "missing binary patch data for '%s'"
402 msgstr "缺失 '%s' 的二进制补丁数据"
403
404 #: apply.c:3098
405 #, c-format
406 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
407 msgstr "不能反向应用一个没有至 '%s' 的反向数据块的二进制补丁"
408
409 #: apply.c:3144
410 #, c-format
411 msgid "cannot apply binary patch to '%s' without full index line"
412 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
413
414 #: apply.c:3154
415 #, c-format
416 msgid ""
417 "the patch applies to '%s' (%s), which does not match the current contents."
418 msgstr "补丁引用到 '%s' (%s),但是和当前内容不匹配。"
419
420 #: apply.c:3162
421 #, c-format
422 msgid "the patch applies to an empty '%s' but it is not empty"
423 msgstr "补丁应用到空文件 '%s',但是它并不空"
424
425 #: apply.c:3180
426 #, c-format
427 msgid "the necessary postimage %s for '%s' cannot be read"
428 msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
429
430 #: apply.c:3193
431 #, c-format
432 msgid "binary patch does not apply to '%s'"
433 msgstr "二进制补丁未应用到 '%s'"
434
435 #: apply.c:3199
436 #, c-format
437 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
438 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
439
440 #: apply.c:3220
441 #, c-format
442 msgid "patch failed: %s:%ld"
443 msgstr "打补丁失败:%s:%ld"
444
445 #: apply.c:3342
446 #, c-format
447 msgid "cannot checkout %s"
448 msgstr "不能检出 %s"
449
450 #: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
451 #, c-format
452 msgid "failed to read %s"
453 msgstr "无法读取 %s"
454
455 #: apply.c:3398
456 #, c-format
457 msgid "reading from '%s' beyond a symbolic link"
458 msgstr "读取位于符号链接中的 '%s'"
459
460 #: apply.c:3427 apply.c:3667
461 #, c-format
462 msgid "path %s has been renamed/deleted"
463 msgstr "路径 %s 已经被重命名/删除"
464
465 #: apply.c:3510 apply.c:3681
466 #, c-format
467 msgid "%s: does not exist in index"
468 msgstr "%s:不存在于索引中"
469
470 #: apply.c:3519 apply.c:3689
471 #, c-format
472 msgid "%s: does not match index"
473 msgstr "%s:和索引不匹配"
474
475 #: apply.c:3554
476 msgid "repository lacks the necessary blob to fall back on 3-way merge."
477 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
478
479 #: apply.c:3557
480 #, c-format
481 msgid "Falling back to three-way merge...\n"
482 msgstr "回落到三方合并...\n"
483
484 #: apply.c:3573 apply.c:3577
485 #, c-format
486 msgid "cannot read the current contents of '%s'"
487 msgstr "无法读取 '%s' 的当前内容"
488
489 #: apply.c:3589
490 #, c-format
491 msgid "Failed to fall back on three-way merge...\n"
492 msgstr "无法回落到三方合并...\n"
493
494 #: apply.c:3603
495 #, c-format
496 msgid "Applied patch to '%s' with conflicts.\n"
497 msgstr "应用补丁到 '%s' 存在冲突。\n"
498
499 #: apply.c:3608
500 #, c-format
501 msgid "Applied patch to '%s' cleanly.\n"
502 msgstr "成功应用补丁到 '%s'。\n"
503
504 #: apply.c:3634
505 msgid "removal patch leaves file contents"
506 msgstr "移除补丁仍留下了文件内容"
507
508 #: apply.c:3706
509 #, c-format
510 msgid "%s: wrong type"
511 msgstr "%s:错误类型"
512
513 #: apply.c:3708
514 #, c-format
515 msgid "%s has type %o, expected %o"
516 msgstr "%s 的类型是 %o,应为 %o"
517
518 #: apply.c:3859 apply.c:3861
519 #, c-format
520 msgid "invalid path '%s'"
521 msgstr "无效路径 '%s'"
522
523 #: apply.c:3917
524 #, c-format
525 msgid "%s: already exists in index"
526 msgstr "%s:已经存在于索引中"
527
528 #: apply.c:3920
529 #, c-format
530 msgid "%s: already exists in working directory"
531 msgstr "%s:已经存在于工作区中"
532
533 #: apply.c:3940
534 #, c-format
535 msgid "new mode (%o) of %s does not match old mode (%o)"
536 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
537
538 #: apply.c:3945
539 #, c-format
540 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
541 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
542
543 #: apply.c:3965
544 #, c-format
545 msgid "affected file '%s' is beyond a symbolic link"
546 msgstr "受影响的文件 '%s' 位于符号链接中"
547
548 #: apply.c:3969
549 #, c-format
550 msgid "%s: patch does not apply"
551 msgstr "%s:补丁未应用"
552
553 #: apply.c:3984
554 #, c-format
555 msgid "Checking patch %s..."
556 msgstr "检查补丁 %s..."
557
558 #: apply.c:4075
559 #, c-format
560 msgid "sha1 information is lacking or useless for submodule %s"
561 msgstr "子模组 %s 的 sha1 信息缺失或无效"
562
563 #: apply.c:4082
564 #, c-format
565 msgid "mode change for %s, which is not in current HEAD"
566 msgstr "%s 的属性改变,但它不再当前 HEAD 中"
567
568 #: apply.c:4085
569 #, c-format
570 msgid "sha1 information is lacking or useless (%s)."
571 msgstr "sha1 信息缺失或无效(%s)。"
572
573 #: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
574 #, c-format
575 msgid "make_cache_entry failed for path '%s'"
576 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
577
578 #: apply.c:4094
579 #, c-format
580 msgid "could not add %s to temporary index"
581 msgstr "不能在临时索引中添加 %s"
582
583 #: apply.c:4104
584 #, c-format
585 msgid "could not write temporary index to %s"
586 msgstr "不能把临时索引写入到 %s"
587
588 #: apply.c:4242
589 #, c-format
590 msgid "unable to remove %s from index"
591 msgstr "不能从索引中移除 %s"
592
593 #: apply.c:4277
594 #, c-format
595 msgid "corrupt patch for submodule %s"
596 msgstr "子模组 %s 损坏的补丁"
597
598 #: apply.c:4283
599 #, c-format
600 msgid "unable to stat newly created file '%s'"
601 msgstr "不能枚举新建文件 '%s' 的状态"
602
603 #: apply.c:4291
604 #, c-format
605 msgid "unable to create backing store for newly created file %s"
606 msgstr "不能为新建文件 %s 创建后端存储"
607
608 #: apply.c:4297 apply.c:4441
609 #, c-format
610 msgid "unable to add cache entry for %s"
611 msgstr "无法为 %s 添加缓存条目"
612
613 #: apply.c:4338
614 #, c-format
615 msgid "failed to write to '%s'"
616 msgstr "无法写入 '%s'"
617
618 #: apply.c:4342
619 #, c-format
620 msgid "closing file '%s'"
621 msgstr "关闭文件 '%s'"
622
623 #: apply.c:4412
624 #, c-format
625 msgid "unable to write file '%s' mode %o"
626 msgstr "不能写文件 '%s' 权限 %o"
627
628 #: apply.c:4510
629 #, c-format
630 msgid "Applied patch %s cleanly."
631 msgstr "成功应用补丁 %s。"
632
633 #: apply.c:4518
634 msgid "internal error"
635 msgstr "内部错误"
636
637 #: apply.c:4521
638 #, c-format
639 msgid "Applying patch %%s with %d reject..."
640 msgid_plural "Applying patch %%s with %d rejects..."
641 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
642 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
643
644 #: apply.c:4532
645 #, c-format
646 msgid "truncating .rej filename to %.*s.rej"
647 msgstr "截短 .rej 文件名为 %.*s.rej"
648
649 #: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
650 #, c-format
651 msgid "cannot open %s"
652 msgstr "不能打开 %s"
653
654 #: apply.c:4554
655 #, c-format
656 msgid "Hunk #%d applied cleanly."
657 msgstr "第 #%d 个片段成功应用。"
658
659 #: apply.c:4558
660 #, c-format
661 msgid "Rejected hunk #%d."
662 msgstr "拒绝第 #%d 个片段。"
663
664 #: apply.c:4668
665 #, c-format
666 msgid "Skipped patch '%s'."
667 msgstr "略过补丁 '%s'。"
668
669 #: apply.c:4676
670 msgid "unrecognized input"
671 msgstr "未能识别的输入"
672
673 #: apply.c:4695
674 msgid "unable to read index file"
675 msgstr "无法读取索引文件"
676
677 #: apply.c:4833
678 #, c-format
679 msgid "can't open patch '%s': %s"
680 msgstr "不能打开补丁 '%s':%s"
681
682 #: apply.c:4858
683 #, c-format
684 msgid "squelched %d whitespace error"
685 msgid_plural "squelched %d whitespace errors"
686 msgstr[0] "抑制下仍有 %d 个空白字符误用"
687 msgstr[1] "抑制下仍有 %d 个空白字符误用"
688
689 #: apply.c:4864 apply.c:4879
690 #, c-format
691 msgid "%d line adds whitespace errors."
692 msgid_plural "%d lines add whitespace errors."
693 msgstr[0] "%d 行有空白字符误用。"
694 msgstr[1] "%d 行有空白字符误用。"
695
696 #: apply.c:4872
697 #, c-format
698 msgid "%d line applied after fixing whitespace errors."
699 msgid_plural "%d lines applied after fixing whitespace errors."
700 msgstr[0] "修复空白错误后,应用了 %d 行。"
701 msgstr[1] "修复空白错误后,应用了 %d 行。"
702
703 #: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
704 msgid "Unable to write new index file"
705 msgstr "无法写入新索引文件"
706
707 #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
708 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
709 #: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
710 #: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
711 #: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
712 msgid "path"
713 msgstr "路径"
714
715 #: apply.c:4920
716 msgid "don't apply changes matching the given path"
717 msgstr "不要应用与给出路径向匹配的变更"
718
719 #: apply.c:4923
720 msgid "apply changes matching the given path"
721 msgstr "应用与给出路径向匹配的变更"
722
723 #: apply.c:4925 builtin/am.c:2286
724 msgid "num"
725 msgstr "数字"
726
727 #: apply.c:4926
728 msgid "remove <num> leading slashes from traditional diff paths"
729 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
730
731 #: apply.c:4929
732 msgid "ignore additions made by the patch"
733 msgstr "忽略补丁中的添加的文件"
734
735 #: apply.c:4931
736 msgid "instead of applying the patch, output diffstat for the input"
737 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
738
739 #: apply.c:4935
740 msgid "show number of added and deleted lines in decimal notation"
741 msgstr "以十进制数显示添加和删除的行数"
742
743 #: apply.c:4937
744 msgid "instead of applying the patch, output a summary for the input"
745 msgstr "不应用补丁,而是显示输入的概要"
746
747 #: apply.c:4939
748 msgid "instead of applying the patch, see if the patch is applicable"
749 msgstr "不应用补丁,而是查看补丁是否可应用"
750
751 #: apply.c:4941
752 msgid "make sure the patch is applicable to the current index"
753 msgstr "确认补丁可以应用到当前索引"
754
755 #: apply.c:4943
756 msgid "apply a patch without touching the working tree"
757 msgstr "应用补丁而不修改工作区"
758
759 #: apply.c:4945
760 msgid "accept a patch that touches outside the working area"
761 msgstr "接受修改工作区之外文件的补丁"
762
763 #: apply.c:4947
764 msgid "also apply the patch (use with --stat/--summary/--check)"
765 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
766
767 #: apply.c:4949
768 msgid "attempt three-way merge if a patch does not apply"
769 msgstr "如果一个补丁不能应用则尝试三方合并"
770
771 #: apply.c:4951
772 msgid "build a temporary index based on embedded index information"
773 msgstr "创建一个临时索引基于嵌入的索引信息"
774
775 #: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
776 msgid "paths are separated with NUL character"
777 msgstr "路径以 NUL 字符分隔"
778
779 #: apply.c:4956
780 msgid "ensure at least <n> lines of context match"
781 msgstr "确保至少匹配 <n> 行上下文"
782
783 #: apply.c:4957 builtin/am.c:2265
784 msgid "action"
785 msgstr "动作"
786
787 #: apply.c:4958
788 msgid "detect new or modified lines that have whitespace errors"
789 msgstr "检查新增和修改的行中间的空白字符滥用"
790
791 #: apply.c:4961 apply.c:4964
792 msgid "ignore changes in whitespace when finding context"
793 msgstr "查找上下文时忽略空白字符的变更"
794
795 #: apply.c:4967
796 msgid "apply the patch in reverse"
797 msgstr "反向应用补丁"
798
799 #: apply.c:4969
800 msgid "don't expect at least one line of context"
801 msgstr "无需至少一行上下文"
802
803 #: apply.c:4971
804 msgid "leave the rejected hunks in corresponding *.rej files"
805 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
806
807 #: apply.c:4973
808 msgid "allow overlapping hunks"
809 msgstr "允许重叠的补丁片段"
810
811 #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
812 #: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
813 #: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
814 msgid "be verbose"
815 msgstr "冗长输出"
816
817 #: apply.c:4976
818 msgid "tolerate incorrectly detected missing new-line at the end of file"
819 msgstr "允许不正确的文件末尾换行符"
820
821 #: apply.c:4979
822 msgid "do not trust the line counts in the hunk headers"
823 msgstr "不信任补丁片段的头信息中的行号"
824
825 #: apply.c:4981 builtin/am.c:2274
826 msgid "root"
827 msgstr "根目录"
828
829 #: apply.c:4982
830 msgid "prepend <root> to all filenames"
831 msgstr "为所有文件名前添加 <根目录>"
832
833 #: archive.c:12
834 msgid "git archive [<options>] <tree-ish> [<path>...]"
835 msgstr "git archive [<选项>] <树或提交> [<路径>...]"
836
837 #: archive.c:13
838 msgid "git archive --list"
839 msgstr "git archive --list"
840
841 #: archive.c:14
842 msgid ""
843 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
844 msgstr ""
845 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
846
847 #: archive.c:15
848 msgid "git archive --remote <repo> [--exec <cmd>] --list"
849 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
850
851 #: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
852 #, c-format
853 msgid "pathspec '%s' did not match any files"
854 msgstr "路径规格 '%s' 未匹配任何文件"
855
856 #: archive.c:429
857 msgid "fmt"
858 msgstr "格式"
859
860 #: archive.c:429
861 msgid "archive format"
862 msgstr "归档格式"
863
864 #: archive.c:430 builtin/log.c:1429
865 msgid "prefix"
866 msgstr "前缀"
867
868 #: archive.c:431
869 msgid "prepend prefix to each pathname in the archive"
870 msgstr "为归档中每个路径名加上前缀"
871
872 #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
873 #: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
874 #: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
875 #: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
876 #: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
877 msgid "file"
878 msgstr "文件"
879
880 #: archive.c:433 builtin/archive.c:89
881 msgid "write the archive to this file"
882 msgstr "归档写入此文件"
883
884 #: archive.c:435
885 msgid "read .gitattributes in working directory"
886 msgstr "读取工作区中的 .gitattributes"
887
888 #: archive.c:436
889 msgid "report archived files on stderr"
890 msgstr "在标准错误上报告归档文件"
891
892 #: archive.c:437
893 msgid "store only"
894 msgstr "只存储"
895
896 #: archive.c:438
897 msgid "compress faster"
898 msgstr "压缩速度更快"
899
900 #: archive.c:446
901 msgid "compress better"
902 msgstr "压缩效果更好"
903
904 #: archive.c:449
905 msgid "list supported archive formats"
906 msgstr "列出支持的归档格式"
907
908 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
909 #: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
910 msgid "repo"
911 msgstr "仓库"
912
913 #: archive.c:452 builtin/archive.c:91
914 msgid "retrieve the archive from remote repository <repo>"
915 msgstr "从远程仓库(<仓库>)提取归档文件"
916
917 #: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
918 msgid "command"
919 msgstr "命令"
920
921 #: archive.c:454 builtin/archive.c:93
922 msgid "path to the remote git-upload-archive command"
923 msgstr "远程 git-upload-archive 命令的路径"
924
925 #: archive.c:461
926 msgid "Unexpected option --remote"
927 msgstr "未知参数 --remote"
928
929 #: archive.c:463
930 msgid "Option --exec can only be used together with --remote"
931 msgstr "选项 --exec 只能和 --remote 同时使用"
932
933 #: archive.c:465
934 msgid "Unexpected option --output"
935 msgstr "未知参数 --output"
936
937 #: archive.c:487
938 #, c-format
939 msgid "Unknown archive format '%s'"
940 msgstr "未知归档格式 '%s'"
941
942 #: archive.c:494
943 #, c-format
944 msgid "Argument not supported for format '%s': -%d"
945 msgstr "参数不支持此格式 '%s':-%d"
946
947 #: attr.c:263
948 msgid ""
949 "Negative patterns are ignored in git attributes\n"
950 "Use '\\!' for literal leading exclamation."
951 msgstr ""
952 "负值模版在 git attributes 中被忽略\n"
953 "当字符串确实要以感叹号开始时,使用 '\\!'。"
954
955 #: bisect.c:441
956 #, c-format
957 msgid "Could not open file '%s'"
958 msgstr "不能打开文件 '%s'"
959
960 #: bisect.c:446
961 #, c-format
962 msgid "Badly quoted content in file '%s': %s"
963 msgstr "文件 '%s' 包含错误的引用格式:%s"
964
965 #: bisect.c:655
966 #, c-format
967 msgid "We cannot bisect more!\n"
968 msgstr "我们无法进行更多的二分查找!\n"
969
970 #: bisect.c:708
971 #, c-format
972 msgid "Not a valid commit name %s"
973 msgstr "不是一个有效的提交名 %s"
974
975 #: bisect.c:732
976 #, c-format
977 msgid ""
978 "The merge base %s is bad.\n"
979 "This means the bug has been fixed between %s and [%s].\n"
980 msgstr ""
981 "合并基线 %s 是坏的。\n"
982 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
983
984 #: bisect.c:737
985 #, c-format
986 msgid ""
987 "The merge base %s is new.\n"
988 "The property has changed between %s and [%s].\n"
989 msgstr ""
990 "合并基线 %s 是新的。\n"
991 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
992
993 #: bisect.c:742
994 #, c-format
995 msgid ""
996 "The merge base %s is %s.\n"
997 "This means the first '%s' commit is between %s and [%s].\n"
998 msgstr ""
999 "合并基线 %s 是 %s。\n"
1000 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1001
1002 #: bisect.c:750
1003 #, c-format
1004 msgid ""
1005 "Some %s revs are not ancestor of the %s rev.\n"
1006 "git bisect cannot work properly in this case.\n"
1007 "Maybe you mistook %s and %s revs?\n"
1008 msgstr ""
1009 "一些 %s 版本不是 %s 版本的祖先。\n"
1010 "这种情况下 git 二分查找无法正常工作。\n"
1011 "您可能弄错了 %s 和 %s 版本?\n"
1012
1013 #: bisect.c:763
1014 #, c-format
1015 msgid ""
1016 "the merge base between %s and [%s] must be skipped.\n"
1017 "So we cannot be sure the first %s commit is between %s and %s.\n"
1018 "We continue anyway."
1019 msgstr ""
1020 "介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1021 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1022 "我们仍旧继续。"
1023
1024 #: bisect.c:798
1025 #, c-format
1026 msgid "Bisecting: a merge base must be tested\n"
1027 msgstr "二分查找中:合并基线必须是经过测试的\n"
1028
1029 #: bisect.c:849
1030 #, c-format
1031 msgid "a %s revision is needed"
1032 msgstr "需要一个 %s 版本"
1033
1034 #: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
1035 #, c-format
1036 msgid "could not create file '%s'"
1037 msgstr "不能创建文件 '%s'"
1038
1039 #: bisect.c:917
1040 #, c-format
1041 msgid "could not read file '%s'"
1042 msgstr "不能读取文件 '%s'"
1043
1044 #: bisect.c:947
1045 msgid "reading bisect refs failed"
1046 msgstr "读取二分查找引用失败"
1047
1048 #: bisect.c:967
1049 #, c-format
1050 msgid "%s was both %s and %s\n"
1051 msgstr "%s 同时为 %s 和 %s\n"
1052
1053 #: bisect.c:975
1054 #, c-format
1055 msgid ""
1056 "No testable commit found.\n"
1057 "Maybe you started with bad path parameters?\n"
1058 msgstr ""
1059 "没有发现可测试的提交。\n"
1060 "可能您在运行时使用了错误的路径参数?\n"
1061
1062 #: bisect.c:994
1063 #, c-format
1064 msgid "(roughly %d step)"
1065 msgid_plural "(roughly %d steps)"
1066 msgstr[0] "(大概 %d 步)"
1067 msgstr[1] "(大概 %d 步)"
1068
1069 #. TRANSLATORS: the last %s will be replaced with
1070 #. "(roughly %d steps)" translation
1071 #: bisect.c:998
1072 #, c-format
1073 msgid "Bisecting: %d revision left to test after this %s\n"
1074 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1075 msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1076 msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1077
1078 #: branch.c:53
1079 #, c-format
1080 msgid ""
1081 "\n"
1082 "After fixing the error cause you may try to fix up\n"
1083 "the remote tracking information by invoking\n"
1084 "\"git branch --set-upstream-to=%s%s%s\"."
1085 msgstr ""
1086 "\n"
1087 "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1088 "\"git branch --set-upstream-to=%s%s%s\" 。"
1089
1090 #: branch.c:67
1091 #, c-format
1092 msgid "Not setting branch %s as its own upstream."
1093 msgstr "未设置分支 %s 作为它自己的上游。"
1094
1095 #: branch.c:93
1096 #, c-format
1097 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
1098 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
1099
1100 #: branch.c:94
1101 #, c-format
1102 msgid "Branch %s set up to track remote branch %s from %s."
1103 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
1104
1105 #: branch.c:98
1106 #, c-format
1107 msgid "Branch %s set up to track local branch %s by rebasing."
1108 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
1109
1110 #: branch.c:99
1111 #, c-format
1112 msgid "Branch %s set up to track local branch %s."
1113 msgstr "分支 %s 设置为跟踪本地分支 %s。"
1114
1115 #: branch.c:104
1116 #, c-format
1117 msgid "Branch %s set up to track remote ref %s by rebasing."
1118 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
1119
1120 #: branch.c:105
1121 #, c-format
1122 msgid "Branch %s set up to track remote ref %s."
1123 msgstr "分支 %s 设置为跟踪远程引用 %s。"
1124
1125 #: branch.c:109
1126 #, c-format
1127 msgid "Branch %s set up to track local ref %s by rebasing."
1128 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
1129
1130 #: branch.c:110
1131 #, c-format
1132 msgid "Branch %s set up to track local ref %s."
1133 msgstr "分支 %s 设置为跟踪本地引用 %s。"
1134
1135 #: branch.c:119
1136 msgid "Unable to write upstream branch configuration"
1137 msgstr "无法写入上游分支配置"
1138
1139 #: branch.c:156
1140 #, c-format
1141 msgid "Not tracking: ambiguous information for ref %s"
1142 msgstr "未跟踪:引用 %s 有歧义"
1143
1144 #: branch.c:185
1145 #, c-format
1146 msgid "'%s' is not a valid branch name."
1147 msgstr "'%s' 不是一个有效的分支名称。"
1148
1149 #: branch.c:190
1150 #, c-format
1151 msgid "A branch named '%s' already exists."
1152 msgstr "一个分支名 '%s' 已经存在。"
1153
1154 #: branch.c:198
1155 msgid "Cannot force update the current branch."
1156 msgstr "无法强制更新当前分支。"
1157
1158 #: branch.c:218
1159 #, c-format
1160 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1161 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
1162
1163 #: branch.c:220
1164 #, c-format
1165 msgid "the requested upstream branch '%s' does not exist"
1166 msgstr "请求的上游分支 '%s' 不存在"
1167
1168 #: branch.c:222
1169 msgid ""
1170 "\n"
1171 "If you are planning on basing your work on an upstream\n"
1172 "branch that already exists at the remote, you may need to\n"
1173 "run \"git fetch\" to retrieve it.\n"
1174 "\n"
1175 "If you are planning to push out a new local branch that\n"
1176 "will track its remote counterpart, you may want to use\n"
1177 "\"git push -u\" to set the upstream config as you push."
1178 msgstr ""
1179 "\n"
1180 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1181 "您可能需要执行 \"git fetch\" 来获取分支。\n"
1182 "\n"
1183 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1184 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
1185
1186 #: branch.c:266
1187 #, c-format
1188 msgid "Not a valid object name: '%s'."
1189 msgstr "不是一个有效的对象名:'%s'。"
1190
1191 #: branch.c:286
1192 #, c-format
1193 msgid "Ambiguous object name: '%s'."
1194 msgstr "歧义的对象名:'%s'。"
1195
1196 #: branch.c:291
1197 #, c-format
1198 msgid "Not a valid branch point: '%s'."
1199 msgstr "无效的分支点:'%s'。"
1200
1201 #: branch.c:345
1202 #, c-format
1203 msgid "'%s' is already checked out at '%s'"
1204 msgstr "'%s' 已经检出到 '%s'"
1205
1206 #: branch.c:364
1207 #, c-format
1208 msgid "HEAD of working tree %s is not updated"
1209 msgstr "工作区 %s 的 HEAD 指向没有被更新"
1210
1211 #: bundle.c:34
1212 #, c-format
1213 msgid "'%s' does not look like a v2 bundle file"
1214 msgstr "'%s' 不像是一个 v2 版本的包文件"
1215
1216 #: bundle.c:61
1217 #, c-format
1218 msgid "unrecognized header: %s%s (%d)"
1219 msgstr "未能识别的包头:%s%s (%d)"
1220
1221 #: bundle.c:87 sequencer.c:963 builtin/commit.c:777
1222 #, c-format
1223 msgid "could not open '%s'"
1224 msgstr "不能打开 '%s'"
1225
1226 #: bundle.c:139
1227 msgid "Repository lacks these prerequisite commits:"
1228 msgstr "仓库中缺少这些必备的提交:"
1229
1230 #: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
1231 #: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
1232 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
1233 #: builtin/merge.c:356 builtin/shortlog.c:170
1234 msgid "revision walk setup failed"
1235 msgstr "版本遍历设置失败"
1236
1237 #: bundle.c:185
1238 #, c-format
1239 msgid "The bundle contains this ref:"
1240 msgid_plural "The bundle contains these %d refs:"
1241 msgstr[0] "这个包中含有这个引用:"
1242 msgstr[1] "这个包中含有 %d 个引用:"
1243
1244 #: bundle.c:192
1245 msgid "The bundle records a complete history."
1246 msgstr "这个包记录一个完整历史。"
1247
1248 #: bundle.c:194
1249 #, c-format
1250 msgid "The bundle requires this ref:"
1251 msgid_plural "The bundle requires these %d refs:"
1252 msgstr[0] "这个包需要这个引用:"
1253 msgstr[1] "这个包需要 %d 个引用:"
1254
1255 #: bundle.c:253
1256 msgid "Could not spawn pack-objects"
1257 msgstr "不能生成 pack-objects 进程"
1258
1259 #: bundle.c:264
1260 msgid "pack-objects died"
1261 msgstr "pack-objects 终止"
1262
1263 #: bundle.c:304
1264 msgid "rev-list died"
1265 msgstr "rev-list 终止"
1266
1267 #: bundle.c:353
1268 #, c-format
1269 msgid "ref '%s' is excluded by the rev-list options"
1270 msgstr "引用 '%s' 被 rev-list 选项排除"
1271
1272 #: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
1273 #, c-format
1274 msgid "unrecognized argument: %s"
1275 msgstr "未能识别的参数:%s"
1276
1277 #: bundle.c:451
1278 msgid "Refusing to create empty bundle."
1279 msgstr "不能创建空包。"
1280
1281 #: bundle.c:463
1282 #, c-format
1283 msgid "cannot create '%s'"
1284 msgstr "不能创建 '%s'"
1285
1286 #: bundle.c:491
1287 msgid "index-pack died"
1288 msgstr "index-pack 终止"
1289
1290 #: color.c:290
1291 #, c-format
1292 msgid "invalid color value: %.*s"
1293 msgstr "无效的颜色值:%.*s"
1294
1295 #: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
1296 #: builtin/am.c:2127
1297 #, c-format
1298 msgid "could not parse %s"
1299 msgstr "不能解析 %s"
1300
1301 #: commit.c:42
1302 #, c-format
1303 msgid "%s %s is not a commit!"
1304 msgstr "%s %s 不是一个提交!"
1305
1306 #: commit.c:1514
1307 msgid ""
1308 "Warning: commit message did not conform to UTF-8.\n"
1309 "You may want to amend it after fixing the message, or set the config\n"
1310 "variable i18n.commitencoding to the encoding your project uses.\n"
1311 msgstr ""
1312 "警告:提交说明不符合 UTF-8 字符集。\n"
1313 "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
1314 "设置为您项目所用的字符集。\n"
1315
1316 #: compat/obstack.c:406 compat/obstack.c:408
1317 msgid "memory exhausted"
1318 msgstr "内存耗尽"
1319
1320 #: config.c:516
1321 #, c-format
1322 msgid "bad config line %d in blob %s"
1323 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
1324
1325 #: config.c:520
1326 #, c-format
1327 msgid "bad config line %d in file %s"
1328 msgstr "文件 %2$s 中错误的配置行 %1$d"
1329
1330 #: config.c:524
1331 #, c-format
1332 msgid "bad config line %d in standard input"
1333 msgstr "标准输入中错误的配置行 %d"
1334
1335 #: config.c:528
1336 #, c-format
1337 msgid "bad config line %d in submodule-blob %s"
1338 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
1339
1340 #: config.c:532
1341 #, c-format
1342 msgid "bad config line %d in command line %s"
1343 msgstr "命令行 %2$s 中错误的配置行 %1$d"
1344
1345 #: config.c:536
1346 #, c-format
1347 msgid "bad config line %d in %s"
1348 msgstr "在 %2$s 中错误的配置行 %1$d"
1349
1350 #: config.c:655
1351 msgid "out of range"
1352 msgstr "超出范围"
1353
1354 #: config.c:655
1355 msgid "invalid unit"
1356 msgstr "无效的单位"
1357
1358 #: config.c:661
1359 #, c-format
1360 msgid "bad numeric config value '%s' for '%s': %s"
1361 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
1362
1363 #: config.c:666
1364 #, c-format
1365 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1366 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1367
1368 #: config.c:669
1369 #, c-format
1370 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1371 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1372
1373 #: config.c:672
1374 #, c-format
1375 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1376 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1377
1378 #: config.c:675
1379 #, c-format
1380 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1381 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1382
1383 #: config.c:678
1384 #, c-format
1385 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1386 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1387
1388 #: config.c:681
1389 #, c-format
1390 msgid "bad numeric config value '%s' for '%s' in %s: %s"
1391 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1392
1393 #: config.c:768
1394 #, c-format
1395 msgid "failed to expand user dir in: '%s'"
1396 msgstr "无法扩展 '%s' 中的用户目录"
1397
1398 #: config.c:852 config.c:863
1399 #, c-format
1400 msgid "bad zlib compression level %d"
1401 msgstr "错误的 zlib 压缩级别 %d"
1402
1403 #: config.c:978
1404 #, c-format
1405 msgid "invalid mode for object creation: %s"
1406 msgstr "无效的对象创建模式:%s"
1407
1408 #: config.c:1312
1409 msgid "unable to parse command-line config"
1410 msgstr "无法解析命令行中的配置"
1411
1412 #: config.c:1362
1413 msgid "unknown error occurred while reading the configuration files"
1414 msgstr "在读取配置文件时遇到未知错误"
1415
1416 #: config.c:1716
1417 #, c-format
1418 msgid "unable to parse '%s' from command-line config"
1419 msgstr "无法解析命令行配置中的 '%s'"
1420
1421 #: config.c:1718
1422 #, c-format
1423 msgid "bad config variable '%s' in file '%s' at line %d"
1424 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
1425
1426 #: config.c:1777
1427 #, c-format
1428 msgid "%s has multiple values"
1429 msgstr "%s 有多个取值"
1430
1431 #: config.c:2311
1432 #, c-format
1433 msgid "could not set '%s' to '%s'"
1434 msgstr "不能设置 '%s' 为 '%s'"
1435
1436 #: config.c:2313
1437 #, c-format
1438 msgid "could not unset '%s'"
1439 msgstr "不能取消设置 '%s'"
1440
1441 #: connect.c:49
1442 msgid "The remote end hung up upon initial contact"
1443 msgstr "远端在初始连接时即挂断"
1444
1445 #: connect.c:51
1446 msgid ""
1447 "Could not read from remote repository.\n"
1448 "\n"
1449 "Please make sure you have the correct access rights\n"
1450 "and the repository exists."
1451 msgstr ""
1452 "无法读取远程仓库。\n"
1453 "\n"
1454 "请确认您有正确的访问权限并且仓库存在。"
1455
1456 #: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
1457 msgid "Checking connectivity"
1458 msgstr "检查连接中"
1459
1460 #: connected.c:75
1461 msgid "Could not run 'git rev-list'"
1462 msgstr "不能执行 'git rev-list'"
1463
1464 #: connected.c:95
1465 msgid "failed write to rev-list"
1466 msgstr "无法写入 rev-list"
1467
1468 #: connected.c:102
1469 msgid "failed to close rev-list's stdin"
1470 msgstr "无法关闭 rev-list 的标准输入"
1471
1472 #: convert.c:201
1473 #, c-format
1474 msgid ""
1475 "CRLF will be replaced by LF in %s.\n"
1476 "The file will have its original line endings in your working directory."
1477 msgstr ""
1478 "文件 %s 中的 CRLF 将被 LF 替换。\n"
1479 "在工作区中该文件仍保持原有的换行符。"
1480
1481 #: convert.c:205
1482 #, c-format
1483 msgid "CRLF would be replaced by LF in %s."
1484 msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
1485
1486 #: convert.c:211
1487 #, c-format
1488 msgid ""
1489 "LF will be replaced by CRLF in %s.\n"
1490 "The file will have its original line endings in your working directory."
1491 msgstr ""
1492 "文件 %s 中的 LF 将被 CRLF 替换。\n"
1493 "在工作区中该文件仍保持原有的换行符。"
1494
1495 #: convert.c:215
1496 #, c-format
1497 msgid "LF would be replaced by CRLF in %s"
1498 msgstr "文件 %s 中的 LF 将被 CRLF 替换"
1499
1500 #: date.c:97
1501 msgid "in the future"
1502 msgstr "在将来"
1503
1504 #: date.c:103
1505 #, c-format
1506 msgid "%lu second ago"
1507 msgid_plural "%lu seconds ago"
1508 msgstr[0] "%lu 秒钟前"
1509 msgstr[1] "%lu 秒钟前"
1510
1511 #: date.c:110
1512 #, c-format
1513 msgid "%lu minute ago"
1514 msgid_plural "%lu minutes ago"
1515 msgstr[0] "%lu 分钟前"
1516 msgstr[1] "%lu 分钟前"
1517
1518 #: date.c:117
1519 #, c-format
1520 msgid "%lu hour ago"
1521 msgid_plural "%lu hours ago"
1522 msgstr[0] "%lu 小时前"
1523 msgstr[1] "%lu 小时前"
1524
1525 #: date.c:124
1526 #, c-format
1527 msgid "%lu day ago"
1528 msgid_plural "%lu days ago"
1529 msgstr[0] "%lu 天前"
1530 msgstr[1] "%lu 天前"
1531
1532 #: date.c:130
1533 #, c-format
1534 msgid "%lu week ago"
1535 msgid_plural "%lu weeks ago"
1536 msgstr[0] "%lu 周前"
1537 msgstr[1] "%lu 周前"
1538
1539 #: date.c:137
1540 #, c-format
1541 msgid "%lu month ago"
1542 msgid_plural "%lu months ago"
1543 msgstr[0] "%lu 个月前"
1544 msgstr[1] "%lu 个月前"
1545
1546 #: date.c:148
1547 #, c-format
1548 msgid "%lu year"
1549 msgid_plural "%lu years"
1550 msgstr[0] "%lu 年"
1551 msgstr[1] "%lu 年"
1552
1553 #. TRANSLATORS: "%s" is "<n> years"
1554 #: date.c:151
1555 #, c-format
1556 msgid "%s, %lu month ago"
1557 msgid_plural "%s, %lu months ago"
1558 msgstr[0] "%s %lu 个月前"
1559 msgstr[1] "%s %lu 个月前"
1560
1561 #: date.c:156 date.c:161
1562 #, c-format
1563 msgid "%lu year ago"
1564 msgid_plural "%lu years ago"
1565 msgstr[0] "%lu 年前"
1566 msgstr[1] "%lu 年前"
1567
1568 #: diffcore-order.c:24
1569 #, c-format
1570 msgid "failed to read orderfile '%s'"
1571 msgstr "无法读取排序文件 '%s'"
1572
1573 #: diffcore-rename.c:540
1574 msgid "Performing inexact rename detection"
1575 msgstr "正在进行非精确的重命名检测"
1576
1577 #: diff.c:62
1578 #, c-format
1579 msgid "option '%s' requires a value"
1580 msgstr "选项 '%s' 需要一个值"
1581
1582 # 译者:注意保持前导空格
1583 #: diff.c:124
1584 #, c-format
1585 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
1586 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
1587
1588 # 译者:注意保持前导空格
1589 #: diff.c:129
1590 #, c-format
1591 msgid " Unknown dirstat parameter '%s'\n"
1592 msgstr " 未知的 dirstat 参数 '%s'\n"
1593
1594 #: diff.c:283
1595 #, c-format
1596 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
1597 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
1598
1599 #: diff.c:346
1600 #, c-format
1601 msgid ""
1602 "Found errors in 'diff.dirstat' config variable:\n"
1603 "%s"
1604 msgstr ""
1605 "发现配置变量 'diff.dirstat' 中的错误:\n"
1606 "%s"
1607
1608 #: diff.c:3087
1609 #, c-format
1610 msgid "external diff died, stopping at %s"
1611 msgstr "外部 diff 退出,停止在 %s"
1612
1613 #: diff.c:3412
1614 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
1615 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
1616
1617 #: diff.c:3502
1618 msgid "--follow requires exactly one pathspec"
1619 msgstr "--follow 明确要求只跟一个路径规格"
1620
1621 #: diff.c:3665
1622 #, c-format
1623 msgid ""
1624 "Failed to parse --dirstat/-X option parameter:\n"
1625 "%s"
1626 msgstr ""
1627 "无法解析 --dirstat/-X 选项的参数:\n"
1628 "%s"
1629
1630 #: diff.c:3679
1631 #, c-format
1632 msgid "Failed to parse --submodule option parameter: '%s'"
1633 msgstr "无法解析 --submodule 选项的参数:'%s'"
1634
1635 #: diff.c:4700
1636 msgid "inexact rename detection was skipped due to too many files."
1637 msgstr "因为文件太多,略过不严格的重命名检查。"
1638
1639 #: diff.c:4703
1640 msgid "only found copies from modified paths due to too many files."
1641 msgstr "因为文件太多,只在修改的路径中查找拷贝。"
1642
1643 #: diff.c:4706
1644 #, c-format
1645 msgid ""
1646 "you may want to set your %s variable to at least %d and retry the command."
1647 msgstr "您可能想要将您的 %s 变量至少设置为 %d 并重复此命令。"
1648
1649 #: dir.c:1866
1650 msgid "failed to get kernel name and information"
1651 msgstr "无法获得内核名称和信息"
1652
1653 #: dir.c:1985
1654 msgid "Untracked cache is disabled on this system or location."
1655 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
1656
1657 #: fetch-pack.c:213
1658 msgid "git fetch-pack: expected shallow list"
1659 msgstr "git fetch-pack:应为 shallow 列表"
1660
1661 #: fetch-pack.c:225
1662 msgid "git fetch-pack: expected ACK/NAK, got EOF"
1663 msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
1664
1665 #: fetch-pack.c:243
1666 #, c-format
1667 msgid "git fetch_pack: expected ACK/NAK, got '%s'"
1668 msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
1669
1670 #: fetch-pack.c:295
1671 msgid "--stateless-rpc requires multi_ack_detailed"
1672 msgstr "--stateless-rpc 需要 multi_ack_detailed"
1673
1674 #: fetch-pack.c:381
1675 #, c-format
1676 msgid "invalid shallow line: %s"
1677 msgstr "无效的 shallow 信息:%s"
1678
1679 #: fetch-pack.c:387
1680 #, c-format
1681 msgid "invalid unshallow line: %s"
1682 msgstr "无效的 unshallow 信息:%s"
1683
1684 #: fetch-pack.c:389
1685 #, c-format
1686 msgid "object not found: %s"
1687 msgstr "对象未找到:%s"
1688
1689 #: fetch-pack.c:392
1690 #, c-format
1691 msgid "error in object: %s"
1692 msgstr "对象中出错:%s"
1693
1694 #: fetch-pack.c:394
1695 #, c-format
1696 msgid "no shallow found: %s"
1697 msgstr "未发现 shallow:%s"
1698
1699 #: fetch-pack.c:397
1700 #, c-format
1701 msgid "expected shallow/unshallow, got %s"
1702 msgstr "应为 shallow/unshallow,却得到 %s"
1703
1704 #: fetch-pack.c:436
1705 #, c-format
1706 msgid "got %s %d %s"
1707 msgstr "得到 %s %d %s"
1708
1709 #: fetch-pack.c:450
1710 #, c-format
1711 msgid "invalid commit %s"
1712 msgstr "无效提交 %s"
1713
1714 #: fetch-pack.c:483
1715 msgid "giving up"
1716 msgstr "放弃"
1717
1718 #: fetch-pack.c:493 progress.c:235
1719 msgid "done"
1720 msgstr "完成"
1721
1722 #: fetch-pack.c:505
1723 #, c-format
1724 msgid "got %s (%d) %s"
1725 msgstr "得到 %s (%d) %s"
1726
1727 #: fetch-pack.c:551
1728 #, c-format
1729 msgid "Marking %s as complete"
1730 msgstr "标记 %s 为完成"
1731
1732 #: fetch-pack.c:697
1733 #, c-format
1734 msgid "already have %s (%s)"
1735 msgstr "已经有 %s (%s)"
1736
1737 #: fetch-pack.c:735
1738 msgid "fetch-pack: unable to fork off sideband demultiplexer"
1739 msgstr "fetch-pack:无法派生 sideband 多路输出"
1740
1741 #: fetch-pack.c:743
1742 msgid "protocol error: bad pack header"
1743 msgstr "协议错误:坏的包头"
1744
1745 #: fetch-pack.c:799
1746 #, c-format
1747 msgid "fetch-pack: unable to fork off %s"
1748 msgstr "fetch-pack:无法派生进程 %s"
1749
1750 #: fetch-pack.c:815
1751 #, c-format
1752 msgid "%s failed"
1753 msgstr "%s 失败"
1754
1755 #: fetch-pack.c:817
1756 msgid "error in sideband demultiplexer"
1757 msgstr "sideband 多路输出出错"
1758
1759 #: fetch-pack.c:844
1760 msgid "Server does not support shallow clients"
1761 msgstr "服务器不支持 shalllow 客户端"
1762
1763 #: fetch-pack.c:848
1764 msgid "Server supports multi_ack_detailed"
1765 msgstr "服务器支持 multi_ack_detailed"
1766
1767 #: fetch-pack.c:851
1768 msgid "Server supports no-done"
1769 msgstr "服务器支持 no-done"
1770
1771 #: fetch-pack.c:857
1772 msgid "Server supports multi_ack"
1773 msgstr "服务器支持 multi_ack"
1774
1775 #: fetch-pack.c:861
1776 msgid "Server supports side-band-64k"
1777 msgstr "服务器支持 side-band-64k"
1778
1779 #: fetch-pack.c:865
1780 msgid "Server supports side-band"
1781 msgstr "服务器支持 side-band"
1782
1783 #: fetch-pack.c:869
1784 msgid "Server supports allow-tip-sha1-in-want"
1785 msgstr "服务器支持 allow-tip-sha1-in-want"
1786
1787 #: fetch-pack.c:873
1788 msgid "Server supports allow-reachable-sha1-in-want"
1789 msgstr "服务器支持 allow-reachable-sha1-in-want"
1790
1791 #: fetch-pack.c:883
1792 msgid "Server supports ofs-delta"
1793 msgstr "服务器支持 ofs-delta"
1794
1795 #: fetch-pack.c:890
1796 #, c-format
1797 msgid "Server version is %.*s"
1798 msgstr "服务器版本 %.*s"
1799
1800 #: fetch-pack.c:896
1801 msgid "Server does not support --shallow-since"
1802 msgstr "服务器不支持 --shallow-since"
1803
1804 #: fetch-pack.c:900
1805 msgid "Server does not support --shallow-exclude"
1806 msgstr "服务器不支持 --shallow-exclude"
1807
1808 #: fetch-pack.c:902
1809 msgid "Server does not support --deepen"
1810 msgstr "服务器不支持 --deepen"
1811
1812 #: fetch-pack.c:913
1813 msgid "no common commits"
1814 msgstr "没有共同的提交"
1815
1816 #: fetch-pack.c:925
1817 msgid "git fetch-pack: fetch failed."
1818 msgstr "git fetch-pack:获取失败。"
1819
1820 #: fetch-pack.c:1087
1821 msgid "no matching remote head"
1822 msgstr "没有匹配的远程分支"
1823
1824 #: gpg-interface.c:185
1825 msgid "gpg failed to sign the data"
1826 msgstr "gpg 无法为数据签名"
1827
1828 #: gpg-interface.c:215
1829 msgid "could not create temporary file"
1830 msgstr "不能创建临时文件"
1831
1832 #: gpg-interface.c:217
1833 #, c-format
1834 msgid "failed writing detached signature to '%s'"
1835 msgstr "无法将分离式签名写入 '%s'"
1836
1837 #: grep.c:1782
1838 #, c-format
1839 msgid "'%s': unable to read %s"
1840 msgstr "'%s':无法读取 %s"
1841
1842 #: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
1843 #, c-format
1844 msgid "failed to stat '%s'"
1845 msgstr "无法枚举 '%s' 状态"
1846
1847 #: grep.c:1810
1848 #, c-format
1849 msgid "'%s': short read"
1850 msgstr "'%s':读取不完整"
1851
1852 #: help.c:203
1853 #, c-format
1854 msgid "available git commands in '%s'"
1855 msgstr "在 '%s' 下可用的 git 命令"
1856
1857 #: help.c:210
1858 msgid "git commands available from elsewhere on your $PATH"
1859 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
1860
1861 #: help.c:241
1862 msgid "These are common Git commands used in various situations:"
1863 msgstr "这些是各种场合常见的 Git 命令:"
1864
1865 #: help.c:306
1866 #, c-format
1867 msgid ""
1868 "'%s' appears to be a git command, but we were not\n"
1869 "able to execute it. Maybe git-%s is broken?"
1870 msgstr ""
1871 "'%s' 像是一个 git 命令,但却无法运行。\n"
1872 "可能是 git-%s 受损?"
1873
1874 #: help.c:361
1875 msgid "Uh oh. Your system reports no Git commands at all."
1876 msgstr "唉呀,您的系统中未发现 Git 命令。"
1877
1878 #: help.c:383
1879 #, c-format
1880 msgid ""
1881 "WARNING: You called a Git command named '%s', which does not exist.\n"
1882 "Continuing under the assumption that you meant '%s'"
1883 msgstr ""
1884 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"
1885 "是 '%s'"
1886
1887 #: help.c:388
1888 #, c-format
1889 msgid "in %0.1f seconds automatically..."
1890 msgstr "在 %0.1f 秒钟后自动运行..."
1891
1892 #: help.c:395
1893 #, c-format
1894 msgid "git: '%s' is not a git command. See 'git --help'."
1895 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
1896
1897 #: help.c:399 help.c:465
1898 msgid ""
1899 "\n"
1900 "Did you mean this?"
1901 msgid_plural ""
1902 "\n"
1903 "Did you mean one of these?"
1904 msgstr[0] ""
1905 "\n"
1906 "您指的是这个么?"
1907 msgstr[1] ""
1908 "\n"
1909 "您指的是这其中的某一个么?"
1910
1911 #: help.c:461
1912 #, c-format
1913 msgid "%s: %s - %s"
1914 msgstr "%s:%s - %s"
1915
1916 #: ident.c:334
1917 msgid ""
1918 "\n"
1919 "*** Please tell me who you are.\n"
1920 "\n"
1921 "Run\n"
1922 "\n"
1923 " git config --global user.email \"you@example.com\"\n"
1924 " git config --global user.name \"Your Name\"\n"
1925 "\n"
1926 "to set your account's default identity.\n"
1927 "Omit --global to set the identity only in this repository.\n"
1928 "\n"
1929 msgstr ""
1930 "\n"
1931 "*** 请告诉我你是谁。\n"
1932 "\n"
1933 "运行\n"
1934 "\n"
1935 " git config --global user.email \"you@example.com\"\n"
1936 " git config --global user.name \"Your Name\"\n"
1937 "\n"
1938 "来设置您账号的缺省身份标识。\n"
1939 "如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
1940
1941 #: lockfile.c:152
1942 #, c-format
1943 msgid ""
1944 "Unable to create '%s.lock': %s.\n"
1945 "\n"
1946 "Another git process seems to be running in this repository, e.g.\n"
1947 "an editor opened by 'git commit'. Please make sure all processes\n"
1948 "are terminated then try again. If it still fails, a git process\n"
1949 "may have crashed in this repository earlier:\n"
1950 "remove the file manually to continue."
1951 msgstr ""
1952 "无法创建 '%s.lock':%s。\n"
1953 "\n"
1954 "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
1955 "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
1956 "可能之前有一个 git 进程在这个仓库中异常退出:\n"
1957 "手动删除这个文件再继续。"
1958
1959 #: lockfile.c:160
1960 #, c-format
1961 msgid "Unable to create '%s.lock': %s"
1962 msgstr "不能创建 '%s.lock':%s"
1963
1964 #: merge.c:41
1965 msgid "failed to read the cache"
1966 msgstr "无法读取缓存"
1967
1968 #: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
1969 #: builtin/checkout.c:588 builtin/clone.c:731
1970 msgid "unable to write new index file"
1971 msgstr "无法写新的索引文件"
1972
1973 #: merge-recursive.c:209
1974 msgid "(bad commit)\n"
1975 msgstr "(坏提交)\n"
1976
1977 #: merge-recursive.c:231
1978 #, c-format
1979 msgid "addinfo_cache failed for path '%s'"
1980 msgstr "为路径 '%s' addinfo_cache 失败"
1981
1982 #: merge-recursive.c:301
1983 msgid "error building trees"
1984 msgstr "无法创建树"
1985
1986 #: merge-recursive.c:720
1987 #, c-format
1988 msgid "failed to create path '%s'%s"
1989 msgstr "无法创建路径 '%s'%s"
1990
1991 #: merge-recursive.c:731
1992 #, c-format
1993 msgid "Removing %s to make room for subdirectory\n"
1994 msgstr "删除 %s 以便为子目录留出空间\n"
1995
1996 #: merge-recursive.c:745 merge-recursive.c:764
1997 msgid ": perhaps a D/F conflict?"
1998 msgstr ":可能是一个目录/文件冲突?"
1999
2000 #: merge-recursive.c:754
2001 #, c-format
2002 msgid "refusing to lose untracked file at '%s'"
2003 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
2004
2005 #: merge-recursive.c:796 builtin/cat-file.c:34
2006 #, c-format
2007 msgid "cannot read object %s '%s'"
2008 msgstr "不能读取对象 %s '%s'"
2009
2010 #: merge-recursive.c:798
2011 #, c-format
2012 msgid "blob expected for %s '%s'"
2013 msgstr "%s '%s' 应为数据对象"
2014
2015 #: merge-recursive.c:822
2016 #, c-format
2017 msgid "failed to open '%s': %s"
2018 msgstr "无法打开 '%s':%s"
2019
2020 #: merge-recursive.c:833
2021 #, c-format
2022 msgid "failed to symlink '%s': %s"
2023 msgstr "无法创建符号链接 '%s':%s"
2024
2025 #: merge-recursive.c:838
2026 #, c-format
2027 msgid "do not know what to do with %06o %s '%s'"
2028 msgstr "不知道如何处理 %06o %s '%s'"
2029
2030 #: merge-recursive.c:978
2031 msgid "Failed to execute internal merge"
2032 msgstr "无法执行内部合并"
2033
2034 #: merge-recursive.c:982
2035 #, c-format
2036 msgid "Unable to add %s to database"
2037 msgstr "不能添加 %s 至对象库"
2038
2039 #: merge-recursive.c:1081 merge-recursive.c:1095
2040 #, c-format
2041 msgid ""
2042 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2043 "in tree."
2044 msgstr ""
2045 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
2046 "的版本被保留。"
2047
2048 #: merge-recursive.c:1087 merge-recursive.c:1100
2049 #, c-format
2050 msgid ""
2051 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2052 "in tree at %s."
2053 msgstr ""
2054 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
2055 "的版本保留于 %8$s 中。"
2056
2057 #: merge-recursive.c:1143
2058 msgid "rename"
2059 msgstr "重命名"
2060
2061 #: merge-recursive.c:1143
2062 msgid "renamed"
2063 msgstr "重命名"
2064
2065 #: merge-recursive.c:1200
2066 #, c-format
2067 msgid "%s is a directory in %s adding as %s instead"
2068 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
2069
2070 #: merge-recursive.c:1225
2071 #, c-format
2072 msgid ""
2073 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
2074 "\"->\"%s\" in \"%s\"%s"
2075 msgstr ""
2076 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
2077 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
2078
2079 #: merge-recursive.c:1230
2080 msgid " (left unresolved)"
2081 msgstr "(留下未解决)"
2082
2083 #: merge-recursive.c:1292
2084 #, c-format
2085 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
2086 msgstr ""
2087 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
2088 "%5$s"
2089
2090 #: merge-recursive.c:1325
2091 #, c-format
2092 msgid "Renaming %s to %s and %s to %s instead"
2093 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
2094
2095 #: merge-recursive.c:1531
2096 #, c-format
2097 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
2098 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
2099
2100 #: merge-recursive.c:1546
2101 #, c-format
2102 msgid "Adding merged %s"
2103 msgstr "添加合并后的 %s"
2104
2105 #: merge-recursive.c:1553 merge-recursive.c:1766
2106 #, c-format
2107 msgid "Adding as %s instead"
2108 msgstr "而是以 %s 为名添加"
2109
2110 #: merge-recursive.c:1610
2111 #, c-format
2112 msgid "cannot read object %s"
2113 msgstr "不能读取对象 %s"
2114
2115 #: merge-recursive.c:1613
2116 #, c-format
2117 msgid "object %s is not a blob"
2118 msgstr "对象 %s 不是一个数据对象"
2119
2120 #: merge-recursive.c:1666
2121 msgid "modify"
2122 msgstr "修改"
2123
2124 #: merge-recursive.c:1666
2125 msgid "modified"
2126 msgstr "修改"
2127
2128 #: merge-recursive.c:1676
2129 msgid "content"
2130 msgstr "内容"
2131
2132 #: merge-recursive.c:1683
2133 msgid "add/add"
2134 msgstr "添加/添加"
2135
2136 #: merge-recursive.c:1718
2137 #, c-format
2138 msgid "Skipped %s (merged same as existing)"
2139 msgstr "略过 %s(已经做过相同合并)"
2140
2141 #: merge-recursive.c:1732
2142 #, c-format
2143 msgid "Auto-merging %s"
2144 msgstr "自动合并 %s"
2145
2146 #: merge-recursive.c:1736 git-submodule.sh:924
2147 msgid "submodule"
2148 msgstr "子模组"
2149
2150 #: merge-recursive.c:1737
2151 #, c-format
2152 msgid "CONFLICT (%s): Merge conflict in %s"
2153 msgstr "冲突(%s):合并冲突于 %s"
2154
2155 #: merge-recursive.c:1831
2156 #, c-format
2157 msgid "Removing %s"
2158 msgstr "删除 %s"
2159
2160 #: merge-recursive.c:1857
2161 msgid "file/directory"
2162 msgstr "文件/目录"
2163
2164 #: merge-recursive.c:1863
2165 msgid "directory/file"
2166 msgstr "目录/文件"
2167
2168 #: merge-recursive.c:1868
2169 #, c-format
2170 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
2171 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
2172
2173 #: merge-recursive.c:1877
2174 #, c-format
2175 msgid "Adding %s"
2176 msgstr "添加 %s"
2177
2178 #: merge-recursive.c:1914
2179 msgid "Already up-to-date!"
2180 msgstr "已经是最新的!"
2181
2182 #: merge-recursive.c:1923
2183 #, c-format
2184 msgid "merging of trees %s and %s failed"
2185 msgstr "无法合并树 %s 和 %s"
2186
2187 #: merge-recursive.c:2006
2188 msgid "Merging:"
2189 msgstr "合并:"
2190
2191 #: merge-recursive.c:2019
2192 #, c-format
2193 msgid "found %u common ancestor:"
2194 msgid_plural "found %u common ancestors:"
2195 msgstr[0] "发现 %u 个共同祖先:"
2196 msgstr[1] "发现 %u 个共同祖先:"
2197
2198 #: merge-recursive.c:2058
2199 msgid "merge returned no commit"
2200 msgstr "合并未返回提交"
2201
2202 #: merge-recursive.c:2121
2203 #, c-format
2204 msgid "Could not parse object '%s'"
2205 msgstr "不能解析对象 '%s'"
2206
2207 #: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
2208 msgid "Unable to write index."
2209 msgstr "不能写入索引。"
2210
2211 #: notes-merge.c:273
2212 #, c-format
2213 msgid ""
2214 "You have not concluded your previous notes merge (%s exists).\n"
2215 "Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
2216 "commit/abort the previous merge before you start a new notes merge."
2217 msgstr ""
2218 "您尚未结束您前一次注释合并(存在 %s)。\n"
2219 "请您在开始一个新的注释合并之前,使用 'git notes merge --commit' 或者 "
2220 "'git notes merge --abort' 来提交/终止前一次合并。"
2221
2222 #: notes-merge.c:280
2223 #, c-format
2224 msgid "You have not concluded your notes merge (%s exists)."
2225 msgstr "您尚未结束注释合并(存在 %s)。"
2226
2227 #: notes-utils.c:41
2228 msgid "Cannot commit uninitialized/unreferenced notes tree"
2229 msgstr "不能提交未初始化/未引用的注解树"
2230
2231 #: notes-utils.c:100
2232 #, c-format
2233 msgid "Bad notes.rewriteMode value: '%s'"
2234 msgstr "坏的 notes.rewriteMode 值:'%s'"
2235
2236 #: notes-utils.c:110
2237 #, c-format
2238 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2239 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
2240
2241 #. TRANSLATORS: The first %s is the name of the
2242 #. environment variable, the second %s is its value
2243 #: notes-utils.c:137
2244 #, c-format
2245 msgid "Bad %s value: '%s'"
2246 msgstr "坏的 %s 值:'%s'"
2247
2248 #: object.c:242
2249 #, c-format
2250 msgid "unable to parse object: %s"
2251 msgstr "不能解析对象:%s"
2252
2253 #: parse-options.c:572
2254 msgid "..."
2255 msgstr "..."
2256
2257 #: parse-options.c:590
2258 #, c-format
2259 msgid "usage: %s"
2260 msgstr "用法:%s"
2261
2262 #. TRANSLATORS: the colon here should align with the
2263 #. one in "usage: %s" translation
2264 #: parse-options.c:594
2265 #, c-format
2266 msgid " or: %s"
2267 msgstr " 或:%s"
2268
2269 # 译者:为保证在输出中对齐,注意调整句中空格!
2270 #: parse-options.c:597
2271 #, c-format
2272 msgid " %s"
2273 msgstr " %s"
2274
2275 #: parse-options.c:631
2276 msgid "-NUM"
2277 msgstr "-数字"
2278
2279 #: parse-options-cb.c:108
2280 #, c-format
2281 msgid "malformed object name '%s'"
2282 msgstr "非法的对象名 '%s'"
2283
2284 #: path.c:826
2285 #, c-format
2286 msgid "Could not make %s writable by group"
2287 msgstr "不能设置 %s 为组可写"
2288
2289 #: pathspec.c:133
2290 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
2291 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
2292
2293 #: pathspec.c:143
2294 msgid ""
2295 "global 'literal' pathspec setting is incompatible with all other global "
2296 "pathspec settings"
2297 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
2298
2299 #: pathspec.c:177
2300 msgid "invalid parameter for pathspec magic 'prefix'"
2301 msgstr "路径规格包含无效的神奇前缀"
2302
2303 #: pathspec.c:183
2304 #, c-format
2305 msgid "Invalid pathspec magic '%.*s' in '%s'"
2306 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
2307
2308 #: pathspec.c:187
2309 #, c-format
2310 msgid "Missing ')' at the end of pathspec magic in '%s'"
2311 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
2312
2313 #: pathspec.c:205
2314 #, c-format
2315 msgid "Unimplemented pathspec magic '%c' in '%s'"
2316 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
2317
2318 #: pathspec.c:230
2319 #, c-format
2320 msgid "%s: 'literal' and 'glob' are incompatible"
2321 msgstr "%s:'literal' 和 'glob' 不兼容"
2322
2323 #: pathspec.c:241
2324 #, c-format
2325 msgid "%s: '%s' is outside repository"
2326 msgstr "%s:'%s' 在仓库之外"
2327
2328 #: pathspec.c:291
2329 #, c-format
2330 msgid "Pathspec '%s' is in submodule '%.*s'"
2331 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
2332
2333 #: pathspec.c:353
2334 #, c-format
2335 msgid "%s: pathspec magic not supported by this command: %s"
2336 msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
2337
2338 #: pathspec.c:408
2339 msgid ""
2340 "empty strings as pathspecs will be made invalid in upcoming releases. please "
2341 "use . instead if you meant to match all paths"
2342 msgstr ""
2343 "在即将到来的版本,不能再使用空字符串作为路径表达式。如果要匹配所有路径,\n"
2344 "请代之以 ."
2345
2346 #: pathspec.c:440
2347 #, c-format
2348 msgid "pathspec '%s' is beyond a symbolic link"
2349 msgstr "路径规格 '%s' 位于符号链接中"
2350
2351 #: pathspec.c:449
2352 msgid ""
2353 "There is nothing to exclude from by :(exclude) patterns.\n"
2354 "Perhaps you forgot to add either ':/' or '.' ?"
2355 msgstr ""
2356 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
2357 "添加 ':/' 或 '.' ?"
2358
2359 #: pretty.c:971
2360 msgid "unable to parse --pretty format"
2361 msgstr "不能解析 --pretty 格式"
2362
2363 #: read-cache.c:1315
2364 #, c-format
2365 msgid ""
2366 "index.version set, but the value is invalid.\n"
2367 "Using version %i"
2368 msgstr ""
2369 "设置了 index.version,但是取值无效。\n"
2370 "使用版本 %i"
2371
2372 #: read-cache.c:1325
2373 #, c-format
2374 msgid ""
2375 "GIT_INDEX_VERSION set, but the value is invalid.\n"
2376 "Using version %i"
2377 msgstr ""
2378 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
2379 "使用版本 %i"
2380
2381 #: refs.c:576 builtin/merge.c:840
2382 #, c-format
2383 msgid "Could not open '%s' for writing"
2384 msgstr "无法打开 '%s' 进行写入"
2385
2386 #: refs/files-backend.c:2481
2387 #, c-format
2388 msgid "could not delete reference %s: %s"
2389 msgstr "无法删除引用 %s:%s"
2390
2391 #: refs/files-backend.c:2484
2392 #, c-format
2393 msgid "could not delete references: %s"
2394 msgstr "无法删除引用:%s"
2395
2396 #: refs/files-backend.c:2493
2397 #, c-format
2398 msgid "could not remove reference %s"
2399 msgstr "无法删除引用 %s"
2400
2401 #: ref-filter.c:55
2402 #, c-format
2403 msgid "expected format: %%(color:<color>)"
2404 msgstr "期望的格式:%%(color:<color>)"
2405
2406 #: ref-filter.c:57
2407 #, c-format
2408 msgid "unrecognized color: %%(color:%s)"
2409 msgstr "未能识别的颜色:%%(color:%s)"
2410
2411 #: ref-filter.c:71
2412 #, c-format
2413 msgid "unrecognized format: %%(%s)"
2414 msgstr "未能识别的格式:%%(%s)"
2415
2416 #: ref-filter.c:77
2417 #, c-format
2418 msgid "%%(body) does not take arguments"
2419 msgstr "%%(body) 不带参数"
2420
2421 #: ref-filter.c:84
2422 #, c-format
2423 msgid "%%(subject) does not take arguments"
2424 msgstr "%%(subject) 不带参数"
2425
2426 #: ref-filter.c:101
2427 #, c-format
2428 msgid "positive value expected contents:lines=%s"
2429 msgstr "要为 contents:lines=%s 提供一个正数"
2430
2431 #: ref-filter.c:103
2432 #, c-format
2433 msgid "unrecognized %%(contents) argument: %s"
2434 msgstr "未能识别的 %%(contents) 参数:%s"
2435
2436 #: ref-filter.c:113
2437 #, c-format
2438 msgid "unrecognized %%(objectname) argument: %s"
2439 msgstr "未能识别的 %%(objectname) 参数:%s"
2440
2441 #: ref-filter.c:135
2442 #, c-format
2443 msgid "expected format: %%(align:<width>,<position>)"
2444 msgstr "期望的格式:%%(align:<width>,<position>)"
2445
2446 #: ref-filter.c:147
2447 #, c-format
2448 msgid "unrecognized position:%s"
2449 msgstr "未能识别的位置:%s"
2450
2451 #: ref-filter.c:151
2452 #, c-format
2453 msgid "unrecognized width:%s"
2454 msgstr "未能识别的宽度:%s"
2455
2456 #: ref-filter.c:157
2457 #, c-format
2458 msgid "unrecognized %%(align) argument: %s"
2459 msgstr "未能识别的 %%(align) 参数:%s"
2460
2461 #: ref-filter.c:161
2462 #, c-format
2463 msgid "positive width expected with the %%(align) atom"
2464 msgstr "元素 %%(align) 需要一个正数的宽度"
2465
2466 #: ref-filter.c:244
2467 #, c-format
2468 msgid "malformed field name: %.*s"
2469 msgstr "非法的字段名:%.*s"
2470
2471 #: ref-filter.c:270
2472 #, c-format
2473 msgid "unknown field name: %.*s"
2474 msgstr "未知的字段名:%.*s"
2475
2476 #: ref-filter.c:372
2477 #, c-format
2478 msgid "format: %%(end) atom used without corresponding atom"
2479 msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
2480
2481 #: ref-filter.c:424
2482 #, c-format
2483 msgid "malformed format string %s"
2484 msgstr "非法的格式化字符串 %s"
2485
2486 #: ref-filter.c:878
2487 msgid ":strip= requires a positive integer argument"
2488 msgstr ":strip= 需要一个正整型参数"
2489
2490 #: ref-filter.c:883
2491 #, c-format
2492 msgid "ref '%s' does not have %ld components to :strip"
2493 msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
2494
2495 #: ref-filter.c:1046
2496 #, c-format
2497 msgid "unknown %.*s format %s"
2498 msgstr "未知的 %.*s 格式 %s"
2499
2500 #: ref-filter.c:1066 ref-filter.c:1097
2501 #, c-format
2502 msgid "missing object %s for %s"
2503 msgstr "缺失 %2$s 的对象 %1$s"
2504
2505 #: ref-filter.c:1069 ref-filter.c:1100
2506 #, c-format
2507 msgid "parse_object_buffer failed on %s for %s"
2508 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
2509
2510 #: ref-filter.c:1311
2511 #, c-format
2512 msgid "malformed object at '%s'"
2513 msgstr "非法的对象于 '%s'"
2514
2515 #: ref-filter.c:1373
2516 #, c-format
2517 msgid "ignoring ref with broken name %s"
2518 msgstr "忽略带有错误名称 %s 的引用"
2519
2520 #: ref-filter.c:1378
2521 #, c-format
2522 msgid "ignoring broken ref %s"
2523 msgstr "忽略损坏的引用 %s"
2524
2525 #: ref-filter.c:1633
2526 #, c-format
2527 msgid "format: %%(end) atom missing"
2528 msgstr "格式:缺少 %%(end) 元素"
2529
2530 #: ref-filter.c:1687
2531 #, c-format
2532 msgid "malformed object name %s"
2533 msgstr "非法的对象名 %s"
2534
2535 #: remote.c:746
2536 #, c-format
2537 msgid "Cannot fetch both %s and %s to %s"
2538 msgstr "不能同时获取 %s 和 %s 至 %s"
2539
2540 #: remote.c:750
2541 #, c-format
2542 msgid "%s usually tracks %s, not %s"
2543 msgstr "%s 通常跟踪 %s,而非 %s"
2544
2545 #: remote.c:754
2546 #, c-format
2547 msgid "%s tracks both %s and %s"
2548 msgstr "%s 同时跟踪 %s 和 %s"
2549
2550 #: remote.c:762
2551 msgid "Internal error"
2552 msgstr "内部错误"
2553
2554 #: remote.c:1677 remote.c:1720
2555 msgid "HEAD does not point to a branch"
2556 msgstr "HEAD 没有指向一个分支"
2557
2558 #: remote.c:1686
2559 #, c-format
2560 msgid "no such branch: '%s'"
2561 msgstr "没有此分支:'%s'"
2562
2563 #: remote.c:1689
2564 #, c-format
2565 msgid "no upstream configured for branch '%s'"
2566 msgstr "尚未给分支 '%s' 设置上游"
2567
2568 #: remote.c:1695
2569 #, c-format
2570 msgid "upstream branch '%s' not stored as a remote-tracking branch"
2571 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
2572
2573 #: remote.c:1710
2574 #, c-format
2575 msgid "push destination '%s' on remote '%s' has no local tracking branch"
2576 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
2577
2578 #: remote.c:1725
2579 #, c-format
2580 msgid "branch '%s' has no remote for pushing"
2581 msgstr "分支 '%s' 没有设置要推送的远程服务器"
2582
2583 #: remote.c:1736
2584 #, c-format
2585 msgid "push refspecs for '%s' do not include '%s'"
2586 msgstr "向 '%s' 推送引用规格未包含 '%s'"
2587
2588 #: remote.c:1749
2589 msgid "push has no destination (push.default is 'nothing')"
2590 msgstr "推送无目标(push.default 是 'nothing')"
2591
2592 #: remote.c:1771
2593 msgid "cannot resolve 'simple' push to a single destination"
2594 msgstr "无法解析 'simple' 推送至一个单独的目标"
2595
2596 #: remote.c:2073
2597 #, c-format
2598 msgid "Your branch is based on '%s', but the upstream is gone.\n"
2599 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
2600
2601 #: remote.c:2077
2602 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
2603 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
2604
2605 #: remote.c:2080
2606 #, c-format
2607 msgid "Your branch is up-to-date with '%s'.\n"
2608 msgstr "您的分支与上游分支 '%s' 一致。\n"
2609
2610 #: remote.c:2084
2611 #, c-format
2612 msgid "Your branch is ahead of '%s' by %d commit.\n"
2613 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
2614 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
2615 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
2616
2617 #: remote.c:2090
2618 msgid " (use \"git push\" to publish your local commits)\n"
2619 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
2620
2621 #: remote.c:2093
2622 #, c-format
2623 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
2624 msgid_plural ""
2625 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
2626 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2627 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2628
2629 # 译者:注意保持前导空格
2630 #: remote.c:2101
2631 msgid " (use \"git pull\" to update your local branch)\n"
2632 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
2633
2634 #: remote.c:2104
2635 #, c-format
2636 msgid ""
2637 "Your branch and '%s' have diverged,\n"
2638 "and have %d and %d different commit each, respectively.\n"
2639 msgid_plural ""
2640 "Your branch and '%s' have diverged,\n"
2641 "and have %d and %d different commits each, respectively.\n"
2642 msgstr[0] ""
2643 "您的分支和 '%s' 出现了偏离,\n"
2644 "并且分别有 %d 和 %d 处不同的提交。\n"
2645 msgstr[1] ""
2646 "您的分支和 '%s' 出现了偏离,\n"
2647 "并且分别有 %d 和 %d 处不同的提交。\n"
2648
2649 # 译者:注意保持前导空格
2650 #: remote.c:2114
2651 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
2652 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
2653
2654 #: revision.c:2158
2655 msgid "your current branch appears to be broken"
2656 msgstr "您的当前分支好像被损坏"
2657
2658 #: revision.c:2161
2659 #, c-format
2660 msgid "your current branch '%s' does not have any commits yet"
2661 msgstr "您的当前分支 '%s' 尚无任何提交"
2662
2663 #: revision.c:2355
2664 msgid "--first-parent is incompatible with --bisect"
2665 msgstr "--first-parent 与 --bisect 不兼容"
2666
2667 #: run-command.c:106
2668 msgid "open /dev/null failed"
2669 msgstr "不能打开 /dev/null"
2670
2671 #: run-command.c:108
2672 #, c-format
2673 msgid "dup2(%d,%d) failed"
2674 msgstr "不能调用 dup2(%d,%d)"
2675
2676 #: send-pack.c:297
2677 msgid "failed to sign the push certificate"
2678 msgstr "无法为推送证书签名"
2679
2680 #: send-pack.c:410
2681 msgid "the receiving end does not support --signed push"
2682 msgstr "接收端不支持签名推送"
2683
2684 #: send-pack.c:412
2685 msgid ""
2686 "not sending a push certificate since the receiving end does not support --"
2687 "signed push"
2688 msgstr "未发送推送证书,因为接收端不支持签名推送"
2689
2690 #: send-pack.c:424
2691 msgid "the receiving end does not support --atomic push"
2692 msgstr "接收端不支持原子推送"
2693
2694 #: send-pack.c:429
2695 msgid "the receiving end does not support push options"
2696 msgstr "接收端不支持推送选项"
2697
2698 #: sequencer.c:171
2699 msgid "revert"
2700 msgstr "还原"
2701
2702 #: sequencer.c:171
2703 msgid "cherry-pick"
2704 msgstr "拣选"
2705
2706 #: sequencer.c:228
2707 msgid ""
2708 "after resolving the conflicts, mark the corrected paths\n"
2709 "with 'git add <paths>' or 'git rm <paths>'"
2710 msgstr ""
2711 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
2712 "命令标记修正后的文件"
2713
2714 #: sequencer.c:231
2715 msgid ""
2716 "after resolving the conflicts, mark the corrected paths\n"
2717 "with 'git add <paths>' or 'git rm <paths>'\n"
2718 "and commit the result with 'git commit'"
2719 msgstr ""
2720 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
2721 "对修正后的文件做标记,然后用 'git commit' 提交"
2722
2723 #: sequencer.c:244 sequencer.c:1209
2724 #, c-format
2725 msgid "could not lock '%s'"
2726 msgstr "不能锁定 '%s'"
2727
2728 #: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
2729 #, c-format
2730 msgid "could not write to '%s'"
2731 msgstr "不能写入 '%s'"
2732
2733 #: sequencer.c:251
2734 #, c-format
2735 msgid "could not write eol to '%s"
2736 msgstr "不能将换行符写入 '%s'"
2737
2738 #: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
2739 #, c-format
2740 msgid "failed to finalize '%s'."
2741 msgstr "无法完成 '%s'。"
2742
2743 #: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
2744 #, c-format
2745 msgid "could not read '%s'"
2746 msgstr "不能读取 '%s'"
2747
2748 #: sequencer.c:305
2749 #, c-format
2750 msgid "your local changes would be overwritten by %s."
2751 msgstr "您的本地修改将被%s覆盖。"
2752
2753 #: sequencer.c:309
2754 msgid "commit your changes or stash them to proceed."
2755 msgstr "提交您的修改或保存进度后再继续。"
2756
2757 #: sequencer.c:324
2758 #, c-format
2759 msgid "%s: fast-forward"
2760 msgstr "%s:快进"
2761
2762 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
2763 #: sequencer.c:399
2764 #, c-format
2765 msgid "%s: Unable to write new index file"
2766 msgstr "%s:无法写入新索引文件"
2767
2768 #: sequencer.c:418
2769 msgid "could not resolve HEAD commit\n"
2770 msgstr "不能解析 HEAD 提交\n"
2771
2772 #: sequencer.c:438
2773 msgid "unable to update cache tree\n"
2774 msgstr "不能更新缓存\n"
2775
2776 #: sequencer.c:483
2777 #, c-format
2778 msgid ""
2779 "you have staged changes in your working tree\n"
2780 "If these changes are meant to be squashed into the previous commit, run:\n"
2781 "\n"
2782 " git commit --amend %s\n"
2783 "\n"
2784 "If they are meant to go into a new commit, run:\n"
2785 "\n"
2786 " git commit %s\n"
2787 "\n"
2788 "In both cases, once you're done, continue with:\n"
2789 "\n"
2790 " git rebase --continue\n"
2791 msgstr ""
2792 "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
2793 "\n"
2794 " git commit --amend %s\n"
2795 "\n"
2796 "如果这些变更要形成一个新提交,执行:\n"
2797 "\n"
2798 " git commit %s\n"
2799 "\n"
2800 "无论哪种情况,当您完成提交,继续执行:\n"
2801 "\n"
2802 " git rebase --continue\n"
2803
2804 #: sequencer.c:567
2805 #, c-format
2806 msgid "could not parse commit %s\n"
2807 msgstr "不能解析提交 %s\n"
2808
2809 #: sequencer.c:572
2810 #, c-format
2811 msgid "could not parse parent commit %s\n"
2812 msgstr "不能解析父提交 %s\n"
2813
2814 #: sequencer.c:656
2815 msgid "your index file is unmerged."
2816 msgstr "您的索引文件未完成合并。"
2817
2818 #: sequencer.c:675
2819 #, c-format
2820 msgid "commit %s is a merge but no -m option was given."
2821 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
2822
2823 #: sequencer.c:683
2824 #, c-format
2825 msgid "commit %s does not have parent %d"
2826 msgstr "提交 %s 没有第 %d 个父提交"
2827
2828 #: sequencer.c:687
2829 #, c-format
2830 msgid "mainline was specified but commit %s is not a merge."
2831 msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
2832
2833 #. TRANSLATORS: The first %s will be a "todo" command like
2834 #. "revert" or "pick", the second %s a SHA1.
2835 #: sequencer.c:700
2836 #, c-format
2837 msgid "%s: cannot parse parent commit %s"
2838 msgstr "%s:不能解析父提交 %s"
2839
2840 #: sequencer.c:705
2841 #, c-format
2842 msgid "cannot get commit message for %s"
2843 msgstr "不能得到 %s 的提交说明"
2844
2845 #: sequencer.c:797
2846 #, c-format
2847 msgid "could not revert %s... %s"
2848 msgstr "不能还原 %s... %s"
2849
2850 #: sequencer.c:798
2851 #, c-format
2852 msgid "could not apply %s... %s"
2853 msgstr "不能应用 %s... %s"
2854
2855 #: sequencer.c:833
2856 msgid "empty commit set passed"
2857 msgstr "提供了空的提交集"
2858
2859 #: sequencer.c:843
2860 #, c-format
2861 msgid "git %s: failed to read the index"
2862 msgstr "git %s:无法读取索引"
2863
2864 #: sequencer.c:850
2865 #, c-format
2866 msgid "git %s: failed to refresh the index"
2867 msgstr "git %s:无法刷新索引"
2868
2869 #: sequencer.c:944
2870 #, c-format
2871 msgid "invalid line %d: %.*s"
2872 msgstr "无效行 %d:%.*s"
2873
2874 #: sequencer.c:950
2875 msgid "no commits parsed."
2876 msgstr "没有解析提交。"
2877
2878 #: sequencer.c:966
2879 #, c-format
2880 msgid "could not read '%s'."
2881 msgstr "不能读取 '%s'。"
2882
2883 #: sequencer.c:972
2884 #, c-format
2885 msgid "unusable instruction sheet: '%s'"
2886 msgstr "无用的指令清单:'%s'"
2887
2888 #: sequencer.c:983
2889 msgid "cannot cherry-pick during a revert."
2890 msgstr "不能在回退中执行拣选。"
2891
2892 #: sequencer.c:985
2893 msgid "cannot revert during a cherry-pick."
2894 msgstr "不能在拣选中执行回退。"
2895
2896 #: sequencer.c:1028
2897 #, c-format
2898 msgid "invalid key: %s"
2899 msgstr "无效键名:%s"
2900
2901 #: sequencer.c:1031
2902 #, c-format
2903 msgid "invalid value for %s: %s"
2904 msgstr "%s 的值无效:%s"
2905
2906 #: sequencer.c:1063
2907 #, c-format
2908 msgid "malformed options sheet: '%s'"
2909 msgstr "非法的选项清单:'%s'"
2910
2911 #: sequencer.c:1101
2912 msgid "a cherry-pick or revert is already in progress"
2913 msgstr "一个拣选或还原操作已在进行"
2914
2915 #: sequencer.c:1102
2916 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
2917 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
2918
2919 #: sequencer.c:1106
2920 #, c-format
2921 msgid "could not create sequencer directory '%s'"
2922 msgstr "不能创建序列目录 '%s'"
2923
2924 #: sequencer.c:1120
2925 msgid "could not lock HEAD"
2926 msgstr "不能锁定 HEAD"
2927
2928 #: sequencer.c:1151 sequencer.c:1289
2929 msgid "no cherry-pick or revert in progress"
2930 msgstr "拣选或还原操作并未进行"
2931
2932 #: sequencer.c:1153
2933 msgid "cannot resolve HEAD"
2934 msgstr "不能解析 HEAD"
2935
2936 #: sequencer.c:1155 sequencer.c:1189
2937 msgid "cannot abort from a branch yet to be born"
2938 msgstr "不能从尚未建立的分支终止"
2939
2940 #: sequencer.c:1175 builtin/grep.c:578
2941 #, c-format
2942 msgid "cannot open '%s'"
2943 msgstr "不能打开 '%s'"
2944
2945 #: sequencer.c:1177
2946 #, c-format
2947 msgid "cannot read '%s': %s"
2948 msgstr "不能读取 '%s':%s"
2949
2950 #: sequencer.c:1178
2951 msgid "unexpected end of file"
2952 msgstr "意外的文件结束"
2953
2954 #: sequencer.c:1184
2955 #, c-format
2956 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
2957 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
2958
2959 #: sequencer.c:1354
2960 #, c-format
2961 msgid "%s: can't cherry-pick a %s"
2962 msgstr "%s:不能拣选一个%s"
2963
2964 #: sequencer.c:1358
2965 #, c-format
2966 msgid "%s: bad revision"
2967 msgstr "%s:错误的版本"
2968
2969 #: sequencer.c:1391
2970 msgid "can't revert as initial commit"
2971 msgstr "不能作为初始提交回退"
2972
2973 #: setup.c:160
2974 #, c-format
2975 msgid ""
2976 "%s: no such path in the working tree.\n"
2977 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
2978 msgstr ""
2979 "%s:工作区中无此路径。\n"
2980 "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
2981
2982 #: setup.c:173
2983 #, c-format
2984 msgid ""
2985 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
2986 "Use '--' to separate paths from revisions, like this:\n"
2987 "'git <command> [<revision>...] -- [<file>...]'"
2988 msgstr ""
2989 "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
2990 "使用 '--' 来分隔版本和路径,例如:\n"
2991 "'git <command> [<revision>...] -- [<file>...]'"
2992
2993 #: setup.c:223
2994 #, c-format
2995 msgid ""
2996 "ambiguous argument '%s': both revision and filename\n"
2997 "Use '--' to separate paths from revisions, like this:\n"
2998 "'git <command> [<revision>...] -- [<file>...]'"
2999 msgstr ""
3000 "有歧义的参数 '%s':可同时是版本和文件\n"
3001 "使用 '--' 来分隔版本和路径,例如:\n"
3002 "'git <command> [<revision>...] -- [<file>...]'"
3003
3004 #: setup.c:468
3005 #, c-format
3006 msgid "Expected git repo version <= %d, found %d"
3007 msgstr "期望 git 仓库版本 <= %d,却得到 %d"
3008
3009 #: setup.c:476
3010 msgid "unknown repository extensions found:"
3011 msgstr "发现未知的仓库扩展:"
3012
3013 #: setup.c:762
3014 #, c-format
3015 msgid "Not a git repository (or any of the parent directories): %s"
3016 msgstr "不是一个 git 仓库(或者任何父目录):%s"
3017
3018 #: setup.c:764 setup.c:915 builtin/index-pack.c:1641
3019 msgid "Cannot come back to cwd"
3020 msgstr "无法返回当前工作目录"
3021
3022 #: setup.c:845
3023 msgid "Unable to read current working directory"
3024 msgstr "不能读取当前工作目录"
3025
3026 #: setup.c:920
3027 #, c-format
3028 msgid ""
3029 "Not a git repository (or any parent up to mount point %s)\n"
3030 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
3031 msgstr ""
3032 "不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
3033 "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
3034
3035 #: setup.c:927
3036 #, c-format
3037 msgid "Cannot change to '%s/..'"
3038 msgstr "不能切换到 '%s/..'"
3039
3040 #: setup.c:989
3041 #, c-format
3042 msgid ""
3043 "Problem with core.sharedRepository filemode value (0%.3o).\n"
3044 "The owner of files must always have read and write permissions."
3045 msgstr ""
3046 "参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
3047 "文件属主必须始终拥有读写权限。"
3048
3049 #: sha1_file.c:473
3050 #, c-format
3051 msgid "path '%s' does not exist"
3052 msgstr "路径 '%s' 不存在"
3053
3054 #: sha1_file.c:499
3055 #, c-format
3056 msgid "reference repository '%s' as a linked checkout is not supported yet."
3057 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
3058
3059 #: sha1_file.c:505
3060 #, c-format
3061 msgid "reference repository '%s' is not a local repository."
3062 msgstr "参考仓库 '%s' 不是一个本地仓库。"
3063
3064 #: sha1_file.c:511
3065 #, c-format
3066 msgid "reference repository '%s' is shallow"
3067 msgstr "参考仓库 '%s' 是一个浅克隆"
3068
3069 #: sha1_file.c:519
3070 #, c-format
3071 msgid "reference repository '%s' is grafted"
3072 msgstr "参考仓库 '%s' 已被嫁接"
3073
3074 #: sha1_file.c:1159
3075 msgid "offset before end of packfile (broken .idx?)"
3076 msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
3077
3078 #: sha1_file.c:2592
3079 #, c-format
3080 msgid "offset before start of pack index for %s (corrupt index?)"
3081 msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
3082
3083 #: sha1_file.c:2596
3084 #, c-format
3085 msgid "offset beyond end of pack index for %s (truncated index?)"
3086 msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
3087
3088 #: sha1_name.c:407
3089 #, c-format
3090 msgid "short SHA1 %s is ambiguous"
3091 msgstr "歧义的短 SHA1 %s"
3092
3093 #: sha1_name.c:418
3094 msgid "The candidates are:"
3095 msgstr "候选者有:"
3096
3097 #: sha1_name.c:577
3098 msgid ""
3099 "Git normally never creates a ref that ends with 40 hex characters\n"
3100 "because it will be ignored when you just specify 40-hex. These refs\n"
3101 "may be created by mistake. For example,\n"
3102 "\n"
3103 " git checkout -b $br $(git rev-parse ...)\n"
3104 "\n"
3105 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
3106 "examine these refs and maybe delete them. Turn this message off by\n"
3107 "running \"git config advice.objectNameWarning false\""
3108 msgstr ""
3109 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
3110 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
3111 "\n"
3112 " git checkout -b $br $(git rev-parse ...)\n"
3113 "\n"
3114 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
3115 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
3116 "命令关闭本消息通知。"
3117
3118 #: submodule.c:64 submodule.c:98
3119 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
3120 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
3121
3122 #: submodule.c:68 submodule.c:102
3123 #, c-format
3124 msgid "Could not find section in .gitmodules where path=%s"
3125 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
3126
3127 #: submodule.c:76
3128 #, c-format
3129 msgid "Could not update .gitmodules entry %s"
3130 msgstr "不能更新 .gitmodules 条目 %s"
3131
3132 #: submodule.c:109
3133 #, c-format
3134 msgid "Could not remove .gitmodules entry for %s"
3135 msgstr "无法移除 %s 的 .gitmodules 条目"
3136
3137 #: submodule.c:120
3138 msgid "staging updated .gitmodules failed"
3139 msgstr "将更新后 .gitmodules 添加暂存区失败"
3140
3141 #: submodule.c:158
3142 msgid "negative values not allowed for submodule.fetchJobs"
3143 msgstr "submodule.fetchJobs 不允许为负值"
3144
3145 #: submodule-config.c:358
3146 #, c-format
3147 msgid "invalid value for %s"
3148 msgstr "%s 的值无效"
3149
3150 #: trailer.c:238
3151 #, c-format
3152 msgid "running trailer command '%s' failed"
3153 msgstr "执行 trailer 命令 '%s' 失败"
3154
3155 #: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
3156 #: trailer.c:541
3157 #, c-format
3158 msgid "unknown value '%s' for key '%s'"
3159 msgstr "键 '%2$s' 的未知取值 '%1$s'"
3160
3161 #: trailer.c:523 trailer.c:528 builtin/remote.c:289
3162 #, c-format
3163 msgid "more than one %s"
3164 msgstr "多于一个 %s"
3165
3166 #: trailer.c:672
3167 #, c-format
3168 msgid "empty trailer token in trailer '%.*s'"
3169 msgstr "签名 '%.*s' 的键为空"
3170
3171 #: trailer.c:695
3172 #, c-format
3173 msgid "could not read input file '%s'"
3174 msgstr "不能读取输入文件 '%s'"
3175
3176 #: trailer.c:698
3177 msgid "could not read from stdin"
3178 msgstr "不能自标准输入读取"
3179
3180 #: trailer.c:929 builtin/am.c:44
3181 #, c-format
3182 msgid "could not stat %s"
3183 msgstr "不能获取 %s 的文件状态"
3184
3185 #: trailer.c:931
3186 #, c-format
3187 msgid "file %s is not a regular file"
3188 msgstr "文件 %s 不是一个正规文件"
3189
3190 #: trailer.c:933
3191 #, c-format
3192 msgid "file %s is not writable by user"
3193 msgstr "文件 %s 用户不可写"
3194
3195 #: trailer.c:945
3196 msgid "could not open temporary file"
3197 msgstr "不能打开临时文件"
3198
3199 #: trailer.c:983
3200 #, c-format
3201 msgid "could not rename temporary file to %s"
3202 msgstr "不能重命名临时文件为 %s"
3203
3204 #: transport.c:62
3205 #, c-format
3206 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
3207 msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
3208
3209 #: transport.c:151
3210 #, c-format
3211 msgid "transport: invalid depth option '%s'"
3212 msgstr "传输:无效的深度选项 '%s'"
3213
3214 #: transport.c:817
3215 #, c-format
3216 msgid ""
3217 "The following submodule paths contain changes that can\n"
3218 "not be found on any remote:\n"
3219 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
3220
3221 #: transport.c:821
3222 #, c-format
3223 msgid ""
3224 "\n"
3225 "Please try\n"
3226 "\n"
3227 "\tgit push --recurse-submodules=on-demand\n"
3228 "\n"
3229 "or cd to the path and use\n"
3230 "\n"
3231 "\tgit push\n"
3232 "\n"
3233 "to push them to a remote.\n"
3234 "\n"
3235 msgstr ""
3236 "\n"
3237 "请尝试\n"
3238 "\n"
3239 "\tgit push --recurse-submodules=on-demand\n"
3240 "\n"
3241 "或者进入到子目录执行\n"
3242 "\n"
3243 "\tgit push\n"
3244 "\n"
3245 "以推送至远程。\n"
3246 "\n"
3247
3248 #: transport.c:829
3249 msgid "Aborting."
3250 msgstr "正在终止。"
3251
3252 #: transport-helper.c:1075
3253 #, c-format
3254 msgid "Could not read ref %s"
3255 msgstr "不能读取引用 %s"
3256
3257 #: tree-walk.c:31
3258 msgid "too-short tree object"
3259 msgstr "太短的树对象"
3260
3261 #: tree-walk.c:37
3262 msgid "malformed mode in tree entry"
3263 msgstr "树对象中的条目属性错误"
3264
3265 #: tree-walk.c:41
3266 msgid "empty filename in tree entry"
3267 msgstr "树对象条目中空的文件名"
3268
3269 #: tree-walk.c:113
3270 msgid "too-short tree file"
3271 msgstr "太短的树文件"
3272
3273 #: unpack-trees.c:64
3274 #, c-format
3275 msgid ""
3276 "Your local changes to the following files would be overwritten by checkout:\n"
3277 "%%sPlease commit your changes or stash them before you switch branches."
3278 msgstr ""
3279 "您对下列文件的本地修改将被检出操作覆盖:\n"
3280 "%%s请在切换分支前提交您的修改或者保存进度。"
3281
3282 #: unpack-trees.c:66
3283 #, c-format
3284 msgid ""
3285 "Your local changes to the following files would be overwritten by checkout:\n"
3286 "%%s"
3287 msgstr ""
3288 "您对下列文件的本地修改将被检出操作覆盖:\n"
3289 "%%s"
3290
3291 #: unpack-trees.c:69
3292 #, c-format
3293 msgid ""
3294 "Your local changes to the following files would be overwritten by merge:\n"
3295 "%%sPlease commit your changes or stash them before you merge."
3296 msgstr ""
3297 "您对下列文件的本地修改将被合并操作覆盖:\n"
3298 "%%s请在合并前提交您的修改或者保存进度。"
3299
3300 #: unpack-trees.c:71
3301 #, c-format
3302 msgid ""
3303 "Your local changes to the following files would be overwritten by merge:\n"
3304 "%%s"
3305 msgstr ""
3306 "您对下列文件的本地修改将被合并操作覆盖:\n"
3307 "%%s"
3308
3309 #: unpack-trees.c:74
3310 #, c-format
3311 msgid ""
3312 "Your local changes to the following files would be overwritten by %s:\n"
3313 "%%sPlease commit your changes or stash them before you %s."
3314 msgstr ""
3315 "您对下列文件的本地修改将被 %s 覆盖:\n"
3316 "%%s请在 %s 之前提交您的修改或者保存进度。"
3317
3318 #: unpack-trees.c:76
3319 #, c-format
3320 msgid ""
3321 "Your local changes to the following files would be overwritten by %s:\n"
3322 "%%s"
3323 msgstr ""
3324 "您对下列文件的本地修改将被 %s 覆盖:\n"
3325 "%%s"
3326
3327 #: unpack-trees.c:81
3328 #, c-format
3329 msgid ""
3330 "Updating the following directories would lose untracked files in it:\n"
3331 "%s"
3332 msgstr ""
3333 "更新如下目录将会丢失其中未跟踪的文件:\n"
3334 "%s"
3335
3336 #: unpack-trees.c:85
3337 #, c-format
3338 msgid ""
3339 "The following untracked working tree files would be removed by checkout:\n"
3340 "%%sPlease move or remove them before you switch branches."
3341 msgstr ""
3342 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
3343 "%%s请在切换分支之前移动或删除。"
3344
3345 #: unpack-trees.c:87
3346 #, c-format
3347 msgid ""
3348 "The following untracked working tree files would be removed by checkout:\n"
3349 "%%s"
3350 msgstr ""
3351 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
3352 "%%s"
3353
3354 #: unpack-trees.c:90
3355 #, c-format
3356 msgid ""
3357 "The following untracked working tree files would be removed by merge:\n"
3358 "%%sPlease move or remove them before you merge."
3359 msgstr ""
3360 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
3361 "%%s请在合并前移动或删除。"
3362
3363 #: unpack-trees.c:92
3364 #, c-format
3365 msgid ""
3366 "The following untracked working tree files would be removed by merge:\n"
3367 "%%s"
3368 msgstr ""
3369 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
3370 "%%s"
3371
3372 #: unpack-trees.c:95
3373 #, c-format
3374 msgid ""
3375 "The following untracked working tree files would be removed by %s:\n"
3376 "%%sPlease move or remove them before you %s."
3377 msgstr ""
3378 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
3379 "%%s请在 %s 前移动或删除。"
3380
3381 #: unpack-trees.c:97
3382 #, c-format
3383 msgid ""
3384 "The following untracked working tree files would be removed by %s:\n"
3385 "%%s"
3386 msgstr ""
3387 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
3388 "%%s"
3389
3390 #: unpack-trees.c:102
3391 #, c-format
3392 msgid ""
3393 "The following untracked working tree files would be overwritten by "
3394 "checkout:\n"
3395 "%%sPlease move or remove them before you switch branches."
3396 msgstr ""
3397 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
3398 "%%s请在切换分支前移动或删除。"
3399
3400 #: unpack-trees.c:104
3401 #, c-format
3402 msgid ""
3403 "The following untracked working tree files would be overwritten by "
3404 "checkout:\n"
3405 "%%s"
3406 msgstr ""
3407 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
3408 "%%s"
3409
3410 #: unpack-trees.c:107
3411 #, c-format
3412 msgid ""
3413 "The following untracked working tree files would be overwritten by merge:\n"
3414 "%%sPlease move or remove them before you merge."
3415 msgstr ""
3416 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
3417 "%%s请在合并前移动或删除。"
3418
3419 #: unpack-trees.c:109
3420 #, c-format
3421 msgid ""
3422 "The following untracked working tree files would be overwritten by merge:\n"
3423 "%%s"
3424 msgstr ""
3425 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
3426 "%%s"
3427
3428 #: unpack-trees.c:112
3429 #, c-format
3430 msgid ""
3431 "The following untracked working tree files would be overwritten by %s:\n"
3432 "%%sPlease move or remove them before you %s."
3433 msgstr ""
3434 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
3435 "%%s请在 %s 前移动或删除。"
3436
3437 #: unpack-trees.c:114
3438 #, c-format
3439 msgid ""
3440 "The following untracked working tree files would be overwritten by %s:\n"
3441 "%%s"
3442 msgstr ""
3443 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
3444 "%%s"
3445
3446 #: unpack-trees.c:121
3447 #, c-format
3448 msgid "Entry '%s' overlaps with '%s'. Cannot bind."
3449 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
3450
3451 #: unpack-trees.c:124
3452 #, c-format
3453 msgid ""
3454 "Cannot update sparse checkout: the following entries are not up-to-date:\n"
3455 "%s"
3456 msgstr ""
3457 "无法更新稀疏检出:如下条目不是最新:\n"
3458 "%s"
3459
3460 #: unpack-trees.c:126
3461 #, c-format
3462 msgid ""
3463 "The following working tree files would be overwritten by sparse checkout "
3464 "update:\n"
3465 "%s"
3466 msgstr ""
3467 "工作区中下列文件将被稀疏检出更新所覆盖:\n"
3468 "%s"
3469
3470 #: unpack-trees.c:128
3471 #, c-format
3472 msgid ""
3473 "The following working tree files would be removed by sparse checkout "
3474 "update:\n"
3475 "%s"
3476 msgstr ""
3477 "工作区中下列文件将被稀疏检出更新所删除:\n"
3478 "%s"
3479
3480 #: unpack-trees.c:205
3481 #, c-format
3482 msgid "Aborting\n"
3483 msgstr "终止中\n"
3484
3485 #: unpack-trees.c:237
3486 msgid "Checking out files"
3487 msgstr "正在检出文件"
3488
3489 #: urlmatch.c:120
3490 msgid "invalid URL scheme name or missing '://' suffix"
3491 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
3492
3493 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
3494 #, c-format
3495 msgid "invalid %XX escape sequence"
3496 msgstr "无效的 %XX 转义序列"
3497
3498 #: urlmatch.c:172
3499 msgid "missing host and scheme is not 'file:'"
3500 msgstr "缺失主机名且 URL 方案不是 'file:'"
3501
3502 #: urlmatch.c:189
3503 msgid "a 'file:' URL may not have a port number"
3504 msgstr "一个 'file:' URL 不应该包含端口号"
3505
3506 #: urlmatch.c:199
3507 msgid "invalid characters in host name"
3508 msgstr "主机名中包含无效的字符"
3509
3510 #: urlmatch.c:244 urlmatch.c:255
3511 msgid "invalid port number"
3512 msgstr "无效的端口号"
3513
3514 #: urlmatch.c:322
3515 msgid "invalid '..' path segment"
3516 msgstr "无效的 '..' 路径片段"
3517
3518 #: worktree.c:282
3519 #, c-format
3520 msgid "failed to read '%s'"
3521 msgstr "无法读取 '%s'"
3522
3523 #: wrapper.c:222 wrapper.c:392
3524 #, c-format
3525 msgid "could not open '%s' for reading and writing"
3526 msgstr "无法打开 '%s' 进行读写"
3527
3528 #: wrapper.c:224 wrapper.c:394 builtin/am.c:766
3529 #, c-format
3530 msgid "could not open '%s' for writing"
3531 msgstr "无法打开 '%s' 进行写入"
3532
3533 #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
3534 #: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
3535 #: builtin/pull.c:341
3536 #, c-format
3537 msgid "could not open '%s' for reading"
3538 msgstr "无法打开 '%s' 进行读取"
3539
3540 #: wrapper.c:605 wrapper.c:626
3541 #, c-format
3542 msgid "unable to access '%s'"
3543 msgstr "不能访问 '%s'"
3544
3545 #: wrapper.c:634
3546 msgid "unable to get current working directory"
3547 msgstr "不能获取当前工作目录"
3548
3549 #: wrapper.c:658
3550 #, c-format
3551 msgid "could not write to %s"
3552 msgstr "不能写入 %s"
3553
3554 #: wrapper.c:660
3555 #, c-format
3556 msgid "could not close %s"
3557 msgstr "不能关闭 %s"
3558
3559 #: wt-status.c:151
3560 msgid "Unmerged paths:"
3561 msgstr "未合并的路径:"
3562
3563 # 译者:注意保持前导空格
3564 #: wt-status.c:178 wt-status.c:205
3565 #, c-format
3566 msgid " (use \"git reset %s <file>...\" to unstage)"
3567 msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
3568
3569 # 译者:注意保持前导空格
3570 #: wt-status.c:180 wt-status.c:207
3571 msgid " (use \"git rm --cached <file>...\" to unstage)"
3572 msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
3573
3574 # 译者:注意保持前导空格
3575 #: wt-status.c:184
3576 msgid " (use \"git add <file>...\" to mark resolution)"
3577 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
3578
3579 # 译者:注意保持前导空格
3580 #: wt-status.c:186 wt-status.c:190
3581 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
3582 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
3583
3584 # 译者:注意保持前导空格
3585 #: wt-status.c:188
3586 msgid " (use \"git rm <file>...\" to mark resolution)"
3587 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
3588
3589 #: wt-status.c:199 wt-status.c:945
3590 msgid "Changes to be committed:"
3591 msgstr "要提交的变更:"
3592
3593 #: wt-status.c:217 wt-status.c:954
3594 msgid "Changes not staged for commit:"
3595 msgstr "尚未暂存以备提交的变更:"
3596
3597 # 译者:注意保持前导空格
3598 #: wt-status.c:221
3599 msgid " (use \"git add <file>...\" to update what will be committed)"
3600 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
3601
3602 # 译者:注意保持前导空格
3603 #: wt-status.c:223
3604 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
3605 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
3606
3607 # 译者:注意保持前导空格
3608 #: wt-status.c:224
3609 msgid ""
3610 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
3611 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
3612
3613 # 译者:注意保持前导空格
3614 #: wt-status.c:226
3615 msgid " (commit or discard the untracked or modified content in submodules)"
3616 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
3617
3618 # 译者:注意保持前导空格
3619 #: wt-status.c:238
3620 #, c-format
3621 msgid " (use \"git %s <file>...\" to include in what will be committed)"
3622 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
3623
3624 #: wt-status.c:253
3625 msgid "both deleted:"
3626 msgstr "双方删除:"
3627
3628 #: wt-status.c:255
3629 msgid "added by us:"
3630 msgstr "由我们添加:"
3631
3632 #: wt-status.c:257
3633 msgid "deleted by them:"
3634 msgstr "由他们删除:"
3635
3636 #: wt-status.c:259
3637 msgid "added by them:"
3638 msgstr "由他们添加:"
3639
3640 #: wt-status.c:261
3641 msgid "deleted by us:"
3642 msgstr "由我们删除:"
3643
3644 #: wt-status.c:263
3645 msgid "both added:"
3646 msgstr "双方添加:"
3647
3648 #: wt-status.c:265
3649 msgid "both modified:"
3650 msgstr "双方修改:"
3651
3652 #: wt-status.c:275
3653 msgid "new file:"
3654 msgstr "新文件:"
3655
3656 #: wt-status.c:277
3657 msgid "copied:"
3658 msgstr "拷贝:"
3659
3660 #: wt-status.c:279
3661 msgid "deleted:"
3662 msgstr "删除:"
3663
3664 #: wt-status.c:281
3665 msgid "modified:"
3666 msgstr "修改:"
3667
3668 #: wt-status.c:283
3669 msgid "renamed:"
3670 msgstr "重命名:"
3671
3672 #: wt-status.c:285
3673 msgid "typechange:"
3674 msgstr "类型变更:"
3675
3676 #: wt-status.c:287
3677 msgid "unknown:"
3678 msgstr "未知:"
3679
3680 #: wt-status.c:289
3681 msgid "unmerged:"
3682 msgstr "未合并:"
3683
3684 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
3685 #: wt-status.c:371
3686 msgid "new commits, "
3687 msgstr "新提交, "
3688
3689 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
3690 #: wt-status.c:373
3691 msgid "modified content, "
3692 msgstr "修改的内容, "
3693
3694 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
3695 #: wt-status.c:375
3696 msgid "untracked content, "
3697 msgstr "未跟踪的内容, "
3698
3699 #: wt-status.c:818
3700 msgid "Submodules changed but not updated:"
3701 msgstr "子模组已修改但尚未更新:"
3702
3703 #: wt-status.c:820
3704 msgid "Submodule changes to be committed:"
3705 msgstr "要提交的子模组变更:"
3706
3707 #: wt-status.c:901
3708 msgid ""
3709 "Do not touch the line above.\n"
3710 "Everything below will be removed."
3711 msgstr ""
3712 "不要改动上面的一行。\n"
3713 "下面的所有内容均将被删除。"
3714
3715 #: wt-status.c:1013
3716 msgid "You have unmerged paths."
3717 msgstr "您有尚未合并的路径。"
3718
3719 # 译者:注意保持前导空格
3720 #: wt-status.c:1016
3721 msgid " (fix conflicts and run \"git commit\")"
3722 msgstr " (解决冲突并运行 \"git commit\")"
3723
3724 # 译者:注意保持前导空格
3725 #: wt-status.c:1018
3726 msgid " (use \"git merge --abort\" to abort the merge)"
3727 msgstr " (使用 \"git merge --abort\" 终止合并)"
3728
3729 #: wt-status.c:1023
3730 msgid "All conflicts fixed but you are still merging."
3731 msgstr "所有冲突已解决但您仍处于合并中。"
3732
3733 # 译者:注意保持前导空格
3734 #: wt-status.c:1026
3735 msgid " (use \"git commit\" to conclude merge)"
3736 msgstr " (使用 \"git commit\" 结束合并)"
3737
3738 #: wt-status.c:1036
3739 msgid "You are in the middle of an am session."
3740 msgstr "您正处于 am 操作过程中。"
3741
3742 #: wt-status.c:1039
3743 msgid "The current patch is empty."
3744 msgstr "当前的补丁为空。"
3745
3746 # 译者:注意保持前导空格
3747 #: wt-status.c:1043
3748 msgid " (fix conflicts and then run \"git am --continue\")"
3749 msgstr " (解决冲突,然后运行 \"git am --continue\")"
3750
3751 # 译者:注意保持前导空格
3752 #: wt-status.c:1045
3753 msgid " (use \"git am --skip\" to skip this patch)"
3754 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
3755
3756 # 译者:注意保持前导空格
3757 #: wt-status.c:1047
3758 msgid " (use \"git am --abort\" to restore the original branch)"
3759 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
3760
3761 #: wt-status.c:1172
3762 msgid "No commands done."
3763 msgstr "没有命令被执行。"
3764
3765 #: wt-status.c:1175
3766 #, c-format
3767 msgid "Last command done (%d command done):"
3768 msgid_plural "Last commands done (%d commands done):"
3769 msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
3770 msgstr[1] "最后的命令已完成(%d 条命令被执行):"
3771
3772 #: wt-status.c:1186
3773 #, c-format
3774 msgid " (see more in file %s)"
3775 msgstr " (更多参见文件 %s)"
3776
3777 #: wt-status.c:1191
3778 msgid "No commands remaining."
3779 msgstr "未剩下任何命令。"
3780
3781 #: wt-status.c:1194
3782 #, c-format
3783 msgid "Next command to do (%d remaining command):"
3784 msgid_plural "Next commands to do (%d remaining commands):"
3785 msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
3786 msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
3787
3788 # 译者:注意保持前导空格
3789 #: wt-status.c:1202
3790 msgid " (use \"git rebase --edit-todo\" to view and edit)"
3791 msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
3792
3793 #: wt-status.c:1215
3794 #, c-format
3795 msgid "You are currently rebasing branch '%s' on '%s'."
3796 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
3797
3798 #: wt-status.c:1220
3799 msgid "You are currently rebasing."
3800 msgstr "您在执行变基操作。"
3801
3802 # 译者:注意保持前导空格
3803 #: wt-status.c:1234
3804 msgid " (fix conflicts and then run \"git rebase --continue\")"
3805 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
3806
3807 # 译者:注意保持前导空格
3808 #: wt-status.c:1236
3809 msgid " (use \"git rebase --skip\" to skip this patch)"
3810 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
3811
3812 # 译者:注意保持前导空格
3813 #: wt-status.c:1238
3814 msgid " (use \"git rebase --abort\" to check out the original branch)"
3815 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
3816
3817 # 译者:注意保持前导空格
3818 #: wt-status.c:1244
3819 msgid " (all conflicts fixed: run \"git rebase --continue\")"
3820 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
3821
3822 #: wt-status.c:1248
3823 #, c-format
3824 msgid ""
3825 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
3826 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
3827
3828 #: wt-status.c:1253
3829 msgid "You are currently splitting a commit during a rebase."
3830 msgstr "您在执行变基操作时拆分提交。"
3831
3832 # 译者:注意保持前导空格
3833 #: wt-status.c:1256
3834 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
3835 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
3836
3837 #: wt-status.c:1260
3838 #, c-format
3839 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
3840 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
3841
3842 #: wt-status.c:1265
3843 msgid "You are currently editing a commit during a rebase."
3844 msgstr "您在执行变基操作时编辑提交。"
3845
3846 # 译者:注意保持前导空格
3847 #: wt-status.c:1268
3848 msgid " (use \"git commit --amend\" to amend the current commit)"
3849 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
3850
3851 # 译者:注意保持前导空格
3852 #: wt-status.c:1270
3853 msgid ""
3854 " (use \"git rebase --continue\" once you are satisfied with your changes)"
3855 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
3856
3857 #: wt-status.c:1280
3858 #, c-format
3859 msgid "You are currently cherry-picking commit %s."
3860 msgstr "您在执行拣选提交 %s 的操作。"
3861
3862 # 译者:注意保持前导空格
3863 #: wt-status.c:1285
3864 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
3865 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
3866
3867 # 译者:注意保持前导空格
3868 #: wt-status.c:1288
3869 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
3870 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
3871
3872 # 译者:注意保持前导空格
3873 #: wt-status.c:1290
3874 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
3875 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
3876
3877 #: wt-status.c:1299
3878 #, c-format
3879 msgid "You are currently reverting commit %s."
3880 msgstr "您在执行反转提交 %s 的操作。"
3881
3882 # 译者:注意保持前导空格
3883 #: wt-status.c:1304
3884 msgid " (fix conflicts and run \"git revert --continue\")"
3885 msgstr " (解决冲突并运行 \"git revert --continue\")"
3886
3887 # 译者:注意保持前导空格
3888 #: wt-status.c:1307
3889 msgid " (all conflicts fixed: run \"git revert --continue\")"
3890 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
3891
3892 # 译者:注意保持前导空格
3893 #: wt-status.c:1309
3894 msgid " (use \"git revert --abort\" to cancel the revert operation)"
3895 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
3896
3897 #: wt-status.c:1320
3898 #, c-format
3899 msgid "You are currently bisecting, started from branch '%s'."
3900 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
3901
3902 #: wt-status.c:1324
3903 msgid "You are currently bisecting."
3904 msgstr "您在执行二分查找操作。"
3905
3906 # 译者:注意保持前导空格
3907 #: wt-status.c:1327
3908 msgid " (use \"git bisect reset\" to get back to the original branch)"
3909 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
3910
3911 #: wt-status.c:1524
3912 msgid "On branch "
3913 msgstr "位于分支 "
3914
3915 #: wt-status.c:1530
3916 msgid "interactive rebase in progress; onto "
3917 msgstr "交互式变基操作正在进行中;至 "
3918
3919 #: wt-status.c:1532
3920 msgid "rebase in progress; onto "
3921 msgstr "变基操作正在进行中;至 "
3922
3923 #: wt-status.c:1537
3924 msgid "HEAD detached at "
3925 msgstr "头指针分离于 "
3926
3927 #: wt-status.c:1539
3928 msgid "HEAD detached from "
3929 msgstr "头指针分离自 "
3930
3931 #: wt-status.c:1542
3932 msgid "Not currently on any branch."
3933 msgstr "当前不在任何分支上。"
3934
3935 #: wt-status.c:1560
3936 msgid "Initial commit"
3937 msgstr "初始提交"
3938
3939 #: wt-status.c:1574
3940 msgid "Untracked files"
3941 msgstr "未跟踪的文件"
3942
3943 #: wt-status.c:1576
3944 msgid "Ignored files"
3945 msgstr "忽略的文件"
3946
3947 #: wt-status.c:1580
3948 #, c-format
3949 msgid ""
3950 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
3951 "may speed it up, but you have to be careful not to forget to add\n"
3952 "new files yourself (see 'git help status')."
3953 msgstr ""
3954 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
3955 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
3956
3957 #: wt-status.c:1586
3958 #, c-format
3959 msgid "Untracked files not listed%s"
3960 msgstr "未跟踪的文件没有列出%s"
3961
3962 # 译者:中文字符串拼接,可删除前导空格
3963 #: wt-status.c:1588
3964 msgid " (use -u option to show untracked files)"
3965 msgstr "(使用 -u 参数显示未跟踪的文件)"
3966
3967 #: wt-status.c:1594
3968 msgid "No changes"
3969 msgstr "没有修改"
3970
3971 #: wt-status.c:1599
3972 #, c-format
3973 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
3974 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
3975
3976 #: wt-status.c:1602
3977 #, c-format
3978 msgid "no changes added to commit\n"
3979 msgstr "修改尚未加入提交\n"
3980
3981 #: wt-status.c:1605
3982 #, c-format
3983 msgid ""
3984 "nothing added to commit but untracked files present (use \"git add\" to "
3985 "track)\n"
3986 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
3987
3988 #: wt-status.c:1608
3989 #, c-format
3990 msgid "nothing added to commit but untracked files present\n"
3991 msgstr "提交为空,但是存在尚未跟踪的文件\n"
3992
3993 # 译者:中文字符串拼接,可删除前导空格
3994 #: wt-status.c:1611
3995 #, c-format
3996 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
3997 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
3998
3999 #: wt-status.c:1614 wt-status.c:1619
4000 #, c-format
4001 msgid "nothing to commit\n"
4002 msgstr "无文件要提交\n"
4003
4004 # 译者:中文字符串拼接,可删除前导空格
4005 #: wt-status.c:1617
4006 #, c-format
4007 msgid "nothing to commit (use -u to show untracked files)\n"
4008 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
4009
4010 # 译者:中文字符串拼接,可删除前导空格
4011 #: wt-status.c:1621
4012 #, c-format
4013 msgid "nothing to commit, working tree clean\n"
4014 msgstr "无文件要提交,干净的工作区\n"
4015
4016 # 译者:注意保持句尾空格
4017 #: wt-status.c:1728
4018 msgid "Initial commit on "
4019 msgstr "初始提交于 "
4020
4021 #: wt-status.c:1732
4022 msgid "HEAD (no branch)"
4023 msgstr "HEAD(非分支)"
4024
4025 #: wt-status.c:1761
4026 msgid "gone"
4027 msgstr "丢失"
4028
4029 # 译者:注意保持句尾空格
4030 #: wt-status.c:1763 wt-status.c:1771
4031 msgid "behind "
4032 msgstr "落后 "
4033
4034 #: wt-status.c:1766 wt-status.c:1769
4035 msgid "ahead "
4036 msgstr "领先 "
4037
4038 #. TRANSLATORS: the action is e.g. "pull with rebase"
4039 #: wt-status.c:2270
4040 #, c-format
4041 msgid "cannot %s: You have unstaged changes."
4042 msgstr "不能%s:您有未暂存的变更。"
4043
4044 #: wt-status.c:2276
4045 msgid "additionally, your index contains uncommitted changes."
4046 msgstr "而且您的索引中包含未提交的变更。"
4047
4048 #: wt-status.c:2278
4049 #, c-format
4050 msgid "cannot %s: Your index contains uncommitted changes."
4051 msgstr "不能%s:您的索引中包含未提交的变更。"
4052
4053 #: compat/precompose_utf8.c:57 builtin/clone.c:414
4054 #, c-format
4055 msgid "failed to unlink '%s'"
4056 msgstr "无法删除 '%s'"
4057
4058 #: builtin/add.c:22
4059 msgid "git add [<options>] [--] <pathspec>..."
4060 msgstr "git add [<选项>] [--] <路径规格>..."
4061
4062 #: builtin/add.c:80
4063 #, c-format
4064 msgid "unexpected diff status %c"
4065 msgstr "意外的差异状态 %c"
4066
4067 #: builtin/add.c:85 builtin/commit.c:291
4068 msgid "updating files failed"
4069 msgstr "更新文件失败"
4070
4071 #: builtin/add.c:95
4072 #, c-format
4073 msgid "remove '%s'\n"
4074 msgstr "删除 '%s'\n"
4075
4076 #: builtin/add.c:149
4077 msgid "Unstaged changes after refreshing the index:"
4078 msgstr "刷新索引之后尚未被暂存的变更:"
4079
4080 #: builtin/add.c:209 builtin/rev-parse.c:840
4081 msgid "Could not read the index"
4082 msgstr "不能读取索引"
4083
4084 #: builtin/add.c:220
4085 #, c-format
4086 msgid "Could not open '%s' for writing."
4087 msgstr "无法打开 '%s' 进行写入。"
4088
4089 #: builtin/add.c:224
4090 msgid "Could not write patch"
4091 msgstr "不能生成补丁"
4092
4093 #: builtin/add.c:227
4094 msgid "editing patch failed"
4095 msgstr "编辑补丁失败"
4096
4097 #: builtin/add.c:230
4098 #, c-format
4099 msgid "Could not stat '%s'"
4100 msgstr "不能查看文件状态 '%s'"
4101
4102 #: builtin/add.c:232
4103 msgid "Empty patch. Aborted."
4104 msgstr "空补丁。异常终止。"
4105
4106 #: builtin/add.c:237
4107 #, c-format
4108 msgid "Could not apply '%s'"
4109 msgstr "不能应用 '%s'"
4110
4111 #: builtin/add.c:247
4112 msgid "The following paths are ignored by one of your .gitignore files:\n"
4113 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
4114
4115 #: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
4116 #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
4117 #: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
4118 msgid "dry run"
4119 msgstr "演习"
4120
4121 #: builtin/add.c:269
4122 msgid "interactive picking"
4123 msgstr "交互式拣选"
4124
4125 #: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
4126 msgid "select hunks interactively"
4127 msgstr "交互式挑选数据块"
4128
4129 #: builtin/add.c:271
4130 msgid "edit current diff and apply"
4131 msgstr "编辑当前差异并应用"
4132
4133 #: builtin/add.c:272
4134 msgid "allow adding otherwise ignored files"
4135 msgstr "允许添加忽略的文件"
4136
4137 #: builtin/add.c:273
4138 msgid "update tracked files"
4139 msgstr "更新已跟踪的文件"
4140
4141 #: builtin/add.c:274
4142 msgid "record only the fact that the path will be added later"
4143 msgstr "只记录,该路径稍后再添加"
4144
4145 #: builtin/add.c:275
4146 msgid "add changes from all tracked and untracked files"
4147 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
4148
4149 #: builtin/add.c:278
4150 msgid "ignore paths removed in the working tree (same as --no-all)"
4151 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
4152
4153 #: builtin/add.c:280
4154 msgid "don't add, only refresh the index"
4155 msgstr "不添加,只刷新索引"
4156
4157 #: builtin/add.c:281
4158 msgid "just skip files which cannot be added because of errors"
4159 msgstr "跳过因出错不能添加的文件"
4160
4161 #: builtin/add.c:282
4162 msgid "check if - even missing - files are ignored in dry run"
4163 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
4164
4165 #: builtin/add.c:283 builtin/update-index.c:947
4166 msgid "(+/-)x"
4167 msgstr "(+/-)x"
4168
4169 #: builtin/add.c:283 builtin/update-index.c:948
4170 msgid "override the executable bit of the listed files"
4171 msgstr "覆盖列表里文件的可执行位"
4172
4173 #: builtin/add.c:305
4174 #, c-format
4175 msgid "Use -f if you really want to add them.\n"
4176 msgstr "使用 -f 参数如果您确实要添加它们。\n"
4177
4178 #: builtin/add.c:312
4179 msgid "adding files failed"
4180 msgstr "添加文件失败"
4181
4182 #: builtin/add.c:348
4183 msgid "-A and -u are mutually incompatible"
4184 msgstr "-A 和 -u 选项互斥"
4185
4186 #: builtin/add.c:355
4187 msgid "Option --ignore-missing can only be used together with --dry-run"
4188 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
4189
4190 #: builtin/add.c:359
4191 #, c-format
4192 msgid "--chmod param '%s' must be either -x or +x"
4193 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
4194
4195 #: builtin/add.c:374
4196 #, c-format
4197 msgid "Nothing specified, nothing added.\n"
4198 msgstr "没有指定文件,也没有文件被添加。\n"
4199
4200 #: builtin/add.c:375
4201 #, c-format
4202 msgid "Maybe you wanted to say 'git add .'?\n"
4203 msgstr "也许您想要执行 'git add .'?\n"
4204
4205 #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
4206 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
4207 #: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
4208 #: builtin/submodule--helper.c:244
4209 msgid "index file corrupt"
4210 msgstr "索引文件损坏"
4211
4212 #: builtin/am.c:414
4213 msgid "could not parse author script"
4214 msgstr "不能解析作者脚本"
4215
4216 #: builtin/am.c:491
4217 #, c-format
4218 msgid "'%s' was deleted by the applypatch-msg hook"
4219 msgstr "'%s' 被 applypatch-msg 钩子删除"
4220
4221 #: builtin/am.c:532
4222 #, c-format
4223 msgid "Malformed input line: '%s'."
4224 msgstr "非法的输入行:'%s'。"
4225
4226 #: builtin/am.c:569
4227 #, c-format
4228 msgid "Failed to copy notes from '%s' to '%s'"
4229 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
4230
4231 #: builtin/am.c:595
4232 msgid "fseek failed"
4233 msgstr "fseek 失败"
4234
4235 #: builtin/am.c:775
4236 #, c-format
4237 msgid "could not parse patch '%s'"
4238 msgstr "无法解析补丁 '%s'"
4239
4240 #: builtin/am.c:840
4241 msgid "Only one StGIT patch series can be applied at once"
4242 msgstr "一次只能有一个 StGIT 补丁队列被应用"
4243
4244 #: builtin/am.c:887
4245 msgid "invalid timestamp"
4246 msgstr "无效的时间戳"
4247
4248 #: builtin/am.c:890 builtin/am.c:898
4249 msgid "invalid Date line"
4250 msgstr "无效的日期行"
4251
4252 #: builtin/am.c:895
4253 msgid "invalid timezone offset"
4254 msgstr "无效的时区偏移值"
4255
4256 #: builtin/am.c:984
4257 msgid "Patch format detection failed."
4258 msgstr "补丁格式检测失败。"
4259
4260 #: builtin/am.c:989 builtin/clone.c:379
4261 #, c-format
4262 msgid "failed to create directory '%s'"
4263 msgstr "无法创建目录 '%s'"
4264
4265 #: builtin/am.c:993
4266 msgid "Failed to split patches."
4267 msgstr "无法拆分补丁。"
4268
4269 #: builtin/am.c:1125 builtin/commit.c:376
4270 msgid "unable to write index file"
4271 msgstr "无法写入索引文件"
4272
4273 #: builtin/am.c:1176
4274 #, c-format
4275 msgid "When you have resolved this problem, run \"%s --continue\"."
4276 msgstr "当您解决这一问题,执行 \"%s --continue\"。"
4277
4278 #: builtin/am.c:1177
4279 #, c-format
4280 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
4281 msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
4282
4283 #: builtin/am.c:1178
4284 #, c-format
4285 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
4286 msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
4287
4288 #: builtin/am.c:1316
4289 msgid "Patch is empty. Was it split wrong?"
4290 msgstr "补丁为空。是不是切分错误?"
4291
4292 #: builtin/am.c:1390 builtin/log.c:1550
4293 #, c-format
4294 msgid "invalid ident line: %s"
4295 msgstr "包含无效的身份标识:%s"
4296
4297 #: builtin/am.c:1417
4298 #, c-format
4299 msgid "unable to parse commit %s"
4300 msgstr "不能解析提交 %s"
4301
4302 #: builtin/am.c:1610
4303 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4304 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4305
4306 #: builtin/am.c:1612
4307 msgid "Using index info to reconstruct a base tree..."
4308 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
4309
4310 #: builtin/am.c:1631
4311 msgid ""
4312 "Did you hand edit your patch?\n"
4313 "It does not apply to blobs recorded in its index."
4314 msgstr ""
4315 "您是否曾手动编辑过您的补丁?\n"
4316 "无法应用补丁到索引中的数据对象上。"
4317
4318 #: builtin/am.c:1637
4319 msgid "Falling back to patching base and 3-way merge..."
4320 msgstr "回落到基础版本上打补丁及进行三方合并..."
4321
4322 #: builtin/am.c:1662
4323 msgid "Failed to merge in the changes."
4324 msgstr "无法合并变更。"
4325
4326 #: builtin/am.c:1686 builtin/merge.c:628
4327 msgid "git write-tree failed to write a tree"
4328 msgstr "git write-tree 无法写入一树对象"
4329
4330 #: builtin/am.c:1693
4331 msgid "applying to an empty history"
4332 msgstr "正应用到一个空历史上"
4333
4334 #: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
4335 #: builtin/merge.c:823
4336 msgid "failed to write commit object"
4337 msgstr "无法写提交对象"
4338
4339 #: builtin/am.c:1739 builtin/am.c:1743
4340 #, c-format
4341 msgid "cannot resume: %s does not exist."
4342 msgstr "无法继续:%s 不存在。"
4343
4344 #: builtin/am.c:1759
4345 msgid "cannot be interactive without stdin connected to a terminal."
4346 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
4347
4348 #: builtin/am.c:1764
4349 msgid "Commit Body is:"
4350 msgstr "提交内容为:"
4351
4352 # 译者:注意保持句尾空格
4353 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4354 #. in your translation. The program will only accept English
4355 #. input at this point.
4356 #.
4357 #: builtin/am.c:1774
4358 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
4359 msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
4360
4361 #: builtin/am.c:1824
4362 #, c-format
4363 msgid "Dirty index: cannot apply patches (dirty: %s)"
4364 msgstr "脏索引:不能应用补丁(脏文件:%s)"
4365
4366 #: builtin/am.c:1861 builtin/am.c:1933
4367 #, c-format
4368 msgid "Applying: %.*s"
4369 msgstr "应用:%.*s"
4370
4371 #: builtin/am.c:1877
4372 msgid "No changes -- Patch already applied."
4373 msgstr "没有变更 —— 补丁已经应用过。"
4374
4375 #: builtin/am.c:1885
4376 #, c-format
4377 msgid "Patch failed at %s %.*s"
4378 msgstr "打补丁失败于 %s %.*s"
4379
4380 #: builtin/am.c:1891
4381 #, c-format
4382 msgid "The copy of the patch that failed is found in: %s"
4383 msgstr "失败的补丁文件副本位于:%s"
4384
4385 #: builtin/am.c:1936
4386 msgid ""
4387 "No changes - did you forget to use 'git add'?\n"
4388 "If there is nothing left to stage, chances are that something else\n"
4389 "already introduced the same changes; you might want to skip this patch."
4390 msgstr ""
4391 "没有变更 —— 您是不是忘了执行 'git add'?\n"
4392 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
4393 "您也许想要跳过这个补丁。"
4394
4395 #: builtin/am.c:1943
4396 msgid ""
4397 "You still have unmerged paths in your index.\n"
4398 "Did you forget to use 'git add'?"
4399 msgstr ""
4400 "您的索引中仍有未合并的路径。\n"
4401 "您是否忘了执行 'git add'?"
4402
4403 #: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
4404 #: builtin/reset.c:316
4405 #, c-format
4406 msgid "Could not parse object '%s'."
4407 msgstr "不能解析对象 '%s'。"
4408
4409 #: builtin/am.c:2103
4410 msgid "failed to clean index"
4411 msgstr "无法清空索引"
4412
4413 #: builtin/am.c:2137
4414 msgid ""
4415 "You seem to have moved HEAD since the last 'am' failure.\n"
4416 "Not rewinding to ORIG_HEAD"
4417 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
4418
4419 #: builtin/am.c:2200
4420 #, c-format
4421 msgid "Invalid value for --patch-format: %s"
4422 msgstr "无效的 --patch-format 值:%s"
4423
4424 #: builtin/am.c:2233
4425 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
4426 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
4427
4428 #: builtin/am.c:2234
4429 msgid "git am [<options>] (--continue | --skip | --abort)"
4430 msgstr "git am [<选项>] (--continue | --skip | --abort)"
4431
4432 #: builtin/am.c:2240
4433 msgid "run interactively"
4434 msgstr "以交互式方式运行"
4435
4436 #: builtin/am.c:2242
4437 msgid "historical option -- no-op"
4438 msgstr "老的参数 —— 无作用"
4439
4440 #: builtin/am.c:2244
4441 msgid "allow fall back on 3way merging if needed"
4442 msgstr "如果必要,允许使用三方合并。"
4443
4444 #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
4445 #: builtin/repack.c:172
4446 msgid "be quiet"
4447 msgstr "静默模式"
4448
4449 #: builtin/am.c:2247
4450 msgid "add a Signed-off-by line to the commit message"
4451 msgstr "在提交说明中添加一个 Signed-off-by 签名"
4452
4453 #: builtin/am.c:2250
4454 msgid "recode into utf8 (default)"
4455 msgstr "使用 utf8 字符集(默认)"
4456
4457 #: builtin/am.c:2252
4458 msgid "pass -k flag to git-mailinfo"
4459 msgstr "向 git-mailinfo 传递 -k 参数"
4460
4461 #: builtin/am.c:2254
4462 msgid "pass -b flag to git-mailinfo"
4463 msgstr "向 git-mailinfo 传递 -b 参数"
4464
4465 #: builtin/am.c:2256
4466 msgid "pass -m flag to git-mailinfo"
4467 msgstr "向 git-mailinfo 传递 -m 参数"
4468
4469 #: builtin/am.c:2258
4470 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
4471 msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
4472
4473 #: builtin/am.c:2261
4474 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
4475 msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
4476
4477 #: builtin/am.c:2264
4478 msgid "strip everything before a scissors line"
4479 msgstr "丢弃裁切线前的所有内容"
4480
4481 #: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
4482 #: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
4483 #: builtin/am.c:2293
4484 msgid "pass it through git-apply"
4485 msgstr "传递给 git-apply"
4486
4487 #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
4488 #: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
4489 #: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
4490 #: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
4491 #: parse-options.h:132 parse-options.h:134 parse-options.h:245
4492 msgid "n"
4493 msgstr "n"
4494
4495 #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
4496 #: builtin/tag.c:372
4497 msgid "format"
4498 msgstr "格式"
4499
4500 #: builtin/am.c:2290
4501 msgid "format the patch(es) are in"
4502 msgstr "补丁的格式"
4503
4504 #: builtin/am.c:2296
4505 msgid "override error message when patch failure occurs"
4506 msgstr "打补丁失败时显示的错误信息"
4507
4508 #: builtin/am.c:2298
4509 msgid "continue applying patches after resolving a conflict"
4510 msgstr "冲突解决后继续应用补丁"
4511
4512 #: builtin/am.c:2301
4513 msgid "synonyms for --continue"
4514 msgstr "和 --continue 同义"
4515
4516 #: builtin/am.c:2304
4517 msgid "skip the current patch"
4518 msgstr "跳过当前补丁"
4519
4520 #: builtin/am.c:2307
4521 msgid "restore the original branch and abort the patching operation."
4522 msgstr "恢复原始分支并终止打补丁操作。"
4523
4524 #: builtin/am.c:2311
4525 msgid "lie about committer date"
4526 msgstr "将作者日期作为提交日期"
4527
4528 #: builtin/am.c:2313
4529 msgid "use current timestamp for author date"
4530 msgstr "用当前时间作为作者日期"
4531
4532 #: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
4533 #: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
4534 msgid "key-id"
4535 msgstr "key-id"
4536
4537 #: builtin/am.c:2316
4538 msgid "GPG-sign commits"
4539 msgstr "使用 GPG 签名提交"
4540
4541 #: builtin/am.c:2319
4542 msgid "(internal use for git-rebase)"
4543 msgstr "(内部使用,用于 git-rebase)"
4544
4545 #: builtin/am.c:2334
4546 msgid ""
4547 "The -b/--binary option has been a no-op for long time, and\n"
4548 "it will be removed. Please do not use it anymore."
4549 msgstr ""
4550 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
4551 "请不要再使用它了。"
4552
4553 #: builtin/am.c:2341
4554 msgid "failed to read the index"
4555 msgstr "无法读取索引"
4556
4557 #: builtin/am.c:2356
4558 #, c-format
4559 msgid "previous rebase directory %s still exists but mbox given."
4560 msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
4561
4562 #: builtin/am.c:2380
4563 #, c-format
4564 msgid ""
4565 "Stray %s directory found.\n"
4566 "Use \"git am --abort\" to remove it."
4567 msgstr ""
4568 "发现了错误的 %s 目录。\n"
4569 "使用 \"git am --abort\" 删除它。"
4570
4571 #: builtin/am.c:2386
4572 msgid "Resolve operation not in progress, we are not resuming."
4573 msgstr "解决操作未进行,我们不会继续。"
4574
4575 #: builtin/apply.c:8
4576 msgid "git apply [<options>] [<patch>...]"
4577 msgstr "git apply [<选项>] [<补丁>...]"
4578
4579 #: builtin/archive.c:17
4580 #, c-format
4581 msgid "could not create archive file '%s'"
4582 msgstr "不能创建归档文件 '%s'"
4583
4584 #: builtin/archive.c:20
4585 msgid "could not redirect output"
4586 msgstr "不能重定向输出"
4587
4588 #: builtin/archive.c:37
4589 msgid "git archive: Remote with no URL"
4590 msgstr "git archive:未提供远程 URL"
4591
4592 #: builtin/archive.c:58
4593 msgid "git archive: expected ACK/NAK, got EOF"
4594 msgstr "git archive:应为 ACK/NACK,却得到 EOF"
4595
4596 #: builtin/archive.c:61
4597 #, c-format
4598 msgid "git archive: NACK %s"
4599 msgstr "git archive:NACK %s"
4600
4601 #: builtin/archive.c:63
4602 #, c-format
4603 msgid "remote error: %s"
4604 msgstr "远程错误:%s"
4605
4606 #: builtin/archive.c:64
4607 msgid "git archive: protocol error"
4608 msgstr "git archive:协议错误"
4609
4610 #: builtin/archive.c:68
4611 msgid "git archive: expected a flush"
4612 msgstr "git archive:应有一个 flush 刷新"
4613
4614 #: builtin/bisect--helper.c:7
4615 msgid "git bisect--helper --next-all [--no-checkout]"
4616 msgstr "git bisect--helper --next-all [--no-checkout]"
4617
4618 #: builtin/bisect--helper.c:17
4619 msgid "perform 'git bisect next'"
4620 msgstr "执行 'git bisect next'"
4621
4622 #: builtin/bisect--helper.c:19
4623 msgid "update BISECT_HEAD instead of checking out the current commit"
4624 msgstr "更新 BISECT_HEAD 而非检出当前提交"
4625
4626 #: builtin/blame.c:33
4627 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
4628 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
4629
4630 #: builtin/blame.c:38
4631 msgid "<rev-opts> are documented in git-rev-list(1)"
4632 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
4633
4634 #: builtin/blame.c:1781
4635 msgid "Blaming lines"
4636 msgstr "追踪代码行"
4637
4638 #: builtin/blame.c:2577
4639 msgid "Show blame entries as we find them, incrementally"
4640 msgstr "增量式地显示发现的 blame 条目"
4641
4642 #: builtin/blame.c:2578
4643 msgid "Show blank SHA-1 for boundary commits (Default: off)"
4644 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
4645
4646 #: builtin/blame.c:2579
4647 msgid "Do not treat root commits as boundaries (Default: off)"
4648 msgstr "不把根提交作为边界(默认:关闭)"
4649
4650 #: builtin/blame.c:2580
4651 msgid "Show work cost statistics"
4652 msgstr "显示命令消耗统计"
4653
4654 #: builtin/blame.c:2581
4655 msgid "Force progress reporting"
4656 msgstr "强制进度显示"
4657
4658 #: builtin/blame.c:2582
4659 msgid "Show output score for blame entries"
4660 msgstr "显示判断 blame 条目位移的得分诊断信息"
4661
4662 #: builtin/blame.c:2583
4663 msgid "Show original filename (Default: auto)"
4664 msgstr "显示原始文件名(默认:自动)"
4665
4666 #: builtin/blame.c:2584
4667 msgid "Show original linenumber (Default: off)"
4668 msgstr "显示原始的行号(默认:关闭)"
4669
4670 #: builtin/blame.c:2585
4671 msgid "Show in a format designed for machine consumption"
4672 msgstr "显示为一个适合机器读取的格式"
4673
4674 #: builtin/blame.c:2586
4675 msgid "Show porcelain format with per-line commit information"
4676 msgstr "为每一行显示机器适用的提交信息"
4677
4678 #: builtin/blame.c:2587
4679 msgid "Use the same output mode as git-annotate (Default: off)"
4680 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
4681
4682 #: builtin/blame.c:2588
4683 msgid "Show raw timestamp (Default: off)"
4684 msgstr "显示原始时间戳(默认:关闭)"
4685
4686 #: builtin/blame.c:2589
4687 msgid "Show long commit SHA1 (Default: off)"
4688 msgstr "显示长的 SHA1 提交号(默认:关闭)"
4689
4690 #: builtin/blame.c:2590
4691 msgid "Suppress author name and timestamp (Default: off)"
4692 msgstr "隐藏作者名字和时间戳(默认:关闭)"
4693
4694 #: builtin/blame.c:2591
4695 msgid "Show author email instead of name (Default: off)"
4696 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
4697
4698 #: builtin/blame.c:2592
4699 msgid "Ignore whitespace differences"
4700 msgstr "忽略空白差异"
4701
4702 #: builtin/blame.c:2599
4703 msgid "Use an experimental indent-based heuristic to improve diffs"
4704 msgstr "使用一个试验性的基于缩进的启发式算法改进差异显示"
4705
4706 #: builtin/blame.c:2600
4707 msgid "Use an experimental blank-line-based heuristic to improve diffs"
4708 msgstr "使用一个试验性的基于空行的启发式算法改进差异显示"
4709
4710 #: builtin/blame.c:2602
4711 msgid "Spend extra cycles to find better match"
4712 msgstr "花费额外的循环来找到更好的匹配"
4713
4714 #: builtin/blame.c:2603
4715 msgid "Use revisions from <file> instead of calling git-rev-list"
4716 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
4717
4718 #: builtin/blame.c:2604
4719 msgid "Use <file>'s contents as the final image"
4720 msgstr "使用 <文件> 的内容作为最终的图片"
4721
4722 #: builtin/blame.c:2605 builtin/blame.c:2606
4723 msgid "score"
4724 msgstr "得分"
4725
4726 #: builtin/blame.c:2605
4727 msgid "Find line copies within and across files"
4728 msgstr "找到文件内及跨文件的行拷贝"
4729
4730 #: builtin/blame.c:2606
4731 msgid "Find line movements within and across files"
4732 msgstr "找到文件内及跨文件的行移动"
4733
4734 #: builtin/blame.c:2607
4735 msgid "n,m"
4736 msgstr "n,m"
4737
4738 #: builtin/blame.c:2607
4739 msgid "Process only line range n,m, counting from 1"
4740 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
4741
4742 #: builtin/blame.c:2654
4743 msgid "--progress can't be used with --incremental or porcelain formats"
4744 msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
4745
4746 #. TRANSLATORS: This string is used to tell us the maximum
4747 #. display width for a relative timestamp in "git blame"
4748 #. output. For C locale, "4 years, 11 months ago", which
4749 #. takes 22 places, is the longest among various forms of
4750 #. relative timestamps, but your language may need more or
4751 #. fewer display columns.
4752 #: builtin/blame.c:2700
4753 msgid "4 years, 11 months ago"
4754 msgstr "4 年 11 个月前"
4755
4756 #: builtin/blame.c:2780
4757 msgid "--contents and --reverse do not blend well."
4758 msgstr "--contents 和 --reverse 不能混用。"
4759
4760 #: builtin/blame.c:2800
4761 msgid "cannot use --contents with final commit object name"
4762 msgstr "不能将 --contents 和最终的提交对象名共用"
4763
4764 #: builtin/blame.c:2805
4765 msgid "--reverse and --first-parent together require specified latest commit"
4766 msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
4767
4768 #: builtin/blame.c:2832
4769 msgid ""
4770 "--reverse --first-parent together require range along first-parent chain"
4771 msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
4772
4773 #: builtin/blame.c:2843
4774 #, c-format
4775 msgid "no such path %s in %s"
4776 msgstr "在 %2$s 中无此路径 %1$s"
4777
4778 #: builtin/blame.c:2854
4779 #, c-format
4780 msgid "cannot read blob %s for path %s"
4781 msgstr "不能为路径 %2$s 读取对象 %1$s"
4782
4783 #: builtin/blame.c:2873
4784 #, c-format
4785 msgid "file %s has only %lu line"
4786 msgid_plural "file %s has only %lu lines"
4787 msgstr[0] "文件 %s 只有 %lu 行"
4788 msgstr[1] "文件 %s 只有 %lu 行"
4789
4790 #: builtin/branch.c:26
4791 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
4792 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
4793
4794 #: builtin/branch.c:27
4795 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
4796 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
4797
4798 #: builtin/branch.c:28
4799 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
4800 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
4801
4802 #: builtin/branch.c:29
4803 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
4804 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
4805
4806 #: builtin/branch.c:30
4807 msgid "git branch [<options>] [-r | -a] [--points-at]"
4808 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
4809
4810 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4811 #: builtin/branch.c:143
4812 #, c-format
4813 msgid ""
4814 "deleting branch '%s' that has been merged to\n"
4815 " '%s', but not yet merged to HEAD."
4816 msgstr ""
4817 "将要删除的分支 '%s' 已经被合并到\n"
4818 " '%s',但未合并到 HEAD。"
4819
4820 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4821 #: builtin/branch.c:147
4822 #, c-format
4823 msgid ""
4824 "not deleting branch '%s' that is not yet merged to\n"
4825 " '%s', even though it is merged to HEAD."
4826 msgstr ""
4827 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
4828 " 然而却尚未被合并到分支 '%s' 。"
4829
4830 #: builtin/branch.c:161
4831 #, c-format
4832 msgid "Couldn't look up commit object for '%s'"
4833 msgstr "无法查询 '%s' 指向的提交对象"
4834
4835 #: builtin/branch.c:165
4836 #, c-format
4837 msgid ""
4838 "The branch '%s' is not fully merged.\n"
4839 "If you are sure you want to delete it, run 'git branch -D %s'."
4840 msgstr ""
4841 "分支 '%s' 没有完全合并。\n"
4842 "如果您确认要删除它,执行 'git branch -D %s'。"
4843
4844 #: builtin/branch.c:178
4845 msgid "Update of config-file failed"
4846 msgstr "无法更新 config 文件"
4847
4848 #: builtin/branch.c:206
4849 msgid "cannot use -a with -d"
4850 msgstr "不能将 -a 和 -d 同时使用"
4851
4852 #: builtin/branch.c:212
4853 msgid "Couldn't look up commit object for HEAD"
4854 msgstr "无法查询 HEAD 指向的提交对象"
4855
4856 #: builtin/branch.c:226
4857 #, c-format
4858 msgid "Cannot delete branch '%s' checked out at '%s'"
4859 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
4860
4861 #: builtin/branch.c:241
4862 #, c-format
4863 msgid "remote-tracking branch '%s' not found."
4864 msgstr "未能找到远程跟踪分支 '%s'。"
4865
4866 #: builtin/branch.c:242
4867 #, c-format
4868 msgid "branch '%s' not found."
4869 msgstr "分支 '%s' 未发现。"
4870
4871 #: builtin/branch.c:257
4872 #, c-format
4873 msgid "Error deleting remote-tracking branch '%s'"
4874 msgstr "无法删除远程跟踪分支 '%s'"
4875
4876 #: builtin/branch.c:258
4877 #, c-format
4878 msgid "Error deleting branch '%s'"
4879 msgstr "无法删除分支 '%s'"
4880
4881 #: builtin/branch.c:265
4882 #, c-format
4883 msgid "Deleted remote-tracking branch %s (was %s).\n"
4884 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
4885
4886 #: builtin/branch.c:266
4887 #, c-format
4888 msgid "Deleted branch %s (was %s).\n"
4889 msgstr "已删除分支 %s(曾为 %s)。\n"
4890
4891 #: builtin/branch.c:312
4892 #, c-format
4893 msgid "[%s: gone]"
4894 msgstr "[%s: 丢失]"
4895
4896 #: builtin/branch.c:317
4897 #, c-format
4898 msgid "[%s]"
4899 msgstr "[%s]"
4900
4901 #: builtin/branch.c:322
4902 #, c-format
4903 msgid "[%s: behind %d]"
4904 msgstr "[%s:落后 %d]"
4905
4906 #: builtin/branch.c:324
4907 #, c-format
4908 msgid "[behind %d]"
4909 msgstr "[落后 %d]"
4910
4911 #: builtin/branch.c:328
4912 #, c-format
4913 msgid "[%s: ahead %d]"
4914 msgstr "[%s:领先 %d]"
4915
4916 #: builtin/branch.c:330
4917 #, c-format
4918 msgid "[ahead %d]"
4919 msgstr "[领先 %d]"
4920
4921 #: builtin/branch.c:333
4922 #, c-format
4923 msgid "[%s: ahead %d, behind %d]"
4924 msgstr "[%s:领先 %d,落后 %d]"
4925
4926 #: builtin/branch.c:336
4927 #, c-format
4928 msgid "[ahead %d, behind %d]"
4929 msgstr "[领先 %d,落后 %d]"
4930
4931 #: builtin/branch.c:349
4932 msgid " **** invalid ref ****"
4933 msgstr " **** 无效引用 ****"
4934
4935 #: builtin/branch.c:375
4936 #, c-format
4937 msgid "(no branch, rebasing %s)"
4938 msgstr "(非分支,正变基 %s)"
4939
4940 #: builtin/branch.c:378
4941 #, c-format
4942 msgid "(no branch, bisect started on %s)"
4943 msgstr "(非分支,二分查找开始于 %s)"
4944
4945 #. TRANSLATORS: make sure this matches
4946 #. "HEAD detached at " in wt-status.c
4947 #: builtin/branch.c:384
4948 #, c-format
4949 msgid "(HEAD detached at %s)"
4950 msgstr "(头指针分离于 %s)"
4951
4952 #. TRANSLATORS: make sure this matches
4953 #. "HEAD detached from " in wt-status.c
4954 #: builtin/branch.c:389
4955 #, c-format
4956 msgid "(HEAD detached from %s)"
4957 msgstr "(头指针分离自 %s)"
4958
4959 #: builtin/branch.c:393
4960 msgid "(no branch)"
4961 msgstr "(非分支)"
4962
4963 #: builtin/branch.c:544
4964 #, c-format
4965 msgid "Branch %s is being rebased at %s"
4966 msgstr "分支 %s 正被变基到 %s"
4967
4968 #: builtin/branch.c:548
4969 #, c-format
4970 msgid "Branch %s is being bisected at %s"
4971 msgstr "分支 %s 正被二分查找于 %s"
4972
4973 #: builtin/branch.c:563
4974 msgid "cannot rename the current branch while not on any."
4975 msgstr "无法重命名当前分支因为不处于任何分支上。"
4976
4977 #: builtin/branch.c:573
4978 #, c-format
4979 msgid "Invalid branch name: '%s'"
4980 msgstr "无效的分支名:'%s'"
4981
4982 #: builtin/branch.c:590
4983 msgid "Branch rename failed"
4984 msgstr "分支重命名失败"
4985
4986 #: builtin/branch.c:594
4987 #, c-format
4988 msgid "Renamed a misnamed branch '%s' away"
4989 msgstr "重命名掉一个错误命名的旧分支 '%s'"
4990
4991 #: builtin/branch.c:597
4992 #, c-format
4993 msgid "Branch renamed to %s, but HEAD is not updated!"
4994 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
4995
4996 #: builtin/branch.c:604
4997 msgid "Branch is renamed, but update of config-file failed"
4998 msgstr "分支被重命名,但更新 config 文件失败"
4999
5000 #: builtin/branch.c:620
5001 #, c-format
5002 msgid ""
5003 "Please edit the description for the branch\n"
5004 " %s\n"
5005 "Lines starting with '%c' will be stripped.\n"
5006 msgstr ""
5007 "请编辑分支的描述\n"
5008 " %s\n"
5009 "以 '%c' 开头的行将被过滤。\n"
5010
5011 #: builtin/branch.c:651
5012 msgid "Generic options"
5013 msgstr "通用选项"
5014
5015 #: builtin/branch.c:653
5016 msgid "show hash and subject, give twice for upstream branch"
5017 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
5018
5019 #: builtin/branch.c:654
5020 msgid "suppress informational messages"
5021 msgstr "不显示信息"
5022
5023 #: builtin/branch.c:655
5024 msgid "set up tracking mode (see git-pull(1))"
5025 msgstr "设置跟踪模式(参见 git-pull(1))"
5026
5027 #: builtin/branch.c:657
5028 msgid "change upstream info"
5029 msgstr "改变上游信息"
5030
5031 #: builtin/branch.c:659
5032 msgid "upstream"
5033 msgstr "上游"
5034
5035 #: builtin/branch.c:659
5036 msgid "change the upstream info"
5037 msgstr "改变上游信息"
5038
5039 #: builtin/branch.c:660
5040 msgid "Unset the upstream info"
5041 msgstr "取消上游信息的设置"
5042
5043 #: builtin/branch.c:661
5044 msgid "use colored output"
5045 msgstr "使用彩色输出"
5046
5047 #: builtin/branch.c:662
5048 msgid "act on remote-tracking branches"
5049 msgstr "作用于远程跟踪分支"
5050
5051 #: builtin/branch.c:664 builtin/branch.c:665
5052 msgid "print only branches that contain the commit"
5053 msgstr "只打印包含该提交的分支"
5054
5055 #: builtin/branch.c:668
5056 msgid "Specific git-branch actions:"
5057 msgstr "具体的 git-branch 动作:"
5058
5059 #: builtin/branch.c:669
5060 msgid "list both remote-tracking and local branches"
5061 msgstr "列出远程跟踪及本地分支"
5062
5063 #: builtin/branch.c:671
5064 msgid "delete fully merged branch"
5065 msgstr "删除完全合并的分支"
5066
5067 #: builtin/branch.c:672
5068 msgid "delete branch (even if not merged)"
5069 msgstr "删除分支(即使没有合并)"
5070
5071 #: builtin/branch.c:673
5072 msgid "move/rename a branch and its reflog"
5073 msgstr "移动/重命名一个分支,以及它的引用日志"
5074
5075 #: builtin/branch.c:674
5076 msgid "move/rename a branch, even if target exists"
5077 msgstr "移动/重命名一个分支,即使目标已存在"
5078
5079 #: builtin/branch.c:675
5080 msgid "list branch names"
5081 msgstr "列出分支名"
5082
5083 #: builtin/branch.c:676
5084 msgid "create the branch's reflog"
5085 msgstr "创建分支的引用日志"
5086
5087 #: builtin/branch.c:678
5088 msgid "edit the description for the branch"
5089 msgstr "标记分支的描述"
5090
5091 #: builtin/branch.c:679
5092 msgid "force creation, move/rename, deletion"
5093 msgstr "强制创建、移动/重命名、删除"
5094
5095 #: builtin/branch.c:680
5096 msgid "print only branches that are merged"
5097 msgstr "只打印已经合并的分支"
5098
5099 #: builtin/branch.c:681
5100 msgid "print only branches that are not merged"
5101 msgstr "只打印尚未合并的分支"
5102
5103 #: builtin/branch.c:682
5104 msgid "list branches in columns"
5105 msgstr "以列的方式显示分支"
5106
5107 #: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
5108 msgid "key"
5109 msgstr "key"
5110
5111 #: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
5112 msgid "field name to sort on"
5113 msgstr "排序的字段名"
5114
5115 #: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
5116 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
5117 #: builtin/tag.c:369
5118 msgid "object"
5119 msgstr "对象"
5120
5121 #: builtin/branch.c:687
5122 msgid "print only branches of the object"
5123 msgstr "只打印指向该对象的分支"
5124
5125 #: builtin/branch.c:705
5126 msgid "Failed to resolve HEAD as a valid ref."
5127 msgstr "无法将 HEAD 解析为有效引用。"
5128
5129 #: builtin/branch.c:709 builtin/clone.c:706
5130 msgid "HEAD not found below refs/heads!"
5131 msgstr "HEAD 没有位于 /refs/heads 之下!"
5132
5133 #: builtin/branch.c:729
5134 msgid "--column and --verbose are incompatible"
5135 msgstr "--column 和 --verbose 不兼容"
5136
5137 #: builtin/branch.c:740 builtin/branch.c:782
5138 msgid "branch name required"
5139 msgstr "必须提供分支名"
5140
5141 #: builtin/branch.c:758
5142 msgid "Cannot give description to detached HEAD"
5143 msgstr "不能向分离头指针提供描述"
5144
5145 #: builtin/branch.c:763
5146 msgid "cannot edit description of more than one branch"
5147 msgstr "不能为一个以上的分支编辑描述"
5148
5149 #: builtin/branch.c:770
5150 #, c-format
5151 msgid "No commit on branch '%s' yet."
5152 msgstr "分支 '%s' 尚无提交。"
5153
5154 #: builtin/branch.c:773
5155 #, c-format
5156 msgid "No branch named '%s'."
5157 msgstr "没有分支 '%s'。"
5158
5159 #: builtin/branch.c:788
5160 msgid "too many branches for a rename operation"
5161 msgstr "为重命名操作提供了太多的分支名"
5162
5163 #: builtin/branch.c:793
5164 msgid "too many branches to set new upstream"
5165 msgstr "为设置新上游提供了太多的分支名"
5166
5167 #: builtin/branch.c:797
5168 #, c-format
5169 msgid ""
5170 "could not set upstream of HEAD to %s when it does not point to any branch."
5171 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
5172
5173 #: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
5174 #, c-format
5175 msgid "no such branch '%s'"
5176 msgstr "没有此分支 '%s'"
5177
5178 #: builtin/branch.c:804
5179 #, c-format
5180 msgid "branch '%s' does not exist"
5181 msgstr "分支 '%s' 不存在"
5182
5183 #: builtin/branch.c:816
5184 msgid "too many branches to unset upstream"
5185 msgstr "为取消上游设置操作提供了太多的分支名"
5186
5187 #: builtin/branch.c:820
5188 msgid "could not unset upstream of HEAD when it does not point to any branch."
5189 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
5190
5191 #: builtin/branch.c:826
5192 #, c-format
5193 msgid "Branch '%s' has no upstream information"
5194 msgstr "分支 '%s' 没有上游信息"
5195
5196 #: builtin/branch.c:840
5197 msgid "it does not make sense to create 'HEAD' manually"
5198 msgstr "手工创建 'HEAD' 没有意义"
5199
5200 #: builtin/branch.c:846
5201 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
5202 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
5203
5204 #: builtin/branch.c:849
5205 #, c-format
5206 msgid ""
5207 "The --set-upstream flag is deprecated and will be removed. Consider using --"
5208 "track or --set-upstream-to\n"
5209 msgstr ""
5210 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
5211
5212 #: builtin/branch.c:866
5213 #, c-format
5214 msgid ""
5215 "\n"
5216 "If you wanted to make '%s' track '%s', do this:\n"
5217 "\n"
5218 msgstr ""
5219 "\n"
5220 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
5221 "\n"
5222
5223 #: builtin/bundle.c:51
5224 #, c-format
5225 msgid "%s is okay\n"
5226 msgstr "%s 可以\n"
5227
5228 #: builtin/bundle.c:64
5229 msgid "Need a repository to create a bundle."
5230 msgstr "需要一个仓库来创建包。"
5231
5232 #: builtin/bundle.c:68
5233 msgid "Need a repository to unbundle."
5234 msgstr "需要一个仓库来解包。"
5235
5236 #: builtin/cat-file.c:513
5237 msgid ""
5238 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5239 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
5240 msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
5241
5242 #: builtin/cat-file.c:514
5243 msgid ""
5244 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5245 "filters]"
5246 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
5247
5248 #: builtin/cat-file.c:551
5249 msgid "<type> can be one of: blob, tree, commit, tag"
5250 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
5251
5252 #: builtin/cat-file.c:552
5253 msgid "show object type"
5254 msgstr "显示对象类型"
5255
5256 #: builtin/cat-file.c:553
5257 msgid "show object size"
5258 msgstr "显示对象大小"
5259
5260 #: builtin/cat-file.c:555
5261 msgid "exit with zero when there's no error"
5262 msgstr "当没有错误时退出并返回零"
5263
5264 #: builtin/cat-file.c:556
5265 msgid "pretty-print object's content"
5266 msgstr "美观地打印对象的内容"
5267
5268 #: builtin/cat-file.c:558
5269 msgid "for blob objects, run textconv on object's content"
5270 msgstr "对于数据对象,对其内容做文本转换"
5271
5272 #: builtin/cat-file.c:560
5273 msgid "for blob objects, run filters on object's content"
5274 msgstr "对于数据对象,对其内容做过滤"
5275
5276 #: builtin/cat-file.c:561 git-submodule.sh:923
5277 msgid "blob"
5278 msgstr "数据对象"
5279
5280 #: builtin/cat-file.c:562
5281 msgid "use a specific path for --textconv/--filters"
5282 msgstr "对于 --textconv/--filters 使用一个特定的路径"
5283
5284 #: builtin/cat-file.c:564
5285 msgid "allow -s and -t to work with broken/corrupt objects"
5286 msgstr "允许 -s 和 -t 对损坏的对象生效"
5287
5288 #: builtin/cat-file.c:565
5289 msgid "buffer --batch output"
5290 msgstr "缓冲 --batch 的输出"
5291
5292 #: builtin/cat-file.c:567
5293 msgid "show info and content of objects fed from the standard input"
5294 msgstr "显示从标准输入提供的对象的信息和内容"
5295
5296 #: builtin/cat-file.c:570
5297 msgid "show info about objects fed from the standard input"
5298 msgstr "显示从标准输入提供的对象的信息"
5299
5300 #: builtin/cat-file.c:573
5301 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
5302 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
5303
5304 #: builtin/cat-file.c:575
5305 msgid "show all objects with --batch or --batch-check"
5306 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
5307
5308 #: builtin/check-attr.c:11
5309 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
5310 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
5311
5312 #: builtin/check-attr.c:12
5313 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
5314 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
5315
5316 #: builtin/check-attr.c:19
5317 msgid "report all attributes set on file"
5318 msgstr "报告设置在文件上的所有属性"
5319
5320 #: builtin/check-attr.c:20
5321 msgid "use .gitattributes only from the index"
5322 msgstr "只使用索引中的 .gitattributes"
5323
5324 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
5325 msgid "read file names from stdin"
5326 msgstr "从标准输入读出文件名"
5327
5328 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
5329 msgid "terminate input and output records by a NUL character"
5330 msgstr "输入和输出的记录使用 NUL 字符终结"
5331
5332 #: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
5333 msgid "suppress progress reporting"
5334 msgstr "不显示进度报告"
5335
5336 #: builtin/check-ignore.c:26
5337 msgid "show non-matching input paths"
5338 msgstr "显示未匹配的输入路径"
5339
5340 #: builtin/check-ignore.c:28
5341 msgid "ignore index when checking"
5342 msgstr "检查时忽略索引"
5343
5344 #: builtin/check-ignore.c:154
5345 msgid "cannot specify pathnames with --stdin"
5346 msgstr "不能同时指定路径及 --stdin 参数"
5347
5348 #: builtin/check-ignore.c:157
5349 msgid "-z only makes sense with --stdin"
5350 msgstr "-z 需要和 --stdin 参数共用才有意义"
5351
5352 #: builtin/check-ignore.c:159
5353 msgid "no path specified"
5354 msgstr "未指定路径"
5355
5356 #: builtin/check-ignore.c:163
5357 msgid "--quiet is only valid with a single pathname"
5358 msgstr "参数 --quiet 只在提供一个路径名时有效"
5359
5360 #: builtin/check-ignore.c:165
5361 msgid "cannot have both --quiet and --verbose"
5362 msgstr "不能同时提供 --quiet 和 --verbose 参数"
5363
5364 #: builtin/check-ignore.c:168
5365 msgid "--non-matching is only valid with --verbose"
5366 msgstr "--non-matching 选项只在使用 --verbose 时有效"
5367
5368 #: builtin/check-mailmap.c:8
5369 msgid "git check-mailmap [<options>] <contact>..."
5370 msgstr "git check-mailmap [<选项>] <联系地址>..."
5371
5372 #: builtin/check-mailmap.c:13
5373 msgid "also read contacts from stdin"
5374 msgstr "还从标准输入读取联系地址"
5375
5376 #: builtin/check-mailmap.c:24
5377 #, c-format
5378 msgid "unable to parse contact: %s"
5379 msgstr "不能解析联系地址:%s"
5380
5381 #: builtin/check-mailmap.c:47
5382 msgid "no contacts specified"
5383 msgstr "未指定联系地址"
5384
5385 #: builtin/checkout-index.c:127
5386 msgid "git checkout-index [<options>] [--] [<file>...]"
5387 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
5388
5389 #: builtin/checkout-index.c:144
5390 msgid "stage should be between 1 and 3 or all"
5391 msgstr "索引值应该取值 1 到 3 或者 all"
5392
5393 #: builtin/checkout-index.c:160
5394 msgid "check out all files in the index"
5395 msgstr "检出索引区的所有文件"
5396
5397 #: builtin/checkout-index.c:161
5398 msgid "force overwrite of existing files"
5399 msgstr "强制覆盖现有的文件"
5400
5401 #: builtin/checkout-index.c:163
5402 msgid "no warning for existing files and files not in index"
5403 msgstr "存在或不在索引中的文件都没有警告"
5404
5405 #: builtin/checkout-index.c:165
5406 msgid "don't checkout new files"
5407 msgstr "不检出新文件"
5408
5409 #: builtin/checkout-index.c:167
5410 msgid "update stat information in the index file"
5411 msgstr "更新索引中文件的状态信息"
5412
5413 #: builtin/checkout-index.c:171
5414 msgid "read list of paths from the standard input"
5415 msgstr "从标准输入读取路径列表"
5416
5417 #: builtin/checkout-index.c:173
5418 msgid "write the content to temporary files"
5419 msgstr "将内容写入临时文件"
5420
5421 #: builtin/checkout-index.c:174 builtin/column.c:30
5422 #: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
5423 #: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
5424 #: builtin/worktree.c:469
5425 msgid "string"
5426 msgstr "字符串"
5427
5428 #: builtin/checkout-index.c:175
5429 msgid "when creating files, prepend <string>"
5430 msgstr "在创建文件时,在前面加上 <字符串>"
5431
5432 #: builtin/checkout-index.c:177
5433 msgid "copy out the files from named stage"
5434 msgstr "从指定暂存区中拷出文件"
5435
5436 #: builtin/checkout.c:25
5437 msgid "git checkout [<options>] <branch>"
5438 msgstr "git checkout [<选项>] <分支>"
5439
5440 #: builtin/checkout.c:26
5441 msgid "git checkout [<options>] [<branch>] -- <file>..."
5442 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
5443
5444 #: builtin/checkout.c:134 builtin/checkout.c:167
5445 #, c-format
5446 msgid "path '%s' does not have our version"
5447 msgstr "路径 '%s' 没有我们的版本"
5448
5449 #: builtin/checkout.c:136 builtin/checkout.c:169
5450 #, c-format
5451 msgid "path '%s' does not have their version"
5452 msgstr "路径 '%s' 没有他们的版本"
5453
5454 #: builtin/checkout.c:152
5455 #, c-format
5456 msgid "path '%s' does not have all necessary versions"
5457 msgstr "路径 '%s' 没有全部必须的版本"
5458
5459 #: builtin/checkout.c:196
5460 #, c-format
5461 msgid "path '%s' does not have necessary versions"
5462 msgstr "路径 '%s' 没有必须的版本"
5463
5464 #: builtin/checkout.c:213
5465 #, c-format
5466 msgid "path '%s': cannot merge"
5467 msgstr "path '%s':无法合并"
5468
5469 #: builtin/checkout.c:230
5470 #, c-format
5471 msgid "Unable to add merge result for '%s'"
5472 msgstr "无法为 '%s' 添加合并结果"
5473
5474 #: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
5475 #: builtin/checkout.c:259
5476 #, c-format
5477 msgid "'%s' cannot be used with updating paths"
5478 msgstr "'%s' 不能在更新路径时使用"
5479
5480 #: builtin/checkout.c:262 builtin/checkout.c:265
5481 #, c-format
5482 msgid "'%s' cannot be used with %s"
5483 msgstr "'%s' 不能和 %s 同时使用"
5484
5485 #: builtin/checkout.c:268
5486 #, c-format
5487 msgid "Cannot update paths and switch to branch '%s' at the same time."
5488 msgstr "不能同时更新路径并切换到分支'%s'。"
5489
5490 #: builtin/checkout.c:339 builtin/checkout.c:346
5491 #, c-format
5492 msgid "path '%s' is unmerged"
5493 msgstr "路径 '%s' 未合并"
5494
5495 #: builtin/checkout.c:494
5496 msgid "you need to resolve your current index first"
5497 msgstr "您需要先解决当前索引的冲突"
5498
5499 #: builtin/checkout.c:624
5500 #, c-format
5501 msgid "Can not do reflog for '%s': %s\n"
5502 msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
5503
5504 #: builtin/checkout.c:663
5505 msgid "HEAD is now at"
5506 msgstr "HEAD 目前位于"
5507
5508 #: builtin/checkout.c:667 builtin/clone.c:660
5509 msgid "unable to update HEAD"
5510 msgstr "不能更新 HEAD"
5511
5512 #: builtin/checkout.c:671
5513 #, c-format
5514 msgid "Reset branch '%s'\n"
5515 msgstr "重置分支 '%s'\n"
5516
5517 #: builtin/checkout.c:674
5518 #, c-format
5519 msgid "Already on '%s'\n"
5520 msgstr "已经位于 '%s'\n"
5521
5522 #: builtin/checkout.c:678
5523 #, c-format
5524 msgid "Switched to and reset branch '%s'\n"
5525 msgstr "切换并重置分支 '%s'\n"
5526
5527 #: builtin/checkout.c:680 builtin/checkout.c:1069
5528 #, c-format
5529 msgid "Switched to a new branch '%s'\n"
5530 msgstr "切换到一个新分支 '%s'\n"
5531
5532 #: builtin/checkout.c:682
5533 #, c-format
5534 msgid "Switched to branch '%s'\n"
5535 msgstr "切换到分支 '%s'\n"
5536
5537 # 译者:注意保持前导空格
5538 #: builtin/checkout.c:733
5539 #, c-format
5540 msgid " ... and %d more.\n"
5541 msgstr " ... 及其它 %d 个。\n"
5542
5543 #: builtin/checkout.c:739
5544 #, c-format
5545 msgid ""
5546 "Warning: you are leaving %d commit behind, not connected to\n"
5547 "any of your branches:\n"
5548 "\n"
5549 "%s\n"
5550 msgid_plural ""
5551 "Warning: you are leaving %d commits behind, not connected to\n"
5552 "any of your branches:\n"
5553 "\n"
5554 "%s\n"
5555 msgstr[0] ""
5556 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
5557 "\n"
5558 "%s\n"
5559 msgstr[1] ""
5560 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
5561 "\n"
5562 "%s\n"
5563
5564 #: builtin/checkout.c:758
5565 #, c-format
5566 msgid ""
5567 "If you want to keep it by creating a new branch, this may be a good time\n"
5568 "to do so with:\n"
5569 "\n"
5570 " git branch <new-branch-name> %s\n"
5571 "\n"
5572 msgid_plural ""
5573 "If you want to keep them by creating a new branch, this may be a good time\n"
5574 "to do so with:\n"
5575 "\n"
5576 " git branch <new-branch-name> %s\n"
5577 "\n"
5578 msgstr[0] ""
5579 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
5580 "如下操作:\n"
5581 "\n"
5582 " git branch <新分支名> %s\n"
5583 "\n"
5584 msgstr[1] ""
5585 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
5586 "如下操作:\n"
5587 "\n"
5588 " git branch <新分支名> %s\n"
5589 "\n"
5590
5591 #: builtin/checkout.c:794
5592 msgid "internal error in revision walk"
5593 msgstr "在版本遍历时遇到内部错误"
5594
5595 #: builtin/checkout.c:798
5596 msgid "Previous HEAD position was"
5597 msgstr "之前的 HEAD 位置是"
5598
5599 #: builtin/checkout.c:825 builtin/checkout.c:1064
5600 msgid "You are on a branch yet to be born"
5601 msgstr "您位于一个尚未初始化的分支"
5602
5603 #: builtin/checkout.c:970
5604 #, c-format
5605 msgid "only one reference expected, %d given."
5606 msgstr "应只有一个引用,却给出了 %d 个"
5607
5608 #: builtin/checkout.c:1010 builtin/worktree.c:214
5609 #, c-format
5610 msgid "invalid reference: %s"
5611 msgstr "无效引用:%s"
5612
5613 #: builtin/checkout.c:1039
5614 #, c-format
5615 msgid "reference is not a tree: %s"
5616 msgstr "引用不是一个树:%s"
5617
5618 #: builtin/checkout.c:1078
5619 msgid "paths cannot be used with switching branches"
5620 msgstr "路径不能和切换分支同时使用"
5621
5622 #: builtin/checkout.c:1081 builtin/checkout.c:1085
5623 #, c-format
5624 msgid "'%s' cannot be used with switching branches"
5625 msgstr "'%s' 不能和切换分支同时使用"
5626
5627 #: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
5628 #: builtin/checkout.c:1100
5629 #, c-format
5630 msgid "'%s' cannot be used with '%s'"
5631 msgstr "'%s' 不能和 '%s' 同时使用"
5632
5633 #: builtin/checkout.c:1105
5634 #, c-format
5635 msgid "Cannot switch branch to a non-commit '%s'"
5636 msgstr "不能切换分支到一个非提交 '%s'"
5637
5638 #: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
5639 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
5640 #: builtin/worktree.c:326
5641 msgid "branch"
5642 msgstr "分支"
5643
5644 #: builtin/checkout.c:1139
5645 msgid "create and checkout a new branch"
5646 msgstr "创建并检出一个新的分支"
5647
5648 #: builtin/checkout.c:1141
5649 msgid "create/reset and checkout a branch"
5650 msgstr "创建/重置并检出一个分支"
5651
5652 #: builtin/checkout.c:1142
5653 msgid "create reflog for new branch"
5654 msgstr "为新的分支创建引用日志"
5655
5656 #: builtin/checkout.c:1143 builtin/worktree.c:328
5657 msgid "detach HEAD at named commit"
5658 msgstr "HEAD 从指定的提交分离"
5659
5660 #: builtin/checkout.c:1144
5661 msgid "set upstream info for new branch"
5662 msgstr "为新的分支设置上游信息"
5663
5664 #: builtin/checkout.c:1146
5665 msgid "new-branch"
5666 msgstr "新分支"
5667
5668 #: builtin/checkout.c:1146
5669 msgid "new unparented branch"
5670 msgstr "新的没有父提交的分支"
5671
5672 #: builtin/checkout.c:1147
5673 msgid "checkout our version for unmerged files"
5674 msgstr "对尚未合并的文件检出我们的版本"
5675
5676 #: builtin/checkout.c:1149
5677 msgid "checkout their version for unmerged files"
5678 msgstr "对尚未合并的文件检出他们的版本"
5679
5680 #: builtin/checkout.c:1151
5681 msgid "force checkout (throw away local modifications)"
5682 msgstr "强制检出(丢弃本地修改)"
5683
5684 #: builtin/checkout.c:1152
5685 msgid "perform a 3-way merge with the new branch"
5686 msgstr "和新的分支执行三方合并"
5687
5688 #: builtin/checkout.c:1153 builtin/merge.c:231
5689 msgid "update ignored files (default)"
5690 msgstr "更新忽略的文件(默认)"
5691
5692 #: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
5693 msgid "style"
5694 msgstr "风格"
5695
5696 #: builtin/checkout.c:1155
5697 msgid "conflict style (merge or diff3)"
5698 msgstr "冲突输出风格(merge 或 diff3)"
5699
5700 #: builtin/checkout.c:1158
5701 msgid "do not limit pathspecs to sparse entries only"
5702 msgstr "对路径不做稀疏检出的限制"
5703
5704 #: builtin/checkout.c:1160
5705 msgid "second guess 'git checkout <no-such-branch>'"
5706 msgstr "二次猜测'git checkout <无此分支>'"
5707
5708 #: builtin/checkout.c:1162
5709 msgid "do not check if another worktree is holding the given ref"
5710 msgstr "不检查指定的引用是否被其他工作区所占用"
5711
5712 #: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
5713 #: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
5714 #: builtin/send-pack.c:168
5715 msgid "force progress reporting"
5716 msgstr "强制显示进度报告"
5717
5718 #: builtin/checkout.c:1194
5719 msgid "-b, -B and --orphan are mutually exclusive"
5720 msgstr "-b、-B 和 --orphan 是互斥的"
5721
5722 #: builtin/checkout.c:1211
5723 msgid "--track needs a branch name"
5724 msgstr "--track 需要一个分支名"
5725
5726 #: builtin/checkout.c:1216
5727 msgid "Missing branch name; try -b"
5728 msgstr "缺少分支名;尝试 -b"
5729
5730 #: builtin/checkout.c:1252
5731 msgid "invalid path specification"
5732 msgstr "无效的路径规格"
5733
5734 #: builtin/checkout.c:1259
5735 #, c-format
5736 msgid ""
5737 "Cannot update paths and switch to branch '%s' at the same time.\n"
5738 "Did you intend to checkout '%s' which can not be resolved as commit?"
5739 msgstr ""
5740 "不能同时更新路径并切换到分支'%s'。\n"
5741 "您是想要检出 '%s' 但其未能解析为提交么?"
5742
5743 #: builtin/checkout.c:1264
5744 #, c-format
5745 msgid "git checkout: --detach does not take a path argument '%s'"
5746 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
5747
5748 #: builtin/checkout.c:1268
5749 msgid ""
5750 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
5751 "checking out of the index."
5752 msgstr ""
5753 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
5754
5755 #: builtin/clean.c:25
5756 msgid ""
5757 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
5758 msgstr ""
5759 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
5760
5761 #: builtin/clean.c:29
5762 #, c-format
5763 msgid "Removing %s\n"
5764 msgstr "正删除 %s\n"
5765
5766 #: builtin/clean.c:30
5767 #, c-format
5768 msgid "Would remove %s\n"
5769 msgstr "将删除 %s\n"
5770
5771 #: builtin/clean.c:31
5772 #, c-format
5773 msgid "Skipping repository %s\n"
5774 msgstr "忽略仓库 %s\n"
5775
5776 #: builtin/clean.c:32
5777 #, c-format
5778 msgid "Would skip repository %s\n"
5779 msgstr "将忽略仓库 %s\n"
5780
5781 #: builtin/clean.c:33
5782 #, c-format
5783 msgid "failed to remove %s"
5784 msgstr "无法删除 %s"
5785
5786 #: builtin/clean.c:291
5787 msgid ""
5788 "Prompt help:\n"
5789 "1 - select a numbered item\n"
5790 "foo - select item based on unique prefix\n"
5791 " - (empty) select nothing"
5792 msgstr ""
5793 "帮助:\n"
5794 "1 - 通过编号选择一个选项\n"
5795 "foo - 通过标题选择一个选项\n"
5796 " - (空)什么也不选择"
5797
5798 #: builtin/clean.c:295
5799 msgid ""
5800 "Prompt help:\n"
5801 "1 - select a single item\n"
5802 "3-5 - select a range of items\n"
5803 "2-3,6-9 - select multiple ranges\n"
5804 "foo - select item based on unique prefix\n"
5805 "-... - unselect specified items\n"
5806 "* - choose all items\n"
5807 " - (empty) finish selecting"
5808 msgstr ""
5809 "帮助:\n"
5810 "1 - 选择一个选项\n"
5811 "3-5 - 选择一个范围内的所有选项\n"
5812 "2-3,6-9 - 选择多个范围内的所有选项\n"
5813 "foo - 通过标题选择一个选项\n"
5814 "-... - 反选特定的选项\n"
5815 "* - 选择所有选项\n"
5816 " - (空)结束选择"
5817
5818 #: builtin/clean.c:511
5819 #, c-format
5820 msgid "Huh (%s)?"
5821 msgstr "嗯(%s)?"
5822
5823 #: builtin/clean.c:653
5824 #, c-format
5825 msgid "Input ignore patterns>> "
5826 msgstr "输入模版以排除条目>> "
5827
5828 #: builtin/clean.c:690
5829 #, c-format
5830 msgid "WARNING: Cannot find items matched by: %s"
5831 msgstr "警告:无法找到和 %s 匹配的条目"
5832
5833 #: builtin/clean.c:711
5834 msgid "Select items to delete"
5835 msgstr "选择要删除的条目"
5836
5837 #. TRANSLATORS: Make sure to keep [y/N] as is
5838 #: builtin/clean.c:752
5839 #, c-format
5840 msgid "Remove %s [y/N]? "
5841 msgstr "删除 %s [y/N]?"
5842
5843 #: builtin/clean.c:777
5844 msgid "Bye."
5845 msgstr "再见。"
5846
5847 #: builtin/clean.c:785
5848 msgid ""
5849 "clean - start cleaning\n"
5850 "filter by pattern - exclude items from deletion\n"
5851 "select by numbers - select items to be deleted by numbers\n"
5852 "ask each - confirm each deletion (like \"rm -i\")\n"
5853 "quit - stop cleaning\n"
5854 "help - this screen\n"
5855 "? - help for prompt selection"
5856 msgstr ""
5857 "clean - 开始清理\n"
5858 "filter by pattern - 通过模版排除要删除的条目\n"
5859 "select by numbers - 通过数字选择要删除的条目\n"
5860 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
5861 "quit - 停止删除并退出\n"
5862 "help - 显示本帮助\n"
5863 "? - 显示如何在提示符下选择的帮助"
5864
5865 #: builtin/clean.c:812
5866 msgid "*** Commands ***"
5867 msgstr "*** 命令 ***"
5868
5869 #: builtin/clean.c:813
5870 msgid "What now"
5871 msgstr "请选择"
5872
5873 #: builtin/clean.c:821
5874 msgid "Would remove the following item:"
5875 msgid_plural "Would remove the following items:"
5876 msgstr[0] "将删除如下条目:"
5877 msgstr[1] "将删除如下条目:"
5878
5879 #: builtin/clean.c:838
5880 msgid "No more files to clean, exiting."
5881 msgstr "没有要清理的文件,退出。"
5882
5883 #: builtin/clean.c:869
5884 msgid "do not print names of files removed"
5885 msgstr "不打印删除文件的名称"
5886
5887 #: builtin/clean.c:871
5888 msgid "force"
5889 msgstr "强制"
5890
5891 #: builtin/clean.c:872
5892 msgid "interactive cleaning"
5893 msgstr "交互式清除"
5894
5895 #: builtin/clean.c:874
5896 msgid "remove whole directories"
5897 msgstr "删除整个目录"
5898
5899 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
5900 #: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
5901 msgid "pattern"
5902 msgstr "模式"
5903
5904 #: builtin/clean.c:876
5905 msgid "add <pattern> to ignore rules"
5906 msgstr "添加 <模式> 到忽略规则"
5907
5908 #: builtin/clean.c:877
5909 msgid "remove ignored files, too"
5910 msgstr "也删除忽略的文件"
5911
5912 #: builtin/clean.c:879
5913 msgid "remove only ignored files"
5914 msgstr "只删除忽略的文件"
5915
5916 #: builtin/clean.c:897
5917 msgid "-x and -X cannot be used together"
5918 msgstr "-x 和 -X 不能同时使用"
5919
5920 #: builtin/clean.c:901
5921 msgid ""
5922 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
5923 "clean"
5924 msgstr ""
5925 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
5926
5927 #: builtin/clean.c:904
5928 msgid ""
5929 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
5930 "refusing to clean"
5931 msgstr ""
5932 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
5933
5934 #: builtin/clone.c:37
5935 msgid "git clone [<options>] [--] <repo> [<dir>]"
5936 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
5937
5938 #: builtin/clone.c:65
5939 msgid "don't create a checkout"
5940 msgstr "不创建一个检出"
5941
5942 #: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
5943 msgid "create a bare repository"
5944 msgstr "创建一个纯仓库"
5945
5946 #: builtin/clone.c:70
5947 msgid "create a mirror repository (implies bare)"
5948 msgstr "创建一个镜像仓库(也是纯仓库)"
5949
5950 #: builtin/clone.c:72
5951 msgid "to clone from a local repository"
5952 msgstr "从本地仓库克隆"
5953
5954 #: builtin/clone.c:74
5955 msgid "don't use local hardlinks, always copy"
5956 msgstr "不使用本地硬链接,始终复制"
5957
5958 #: builtin/clone.c:76
5959 msgid "setup as shared repository"
5960 msgstr "设置为共享仓库"
5961
5962 #: builtin/clone.c:78 builtin/clone.c:80
5963 msgid "initialize submodules in the clone"
5964 msgstr "在克隆时初始化子模组"
5965
5966 #: builtin/clone.c:82
5967 msgid "number of submodules cloned in parallel"
5968 msgstr "并发克隆的子模组的数量"
5969
5970 #: builtin/clone.c:83 builtin/init-db.c:475
5971 msgid "template-directory"
5972 msgstr "模板目录"
5973
5974 #: builtin/clone.c:84 builtin/init-db.c:476
5975 msgid "directory from which templates will be used"
5976 msgstr "模板目录将被使用"
5977
5978 #: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
5979 #: builtin/submodule--helper.c:954
5980 msgid "reference repository"
5981 msgstr "参考仓库"
5982
5983 #: builtin/clone.c:90
5984 msgid "use --reference only while cloning"
5985 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
5986
5987 #: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
5988 msgid "name"
5989 msgstr "名称"
5990
5991 #: builtin/clone.c:92
5992 msgid "use <name> instead of 'origin' to track upstream"
5993 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
5994
5995 #: builtin/clone.c:94
5996 msgid "checkout <branch> instead of the remote's HEAD"
5997 msgstr "检出 <分支> 而不是远程 HEAD"
5998
5999 #: builtin/clone.c:96
6000 msgid "path to git-upload-pack on the remote"
6001 msgstr "远程 git-upload-pack 路径"
6002
6003 #: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
6004 #: builtin/pull.c:202
6005 msgid "depth"
6006 msgstr "深度"
6007
6008 #: builtin/clone.c:98
6009 msgid "create a shallow clone of that depth"
6010 msgstr "创建一个指定深度的浅克隆"
6011
6012 #: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
6013 #: parse-options.h:142
6014 msgid "time"
6015 msgstr "时间"
6016
6017 #: builtin/clone.c:100
6018 msgid "create a shallow clone since a specific time"
6019 msgstr "从一个特定时间创建一个浅克隆"
6020
6021 #: builtin/clone.c:101 builtin/fetch.c:124
6022 msgid "revision"
6023 msgstr "版本"
6024
6025 #: builtin/clone.c:102 builtin/fetch.c:125
6026 msgid "deepen history of shallow clone by excluding rev"
6027 msgstr "通过排除版本来深化浅克隆的历史"
6028
6029 #: builtin/clone.c:104
6030 msgid "clone only one branch, HEAD or --branch"
6031 msgstr "只克隆一个分支、HEAD 或 --branch"
6032
6033 #: builtin/clone.c:106
6034 msgid "any cloned submodules will be shallow"
6035 msgstr "子模组将以浅下载模式克隆"
6036
6037 #: builtin/clone.c:107 builtin/init-db.c:484
6038 msgid "gitdir"
6039 msgstr "git目录"
6040
6041 #: builtin/clone.c:108 builtin/init-db.c:485
6042 msgid "separate git dir from working tree"
6043 msgstr "git目录和工作区分离"
6044
6045 #: builtin/clone.c:109
6046 msgid "key=value"
6047 msgstr "key=value"
6048
6049 #: builtin/clone.c:110
6050 msgid "set config inside the new repository"
6051 msgstr "在新仓库中设置配置信息"
6052
6053 #: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
6054 msgid "use IPv4 addresses only"
6055 msgstr "只使用 IPv4 地址"
6056
6057 #: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
6058 msgid "use IPv6 addresses only"
6059 msgstr "只使用 IPv6 地址"
6060
6061 #: builtin/clone.c:250
6062 msgid ""
6063 "No directory name could be guessed.\n"
6064 "Please specify a directory on the command line"
6065 msgstr ""
6066 "无法猜到目录名。\n"
6067 "请在命令行指定一个目录"
6068
6069 #: builtin/clone.c:303
6070 #, c-format
6071 msgid "info: Could not add alternate for '%s': %s\n"
6072 msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
6073
6074 #: builtin/clone.c:375
6075 #, c-format
6076 msgid "failed to open '%s'"
6077 msgstr "无法打开 '%s'"
6078
6079 #: builtin/clone.c:383
6080 #, c-format
6081 msgid "%s exists and is not a directory"
6082 msgstr "%s 存在且不是一个目录"
6083
6084 #: builtin/clone.c:397
6085 #, c-format
6086 msgid "failed to stat %s\n"
6087 msgstr "无法枚举 %s 状态\n"
6088
6089 #: builtin/clone.c:419
6090 #, c-format
6091 msgid "failed to create link '%s'"
6092 msgstr "无法创建链接 '%s'"
6093
6094 #: builtin/clone.c:423
6095 #, c-format
6096 msgid "failed to copy file to '%s'"
6097 msgstr "无法拷贝文件至 '%s'"
6098
6099 #: builtin/clone.c:448
6100 #, c-format
6101 msgid "done.\n"
6102 msgstr "完成。\n"
6103
6104 #: builtin/clone.c:460
6105 msgid ""
6106 "Clone succeeded, but checkout failed.\n"
6107 "You can inspect what was checked out with 'git status'\n"
6108 "and retry the checkout with 'git checkout -f HEAD'\n"
6109 msgstr ""
6110 "克隆成功,但是检出失败。\n"
6111 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
6112 "'git checkout -f HEAD' 重试\n"
6113
6114 #: builtin/clone.c:537
6115 #, c-format
6116 msgid "Could not find remote branch %s to clone."
6117 msgstr "不能发现要克隆的远程分支 %s。"
6118
6119 #: builtin/clone.c:632
6120 msgid "remote did not send all necessary objects"
6121 msgstr "远程没有发送所有必须的对象"
6122
6123 #: builtin/clone.c:648
6124 #, c-format
6125 msgid "unable to update %s"
6126 msgstr "不能更新 %s"
6127
6128 #: builtin/clone.c:697
6129 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
6130 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
6131
6132 #: builtin/clone.c:728
6133 msgid "unable to checkout working tree"
6134 msgstr "不能检出工作区"
6135
6136 #: builtin/clone.c:768
6137 msgid "unable to write parameters to config file"
6138 msgstr "无法将参数写入配置文件"
6139
6140 #: builtin/clone.c:831
6141 msgid "cannot repack to clean up"
6142 msgstr "无法执行 repack 来清理"
6143
6144 #: builtin/clone.c:833
6145 msgid "cannot unlink temporary alternates file"
6146 msgstr "无法删除临时的 alternates 文件"
6147
6148 #: builtin/clone.c:866 builtin/receive-pack.c:1895
6149 msgid "Too many arguments."
6150 msgstr "太多参数。"
6151
6152 #: builtin/clone.c:870
6153 msgid "You must specify a repository to clone."
6154 msgstr "您必须指定一个仓库来克隆。"
6155
6156 #: builtin/clone.c:883
6157 #, c-format
6158 msgid "--bare and --origin %s options are incompatible."
6159 msgstr "--bare 和 --origin %s 选项不兼容。"
6160
6161 #: builtin/clone.c:886
6162 msgid "--bare and --separate-git-dir are incompatible."
6163 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
6164
6165 #: builtin/clone.c:899
6166 #, c-format
6167 msgid "repository '%s' does not exist"
6168 msgstr "仓库 '%s' 不存在"
6169
6170 #: builtin/clone.c:905 builtin/fetch.c:1338
6171 #, c-format
6172 msgid "depth %s is not a positive number"
6173 msgstr "深度 %s 不是一个正数"
6174
6175 #: builtin/clone.c:915
6176 #, c-format
6177 msgid "destination path '%s' already exists and is not an empty directory."
6178 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
6179
6180 #: builtin/clone.c:925
6181 #, c-format
6182 msgid "working tree '%s' already exists."
6183 msgstr "工作区 '%s' 已经存在。"
6184
6185 #: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
6186 #: builtin/worktree.c:222 builtin/worktree.c:249
6187 #, c-format
6188 msgid "could not create leading directories of '%s'"
6189 msgstr "不能为 '%s' 创建先导目录"
6190
6191 #: builtin/clone.c:943
6192 #, c-format
6193 msgid "could not create work tree dir '%s'"
6194 msgstr "不能创建工作区目录 '%s'"
6195
6196 #: builtin/clone.c:955
6197 #, c-format
6198 msgid "Cloning into bare repository '%s'...\n"
6199 msgstr "克隆到纯仓库 '%s'...\n"
6200
6201 #: builtin/clone.c:957
6202 #, c-format
6203 msgid "Cloning into '%s'...\n"
6204 msgstr "正克隆到 '%s'...\n"
6205
6206 #: builtin/clone.c:963
6207 msgid ""
6208 "clone --recursive is not compatible with both --reference and --reference-if-"
6209 "able"
6210 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
6211
6212 #: builtin/clone.c:1019
6213 msgid "--depth is ignored in local clones; use file:// instead."
6214 msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
6215
6216 #: builtin/clone.c:1021
6217 msgid "--shallow-since is ignored in local clones; use file:// instead."
6218 msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6219
6220 #: builtin/clone.c:1023
6221 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
6222 msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
6223
6224 #: builtin/clone.c:1026
6225 msgid "source repository is shallow, ignoring --local"
6226 msgstr "源仓库是浅克隆,忽略 --local"
6227
6228 #: builtin/clone.c:1031
6229 msgid "--local is ignored"
6230 msgstr "--local 被忽略"
6231
6232 #: builtin/clone.c:1035
6233 #, c-format
6234 msgid "Don't know how to clone %s"
6235 msgstr "不知道如何克隆 %s"
6236
6237 #: builtin/clone.c:1090 builtin/clone.c:1098
6238 #, c-format
6239 msgid "Remote branch %s not found in upstream %s"
6240 msgstr "远程分支 %s 在上游 %s 未发现"
6241
6242 #: builtin/clone.c:1101
6243 msgid "You appear to have cloned an empty repository."
6244 msgstr "您似乎克隆了一个空仓库。"
6245
6246 #: builtin/column.c:9
6247 msgid "git column [<options>]"
6248 msgstr "git column [<选项>]"
6249
6250 #: builtin/column.c:26
6251 msgid "lookup config vars"
6252 msgstr "查找配置变量"
6253
6254 #: builtin/column.c:27 builtin/column.c:28
6255 msgid "layout to use"
6256 msgstr "要使用的布局"
6257
6258 #: builtin/column.c:29
6259 msgid "Maximum width"
6260 msgstr "最大宽度"
6261
6262 #: builtin/column.c:30
6263 msgid "Padding space on left border"
6264 msgstr "左边框的填充空间"
6265
6266 #: builtin/column.c:31
6267 msgid "Padding space on right border"
6268 msgstr "右边框的填充空间"
6269
6270 #: builtin/column.c:32
6271 msgid "Padding space between columns"
6272 msgstr "两列之间的填充空间"
6273
6274 #: builtin/column.c:51
6275 msgid "--command must be the first argument"
6276 msgstr "--command 必须是第一个参数"
6277
6278 #: builtin/commit.c:38
6279 msgid "git commit [<options>] [--] <pathspec>..."
6280 msgstr "git commit [<选项>] [--] <路径规格>..."
6281
6282 #: builtin/commit.c:43
6283 msgid "git status [<options>] [--] <pathspec>..."
6284 msgstr "git status [<选项>] [--] <路径规格>..."
6285
6286 #: builtin/commit.c:48
6287 msgid ""
6288 "Your name and email address were configured automatically based\n"
6289 "on your username and hostname. Please check that they are accurate.\n"
6290 "You can suppress this message by setting them explicitly. Run the\n"
6291 "following command and follow the instructions in your editor to edit\n"
6292 "your configuration file:\n"
6293 "\n"
6294 " git config --global --edit\n"
6295 "\n"
6296 "After doing this, you may fix the identity used for this commit with:\n"
6297 "\n"
6298 " git commit --amend --reset-author\n"
6299 msgstr ""
6300 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6301 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
6302 "中编辑您的配置文件:\n"
6303 "\n"
6304 " git config --global --edit\n"
6305 "\n"
6306 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6307 "\n"
6308 " git commit --amend --reset-author\n"
6309
6310 #: builtin/commit.c:61
6311 msgid ""
6312 "Your name and email address were configured automatically based\n"
6313 "on your username and hostname. Please check that they are accurate.\n"
6314 "You can suppress this message by setting them explicitly:\n"
6315 "\n"
6316 " git config --global user.name \"Your Name\"\n"
6317 " git config --global user.email you@example.com\n"
6318 "\n"
6319 "After doing this, you may fix the identity used for this commit with:\n"
6320 "\n"
6321 " git commit --amend --reset-author\n"
6322 msgstr ""
6323 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6324 "与否。您可以对其进行设置以免再出现本提示信息:\n"
6325 "\n"
6326 " git config --global user.name \"Your Name\"\n"
6327 " git config --global user.email you@example.com\n"
6328 "\n"
6329 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6330 "\n"
6331 " git commit --amend --reset-author\n"
6332
6333 #: builtin/commit.c:73
6334 msgid ""
6335 "You asked to amend the most recent commit, but doing so would make\n"
6336 "it empty. You can repeat your command with --allow-empty, or you can\n"
6337 "remove the commit entirely with \"git reset HEAD^\".\n"
6338 msgstr ""
6339 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
6340 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
6341
6342 #: builtin/commit.c:78
6343 msgid ""
6344 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
6345 "If you wish to commit it anyway, use:\n"
6346 "\n"
6347 " git commit --allow-empty\n"
6348 "\n"
6349 msgstr ""
6350 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
6351 "也要提交,使用命令:\n"
6352 "\n"
6353 " git commit --allow-empty\n"
6354 "\n"
6355
6356 #: builtin/commit.c:85
6357 msgid "Otherwise, please use 'git reset'\n"
6358 msgstr "否则,请使用命令 'git reset'\n"
6359
6360 #: builtin/commit.c:88
6361 msgid ""
6362 "If you wish to skip this commit, use:\n"
6363 "\n"
6364 " git reset\n"
6365 "\n"
6366 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
6367 "the remaining commits.\n"
6368 msgstr ""
6369 "如果您想跳过这个提交,使用命令:\n"
6370 "\n"
6371 " git reset\n"
6372 "\n"
6373 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
6374 "操作。\n"
6375
6376 #: builtin/commit.c:318
6377 msgid "failed to unpack HEAD tree object"
6378 msgstr "无法解包 HEAD 树对象"
6379
6380 #: builtin/commit.c:359
6381 msgid "unable to create temporary index"
6382 msgstr "不能创建临时索引"
6383
6384 #: builtin/commit.c:365
6385 msgid "interactive add failed"
6386 msgstr "交互式添加失败"
6387
6388 #: builtin/commit.c:378
6389 msgid "unable to update temporary index"
6390 msgstr "无法更新临时索引"
6391
6392 #: builtin/commit.c:380
6393 msgid "Failed to update main cache tree"
6394 msgstr "不能更新树的主缓存"
6395
6396 #: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
6397 msgid "unable to write new_index file"
6398 msgstr "无法写 new_index 文件"
6399
6400 #: builtin/commit.c:458
6401 msgid "cannot do a partial commit during a merge."
6402 msgstr "在合并过程中不能做部分提交。"
6403
6404 #: builtin/commit.c:460
6405 msgid "cannot do a partial commit during a cherry-pick."
6406 msgstr "在拣选过程中不能做部分提交。"
6407
6408 #: builtin/commit.c:469
6409 msgid "cannot read the index"
6410 msgstr "无法读取索引"
6411
6412 #: builtin/commit.c:488
6413 msgid "unable to write temporary index file"
6414 msgstr "无法写临时索引文件"
6415
6416 #: builtin/commit.c:582
6417 #, c-format
6418 msgid "commit '%s' lacks author header"
6419 msgstr "提交 '%s' 缺少作者信息"
6420
6421 #: builtin/commit.c:584
6422 #, c-format
6423 msgid "commit '%s' has malformed author line"
6424 msgstr "提交 '%s' 有非法的作者信息"
6425
6426 #: builtin/commit.c:603
6427 msgid "malformed --author parameter"
6428 msgstr "非法的 --author 参数"
6429
6430 #: builtin/commit.c:611
6431 #, c-format
6432 msgid "invalid date format: %s"
6433 msgstr "无效的日期格式:%s"
6434
6435 #: builtin/commit.c:655
6436 msgid ""
6437 "unable to select a comment character that is not used\n"
6438 "in the current commit message"
6439 msgstr "无法选择一个未被当前提交说明使用的注释字符"
6440
6441 #: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
6442 #, c-format
6443 msgid "could not lookup commit %s"
6444 msgstr "不能查询提交 %s"
6445
6446 #: builtin/commit.c:704 builtin/shortlog.c:286
6447 #, c-format
6448 msgid "(reading log message from standard input)\n"
6449 msgstr "(正从标准输入中读取日志信息)\n"
6450
6451 #: builtin/commit.c:706
6452 msgid "could not read log from standard input"
6453 msgstr "不能从标准输入中读取日志信息"
6454
6455 #: builtin/commit.c:710
6456 #, c-format
6457 msgid "could not read log file '%s'"
6458 msgstr "不能读取日志文件 '%s'"
6459
6460 #: builtin/commit.c:737 builtin/commit.c:745
6461 msgid "could not read SQUASH_MSG"
6462 msgstr "不能读取 SQUASH_MSG"
6463
6464 #: builtin/commit.c:742
6465 msgid "could not read MERGE_MSG"
6466 msgstr "不能读取 MERGE_MSG"
6467
6468 #: builtin/commit.c:796
6469 msgid "could not write commit template"
6470 msgstr "不能写提交模版"
6471
6472 #: builtin/commit.c:814
6473 #, c-format
6474 msgid ""
6475 "\n"
6476 "It looks like you may be committing a merge.\n"
6477 "If this is not correct, please remove the file\n"
6478 "\t%s\n"
6479 "and try again.\n"
6480 msgstr ""
6481 "\n"
6482 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
6483 "\t%s\n"
6484 "然后重试。\n"
6485
6486 #: builtin/commit.c:819
6487 #, c-format
6488 msgid ""
6489 "\n"
6490 "It looks like you may be committing a cherry-pick.\n"
6491 "If this is not correct, please remove the file\n"
6492 "\t%s\n"
6493 "and try again.\n"
6494 msgstr ""
6495 "\n"
6496 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
6497 "\t%s\n"
6498 "然后重试。\n"
6499
6500 #: builtin/commit.c:832
6501 #, c-format
6502 msgid ""
6503 "Please enter the commit message for your changes. Lines starting\n"
6504 "with '%c' will be ignored, and an empty message aborts the commit.\n"
6505 msgstr ""
6506 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
6507 "说明将会终止提交。\n"
6508
6509 #: builtin/commit.c:839
6510 #, c-format
6511 msgid ""
6512 "Please enter the commit message for your changes. Lines starting\n"
6513 "with '%c' will be kept; you may remove them yourself if you want to.\n"
6514 "An empty message aborts the commit.\n"
6515 msgstr ""
6516 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
6517 "也可以删除它们。一个空的提交说明将会终止提交。\n"
6518
6519 # 译者:为保证在输出中对齐,注意调整句中空格!
6520 #: builtin/commit.c:859
6521 #, c-format
6522 msgid "%sAuthor: %.*s <%.*s>"
6523 msgstr "%s作者: %.*s <%.*s>"
6524
6525 # 译者:为保证在输出中对齐,注意调整句中空格!
6526 #: builtin/commit.c:867
6527 #, c-format
6528 msgid "%sDate: %s"
6529 msgstr "%s日期: %s"
6530
6531 # 译者:为保证在输出中对齐,注意调整句中空格!
6532 #: builtin/commit.c:874
6533 #, c-format
6534 msgid "%sCommitter: %.*s <%.*s>"
6535 msgstr "%s提交者:%.*s <%.*s>"
6536
6537 #: builtin/commit.c:892
6538 msgid "Cannot read index"
6539 msgstr "无法读取索引"
6540
6541 #: builtin/commit.c:954
6542 msgid "Error building trees"
6543 msgstr "无法创建树对象"
6544
6545 #: builtin/commit.c:969 builtin/tag.c:266
6546 #, c-format
6547 msgid "Please supply the message using either -m or -F option.\n"
6548 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
6549
6550 #: builtin/commit.c:1071
6551 #, c-format
6552 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
6553 msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
6554
6555 #: builtin/commit.c:1086 builtin/commit.c:1327
6556 #, c-format
6557 msgid "Invalid untracked files mode '%s'"
6558 msgstr "无效的未追踪文件参数 '%s'"
6559
6560 #: builtin/commit.c:1124
6561 msgid "--long and -z are incompatible"
6562 msgstr "--long 和 -z 选项不兼容"
6563
6564 #: builtin/commit.c:1154
6565 msgid "Using both --reset-author and --author does not make sense"
6566 msgstr "同时使用 --reset-author 和 --author 没有意义"
6567
6568 #: builtin/commit.c:1163
6569 msgid "You have nothing to amend."
6570 msgstr "您没有可修补的提交。"
6571
6572 #: builtin/commit.c:1166
6573 msgid "You are in the middle of a merge -- cannot amend."
6574 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
6575
6576 #: builtin/commit.c:1168
6577 msgid "You are in the middle of a cherry-pick -- cannot amend."
6578 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
6579
6580 #: builtin/commit.c:1171
6581 msgid "Options --squash and --fixup cannot be used together"
6582 msgstr "选项 --squash 和 --fixup 不能同时使用"
6583
6584 #: builtin/commit.c:1181
6585 msgid "Only one of -c/-C/-F/--fixup can be used."
6586 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
6587
6588 #: builtin/commit.c:1183
6589 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
6590 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
6591
6592 #: builtin/commit.c:1191
6593 msgid "--reset-author can be used only with -C, -c or --amend."
6594 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
6595
6596 #: builtin/commit.c:1208
6597 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
6598 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
6599
6600 #: builtin/commit.c:1210
6601 msgid "No paths with --include/--only does not make sense."
6602 msgstr "参数 --include/--only 不跟路径没有意义。"
6603
6604 #: builtin/commit.c:1212
6605 msgid "Clever... amending the last one with dirty index."
6606 msgstr "聪明... 用脏索引修补最后一个提交。"
6607
6608 #: builtin/commit.c:1214
6609 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
6610 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
6611
6612 #: builtin/commit.c:1226 builtin/tag.c:474
6613 #, c-format
6614 msgid "Invalid cleanup mode %s"
6615 msgstr "无效的清理模式 %s"
6616
6617 #: builtin/commit.c:1231
6618 msgid "Paths with -a does not make sense."
6619 msgstr "路径和 -a 选项同时使用没有意义。"
6620
6621 #: builtin/commit.c:1341 builtin/commit.c:1617
6622 msgid "show status concisely"
6623 msgstr "以简洁的格式显示状态"
6624
6625 #: builtin/commit.c:1343 builtin/commit.c:1619
6626 msgid "show branch information"
6627 msgstr "显示分支信息"
6628
6629 #: builtin/commit.c:1345
6630 msgid "version"
6631 msgstr "版本"
6632
6633 #: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
6634 #: builtin/worktree.c:440
6635 msgid "machine-readable output"
6636 msgstr "机器可读的输出"
6637
6638 #: builtin/commit.c:1348 builtin/commit.c:1623
6639 msgid "show status in long format (default)"
6640 msgstr "以长格式显示状态(默认)"
6641
6642 #: builtin/commit.c:1351 builtin/commit.c:1626
6643 msgid "terminate entries with NUL"
6644 msgstr "条目以 NUL 字符结尾"
6645
6646 #: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
6647 #: builtin/fast-export.c:984 builtin/tag.c:353
6648 msgid "mode"
6649 msgstr "模式"
6650
6651 #: builtin/commit.c:1354 builtin/commit.c:1629
6652 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
6653 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
6654
6655 #: builtin/commit.c:1357
6656 msgid "show ignored files"
6657 msgstr "显示忽略的文件"
6658
6659 #: builtin/commit.c:1358 parse-options.h:155
6660 msgid "when"
6661 msgstr "何时"
6662
6663 #: builtin/commit.c:1359
6664 msgid ""
6665 "ignore changes to submodules, optional when: all, dirty, untracked. "
6666 "(Default: all)"
6667 msgstr ""
6668 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
6669
6670 #: builtin/commit.c:1361
6671 msgid "list untracked files in columns"
6672 msgstr "以列的方式显示未跟踪的文件"
6673
6674 #: builtin/commit.c:1437
6675 msgid "couldn't look up newly created commit"
6676 msgstr "无法找到新创建的提交"
6677
6678 #: builtin/commit.c:1439
6679 msgid "could not parse newly created commit"
6680 msgstr "不能解析新创建的提交"
6681
6682 #: builtin/commit.c:1484
6683 msgid "detached HEAD"
6684 msgstr "分离头指针"
6685
6686 # 译者:中文字符串拼接,可删除前导空格
6687 #: builtin/commit.c:1487
6688 msgid " (root-commit)"
6689 msgstr "(根提交)"
6690
6691 #: builtin/commit.c:1587
6692 msgid "suppress summary after successful commit"
6693 msgstr "提交成功后不显示概述信息"
6694
6695 #: builtin/commit.c:1588
6696 msgid "show diff in commit message template"
6697 msgstr "在提交说明模板里显示差异"
6698
6699 #: builtin/commit.c:1590
6700 msgid "Commit message options"
6701 msgstr "提交说明选项"
6702
6703 #: builtin/commit.c:1591 builtin/tag.c:351
6704 msgid "read message from file"
6705 msgstr "从文件中读取提交说明"
6706
6707 #: builtin/commit.c:1592
6708 msgid "author"
6709 msgstr "作者"
6710
6711 #: builtin/commit.c:1592
6712 msgid "override author for commit"
6713 msgstr "提交时覆盖作者"
6714
6715 #: builtin/commit.c:1593 builtin/gc.c:326
6716 msgid "date"
6717 msgstr "日期"
6718
6719 #: builtin/commit.c:1593
6720 msgid "override date for commit"
6721 msgstr "提交时覆盖日期"
6722
6723 #: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
6724 #: builtin/notes.c:561 builtin/tag.c:349
6725 msgid "message"
6726 msgstr "说明"
6727
6728 #: builtin/commit.c:1594
6729 msgid "commit message"
6730 msgstr "提交说明"
6731
6732 #: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
6733 #: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
6734 msgid "commit"
6735 msgstr "提交"
6736
6737 #: builtin/commit.c:1595
6738 msgid "reuse and edit message from specified commit"
6739 msgstr "重用并编辑指定提交的提交说明"
6740
6741 #: builtin/commit.c:1596
6742 msgid "reuse message from specified commit"
6743 msgstr "重用指定提交的提交说明"
6744
6745 #: builtin/commit.c:1597
6746 msgid "use autosquash formatted message to fixup specified commit"
6747 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
6748
6749 #: builtin/commit.c:1598
6750 msgid "use autosquash formatted message to squash specified commit"
6751 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
6752
6753 #: builtin/commit.c:1599
6754 msgid "the commit is authored by me now (used with -C/-c/--amend)"
6755 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
6756
6757 #: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
6758 msgid "add Signed-off-by:"
6759 msgstr "添加 Signed-off-by: 签名"
6760
6761 #: builtin/commit.c:1601
6762 msgid "use specified template file"
6763 msgstr "使用指定的模板文件"
6764
6765 #: builtin/commit.c:1602
6766 msgid "force edit of commit"
6767 msgstr "强制编辑提交"
6768
6769 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
6770 #: builtin/commit.c:1603
6771 msgid "default"
6772 msgstr "default"
6773
6774 #: builtin/commit.c:1603 builtin/tag.c:354
6775 msgid "how to strip spaces and #comments from message"
6776 msgstr "设置如何删除提交说明里的空格和#注释"
6777
6778 #: builtin/commit.c:1604
6779 msgid "include status in commit message template"
6780 msgstr "在提交说明模板里包含状态信息"
6781
6782 #: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
6783 #: builtin/revert.c:93
6784 msgid "GPG sign commit"
6785 msgstr "GPG 提交签名"
6786
6787 #: builtin/commit.c:1609
6788 msgid "Commit contents options"
6789 msgstr "提交内容选项"
6790
6791 #: builtin/commit.c:1610
6792 msgid "commit all changed files"
6793 msgstr "提交所有改动的文件"
6794
6795 #: builtin/commit.c:1611
6796 msgid "add specified files to index for commit"
6797 msgstr "添加指定的文件到索引区等待提交"
6798
6799 #: builtin/commit.c:1612
6800 msgid "interactively add files"
6801 msgstr "交互式添加文件"
6802
6803 #: builtin/commit.c:1613
6804 msgid "interactively add changes"
6805 msgstr "交互式添加变更"
6806
6807 #: builtin/commit.c:1614
6808 msgid "commit only specified files"
6809 msgstr "只提交指定的文件"
6810
6811 #: builtin/commit.c:1615
6812 msgid "bypass pre-commit and commit-msg hooks"
6813 msgstr "绕过 pre-commit 和 commit-msg 钩子"
6814
6815 #: builtin/commit.c:1616
6816 msgid "show what would be committed"
6817 msgstr "显示将要提交的内容"
6818
6819 #: builtin/commit.c:1627
6820 msgid "amend previous commit"
6821 msgstr "修改先前的提交"
6822
6823 #: builtin/commit.c:1628
6824 msgid "bypass post-rewrite hook"
6825 msgstr "绕过 post-rewrite 钩子"
6826
6827 #: builtin/commit.c:1633
6828 msgid "ok to record an empty change"
6829 msgstr "允许一个空提交"
6830
6831 #: builtin/commit.c:1635
6832 msgid "ok to record a change with an empty message"
6833 msgstr "允许空的提交说明"
6834
6835 #: builtin/commit.c:1664
6836 msgid "could not parse HEAD commit"
6837 msgstr "不能解析 HEAD 提交"
6838
6839 #: builtin/commit.c:1712
6840 #, c-format
6841 msgid "Corrupt MERGE_HEAD file (%s)"
6842 msgstr "损坏的 MERGE_HEAD 文件(%s)"
6843
6844 #: builtin/commit.c:1719
6845 msgid "could not read MERGE_MODE"
6846 msgstr "不能读取 MERGE_MODE"
6847
6848 #: builtin/commit.c:1738
6849 #, c-format
6850 msgid "could not read commit message: %s"
6851 msgstr "不能读取提交说明:%s"
6852
6853 #: builtin/commit.c:1749
6854 #, c-format
6855 msgid "Aborting commit; you did not edit the message.\n"
6856 msgstr "终止提交;您未更改来自模版的提交说明。\n"
6857
6858 #: builtin/commit.c:1754
6859 #, c-format
6860 msgid "Aborting commit due to empty commit message.\n"
6861 msgstr "终止提交因为提交说明为空。\n"
6862
6863 #: builtin/commit.c:1802
6864 msgid ""
6865 "Repository has been updated, but unable to write\n"
6866 "new_index file. Check that disk is not full and quota is\n"
6867 "not exceeded, and then \"git reset HEAD\" to recover."
6868 msgstr ""
6869 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
6870 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
6871
6872 #: builtin/config.c:9
6873 msgid "git config [<options>]"
6874 msgstr "git config [<选项>]"
6875
6876 #: builtin/config.c:55
6877 msgid "Config file location"
6878 msgstr "配置文件位置"
6879
6880 #: builtin/config.c:56
6881 msgid "use global config file"
6882 msgstr "使用全局配置文件"
6883
6884 #: builtin/config.c:57
6885 msgid "use system config file"
6886 msgstr "使用系统级配置文件"
6887
6888 #: builtin/config.c:58
6889 msgid "use repository config file"
6890 msgstr "使用仓库级配置文件"
6891
6892 #: builtin/config.c:59
6893 msgid "use given config file"
6894 msgstr "使用指定的配置文件"
6895
6896 #: builtin/config.c:60
6897 msgid "blob-id"
6898 msgstr "数据对象 ID"
6899
6900 #: builtin/config.c:60
6901 msgid "read config from given blob object"
6902 msgstr "从给定的数据对象读取配置"
6903
6904 #: builtin/config.c:61
6905 msgid "Action"
6906 msgstr "操作"
6907
6908 #: builtin/config.c:62
6909 msgid "get value: name [value-regex]"
6910 msgstr "获取值:name [value-regex]"
6911
6912 #: builtin/config.c:63
6913 msgid "get all values: key [value-regex]"
6914 msgstr "获得所有的值:key [value-regex]"
6915
6916 #: builtin/config.c:64
6917 msgid "get values for regexp: name-regex [value-regex]"
6918 msgstr "根据正则表达式获得值:name-regex [value-regex]"
6919
6920 #: builtin/config.c:65
6921 msgid "get value specific for the URL: section[.var] URL"
6922 msgstr "获得 URL 取值:section[.var] URL"
6923
6924 #: builtin/config.c:66
6925 msgid "replace all matching variables: name value [value_regex]"
6926 msgstr "替换所有匹配的变量:name value [value_regex]"
6927
6928 #: builtin/config.c:67
6929 msgid "add a new variable: name value"
6930 msgstr "添加一个新的变量:name value"
6931
6932 #: builtin/config.c:68
6933 msgid "remove a variable: name [value-regex]"
6934 msgstr "删除一个变量:name [value-regex]"
6935
6936 #: builtin/config.c:69
6937 msgid "remove all matches: name [value-regex]"
6938 msgstr "删除所有匹配项:name [value-regex]"
6939
6940 #: builtin/config.c:70
6941 msgid "rename section: old-name new-name"
6942 msgstr "重命名小节:old-name new-name"
6943
6944 #: builtin/config.c:71
6945 msgid "remove a section: name"
6946 msgstr "删除一个小节:name"
6947
6948 #: builtin/config.c:72
6949 msgid "list all"
6950 msgstr "列出所有"
6951
6952 #: builtin/config.c:73
6953 msgid "open an editor"
6954 msgstr "打开一个编辑器"
6955
6956 #: builtin/config.c:74
6957 msgid "find the color configured: slot [default]"
6958 msgstr "获得配置的颜色:配置 [默认]"
6959
6960 #: builtin/config.c:75
6961 msgid "find the color setting: slot [stdout-is-tty]"
6962 msgstr "获得颜色设置:配置 [stdout-is-tty]"
6963
6964 #: builtin/config.c:76
6965 msgid "Type"
6966 msgstr "类型"
6967
6968 #: builtin/config.c:77
6969 msgid "value is \"true\" or \"false\""
6970 msgstr "值是 \"true\" 或 \"false\""
6971
6972 #: builtin/config.c:78
6973 msgid "value is decimal number"
6974 msgstr "值是十进制数"
6975
6976 #: builtin/config.c:79
6977 msgid "value is --bool or --int"
6978 msgstr "值是 --bool or --int"
6979
6980 #: builtin/config.c:80
6981 msgid "value is a path (file or directory name)"
6982 msgstr "值是一个路径(文件或目录名)"
6983
6984 #: builtin/config.c:81
6985 msgid "Other"
6986 msgstr "其它"
6987
6988 #: builtin/config.c:82
6989 msgid "terminate values with NUL byte"
6990 msgstr "终止值是 NUL 字节"
6991
6992 #: builtin/config.c:83
6993 msgid "show variable names only"
6994 msgstr "只显示变量名"
6995
6996 #: builtin/config.c:84
6997 msgid "respect include directives on lookup"
6998 msgstr "查询时参照 include 指令递归查找"
6999
7000 #: builtin/config.c:85
7001 msgid "show origin of config (file, standard input, blob, command line)"
7002 msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
7003
7004 #: builtin/config.c:327
7005 msgid "unable to parse default color value"
7006 msgstr "不能解析默认颜色值"
7007
7008 #: builtin/config.c:471
7009 #, c-format
7010 msgid ""
7011 "# This is Git's per-user configuration file.\n"
7012 "[user]\n"
7013 "# Please adapt and uncomment the following lines:\n"
7014 "#\tname = %s\n"
7015 "#\temail = %s\n"
7016 msgstr ""
7017 "# This is Git's per-user configuration file.\n"
7018 "[user]\n"
7019 "# Please adapt and uncomment the following lines:\n"
7020 "#\tname = %s\n"
7021 "#\temail = %s\n"
7022
7023 #: builtin/config.c:613
7024 #, c-format
7025 msgid "cannot create configuration file %s"
7026 msgstr "不能创建配置文件 %s"
7027
7028 #: builtin/config.c:625
7029 #, c-format
7030 msgid ""
7031 "cannot overwrite multiple values with a single value\n"
7032 " Use a regexp, --add or --replace-all to change %s."
7033 msgstr ""
7034 "无法用一个值覆盖多个值\n"
7035 " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
7036
7037 #: builtin/count-objects.c:86
7038 msgid "git count-objects [-v] [-H | --human-readable]"
7039 msgstr "git count-objects [-v] [-H | --human-readable]"
7040
7041 #: builtin/count-objects.c:96
7042 msgid "print sizes in human readable format"
7043 msgstr "以用户可读的格式显示大小"
7044
7045 #: builtin/describe.c:17
7046 msgid "git describe [<options>] [<commit-ish>...]"
7047 msgstr "git describe [<选项>] [<提交号>...]"
7048
7049 #: builtin/describe.c:18
7050 msgid "git describe [<options>] --dirty"
7051 msgstr "git describe [<选项>] --dirty"
7052
7053 #: builtin/describe.c:217
7054 #, c-format
7055 msgid "annotated tag %s not available"
7056 msgstr "附注标签 %s 无效"
7057
7058 #: builtin/describe.c:221
7059 #, c-format
7060 msgid "annotated tag %s has no embedded name"
7061 msgstr "附注标签 %s 没有嵌入名称"
7062
7063 #: builtin/describe.c:223
7064 #, c-format
7065 msgid "tag '%s' is really '%s' here"
7066 msgstr "标签 '%s' 的确是在 '%s'"
7067
7068 #: builtin/describe.c:250 builtin/log.c:480
7069 #, c-format
7070 msgid "Not a valid object name %s"
7071 msgstr "不是一个有效的对象名 %s"
7072
7073 #: builtin/describe.c:253
7074 #, c-format
7075 msgid "%s is not a valid '%s' object"
7076 msgstr "%s 不是一个有效的 '%s' 对象"
7077
7078 #: builtin/describe.c:270
7079 #, c-format
7080 msgid "no tag exactly matches '%s'"
7081 msgstr "没有标签准确匹配 '%s'"
7082
7083 #: builtin/describe.c:272
7084 #, c-format
7085 msgid "searching to describe %s\n"
7086 msgstr "搜索描述 %s\n"
7087
7088 #: builtin/describe.c:319
7089 #, c-format
7090 msgid "finished search at %s\n"
7091 msgstr "完成搜索 %s\n"
7092
7093 #: builtin/describe.c:346
7094 #, c-format
7095 msgid ""
7096 "No annotated tags can describe '%s'.\n"
7097 "However, there were unannotated tags: try --tags."
7098 msgstr ""
7099 "没有附注标签能描述 '%s'。\n"
7100 "然而,存在未附注标签:尝试 --tags。"
7101
7102 #: builtin/describe.c:350
7103 #, c-format
7104 msgid ""
7105 "No tags can describe '%s'.\n"
7106 "Try --always, or create some tags."
7107 msgstr ""
7108 "没有标签能描述 '%s'。\n"
7109 "尝试 --always,或者创建一些标签。"
7110
7111 #: builtin/describe.c:371
7112 #, c-format
7113 msgid "traversed %lu commits\n"
7114 msgstr "已遍历 %lu 个提交\n"
7115
7116 #: builtin/describe.c:374
7117 #, c-format
7118 msgid ""
7119 "more than %i tags found; listed %i most recent\n"
7120 "gave up search at %s\n"
7121 msgstr ""
7122 "发现多于 %i 个标签,列出最近的 %i 个\n"
7123 "在 %s 放弃搜索\n"
7124
7125 #: builtin/describe.c:396
7126 msgid "find the tag that comes after the commit"
7127 msgstr "寻找该提交之后的标签"
7128
7129 #: builtin/describe.c:397
7130 msgid "debug search strategy on stderr"
7131 msgstr "在标准错误上调试搜索策略"
7132
7133 #: builtin/describe.c:398
7134 msgid "use any ref"
7135 msgstr "使用任意引用"
7136
7137 #: builtin/describe.c:399
7138 msgid "use any tag, even unannotated"
7139 msgstr "使用任意标签,即使未附带注释"
7140
7141 #: builtin/describe.c:400
7142 msgid "always use long format"
7143 msgstr "始终使用长提交号格式"
7144
7145 #: builtin/describe.c:401
7146 msgid "only follow first parent"
7147 msgstr "只跟随第一个父提交"
7148
7149 #: builtin/describe.c:404
7150 msgid "only output exact matches"
7151 msgstr "只输出精确匹配"
7152
7153 #: builtin/describe.c:406
7154 msgid "consider <n> most recent tags (default: 10)"
7155 msgstr "考虑最近 <n> 个标签(默认:10)"
7156
7157 #: builtin/describe.c:408
7158 msgid "only consider tags matching <pattern>"
7159 msgstr "只考虑匹配 <模式> 的标签"
7160
7161 #: builtin/describe.c:410 builtin/name-rev.c:320
7162 msgid "show abbreviated commit object as fallback"
7163 msgstr "显示简写的提交号作为后备"
7164
7165 #: builtin/describe.c:411
7166 msgid "mark"
7167 msgstr "标记"
7168
7169 #: builtin/describe.c:412
7170 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
7171 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
7172
7173 #: builtin/describe.c:430
7174 msgid "--long is incompatible with --abbrev=0"
7175 msgstr "--long 与 --abbrev=0 不兼容"
7176
7177 #: builtin/describe.c:456
7178 msgid "No names found, cannot describe anything."
7179 msgstr "没有发现名称,无法描述任何东西。"
7180
7181 #: builtin/describe.c:476
7182 msgid "--dirty is incompatible with commit-ishes"
7183 msgstr "--dirty 不能与提交同时使用"
7184
7185 #: builtin/diff.c:86
7186 #, c-format
7187 msgid "'%s': not a regular file or symlink"
7188 msgstr "'%s':不是一个正规文件或符号链接"
7189
7190 #: builtin/diff.c:237
7191 #, c-format
7192 msgid "invalid option: %s"
7193 msgstr "无效选项:%s"
7194
7195 #: builtin/diff.c:361
7196 msgid "Not a git repository"
7197 msgstr "不是一个 git 仓库"
7198
7199 #: builtin/diff.c:404
7200 #, c-format
7201 msgid "invalid object '%s' given."
7202 msgstr "提供了无效对象 '%s'。"
7203
7204 #: builtin/diff.c:413
7205 #, c-format
7206 msgid "more than two blobs given: '%s'"
7207 msgstr "提供了超过两个数据对象:'%s'"
7208
7209 #: builtin/diff.c:420
7210 #, c-format
7211 msgid "unhandled object '%s' given."
7212 msgstr "无法处理的对象 '%s'。"
7213
7214 #: builtin/fast-export.c:25
7215 msgid "git fast-export [rev-list-opts]"
7216 msgstr "git fast-export [rev-list-opts]"
7217
7218 #: builtin/fast-export.c:980
7219 msgid "show progress after <n> objects"
7220 msgstr "在 <n> 个对象之后显示进度"
7221
7222 #: builtin/fast-export.c:982
7223 msgid "select handling of signed tags"
7224 msgstr "选择如何处理签名标签"
7225
7226 #: builtin/fast-export.c:985
7227 msgid "select handling of tags that tag filtered objects"
7228 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
7229
7230 #: builtin/fast-export.c:988
7231 msgid "Dump marks to this file"
7232 msgstr "把标记存储到这个文件"
7233
7234 #: builtin/fast-export.c:990
7235 msgid "Import marks from this file"
7236 msgstr "从这个文件导入标记"
7237
7238 #: builtin/fast-export.c:992
7239 msgid "Fake a tagger when tags lack one"
7240 msgstr "当标签缺少标记者字段时,假装提供一个"
7241
7242 #: builtin/fast-export.c:994
7243 msgid "Output full tree for each commit"
7244 msgstr "每次提交都输出整个树"
7245
7246 #: builtin/fast-export.c:996
7247 msgid "Use the done feature to terminate the stream"
7248 msgstr "使用 done 功能来终止流"
7249
7250 #: builtin/fast-export.c:997
7251 msgid "Skip output of blob data"
7252 msgstr "跳过数据对象的输出"
7253
7254 #: builtin/fast-export.c:998
7255 msgid "refspec"
7256 msgstr "引用规格"
7257
7258 #: builtin/fast-export.c:999
7259 msgid "Apply refspec to exported refs"
7260 msgstr "对导出的引用应用引用规格"
7261
7262 #: builtin/fast-export.c:1000
7263 msgid "anonymize output"
7264 msgstr "匿名输出"
7265
7266 #: builtin/fetch.c:21
7267 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
7268 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
7269
7270 #: builtin/fetch.c:22
7271 msgid "git fetch [<options>] <group>"
7272 msgstr "git fetch [<选项>] <组>"
7273
7274 #: builtin/fetch.c:23
7275 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
7276 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
7277
7278 #: builtin/fetch.c:24
7279 msgid "git fetch --all [<options>]"
7280 msgstr "git fetch --all [<选项>]"
7281
7282 #: builtin/fetch.c:95 builtin/pull.c:175
7283 msgid "fetch from all remotes"
7284 msgstr "从所有的远程抓取"
7285
7286 #: builtin/fetch.c:97 builtin/pull.c:178
7287 msgid "append to .git/FETCH_HEAD instead of overwriting"
7288 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
7289
7290 #: builtin/fetch.c:99 builtin/pull.c:181
7291 msgid "path to upload pack on remote end"
7292 msgstr "上传包到远程的路径"
7293
7294 #: builtin/fetch.c:100 builtin/pull.c:183
7295 msgid "force overwrite of local branch"
7296 msgstr "强制覆盖本地分支"
7297
7298 #: builtin/fetch.c:102
7299 msgid "fetch from multiple remotes"
7300 msgstr "从多个远程抓取"
7301
7302 #: builtin/fetch.c:104 builtin/pull.c:185
7303 msgid "fetch all tags and associated objects"
7304 msgstr "抓取所有的标签和关联对象"
7305
7306 #: builtin/fetch.c:106
7307 msgid "do not fetch all tags (--no-tags)"
7308 msgstr "不抓取任何标签(--no-tags)"
7309
7310 #: builtin/fetch.c:108
7311 msgid "number of submodules fetched in parallel"
7312 msgstr "子模组获取的并发数"
7313
7314 #: builtin/fetch.c:110 builtin/pull.c:188
7315 msgid "prune remote-tracking branches no longer on remote"
7316 msgstr "清除远程已经不存在的分支的跟踪分支"
7317
7318 # 译者:可选值,不能翻译
7319 #: builtin/fetch.c:111 builtin/pull.c:191
7320 msgid "on-demand"
7321 msgstr "on-demand"
7322
7323 #: builtin/fetch.c:112 builtin/pull.c:192
7324 msgid "control recursive fetching of submodules"
7325 msgstr "控制子模组的递归抓取"
7326
7327 #: builtin/fetch.c:116 builtin/pull.c:200
7328 msgid "keep downloaded pack"
7329 msgstr "保持下载包"
7330
7331 #: builtin/fetch.c:118
7332 msgid "allow updating of HEAD ref"
7333 msgstr "允许更新 HEAD 引用"
7334
7335 #: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
7336 msgid "deepen history of shallow clone"
7337 msgstr "深化浅克隆的历史"
7338
7339 #: builtin/fetch.c:123
7340 msgid "deepen history of shallow repository based on time"
7341 msgstr "基于时间来深化浅克隆的历史"
7342
7343 #: builtin/fetch.c:129 builtin/pull.c:206
7344 msgid "convert to a complete repository"
7345 msgstr "转换为一个完整的仓库"
7346
7347 #: builtin/fetch.c:131 builtin/log.c:1433
7348 msgid "dir"
7349 msgstr "目录"
7350
7351 #: builtin/fetch.c:132
7352 msgid "prepend this to submodule path output"
7353 msgstr "在子模组路径输出的前面加上此目录"
7354
7355 #: builtin/fetch.c:135
7356 msgid "default mode for recursion"
7357 msgstr "递归的默认模式"
7358
7359 #: builtin/fetch.c:137 builtin/pull.c:209
7360 msgid "accept refs that update .git/shallow"
7361 msgstr "接受更新 .git/shallow 的引用"
7362
7363 #: builtin/fetch.c:138 builtin/pull.c:211
7364 msgid "refmap"
7365 msgstr "引用映射"
7366
7367 #: builtin/fetch.c:139 builtin/pull.c:212
7368 msgid "specify fetch refmap"
7369 msgstr "指定获取操作的引用映射"
7370
7371 #: builtin/fetch.c:398
7372 msgid "Couldn't find remote ref HEAD"
7373 msgstr "无法发现远程 HEAD 引用"
7374
7375 #: builtin/fetch.c:514
7376 #, c-format
7377 msgid "configuration fetch.output contains invalid value %s"
7378 msgstr "配置变量 fetch.output 包含无效值 %s"
7379
7380 #: builtin/fetch.c:607
7381 #, c-format
7382 msgid "object %s not found"
7383 msgstr "对象 %s 未发现"
7384
7385 #: builtin/fetch.c:611
7386 msgid "[up to date]"
7387 msgstr "[最新]"
7388
7389 #: builtin/fetch.c:624 builtin/fetch.c:704
7390 msgid "[rejected]"
7391 msgstr "[已拒绝]"
7392
7393 #: builtin/fetch.c:625
7394 msgid "can't fetch in current branch"
7395 msgstr "当前分支下不能执行获取操作"
7396
7397 #: builtin/fetch.c:634
7398 msgid "[tag update]"
7399 msgstr "[标签更新]"
7400
7401 #: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
7402 #: builtin/fetch.c:699
7403 msgid "unable to update local ref"
7404 msgstr "不能更新本地引用"
7405
7406 #: builtin/fetch.c:654
7407 msgid "[new tag]"
7408 msgstr "[新标签]"
7409
7410 #: builtin/fetch.c:657
7411 msgid "[new branch]"
7412 msgstr "[新分支]"
7413
7414 #: builtin/fetch.c:660
7415 msgid "[new ref]"
7416 msgstr "[新引用]"
7417
7418 #: builtin/fetch.c:699
7419 msgid "forced update"
7420 msgstr "强制更新"
7421
7422 #: builtin/fetch.c:704
7423 msgid "non-fast-forward"
7424 msgstr "非快进"
7425
7426 #: builtin/fetch.c:749
7427 #, c-format
7428 msgid "%s did not send all necessary objects\n"
7429 msgstr "%s 未发送所有必须的对象\n"
7430
7431 #: builtin/fetch.c:769
7432 #, c-format
7433 msgid "reject %s because shallow roots are not allowed to be updated"
7434 msgstr "拒绝 %s 因为浅克隆不允许被更新"
7435
7436 #: builtin/fetch.c:856 builtin/fetch.c:952
7437 #, c-format
7438 msgid "From %.*s\n"
7439 msgstr "来自 %.*s\n"
7440
7441 #: builtin/fetch.c:867
7442 #, c-format
7443 msgid ""
7444 "some local refs could not be updated; try running\n"
7445 " 'git remote prune %s' to remove any old, conflicting branches"
7446 msgstr ""
7447 "一些本地引用不能被更新;尝试运行\n"
7448 " 'git remote prune %s' 来删除旧的、有冲突的分支"
7449
7450 # 译者:注意保持前导空格
7451 #: builtin/fetch.c:922
7452 #, c-format
7453 msgid " (%s will become dangling)"
7454 msgstr " (%s 将成为摇摆状态)"
7455
7456 # 译者:注意保持前导空格
7457 #: builtin/fetch.c:923
7458 #, c-format
7459 msgid " (%s has become dangling)"
7460 msgstr " (%s 已成为摇摆状态)"
7461
7462 #: builtin/fetch.c:955
7463 msgid "[deleted]"
7464 msgstr "[已删除]"
7465
7466 #: builtin/fetch.c:956 builtin/remote.c:1020
7467 msgid "(none)"
7468 msgstr "(无)"
7469
7470 #: builtin/fetch.c:979
7471 #, c-format
7472 msgid "Refusing to fetch into current branch %s of non-bare repository"
7473 msgstr "拒绝获取到非纯仓库的当前分支 %s"
7474
7475 #: builtin/fetch.c:998
7476 #, c-format
7477 msgid "Option \"%s\" value \"%s\" is not valid for %s"
7478 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
7479
7480 #: builtin/fetch.c:1001
7481 #, c-format
7482 msgid "Option \"%s\" is ignored for %s\n"
7483 msgstr "选项 \"%s\" 为 %s 所忽略\n"
7484
7485 #: builtin/fetch.c:1077
7486 #, c-format
7487 msgid "Don't know how to fetch from %s"
7488 msgstr "不知道如何从 %s 获取"
7489
7490 #: builtin/fetch.c:1237
7491 #, c-format
7492 msgid "Fetching %s\n"
7493 msgstr "正在获取 %s\n"
7494
7495 #: builtin/fetch.c:1239 builtin/remote.c:96
7496 #, c-format
7497 msgid "Could not fetch %s"
7498 msgstr "不能获取 %s"
7499
7500 #: builtin/fetch.c:1257
7501 msgid ""
7502 "No remote repository specified. Please, specify either a URL or a\n"
7503 "remote name from which new revisions should be fetched."
7504 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
7505
7506 #: builtin/fetch.c:1280
7507 msgid "You need to specify a tag name."
7508 msgstr "您需要指定一个标签名称。"
7509
7510 #: builtin/fetch.c:1322
7511 msgid "Negative depth in --deepen is not supported"
7512 msgstr "--deepen 不支持负数深度"
7513
7514 #: builtin/fetch.c:1324
7515 msgid "--deepen and --depth are mutually exclusive"
7516 msgstr "--deepen 和 --depth 是互斥的"
7517
7518 #: builtin/fetch.c:1329
7519 msgid "--depth and --unshallow cannot be used together"
7520 msgstr "--depth 和 --unshallow 不能同时使用"
7521
7522 #: builtin/fetch.c:1331
7523 msgid "--unshallow on a complete repository does not make sense"
7524 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
7525
7526 #: builtin/fetch.c:1353
7527 msgid "fetch --all does not take a repository argument"
7528 msgstr "fetch --all 不能带一个仓库参数"
7529
7530 #: builtin/fetch.c:1355
7531 msgid "fetch --all does not make sense with refspecs"
7532 msgstr "fetch --all 带引用规格没有任何意义"
7533
7534 #: builtin/fetch.c:1366
7535 #, c-format
7536 msgid "No such remote or remote group: %s"
7537 msgstr "没有这样的远程或远程组:%s"
7538
7539 #: builtin/fetch.c:1374
7540 msgid "Fetching a group and specifying refspecs does not make sense"
7541 msgstr "获取组并指定引用规格没有意义"
7542
7543 #: builtin/fmt-merge-msg.c:14
7544 msgid ""
7545 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
7546 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
7547
7548 #: builtin/fmt-merge-msg.c:663
7549 msgid "populate log with at most <n> entries from shortlog"
7550 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
7551
7552 #: builtin/fmt-merge-msg.c:666
7553 msgid "alias for --log (deprecated)"
7554 msgstr "参数 --log 的别名(已弃用)"
7555
7556 #: builtin/fmt-merge-msg.c:669
7557 msgid "text"
7558 msgstr "文本"
7559
7560 #: builtin/fmt-merge-msg.c:670
7561 msgid "use <text> as start of message"
7562 msgstr "使用 <文本> 作为提交说明的开始"
7563
7564 #: builtin/fmt-merge-msg.c:671
7565 msgid "file to read from"
7566 msgstr "从文件中读取"
7567
7568 #: builtin/for-each-ref.c:9
7569 msgid "git for-each-ref [<options>] [<pattern>]"
7570 msgstr "git for-each-ref [<选项>] [<模式>]"
7571
7572 #: builtin/for-each-ref.c:10
7573 msgid "git for-each-ref [--points-at <object>]"
7574 msgstr "git for-each-ref [--points-at <对象>]"
7575
7576 #: builtin/for-each-ref.c:11
7577 msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
7578 msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
7579
7580 #: builtin/for-each-ref.c:12
7581 msgid "git for-each-ref [--contains [<object>]]"
7582 msgstr "git for-each-ref [--contains [<对象>]]"
7583
7584 #: builtin/for-each-ref.c:27
7585 msgid "quote placeholders suitably for shells"
7586 msgstr "引用占位符适用于 shells"
7587
7588 #: builtin/for-each-ref.c:29
7589 msgid "quote placeholders suitably for perl"
7590 msgstr "引用占位符适用于 perl"
7591
7592 #: builtin/for-each-ref.c:31
7593 msgid "quote placeholders suitably for python"
7594 msgstr "引用占位符适用于 python"
7595
7596 #: builtin/for-each-ref.c:33
7597 msgid "quote placeholders suitably for Tcl"
7598 msgstr "引用占位符适用于 Tcl"
7599
7600 #: builtin/for-each-ref.c:36
7601 msgid "show only <n> matched refs"
7602 msgstr "只显示 <n> 个匹配的引用"
7603
7604 #: builtin/for-each-ref.c:37 builtin/tag.c:372
7605 msgid "format to use for the output"
7606 msgstr "输出格式"
7607
7608 #: builtin/for-each-ref.c:41
7609 msgid "print only refs which points at the given object"
7610 msgstr "只打印指向给定对象的引用"
7611
7612 #: builtin/for-each-ref.c:43
7613 msgid "print only refs that are merged"
7614 msgstr "只打印已经合并的引用"
7615
7616 #: builtin/for-each-ref.c:44
7617 msgid "print only refs that are not merged"
7618 msgstr "只打印没有合并的引用"
7619
7620 #: builtin/for-each-ref.c:45
7621 msgid "print only refs which contain the commit"
7622 msgstr "只打印包含该提交的引用"
7623
7624 #: builtin/fsck.c:519
7625 msgid "Checking object directories"
7626 msgstr "检查对象目录中"
7627
7628 #: builtin/fsck.c:588
7629 msgid "git fsck [<options>] [<object>...]"
7630 msgstr "git fsck [<选项>] [<对象>...]"
7631
7632 #: builtin/fsck.c:594
7633 msgid "show unreachable objects"
7634 msgstr "显示不可达的对象"
7635
7636 #: builtin/fsck.c:595
7637 msgid "show dangling objects"
7638 msgstr "显示摇摆的对象"
7639
7640 #: builtin/fsck.c:596
7641 msgid "report tags"
7642 msgstr "报告标签"
7643
7644 #: builtin/fsck.c:597
7645 msgid "report root nodes"
7646 msgstr "报告根节点"
7647
7648 #: builtin/fsck.c:598
7649 msgid "make index objects head nodes"
7650 msgstr "将索引亦作为检查的头节点"
7651
7652 #: builtin/fsck.c:599
7653 msgid "make reflogs head nodes (default)"
7654 msgstr "将引用日志作为检查的头节点(默认)"
7655
7656 #: builtin/fsck.c:600
7657 msgid "also consider packs and alternate objects"
7658 msgstr "也考虑包和备用对象"
7659
7660 #: builtin/fsck.c:601
7661 msgid "check only connectivity"
7662 msgstr "仅检查连通性"
7663
7664 #: builtin/fsck.c:602
7665 msgid "enable more strict checking"
7666 msgstr "启用更严格的检查"
7667
7668 #: builtin/fsck.c:604
7669 msgid "write dangling objects in .git/lost-found"
7670 msgstr "将摇摆对象写入 .git/lost-found 中"
7671
7672 #: builtin/fsck.c:605 builtin/prune.c:107
7673 msgid "show progress"
7674 msgstr "显示进度"
7675
7676 #: builtin/fsck.c:606
7677 msgid "show verbose names for reachable objects"
7678 msgstr "显示可达对象的详细名称"
7679
7680 #: builtin/fsck.c:665
7681 msgid "Checking objects"
7682 msgstr "检查对象中"
7683
7684 #: builtin/gc.c:25
7685 msgid "git gc [<options>]"
7686 msgstr "git gc [<选项>]"
7687
7688 #: builtin/gc.c:72
7689 #, c-format
7690 msgid "Invalid %s: '%s'"
7691 msgstr "无效 %s:'%s'"
7692
7693 #: builtin/gc.c:139
7694 #, c-format
7695 msgid "insanely long object directory %.*s"
7696 msgstr "不正常的长对象目录 %.*s"
7697
7698 #: builtin/gc.c:290
7699 #, c-format
7700 msgid ""
7701 "The last gc run reported the following. Please correct the root cause\n"
7702 "and remove %s.\n"
7703 "Automatic cleanup will not be performed until the file is removed.\n"
7704 "\n"
7705 "%s"
7706 msgstr ""
7707 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
7708 "在该文件被删除之前,自动清理将不会执行。\n"
7709 "\n"
7710 "%s"
7711
7712 #: builtin/gc.c:327
7713 msgid "prune unreferenced objects"
7714 msgstr "清除未引用的对象"
7715
7716 #: builtin/gc.c:329
7717 msgid "be more thorough (increased runtime)"
7718 msgstr "更彻底(增加运行时间)"
7719
7720 #: builtin/gc.c:330
7721 msgid "enable auto-gc mode"
7722 msgstr "启用自动垃圾回收模式"
7723
7724 #: builtin/gc.c:331
7725 msgid "force running gc even if there may be another gc running"
7726 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
7727
7728 #: builtin/gc.c:373
7729 #, c-format
7730 msgid "Auto packing the repository in background for optimum performance.\n"
7731 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
7732
7733 #: builtin/gc.c:375
7734 #, c-format
7735 msgid "Auto packing the repository for optimum performance.\n"
7736 msgstr "自动打包仓库以求最佳性能。\n"
7737
7738 #: builtin/gc.c:376
7739 #, c-format
7740 msgid "See \"git help gc\" for manual housekeeping.\n"
7741 msgstr "手工维护参见 \"git help gc\"。\n"
7742
7743 #: builtin/gc.c:397
7744 #, c-format
7745 msgid ""
7746 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
7747 msgstr ""
7748 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
7749
7750 #: builtin/gc.c:441
7751 msgid ""
7752 "There are too many unreachable loose objects; run 'git prune' to remove them."
7753 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
7754
7755 #: builtin/grep.c:23
7756 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
7757 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
7758
7759 #: builtin/grep.c:219
7760 #, c-format
7761 msgid "grep: failed to create thread: %s"
7762 msgstr "grep:无法创建线程:%s"
7763
7764 #: builtin/grep.c:277
7765 #, c-format
7766 msgid "invalid number of threads specified (%d) for %s"
7767 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
7768
7769 #: builtin/grep.c:453 builtin/grep.c:488
7770 #, c-format
7771 msgid "unable to read tree (%s)"
7772 msgstr "无法读取树(%s)"
7773
7774 #: builtin/grep.c:503
7775 #, c-format
7776 msgid "unable to grep from object of type %s"
7777 msgstr "无法抓取来自于 %s 类型的对象"
7778
7779 #: builtin/grep.c:561
7780 #, c-format
7781 msgid "switch `%c' expects a numerical value"
7782 msgstr "开关 `%c' 期望一个数字值"
7783
7784 #: builtin/grep.c:647
7785 msgid "search in index instead of in the work tree"
7786 msgstr "在索引区搜索而不是在工作区"
7787
7788 #: builtin/grep.c:649
7789 msgid "find in contents not managed by git"
7790 msgstr "在未被 git 管理的内容中查找"
7791
7792 # 译者:中文字符串拼接,可删除前导空格
7793 #: builtin/grep.c:651
7794 msgid "search in both tracked and untracked files"
7795 msgstr "在跟踪和未跟踪的文件中搜索"
7796
7797 #: builtin/grep.c:653
7798 msgid "ignore files specified via '.gitignore'"
7799 msgstr "忽略 '.gitignore' 包含的文件"
7800
7801 #: builtin/grep.c:656
7802 msgid "show non-matching lines"
7803 msgstr "显示未匹配的行"
7804
7805 #: builtin/grep.c:658
7806 msgid "case insensitive matching"
7807 msgstr "不区分大小写匹配"
7808
7809 #: builtin/grep.c:660
7810 msgid "match patterns only at word boundaries"
7811 msgstr "只在单词边界匹配模式"
7812
7813 #: builtin/grep.c:662
7814 msgid "process binary files as text"
7815 msgstr "把二进制文件当做文本处理"
7816
7817 #: builtin/grep.c:664
7818 msgid "don't match patterns in binary files"
7819 msgstr "不在二进制文件中匹配模式"
7820
7821 #: builtin/grep.c:667
7822 msgid "process binary files with textconv filters"
7823 msgstr "用 textconv 过滤器处理二进制文件"
7824
7825 #: builtin/grep.c:669
7826 msgid "descend at most <depth> levels"
7827 msgstr "最多以指定的深度向下寻找"
7828
7829 #: builtin/grep.c:673
7830 msgid "use extended POSIX regular expressions"
7831 msgstr "使用扩展的 POSIX 正则表达式"
7832
7833 #: builtin/grep.c:676
7834 msgid "use basic POSIX regular expressions (default)"
7835 msgstr "使用基本的 POSIX 正则表达式(默认)"
7836
7837 #: builtin/grep.c:679
7838 msgid "interpret patterns as fixed strings"
7839 msgstr "把模式解析为固定的字符串"
7840
7841 #: builtin/grep.c:682
7842 msgid "use Perl-compatible regular expressions"
7843 msgstr "使用 Perl 兼容的正则表达式"
7844
7845 #: builtin/grep.c:685
7846 msgid "show line numbers"
7847 msgstr "显示行号"
7848
7849 #: builtin/grep.c:686
7850 msgid "don't show filenames"
7851 msgstr "不显示文件名"
7852
7853 #: builtin/grep.c:687
7854 msgid "show filenames"
7855 msgstr "显示文件名"
7856
7857 #: builtin/grep.c:689
7858 msgid "show filenames relative to top directory"
7859 msgstr "显示相对于顶级目录的文件名"
7860
7861 #: builtin/grep.c:691
7862 msgid "show only filenames instead of matching lines"
7863 msgstr "只显示文件名而不显示匹配的行"
7864
7865 #: builtin/grep.c:693
7866 msgid "synonym for --files-with-matches"
7867 msgstr "和 --files-with-matches 同义"
7868
7869 #: builtin/grep.c:696
7870 msgid "show only the names of files without match"
7871 msgstr "只显示未匹配的文件名"
7872
7873 #: builtin/grep.c:698
7874 msgid "print NUL after filenames"
7875 msgstr "在文件名后输出 NUL 字符"
7876
7877 #: builtin/grep.c:700
7878 msgid "show the number of matches instead of matching lines"
7879 msgstr "显示总匹配行数,而不显示匹配的行"
7880
7881 #: builtin/grep.c:701
7882 msgid "highlight matches"
7883 msgstr "高亮显示匹配项"
7884
7885 #: builtin/grep.c:703
7886 msgid "print empty line between matches from different files"
7887 msgstr "在不同文件的匹配项之间打印空行"
7888
7889 #: builtin/grep.c:705
7890 msgid "show filename only once above matches from same file"
7891 msgstr "只在同一文件的匹配项的上面显示一次文件名"
7892
7893 #: builtin/grep.c:708
7894 msgid "show <n> context lines before and after matches"
7895 msgstr "显示匹配项前后的 <n> 行上下文"
7896
7897 #: builtin/grep.c:711
7898 msgid "show <n> context lines before matches"
7899 msgstr "显示匹配项前 <n> 行上下文"
7900
7901 #: builtin/grep.c:713
7902 msgid "show <n> context lines after matches"
7903 msgstr "显示匹配项后 <n> 行上下文"
7904
7905 #: builtin/grep.c:715
7906 msgid "use <n> worker threads"
7907 msgstr "使用 <n> 个工作线程"
7908
7909 #: builtin/grep.c:716
7910 msgid "shortcut for -C NUM"
7911 msgstr "快捷键 -C 数字"
7912
7913 #: builtin/grep.c:719
7914 msgid "show a line with the function name before matches"
7915 msgstr "在匹配的前面显示一行函数名"
7916
7917 #: builtin/grep.c:721
7918 msgid "show the surrounding function"
7919 msgstr "显示所在函数的前后内容"
7920
7921 #: builtin/grep.c:724
7922 msgid "read patterns from file"
7923 msgstr "从文件读取模式"
7924
7925 #: builtin/grep.c:726
7926 msgid "match <pattern>"
7927 msgstr "匹配 <模式>"
7928
7929 #: builtin/grep.c:728
7930 msgid "combine patterns specified with -e"
7931 msgstr "组合用 -e 参数设定的模式"
7932
7933 #: builtin/grep.c:740
7934 msgid "indicate hit with exit status without output"
7935 msgstr "不输出,而用退出码标识命中状态"
7936
7937 #: builtin/grep.c:742
7938 msgid "show only matches from files that match all patterns"
7939 msgstr "只显示匹配所有模式的文件中的匹配"
7940
7941 #: builtin/grep.c:744
7942 msgid "show parse tree for grep expression"
7943 msgstr "显示 grep 表达式的解析树"
7944
7945 #: builtin/grep.c:748
7946 msgid "pager"
7947 msgstr "分页"
7948
7949 #: builtin/grep.c:748
7950 msgid "show matching files in the pager"
7951 msgstr "分页显示匹配的文件"
7952
7953 #: builtin/grep.c:751
7954 msgid "allow calling of grep(1) (ignored by this build)"
7955 msgstr "允许调用 grep(1)(本次构建忽略)"
7956
7957 #: builtin/grep.c:814
7958 msgid "no pattern given."
7959 msgstr "未提供模式匹配。"
7960
7961 #: builtin/grep.c:846 builtin/index-pack.c:1480
7962 #, c-format
7963 msgid "invalid number of threads specified (%d)"
7964 msgstr "指定的线程数无效(%d)"
7965
7966 #: builtin/grep.c:876
7967 msgid "--open-files-in-pager only works on the worktree"
7968 msgstr "--open-files-in-pager 仅用于工作区"
7969
7970 #: builtin/grep.c:902
7971 msgid "--cached or --untracked cannot be used with --no-index."
7972 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
7973
7974 #: builtin/grep.c:907
7975 msgid "--no-index or --untracked cannot be used with revs."
7976 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
7977
7978 #: builtin/grep.c:910
7979 msgid "--[no-]exclude-standard cannot be used for tracked contents."
7980 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
7981
7982 #: builtin/grep.c:918
7983 msgid "both --cached and trees are given."
7984 msgstr "同时给出了 --cached 和树对象。"
7985
7986 #: builtin/hash-object.c:81
7987 msgid ""
7988 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
7989 "[--] <file>..."
7990 msgstr ""
7991 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
7992 "[--] <文件>..."
7993
7994 #: builtin/hash-object.c:82
7995 msgid "git hash-object --stdin-paths"
7996 msgstr "git hash-object --stdin-paths"
7997
7998 #: builtin/hash-object.c:94
7999 msgid "type"
8000 msgstr "类型"
8001
8002 #: builtin/hash-object.c:94
8003 msgid "object type"
8004 msgstr "对象类型"
8005
8006 #: builtin/hash-object.c:95
8007 msgid "write the object into the object database"
8008 msgstr "将对象写入对象数据库"
8009
8010 #: builtin/hash-object.c:97
8011 msgid "read the object from stdin"
8012 msgstr "从标准输入读取对象"
8013
8014 #: builtin/hash-object.c:99
8015 msgid "store file as is without filters"
8016 msgstr "原样存储文件不使用过滤器"
8017
8018 #: builtin/hash-object.c:100
8019 msgid ""
8020 "just hash any random garbage to create corrupt objects for debugging Git"
8021 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
8022
8023 #: builtin/hash-object.c:101
8024 msgid "process file as it were from this path"
8025 msgstr "处理文件并假设其来自于此路径"
8026
8027 #: builtin/help.c:42
8028 msgid "print all available commands"
8029 msgstr "打印所有可用的命令"
8030
8031 #: builtin/help.c:43
8032 msgid "exclude guides"
8033 msgstr "排除向导"
8034
8035 #: builtin/help.c:44
8036 msgid "print list of useful guides"
8037 msgstr "显示有用的指南列表"
8038
8039 #: builtin/help.c:45
8040 msgid "show man page"
8041 msgstr "显示 man 手册"
8042
8043 #: builtin/help.c:46
8044 msgid "show manual in web browser"
8045 msgstr "在 web 浏览器中显示手册"
8046
8047 #: builtin/help.c:48
8048 msgid "show info page"
8049 msgstr "显示 info 手册"
8050
8051 #: builtin/help.c:54
8052 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
8053 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
8054
8055 #: builtin/help.c:66
8056 #, c-format
8057 msgid "unrecognized help format '%s'"
8058 msgstr "未能识别的帮助格式 '%s'"
8059
8060 #: builtin/help.c:93
8061 msgid "Failed to start emacsclient."
8062 msgstr "无法启动 emacsclient。"
8063
8064 #: builtin/help.c:106
8065 msgid "Failed to parse emacsclient version."
8066 msgstr "无法解析 emacsclient 版本。"
8067
8068 #: builtin/help.c:114
8069 #, c-format
8070 msgid "emacsclient version '%d' too old (< 22)."
8071 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8072
8073 #: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
8074 #, c-format
8075 msgid "failed to exec '%s'"
8076 msgstr "无法执行 '%s'"
8077
8078 #: builtin/help.c:207
8079 #, c-format
8080 msgid ""
8081 "'%s': path for unsupported man viewer.\n"
8082 "Please consider using 'man.<tool>.cmd' instead."
8083 msgstr ""
8084 "'%s':不支持的 man 手册查看器的路径。\n"
8085 "请使用 'man.<工具>.cmd'。"
8086
8087 #: builtin/help.c:219
8088 #, c-format
8089 msgid ""
8090 "'%s': cmd for supported man viewer.\n"
8091 "Please consider using 'man.<tool>.path' instead."
8092 msgstr ""
8093 "'%s': 支持的 man 手册查看器命令。\n"
8094 "请使用 'man.<工具>.path'。"
8095
8096 #: builtin/help.c:336
8097 #, c-format
8098 msgid "'%s': unknown man viewer."
8099 msgstr "'%s':未知的 man 查看器。"
8100
8101 #: builtin/help.c:353
8102 msgid "no man viewer handled the request"
8103 msgstr "没有 man 查看器处理此请求"
8104
8105 #: builtin/help.c:361
8106 msgid "no info viewer handled the request"
8107 msgstr "没有 info 查看器处理此请求"
8108
8109 #: builtin/help.c:403
8110 msgid "Defining attributes per path"
8111 msgstr "定义路径的属性"
8112
8113 #: builtin/help.c:404
8114 msgid "Everyday Git With 20 Commands Or So"
8115 msgstr "每一天 Git 常用的约 20 条命令"
8116
8117 #: builtin/help.c:405
8118 msgid "A Git glossary"
8119 msgstr "Git 词汇表"
8120
8121 #: builtin/help.c:406
8122 msgid "Specifies intentionally untracked files to ignore"
8123 msgstr "忽略指定的未跟踪文件"
8124
8125 #: builtin/help.c:407
8126 msgid "Defining submodule properties"
8127 msgstr "定义子模组属性"
8128
8129 #: builtin/help.c:408
8130 msgid "Specifying revisions and ranges for Git"
8131 msgstr "指定 Git 的版本和版本范围"
8132
8133 #: builtin/help.c:409
8134 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
8135 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
8136
8137 #: builtin/help.c:410
8138 msgid "An overview of recommended workflows with Git"
8139 msgstr "Git 推荐的工作流概览"
8140
8141 #: builtin/help.c:422
8142 msgid "The common Git guides are:\n"
8143 msgstr "最常用的 Git 向导有:\n"
8144
8145 #: builtin/help.c:440
8146 #, c-format
8147 msgid "`git %s' is aliased to `%s'"
8148 msgstr "`git %s' 是 `%s' 的别名"
8149
8150 #: builtin/help.c:462 builtin/help.c:479
8151 #, c-format
8152 msgid "usage: %s%s"
8153 msgstr "用法:%s%s"
8154
8155 #: builtin/index-pack.c:154
8156 #, c-format
8157 msgid "unable to open %s"
8158 msgstr "不能打开 %s"
8159
8160 #: builtin/index-pack.c:204
8161 #, c-format
8162 msgid "object type mismatch at %s"
8163 msgstr "%s 的对象类型不匹配"
8164
8165 #: builtin/index-pack.c:224
8166 #, c-format
8167 msgid "did not receive expected object %s"
8168 msgstr "未能获取预期的对象 %s"
8169
8170 #: builtin/index-pack.c:227
8171 #, c-format
8172 msgid "object %s: expected type %s, found %s"
8173 msgstr "对象 %s:应为类型 %s,却是 %s"
8174
8175 #: builtin/index-pack.c:269
8176 #, c-format
8177 msgid "cannot fill %d byte"
8178 msgid_plural "cannot fill %d bytes"
8179 msgstr[0] "无法填充 %d 字节"
8180 msgstr[1] "无法填充 %d 字节"
8181
8182 #: builtin/index-pack.c:279
8183 msgid "early EOF"
8184 msgstr "过早的文件结束符(EOF)"
8185
8186 #: builtin/index-pack.c:280
8187 msgid "read error on input"
8188 msgstr "输入上的读错误"
8189
8190 #: builtin/index-pack.c:292
8191 msgid "used more bytes than were available"
8192 msgstr "用掉了超过可用的字节"
8193
8194 #: builtin/index-pack.c:299
8195 msgid "pack too large for current definition of off_t"
8196 msgstr "包太大超过了当前 off_t 的定义"
8197
8198 #: builtin/index-pack.c:302 builtin/unpack-objects.c:92
8199 msgid "pack exceeds maximum allowed size"
8200 msgstr "包超过了最大允许值"
8201
8202 #: builtin/index-pack.c:317
8203 #, c-format
8204 msgid "unable to create '%s'"
8205 msgstr "不能创建 '%s'"
8206
8207 #: builtin/index-pack.c:322
8208 #, c-format
8209 msgid "cannot open packfile '%s'"
8210 msgstr "无法打开包文件 '%s'"
8211
8212 #: builtin/index-pack.c:336
8213 msgid "pack signature mismatch"
8214 msgstr "包签名不匹配"
8215
8216 #: builtin/index-pack.c:338
8217 #, c-format
8218 msgid "pack version %<PRIu32> unsupported"
8219 msgstr "不支持包版本 %<PRIu32>"
8220
8221 #: builtin/index-pack.c:356
8222 #, c-format
8223 msgid "pack has bad object at offset %<PRIuMAX>: %s"
8224 msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8225
8226 #: builtin/index-pack.c:478
8227 #, c-format
8228 msgid "inflate returned %d"
8229 msgstr "解压缩返回 %d"
8230
8231 #: builtin/index-pack.c:527
8232 msgid "offset value overflow for delta base object"
8233 msgstr "偏移值覆盖了 delta 基准对象"
8234
8235 #: builtin/index-pack.c:535
8236 msgid "delta base offset is out of bound"
8237 msgstr "delta 基准偏移越界"
8238
8239 #: builtin/index-pack.c:543
8240 #, c-format
8241 msgid "unknown object type %d"
8242 msgstr "未知对象类型 %d"
8243
8244 #: builtin/index-pack.c:574
8245 msgid "cannot pread pack file"
8246 msgstr "无法读取包文件"
8247
8248 #: builtin/index-pack.c:576
8249 #, c-format
8250 msgid "premature end of pack file, %<PRIuMAX> byte missing"
8251 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
8252 msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8253 msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8254
8255 #: builtin/index-pack.c:602
8256 msgid "serious inflate inconsistency"
8257 msgstr "解压缩严重的不一致"
8258
8259 #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
8260 #: builtin/index-pack.c:811 builtin/index-pack.c:820
8261 #, c-format
8262 msgid "SHA1 COLLISION FOUND WITH %s !"
8263 msgstr "发现 %s 出现 SHA1 冲突!"
8264
8265 #: builtin/index-pack.c:751 builtin/pack-objects.c:166
8266 #: builtin/pack-objects.c:258
8267 #, c-format
8268 msgid "unable to read %s"
8269 msgstr "不能读 %s"
8270
8271 #: builtin/index-pack.c:817
8272 #, c-format
8273 msgid "cannot read existing object %s"
8274 msgstr "不能读取现存对象 %s"
8275
8276 #: builtin/index-pack.c:831
8277 #, c-format
8278 msgid "invalid blob object %s"
8279 msgstr "无效的数据对象 %s"
8280
8281 #: builtin/index-pack.c:845
8282 #, c-format
8283 msgid "invalid %s"
8284 msgstr "无效的 %s"
8285
8286 #: builtin/index-pack.c:848
8287 msgid "Error in object"
8288 msgstr "对象中出错"
8289
8290 #: builtin/index-pack.c:850
8291 #, c-format
8292 msgid "Not all child objects of %s are reachable"
8293 msgstr "%s 的所有子对象并非都可达"
8294
8295 #: builtin/index-pack.c:922 builtin/index-pack.c:953
8296 msgid "failed to apply delta"
8297 msgstr "无法应用 delta"
8298
8299 #: builtin/index-pack.c:1123
8300 msgid "Receiving objects"
8301 msgstr "接收对象中"
8302
8303 #: builtin/index-pack.c:1123
8304 msgid "Indexing objects"
8305 msgstr "索引对象中"
8306
8307 #: builtin/index-pack.c:1155
8308 msgid "pack is corrupted (SHA1 mismatch)"
8309 msgstr "包冲突(SHA1 不匹配)"
8310
8311 #: builtin/index-pack.c:1160
8312 msgid "cannot fstat packfile"
8313 msgstr "不能枚举包文件状态"
8314
8315 #: builtin/index-pack.c:1163
8316 msgid "pack has junk at the end"
8317 msgstr "包的结尾有垃圾数据"
8318
8319 #: builtin/index-pack.c:1174
8320 msgid "confusion beyond insanity in parse_pack_objects()"
8321 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
8322
8323 #: builtin/index-pack.c:1197
8324 msgid "Resolving deltas"
8325 msgstr "处理 delta 中"
8326
8327 #: builtin/index-pack.c:1208
8328 #, c-format
8329 msgid "unable to create thread: %s"
8330 msgstr "不能创建线程:%s"
8331
8332 #: builtin/index-pack.c:1250
8333 msgid "confusion beyond insanity"
8334 msgstr "不可理喻"
8335
8336 #: builtin/index-pack.c:1256
8337 #, c-format
8338 msgid "completed with %d local object"
8339 msgid_plural "completed with %d local objects"
8340 msgstr[0] "完成 %d 个本地对象"
8341 msgstr[1] "完成 %d 个本地对象"
8342
8343 #: builtin/index-pack.c:1268
8344 #, c-format
8345 msgid "Unexpected tail checksum for %s (disk corruption?)"
8346 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
8347
8348 #: builtin/index-pack.c:1272
8349 #, c-format
8350 msgid "pack has %d unresolved delta"
8351 msgid_plural "pack has %d unresolved deltas"
8352 msgstr[0] "包有 %d 个未解决的 delta"
8353 msgstr[1] "包有 %d 个未解决的 delta"
8354
8355 #: builtin/index-pack.c:1296
8356 #, c-format
8357 msgid "unable to deflate appended object (%d)"
8358 msgstr "不能压缩附加对象(%d)"
8359
8360 #: builtin/index-pack.c:1372
8361 #, c-format
8362 msgid "local object %s is corrupt"
8363 msgstr "本地对象 %s 已损坏"
8364
8365 #: builtin/index-pack.c:1396
8366 msgid "error while closing pack file"
8367 msgstr "关闭包文件时出错"
8368
8369 #: builtin/index-pack.c:1409
8370 #, c-format
8371 msgid "cannot write keep file '%s'"
8372 msgstr "无法写保留文件 '%s'"
8373
8374 #: builtin/index-pack.c:1417
8375 #, c-format
8376 msgid "cannot close written keep file '%s'"
8377 msgstr "无法关闭保留文件 '%s'"
8378
8379 #: builtin/index-pack.c:1430
8380 msgid "cannot store pack file"
8381 msgstr "无法存储包文件"
8382
8383 #: builtin/index-pack.c:1441
8384 msgid "cannot store index file"
8385 msgstr "无法存储索引文件"
8386
8387 #: builtin/index-pack.c:1474
8388 #, c-format
8389 msgid "bad pack.indexversion=%<PRIu32>"
8390 msgstr "坏的 pack.indexversion=%<PRIu32>"
8391
8392 #: builtin/index-pack.c:1484 builtin/index-pack.c:1681
8393 #, c-format
8394 msgid "no threads support, ignoring %s"
8395 msgstr "没有线程支持,忽略 %s"
8396
8397 #: builtin/index-pack.c:1542
8398 #, c-format
8399 msgid "Cannot open existing pack file '%s'"
8400 msgstr "无法打开现存包文件 '%s'"
8401
8402 #: builtin/index-pack.c:1544
8403 #, c-format
8404 msgid "Cannot open existing pack idx file for '%s'"
8405 msgstr "无法为 %s 打开包索引文件"
8406
8407 #: builtin/index-pack.c:1591
8408 #, c-format
8409 msgid "non delta: %d object"
8410 msgid_plural "non delta: %d objects"
8411 msgstr[0] "非 delta:%d 个对象"
8412 msgstr[1] "非 delta:%d 个对象"
8413
8414 #: builtin/index-pack.c:1598
8415 #, c-format
8416 msgid "chain length = %d: %lu object"
8417 msgid_plural "chain length = %d: %lu objects"
8418 msgstr[0] "链长 = %d: %lu 对象"
8419 msgstr[1] "链长 = %d: %lu 对象"
8420
8421 #: builtin/index-pack.c:1611
8422 #, c-format
8423 msgid "packfile name '%s' does not end with '.pack'"
8424 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8425
8426 #: builtin/index-pack.c:1693 builtin/index-pack.c:1696
8427 #: builtin/index-pack.c:1712 builtin/index-pack.c:1716
8428 #, c-format
8429 msgid "bad %s"
8430 msgstr "错误选项 %s"
8431
8432 #: builtin/index-pack.c:1732
8433 msgid "--fix-thin cannot be used without --stdin"
8434 msgstr "--fix-thin 不能和 --stdin 同时使用"
8435
8436 #: builtin/index-pack.c:1740
8437 msgid "--verify with no packfile name given"
8438 msgstr "--verify 没有提供包文件名参数"
8439
8440 #: builtin/init-db.c:54
8441 #, c-format
8442 msgid "cannot stat '%s'"
8443 msgstr "不能枚举 '%s' 状态"
8444
8445 #: builtin/init-db.c:60
8446 #, c-format
8447 msgid "cannot stat template '%s'"
8448 msgstr "不能枚举模版 '%s' 状态"
8449
8450 #: builtin/init-db.c:65
8451 #, c-format
8452 msgid "cannot opendir '%s'"
8453 msgstr "不能打开目录 '%s'"
8454
8455 #: builtin/init-db.c:76
8456 #, c-format
8457 msgid "cannot readlink '%s'"
8458 msgstr "不能读取链接 '%s'"
8459
8460 #: builtin/init-db.c:78
8461 #, c-format
8462 msgid "cannot symlink '%s' '%s'"
8463 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
8464
8465 #: builtin/init-db.c:84
8466 #, c-format
8467 msgid "cannot copy '%s' to '%s'"
8468 msgstr "不能拷贝 '%s' 至 '%s'"
8469
8470 #: builtin/init-db.c:88
8471 #, c-format
8472 msgid "ignoring template %s"
8473 msgstr "忽略模版 %s"
8474
8475 #: builtin/init-db.c:119
8476 #, c-format
8477 msgid "templates not found %s"
8478 msgstr "模版未找到 %s"
8479
8480 #: builtin/init-db.c:134
8481 #, c-format
8482 msgid "not copying templates from '%s': %s"
8483 msgstr "没有从 '%s' 复制模版:%s"
8484
8485 #: builtin/init-db.c:327
8486 #, c-format
8487 msgid "unable to handle file type %d"
8488 msgstr "不能处理 %d 类型的文件"
8489
8490 #: builtin/init-db.c:330
8491 #, c-format
8492 msgid "unable to move %s to %s"
8493 msgstr "不能移动 %s 至 %s"
8494
8495 #: builtin/init-db.c:347 builtin/init-db.c:350
8496 #, c-format
8497 msgid "%s already exists"
8498 msgstr "%s 已经存在"
8499
8500 #: builtin/init-db.c:403
8501 #, c-format
8502 msgid "Reinitialized existing shared Git repository in %s%s\n"
8503 msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
8504
8505 #: builtin/init-db.c:404
8506 #, c-format
8507 msgid "Reinitialized existing Git repository in %s%s\n"
8508 msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
8509
8510 #: builtin/init-db.c:408
8511 #, c-format
8512 msgid "Initialized empty shared Git repository in %s%s\n"
8513 msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
8514
8515 #: builtin/init-db.c:409
8516 #, c-format
8517 msgid "Initialized empty Git repository in %s%s\n"
8518 msgstr "已初始化空的 Git 仓库于 %s%s\n"
8519
8520 #: builtin/init-db.c:457
8521 msgid ""
8522 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
8523 "shared[=<permissions>]] [<directory>]"
8524 msgstr ""
8525 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
8526 "[<目录>]"
8527
8528 #: builtin/init-db.c:480
8529 msgid "permissions"
8530 msgstr "权限"
8531
8532 #: builtin/init-db.c:481
8533 msgid "specify that the git repository is to be shared amongst several users"
8534 msgstr "指定 git 仓库是多个用户之间共享的"
8535
8536 #: builtin/init-db.c:515 builtin/init-db.c:520
8537 #, c-format
8538 msgid "cannot mkdir %s"
8539 msgstr "不能创建目录 %s"
8540
8541 #: builtin/init-db.c:524
8542 #, c-format
8543 msgid "cannot chdir to %s"
8544 msgstr "不能切换目录到 %s"
8545
8546 #: builtin/init-db.c:545
8547 #, c-format
8548 msgid ""
8549 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
8550 "dir=<directory>)"
8551 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
8552
8553 #: builtin/init-db.c:573
8554 #, c-format
8555 msgid "Cannot access work tree '%s'"
8556 msgstr "不能访问工作区 '%s'"
8557
8558 #: builtin/interpret-trailers.c:15
8559 msgid ""
8560 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
8561 "<token>[(=|:)<value>])...] [<file>...]"
8562 msgstr ""
8563 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
8564 ">])...] [<文件>...]"
8565
8566 #: builtin/interpret-trailers.c:26
8567 msgid "edit files in place"
8568 msgstr "在原位编辑文件"
8569
8570 #: builtin/interpret-trailers.c:27
8571 msgid "trim empty trailers"
8572 msgstr "删除空签名"
8573
8574 #: builtin/interpret-trailers.c:28
8575 msgid "trailer"
8576 msgstr "签名"
8577
8578 #: builtin/interpret-trailers.c:29
8579 msgid "trailer(s) to add"
8580 msgstr "要添加的签名"
8581
8582 #: builtin/interpret-trailers.c:42
8583 msgid "no input file given for in-place editing"
8584 msgstr "没有给出要原位编辑的文件"
8585
8586 #: builtin/log.c:44
8587 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
8588 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
8589
8590 #: builtin/log.c:45
8591 msgid "git show [<options>] <object>..."
8592 msgstr "git show [<选项>] <对象>..."
8593
8594 #: builtin/log.c:84
8595 #, c-format
8596 msgid "invalid --decorate option: %s"
8597 msgstr "无效的 --decorate 选项:%s"
8598
8599 #: builtin/log.c:139
8600 msgid "suppress diff output"
8601 msgstr "不显示差异输出"
8602
8603 #: builtin/log.c:140
8604 msgid "show source"
8605 msgstr "显示源"
8606
8607 #: builtin/log.c:141
8608 msgid "Use mail map file"
8609 msgstr "使用邮件映射文件"
8610
8611 #: builtin/log.c:142
8612 msgid "decorate options"
8613 msgstr "修饰选项"
8614
8615 #: builtin/log.c:145
8616 msgid "Process line range n,m in file, counting from 1"
8617 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
8618
8619 #: builtin/log.c:241
8620 #, c-format
8621 msgid "Final output: %d %s\n"
8622 msgstr "最终输出:%d %s\n"
8623
8624 #: builtin/log.c:486
8625 #, c-format
8626 msgid "git show %s: bad file"
8627 msgstr "git show %s: 损坏的文件"
8628
8629 #: builtin/log.c:500 builtin/log.c:594
8630 #, c-format
8631 msgid "Could not read object %s"
8632 msgstr "不能读取对象 %s"
8633
8634 #: builtin/log.c:618
8635 #, c-format
8636 msgid "Unknown type: %d"
8637 msgstr "未知类型:%d"
8638
8639 #: builtin/log.c:739
8640 msgid "format.headers without value"
8641 msgstr "format.headers 没有值"
8642
8643 #: builtin/log.c:839
8644 msgid "name of output directory is too long"
8645 msgstr "输出目录名太长"
8646
8647 #: builtin/log.c:854
8648 #, c-format
8649 msgid "Cannot open patch file %s"
8650 msgstr "无法打开补丁文件 %s"
8651
8652 #: builtin/log.c:868
8653 msgid "Need exactly one range."
8654 msgstr "只需要一个范围。"
8655
8656 #: builtin/log.c:878
8657 msgid "Not a range."
8658 msgstr "不是一个范围。"
8659
8660 #: builtin/log.c:984
8661 msgid "Cover letter needs email format"
8662 msgstr "信封需要邮件地址格式"
8663
8664 #: builtin/log.c:1063
8665 #, c-format
8666 msgid "insane in-reply-to: %s"
8667 msgstr "不正常的 in-reply-to:%s"
8668
8669 #: builtin/log.c:1091
8670 msgid "git format-patch [<options>] [<since> | <revision-range>]"
8671 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
8672
8673 #: builtin/log.c:1141
8674 msgid "Two output directories?"
8675 msgstr "两个输出目录?"
8676
8677 #: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
8678 #, c-format
8679 msgid "Unknown commit %s"
8680 msgstr "未知提交 %s"
8681
8682 #: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
8683 #, c-format
8684 msgid "Failed to resolve '%s' as a valid ref."
8685 msgstr "无法解析 '%s' 为一个有效引用。"
8686
8687 #: builtin/log.c:1263
8688 msgid "Could not find exact merge base."
8689 msgstr "不能找到准确的合并基线。"
8690
8691 #: builtin/log.c:1267
8692 msgid ""
8693 "Failed to get upstream, if you want to record base commit automatically,\n"
8694 "please use git branch --set-upstream-to to track a remote branch.\n"
8695 "Or you could specify base commit by --base=<base-commit-id> manually."
8696 msgstr ""
8697 "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
8698 "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
8699 "参数 --base=<base-commit-id> 手动指定一个基线提交。"
8700
8701 #: builtin/log.c:1287
8702 msgid "Failed to find exact merge base"
8703 msgstr "无法找到准确的合并基线"
8704
8705 #: builtin/log.c:1298
8706 msgid "base commit should be the ancestor of revision list"
8707 msgstr "基线提交应该是版本列表的祖先"
8708
8709 #: builtin/log.c:1302
8710 msgid "base commit shouldn't be in revision list"
8711 msgstr "基线提交不应该出现在版本列表中"
8712
8713 #: builtin/log.c:1351
8714 msgid "cannot get patch id"
8715 msgstr "无法得到补丁 id"
8716
8717 #: builtin/log.c:1408
8718 msgid "use [PATCH n/m] even with a single patch"
8719 msgstr "使用 [PATCH n/m],即使只有一个补丁"
8720
8721 #: builtin/log.c:1411
8722 msgid "use [PATCH] even with multiple patches"
8723 msgstr "使用 [PATCH],即使有多个补丁"
8724
8725 #: builtin/log.c:1415
8726 msgid "print patches to standard out"
8727 msgstr "打印补丁到标准输出"
8728
8729 #: builtin/log.c:1417
8730 msgid "generate a cover letter"
8731 msgstr "生成一封附信"
8732
8733 #: builtin/log.c:1419
8734 msgid "use simple number sequence for output file names"
8735 msgstr "使用简单的数字序列作为输出文件名"
8736
8737 #: builtin/log.c:1420
8738 msgid "sfx"
8739 msgstr "后缀"
8740
8741 #: builtin/log.c:1421
8742 msgid "use <sfx> instead of '.patch'"
8743 msgstr "使用 <后缀> 代替 '.patch'"
8744
8745 #: builtin/log.c:1423
8746 msgid "start numbering patches at <n> instead of 1"
8747 msgstr "补丁以 <n> 开始编号,而不是1"
8748
8749 #: builtin/log.c:1425
8750 msgid "mark the series as Nth re-roll"
8751 msgstr "标记补丁系列是第几次重制"
8752
8753 #: builtin/log.c:1427
8754 msgid "Use [RFC PATCH] instead of [PATCH]"
8755 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
8756
8757 #: builtin/log.c:1430
8758 msgid "Use [<prefix>] instead of [PATCH]"
8759 msgstr "使用 [<前缀>] 代替 [PATCH]"
8760
8761 #: builtin/log.c:1433
8762 msgid "store resulting files in <dir>"
8763 msgstr "把结果文件存储在 <目录>"
8764
8765 #: builtin/log.c:1436
8766 msgid "don't strip/add [PATCH]"
8767 msgstr "不删除/添加 [PATCH]"
8768
8769 #: builtin/log.c:1439
8770 msgid "don't output binary diffs"
8771 msgstr "不输出二进制差异"
8772
8773 #: builtin/log.c:1441
8774 msgid "output all-zero hash in From header"
8775 msgstr "在 From 头信息中输出全为零的哈希值"
8776
8777 #: builtin/log.c:1443
8778 msgid "don't include a patch matching a commit upstream"
8779 msgstr "不包含已在上游提交中的补丁"
8780
8781 #: builtin/log.c:1445
8782 msgid "show patch format instead of default (patch + stat)"
8783 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
8784
8785 #: builtin/log.c:1447
8786 msgid "Messaging"
8787 msgstr "邮件发送"
8788
8789 #: builtin/log.c:1448
8790 msgid "header"
8791 msgstr "header"
8792
8793 #: builtin/log.c:1449
8794 msgid "add email header"
8795 msgstr "添加邮件头"
8796
8797 #: builtin/log.c:1450 builtin/log.c:1452
8798 msgid "email"
8799 msgstr "邮件地址"
8800
8801 #: builtin/log.c:1450
8802 msgid "add To: header"
8803 msgstr "添加收件人"
8804
8805 #: builtin/log.c:1452
8806 msgid "add Cc: header"
8807 msgstr "添加抄送"
8808
8809 #: builtin/log.c:1454
8810 msgid "ident"
8811 msgstr "标识"
8812
8813 #: builtin/log.c:1455
8814 msgid "set From address to <ident> (or committer ident if absent)"
8815 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
8816
8817 #: builtin/log.c:1457
8818 msgid "message-id"
8819 msgstr "邮件标识"
8820
8821 #: builtin/log.c:1458
8822 msgid "make first mail a reply to <message-id>"
8823 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
8824
8825 #: builtin/log.c:1459 builtin/log.c:1462
8826 msgid "boundary"
8827 msgstr "边界"
8828
8829 #: builtin/log.c:1460
8830 msgid "attach the patch"
8831 msgstr "附件方式添加补丁"
8832
8833 #: builtin/log.c:1463
8834 msgid "inline the patch"
8835 msgstr "内联显示补丁"
8836
8837 #: builtin/log.c:1467
8838 msgid "enable message threading, styles: shallow, deep"
8839 msgstr "启用邮件线索,风格:浅,深"
8840
8841 #: builtin/log.c:1469
8842 msgid "signature"
8843 msgstr "签名"
8844
8845 #: builtin/log.c:1470
8846 msgid "add a signature"
8847 msgstr "添加一个签名"
8848
8849 #: builtin/log.c:1471
8850 msgid "base-commit"
8851 msgstr "基线提交"
8852
8853 #: builtin/log.c:1472
8854 msgid "add prerequisite tree info to the patch series"
8855 msgstr "为补丁列表添加前置树信息"
8856
8857 #: builtin/log.c:1474
8858 msgid "add a signature from a file"
8859 msgstr "从文件添加一个签名"
8860
8861 #: builtin/log.c:1475
8862 msgid "don't print the patch filenames"
8863 msgstr "不要打印补丁文件名"
8864
8865 #: builtin/log.c:1565
8866 msgid "-n and -k are mutually exclusive."
8867 msgstr "-n 和 -k 互斥。"
8868
8869 #: builtin/log.c:1567
8870 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
8871 msgstr "--subject-prefix/--rfc 和 -k 互斥。"
8872
8873 #: builtin/log.c:1575
8874 msgid "--name-only does not make sense"
8875 msgstr "--name-only 无意义"
8876
8877 #: builtin/log.c:1577
8878 msgid "--name-status does not make sense"
8879 msgstr "--name-status 无意义"
8880
8881 #: builtin/log.c:1579
8882 msgid "--check does not make sense"
8883 msgstr "--check 无意义"
8884
8885 #: builtin/log.c:1609
8886 msgid "standard output, or directory, which one?"
8887 msgstr "标准输出或目录,哪一个?"
8888
8889 #: builtin/log.c:1611
8890 #, c-format
8891 msgid "Could not create directory '%s'"
8892 msgstr "不能创建目录 '%s'"
8893
8894 #: builtin/log.c:1705
8895 #, c-format
8896 msgid "unable to read signature file '%s'"
8897 msgstr "无法读取签名文件 '%s'"
8898
8899 #: builtin/log.c:1777
8900 msgid "Failed to create output files"
8901 msgstr "无法创建输出文件"
8902
8903 #: builtin/log.c:1826
8904 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
8905 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
8906
8907 #: builtin/log.c:1880
8908 #, c-format
8909 msgid ""
8910 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
8911 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
8912
8913 #: builtin/ls-files.c:458
8914 msgid "git ls-files [<options>] [<file>...]"
8915 msgstr "git ls-files [<选项>] [<文件>...]"
8916
8917 #: builtin/ls-files.c:507
8918 msgid "identify the file status with tags"
8919 msgstr "用标签标识文件的状态"
8920
8921 #: builtin/ls-files.c:509
8922 msgid "use lowercase letters for 'assume unchanged' files"
8923 msgstr "使用小写字母表示 '假设未改变的' 文件"
8924
8925 #: builtin/ls-files.c:511
8926 msgid "show cached files in the output (default)"
8927 msgstr "显示缓存的文件(默认)"
8928
8929 #: builtin/ls-files.c:513
8930 msgid "show deleted files in the output"
8931 msgstr "显示已删除的文件"
8932
8933 #: builtin/ls-files.c:515
8934 msgid "show modified files in the output"
8935 msgstr "显示已修改的文件"
8936
8937 #: builtin/ls-files.c:517
8938 msgid "show other files in the output"
8939 msgstr "显示其它文件"
8940
8941 #: builtin/ls-files.c:519
8942 msgid "show ignored files in the output"
8943 msgstr "显示忽略的文件"
8944
8945 #: builtin/ls-files.c:522
8946 msgid "show staged contents' object name in the output"
8947 msgstr "显示暂存区内容的对象名称"
8948
8949 #: builtin/ls-files.c:524
8950 msgid "show files on the filesystem that need to be removed"
8951 msgstr "显示文件系统需要删除的文件"
8952
8953 #: builtin/ls-files.c:526
8954 msgid "show 'other' directories' names only"
8955 msgstr "只显示“其他”目录的名称"
8956
8957 #: builtin/ls-files.c:528
8958 msgid "show line endings of files"
8959 msgstr "显示文件换行符格式"
8960
8961 #: builtin/ls-files.c:530
8962 msgid "don't show empty directories"
8963 msgstr "不显示空目录"
8964
8965 #: builtin/ls-files.c:533
8966 msgid "show unmerged files in the output"
8967 msgstr "显示未合并的文件"
8968
8969 #: builtin/ls-files.c:535
8970 msgid "show resolve-undo information"
8971 msgstr "显示 resolve-undo 信息"
8972
8973 #: builtin/ls-files.c:537
8974 msgid "skip files matching pattern"
8975 msgstr "匹配排除文件的模式"
8976
8977 #: builtin/ls-files.c:540
8978 msgid "exclude patterns are read from <file>"
8979 msgstr "从 <文件> 中读取排除模式"
8980
8981 #: builtin/ls-files.c:543
8982 msgid "read additional per-directory exclude patterns in <file>"
8983 msgstr "从 <文件> 读取额外的每个目录的排除模式"
8984
8985 #: builtin/ls-files.c:545
8986 msgid "add the standard git exclusions"
8987 msgstr "添加标准的 git 排除"
8988
8989 #: builtin/ls-files.c:548
8990 msgid "make the output relative to the project top directory"
8991 msgstr "显示相对于顶级目录的文件名"
8992
8993 #: builtin/ls-files.c:551
8994 msgid "recurse through submodules"
8995 msgstr "在子模组中递归"
8996
8997 #: builtin/ls-files.c:553
8998 msgid "if any <file> is not in the index, treat this as an error"
8999 msgstr "如果任何 <文件> 都不在索引区,视为错误"
9000
9001 #: builtin/ls-files.c:554
9002 msgid "tree-ish"
9003 msgstr "树或提交"
9004
9005 #: builtin/ls-files.c:555
9006 msgid "pretend that paths removed since <tree-ish> are still present"
9007 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
9008
9009 #: builtin/ls-files.c:557
9010 msgid "show debugging data"
9011 msgstr "显示调试数据"
9012
9013 #: builtin/ls-remote.c:7
9014 msgid ""
9015 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9016 " [-q | --quiet] [--exit-code] [--get-url]\n"
9017 " [--symref] [<repository> [<refs>...]]"
9018 msgstr ""
9019 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9020 " [-q | --quiet] [--exit-code] [--get-url]\n"
9021 " [--symref] [<仓库> [<引用>...]]"
9022
9023 #: builtin/ls-remote.c:50
9024 msgid "do not print remote URL"
9025 msgstr "不打印远程 URL"
9026
9027 #: builtin/ls-remote.c:51 builtin/ls-remote.c:53
9028 msgid "exec"
9029 msgstr "exec"
9030
9031 #: builtin/ls-remote.c:52 builtin/ls-remote.c:54
9032 msgid "path of git-upload-pack on the remote host"
9033 msgstr "远程主机上的 git-upload-pack 路径"
9034
9035 #: builtin/ls-remote.c:56
9036 msgid "limit to tags"
9037 msgstr "仅限于标签"
9038
9039 #: builtin/ls-remote.c:57
9040 msgid "limit to heads"
9041 msgstr "仅限于分支"
9042
9043 #: builtin/ls-remote.c:58
9044 msgid "do not show peeled tags"
9045 msgstr "不显示已解析的标签"
9046
9047 #: builtin/ls-remote.c:60
9048 msgid "take url.<base>.insteadOf into account"
9049 msgstr "参考 url.<base>.insteadOf 设置"
9050
9051 #: builtin/ls-remote.c:62
9052 msgid "exit with exit code 2 if no matching refs are found"
9053 msgstr "若未找到匹配的引用则以退出码2退出"
9054
9055 #: builtin/ls-remote.c:64
9056 msgid "show underlying ref in addition to the object pointed by it"
9057 msgstr "除了显示指向的对象外,显示指向的引用名"
9058
9059 #: builtin/ls-tree.c:28
9060 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
9061 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
9062
9063 #: builtin/ls-tree.c:128
9064 msgid "only show trees"
9065 msgstr "只显示树"
9066
9067 #: builtin/ls-tree.c:130
9068 msgid "recurse into subtrees"
9069 msgstr "递归到子树"
9070
9071 #: builtin/ls-tree.c:132
9072 msgid "show trees when recursing"
9073 msgstr "当递归时显示树"
9074
9075 #: builtin/ls-tree.c:135
9076 msgid "terminate entries with NUL byte"
9077 msgstr "条目以 NUL 字符终止"
9078
9079 #: builtin/ls-tree.c:136
9080 msgid "include object size"
9081 msgstr "包括对象大小"
9082
9083 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
9084 msgid "list only filenames"
9085 msgstr "只列出文件名"
9086
9087 #: builtin/ls-tree.c:143
9088 msgid "use full path names"
9089 msgstr "使用文件的全路径"
9090
9091 #: builtin/ls-tree.c:145
9092 msgid "list entire tree; not just current directory (implies --full-name)"
9093 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
9094
9095 #: builtin/merge.c:46
9096 msgid "git merge [<options>] [<commit>...]"
9097 msgstr "git merge [<选项>] [<提交>...]"
9098
9099 #: builtin/merge.c:47
9100 msgid "git merge [<options>] <msg> HEAD <commit>"
9101 msgstr "git merge [<选项>] <说明> HEAD <提交>"
9102
9103 #: builtin/merge.c:48
9104 msgid "git merge --abort"
9105 msgstr "git merge --abort"
9106
9107 #: builtin/merge.c:102
9108 msgid "switch `m' requires a value"
9109 msgstr "开关 `m' 需要一个值"
9110
9111 #: builtin/merge.c:139
9112 #, c-format
9113 msgid "Could not find merge strategy '%s'.\n"
9114 msgstr "不能找到合并策略 '%s'。\n"
9115
9116 #: builtin/merge.c:140
9117 #, c-format
9118 msgid "Available strategies are:"
9119 msgstr "可用的策略有:"
9120
9121 #: builtin/merge.c:145
9122 #, c-format
9123 msgid "Available custom strategies are:"
9124 msgstr "可用的自定义策略有:"
9125
9126 #: builtin/merge.c:195 builtin/pull.c:127
9127 msgid "do not show a diffstat at the end of the merge"
9128 msgstr "在合并的最后不显示差异统计"
9129
9130 #: builtin/merge.c:198 builtin/pull.c:130
9131 msgid "show a diffstat at the end of the merge"
9132 msgstr "在合并的最后显示差异统计"
9133
9134 #: builtin/merge.c:199 builtin/pull.c:133
9135 msgid "(synonym to --stat)"
9136 msgstr "(和 --stat 同义)"
9137
9138 #: builtin/merge.c:201 builtin/pull.c:136
9139 msgid "add (at most <n>) entries from shortlog to merge commit message"
9140 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
9141
9142 #: builtin/merge.c:204 builtin/pull.c:139
9143 msgid "create a single commit instead of doing a merge"
9144 msgstr "创建一个单独的提交而不是做一次合并"
9145
9146 #: builtin/merge.c:206 builtin/pull.c:142
9147 msgid "perform a commit if the merge succeeds (default)"
9148 msgstr "如果合并成功,执行一次提交(默认)"
9149
9150 #: builtin/merge.c:208 builtin/pull.c:145
9151 msgid "edit message before committing"
9152 msgstr "在提交前编辑提交说明"
9153
9154 #: builtin/merge.c:209
9155 msgid "allow fast-forward (default)"
9156 msgstr "允许快进(默认)"
9157
9158 #: builtin/merge.c:211 builtin/pull.c:151
9159 msgid "abort if fast-forward is not possible"
9160 msgstr "如果不能快进就放弃合并"
9161
9162 #: builtin/merge.c:215 builtin/pull.c:154
9163 msgid "verify that the named commit has a valid GPG signature"
9164 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
9165
9166 #: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
9167 #: builtin/revert.c:89
9168 msgid "strategy"
9169 msgstr "策略"
9170
9171 #: builtin/merge.c:217 builtin/pull.c:159
9172 msgid "merge strategy to use"
9173 msgstr "要使用的合并策略"
9174
9175 #: builtin/merge.c:218 builtin/pull.c:162
9176 msgid "option=value"
9177 msgstr "option=value"
9178
9179 #: builtin/merge.c:219 builtin/pull.c:163
9180 msgid "option for selected merge strategy"
9181 msgstr "所选的合并策略的选项"
9182
9183 #: builtin/merge.c:221
9184 msgid "merge commit message (for a non-fast-forward merge)"
9185 msgstr "合并的提交说明(针对非快进式合并)"
9186
9187 #: builtin/merge.c:225
9188 msgid "abort the current in-progress merge"
9189 msgstr "放弃当前正在进行的合并"
9190
9191 #: builtin/merge.c:227 builtin/pull.c:170
9192 msgid "allow merging unrelated histories"
9193 msgstr "允许合并不相关的历史"
9194
9195 #: builtin/merge.c:255
9196 msgid "could not run stash."
9197 msgstr "不能进行进度保存。"
9198
9199 #: builtin/merge.c:260
9200 msgid "stash failed"
9201 msgstr "进度保存失败"
9202
9203 #: builtin/merge.c:265
9204 #, c-format
9205 msgid "not a valid object: %s"
9206 msgstr "不是一个有效对象:%s"
9207
9208 #: builtin/merge.c:284 builtin/merge.c:301
9209 msgid "read-tree failed"
9210 msgstr "读取树失败"
9211
9212 # 译者:注意保持前导空格
9213 #: builtin/merge.c:331
9214 msgid " (nothing to squash)"
9215 msgstr " (无可压缩)"
9216
9217 #: builtin/merge.c:342
9218 #, c-format
9219 msgid "Squash commit -- not updating HEAD\n"
9220 msgstr "压缩提交 -- 未更新 HEAD\n"
9221
9222 #: builtin/merge.c:392
9223 #, c-format
9224 msgid "No merge message -- not updating HEAD\n"
9225 msgstr "无合并信息 -- 未更新 HEAD\n"
9226
9227 #: builtin/merge.c:443
9228 #, c-format
9229 msgid "'%s' does not point to a commit"
9230 msgstr "'%s' 没有指向一个提交"
9231
9232 #: builtin/merge.c:533
9233 #, c-format
9234 msgid "Bad branch.%s.mergeoptions string: %s"
9235 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
9236
9237 #: builtin/merge.c:652
9238 msgid "Not handling anything other than two heads merge."
9239 msgstr "不能处理两个头合并之外的任何操作。"
9240
9241 #: builtin/merge.c:666
9242 #, c-format
9243 msgid "Unknown option for merge-recursive: -X%s"
9244 msgstr "merge-recursive 的未知选项:-X%s"
9245
9246 #: builtin/merge.c:681
9247 #, c-format
9248 msgid "unable to write %s"
9249 msgstr "不能写 %s"
9250
9251 #: builtin/merge.c:733
9252 #, c-format
9253 msgid "Could not read from '%s'"
9254 msgstr "不能从 '%s' 读取"
9255
9256 #: builtin/merge.c:742
9257 #, c-format
9258 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
9259 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
9260
9261 #: builtin/merge.c:748
9262 #, c-format
9263 msgid ""
9264 "Please enter a commit message to explain why this merge is necessary,\n"
9265 "especially if it merges an updated upstream into a topic branch.\n"
9266 "\n"
9267 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
9268 "the commit.\n"
9269 msgstr ""
9270 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
9271 "合并到主题分支。\n"
9272 "\n"
9273 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
9274
9275 #: builtin/merge.c:772
9276 msgid "Empty commit message."
9277 msgstr "空提交信息。"
9278
9279 #: builtin/merge.c:792
9280 #, c-format
9281 msgid "Wonderful.\n"
9282 msgstr "太棒了。\n"
9283
9284 #: builtin/merge.c:847
9285 #, c-format
9286 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
9287 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
9288
9289 #: builtin/merge.c:863
9290 #, c-format
9291 msgid "'%s' is not a commit"
9292 msgstr "'%s' 不是一个提交"
9293
9294 #: builtin/merge.c:904
9295 msgid "No current branch."
9296 msgstr "没有当前分支。"
9297
9298 #: builtin/merge.c:906
9299 msgid "No remote for the current branch."
9300 msgstr "当前分支没有对应的远程仓库。"
9301
9302 #: builtin/merge.c:908
9303 msgid "No default upstream defined for the current branch."
9304 msgstr "当前分支没有定义默认的上游分支。"
9305
9306 #: builtin/merge.c:913
9307 #, c-format
9308 msgid "No remote-tracking branch for %s from %s"
9309 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
9310
9311 #: builtin/merge.c:960
9312 #, c-format
9313 msgid "Bad value '%s' in environment '%s'"
9314 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
9315
9316 #: builtin/merge.c:1034
9317 #, c-format
9318 msgid "could not close '%s'"
9319 msgstr "不能关闭 '%s'"
9320
9321 #: builtin/merge.c:1061
9322 #, c-format
9323 msgid "not something we can merge in %s: %s"
9324 msgstr "不能在 %s 中合并:%s"
9325
9326 #: builtin/merge.c:1095
9327 msgid "not something we can merge"
9328 msgstr "不能合并"
9329
9330 #: builtin/merge.c:1162
9331 msgid "There is no merge to abort (MERGE_HEAD missing)."
9332 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
9333
9334 #: builtin/merge.c:1178
9335 msgid ""
9336 "You have not concluded your merge (MERGE_HEAD exists).\n"
9337 "Please, commit your changes before you merge."
9338 msgstr ""
9339 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
9340 "请在合并前先提交您的修改。"
9341
9342 #: builtin/merge.c:1185
9343 msgid ""
9344 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
9345 "Please, commit your changes before you merge."
9346 msgstr ""
9347 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
9348 "请在合并前先提交您的修改。"
9349
9350 #: builtin/merge.c:1188
9351 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
9352 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
9353
9354 #: builtin/merge.c:1197
9355 msgid "You cannot combine --squash with --no-ff."
9356 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
9357
9358 #: builtin/merge.c:1205
9359 msgid "No commit specified and merge.defaultToUpstream not set."
9360 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
9361
9362 #: builtin/merge.c:1222
9363 msgid "Squash commit into empty head not supported yet"
9364 msgstr "尚不支持到空分支的压缩提交"
9365
9366 #: builtin/merge.c:1224
9367 msgid "Non-fast-forward commit does not make sense into an empty head"
9368 msgstr "到空分支的非快进式提交没有意义"
9369
9370 #: builtin/merge.c:1229
9371 #, c-format
9372 msgid "%s - not something we can merge"
9373 msgstr "%s - 不能被合并"
9374
9375 #: builtin/merge.c:1231
9376 msgid "Can merge only exactly one commit into empty head"
9377 msgstr "只能将一个提交合并到空分支上"
9378
9379 #: builtin/merge.c:1287
9380 #, c-format
9381 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
9382 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
9383
9384 #: builtin/merge.c:1290
9385 #, c-format
9386 msgid "Commit %s has a bad GPG signature allegedly by %s."
9387 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
9388
9389 #: builtin/merge.c:1293
9390 #, c-format
9391 msgid "Commit %s does not have a GPG signature."
9392 msgstr "提交 %s 没有一个 GPG 签名。"
9393
9394 #: builtin/merge.c:1296
9395 #, c-format
9396 msgid "Commit %s has a good GPG signature by %s\n"
9397 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
9398
9399 #: builtin/merge.c:1358
9400 msgid "refusing to merge unrelated histories"
9401 msgstr "拒绝合并无关的历史"
9402
9403 #: builtin/merge.c:1367
9404 msgid "Already up-to-date."
9405 msgstr "已经是最新的。"
9406
9407 #: builtin/merge.c:1377
9408 #, c-format
9409 msgid "Updating %s..%s\n"
9410 msgstr "更新 %s..%s\n"
9411
9412 #: builtin/merge.c:1418
9413 #, c-format
9414 msgid "Trying really trivial in-index merge...\n"
9415 msgstr "尝试非常小的索引内合并...\n"
9416
9417 #: builtin/merge.c:1425
9418 #, c-format
9419 msgid "Nope.\n"
9420 msgstr "无。\n"
9421
9422 #: builtin/merge.c:1450
9423 msgid "Already up-to-date. Yeeah!"
9424 msgstr "已经是最新的。耶!"
9425
9426 #: builtin/merge.c:1456
9427 msgid "Not possible to fast-forward, aborting."
9428 msgstr "无法快进,终止。"
9429
9430 #: builtin/merge.c:1479 builtin/merge.c:1558
9431 #, c-format
9432 msgid "Rewinding the tree to pristine...\n"
9433 msgstr "将树回滚至原始状态...\n"
9434
9435 #: builtin/merge.c:1483
9436 #, c-format
9437 msgid "Trying merge strategy %s...\n"
9438 msgstr "尝试合并策略 %s...\n"
9439
9440 #: builtin/merge.c:1549
9441 #, c-format
9442 msgid "No merge strategy handled the merge.\n"
9443 msgstr "没有合并策略处理此合并。\n"
9444
9445 #: builtin/merge.c:1551
9446 #, c-format
9447 msgid "Merge with strategy %s failed.\n"
9448 msgstr "使用策略 %s 合并失败。\n"
9449
9450 #: builtin/merge.c:1560
9451 #, c-format
9452 msgid "Using the %s to prepare resolving by hand.\n"
9453 msgstr "使用 %s 以准备手工解决。\n"
9454
9455 #: builtin/merge.c:1572
9456 #, c-format
9457 msgid "Automatic merge went well; stopped before committing as requested\n"
9458 msgstr "自动合并进展顺利,按要求在提交前停止\n"
9459
9460 #: builtin/merge-base.c:29
9461 msgid "git merge-base [-a | --all] <commit> <commit>..."
9462 msgstr "git merge-base [-a | --all] <提交> <提交>..."
9463
9464 #: builtin/merge-base.c:30
9465 msgid "git merge-base [-a | --all] --octopus <commit>..."
9466 msgstr "git merge-base [-a | --all] --octopus <提交>..."
9467
9468 #: builtin/merge-base.c:31
9469 msgid "git merge-base --independent <commit>..."
9470 msgstr "git merge-base --independent <提交>..."
9471
9472 #: builtin/merge-base.c:32
9473 msgid "git merge-base --is-ancestor <commit> <commit>"
9474 msgstr "git merge-base --is-ancestor <提交> <提交>"
9475
9476 #: builtin/merge-base.c:33
9477 msgid "git merge-base --fork-point <ref> [<commit>]"
9478 msgstr "git merge-base --fork-point <引用> [<提交>]"
9479
9480 #: builtin/merge-base.c:217
9481 msgid "output all common ancestors"
9482 msgstr "输出所有共同的祖先"
9483
9484 #: builtin/merge-base.c:219
9485 msgid "find ancestors for a single n-way merge"
9486 msgstr "查找一个多路合并的祖先提交"
9487
9488 #: builtin/merge-base.c:221
9489 msgid "list revs not reachable from others"
9490 msgstr "显示不能被其他访问到的版本"
9491
9492 #: builtin/merge-base.c:223
9493 msgid "is the first one ancestor of the other?"
9494 msgstr "第一个是其他的祖先提交么?"
9495
9496 #: builtin/merge-base.c:225
9497 msgid "find where <commit> forked from reflog of <ref>"
9498 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
9499
9500 #: builtin/merge-file.c:8
9501 msgid ""
9502 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
9503 "<orig-file> <file2>"
9504 msgstr ""
9505 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
9506 "件> <文件2>"
9507
9508 #: builtin/merge-file.c:33
9509 msgid "send results to standard output"
9510 msgstr "将结果发送到标准输出"
9511
9512 #: builtin/merge-file.c:34
9513 msgid "use a diff3 based merge"
9514 msgstr "使用基于 diff3 的合并"
9515
9516 #: builtin/merge-file.c:35
9517 msgid "for conflicts, use our version"
9518 msgstr "如果冲突,使用我们的版本"
9519
9520 #: builtin/merge-file.c:37
9521 msgid "for conflicts, use their version"
9522 msgstr "如果冲突,使用他们的版本"
9523
9524 #: builtin/merge-file.c:39
9525 msgid "for conflicts, use a union version"
9526 msgstr "如果冲突,使用联合版本"
9527
9528 #: builtin/merge-file.c:42
9529 msgid "for conflicts, use this marker size"
9530 msgstr "如果冲突,使用指定长度的标记"
9531
9532 #: builtin/merge-file.c:43
9533 msgid "do not warn about conflicts"
9534 msgstr "不要警告冲突"
9535
9536 #: builtin/merge-file.c:45
9537 msgid "set labels for file1/orig-file/file2"
9538 msgstr "为 文件1/初始文件/文件2 设置标签"
9539
9540 #: builtin/merge-recursive.c:45
9541 #, c-format
9542 msgid "unknown option %s"
9543 msgstr "未知选项 %s"
9544
9545 #: builtin/merge-recursive.c:51
9546 #, c-format
9547 msgid "could not parse object '%s'"
9548 msgstr "不能解析对象 '%s'"
9549
9550 #: builtin/merge-recursive.c:55
9551 #, c-format
9552 msgid "cannot handle more than %d base. Ignoring %s."
9553 msgid_plural "cannot handle more than %d bases. Ignoring %s."
9554 msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
9555 msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
9556
9557 #: builtin/merge-recursive.c:63
9558 msgid "not handling anything other than two heads merge."
9559 msgstr "不能处理两个头合并之外的任何操作。"
9560
9561 #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
9562 #, c-format
9563 msgid "could not resolve ref '%s'"
9564 msgstr "无法解析引用 '%s'"
9565
9566 #: builtin/merge-recursive.c:77
9567 #, c-format
9568 msgid "Merging %s with %s\n"
9569 msgstr "合并 %s 和 %s\n"
9570
9571 #: builtin/mktree.c:65
9572 msgid "git mktree [-z] [--missing] [--batch]"
9573 msgstr "git mktree [-z] [--missing] [--batch]"
9574
9575 #: builtin/mktree.c:152
9576 msgid "input is NUL terminated"
9577 msgstr "输入以 NUL 字符终止"
9578
9579 #: builtin/mktree.c:153 builtin/write-tree.c:24
9580 msgid "allow missing objects"
9581 msgstr "允许丢失的对象"
9582
9583 #: builtin/mktree.c:154
9584 msgid "allow creation of more than one tree"
9585 msgstr "允许创建一个以上的树"
9586
9587 #: builtin/mv.c:15
9588 msgid "git mv [<options>] <source>... <destination>"
9589 msgstr "git mv [<选项>] <源>... <目标>"
9590
9591 #: builtin/mv.c:70
9592 #, c-format
9593 msgid "Directory %s is in index and no submodule?"
9594 msgstr "目录 %s 在索引中并且不是子模组?"
9595
9596 #: builtin/mv.c:72 builtin/rm.c:317
9597 msgid "Please stage your changes to .gitmodules or stash them to proceed"
9598 msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
9599
9600 #: builtin/mv.c:90
9601 #, c-format
9602 msgid "%.*s is in index"
9603 msgstr "%.*s 在索引中"
9604
9605 #: builtin/mv.c:112
9606 msgid "force move/rename even if target exists"
9607 msgstr "强制移动/重命令,即使目标存在"
9608
9609 #: builtin/mv.c:113
9610 msgid "skip move/rename errors"
9611 msgstr "跳过移动/重命名错误"
9612
9613 #: builtin/mv.c:155
9614 #, c-format
9615 msgid "destination '%s' is not a directory"
9616 msgstr "目标 '%s' 不是一个目录"
9617
9618 #: builtin/mv.c:166
9619 #, c-format
9620 msgid "Checking rename of '%s' to '%s'\n"
9621 msgstr "检查 '%s' 到 '%s' 的重命名\n"
9622
9623 #: builtin/mv.c:170
9624 msgid "bad source"
9625 msgstr "坏的源"
9626
9627 #: builtin/mv.c:173
9628 msgid "can not move directory into itself"
9629 msgstr "不能将目录移动到自身"
9630
9631 #: builtin/mv.c:176
9632 msgid "cannot move directory over file"
9633 msgstr "不能将目录移动到文件"
9634
9635 #: builtin/mv.c:185
9636 msgid "source directory is empty"
9637 msgstr "源目录为空"
9638
9639 #: builtin/mv.c:210
9640 msgid "not under version control"
9641 msgstr "不在版本控制之下"
9642
9643 #: builtin/mv.c:213
9644 msgid "destination exists"
9645 msgstr "目标已存在"
9646
9647 #: builtin/mv.c:221
9648 #, c-format
9649 msgid "overwriting '%s'"
9650 msgstr "覆盖 '%s'"
9651
9652 #: builtin/mv.c:224
9653 msgid "Cannot overwrite"
9654 msgstr "不能覆盖"
9655
9656 #: builtin/mv.c:227
9657 msgid "multiple sources for the same target"
9658 msgstr "同一目标具有多个源"
9659
9660 #: builtin/mv.c:229
9661 msgid "destination directory does not exist"
9662 msgstr "目标目录不存在"
9663
9664 #: builtin/mv.c:236
9665 #, c-format
9666 msgid "%s, source=%s, destination=%s"
9667 msgstr "%s,源=%s,目标=%s"
9668
9669 #: builtin/mv.c:257
9670 #, c-format
9671 msgid "Renaming %s to %s\n"
9672 msgstr "重命名 %s 至 %s\n"
9673
9674 #: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
9675 #, c-format
9676 msgid "renaming '%s' failed"
9677 msgstr "重命名 '%s' 失败"
9678
9679 #: builtin/name-rev.c:257
9680 msgid "git name-rev [<options>] <commit>..."
9681 msgstr "git name-rev [<选项>] <提交>..."
9682
9683 #: builtin/name-rev.c:258
9684 msgid "git name-rev [<options>] --all"
9685 msgstr "git name-rev [<选项>] --all"
9686
9687 #: builtin/name-rev.c:259
9688 msgid "git name-rev [<options>] --stdin"
9689 msgstr "git name-rev [<选项>] --stdin"
9690
9691 #: builtin/name-rev.c:311
9692 msgid "print only names (no SHA-1)"
9693 msgstr "只打印名称(无 SHA-1)"
9694
9695 #: builtin/name-rev.c:312
9696 msgid "only use tags to name the commits"
9697 msgstr "只使用标签来命名提交"
9698
9699 #: builtin/name-rev.c:314
9700 msgid "only use refs matching <pattern>"
9701 msgstr "只使用和 <模式> 相匹配的引用"
9702
9703 #: builtin/name-rev.c:316
9704 msgid "list all commits reachable from all refs"
9705 msgstr "列出可以从所有引用访问的提交"
9706
9707 #: builtin/name-rev.c:317
9708 msgid "read from stdin"
9709 msgstr "从标准输入读取"
9710
9711 #: builtin/name-rev.c:318
9712 msgid "allow to print `undefined` names (default)"
9713 msgstr "允许打印 `未定义` 的名称(默认)"
9714
9715 #: builtin/name-rev.c:324
9716 msgid "dereference tags in the input (internal use)"
9717 msgstr "反向解析输入中的标签(内部使用)"
9718
9719 #: builtin/notes.c:25
9720 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
9721 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
9722
9723 #: builtin/notes.c:26
9724 msgid ""
9725 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
9726 "| (-c | -C) <object>] [<object>]"
9727 msgstr ""
9728 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
9729 "| (-c | -C) <对象>] [<对象>]"
9730
9731 #: builtin/notes.c:27
9732 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
9733 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
9734
9735 #: builtin/notes.c:28
9736 msgid ""
9737 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
9738 "(-c | -C) <object>] [<object>]"
9739 msgstr ""
9740 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
9741 "(-c | -C) <对象>] [<对象>]"
9742
9743 #: builtin/notes.c:29
9744 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
9745 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
9746
9747 #: builtin/notes.c:30
9748 msgid "git notes [--ref <notes-ref>] show [<object>]"
9749 msgstr "git notes [--ref <注解引用>] show [<对象>]"
9750
9751 #: builtin/notes.c:31
9752 msgid ""
9753 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
9754 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
9755
9756 #: builtin/notes.c:32
9757 msgid "git notes merge --commit [-v | -q]"
9758 msgstr "git notes merge --commit [-v | -q]"
9759
9760 #: builtin/notes.c:33
9761 msgid "git notes merge --abort [-v | -q]"
9762 msgstr "git notes merge --abort [-v | -q]"
9763
9764 #: builtin/notes.c:34
9765 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
9766 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
9767
9768 #: builtin/notes.c:35
9769 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
9770 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
9771
9772 #: builtin/notes.c:36
9773 msgid "git notes [--ref <notes-ref>] get-ref"
9774 msgstr "git notes [--ref <注解引用>] get-ref"
9775
9776 #: builtin/notes.c:41
9777 msgid "git notes [list [<object>]]"
9778 msgstr "git notes [list [<对象>]]"
9779
9780 #: builtin/notes.c:46
9781 msgid "git notes add [<options>] [<object>]"
9782 msgstr "git notes add [<选项>] [<对象>]"
9783
9784 #: builtin/notes.c:51
9785 msgid "git notes copy [<options>] <from-object> <to-object>"
9786 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
9787
9788 #: builtin/notes.c:52
9789 msgid "git notes copy --stdin [<from-object> <to-object>]..."
9790 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
9791
9792 #: builtin/notes.c:57
9793 msgid "git notes append [<options>] [<object>]"
9794 msgstr "git notes append [<选项>] [<对象>]"
9795
9796 #: builtin/notes.c:62
9797 msgid "git notes edit [<object>]"
9798 msgstr "git notes edit [<对象>]"
9799
9800 #: builtin/notes.c:67
9801 msgid "git notes show [<object>]"
9802 msgstr "git notes show [<对象>]"
9803
9804 #: builtin/notes.c:72
9805 msgid "git notes merge [<options>] <notes-ref>"
9806 msgstr "git notes merge [<选项>] <注解引用>"
9807
9808 #: builtin/notes.c:73
9809 msgid "git notes merge --commit [<options>]"
9810 msgstr "git notes merge --commit [<选项>]"
9811
9812 #: builtin/notes.c:74
9813 msgid "git notes merge --abort [<options>]"
9814 msgstr "git notes merge --abort [<选项>]"
9815
9816 #: builtin/notes.c:79
9817 msgid "git notes remove [<object>]"
9818 msgstr "git notes remove [<对象>]"
9819
9820 #: builtin/notes.c:84
9821 msgid "git notes prune [<options>]"
9822 msgstr "git notes prune [<选项>]"
9823
9824 #: builtin/notes.c:89
9825 msgid "git notes get-ref"
9826 msgstr "git notes get-ref"
9827
9828 #: builtin/notes.c:94
9829 msgid "Write/edit the notes for the following object:"
9830 msgstr "为下面的对象写/编辑说明:"
9831
9832 #: builtin/notes.c:147
9833 #, c-format
9834 msgid "unable to start 'show' for object '%s'"
9835 msgstr "不能为对象 '%s' 开始 'show'"
9836
9837 #: builtin/notes.c:151
9838 msgid "could not read 'show' output"
9839 msgstr "不能读取 'show' 的输出"
9840
9841 #: builtin/notes.c:159
9842 #, c-format
9843 msgid "failed to finish 'show' for object '%s'"
9844 msgstr "无法为对象 '%s' 完成 'show'"
9845
9846 #: builtin/notes.c:194
9847 msgid "please supply the note contents using either -m or -F option"
9848 msgstr "请通过 -m 或 -F 选项为注解提供内容"
9849
9850 #: builtin/notes.c:203
9851 msgid "unable to write note object"
9852 msgstr "不能写注解对象"
9853
9854 #: builtin/notes.c:205
9855 #, c-format
9856 msgid "the note contents have been left in %s"
9857 msgstr "注解内容被留在 %s 中"
9858
9859 #: builtin/notes.c:233 builtin/tag.c:439
9860 #, c-format
9861 msgid "cannot read '%s'"
9862 msgstr "不能读取 '%s'"
9863
9864 #: builtin/notes.c:235 builtin/tag.c:442
9865 #, c-format
9866 msgid "could not open or read '%s'"
9867 msgstr "不能打开或读取 '%s'"
9868
9869 #: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
9870 #: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
9871 #: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
9872 #, c-format
9873 msgid "failed to resolve '%s' as a valid ref."
9874 msgstr "无法解析 '%s' 为一个有效引用。"
9875
9876 #: builtin/notes.c:257
9877 #, c-format
9878 msgid "failed to read object '%s'."
9879 msgstr "无法读取对象 '%s'。"
9880
9881 #: builtin/notes.c:261
9882 #, c-format
9883 msgid "cannot read note data from non-blob object '%s'."
9884 msgstr "不能从非数据对象 '%s' 中读取注解数据。"
9885
9886 #: builtin/notes.c:301
9887 #, c-format
9888 msgid "malformed input line: '%s'."
9889 msgstr "非法的输入行:'%s'。"
9890
9891 #: builtin/notes.c:316
9892 #, c-format
9893 msgid "failed to copy notes from '%s' to '%s'"
9894 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
9895
9896 #. TRANSLATORS: the first %s will be replaced by a
9897 #. git notes command: 'add', 'merge', 'remove', etc.
9898 #: builtin/notes.c:345
9899 #, c-format
9900 msgid "refusing to %s notes in %s (outside of refs/notes/)"
9901 msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
9902
9903 #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
9904 #: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
9905 #: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
9906 msgid "too many parameters"
9907 msgstr "参数太多"
9908
9909 #: builtin/notes.c:378 builtin/notes.c:665
9910 #, c-format
9911 msgid "no note found for object %s."
9912 msgstr "未发现对象 %s 的注解。"
9913
9914 #: builtin/notes.c:399 builtin/notes.c:562
9915 msgid "note contents as a string"
9916 msgstr "注解内容作为一个字符串"
9917
9918 #: builtin/notes.c:402 builtin/notes.c:565
9919 msgid "note contents in a file"
9920 msgstr "注解内容到一个文件中"
9921
9922 #: builtin/notes.c:405 builtin/notes.c:568
9923 msgid "reuse and edit specified note object"
9924 msgstr "重用和编辑指定的注解对象"
9925
9926 #: builtin/notes.c:408 builtin/notes.c:571
9927 msgid "reuse specified note object"
9928 msgstr "重用指定的注解对象"
9929
9930 #: builtin/notes.c:411 builtin/notes.c:574
9931 msgid "allow storing empty note"
9932 msgstr "允许保存空白注释"
9933
9934 #: builtin/notes.c:412 builtin/notes.c:483
9935 msgid "replace existing notes"
9936 msgstr "替换已存在的注解"
9937
9938 #: builtin/notes.c:437
9939 #, c-format
9940 msgid ""
9941 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
9942 "existing notes"
9943 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
9944
9945 #: builtin/notes.c:452 builtin/notes.c:531
9946 #, c-format
9947 msgid "Overwriting existing notes for object %s\n"
9948 msgstr "覆盖对象 %s 现存注解\n"
9949
9950 #: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
9951 #, c-format
9952 msgid "Removing note for object %s\n"
9953 msgstr "删除对象 %s 的注解\n"
9954
9955 #: builtin/notes.c:484
9956 msgid "read objects from stdin"
9957 msgstr "从标准输入读取对象"
9958
9959 #: builtin/notes.c:486
9960 msgid "load rewriting config for <command> (implies --stdin)"
9961 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
9962
9963 #: builtin/notes.c:504
9964 msgid "too few parameters"
9965 msgstr "参数太少"
9966
9967 #: builtin/notes.c:525
9968 #, c-format
9969 msgid ""
9970 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
9971 "existing notes"
9972 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
9973
9974 #: builtin/notes.c:537
9975 #, c-format
9976 msgid "missing notes on source object %s. Cannot copy."
9977 msgstr "源对象 %s 缺少注解。不能拷贝。"
9978
9979 #: builtin/notes.c:589
9980 #, c-format
9981 msgid ""
9982 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
9983 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
9984 msgstr ""
9985 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
9986 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
9987
9988 #: builtin/notes.c:685
9989 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
9990 msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
9991
9992 #: builtin/notes.c:687
9993 msgid "failed to delete ref NOTES_MERGE_REF"
9994 msgstr "无法删除引用 NOTES_MERGE_REF"
9995
9996 #: builtin/notes.c:689
9997 msgid "failed to remove 'git notes merge' worktree"
9998 msgstr "无法删除 'git notes merge' 工作区"
9999
10000 #: builtin/notes.c:709
10001 msgid "failed to read ref NOTES_MERGE_PARTIAL"
10002 msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
10003
10004 #: builtin/notes.c:711
10005 msgid "could not find commit from NOTES_MERGE_PARTIAL."
10006 msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
10007
10008 #: builtin/notes.c:713
10009 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
10010 msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
10011
10012 #: builtin/notes.c:726
10013 msgid "failed to resolve NOTES_MERGE_REF"
10014 msgstr "无法解析 NOTES_MERGE_REF"
10015
10016 #: builtin/notes.c:729
10017 msgid "failed to finalize notes merge"
10018 msgstr "无法完成注解合并"
10019
10020 #: builtin/notes.c:755
10021 #, c-format
10022 msgid "unknown notes merge strategy %s"
10023 msgstr "未知的注解合并策略 %s"
10024
10025 #: builtin/notes.c:771
10026 msgid "General options"
10027 msgstr "通用选项"
10028
10029 #: builtin/notes.c:773
10030 msgid "Merge options"
10031 msgstr "合并选项"
10032
10033 #: builtin/notes.c:775
10034 msgid ""
10035 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
10036 "cat_sort_uniq)"
10037 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
10038
10039 #: builtin/notes.c:777
10040 msgid "Committing unmerged notes"
10041 msgstr "提交未合并的注解"
10042
10043 #: builtin/notes.c:779
10044 msgid "finalize notes merge by committing unmerged notes"
10045 msgstr "通过提交未合并的注解来完成注解合并"
10046
10047 #: builtin/notes.c:781
10048 msgid "Aborting notes merge resolution"
10049 msgstr "中止注解合并的方案"
10050
10051 #: builtin/notes.c:783
10052 msgid "abort notes merge"
10053 msgstr "中止注解合并"
10054
10055 #: builtin/notes.c:794
10056 msgid "cannot mix --commit, --abort or -s/--strategy"
10057 msgstr "不能混用 --commit、--abort 或 -s/--strategy"
10058
10059 #: builtin/notes.c:799
10060 msgid "must specify a notes ref to merge"
10061 msgstr "必须指定一个注解引用来合并"
10062
10063 #: builtin/notes.c:823
10064 #, c-format
10065 msgid "unknown -s/--strategy: %s"
10066 msgstr "未知的 -s/--strategy:%s"
10067
10068 #: builtin/notes.c:860
10069 #, c-format
10070 msgid "a notes merge into %s is already in-progress at %s"
10071 msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
10072
10073 #: builtin/notes.c:863
10074 #, c-format
10075 msgid "failed to store link to current notes ref (%s)"
10076 msgstr "无法存储链接到当前的注解引用(%s)"
10077
10078 #: builtin/notes.c:865
10079 #, c-format
10080 msgid ""
10081 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
10082 "'git notes merge --commit', or abort the merge with 'git notes merge --"
10083 "abort'.\n"
10084 msgstr ""
10085 "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
10086 "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
10087
10088 #: builtin/notes.c:887
10089 #, c-format
10090 msgid "Object %s has no note\n"
10091 msgstr "对象 %s 没有注解\n"
10092
10093 #: builtin/notes.c:899
10094 msgid "attempt to remove non-existent note is not an error"
10095 msgstr "尝试删除不存在的注解不是一个错误"
10096
10097 #: builtin/notes.c:902
10098 msgid "read object names from the standard input"
10099 msgstr "从标准输入读取对象名称"
10100
10101 #: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
10102 msgid "do not remove, show only"
10103 msgstr "不删除,只显示"
10104
10105 #: builtin/notes.c:941
10106 msgid "report pruned notes"
10107 msgstr "报告清除的注解"
10108
10109 #: builtin/notes.c:983
10110 msgid "notes-ref"
10111 msgstr "注解引用"
10112
10113 #: builtin/notes.c:984
10114 msgid "use notes from <notes-ref>"
10115 msgstr "从 <注解引用> 使用注解"
10116
10117 #: builtin/notes.c:1019
10118 #, c-format
10119 msgid "unknown subcommand: %s"
10120 msgstr "未知子命令:%s"
10121
10122 #: builtin/pack-objects.c:29
10123 msgid ""
10124 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
10125 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
10126
10127 #: builtin/pack-objects.c:30
10128 msgid ""
10129 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
10130 msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
10131
10132 #: builtin/pack-objects.c:179 builtin/pack-objects.c:182
10133 #, c-format
10134 msgid "deflate error (%d)"
10135 msgstr "压缩错误 (%d)"
10136
10137 #: builtin/pack-objects.c:768
10138 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
10139 msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
10140
10141 #: builtin/pack-objects.c:781
10142 msgid "Writing objects"
10143 msgstr "写入对象中"
10144
10145 #: builtin/pack-objects.c:1070
10146 msgid "disabling bitmap writing, as some objects are not being packed"
10147 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
10148
10149 #: builtin/pack-objects.c:2346
10150 msgid "Compressing objects"
10151 msgstr "压缩对象中"
10152
10153 #: builtin/pack-objects.c:2759
10154 #, c-format
10155 msgid "unsupported index version %s"
10156 msgstr "不支持的索引版本 %s"
10157
10158 #: builtin/pack-objects.c:2763
10159 #, c-format
10160 msgid "bad index version '%s'"
10161 msgstr "坏的索引版本 '%s'"
10162
10163 #: builtin/pack-objects.c:2793
10164 msgid "do not show progress meter"
10165 msgstr "不显示进度表"
10166
10167 #: builtin/pack-objects.c:2795
10168 msgid "show progress meter"
10169 msgstr "显示进度表"
10170
10171 #: builtin/pack-objects.c:2797
10172 msgid "show progress meter during object writing phase"
10173 msgstr "在对象写入阶段显示进度表"
10174
10175 #: builtin/pack-objects.c:2800
10176 msgid "similar to --all-progress when progress meter is shown"
10177 msgstr "当进度表显示时类似于 --all-progress"
10178
10179 #: builtin/pack-objects.c:2801
10180 msgid "version[,offset]"
10181 msgstr "版本[,偏移]"
10182
10183 #: builtin/pack-objects.c:2802
10184 msgid "write the pack index file in the specified idx format version"
10185 msgstr "用指定的 idx 格式版本来写包索引文件"
10186
10187 #: builtin/pack-objects.c:2805
10188 msgid "maximum size of each output pack file"
10189 msgstr "每个输出包的最大尺寸"
10190
10191 #: builtin/pack-objects.c:2807
10192 msgid "ignore borrowed objects from alternate object store"
10193 msgstr "忽略从备用对象存储里借用对象"
10194
10195 #: builtin/pack-objects.c:2809
10196 msgid "ignore packed objects"
10197 msgstr "忽略包对象"
10198
10199 #: builtin/pack-objects.c:2811
10200 msgid "limit pack window by objects"
10201 msgstr "限制打包窗口的对象数"
10202
10203 #: builtin/pack-objects.c:2813
10204 msgid "limit pack window by memory in addition to object limit"
10205 msgstr "除对象数量限制外设置打包窗口的内存限制"
10206
10207 #: builtin/pack-objects.c:2815
10208 msgid "maximum length of delta chain allowed in the resulting pack"
10209 msgstr "打包允许的 delta 链的最大长度"
10210
10211 #: builtin/pack-objects.c:2817
10212 msgid "reuse existing deltas"
10213 msgstr "重用已存在的 deltas"
10214
10215 #: builtin/pack-objects.c:2819
10216 msgid "reuse existing objects"
10217 msgstr "重用已存在的对象"
10218
10219 #: builtin/pack-objects.c:2821
10220 msgid "use OFS_DELTA objects"
10221 msgstr "使用 OFS_DELTA 对象"
10222
10223 #: builtin/pack-objects.c:2823
10224 msgid "use threads when searching for best delta matches"
10225 msgstr "使用线程查询最佳 delta 匹配"
10226
10227 #: builtin/pack-objects.c:2825
10228 msgid "do not create an empty pack output"
10229 msgstr "不创建空的包输出"
10230
10231 #: builtin/pack-objects.c:2827
10232 msgid "read revision arguments from standard input"
10233 msgstr "从标准输入读取版本号参数"
10234
10235 #: builtin/pack-objects.c:2829
10236 msgid "limit the objects to those that are not yet packed"
10237 msgstr "限制那些尚未打包的对象"
10238
10239 #: builtin/pack-objects.c:2832
10240 msgid "include objects reachable from any reference"
10241 msgstr "包括可以从任何引用访问到的对象"
10242
10243 #: builtin/pack-objects.c:2835
10244 msgid "include objects referred by reflog entries"
10245 msgstr "包括被引用日志引用到的对象"
10246
10247 #: builtin/pack-objects.c:2838
10248 msgid "include objects referred to by the index"
10249 msgstr "包括被索引引用到的对象"
10250
10251 #: builtin/pack-objects.c:2841
10252 msgid "output pack to stdout"
10253 msgstr "输出包到标准输出"
10254
10255 #: builtin/pack-objects.c:2843
10256 msgid "include tag objects that refer to objects to be packed"
10257 msgstr "包括那些引用了待打包对象的标签对象"
10258
10259 #: builtin/pack-objects.c:2845
10260 msgid "keep unreachable objects"
10261 msgstr "维持不可达的对象"
10262
10263 #: builtin/pack-objects.c:2847
10264 msgid "pack loose unreachable objects"
10265 msgstr "打包松散的不可达对象"
10266
10267 #: builtin/pack-objects.c:2849
10268 msgid "unpack unreachable objects newer than <time>"
10269 msgstr "将比给定 <时间> 新的无法访问的对象解包"
10270
10271 #: builtin/pack-objects.c:2852
10272 msgid "create thin packs"
10273 msgstr "创建精简包"
10274
10275 #: builtin/pack-objects.c:2854
10276 msgid "create packs suitable for shallow fetches"
10277 msgstr "创建适合浅克隆仓库获取的包"
10278
10279 #: builtin/pack-objects.c:2856
10280 msgid "ignore packs that have companion .keep file"
10281 msgstr "忽略配有 .keep 文件的包"
10282
10283 #: builtin/pack-objects.c:2858
10284 msgid "pack compression level"
10285 msgstr "打包压缩级别"
10286
10287 #: builtin/pack-objects.c:2860
10288 msgid "do not hide commits by grafts"
10289 msgstr "显示被嫁接隐藏的提交"
10290
10291 #: builtin/pack-objects.c:2862
10292 msgid "use a bitmap index if available to speed up counting objects"
10293 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
10294
10295 #: builtin/pack-objects.c:2864
10296 msgid "write a bitmap index together with the pack index"
10297 msgstr "在建立包索引的同时创建 bitmap 索引"
10298
10299 #: builtin/pack-objects.c:2993
10300 msgid "Counting objects"
10301 msgstr "对象计数中"
10302
10303 #: builtin/pack-refs.c:6
10304 msgid "git pack-refs [<options>]"
10305 msgstr "git pack-refs [<选项>]"
10306
10307 #: builtin/pack-refs.c:14
10308 msgid "pack everything"
10309 msgstr "打包一切"
10310
10311 #: builtin/pack-refs.c:15
10312 msgid "prune loose refs (default)"
10313 msgstr "清除松散的引用(默认)"
10314
10315 #: builtin/prune-packed.c:7
10316 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
10317 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
10318
10319 #: builtin/prune-packed.c:40
10320 msgid "Removing duplicate objects"
10321 msgstr "正在删除重复对象"
10322
10323 #: builtin/prune.c:11
10324 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
10325 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
10326
10327 #: builtin/prune.c:106 builtin/worktree.c:128
10328 msgid "report pruned objects"
10329 msgstr "报告清除的对象"
10330
10331 #: builtin/prune.c:109 builtin/worktree.c:130
10332 msgid "expire objects older than <time>"
10333 msgstr "使早于给定时间的对象过期"
10334
10335 #: builtin/prune.c:123
10336 msgid "cannot prune in a precious-objects repo"
10337 msgstr "不能在珍品仓库中执行清理操作"
10338
10339 #: builtin/pull.c:51 builtin/pull.c:53
10340 #, c-format
10341 msgid "Invalid value for %s: %s"
10342 msgstr "%s 的值无效:%s"
10343
10344 #: builtin/pull.c:73
10345 msgid "git pull [<options>] [<repository> [<refspec>...]]"
10346 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
10347
10348 #: builtin/pull.c:121
10349 msgid "Options related to merging"
10350 msgstr "和合并相关的选项"
10351
10352 #: builtin/pull.c:124
10353 msgid "incorporate changes by rebasing rather than merging"
10354 msgstr "使用变基操作取代合并操作以合入修改"
10355
10356 #: builtin/pull.c:148 builtin/revert.c:101
10357 msgid "allow fast-forward"
10358 msgstr "允许快进式"
10359
10360 #: builtin/pull.c:157
10361 msgid "automatically stash/stash pop before and after rebase"
10362 msgstr "自动在变基操作前后执行 stash/stash pop"
10363
10364 #: builtin/pull.c:173
10365 msgid "Options related to fetching"
10366 msgstr "和获取相关的参数"
10367
10368 #: builtin/pull.c:195
10369 msgid "number of submodules pulled in parallel"
10370 msgstr "并发拉取的子模组的数量"
10371
10372 #: builtin/pull.c:284
10373 #, c-format
10374 msgid "Invalid value for pull.ff: %s"
10375 msgstr "pull.ff 的取值无效:%s"
10376
10377 #: builtin/pull.c:397
10378 msgid ""
10379 "There is no candidate for rebasing against among the refs that you just "
10380 "fetched."
10381 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
10382
10383 #: builtin/pull.c:399
10384 msgid ""
10385 "There are no candidates for merging among the refs that you just fetched."
10386 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
10387
10388 #: builtin/pull.c:400
10389 msgid ""
10390 "Generally this means that you provided a wildcard refspec which had no\n"
10391 "matches on the remote end."
10392 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
10393
10394 #: builtin/pull.c:403
10395 #, c-format
10396 msgid ""
10397 "You asked to pull from the remote '%s', but did not specify\n"
10398 "a branch. Because this is not the default configured remote\n"
10399 "for your current branch, you must specify a branch on the command line."
10400 msgstr ""
10401 "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
10402 "分支默认的远程仓库,您必须在命令行中指定一个分支名。"
10403
10404 #: builtin/pull.c:408 git-parse-remote.sh:73
10405 msgid "You are not currently on a branch."
10406 msgstr "您当前不在一个分支上。"
10407
10408 #: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
10409 msgid "Please specify which branch you want to rebase against."
10410 msgstr "请指定您要变基到哪一个分支。"
10411
10412 #: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
10413 msgid "Please specify which branch you want to merge with."
10414 msgstr "请指定您要合并哪一个分支。"
10415
10416 #: builtin/pull.c:413 builtin/pull.c:428
10417 msgid "See git-pull(1) for details."
10418 msgstr "详见 git-pull(1)。"
10419
10420 #: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
10421 #: git-parse-remote.sh:64
10422 msgid "<remote>"
10423 msgstr "<远程>"
10424
10425 #: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
10426 #: git-parse-remote.sh:65
10427 msgid "<branch>"
10428 msgstr "<分支>"
10429
10430 #: builtin/pull.c:423 git-parse-remote.sh:75
10431 msgid "There is no tracking information for the current branch."
10432 msgstr "当前分支没有跟踪信息。"
10433
10434 #: builtin/pull.c:432 git-parse-remote.sh:95
10435 msgid ""
10436 "If you wish to set tracking information for this branch you can do so with:"
10437 msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
10438
10439 #: builtin/pull.c:437
10440 #, c-format
10441 msgid ""
10442 "Your configuration specifies to merge with the ref '%s'\n"
10443 "from the remote, but no such ref was fetched."
10444 msgstr ""
10445 "您的配置中指定要合并远程的引用 '%s',\n"
10446 "但是没有获取到这个引用。"
10447
10448 #: builtin/pull.c:754
10449 msgid "ignoring --verify-signatures for rebase"
10450 msgstr "为变基操作忽略 --verify-signatures"
10451
10452 #: builtin/pull.c:801
10453 msgid "--[no-]autostash option is only valid with --rebase."
10454 msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
10455
10456 #: builtin/pull.c:809
10457 msgid "Updating an unborn branch with changes added to the index."
10458 msgstr "更新尚未诞生的分支,变更添加至索引。"
10459
10460 #: builtin/pull.c:812
10461 msgid "pull with rebase"
10462 msgstr "变基式拉取"
10463
10464 #: builtin/pull.c:813
10465 msgid "please commit or stash them."
10466 msgstr "请提交或为它们保存进度。"
10467
10468 #: builtin/pull.c:838
10469 #, c-format
10470 msgid ""
10471 "fetch updated the current branch head.\n"
10472 "fast-forwarding your working tree from\n"
10473 "commit %s."
10474 msgstr ""
10475 "fetch 更新了当前的分支。快进您的工作区\n"
10476 "至提交 %s。"
10477
10478 #: builtin/pull.c:843
10479 #, c-format
10480 msgid ""
10481 "Cannot fast-forward your working tree.\n"
10482 "After making sure that you saved anything precious from\n"
10483 "$ git diff %s\n"
10484 "output, run\n"
10485 "$ git reset --hard\n"
10486 "to recover."
10487 msgstr ""
10488 "您当前的工作区无法执行快进操作。\n"
10489 "首先执行如下命令:\n"
10490 "$ git diff %s\n"
10491 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
10492 "$ git reset --hard\n"
10493 "恢复之前的状态。"
10494
10495 #: builtin/pull.c:858
10496 msgid "Cannot merge multiple branches into empty head."
10497 msgstr "无法将多个分支合并到空分支。"
10498
10499 #: builtin/pull.c:862
10500 msgid "Cannot rebase onto multiple branches."
10501 msgstr "无法变基到多个分支。"
10502
10503 #: builtin/push.c:16
10504 msgid "git push [<options>] [<repository> [<refspec>...]]"
10505 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
10506
10507 #: builtin/push.c:89
10508 msgid "tag shorthand without <tag>"
10509 msgstr "标签后面未提供 <标签> 参数"
10510
10511 #: builtin/push.c:99
10512 msgid "--delete only accepts plain target ref names"
10513 msgstr "--delete 只接受简单的目标引用名"
10514
10515 #: builtin/push.c:143
10516 msgid ""
10517 "\n"
10518 "To choose either option permanently, see push.default in 'git help config'."
10519 msgstr ""
10520 "\n"
10521 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
10522
10523 #: builtin/push.c:146
10524 #, c-format
10525 msgid ""
10526 "The upstream branch of your current branch does not match\n"
10527 "the name of your current branch. To push to the upstream branch\n"
10528 "on the remote, use\n"
10529 "\n"
10530 " git push %s HEAD:%s\n"
10531 "\n"
10532 "To push to the branch of the same name on the remote, use\n"
10533 "\n"
10534 " git push %s %s\n"
10535 "%s"
10536 msgstr ""
10537 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
10538 "上游分支,使用\n"
10539 "\n"
10540 " git push %s HEAD:%s\n"
10541 "\n"
10542 "为推送至远程同名分支,使用\n"
10543 "\n"
10544 " git push %s %s\n"
10545 "%s"
10546
10547 #: builtin/push.c:161
10548 #, c-format
10549 msgid ""
10550 "You are not currently on a branch.\n"
10551 "To push the history leading to the current (detached HEAD)\n"
10552 "state now, use\n"
10553 "\n"
10554 " git push %s HEAD:<name-of-remote-branch>\n"
10555 msgstr ""
10556 "您当前不在一个分支上。\n"
10557 "现在为推送当前(分离头指针)的历史,使用\n"
10558 "\n"
10559 " git push %s HEAD:<远程分支名字>\n"
10560
10561 #: builtin/push.c:175
10562 #, c-format
10563 msgid ""
10564 "The current branch %s has no upstream branch.\n"
10565 "To push the current branch and set the remote as upstream, use\n"
10566 "\n"
10567 " git push --set-upstream %s %s\n"
10568 msgstr ""
10569 "当前分支 %s 没有对应的上游分支。\n"
10570 "为推送当前分支并建立与远程上游的跟踪,使用\n"
10571 "\n"
10572 " git push --set-upstream %s %s\n"
10573
10574 #: builtin/push.c:183
10575 #, c-format
10576 msgid "The current branch %s has multiple upstream branches, refusing to push."
10577 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
10578
10579 #: builtin/push.c:186
10580 #, c-format
10581 msgid ""
10582 "You are pushing to remote '%s', which is not the upstream of\n"
10583 "your current branch '%s', without telling me what to push\n"
10584 "to update which remote branch."
10585 msgstr ""
10586 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
10587 "而没有告诉我要推送什么、更新哪个远程分支。"
10588
10589 #: builtin/push.c:242
10590 msgid ""
10591 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
10592 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
10593
10594 #: builtin/push.c:249
10595 msgid ""
10596 "Updates were rejected because the tip of your current branch is behind\n"
10597 "its remote counterpart. Integrate the remote changes (e.g.\n"
10598 "'git pull ...') before pushing again.\n"
10599 "See the 'Note about fast-forwards' in 'git push --help' for details."
10600 msgstr ""
10601 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
10602 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
10603 "'git push --help' 中的 'Note about fast-forwards' 小节。"
10604
10605 #: builtin/push.c:255
10606 msgid ""
10607 "Updates were rejected because a pushed branch tip is behind its remote\n"
10608 "counterpart. Check out this branch and integrate the remote changes\n"
10609 "(e.g. 'git pull ...') before pushing again.\n"
10610 "See the 'Note about fast-forwards' in 'git push --help' for details."
10611 msgstr ""
10612 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
10613 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
10614 "'git push --help' 中的 'Note about fast-forwards' 小节。"
10615
10616 #: builtin/push.c:261
10617 msgid ""
10618 "Updates were rejected because the remote contains work that you do\n"
10619 "not have locally. This is usually caused by another repository pushing\n"
10620 "to the same ref. You may want to first integrate the remote changes\n"
10621 "(e.g., 'git pull ...') before pushing again.\n"
10622 "See the 'Note about fast-forwards' in 'git push --help' for details."
10623 msgstr ""
10624 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
10625 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
10626 "(如 'git pull ...')。\n"
10627 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
10628
10629 #: builtin/push.c:268
10630 msgid "Updates were rejected because the tag already exists in the remote."
10631 msgstr "更新被拒绝,因为该标签在远程已经存在。"
10632
10633 #: builtin/push.c:271
10634 msgid ""
10635 "You cannot update a remote ref that points at a non-commit object,\n"
10636 "or update a remote ref to make it point at a non-commit object,\n"
10637 "without using the '--force' option.\n"
10638 msgstr ""
10639 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
10640 "也不能更新远程引用让其指向一个非提交对象。\n"
10641
10642 #: builtin/push.c:331
10643 #, c-format
10644 msgid "Pushing to %s\n"
10645 msgstr "推送到 %s\n"
10646
10647 #: builtin/push.c:335
10648 #, c-format
10649 msgid "failed to push some refs to '%s'"
10650 msgstr "无法推送一些引用到 '%s'"
10651
10652 #: builtin/push.c:366
10653 #, c-format
10654 msgid "bad repository '%s'"
10655 msgstr "坏的仓库 '%s'"
10656
10657 #: builtin/push.c:367
10658 msgid ""
10659 "No configured push destination.\n"
10660 "Either specify the URL from the command-line or configure a remote "
10661 "repository using\n"
10662 "\n"
10663 " git remote add <name> <url>\n"
10664 "\n"
10665 "and then push using the remote name\n"
10666 "\n"
10667 " git push <name>\n"
10668 msgstr ""
10669 "没有配置推送目标。\n"
10670 "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
10671 "\n"
10672 " git remote add <名称> <地址>\n"
10673 "\n"
10674 "然后使用该远程仓库名执行推送\n"
10675 "\n"
10676 " git push <名称>\n"
10677
10678 #: builtin/push.c:385
10679 msgid "--all and --tags are incompatible"
10680 msgstr "--all 和 --tags 不兼容"
10681
10682 #: builtin/push.c:386
10683 msgid "--all can't be combined with refspecs"
10684 msgstr "--all 不能和引用规格同时使用"
10685
10686 #: builtin/push.c:391
10687 msgid "--mirror and --tags are incompatible"
10688 msgstr "--mirror 和 --tags 不兼容"
10689
10690 #: builtin/push.c:392
10691 msgid "--mirror can't be combined with refspecs"
10692 msgstr "--mirror 不能和引用规格同时使用"
10693
10694 #: builtin/push.c:397
10695 msgid "--all and --mirror are incompatible"
10696 msgstr "--all 和 --mirror 不兼容"
10697
10698 #: builtin/push.c:515
10699 msgid "repository"
10700 msgstr "仓库"
10701
10702 #: builtin/push.c:516 builtin/send-pack.c:161
10703 msgid "push all refs"
10704 msgstr "推送所有引用"
10705
10706 #: builtin/push.c:517 builtin/send-pack.c:163
10707 msgid "mirror all refs"
10708 msgstr "镜像所有引用"
10709
10710 #: builtin/push.c:519
10711 msgid "delete refs"
10712 msgstr "删除引用"
10713
10714 #: builtin/push.c:520
10715 msgid "push tags (can't be used with --all or --mirror)"
10716 msgstr "推送标签(不能使用 --all or --mirror)"
10717
10718 #: builtin/push.c:523 builtin/send-pack.c:164
10719 msgid "force updates"
10720 msgstr "强制更新"
10721
10722 #: builtin/push.c:525 builtin/send-pack.c:175
10723 msgid "refname>:<expect"
10724 msgstr "引用名>:<期望值"
10725
10726 #: builtin/push.c:526 builtin/send-pack.c:176
10727 msgid "require old value of ref to be at this value"
10728 msgstr "要求引用旧的取值为设定值"
10729
10730 #: builtin/push.c:529
10731 msgid "control recursive pushing of submodules"
10732 msgstr "控制子模组的递归推送"
10733
10734 #: builtin/push.c:531 builtin/send-pack.c:169
10735 msgid "use thin pack"
10736 msgstr "使用精简打包"
10737
10738 #: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
10739 #: builtin/send-pack.c:159
10740 msgid "receive pack program"
10741 msgstr "接收包程序"
10742
10743 #: builtin/push.c:534
10744 msgid "set upstream for git pull/status"
10745 msgstr "设置 git pull/status 的上游"
10746
10747 #: builtin/push.c:537
10748 msgid "prune locally removed refs"
10749 msgstr "清除本地删除的引用"
10750
10751 #: builtin/push.c:539
10752 msgid "bypass pre-push hook"
10753 msgstr "绕过 pre-push 钩子"
10754
10755 #: builtin/push.c:540
10756 msgid "push missing but relevant tags"
10757 msgstr "推送缺失但有关的标签"
10758
10759 #: builtin/push.c:543 builtin/send-pack.c:166
10760 msgid "GPG sign the push"
10761 msgstr "用 GPG 为推送签名"
10762
10763 #: builtin/push.c:545 builtin/send-pack.c:170
10764 msgid "request atomic transaction on remote side"
10765 msgstr "需要远端支持原子事务"
10766
10767 #: builtin/push.c:546
10768 msgid "server-specific"
10769 msgstr "server-specific"
10770
10771 #: builtin/push.c:546
10772 msgid "option to transmit"
10773 msgstr "传输选项"
10774
10775 #: builtin/push.c:560
10776 msgid "--delete is incompatible with --all, --mirror and --tags"
10777 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
10778
10779 #: builtin/push.c:562
10780 msgid "--delete doesn't make sense without any refs"
10781 msgstr "--delete 未接任何引用没有意义"
10782
10783 #: builtin/push.c:579
10784 msgid "push options must not have new line characters"
10785 msgstr "推送选项不能有换行符"
10786
10787 #: builtin/read-tree.c:37
10788 msgid ""
10789 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
10790 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
10791 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
10792 msgstr ""
10793 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
10794 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
10795 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
10796
10797 #: builtin/read-tree.c:110
10798 msgid "write resulting index to <file>"
10799 msgstr "将索引结果写入 <文件>"
10800
10801 #: builtin/read-tree.c:113
10802 msgid "only empty the index"
10803 msgstr "只是清空索引"
10804
10805 #: builtin/read-tree.c:115
10806 msgid "Merging"
10807 msgstr "合并"
10808
10809 #: builtin/read-tree.c:117
10810 msgid "perform a merge in addition to a read"
10811 msgstr "读取之余再执行一个合并"
10812
10813 #: builtin/read-tree.c:119
10814 msgid "3-way merge if no file level merging required"
10815 msgstr "如果没有文件级合并需要,执行三方合并"
10816
10817 #: builtin/read-tree.c:121
10818 msgid "3-way merge in presence of adds and removes"
10819 msgstr "存在添加和删除时,也执行三方合并"
10820
10821 #: builtin/read-tree.c:123
10822 msgid "same as -m, but discard unmerged entries"
10823 msgstr "类似于 -m,但丢弃未合并的条目"
10824
10825 #: builtin/read-tree.c:124
10826 msgid "<subdirectory>/"
10827 msgstr "<子目录>/"
10828
10829 #: builtin/read-tree.c:125
10830 msgid "read the tree into the index under <subdirectory>/"
10831 msgstr "读取树对象到索引的 <子目录>/ 下"
10832
10833 #: builtin/read-tree.c:128
10834 msgid "update working tree with merge result"
10835 msgstr "用合并的结果更新工作区"
10836
10837 #: builtin/read-tree.c:130
10838 msgid "gitignore"
10839 msgstr "gitignore"
10840
10841 #: builtin/read-tree.c:131
10842 msgid "allow explicitly ignored files to be overwritten"
10843 msgstr "允许忽略文件中设定的文件可以被覆盖"
10844
10845 #: builtin/read-tree.c:134
10846 msgid "don't check the working tree after merging"
10847 msgstr "合并后不检查工作区"
10848
10849 #: builtin/read-tree.c:135
10850 msgid "don't update the index or the work tree"
10851 msgstr "不更新索引区和工作区"
10852
10853 #: builtin/read-tree.c:137
10854 msgid "skip applying sparse checkout filter"
10855 msgstr "跳过应用稀疏检出过滤器"
10856
10857 #: builtin/read-tree.c:139
10858 msgid "debug unpack-trees"
10859 msgstr "调试 unpack-trees"
10860
10861 #: builtin/receive-pack.c:26
10862 msgid "git receive-pack <git-dir>"
10863 msgstr "git receive-pack <git-dir>"
10864
10865 #: builtin/receive-pack.c:793
10866 msgid ""
10867 "By default, updating the current branch in a non-bare repository\n"
10868 "is denied, because it will make the index and work tree inconsistent\n"
10869 "with what you pushed, and will require 'git reset --hard' to match\n"
10870 "the work tree to HEAD.\n"
10871 "\n"
10872 "You can set 'receive.denyCurrentBranch' configuration variable to\n"
10873 "'ignore' or 'warn' in the remote repository to allow pushing into\n"
10874 "its current branch; however, this is not recommended unless you\n"
10875 "arranged to update its work tree to match what you pushed in some\n"
10876 "other way.\n"
10877 "\n"
10878 "To squelch this message and still keep the default behaviour, set\n"
10879 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
10880 msgstr ""
10881 "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
10882 "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
10883 "\n"
10884 "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
10885 "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
10886 "用某种方式将其工作区更新至您推送的状态。\n"
10887 "\n"
10888 "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
10889 "配置变量为 'refuse'。"
10890
10891 #: builtin/receive-pack.c:813
10892 msgid ""
10893 "By default, deleting the current branch is denied, because the next\n"
10894 "'git clone' won't result in any file checked out, causing confusion.\n"
10895 "\n"
10896 "You can set 'receive.denyDeleteCurrent' configuration variable to\n"
10897 "'warn' or 'ignore' in the remote repository to allow deleting the\n"
10898 "current branch, with or without a warning message.\n"
10899 "\n"
10900 "To squelch this message, you can set it to 'refuse'."
10901 msgstr ""
10902 "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
10903 "导致混淆。\n"
10904 "\n"
10905 "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
10906 "'warn' 或 'ignore' 以允许删除当前分支,显示或者不显示警告。\n"
10907 "\n"
10908 "若要屏蔽此信息,您可以设置它为 'refuse'。"
10909
10910 #: builtin/receive-pack.c:1883
10911 msgid "quiet"
10912 msgstr "静默模式"
10913
10914 #: builtin/receive-pack.c:1897
10915 msgid "You must specify a directory."
10916 msgstr "您必须指定一个目录。"
10917
10918 #: builtin/reflog.c:423
10919 #, c-format
10920 msgid "'%s' for '%s' is not a valid timestamp"
10921 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
10922
10923 #: builtin/reflog.c:540 builtin/reflog.c:545
10924 #, c-format
10925 msgid "'%s' is not a valid timestamp"
10926 msgstr "'%s' 不是一个有效的时间戳"
10927
10928 #: builtin/remote.c:12
10929 msgid "git remote [-v | --verbose]"
10930 msgstr "git remote [-v | --verbose]"
10931
10932 #: builtin/remote.c:13
10933 msgid ""
10934 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
10935 "mirror=<fetch|push>] <name> <url>"
10936 msgstr ""
10937 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
10938 "mirror=<fetch|push>] <名称> <地址>"
10939
10940 #: builtin/remote.c:14 builtin/remote.c:34
10941 msgid "git remote rename <old> <new>"
10942 msgstr "git remote rename <旧名称> <新名称>"
10943
10944 #: builtin/remote.c:15 builtin/remote.c:39
10945 msgid "git remote remove <name>"
10946 msgstr "git remote remove <名称>"
10947
10948 #: builtin/remote.c:16 builtin/remote.c:44
10949 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
10950 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
10951
10952 #: builtin/remote.c:17
10953 msgid "git remote [-v | --verbose] show [-n] <name>"
10954 msgstr "git remote [-v | --verbose] show [-n] <名称>"
10955
10956 #: builtin/remote.c:18
10957 msgid "git remote prune [-n | --dry-run] <name>"
10958 msgstr "git remote prune [-n | --dry-run] <名称>"
10959
10960 #: builtin/remote.c:19
10961 msgid ""
10962 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
10963 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
10964
10965 #: builtin/remote.c:20
10966 msgid "git remote set-branches [--add] <name> <branch>..."
10967 msgstr "git remote set-branches [--add] <名称> <分支>..."
10968
10969 #: builtin/remote.c:21 builtin/remote.c:70
10970 msgid "git remote get-url [--push] [--all] <name>"
10971 msgstr "git remote get-url [--push] [--all] <名称>"
10972
10973 #: builtin/remote.c:22 builtin/remote.c:75
10974 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
10975 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
10976
10977 #: builtin/remote.c:23 builtin/remote.c:76
10978 msgid "git remote set-url --add <name> <newurl>"
10979 msgstr "git remote set-url --add <名称> <新的地址>"
10980
10981 #: builtin/remote.c:24 builtin/remote.c:77
10982 msgid "git remote set-url --delete <name> <url>"
10983 msgstr "git remote set-url --delete <名称> <地址>"
10984
10985 #: builtin/remote.c:29
10986 msgid "git remote add [<options>] <name> <url>"
10987 msgstr "git remote add [<选项>] <名称> <地址>"
10988
10989 #: builtin/remote.c:49
10990 msgid "git remote set-branches <name> <branch>..."
10991 msgstr "git remote set-branches <名称> <分支>..."
10992
10993 #: builtin/remote.c:50
10994 msgid "git remote set-branches --add <name> <branch>..."
10995 msgstr "git remote set-branches --add <名称> <分支>..."
10996
10997 #: builtin/remote.c:55
10998 msgid "git remote show [<options>] <name>"
10999 msgstr "git remote show [<选项>] <名称>"
11000
11001 #: builtin/remote.c:60
11002 msgid "git remote prune [<options>] <name>"
11003 msgstr "git remote prune [<选项>] <名称>"
11004
11005 #: builtin/remote.c:65
11006 msgid "git remote update [<options>] [<group> | <remote>]..."
11007 msgstr "git remote update [<选项>] [<组> | <远程>]..."
11008
11009 #: builtin/remote.c:94
11010 #, c-format
11011 msgid "Updating %s"
11012 msgstr "更新 %s 中"
11013
11014 #: builtin/remote.c:126
11015 msgid ""
11016 "--mirror is dangerous and deprecated; please\n"
11017 "\t use --mirror=fetch or --mirror=push instead"
11018 msgstr ""
11019 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
11020 "\t 或 --mirror=push"
11021
11022 #: builtin/remote.c:143
11023 #, c-format
11024 msgid "unknown mirror argument: %s"
11025 msgstr "未知的镜像参数:%s"
11026
11027 #: builtin/remote.c:159
11028 msgid "fetch the remote branches"
11029 msgstr "抓取远程的分支"
11030
11031 #: builtin/remote.c:161
11032 msgid "import all tags and associated objects when fetching"
11033 msgstr "抓取时导入所有的标签和关联对象"
11034
11035 #: builtin/remote.c:164
11036 msgid "or do not fetch any tag at all (--no-tags)"
11037 msgstr "或不抓取任何标签(--no-tags)"
11038
11039 #: builtin/remote.c:166
11040 msgid "branch(es) to track"
11041 msgstr "跟踪的分支"
11042
11043 #: builtin/remote.c:167
11044 msgid "master branch"
11045 msgstr "主线分支"
11046
11047 #: builtin/remote.c:168
11048 msgid "push|fetch"
11049 msgstr "push|fetch"
11050
11051 #: builtin/remote.c:169
11052 msgid "set up remote as a mirror to push to or fetch from"
11053 msgstr "把远程设置为用以推送或抓取的镜像"
11054
11055 #: builtin/remote.c:181
11056 msgid "specifying a master branch makes no sense with --mirror"
11057 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
11058
11059 #: builtin/remote.c:183
11060 msgid "specifying branches to track makes sense only with fetch mirrors"
11061 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
11062
11063 #: builtin/remote.c:190 builtin/remote.c:629
11064 #, c-format
11065 msgid "remote %s already exists."
11066 msgstr "远程 %s 已经存在。"
11067
11068 #: builtin/remote.c:194 builtin/remote.c:633
11069 #, c-format
11070 msgid "'%s' is not a valid remote name"
11071 msgstr "'%s' 不是一个有效的远程名称"
11072
11073 #: builtin/remote.c:234
11074 #, c-format
11075 msgid "Could not setup master '%s'"
11076 msgstr "无法设置 master '%s'"
11077
11078 #: builtin/remote.c:336
11079 #, c-format
11080 msgid "Could not get fetch map for refspec %s"
11081 msgstr "无法得到引用规格 %s 的获取列表"
11082
11083 #: builtin/remote.c:437 builtin/remote.c:445
11084 msgid "(matching)"
11085 msgstr "(匹配)"
11086
11087 #: builtin/remote.c:449
11088 msgid "(delete)"
11089 msgstr "(删除)"
11090
11091 #: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
11092 #, c-format
11093 msgid "No such remote: %s"
11094 msgstr "没有这样的远程:%s"
11095
11096 #: builtin/remote.c:639
11097 #, c-format
11098 msgid "Could not rename config section '%s' to '%s'"
11099 msgstr "不能重命名配置小节 '%s' 到 '%s'"
11100
11101 #: builtin/remote.c:659
11102 #, c-format
11103 msgid ""
11104 "Not updating non-default fetch refspec\n"
11105 "\t%s\n"
11106 "\tPlease update the configuration manually if necessary."
11107 msgstr ""
11108 "没有更新非默认的获取引用规格\n"
11109 "\t%s\n"
11110 "\t如果必要请手动更新配置。"
11111
11112 #: builtin/remote.c:695
11113 #, c-format
11114 msgid "deleting '%s' failed"
11115 msgstr "删除 '%s' 失败"
11116
11117 #: builtin/remote.c:729
11118 #, c-format
11119 msgid "creating '%s' failed"
11120 msgstr "创建 '%s' 失败"
11121
11122 #: builtin/remote.c:792
11123 msgid ""
11124 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
11125 "to delete it, use:"
11126 msgid_plural ""
11127 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
11128 "to delete them, use:"
11129 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
11130 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
11131
11132 #: builtin/remote.c:806
11133 #, c-format
11134 msgid "Could not remove config section '%s'"
11135 msgstr "不能移除配置小节 '%s'"
11136
11137 #: builtin/remote.c:907
11138 #, c-format
11139 msgid " new (next fetch will store in remotes/%s)"
11140 msgstr " 新的(下一次获取将存储于 remotes/%s)"
11141
11142 #: builtin/remote.c:910
11143 msgid " tracked"
11144 msgstr " 已跟踪"
11145
11146 #: builtin/remote.c:912
11147 msgid " stale (use 'git remote prune' to remove)"
11148 msgstr " 过时(使用 'git remote prune' 来移除)"
11149
11150 #: builtin/remote.c:914
11151 msgid " ???"
11152 msgstr " ???"
11153
11154 #: builtin/remote.c:955
11155 #, c-format
11156 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
11157 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
11158
11159 #: builtin/remote.c:963
11160 #, c-format
11161 msgid "rebases interactively onto remote %s"
11162 msgstr "交互式变基到远程 %s"
11163
11164 #: builtin/remote.c:964
11165 #, c-format
11166 msgid "rebases onto remote %s"
11167 msgstr "变基到远程 %s"
11168
11169 #: builtin/remote.c:967
11170 #, c-format
11171 msgid " merges with remote %s"
11172 msgstr " 与远程 %s 合并"
11173
11174 #: builtin/remote.c:970
11175 #, c-format
11176 msgid "merges with remote %s"
11177 msgstr "与远程 %s 合并"
11178
11179 #: builtin/remote.c:973
11180 #, c-format
11181 msgid "%-*s and with remote %s\n"
11182 msgstr "%-*s 以及和远程 %s\n"
11183
11184 #: builtin/remote.c:1016
11185 msgid "create"
11186 msgstr "创建"
11187
11188 #: builtin/remote.c:1019
11189 msgid "delete"
11190 msgstr "删除"
11191
11192 #: builtin/remote.c:1023
11193 msgid "up to date"
11194 msgstr "最新"
11195
11196 #: builtin/remote.c:1026
11197 msgid "fast-forwardable"
11198 msgstr "可快进"
11199
11200 #: builtin/remote.c:1029
11201 msgid "local out of date"
11202 msgstr "本地已过时"
11203
11204 #: builtin/remote.c:1036
11205 #, c-format
11206 msgid " %-*s forces to %-*s (%s)"
11207 msgstr " %-*s 强制推送至 %-*s (%s)"
11208
11209 #: builtin/remote.c:1039
11210 #, c-format
11211 msgid " %-*s pushes to %-*s (%s)"
11212 msgstr " %-*s 推送至 %-*s (%s)"
11213
11214 #: builtin/remote.c:1043
11215 #, c-format
11216 msgid " %-*s forces to %s"
11217 msgstr " %-*s 强制推送至 %s"
11218
11219 #: builtin/remote.c:1046
11220 #, c-format
11221 msgid " %-*s pushes to %s"
11222 msgstr " %-*s 推送至 %s"
11223
11224 #: builtin/remote.c:1114
11225 msgid "do not query remotes"
11226 msgstr "不查询远程"
11227
11228 #: builtin/remote.c:1141
11229 #, c-format
11230 msgid "* remote %s"
11231 msgstr "* 远程 %s"
11232
11233 #: builtin/remote.c:1142
11234 #, c-format
11235 msgid " Fetch URL: %s"
11236 msgstr " 获取地址:%s"
11237
11238 #: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
11239 msgid "(no URL)"
11240 msgstr "(无 URL)"
11241
11242 #. TRANSLATORS: the colon ':' should align with
11243 #. the one in " Fetch URL: %s" translation
11244 #: builtin/remote.c:1154 builtin/remote.c:1156
11245 #, c-format
11246 msgid " Push URL: %s"
11247 msgstr " 推送地址:%s"
11248
11249 #: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
11250 #, c-format
11251 msgid " HEAD branch: %s"
11252 msgstr " HEAD 分支:%s"
11253
11254 # 译者:中文字符串拼接,可删除前导空格
11255 #: builtin/remote.c:1158
11256 msgid "(not queried)"
11257 msgstr "(未查询)"
11258
11259 #: builtin/remote.c:1160
11260 msgid "(unknown)"
11261 msgstr "(未知)"
11262
11263 #: builtin/remote.c:1164
11264 #, c-format
11265 msgid ""
11266 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
11267 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
11268
11269 #: builtin/remote.c:1176
11270 #, c-format
11271 msgid " Remote branch:%s"
11272 msgid_plural " Remote branches:%s"
11273 msgstr[0] " 远程分支:%s"
11274 msgstr[1] " 远程分支:%s"
11275
11276 # 译者:中文字符串拼接,可删除前导空格
11277 #: builtin/remote.c:1179 builtin/remote.c:1205
11278 msgid " (status not queried)"
11279 msgstr "(状态未查询)"
11280
11281 #: builtin/remote.c:1188
11282 msgid " Local branch configured for 'git pull':"
11283 msgid_plural " Local branches configured for 'git pull':"
11284 msgstr[0] " 为 'git pull' 配置的本地分支:"
11285 msgstr[1] " 为 'git pull' 配置的本地分支:"
11286
11287 #: builtin/remote.c:1196
11288 msgid " Local refs will be mirrored by 'git push'"
11289 msgstr " 本地引用将在 'git push' 时被镜像"
11290
11291 #: builtin/remote.c:1202
11292 #, c-format
11293 msgid " Local ref configured for 'git push'%s:"
11294 msgid_plural " Local refs configured for 'git push'%s:"
11295 msgstr[0] " 为 'git push' 配置的本地引用%s:"
11296 msgstr[1] " 为 'git push' 配置的本地引用%s:"
11297
11298 #: builtin/remote.c:1223
11299 msgid "set refs/remotes/<name>/HEAD according to remote"
11300 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
11301
11302 #: builtin/remote.c:1225
11303 msgid "delete refs/remotes/<name>/HEAD"
11304 msgstr "删除 refs/remotes/<名称>/HEAD"
11305
11306 #: builtin/remote.c:1240
11307 msgid "Cannot determine remote HEAD"
11308 msgstr "无法确定远程 HEAD"
11309
11310 #: builtin/remote.c:1242
11311 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
11312 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
11313
11314 #: builtin/remote.c:1252
11315 #, c-format
11316 msgid "Could not delete %s"
11317 msgstr "无法删除 %s"
11318
11319 #: builtin/remote.c:1260
11320 #, c-format
11321 msgid "Not a valid ref: %s"
11322 msgstr "不是一个有效引用:%s"
11323
11324 #: builtin/remote.c:1262
11325 #, c-format
11326 msgid "Could not setup %s"
11327 msgstr "不能设置 %s"
11328
11329 # 译者:注意保持前导空格
11330 #: builtin/remote.c:1280
11331 #, c-format
11332 msgid " %s will become dangling!"
11333 msgstr " %s 将成为摇摆状态!"
11334
11335 # 译者:注意保持前导空格
11336 #: builtin/remote.c:1281
11337 #, c-format
11338 msgid " %s has become dangling!"
11339 msgstr " %s 已成为摇摆状态!"
11340
11341 #: builtin/remote.c:1291
11342 #, c-format
11343 msgid "Pruning %s"
11344 msgstr "修剪 %s"
11345
11346 #: builtin/remote.c:1292
11347 #, c-format
11348 msgid "URL: %s"
11349 msgstr "URL:%s"
11350
11351 #: builtin/remote.c:1308
11352 #, c-format
11353 msgid " * [would prune] %s"
11354 msgstr " * [将删除] %s"
11355
11356 #: builtin/remote.c:1311
11357 #, c-format
11358 msgid " * [pruned] %s"
11359 msgstr " * [已删除] %s"
11360
11361 #: builtin/remote.c:1356
11362 msgid "prune remotes after fetching"
11363 msgstr "抓取后清除远程"
11364
11365 #: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
11366 #, c-format
11367 msgid "No such remote '%s'"
11368 msgstr "没有此远程 '%s'"
11369
11370 #: builtin/remote.c:1435
11371 msgid "add branch"
11372 msgstr "添加分支"
11373
11374 #: builtin/remote.c:1442
11375 msgid "no remote specified"
11376 msgstr "未指定远程"
11377
11378 #: builtin/remote.c:1459
11379 msgid "query push URLs rather than fetch URLs"
11380 msgstr "查询推送 URL 地址,而非获取 URL 地址"
11381
11382 #: builtin/remote.c:1461
11383 msgid "return all URLs"
11384 msgstr "返回所有 URL 地址"
11385
11386 #: builtin/remote.c:1489
11387 #, c-format
11388 msgid "no URLs configured for remote '%s'"
11389 msgstr "没有给远程仓库 '%s' 设定 URL"
11390
11391 #: builtin/remote.c:1515
11392 msgid "manipulate push URLs"
11393 msgstr "操作推送 URLS"
11394
11395 #: builtin/remote.c:1517
11396 msgid "add URL"
11397 msgstr "添加 URL"
11398
11399 #: builtin/remote.c:1519
11400 msgid "delete URLs"
11401 msgstr "删除 URLS"
11402
11403 #: builtin/remote.c:1526
11404 msgid "--add --delete doesn't make sense"
11405 msgstr "--add --delete 无意义"
11406
11407 #: builtin/remote.c:1567
11408 #, c-format
11409 msgid "Invalid old URL pattern: %s"
11410 msgstr "无效的旧 URL 匹配模版:%s"
11411
11412 #: builtin/remote.c:1575
11413 #, c-format
11414 msgid "No such URL found: %s"
11415 msgstr "未找到此 URL:%s"
11416
11417 #: builtin/remote.c:1577
11418 msgid "Will not delete all non-push URLs"
11419 msgstr "将不会删除所有非推送 URL 地址"
11420
11421 #: builtin/remote.c:1591
11422 msgid "be verbose; must be placed before a subcommand"
11423 msgstr "冗长输出;必须置于子命令之前"
11424
11425 #: builtin/remote.c:1622
11426 #, c-format
11427 msgid "Unknown subcommand: %s"
11428 msgstr "未知子命令:%s"
11429
11430 #: builtin/repack.c:17
11431 msgid "git repack [<options>]"
11432 msgstr "git repack [<选项>]"
11433
11434 #: builtin/repack.c:160
11435 msgid "pack everything in a single pack"
11436 msgstr "所有内容打包到一个包文件中"
11437
11438 #: builtin/repack.c:162
11439 msgid "same as -a, and turn unreachable objects loose"
11440 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
11441
11442 #: builtin/repack.c:165
11443 msgid "remove redundant packs, and run git-prune-packed"
11444 msgstr "删除多余的包,运行 git-prune-packed"
11445
11446 #: builtin/repack.c:167
11447 msgid "pass --no-reuse-delta to git-pack-objects"
11448 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
11449
11450 #: builtin/repack.c:169
11451 msgid "pass --no-reuse-object to git-pack-objects"
11452 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
11453
11454 #: builtin/repack.c:171
11455 msgid "do not run git-update-server-info"
11456 msgstr "不运行 git-update-server-info"
11457
11458 #: builtin/repack.c:174
11459 msgid "pass --local to git-pack-objects"
11460 msgstr "向 git-pack-objects 传递参数 --local"
11461
11462 #: builtin/repack.c:176
11463 msgid "write bitmap index"
11464 msgstr "写 bitmap 索引"
11465
11466 #: builtin/repack.c:177
11467 msgid "approxidate"
11468 msgstr "近似日期"
11469
11470 #: builtin/repack.c:178
11471 msgid "with -A, do not loosen objects older than this"
11472 msgstr "使用 -A,不要将早于给定时间的对象过期"
11473
11474 #: builtin/repack.c:180
11475 msgid "with -a, repack unreachable objects"
11476 msgstr "使用 -a ,重新对不可达对象打包"
11477
11478 #: builtin/repack.c:182
11479 msgid "size of the window used for delta compression"
11480 msgstr "用于增量压缩的窗口值"
11481
11482 #: builtin/repack.c:183 builtin/repack.c:187
11483 msgid "bytes"
11484 msgstr "字节"
11485
11486 #: builtin/repack.c:184
11487 msgid "same as the above, but limit memory size instead of entries count"
11488 msgstr "和上面的相似,但限制内存大小而非条目数"
11489
11490 #: builtin/repack.c:186
11491 msgid "limits the maximum delta depth"
11492 msgstr "限制最大增量深度"
11493
11494 #: builtin/repack.c:188
11495 msgid "maximum size of each packfile"
11496 msgstr "每个包文件的最大尺寸"
11497
11498 #: builtin/repack.c:190
11499 msgid "repack objects in packs marked with .keep"
11500 msgstr "对标记为 .keep 的包中的对象重新打包"
11501
11502 #: builtin/repack.c:200
11503 msgid "cannot delete packs in a precious-objects repo"
11504 msgstr "不能删除珍品仓库中的打包文件"
11505
11506 #: builtin/repack.c:204
11507 msgid "--keep-unreachable and -A are incompatible"
11508 msgstr "--keep-unreachable 和 -A 不兼容"
11509
11510 #: builtin/repack.c:391 builtin/worktree.c:115
11511 #, c-format
11512 msgid "failed to remove '%s'"
11513 msgstr "无法删除 '%s'"
11514
11515 #: builtin/replace.c:19
11516 msgid "git replace [-f] <object> <replacement>"
11517 msgstr "git replace [-f] <对象> <替换物>"
11518
11519 #: builtin/replace.c:20
11520 msgid "git replace [-f] --edit <object>"
11521 msgstr "git replace [-f] --edit <对象>"
11522
11523 #: builtin/replace.c:21
11524 msgid "git replace [-f] --graft <commit> [<parent>...]"
11525 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
11526
11527 #: builtin/replace.c:22
11528 msgid "git replace -d <object>..."
11529 msgstr "git replace -d <对象>..."
11530
11531 #: builtin/replace.c:23
11532 msgid "git replace [--format=<format>] [-l [<pattern>]]"
11533 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
11534
11535 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
11536 #, c-format
11537 msgid "Not a valid object name: '%s'"
11538 msgstr "不是一个有效的对象名:'%s'"
11539
11540 #: builtin/replace.c:355
11541 #, c-format
11542 msgid "bad mergetag in commit '%s'"
11543 msgstr "提交 '%s' 中含有损坏的合并标签"
11544
11545 #: builtin/replace.c:357
11546 #, c-format
11547 msgid "malformed mergetag in commit '%s'"
11548 msgstr "提交 '%s' 中含有非法的合并标签"
11549
11550 #: builtin/replace.c:368
11551 #, c-format
11552 msgid ""
11553 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
11554 "instead of --graft"
11555 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
11556
11557 #: builtin/replace.c:401
11558 #, c-format
11559 msgid "the original commit '%s' has a gpg signature."
11560 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
11561
11562 #: builtin/replace.c:402
11563 msgid "the signature will be removed in the replacement commit!"
11564 msgstr "在替换的提交中签名将被移除!"
11565
11566 #: builtin/replace.c:408
11567 #, c-format
11568 msgid "could not write replacement commit for: '%s'"
11569 msgstr "不能为 '%s' 写替换提交"
11570
11571 #: builtin/replace.c:432
11572 msgid "list replace refs"
11573 msgstr "列出替换的引用"
11574
11575 #: builtin/replace.c:433
11576 msgid "delete replace refs"
11577 msgstr "删除替换的引用"
11578
11579 #: builtin/replace.c:434
11580 msgid "edit existing object"
11581 msgstr "编辑现存的对象"
11582
11583 #: builtin/replace.c:435
11584 msgid "change a commit's parents"
11585 msgstr "修改一个提交的父提交"
11586
11587 #: builtin/replace.c:436
11588 msgid "replace the ref if it exists"
11589 msgstr "如果存在则替换引用"
11590
11591 #: builtin/replace.c:437
11592 msgid "do not pretty-print contents for --edit"
11593 msgstr "不要为 --edit 操作美观显示内容"
11594
11595 #: builtin/replace.c:438
11596 msgid "use this format"
11597 msgstr "使用此格式"
11598
11599 #: builtin/rerere.c:12
11600 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
11601 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
11602
11603 #: builtin/rerere.c:58
11604 msgid "register clean resolutions in index"
11605 msgstr "在索引中注册干净的解决方案"
11606
11607 #: builtin/reset.c:26
11608 msgid ""
11609 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
11610 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
11611
11612 #: builtin/reset.c:27
11613 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
11614 msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
11615
11616 #: builtin/reset.c:28
11617 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
11618 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
11619
11620 #: builtin/reset.c:34
11621 msgid "mixed"
11622 msgstr "混杂"
11623
11624 #: builtin/reset.c:34
11625 msgid "soft"
11626 msgstr "软性"
11627
11628 #: builtin/reset.c:34
11629 msgid "hard"
11630 msgstr "硬性"
11631
11632 #: builtin/reset.c:34
11633 msgid "merge"
11634 msgstr "合并"
11635
11636 #: builtin/reset.c:34
11637 msgid "keep"
11638 msgstr "保持"
11639
11640 #: builtin/reset.c:74
11641 msgid "You do not have a valid HEAD."
11642 msgstr "您没有一个有效的 HEAD。"
11643
11644 #: builtin/reset.c:76
11645 msgid "Failed to find tree of HEAD."
11646 msgstr "无法找到 HEAD 指向的树。"
11647
11648 #: builtin/reset.c:82
11649 #, c-format
11650 msgid "Failed to find tree of %s."
11651 msgstr "无法找到 %s 指向的树。"
11652
11653 #: builtin/reset.c:100
11654 #, c-format
11655 msgid "HEAD is now at %s"
11656 msgstr "HEAD 现在位于 %s"
11657
11658 # 译者:汉字之间无空格,故删除%s前后空格
11659 #: builtin/reset.c:183
11660 #, c-format
11661 msgid "Cannot do a %s reset in the middle of a merge."
11662 msgstr "在合并过程中不能做%s重置操作。"
11663
11664 #: builtin/reset.c:276
11665 msgid "be quiet, only report errors"
11666 msgstr "安静模式,只报告错误"
11667
11668 #: builtin/reset.c:278
11669 msgid "reset HEAD and index"
11670 msgstr "重置 HEAD 和索引"
11671
11672 #: builtin/reset.c:279
11673 msgid "reset only HEAD"
11674 msgstr "只重置 HEAD"
11675
11676 #: builtin/reset.c:281 builtin/reset.c:283
11677 msgid "reset HEAD, index and working tree"
11678 msgstr "重置 HEAD、索引和工作区"
11679
11680 #: builtin/reset.c:285
11681 msgid "reset HEAD but keep local changes"
11682 msgstr "重置 HEAD 但保存本地变更"
11683
11684 #: builtin/reset.c:288
11685 msgid "record only the fact that removed paths will be added later"
11686 msgstr "将删除的路径标记为稍后添加"
11687
11688 #: builtin/reset.c:305
11689 #, c-format
11690 msgid "Failed to resolve '%s' as a valid revision."
11691 msgstr "无法将 '%s' 解析为一个有效的版本。"
11692
11693 #: builtin/reset.c:313
11694 #, c-format
11695 msgid "Failed to resolve '%s' as a valid tree."
11696 msgstr "无法将 '%s' 解析为一个有效的树对象。"
11697
11698 #: builtin/reset.c:322
11699 msgid "--patch is incompatible with --{hard,mixed,soft}"
11700 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
11701
11702 #: builtin/reset.c:331
11703 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
11704 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
11705
11706 # 译者:汉字之间无空格,故删除%s前后空格
11707 #: builtin/reset.c:333
11708 #, c-format
11709 msgid "Cannot do %s reset with paths."
11710 msgstr "不能带路径进行%s重置。"
11711
11712 # 译者:汉字之间无空格,故删除%s前后空格
11713 #: builtin/reset.c:343
11714 #, c-format
11715 msgid "%s reset is not allowed in a bare repository"
11716 msgstr "不能对纯仓库进行%s重置"
11717
11718 #: builtin/reset.c:347
11719 msgid "-N can only be used with --mixed"
11720 msgstr "-N 只能和 --mixed 同时使用"
11721
11722 #: builtin/reset.c:364
11723 msgid "Unstaged changes after reset:"
11724 msgstr "重置后取消暂存的变更:"
11725
11726 #: builtin/reset.c:370
11727 #, c-format
11728 msgid "Could not reset index file to revision '%s'."
11729 msgstr "不能重置索引文件至版本 '%s'。"
11730
11731 #: builtin/reset.c:374
11732 msgid "Could not write new index file."
11733 msgstr "不能写入新的索引文件。"
11734
11735 #: builtin/rev-list.c:354
11736 msgid "rev-list does not support display of notes"
11737 msgstr "rev-list 不支持显示注解"
11738
11739 #: builtin/rev-parse.c:386
11740 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
11741 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
11742
11743 #: builtin/rev-parse.c:391
11744 msgid "keep the `--` passed as an arg"
11745 msgstr "保持 `--` 作为一个参数传递"
11746
11747 #: builtin/rev-parse.c:393
11748 msgid "stop parsing after the first non-option argument"
11749 msgstr "遇到第一个非选项参数后停止解析"
11750
11751 #: builtin/rev-parse.c:396
11752 msgid "output in stuck long form"
11753 msgstr "以固定长格式输出"
11754
11755 #: builtin/rev-parse.c:527
11756 msgid ""
11757 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
11758 " or: git rev-parse --sq-quote [<arg>...]\n"
11759 " or: git rev-parse [<options>] [<arg>...]\n"
11760 "\n"
11761 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
11762 msgstr ""
11763 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
11764 " 或者:git rev-parse --sq-quote [<参数>...]\n"
11765 " 或者:git rev-parse [<选项>] [<参数>...]\n"
11766 "\n"
11767 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
11768
11769 #: builtin/revert.c:22
11770 msgid "git revert [<options>] <commit-ish>..."
11771 msgstr "git revert [<选项>] <提交号>..."
11772
11773 #: builtin/revert.c:23
11774 msgid "git revert <subcommand>"
11775 msgstr "git revert <子命令>"
11776
11777 #: builtin/revert.c:28
11778 msgid "git cherry-pick [<options>] <commit-ish>..."
11779 msgstr "git cherry-pick [<选项>] <提交号>..."
11780
11781 #: builtin/revert.c:29
11782 msgid "git cherry-pick <subcommand>"
11783 msgstr "git cherry-pick <子命令>"
11784
11785 #: builtin/revert.c:71
11786 #, c-format
11787 msgid "%s: %s cannot be used with %s"
11788 msgstr "%s:%s 不能和 %s 同时使用"
11789
11790 #: builtin/revert.c:80
11791 msgid "end revert or cherry-pick sequence"
11792 msgstr "终止反转或拣选操作"
11793
11794 #: builtin/revert.c:81
11795 msgid "resume revert or cherry-pick sequence"
11796 msgstr "继续反转或拣选操作"
11797
11798 #: builtin/revert.c:82
11799 msgid "cancel revert or cherry-pick sequence"
11800 msgstr "取消反转或拣选操作"
11801
11802 #: builtin/revert.c:83
11803 msgid "don't automatically commit"
11804 msgstr "不要自动提交"
11805
11806 #: builtin/revert.c:84
11807 msgid "edit the commit message"
11808 msgstr "编辑提交说明"
11809
11810 #: builtin/revert.c:87
11811 msgid "parent number"
11812 msgstr "父编号"
11813
11814 #: builtin/revert.c:89
11815 msgid "merge strategy"
11816 msgstr "合并策略"
11817
11818 #: builtin/revert.c:90
11819 msgid "option"
11820 msgstr "选项"
11821
11822 #: builtin/revert.c:91
11823 msgid "option for merge strategy"
11824 msgstr "合并策略的选项"
11825
11826 #: builtin/revert.c:100
11827 msgid "append commit name"
11828 msgstr "追加提交名称"
11829
11830 #: builtin/revert.c:102
11831 msgid "preserve initially empty commits"
11832 msgstr "保留初始化的空提交"
11833
11834 #: builtin/revert.c:103
11835 msgid "allow commits with empty messages"
11836 msgstr "允许提交说明为空"
11837
11838 #: builtin/revert.c:104
11839 msgid "keep redundant, empty commits"
11840 msgstr "保持多余的、空的提交"
11841
11842 #: builtin/revert.c:192
11843 msgid "revert failed"
11844 msgstr "还原失败"
11845
11846 #: builtin/revert.c:205
11847 msgid "cherry-pick failed"
11848 msgstr "拣选失败"
11849
11850 #: builtin/rm.c:17
11851 msgid "git rm [<options>] [--] <file>..."
11852 msgstr "git rm [<选项>] [--] <文件>..."
11853
11854 #: builtin/rm.c:65
11855 msgid ""
11856 "the following submodule (or one of its nested submodules)\n"
11857 "uses a .git directory:"
11858 msgid_plural ""
11859 "the following submodules (or one of their nested submodules)\n"
11860 "use a .git directory:"
11861 msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
11862 msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
11863
11864 #: builtin/rm.c:71
11865 msgid ""
11866 "\n"
11867 "(use 'rm -rf' if you really want to remove it including all of its history)"
11868 msgstr ""
11869 "\n"
11870 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11871
11872 #: builtin/rm.c:230
11873 msgid ""
11874 "the following file has staged content different from both the\n"
11875 "file and the HEAD:"
11876 msgid_plural ""
11877 "the following files have staged content different from both the\n"
11878 "file and the HEAD:"
11879 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
11880 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
11881
11882 #: builtin/rm.c:235
11883 msgid ""
11884 "\n"
11885 "(use -f to force removal)"
11886 msgstr ""
11887 "\n"
11888 "(使用 -f 强制删除)"
11889
11890 #: builtin/rm.c:239
11891 msgid "the following file has changes staged in the index:"
11892 msgid_plural "the following files have changes staged in the index:"
11893 msgstr[0] "下列文件索引中有变更"
11894 msgstr[1] "下列文件索引中有变更"
11895
11896 #: builtin/rm.c:243 builtin/rm.c:254
11897 msgid ""
11898 "\n"
11899 "(use --cached to keep the file, or -f to force removal)"
11900 msgstr ""
11901 "\n"
11902 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
11903
11904 #: builtin/rm.c:251
11905 msgid "the following file has local modifications:"
11906 msgid_plural "the following files have local modifications:"
11907 msgstr[0] "如下文件有本地修改:"
11908 msgstr[1] "如下文件有本地修改:"
11909
11910 #: builtin/rm.c:269
11911 msgid "do not list removed files"
11912 msgstr "不列出删除的文件"
11913
11914 #: builtin/rm.c:270
11915 msgid "only remove from the index"
11916 msgstr "只从索引区删除"
11917
11918 #: builtin/rm.c:271
11919 msgid "override the up-to-date check"
11920 msgstr "忽略文件更新状态检查"
11921
11922 #: builtin/rm.c:272
11923 msgid "allow recursive removal"
11924 msgstr "允许递归删除"
11925
11926 #: builtin/rm.c:274
11927 msgid "exit with a zero status even if nothing matched"
11928 msgstr "即使没有匹配,也以零状态退出"
11929
11930 #: builtin/rm.c:335
11931 #, c-format
11932 msgid "not removing '%s' recursively without -r"
11933 msgstr "未提供 -r 选项不会递归删除 '%s'"
11934
11935 #: builtin/rm.c:374
11936 #, c-format
11937 msgid "git rm: unable to remove %s"
11938 msgstr "git rm:不能删除 %s"
11939
11940 #: builtin/send-pack.c:18
11941 msgid ""
11942 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
11943 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
11944 "[<ref>...]\n"
11945 " --all and explicit <ref> specification are mutually exclusive."
11946 msgstr ""
11947 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
11948 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
11949 " --all 和明确的 <引用> 互斥。"
11950
11951 #: builtin/send-pack.c:160
11952 msgid "remote name"
11953 msgstr "远程名称"
11954
11955 #: builtin/send-pack.c:171
11956 msgid "use stateless RPC protocol"
11957 msgstr "使用无状态的 RPC 协议"
11958
11959 #: builtin/send-pack.c:172
11960 msgid "read refs from stdin"
11961 msgstr "从标准输入读取引用"
11962
11963 #: builtin/send-pack.c:173
11964 msgid "print status from remote helper"
11965 msgstr "打印来自远程 helper 的状态"
11966
11967 #: builtin/shortlog.c:13
11968 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
11969 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
11970
11971 #: builtin/shortlog.c:242
11972 msgid "sort output according to the number of commits per author"
11973 msgstr "根据每个作者的提交数量排序"
11974
11975 #: builtin/shortlog.c:244
11976 msgid "Suppress commit descriptions, only provides commit count"
11977 msgstr "隐藏提交说明,只提供提交数量"
11978
11979 #: builtin/shortlog.c:246
11980 msgid "Show the email address of each author"
11981 msgstr "显示每个作者的电子邮件地址"
11982
11983 #: builtin/shortlog.c:247
11984 msgid "w[,i1[,i2]]"
11985 msgstr "w[,i1[,i2]]"
11986
11987 #: builtin/shortlog.c:248
11988 msgid "Linewrap output"
11989 msgstr "折行输出"
11990
11991 #: builtin/show-branch.c:10
11992 msgid ""
11993 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
11994 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
11995 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
11996 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
11997 msgstr ""
11998 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
11999 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
12000 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
12001 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
12002
12003 #: builtin/show-branch.c:14
12004 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
12005 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
12006
12007 #: builtin/show-branch.c:375
12008 #, c-format
12009 msgid "ignoring %s; cannot handle more than %d ref"
12010 msgid_plural "ignoring %s; cannot handle more than %d refs"
12011 msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
12012 msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
12013
12014 #: builtin/show-branch.c:541
12015 #, c-format
12016 msgid "no matching refs with %s"
12017 msgstr "没有和 %s 匹配的引用"
12018
12019 #: builtin/show-branch.c:639
12020 msgid "show remote-tracking and local branches"
12021 msgstr "显示远程跟踪的和本地的分支"
12022
12023 #: builtin/show-branch.c:641
12024 msgid "show remote-tracking branches"
12025 msgstr "显示远程跟踪的分支"
12026
12027 #: builtin/show-branch.c:643
12028 msgid "color '*!+-' corresponding to the branch"
12029 msgstr "着色 '*!+-' 到相应的分支"
12030
12031 #: builtin/show-branch.c:645
12032 msgid "show <n> more commits after the common ancestor"
12033 msgstr "显示共同祖先后的 <n> 个提交"
12034
12035 #: builtin/show-branch.c:647
12036 msgid "synonym to more=-1"
12037 msgstr "和 more=-1 同义"
12038
12039 #: builtin/show-branch.c:648
12040 msgid "suppress naming strings"
12041 msgstr "不显示字符串命名"
12042
12043 #: builtin/show-branch.c:650
12044 msgid "include the current branch"
12045 msgstr "包括当前分支"
12046
12047 #: builtin/show-branch.c:652
12048 msgid "name commits with their object names"
12049 msgstr "以对象名字命名提交"
12050
12051 #: builtin/show-branch.c:654
12052 msgid "show possible merge bases"
12053 msgstr "显示可能合并的基线"
12054
12055 #: builtin/show-branch.c:656
12056 msgid "show refs unreachable from any other ref"
12057 msgstr "显示没有任何引用的的引用"
12058
12059 #: builtin/show-branch.c:658
12060 msgid "show commits in topological order"
12061 msgstr "以拓扑顺序显示提交"
12062
12063 #: builtin/show-branch.c:661
12064 msgid "show only commits not on the first branch"
12065 msgstr "只显示不在第一个分支上的提交"
12066
12067 #: builtin/show-branch.c:663
12068 msgid "show merges reachable from only one tip"
12069 msgstr "显示仅一个分支可访问的合并提交"
12070
12071 #: builtin/show-branch.c:665
12072 msgid "topologically sort, maintaining date order where possible"
12073 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
12074
12075 #: builtin/show-branch.c:668
12076 msgid "<n>[,<base>]"
12077 msgstr "<n>[,<base>]"
12078
12079 #: builtin/show-branch.c:669
12080 msgid "show <n> most recent ref-log entries starting at base"
12081 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
12082
12083 #: builtin/show-branch.c:703
12084 msgid ""
12085 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
12086 msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
12087
12088 #: builtin/show-branch.c:727
12089 msgid "no branches given, and HEAD is not valid"
12090 msgstr "未提供分支,且 HEAD 无效"
12091
12092 #: builtin/show-branch.c:730
12093 msgid "--reflog option needs one branch name"
12094 msgstr "选项 --reflog 需要一个分支名"
12095
12096 #: builtin/show-branch.c:733
12097 #, c-format
12098 msgid "only %d entry can be shown at one time."
12099 msgid_plural "only %d entries can be shown at one time."
12100 msgstr[0] "一次只能显示 %d 个条目。"
12101 msgstr[1] "一次只能显示 %d 个条目。"
12102
12103 #: builtin/show-branch.c:737
12104 #, c-format
12105 msgid "no such ref %s"
12106 msgstr "无此引用 %s"
12107
12108 #: builtin/show-branch.c:829
12109 #, c-format
12110 msgid "cannot handle more than %d rev."
12111 msgid_plural "cannot handle more than %d revs."
12112 msgstr[0] "不能处理 %d 个以上的版本。"
12113 msgstr[1] "不能处理 %d 个以上的版本。"
12114
12115 #: builtin/show-branch.c:833
12116 #, c-format
12117 msgid "'%s' is not a valid ref."
12118 msgstr "'%s' 不是一个有效的引用。"
12119
12120 #: builtin/show-branch.c:836
12121 #, c-format
12122 msgid "cannot find commit %s (%s)"
12123 msgstr "不能找到提交 %s (%s)"
12124
12125 #: builtin/show-ref.c:10
12126 msgid ""
12127 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
12128 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
12129 msgstr ""
12130 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
12131 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
12132
12133 #: builtin/show-ref.c:11
12134 msgid "git show-ref --exclude-existing[=<pattern>]"
12135 msgstr "git show-ref --exclude-existing[=<模式>]"
12136
12137 #: builtin/show-ref.c:165
12138 msgid "only show tags (can be combined with heads)"
12139 msgstr "只显示标签(可以和头共用)"
12140
12141 #: builtin/show-ref.c:166
12142 msgid "only show heads (can be combined with tags)"
12143 msgstr "只显示头(可以和标签共用)"
12144
12145 #: builtin/show-ref.c:167
12146 msgid "stricter reference checking, requires exact ref path"
12147 msgstr "更严格的引用检测,需要精确的引用路径"
12148
12149 #: builtin/show-ref.c:170 builtin/show-ref.c:172
12150 msgid "show the HEAD reference, even if it would be filtered out"
12151 msgstr "显示 HEAD 引用,即使被过滤掉"
12152
12153 #: builtin/show-ref.c:174
12154 msgid "dereference tags into object IDs"
12155 msgstr "转换标签到对象 ID"
12156
12157 #: builtin/show-ref.c:176
12158 msgid "only show SHA1 hash using <n> digits"
12159 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
12160
12161 #: builtin/show-ref.c:180
12162 msgid "do not print results to stdout (useful with --verify)"
12163 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
12164
12165 #: builtin/show-ref.c:182
12166 msgid "show refs from stdin that aren't in local repository"
12167 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
12168
12169 #: builtin/stripspace.c:17
12170 msgid "git stripspace [-s | --strip-comments]"
12171 msgstr "git stripspace [-s | --strip-comments]"
12172
12173 #: builtin/stripspace.c:18
12174 msgid "git stripspace [-c | --comment-lines]"
12175 msgstr "git stripspace [-c | --comment-lines]"
12176
12177 #: builtin/stripspace.c:35
12178 msgid "skip and remove all lines starting with comment character"
12179 msgstr "跳过和移除所有的注释行"
12180
12181 #: builtin/stripspace.c:38
12182 msgid "prepend comment character and space to each line"
12183 msgstr "为每一行的行首添加注释符和空格"
12184
12185 #: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
12186 #, c-format
12187 msgid "No such ref: %s"
12188 msgstr "没有这样的引用:%s"
12189
12190 #: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
12191 #, c-format
12192 msgid "Expecting a full ref name, got %s"
12193 msgstr "期望一个完整的引用名称,却得到 %s"
12194
12195 #: builtin/submodule--helper.c:71
12196 #, c-format
12197 msgid "cannot strip one component off url '%s'"
12198 msgstr "无法从 url '%s' 剥离一个组件"
12199
12200 #: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
12201 #: builtin/submodule--helper.c:590
12202 msgid "alternative anchor for relative paths"
12203 msgstr "相对路径的替代锚记(anchor)"
12204
12205 #: builtin/submodule--helper.c:287
12206 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
12207 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
12208
12209 #: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
12210 #, c-format
12211 msgid "No url found for submodule path '%s' in .gitmodules"
12212 msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
12213
12214 #: builtin/submodule--helper.c:369
12215 #, c-format
12216 msgid "Failed to register url for submodule path '%s'"
12217 msgstr "无法为子模组 '%s' 注册 url"
12218
12219 #: builtin/submodule--helper.c:373
12220 #, c-format
12221 msgid "Submodule '%s' (%s) registered for path '%s'\n"
12222 msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
12223
12224 #
12225 #: builtin/submodule--helper.c:383
12226 #, c-format
12227 msgid "warning: command update mode suggested for submodule '%s'\n"
12228 msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
12229
12230 #: builtin/submodule--helper.c:390
12231 #, c-format
12232 msgid "Failed to register update mode for submodule path '%s'"
12233 msgstr "无法为子模组 '%s' 注册更新模式"
12234
12235 #: builtin/submodule--helper.c:409
12236 msgid "Suppress output for initializing a submodule"
12237 msgstr "初始化子模组时抑制输出"
12238
12239 #: builtin/submodule--helper.c:414
12240 msgid "git submodule--helper init [<path>]"
12241 msgstr "git submodule--helper init [<路径>]"
12242
12243 #: builtin/submodule--helper.c:435
12244 msgid "git submodule--helper name <path>"
12245 msgstr "git submodule--helper name <路径>"
12246
12247 #: builtin/submodule--helper.c:441
12248 #, c-format
12249 msgid "no submodule mapping found in .gitmodules for path '%s'"
12250 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
12251
12252 #: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
12253 #, c-format
12254 msgid "submodule '%s' cannot add alternate: %s"
12255 msgstr "子模组 '%s' 不能添加仓库备选:%s"
12256
12257 #: builtin/submodule--helper.c:563
12258 #, c-format
12259 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
12260 msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
12261
12262 #: builtin/submodule--helper.c:570
12263 #, c-format
12264 msgid "Value '%s' for submodule.alternateLocation is not recognized"
12265 msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
12266
12267 #: builtin/submodule--helper.c:593
12268 msgid "where the new submodule will be cloned to"
12269 msgstr "新的子模组将要克隆的路径"
12270
12271 #: builtin/submodule--helper.c:596
12272 msgid "name of the new submodule"
12273 msgstr "新子模组的名称"
12274
12275 #: builtin/submodule--helper.c:599
12276 msgid "url where to clone the submodule from"
12277 msgstr "克隆子模组的 url 地址"
12278
12279 #: builtin/submodule--helper.c:605
12280 msgid "depth for shallow clones"
12281 msgstr "浅克隆的深度"
12282
12283 #: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
12284 msgid "force cloning progress"
12285 msgstr "显示克隆进度"
12286
12287 #: builtin/submodule--helper.c:613
12288 msgid ""
12289 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
12290 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
12291 msgstr ""
12292 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
12293 "[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
12294
12295 #: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
12296 #, c-format
12297 msgid "could not create directory '%s'"
12298 msgstr "不能创建目录 '%s'"
12299
12300 #: builtin/submodule--helper.c:644
12301 #, c-format
12302 msgid "clone of '%s' into submodule path '%s' failed"
12303 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
12304
12305 #: builtin/submodule--helper.c:660
12306 #, c-format
12307 msgid "cannot open file '%s'"
12308 msgstr "无法打开文件 '%s'"
12309
12310 #: builtin/submodule--helper.c:665
12311 #, c-format
12312 msgid "could not close file %s"
12313 msgstr "无法关闭文件 %s"
12314
12315 #: builtin/submodule--helper.c:672
12316 #, c-format
12317 msgid "could not get submodule directory for '%s'"
12318 msgstr "无法得到 '%s' 的子模组目录"
12319
12320 #: builtin/submodule--helper.c:726
12321 #, c-format
12322 msgid "Submodule path '%s' not initialized"
12323 msgstr "子模组 '%s' 尚未初始化"
12324
12325 #: builtin/submodule--helper.c:730
12326 msgid "Maybe you want to use 'update --init'?"
12327 msgstr "也许您想要执行 'update --init'?"
12328
12329 #: builtin/submodule--helper.c:756
12330 #, c-format
12331 msgid "Skipping unmerged submodule %s"
12332 msgstr "略过未合并的子模组 %s"
12333
12334 #: builtin/submodule--helper.c:777
12335 #, c-format
12336 msgid "Skipping submodule '%s'"
12337 msgstr "略过子模组 '%s'"
12338
12339 #: builtin/submodule--helper.c:913
12340 #, c-format
12341 msgid "Failed to clone '%s'. Retry scheduled"
12342 msgstr "克隆 '%s' 失败。按计划重试"
12343
12344 #: builtin/submodule--helper.c:924
12345 #, c-format
12346 msgid "Failed to clone '%s' a second time, aborting"
12347 msgstr "第二次尝试克隆 '%s' 失败,退出"
12348
12349 #: builtin/submodule--helper.c:945
12350 msgid "path into the working tree"
12351 msgstr "到工作区的路径"
12352
12353 #: builtin/submodule--helper.c:948
12354 msgid "path into the working tree, across nested submodule boundaries"
12355 msgstr "工作区中的路径,递归嵌套子模组"
12356
12357 #: builtin/submodule--helper.c:952
12358 msgid "rebase, merge, checkout or none"
12359 msgstr "rebase、merge、checkout 或 none"
12360
12361 #: builtin/submodule--helper.c:956
12362 msgid "Create a shallow clone truncated to the specified number of revisions"
12363 msgstr "创建一个指定深度的浅克隆"
12364
12365 #: builtin/submodule--helper.c:959
12366 msgid "parallel jobs"
12367 msgstr "并发任务"
12368
12369 #: builtin/submodule--helper.c:961
12370 msgid "whether the initial clone should follow the shallow recommendation"
12371 msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
12372
12373 #: builtin/submodule--helper.c:962
12374 msgid "don't print cloning progress"
12375 msgstr "不要输出克隆进度"
12376
12377 #: builtin/submodule--helper.c:969
12378 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
12379 msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
12380
12381 #: builtin/submodule--helper.c:979
12382 msgid "bad value for update parameter"
12383 msgstr "update 参数取值错误"
12384
12385 #: builtin/submodule--helper.c:1050
12386 #, c-format
12387 msgid ""
12388 "Submodule (%s) branch configured to inherit branch from superproject, but "
12389 "the superproject is not on any branch"
12390 msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
12391
12392 #: builtin/submodule--helper.c:1100
12393 msgid "submodule--helper subcommand must be called with a subcommand"
12394 msgstr "submodule-helper 子命令必须由另外的子命令调用"
12395
12396 #: builtin/submodule--helper.c:1107
12397 #, c-format
12398 msgid "'%s' is not a valid submodule--helper subcommand"
12399 msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
12400
12401 #: builtin/symbolic-ref.c:7
12402 msgid "git symbolic-ref [<options>] <name> [<ref>]"
12403 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
12404
12405 #: builtin/symbolic-ref.c:8
12406 msgid "git symbolic-ref -d [-q] <name>"
12407 msgstr "git symbolic-ref -d [-q] <名称>"
12408
12409 #: builtin/symbolic-ref.c:40
12410 msgid "suppress error message for non-symbolic (detached) refs"
12411 msgstr "不显示非符号(分离的)引用的错误信息"
12412
12413 #: builtin/symbolic-ref.c:41
12414 msgid "delete symbolic ref"
12415 msgstr "删除符号引用"
12416
12417 #: builtin/symbolic-ref.c:42
12418 msgid "shorten ref output"
12419 msgstr "简短的引用输出"
12420
12421 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
12422 msgid "reason"
12423 msgstr "原因"
12424
12425 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
12426 msgid "reason of the update"
12427 msgstr "更新的原因"
12428
12429 #: builtin/tag.c:23
12430 msgid ""
12431 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
12432 "[<head>]"
12433 msgstr ""
12434 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
12435
12436 #: builtin/tag.c:24
12437 msgid "git tag -d <tagname>..."
12438 msgstr "git tag -d <标签名>..."
12439
12440 #: builtin/tag.c:25
12441 msgid ""
12442 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
12443 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
12444 msgstr ""
12445 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
12446 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
12447
12448 #: builtin/tag.c:27
12449 msgid "git tag -v <tagname>..."
12450 msgstr "git tag -v <标签名>..."
12451
12452 #: builtin/tag.c:81
12453 #, c-format
12454 msgid "tag name too long: %.*s..."
12455 msgstr "标签名称太长:%.*s..."
12456
12457 #: builtin/tag.c:86
12458 #, c-format
12459 msgid "tag '%s' not found."
12460 msgstr "未发现标签 '%s'。"
12461
12462 #: builtin/tag.c:101
12463 #, c-format
12464 msgid "Deleted tag '%s' (was %s)\n"
12465 msgstr "已删除标签 '%s'(曾为 %s)\n"
12466
12467 #: builtin/tag.c:117
12468 #, c-format
12469 msgid ""
12470 "\n"
12471 "Write a message for tag:\n"
12472 " %s\n"
12473 "Lines starting with '%c' will be ignored.\n"
12474 msgstr ""
12475 "\n"
12476 "输入一个标签说明:\n"
12477 " %s\n"
12478 "以 '%c' 开头的行将被忽略。\n"
12479
12480 #: builtin/tag.c:121
12481 #, c-format
12482 msgid ""
12483 "\n"
12484 "Write a message for tag:\n"
12485 " %s\n"
12486 "Lines starting with '%c' will be kept; you may remove them yourself if you "
12487 "want to.\n"
12488 msgstr ""
12489 "\n"
12490 "输入一个标签说明:\n"
12491 " %s\n"
12492 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
12493
12494 #: builtin/tag.c:199
12495 msgid "unable to sign the tag"
12496 msgstr "无法签署标签"
12497
12498 #: builtin/tag.c:201
12499 msgid "unable to write tag file"
12500 msgstr "无法写标签文件"
12501
12502 #: builtin/tag.c:226
12503 msgid "bad object type."
12504 msgstr "坏的对象类型。"
12505
12506 #: builtin/tag.c:239
12507 msgid "tag header too big."
12508 msgstr "标签头信息太大。"
12509
12510 #: builtin/tag.c:275
12511 msgid "no tag message?"
12512 msgstr "无标签说明?"
12513
12514 #: builtin/tag.c:281
12515 #, c-format
12516 msgid "The tag message has been left in %s\n"
12517 msgstr "标签说明被保留在 %s\n"
12518
12519 #: builtin/tag.c:339
12520 msgid "list tag names"
12521 msgstr "列出标签名称"
12522
12523 #: builtin/tag.c:341
12524 msgid "print <n> lines of each tag message"
12525 msgstr "每个标签信息打印 <n> 行"
12526
12527 #: builtin/tag.c:343
12528 msgid "delete tags"
12529 msgstr "删除标签"
12530
12531 #: builtin/tag.c:344
12532 msgid "verify tags"
12533 msgstr "验证标签"
12534
12535 #: builtin/tag.c:346
12536 msgid "Tag creation options"
12537 msgstr "标签创建选项"
12538
12539 #: builtin/tag.c:348
12540 msgid "annotated tag, needs a message"
12541 msgstr "附注标签,需要一个说明"
12542
12543 #: builtin/tag.c:350
12544 msgid "tag message"
12545 msgstr "标签说明"
12546
12547 #: builtin/tag.c:352
12548 msgid "annotated and GPG-signed tag"
12549 msgstr "附注并附加 GPG 签名的标签"
12550
12551 #: builtin/tag.c:356
12552 msgid "use another key to sign the tag"
12553 msgstr "使用另外的私钥签名该标签"
12554
12555 #: builtin/tag.c:357
12556 msgid "replace the tag if exists"
12557 msgstr "如果存在,替换现有的标签"
12558
12559 #: builtin/tag.c:358 builtin/update-ref.c:368
12560 msgid "create a reflog"
12561 msgstr "创建引用日志"
12562
12563 #: builtin/tag.c:360
12564 msgid "Tag listing options"
12565 msgstr "标签列表选项"
12566
12567 #: builtin/tag.c:361
12568 msgid "show tag list in columns"
12569 msgstr "以列的方式显示标签列表"
12570
12571 #: builtin/tag.c:362 builtin/tag.c:363
12572 msgid "print only tags that contain the commit"
12573 msgstr "只打印包含提交的标签"
12574
12575 #: builtin/tag.c:364
12576 msgid "print only tags that are merged"
12577 msgstr "只打印已经合并的标签"
12578
12579 #: builtin/tag.c:365
12580 msgid "print only tags that are not merged"
12581 msgstr "只打印尚未合并的标签"
12582
12583 #: builtin/tag.c:370
12584 msgid "print only tags of the object"
12585 msgstr "只打印对象的标签"
12586
12587 #: builtin/tag.c:399
12588 msgid "--column and -n are incompatible"
12589 msgstr "--column 和 -n 不兼容"
12590
12591 #: builtin/tag.c:419
12592 msgid "-n option is only allowed with -l."
12593 msgstr "-n 选项只允许和 -l 同时使用。"
12594
12595 #: builtin/tag.c:421
12596 msgid "--contains option is only allowed with -l."
12597 msgstr "--contains 选项只允许和 -l 同时使用。"
12598
12599 #: builtin/tag.c:423
12600 msgid "--points-at option is only allowed with -l."
12601 msgstr "--points-at 选项只允许和 -l 同时使用。"
12602
12603 #: builtin/tag.c:425
12604 msgid "--merged and --no-merged option are only allowed with -l"
12605 msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
12606
12607 #: builtin/tag.c:433
12608 msgid "only one -F or -m option is allowed."
12609 msgstr "只允许一个 -F 或 -m 选项。"
12610
12611 #: builtin/tag.c:452
12612 msgid "too many params"
12613 msgstr "太多参数"
12614
12615 #: builtin/tag.c:458
12616 #, c-format
12617 msgid "'%s' is not a valid tag name."
12618 msgstr "'%s' 不是一个有效的标签名称。"
12619
12620 #: builtin/tag.c:463
12621 #, c-format
12622 msgid "tag '%s' already exists"
12623 msgstr "标签 '%s' 已存在"
12624
12625 #: builtin/tag.c:491
12626 #, c-format
12627 msgid "Updated tag '%s' (was %s)\n"
12628 msgstr "已更新标签 '%s'(曾为 %s)\n"
12629
12630 #: builtin/unpack-objects.c:493
12631 msgid "Unpacking objects"
12632 msgstr "展开对象中"
12633
12634 #: builtin/update-index.c:79
12635 #, c-format
12636 msgid "failed to create directory %s"
12637 msgstr "无法创建目录 %s"
12638
12639 #: builtin/update-index.c:85
12640 #, c-format
12641 msgid "failed to stat %s"
12642 msgstr "无法枚举 %s 状态"
12643
12644 #: builtin/update-index.c:95
12645 #, c-format
12646 msgid "failed to create file %s"
12647 msgstr "无法创建文件 %s"
12648
12649 #: builtin/update-index.c:103
12650 #, c-format
12651 msgid "failed to delete file %s"
12652 msgstr "无法删除文件 %s"
12653
12654 #: builtin/update-index.c:110 builtin/update-index.c:212
12655 #, c-format
12656 msgid "failed to delete directory %s"
12657 msgstr "无法删除目录 %s"
12658
12659 #: builtin/update-index.c:133
12660 #, c-format
12661 msgid "Testing mtime in '%s' "
12662 msgstr "在 '%s' 中测试 mtime "
12663
12664 #: builtin/update-index.c:145
12665 msgid "directory stat info does not change after adding a new file"
12666 msgstr "添加一个新文件后,目录的状态信息未改变"
12667
12668 #: builtin/update-index.c:158
12669 msgid "directory stat info does not change after adding a new directory"
12670 msgstr "添加一个新目录后,目录的状态信息未改变"
12671
12672 #: builtin/update-index.c:171
12673 msgid "directory stat info changes after updating a file"
12674 msgstr "更新一个文件后,目录的状态信息被修改"
12675
12676 #: builtin/update-index.c:182
12677 msgid "directory stat info changes after adding a file inside subdirectory"
12678 msgstr "在子目录中添加文件后,目录的状态信息被修改"
12679
12680 #: builtin/update-index.c:193
12681 msgid "directory stat info does not change after deleting a file"
12682 msgstr "删除一个文件后,目录的状态信息未改变"
12683
12684 #: builtin/update-index.c:206
12685 msgid "directory stat info does not change after deleting a directory"
12686 msgstr "删除一个目录后,目录的状态信息未改变"
12687
12688 #: builtin/update-index.c:213
12689 msgid " OK"
12690 msgstr " OK"
12691
12692 #: builtin/update-index.c:564
12693 msgid "git update-index [<options>] [--] [<file>...]"
12694 msgstr "git update-index [<选项>] [--] [<文件>...]"
12695
12696 #: builtin/update-index.c:919
12697 msgid "continue refresh even when index needs update"
12698 msgstr "当索引需要更新时继续刷新"
12699
12700 #: builtin/update-index.c:922
12701 msgid "refresh: ignore submodules"
12702 msgstr "刷新:忽略子模组"
12703
12704 #: builtin/update-index.c:925
12705 msgid "do not ignore new files"
12706 msgstr "不忽略新的文件"
12707
12708 #: builtin/update-index.c:927
12709 msgid "let files replace directories and vice-versa"
12710 msgstr "让文件替换目录(反之亦然)"
12711
12712 #: builtin/update-index.c:929
12713 msgid "notice files missing from worktree"
12714 msgstr "通知文件从工作区丢失"
12715
12716 #: builtin/update-index.c:931
12717 msgid "refresh even if index contains unmerged entries"
12718 msgstr "即使索引区包含未合并的条目也执行刷新"
12719
12720 #: builtin/update-index.c:934
12721 msgid "refresh stat information"
12722 msgstr "刷新统计信息"
12723
12724 #: builtin/update-index.c:938
12725 msgid "like --refresh, but ignore assume-unchanged setting"
12726 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
12727
12728 #: builtin/update-index.c:942
12729 msgid "<mode>,<object>,<path>"
12730 msgstr "<存取模式>,<对象>,<路径>"
12731
12732 #: builtin/update-index.c:943
12733 msgid "add the specified entry to the index"
12734 msgstr "添加指定的条目到索引区"
12735
12736 #: builtin/update-index.c:952
12737 msgid "mark files as \"not changing\""
12738 msgstr "把文件标记为 \"没有变更\""
12739
12740 #: builtin/update-index.c:955
12741 msgid "clear assumed-unchanged bit"
12742 msgstr "清除 assumed-unchanged 位"
12743
12744 #: builtin/update-index.c:958
12745 msgid "mark files as \"index-only\""
12746 msgstr "把文件标记为 \"仅索引\""
12747
12748 #: builtin/update-index.c:961
12749 msgid "clear skip-worktree bit"
12750 msgstr "清除 skip-worktree 位"
12751
12752 #: builtin/update-index.c:964
12753 msgid "add to index only; do not add content to object database"
12754 msgstr "只添加到索引区;不添加对象到对象库"
12755
12756 #: builtin/update-index.c:966
12757 msgid "remove named paths even if present in worktree"
12758 msgstr "即使存在工作区里,也删除路径"
12759
12760 #: builtin/update-index.c:968
12761 msgid "with --stdin: input lines are terminated by null bytes"
12762 msgstr "携带 --stdin:输入的行以 null 字符终止"
12763
12764 #: builtin/update-index.c:970
12765 msgid "read list of paths to be updated from standard input"
12766 msgstr "从标准输入中读取需要更新的路径列表"
12767
12768 #: builtin/update-index.c:974
12769 msgid "add entries from standard input to the index"
12770 msgstr "从标准输入添加条目到索引区"
12771
12772 #: builtin/update-index.c:978
12773 msgid "repopulate stages #2 and #3 for the listed paths"
12774 msgstr "为指定文件重新生成第2和第3暂存区"
12775
12776 #: builtin/update-index.c:982
12777 msgid "only update entries that differ from HEAD"
12778 msgstr "只更新与 HEAD 不同的条目"
12779
12780 #: builtin/update-index.c:986
12781 msgid "ignore files missing from worktree"
12782 msgstr "忽略工作区丢失的文件"
12783
12784 #: builtin/update-index.c:989
12785 msgid "report actions to standard output"
12786 msgstr "在标准输出显示操作"
12787
12788 #: builtin/update-index.c:991
12789 msgid "(for porcelains) forget saved unresolved conflicts"
12790 msgstr "(for porcelains) 忘记保存的未解决的冲突"
12791
12792 #: builtin/update-index.c:995
12793 msgid "write index in this format"
12794 msgstr "以这种格式写入索引区"
12795
12796 #: builtin/update-index.c:997
12797 msgid "enable or disable split index"
12798 msgstr "启用或禁用索引拆分"
12799
12800 #: builtin/update-index.c:999
12801 msgid "enable/disable untracked cache"
12802 msgstr "启用/禁用对未跟踪文件的缓存"
12803
12804 #: builtin/update-index.c:1001
12805 msgid "test if the filesystem supports untracked cache"
12806 msgstr "测试文件系统是否支持未跟踪文件缓存"
12807
12808 #: builtin/update-index.c:1003
12809 msgid "enable untracked cache without testing the filesystem"
12810 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
12811
12812 #: builtin/update-index.c:1119
12813 msgid ""
12814 "core.untrackedCache is set to true; remove or change it, if you really want "
12815 "to disable the untracked cache"
12816 msgstr "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修改它。"
12817
12818 #: builtin/update-index.c:1123
12819 msgid "Untracked cache disabled"
12820 msgstr "缓存未跟踪文件被禁用"
12821
12822 #: builtin/update-index.c:1131
12823 msgid ""
12824 "core.untrackedCache is set to false; remove or change it, if you really want "
12825 "to enable the untracked cache"
12826 msgstr "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或修改它。"
12827
12828 #: builtin/update-index.c:1135
12829 #, c-format
12830 msgid "Untracked cache enabled for '%s'"
12831 msgstr "缓存未跟踪文件在 '%s' 启用"
12832
12833 #: builtin/update-ref.c:9
12834 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
12835 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
12836
12837 #: builtin/update-ref.c:10
12838 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
12839 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
12840
12841 #: builtin/update-ref.c:11
12842 msgid "git update-ref [<options>] --stdin [-z]"
12843 msgstr "git update-ref [<选项>] --stdin [-z]"
12844
12845 #: builtin/update-ref.c:363
12846 msgid "delete the reference"
12847 msgstr "删除引用"
12848
12849 #: builtin/update-ref.c:365
12850 msgid "update <refname> not the one it points to"
12851 msgstr "更新 <引用名> 本身而不是它指向的引用"
12852
12853 #: builtin/update-ref.c:366
12854 msgid "stdin has NUL-terminated arguments"
12855 msgstr "标准输入有以 NUL 字符终止的参数"
12856
12857 #: builtin/update-ref.c:367
12858 msgid "read updates from stdin"
12859 msgstr "从标准输入读取更新"
12860
12861 #: builtin/update-server-info.c:6
12862 msgid "git update-server-info [--force]"
12863 msgstr "git update-server-info [--force]"
12864
12865 #: builtin/update-server-info.c:14
12866 msgid "update the info files from scratch"
12867 msgstr "从头开始更新文件信息"
12868
12869 #: builtin/verify-commit.c:17
12870 msgid "git verify-commit [-v | --verbose] <commit>..."
12871 msgstr "git verify-commit [-v | --verbose] <提交>..."
12872
12873 #: builtin/verify-commit.c:72
12874 msgid "print commit contents"
12875 msgstr "打印提交内容"
12876
12877 #: builtin/verify-commit.c:73 builtin/verify-tag.c:35
12878 msgid "print raw gpg status output"
12879 msgstr "打印原始 gpg 状态输出"
12880
12881 #: builtin/verify-pack.c:54
12882 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
12883 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
12884
12885 #: builtin/verify-pack.c:64
12886 msgid "verbose"
12887 msgstr "冗长输出"
12888
12889 #: builtin/verify-pack.c:66
12890 msgid "show statistics only"
12891 msgstr "只显示统计"
12892
12893 #: builtin/verify-tag.c:17
12894 msgid "git verify-tag [-v | --verbose] <tag>..."
12895 msgstr "git verify-tag [-v | --verbose] <标签>..."
12896
12897 #: builtin/verify-tag.c:34
12898 msgid "print tag contents"
12899 msgstr "打印标签内容"
12900
12901 #: builtin/worktree.c:15
12902 msgid "git worktree add [<options>] <path> [<branch>]"
12903 msgstr "git worktree add [<选项>] <路径> [<分支>]"
12904
12905 #: builtin/worktree.c:16
12906 msgid "git worktree list [<options>]"
12907 msgstr "git worktree list [<选项>]"
12908
12909 #: builtin/worktree.c:17
12910 msgid "git worktree lock [<options>] <path>"
12911 msgstr "git worktree lock [<选项>] <路径>"
12912
12913 #: builtin/worktree.c:18
12914 msgid "git worktree prune [<options>]"
12915 msgstr "git worktree prune [<选项>]"
12916
12917 #: builtin/worktree.c:19
12918 msgid "git worktree unlock <path>"
12919 msgstr "git worktree unlock <路径>"
12920
12921 #: builtin/worktree.c:42
12922 #, c-format
12923 msgid "Removing worktrees/%s: not a valid directory"
12924 msgstr "删除工作区/%s:不是一个有效的目录"
12925
12926 #: builtin/worktree.c:48
12927 #, c-format
12928 msgid "Removing worktrees/%s: gitdir file does not exist"
12929 msgstr "删除 worktrees/%s:gitdir 文件不存在"
12930
12931 #: builtin/worktree.c:53
12932 #, c-format
12933 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
12934 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
12935
12936 #: builtin/worktree.c:64
12937 #, c-format
12938 msgid "Removing worktrees/%s: invalid gitdir file"
12939 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
12940
12941 #: builtin/worktree.c:80
12942 #, c-format
12943 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
12944 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
12945
12946 #: builtin/worktree.c:204
12947 #, c-format
12948 msgid "'%s' already exists"
12949 msgstr "'%s' 已经存在"
12950
12951 #: builtin/worktree.c:236
12952 #, c-format
12953 msgid "could not create directory of '%s'"
12954 msgstr "不能创建目录 '%s'"
12955
12956 #: builtin/worktree.c:272
12957 #, c-format
12958 msgid "Preparing %s (identifier %s)"
12959 msgstr "准备 %s (标识符 %s)"
12960
12961 #: builtin/worktree.c:323
12962 msgid "checkout <branch> even if already checked out in other worktree"
12963 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
12964
12965 #: builtin/worktree.c:325
12966 msgid "create a new branch"
12967 msgstr "创建一个新分支"
12968
12969 #: builtin/worktree.c:327
12970 msgid "create or reset a branch"
12971 msgstr "创建或重置一个分支"
12972
12973 #: builtin/worktree.c:329
12974 msgid "populate the new working tree"
12975 msgstr "生成新的工作区"
12976
12977 #: builtin/worktree.c:337
12978 msgid "-b, -B, and --detach are mutually exclusive"
12979 msgstr "-b、-B 和 --detach 是互斥的"
12980
12981 #: builtin/worktree.c:470
12982 msgid "reason for locking"
12983 msgstr "锁定原因"
12984
12985 #: builtin/worktree.c:482 builtin/worktree.c:515
12986 #, c-format
12987 msgid "'%s' is not a working tree"
12988 msgstr "'%s' 不是一个工作区"
12989
12990 #: builtin/worktree.c:484 builtin/worktree.c:517
12991 msgid "The main working tree cannot be locked or unlocked"
12992 msgstr "主工作区无法被加锁或解锁"
12993
12994 #: builtin/worktree.c:489
12995 #, c-format
12996 msgid "'%s' is already locked, reason: %s"
12997 msgstr "'%s' 已被锁定,原因:%s"
12998
12999 #: builtin/worktree.c:491
13000 #, c-format
13001 msgid "'%s' is already locked"
13002 msgstr "'%s' 已被锁定"
13003
13004 #: builtin/worktree.c:519
13005 #, c-format
13006 msgid "'%s' is not locked"
13007 msgstr "'%s' 未被锁定"
13008
13009 #: builtin/write-tree.c:13
13010 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
13011 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
13012
13013 #: builtin/write-tree.c:26
13014 msgid "<prefix>/"
13015 msgstr "<前缀>/"
13016
13017 #: builtin/write-tree.c:27
13018 msgid "write tree object for a subdirectory <prefix>"
13019 msgstr "将 <前缀> 子目录内容写到一个树对象"
13020
13021 #: builtin/write-tree.c:30
13022 msgid "only useful for debugging"
13023 msgstr "只对调试有用"
13024
13025 #: upload-pack.c:22
13026 msgid "git upload-pack [<options>] <dir>"
13027 msgstr "git upload-pack [<选项>] <目录>"
13028
13029 #: upload-pack.c:1028
13030 msgid "quit after a single request/response exchange"
13031 msgstr "在一次单独的请求/响应(request/response)交换后退出"
13032
13033 #: upload-pack.c:1030
13034 msgid "exit immediately after initial ref advertisement"
13035 msgstr "在初始的引用广告后立即退出"
13036
13037 #: upload-pack.c:1032
13038 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
13039 msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
13040
13041 #: upload-pack.c:1034
13042 msgid "interrupt transfer after <n> seconds of inactivity"
13043 msgstr "不活动 <n> 秒钟后终止传输"
13044
13045 #: credential-cache--daemon.c:223
13046 #, c-format
13047 msgid ""
13048 "The permissions on your socket directory are too loose; other\n"
13049 "users may be able to read your cached credentials. Consider running:\n"
13050 "\n"
13051 "\tchmod 0700 %s"
13052 msgstr ""
13053 "您 socket 目录权限过于放松,其他用户可能会读取您缓存的认证信息。考虑执行:\n"
13054 "\n"
13055 "\tchmod 0700 %s"
13056
13057 #: credential-cache--daemon.c:271
13058 msgid "print debugging messages to stderr"
13059 msgstr "调试信息输出到标准错误"
13060
13061 #: git.c:14
13062 msgid ""
13063 "'git help -a' and 'git help -g' list available subcommands and some\n"
13064 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
13065 "to read about a specific subcommand or concept."
13066 msgstr ""
13067 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
13068 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
13069 "帮助。"
13070
13071 #: http.c:342
13072 msgid "Delegation control is not supported with cURL < 7.22.0"
13073 msgstr "当 cURL < 7.22.0 时,不支持委托控制"
13074
13075 #: http.c:351
13076 msgid "Public key pinning not supported with cURL < 7.44.0"
13077 msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
13078
13079 #: common-cmds.h:9
13080 msgid "start a working area (see also: git help tutorial)"
13081 msgstr "开始一个工作区(参见:git help tutorial)"
13082
13083 #: common-cmds.h:10
13084 msgid "work on the current change (see also: git help everyday)"
13085 msgstr "在当前变更上工作(参见:git help everyday)"
13086
13087 #: common-cmds.h:11
13088 msgid "examine the history and state (see also: git help revisions)"
13089 msgstr "检查历史和状态(参见:git help revisions)"
13090
13091 #: common-cmds.h:12
13092 msgid "grow, mark and tweak your common history"
13093 msgstr "扩展、标记和调校您的历史记录"
13094
13095 #: common-cmds.h:13
13096 msgid "collaborate (see also: git help workflows)"
13097 msgstr "协同(参见:git help workflows)"
13098
13099 #: common-cmds.h:17
13100 msgid "Add file contents to the index"
13101 msgstr "添加文件内容至索引"
13102
13103 #: common-cmds.h:18
13104 msgid "Use binary search to find the commit that introduced a bug"
13105 msgstr "通过二分查找定位引入 bug 的提交"
13106
13107 #: common-cmds.h:19
13108 msgid "List, create, or delete branches"
13109 msgstr "列出、创建或删除分支"
13110
13111 #: common-cmds.h:20
13112 msgid "Switch branches or restore working tree files"
13113 msgstr "切换分支或恢复工作区文件"
13114
13115 #: common-cmds.h:21
13116 msgid "Clone a repository into a new directory"
13117 msgstr "克隆一个仓库到一个新目录"
13118
13119 #: common-cmds.h:22
13120 msgid "Record changes to the repository"
13121 msgstr "记录变更到仓库"
13122
13123 #: common-cmds.h:23
13124 msgid "Show changes between commits, commit and working tree, etc"
13125 msgstr "显示提交之间、提交和工作区之间等的差异"
13126
13127 #: common-cmds.h:24
13128 msgid "Download objects and refs from another repository"
13129 msgstr "从另外一个仓库下载对象和引用"
13130
13131 #: common-cmds.h:25
13132 msgid "Print lines matching a pattern"
13133 msgstr "输出和模式匹配的行"
13134
13135 #: common-cmds.h:26
13136 msgid "Create an empty Git repository or reinitialize an existing one"
13137 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
13138
13139 #: common-cmds.h:27
13140 msgid "Show commit logs"
13141 msgstr "显示提交日志"
13142
13143 #: common-cmds.h:28
13144 msgid "Join two or more development histories together"
13145 msgstr "合并两个或更多开发历史"
13146
13147 #: common-cmds.h:29
13148 msgid "Move or rename a file, a directory, or a symlink"
13149 msgstr "移动或重命名一个文件、目录或符号链接"
13150
13151 #: common-cmds.h:30
13152 msgid "Fetch from and integrate with another repository or a local branch"
13153 msgstr "获取并整合另外的仓库或一个本地分支"
13154
13155 #: common-cmds.h:31
13156 msgid "Update remote refs along with associated objects"
13157 msgstr "更新远程引用和相关的对象"
13158
13159 #: common-cmds.h:32
13160 msgid "Reapply commits on top of another base tip"
13161 msgstr "在另一个分支上重新应用提交"
13162
13163 #: common-cmds.h:33
13164 msgid "Reset current HEAD to the specified state"
13165 msgstr "重置当前 HEAD 到指定状态"
13166
13167 #: common-cmds.h:34
13168 msgid "Remove files from the working tree and from the index"
13169 msgstr "从工作区和索引中删除文件"
13170
13171 #: common-cmds.h:35
13172 msgid "Show various types of objects"
13173 msgstr "显示各种类型的对象"
13174
13175 #: common-cmds.h:36
13176 msgid "Show the working tree status"
13177 msgstr "显示工作区状态"
13178
13179 #: common-cmds.h:37
13180 msgid "Create, list, delete or verify a tag object signed with GPG"
13181 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
13182
13183 #: parse-options.h:145
13184 msgid "expiry-date"
13185 msgstr "到期时间"
13186
13187 #: parse-options.h:160
13188 msgid "no-op (backward compatibility)"
13189 msgstr "空操作(向后兼容)"
13190
13191 #: parse-options.h:238
13192 msgid "be more verbose"
13193 msgstr "更加详细"
13194
13195 #: parse-options.h:240
13196 msgid "be more quiet"
13197 msgstr "更加安静"
13198
13199 #: parse-options.h:246
13200 msgid "use <n> digits to display SHA-1s"
13201 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
13202
13203 #: rerere.h:40
13204 msgid "update the index with reused conflict resolution if possible"
13205 msgstr "如果可能,重用冲突解决更新索引"
13206
13207 #: git-bisect.sh:54
13208 msgid "You need to start by \"git bisect start\""
13209 msgstr "您需要执行 \"git bisect start\" 来开始"
13210
13211 # 译者:注意保持句尾空格
13212 #. TRANSLATORS: Make sure to include [Y] and [n] in your
13213 #. translation. The program will only accept English input
13214 #. at this point.
13215 #: git-bisect.sh:60
13216 msgid "Do you want me to do it for you [Y/n]? "
13217 msgstr "您想让我为您这样做么[Y/n]? "
13218
13219 #: git-bisect.sh:121
13220 #, sh-format
13221 msgid "unrecognised option: '$arg'"
13222 msgstr "未能识别的选项:'$arg'"
13223
13224 #: git-bisect.sh:125
13225 #, sh-format
13226 msgid "'$arg' does not appear to be a valid revision"
13227 msgstr "'$arg' 看起来不像是一个有效的版本"
13228
13229 #: git-bisect.sh:154
13230 msgid "Bad HEAD - I need a HEAD"
13231 msgstr "坏的 HEAD - 我需要一个 HEAD"
13232
13233 #: git-bisect.sh:167
13234 #, sh-format
13235 msgid ""
13236 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
13237 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
13238
13239 #: git-bisect.sh:177
13240 msgid "won't bisect on cg-seek'ed tree"
13241 msgstr "不会在做了 cg-seek 的树上做二分查找"
13242
13243 #: git-bisect.sh:181
13244 msgid "Bad HEAD - strange symbolic ref"
13245 msgstr "坏的 HEAD - 奇怪的符号引用"
13246
13247 #: git-bisect.sh:233
13248 #, sh-format
13249 msgid "Bad bisect_write argument: $state"
13250 msgstr "坏的 bisect_write 参数:$state"
13251
13252 #: git-bisect.sh:262
13253 #, sh-format
13254 msgid "Bad rev input: $arg"
13255 msgstr "坏的输入版本:$arg"
13256
13257 #: git-bisect.sh:281
13258 #, sh-format
13259 msgid "Bad rev input: $bisected_head"
13260 msgstr "坏的输入版本:$bisected_head"
13261
13262 #: git-bisect.sh:290
13263 #, sh-format
13264 msgid "Bad rev input: $rev"
13265 msgstr "坏的输入版本:$rev"
13266
13267 #: git-bisect.sh:299
13268 #, sh-format
13269 msgid "'git bisect $TERM_BAD' can take only one argument."
13270 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
13271
13272 #: git-bisect.sh:322
13273 #, sh-format
13274 msgid "Warning: bisecting only with a $TERM_BAD commit."
13275 msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
13276
13277 # 译者:注意保持句尾空格
13278 #. TRANSLATORS: Make sure to include [Y] and [n] in your
13279 #. translation. The program will only accept English input
13280 #. at this point.
13281 #: git-bisect.sh:328
13282 msgid "Are you sure [Y/n]? "
13283 msgstr "您确认么[Y/n]? "
13284
13285 #: git-bisect.sh:340
13286 #, sh-format
13287 msgid ""
13288 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
13289 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
13290 msgstr ""
13291 "您需要给我至少一个好版本和一个坏版本。\n"
13292 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
13293
13294 #: git-bisect.sh:343
13295 #, sh-format
13296 msgid ""
13297 "You need to start by \"git bisect start\".\n"
13298 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
13299 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
13300 msgstr ""
13301 "您需要执行 \"git bisect start\" 来开始。\n"
13302 "然后需要提供我至少一个好版本和一个坏版本。\n"
13303 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
13304
13305 #: git-bisect.sh:414 git-bisect.sh:546
13306 msgid "We are not bisecting."
13307 msgstr "我们没有在二分查找。"
13308
13309 #: git-bisect.sh:421
13310 #, sh-format
13311 msgid "'$invalid' is not a valid commit"
13312 msgstr "'$invalid' 不是一个有效的提交"
13313
13314 #: git-bisect.sh:430
13315 #, sh-format
13316 msgid ""
13317 "Could not check out original HEAD '$branch'.\n"
13318 "Try 'git bisect reset <commit>'."
13319 msgstr ""
13320 "不能检出原始 HEAD '$branch'。\n"
13321 "尝试 'git bisect reset <提交>'。"
13322
13323 #: git-bisect.sh:458
13324 msgid "No logfile given"
13325 msgstr "未提供日志文件"
13326
13327 #: git-bisect.sh:459
13328 #, sh-format
13329 msgid "cannot read $file for replaying"
13330 msgstr "不能读取 $file 来重放"
13331
13332 #: git-bisect.sh:480
13333 msgid "?? what are you talking about?"
13334 msgstr "?? 您在说什么?"
13335
13336 #: git-bisect.sh:492
13337 #, sh-format
13338 msgid "running $command"
13339 msgstr "运行 $command"
13340
13341 #: git-bisect.sh:499
13342 #, sh-format
13343 msgid ""
13344 "bisect run failed:\n"
13345 "exit code $res from '$command' is < 0 or >= 128"
13346 msgstr ""
13347 "二分查找运行失败:\n"
13348 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
13349
13350 #: git-bisect.sh:525
13351 msgid "bisect run cannot continue any more"
13352 msgstr "二分查找不能继续运行"
13353
13354 #: git-bisect.sh:531
13355 #, sh-format
13356 msgid ""
13357 "bisect run failed:\n"
13358 "'bisect_state $state' exited with error code $res"
13359 msgstr ""
13360 "二分查找运行失败:\n"
13361 "'bisect_state $state' 退出码为 $res"
13362
13363 #: git-bisect.sh:538
13364 msgid "bisect run success"
13365 msgstr "二分查找运行成功"
13366
13367 #: git-bisect.sh:565
13368 msgid "please use two different terms"
13369 msgstr "请使用两个不同的术语"
13370
13371 #: git-bisect.sh:575
13372 #, sh-format
13373 msgid "'$term' is not a valid term"
13374 msgstr "'$term' 不是一个有效的名称"
13375
13376 #: git-bisect.sh:578
13377 #, sh-format
13378 msgid "can't use the builtin command '$term' as a term"
13379 msgstr "不能使用内置命令 '$term' 作为术语"
13380
13381 #: git-bisect.sh:587 git-bisect.sh:593
13382 #, sh-format
13383 msgid "can't change the meaning of term '$term'"
13384 msgstr "不能修改术语 '$term' 的含义"
13385
13386 #: git-bisect.sh:606
13387 #, sh-format
13388 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
13389 msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
13390
13391 #: git-bisect.sh:636
13392 msgid "no terms defined"
13393 msgstr "未定义术语"
13394
13395 #: git-bisect.sh:653
13396 #, sh-format
13397 msgid ""
13398 "invalid argument $arg for 'git bisect terms'.\n"
13399 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
13400 msgstr ""
13401 "参数 $arg 对命令 'git bisect terms' 无效。\n"
13402 "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
13403
13404 #: git-merge-octopus.sh:46
13405 msgid ""
13406 "Error: Your local changes to the following files would be overwritten by "
13407 "merge"
13408 msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
13409
13410 #: git-merge-octopus.sh:61
13411 msgid "Automated merge did not work."
13412 msgstr "自动合并未生效。"
13413
13414 #: git-merge-octopus.sh:62
13415 msgid "Should not be doing an octopus."
13416 msgstr "不应该执行章鱼式合并。"
13417
13418 #: git-merge-octopus.sh:73
13419 #, sh-format
13420 msgid "Unable to find common commit with $pretty_name"
13421 msgstr "无法找到和 $pretty_name 的基线提交"
13422
13423 #: git-merge-octopus.sh:77
13424 #, sh-format
13425 msgid "Already up-to-date with $pretty_name"
13426 msgstr "已经和 $pretty_name 保持一致"
13427
13428 #: git-merge-octopus.sh:89
13429 #, sh-format
13430 msgid "Fast-forwarding to: $pretty_name"
13431 msgstr "快进至:$pretty_name"
13432
13433 #: git-merge-octopus.sh:97
13434 #, sh-format
13435 msgid "Trying simple merge with $pretty_name"
13436 msgstr "尝试和 $pretty_name 的简单合并"
13437
13438 #: git-merge-octopus.sh:102
13439 msgid "Simple merge did not work, trying automatic merge."
13440 msgstr "简单合并未生效,尝试自动合并。"
13441
13442 #: git-rebase.sh:56
13443 msgid ""
13444 "When you have resolved this problem, run \"git rebase --continue\".\n"
13445 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
13446 "To check out the original branch and stop rebasing, run \"git rebase --abort"
13447 "\"."
13448 msgstr ""
13449 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
13450 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
13451 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
13452
13453 #: git-rebase.sh:156 git-rebase.sh:395
13454 #, sh-format
13455 msgid "Could not move back to $head_name"
13456 msgstr "无法移回 $head_name"
13457
13458 #: git-rebase.sh:167
13459 msgid "Applied autostash."
13460 msgstr "成功应用 autostash。"
13461
13462 #: git-rebase.sh:170
13463 #, sh-format
13464 msgid "Cannot store $stash_sha1"
13465 msgstr "无法保存 $stash_sha1"
13466
13467 #: git-rebase.sh:171
13468 msgid ""
13469 "Applying autostash resulted in conflicts.\n"
13470 "Your changes are safe in the stash.\n"
13471 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
13472 msgstr ""
13473 "应用 autostash 导致冲突。\n"
13474 "您的修改安全地保存在 stash 中。\n"
13475 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
13476
13477 #: git-rebase.sh:210
13478 msgid "The pre-rebase hook refused to rebase."
13479 msgstr "钩子 pre-rebase 拒绝变基操作。"
13480
13481 #: git-rebase.sh:215
13482 msgid "It looks like git-am is in progress. Cannot rebase."
13483 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
13484
13485 #: git-rebase.sh:356
13486 msgid "No rebase in progress?"
13487 msgstr "没有正在进行的变基?"
13488
13489 #: git-rebase.sh:367
13490 msgid "The --edit-todo action can only be used during interactive rebase."
13491 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
13492
13493 #: git-rebase.sh:374
13494 msgid "Cannot read HEAD"
13495 msgstr "不能读取 HEAD"
13496
13497 #: git-rebase.sh:377
13498 msgid ""
13499 "You must edit all merge conflicts and then\n"
13500 "mark them as resolved using git add"
13501 msgstr ""
13502 "您必须编辑所有的合并冲突,然后通过 git add\n"
13503 "命令将它们标记为已解决"
13504
13505 #: git-rebase.sh:414
13506 #, sh-format
13507 msgid ""
13508 "It seems that there is already a $state_dir_base directory, and\n"
13509 "I wonder if you are in the middle of another rebase. If that is the\n"
13510 "case, please try\n"
13511 "\t$cmd_live_rebase\n"
13512 "If that is not the case, please\n"
13513 "\t$cmd_clear_stale_rebase\n"
13514 "and run me again. I am stopping in case you still have something\n"
13515 "valuable there."
13516 msgstr ""
13517 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
13518 "过程中。 如果是这样,请执行\n"
13519 "\t$cmd_live_rebase\n"
13520 "如果不是这样,请执行\n"
13521 "\t$cmd_clear_stale_rebase\n"
13522 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
13523
13524 #: git-rebase.sh:465
13525 #, sh-format
13526 msgid "invalid upstream $upstream_name"
13527 msgstr "无效的上游 $upstream_name"
13528
13529 #: git-rebase.sh:489
13530 #, sh-format
13531 msgid "$onto_name: there are more than one merge bases"
13532 msgstr "$onto_name: 有一个以上的合并基准"
13533
13534 #: git-rebase.sh:492 git-rebase.sh:496
13535 #, sh-format
13536 msgid "$onto_name: there is no merge base"
13537 msgstr "$onto_name: 没有合并基准"
13538
13539 #: git-rebase.sh:501
13540 #, sh-format
13541 msgid "Does not point to a valid commit: $onto_name"
13542 msgstr "没有指向一个有效的提交:$onto_name"
13543
13544 #: git-rebase.sh:524
13545 #, sh-format
13546 msgid "fatal: no such branch: $branch_name"
13547 msgstr "严重错误:无此分支:$branch_name"
13548
13549 #: git-rebase.sh:557
13550 msgid "Cannot autostash"
13551 msgstr "无法 autostash"
13552
13553 #: git-rebase.sh:562
13554 #, sh-format
13555 msgid "Created autostash: $stash_abbrev"
13556 msgstr "创建了 autostash: $stash_abbrev"
13557
13558 #: git-rebase.sh:566
13559 msgid "Please commit or stash them."
13560 msgstr "请提交或为它们保存进度。"
13561
13562 #: git-rebase.sh:586
13563 #, sh-format
13564 msgid "Current branch $branch_name is up to date."
13565 msgstr "当前分支 $branch_name 是最新的。"
13566
13567 #: git-rebase.sh:590
13568 #, sh-format
13569 msgid "Current branch $branch_name is up to date, rebase forced."
13570 msgstr "当前分支 $branch_name 是最新的,强制变基。"
13571
13572 #: git-rebase.sh:601
13573 #, sh-format
13574 msgid "Changes from $mb to $onto:"
13575 msgstr "变更从 $mb 到 $onto:"
13576
13577 #: git-rebase.sh:610
13578 msgid "First, rewinding head to replay your work on top of it..."
13579 msgstr "首先,回退分支以便在上面重放您的工作..."
13580
13581 #: git-rebase.sh:620
13582 #, sh-format
13583 msgid "Fast-forwarded $branch_name to $onto_name."
13584 msgstr "快进 $branch_name 至 $onto_name。"
13585
13586 #: git-stash.sh:50
13587 msgid "git stash clear with parameters is unimplemented"
13588 msgstr "git stash clear 不支持参数"
13589
13590 #: git-stash.sh:73
13591 msgid "You do not have the initial commit yet"
13592 msgstr "您尚未建立初始提交"
13593
13594 #: git-stash.sh:88
13595 msgid "Cannot save the current index state"
13596 msgstr "无法保存当前索引状态"
13597
13598 #: git-stash.sh:103
13599 msgid "Cannot save the untracked files"
13600 msgstr "无法保存未跟踪文件"
13601
13602 #: git-stash.sh:123 git-stash.sh:136
13603 msgid "Cannot save the current worktree state"
13604 msgstr "无法保存当前工作区状态"
13605
13606 #: git-stash.sh:140
13607 msgid "No changes selected"
13608 msgstr "没有选择变更"
13609
13610 #: git-stash.sh:143
13611 msgid "Cannot remove temporary index (can't happen)"
13612 msgstr "无法删除临时索引(不应发生)"
13613
13614 #: git-stash.sh:156
13615 msgid "Cannot record working tree state"
13616 msgstr "不能记录工作区状态"
13617
13618 #: git-stash.sh:188
13619 #, sh-format
13620 msgid "Cannot update $ref_stash with $w_commit"
13621 msgstr "无法用 $w_commit 更新 $ref_stash"
13622
13623 #. TRANSLATORS: $option is an invalid option, like
13624 #. `--blah-blah'. The 7 spaces at the beginning of the
13625 #. second line correspond to "error: ". So you should line
13626 #. up the second line with however many characters the
13627 #. translation of "error: " takes in your language. E.g. in
13628 #. English this is:
13629 #.
13630 #. $ git stash save --blah-blah 2>&1 | head -n 2
13631 #. error: unknown option for 'stash save': --blah-blah
13632 #. To provide a message, use git stash save -- '--blah-blah'
13633 #: git-stash.sh:238
13634 #, sh-format
13635 msgid ""
13636 "error: unknown option for 'stash save': $option\n"
13637 " To provide a message, use git stash save -- '$option'"
13638 msgstr ""
13639 "错误:'stash save' 的未知选项:$option\n"
13640 " 要提供一个描述信息,使用 git stash save -- '$option'"
13641
13642 #: git-stash.sh:251
13643 msgid "Can't use --patch and --include-untracked or --all at the same time"
13644 msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
13645
13646 #: git-stash.sh:259
13647 msgid "No local changes to save"
13648 msgstr "没有要保存的本地修改"
13649
13650 #: git-stash.sh:263
13651 msgid "Cannot initialize stash"
13652 msgstr "无法初始化 stash"
13653
13654 #: git-stash.sh:267
13655 msgid "Cannot save the current status"
13656 msgstr "无法保存当前状态"
13657
13658 #: git-stash.sh:268
13659 #, sh-format
13660 msgid "Saved working directory and index state $stash_msg"
13661 msgstr "保存工作目录和索引状态 $stash_msg"
13662
13663 #: git-stash.sh:285
13664 msgid "Cannot remove worktree changes"
13665 msgstr "无法删除工作区变更"
13666
13667 #: git-stash.sh:403
13668 #, sh-format
13669 msgid "unknown option: $opt"
13670 msgstr "未知选项: $opt"
13671
13672 #: git-stash.sh:416
13673 msgid "No stash found."
13674 msgstr "未发现 stash。"
13675
13676 #: git-stash.sh:423
13677 #, sh-format
13678 msgid "Too many revisions specified: $REV"
13679 msgstr "指定了太多的版本:$REV"
13680
13681 #: git-stash.sh:438
13682 #, sh-format
13683 msgid "$reference is not a valid reference"
13684 msgstr "$reference 不是一个有效的引用"
13685
13686 #: git-stash.sh:466
13687 #, sh-format
13688 msgid "'$args' is not a stash-like commit"
13689 msgstr "'$args' 不是 stash 样提交"
13690
13691 #: git-stash.sh:477
13692 #, sh-format
13693 msgid "'$args' is not a stash reference"
13694 msgstr "'$args' 不是一个 stash 引用"
13695
13696 #: git-stash.sh:485
13697 msgid "unable to refresh index"
13698 msgstr "无法刷新索引"
13699
13700 #: git-stash.sh:489
13701 msgid "Cannot apply a stash in the middle of a merge"
13702 msgstr "无法在合并过程中恢复进度"
13703
13704 #: git-stash.sh:497
13705 msgid "Conflicts in index. Try without --index."
13706 msgstr "索引中有冲突。尝试不使用 --index。"
13707
13708 #: git-stash.sh:499
13709 msgid "Could not save index tree"
13710 msgstr "不能保存索引树"
13711
13712 #: git-stash.sh:508
13713 msgid "Could not restore untracked files from stash"
13714 msgstr "无法从进度保存中恢复未跟踪文件"
13715
13716 #: git-stash.sh:533
13717 msgid "Cannot unstage modified files"
13718 msgstr "无法将修改的文件取消暂存"
13719
13720 #: git-stash.sh:548
13721 msgid "Index was not unstashed."
13722 msgstr "索引的进度没有被恢复。"
13723
13724 #: git-stash.sh:562
13725 msgid "The stash is kept in case you need it again."
13726 msgstr "暂存被保留以备您再次需要。"
13727
13728 #: git-stash.sh:571
13729 #, sh-format
13730 msgid "Dropped ${REV} ($s)"
13731 msgstr "丢弃了 ${REV} ($s)"
13732
13733 #: git-stash.sh:572
13734 #, sh-format
13735 msgid "${REV}: Could not drop stash entry"
13736 msgstr "${REV}:不能丢弃进度条目"
13737
13738 #: git-stash.sh:580
13739 msgid "No branch name specified"
13740 msgstr "未指定分支名"
13741
13742 #: git-stash.sh:652
13743 msgid "(To restore them type \"git stash apply\")"
13744 msgstr "(为恢复数据输入 \"git stash apply\")"
13745
13746 #: git-submodule.sh:184
13747 msgid "Relative path can only be used from the toplevel of the working tree"
13748 msgstr "只能在工作区的顶级目录中使用相对路径"
13749
13750 #: git-submodule.sh:194
13751 #, sh-format
13752 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
13753 msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
13754
13755 #: git-submodule.sh:211
13756 #, sh-format
13757 msgid "'$sm_path' already exists in the index"
13758 msgstr "'$sm_path' 已经存在于索引中"
13759
13760 #: git-submodule.sh:215
13761 #, sh-format
13762 msgid ""
13763 "The following path is ignored by one of your .gitignore files:\n"
13764 "$sm_path\n"
13765 "Use -f if you really want to add it."
13766 msgstr ""
13767 "以下路径被您的一个 .gitignore 文件所忽略:\n"
13768 "$sm_path\n"
13769 "如果您确实想添加它,使用 -f 参数。"
13770
13771 #: git-submodule.sh:233
13772 #, sh-format
13773 msgid "Adding existing repo at '$sm_path' to the index"
13774 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
13775
13776 #: git-submodule.sh:235
13777 #, sh-format
13778 msgid "'$sm_path' already exists and is not a valid git repo"
13779 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
13780
13781 #: git-submodule.sh:243
13782 #, sh-format
13783 msgid "A git directory for '$sm_name' is found locally with remote(s):"
13784 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
13785
13786 #: git-submodule.sh:245
13787 #, sh-format
13788 msgid ""
13789 "If you want to reuse this local git directory instead of cloning again from\n"
13790 " $realrepo\n"
13791 "use the '--force' option. If the local git directory is not the correct "
13792 "repo\n"
13793 "or you are unsure what this means choose another name with the '--name' "
13794 "option."
13795 msgstr ""
13796 "如果您想要重用这个本地 git 目录而非重新克隆自\n"
13797 " $realrepo\n"
13798 "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
13799 "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
13800
13801 #: git-submodule.sh:251
13802 #, sh-format
13803 msgid "Reactivating local git directory for submodule '$sm_name'."
13804 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
13805
13806 #: git-submodule.sh:263
13807 #, sh-format
13808 msgid "Unable to checkout submodule '$sm_path'"
13809 msgstr "不能检出子模组 '$sm_path'"
13810
13811 #: git-submodule.sh:268
13812 #, sh-format
13813 msgid "Failed to add submodule '$sm_path'"
13814 msgstr "无法添加子模组 '$sm_path'"
13815
13816 #: git-submodule.sh:277
13817 #, sh-format
13818 msgid "Failed to register submodule '$sm_path'"
13819 msgstr "无法注册子模组 '$sm_path'"
13820
13821 #: git-submodule.sh:324
13822 #, sh-format
13823 msgid "Entering '$displaypath'"
13824 msgstr "正在进入 '$displaypath'"
13825
13826 #: git-submodule.sh:344
13827 #, sh-format
13828 msgid "Stopping at '$displaypath'; script returned non-zero status."
13829 msgstr "停止于 '$displaypath';脚本返回非零值。"
13830
13831 #: git-submodule.sh:415
13832 #, sh-format
13833 msgid "pathspec and --all are incompatible"
13834 msgstr "pathspec 和 --all 不兼容"
13835
13836 #: git-submodule.sh:420
13837 #, sh-format
13838 msgid "Use '--all' if you really want to deinitialize all submodules"
13839 msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
13840
13841 #: git-submodule.sh:440
13842 #, sh-format
13843 msgid ""
13844 "Submodule work tree '$displaypath' contains a .git directory\n"
13845 "(use 'rm -rf' if you really want to remove it including all of its history)"
13846 msgstr ""
13847 "子模组工作区 '$displaypath' 包含一个 .git 目录\n"
13848 "(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
13849
13850 #: git-submodule.sh:448
13851 #, sh-format
13852 msgid ""
13853 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
13854 "discard them"
13855 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
13856
13857 #: git-submodule.sh:451
13858 #, sh-format
13859 msgid "Cleared directory '$displaypath'"
13860 msgstr "已清除目录 '$displaypath'"
13861
13862 #: git-submodule.sh:452
13863 #, sh-format
13864 msgid "Could not remove submodule work tree '$displaypath'"
13865 msgstr "无法移除子模组工作区 '$displaypath'"
13866
13867 #: git-submodule.sh:455
13868 #, sh-format
13869 msgid "Could not create empty submodule directory '$displaypath'"
13870 msgstr "不能创建空的子模组目录 '$displaypath'"
13871
13872 #: git-submodule.sh:464
13873 #, sh-format
13874 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
13875 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
13876
13877 #: git-submodule.sh:617
13878 #, sh-format
13879 msgid "Unable to find current revision in submodule path '$displaypath'"
13880 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
13881
13882 #: git-submodule.sh:627
13883 #, sh-format
13884 msgid "Unable to fetch in submodule path '$sm_path'"
13885 msgstr "无法在子模组路径 '$sm_path' 中获取"
13886
13887 #: git-submodule.sh:632
13888 #, sh-format
13889 msgid ""
13890 "Unable to find current ${remote_name}/${branch} revision in submodule path "
13891 "'$sm_path'"
13892 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
13893
13894 #: git-submodule.sh:650
13895 #, sh-format
13896 msgid "Unable to fetch in submodule path '$displaypath'"
13897 msgstr "无法在子模组路径 '$displaypath' 中获取"
13898
13899 #: git-submodule.sh:656
13900 #, sh-format
13901 msgid ""
13902 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
13903 "Direct fetching of that commit failed."
13904 msgstr ""
13905 "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
13906
13907 #: git-submodule.sh:663
13908 #, sh-format
13909 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
13910 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
13911
13912 #: git-submodule.sh:664
13913 #, sh-format
13914 msgid "Submodule path '$displaypath': checked out '$sha1'"
13915 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
13916
13917 #: git-submodule.sh:668
13918 #, sh-format
13919 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
13920 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
13921
13922 #: git-submodule.sh:669
13923 #, sh-format
13924 msgid "Submodule path '$displaypath': rebased into '$sha1'"
13925 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
13926
13927 #: git-submodule.sh:674
13928 #, sh-format
13929 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
13930 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
13931
13932 #: git-submodule.sh:675
13933 #, sh-format
13934 msgid "Submodule path '$displaypath': merged in '$sha1'"
13935 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
13936
13937 #: git-submodule.sh:680
13938 #, sh-format
13939 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
13940 msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
13941
13942 #: git-submodule.sh:681
13943 #, sh-format
13944 msgid "Submodule path '$displaypath': '$command $sha1'"
13945 msgstr "子模组 '$displaypath':'$command $sha1'"
13946
13947 #: git-submodule.sh:712
13948 #, sh-format
13949 msgid "Failed to recurse into submodule path '$displaypath'"
13950 msgstr "无法递归进子模组路径 '$displaypath'"
13951
13952 #: git-submodule.sh:820
13953 msgid "The --cached option cannot be used with the --files option"
13954 msgstr "选项 --cached 不能和选项 --files 同时使用"
13955
13956 #: git-submodule.sh:872
13957 #, sh-format
13958 msgid "unexpected mode $mod_dst"
13959 msgstr "意外的模式 $mod_dst"
13960
13961 # 译者:注意保持前导空格
13962 #: git-submodule.sh:892
13963 #, sh-format
13964 msgid " Warn: $display_name doesn't contain commit $sha1_src"
13965 msgstr " 警告:$display_name 未包含提交 $sha1_src"
13966
13967 # 译者:注意保持前导空格
13968 #: git-submodule.sh:895
13969 #, sh-format
13970 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
13971 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
13972
13973 # 译者:注意保持前导空格
13974 #: git-submodule.sh:898
13975 #, sh-format
13976 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
13977 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
13978
13979 #: git-submodule.sh:1045
13980 #, sh-format
13981 msgid "Failed to recurse into submodule path '$sm_path'"
13982 msgstr "无法递归进子模组路径 '$sm_path'"
13983
13984 #: git-submodule.sh:1112
13985 #, sh-format
13986 msgid "Synchronizing submodule url for '$displaypath'"
13987 msgstr "为 '$displaypath' 同步子模组 url"
13988
13989 #: git-parse-remote.sh:89
13990 #, sh-format
13991 msgid "See git-${cmd}(1) for details."
13992 msgstr "详见 git-${cmd}(1)。"
13993
13994 #: git-rebase--interactive.sh:131
13995 #, sh-format
13996 msgid "Rebasing ($new_count/$total)"
13997 msgstr "变基中($new_count/$total)"
13998
13999 #: git-rebase--interactive.sh:147
14000 msgid ""
14001 "\n"
14002 "Commands:\n"
14003 " p, pick = use commit\n"
14004 " r, reword = use commit, but edit the commit message\n"
14005 " e, edit = use commit, but stop for amending\n"
14006 " s, squash = use commit, but meld into previous commit\n"
14007 " f, fixup = like \"squash\", but discard this commit's log message\n"
14008 " x, exec = run command (the rest of the line) using shell\n"
14009 " d, drop = remove commit\n"
14010 "\n"
14011 "These lines can be re-ordered; they are executed from top to bottom.\n"
14012 msgstr ""
14013 "\n"
14014 "命令:\n"
14015 " p, pick = 使用提交\n"
14016 " r, reword = 使用提交,但修改提交说明\n"
14017 " e, edit = 使用提交,但停止以便进行提交修补\n"
14018 " s, squash = 使用提交,但和前一个版本融合\n"
14019 " f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n"
14020 " x, exec = 使用 shell 运行命令(此行剩余部分)\n"
14021 " d, drop = 删除提交\n"
14022 "\n"
14023 "这些行可以被重新排序;它们会被从上至下地执行。\n"
14024 "\n"
14025
14026 #: git-rebase--interactive.sh:162
14027 msgid ""
14028 "\n"
14029 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
14030 msgstr ""
14031 "\n"
14032 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
14033
14034 #: git-rebase--interactive.sh:166
14035 msgid ""
14036 "\n"
14037 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
14038 msgstr ""
14039 "\n"
14040 "如果您在这里删除一行,对应的提交将会丢失。\n"
14041
14042 #: git-rebase--interactive.sh:202
14043 #, sh-format
14044 msgid ""
14045 "You can amend the commit now, with\n"
14046 "\n"
14047 "\tgit commit --amend $gpg_sign_opt_quoted\n"
14048 "\n"
14049 "Once you are satisfied with your changes, run\n"
14050 "\n"
14051 "\tgit rebase --continue"
14052 msgstr ""
14053 "您现在可以修补这个提交,使用\n"
14054 "\n"
14055 "\tgit commit --amend $gpg_sign_opt_quoted\n"
14056 "\n"
14057 "当您对变更感到满意,执行\n"
14058 "\n"
14059 "\tgit rebase --continue"
14060
14061 #: git-rebase--interactive.sh:227
14062 #, sh-format
14063 msgid "$sha1: not a commit that can be picked"
14064 msgstr "$sha1:不是一个可以被拣选的提交"
14065
14066 #: git-rebase--interactive.sh:266
14067 #, sh-format
14068 msgid "Invalid commit name: $sha1"
14069 msgstr "无效的提交名:$sha1"
14070
14071 #: git-rebase--interactive.sh:308
14072 msgid "Cannot write current commit's replacement sha1"
14073 msgstr "不能写入当前提交的替代 sha1"
14074
14075 #: git-rebase--interactive.sh:360
14076 #, sh-format
14077 msgid "Fast-forward to $sha1"
14078 msgstr "快进到 $sha1"
14079
14080 #: git-rebase--interactive.sh:362
14081 #, sh-format
14082 msgid "Cannot fast-forward to $sha1"
14083 msgstr "不能快进到 $sha1"
14084
14085 #: git-rebase--interactive.sh:371
14086 #, sh-format
14087 msgid "Cannot move HEAD to $first_parent"
14088 msgstr "不能移动 HEAD 到 $first_parent"
14089
14090 #: git-rebase--interactive.sh:376
14091 #, sh-format
14092 msgid "Refusing to squash a merge: $sha1"
14093 msgstr "拒绝压缩一个合并:$sha1"
14094
14095 #: git-rebase--interactive.sh:390
14096 #, sh-format
14097 msgid "Error redoing merge $sha1"
14098 msgstr "无法重做合并 $sha1"
14099
14100 #: git-rebase--interactive.sh:398
14101 #, sh-format
14102 msgid "Could not pick $sha1"
14103 msgstr "不能拣选 $sha1"
14104
14105 #: git-rebase--interactive.sh:407
14106 #, sh-format
14107 msgid "This is the commit message #${n}:"
14108 msgstr "这是提交说明 #${n}:"
14109
14110 #: git-rebase--interactive.sh:412
14111 #, sh-format
14112 msgid "The commit message #${n} will be skipped:"
14113 msgstr "提交说明 #${n} 将被跳过:"
14114
14115 #: git-rebase--interactive.sh:423
14116 #, sh-format
14117 msgid "This is a combination of $count commit."
14118 msgid_plural "This is a combination of $count commits."
14119 msgstr[0] "这是一个 $count 个提交的组合。"
14120 msgstr[1] "这是一个 $count 个提交的组合。"
14121
14122 #: git-rebase--interactive.sh:431
14123 #, sh-format
14124 msgid "Cannot write $fixup_msg"
14125 msgstr "不能写入 $fixup_msg"
14126
14127 #: git-rebase--interactive.sh:434
14128 msgid "This is a combination of 2 commits."
14129 msgstr "这是一个 2 个提交的组合。"
14130
14131 #: git-rebase--interactive.sh:435
14132 msgid "This is the 1st commit message:"
14133 msgstr "这是第一个提交说明:"
14134
14135 #: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
14136 #: git-rebase--interactive.sh:521
14137 #, sh-format
14138 msgid "Could not apply $sha1... $rest"
14139 msgstr "不能应用 $sha1... $rest"
14140
14141 #: git-rebase--interactive.sh:549
14142 #, sh-format
14143 msgid ""
14144 "Could not amend commit after successfully picking $sha1... $rest\n"
14145 "This is most likely due to an empty commit message, or the pre-commit hook\n"
14146 "failed. If the pre-commit hook failed, you may need to resolve the issue "
14147 "before\n"
14148 "you are able to reword the commit."
14149 msgstr ""
14150 "不能在成功拣选 $sha1... $rest 之后修补提交\n"
14151 "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
14152 "钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
14153
14154 #: git-rebase--interactive.sh:564
14155 #, sh-format
14156 msgid "Stopped at $sha1_abbrev... $rest"
14157 msgstr "停止在 $sha1_abbrev... $rest"
14158
14159 #: git-rebase--interactive.sh:579
14160 #, sh-format
14161 msgid "Cannot '$squash_style' without a previous commit"
14162 msgstr "没有父提交的情况下不能 '$squash_style'"
14163
14164 #: git-rebase--interactive.sh:621
14165 #, sh-format
14166 msgid "Executing: $rest"
14167 msgstr "执行:$rest"
14168
14169 #: git-rebase--interactive.sh:629
14170 #, sh-format
14171 msgid "Execution failed: $rest"
14172 msgstr "执行失败:$rest"
14173
14174 #: git-rebase--interactive.sh:631
14175 msgid "and made changes to the index and/or the working tree"
14176 msgstr "并且修改索引和/或工作区"
14177
14178 # 译者:注意保持前导空格
14179 #: git-rebase--interactive.sh:633
14180 msgid ""
14181 "You can fix the problem, and then run\n"
14182 "\n"
14183 "\tgit rebase --continue"
14184 msgstr ""
14185 "您可以解决这个问题,然后运行\n"
14186 "\n"
14187 "\tgit rebase --continue"
14188
14189 #. TRANSLATORS: after these lines is a command to be issued by the user
14190 #: git-rebase--interactive.sh:646
14191 #, sh-format
14192 msgid ""
14193 "Execution succeeded: $rest\n"
14194 "but left changes to the index and/or the working tree\n"
14195 "Commit or stash your changes, and then run\n"
14196 "\n"
14197 "\tgit rebase --continue"
14198 msgstr ""
14199 "执行成功:$rest\n"
14200 "但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n"
14201 "\n"
14202 "\tgit rebase --continue"
14203
14204 #: git-rebase--interactive.sh:657
14205 #, sh-format
14206 msgid "Unknown command: $command $sha1 $rest"
14207 msgstr "未知命令:$command $sha1 $rest"
14208
14209 #: git-rebase--interactive.sh:658
14210 msgid "Please fix this using 'git rebase --edit-todo'."
14211 msgstr "要修改请使用命令 'git rebase --edit-todo'。"
14212
14213 #: git-rebase--interactive.sh:693
14214 #, sh-format
14215 msgid "Successfully rebased and updated $head_name."
14216 msgstr "成功变基并更新 $head_name。"
14217
14218 #: git-rebase--interactive.sh:740
14219 msgid "Could not skip unnecessary pick commands"
14220 msgstr "不能跳过不必要的拣选命令"
14221
14222 #: git-rebase--interactive.sh:898
14223 #, sh-format
14224 msgid ""
14225 "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
14226 " - $line"
14227 msgstr ""
14228 "警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n"
14229 " - $line"
14230
14231 #: git-rebase--interactive.sh:931
14232 #, sh-format
14233 msgid ""
14234 "Warning: the command isn't recognized in the following line:\n"
14235 " - $line"
14236 msgstr ""
14237 "警告:下面一行中的命令未能被识别:\n"
14238 " - $line"
14239
14240 #: git-rebase--interactive.sh:970
14241 msgid "could not detach HEAD"
14242 msgstr "不能检出为分离头指针"
14243
14244 #: git-rebase--interactive.sh:1008
14245 msgid ""
14246 "Warning: some commits may have been dropped accidentally.\n"
14247 "Dropped commits (newer to older):"
14248 msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):"
14249
14250 #: git-rebase--interactive.sh:1016
14251 msgid ""
14252 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
14253 "\n"
14254 "Use 'git config rebase.missingCommitsCheck' to change the level of "
14255 "warnings.\n"
14256 "The possible behaviours are: ignore, warn, error."
14257 msgstr ""
14258 "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
14259 "\n"
14260 "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
14261 "可选值有:ignore、warn、error。"
14262
14263 #: git-rebase--interactive.sh:1027
14264 #, sh-format
14265 msgid ""
14266 "Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
14267 "Ignoring."
14268 msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
14269
14270 #: git-rebase--interactive.sh:1044
14271 msgid ""
14272 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
14273 "continue'."
14274 msgstr ""
14275 "您可以用命令 'git rebase --edit-todo' 修正然后执行命令 'git rebase --"
14276 "continue'。"
14277
14278 #: git-rebase--interactive.sh:1045
14279 msgid "Or you can abort the rebase with 'git rebase --abort'."
14280 msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
14281
14282 #: git-rebase--interactive.sh:1069
14283 msgid "Could not remove CHERRY_PICK_HEAD"
14284 msgstr "不能删除 CHERRY_PICK_HEAD"
14285
14286 #: git-rebase--interactive.sh:1074
14287 #, sh-format
14288 msgid ""
14289 "You have staged changes in your working tree.\n"
14290 "If these changes are meant to be\n"
14291 "squashed into the previous commit, run:\n"
14292 "\n"
14293 " git commit --amend $gpg_sign_opt_quoted\n"
14294 "\n"
14295 "If they are meant to go into a new commit, run:\n"
14296 "\n"
14297 " git commit $gpg_sign_opt_quoted\n"
14298 "\n"
14299 "In both cases, once you're done, continue with:\n"
14300 "\n"
14301 " git rebase --continue\n"
14302 msgstr ""
14303 "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
14304 "\n"
14305 " git commit --amend $gpg_sign_opt_quoted\n"
14306 "\n"
14307 "如果这些变更要形成一个新提交,执行:\n"
14308 "\n"
14309 " git commit $gpg_sign_opt_quoted\n"
14310 "\n"
14311 "无论哪种情况,当您完成提交,继续执行:\n"
14312 "\n"
14313 " git rebase --continue\n"
14314
14315 #: git-rebase--interactive.sh:1091
14316 msgid "Error trying to find the author identity to amend commit"
14317 msgstr "在修补提交中查找作者信息时遇到错误"
14318
14319 #: git-rebase--interactive.sh:1096
14320 msgid ""
14321 "You have uncommitted changes in your working tree. Please commit them\n"
14322 "first and then run 'git rebase --continue' again."
14323 msgstr ""
14324 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
14325
14326 #: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
14327 msgid "Could not commit staged changes."
14328 msgstr "不能提交暂存的修改。"
14329
14330 #: git-rebase--interactive.sh:1129
14331 msgid ""
14332 "\n"
14333 "You are editing the todo file of an ongoing interactive rebase.\n"
14334 "To continue rebase after editing, run:\n"
14335 " git rebase --continue\n"
14336 "\n"
14337 msgstr ""
14338 "\n"
14339 "您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n"
14340 "请执行:\n"
14341 " git rebase --continue\n"
14342 "\n"
14343
14344 #: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
14345 msgid "Could not execute editor"
14346 msgstr "无法运行编辑器"
14347
14348 #: git-rebase--interactive.sh:1150
14349 #, sh-format
14350 msgid "Could not checkout $switch_to"
14351 msgstr "不能检出 $switch_to"
14352
14353 #: git-rebase--interactive.sh:1155
14354 msgid "No HEAD?"
14355 msgstr "没有 HEAD?"
14356
14357 #: git-rebase--interactive.sh:1156
14358 #, sh-format
14359 msgid "Could not create temporary $state_dir"
14360 msgstr "不能创建临时 $state_dir"
14361
14362 #: git-rebase--interactive.sh:1158
14363 msgid "Could not mark as interactive"
14364 msgstr "不能标记为交互式"
14365
14366 #: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
14367 msgid "Could not init rewritten commits"
14368 msgstr "不能对重写提交进行初始化"
14369
14370 #: git-rebase--interactive.sh:1273
14371 #, sh-format
14372 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
14373 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
14374 msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
14375 msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
14376
14377 #: git-rebase--interactive.sh:1278
14378 msgid ""
14379 "\n"
14380 "However, if you remove everything, the rebase will be aborted.\n"
14381 "\n"
14382 msgstr ""
14383 "\n"
14384 "然而,如果您删除全部内容,变基操作将会终止。\n"
14385 "\n"
14386
14387 #: git-rebase--interactive.sh:1285
14388 msgid "Note that empty commits are commented out"
14389 msgstr "注意空提交已被注释掉"
14390
14391 #: git-sh-setup.sh:89 git-sh-setup.sh:94
14392 #, sh-format
14393 msgid "usage: $dashless $USAGE"
14394 msgstr "用法:$dashless $USAGE"
14395
14396 #: git-sh-setup.sh:190
14397 #, sh-format
14398 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
14399 msgstr "不能切换目录到 $cdup,工作区的顶级目录"
14400
14401 #: git-sh-setup.sh:199 git-sh-setup.sh:206
14402 #, sh-format
14403 msgid "fatal: $program_name cannot be used without a working tree."
14404 msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
14405
14406 #: git-sh-setup.sh:220
14407 msgid "Cannot rebase: You have unstaged changes."
14408 msgstr "不能变基:您有未暂存的变更。"
14409
14410 #: git-sh-setup.sh:223
14411 msgid "Cannot rewrite branches: You have unstaged changes."
14412 msgstr "不能重写分支:您有未暂存的变更。"
14413
14414 #: git-sh-setup.sh:226
14415 msgid "Cannot pull with rebase: You have unstaged changes."
14416 msgstr "无法通过变基方式拉取:您有未暂存的变更。"
14417
14418 #: git-sh-setup.sh:229
14419 #, sh-format
14420 msgid "Cannot $action: You have unstaged changes."
14421 msgstr "不能 $action:您有未暂存的变更。"
14422
14423 #: git-sh-setup.sh:242
14424 msgid "Cannot rebase: Your index contains uncommitted changes."
14425 msgstr "不能变基:您的索引中包含未提交的变更。"
14426
14427 #: git-sh-setup.sh:245
14428 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
14429 msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
14430
14431 #: git-sh-setup.sh:248
14432 #, sh-format
14433 msgid "Cannot $action: Your index contains uncommitted changes."
14434 msgstr "不能 $action:您的索引中包含未提交的变更。"
14435
14436 #: git-sh-setup.sh:252
14437 msgid "Additionally, your index contains uncommitted changes."
14438 msgstr "而且您的索引中包含未提交的变更。"
14439
14440 #: git-sh-setup.sh:372
14441 msgid "You need to run this command from the toplevel of the working tree."
14442 msgstr "您需要在工作区的顶级目录中运行这个命令。"
14443
14444 #: git-sh-setup.sh:377
14445 msgid "Unable to determine absolute path of git directory"
14446 msgstr "不能确定 git 目录的绝对路径"
14447
14448 #~ msgid "Could not write to %s"
14449 #~ msgstr "不能写入 %s"
14450
14451 #~ msgid "Error wrapping up %s."
14452 #~ msgstr "错误收尾 %s。"
14453
14454 #~ msgid "Your local changes would be overwritten by cherry-pick."
14455 #~ msgstr "您的本地修改将被拣选操作覆盖。"
14456
14457 #~ msgid "Cannot revert during another revert."
14458 #~ msgstr "不能在回退中执行另一回退。"
14459
14460 #~ msgid "Cannot cherry-pick during another cherry-pick."
14461 #~ msgstr "不能在拣选过程中执行另一拣选。"
14462
14463 #~ msgid "Could not parse line %d."
14464 #~ msgstr "不能解析第 %d 行。"
14465
14466 #~ msgid "Could not open %s"
14467 #~ msgstr "不能打开 %s"
14468
14469 #~ msgid "Could not read %s."
14470 #~ msgstr "不能读取 %s。"
14471
14472 #~ msgid "Could not format %s."
14473 #~ msgstr "不能格式化 %s。"
14474
14475 #~ msgid "%s: %s"
14476 #~ msgstr "%s:%s"
14477
14478 #~ msgid "cannot open %s: %s"
14479 #~ msgstr "不能打开 %s:%s"
14480
14481 #~ msgid "You need to set your committer info first"
14482 #~ msgstr "您需要先设置您的提交者信息"