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