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