]> git.ipfire.org Git - thirdparty/git.git/blob - po/zh_CN.po
Merge branch 'jk/fetch-all-peeled-fix'
[thirdparty/git.git] / po / zh_CN.po
1 # Chinese translations for Git package
2 # Git 软件包的简体中文翻译.
3 # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
4 # This file is distributed under the same license as the Git package.
5 # Contributors:
6 # - Fangyi Zhou <fangyi.zhou AT yuriko.moe>
7 # - Jiang Xin <worldhello.net AT gmail.com>
8 # - Lian Cheng <rhythm.mail AT gmail.com>
9 # - Ray Chen <oldsharp AT gmail.com>
10 # - Riku <lu.riku AT gmail.com>
11 # - Thynson <lanxingcan AT gmail.com>
12 # - ws3389 <willsmith3389 AT gmail.com>
13 # - Wang Sheng <wangsheng2008love AT 163.com>
14 # - 依云 <lilydjwg AT gmail.com>
15 # - Yichao Yu <yyc1992 AT gmail.com>
16 # - Zhuang Ya <zhuangya AT me.com>
17 #
18 # Git glossary for Chinese translators
19 #
20 # English | Chinese
21 # ---------------------------------+--------------------------------------
22 # 3-way merge | 三方合并
23 # abbreviate | 简写(的 SHA-1 值)
24 # alternate object database | 备用对象库
25 # amend | 修补
26 # ancestor | 祖先,祖先提交
27 # annotated tag | 附注标签
28 # bare repository | 纯仓库
29 # bisect | 二分查找
30 # blob object | 数据对象
31 # branch | 分支
32 # bundle | 包
33 # bypass | 绕过
34 # cache | 索引(的别称)
35 # chain | (提交)链
36 # changeset | 变更集
37 # checkout | 检出
38 # checksum | 校验,校验和
39 # cherry-picking | 拣选
40 # clean | 干净(的工作区)
41 # clone | 克隆
42 # commit | 提交
43 # commit message | 提交说明
44 # commit object | 提交对象
45 # commit-ish (also committish) | 提交号
46 # conflict | 冲突
47 # core Git | 核心 Git 工具
48 # DAG | 有向无环图
49 # dangling object | 摇摆对象
50 # detached HEAD | 分离头指针
51 # directory | 目录
52 # dirty | 脏(的工作区)
53 # dumb HTTP protocol | 哑 HTTP 协议
54 # evil merge | 坏合并(合并引入了父提交没有的修改)
55 # fast-forward | 快进
56 # fetch | 获取
57 # file system | 文件系统
58 # fork | 派生
59 # Git archive | 仓库(对于 arch 用户)
60 # gitfile | gitfile(仓库链接文件)
61 # grafts | (提交)移植
62 # hash | 哈希值
63 # HEAD | HEAD(头指针,亦即当前分支)
64 # head | 头、分支
65 # head ref | 分支
66 # header | 头信息
67 # hook | 钩子
68 # hunk | 补丁片段
69 # index | 索引
70 # index entry | 索引条目
71 # loose object | 松散对象
72 # loose refs | 松散引用
73 # master | master(默认分支名)
74 # merge | 合并
75 # object | 对象
76 # object database | 对象库
77 # object identifier | 对象标识符
78 # object name | 对象名称
79 # object type | 对象类型
80 # octopus | 章鱼式合并(两分支以上的合并)
81 # origin | origin(默认的远程名称)
82 # pack | 包
83 # pack index | 包索引
84 # packfile | 包文件
85 # parent | 父提交
86 # patch | 补丁
87 # pathspec | 路径规格
88 # pattern | 模式
89 # pickaxe | 挖掘
90 # plumbing | 管件(Git 底层核心命令的别称)
91 # porcelain | 瓷件(Git 上层封装命令的别称)
92 # precious-objects repo | 珍品仓库
93 # prune | 清除
94 # pull | 拉,拉取
95 # push | 推,推送
96 # reachable | 可达
97 # rebase | 变基
98 # ref | 引用
99 # reflog | 引用日志
100 # refspec | 引用规格
101 # remote | 远程,远程仓库
102 # remote-tracking branch | 远程跟踪分支
103 # replay | 重放
104 # repo | 仓库
105 # repository | 仓库
106 # resolve | (冲突)解决
107 # revert | 还原
108 # revision | 版本
109 # rewind | 回退
110 # SCM | 源代码管理(工具)
111 # SHA-1 | SHA-1(安全哈希算法1)
112 # shallow repository | 浅(克隆)仓库
113 # signed tag | 签名标签
114 # smart HTTP protocol | 智能 HTTP 协议
115 # squash | 压缩
116 # stage | n. 暂存区(即索引); v. 暂存
117 # stash | n. 贮藏区; v. 贮藏
118 # submodule | 子模组
119 # symref | 符号引用
120 # tag | n. 标签; v. 打标签
121 # tag object | 标签对象
122 # tagger | 打标签者
123 # topic branch | 主题分支
124 # track | 跟踪
125 # trailer | 尾部署名
126 # tree | 树(工作区或树对象)
127 # tree object | 树对象
128 # tree-ish (also treeish) | 树对象(或可以解析为一树对象)
129 # unmerged index | 未合并索引
130 # unpack | 解包
131 # unreachable object | 不可达对象
132 # unstage | 取消暂存
133 # upstream | 上游
134 # upstream branch | 上游分支
135 # working tree | 工作区
136 #
137 msgid ""
138 msgstr ""
139 "Project-Id-Version: Git\n"
140 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
141 "POT-Creation-Date: 2018-06-16 22:06+0800\n"
142 "PO-Revision-Date: 2018-06-18 00:28+0800\n"
143 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
144 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
145 "Language: zh_CN\n"
146 "MIME-Version: 1.0\n"
147 "Content-Type: text/plain; charset=UTF-8\n"
148 "Content-Transfer-Encoding: 8bit\n"
149 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
150
151 #: advice.c:92
152 #, c-format
153 msgid "%shint: %.*s%s\n"
154 msgstr "%s提示:%.*s%s\n"
155
156 #: advice.c:137
157 msgid "Cherry-picking is not possible because you have unmerged files."
158 msgstr "无法拣选,因为您有未合并的文件。"
159
160 #: advice.c:139
161 msgid "Committing is not possible because you have unmerged files."
162 msgstr "无法提交,因为您有未合并的文件。"
163
164 #: advice.c:141
165 msgid "Merging is not possible because you have unmerged files."
166 msgstr "无法合并,因为您有未合并的文件。"
167
168 #: advice.c:143
169 msgid "Pulling is not possible because you have unmerged files."
170 msgstr "无法拉取,因为您有未合并的文件。"
171
172 #: advice.c:145
173 msgid "Reverting is not possible because you have unmerged files."
174 msgstr "无法回退,因为您有未合并的文件。"
175
176 #: advice.c:147
177 #, c-format
178 msgid "It is not possible to %s because you have unmerged files."
179 msgstr "无法 %s,因为您有未合并的文件。"
180
181 #: advice.c:155
182 msgid ""
183 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
184 "as appropriate to mark resolution and make a commit."
185 msgstr ""
186 "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
187 "解决方案并提交。"
188
189 #: advice.c:163
190 msgid "Exiting because of an unresolved conflict."
191 msgstr "因为存在未解决的冲突而退出。"
192
193 #: advice.c:168 builtin/merge.c:1250
194 msgid "You have not concluded your merge (MERGE_HEAD exists)."
195 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
196
197 #: advice.c:170
198 msgid "Please, commit your changes before merging."
199 msgstr "请在合并前先提交您的修改。"
200
201 #: advice.c:171
202 msgid "Exiting because of unfinished merge."
203 msgstr "因为存在未完成的合并而退出。"
204
205 #: advice.c:177
206 #, c-format
207 msgid ""
208 "Note: checking out '%s'.\n"
209 "\n"
210 "You are in 'detached HEAD' state. You can look around, make experimental\n"
211 "changes and commit them, and you can discard any commits you make in this\n"
212 "state without impacting any branches by performing another checkout.\n"
213 "\n"
214 "If you want to create a new branch to retain commits you create, you may\n"
215 "do so (now or later) by using -b with the checkout command again. Example:\n"
216 "\n"
217 " git checkout -b <new-branch-name>\n"
218 "\n"
219 msgstr ""
220 "注意:正在检出 '%s'。\n"
221 "\n"
222 "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
223 "外\n"
224 "的检出分支操作丢弃在这个状态下所做的任何提交。\n"
225 "\n"
226 "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
227 "参数 -b 来实现(现在或稍后)。例如:\n"
228 "\n"
229 " git checkout -b <新分支名>\n"
230 "\n"
231
232 #: apply.c:58
233 #, c-format
234 msgid "unrecognized whitespace option '%s'"
235 msgstr "未能识别的空白字符选项 '%s'"
236
237 #: apply.c:74
238 #, c-format
239 msgid "unrecognized whitespace ignore option '%s'"
240 msgstr "未能识别的空白字符忽略选项 '%s'"
241
242 #: apply.c:122
243 msgid "--reject and --3way cannot be used together."
244 msgstr "--reject 和 --3way 不能同时使用。"
245
246 #: apply.c:124
247 msgid "--cached and --3way cannot be used together."
248 msgstr "--cached 和 --3way 不能同时使用。"
249
250 #: apply.c:127
251 msgid "--3way outside a repository"
252 msgstr "--3way 在一个仓库之外"
253
254 #: apply.c:138
255 msgid "--index outside a repository"
256 msgstr "--index 在一个仓库之外"
257
258 #: apply.c:141
259 msgid "--cached outside a repository"
260 msgstr "--cached 在一个仓库之外"
261
262 #: apply.c:821
263 #, c-format
264 msgid "Cannot prepare timestamp regexp %s"
265 msgstr "无法准备时间戳正则表达式 %s"
266
267 #: apply.c:830
268 #, c-format
269 msgid "regexec returned %d for input: %s"
270 msgstr "regexec 返回 %d,输入为:%s"
271
272 #: apply.c:904
273 #, c-format
274 msgid "unable to find filename in patch at line %d"
275 msgstr "不能在补丁的第 %d 行找到文件名"
276
277 #: apply.c:942
278 #, c-format
279 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
280 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
281
282 #: apply.c:948
283 #, c-format
284 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
285 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
286
287 #: apply.c:949
288 #, c-format
289 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
290 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
291
292 #: apply.c:954
293 #, c-format
294 msgid "git apply: bad git-diff - expected /dev/null on line %d"
295 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
296
297 #: apply.c:983
298 #, c-format
299 msgid "invalid mode on line %d: %s"
300 msgstr "第 %d 行包含无效文件模式:%s"
301
302 #: apply.c:1301
303 #, c-format
304 msgid "inconsistent header lines %d and %d"
305 msgstr "不一致的文件头,%d 行和 %d 行"
306
307 #: apply.c:1473
308 #, c-format
309 msgid "recount: unexpected line: %.*s"
310 msgstr "recount:意外的行:%.*s"
311
312 #: apply.c:1542
313 #, c-format
314 msgid "patch fragment without header at line %d: %.*s"
315 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
316
317 #: apply.c:1562
318 #, c-format
319 msgid ""
320 "git diff header lacks filename information when removing %d leading pathname "
321 "component (line %d)"
322 msgid_plural ""
323 "git diff header lacks filename information when removing %d leading pathname "
324 "components (line %d)"
325 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
326 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
327
328 #: apply.c:1575
329 #, c-format
330 msgid "git diff header lacks filename information (line %d)"
331 msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
332
333 #: apply.c:1763
334 msgid "new file depends on old contents"
335 msgstr "新文件依赖旧内容"
336
337 #: apply.c:1765
338 msgid "deleted file still has contents"
339 msgstr "删除的文件仍有内容"
340
341 #: apply.c:1799
342 #, c-format
343 msgid "corrupt patch at line %d"
344 msgstr "补丁在第 %d 行损坏"
345
346 #: apply.c:1836
347 #, c-format
348 msgid "new file %s depends on old contents"
349 msgstr "新文件 %s 依赖旧内容"
350
351 #: apply.c:1838
352 #, c-format
353 msgid "deleted file %s still has contents"
354 msgstr "删除的文件 %s 仍有内容"
355
356 #: apply.c:1841
357 #, c-format
358 msgid "** warning: file %s becomes empty but is not deleted"
359 msgstr "** 警告:文件 %s 成为空文件但并未删除"
360
361 #: apply.c:1988
362 #, c-format
363 msgid "corrupt binary patch at line %d: %.*s"
364 msgstr "二进制补丁在第 %d 行损坏:%.*s"
365
366 #: apply.c:2025
367 #, c-format
368 msgid "unrecognized binary patch at line %d"
369 msgstr "未能识别的二进制补丁位于第 %d 行"
370
371 #: apply.c:2185
372 #, c-format
373 msgid "patch with only garbage at line %d"
374 msgstr "补丁文件的第 %d 行只有垃圾数据"
375
376 #: apply.c:2271
377 #, c-format
378 msgid "unable to read symlink %s"
379 msgstr "无法读取符号链接 %s"
380
381 #: apply.c:2275
382 #, c-format
383 msgid "unable to open or read %s"
384 msgstr "不能打开或读取 %s"
385
386 #: apply.c:2934
387 #, c-format
388 msgid "invalid start of line: '%c'"
389 msgstr "无效的行首字符:'%c'"
390
391 #: apply.c:3055
392 #, c-format
393 msgid "Hunk #%d succeeded at %d (offset %d line)."
394 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
395 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
396 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
397
398 #: apply.c:3067
399 #, c-format
400 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
401 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
402
403 #: apply.c:3073
404 #, c-format
405 msgid ""
406 "while searching for:\n"
407 "%.*s"
408 msgstr ""
409 "当查询:\n"
410 "%.*s"
411
412 #: apply.c:3095
413 #, c-format
414 msgid "missing binary patch data for '%s'"
415 msgstr "缺失 '%s' 的二进制补丁数据"
416
417 #: apply.c:3103
418 #, c-format
419 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
420 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
421
422 #: apply.c:3149
423 #, c-format
424 msgid "cannot apply binary patch to '%s' without full index line"
425 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
426
427 #: apply.c:3159
428 #, c-format
429 msgid ""
430 "the patch applies to '%s' (%s), which does not match the current contents."
431 msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
432
433 #: apply.c:3167
434 #, c-format
435 msgid "the patch applies to an empty '%s' but it is not empty"
436 msgstr "补丁应用到空文件 '%s',但其并非空文件"
437
438 #: apply.c:3185
439 #, c-format
440 msgid "the necessary postimage %s for '%s' cannot be read"
441 msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
442
443 #: apply.c:3198
444 #, c-format
445 msgid "binary patch does not apply to '%s'"
446 msgstr "二进制补丁未应用到 '%s'"
447
448 #: apply.c:3204
449 #, c-format
450 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
451 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
452
453 #: apply.c:3225
454 #, c-format
455 msgid "patch failed: %s:%ld"
456 msgstr "打补丁失败:%s:%ld"
457
458 #: apply.c:3347
459 #, c-format
460 msgid "cannot checkout %s"
461 msgstr "不能检出 %s"
462
463 #: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278
464 #, c-format
465 msgid "failed to read %s"
466 msgstr "无法读取 %s"
467
468 #: apply.c:3404
469 #, c-format
470 msgid "reading from '%s' beyond a symbolic link"
471 msgstr "读取位于符号链接中的 '%s'"
472
473 #: apply.c:3433 apply.c:3673
474 #, c-format
475 msgid "path %s has been renamed/deleted"
476 msgstr "路径 %s 已经被重命名/删除"
477
478 #: apply.c:3516 apply.c:3687
479 #, c-format
480 msgid "%s: does not exist in index"
481 msgstr "%s:不存在于索引中"
482
483 #: apply.c:3525 apply.c:3695
484 #, c-format
485 msgid "%s: does not match index"
486 msgstr "%s:和索引不匹配"
487
488 #: apply.c:3560
489 msgid "repository lacks the necessary blob to fall back on 3-way merge."
490 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
491
492 #: apply.c:3563
493 #, c-format
494 msgid "Falling back to three-way merge...\n"
495 msgstr "回落到三方合并...\n"
496
497 #: apply.c:3579 apply.c:3583
498 #, c-format
499 msgid "cannot read the current contents of '%s'"
500 msgstr "无法读取 '%s' 的当前内容"
501
502 #: apply.c:3595
503 #, c-format
504 msgid "Failed to fall back on three-way merge...\n"
505 msgstr "无法回落到三方合并...\n"
506
507 #: apply.c:3609
508 #, c-format
509 msgid "Applied patch to '%s' with conflicts.\n"
510 msgstr "应用补丁到 '%s' 存在冲突。\n"
511
512 #: apply.c:3614
513 #, c-format
514 msgid "Applied patch to '%s' cleanly.\n"
515 msgstr "成功应用补丁到 '%s'。\n"
516
517 #: apply.c:3640
518 msgid "removal patch leaves file contents"
519 msgstr "移除补丁仍留下了文件内容"
520
521 #: apply.c:3712
522 #, c-format
523 msgid "%s: wrong type"
524 msgstr "%s:错误类型"
525
526 #: apply.c:3714
527 #, c-format
528 msgid "%s has type %o, expected %o"
529 msgstr "%s 的类型是 %o,应为 %o"
530
531 #: apply.c:3864 apply.c:3866
532 #, c-format
533 msgid "invalid path '%s'"
534 msgstr "无效路径 '%s'"
535
536 #: apply.c:3922
537 #, c-format
538 msgid "%s: already exists in index"
539 msgstr "%s:已经存在于索引中"
540
541 #: apply.c:3925
542 #, c-format
543 msgid "%s: already exists in working directory"
544 msgstr "%s:已经存在于工作区中"
545
546 #: apply.c:3945
547 #, c-format
548 msgid "new mode (%o) of %s does not match old mode (%o)"
549 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
550
551 #: apply.c:3950
552 #, c-format
553 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
554 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
555
556 #: apply.c:3970
557 #, c-format
558 msgid "affected file '%s' is beyond a symbolic link"
559 msgstr "受影响的文件 '%s' 位于符号链接中"
560
561 #: apply.c:3974
562 #, c-format
563 msgid "%s: patch does not apply"
564 msgstr "%s:补丁未应用"
565
566 #: apply.c:3989
567 #, c-format
568 msgid "Checking patch %s..."
569 msgstr "检查补丁 %s..."
570
571 #: apply.c:4080
572 #, c-format
573 msgid "sha1 information is lacking or useless for submodule %s"
574 msgstr "子模组 %s 的 sha1 信息缺失或无效"
575
576 #: apply.c:4087
577 #, c-format
578 msgid "mode change for %s, which is not in current HEAD"
579 msgstr "%s 的模式变更,但它不在当前 HEAD 中"
580
581 #: apply.c:4090
582 #, c-format
583 msgid "sha1 information is lacking or useless (%s)."
584 msgstr "sha1 信息缺失或无效(%s)。"
585
586 #: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
587 #, c-format
588 msgid "make_cache_entry failed for path '%s'"
589 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
590
591 #: apply.c:4099
592 #, c-format
593 msgid "could not add %s to temporary index"
594 msgstr "不能在临时索引中添加 %s"
595
596 #: apply.c:4109
597 #, c-format
598 msgid "could not write temporary index to %s"
599 msgstr "不能把临时索引写入到 %s"
600
601 #: apply.c:4247
602 #, c-format
603 msgid "unable to remove %s from index"
604 msgstr "不能从索引中移除 %s"
605
606 #: apply.c:4282
607 #, c-format
608 msgid "corrupt patch for submodule %s"
609 msgstr "子模组 %s 损坏的补丁"
610
611 #: apply.c:4288
612 #, c-format
613 msgid "unable to stat newly created file '%s'"
614 msgstr "不能对新建文件 '%s' 调用 stat"
615
616 #: apply.c:4296
617 #, c-format
618 msgid "unable to create backing store for newly created file %s"
619 msgstr "不能为新建文件 %s 创建后端存储"
620
621 #: apply.c:4302 apply.c:4446
622 #, c-format
623 msgid "unable to add cache entry for %s"
624 msgstr "无法为 %s 添加缓存条目"
625
626 #: apply.c:4343
627 #, c-format
628 msgid "failed to write to '%s'"
629 msgstr "无法写入 '%s'"
630
631 #: apply.c:4347
632 #, c-format
633 msgid "closing file '%s'"
634 msgstr "关闭文件 '%s'"
635
636 #: apply.c:4417
637 #, c-format
638 msgid "unable to write file '%s' mode %o"
639 msgstr "不能写文件 '%s' 权限 %o"
640
641 #: apply.c:4515
642 #, c-format
643 msgid "Applied patch %s cleanly."
644 msgstr "成功应用补丁 %s。"
645
646 #: apply.c:4523
647 msgid "internal error"
648 msgstr "内部错误"
649
650 #: apply.c:4526
651 #, c-format
652 msgid "Applying patch %%s with %d reject..."
653 msgid_plural "Applying patch %%s with %d rejects..."
654 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
655 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
656
657 #: apply.c:4537
658 #, c-format
659 msgid "truncating .rej filename to %.*s.rej"
660 msgstr "截短 .rej 文件名为 %.*s.rej"
661
662 #: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036
663 #, c-format
664 msgid "cannot open %s"
665 msgstr "不能打开 %s"
666
667 #: apply.c:4559
668 #, c-format
669 msgid "Hunk #%d applied cleanly."
670 msgstr "第 #%d 个片段成功应用。"
671
672 #: apply.c:4563
673 #, c-format
674 msgid "Rejected hunk #%d."
675 msgstr "拒绝第 #%d 个片段。"
676
677 #: apply.c:4673
678 #, c-format
679 msgid "Skipped patch '%s'."
680 msgstr "略过补丁 '%s'。"
681
682 #: apply.c:4681
683 msgid "unrecognized input"
684 msgstr "未能识别的输入"
685
686 #: apply.c:4700
687 msgid "unable to read index file"
688 msgstr "无法读取索引文件"
689
690 #: apply.c:4837
691 #, c-format
692 msgid "can't open patch '%s': %s"
693 msgstr "不能打开补丁 '%s':%s"
694
695 #: apply.c:4864
696 #, c-format
697 msgid "squelched %d whitespace error"
698 msgid_plural "squelched %d whitespace errors"
699 msgstr[0] "抑制下仍有 %d 个空白字符误用"
700 msgstr[1] "抑制下仍有 %d 个空白字符误用"
701
702 #: apply.c:4870 apply.c:4885
703 #, c-format
704 msgid "%d line adds whitespace errors."
705 msgid_plural "%d lines add whitespace errors."
706 msgstr[0] "%d 行新增了空白字符误用。"
707 msgstr[1] "%d 行新增了空白字符误用。"
708
709 #: apply.c:4878
710 #, c-format
711 msgid "%d line applied after fixing whitespace errors."
712 msgid_plural "%d lines applied after fixing whitespace errors."
713 msgstr[0] "修复空白错误后,应用了 %d 行。"
714 msgstr[1] "修复空白错误后,应用了 %d 行。"
715
716 #: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
717 msgid "Unable to write new index file"
718 msgstr "无法写入新索引文件"
719
720 #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
721 #: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198
722 #: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210
723 #: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584
724 #: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807
725 #: git-add--interactive.perl:197
726 msgid "path"
727 msgstr "路径"
728
729 #: apply.c:4922
730 msgid "don't apply changes matching the given path"
731 msgstr "不要应用与给出路径向匹配的变更"
732
733 #: apply.c:4925
734 msgid "apply changes matching the given path"
735 msgstr "应用与给出路径向匹配的变更"
736
737 #: apply.c:4927 builtin/am.c:2263
738 msgid "num"
739 msgstr "数字"
740
741 #: apply.c:4928
742 msgid "remove <num> leading slashes from traditional diff paths"
743 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
744
745 #: apply.c:4931
746 msgid "ignore additions made by the patch"
747 msgstr "忽略补丁中的添加的文件"
748
749 #: apply.c:4933
750 msgid "instead of applying the patch, output diffstat for the input"
751 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
752
753 #: apply.c:4937
754 msgid "show number of added and deleted lines in decimal notation"
755 msgstr "以十进制数显示添加和删除的行数"
756
757 #: apply.c:4939
758 msgid "instead of applying the patch, output a summary for the input"
759 msgstr "不应用补丁,而是显示输入的概要"
760
761 #: apply.c:4941
762 msgid "instead of applying the patch, see if the patch is applicable"
763 msgstr "不应用补丁,而是查看补丁是否可应用"
764
765 #: apply.c:4943
766 msgid "make sure the patch is applicable to the current index"
767 msgstr "确认补丁可以应用到当前索引"
768
769 #: apply.c:4945
770 msgid "apply a patch without touching the working tree"
771 msgstr "应用补丁而不修改工作区"
772
773 #: apply.c:4947
774 msgid "accept a patch that touches outside the working area"
775 msgstr "接受修改工作区之外文件的补丁"
776
777 #: apply.c:4950
778 msgid "also apply the patch (use with --stat/--summary/--check)"
779 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
780
781 #: apply.c:4952
782 msgid "attempt three-way merge if a patch does not apply"
783 msgstr "如果一个补丁不能应用则尝试三方合并"
784
785 #: apply.c:4954
786 msgid "build a temporary index based on embedded index information"
787 msgstr "创建一个临时索引基于嵌入的索引信息"
788
789 #: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
790 msgid "paths are separated with NUL character"
791 msgstr "路径以 NUL 字符分隔"
792
793 #: apply.c:4959
794 msgid "ensure at least <n> lines of context match"
795 msgstr "确保至少匹配 <n> 行上下文"
796
797 #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
798 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
799 #: builtin/pack-objects.c:3177
800 msgid "action"
801 msgstr "动作"
802
803 #: apply.c:4961
804 msgid "detect new or modified lines that have whitespace errors"
805 msgstr "检查新增和修改的行中间的空白字符滥用"
806
807 #: apply.c:4964 apply.c:4967
808 msgid "ignore changes in whitespace when finding context"
809 msgstr "查找上下文时忽略空白字符的变更"
810
811 #: apply.c:4970
812 msgid "apply the patch in reverse"
813 msgstr "反向应用补丁"
814
815 #: apply.c:4972
816 msgid "don't expect at least one line of context"
817 msgstr "无需至少一行上下文"
818
819 #: apply.c:4974
820 msgid "leave the rejected hunks in corresponding *.rej files"
821 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
822
823 #: apply.c:4976
824 msgid "allow overlapping hunks"
825 msgstr "允许重叠的补丁片段"
826
827 #: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21
828 #: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666
829 #: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124
830 msgid "be verbose"
831 msgstr "冗长输出"
832
833 #: apply.c:4979
834 msgid "tolerate incorrectly detected missing new-line at the end of file"
835 msgstr "允许不正确的文件末尾换行符"
836
837 #: apply.c:4982
838 msgid "do not trust the line counts in the hunk headers"
839 msgstr "不信任补丁片段的头信息中的行号"
840
841 #: apply.c:4984 builtin/am.c:2251
842 msgid "root"
843 msgstr "根目录"
844
845 #: apply.c:4985
846 msgid "prepend <root> to all filenames"
847 msgstr "为所有文件名前添加 <根目录>"
848
849 #: archive.c:13
850 msgid "git archive [<options>] <tree-ish> [<path>...]"
851 msgstr "git archive [<选项>] <树或提交> [<路径>...]"
852
853 #: archive.c:14
854 msgid "git archive --list"
855 msgstr "git archive --list"
856
857 #: archive.c:15
858 msgid ""
859 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
860 msgstr ""
861 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
862
863 #: archive.c:16
864 msgid "git archive --remote <repo> [--exec <cmd>] --list"
865 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
866
867 #: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
868 #, c-format
869 msgid "pathspec '%s' did not match any files"
870 msgstr "路径规格 '%s' 未匹配任何文件"
871
872 #: archive.c:434
873 msgid "fmt"
874 msgstr "格式"
875
876 #: archive.c:434
877 msgid "archive format"
878 msgstr "归档格式"
879
880 #: archive.c:435 builtin/log.c:1462
881 msgid "prefix"
882 msgstr "前缀"
883
884 #: archive.c:436
885 msgid "prepend prefix to each pathname in the archive"
886 msgstr "为归档中每个路径名加上前缀"
887
888 #: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127
889 #: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869
890 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
891 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119
892 #: parse-options.h:165
893 msgid "file"
894 msgstr "文件"
895
896 #: archive.c:438 builtin/archive.c:89
897 msgid "write the archive to this file"
898 msgstr "归档写入此文件"
899
900 #: archive.c:440
901 msgid "read .gitattributes in working directory"
902 msgstr "读取工作区中的 .gitattributes"
903
904 #: archive.c:441
905 msgid "report archived files on stderr"
906 msgstr "在标准错误上报告归档文件"
907
908 #: archive.c:442
909 msgid "store only"
910 msgstr "只存储"
911
912 #: archive.c:443
913 msgid "compress faster"
914 msgstr "压缩速度更快"
915
916 #: archive.c:451
917 msgid "compress better"
918 msgstr "压缩效果更好"
919
920 #: archive.c:454
921 msgid "list supported archive formats"
922 msgstr "列出支持的归档格式"
923
924 #: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
925 #: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593
926 msgid "repo"
927 msgstr "仓库"
928
929 #: archive.c:457 builtin/archive.c:91
930 msgid "retrieve the archive from remote repository <repo>"
931 msgstr "从远程仓库(<仓库>)提取归档文件"
932
933 #: archive.c:458 builtin/archive.c:92 builtin/notes.c:489
934 msgid "command"
935 msgstr "命令"
936
937 #: archive.c:459 builtin/archive.c:93
938 msgid "path to the remote git-upload-archive command"
939 msgstr "远程 git-upload-archive 命令的路径"
940
941 #: archive.c:466
942 msgid "Unexpected option --remote"
943 msgstr "未知参数 --remote"
944
945 #: archive.c:468
946 msgid "Option --exec can only be used together with --remote"
947 msgstr "选项 --exec 只能和 --remote 同时使用"
948
949 #: archive.c:470
950 msgid "Unexpected option --output"
951 msgstr "未知参数 --output"
952
953 #: archive.c:492
954 #, c-format
955 msgid "Unknown archive format '%s'"
956 msgstr "未知归档格式 '%s'"
957
958 #: archive.c:499
959 #, c-format
960 msgid "Argument not supported for format '%s': -%d"
961 msgstr "参数不支持此格式 '%s':-%d"
962
963 #: attr.c:218
964 #, c-format
965 msgid "%.*s is not a valid attribute name"
966 msgstr "%.*s 不是一个有效的属性名"
967
968 #: attr.c:415
969 msgid ""
970 "Negative patterns are ignored in git attributes\n"
971 "Use '\\!' for literal leading exclamation."
972 msgstr ""
973 "负值模版在 git attributes 中被忽略\n"
974 "当字符串确实要以感叹号开始时,使用 '\\!'。"
975
976 #: bisect.c:461
977 #, c-format
978 msgid "Badly quoted content in file '%s': %s"
979 msgstr "文件 '%s' 包含错误的引用格式:%s"
980
981 #: bisect.c:669
982 #, c-format
983 msgid "We cannot bisect more!\n"
984 msgstr "我们无法进行更多的二分查找!\n"
985
986 #: bisect.c:723
987 #, c-format
988 msgid "Not a valid commit name %s"
989 msgstr "不是一个有效的提交名 %s"
990
991 #: bisect.c:747
992 #, c-format
993 msgid ""
994 "The merge base %s is bad.\n"
995 "This means the bug has been fixed between %s and [%s].\n"
996 msgstr ""
997 "合并基线 %s 是坏的。\n"
998 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
999
1000 #: bisect.c:752
1001 #, c-format
1002 msgid ""
1003 "The merge base %s is new.\n"
1004 "The property has changed between %s and [%s].\n"
1005 msgstr ""
1006 "合并基线 %s 是新的。\n"
1007 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
1008
1009 #: bisect.c:757
1010 #, c-format
1011 msgid ""
1012 "The merge base %s is %s.\n"
1013 "This means the first '%s' commit is between %s and [%s].\n"
1014 msgstr ""
1015 "合并基线 %s 是 %s。\n"
1016 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1017
1018 #: bisect.c:765
1019 #, c-format
1020 msgid ""
1021 "Some %s revs are not ancestors of the %s rev.\n"
1022 "git bisect cannot work properly in this case.\n"
1023 "Maybe you mistook %s and %s revs?\n"
1024 msgstr ""
1025 "一些 %s 版本不是 %s 版本的祖先。\n"
1026 "这种情况下 git 二分查找无法正常工作。\n"
1027 "您可能弄错了 %s 和 %s 版本?\n"
1028
1029 #: bisect.c:778
1030 #, c-format
1031 msgid ""
1032 "the merge base between %s and [%s] must be skipped.\n"
1033 "So we cannot be sure the first %s commit is between %s and %s.\n"
1034 "We continue anyway."
1035 msgstr ""
1036 "介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1037 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1038 "我们仍旧继续。"
1039
1040 #: bisect.c:811
1041 #, c-format
1042 msgid "Bisecting: a merge base must be tested\n"
1043 msgstr "二分查找中:合并基线必须是经过测试的\n"
1044
1045 #: bisect.c:851
1046 #, c-format
1047 msgid "a %s revision is needed"
1048 msgstr "需要一个 %s 版本"
1049
1050 #: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236
1051 #, c-format
1052 msgid "could not create file '%s'"
1053 msgstr "不能创建文件 '%s'"
1054
1055 #: bisect.c:921
1056 #, c-format
1057 msgid "could not read file '%s'"
1058 msgstr "不能读取文件 '%s'"
1059
1060 #: bisect.c:951
1061 msgid "reading bisect refs failed"
1062 msgstr "读取二分查找引用失败"
1063
1064 #: bisect.c:970
1065 #, c-format
1066 msgid "%s was both %s and %s\n"
1067 msgstr "%s 同时为 %s 和 %s\n"
1068
1069 #: bisect.c:978
1070 #, c-format
1071 msgid ""
1072 "No testable commit found.\n"
1073 "Maybe you started with bad path parameters?\n"
1074 msgstr ""
1075 "没有发现可测试的提交。\n"
1076 "可能您在运行时使用了错误的路径参数?\n"
1077
1078 #: bisect.c:997
1079 #, c-format
1080 msgid "(roughly %d step)"
1081 msgid_plural "(roughly %d steps)"
1082 msgstr[0] "(大概 %d 步)"
1083 msgstr[1] "(大概 %d 步)"
1084
1085 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1086 #. steps)" translation.
1087 #.
1088 #: bisect.c:1003
1089 #, c-format
1090 msgid "Bisecting: %d revision left to test after this %s\n"
1091 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1092 msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1093 msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1094
1095 #: blame.c:1756
1096 msgid "--contents and --reverse do not blend well."
1097 msgstr "--contents 和 --reverse 不能混用。"
1098
1099 #: blame.c:1767
1100 msgid "cannot use --contents with final commit object name"
1101 msgstr "不能将 --contents 和最终的提交对象名共用"
1102
1103 #: blame.c:1787
1104 msgid "--reverse and --first-parent together require specified latest commit"
1105 msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1106
1107 #: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861
1108 #: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
1109 #: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372
1110 #: builtin/shortlog.c:192
1111 msgid "revision walk setup failed"
1112 msgstr "版本遍历设置失败"
1113
1114 #: blame.c:1814
1115 msgid ""
1116 "--reverse --first-parent together require range along first-parent chain"
1117 msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1118
1119 #: blame.c:1825
1120 #, c-format
1121 msgid "no such path %s in %s"
1122 msgstr "在 %2$s 中无此路径 %1$s"
1123
1124 #: blame.c:1836
1125 #, c-format
1126 msgid "cannot read blob %s for path %s"
1127 msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1128
1129 #: branch.c:54
1130 #, c-format
1131 msgid ""
1132 "\n"
1133 "After fixing the error cause you may try to fix up\n"
1134 "the remote tracking information by invoking\n"
1135 "\"git branch --set-upstream-to=%s%s%s\"."
1136 msgstr ""
1137 "\n"
1138 "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1139 "\"git branch --set-upstream-to=%s%s%s\" 。"
1140
1141 #: branch.c:68
1142 #, c-format
1143 msgid "Not setting branch %s as its own upstream."
1144 msgstr "未设置分支 %s 作为它自己的上游。"
1145
1146 #: branch.c:94
1147 #, c-format
1148 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1149 msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
1150
1151 #: branch.c:95
1152 #, c-format
1153 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1154 msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
1155
1156 #: branch.c:99
1157 #, c-format
1158 msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1159 msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
1160
1161 #: branch.c:100
1162 #, c-format
1163 msgid "Branch '%s' set up to track local branch '%s'."
1164 msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
1165
1166 #: branch.c:105
1167 #, c-format
1168 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1169 msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
1170
1171 #: branch.c:106
1172 #, c-format
1173 msgid "Branch '%s' set up to track remote ref '%s'."
1174 msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
1175
1176 #: branch.c:110
1177 #, c-format
1178 msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1179 msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
1180
1181 #: branch.c:111
1182 #, c-format
1183 msgid "Branch '%s' set up to track local ref '%s'."
1184 msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
1185
1186 #: branch.c:120
1187 msgid "Unable to write upstream branch configuration"
1188 msgstr "无法写入上游分支配置"
1189
1190 #: branch.c:157
1191 #, c-format
1192 msgid "Not tracking: ambiguous information for ref %s"
1193 msgstr "未跟踪:引用 %s 有歧义"
1194
1195 #: branch.c:190
1196 #, c-format
1197 msgid "'%s' is not a valid branch name."
1198 msgstr "'%s' 不是一个有效的分支名称。"
1199
1200 #: branch.c:209
1201 #, c-format
1202 msgid "A branch named '%s' already exists."
1203 msgstr "一个分支名 '%s' 已经存在。"
1204
1205 #: branch.c:214
1206 msgid "Cannot force update the current branch."
1207 msgstr "无法强制更新当前分支。"
1208
1209 #: branch.c:234
1210 #, c-format
1211 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1212 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
1213
1214 #: branch.c:236
1215 #, c-format
1216 msgid "the requested upstream branch '%s' does not exist"
1217 msgstr "请求的上游分支 '%s' 不存在"
1218
1219 #: branch.c:238
1220 msgid ""
1221 "\n"
1222 "If you are planning on basing your work on an upstream\n"
1223 "branch that already exists at the remote, you may need to\n"
1224 "run \"git fetch\" to retrieve it.\n"
1225 "\n"
1226 "If you are planning to push out a new local branch that\n"
1227 "will track its remote counterpart, you may want to use\n"
1228 "\"git push -u\" to set the upstream config as you push."
1229 msgstr ""
1230 "\n"
1231 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1232 "您可能需要执行 \"git fetch\" 来获取分支。\n"
1233 "\n"
1234 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1235 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
1236
1237 #: branch.c:281
1238 #, c-format
1239 msgid "Not a valid object name: '%s'."
1240 msgstr "不是一个有效的对象名:'%s'。"
1241
1242 #: branch.c:301
1243 #, c-format
1244 msgid "Ambiguous object name: '%s'."
1245 msgstr "歧义的对象名:'%s'。"
1246
1247 #: branch.c:306
1248 #, c-format
1249 msgid "Not a valid branch point: '%s'."
1250 msgstr "无效的分支点:'%s'。"
1251
1252 #: branch.c:360
1253 #, c-format
1254 msgid "'%s' is already checked out at '%s'"
1255 msgstr "'%s' 已经检出到 '%s'"
1256
1257 #: branch.c:383
1258 #, c-format
1259 msgid "HEAD of working tree %s is not updated"
1260 msgstr "工作区 %s 的 HEAD 指向没有被更新"
1261
1262 #: bundle.c:34
1263 #, c-format
1264 msgid "'%s' does not look like a v2 bundle file"
1265 msgstr "'%s' 不像是一个 v2 版本的包文件"
1266
1267 #: bundle.c:62
1268 #, c-format
1269 msgid "unrecognized header: %s%s (%d)"
1270 msgstr "未能识别的包头:%s%s (%d)"
1271
1272 #: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755
1273 #, c-format
1274 msgid "could not open '%s'"
1275 msgstr "不能打开 '%s'"
1276
1277 #: bundle.c:139
1278 msgid "Repository lacks these prerequisite commits:"
1279 msgstr "仓库中缺少这些必备的提交:"
1280
1281 #: bundle.c:190
1282 #, c-format
1283 msgid "The bundle contains this ref:"
1284 msgid_plural "The bundle contains these %d refs:"
1285 msgstr[0] "这个包中含有这个引用:"
1286 msgstr[1] "这个包中含有 %d 个引用:"
1287
1288 #: bundle.c:197
1289 msgid "The bundle records a complete history."
1290 msgstr "这个包记录一个完整历史。"
1291
1292 #: bundle.c:199
1293 #, c-format
1294 msgid "The bundle requires this ref:"
1295 msgid_plural "The bundle requires these %d refs:"
1296 msgstr[0] "这个包需要这个引用:"
1297 msgstr[1] "这个包需要 %d 个引用:"
1298
1299 #: bundle.c:258
1300 msgid "Could not spawn pack-objects"
1301 msgstr "不能生成 pack-objects 进程"
1302
1303 #: bundle.c:269
1304 msgid "pack-objects died"
1305 msgstr "pack-objects 终止"
1306
1307 #: bundle.c:311
1308 msgid "rev-list died"
1309 msgstr "rev-list 终止"
1310
1311 #: bundle.c:360
1312 #, c-format
1313 msgid "ref '%s' is excluded by the rev-list options"
1314 msgstr "引用 '%s' 被 rev-list 选项排除"
1315
1316 #: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303
1317 #, c-format
1318 msgid "unrecognized argument: %s"
1319 msgstr "未能识别的参数:%s"
1320
1321 #: bundle.c:458
1322 msgid "Refusing to create empty bundle."
1323 msgstr "不能创建空包。"
1324
1325 #: bundle.c:470
1326 #, c-format
1327 msgid "cannot create '%s'"
1328 msgstr "不能创建 '%s'"
1329
1330 #: bundle.c:498
1331 msgid "index-pack died"
1332 msgstr "index-pack 终止"
1333
1334 #: color.c:296
1335 #, c-format
1336 msgid "invalid color value: %.*s"
1337 msgstr "无效的颜色值:%.*s"
1338
1339 #: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465
1340 #: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376
1341 #: builtin/replace.c:448
1342 #, c-format
1343 msgid "could not parse %s"
1344 msgstr "不能解析 %s"
1345
1346 #: commit.c:45
1347 #, c-format
1348 msgid "%s %s is not a commit!"
1349 msgstr "%s %s 不是一个提交!"
1350
1351 #: commit.c:182
1352 msgid ""
1353 "Support for <GIT_DIR>/info/grafts is deprecated\n"
1354 "and will be removed in a future Git version.\n"
1355 "\n"
1356 "Please use \"git replace --convert-graft-file\"\n"
1357 "to convert the grafts into replace refs.\n"
1358 "\n"
1359 "Turn this message off by running\n"
1360 "\"git config advice.graftFileDeprecated false\""
1361 msgstr ""
1362 "对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n"
1363 "未来的Git版本中被移除。\n"
1364 "\n"
1365 "请使用 \"git replace --convert-graft-file\" 将\n"
1366 "grafts 转换为替换引用。\n"
1367 "\n"
1368 "设置 \"git config advice.graftFileDeprecated false\"\n"
1369 "可关闭本消息"
1370
1371 #: commit.c:1540
1372 msgid ""
1373 "Warning: commit message did not conform to UTF-8.\n"
1374 "You may want to amend it after fixing the message, or set the config\n"
1375 "variable i18n.commitencoding to the encoding your project uses.\n"
1376 msgstr ""
1377 "警告:提交说明不符合 UTF-8 字符编码。\n"
1378 "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
1379 "设置为您项目所用的字符编码。\n"
1380
1381 #: commit-graph.c:669
1382 #, c-format
1383 msgid "the commit graph format cannot write %d commits"
1384 msgstr "提交图形格式不能写入 %d 个提交"
1385
1386 #: commit-graph.c:696
1387 msgid "too many commits to write graph"
1388 msgstr "提交太多不能画图"
1389
1390 #: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521
1391 #, c-format
1392 msgid "cannot mkdir %s"
1393 msgstr "不能创建目录 %s"
1394
1395 #: compat/obstack.c:405 compat/obstack.c:407
1396 msgid "memory exhausted"
1397 msgstr "内存耗尽"
1398
1399 #: config.c:187
1400 msgid "relative config include conditionals must come from files"
1401 msgstr "包含相对路径的条件引用必须来自于文件"
1402
1403 #: config.c:788
1404 #, c-format
1405 msgid "bad config line %d in blob %s"
1406 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
1407
1408 #: config.c:792
1409 #, c-format
1410 msgid "bad config line %d in file %s"
1411 msgstr "文件 %2$s 中错误的配置行 %1$d"
1412
1413 #: config.c:796
1414 #, c-format
1415 msgid "bad config line %d in standard input"
1416 msgstr "标准输入中错误的配置行 %d"
1417
1418 #: config.c:800
1419 #, c-format
1420 msgid "bad config line %d in submodule-blob %s"
1421 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
1422
1423 #: config.c:804
1424 #, c-format
1425 msgid "bad config line %d in command line %s"
1426 msgstr "命令行 %2$s 中错误的配置行 %1$d"
1427
1428 #: config.c:808
1429 #, c-format
1430 msgid "bad config line %d in %s"
1431 msgstr "在 %2$s 中错误的配置行 %1$d"
1432
1433 #: config.c:936
1434 msgid "out of range"
1435 msgstr "超出范围"
1436
1437 #: config.c:936
1438 msgid "invalid unit"
1439 msgstr "无效的单位"
1440
1441 #: config.c:942
1442 #, c-format
1443 msgid "bad numeric config value '%s' for '%s': %s"
1444 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
1445
1446 #: config.c:947
1447 #, c-format
1448 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1449 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1450
1451 #: config.c:950
1452 #, c-format
1453 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1454 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1455
1456 #: config.c:953
1457 #, c-format
1458 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1459 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1460
1461 #: config.c:956
1462 #, c-format
1463 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1464 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1465
1466 #: config.c:959
1467 #, c-format
1468 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1469 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1470
1471 #: config.c:962
1472 #, c-format
1473 msgid "bad numeric config value '%s' for '%s' in %s: %s"
1474 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1475
1476 #: config.c:1057
1477 #, c-format
1478 msgid "failed to expand user dir in: '%s'"
1479 msgstr "无法扩展 '%s' 中的用户目录"
1480
1481 #: config.c:1066
1482 #, c-format
1483 msgid "'%s' for '%s' is not a valid timestamp"
1484 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
1485
1486 #: config.c:1171 config.c:1182
1487 #, c-format
1488 msgid "bad zlib compression level %d"
1489 msgstr "错误的 zlib 压缩级别 %d"
1490
1491 #: config.c:1307
1492 #, c-format
1493 msgid "invalid mode for object creation: %s"
1494 msgstr "无效的对象创建模式:%s"
1495
1496 #: config.c:1473
1497 #, c-format
1498 msgid "bad pack compression level %d"
1499 msgstr "错误的打包压缩级别 %d"
1500
1501 #: config.c:1681
1502 msgid "unable to parse command-line config"
1503 msgstr "无法解析命令行中的配置"
1504
1505 #: config.c:2013
1506 msgid "unknown error occurred while reading the configuration files"
1507 msgstr "在读取配置文件时遇到未知错误"
1508
1509 #: config.c:2200
1510 #, c-format
1511 msgid "Invalid %s: '%s'"
1512 msgstr "无效 %s:'%s'"
1513
1514 #: config.c:2243
1515 #, c-format
1516 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1517 msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
1518
1519 #: config.c:2269
1520 #, c-format
1521 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1522 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
1523
1524 #: config.c:2294
1525 #, c-format
1526 msgid "unable to parse '%s' from command-line config"
1527 msgstr "无法解析命令行配置中的 '%s'"
1528
1529 #: config.c:2296
1530 #, c-format
1531 msgid "bad config variable '%s' in file '%s' at line %d"
1532 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
1533
1534 #: config.c:2402
1535 #, c-format
1536 msgid "%s has multiple values"
1537 msgstr "%s 有多个取值"
1538
1539 #: config.c:2766 config.c:3019
1540 #, c-format
1541 msgid "fstat on %s failed"
1542 msgstr "对 %s 调用 fstat 失败"
1543
1544 #: config.c:2905
1545 #, c-format
1546 msgid "could not set '%s' to '%s'"
1547 msgstr "不能设置 '%s' 为 '%s'"
1548
1549 #: config.c:2907 builtin/remote.c:779
1550 #, c-format
1551 msgid "could not unset '%s'"
1552 msgstr "不能取消设置 '%s'"
1553
1554 #: connect.c:61
1555 msgid "The remote end hung up upon initial contact"
1556 msgstr "远端在连接发起时即挂断"
1557
1558 #: connect.c:63
1559 msgid ""
1560 "Could not read from remote repository.\n"
1561 "\n"
1562 "Please make sure you have the correct access rights\n"
1563 "and the repository exists."
1564 msgstr ""
1565 "无法读取远程仓库。\n"
1566 "\n"
1567 "请确认您有正确的访问权限并且仓库存在。"
1568
1569 #: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145
1570 msgid "Checking connectivity"
1571 msgstr "检查连接中"
1572
1573 #: connected.c:78
1574 msgid "Could not run 'git rev-list'"
1575 msgstr "不能执行 'git rev-list'"
1576
1577 #: connected.c:98
1578 msgid "failed write to rev-list"
1579 msgstr "无法写入 rev-list"
1580
1581 #: connected.c:105
1582 msgid "failed to close rev-list's stdin"
1583 msgstr "无法关闭 rev-list 的标准输入"
1584
1585 #: convert.c:206
1586 #, c-format
1587 msgid "CRLF would be replaced by LF in %s."
1588 msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
1589
1590 #: convert.c:208
1591 #, c-format
1592 msgid ""
1593 "CRLF will be replaced by LF in %s.\n"
1594 "The file will have its original line endings in your working directory."
1595 msgstr ""
1596 "文件 %s 中的 CRLF 将被 LF 替换。\n"
1597 "在工作区中该文件仍保持原有的换行符。"
1598
1599 #: convert.c:216
1600 #, c-format
1601 msgid "LF would be replaced by CRLF in %s"
1602 msgstr "文件 %s 中的 LF 将被 CRLF 替换"
1603
1604 #: convert.c:218
1605 #, c-format
1606 msgid ""
1607 "LF will be replaced by CRLF in %s.\n"
1608 "The file will have its original line endings in your working directory."
1609 msgstr ""
1610 "文件 %s 中的 LF 将被 CRLF 替换。\n"
1611 "在工作区中该文件仍保持原有的换行符。"
1612
1613 #: convert.c:279
1614 #, c-format
1615 msgid "BOM is prohibited in '%s' if encoded as %s"
1616 msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
1617
1618 #: convert.c:286
1619 #, c-format
1620 msgid ""
1621 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
1622 "tree-encoding."
1623 msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%s 作为工作区编码。"
1624
1625 #: convert.c:304
1626 #, c-format
1627 msgid "BOM is required in '%s' if encoded as %s"
1628 msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
1629
1630 #: convert.c:306
1631 #, c-format
1632 msgid ""
1633 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
1634 "%sLE (depending on the byte order) as working-tree-encoding."
1635 msgstr ""
1636 "文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
1637 "节序)作为工作区编码。"
1638
1639 #: convert.c:424
1640 #, c-format
1641 msgid "failed to encode '%s' from %s to %s"
1642 msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
1643
1644 #: convert.c:467
1645 #, c-format
1646 msgid "encoding '%s' from %s to %s and back is not the same"
1647 msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
1648
1649 #: convert.c:1225
1650 msgid "true/false are no valid working-tree-encodings"
1651 msgstr "true/false 不是有效的工作区编码"
1652
1653 #: date.c:116
1654 msgid "in the future"
1655 msgstr "在将来"
1656
1657 #: date.c:122
1658 #, c-format
1659 msgid "%<PRIuMAX> second ago"
1660 msgid_plural "%<PRIuMAX> seconds ago"
1661 msgstr[0] "%<PRIuMAX> 秒钟前"
1662 msgstr[1] "%<PRIuMAX> 秒钟前"
1663
1664 #: date.c:129
1665 #, c-format
1666 msgid "%<PRIuMAX> minute ago"
1667 msgid_plural "%<PRIuMAX> minutes ago"
1668 msgstr[0] "%<PRIuMAX> 分钟前"
1669 msgstr[1] "%<PRIuMAX> 分钟前"
1670
1671 #: date.c:136
1672 #, c-format
1673 msgid "%<PRIuMAX> hour ago"
1674 msgid_plural "%<PRIuMAX> hours ago"
1675 msgstr[0] "%<PRIuMAX> 小时前"
1676 msgstr[1] "%<PRIuMAX> 小时前"
1677
1678 #: date.c:143
1679 #, c-format
1680 msgid "%<PRIuMAX> day ago"
1681 msgid_plural "%<PRIuMAX> days ago"
1682 msgstr[0] "%<PRIuMAX> 天前"
1683 msgstr[1] "%<PRIuMAX> 天前"
1684
1685 #: date.c:149
1686 #, c-format
1687 msgid "%<PRIuMAX> week ago"
1688 msgid_plural "%<PRIuMAX> weeks ago"
1689 msgstr[0] "%<PRIuMAX> 周前"
1690 msgstr[1] "%<PRIuMAX> 周前"
1691
1692 #: date.c:156
1693 #, c-format
1694 msgid "%<PRIuMAX> month ago"
1695 msgid_plural "%<PRIuMAX> months ago"
1696 msgstr[0] "%<PRIuMAX> 个月前"
1697 msgstr[1] "%<PRIuMAX> 个月前"
1698
1699 #: date.c:167
1700 #, c-format
1701 msgid "%<PRIuMAX> year"
1702 msgid_plural "%<PRIuMAX> years"
1703 msgstr[0] "%<PRIuMAX> 年"
1704 msgstr[1] "%<PRIuMAX> 年"
1705
1706 #. TRANSLATORS: "%s" is "<n> years"
1707 #: date.c:170
1708 #, c-format
1709 msgid "%s, %<PRIuMAX> month ago"
1710 msgid_plural "%s, %<PRIuMAX> months ago"
1711 msgstr[0] "%s %<PRIuMAX> 个月前"
1712 msgstr[1] "%s %<PRIuMAX> 个月前"
1713
1714 #: date.c:175 date.c:180
1715 #, c-format
1716 msgid "%<PRIuMAX> year ago"
1717 msgid_plural "%<PRIuMAX> years ago"
1718 msgstr[0] "%<PRIuMAX> 年前"
1719 msgstr[1] "%<PRIuMAX> 年前"
1720
1721 #: diffcore-order.c:24
1722 #, c-format
1723 msgid "failed to read orderfile '%s'"
1724 msgstr "无法读取排序文件 '%s'"
1725
1726 #: diffcore-rename.c:535
1727 msgid "Performing inexact rename detection"
1728 msgstr "正在进行非精确的重命名探测"
1729
1730 #: diff.c:74
1731 #, c-format
1732 msgid "option '%s' requires a value"
1733 msgstr "选项 '%s' 需要一个值"
1734
1735 # 译者:注意保持前导空格
1736 #: diff.c:152
1737 #, c-format
1738 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
1739 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
1740
1741 # 译者:注意保持前导空格
1742 #: diff.c:157
1743 #, c-format
1744 msgid " Unknown dirstat parameter '%s'\n"
1745 msgstr " 未知的 dirstat 参数 '%s'\n"
1746
1747 #: diff.c:281
1748 msgid ""
1749 "color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
1750 "'plain'"
1751 msgstr ""
1752 "代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"
1753
1754 #: diff.c:341
1755 #, c-format
1756 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
1757 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
1758
1759 #: diff.c:401
1760 #, c-format
1761 msgid ""
1762 "Found errors in 'diff.dirstat' config variable:\n"
1763 "%s"
1764 msgstr ""
1765 "发现配置变量 'diff.dirstat' 中的错误:\n"
1766 "%s"
1767
1768 #: diff.c:3823
1769 #, c-format
1770 msgid "external diff died, stopping at %s"
1771 msgstr "外部 diff 退出,停止在 %s"
1772
1773 #: diff.c:4153
1774 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
1775 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
1776
1777 #: diff.c:4156
1778 msgid "-G, -S and --find-object are mutually exclusive"
1779 msgstr "-G、-S 和 --find-object 是互斥的"
1780
1781 #: diff.c:4244
1782 msgid "--follow requires exactly one pathspec"
1783 msgstr "--follow 明确要求只跟一个路径规格"
1784
1785 #: diff.c:4410
1786 #, c-format
1787 msgid ""
1788 "Failed to parse --dirstat/-X option parameter:\n"
1789 "%s"
1790 msgstr ""
1791 "无法解析 --dirstat/-X 选项的参数:\n"
1792 "%s"
1793
1794 #: diff.c:4424
1795 #, c-format
1796 msgid "Failed to parse --submodule option parameter: '%s'"
1797 msgstr "无法解析 --submodule 选项的参数:'%s'"
1798
1799 #: diff.c:5500
1800 msgid "inexact rename detection was skipped due to too many files."
1801 msgstr "因为文件太多,略过不严格的重命名检查。"
1802
1803 #: diff.c:5503
1804 msgid "only found copies from modified paths due to too many files."
1805 msgstr "因为文件太多,只在修改的路径中查找拷贝。"
1806
1807 #: diff.c:5506
1808 #, c-format
1809 msgid ""
1810 "you may want to set your %s variable to at least %d and retry the command."
1811 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
1812
1813 #: dir.c:1867
1814 #, c-format
1815 msgid "could not open directory '%s'"
1816 msgstr "不能打开目录 '%s'"
1817
1818 #: dir.c:2109
1819 msgid "failed to get kernel name and information"
1820 msgstr "无法获得内核名称和信息"
1821
1822 #: dir.c:2233
1823 msgid "Untracked cache is disabled on this system or location."
1824 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
1825
1826 #: dir.c:3075 dir.c:3080
1827 #, c-format
1828 msgid "could not create directories for %s"
1829 msgstr "不能为 %s 创建目录"
1830
1831 #: dir.c:3109
1832 #, c-format
1833 msgid "could not migrate git directory from '%s' to '%s'"
1834 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
1835
1836 #: editor.c:61
1837 #, c-format
1838 msgid "hint: Waiting for your editor to close the file...%c"
1839 msgstr "提示:等待您的编辑器关闭文件...%c"
1840
1841 #: entry.c:177
1842 msgid "Filtering content"
1843 msgstr "过滤内容"
1844
1845 #: entry.c:435
1846 #, c-format
1847 msgid "could not stat file '%s'"
1848 msgstr "不能对文件 '%s' 调用 stat"
1849
1850 #: fetch-object.c:17
1851 msgid "Remote with no URL"
1852 msgstr "远程未设置 URL"
1853
1854 #: fetch-pack.c:254
1855 msgid "git fetch-pack: expected shallow list"
1856 msgstr "git fetch-pack:应为 shallow 列表"
1857
1858 #: fetch-pack.c:266
1859 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
1860 msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
1861
1862 #: fetch-pack.c:285 builtin/archive.c:63
1863 #, c-format
1864 msgid "remote error: %s"
1865 msgstr "远程错误:%s"
1866
1867 #: fetch-pack.c:286
1868 #, c-format
1869 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1870 msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
1871
1872 #: fetch-pack.c:338
1873 msgid "--stateless-rpc requires multi_ack_detailed"
1874 msgstr "--stateless-rpc 需要 multi_ack_detailed"
1875
1876 #: fetch-pack.c:429 fetch-pack.c:1310
1877 #, c-format
1878 msgid "invalid shallow line: %s"
1879 msgstr "无效的 shallow 信息:%s"
1880
1881 #: fetch-pack.c:435 fetch-pack.c:1316
1882 #, c-format
1883 msgid "invalid unshallow line: %s"
1884 msgstr "无效的 unshallow 信息:%s"
1885
1886 #: fetch-pack.c:437 fetch-pack.c:1318
1887 #, c-format
1888 msgid "object not found: %s"
1889 msgstr "对象未找到:%s"
1890
1891 #: fetch-pack.c:440 fetch-pack.c:1321
1892 #, c-format
1893 msgid "error in object: %s"
1894 msgstr "对象中出错:%s"
1895
1896 #: fetch-pack.c:442 fetch-pack.c:1323
1897 #, c-format
1898 msgid "no shallow found: %s"
1899 msgstr "未发现 shallow:%s"
1900
1901 #: fetch-pack.c:445 fetch-pack.c:1326
1902 #, c-format
1903 msgid "expected shallow/unshallow, got %s"
1904 msgstr "应为 shallow/unshallow,却得到 %s"
1905
1906 #: fetch-pack.c:486
1907 #, c-format
1908 msgid "got %s %d %s"
1909 msgstr "得到 %s %d %s"
1910
1911 #: fetch-pack.c:500
1912 #, c-format
1913 msgid "invalid commit %s"
1914 msgstr "无效提交 %s"
1915
1916 #: fetch-pack.c:533
1917 msgid "giving up"
1918 msgstr "放弃"
1919
1920 #: fetch-pack.c:543 progress.c:229
1921 msgid "done"
1922 msgstr "完成"
1923
1924 #: fetch-pack.c:555
1925 #, c-format
1926 msgid "got %s (%d) %s"
1927 msgstr "得到 %s (%d) %s"
1928
1929 #: fetch-pack.c:601
1930 #, c-format
1931 msgid "Marking %s as complete"
1932 msgstr "标记 %s 为完成"
1933
1934 #: fetch-pack.c:828
1935 #, c-format
1936 msgid "already have %s (%s)"
1937 msgstr "已经有 %s(%s)"
1938
1939 #: fetch-pack.c:869
1940 msgid "fetch-pack: unable to fork off sideband demultiplexer"
1941 msgstr "fetch-pack:无法派生 sideband 多路输出"
1942
1943 #: fetch-pack.c:877
1944 msgid "protocol error: bad pack header"
1945 msgstr "协议错误:坏的包头"
1946
1947 #: fetch-pack.c:944
1948 #, c-format
1949 msgid "fetch-pack: unable to fork off %s"
1950 msgstr "fetch-pack:无法派生进程 %s"
1951
1952 #: fetch-pack.c:960
1953 #, c-format
1954 msgid "%s failed"
1955 msgstr "%s 失败"
1956
1957 #: fetch-pack.c:962
1958 msgid "error in sideband demultiplexer"
1959 msgstr "sideband 多路输出出错"
1960
1961 #: fetch-pack.c:989
1962 msgid "Server does not support shallow clients"
1963 msgstr "服务器不支持 shalllow 客户端"
1964
1965 #: fetch-pack.c:993
1966 msgid "Server supports multi_ack_detailed"
1967 msgstr "服务器支持 multi_ack_detailed"
1968
1969 #: fetch-pack.c:996
1970 msgid "Server supports no-done"
1971 msgstr "服务器支持 no-done"
1972
1973 #: fetch-pack.c:1002
1974 msgid "Server supports multi_ack"
1975 msgstr "服务器支持 multi_ack"
1976
1977 #: fetch-pack.c:1006
1978 msgid "Server supports side-band-64k"
1979 msgstr "服务器支持 side-band-64k"
1980
1981 #: fetch-pack.c:1010
1982 msgid "Server supports side-band"
1983 msgstr "服务器支持 side-band"
1984
1985 #: fetch-pack.c:1014
1986 msgid "Server supports allow-tip-sha1-in-want"
1987 msgstr "服务器支持 allow-tip-sha1-in-want"
1988
1989 #: fetch-pack.c:1018
1990 msgid "Server supports allow-reachable-sha1-in-want"
1991 msgstr "服务器支持 allow-reachable-sha1-in-want"
1992
1993 #: fetch-pack.c:1028
1994 msgid "Server supports ofs-delta"
1995 msgstr "服务器支持 ofs-delta"
1996
1997 #: fetch-pack.c:1034 fetch-pack.c:1204
1998 msgid "Server supports filter"
1999 msgstr "服务器支持 filter"
2000
2001 #: fetch-pack.c:1042
2002 #, c-format
2003 msgid "Server version is %.*s"
2004 msgstr "服务器版本 %.*s"
2005
2006 #: fetch-pack.c:1048
2007 msgid "Server does not support --shallow-since"
2008 msgstr "服务器不支持 --shallow-since"
2009
2010 #: fetch-pack.c:1052
2011 msgid "Server does not support --shallow-exclude"
2012 msgstr "服务器不支持 --shallow-exclude"
2013
2014 #: fetch-pack.c:1054
2015 msgid "Server does not support --deepen"
2016 msgstr "服务器不支持 --deepen"
2017
2018 #: fetch-pack.c:1065
2019 msgid "no common commits"
2020 msgstr "没有共同的提交"
2021
2022 #: fetch-pack.c:1077 fetch-pack.c:1414
2023 msgid "git fetch-pack: fetch failed."
2024 msgstr "git fetch-pack:获取失败。"
2025
2026 #: fetch-pack.c:1199
2027 msgid "Server does not support shallow requests"
2028 msgstr "服务器不支持 shalllow 请求"
2029
2030 #: fetch-pack.c:1584
2031 msgid "no matching remote head"
2032 msgstr "没有匹配的远程分支"
2033
2034 #: fetch-pack.c:1610
2035 #, c-format
2036 msgid "no such remote ref %s"
2037 msgstr "没有这样的远程引用 %s"
2038
2039 #: fetch-pack.c:1613
2040 #, c-format
2041 msgid "Server does not allow request for unadvertised object %s"
2042 msgstr "服务器不允许请求未公开的对象 %s"
2043
2044 #: gpg-interface.c:185
2045 msgid "gpg failed to sign the data"
2046 msgstr "gpg 无法为数据签名"
2047
2048 #: gpg-interface.c:210
2049 msgid "could not create temporary file"
2050 msgstr "不能创建临时文件"
2051
2052 #: gpg-interface.c:213
2053 #, c-format
2054 msgid "failed writing detached signature to '%s'"
2055 msgstr "无法将分离式签名写入 '%s'"
2056
2057 #: graph.c:97
2058 #, c-format
2059 msgid "ignore invalid color '%.*s' in log.graphColors"
2060 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
2061
2062 #: grep.c:2020
2063 #, c-format
2064 msgid "'%s': unable to read %s"
2065 msgstr "'%s':无法读取 %s"
2066
2067 #: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81
2068 #: builtin/rm.c:134
2069 #, c-format
2070 msgid "failed to stat '%s'"
2071 msgstr "对 '%s' 调用 stat 失败"
2072
2073 #: grep.c:2048
2074 #, c-format
2075 msgid "'%s': short read"
2076 msgstr "'%s':读取不完整"
2077
2078 #: help.c:23
2079 msgid "start a working area (see also: git help tutorial)"
2080 msgstr "开始一个工作区(参见:git help tutorial)"
2081
2082 #: help.c:24
2083 msgid "work on the current change (see also: git help everyday)"
2084 msgstr "在当前变更上工作(参见:git help everyday)"
2085
2086 #: help.c:25
2087 msgid "examine the history and state (see also: git help revisions)"
2088 msgstr "检查历史和状态(参见:git help revisions)"
2089
2090 #: help.c:26
2091 msgid "grow, mark and tweak your common history"
2092 msgstr "扩展、标记和调校您的历史记录"
2093
2094 #: help.c:27
2095 msgid "collaborate (see also: git help workflows)"
2096 msgstr "协同(参见:git help workflows)"
2097
2098 #: help.c:31
2099 msgid "Main Porcelain Commands"
2100 msgstr "主要的上层命令"
2101
2102 #: help.c:32
2103 msgid "Ancillary Commands / Manipulators"
2104 msgstr "辅助命令/操作者"
2105
2106 #: help.c:33
2107 msgid "Ancillary Commands / Interrogators"
2108 msgstr "辅助命令/询问者"
2109
2110 #: help.c:34
2111 msgid "Interacting with Others"
2112 msgstr "与其它系统交互"
2113
2114 #: help.c:35
2115 msgid "Low-level Commands / Manipulators"
2116 msgstr "低级命令/操作者"
2117
2118 #: help.c:36
2119 msgid "Low-level Commands / Interrogators"
2120 msgstr "低级命令/询问者"
2121
2122 #: help.c:37
2123 msgid "Low-level Commands / Synching Repositories"
2124 msgstr "低级命令/同步仓库"
2125
2126 #: help.c:38
2127 msgid "Low-level Commands / Internal Helpers"
2128 msgstr "低级命令/内部助手"
2129
2130 #: help.c:293
2131 #, c-format
2132 msgid "available git commands in '%s'"
2133 msgstr "在 '%s' 下可用的 git 命令"
2134
2135 #: help.c:300
2136 msgid "git commands available from elsewhere on your $PATH"
2137 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
2138
2139 #: help.c:309
2140 msgid "These are common Git commands used in various situations:"
2141 msgstr "这些是各种场合常见的 Git 命令:"
2142
2143 #: help.c:358 git.c:90
2144 #, c-format
2145 msgid "unsupported command listing type '%s'"
2146 msgstr "不支持的命令列表类型 '%s'"
2147
2148 #: help.c:405
2149 msgid "The common Git guides are:"
2150 msgstr "最常用的 Git 向导有:"
2151
2152 #: help.c:467
2153 #, c-format
2154 msgid ""
2155 "'%s' appears to be a git command, but we were not\n"
2156 "able to execute it. Maybe git-%s is broken?"
2157 msgstr ""
2158 "'%s' 像是一个 git 命令,但却无法运行。\n"
2159 "可能是 git-%s 受损?"
2160
2161 #: help.c:526
2162 msgid "Uh oh. Your system reports no Git commands at all."
2163 msgstr "唉呀,您的系统中未发现 Git 命令。"
2164
2165 #: help.c:548
2166 #, c-format
2167 msgid "WARNING: You called a Git command named '%s', which does not exist."
2168 msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
2169
2170 #: help.c:553
2171 #, c-format
2172 msgid "Continuing under the assumption that you meant '%s'."
2173 msgstr "假定你想要的是 '%s' 并继续。"
2174
2175 #: help.c:558
2176 #, c-format
2177 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
2178 msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
2179
2180 #: help.c:566
2181 #, c-format
2182 msgid "git: '%s' is not a git command. See 'git --help'."
2183 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
2184
2185 #: help.c:570
2186 msgid ""
2187 "\n"
2188 "The most similar command is"
2189 msgid_plural ""
2190 "\n"
2191 "The most similar commands are"
2192 msgstr[0] ""
2193 "\n"
2194 "最相似的命令是"
2195 msgstr[1] ""
2196 "\n"
2197 "最相似的命令是"
2198
2199 #: help.c:585
2200 msgid "git version [<options>]"
2201 msgstr "git version [<选项>]"
2202
2203 #: help.c:652
2204 #, c-format
2205 msgid "%s: %s - %s"
2206 msgstr "%s:%s - %s"
2207
2208 #: help.c:656
2209 msgid ""
2210 "\n"
2211 "Did you mean this?"
2212 msgid_plural ""
2213 "\n"
2214 "Did you mean one of these?"
2215 msgstr[0] ""
2216 "\n"
2217 "您指的是这个么?"
2218 msgstr[1] ""
2219 "\n"
2220 "您指的是这其中的某一个么?"
2221
2222 #: ident.c:342
2223 msgid ""
2224 "\n"
2225 "*** Please tell me who you are.\n"
2226 "\n"
2227 "Run\n"
2228 "\n"
2229 " git config --global user.email \"you@example.com\"\n"
2230 " git config --global user.name \"Your Name\"\n"
2231 "\n"
2232 "to set your account's default identity.\n"
2233 "Omit --global to set the identity only in this repository.\n"
2234 "\n"
2235 msgstr ""
2236 "\n"
2237 "*** 请告诉我你是谁。\n"
2238 "\n"
2239 "运行\n"
2240 "\n"
2241 " git config --global user.email \"you@example.com\"\n"
2242 " git config --global user.name \"Your Name\"\n"
2243 "\n"
2244 "来设置您账号的缺省身份标识。\n"
2245 "如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
2246
2247 #: ident.c:366
2248 msgid "no email was given and auto-detection is disabled"
2249 msgstr "未提供邮件地址且自动探测被禁用"
2250
2251 #: ident.c:371
2252 #, c-format
2253 msgid "unable to auto-detect email address (got '%s')"
2254 msgstr "无法自动探测邮件地址(得到 '%s')"
2255
2256 #: ident.c:381
2257 msgid "no name was given and auto-detection is disabled"
2258 msgstr "未提供姓名且自动探测被禁用"
2259
2260 #: ident.c:387
2261 #, c-format
2262 msgid "unable to auto-detect name (got '%s')"
2263 msgstr "无法自动探测姓名(得到 '%s')"
2264
2265 #: ident.c:395
2266 #, c-format
2267 msgid "empty ident name (for <%s>) not allowed"
2268 msgstr "不允许空的姓名(对于 <%s>)"
2269
2270 #: ident.c:401
2271 #, c-format
2272 msgid "name consists only of disallowed characters: %s"
2273 msgstr "姓名中仅包含禁用字符:%s"
2274
2275 #: ident.c:416 builtin/commit.c:587
2276 #, c-format
2277 msgid "invalid date format: %s"
2278 msgstr "无效的日期格式:%s"
2279
2280 #: list-objects-filter-options.c:36
2281 msgid "multiple filter-specs cannot be combined"
2282 msgstr "不能混用多种过滤规格"
2283
2284 #: list-objects-filter-options.c:126
2285 msgid "cannot change partial clone promisor remote"
2286 msgstr "无法修改部分克隆的 promisor 远程仓库"
2287
2288 #: lockfile.c:151
2289 #, c-format
2290 msgid ""
2291 "Unable to create '%s.lock': %s.\n"
2292 "\n"
2293 "Another git process seems to be running in this repository, e.g.\n"
2294 "an editor opened by 'git commit'. Please make sure all processes\n"
2295 "are terminated then try again. If it still fails, a git process\n"
2296 "may have crashed in this repository earlier:\n"
2297 "remove the file manually to continue."
2298 msgstr ""
2299 "无法创建 '%s.lock':%s。\n"
2300 "\n"
2301 "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
2302 "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
2303 "可能之前有一个 git 进程在这个仓库中异常退出:\n"
2304 "手动删除这个文件再继续。"
2305
2306 #: lockfile.c:159
2307 #, c-format
2308 msgid "Unable to create '%s.lock': %s"
2309 msgstr "不能创建 '%s.lock':%s"
2310
2311 #: merge.c:71
2312 msgid "failed to read the cache"
2313 msgstr "无法读取缓存"
2314
2315 #: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
2316 #: builtin/checkout.c:606 builtin/clone.c:761
2317 msgid "unable to write new index file"
2318 msgstr "无法写新的索引文件"
2319
2320 #: merge-recursive.c:298
2321 msgid "(bad commit)\n"
2322 msgstr "(坏提交)\n"
2323
2324 #: merge-recursive.c:320
2325 #, c-format
2326 msgid "add_cacheinfo failed for path '%s'; merge aborting."
2327 msgstr "addinfo_cache 对路径 '%s' 执行失败,合并终止。"
2328
2329 #: merge-recursive.c:328
2330 #, c-format
2331 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
2332 msgstr "addinfo_cache 无法刷新路径 '%s',合并终止。"
2333
2334 #: merge-recursive.c:410
2335 msgid "error building trees"
2336 msgstr "无法创建树"
2337
2338 #: merge-recursive.c:881
2339 #, c-format
2340 msgid "failed to create path '%s'%s"
2341 msgstr "无法创建路径 '%s'%s"
2342
2343 #: merge-recursive.c:892
2344 #, c-format
2345 msgid "Removing %s to make room for subdirectory\n"
2346 msgstr "删除 %s 以便为子目录留出空间\n"
2347
2348 #: merge-recursive.c:906 merge-recursive.c:925
2349 msgid ": perhaps a D/F conflict?"
2350 msgstr ":可能是一个目录/文件冲突?"
2351
2352 #: merge-recursive.c:915
2353 #, c-format
2354 msgid "refusing to lose untracked file at '%s'"
2355 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
2356
2357 #: merge-recursive.c:957 builtin/cat-file.c:37
2358 #, c-format
2359 msgid "cannot read object %s '%s'"
2360 msgstr "不能读取对象 %s '%s'"
2361
2362 #: merge-recursive.c:959
2363 #, c-format
2364 msgid "blob expected for %s '%s'"
2365 msgstr "%s '%s' 应为数据对象"
2366
2367 #: merge-recursive.c:983
2368 #, c-format
2369 msgid "failed to open '%s': %s"
2370 msgstr "无法打开 '%s':%s"
2371
2372 #: merge-recursive.c:994
2373 #, c-format
2374 msgid "failed to symlink '%s': %s"
2375 msgstr "无法创建符号链接 '%s':%s"
2376
2377 #: merge-recursive.c:999
2378 #, c-format
2379 msgid "do not know what to do with %06o %s '%s'"
2380 msgstr "不知道如何处理 %06o %s '%s'"
2381
2382 #: merge-recursive.c:1186
2383 #, c-format
2384 msgid "Failed to merge submodule %s (not checked out)"
2385 msgstr "无法合并子模组 %s (没有检出)"
2386
2387 #: merge-recursive.c:1193
2388 #, c-format
2389 msgid "Failed to merge submodule %s (commits not present)"
2390 msgstr "无法合并子模组 %s(提交不存在)"
2391
2392 #: merge-recursive.c:1200
2393 #, c-format
2394 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
2395 msgstr "无法合并子模组 %s (提交未跟随合并基线)"
2396
2397 #: merge-recursive.c:1208 merge-recursive.c:1220
2398 #, c-format
2399 msgid "Fast-forwarding submodule %s to the following commit:"
2400 msgstr "子模组 %s 快进到如下提交:"
2401
2402 #: merge-recursive.c:1211 merge-recursive.c:1223
2403 #, c-format
2404 msgid "Fast-forwarding submodule %s"
2405 msgstr "快进子模组 %s"
2406
2407 #: merge-recursive.c:1245
2408 #, c-format
2409 msgid "Failed to merge submodule %s (merge following commits not found)"
2410 msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
2411
2412 #: merge-recursive.c:1249
2413 #, c-format
2414 msgid "Failed to merge submodule %s (not fast-forward)"
2415 msgstr "无法合并子模组 %s(非快进)"
2416
2417 #: merge-recursive.c:1250
2418 msgid "Found a possible merge resolution for the submodule:\n"
2419 msgstr "找到子模组的一个可能的合并方案:\n"
2420
2421 #: merge-recursive.c:1253
2422 #, c-format
2423 msgid ""
2424 "If this is correct simply add it to the index for example\n"
2425 "by using:\n"
2426 "\n"
2427 " git update-index --cacheinfo 160000 %s \"%s\"\n"
2428 "\n"
2429 "which will accept this suggestion.\n"
2430 msgstr ""
2431 "如果这个正确,将其添加到索引,例如使用命令:\n"
2432 "\n"
2433 " git update-index --cacheinfo 160000 %s \"%s\"\n"
2434 "\n"
2435 "以接受此建议。\n"
2436
2437 #: merge-recursive.c:1262
2438 #, c-format
2439 msgid "Failed to merge submodule %s (multiple merges found)"
2440 msgstr "无法合并子模组 %s (发现多个合并)"
2441
2442 #: merge-recursive.c:1321
2443 msgid "Failed to execute internal merge"
2444 msgstr "无法执行内部合并"
2445
2446 #: merge-recursive.c:1326
2447 #, c-format
2448 msgid "Unable to add %s to database"
2449 msgstr "不能添加 %s 至对象库"
2450
2451 #: merge-recursive.c:1358
2452 #, c-format
2453 msgid "Auto-merging %s"
2454 msgstr "自动合并 %s"
2455
2456 #: merge-recursive.c:1423
2457 #, c-format
2458 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
2459 msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
2460
2461 #: merge-recursive.c:1475
2462 #, c-format
2463 msgid ""
2464 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2465 "in tree."
2466 msgstr ""
2467 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2468 "本被保留。"
2469
2470 #: merge-recursive.c:1480
2471 #, c-format
2472 msgid ""
2473 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2474 "left in tree."
2475 msgstr ""
2476 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2477 "%7$s 版本被保留。"
2478
2479 #: merge-recursive.c:1487
2480 #, c-format
2481 msgid ""
2482 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2483 "in tree at %s."
2484 msgstr ""
2485 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2486 "本保留在 %8$s 中。"
2487
2488 #: merge-recursive.c:1492
2489 #, c-format
2490 msgid ""
2491 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2492 "left in tree at %s."
2493 msgstr ""
2494 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2495 "%7$s 版本保留在 %9$s 中。"
2496
2497 #: merge-recursive.c:1526
2498 msgid "rename"
2499 msgstr "重命名"
2500
2501 #: merge-recursive.c:1526
2502 msgid "renamed"
2503 msgstr "重命名"
2504
2505 #: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368
2506 #: merge-recursive.c:3086
2507 #, c-format
2508 msgid "Refusing to lose dirty file at %s"
2509 msgstr "拒绝丢失脏文件 '%s'"
2510
2511 #: merge-recursive.c:1594
2512 #, c-format
2513 msgid "%s is a directory in %s adding as %s instead"
2514 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
2515
2516 #: merge-recursive.c:1599
2517 #, c-format
2518 msgid "Refusing to lose untracked file at %s; adding as %s instead"
2519 msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
2520
2521 #: merge-recursive.c:1625
2522 #, c-format
2523 msgid ""
2524 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
2525 "\"->\"%s\" in \"%s\"%s"
2526 msgstr ""
2527 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
2528 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
2529
2530 #: merge-recursive.c:1630
2531 msgid " (left unresolved)"
2532 msgstr "(留下未解决)"
2533
2534 #: merge-recursive.c:1694
2535 #, c-format
2536 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
2537 msgstr ""
2538 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
2539 "%5$s"
2540
2541 #: merge-recursive.c:1733
2542 #, c-format
2543 msgid "Renaming %s to %s and %s to %s instead"
2544 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
2545
2546 #: merge-recursive.c:1745
2547 #, c-format
2548 msgid "Refusing to lose untracked file at %s, even though it's in the way."
2549 msgstr "拒绝丢失未跟踪文件 '%s',即使它妨碍了。"
2550
2551 #: merge-recursive.c:1951
2552 #, c-format
2553 msgid ""
2554 "CONFLICT (directory rename split): Unclear where to place %s because "
2555 "directory %s was renamed to multiple other directories, with no destination "
2556 "getting a majority of the files."
2557 msgstr ""
2558 "冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
2559 "其它目录,没有一个目录包含主要的文件。"
2560
2561 #: merge-recursive.c:1983
2562 #, c-format
2563 msgid ""
2564 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
2565 "implicit directory rename(s) putting the following path(s) there: %s."
2566 msgstr ""
2567 "冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
2568 "在:%s。"
2569
2570 #: merge-recursive.c:1993
2571 #, c-format
2572 msgid ""
2573 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
2574 "implicit directory renames tried to put these paths there: %s"
2575 msgstr ""
2576 "冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
2577 "径放置于此:%s"
2578
2579 #: merge-recursive.c:2085
2580 #, c-format
2581 msgid ""
2582 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
2583 ">%s in %s"
2584 msgstr ""
2585 "冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
2586 "%4$s->%5$s"
2587
2588 #: merge-recursive.c:2330
2589 #, c-format
2590 msgid ""
2591 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
2592 "renamed."
2593 msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
2594
2595 #: merge-recursive.c:2736
2596 #, c-format
2597 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
2598 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
2599
2600 #: merge-recursive.c:2751
2601 #, c-format
2602 msgid "Adding merged %s"
2603 msgstr "添加合并后的 %s"
2604
2605 #: merge-recursive.c:2758 merge-recursive.c:3089
2606 #, c-format
2607 msgid "Adding as %s instead"
2608 msgstr "而是以 %s 为名添加"
2609
2610 #: merge-recursive.c:2914
2611 #, c-format
2612 msgid "cannot read object %s"
2613 msgstr "不能读取对象 %s"
2614
2615 #: merge-recursive.c:2917
2616 #, c-format
2617 msgid "object %s is not a blob"
2618 msgstr "对象 %s 不是一个数据对象"
2619
2620 #: merge-recursive.c:2986
2621 msgid "modify"
2622 msgstr "修改"
2623
2624 #: merge-recursive.c:2986
2625 msgid "modified"
2626 msgstr "修改"
2627
2628 #: merge-recursive.c:2997
2629 msgid "content"
2630 msgstr "内容"
2631
2632 #: merge-recursive.c:3004
2633 msgid "add/add"
2634 msgstr "添加/添加"
2635
2636 #: merge-recursive.c:3046
2637 #, c-format
2638 msgid "Skipped %s (merged same as existing)"
2639 msgstr "略过 %s(已经做过相同合并)"
2640
2641 #: merge-recursive.c:3055 git-submodule.sh:895
2642 msgid "submodule"
2643 msgstr "子模组"
2644
2645 #: merge-recursive.c:3056
2646 #, c-format
2647 msgid "CONFLICT (%s): Merge conflict in %s"
2648 msgstr "冲突(%s):合并冲突于 %s"
2649
2650 #: merge-recursive.c:3178
2651 #, c-format
2652 msgid "Removing %s"
2653 msgstr "删除 %s"
2654
2655 #: merge-recursive.c:3204
2656 msgid "file/directory"
2657 msgstr "文件/目录"
2658
2659 #: merge-recursive.c:3210
2660 msgid "directory/file"
2661 msgstr "目录/文件"
2662
2663 #: merge-recursive.c:3217
2664 #, c-format
2665 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
2666 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
2667
2668 #: merge-recursive.c:3226
2669 #, c-format
2670 msgid "Adding %s"
2671 msgstr "添加 %s"
2672
2673 #: merge-recursive.c:3267
2674 #, c-format
2675 msgid "Dirty index: cannot merge (dirty: %s)"
2676 msgstr "脏索引:不能合并(脏文件:%s)"
2677
2678 #: merge-recursive.c:3271
2679 msgid "Already up to date!"
2680 msgstr "已经是最新的!"
2681
2682 #: merge-recursive.c:3280
2683 #, c-format
2684 msgid "merging of trees %s and %s failed"
2685 msgstr "无法合并树 %s 和 %s"
2686
2687 #: merge-recursive.c:3379
2688 msgid "Merging:"
2689 msgstr "合并:"
2690
2691 #: merge-recursive.c:3392
2692 #, c-format
2693 msgid "found %u common ancestor:"
2694 msgid_plural "found %u common ancestors:"
2695 msgstr[0] "发现 %u 个共同祖先:"
2696 msgstr[1] "发现 %u 个共同祖先:"
2697
2698 #: merge-recursive.c:3431
2699 msgid "merge returned no commit"
2700 msgstr "合并未返回提交"
2701
2702 #: merge-recursive.c:3495
2703 #, c-format
2704 msgid "Could not parse object '%s'"
2705 msgstr "不能解析对象 '%s'"
2706
2707 #: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816
2708 msgid "Unable to write index."
2709 msgstr "不能写入索引。"
2710
2711 #: notes-merge.c:272
2712 #, c-format
2713 msgid ""
2714 "You have not concluded your previous notes merge (%s exists).\n"
2715 "Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
2716 "commit/abort the previous merge before you start a new notes merge."
2717 msgstr ""
2718 "您的前一次注释合并尚未结束(存在 %s)。\n"
2719 "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
2720 "notes merge --abort' 来提交/终止前一次合并。"
2721
2722 #: notes-merge.c:279
2723 #, c-format
2724 msgid "You have not concluded your notes merge (%s exists)."
2725 msgstr "您尚未结束注释合并(存在 %s)。"
2726
2727 #: notes-utils.c:43
2728 msgid "Cannot commit uninitialized/unreferenced notes tree"
2729 msgstr "不能提交未初始化/未引用的注解树"
2730
2731 #: notes-utils.c:102
2732 #, c-format
2733 msgid "Bad notes.rewriteMode value: '%s'"
2734 msgstr "坏的 notes.rewriteMode 值:'%s'"
2735
2736 #: notes-utils.c:112
2737 #, c-format
2738 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2739 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
2740
2741 #. TRANSLATORS: The first %s is the name of
2742 #. the environment variable, the second %s is
2743 #. its value.
2744 #.
2745 #: notes-utils.c:142
2746 #, c-format
2747 msgid "Bad %s value: '%s'"
2748 msgstr "坏的 %s 值:'%s'"
2749
2750 #: object.c:242
2751 #, c-format
2752 msgid "unable to parse object: %s"
2753 msgstr "不能解析对象:%s"
2754
2755 #: packfile.c:563
2756 msgid "offset before end of packfile (broken .idx?)"
2757 msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
2758
2759 #: packfile.c:1742
2760 #, c-format
2761 msgid "offset before start of pack index for %s (corrupt index?)"
2762 msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
2763
2764 #: packfile.c:1746
2765 #, c-format
2766 msgid "offset beyond end of pack index for %s (truncated index?)"
2767 msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
2768
2769 #: parse-options.c:621
2770 msgid "..."
2771 msgstr "..."
2772
2773 #: parse-options.c:640
2774 #, c-format
2775 msgid "usage: %s"
2776 msgstr "用法:%s"
2777
2778 #. TRANSLATORS: the colon here should align with the
2779 #. one in "usage: %s" translation.
2780 #.
2781 #: parse-options.c:646
2782 #, c-format
2783 msgid " or: %s"
2784 msgstr " 或:%s"
2785
2786 # 译者:为保证在输出中对齐,注意调整句中空格!
2787 #: parse-options.c:649
2788 #, c-format
2789 msgid " %s"
2790 msgstr " %s"
2791
2792 #: parse-options.c:688
2793 msgid "-NUM"
2794 msgstr "-数字"
2795
2796 #: parse-options-cb.c:44
2797 #, c-format
2798 msgid "malformed expiration date '%s'"
2799 msgstr "格式错误的到期时间:'%s'"
2800
2801 #: parse-options-cb.c:112
2802 #, c-format
2803 msgid "malformed object name '%s'"
2804 msgstr "格式错误的对象名 '%s'"
2805
2806 #: path.c:892
2807 #, c-format
2808 msgid "Could not make %s writable by group"
2809 msgstr "不能设置 %s 为组可写"
2810
2811 #: pathspec.c:129
2812 msgid "Escape character '\\' not allowed as last character in attr value"
2813 msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
2814
2815 #: pathspec.c:147
2816 msgid "Only one 'attr:' specification is allowed."
2817 msgstr "只允许一个 'attr:' 规格。"
2818
2819 #: pathspec.c:150
2820 msgid "attr spec must not be empty"
2821 msgstr "属性规格不能为空"
2822
2823 #: pathspec.c:193
2824 #, c-format
2825 msgid "invalid attribute name %s"
2826 msgstr "无效的属性名 %s"
2827
2828 #: pathspec.c:258
2829 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
2830 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
2831
2832 #: pathspec.c:265
2833 msgid ""
2834 "global 'literal' pathspec setting is incompatible with all other global "
2835 "pathspec settings"
2836 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
2837
2838 #: pathspec.c:305
2839 msgid "invalid parameter for pathspec magic 'prefix'"
2840 msgstr "路径规格包含无效的神奇前缀"
2841
2842 #: pathspec.c:326
2843 #, c-format
2844 msgid "Invalid pathspec magic '%.*s' in '%s'"
2845 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
2846
2847 #: pathspec.c:331
2848 #, c-format
2849 msgid "Missing ')' at the end of pathspec magic in '%s'"
2850 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
2851
2852 #: pathspec.c:369
2853 #, c-format
2854 msgid "Unimplemented pathspec magic '%c' in '%s'"
2855 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
2856
2857 #: pathspec.c:428
2858 #, c-format
2859 msgid "%s: 'literal' and 'glob' are incompatible"
2860 msgstr "%s:'literal' 和 'glob' 不兼容"
2861
2862 #: pathspec.c:441
2863 #, c-format
2864 msgid "%s: '%s' is outside repository"
2865 msgstr "%s:'%s' 在仓库之外"
2866
2867 #: pathspec.c:515
2868 #, c-format
2869 msgid "'%s' (mnemonic: '%c')"
2870 msgstr "'%s'(助记符:'%c')"
2871
2872 #: pathspec.c:525
2873 #, c-format
2874 msgid "%s: pathspec magic not supported by this command: %s"
2875 msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
2876
2877 #: pathspec.c:592
2878 #, c-format
2879 msgid "pathspec '%s' is beyond a symbolic link"
2880 msgstr "路径规格 '%s' 位于符号链接中"
2881
2882 #: pretty.c:962
2883 msgid "unable to parse --pretty format"
2884 msgstr "不能解析 --pretty 格式"
2885
2886 #: read-cache.c:1500
2887 #, c-format
2888 msgid ""
2889 "index.version set, but the value is invalid.\n"
2890 "Using version %i"
2891 msgstr ""
2892 "设置了 index.version,但是取值无效。\n"
2893 "使用版本 %i"
2894
2895 #: read-cache.c:1510
2896 #, c-format
2897 msgid ""
2898 "GIT_INDEX_VERSION set, but the value is invalid.\n"
2899 "Using version %i"
2900 msgstr ""
2901 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
2902 "使用版本 %i"
2903
2904 #: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048
2905 #, c-format
2906 msgid "could not close '%s'"
2907 msgstr "不能关闭 '%s'"
2908
2909 #: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234
2910 #, c-format
2911 msgid "could not stat '%s'"
2912 msgstr "不能对 '%s' 调用 stat"
2913
2914 #: read-cache.c:2490
2915 #, c-format
2916 msgid "unable to open git dir: %s"
2917 msgstr "不能打开 git 目录:%s"
2918
2919 #: read-cache.c:2502
2920 #, c-format
2921 msgid "unable to unlink: %s"
2922 msgstr "无法删除:%s"
2923
2924 #: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395
2925 #: builtin/am.c:779
2926 #, c-format
2927 msgid "could not open '%s' for writing"
2928 msgstr "无法打开 '%s' 进行写入"
2929
2930 #: refs.c:1880
2931 msgid "ref updates forbidden inside quarantine environment"
2932 msgstr "在隔离环境中禁止更新引用"
2933
2934 #: refs/files-backend.c:1191
2935 #, c-format
2936 msgid "could not remove reference %s"
2937 msgstr "无法删除引用 %s"
2938
2939 #: refs/files-backend.c:1205 refs/packed-backend.c:1531
2940 #: refs/packed-backend.c:1541
2941 #, c-format
2942 msgid "could not delete reference %s: %s"
2943 msgstr "无法删除引用 %s:%s"
2944
2945 #: refs/files-backend.c:1208 refs/packed-backend.c:1544
2946 #, c-format
2947 msgid "could not delete references: %s"
2948 msgstr "无法删除引用:%s"
2949
2950 #: ref-filter.c:35 wt-status.c:1850
2951 msgid "gone"
2952 msgstr "丢失"
2953
2954 #: ref-filter.c:36
2955 #, c-format
2956 msgid "ahead %d"
2957 msgstr "领先 %d"
2958
2959 #: ref-filter.c:37
2960 #, c-format
2961 msgid "behind %d"
2962 msgstr "落后 %d"
2963
2964 #: ref-filter.c:38
2965 #, c-format
2966 msgid "ahead %d, behind %d"
2967 msgstr "领先 %d,落后 %d"
2968
2969 #: ref-filter.c:121
2970 #, c-format
2971 msgid "expected format: %%(color:<color>)"
2972 msgstr "期望的格式:%%(color:<颜色>)"
2973
2974 #: ref-filter.c:123
2975 #, c-format
2976 msgid "unrecognized color: %%(color:%s)"
2977 msgstr "未能识别的颜色:%%(color:%s)"
2978
2979 #: ref-filter.c:145
2980 #, c-format
2981 msgid "Integer value expected refname:lstrip=%s"
2982 msgstr "期望整数值 refname:lstrip=%s"
2983
2984 #: ref-filter.c:149
2985 #, c-format
2986 msgid "Integer value expected refname:rstrip=%s"
2987 msgstr "期望整数值 refname:rstrip=%s"
2988
2989 #: ref-filter.c:151
2990 #, c-format
2991 msgid "unrecognized %%(%s) argument: %s"
2992 msgstr "未能识别的 %%(%s) 参数:%s"
2993
2994 #: ref-filter.c:206
2995 #, c-format
2996 msgid "%%(body) does not take arguments"
2997 msgstr "%%(body) 不带参数"
2998
2999 #: ref-filter.c:215
3000 #, c-format
3001 msgid "%%(subject) does not take arguments"
3002 msgstr "%%(subject) 不带参数"
3003
3004 #: ref-filter.c:235
3005 #, c-format
3006 msgid "unknown %%(trailers) argument: %s"
3007 msgstr "未知的 %%(trailers) 参数:%s"
3008
3009 #: ref-filter.c:264
3010 #, c-format
3011 msgid "positive value expected contents:lines=%s"
3012 msgstr "期望一个正数 contents:lines=%s"
3013
3014 #: ref-filter.c:266
3015 #, c-format
3016 msgid "unrecognized %%(contents) argument: %s"
3017 msgstr "未能识别的 %%(contents) 参数:%s"
3018
3019 #: ref-filter.c:281
3020 #, c-format
3021 msgid "positive value expected objectname:short=%s"
3022 msgstr "期望一个正数 objectname:short=%s"
3023
3024 #: ref-filter.c:285
3025 #, c-format
3026 msgid "unrecognized %%(objectname) argument: %s"
3027 msgstr "未能识别的 %%(objectname) 参数:%s"
3028
3029 #: ref-filter.c:315
3030 #, c-format
3031 msgid "expected format: %%(align:<width>,<position>)"
3032 msgstr "期望的格式:%%(align:<宽度>,<位置>)"
3033
3034 #: ref-filter.c:327
3035 #, c-format
3036 msgid "unrecognized position:%s"
3037 msgstr "未能识别的位置:%s"
3038
3039 #: ref-filter.c:334
3040 #, c-format
3041 msgid "unrecognized width:%s"
3042 msgstr "未能识别的宽度:%s"
3043
3044 #: ref-filter.c:343
3045 #, c-format
3046 msgid "unrecognized %%(align) argument: %s"
3047 msgstr "未能识别的 %%(align) 参数:%s"
3048
3049 #: ref-filter.c:351
3050 #, c-format
3051 msgid "positive width expected with the %%(align) atom"
3052 msgstr "元素 %%(align) 需要一个正数的宽度"
3053
3054 #: ref-filter.c:369
3055 #, c-format
3056 msgid "unrecognized %%(if) argument: %s"
3057 msgstr "未能识别的 %%(if) 参数:%s"
3058
3059 #: ref-filter.c:464
3060 #, c-format
3061 msgid "malformed field name: %.*s"
3062 msgstr "格式错误的字段名:%.*s"
3063
3064 #: ref-filter.c:491
3065 #, c-format
3066 msgid "unknown field name: %.*s"
3067 msgstr "未知的字段名:%.*s"
3068
3069 #: ref-filter.c:608
3070 #, c-format
3071 msgid "format: %%(if) atom used without a %%(then) atom"
3072 msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
3073
3074 #: ref-filter.c:671
3075 #, c-format
3076 msgid "format: %%(then) atom used without an %%(if) atom"
3077 msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
3078
3079 #: ref-filter.c:673
3080 #, c-format
3081 msgid "format: %%(then) atom used more than once"
3082 msgstr "格式:%%(then) 元素用了多次"
3083
3084 #: ref-filter.c:675
3085 #, c-format
3086 msgid "format: %%(then) atom used after %%(else)"
3087 msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
3088
3089 #: ref-filter.c:703
3090 #, c-format
3091 msgid "format: %%(else) atom used without an %%(if) atom"
3092 msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
3093
3094 #: ref-filter.c:705
3095 #, c-format
3096 msgid "format: %%(else) atom used without a %%(then) atom"
3097 msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
3098
3099 #: ref-filter.c:707
3100 #, c-format
3101 msgid "format: %%(else) atom used more than once"
3102 msgstr "格式:%%(else) 元素用了多次"
3103
3104 #: ref-filter.c:722
3105 #, c-format
3106 msgid "format: %%(end) atom used without corresponding atom"
3107 msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
3108
3109 #: ref-filter.c:779
3110 #, c-format
3111 msgid "malformed format string %s"
3112 msgstr "错误的格式化字符串 %s"
3113
3114 #: ref-filter.c:1387
3115 #, c-format
3116 msgid "(no branch, rebasing %s)"
3117 msgstr "(非分支,正变基 %s)"
3118
3119 #: ref-filter.c:1390
3120 #, c-format
3121 msgid "(no branch, rebasing detached HEAD %s)"
3122 msgstr "(非分支,正变基分离头指针 %s)"
3123
3124 #: ref-filter.c:1393
3125 #, c-format
3126 msgid "(no branch, bisect started on %s)"
3127 msgstr "(非分支,二分查找开始于 %s)"
3128
3129 #. TRANSLATORS: make sure this matches "HEAD
3130 #. detached at " in wt-status.c
3131 #.
3132 #: ref-filter.c:1401
3133 #, c-format
3134 msgid "(HEAD detached at %s)"
3135 msgstr "(头指针分离于 %s)"
3136
3137 #. TRANSLATORS: make sure this matches "HEAD
3138 #. detached from " in wt-status.c
3139 #.
3140 #: ref-filter.c:1408
3141 #, c-format
3142 msgid "(HEAD detached from %s)"
3143 msgstr "(头指针分离自 %s)"
3144
3145 #: ref-filter.c:1412
3146 msgid "(no branch)"
3147 msgstr "(非分支)"
3148
3149 #: ref-filter.c:1442
3150 #, c-format
3151 msgid "missing object %s for %s"
3152 msgstr "缺失 %2$s 的对象 %1$s"
3153
3154 #: ref-filter.c:1445
3155 #, c-format
3156 msgid "parse_object_buffer failed on %s for %s"
3157 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
3158
3159 #: ref-filter.c:1902
3160 #, c-format
3161 msgid "malformed object at '%s'"
3162 msgstr "格式错误的对象 '%s'"
3163
3164 #: ref-filter.c:1984
3165 #, c-format
3166 msgid "ignoring ref with broken name %s"
3167 msgstr "忽略带有错误名称 %s 的引用"
3168
3169 #: ref-filter.c:1989
3170 #, c-format
3171 msgid "ignoring broken ref %s"
3172 msgstr "忽略损坏的引用 %s"
3173
3174 #: ref-filter.c:2261
3175 #, c-format
3176 msgid "format: %%(end) atom missing"
3177 msgstr "格式:缺少 %%(end) 元素"
3178
3179 #: ref-filter.c:2365
3180 #, c-format
3181 msgid "malformed object name %s"
3182 msgstr "格式错误的对象名 %s"
3183
3184 #: remote.c:605
3185 #, c-format
3186 msgid "Cannot fetch both %s and %s to %s"
3187 msgstr "不能同时获取 %s 和 %s 至 %s"
3188
3189 #: remote.c:609
3190 #, c-format
3191 msgid "%s usually tracks %s, not %s"
3192 msgstr "%s 通常跟踪 %s,而非 %s"
3193
3194 #: remote.c:613
3195 #, c-format
3196 msgid "%s tracks both %s and %s"
3197 msgstr "%s 同时跟踪 %s 和 %s"
3198
3199 #: remote.c:621
3200 msgid "Internal error"
3201 msgstr "内部错误"
3202
3203 #: remote.c:1534 remote.c:1635
3204 msgid "HEAD does not point to a branch"
3205 msgstr "HEAD 没有指向一个分支"
3206
3207 #: remote.c:1543
3208 #, c-format
3209 msgid "no such branch: '%s'"
3210 msgstr "没有此分支:'%s'"
3211
3212 #: remote.c:1546
3213 #, c-format
3214 msgid "no upstream configured for branch '%s'"
3215 msgstr "尚未给分支 '%s' 设置上游"
3216
3217 #: remote.c:1552
3218 #, c-format
3219 msgid "upstream branch '%s' not stored as a remote-tracking branch"
3220 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
3221
3222 #: remote.c:1567
3223 #, c-format
3224 msgid "push destination '%s' on remote '%s' has no local tracking branch"
3225 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
3226
3227 #: remote.c:1579
3228 #, c-format
3229 msgid "branch '%s' has no remote for pushing"
3230 msgstr "分支 '%s' 没有设置要推送的远程服务器"
3231
3232 #: remote.c:1589
3233 #, c-format
3234 msgid "push refspecs for '%s' do not include '%s'"
3235 msgstr "向 '%s' 推送引用规格未包含 '%s'"
3236
3237 #: remote.c:1602
3238 msgid "push has no destination (push.default is 'nothing')"
3239 msgstr "推送无目标(push.default 是 'nothing')"
3240
3241 #: remote.c:1624
3242 msgid "cannot resolve 'simple' push to a single destination"
3243 msgstr "无法解析 'simple' 推送至一个单独的目标"
3244
3245 #: remote.c:1939
3246 #, c-format
3247 msgid "Your branch is based on '%s', but the upstream is gone.\n"
3248 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
3249
3250 #: remote.c:1943
3251 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
3252 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
3253
3254 #: remote.c:1946
3255 #, c-format
3256 msgid "Your branch is up to date with '%s'.\n"
3257 msgstr "您的分支与上游分支 '%s' 一致。\n"
3258
3259 #: remote.c:1950
3260 #, c-format
3261 msgid "Your branch and '%s' refer to different commits.\n"
3262 msgstr "您的分支和 '%s' 指向不同的提交。\n"
3263
3264 #: remote.c:1953
3265 #, c-format
3266 msgid " (use \"%s\" for details)\n"
3267 msgstr " (使用 \"%s\" 查看详情)\n"
3268
3269 #: remote.c:1957
3270 #, c-format
3271 msgid "Your branch is ahead of '%s' by %d commit.\n"
3272 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
3273 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
3274 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
3275
3276 #: remote.c:1963
3277 msgid " (use \"git push\" to publish your local commits)\n"
3278 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
3279
3280 #: remote.c:1966
3281 #, c-format
3282 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
3283 msgid_plural ""
3284 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
3285 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
3286 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
3287
3288 # 译者:注意保持前导空格
3289 #: remote.c:1974
3290 msgid " (use \"git pull\" to update your local branch)\n"
3291 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
3292
3293 #: remote.c:1977
3294 #, c-format
3295 msgid ""
3296 "Your branch and '%s' have diverged,\n"
3297 "and have %d and %d different commit each, respectively.\n"
3298 msgid_plural ""
3299 "Your branch and '%s' have diverged,\n"
3300 "and have %d and %d different commits each, respectively.\n"
3301 msgstr[0] ""
3302 "您的分支和 '%s' 出现了偏离,\n"
3303 "并且分别有 %d 和 %d 处不同的提交。\n"
3304 msgstr[1] ""
3305 "您的分支和 '%s' 出现了偏离,\n"
3306 "并且分别有 %d 和 %d 处不同的提交。\n"
3307
3308 # 译者:注意保持前导空格
3309 #: remote.c:1987
3310 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
3311 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
3312
3313 #: revision.c:2289
3314 msgid "your current branch appears to be broken"
3315 msgstr "您的当前分支好像被损坏"
3316
3317 #: revision.c:2292
3318 #, c-format
3319 msgid "your current branch '%s' does not have any commits yet"
3320 msgstr "您的当前分支 '%s' 尚无任何提交"
3321
3322 #: revision.c:2489
3323 msgid "--first-parent is incompatible with --bisect"
3324 msgstr "--first-parent 与 --bisect 不兼容"
3325
3326 #: run-command.c:728
3327 msgid "open /dev/null failed"
3328 msgstr "不能打开 /dev/null"
3329
3330 #: run-command.c:1271
3331 #, c-format
3332 msgid ""
3333 "The '%s' hook was ignored because it's not set as executable.\n"
3334 "You can disable this warning with `git config advice.ignoredHook false`."
3335 msgstr ""
3336 "因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
3337 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"
3338
3339 #: send-pack.c:141
3340 msgid "unexpected flush packet while reading remote unpack status"
3341 msgstr "读取远程解包状态时收到意外的 flush 包"
3342
3343 #: send-pack.c:143
3344 #, c-format
3345 msgid "unable to parse remote unpack status: %s"
3346 msgstr "不能解析远程解包状态:%s"
3347
3348 #: send-pack.c:145
3349 #, c-format
3350 msgid "remote unpack failed: %s"
3351 msgstr "远程解包失败:%s"
3352
3353 #: send-pack.c:308
3354 msgid "failed to sign the push certificate"
3355 msgstr "无法为推送证书签名"
3356
3357 #: send-pack.c:421
3358 msgid "the receiving end does not support --signed push"
3359 msgstr "接收端不支持签名推送"
3360
3361 #: send-pack.c:423
3362 msgid ""
3363 "not sending a push certificate since the receiving end does not support --"
3364 "signed push"
3365 msgstr "未发送推送证书,因为接收端不支持签名推送"
3366
3367 #: send-pack.c:435
3368 msgid "the receiving end does not support --atomic push"
3369 msgstr "接收端不支持原子推送"
3370
3371 #: send-pack.c:440
3372 msgid "the receiving end does not support push options"
3373 msgstr "接收端不支持推送选项"
3374
3375 #: sequencer.c:175
3376 #, c-format
3377 msgid "invalid commit message cleanup mode '%s'"
3378 msgstr "无效的提交信息清理模式 '%s'"
3379
3380 #: sequencer.c:275
3381 #, c-format
3382 msgid "could not delete '%s'"
3383 msgstr "无法删除 '%s'"
3384
3385 #: sequencer.c:301
3386 msgid "revert"
3387 msgstr "还原"
3388
3389 #: sequencer.c:303
3390 msgid "cherry-pick"
3391 msgstr "拣选"
3392
3393 #: sequencer.c:305
3394 msgid "rebase -i"
3395 msgstr "rebase -i"
3396
3397 #: sequencer.c:307
3398 #, c-format
3399 msgid "Unknown action: %d"
3400 msgstr "未知动作:%d"
3401
3402 #: sequencer.c:364
3403 msgid ""
3404 "after resolving the conflicts, mark the corrected paths\n"
3405 "with 'git add <paths>' or 'git rm <paths>'"
3406 msgstr ""
3407 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
3408 "命令标记修正后的文件"
3409
3410 #: sequencer.c:367
3411 msgid ""
3412 "after resolving the conflicts, mark the corrected paths\n"
3413 "with 'git add <paths>' or 'git rm <paths>'\n"
3414 "and commit the result with 'git commit'"
3415 msgstr ""
3416 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
3417 "对修正后的文件做标记,然后用 'git commit' 提交"
3418
3419 #: sequencer.c:380 sequencer.c:2468
3420 #, c-format
3421 msgid "could not lock '%s'"
3422 msgstr "不能锁定 '%s'"
3423
3424 #: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486
3425 #: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656
3426 #, c-format
3427 msgid "could not write to '%s'"
3428 msgstr "不能写入 '%s'"
3429
3430 #: sequencer.c:387
3431 #, c-format
3432 msgid "could not write eol to '%s'"
3433 msgstr "不能将换行符写入 '%s'"
3434
3435 #: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488
3436 #: sequencer.c:2702
3437 #, c-format
3438 msgid "failed to finalize '%s'"
3439 msgstr "无法完成 '%s'"
3440
3441 #: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371
3442 #: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727
3443 #: builtin/merge.c:1046
3444 #, c-format
3445 msgid "could not read '%s'"
3446 msgstr "不能读取 '%s'"
3447
3448 #: sequencer.c:441
3449 #, c-format
3450 msgid "your local changes would be overwritten by %s."
3451 msgstr "您的本地修改将被%s覆盖。"
3452
3453 #: sequencer.c:445
3454 msgid "commit your changes or stash them to proceed."
3455 msgstr "提交您的修改或贮藏后再继续。"
3456
3457 #: sequencer.c:474
3458 #, c-format
3459 msgid "%s: fast-forward"
3460 msgstr "%s:快进"
3461
3462 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
3463 #. "rebase -i".
3464 #.
3465 #: sequencer.c:563
3466 #, c-format
3467 msgid "%s: Unable to write new index file"
3468 msgstr "%s:无法写入新索引文件"
3469
3470 #: sequencer.c:579
3471 msgid "unable to update cache tree"
3472 msgstr "不能更新缓存树"
3473
3474 #: sequencer.c:592
3475 msgid "could not resolve HEAD commit"
3476 msgstr "不能解析 HEAD 提交"
3477
3478 #: sequencer.c:749
3479 #, c-format
3480 msgid ""
3481 "you have staged changes in your working tree\n"
3482 "If these changes are meant to be squashed into the previous commit, run:\n"
3483 "\n"
3484 " git commit --amend %s\n"
3485 "\n"
3486 "If they are meant to go into a new commit, run:\n"
3487 "\n"
3488 " git commit %s\n"
3489 "\n"
3490 "In both cases, once you're done, continue with:\n"
3491 "\n"
3492 " git rebase --continue\n"
3493 msgstr ""
3494 "您的工作区中存在已暂存的修改\n"
3495 "如果这些修改需要被并入前一个提交,执行:\n"
3496 "\n"
3497 " git commit --amend %s\n"
3498 "\n"
3499 "如果这些修改要形成一个新提交,执行:\n"
3500 "\n"
3501 " git commit %s\n"
3502 "\n"
3503 "无论哪种情况,当您完成提交,继续执行:\n"
3504 "\n"
3505 " git rebase --continue\n"
3506
3507 #: sequencer.c:818
3508 msgid "writing root commit"
3509 msgstr "写根提交"
3510
3511 #: sequencer.c:1043
3512 msgid "'prepare-commit-msg' hook failed"
3513 msgstr "'prepare-commit-msg' 钩子失败"
3514
3515 #: sequencer.c:1050
3516 msgid ""
3517 "Your name and email address were configured automatically based\n"
3518 "on your username and hostname. Please check that they are accurate.\n"
3519 "You can suppress this message by setting them explicitly. Run the\n"
3520 "following command and follow the instructions in your editor to edit\n"
3521 "your configuration file:\n"
3522 "\n"
3523 " git config --global --edit\n"
3524 "\n"
3525 "After doing this, you may fix the identity used for this commit with:\n"
3526 "\n"
3527 " git commit --amend --reset-author\n"
3528 msgstr ""
3529 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3530 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
3531 "中编辑您的配置文件:\n"
3532 "\n"
3533 " git config --global --edit\n"
3534 "\n"
3535 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
3536 "\n"
3537 " git commit --amend --reset-author\n"
3538
3539 #: sequencer.c:1063
3540 msgid ""
3541 "Your name and email address were configured automatically based\n"
3542 "on your username and hostname. Please check that they are accurate.\n"
3543 "You can suppress this message by setting them explicitly:\n"
3544 "\n"
3545 " git config --global user.name \"Your Name\"\n"
3546 " git config --global user.email you@example.com\n"
3547 "\n"
3548 "After doing this, you may fix the identity used for this commit with:\n"
3549 "\n"
3550 " git commit --amend --reset-author\n"
3551 msgstr ""
3552 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3553 "与否。您可以对其进行设置以免再出现本提示信息:\n"
3554 "\n"
3555 " git config --global user.name \"Your Name\"\n"
3556 " git config --global user.email you@example.com\n"
3557 "\n"
3558 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
3559 "\n"
3560 " git commit --amend --reset-author\n"
3561
3562 #: sequencer.c:1103
3563 msgid "couldn't look up newly created commit"
3564 msgstr "无法找到新创建的提交"
3565
3566 #: sequencer.c:1105
3567 msgid "could not parse newly created commit"
3568 msgstr "不能解析新创建的提交"
3569
3570 #: sequencer.c:1151
3571 msgid "unable to resolve HEAD after creating commit"
3572 msgstr "创建提交后,不能解析 HEAD"
3573
3574 #: sequencer.c:1153
3575 msgid "detached HEAD"
3576 msgstr "分离头指针"
3577
3578 # 译者:中文字符串拼接,可删除前导空格
3579 #: sequencer.c:1157
3580 msgid " (root-commit)"
3581 msgstr "(根提交)"
3582
3583 #: sequencer.c:1178
3584 msgid "could not parse HEAD"
3585 msgstr "不能解析 HEAD"
3586
3587 #: sequencer.c:1180
3588 #, c-format
3589 msgid "HEAD %s is not a commit!"
3590 msgstr "HEAD %s 不是一个提交!"
3591
3592 #: sequencer.c:1184 builtin/commit.c:1528
3593 msgid "could not parse HEAD commit"
3594 msgstr "不能解析 HEAD 提交"
3595
3596 #: sequencer.c:1235 sequencer.c:1832
3597 msgid "unable to parse commit author"
3598 msgstr "不能解析提交作者"
3599
3600 #: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645
3601 msgid "git write-tree failed to write a tree"
3602 msgstr "git write-tree 无法写入树对象"
3603
3604 #: sequencer.c:1262 sequencer.c:1317
3605 #, c-format
3606 msgid "unable to read commit message from '%s'"
3607 msgstr "不能从 '%s' 读取提交说明"
3608
3609 #: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825
3610 #: builtin/merge.c:850
3611 msgid "failed to write commit object"
3612 msgstr "无法写提交对象"
3613
3614 #: sequencer.c:1344
3615 #, c-format
3616 msgid "could not parse commit %s"
3617 msgstr "不能解析提交 %s"
3618
3619 #: sequencer.c:1349
3620 #, c-format
3621 msgid "could not parse parent commit %s"
3622 msgstr "不能解析父提交 %s"
3623
3624 #: sequencer.c:1500 sequencer.c:1525
3625 #, c-format
3626 msgid "This is a combination of %d commits."
3627 msgstr "这是一个 %d 个提交的组合。"
3628
3629 #: sequencer.c:1510 sequencer.c:4355
3630 msgid "need a HEAD to fixup"
3631 msgstr "需要一个 HEAD 来修复"
3632
3633 #: sequencer.c:1512 sequencer.c:2729
3634 msgid "could not read HEAD"
3635 msgstr "不能读取 HEAD"
3636
3637 #: sequencer.c:1514
3638 msgid "could not read HEAD's commit message"
3639 msgstr "不能读取 HEAD 的提交说明"
3640
3641 #: sequencer.c:1520
3642 #, c-format
3643 msgid "cannot write '%s'"
3644 msgstr "不能写 '%s'"
3645
3646 #: sequencer.c:1527 git-rebase--interactive.sh:457
3647 msgid "This is the 1st commit message:"
3648 msgstr "这是第一个提交说明:"
3649
3650 #: sequencer.c:1535
3651 #, c-format
3652 msgid "could not read commit message of %s"
3653 msgstr "不能读取 %s 的提交说明"
3654
3655 #: sequencer.c:1542
3656 #, c-format
3657 msgid "This is the commit message #%d:"
3658 msgstr "这是提交说明 #%d:"
3659
3660 #: sequencer.c:1548
3661 #, c-format
3662 msgid "The commit message #%d will be skipped:"
3663 msgstr "提交说明 #%d 将被跳过:"
3664
3665 #: sequencer.c:1553
3666 #, c-format
3667 msgid "unknown command: %d"
3668 msgstr "未知命令:%d"
3669
3670 #: sequencer.c:1631
3671 msgid "your index file is unmerged."
3672 msgstr "您的索引文件未完成合并。"
3673
3674 #: sequencer.c:1638
3675 msgid "cannot fixup root commit"
3676 msgstr "不能修复根提交"
3677
3678 #: sequencer.c:1657
3679 #, c-format
3680 msgid "commit %s is a merge but no -m option was given."
3681 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
3682
3683 #: sequencer.c:1665
3684 #, c-format
3685 msgid "commit %s does not have parent %d"
3686 msgstr "提交 %s 没有第 %d 个父提交"
3687
3688 #: sequencer.c:1669
3689 #, c-format
3690 msgid "mainline was specified but commit %s is not a merge."
3691 msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
3692
3693 #: sequencer.c:1675
3694 #, c-format
3695 msgid "cannot get commit message for %s"
3696 msgstr "不能得到 %s 的提交说明"
3697
3698 #. TRANSLATORS: The first %s will be a "todo" command like
3699 #. "revert" or "pick", the second %s a SHA1.
3700 #: sequencer.c:1694
3701 #, c-format
3702 msgid "%s: cannot parse parent commit %s"
3703 msgstr "%s:不能解析父提交 %s"
3704
3705 #: sequencer.c:1759
3706 #, c-format
3707 msgid "could not rename '%s' to '%s'"
3708 msgstr "不能将 '%s' 重命名为 '%s'"
3709
3710 #: sequencer.c:1813
3711 #, c-format
3712 msgid "could not revert %s... %s"
3713 msgstr "不能还原 %s... %s"
3714
3715 #: sequencer.c:1814
3716 #, c-format
3717 msgid "could not apply %s... %s"
3718 msgstr "不能应用 %s... %s"
3719
3720 #: sequencer.c:1864
3721 msgid "empty commit set passed"
3722 msgstr "提供了空的提交集"
3723
3724 #: sequencer.c:1874
3725 #, c-format
3726 msgid "git %s: failed to read the index"
3727 msgstr "git %s:无法读取索引"
3728
3729 #: sequencer.c:1881
3730 #, c-format
3731 msgid "git %s: failed to refresh the index"
3732 msgstr "git %s:无法刷新索引"
3733
3734 #: sequencer.c:1961
3735 #, c-format
3736 msgid "%s does not accept arguments: '%s'"
3737 msgstr "%s 不接受参数:'%s'"
3738
3739 #: sequencer.c:1970
3740 #, c-format
3741 msgid "missing arguments for %s"
3742 msgstr "缺少 %s 的参数"
3743
3744 #: sequencer.c:2029
3745 #, c-format
3746 msgid "invalid line %d: %.*s"
3747 msgstr "无效行 %d:%.*s"
3748
3749 #: sequencer.c:2037
3750 #, c-format
3751 msgid "cannot '%s' without a previous commit"
3752 msgstr "没有父提交的情况下不能 '%s'"
3753
3754 #: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173
3755 #, c-format
3756 msgid "could not read '%s'."
3757 msgstr "不能读取 '%s'。"
3758
3759 #: sequencer.c:2108
3760 msgid "please fix this using 'git rebase --edit-todo'."
3761 msgstr "请用 'git rebase --edit-todo' 来修改。"
3762
3763 #: sequencer.c:2110
3764 #, c-format
3765 msgid "unusable instruction sheet: '%s'"
3766 msgstr "不可用的指令清单:'%s'"
3767
3768 #: sequencer.c:2115
3769 msgid "no commits parsed."
3770 msgstr "没有解析提交。"
3771
3772 #: sequencer.c:2126
3773 msgid "cannot cherry-pick during a revert."
3774 msgstr "不能在回退中执行拣选。"
3775
3776 #: sequencer.c:2128
3777 msgid "cannot revert during a cherry-pick."
3778 msgstr "不能在拣选中执行回退。"
3779
3780 #: sequencer.c:2195
3781 #, c-format
3782 msgid "invalid key: %s"
3783 msgstr "无效键名:%s"
3784
3785 #: sequencer.c:2198
3786 #, c-format
3787 msgid "invalid value for %s: %s"
3788 msgstr "%s 的值无效:%s"
3789
3790 #: sequencer.c:2269
3791 msgid "unusable squash-onto"
3792 msgstr "不可用的 squash-onto"
3793
3794 #: sequencer.c:2285
3795 #, c-format
3796 msgid "malformed options sheet: '%s'"
3797 msgstr "格式错误的选项清单:'%s'"
3798
3799 #: sequencer.c:2323
3800 msgid "a cherry-pick or revert is already in progress"
3801 msgstr "一个拣选或还原操作已在进行"
3802
3803 #: sequencer.c:2324
3804 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3805 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
3806
3807 #: sequencer.c:2327
3808 #, c-format
3809 msgid "could not create sequencer directory '%s'"
3810 msgstr "不能创建序列目录 '%s'"
3811
3812 #: sequencer.c:2341
3813 msgid "could not lock HEAD"
3814 msgstr "不能锁定 HEAD"
3815
3816 #: sequencer.c:2396 sequencer.c:3403
3817 msgid "no cherry-pick or revert in progress"
3818 msgstr "拣选或还原操作并未进行"
3819
3820 #: sequencer.c:2398
3821 msgid "cannot resolve HEAD"
3822 msgstr "不能解析 HEAD"
3823
3824 #: sequencer.c:2400 sequencer.c:2435
3825 msgid "cannot abort from a branch yet to be born"
3826 msgstr "不能从尚未建立的分支终止"
3827
3828 #: sequencer.c:2421 builtin/grep.c:720
3829 #, c-format
3830 msgid "cannot open '%s'"
3831 msgstr "不能打开 '%s'"
3832
3833 #: sequencer.c:2423
3834 #, c-format
3835 msgid "cannot read '%s': %s"
3836 msgstr "不能读取 '%s':%s"
3837
3838 #: sequencer.c:2424
3839 msgid "unexpected end of file"
3840 msgstr "意外的文件结束"
3841
3842 #: sequencer.c:2430
3843 #, c-format
3844 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3845 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
3846
3847 #: sequencer.c:2441
3848 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3849 msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
3850
3851 #: sequencer.c:2545 sequencer.c:3321
3852 #, c-format
3853 msgid "could not update %s"
3854 msgstr "不能更新 %s"
3855
3856 #: sequencer.c:2583 sequencer.c:3301
3857 msgid "cannot read HEAD"
3858 msgstr "不能读取 HEAD"
3859
3860 #: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639
3861 #, c-format
3862 msgid "could not copy '%s' to '%s'"
3863 msgstr "不能拷贝 '%s' 至 '%s'"
3864
3865 #: sequencer.c:2641
3866 msgid "could not read index"
3867 msgstr "不能读取索引"
3868
3869 # 译者:注意保持前导空格
3870 #: sequencer.c:2646
3871 #, c-format
3872 msgid ""
3873 "execution failed: %s\n"
3874 "%sYou can fix the problem, and then run\n"
3875 "\n"
3876 " git rebase --continue\n"
3877 "\n"
3878 msgstr ""
3879 "执行失败:%s\n"
3880 "%s您可以改正该问题,然后运行\n"
3881 "\n"
3882 " git rebase --continue\n"
3883 "\n"
3884
3885 #: sequencer.c:2652
3886 msgid "and made changes to the index and/or the working tree\n"
3887 msgstr "并且修改索引和/或工作区\n"
3888
3889 #: sequencer.c:2658
3890 #, c-format
3891 msgid ""
3892 "execution succeeded: %s\n"
3893 "but left changes to the index and/or the working tree\n"
3894 "Commit or stash your changes, and then run\n"
3895 "\n"
3896 " git rebase --continue\n"
3897 "\n"
3898 msgstr ""
3899 "执行成功:%s\n"
3900 "但是在索引和/或工作区中存在变更\n"
3901 "提交或贮藏修改,然后运行\n"
3902 "\n"
3903 " git rebase --continue\n"
3904 "\n"
3905
3906 #: sequencer.c:2771
3907 msgid "writing fake root commit"
3908 msgstr "写伪根提交"
3909
3910 #: sequencer.c:2776
3911 msgid "writing squash-onto"
3912 msgstr "写入 squash-onto"
3913
3914 #: sequencer.c:2811
3915 #, c-format
3916 msgid "failed to find tree of %s"
3917 msgstr "无法找到 %s 指向的树。"
3918
3919 #: sequencer.c:2829
3920 msgid "could not write index"
3921 msgstr "不能写入索引"
3922
3923 #: sequencer.c:2861
3924 msgid "cannot merge without a current revision"
3925 msgstr "没有当前版本不能合并"
3926
3927 #: sequencer.c:2884
3928 #, c-format
3929 msgid "could not resolve '%s'"
3930 msgstr "无法解析 '%s'"
3931
3932 #: sequencer.c:2906
3933 #, c-format
3934 msgid "could not get commit message of '%s'"
3935 msgstr "不能获取 '%s' 的提交说明"
3936
3937 #: sequencer.c:2916 sequencer.c:2941
3938 #, c-format
3939 msgid "could not write '%s'"
3940 msgstr "不能写入 '%s'"
3941
3942 #: sequencer.c:3005
3943 #, c-format
3944 msgid "could not even attempt to merge '%.*s'"
3945 msgstr "甚至不能尝试合并 '%.*s'"
3946
3947 #: sequencer.c:3021
3948 msgid "merge: Unable to write new index file"
3949 msgstr "合并:无法写入新索引文件"
3950
3951 #: sequencer.c:3088
3952 #, c-format
3953 msgid "Applied autostash.\n"
3954 msgstr "已应用 autostash。\n"
3955
3956 #: sequencer.c:3100
3957 #, c-format
3958 msgid "cannot store %s"
3959 msgstr "不能存储 %s"
3960
3961 #: sequencer.c:3103 git-rebase.sh:188
3962 #, c-format
3963 msgid ""
3964 "Applying autostash resulted in conflicts.\n"
3965 "Your changes are safe in the stash.\n"
3966 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
3967 msgstr ""
3968 "应用 autostash 导致冲突。\n"
3969 "您的修改安全地保存在贮藏区中。\n"
3970 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
3971
3972 #: sequencer.c:3134
3973 #, c-format
3974 msgid ""
3975 "Could not execute the todo command\n"
3976 "\n"
3977 " %.*s\n"
3978 "It has been rescheduled; To edit the command before continuing, please\n"
3979 "edit the todo list first:\n"
3980 "\n"
3981 " git rebase --edit-todo\n"
3982 " git rebase --continue\n"
3983 msgstr ""
3984 "无法执行待办命令\n"
3985 "\n"
3986 " %.*s\n"
3987 "已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
3988 "\n"
3989 " git rebase --edit-todo\n"
3990 " git rebase --continue\n"
3991
3992 #: sequencer.c:3202
3993 #, c-format
3994 msgid "Stopped at %s... %.*s\n"
3995 msgstr "停止在 %s... %.*s\n"
3996
3997 #: sequencer.c:3264
3998 #, c-format
3999 msgid "unknown command %d"
4000 msgstr "未知命令 %d"
4001
4002 #: sequencer.c:3309
4003 msgid "could not read orig-head"
4004 msgstr "不能读取 orig-head"
4005
4006 #: sequencer.c:3314 sequencer.c:4352
4007 msgid "could not read 'onto'"
4008 msgstr "不能读取 'onto'"
4009
4010 #: sequencer.c:3328
4011 #, c-format
4012 msgid "could not update HEAD to %s"
4013 msgstr "不能更新 HEAD 为 %s"
4014
4015 #: sequencer.c:3414
4016 msgid "cannot rebase: You have unstaged changes."
4017 msgstr "不能变基:您有未暂存的变更。"
4018
4019 #: sequencer.c:3423
4020 msgid "cannot amend non-existing commit"
4021 msgstr "不能修补不存在的提交"
4022
4023 #: sequencer.c:3425
4024 #, c-format
4025 msgid "invalid file: '%s'"
4026 msgstr "无效文件:'%s'"
4027
4028 #: sequencer.c:3427
4029 #, c-format
4030 msgid "invalid contents: '%s'"
4031 msgstr "无效内容:'%s'"
4032
4033 #: sequencer.c:3430
4034 msgid ""
4035 "\n"
4036 "You have uncommitted changes in your working tree. Please, commit them\n"
4037 "first and then run 'git rebase --continue' again."
4038 msgstr ""
4039 "\n"
4040 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
4041
4042 #: sequencer.c:3455 sequencer.c:3493
4043 #, c-format
4044 msgid "could not write file: '%s'"
4045 msgstr "不能写入文件:'%s'"
4046
4047 #: sequencer.c:3508
4048 msgid "could not remove CHERRY_PICK_HEAD"
4049 msgstr "不能删除 CHERRY_PICK_HEAD"
4050
4051 #: sequencer.c:3515
4052 msgid "could not commit staged changes."
4053 msgstr "不能提交暂存的修改。"
4054
4055 #: sequencer.c:3612
4056 #, c-format
4057 msgid "%s: can't cherry-pick a %s"
4058 msgstr "%s:不能拣选一个%s"
4059
4060 #: sequencer.c:3616
4061 #, c-format
4062 msgid "%s: bad revision"
4063 msgstr "%s:错误的版本"
4064
4065 #: sequencer.c:3649
4066 msgid "can't revert as initial commit"
4067 msgstr "不能作为初始提交回退"
4068
4069 #: sequencer.c:4098
4070 msgid "make_script: unhandled options"
4071 msgstr "make_script:有未能处理的选项"
4072
4073 #: sequencer.c:4101
4074 msgid "make_script: error preparing revisions"
4075 msgstr "make_script:准备版本时错误"
4076
4077 #: sequencer.c:4142 sequencer.c:4177
4078 #, c-format
4079 msgid "unusable todo list: '%s'"
4080 msgstr "不可用的待办列表:'%s'"
4081
4082 #: sequencer.c:4236
4083 #, c-format
4084 msgid ""
4085 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
4086 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
4087
4088 #: sequencer.c:4302
4089 #, c-format
4090 msgid ""
4091 "Warning: some commits may have been dropped accidentally.\n"
4092 "Dropped commits (newer to older):\n"
4093 msgstr ""
4094 "警告:一些提交可能被意外丢弃。\n"
4095 "丢弃的提交(从新到旧):\n"
4096
4097 #: sequencer.c:4309
4098 #, c-format
4099 msgid ""
4100 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
4101 "\n"
4102 "Use 'git config rebase.missingCommitsCheck' to change the level of "
4103 "warnings.\n"
4104 "The possible behaviours are: ignore, warn, error.\n"
4105 "\n"
4106 msgstr ""
4107 "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
4108 "\n"
4109 "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
4110 "可选值有:ignore、warn、error。\n"
4111 "\n"
4112
4113 #: sequencer.c:4321
4114 #, c-format
4115 msgid ""
4116 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
4117 "continue'.\n"
4118 "Or you can abort the rebase with 'git rebase --abort'.\n"
4119 msgstr ""
4120 "您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
4121 "或者您可以用 'git rebase --abort' 终止变基。\n"
4122
4123 #: sequencer.c:4375
4124 #, c-format
4125 msgid "could not parse commit '%s'"
4126 msgstr "不能解析提交 '%s'"
4127
4128 #: sequencer.c:4490
4129 msgid "the script was already rearranged."
4130 msgstr "脚本已经重新编排。"
4131
4132 #: setup.c:123
4133 #, c-format
4134 msgid "'%s' is outside repository"
4135 msgstr "'%s' 在仓库之外"
4136
4137 #: setup.c:172
4138 #, c-format
4139 msgid ""
4140 "%s: no such path in the working tree.\n"
4141 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
4142 msgstr ""
4143 "%s:工作区中无此路径。\n"
4144 "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
4145
4146 #: setup.c:185
4147 #, c-format
4148 msgid ""
4149 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
4150 "Use '--' to separate paths from revisions, like this:\n"
4151 "'git <command> [<revision>...] -- [<file>...]'"
4152 msgstr ""
4153 "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
4154 "使用 '--' 来分隔版本和路径,例如:\n"
4155 "'git <命令> [<版本>...] -- [<文件>...]'"
4156
4157 #: setup.c:234
4158 #, c-format
4159 msgid "option '%s' must come before non-option arguments"
4160 msgstr "选项 '%s' 必须在其他非选项参数之前"
4161
4162 #: setup.c:253
4163 #, c-format
4164 msgid ""
4165 "ambiguous argument '%s': both revision and filename\n"
4166 "Use '--' to separate paths from revisions, like this:\n"
4167 "'git <command> [<revision>...] -- [<file>...]'"
4168 msgstr ""
4169 "有歧义的参数 '%s':可同时是版本和文件\n"
4170 "使用 '--' 来分隔版本和路径,例如:\n"
4171 "'git <命令> [<版本>...] -- [<文件>...]'"
4172
4173 #: setup.c:389
4174 msgid "unable to set up work tree using invalid config"
4175 msgstr "无法使用无效配置来创建工作区"
4176
4177 #: setup.c:393
4178 msgid "this operation must be run in a work tree"
4179 msgstr "该操作必须在一个工作区中运行"
4180
4181 #: setup.c:503
4182 #, c-format
4183 msgid "Expected git repo version <= %d, found %d"
4184 msgstr "期望 git 仓库版本 <= %d,却得到 %d"
4185
4186 #: setup.c:511
4187 msgid "unknown repository extensions found:"
4188 msgstr "发现未知的仓库扩展:"
4189
4190 #: setup.c:530
4191 #, c-format
4192 msgid "error opening '%s'"
4193 msgstr "无法打开 '%s'"
4194
4195 #: setup.c:532
4196 #, c-format
4197 msgid "too large to be a .git file: '%s'"
4198 msgstr "文件太大,无法作为 .git 文件:'%s'"
4199
4200 #: setup.c:534
4201 #, c-format
4202 msgid "error reading %s"
4203 msgstr "无法读取 %s"
4204
4205 #: setup.c:536
4206 #, c-format
4207 msgid "invalid gitfile format: %s"
4208 msgstr "无效的 gitfile 格式:%s"
4209
4210 #: setup.c:538
4211 #, c-format
4212 msgid "no path in gitfile: %s"
4213 msgstr "在 gitfile 中没有路径:%s"
4214
4215 #: setup.c:540
4216 #, c-format
4217 msgid "not a git repository: %s"
4218 msgstr "不是一个 git 仓库:%s"
4219
4220 #: setup.c:639
4221 #, c-format
4222 msgid "'$%s' too big"
4223 msgstr "'$%s' 太大"
4224
4225 #: setup.c:653
4226 #, c-format
4227 msgid "not a git repository: '%s'"
4228 msgstr "不是一个 git 仓库:'%s'"
4229
4230 #: setup.c:682 setup.c:684 setup.c:715
4231 #, c-format
4232 msgid "cannot chdir to '%s'"
4233 msgstr "不能切换目录到 '%s'"
4234
4235 #: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815
4236 msgid "cannot come back to cwd"
4237 msgstr "无法返回当前工作目录"
4238
4239 #: setup.c:813
4240 #, c-format
4241 msgid "not a git repository (or any of the parent directories): %s"
4242 msgstr "不是一个 git 仓库(或者任何父目录):%s"
4243
4244 #: setup.c:824
4245 #, c-format
4246 msgid "failed to stat '%*s%s%s'"
4247 msgstr "无法获取 '%*s%s%s' 状态(stat)"
4248
4249 #: setup.c:1054
4250 msgid "Unable to read current working directory"
4251 msgstr "不能读取当前工作目录"
4252
4253 #: setup.c:1066 setup.c:1072
4254 #, c-format
4255 msgid "cannot change to '%s'"
4256 msgstr "不能切换到 '%s'"
4257
4258 #: setup.c:1085
4259 #, c-format
4260 msgid ""
4261 "not a git repository (or any parent up to mount point %s)\n"
4262 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
4263 msgstr ""
4264 "不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
4265 "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
4266
4267 #: setup.c:1168
4268 #, c-format
4269 msgid ""
4270 "problem with core.sharedRepository filemode value (0%.3o).\n"
4271 "The owner of files must always have read and write permissions."
4272 msgstr ""
4273 "参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
4274 "文件属主必须始终拥有读写权限。"
4275
4276 #: setup.c:1211
4277 msgid "open /dev/null or dup failed"
4278 msgstr "不能打开或者复制 /dev/null"
4279
4280 #: setup.c:1226
4281 msgid "fork failed"
4282 msgstr "fork 失败"
4283
4284 #: setup.c:1231
4285 msgid "setsid failed"
4286 msgstr "setsid 失败"
4287
4288 #: sha1-file.c:625
4289 #, c-format
4290 msgid "path '%s' does not exist"
4291 msgstr "路径 '%s' 不存在"
4292
4293 #: sha1-file.c:651
4294 #, c-format
4295 msgid "reference repository '%s' as a linked checkout is not supported yet."
4296 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
4297
4298 #: sha1-file.c:657
4299 #, c-format
4300 msgid "reference repository '%s' is not a local repository."
4301 msgstr "参考仓库 '%s' 不是一个本地仓库。"
4302
4303 #: sha1-file.c:663
4304 #, c-format
4305 msgid "reference repository '%s' is shallow"
4306 msgstr "参考仓库 '%s' 是一个浅克隆"
4307
4308 #: sha1-file.c:671
4309 #, c-format
4310 msgid "reference repository '%s' is grafted"
4311 msgstr "参考仓库 '%s' 已被移植"
4312
4313 #: sha1-name.c:442
4314 #, c-format
4315 msgid "short SHA1 %s is ambiguous"
4316 msgstr "短 SHA1 %s 存在歧义"
4317
4318 #: sha1-name.c:453
4319 msgid "The candidates are:"
4320 msgstr "候选者有:"
4321
4322 #: sha1-name.c:695
4323 msgid ""
4324 "Git normally never creates a ref that ends with 40 hex characters\n"
4325 "because it will be ignored when you just specify 40-hex. These refs\n"
4326 "may be created by mistake. For example,\n"
4327 "\n"
4328 " git checkout -b $br $(git rev-parse ...)\n"
4329 "\n"
4330 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
4331 "examine these refs and maybe delete them. Turn this message off by\n"
4332 "running \"git config advice.objectNameWarning false\""
4333 msgstr ""
4334 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
4335 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
4336 "\n"
4337 " git checkout -b $br $(git rev-parse ...)\n"
4338 "\n"
4339 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
4340 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
4341 "命令关闭本消息通知。"
4342
4343 #: submodule.c:97 submodule.c:131
4344 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
4345 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
4346
4347 #: submodule.c:101 submodule.c:135
4348 #, c-format
4349 msgid "Could not find section in .gitmodules where path=%s"
4350 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
4351
4352 #: submodule.c:109
4353 #, c-format
4354 msgid "Could not update .gitmodules entry %s"
4355 msgstr "不能更新 .gitmodules 条目 %s"
4356
4357 #: submodule.c:142
4358 #, c-format
4359 msgid "Could not remove .gitmodules entry for %s"
4360 msgstr "无法移除 %s 的 .gitmodules 条目"
4361
4362 #: submodule.c:153
4363 msgid "staging updated .gitmodules failed"
4364 msgstr "将更新后 .gitmodules 添加暂存区失败"
4365
4366 #: submodule.c:315
4367 #, c-format
4368 msgid "in unpopulated submodule '%s'"
4369 msgstr "位于未检出的子模组 '%s'"
4370
4371 #: submodule.c:346
4372 #, c-format
4373 msgid "Pathspec '%s' is in submodule '%.*s'"
4374 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
4375
4376 #: submodule.c:837
4377 #, c-format
4378 msgid "submodule entry '%s' (%s) is a %s, not a commit"
4379 msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
4380
4381 #: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743
4382 msgid "Failed to resolve HEAD as a valid ref."
4383 msgstr "无法将 HEAD 解析为有效引用。"
4384
4385 #: submodule.c:1375
4386 #, c-format
4387 msgid "'%s' not recognized as a git repository"
4388 msgstr "无法将 '%s' 识别为一个 git 仓库"
4389
4390 #: submodule.c:1513
4391 #, c-format
4392 msgid "could not start 'git status' in submodule '%s'"
4393 msgstr "无法在子模组 '%s' 中启动 'git status'"
4394
4395 #: submodule.c:1526
4396 #, c-format
4397 msgid "could not run 'git status' in submodule '%s'"
4398 msgstr "无法在子模组 '%s' 中执行 'git status'"
4399
4400 #: submodule.c:1619
4401 #, c-format
4402 msgid "submodule '%s' has dirty index"
4403 msgstr "子模组 '%s' 中有脏索引"
4404
4405 #: submodule.c:1718
4406 #, c-format
4407 msgid ""
4408 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
4409 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
4410
4411 #: submodule.c:1730 submodule.c:1786
4412 #, c-format
4413 msgid "could not lookup name for submodule '%s'"
4414 msgstr "不能查询子模组 '%s' 的名称"
4415
4416 #: submodule.c:1734 builtin/submodule--helper.c:1261
4417 #: builtin/submodule--helper.c:1271
4418 #, c-format
4419 msgid "could not create directory '%s'"
4420 msgstr "不能创建目录 '%s'"
4421
4422 #: submodule.c:1737
4423 #, c-format
4424 msgid ""
4425 "Migrating git directory of '%s%s' from\n"
4426 "'%s' to\n"
4427 "'%s'\n"
4428 msgstr ""
4429 "将 '%s%s' 的 git 目录从\n"
4430 "'%s' 迁移至\n"
4431 "'%s'\n"
4432
4433 #: submodule.c:1821
4434 #, c-format
4435 msgid "could not recurse into submodule '%s'"
4436 msgstr "无法递归进子模组路径 '%s'"
4437
4438 #: submodule.c:1865
4439 msgid "could not start ls-files in .."
4440 msgstr "无法在 .. 中启动 ls-files"
4441
4442 #: submodule.c:1904
4443 #, c-format
4444 msgid "ls-tree returned unexpected return code %d"
4445 msgstr "ls-tree 返回未知返回值 %d"
4446
4447 #: submodule-config.c:230
4448 #, c-format
4449 msgid "ignoring suspicious submodule name: %s"
4450 msgstr "忽略可疑的子模组名称:%s"
4451
4452 #: submodule-config.c:294
4453 msgid "negative values not allowed for submodule.fetchjobs"
4454 msgstr "submodule.fetchjobs 不允许为负值"
4455
4456 #: submodule-config.c:467
4457 #, c-format
4458 msgid "invalid value for %s"
4459 msgstr "%s 的值无效"
4460
4461 #: trailer.c:238
4462 #, c-format
4463 msgid "running trailer command '%s' failed"
4464 msgstr "执行 trailer 命令 '%s' 失败"
4465
4466 #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
4467 #: trailer.c:557
4468 #, c-format
4469 msgid "unknown value '%s' for key '%s'"
4470 msgstr "键 '%2$s' 的未知取值 '%1$s'"
4471
4472 #: trailer.c:539 trailer.c:544 builtin/remote.c:293
4473 #, c-format
4474 msgid "more than one %s"
4475 msgstr "多于一个 %s"
4476
4477 #: trailer.c:730
4478 #, c-format
4479 msgid "empty trailer token in trailer '%.*s'"
4480 msgstr "签名 '%.*s' 的键为空"
4481
4482 #: trailer.c:750
4483 #, c-format
4484 msgid "could not read input file '%s'"
4485 msgstr "不能读取输入文件 '%s'"
4486
4487 #: trailer.c:753
4488 msgid "could not read from stdin"
4489 msgstr "不能自标准输入读取"
4490
4491 #: trailer.c:1008 builtin/am.c:46
4492 #, c-format
4493 msgid "could not stat %s"
4494 msgstr "不能对 %s 调用 stat"
4495
4496 #: trailer.c:1010
4497 #, c-format
4498 msgid "file %s is not a regular file"
4499 msgstr "文件 %s 不是一个正规文件"
4500
4501 #: trailer.c:1012
4502 #, c-format
4503 msgid "file %s is not writable by user"
4504 msgstr "文件 %s 用户不可写"
4505
4506 #: trailer.c:1024
4507 msgid "could not open temporary file"
4508 msgstr "不能打开临时文件"
4509
4510 #: trailer.c:1064
4511 #, c-format
4512 msgid "could not rename temporary file to %s"
4513 msgstr "不能重命名临时文件为 %s"
4514
4515 #: transport.c:116
4516 #, c-format
4517 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
4518 msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
4519
4520 #: transport.c:208
4521 #, c-format
4522 msgid "transport: invalid depth option '%s'"
4523 msgstr "传输:无效的深度选项 '%s'"
4524
4525 #: transport.c:584
4526 msgid "could not parse transport.color.* config"
4527 msgstr "不能解析 transport.color.* 配置"
4528
4529 #: transport.c:996
4530 #, c-format
4531 msgid ""
4532 "The following submodule paths contain changes that can\n"
4533 "not be found on any remote:\n"
4534 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
4535
4536 #: transport.c:1000
4537 #, c-format
4538 msgid ""
4539 "\n"
4540 "Please try\n"
4541 "\n"
4542 "\tgit push --recurse-submodules=on-demand\n"
4543 "\n"
4544 "or cd to the path and use\n"
4545 "\n"
4546 "\tgit push\n"
4547 "\n"
4548 "to push them to a remote.\n"
4549 "\n"
4550 msgstr ""
4551 "\n"
4552 "请尝试\n"
4553 "\n"
4554 "\tgit push --recurse-submodules=on-demand\n"
4555 "\n"
4556 "或者进入到子目录执行\n"
4557 "\n"
4558 "\tgit push\n"
4559 "\n"
4560 "以推送至远程。\n"
4561 "\n"
4562
4563 #: transport.c:1008
4564 msgid "Aborting."
4565 msgstr "正在终止。"
4566
4567 #: transport-helper.c:1087
4568 #, c-format
4569 msgid "Could not read ref %s"
4570 msgstr "不能读取引用 %s"
4571
4572 #: tree-walk.c:31
4573 msgid "too-short tree object"
4574 msgstr "太短的树对象"
4575
4576 #: tree-walk.c:37
4577 msgid "malformed mode in tree entry"
4578 msgstr "树对象中的条目模式错误"
4579
4580 #: tree-walk.c:41
4581 msgid "empty filename in tree entry"
4582 msgstr "树对象条目中空的文件名"
4583
4584 #: tree-walk.c:113
4585 msgid "too-short tree file"
4586 msgstr "太短的树文件"
4587
4588 #: unpack-trees.c:111
4589 #, c-format
4590 msgid ""
4591 "Your local changes to the following files would be overwritten by checkout:\n"
4592 "%%sPlease commit your changes or stash them before you switch branches."
4593 msgstr ""
4594 "您对下列文件的本地修改将被检出操作覆盖:\n"
4595 "%%s请在切换分支前提交或贮藏您的修改。"
4596
4597 #: unpack-trees.c:113
4598 #, c-format
4599 msgid ""
4600 "Your local changes to the following files would be overwritten by checkout:\n"
4601 "%%s"
4602 msgstr ""
4603 "您对下列文件的本地修改将被检出操作覆盖:\n"
4604 "%%s"
4605
4606 #: unpack-trees.c:116
4607 #, c-format
4608 msgid ""
4609 "Your local changes to the following files would be overwritten by merge:\n"
4610 "%%sPlease commit your changes or stash them before you merge."
4611 msgstr ""
4612 "您对下列文件的本地修改将被合并操作覆盖:\n"
4613 "%%s请在合并前提交或贮藏您的修改。"
4614
4615 #: unpack-trees.c:118
4616 #, c-format
4617 msgid ""
4618 "Your local changes to the following files would be overwritten by merge:\n"
4619 "%%s"
4620 msgstr ""
4621 "您对下列文件的本地修改将被合并操作覆盖:\n"
4622 "%%s"
4623
4624 #: unpack-trees.c:121
4625 #, c-format
4626 msgid ""
4627 "Your local changes to the following files would be overwritten by %s:\n"
4628 "%%sPlease commit your changes or stash them before you %s."
4629 msgstr ""
4630 "您对下列文件的本地修改将被 %s 覆盖:\n"
4631 "%%s请在 %s 之前提交或贮藏您的修改。"
4632
4633 #: unpack-trees.c:123
4634 #, c-format
4635 msgid ""
4636 "Your local changes to the following files would be overwritten by %s:\n"
4637 "%%s"
4638 msgstr ""
4639 "您对下列文件的本地修改将被 %s 覆盖:\n"
4640 "%%s"
4641
4642 #: unpack-trees.c:128
4643 #, c-format
4644 msgid ""
4645 "Updating the following directories would lose untracked files in them:\n"
4646 "%s"
4647 msgstr ""
4648 "更新如下目录将会丢失其中未跟踪的文件:\n"
4649 "%s"
4650
4651 #: unpack-trees.c:132
4652 #, c-format
4653 msgid ""
4654 "The following untracked working tree files would be removed by checkout:\n"
4655 "%%sPlease move or remove them before you switch branches."
4656 msgstr ""
4657 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
4658 "%%s请在切换分支之前移动或删除。"
4659
4660 #: unpack-trees.c:134
4661 #, c-format
4662 msgid ""
4663 "The following untracked working tree files would be removed by checkout:\n"
4664 "%%s"
4665 msgstr ""
4666 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
4667 "%%s"
4668
4669 #: unpack-trees.c:137
4670 #, c-format
4671 msgid ""
4672 "The following untracked working tree files would be removed by merge:\n"
4673 "%%sPlease move or remove them before you merge."
4674 msgstr ""
4675 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
4676 "%%s请在合并前移动或删除。"
4677
4678 #: unpack-trees.c:139
4679 #, c-format
4680 msgid ""
4681 "The following untracked working tree files would be removed by merge:\n"
4682 "%%s"
4683 msgstr ""
4684 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
4685 "%%s"
4686
4687 #: unpack-trees.c:142
4688 #, c-format
4689 msgid ""
4690 "The following untracked working tree files would be removed by %s:\n"
4691 "%%sPlease move or remove them before you %s."
4692 msgstr ""
4693 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
4694 "%%s请在 %s 前移动或删除。"
4695
4696 #: unpack-trees.c:144
4697 #, c-format
4698 msgid ""
4699 "The following untracked working tree files would be removed by %s:\n"
4700 "%%s"
4701 msgstr ""
4702 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
4703 "%%s"
4704
4705 #: unpack-trees.c:150
4706 #, c-format
4707 msgid ""
4708 "The following untracked working tree files would be overwritten by "
4709 "checkout:\n"
4710 "%%sPlease move or remove them before you switch branches."
4711 msgstr ""
4712 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
4713 "%%s请在切换分支前移动或删除。"
4714
4715 #: unpack-trees.c:152
4716 #, c-format
4717 msgid ""
4718 "The following untracked working tree files would be overwritten by "
4719 "checkout:\n"
4720 "%%s"
4721 msgstr ""
4722 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
4723 "%%s"
4724
4725 #: unpack-trees.c:155
4726 #, c-format
4727 msgid ""
4728 "The following untracked working tree files would be overwritten by merge:\n"
4729 "%%sPlease move or remove them before you merge."
4730 msgstr ""
4731 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
4732 "%%s请在合并前移动或删除。"
4733
4734 #: unpack-trees.c:157
4735 #, c-format
4736 msgid ""
4737 "The following untracked working tree files would be overwritten by merge:\n"
4738 "%%s"
4739 msgstr ""
4740 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
4741 "%%s"
4742
4743 #: unpack-trees.c:160
4744 #, c-format
4745 msgid ""
4746 "The following untracked working tree files would be overwritten by %s:\n"
4747 "%%sPlease move or remove them before you %s."
4748 msgstr ""
4749 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
4750 "%%s请在 %s 前移动或删除。"
4751
4752 #: unpack-trees.c:162
4753 #, c-format
4754 msgid ""
4755 "The following untracked working tree files would be overwritten by %s:\n"
4756 "%%s"
4757 msgstr ""
4758 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
4759 "%%s"
4760
4761 #: unpack-trees.c:170
4762 #, c-format
4763 msgid "Entry '%s' overlaps with '%s'. Cannot bind."
4764 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
4765
4766 #: unpack-trees.c:173
4767 #, c-format
4768 msgid ""
4769 "Cannot update sparse checkout: the following entries are not up to date:\n"
4770 "%s"
4771 msgstr ""
4772 "无法更新稀疏检出:如下条目不是最新:\n"
4773 "%s"
4774
4775 #: unpack-trees.c:175
4776 #, c-format
4777 msgid ""
4778 "The following working tree files would be overwritten by sparse checkout "
4779 "update:\n"
4780 "%s"
4781 msgstr ""
4782 "工作区中下列文件将被稀疏检出更新所覆盖:\n"
4783 "%s"
4784
4785 #: unpack-trees.c:177
4786 #, c-format
4787 msgid ""
4788 "The following working tree files would be removed by sparse checkout "
4789 "update:\n"
4790 "%s"
4791 msgstr ""
4792 "工作区中下列文件将被稀疏检出更新所删除:\n"
4793 "%s"
4794
4795 #: unpack-trees.c:179
4796 #, c-format
4797 msgid ""
4798 "Cannot update submodule:\n"
4799 "%s"
4800 msgstr ""
4801 "无法更新子模组:\n"
4802 "%s"
4803
4804 #: unpack-trees.c:262
4805 #, c-format
4806 msgid "Aborting\n"
4807 msgstr "终止中\n"
4808
4809 #: unpack-trees.c:344
4810 msgid "Checking out files"
4811 msgstr "正在检出文件"
4812
4813 #: urlmatch.c:163
4814 msgid "invalid URL scheme name or missing '://' suffix"
4815 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
4816
4817 #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
4818 #, c-format
4819 msgid "invalid %XX escape sequence"
4820 msgstr "无效的 %XX 转义序列"
4821
4822 #: urlmatch.c:215
4823 msgid "missing host and scheme is not 'file:'"
4824 msgstr "缺失主机名且 URL 方案不是 'file:'"
4825
4826 #: urlmatch.c:232
4827 msgid "a 'file:' URL may not have a port number"
4828 msgstr "一个 'file:' URL 不应该包含端口号"
4829
4830 #: urlmatch.c:247
4831 msgid "invalid characters in host name"
4832 msgstr "主机名中包含无效的字符"
4833
4834 #: urlmatch.c:292 urlmatch.c:303
4835 msgid "invalid port number"
4836 msgstr "无效的端口号"
4837
4838 #: urlmatch.c:371
4839 msgid "invalid '..' path segment"
4840 msgstr "无效的 '..' 路径片段"
4841
4842 #: worktree.c:245 builtin/am.c:2147
4843 #, c-format
4844 msgid "failed to read '%s'"
4845 msgstr "无法读取 '%s'"
4846
4847 #: worktree.c:291
4848 #, c-format
4849 msgid "'%s' at main working tree is not the repository directory"
4850 msgstr "在主工作区的 '%s' 不是仓库目录"
4851
4852 #: worktree.c:302
4853 #, c-format
4854 msgid "'%s' file does not contain absolute path to the working tree location"
4855 msgstr "文件 '%s' 不包含工作区的绝对路径"
4856
4857 #: worktree.c:314
4858 #, c-format
4859 msgid "'%s' does not exist"
4860 msgstr "'%s' 不存在"
4861
4862 #: worktree.c:320
4863 #, c-format
4864 msgid "'%s' is not a .git file, error code %d"
4865 msgstr "'%s' 不是一个 .git 文件,错误码 %d"
4866
4867 #: worktree.c:328
4868 #, c-format
4869 msgid "'%s' does not point back to '%s'"
4870 msgstr "'%s' 没有指回到 '%s'"
4871
4872 #: wrapper.c:223 wrapper.c:393
4873 #, c-format
4874 msgid "could not open '%s' for reading and writing"
4875 msgstr "无法打开 '%s' 进行读写"
4876
4877 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
4878 #: builtin/am.c:862 builtin/merge.c:1043
4879 #, c-format
4880 msgid "could not open '%s' for reading"
4881 msgstr "无法打开 '%s' 进行读取"
4882
4883 #: wrapper.c:424 wrapper.c:624
4884 #, c-format
4885 msgid "unable to access '%s'"
4886 msgstr "不能访问 '%s'"
4887
4888 #: wrapper.c:632
4889 msgid "unable to get current working directory"
4890 msgstr "不能获取当前工作目录"
4891
4892 #: wt-status.c:154
4893 msgid "Unmerged paths:"
4894 msgstr "未合并的路径:"
4895
4896 # 译者:注意保持前导空格
4897 #: wt-status.c:181 wt-status.c:208
4898 #, c-format
4899 msgid " (use \"git reset %s <file>...\" to unstage)"
4900 msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
4901
4902 # 译者:注意保持前导空格
4903 #: wt-status.c:183 wt-status.c:210
4904 msgid " (use \"git rm --cached <file>...\" to unstage)"
4905 msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
4906
4907 # 译者:注意保持前导空格
4908 #: wt-status.c:187
4909 msgid " (use \"git add <file>...\" to mark resolution)"
4910 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
4911
4912 # 译者:注意保持前导空格
4913 #: wt-status.c:189 wt-status.c:193
4914 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
4915 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
4916
4917 # 译者:注意保持前导空格
4918 #: wt-status.c:191
4919 msgid " (use \"git rm <file>...\" to mark resolution)"
4920 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
4921
4922 #: wt-status.c:202 wt-status.c:1015
4923 msgid "Changes to be committed:"
4924 msgstr "要提交的变更:"
4925
4926 #: wt-status.c:220 wt-status.c:1024
4927 msgid "Changes not staged for commit:"
4928 msgstr "尚未暂存以备提交的变更:"
4929
4930 # 译者:注意保持前导空格
4931 #: wt-status.c:224
4932 msgid " (use \"git add <file>...\" to update what will be committed)"
4933 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
4934
4935 # 译者:注意保持前导空格
4936 #: wt-status.c:226
4937 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
4938 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
4939
4940 # 译者:注意保持前导空格
4941 #: wt-status.c:227
4942 msgid ""
4943 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
4944 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
4945
4946 # 译者:注意保持前导空格
4947 #: wt-status.c:229
4948 msgid " (commit or discard the untracked or modified content in submodules)"
4949 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
4950
4951 # 译者:注意保持前导空格
4952 #: wt-status.c:241
4953 #, c-format
4954 msgid " (use \"git %s <file>...\" to include in what will be committed)"
4955 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
4956
4957 #: wt-status.c:256
4958 msgid "both deleted:"
4959 msgstr "双方删除:"
4960
4961 #: wt-status.c:258
4962 msgid "added by us:"
4963 msgstr "由我们添加:"
4964
4965 #: wt-status.c:260
4966 msgid "deleted by them:"
4967 msgstr "由他们删除:"
4968
4969 #: wt-status.c:262
4970 msgid "added by them:"
4971 msgstr "由他们添加:"
4972
4973 #: wt-status.c:264
4974 msgid "deleted by us:"
4975 msgstr "由我们删除:"
4976
4977 #: wt-status.c:266
4978 msgid "both added:"
4979 msgstr "双方添加:"
4980
4981 #: wt-status.c:268
4982 msgid "both modified:"
4983 msgstr "双方修改:"
4984
4985 #: wt-status.c:278
4986 msgid "new file:"
4987 msgstr "新文件:"
4988
4989 #: wt-status.c:280
4990 msgid "copied:"
4991 msgstr "拷贝:"
4992
4993 #: wt-status.c:282
4994 msgid "deleted:"
4995 msgstr "删除:"
4996
4997 #: wt-status.c:284
4998 msgid "modified:"
4999 msgstr "修改:"
5000
5001 #: wt-status.c:286
5002 msgid "renamed:"
5003 msgstr "重命名:"
5004
5005 #: wt-status.c:288
5006 msgid "typechange:"
5007 msgstr "类型变更:"
5008
5009 #: wt-status.c:290
5010 msgid "unknown:"
5011 msgstr "未知:"
5012
5013 #: wt-status.c:292
5014 msgid "unmerged:"
5015 msgstr "未合并:"
5016
5017 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
5018 #: wt-status.c:372
5019 msgid "new commits, "
5020 msgstr "新提交, "
5021
5022 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
5023 #: wt-status.c:374
5024 msgid "modified content, "
5025 msgstr "修改的内容, "
5026
5027 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
5028 #: wt-status.c:376
5029 msgid "untracked content, "
5030 msgstr "未跟踪的内容, "
5031
5032 #: wt-status.c:853
5033 #, c-format
5034 msgid "Your stash currently has %d entry"
5035 msgid_plural "Your stash currently has %d entries"
5036 msgstr[0] "您的贮藏区当前有 %d 条记录"
5037 msgstr[1] "您的贮藏区当前有 %d 条记录"
5038
5039 #: wt-status.c:885
5040 msgid "Submodules changed but not updated:"
5041 msgstr "子模组已修改但尚未更新:"
5042
5043 #: wt-status.c:887
5044 msgid "Submodule changes to be committed:"
5045 msgstr "要提交的子模组变更:"
5046
5047 #: wt-status.c:969
5048 msgid ""
5049 "Do not modify or remove the line above.\n"
5050 "Everything below it will be ignored."
5051 msgstr ""
5052 "不要改动或删除上面的一行。\n"
5053 "其下所有内容都将被忽略。"
5054
5055 #: wt-status.c:1084
5056 msgid "You have unmerged paths."
5057 msgstr "您有尚未合并的路径。"
5058
5059 # 译者:注意保持前导空格
5060 #: wt-status.c:1087
5061 msgid " (fix conflicts and run \"git commit\")"
5062 msgstr " (解决冲突并运行 \"git commit\")"
5063
5064 # 译者:注意保持前导空格
5065 #: wt-status.c:1089
5066 msgid " (use \"git merge --abort\" to abort the merge)"
5067 msgstr " (使用 \"git merge --abort\" 终止合并)"
5068
5069 #: wt-status.c:1094
5070 msgid "All conflicts fixed but you are still merging."
5071 msgstr "所有冲突已解决但您仍处于合并中。"
5072
5073 # 译者:注意保持前导空格
5074 #: wt-status.c:1097
5075 msgid " (use \"git commit\" to conclude merge)"
5076 msgstr " (使用 \"git commit\" 结束合并)"
5077
5078 #: wt-status.c:1107
5079 msgid "You are in the middle of an am session."
5080 msgstr "您正处于 am 操作过程中。"
5081
5082 #: wt-status.c:1110
5083 msgid "The current patch is empty."
5084 msgstr "当前的补丁为空。"
5085
5086 # 译者:注意保持前导空格
5087 #: wt-status.c:1114
5088 msgid " (fix conflicts and then run \"git am --continue\")"
5089 msgstr " (解决冲突,然后运行 \"git am --continue\")"
5090
5091 # 译者:注意保持前导空格
5092 #: wt-status.c:1116
5093 msgid " (use \"git am --skip\" to skip this patch)"
5094 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
5095
5096 # 译者:注意保持前导空格
5097 #: wt-status.c:1118
5098 msgid " (use \"git am --abort\" to restore the original branch)"
5099 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
5100
5101 #: wt-status.c:1250
5102 msgid "git-rebase-todo is missing."
5103 msgstr "git-rebase-todo 丢失。"
5104
5105 #: wt-status.c:1252
5106 msgid "No commands done."
5107 msgstr "没有命令被执行。"
5108
5109 #: wt-status.c:1255
5110 #, c-format
5111 msgid "Last command done (%d command done):"
5112 msgid_plural "Last commands done (%d commands done):"
5113 msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
5114 msgstr[1] "最后的命令已完成(%d 条命令被执行):"
5115
5116 #: wt-status.c:1266
5117 #, c-format
5118 msgid " (see more in file %s)"
5119 msgstr " (更多参见文件 %s)"
5120
5121 #: wt-status.c:1271
5122 msgid "No commands remaining."
5123 msgstr "未剩下任何命令。"
5124
5125 #: wt-status.c:1274
5126 #, c-format
5127 msgid "Next command to do (%d remaining command):"
5128 msgid_plural "Next commands to do (%d remaining commands):"
5129 msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
5130 msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
5131
5132 # 译者:注意保持前导空格
5133 #: wt-status.c:1282
5134 msgid " (use \"git rebase --edit-todo\" to view and edit)"
5135 msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
5136
5137 #: wt-status.c:1295
5138 #, c-format
5139 msgid "You are currently rebasing branch '%s' on '%s'."
5140 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
5141
5142 #: wt-status.c:1300
5143 msgid "You are currently rebasing."
5144 msgstr "您在执行变基操作。"
5145
5146 # 译者:注意保持前导空格
5147 #: wt-status.c:1314
5148 msgid " (fix conflicts and then run \"git rebase --continue\")"
5149 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
5150
5151 # 译者:注意保持前导空格
5152 #: wt-status.c:1316
5153 msgid " (use \"git rebase --skip\" to skip this patch)"
5154 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
5155
5156 # 译者:注意保持前导空格
5157 #: wt-status.c:1318
5158 msgid " (use \"git rebase --abort\" to check out the original branch)"
5159 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
5160
5161 # 译者:注意保持前导空格
5162 #: wt-status.c:1324
5163 msgid " (all conflicts fixed: run \"git rebase --continue\")"
5164 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
5165
5166 #: wt-status.c:1328
5167 #, c-format
5168 msgid ""
5169 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
5170 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
5171
5172 #: wt-status.c:1333
5173 msgid "You are currently splitting a commit during a rebase."
5174 msgstr "您在执行变基操作时拆分提交。"
5175
5176 # 译者:注意保持前导空格
5177 #: wt-status.c:1336
5178 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
5179 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
5180
5181 #: wt-status.c:1340
5182 #, c-format
5183 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
5184 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
5185
5186 #: wt-status.c:1345
5187 msgid "You are currently editing a commit during a rebase."
5188 msgstr "您在执行变基操作时编辑提交。"
5189
5190 # 译者:注意保持前导空格
5191 #: wt-status.c:1348
5192 msgid " (use \"git commit --amend\" to amend the current commit)"
5193 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
5194
5195 # 译者:注意保持前导空格
5196 #: wt-status.c:1350
5197 msgid ""
5198 " (use \"git rebase --continue\" once you are satisfied with your changes)"
5199 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
5200
5201 #: wt-status.c:1360
5202 #, c-format
5203 msgid "You are currently cherry-picking commit %s."
5204 msgstr "您在执行拣选提交 %s 的操作。"
5205
5206 # 译者:注意保持前导空格
5207 #: wt-status.c:1365
5208 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
5209 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
5210
5211 # 译者:注意保持前导空格
5212 #: wt-status.c:1368
5213 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
5214 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
5215
5216 # 译者:注意保持前导空格
5217 #: wt-status.c:1370
5218 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
5219 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
5220
5221 #: wt-status.c:1379
5222 #, c-format
5223 msgid "You are currently reverting commit %s."
5224 msgstr "您在执行反转提交 %s 的操作。"
5225
5226 # 译者:注意保持前导空格
5227 #: wt-status.c:1384
5228 msgid " (fix conflicts and run \"git revert --continue\")"
5229 msgstr " (解决冲突并运行 \"git revert --continue\")"
5230
5231 # 译者:注意保持前导空格
5232 #: wt-status.c:1387
5233 msgid " (all conflicts fixed: run \"git revert --continue\")"
5234 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
5235
5236 # 译者:注意保持前导空格
5237 #: wt-status.c:1389
5238 msgid " (use \"git revert --abort\" to cancel the revert operation)"
5239 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
5240
5241 #: wt-status.c:1400
5242 #, c-format
5243 msgid "You are currently bisecting, started from branch '%s'."
5244 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
5245
5246 #: wt-status.c:1404
5247 msgid "You are currently bisecting."
5248 msgstr "您在执行二分查找操作。"
5249
5250 # 译者:注意保持前导空格
5251 #: wt-status.c:1407
5252 msgid " (use \"git bisect reset\" to get back to the original branch)"
5253 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
5254
5255 #: wt-status.c:1604
5256 msgid "On branch "
5257 msgstr "位于分支 "
5258
5259 #: wt-status.c:1610
5260 msgid "interactive rebase in progress; onto "
5261 msgstr "交互式变基操作正在进行中;至 "
5262
5263 #: wt-status.c:1612
5264 msgid "rebase in progress; onto "
5265 msgstr "变基操作正在进行中;至 "
5266
5267 #: wt-status.c:1617
5268 msgid "HEAD detached at "
5269 msgstr "头指针分离于 "
5270
5271 #: wt-status.c:1619
5272 msgid "HEAD detached from "
5273 msgstr "头指针分离自 "
5274
5275 #: wt-status.c:1622
5276 msgid "Not currently on any branch."
5277 msgstr "当前不在任何分支上。"
5278
5279 #: wt-status.c:1642
5280 msgid "Initial commit"
5281 msgstr "初始提交"
5282
5283 #: wt-status.c:1643
5284 msgid "No commits yet"
5285 msgstr "尚无提交"
5286
5287 #: wt-status.c:1657
5288 msgid "Untracked files"
5289 msgstr "未跟踪的文件"
5290
5291 #: wt-status.c:1659
5292 msgid "Ignored files"
5293 msgstr "忽略的文件"
5294
5295 #: wt-status.c:1663
5296 #, c-format
5297 msgid ""
5298 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
5299 "may speed it up, but you have to be careful not to forget to add\n"
5300 "new files yourself (see 'git help status')."
5301 msgstr ""
5302 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
5303 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
5304
5305 #: wt-status.c:1669
5306 #, c-format
5307 msgid "Untracked files not listed%s"
5308 msgstr "未跟踪的文件没有列出%s"
5309
5310 # 译者:中文字符串拼接,可删除前导空格
5311 #: wt-status.c:1671
5312 msgid " (use -u option to show untracked files)"
5313 msgstr "(使用 -u 参数显示未跟踪的文件)"
5314
5315 #: wt-status.c:1677
5316 msgid "No changes"
5317 msgstr "没有修改"
5318
5319 #: wt-status.c:1682
5320 #, c-format
5321 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
5322 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
5323
5324 #: wt-status.c:1685
5325 #, c-format
5326 msgid "no changes added to commit\n"
5327 msgstr "修改尚未加入提交\n"
5328
5329 #: wt-status.c:1688
5330 #, c-format
5331 msgid ""
5332 "nothing added to commit but untracked files present (use \"git add\" to "
5333 "track)\n"
5334 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
5335
5336 #: wt-status.c:1691
5337 #, c-format
5338 msgid "nothing added to commit but untracked files present\n"
5339 msgstr "提交为空,但是存在尚未跟踪的文件\n"
5340
5341 # 译者:中文字符串拼接,可删除前导空格
5342 #: wt-status.c:1694
5343 #, c-format
5344 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
5345 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
5346
5347 #: wt-status.c:1697 wt-status.c:1702
5348 #, c-format
5349 msgid "nothing to commit\n"
5350 msgstr "无文件要提交\n"
5351
5352 # 译者:中文字符串拼接,可删除前导空格
5353 #: wt-status.c:1700
5354 #, c-format
5355 msgid "nothing to commit (use -u to show untracked files)\n"
5356 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
5357
5358 # 译者:中文字符串拼接,可删除前导空格
5359 #: wt-status.c:1704
5360 #, c-format
5361 msgid "nothing to commit, working tree clean\n"
5362 msgstr "无文件要提交,干净的工作区\n"
5363
5364 #: wt-status.c:1817
5365 msgid "No commits yet on "
5366 msgstr "尚无提交在 "
5367
5368 #: wt-status.c:1821
5369 msgid "HEAD (no branch)"
5370 msgstr "HEAD(非分支)"
5371
5372 #: wt-status.c:1852
5373 msgid "different"
5374 msgstr "不同"
5375
5376 # 译者:注意保持句尾空格
5377 #: wt-status.c:1854 wt-status.c:1862
5378 msgid "behind "
5379 msgstr "落后 "
5380
5381 #: wt-status.c:1857 wt-status.c:1860
5382 msgid "ahead "
5383 msgstr "领先 "
5384
5385 #. TRANSLATORS: the action is e.g. "pull with rebase"
5386 #: wt-status.c:2366
5387 #, c-format
5388 msgid "cannot %s: You have unstaged changes."
5389 msgstr "不能%s:您有未暂存的变更。"
5390
5391 #: wt-status.c:2372
5392 msgid "additionally, your index contains uncommitted changes."
5393 msgstr "另外,您的索引中包含未提交的变更。"
5394
5395 #: wt-status.c:2374
5396 #, c-format
5397 msgid "cannot %s: Your index contains uncommitted changes."
5398 msgstr "不能%s:您的索引中包含未提交的变更。"
5399
5400 #: compat/precompose_utf8.c:58 builtin/clone.c:442
5401 #, c-format
5402 msgid "failed to unlink '%s'"
5403 msgstr "无法删除 '%s'"
5404
5405 #: builtin/add.c:24
5406 msgid "git add [<options>] [--] <pathspec>..."
5407 msgstr "git add [<选项>] [--] <路径规格>..."
5408
5409 #: builtin/add.c:83
5410 #, c-format
5411 msgid "unexpected diff status %c"
5412 msgstr "意外的差异状态 %c"
5413
5414 #: builtin/add.c:88 builtin/commit.c:266
5415 msgid "updating files failed"
5416 msgstr "更新文件失败"
5417
5418 #: builtin/add.c:98
5419 #, c-format
5420 msgid "remove '%s'\n"
5421 msgstr "删除 '%s'\n"
5422
5423 #: builtin/add.c:173
5424 msgid "Unstaged changes after refreshing the index:"
5425 msgstr "刷新索引之后尚未被暂存的变更:"
5426
5427 #: builtin/add.c:233 builtin/rev-parse.c:892
5428 msgid "Could not read the index"
5429 msgstr "不能读取索引"
5430
5431 #: builtin/add.c:244
5432 #, c-format
5433 msgid "Could not open '%s' for writing."
5434 msgstr "无法打开 '%s' 进行写入。"
5435
5436 #: builtin/add.c:248
5437 msgid "Could not write patch"
5438 msgstr "不能生成补丁"
5439
5440 #: builtin/add.c:251
5441 msgid "editing patch failed"
5442 msgstr "编辑补丁失败"
5443
5444 #: builtin/add.c:254
5445 #, c-format
5446 msgid "Could not stat '%s'"
5447 msgstr "不能对 '%s' 调用 stat"
5448
5449 #: builtin/add.c:256
5450 msgid "Empty patch. Aborted."
5451 msgstr "空补丁。异常终止。"
5452
5453 #: builtin/add.c:261
5454 #, c-format
5455 msgid "Could not apply '%s'"
5456 msgstr "不能应用 '%s'"
5457
5458 #: builtin/add.c:269
5459 msgid "The following paths are ignored by one of your .gitignore files:\n"
5460 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
5461
5462 #: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123
5463 #: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557
5464 #: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165
5465 msgid "dry run"
5466 msgstr "演习"
5467
5468 #: builtin/add.c:292
5469 msgid "interactive picking"
5470 msgstr "交互式拣选"
5471
5472 #: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302
5473 msgid "select hunks interactively"
5474 msgstr "交互式挑选数据块"
5475
5476 #: builtin/add.c:294
5477 msgid "edit current diff and apply"
5478 msgstr "编辑当前差异并应用"
5479
5480 #: builtin/add.c:295
5481 msgid "allow adding otherwise ignored files"
5482 msgstr "允许添加忽略的文件"
5483
5484 #: builtin/add.c:296
5485 msgid "update tracked files"
5486 msgstr "更新已跟踪的文件"
5487
5488 #: builtin/add.c:297
5489 msgid "renormalize EOL of tracked files (implies -u)"
5490 msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
5491
5492 #: builtin/add.c:298
5493 msgid "record only the fact that the path will be added later"
5494 msgstr "只记录,该路径稍后再添加"
5495
5496 #: builtin/add.c:299
5497 msgid "add changes from all tracked and untracked files"
5498 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
5499
5500 #: builtin/add.c:302
5501 msgid "ignore paths removed in the working tree (same as --no-all)"
5502 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
5503
5504 #: builtin/add.c:304
5505 msgid "don't add, only refresh the index"
5506 msgstr "不添加,只刷新索引"
5507
5508 #: builtin/add.c:305
5509 msgid "just skip files which cannot be added because of errors"
5510 msgstr "跳过因出错不能添加的文件"
5511
5512 #: builtin/add.c:306
5513 msgid "check if - even missing - files are ignored in dry run"
5514 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
5515
5516 #: builtin/add.c:307 builtin/update-index.c:974
5517 msgid "(+/-)x"
5518 msgstr "(+/-)x"
5519
5520 #: builtin/add.c:307 builtin/update-index.c:975
5521 msgid "override the executable bit of the listed files"
5522 msgstr "覆盖列表里文件的可执行位"
5523
5524 #: builtin/add.c:309
5525 msgid "warn when adding an embedded repository"
5526 msgstr "创建一个嵌入式仓库时给予警告"
5527
5528 #: builtin/add.c:324
5529 #, c-format
5530 msgid ""
5531 "You've added another git repository inside your current repository.\n"
5532 "Clones of the outer repository will not contain the contents of\n"
5533 "the embedded repository and will not know how to obtain it.\n"
5534 "If you meant to add a submodule, use:\n"
5535 "\n"
5536 "\tgit submodule add <url> %s\n"
5537 "\n"
5538 "If you added this path by mistake, you can remove it from the\n"
5539 "index with:\n"
5540 "\n"
5541 "\tgit rm --cached %s\n"
5542 "\n"
5543 "See \"git help submodule\" for more information."
5544 msgstr ""
5545 "您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并"
5546 "且不知道该如何获取它。\n"
5547 "如果您要添加一个子模组,使用:\n"
5548 "\n"
5549 "\tgit submodule add <url> %s\n"
5550 "\n"
5551 "如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
5552 "\n"
5553 "\tgit rm --cached %s\n"
5554 "\n"
5555 "参见 \"git help submodule\" 获取更多信息。"
5556
5557 #: builtin/add.c:352
5558 #, c-format
5559 msgid "adding embedded git repository: %s"
5560 msgstr "正在添加嵌入式 git 仓库:%s"
5561
5562 #: builtin/add.c:370
5563 #, c-format
5564 msgid "Use -f if you really want to add them.\n"
5565 msgstr "使用 -f 参数如果您确实要添加它们。\n"
5566
5567 #: builtin/add.c:378
5568 msgid "adding files failed"
5569 msgstr "添加文件失败"
5570
5571 #: builtin/add.c:416
5572 msgid "-A and -u are mutually incompatible"
5573 msgstr "-A 和 -u 选项互斥"
5574
5575 #: builtin/add.c:423
5576 msgid "Option --ignore-missing can only be used together with --dry-run"
5577 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
5578
5579 #: builtin/add.c:427
5580 #, c-format
5581 msgid "--chmod param '%s' must be either -x or +x"
5582 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
5583
5584 #: builtin/add.c:442
5585 #, c-format
5586 msgid "Nothing specified, nothing added.\n"
5587 msgstr "没有指定文件,也没有文件被添加。\n"
5588
5589 #: builtin/add.c:443
5590 #, c-format
5591 msgid "Maybe you wanted to say 'git add .'?\n"
5592 msgstr "也许您想要执行 'git add .'?\n"
5593
5594 #: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280
5595 #: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325
5596 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
5597 #: builtin/rm.c:270 builtin/submodule--helper.c:328
5598 msgid "index file corrupt"
5599 msgstr "索引文件损坏"
5600
5601 #: builtin/am.c:414
5602 msgid "could not parse author script"
5603 msgstr "不能解析作者脚本"
5604
5605 #: builtin/am.c:498
5606 #, c-format
5607 msgid "'%s' was deleted by the applypatch-msg hook"
5608 msgstr "'%s' 被 applypatch-msg 钩子删除"
5609
5610 #: builtin/am.c:539
5611 #, c-format
5612 msgid "Malformed input line: '%s'."
5613 msgstr "非法的输入行:'%s'。"
5614
5615 #: builtin/am.c:576
5616 #, c-format
5617 msgid "Failed to copy notes from '%s' to '%s'"
5618 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
5619
5620 #: builtin/am.c:602
5621 msgid "fseek failed"
5622 msgstr "fseek 失败"
5623
5624 #: builtin/am.c:790
5625 #, c-format
5626 msgid "could not parse patch '%s'"
5627 msgstr "无法解析补丁 '%s'"
5628
5629 #: builtin/am.c:855
5630 msgid "Only one StGIT patch series can be applied at once"
5631 msgstr "一次只能有一个 StGIT 补丁队列被应用"
5632
5633 #: builtin/am.c:903
5634 msgid "invalid timestamp"
5635 msgstr "无效的时间戳"
5636
5637 #: builtin/am.c:908 builtin/am.c:920
5638 msgid "invalid Date line"
5639 msgstr "无效的日期行"
5640
5641 #: builtin/am.c:915
5642 msgid "invalid timezone offset"
5643 msgstr "无效的时区偏移值"
5644
5645 #: builtin/am.c:1008
5646 msgid "Patch format detection failed."
5647 msgstr "补丁格式探测失败。"
5648
5649 #: builtin/am.c:1013 builtin/clone.c:407
5650 #, c-format
5651 msgid "failed to create directory '%s'"
5652 msgstr "无法创建目录 '%s'"
5653
5654 #: builtin/am.c:1018
5655 msgid "Failed to split patches."
5656 msgstr "无法拆分补丁。"
5657
5658 #: builtin/am.c:1148 builtin/commit.c:351
5659 msgid "unable to write index file"
5660 msgstr "无法写入索引文件"
5661
5662 #: builtin/am.c:1162
5663 #, c-format
5664 msgid "When you have resolved this problem, run \"%s --continue\"."
5665 msgstr "当您解决这一问题,执行 \"%s --continue\"。"
5666
5667 #: builtin/am.c:1163
5668 #, c-format
5669 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
5670 msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
5671
5672 #: builtin/am.c:1164
5673 #, c-format
5674 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
5675 msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
5676
5677 #: builtin/am.c:1271
5678 msgid "Patch is empty."
5679 msgstr "补丁为空。"
5680
5681 #: builtin/am.c:1337
5682 #, c-format
5683 msgid "invalid ident line: %.*s"
5684 msgstr "无效的身份标识:%.*s"
5685
5686 #: builtin/am.c:1359
5687 #, c-format
5688 msgid "unable to parse commit %s"
5689 msgstr "不能解析提交 %s"
5690
5691 #: builtin/am.c:1554
5692 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
5693 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
5694
5695 #: builtin/am.c:1556
5696 msgid "Using index info to reconstruct a base tree..."
5697 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
5698
5699 #: builtin/am.c:1575
5700 msgid ""
5701 "Did you hand edit your patch?\n"
5702 "It does not apply to blobs recorded in its index."
5703 msgstr ""
5704 "您是否曾手动编辑过您的补丁?\n"
5705 "无法应用补丁到索引中的数据对象上。"
5706
5707 #: builtin/am.c:1581
5708 msgid "Falling back to patching base and 3-way merge..."
5709 msgstr "回落到基础版本上打补丁及进行三方合并..."
5710
5711 #: builtin/am.c:1606
5712 msgid "Failed to merge in the changes."
5713 msgstr "无法合并变更。"
5714
5715 #: builtin/am.c:1637
5716 msgid "applying to an empty history"
5717 msgstr "正应用到一个空历史上"
5718
5719 #: builtin/am.c:1683 builtin/am.c:1687
5720 #, c-format
5721 msgid "cannot resume: %s does not exist."
5722 msgstr "无法继续:%s 不存在。"
5723
5724 #: builtin/am.c:1703
5725 msgid "cannot be interactive without stdin connected to a terminal."
5726 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
5727
5728 #: builtin/am.c:1708
5729 msgid "Commit Body is:"
5730 msgstr "提交内容为:"
5731
5732 # 译者:注意保持句尾空格
5733 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5734 #. in your translation. The program will only accept English
5735 #. input at this point.
5736 #.
5737 #: builtin/am.c:1718
5738 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
5739 msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
5740
5741 #: builtin/am.c:1768
5742 #, c-format
5743 msgid "Dirty index: cannot apply patches (dirty: %s)"
5744 msgstr "脏索引:不能应用补丁(脏文件:%s)"
5745
5746 #: builtin/am.c:1808 builtin/am.c:1879
5747 #, c-format
5748 msgid "Applying: %.*s"
5749 msgstr "应用:%.*s"
5750
5751 #: builtin/am.c:1824
5752 msgid "No changes -- Patch already applied."
5753 msgstr "没有变更 —— 补丁已经应用过。"
5754
5755 #: builtin/am.c:1832
5756 #, c-format
5757 msgid "Patch failed at %s %.*s"
5758 msgstr "打补丁失败于 %s %.*s"
5759
5760 #: builtin/am.c:1838
5761 msgid "Use 'git am --show-current-patch' to see the failed patch"
5762 msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"
5763
5764 #: builtin/am.c:1882
5765 msgid ""
5766 "No changes - did you forget to use 'git add'?\n"
5767 "If there is nothing left to stage, chances are that something else\n"
5768 "already introduced the same changes; you might want to skip this patch."
5769 msgstr ""
5770 "没有变更 —— 您是不是忘了执行 'git add'?\n"
5771 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
5772 "您也许想要跳过这个补丁。"
5773
5774 #: builtin/am.c:1889
5775 msgid ""
5776 "You still have unmerged paths in your index.\n"
5777 "You should 'git add' each file with resolved conflicts to mark them as "
5778 "such.\n"
5779 "You might run `git rm` on a file to accept \"deleted by them\" for it."
5780 msgstr ""
5781 "在您的索引中仍存在未合并的路径。\n"
5782 "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
5783 "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
5784
5785 #: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
5786 #: builtin/reset.c:332
5787 #, c-format
5788 msgid "Could not parse object '%s'."
5789 msgstr "不能解析对象 '%s'。"
5790
5791 #: builtin/am.c:2048
5792 msgid "failed to clean index"
5793 msgstr "无法清空索引"
5794
5795 #: builtin/am.c:2083
5796 msgid ""
5797 "You seem to have moved HEAD since the last 'am' failure.\n"
5798 "Not rewinding to ORIG_HEAD"
5799 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
5800
5801 #: builtin/am.c:2174
5802 #, c-format
5803 msgid "Invalid value for --patch-format: %s"
5804 msgstr "无效的 --patch-format 值:%s"
5805
5806 #: builtin/am.c:2210
5807 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
5808 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5809
5810 #: builtin/am.c:2211
5811 msgid "git am [<options>] (--continue | --skip | --abort)"
5812 msgstr "git am [<选项>] (--continue | --skip | --abort)"
5813
5814 #: builtin/am.c:2217
5815 msgid "run interactively"
5816 msgstr "以交互式方式运行"
5817
5818 #: builtin/am.c:2219
5819 msgid "historical option -- no-op"
5820 msgstr "老的参数 —— 无作用"
5821
5822 #: builtin/am.c:2221
5823 msgid "allow fall back on 3way merging if needed"
5824 msgstr "如果必要,允许使用三方合并。"
5825
5826 #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
5827 #: builtin/repack.c:192
5828 msgid "be quiet"
5829 msgstr "静默模式"
5830
5831 #: builtin/am.c:2224
5832 msgid "add a Signed-off-by line to the commit message"
5833 msgstr "在提交说明中添加一个 Signed-off-by 签名"
5834
5835 #: builtin/am.c:2227
5836 msgid "recode into utf8 (default)"
5837 msgstr "使用 utf8 字符集(默认)"
5838
5839 #: builtin/am.c:2229
5840 msgid "pass -k flag to git-mailinfo"
5841 msgstr "向 git-mailinfo 传递 -k 参数"
5842
5843 #: builtin/am.c:2231
5844 msgid "pass -b flag to git-mailinfo"
5845 msgstr "向 git-mailinfo 传递 -b 参数"
5846
5847 #: builtin/am.c:2233
5848 msgid "pass -m flag to git-mailinfo"
5849 msgstr "向 git-mailinfo 传递 -m 参数"
5850
5851 #: builtin/am.c:2235
5852 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
5853 msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5854
5855 #: builtin/am.c:2238
5856 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
5857 msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
5858
5859 #: builtin/am.c:2241
5860 msgid "strip everything before a scissors line"
5861 msgstr "丢弃裁切线前的所有内容"
5862
5863 #: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
5864 #: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
5865 #: builtin/am.c:2270
5866 msgid "pass it through git-apply"
5867 msgstr "传递给 git-apply"
5868
5869 #: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665
5870 #: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208
5871 #: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201
5872 #: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631
5873 #: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144
5874 #: parse-options.h:146 parse-options.h:258
5875 msgid "n"
5876 msgstr "n"
5877
5878 #: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38
5879 #: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39
5880 msgid "format"
5881 msgstr "格式"
5882
5883 #: builtin/am.c:2267
5884 msgid "format the patch(es) are in"
5885 msgstr "补丁的格式"
5886
5887 #: builtin/am.c:2273
5888 msgid "override error message when patch failure occurs"
5889 msgstr "打补丁失败时显示的错误信息"
5890
5891 #: builtin/am.c:2275
5892 msgid "continue applying patches after resolving a conflict"
5893 msgstr "冲突解决后继续应用补丁"
5894
5895 #: builtin/am.c:2278
5896 msgid "synonyms for --continue"
5897 msgstr "和 --continue 同义"
5898
5899 #: builtin/am.c:2281
5900 msgid "skip the current patch"
5901 msgstr "跳过当前补丁"
5902
5903 #: builtin/am.c:2284
5904 msgid "restore the original branch and abort the patching operation."
5905 msgstr "恢复原始分支并终止打补丁操作。"
5906
5907 #: builtin/am.c:2287
5908 msgid "abort the patching operation but keep HEAD where it is."
5909 msgstr "终止补丁操作但保持 HEAD 不变。"
5910
5911 #: builtin/am.c:2290
5912 msgid "show the patch being applied."
5913 msgstr "显示正在应用的补丁。"
5914
5915 #: builtin/am.c:2294
5916 msgid "lie about committer date"
5917 msgstr "将作者日期作为提交日期"
5918
5919 #: builtin/am.c:2296
5920 msgid "use current timestamp for author date"
5921 msgstr "用当前时间作为作者日期"
5922
5923 #: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239
5924 #: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399
5925 msgid "key-id"
5926 msgstr "key-id"
5927
5928 #: builtin/am.c:2299
5929 msgid "GPG-sign commits"
5930 msgstr "使用 GPG 签名提交"
5931
5932 #: builtin/am.c:2302
5933 msgid "(internal use for git-rebase)"
5934 msgstr "(内部使用,用于 git-rebase)"
5935
5936 #: builtin/am.c:2320
5937 msgid ""
5938 "The -b/--binary option has been a no-op for long time, and\n"
5939 "it will be removed. Please do not use it anymore."
5940 msgstr ""
5941 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
5942 "请不要再使用它了。"
5943
5944 #: builtin/am.c:2327
5945 msgid "failed to read the index"
5946 msgstr "无法读取索引"
5947
5948 #: builtin/am.c:2342
5949 #, c-format
5950 msgid "previous rebase directory %s still exists but mbox given."
5951 msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
5952
5953 #: builtin/am.c:2366
5954 #, c-format
5955 msgid ""
5956 "Stray %s directory found.\n"
5957 "Use \"git am --abort\" to remove it."
5958 msgstr ""
5959 "发现了错误的 %s 目录。\n"
5960 "使用 \"git am --abort\" 删除它。"
5961
5962 #: builtin/am.c:2372
5963 msgid "Resolve operation not in progress, we are not resuming."
5964 msgstr "解决操作未进行,我们不会继续。"
5965
5966 #: builtin/apply.c:8
5967 msgid "git apply [<options>] [<patch>...]"
5968 msgstr "git apply [<选项>] [<补丁>...]"
5969
5970 #: builtin/archive.c:17
5971 #, c-format
5972 msgid "could not create archive file '%s'"
5973 msgstr "不能创建归档文件 '%s'"
5974
5975 #: builtin/archive.c:20
5976 msgid "could not redirect output"
5977 msgstr "不能重定向输出"
5978
5979 #: builtin/archive.c:37
5980 msgid "git archive: Remote with no URL"
5981 msgstr "git archive:未提供远程 URL"
5982
5983 #: builtin/archive.c:58
5984 msgid "git archive: expected ACK/NAK, got a flush packet"
5985 msgstr "git archive:期望是 ACK/NAK,却得到 flush 包"
5986
5987 #: builtin/archive.c:61
5988 #, c-format
5989 msgid "git archive: NACK %s"
5990 msgstr "git archive:NACK %s"
5991
5992 #: builtin/archive.c:64
5993 msgid "git archive: protocol error"
5994 msgstr "git archive:协议错误"
5995
5996 #: builtin/archive.c:68
5997 msgid "git archive: expected a flush"
5998 msgstr "git archive:应有一个 flush 包"
5999
6000 #: builtin/bisect--helper.c:12
6001 msgid "git bisect--helper --next-all [--no-checkout]"
6002 msgstr "git bisect--helper --next-all [--no-checkout]"
6003
6004 #: builtin/bisect--helper.c:13
6005 msgid "git bisect--helper --write-terms <bad_term> <good_term>"
6006 msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
6007
6008 #: builtin/bisect--helper.c:14
6009 msgid "git bisect--helper --bisect-clean-state"
6010 msgstr "git bisect--helper --bisect-clean-state"
6011
6012 #: builtin/bisect--helper.c:46
6013 #, c-format
6014 msgid "'%s' is not a valid term"
6015 msgstr "'%s' 不是一个有效的术语"
6016
6017 #: builtin/bisect--helper.c:50
6018 #, c-format
6019 msgid "can't use the builtin command '%s' as a term"
6020 msgstr "不能使用内置命令 '%s' 作为术语"
6021
6022 #: builtin/bisect--helper.c:60
6023 #, c-format
6024 msgid "can't change the meaning of the term '%s'"
6025 msgstr "不能修改术语 '%s' 的含义"
6026
6027 #: builtin/bisect--helper.c:71
6028 msgid "please use two different terms"
6029 msgstr "请使用两个不同的术语"
6030
6031 #: builtin/bisect--helper.c:78
6032 msgid "could not open the file BISECT_TERMS"
6033 msgstr "不能打开文件 BISECT_TERMS"
6034
6035 #: builtin/bisect--helper.c:120
6036 msgid "perform 'git bisect next'"
6037 msgstr "执行 'git bisect next'"
6038
6039 #: builtin/bisect--helper.c:122
6040 msgid "write the terms to .git/BISECT_TERMS"
6041 msgstr "将术语写入 .git/BISECT_TERMS"
6042
6043 #: builtin/bisect--helper.c:124
6044 msgid "cleanup the bisection state"
6045 msgstr "清除二分查找状态"
6046
6047 #: builtin/bisect--helper.c:126
6048 msgid "check for expected revs"
6049 msgstr "检查预期的版本"
6050
6051 #: builtin/bisect--helper.c:128
6052 msgid "update BISECT_HEAD instead of checking out the current commit"
6053 msgstr "更新 BISECT_HEAD 而非检出当前提交"
6054
6055 #: builtin/bisect--helper.c:143
6056 msgid "--write-terms requires two arguments"
6057 msgstr "--write-terms 需要两个参数"
6058
6059 #: builtin/bisect--helper.c:147
6060 msgid "--bisect-clean-state requires no arguments"
6061 msgstr "--bisect-clean-state 不需要参数"
6062
6063 #: builtin/blame.c:29
6064 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
6065 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
6066
6067 #: builtin/blame.c:34
6068 msgid "<rev-opts> are documented in git-rev-list(1)"
6069 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
6070
6071 #: builtin/blame.c:404
6072 #, c-format
6073 msgid "expecting a color: %s"
6074 msgstr "期望一个颜色:%s"
6075
6076 #: builtin/blame.c:411
6077 msgid "must end with a color"
6078 msgstr "必须以一个颜色结尾"
6079
6080 #: builtin/blame.c:697
6081 #, c-format
6082 msgid "invalid color '%s' in color.blame.repeatedLines"
6083 msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
6084
6085 #: builtin/blame.c:715
6086 msgid "invalid value for blame.coloring"
6087 msgstr "设置 blame.coloring 中的无效取值"
6088
6089 #: builtin/blame.c:786
6090 msgid "Show blame entries as we find them, incrementally"
6091 msgstr "增量式地显示发现的 blame 条目"
6092
6093 #: builtin/blame.c:787
6094 msgid "Show blank SHA-1 for boundary commits (Default: off)"
6095 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
6096
6097 #: builtin/blame.c:788
6098 msgid "Do not treat root commits as boundaries (Default: off)"
6099 msgstr "不把根提交作为边界(默认:关闭)"
6100
6101 #: builtin/blame.c:789
6102 msgid "Show work cost statistics"
6103 msgstr "显示命令消耗统计"
6104
6105 #: builtin/blame.c:790
6106 msgid "Force progress reporting"
6107 msgstr "强制进度显示"
6108
6109 #: builtin/blame.c:791
6110 msgid "Show output score for blame entries"
6111 msgstr "显示判断 blame 条目位移的得分诊断信息"
6112
6113 #: builtin/blame.c:792
6114 msgid "Show original filename (Default: auto)"
6115 msgstr "显示原始文件名(默认:自动)"
6116
6117 #: builtin/blame.c:793
6118 msgid "Show original linenumber (Default: off)"
6119 msgstr "显示原始的行号(默认:关闭)"
6120
6121 #: builtin/blame.c:794
6122 msgid "Show in a format designed for machine consumption"
6123 msgstr "显示为一个适合机器读取的格式"
6124
6125 #: builtin/blame.c:795
6126 msgid "Show porcelain format with per-line commit information"
6127 msgstr "为每一行显示机器适用的提交信息"
6128
6129 #: builtin/blame.c:796
6130 msgid "Use the same output mode as git-annotate (Default: off)"
6131 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
6132
6133 #: builtin/blame.c:797
6134 msgid "Show raw timestamp (Default: off)"
6135 msgstr "显示原始时间戳(默认:关闭)"
6136
6137 #: builtin/blame.c:798
6138 msgid "Show long commit SHA1 (Default: off)"
6139 msgstr "显示长的 SHA1 提交号(默认:关闭)"
6140
6141 #: builtin/blame.c:799
6142 msgid "Suppress author name and timestamp (Default: off)"
6143 msgstr "隐藏作者名字和时间戳(默认:关闭)"
6144
6145 #: builtin/blame.c:800
6146 msgid "Show author email instead of name (Default: off)"
6147 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
6148
6149 #: builtin/blame.c:801
6150 msgid "Ignore whitespace differences"
6151 msgstr "忽略空白差异"
6152
6153 #: builtin/blame.c:802
6154 msgid "color redundant metadata from previous line differently"
6155 msgstr "使用颜色间隔输出与前一行不同的重复元信息"
6156
6157 #: builtin/blame.c:803
6158 msgid "color lines by age"
6159 msgstr "依据时间着色"
6160
6161 #: builtin/blame.c:810
6162 msgid "Use an experimental heuristic to improve diffs"
6163 msgstr "使用一个试验性的启发式算法改进差异显示"
6164
6165 #: builtin/blame.c:812
6166 msgid "Spend extra cycles to find better match"
6167 msgstr "花费额外的循环来找到更好的匹配"
6168
6169 #: builtin/blame.c:813
6170 msgid "Use revisions from <file> instead of calling git-rev-list"
6171 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
6172
6173 #: builtin/blame.c:814
6174 msgid "Use <file>'s contents as the final image"
6175 msgstr "使用 <文件> 的内容作为最终的图片"
6176
6177 #: builtin/blame.c:815 builtin/blame.c:816
6178 msgid "score"
6179 msgstr "得分"
6180
6181 #: builtin/blame.c:815
6182 msgid "Find line copies within and across files"
6183 msgstr "找到文件内及跨文件的行拷贝"
6184
6185 #: builtin/blame.c:816
6186 msgid "Find line movements within and across files"
6187 msgstr "找到文件内及跨文件的行移动"
6188
6189 #: builtin/blame.c:817
6190 msgid "n,m"
6191 msgstr "n,m"
6192
6193 #: builtin/blame.c:817
6194 msgid "Process only line range n,m, counting from 1"
6195 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
6196
6197 #: builtin/blame.c:866
6198 msgid "--progress can't be used with --incremental or porcelain formats"
6199 msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
6200
6201 #. TRANSLATORS: This string is used to tell us the
6202 #. maximum display width for a relative timestamp in
6203 #. "git blame" output. For C locale, "4 years, 11
6204 #. months ago", which takes 22 places, is the longest
6205 #. among various forms of relative timestamps, but
6206 #. your language may need more or fewer display
6207 #. columns.
6208 #.
6209 #: builtin/blame.c:917
6210 msgid "4 years, 11 months ago"
6211 msgstr "4 年 11 个月前"
6212
6213 #: builtin/blame.c:1003
6214 #, c-format
6215 msgid "file %s has only %lu line"
6216 msgid_plural "file %s has only %lu lines"
6217 msgstr[0] "文件 %s 只有 %lu 行"
6218 msgstr[1] "文件 %s 只有 %lu 行"
6219
6220 #: builtin/blame.c:1049
6221 msgid "Blaming lines"
6222 msgstr "追踪代码行"
6223
6224 #: builtin/branch.c:27
6225 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
6226 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
6227
6228 #: builtin/branch.c:28
6229 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
6230 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
6231
6232 #: builtin/branch.c:29
6233 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
6234 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
6235
6236 #: builtin/branch.c:30
6237 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
6238 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
6239
6240 #: builtin/branch.c:31
6241 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
6242 msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
6243
6244 #: builtin/branch.c:32
6245 msgid "git branch [<options>] [-r | -a] [--points-at]"
6246 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
6247
6248 #: builtin/branch.c:33
6249 msgid "git branch [<options>] [-r | -a] [--format]"
6250 msgstr "git branch [<选项>] [-r | -a] [--format]"
6251
6252 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
6253 #: builtin/branch.c:146
6254 #, c-format
6255 msgid ""
6256 "deleting branch '%s' that has been merged to\n"
6257 " '%s', but not yet merged to HEAD."
6258 msgstr ""
6259 "将要删除的分支 '%s' 已经被合并到\n"
6260 " '%s',但未合并到 HEAD。"
6261
6262 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
6263 #: builtin/branch.c:150
6264 #, c-format
6265 msgid ""
6266 "not deleting branch '%s' that is not yet merged to\n"
6267 " '%s', even though it is merged to HEAD."
6268 msgstr ""
6269 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
6270 " 然而却尚未被合并到分支 '%s' 。"
6271
6272 #: builtin/branch.c:164
6273 #, c-format
6274 msgid "Couldn't look up commit object for '%s'"
6275 msgstr "无法查询 '%s' 指向的提交对象"
6276
6277 #: builtin/branch.c:168
6278 #, c-format
6279 msgid ""
6280 "The branch '%s' is not fully merged.\n"
6281 "If you are sure you want to delete it, run 'git branch -D %s'."
6282 msgstr ""
6283 "分支 '%s' 没有完全合并。\n"
6284 "如果您确认要删除它,执行 'git branch -D %s'。"
6285
6286 #: builtin/branch.c:181
6287 msgid "Update of config-file failed"
6288 msgstr "更新配置文件失败"
6289
6290 #: builtin/branch.c:212
6291 msgid "cannot use -a with -d"
6292 msgstr "不能将 -a 和 -d 同时使用"
6293
6294 #: builtin/branch.c:218
6295 msgid "Couldn't look up commit object for HEAD"
6296 msgstr "无法查询 HEAD 指向的提交对象"
6297
6298 #: builtin/branch.c:232
6299 #, c-format
6300 msgid "Cannot delete branch '%s' checked out at '%s'"
6301 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
6302
6303 #: builtin/branch.c:247
6304 #, c-format
6305 msgid "remote-tracking branch '%s' not found."
6306 msgstr "未能找到远程跟踪分支 '%s'。"
6307
6308 #: builtin/branch.c:248
6309 #, c-format
6310 msgid "branch '%s' not found."
6311 msgstr "分支 '%s' 未发现。"
6312
6313 #: builtin/branch.c:263
6314 #, c-format
6315 msgid "Error deleting remote-tracking branch '%s'"
6316 msgstr "无法删除远程跟踪分支 '%s'"
6317
6318 #: builtin/branch.c:264
6319 #, c-format
6320 msgid "Error deleting branch '%s'"
6321 msgstr "无法删除分支 '%s'"
6322
6323 #: builtin/branch.c:271
6324 #, c-format
6325 msgid "Deleted remote-tracking branch %s (was %s).\n"
6326 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
6327
6328 #: builtin/branch.c:272
6329 #, c-format
6330 msgid "Deleted branch %s (was %s).\n"
6331 msgstr "已删除分支 %s(曾为 %s)。\n"
6332
6333 #: builtin/branch.c:416 builtin/tag.c:58
6334 msgid "unable to parse format string"
6335 msgstr "不能解析格式化字符串"
6336
6337 #: builtin/branch.c:453
6338 #, c-format
6339 msgid "Branch %s is being rebased at %s"
6340 msgstr "分支 %s 正被变基到 %s"
6341
6342 #: builtin/branch.c:457
6343 #, c-format
6344 msgid "Branch %s is being bisected at %s"
6345 msgstr "分支 %s 正被二分查找于 %s"
6346
6347 #: builtin/branch.c:474
6348 msgid "cannot copy the current branch while not on any."
6349 msgstr "无法拷贝当前分支因为不处于任何分支上。"
6350
6351 #: builtin/branch.c:476
6352 msgid "cannot rename the current branch while not on any."
6353 msgstr "无法重命名当前分支因为不处于任何分支上。"
6354
6355 #: builtin/branch.c:487
6356 #, c-format
6357 msgid "Invalid branch name: '%s'"
6358 msgstr "无效的分支名:'%s'"
6359
6360 #: builtin/branch.c:514
6361 msgid "Branch rename failed"
6362 msgstr "分支重命名失败"
6363
6364 #: builtin/branch.c:516
6365 msgid "Branch copy failed"
6366 msgstr "分支拷贝失败"
6367
6368 #: builtin/branch.c:520
6369 #, c-format
6370 msgid "Created a copy of a misnamed branch '%s'"
6371 msgstr "已为错误命名的分支 '%s' 创建了一个副本"
6372
6373 #: builtin/branch.c:523
6374 #, c-format
6375 msgid "Renamed a misnamed branch '%s' away"
6376 msgstr "已将错误命名的分支 '%s' 重命名"
6377
6378 #: builtin/branch.c:529
6379 #, c-format
6380 msgid "Branch renamed to %s, but HEAD is not updated!"
6381 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
6382
6383 #: builtin/branch.c:538
6384 msgid "Branch is renamed, but update of config-file failed"
6385 msgstr "分支被重命名,但更新配置文件失败"
6386
6387 #: builtin/branch.c:540
6388 msgid "Branch is copied, but update of config-file failed"
6389 msgstr "分支已拷贝,但更新配置文件失败"
6390
6391 #: builtin/branch.c:556
6392 #, c-format
6393 msgid ""
6394 "Please edit the description for the branch\n"
6395 " %s\n"
6396 "Lines starting with '%c' will be stripped.\n"
6397 msgstr ""
6398 "请编辑分支的描述\n"
6399 " %s\n"
6400 "以 '%c' 开头的行将被过滤。\n"
6401
6402 #: builtin/branch.c:589
6403 msgid "Generic options"
6404 msgstr "通用选项"
6405
6406 #: builtin/branch.c:591
6407 msgid "show hash and subject, give twice for upstream branch"
6408 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
6409
6410 #: builtin/branch.c:592
6411 msgid "suppress informational messages"
6412 msgstr "不显示信息"
6413
6414 #: builtin/branch.c:593
6415 msgid "set up tracking mode (see git-pull(1))"
6416 msgstr "设置跟踪模式(参见 git-pull(1))"
6417
6418 #: builtin/branch.c:595
6419 msgid "do not use"
6420 msgstr "不要使用"
6421
6422 #: builtin/branch.c:597
6423 msgid "upstream"
6424 msgstr "上游"
6425
6426 #: builtin/branch.c:597
6427 msgid "change the upstream info"
6428 msgstr "改变上游信息"
6429
6430 #: builtin/branch.c:598
6431 msgid "Unset the upstream info"
6432 msgstr "取消上游信息的设置"
6433
6434 #: builtin/branch.c:599
6435 msgid "use colored output"
6436 msgstr "使用彩色输出"
6437
6438 #: builtin/branch.c:600
6439 msgid "act on remote-tracking branches"
6440 msgstr "作用于远程跟踪分支"
6441
6442 #: builtin/branch.c:602 builtin/branch.c:604
6443 msgid "print only branches that contain the commit"
6444 msgstr "只打印包含该提交的分支"
6445
6446 #: builtin/branch.c:603 builtin/branch.c:605
6447 msgid "print only branches that don't contain the commit"
6448 msgstr "只打印不包含该提交的分支"
6449
6450 #: builtin/branch.c:608
6451 msgid "Specific git-branch actions:"
6452 msgstr "具体的 git-branch 动作:"
6453
6454 #: builtin/branch.c:609
6455 msgid "list both remote-tracking and local branches"
6456 msgstr "列出远程跟踪及本地分支"
6457
6458 #: builtin/branch.c:611
6459 msgid "delete fully merged branch"
6460 msgstr "删除完全合并的分支"
6461
6462 #: builtin/branch.c:612
6463 msgid "delete branch (even if not merged)"
6464 msgstr "删除分支(即使没有合并)"
6465
6466 #: builtin/branch.c:613
6467 msgid "move/rename a branch and its reflog"
6468 msgstr "移动/重命名一个分支,以及它的引用日志"
6469
6470 #: builtin/branch.c:614
6471 msgid "move/rename a branch, even if target exists"
6472 msgstr "移动/重命名一个分支,即使目标已存在"
6473
6474 #: builtin/branch.c:615
6475 msgid "copy a branch and its reflog"
6476 msgstr "拷贝一个分支和它的引用日志"
6477
6478 #: builtin/branch.c:616
6479 msgid "copy a branch, even if target exists"
6480 msgstr "拷贝一个分支,即使目标已存在"
6481
6482 #: builtin/branch.c:617
6483 msgid "list branch names"
6484 msgstr "列出分支名"
6485
6486 #: builtin/branch.c:618
6487 msgid "create the branch's reflog"
6488 msgstr "创建分支的引用日志"
6489
6490 #: builtin/branch.c:620
6491 msgid "edit the description for the branch"
6492 msgstr "标记分支的描述"
6493
6494 #: builtin/branch.c:621
6495 msgid "force creation, move/rename, deletion"
6496 msgstr "强制创建、移动/重命名、删除"
6497
6498 #: builtin/branch.c:622
6499 msgid "print only branches that are merged"
6500 msgstr "只打印已经合并的分支"
6501
6502 #: builtin/branch.c:623
6503 msgid "print only branches that are not merged"
6504 msgstr "只打印尚未合并的分支"
6505
6506 #: builtin/branch.c:624
6507 msgid "list branches in columns"
6508 msgstr "以列的方式显示分支"
6509
6510 #: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
6511 #: builtin/tag.c:412
6512 msgid "key"
6513 msgstr "key"
6514
6515 #: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
6516 #: builtin/tag.c:413
6517 msgid "field name to sort on"
6518 msgstr "排序的字段名"
6519
6520 #: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408
6521 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
6522 #: builtin/tag.c:415
6523 msgid "object"
6524 msgstr "对象"
6525
6526 #: builtin/branch.c:629
6527 msgid "print only branches of the object"
6528 msgstr "只打印指向该对象的分支"
6529
6530 #: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422
6531 msgid "sorting and filtering are case insensitive"
6532 msgstr "排序和过滤属于大小写不敏感"
6533
6534 #: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420
6535 #: builtin/verify-tag.c:39
6536 msgid "format to use for the output"
6537 msgstr "输出格式"
6538
6539 #: builtin/branch.c:655 builtin/clone.c:737
6540 msgid "HEAD not found below refs/heads!"
6541 msgstr "HEAD 没有位于 /refs/heads 之下!"
6542
6543 #: builtin/branch.c:678
6544 msgid "--column and --verbose are incompatible"
6545 msgstr "--column 和 --verbose 不兼容"
6546
6547 #: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754
6548 msgid "branch name required"
6549 msgstr "必须提供分支名"
6550
6551 #: builtin/branch.c:721
6552 msgid "Cannot give description to detached HEAD"
6553 msgstr "不能向分离头指针提供描述"
6554
6555 #: builtin/branch.c:726
6556 msgid "cannot edit description of more than one branch"
6557 msgstr "不能为一个以上的分支编辑描述"
6558
6559 #: builtin/branch.c:733
6560 #, c-format
6561 msgid "No commit on branch '%s' yet."
6562 msgstr "分支 '%s' 尚无提交。"
6563
6564 #: builtin/branch.c:736
6565 #, c-format
6566 msgid "No branch named '%s'."
6567 msgstr "没有分支 '%s'。"
6568
6569 #: builtin/branch.c:751
6570 msgid "too many branches for a copy operation"
6571 msgstr "为拷贝操作提供了太多的分支名"
6572
6573 #: builtin/branch.c:760
6574 msgid "too many arguments for a rename operation"
6575 msgstr "为重命名操作提供了太多的参数"
6576
6577 #: builtin/branch.c:765
6578 msgid "too many arguments to set new upstream"
6579 msgstr "为设置新上游提供了太多的参数"
6580
6581 #: builtin/branch.c:769
6582 #, c-format
6583 msgid ""
6584 "could not set upstream of HEAD to %s when it does not point to any branch."
6585 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
6586
6587 #: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810
6588 #, c-format
6589 msgid "no such branch '%s'"
6590 msgstr "没有此分支 '%s'"
6591
6592 #: builtin/branch.c:776
6593 #, c-format
6594 msgid "branch '%s' does not exist"
6595 msgstr "分支 '%s' 不存在"
6596
6597 #: builtin/branch.c:788
6598 msgid "too many arguments to unset upstream"
6599 msgstr "为取消上游设置操作提供了太多的参数"
6600
6601 #: builtin/branch.c:792
6602 msgid "could not unset upstream of HEAD when it does not point to any branch."
6603 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
6604
6605 #: builtin/branch.c:798
6606 #, c-format
6607 msgid "Branch '%s' has no upstream information"
6608 msgstr "分支 '%s' 没有上游信息"
6609
6610 #: builtin/branch.c:813
6611 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
6612 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
6613
6614 #: builtin/branch.c:816
6615 msgid ""
6616 "the '--set-upstream' option is no longer supported. Please use '--track' or "
6617 "'--set-upstream-to' instead."
6618 msgstr ""
6619 "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
6620
6621 #: builtin/bundle.c:45
6622 #, c-format
6623 msgid "%s is okay\n"
6624 msgstr "%s 可以\n"
6625
6626 #: builtin/bundle.c:58
6627 msgid "Need a repository to create a bundle."
6628 msgstr "需要一个仓库来创建包。"
6629
6630 #: builtin/bundle.c:62
6631 msgid "Need a repository to unbundle."
6632 msgstr "需要一个仓库来解包。"
6633
6634 #: builtin/cat-file.c:525
6635 msgid ""
6636 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
6637 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
6638 msgstr ""
6639 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
6640 "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
6641
6642 #: builtin/cat-file.c:526
6643 msgid ""
6644 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
6645 "filters]"
6646 msgstr ""
6647 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
6648 "filters]"
6649
6650 #: builtin/cat-file.c:563
6651 msgid "<type> can be one of: blob, tree, commit, tag"
6652 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
6653
6654 #: builtin/cat-file.c:564
6655 msgid "show object type"
6656 msgstr "显示对象类型"
6657
6658 #: builtin/cat-file.c:565
6659 msgid "show object size"
6660 msgstr "显示对象大小"
6661
6662 #: builtin/cat-file.c:567
6663 msgid "exit with zero when there's no error"
6664 msgstr "当没有错误时退出并返回零"
6665
6666 #: builtin/cat-file.c:568
6667 msgid "pretty-print object's content"
6668 msgstr "美观地打印对象的内容"
6669
6670 #: builtin/cat-file.c:570
6671 msgid "for blob objects, run textconv on object's content"
6672 msgstr "对于数据对象,对其内容做文本转换"
6673
6674 #: builtin/cat-file.c:572
6675 msgid "for blob objects, run filters on object's content"
6676 msgstr "对于数据对象,对其内容做过滤"
6677
6678 #: builtin/cat-file.c:573 git-submodule.sh:894
6679 msgid "blob"
6680 msgstr "数据对象"
6681
6682 #: builtin/cat-file.c:574
6683 msgid "use a specific path for --textconv/--filters"
6684 msgstr "对于 --textconv/--filters 使用一个特定的路径"
6685
6686 #: builtin/cat-file.c:576
6687 msgid "allow -s and -t to work with broken/corrupt objects"
6688 msgstr "允许 -s 和 -t 对损坏的对象生效"
6689
6690 #: builtin/cat-file.c:577
6691 msgid "buffer --batch output"
6692 msgstr "缓冲 --batch 的输出"
6693
6694 #: builtin/cat-file.c:579
6695 msgid "show info and content of objects fed from the standard input"
6696 msgstr "显示从标准输入提供的对象的信息和内容"
6697
6698 #: builtin/cat-file.c:582
6699 msgid "show info about objects fed from the standard input"
6700 msgstr "显示从标准输入提供的对象的信息"
6701
6702 #: builtin/cat-file.c:585
6703 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
6704 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
6705
6706 #: builtin/cat-file.c:587
6707 msgid "show all objects with --batch or --batch-check"
6708 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
6709
6710 #: builtin/check-attr.c:12
6711 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
6712 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
6713
6714 #: builtin/check-attr.c:13
6715 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
6716 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
6717
6718 #: builtin/check-attr.c:20
6719 msgid "report all attributes set on file"
6720 msgstr "报告设置在文件上的所有属性"
6721
6722 #: builtin/check-attr.c:21
6723 msgid "use .gitattributes only from the index"
6724 msgstr "只使用索引中的 .gitattributes"
6725
6726 #: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
6727 msgid "read file names from stdin"
6728 msgstr "从标准输入读出文件名"
6729
6730 #: builtin/check-attr.c:24 builtin/check-ignore.c:26
6731 msgid "terminate input and output records by a NUL character"
6732 msgstr "输入和输出的记录使用 NUL 字符终结"
6733
6734 #: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500
6735 msgid "suppress progress reporting"
6736 msgstr "不显示进度报告"
6737
6738 #: builtin/check-ignore.c:28
6739 msgid "show non-matching input paths"
6740 msgstr "显示未匹配的输入路径"
6741
6742 #: builtin/check-ignore.c:30
6743 msgid "ignore index when checking"
6744 msgstr "检查时忽略索引"
6745
6746 #: builtin/check-ignore.c:159
6747 msgid "cannot specify pathnames with --stdin"
6748 msgstr "不能同时指定路径及 --stdin 参数"
6749
6750 #: builtin/check-ignore.c:162
6751 msgid "-z only makes sense with --stdin"
6752 msgstr "-z 需要和 --stdin 参数共用才有意义"
6753
6754 #: builtin/check-ignore.c:164
6755 msgid "no path specified"
6756 msgstr "未指定路径"
6757
6758 #: builtin/check-ignore.c:168
6759 msgid "--quiet is only valid with a single pathname"
6760 msgstr "参数 --quiet 只在提供一个路径名时有效"
6761
6762 #: builtin/check-ignore.c:170
6763 msgid "cannot have both --quiet and --verbose"
6764 msgstr "不能同时提供 --quiet 和 --verbose 参数"
6765
6766 #: builtin/check-ignore.c:173
6767 msgid "--non-matching is only valid with --verbose"
6768 msgstr "--non-matching 选项只在使用 --verbose 时有效"
6769
6770 #: builtin/check-mailmap.c:9
6771 msgid "git check-mailmap [<options>] <contact>..."
6772 msgstr "git check-mailmap [<选项>] <联系地址>..."
6773
6774 #: builtin/check-mailmap.c:14
6775 msgid "also read contacts from stdin"
6776 msgstr "还从标准输入读取联系地址"
6777
6778 #: builtin/check-mailmap.c:25
6779 #, c-format
6780 msgid "unable to parse contact: %s"
6781 msgstr "不能解析联系地址:%s"
6782
6783 #: builtin/check-mailmap.c:48
6784 msgid "no contacts specified"
6785 msgstr "未指定联系地址"
6786
6787 #: builtin/checkout-index.c:128
6788 msgid "git checkout-index [<options>] [--] [<file>...]"
6789 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
6790
6791 #: builtin/checkout-index.c:143
6792 msgid "stage should be between 1 and 3 or all"
6793 msgstr "索引值应该取值 1 到 3 或者 all"
6794
6795 #: builtin/checkout-index.c:159
6796 msgid "check out all files in the index"
6797 msgstr "检出索引区的所有文件"
6798
6799 #: builtin/checkout-index.c:160
6800 msgid "force overwrite of existing files"
6801 msgstr "强制覆盖现有的文件"
6802
6803 #: builtin/checkout-index.c:162
6804 msgid "no warning for existing files and files not in index"
6805 msgstr "存在或不在索引中的文件都没有警告"
6806
6807 #: builtin/checkout-index.c:164
6808 msgid "don't checkout new files"
6809 msgstr "不检出新文件"
6810
6811 #: builtin/checkout-index.c:166
6812 msgid "update stat information in the index file"
6813 msgstr "更新索引中文件的状态信息"
6814
6815 #: builtin/checkout-index.c:170
6816 msgid "read list of paths from the standard input"
6817 msgstr "从标准输入读取路径列表"
6818
6819 #: builtin/checkout-index.c:172
6820 msgid "write the content to temporary files"
6821 msgstr "将内容写入临时文件"
6822
6823 #: builtin/checkout-index.c:173 builtin/column.c:31
6824 #: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219
6825 #: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591
6826 #: builtin/worktree.c:610
6827 msgid "string"
6828 msgstr "字符串"
6829
6830 #: builtin/checkout-index.c:174
6831 msgid "when creating files, prepend <string>"
6832 msgstr "在创建文件时,在前面加上 <字符串>"
6833
6834 #: builtin/checkout-index.c:176
6835 msgid "copy out the files from named stage"
6836 msgstr "从指定暂存区中拷出文件"
6837
6838 #: builtin/checkout.c:27
6839 msgid "git checkout [<options>] <branch>"
6840 msgstr "git checkout [<选项>] <分支>"
6841
6842 #: builtin/checkout.c:28
6843 msgid "git checkout [<options>] [<branch>] -- <file>..."
6844 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
6845
6846 #: builtin/checkout.c:136 builtin/checkout.c:169
6847 #, c-format
6848 msgid "path '%s' does not have our version"
6849 msgstr "路径 '%s' 没有我们的版本"
6850
6851 #: builtin/checkout.c:138 builtin/checkout.c:171
6852 #, c-format
6853 msgid "path '%s' does not have their version"
6854 msgstr "路径 '%s' 没有他们的版本"
6855
6856 #: builtin/checkout.c:154
6857 #, c-format
6858 msgid "path '%s' does not have all necessary versions"
6859 msgstr "路径 '%s' 没有全部必须的版本"
6860
6861 #: builtin/checkout.c:198
6862 #, c-format
6863 msgid "path '%s' does not have necessary versions"
6864 msgstr "路径 '%s' 没有必须的版本"
6865
6866 #: builtin/checkout.c:215
6867 #, c-format
6868 msgid "path '%s': cannot merge"
6869 msgstr "path '%s':无法合并"
6870
6871 #: builtin/checkout.c:231
6872 #, c-format
6873 msgid "Unable to add merge result for '%s'"
6874 msgstr "无法为 '%s' 添加合并结果"
6875
6876 #: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
6877 #: builtin/checkout.c:262
6878 #, c-format
6879 msgid "'%s' cannot be used with updating paths"
6880 msgstr "'%s' 不能在更新路径时使用"
6881
6882 #: builtin/checkout.c:265 builtin/checkout.c:268
6883 #, c-format
6884 msgid "'%s' cannot be used with %s"
6885 msgstr "'%s' 不能和 %s 同时使用"
6886
6887 #: builtin/checkout.c:271
6888 #, c-format
6889 msgid "Cannot update paths and switch to branch '%s' at the same time."
6890 msgstr "不能同时更新路径并切换到分支'%s'。"
6891
6892 #: builtin/checkout.c:340 builtin/checkout.c:347
6893 #, c-format
6894 msgid "path '%s' is unmerged"
6895 msgstr "路径 '%s' 未合并"
6896
6897 #: builtin/checkout.c:506
6898 msgid "you need to resolve your current index first"
6899 msgstr "您需要先解决当前索引的冲突"
6900
6901 #: builtin/checkout.c:643
6902 #, c-format
6903 msgid "Can not do reflog for '%s': %s\n"
6904 msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
6905
6906 #: builtin/checkout.c:684
6907 msgid "HEAD is now at"
6908 msgstr "HEAD 目前位于"
6909
6910 #: builtin/checkout.c:688 builtin/clone.c:691
6911 msgid "unable to update HEAD"
6912 msgstr "不能更新 HEAD"
6913
6914 #: builtin/checkout.c:692
6915 #, c-format
6916 msgid "Reset branch '%s'\n"
6917 msgstr "重置分支 '%s'\n"
6918
6919 #: builtin/checkout.c:695
6920 #, c-format
6921 msgid "Already on '%s'\n"
6922 msgstr "已经位于 '%s'\n"
6923
6924 #: builtin/checkout.c:699
6925 #, c-format
6926 msgid "Switched to and reset branch '%s'\n"
6927 msgstr "切换并重置分支 '%s'\n"
6928
6929 #: builtin/checkout.c:701 builtin/checkout.c:1046
6930 #, c-format
6931 msgid "Switched to a new branch '%s'\n"
6932 msgstr "切换到一个新分支 '%s'\n"
6933
6934 #: builtin/checkout.c:703
6935 #, c-format
6936 msgid "Switched to branch '%s'\n"
6937 msgstr "切换到分支 '%s'\n"
6938
6939 # 译者:注意保持前导空格
6940 #: builtin/checkout.c:754
6941 #, c-format
6942 msgid " ... and %d more.\n"
6943 msgstr " ... 及其它 %d 个。\n"
6944
6945 #: builtin/checkout.c:760
6946 #, c-format
6947 msgid ""
6948 "Warning: you are leaving %d commit behind, not connected to\n"
6949 "any of your branches:\n"
6950 "\n"
6951 "%s\n"
6952 msgid_plural ""
6953 "Warning: you are leaving %d commits behind, not connected to\n"
6954 "any of your branches:\n"
6955 "\n"
6956 "%s\n"
6957 msgstr[0] ""
6958 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6959 "\n"
6960 "%s\n"
6961 msgstr[1] ""
6962 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6963 "\n"
6964 "%s\n"
6965
6966 #: builtin/checkout.c:779
6967 #, c-format
6968 msgid ""
6969 "If you want to keep it by creating a new branch, this may be a good time\n"
6970 "to do so with:\n"
6971 "\n"
6972 " git branch <new-branch-name> %s\n"
6973 "\n"
6974 msgid_plural ""
6975 "If you want to keep them by creating a new branch, this may be a good time\n"
6976 "to do so with:\n"
6977 "\n"
6978 " git branch <new-branch-name> %s\n"
6979 "\n"
6980 msgstr[0] ""
6981 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
6982 "如下操作:\n"
6983 "\n"
6984 " git branch <新分支名> %s\n"
6985 "\n"
6986 msgstr[1] ""
6987 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
6988 "如下操作:\n"
6989 "\n"
6990 " git branch <新分支名> %s\n"
6991 "\n"
6992
6993 #: builtin/checkout.c:811
6994 msgid "internal error in revision walk"
6995 msgstr "在版本遍历时遇到内部错误"
6996
6997 #: builtin/checkout.c:815
6998 msgid "Previous HEAD position was"
6999 msgstr "之前的 HEAD 位置是"
7000
7001 #: builtin/checkout.c:843 builtin/checkout.c:1041
7002 msgid "You are on a branch yet to be born"
7003 msgstr "您位于一个尚未初始化的分支"
7004
7005 #: builtin/checkout.c:947
7006 #, c-format
7007 msgid "only one reference expected, %d given."
7008 msgstr "应只有一个引用,却给出了 %d 个"
7009
7010 #: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389
7011 #, c-format
7012 msgid "invalid reference: %s"
7013 msgstr "无效引用:%s"
7014
7015 #: builtin/checkout.c:1016
7016 #, c-format
7017 msgid "reference is not a tree: %s"
7018 msgstr "引用不是一个树:%s"
7019
7020 #: builtin/checkout.c:1055
7021 msgid "paths cannot be used with switching branches"
7022 msgstr "路径不能和切换分支同时使用"
7023
7024 #: builtin/checkout.c:1058 builtin/checkout.c:1062
7025 #, c-format
7026 msgid "'%s' cannot be used with switching branches"
7027 msgstr "'%s' 不能和切换分支同时使用"
7028
7029 #: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074
7030 #: builtin/checkout.c:1077
7031 #, c-format
7032 msgid "'%s' cannot be used with '%s'"
7033 msgstr "'%s' 不能和 '%s' 同时使用"
7034
7035 #: builtin/checkout.c:1082
7036 #, c-format
7037 msgid "Cannot switch branch to a non-commit '%s'"
7038 msgstr "不能切换分支到一个非提交 '%s'"
7039
7040 #: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118
7041 #: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433
7042 #: builtin/worktree.c:435
7043 msgid "branch"
7044 msgstr "分支"
7045
7046 #: builtin/checkout.c:1115
7047 msgid "create and checkout a new branch"
7048 msgstr "创建并检出一个新的分支"
7049
7050 #: builtin/checkout.c:1117
7051 msgid "create/reset and checkout a branch"
7052 msgstr "创建/重置并检出一个分支"
7053
7054 #: builtin/checkout.c:1118
7055 msgid "create reflog for new branch"
7056 msgstr "为新的分支创建引用日志"
7057
7058 #: builtin/checkout.c:1119 builtin/worktree.c:437
7059 msgid "detach HEAD at named commit"
7060 msgstr "HEAD 从指定的提交分离"
7061
7062 #: builtin/checkout.c:1120
7063 msgid "set upstream info for new branch"
7064 msgstr "为新的分支设置上游信息"
7065
7066 #: builtin/checkout.c:1122
7067 msgid "new-branch"
7068 msgstr "新分支"
7069
7070 #: builtin/checkout.c:1122
7071 msgid "new unparented branch"
7072 msgstr "新的没有父提交的分支"
7073
7074 #: builtin/checkout.c:1123
7075 msgid "checkout our version for unmerged files"
7076 msgstr "对尚未合并的文件检出我们的版本"
7077
7078 #: builtin/checkout.c:1125
7079 msgid "checkout their version for unmerged files"
7080 msgstr "对尚未合并的文件检出他们的版本"
7081
7082 #: builtin/checkout.c:1127
7083 msgid "force checkout (throw away local modifications)"
7084 msgstr "强制检出(丢弃本地修改)"
7085
7086 #: builtin/checkout.c:1129
7087 msgid "perform a 3-way merge with the new branch"
7088 msgstr "和新的分支执行三方合并"
7089
7090 #: builtin/checkout.c:1131 builtin/merge.c:241
7091 msgid "update ignored files (default)"
7092 msgstr "更新忽略的文件(默认)"
7093
7094 #: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264
7095 msgid "style"
7096 msgstr "风格"
7097
7098 #: builtin/checkout.c:1134
7099 msgid "conflict style (merge or diff3)"
7100 msgstr "冲突输出风格(merge 或 diff3)"
7101
7102 #: builtin/checkout.c:1137
7103 msgid "do not limit pathspecs to sparse entries only"
7104 msgstr "对路径不做稀疏检出的限制"
7105
7106 #: builtin/checkout.c:1139
7107 msgid "second guess 'git checkout <no-such-branch>'"
7108 msgstr "二次猜测'git checkout <无此分支>'"
7109
7110 #: builtin/checkout.c:1141
7111 msgid "do not check if another worktree is holding the given ref"
7112 msgstr "不检查指定的引用是否被其他工作区所占用"
7113
7114 #: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149
7115 #: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572
7116 #: builtin/send-pack.c:174
7117 msgid "force progress reporting"
7118 msgstr "强制显示进度报告"
7119
7120 #: builtin/checkout.c:1175
7121 msgid "-b, -B and --orphan are mutually exclusive"
7122 msgstr "-b、-B 和 --orphan 是互斥的"
7123
7124 #: builtin/checkout.c:1192
7125 msgid "--track needs a branch name"
7126 msgstr "--track 需要一个分支名"
7127
7128 #: builtin/checkout.c:1197
7129 msgid "Missing branch name; try -b"
7130 msgstr "缺少分支名;尝试 -b"
7131
7132 #: builtin/checkout.c:1233
7133 msgid "invalid path specification"
7134 msgstr "无效的路径规格"
7135
7136 #: builtin/checkout.c:1240
7137 #, c-format
7138 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
7139 msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
7140
7141 #: builtin/checkout.c:1244
7142 #, c-format
7143 msgid "git checkout: --detach does not take a path argument '%s'"
7144 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
7145
7146 #: builtin/checkout.c:1248
7147 msgid ""
7148 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
7149 "checking out of the index."
7150 msgstr ""
7151 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
7152
7153 #: builtin/clean.c:26
7154 msgid ""
7155 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
7156 msgstr ""
7157 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
7158
7159 #: builtin/clean.c:30
7160 #, c-format
7161 msgid "Removing %s\n"
7162 msgstr "正删除 %s\n"
7163
7164 #: builtin/clean.c:31
7165 #, c-format
7166 msgid "Would remove %s\n"
7167 msgstr "将删除 %s\n"
7168
7169 #: builtin/clean.c:32
7170 #, c-format
7171 msgid "Skipping repository %s\n"
7172 msgstr "忽略仓库 %s\n"
7173
7174 #: builtin/clean.c:33
7175 #, c-format
7176 msgid "Would skip repository %s\n"
7177 msgstr "将忽略仓库 %s\n"
7178
7179 #: builtin/clean.c:34
7180 #, c-format
7181 msgid "failed to remove %s"
7182 msgstr "无法删除 %s"
7183
7184 #: builtin/clean.c:302 git-add--interactive.perl:579
7185 #, c-format
7186 msgid ""
7187 "Prompt help:\n"
7188 "1 - select a numbered item\n"
7189 "foo - select item based on unique prefix\n"
7190 " - (empty) select nothing\n"
7191 msgstr ""
7192 "帮助:\n"
7193 "1 - 通过编号选择一个选项\n"
7194 "foo - 通过唯一前缀选择一个选项\n"
7195 " - (空)什么也不选择\n"
7196
7197 #: builtin/clean.c:306 git-add--interactive.perl:588
7198 #, c-format
7199 msgid ""
7200 "Prompt help:\n"
7201 "1 - select a single item\n"
7202 "3-5 - select a range of items\n"
7203 "2-3,6-9 - select multiple ranges\n"
7204 "foo - select item based on unique prefix\n"
7205 "-... - unselect specified items\n"
7206 "* - choose all items\n"
7207 " - (empty) finish selecting\n"
7208 msgstr ""
7209 "帮助:\n"
7210 "1 - 选择一个选项\n"
7211 "3-5 - 选择一个范围内的所有选项\n"
7212 "2-3,6-9 - 选择多个范围内的所有选项\n"
7213 "foo - 通过唯一前缀选择一个选项\n"
7214 "-... - 反选特定的选项\n"
7215 "* - 选择所有选项\n"
7216 " - (空)结束选择\n"
7217
7218 #: builtin/clean.c:522 git-add--interactive.perl:554
7219 #: git-add--interactive.perl:559
7220 #, c-format, perl-format
7221 msgid "Huh (%s)?\n"
7222 msgstr "嗯(%s)?\n"
7223
7224 #: builtin/clean.c:664
7225 #, c-format
7226 msgid "Input ignore patterns>> "
7227 msgstr "输入模版以排除条目>> "
7228
7229 #: builtin/clean.c:701
7230 #, c-format
7231 msgid "WARNING: Cannot find items matched by: %s"
7232 msgstr "警告:无法找到和 %s 匹配的条目"
7233
7234 #: builtin/clean.c:722
7235 msgid "Select items to delete"
7236 msgstr "选择要删除的条目"
7237
7238 #. TRANSLATORS: Make sure to keep [y/N] as is
7239 #: builtin/clean.c:763
7240 #, c-format
7241 msgid "Remove %s [y/N]? "
7242 msgstr "删除 %s [y/N]?"
7243
7244 #: builtin/clean.c:788 git-add--interactive.perl:1717
7245 #, c-format
7246 msgid "Bye.\n"
7247 msgstr "再见。\n"
7248
7249 #: builtin/clean.c:796
7250 msgid ""
7251 "clean - start cleaning\n"
7252 "filter by pattern - exclude items from deletion\n"
7253 "select by numbers - select items to be deleted by numbers\n"
7254 "ask each - confirm each deletion (like \"rm -i\")\n"
7255 "quit - stop cleaning\n"
7256 "help - this screen\n"
7257 "? - help for prompt selection"
7258 msgstr ""
7259 "clean - 开始清理\n"
7260 "filter by pattern - 通过模版排除要删除的条目\n"
7261 "select by numbers - 通过数字选择要删除的条目\n"
7262 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
7263 "quit - 停止删除并退出\n"
7264 "help - 显示本帮助\n"
7265 "? - 显示如何在提示符下选择的帮助"
7266
7267 #: builtin/clean.c:823 git-add--interactive.perl:1793
7268 msgid "*** Commands ***"
7269 msgstr "*** 命令 ***"
7270
7271 #: builtin/clean.c:824 git-add--interactive.perl:1790
7272 msgid "What now"
7273 msgstr "请选择"
7274
7275 #: builtin/clean.c:832
7276 msgid "Would remove the following item:"
7277 msgid_plural "Would remove the following items:"
7278 msgstr[0] "将删除如下条目:"
7279 msgstr[1] "将删除如下条目:"
7280
7281 #: builtin/clean.c:848
7282 msgid "No more files to clean, exiting."
7283 msgstr "没有要清理的文件,退出。"
7284
7285 #: builtin/clean.c:910
7286 msgid "do not print names of files removed"
7287 msgstr "不打印删除文件的名称"
7288
7289 #: builtin/clean.c:912
7290 msgid "force"
7291 msgstr "强制"
7292
7293 #: builtin/clean.c:913
7294 msgid "interactive cleaning"
7295 msgstr "交互式清除"
7296
7297 #: builtin/clean.c:915
7298 msgid "remove whole directories"
7299 msgstr "删除整个目录"
7300
7301 #: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
7302 #: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
7303 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
7304 #: builtin/show-ref.c:176
7305 msgid "pattern"
7306 msgstr "模式"
7307
7308 #: builtin/clean.c:917
7309 msgid "add <pattern> to ignore rules"
7310 msgstr "添加 <模式> 到忽略规则"
7311
7312 #: builtin/clean.c:918
7313 msgid "remove ignored files, too"
7314 msgstr "也删除忽略的文件"
7315
7316 #: builtin/clean.c:920
7317 msgid "remove only ignored files"
7318 msgstr "只删除忽略的文件"
7319
7320 #: builtin/clean.c:938
7321 msgid "-x and -X cannot be used together"
7322 msgstr "-x 和 -X 不能同时使用"
7323
7324 #: builtin/clean.c:942
7325 msgid ""
7326 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
7327 "clean"
7328 msgstr ""
7329 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
7330
7331 #: builtin/clean.c:945
7332 msgid ""
7333 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
7334 "refusing to clean"
7335 msgstr ""
7336 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
7337
7338 #: builtin/clone.c:42
7339 msgid "git clone [<options>] [--] <repo> [<dir>]"
7340 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
7341
7342 #: builtin/clone.c:87
7343 msgid "don't create a checkout"
7344 msgstr "不创建一个检出"
7345
7346 #: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479
7347 msgid "create a bare repository"
7348 msgstr "创建一个纯仓库"
7349
7350 #: builtin/clone.c:92
7351 msgid "create a mirror repository (implies bare)"
7352 msgstr "创建一个镜像仓库(也是纯仓库)"
7353
7354 #: builtin/clone.c:94
7355 msgid "to clone from a local repository"
7356 msgstr "从本地仓库克隆"
7357
7358 #: builtin/clone.c:96
7359 msgid "don't use local hardlinks, always copy"
7360 msgstr "不使用本地硬链接,始终复制"
7361
7362 #: builtin/clone.c:98
7363 msgid "setup as shared repository"
7364 msgstr "设置为共享仓库"
7365
7366 #: builtin/clone.c:100 builtin/clone.c:104
7367 msgid "pathspec"
7368 msgstr "路径规格"
7369
7370 #: builtin/clone.c:100 builtin/clone.c:104
7371 msgid "initialize submodules in the clone"
7372 msgstr "在克隆时初始化子模组"
7373
7374 #: builtin/clone.c:107
7375 msgid "number of submodules cloned in parallel"
7376 msgstr "并发克隆的子模组的数量"
7377
7378 #: builtin/clone.c:108 builtin/init-db.c:476
7379 msgid "template-directory"
7380 msgstr "模板目录"
7381
7382 #: builtin/clone.c:109 builtin/init-db.c:477
7383 msgid "directory from which templates will be used"
7384 msgstr "模板目录将被使用"
7385
7386 #: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223
7387 #: builtin/submodule--helper.c:1594
7388 msgid "reference repository"
7389 msgstr "参考仓库"
7390
7391 #: builtin/clone.c:115 builtin/submodule--helper.c:1225
7392 #: builtin/submodule--helper.c:1596
7393 msgid "use --reference only while cloning"
7394 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7395
7396 #: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44
7397 #: builtin/pack-objects.c:3166 builtin/repack.c:213
7398 msgid "name"
7399 msgstr "名称"
7400
7401 #: builtin/clone.c:117
7402 msgid "use <name> instead of 'origin' to track upstream"
7403 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
7404
7405 #: builtin/clone.c:119
7406 msgid "checkout <branch> instead of the remote's HEAD"
7407 msgstr "检出 <分支> 而不是远程 HEAD"
7408
7409 #: builtin/clone.c:121
7410 msgid "path to git-upload-pack on the remote"
7411 msgstr "远程 git-upload-pack 路径"
7412
7413 #: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813
7414 #: builtin/pull.c:216
7415 msgid "depth"
7416 msgstr "深度"
7417
7418 #: builtin/clone.c:123
7419 msgid "create a shallow clone of that depth"
7420 msgstr "创建一个指定深度的浅克隆"
7421
7422 #: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157
7423 #: parse-options.h:154
7424 msgid "time"
7425 msgstr "时间"
7426
7427 #: builtin/clone.c:125
7428 msgid "create a shallow clone since a specific time"
7429 msgstr "从一个特定时间创建一个浅克隆"
7430
7431 #: builtin/clone.c:126 builtin/fetch.c:154
7432 msgid "revision"
7433 msgstr "版本"
7434
7435 #: builtin/clone.c:127 builtin/fetch.c:155
7436 msgid "deepen history of shallow clone, excluding rev"
7437 msgstr "深化浅克隆的历史,除了特定版本"
7438
7439 #: builtin/clone.c:129
7440 msgid "clone only one branch, HEAD or --branch"
7441 msgstr "只克隆一个分支、HEAD 或 --branch"
7442
7443 #: builtin/clone.c:131
7444 msgid "don't clone any tags, and make later fetches not to follow them"
7445 msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
7446
7447 #: builtin/clone.c:133
7448 msgid "any cloned submodules will be shallow"
7449 msgstr "子模组将以浅下载模式克隆"
7450
7451 #: builtin/clone.c:134 builtin/init-db.c:485
7452 msgid "gitdir"
7453 msgstr "git目录"
7454
7455 #: builtin/clone.c:135 builtin/init-db.c:486
7456 msgid "separate git dir from working tree"
7457 msgstr "git目录和工作区分离"
7458
7459 #: builtin/clone.c:136
7460 msgid "key=value"
7461 msgstr "key=value"
7462
7463 #: builtin/clone.c:137
7464 msgid "set config inside the new repository"
7465 msgstr "在新仓库中设置配置信息"
7466
7467 #: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229
7468 #: builtin/push.c:583
7469 msgid "use IPv4 addresses only"
7470 msgstr "只使用 IPv4 地址"
7471
7472 #: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232
7473 #: builtin/push.c:585
7474 msgid "use IPv6 addresses only"
7475 msgstr "只使用 IPv6 地址"
7476
7477 #: builtin/clone.c:278
7478 msgid ""
7479 "No directory name could be guessed.\n"
7480 "Please specify a directory on the command line"
7481 msgstr ""
7482 "无法猜到目录名。\n"
7483 "请在命令行指定一个目录"
7484
7485 #: builtin/clone.c:331
7486 #, c-format
7487 msgid "info: Could not add alternate for '%s': %s\n"
7488 msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
7489
7490 #: builtin/clone.c:403
7491 #, c-format
7492 msgid "failed to open '%s'"
7493 msgstr "无法打开 '%s'"
7494
7495 #: builtin/clone.c:411
7496 #, c-format
7497 msgid "%s exists and is not a directory"
7498 msgstr "%s 存在且不是一个目录"
7499
7500 #: builtin/clone.c:425
7501 #, c-format
7502 msgid "failed to stat %s\n"
7503 msgstr "对 %s 调用 stat 失败\n"
7504
7505 #: builtin/clone.c:447
7506 #, c-format
7507 msgid "failed to create link '%s'"
7508 msgstr "无法创建链接 '%s'"
7509
7510 #: builtin/clone.c:451
7511 #, c-format
7512 msgid "failed to copy file to '%s'"
7513 msgstr "无法拷贝文件至 '%s'"
7514
7515 #: builtin/clone.c:477
7516 #, c-format
7517 msgid "done.\n"
7518 msgstr "完成。\n"
7519
7520 #: builtin/clone.c:491
7521 msgid ""
7522 "Clone succeeded, but checkout failed.\n"
7523 "You can inspect what was checked out with 'git status'\n"
7524 "and retry the checkout with 'git checkout -f HEAD'\n"
7525 msgstr ""
7526 "克隆成功,但是检出失败。\n"
7527 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
7528 "'git checkout -f HEAD' 重试\n"
7529
7530 #: builtin/clone.c:568
7531 #, c-format
7532 msgid "Could not find remote branch %s to clone."
7533 msgstr "不能发现要克隆的远程分支 %s。"
7534
7535 #: builtin/clone.c:663
7536 msgid "remote did not send all necessary objects"
7537 msgstr "远程没有发送所有必须的对象"
7538
7539 #: builtin/clone.c:679
7540 #, c-format
7541 msgid "unable to update %s"
7542 msgstr "不能更新 %s"
7543
7544 #: builtin/clone.c:728
7545 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
7546 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
7547
7548 #: builtin/clone.c:758
7549 msgid "unable to checkout working tree"
7550 msgstr "不能检出工作区"
7551
7552 #: builtin/clone.c:803
7553 msgid "unable to write parameters to config file"
7554 msgstr "无法将参数写入配置文件"
7555
7556 #: builtin/clone.c:866
7557 msgid "cannot repack to clean up"
7558 msgstr "无法执行 repack 来清理"
7559
7560 #: builtin/clone.c:868
7561 msgid "cannot unlink temporary alternates file"
7562 msgstr "无法删除临时的 alternates 文件"
7563
7564 #: builtin/clone.c:907 builtin/receive-pack.c:1947
7565 msgid "Too many arguments."
7566 msgstr "太多参数。"
7567
7568 #: builtin/clone.c:911
7569 msgid "You must specify a repository to clone."
7570 msgstr "您必须指定一个仓库来克隆。"
7571
7572 #: builtin/clone.c:924
7573 #, c-format
7574 msgid "--bare and --origin %s options are incompatible."
7575 msgstr "--bare 和 --origin %s 选项不兼容。"
7576
7577 #: builtin/clone.c:927
7578 msgid "--bare and --separate-git-dir are incompatible."
7579 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
7580
7581 #: builtin/clone.c:940
7582 #, c-format
7583 msgid "repository '%s' does not exist"
7584 msgstr "仓库 '%s' 不存在"
7585
7586 #: builtin/clone.c:946 builtin/fetch.c:1460
7587 #, c-format
7588 msgid "depth %s is not a positive number"
7589 msgstr "深度 %s 不是一个正数"
7590
7591 #: builtin/clone.c:956
7592 #, c-format
7593 msgid "destination path '%s' already exists and is not an empty directory."
7594 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
7595
7596 #: builtin/clone.c:966
7597 #, c-format
7598 msgid "working tree '%s' already exists."
7599 msgstr "工作区 '%s' 已经存在。"
7600
7601 #: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270
7602 #: builtin/worktree.c:246 builtin/worktree.c:276
7603 #, c-format
7604 msgid "could not create leading directories of '%s'"
7605 msgstr "不能为 '%s' 创建先导目录"
7606
7607 #: builtin/clone.c:986
7608 #, c-format
7609 msgid "could not create work tree dir '%s'"
7610 msgstr "不能创建工作区目录 '%s'"
7611
7612 #: builtin/clone.c:1006
7613 #, c-format
7614 msgid "Cloning into bare repository '%s'...\n"
7615 msgstr "克隆到纯仓库 '%s'...\n"
7616
7617 #: builtin/clone.c:1008
7618 #, c-format
7619 msgid "Cloning into '%s'...\n"
7620 msgstr "正克隆到 '%s'...\n"
7621
7622 #: builtin/clone.c:1032
7623 msgid ""
7624 "clone --recursive is not compatible with both --reference and --reference-if-"
7625 "able"
7626 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
7627
7628 #: builtin/clone.c:1093
7629 msgid "--depth is ignored in local clones; use file:// instead."
7630 msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
7631
7632 #: builtin/clone.c:1095
7633 msgid "--shallow-since is ignored in local clones; use file:// instead."
7634 msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
7635
7636 #: builtin/clone.c:1097
7637 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
7638 msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
7639
7640 #: builtin/clone.c:1099
7641 msgid "--filter is ignored in local clones; use file:// instead."
7642 msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
7643
7644 #: builtin/clone.c:1102
7645 msgid "source repository is shallow, ignoring --local"
7646 msgstr "源仓库是浅克隆,忽略 --local"
7647
7648 #: builtin/clone.c:1107
7649 msgid "--local is ignored"
7650 msgstr "--local 被忽略"
7651
7652 #: builtin/clone.c:1169 builtin/clone.c:1177
7653 #, c-format
7654 msgid "Remote branch %s not found in upstream %s"
7655 msgstr "远程分支 %s 在上游 %s 未发现"
7656
7657 #: builtin/clone.c:1180
7658 msgid "You appear to have cloned an empty repository."
7659 msgstr "您似乎克隆了一个空仓库。"
7660
7661 #: builtin/column.c:10
7662 msgid "git column [<options>]"
7663 msgstr "git column [<选项>]"
7664
7665 #: builtin/column.c:27
7666 msgid "lookup config vars"
7667 msgstr "查找配置变量"
7668
7669 #: builtin/column.c:28 builtin/column.c:29
7670 msgid "layout to use"
7671 msgstr "要使用的布局"
7672
7673 #: builtin/column.c:30
7674 msgid "Maximum width"
7675 msgstr "最大宽度"
7676
7677 #: builtin/column.c:31
7678 msgid "Padding space on left border"
7679 msgstr "左边框的填充空间"
7680
7681 #: builtin/column.c:32
7682 msgid "Padding space on right border"
7683 msgstr "右边框的填充空间"
7684
7685 #: builtin/column.c:33
7686 msgid "Padding space between columns"
7687 msgstr "两列之间的填充空间"
7688
7689 #: builtin/column.c:51
7690 msgid "--command must be the first argument"
7691 msgstr "--command 必须是第一个参数"
7692
7693 #: builtin/commit.c:37
7694 msgid "git commit [<options>] [--] <pathspec>..."
7695 msgstr "git commit [<选项>] [--] <路径规格>..."
7696
7697 #: builtin/commit.c:42
7698 msgid "git status [<options>] [--] <pathspec>..."
7699 msgstr "git status [<选项>] [--] <路径规格>..."
7700
7701 #: builtin/commit.c:47
7702 msgid ""
7703 "You asked to amend the most recent commit, but doing so would make\n"
7704 "it empty. You can repeat your command with --allow-empty, or you can\n"
7705 "remove the commit entirely with \"git reset HEAD^\".\n"
7706 msgstr ""
7707 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
7708 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
7709
7710 #: builtin/commit.c:52
7711 msgid ""
7712 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
7713 "If you wish to commit it anyway, use:\n"
7714 "\n"
7715 " git commit --allow-empty\n"
7716 "\n"
7717 msgstr ""
7718 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
7719 "也要提交,使用命令:\n"
7720 "\n"
7721 " git commit --allow-empty\n"
7722 "\n"
7723
7724 #: builtin/commit.c:59
7725 msgid "Otherwise, please use 'git reset'\n"
7726 msgstr "否则,请使用命令 'git reset'\n"
7727
7728 #: builtin/commit.c:62
7729 msgid ""
7730 "If you wish to skip this commit, use:\n"
7731 "\n"
7732 " git reset\n"
7733 "\n"
7734 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
7735 "the remaining commits.\n"
7736 msgstr ""
7737 "如果您想跳过这个提交,使用命令:\n"
7738 "\n"
7739 " git reset\n"
7740 "\n"
7741 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
7742 "操作。\n"
7743
7744 #: builtin/commit.c:293
7745 msgid "failed to unpack HEAD tree object"
7746 msgstr "无法解包 HEAD 树对象"
7747
7748 #: builtin/commit.c:334
7749 msgid "unable to create temporary index"
7750 msgstr "不能创建临时索引"
7751
7752 #: builtin/commit.c:340
7753 msgid "interactive add failed"
7754 msgstr "交互式添加失败"
7755
7756 #: builtin/commit.c:353
7757 msgid "unable to update temporary index"
7758 msgstr "无法更新临时索引"
7759
7760 #: builtin/commit.c:355
7761 msgid "Failed to update main cache tree"
7762 msgstr "不能更新树的主缓存"
7763
7764 #: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449
7765 msgid "unable to write new_index file"
7766 msgstr "无法写 new_index 文件"
7767
7768 #: builtin/commit.c:432
7769 msgid "cannot do a partial commit during a merge."
7770 msgstr "在合并过程中不能做部分提交。"
7771
7772 #: builtin/commit.c:434
7773 msgid "cannot do a partial commit during a cherry-pick."
7774 msgstr "在拣选过程中不能做部分提交。"
7775
7776 #: builtin/commit.c:442
7777 msgid "cannot read the index"
7778 msgstr "无法读取索引"
7779
7780 #: builtin/commit.c:461
7781 msgid "unable to write temporary index file"
7782 msgstr "无法写临时索引文件"
7783
7784 #: builtin/commit.c:558
7785 #, c-format
7786 msgid "commit '%s' lacks author header"
7787 msgstr "提交 '%s' 缺少作者信息"
7788
7789 #: builtin/commit.c:560
7790 #, c-format
7791 msgid "commit '%s' has malformed author line"
7792 msgstr "提交 '%s' 有格式错误的作者信息"
7793
7794 #: builtin/commit.c:579
7795 msgid "malformed --author parameter"
7796 msgstr "格式错误的 --author 参数"
7797
7798 #: builtin/commit.c:631
7799 msgid ""
7800 "unable to select a comment character that is not used\n"
7801 "in the current commit message"
7802 msgstr "无法选择一个未被当前提交说明使用的注释字符"
7803
7804 #: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029
7805 #, c-format
7806 msgid "could not lookup commit %s"
7807 msgstr "不能查询提交 %s"
7808
7809 #: builtin/commit.c:680 builtin/shortlog.c:316
7810 #, c-format
7811 msgid "(reading log message from standard input)\n"
7812 msgstr "(正从标准输入中读取日志信息)\n"
7813
7814 #: builtin/commit.c:682
7815 msgid "could not read log from standard input"
7816 msgstr "不能从标准输入中读取日志信息"
7817
7818 #: builtin/commit.c:686
7819 #, c-format
7820 msgid "could not read log file '%s'"
7821 msgstr "不能读取日志文件 '%s'"
7822
7823 #: builtin/commit.c:715 builtin/commit.c:723
7824 msgid "could not read SQUASH_MSG"
7825 msgstr "不能读取 SQUASH_MSG"
7826
7827 #: builtin/commit.c:720
7828 msgid "could not read MERGE_MSG"
7829 msgstr "不能读取 MERGE_MSG"
7830
7831 #: builtin/commit.c:774
7832 msgid "could not write commit template"
7833 msgstr "不能写提交模版"
7834
7835 #: builtin/commit.c:792
7836 #, c-format
7837 msgid ""
7838 "\n"
7839 "It looks like you may be committing a merge.\n"
7840 "If this is not correct, please remove the file\n"
7841 "\t%s\n"
7842 "and try again.\n"
7843 msgstr ""
7844 "\n"
7845 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
7846 "\t%s\n"
7847 "然后重试。\n"
7848
7849 #: builtin/commit.c:797
7850 #, c-format
7851 msgid ""
7852 "\n"
7853 "It looks like you may be committing a cherry-pick.\n"
7854 "If this is not correct, please remove the file\n"
7855 "\t%s\n"
7856 "and try again.\n"
7857 msgstr ""
7858 "\n"
7859 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
7860 "\t%s\n"
7861 "然后重试。\n"
7862
7863 #: builtin/commit.c:810
7864 #, c-format
7865 msgid ""
7866 "Please enter the commit message for your changes. Lines starting\n"
7867 "with '%c' will be ignored, and an empty message aborts the commit.\n"
7868 msgstr ""
7869 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
7870 "说明将会终止提交。\n"
7871
7872 #: builtin/commit.c:818
7873 #, c-format
7874 msgid ""
7875 "Please enter the commit message for your changes. Lines starting\n"
7876 "with '%c' will be kept; you may remove them yourself if you want to.\n"
7877 "An empty message aborts the commit.\n"
7878 msgstr ""
7879 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
7880 "也可以删除它们。一个空的提交说明将会终止提交。\n"
7881
7882 # 译者:为保证在输出中对齐,注意调整句中空格!
7883 #: builtin/commit.c:835
7884 #, c-format
7885 msgid "%sAuthor: %.*s <%.*s>"
7886 msgstr "%s作者: %.*s <%.*s>"
7887
7888 # 译者:为保证在输出中对齐,注意调整句中空格!
7889 #: builtin/commit.c:843
7890 #, c-format
7891 msgid "%sDate: %s"
7892 msgstr "%s日期: %s"
7893
7894 # 译者:为保证在输出中对齐,注意调整句中空格!
7895 #: builtin/commit.c:850
7896 #, c-format
7897 msgid "%sCommitter: %.*s <%.*s>"
7898 msgstr "%s提交者:%.*s <%.*s>"
7899
7900 #: builtin/commit.c:867
7901 msgid "Cannot read index"
7902 msgstr "无法读取索引"
7903
7904 #: builtin/commit.c:933
7905 msgid "Error building trees"
7906 msgstr "无法创建树对象"
7907
7908 #: builtin/commit.c:947 builtin/tag.c:257
7909 #, c-format
7910 msgid "Please supply the message using either -m or -F option.\n"
7911 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
7912
7913 #: builtin/commit.c:991
7914 #, c-format
7915 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
7916 msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
7917
7918 #: builtin/commit.c:1005
7919 #, c-format
7920 msgid "Invalid ignored mode '%s'"
7921 msgstr "无效的忽略模式 '%s'"
7922
7923 #: builtin/commit.c:1019 builtin/commit.c:1269
7924 #, c-format
7925 msgid "Invalid untracked files mode '%s'"
7926 msgstr "无效的未追踪文件参数 '%s'"
7927
7928 #: builtin/commit.c:1057
7929 msgid "--long and -z are incompatible"
7930 msgstr "--long 和 -z 选项不兼容"
7931
7932 #: builtin/commit.c:1090
7933 msgid "Using both --reset-author and --author does not make sense"
7934 msgstr "同时使用 --reset-author 和 --author 没有意义"
7935
7936 #: builtin/commit.c:1099
7937 msgid "You have nothing to amend."
7938 msgstr "您没有可修补的提交。"
7939
7940 #: builtin/commit.c:1102
7941 msgid "You are in the middle of a merge -- cannot amend."
7942 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
7943
7944 #: builtin/commit.c:1104
7945 msgid "You are in the middle of a cherry-pick -- cannot amend."
7946 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
7947
7948 #: builtin/commit.c:1107
7949 msgid "Options --squash and --fixup cannot be used together"
7950 msgstr "选项 --squash 和 --fixup 不能同时使用"
7951
7952 #: builtin/commit.c:1117
7953 msgid "Only one of -c/-C/-F/--fixup can be used."
7954 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
7955
7956 #: builtin/commit.c:1119
7957 msgid "Option -m cannot be combined with -c/-C/-F."
7958 msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
7959
7960 #: builtin/commit.c:1127
7961 msgid "--reset-author can be used only with -C, -c or --amend."
7962 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
7963
7964 #: builtin/commit.c:1144
7965 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
7966 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
7967
7968 #: builtin/commit.c:1146
7969 msgid "No paths with --include/--only does not make sense."
7970 msgstr "参数 --include/--only 不跟路径没有意义。"
7971
7972 #: builtin/commit.c:1160 builtin/tag.c:543
7973 #, c-format
7974 msgid "Invalid cleanup mode %s"
7975 msgstr "无效的清理模式 %s"
7976
7977 #: builtin/commit.c:1165
7978 msgid "Paths with -a does not make sense."
7979 msgstr "路径和 -a 选项同时使用没有意义。"
7980
7981 #: builtin/commit.c:1303 builtin/commit.c:1480
7982 msgid "show status concisely"
7983 msgstr "以简洁的格式显示状态"
7984
7985 #: builtin/commit.c:1305 builtin/commit.c:1482
7986 msgid "show branch information"
7987 msgstr "显示分支信息"
7988
7989 #: builtin/commit.c:1307
7990 msgid "show stash information"
7991 msgstr "显示贮藏区信息"
7992
7993 #: builtin/commit.c:1309 builtin/commit.c:1484
7994 msgid "compute full ahead/behind values"
7995 msgstr "计算完整的领先/落后值"
7996
7997 #: builtin/commit.c:1311
7998 msgid "version"
7999 msgstr "版本"
8000
8001 #: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
8002 #: builtin/worktree.c:581
8003 msgid "machine-readable output"
8004 msgstr "机器可读的输出"
8005
8006 #: builtin/commit.c:1314 builtin/commit.c:1488
8007 msgid "show status in long format (default)"
8008 msgstr "以长格式显示状态(默认)"
8009
8010 #: builtin/commit.c:1317 builtin/commit.c:1491
8011 msgid "terminate entries with NUL"
8012 msgstr "条目以 NUL 字符结尾"
8013
8014 #: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494
8015 #: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397
8016 msgid "mode"
8017 msgstr "模式"
8018
8019 #: builtin/commit.c:1320 builtin/commit.c:1494
8020 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
8021 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
8022
8023 #: builtin/commit.c:1324
8024 msgid ""
8025 "show ignored files, optional modes: traditional, matching, no. (Default: "
8026 "traditional)"
8027 msgstr ""
8028 "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
8029
8030 #: builtin/commit.c:1326 parse-options.h:167
8031 msgid "when"
8032 msgstr "何时"
8033
8034 #: builtin/commit.c:1327
8035 msgid ""
8036 "ignore changes to submodules, optional when: all, dirty, untracked. "
8037 "(Default: all)"
8038 msgstr ""
8039 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
8040
8041 #: builtin/commit.c:1329
8042 msgid "list untracked files in columns"
8043 msgstr "以列的方式显示未跟踪的文件"
8044
8045 #: builtin/commit.c:1330
8046 msgid "do not detect renames"
8047 msgstr "不检测重命名"
8048
8049 #: builtin/commit.c:1332
8050 msgid "detect renames, optionally set similarity index"
8051 msgstr "检测重命名,可以设置索引相似度"
8052
8053 #: builtin/commit.c:1352
8054 msgid "Unsupported combination of ignored and untracked-files arguments"
8055 msgstr "不支持已忽略和未跟踪文件参数的组合"
8056
8057 #: builtin/commit.c:1450
8058 msgid "suppress summary after successful commit"
8059 msgstr "提交成功后不显示概述信息"
8060
8061 #: builtin/commit.c:1451
8062 msgid "show diff in commit message template"
8063 msgstr "在提交说明模板里显示差异"
8064
8065 #: builtin/commit.c:1453
8066 msgid "Commit message options"
8067 msgstr "提交说明选项"
8068
8069 #: builtin/commit.c:1454 builtin/tag.c:394
8070 msgid "read message from file"
8071 msgstr "从文件中读取提交说明"
8072
8073 #: builtin/commit.c:1455
8074 msgid "author"
8075 msgstr "作者"
8076
8077 #: builtin/commit.c:1455
8078 msgid "override author for commit"
8079 msgstr "提交时覆盖作者"
8080
8081 #: builtin/commit.c:1456 builtin/gc.c:501
8082 msgid "date"
8083 msgstr "日期"
8084
8085 #: builtin/commit.c:1456
8086 msgid "override date for commit"
8087 msgstr "提交时覆盖日期"
8088
8089 #: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402
8090 #: builtin/notes.c:565 builtin/tag.c:392
8091 msgid "message"
8092 msgstr "说明"
8093
8094 #: builtin/commit.c:1457
8095 msgid "commit message"
8096 msgstr "提交说明"
8097
8098 #: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460
8099 #: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92
8100 msgid "commit"
8101 msgstr "提交"
8102
8103 #: builtin/commit.c:1458
8104 msgid "reuse and edit message from specified commit"
8105 msgstr "重用并编辑指定提交的提交说明"
8106
8107 #: builtin/commit.c:1459
8108 msgid "reuse message from specified commit"
8109 msgstr "重用指定提交的提交说明"
8110
8111 #: builtin/commit.c:1460
8112 msgid "use autosquash formatted message to fixup specified commit"
8113 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
8114
8115 #: builtin/commit.c:1461
8116 msgid "use autosquash formatted message to squash specified commit"
8117 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
8118
8119 #: builtin/commit.c:1462
8120 msgid "the commit is authored by me now (used with -C/-c/--amend)"
8121 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
8122
8123 #: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242
8124 #: builtin/pull.c:154 builtin/revert.c:105
8125 msgid "add Signed-off-by:"
8126 msgstr "添加 Signed-off-by: 签名"
8127
8128 #: builtin/commit.c:1464
8129 msgid "use specified template file"
8130 msgstr "使用指定的模板文件"
8131
8132 #: builtin/commit.c:1465
8133 msgid "force edit of commit"
8134 msgstr "强制编辑提交"
8135
8136 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
8137 #: builtin/commit.c:1466
8138 msgid "default"
8139 msgstr "default"
8140
8141 #: builtin/commit.c:1466 builtin/tag.c:398
8142 msgid "how to strip spaces and #comments from message"
8143 msgstr "设置如何删除提交说明里的空格和#注释"
8144
8145 #: builtin/commit.c:1467
8146 msgid "include status in commit message template"
8147 msgstr "在提交说明模板里包含状态信息"
8148
8149 #: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184
8150 #: builtin/revert.c:113
8151 msgid "GPG sign commit"
8152 msgstr "GPG 提交签名"
8153
8154 #: builtin/commit.c:1472
8155 msgid "Commit contents options"
8156 msgstr "提交内容选项"
8157
8158 #: builtin/commit.c:1473
8159 msgid "commit all changed files"
8160 msgstr "提交所有改动的文件"
8161
8162 #: builtin/commit.c:1474
8163 msgid "add specified files to index for commit"
8164 msgstr "添加指定的文件到索引区等待提交"
8165
8166 #: builtin/commit.c:1475
8167 msgid "interactively add files"
8168 msgstr "交互式添加文件"
8169
8170 #: builtin/commit.c:1476
8171 msgid "interactively add changes"
8172 msgstr "交互式添加变更"
8173
8174 #: builtin/commit.c:1477
8175 msgid "commit only specified files"
8176 msgstr "只提交指定的文件"
8177
8178 #: builtin/commit.c:1478
8179 msgid "bypass pre-commit and commit-msg hooks"
8180 msgstr "绕过 pre-commit 和 commit-msg 钩子"
8181
8182 #: builtin/commit.c:1479
8183 msgid "show what would be committed"
8184 msgstr "显示将要提交的内容"
8185
8186 #: builtin/commit.c:1492
8187 msgid "amend previous commit"
8188 msgstr "修改先前的提交"
8189
8190 #: builtin/commit.c:1493
8191 msgid "bypass post-rewrite hook"
8192 msgstr "绕过 post-rewrite 钩子"
8193
8194 #: builtin/commit.c:1498
8195 msgid "ok to record an empty change"
8196 msgstr "允许一个空提交"
8197
8198 #: builtin/commit.c:1500
8199 msgid "ok to record a change with an empty message"
8200 msgstr "允许空的提交说明"
8201
8202 #: builtin/commit.c:1573
8203 #, c-format
8204 msgid "Corrupt MERGE_HEAD file (%s)"
8205 msgstr "损坏的 MERGE_HEAD 文件(%s)"
8206
8207 #: builtin/commit.c:1580
8208 msgid "could not read MERGE_MODE"
8209 msgstr "不能读取 MERGE_MODE"
8210
8211 #: builtin/commit.c:1599
8212 #, c-format
8213 msgid "could not read commit message: %s"
8214 msgstr "不能读取提交说明:%s"
8215
8216 #: builtin/commit.c:1610
8217 #, c-format
8218 msgid "Aborting commit due to empty commit message.\n"
8219 msgstr "终止提交因为提交说明为空。\n"
8220
8221 #: builtin/commit.c:1615
8222 #, c-format
8223 msgid "Aborting commit; you did not edit the message.\n"
8224 msgstr "终止提交;您未更改来自模版的提交说明。\n"
8225
8226 #: builtin/commit.c:1650
8227 msgid ""
8228 "Repository has been updated, but unable to write\n"
8229 "new_index file. Check that disk is not full and quota is\n"
8230 "not exceeded, and then \"git reset HEAD\" to recover."
8231 msgstr ""
8232 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
8233 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
8234
8235 #: builtin/commit-graph.c:9
8236 msgid "git commit-graph [--object-dir <objdir>]"
8237 msgstr "git commit-graph [--object-dir <对象目录>]"
8238
8239 #: builtin/commit-graph.c:10 builtin/commit-graph.c:16
8240 msgid "git commit-graph read [--object-dir <objdir>]"
8241 msgstr "git commit-graph read [--object-dir <对象目录>]"
8242
8243 #: builtin/commit-graph.c:11 builtin/commit-graph.c:21
8244 msgid ""
8245 "git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--"
8246 "stdin-commits]"
8247 msgstr ""
8248 "git commit-graph write [--object-dir <对象目录>] [--append] [--stdin-packs|--"
8249 "stdin-commits]"
8250
8251 #: builtin/commit-graph.c:39 builtin/commit-graph.c:92
8252 #: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466
8253 msgid "dir"
8254 msgstr "目录"
8255
8256 #: builtin/commit-graph.c:40 builtin/commit-graph.c:93
8257 #: builtin/commit-graph.c:148
8258 msgid "The object directory to store the graph"
8259 msgstr "保存图形的对象目录"
8260
8261 #: builtin/commit-graph.c:95
8262 msgid "scan pack-indexes listed by stdin for commits"
8263 msgstr "从标准输入中的包索引文件列表中扫描提交"
8264
8265 #: builtin/commit-graph.c:97
8266 msgid "start walk at commits listed by stdin"
8267 msgstr "从标准输入中的提交开始扫描"
8268
8269 #: builtin/commit-graph.c:99
8270 msgid "include all commits already in the commit-graph file"
8271 msgstr "包含 commit-graph 文件中已有所有提交"
8272
8273 #: builtin/commit-graph.c:108
8274 msgid "cannot use both --stdin-commits and --stdin-packs"
8275 msgstr "不能同时使用 --stdin-commits 和 --stdin-packs 选项"
8276
8277 #: builtin/config.c:10
8278 msgid "git config [<options>]"
8279 msgstr "git config [<选项>]"
8280
8281 #: builtin/config.c:101
8282 #, c-format
8283 msgid "unrecognized --type argument, %s"
8284 msgstr "未能识别的 --type 参数,%s"
8285
8286 #: builtin/config.c:123
8287 msgid "Config file location"
8288 msgstr "配置文件位置"
8289
8290 #: builtin/config.c:124
8291 msgid "use global config file"
8292 msgstr "使用全局配置文件"
8293
8294 #: builtin/config.c:125
8295 msgid "use system config file"
8296 msgstr "使用系统级配置文件"
8297
8298 #: builtin/config.c:126
8299 msgid "use repository config file"
8300 msgstr "使用仓库级配置文件"
8301
8302 #: builtin/config.c:127
8303 msgid "use given config file"
8304 msgstr "使用指定的配置文件"
8305
8306 #: builtin/config.c:128
8307 msgid "blob-id"
8308 msgstr "数据对象 ID"
8309
8310 #: builtin/config.c:128
8311 msgid "read config from given blob object"
8312 msgstr "从给定的数据对象读取配置"
8313
8314 #: builtin/config.c:129
8315 msgid "Action"
8316 msgstr "操作"
8317
8318 #: builtin/config.c:130
8319 msgid "get value: name [value-regex]"
8320 msgstr "获取值:name [value-regex]"
8321
8322 #: builtin/config.c:131
8323 msgid "get all values: key [value-regex]"
8324 msgstr "获得所有的值:key [value-regex]"
8325
8326 #: builtin/config.c:132
8327 msgid "get values for regexp: name-regex [value-regex]"
8328 msgstr "根据正则表达式获得值:name-regex [value-regex]"
8329
8330 #: builtin/config.c:133
8331 msgid "get value specific for the URL: section[.var] URL"
8332 msgstr "获得 URL 取值:section[.var] URL"
8333
8334 #: builtin/config.c:134
8335 msgid "replace all matching variables: name value [value_regex]"
8336 msgstr "替换所有匹配的变量:name value [value_regex]"
8337
8338 #: builtin/config.c:135
8339 msgid "add a new variable: name value"
8340 msgstr "添加一个新的变量:name value"
8341
8342 #: builtin/config.c:136
8343 msgid "remove a variable: name [value-regex]"
8344 msgstr "删除一个变量:name [value-regex]"
8345
8346 #: builtin/config.c:137
8347 msgid "remove all matches: name [value-regex]"
8348 msgstr "删除所有匹配项:name [value-regex]"
8349
8350 #: builtin/config.c:138
8351 msgid "rename section: old-name new-name"
8352 msgstr "重命名小节:old-name new-name"
8353
8354 #: builtin/config.c:139
8355 msgid "remove a section: name"
8356 msgstr "删除一个小节:name"
8357
8358 #: builtin/config.c:140
8359 msgid "list all"
8360 msgstr "列出所有"
8361
8362 #: builtin/config.c:141
8363 msgid "open an editor"
8364 msgstr "打开一个编辑器"
8365
8366 #: builtin/config.c:142
8367 msgid "find the color configured: slot [default]"
8368 msgstr "获得配置的颜色:配置 [默认]"
8369
8370 #: builtin/config.c:143
8371 msgid "find the color setting: slot [stdout-is-tty]"
8372 msgstr "获得颜色设置:配置 [stdout-is-tty]"
8373
8374 #: builtin/config.c:144
8375 msgid "Type"
8376 msgstr "类型"
8377
8378 #: builtin/config.c:145
8379 msgid "value is given this type"
8380 msgstr "取值为该类型"
8381
8382 #: builtin/config.c:146
8383 msgid "value is \"true\" or \"false\""
8384 msgstr "值是 \"true\" 或 \"false\""
8385
8386 #: builtin/config.c:147
8387 msgid "value is decimal number"
8388 msgstr "值是十进制数"
8389
8390 #: builtin/config.c:148
8391 msgid "value is --bool or --int"
8392 msgstr "值是 --bool or --int"
8393
8394 #: builtin/config.c:149
8395 msgid "value is a path (file or directory name)"
8396 msgstr "值是一个路径(文件或目录名)"
8397
8398 #: builtin/config.c:150
8399 msgid "value is an expiry date"
8400 msgstr "值是一个到期日期"
8401
8402 #: builtin/config.c:151
8403 msgid "Other"
8404 msgstr "其它"
8405
8406 #: builtin/config.c:152
8407 msgid "terminate values with NUL byte"
8408 msgstr "终止值是 NUL 字节"
8409
8410 #: builtin/config.c:153
8411 msgid "show variable names only"
8412 msgstr "只显示变量名"
8413
8414 #: builtin/config.c:154
8415 msgid "respect include directives on lookup"
8416 msgstr "查询时参照 include 指令递归查找"
8417
8418 #: builtin/config.c:155
8419 msgid "show origin of config (file, standard input, blob, command line)"
8420 msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
8421
8422 #: builtin/config.c:156
8423 msgid "value"
8424 msgstr "取值"
8425
8426 #: builtin/config.c:156
8427 msgid "with --get, use default value when missing entry"
8428 msgstr "使用 --get 参数,当缺少设置时使用默认值"
8429
8430 #: builtin/config.c:332
8431 #, c-format
8432 msgid "failed to format default config value: %s"
8433 msgstr "无法格式化默认配置取值:%s"
8434
8435 #: builtin/config.c:431
8436 msgid "unable to parse default color value"
8437 msgstr "不能解析默认颜色值"
8438
8439 #: builtin/config.c:575
8440 #, c-format
8441 msgid ""
8442 "# This is Git's per-user configuration file.\n"
8443 "[user]\n"
8444 "# Please adapt and uncomment the following lines:\n"
8445 "#\tname = %s\n"
8446 "#\temail = %s\n"
8447 msgstr ""
8448 "# This is Git's per-user configuration file.\n"
8449 "[user]\n"
8450 "# Please adapt and uncomment the following lines:\n"
8451 "#\tname = %s\n"
8452 "#\temail = %s\n"
8453
8454 #: builtin/config.c:603
8455 msgid "--local can only be used inside a git repository"
8456 msgstr "--local 只能在一个仓库内使用"
8457
8458 #: builtin/config.c:606
8459 msgid "--blob can only be used inside a git repository"
8460 msgstr "--blob 只能在一个仓库内使用"
8461
8462 #: builtin/config.c:735
8463 #, c-format
8464 msgid "cannot create configuration file %s"
8465 msgstr "不能创建配置文件 %s"
8466
8467 #: builtin/config.c:748
8468 #, c-format
8469 msgid ""
8470 "cannot overwrite multiple values with a single value\n"
8471 " Use a regexp, --add or --replace-all to change %s."
8472 msgstr ""
8473 "无法用一个值覆盖多个值\n"
8474 " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
8475
8476 #: builtin/count-objects.c:90
8477 msgid "git count-objects [-v] [-H | --human-readable]"
8478 msgstr "git count-objects [-v] [-H | --human-readable]"
8479
8480 #: builtin/count-objects.c:100
8481 msgid "print sizes in human readable format"
8482 msgstr "以用户可读的格式显示大小"
8483
8484 #: builtin/describe.c:22
8485 msgid "git describe [<options>] [<commit-ish>...]"
8486 msgstr "git describe [<选项>] [<提交号>...]"
8487
8488 #: builtin/describe.c:23
8489 msgid "git describe [<options>] --dirty"
8490 msgstr "git describe [<选项>] --dirty"
8491
8492 #: builtin/describe.c:57
8493 msgid "head"
8494 msgstr "头"
8495
8496 #: builtin/describe.c:57
8497 msgid "lightweight"
8498 msgstr "轻量级的"
8499
8500 #: builtin/describe.c:57
8501 msgid "annotated"
8502 msgstr "附注的"
8503
8504 #: builtin/describe.c:267
8505 #, c-format
8506 msgid "annotated tag %s not available"
8507 msgstr "附注标签 %s 无效"
8508
8509 #: builtin/describe.c:271
8510 #, c-format
8511 msgid "annotated tag %s has no embedded name"
8512 msgstr "附注标签 %s 没有嵌入名称"
8513
8514 #: builtin/describe.c:273
8515 #, c-format
8516 msgid "tag '%s' is really '%s' here"
8517 msgstr "标签 '%s' 的确是在 '%s'"
8518
8519 #: builtin/describe.c:317
8520 #, c-format
8521 msgid "no tag exactly matches '%s'"
8522 msgstr "没有标签准确匹配 '%s'"
8523
8524 #: builtin/describe.c:319
8525 #, c-format
8526 msgid "No exact match on refs or tags, searching to describe\n"
8527 msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
8528
8529 #: builtin/describe.c:366
8530 #, c-format
8531 msgid "finished search at %s\n"
8532 msgstr "完成搜索 %s\n"
8533
8534 #: builtin/describe.c:392
8535 #, c-format
8536 msgid ""
8537 "No annotated tags can describe '%s'.\n"
8538 "However, there were unannotated tags: try --tags."
8539 msgstr ""
8540 "没有附注标签能描述 '%s'。\n"
8541 "然而,存在未附注标签:尝试 --tags。"
8542
8543 #: builtin/describe.c:396
8544 #, c-format
8545 msgid ""
8546 "No tags can describe '%s'.\n"
8547 "Try --always, or create some tags."
8548 msgstr ""
8549 "没有标签能描述 '%s'。\n"
8550 "尝试 --always,或者创建一些标签。"
8551
8552 #: builtin/describe.c:426
8553 #, c-format
8554 msgid "traversed %lu commits\n"
8555 msgstr "已遍历 %lu 个提交\n"
8556
8557 #: builtin/describe.c:429
8558 #, c-format
8559 msgid ""
8560 "more than %i tags found; listed %i most recent\n"
8561 "gave up search at %s\n"
8562 msgstr ""
8563 "发现多于 %i 个标签,列出最近的 %i 个\n"
8564 "在 %s 放弃搜索\n"
8565
8566 #: builtin/describe.c:497
8567 #, c-format
8568 msgid "describe %s\n"
8569 msgstr "描述 %s\n"
8570
8571 #: builtin/describe.c:500 builtin/log.c:502
8572 #, c-format
8573 msgid "Not a valid object name %s"
8574 msgstr "不是一个有效的对象名 %s"
8575
8576 #: builtin/describe.c:508
8577 #, c-format
8578 msgid "%s is neither a commit nor blob"
8579 msgstr "%s 既不是提交也不是数据对象"
8580
8581 #: builtin/describe.c:522
8582 msgid "find the tag that comes after the commit"
8583 msgstr "寻找该提交之后的标签"
8584
8585 #: builtin/describe.c:523
8586 msgid "debug search strategy on stderr"
8587 msgstr "在标准错误上调试搜索策略"
8588
8589 #: builtin/describe.c:524
8590 msgid "use any ref"
8591 msgstr "使用任意引用"
8592
8593 #: builtin/describe.c:525
8594 msgid "use any tag, even unannotated"
8595 msgstr "使用任意标签,即使未附带注释"
8596
8597 #: builtin/describe.c:526
8598 msgid "always use long format"
8599 msgstr "始终使用长提交号格式"
8600
8601 #: builtin/describe.c:527
8602 msgid "only follow first parent"
8603 msgstr "只跟随第一个父提交"
8604
8605 #: builtin/describe.c:530
8606 msgid "only output exact matches"
8607 msgstr "只输出精确匹配"
8608
8609 #: builtin/describe.c:532
8610 msgid "consider <n> most recent tags (default: 10)"
8611 msgstr "考虑最近 <n> 个标签(默认:10)"
8612
8613 #: builtin/describe.c:534
8614 msgid "only consider tags matching <pattern>"
8615 msgstr "只考虑匹配 <模式> 的标签"
8616
8617 #: builtin/describe.c:536
8618 msgid "do not consider tags matching <pattern>"
8619 msgstr "不考虑匹配 <模式> 的标签"
8620
8621 #: builtin/describe.c:538 builtin/name-rev.c:406
8622 msgid "show abbreviated commit object as fallback"
8623 msgstr "显示简写的提交号作为后备"
8624
8625 #: builtin/describe.c:539 builtin/describe.c:542
8626 msgid "mark"
8627 msgstr "标记"
8628
8629 #: builtin/describe.c:540
8630 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
8631 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
8632
8633 #: builtin/describe.c:543
8634 msgid "append <mark> on broken working tree (default: \"-broken\")"
8635 msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
8636
8637 #: builtin/describe.c:561
8638 msgid "--long is incompatible with --abbrev=0"
8639 msgstr "--long 与 --abbrev=0 不兼容"
8640
8641 #: builtin/describe.c:590
8642 msgid "No names found, cannot describe anything."
8643 msgstr "没有发现名称,无法描述任何东西。"
8644
8645 #: builtin/describe.c:640
8646 msgid "--dirty is incompatible with commit-ishes"
8647 msgstr "--dirty 与提交号不兼容"
8648
8649 #: builtin/describe.c:642
8650 msgid "--broken is incompatible with commit-ishes"
8651 msgstr "--broken 与提交号不兼容"
8652
8653 #: builtin/diff.c:83
8654 #, c-format
8655 msgid "'%s': not a regular file or symlink"
8656 msgstr "'%s':不是一个正规文件或符号链接"
8657
8658 #: builtin/diff.c:234
8659 #, c-format
8660 msgid "invalid option: %s"
8661 msgstr "无效选项:%s"
8662
8663 #: builtin/diff.c:356
8664 msgid "Not a git repository"
8665 msgstr "不是一个 git 仓库"
8666
8667 #: builtin/diff.c:399
8668 #, c-format
8669 msgid "invalid object '%s' given."
8670 msgstr "提供了无效对象 '%s'。"
8671
8672 #: builtin/diff.c:408
8673 #, c-format
8674 msgid "more than two blobs given: '%s'"
8675 msgstr "提供了超过两个数据对象:'%s'"
8676
8677 #: builtin/diff.c:413
8678 #, c-format
8679 msgid "unhandled object '%s' given."
8680 msgstr "无法处理的对象 '%s'。"
8681
8682 #: builtin/difftool.c:29
8683 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
8684 msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
8685
8686 #: builtin/difftool.c:259
8687 #, c-format
8688 msgid "failed: %d"
8689 msgstr "失败:%d"
8690
8691 #: builtin/difftool.c:301
8692 #, c-format
8693 msgid "could not read symlink %s"
8694 msgstr "无法读取符号链接 %s"
8695
8696 #: builtin/difftool.c:303
8697 #, c-format
8698 msgid "could not read symlink file %s"
8699 msgstr "无法读取符号链接文件 %s"
8700
8701 #: builtin/difftool.c:311
8702 #, c-format
8703 msgid "could not read object %s for symlink %s"
8704 msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
8705
8706 #: builtin/difftool.c:412
8707 msgid ""
8708 "combined diff formats('-c' and '--cc') are not supported in\n"
8709 "directory diff mode('-d' and '--dir-diff')."
8710 msgstr ""
8711 "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
8712 "cc')。"
8713
8714 #: builtin/difftool.c:632
8715 #, c-format
8716 msgid "both files modified: '%s' and '%s'."
8717 msgstr "两个文件都被修改:'%s' 和 '%s'。"
8718
8719 #: builtin/difftool.c:634
8720 msgid "working tree file has been left."
8721 msgstr "工作区文件被留了下来。"
8722
8723 #: builtin/difftool.c:645
8724 #, c-format
8725 msgid "temporary files exist in '%s'."
8726 msgstr "临时文件存在于 '%s'。"
8727
8728 #: builtin/difftool.c:646
8729 msgid "you may want to cleanup or recover these."
8730 msgstr "您可能想要清理或者恢复它们。"
8731
8732 #: builtin/difftool.c:695
8733 msgid "use `diff.guitool` instead of `diff.tool`"
8734 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
8735
8736 #: builtin/difftool.c:697
8737 msgid "perform a full-directory diff"
8738 msgstr "执行一个全目录差异比较"
8739
8740 #: builtin/difftool.c:699
8741 msgid "do not prompt before launching a diff tool"
8742 msgstr "启动差异比较工具之前不提示"
8743
8744 #: builtin/difftool.c:704
8745 msgid "use symlinks in dir-diff mode"
8746 msgstr "在 dir-diff 模式中使用符号链接"
8747
8748 #: builtin/difftool.c:705
8749 msgid "<tool>"
8750 msgstr "<工具>"
8751
8752 #: builtin/difftool.c:706
8753 msgid "use the specified diff tool"
8754 msgstr "使用指定的差异比较工具"
8755
8756 #: builtin/difftool.c:708
8757 msgid "print a list of diff tools that may be used with `--tool`"
8758 msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
8759
8760 #: builtin/difftool.c:711
8761 msgid ""
8762 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
8763 "code"
8764 msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
8765
8766 #: builtin/difftool.c:713
8767 msgid "<command>"
8768 msgstr "<命令>"
8769
8770 #: builtin/difftool.c:714
8771 msgid "specify a custom command for viewing diffs"
8772 msgstr "指定一个用于查看差异的自定义命令"
8773
8774 #: builtin/difftool.c:738
8775 msgid "no <tool> given for --tool=<tool>"
8776 msgstr "没有为 --tool=<工具> 参数提供 <工具>"
8777
8778 #: builtin/difftool.c:745
8779 msgid "no <cmd> given for --extcmd=<cmd>"
8780 msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
8781
8782 #: builtin/fast-export.c:27
8783 msgid "git fast-export [rev-list-opts]"
8784 msgstr "git fast-export [rev-list-opts]"
8785
8786 #: builtin/fast-export.c:1000
8787 msgid "show progress after <n> objects"
8788 msgstr "在 <n> 个对象之后显示进度"
8789
8790 #: builtin/fast-export.c:1002
8791 msgid "select handling of signed tags"
8792 msgstr "选择如何处理签名标签"
8793
8794 #: builtin/fast-export.c:1005
8795 msgid "select handling of tags that tag filtered objects"
8796 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
8797
8798 #: builtin/fast-export.c:1008
8799 msgid "Dump marks to this file"
8800 msgstr "把标记存储到这个文件"
8801
8802 #: builtin/fast-export.c:1010
8803 msgid "Import marks from this file"
8804 msgstr "从这个文件导入标记"
8805
8806 #: builtin/fast-export.c:1012
8807 msgid "Fake a tagger when tags lack one"
8808 msgstr "当标签缺少标记者字段时,假装提供一个"
8809
8810 #: builtin/fast-export.c:1014
8811 msgid "Output full tree for each commit"
8812 msgstr "每次提交都输出整个树"
8813
8814 #: builtin/fast-export.c:1016
8815 msgid "Use the done feature to terminate the stream"
8816 msgstr "使用 done 功能来终止流"
8817
8818 #: builtin/fast-export.c:1017
8819 msgid "Skip output of blob data"
8820 msgstr "跳过数据对象的输出"
8821
8822 #: builtin/fast-export.c:1018
8823 msgid "refspec"
8824 msgstr "引用规格"
8825
8826 #: builtin/fast-export.c:1019
8827 msgid "Apply refspec to exported refs"
8828 msgstr "对导出的引用应用引用规格"
8829
8830 #: builtin/fast-export.c:1020
8831 msgid "anonymize output"
8832 msgstr "匿名输出"
8833
8834 #: builtin/fetch.c:26
8835 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
8836 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
8837
8838 #: builtin/fetch.c:27
8839 msgid "git fetch [<options>] <group>"
8840 msgstr "git fetch [<选项>] <组>"
8841
8842 #: builtin/fetch.c:28
8843 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
8844 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
8845
8846 #: builtin/fetch.c:29
8847 msgid "git fetch --all [<options>]"
8848 msgstr "git fetch --all [<选项>]"
8849
8850 #: builtin/fetch.c:123 builtin/pull.c:193
8851 msgid "fetch from all remotes"
8852 msgstr "从所有的远程抓取"
8853
8854 #: builtin/fetch.c:125 builtin/pull.c:196
8855 msgid "append to .git/FETCH_HEAD instead of overwriting"
8856 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
8857
8858 #: builtin/fetch.c:127 builtin/pull.c:199
8859 msgid "path to upload pack on remote end"
8860 msgstr "上传包到远程的路径"
8861
8862 #: builtin/fetch.c:128 builtin/pull.c:201
8863 msgid "force overwrite of local branch"
8864 msgstr "强制覆盖本地分支"
8865
8866 #: builtin/fetch.c:130
8867 msgid "fetch from multiple remotes"
8868 msgstr "从多个远程抓取"
8869
8870 #: builtin/fetch.c:132 builtin/pull.c:203
8871 msgid "fetch all tags and associated objects"
8872 msgstr "抓取所有的标签和关联对象"
8873
8874 #: builtin/fetch.c:134
8875 msgid "do not fetch all tags (--no-tags)"
8876 msgstr "不抓取任何标签(--no-tags)"
8877
8878 #: builtin/fetch.c:136
8879 msgid "number of submodules fetched in parallel"
8880 msgstr "子模组获取的并发数"
8881
8882 #: builtin/fetch.c:138 builtin/pull.c:206
8883 msgid "prune remote-tracking branches no longer on remote"
8884 msgstr "清除远程已经不存在的分支的跟踪分支"
8885
8886 #: builtin/fetch.c:140
8887 msgid "prune local tags no longer on remote and clobber changed tags"
8888 msgstr "清除远程不存在的本地标签,并且替换变更标签"
8889
8890 # 译者:可选值,不能翻译
8891 #: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131
8892 msgid "on-demand"
8893 msgstr "on-demand"
8894
8895 #: builtin/fetch.c:142
8896 msgid "control recursive fetching of submodules"
8897 msgstr "控制子模组的递归抓取"
8898
8899 #: builtin/fetch.c:146 builtin/pull.c:214
8900 msgid "keep downloaded pack"
8901 msgstr "保持下载包"
8902
8903 #: builtin/fetch.c:148
8904 msgid "allow updating of HEAD ref"
8905 msgstr "允许更新 HEAD 引用"
8906
8907 #: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217
8908 msgid "deepen history of shallow clone"
8909 msgstr "深化浅克隆的历史"
8910
8911 #: builtin/fetch.c:153
8912 msgid "deepen history of shallow repository based on time"
8913 msgstr "基于时间来深化浅克隆的历史"
8914
8915 #: builtin/fetch.c:159 builtin/pull.c:220
8916 msgid "convert to a complete repository"
8917 msgstr "转换为一个完整的仓库"
8918
8919 #: builtin/fetch.c:162
8920 msgid "prepend this to submodule path output"
8921 msgstr "在子模组路径输出的前面加上此目录"
8922
8923 #: builtin/fetch.c:165
8924 msgid ""
8925 "default for recursive fetching of submodules (lower priority than config "
8926 "files)"
8927 msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
8928
8929 #: builtin/fetch.c:169 builtin/pull.c:223
8930 msgid "accept refs that update .git/shallow"
8931 msgstr "接受更新 .git/shallow 的引用"
8932
8933 #: builtin/fetch.c:170 builtin/pull.c:225
8934 msgid "refmap"
8935 msgstr "引用映射"
8936
8937 #: builtin/fetch.c:171 builtin/pull.c:226
8938 msgid "specify fetch refmap"
8939 msgstr "指定获取操作的引用映射"
8940
8941 #: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
8942 #: builtin/send-pack.c:172
8943 msgid "server-specific"
8944 msgstr "server-specific"
8945
8946 #: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
8947 #: builtin/send-pack.c:173
8948 msgid "option to transmit"
8949 msgstr "传输选项"
8950
8951 #: builtin/fetch.c:442
8952 msgid "Couldn't find remote ref HEAD"
8953 msgstr "无法发现远程 HEAD 引用"
8954
8955 #: builtin/fetch.c:560
8956 #, c-format
8957 msgid "configuration fetch.output contains invalid value %s"
8958 msgstr "配置变量 fetch.output 包含无效值 %s"
8959
8960 #: builtin/fetch.c:653
8961 #, c-format
8962 msgid "object %s not found"
8963 msgstr "对象 %s 未发现"
8964
8965 #: builtin/fetch.c:657
8966 msgid "[up to date]"
8967 msgstr "[最新]"
8968
8969 #: builtin/fetch.c:670 builtin/fetch.c:750
8970 msgid "[rejected]"
8971 msgstr "[已拒绝]"
8972
8973 #: builtin/fetch.c:671
8974 msgid "can't fetch in current branch"
8975 msgstr "当前分支下不能执行获取操作"
8976
8977 #: builtin/fetch.c:680
8978 msgid "[tag update]"
8979 msgstr "[标签更新]"
8980
8981 #: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730
8982 #: builtin/fetch.c:745
8983 msgid "unable to update local ref"
8984 msgstr "不能更新本地引用"
8985
8986 #: builtin/fetch.c:700
8987 msgid "[new tag]"
8988 msgstr "[新标签]"
8989
8990 #: builtin/fetch.c:703
8991 msgid "[new branch]"
8992 msgstr "[新分支]"
8993
8994 #: builtin/fetch.c:706
8995 msgid "[new ref]"
8996 msgstr "[新引用]"
8997
8998 #: builtin/fetch.c:745
8999 msgid "forced update"
9000 msgstr "强制更新"
9001
9002 #: builtin/fetch.c:750
9003 msgid "non-fast-forward"
9004 msgstr "非快进"
9005
9006 #: builtin/fetch.c:795
9007 #, c-format
9008 msgid "%s did not send all necessary objects\n"
9009 msgstr "%s 未发送所有必须的对象\n"
9010
9011 #: builtin/fetch.c:815
9012 #, c-format
9013 msgid "reject %s because shallow roots are not allowed to be updated"
9014 msgstr "拒绝 %s 因为浅克隆不允许被更新"
9015
9016 #: builtin/fetch.c:903 builtin/fetch.c:999
9017 #, c-format
9018 msgid "From %.*s\n"
9019 msgstr "来自 %.*s\n"
9020
9021 #: builtin/fetch.c:914
9022 #, c-format
9023 msgid ""
9024 "some local refs could not be updated; try running\n"
9025 " 'git remote prune %s' to remove any old, conflicting branches"
9026 msgstr ""
9027 "一些本地引用不能被更新;尝试运行\n"
9028 " 'git remote prune %s' 来删除旧的、有冲突的分支"
9029
9030 # 译者:注意保持前导空格
9031 #: builtin/fetch.c:969
9032 #, c-format
9033 msgid " (%s will become dangling)"
9034 msgstr " (%s 将成为摇摆状态)"
9035
9036 # 译者:注意保持前导空格
9037 #: builtin/fetch.c:970
9038 #, c-format
9039 msgid " (%s has become dangling)"
9040 msgstr " (%s 已成为摇摆状态)"
9041
9042 #: builtin/fetch.c:1002
9043 msgid "[deleted]"
9044 msgstr "[已删除]"
9045
9046 #: builtin/fetch.c:1003 builtin/remote.c:1033
9047 msgid "(none)"
9048 msgstr "(无)"
9049
9050 #: builtin/fetch.c:1026
9051 #, c-format
9052 msgid "Refusing to fetch into current branch %s of non-bare repository"
9053 msgstr "拒绝获取到非纯仓库的当前分支 %s"
9054
9055 #: builtin/fetch.c:1045
9056 #, c-format
9057 msgid "Option \"%s\" value \"%s\" is not valid for %s"
9058 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
9059
9060 #: builtin/fetch.c:1048
9061 #, c-format
9062 msgid "Option \"%s\" is ignored for %s\n"
9063 msgstr "选项 \"%s\" 为 %s 所忽略\n"
9064
9065 #: builtin/fetch.c:1287
9066 #, c-format
9067 msgid "Fetching %s\n"
9068 msgstr "正在获取 %s\n"
9069
9070 #: builtin/fetch.c:1289 builtin/remote.c:98
9071 #, c-format
9072 msgid "Could not fetch %s"
9073 msgstr "不能获取 %s"
9074
9075 #: builtin/fetch.c:1335 builtin/fetch.c:1503
9076 msgid ""
9077 "--filter can only be used with the remote configured in core.partialClone"
9078 msgstr "只可以将 --filter 用于在 core.partialClone 中配置的远程仓库"
9079
9080 #: builtin/fetch.c:1358
9081 msgid ""
9082 "No remote repository specified. Please, specify either a URL or a\n"
9083 "remote name from which new revisions should be fetched."
9084 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
9085
9086 #: builtin/fetch.c:1395
9087 msgid "You need to specify a tag name."
9088 msgstr "您需要指定一个标签名称。"
9089
9090 #: builtin/fetch.c:1444
9091 msgid "Negative depth in --deepen is not supported"
9092 msgstr "--deepen 不支持负数深度"
9093
9094 #: builtin/fetch.c:1446
9095 msgid "--deepen and --depth are mutually exclusive"
9096 msgstr "--deepen 和 --depth 是互斥的"
9097
9098 #: builtin/fetch.c:1451
9099 msgid "--depth and --unshallow cannot be used together"
9100 msgstr "--depth 和 --unshallow 不能同时使用"
9101
9102 #: builtin/fetch.c:1453
9103 msgid "--unshallow on a complete repository does not make sense"
9104 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
9105
9106 #: builtin/fetch.c:1469
9107 msgid "fetch --all does not take a repository argument"
9108 msgstr "fetch --all 不能带一个仓库参数"
9109
9110 #: builtin/fetch.c:1471
9111 msgid "fetch --all does not make sense with refspecs"
9112 msgstr "fetch --all 带引用规格没有任何意义"
9113
9114 #: builtin/fetch.c:1480
9115 #, c-format
9116 msgid "No such remote or remote group: %s"
9117 msgstr "没有这样的远程或远程组:%s"
9118
9119 #: builtin/fetch.c:1487
9120 msgid "Fetching a group and specifying refspecs does not make sense"
9121 msgstr "获取组并指定引用规格没有意义"
9122
9123 #: builtin/fmt-merge-msg.c:15
9124 msgid ""
9125 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
9126 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
9127
9128 #: builtin/fmt-merge-msg.c:666
9129 msgid "populate log with at most <n> entries from shortlog"
9130 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
9131
9132 #: builtin/fmt-merge-msg.c:669
9133 msgid "alias for --log (deprecated)"
9134 msgstr "参数 --log 的别名(已弃用)"
9135
9136 #: builtin/fmt-merge-msg.c:672
9137 msgid "text"
9138 msgstr "文本"
9139
9140 #: builtin/fmt-merge-msg.c:673
9141 msgid "use <text> as start of message"
9142 msgstr "使用 <文本> 作为提交说明的开始"
9143
9144 #: builtin/fmt-merge-msg.c:674
9145 msgid "file to read from"
9146 msgstr "从文件中读取"
9147
9148 #: builtin/for-each-ref.c:10
9149 msgid "git for-each-ref [<options>] [<pattern>]"
9150 msgstr "git for-each-ref [<选项>] [<模式>]"
9151
9152 #: builtin/for-each-ref.c:11
9153 msgid "git for-each-ref [--points-at <object>]"
9154 msgstr "git for-each-ref [--points-at <对象>]"
9155
9156 #: builtin/for-each-ref.c:12
9157 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
9158 msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
9159
9160 #: builtin/for-each-ref.c:13
9161 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
9162 msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
9163
9164 #: builtin/for-each-ref.c:28
9165 msgid "quote placeholders suitably for shells"
9166 msgstr "引用占位符适用于 shells"
9167
9168 #: builtin/for-each-ref.c:30
9169 msgid "quote placeholders suitably for perl"
9170 msgstr "引用占位符适用于 perl"
9171
9172 #: builtin/for-each-ref.c:32
9173 msgid "quote placeholders suitably for python"
9174 msgstr "引用占位符适用于 python"
9175
9176 #: builtin/for-each-ref.c:34
9177 msgid "quote placeholders suitably for Tcl"
9178 msgstr "引用占位符适用于 Tcl"
9179
9180 #: builtin/for-each-ref.c:37
9181 msgid "show only <n> matched refs"
9182 msgstr "只显示 <n> 个匹配的引用"
9183
9184 #: builtin/for-each-ref.c:39 builtin/tag.c:421
9185 msgid "respect format colors"
9186 msgstr "遵照格式中的颜色输出"
9187
9188 #: builtin/for-each-ref.c:43
9189 msgid "print only refs which points at the given object"
9190 msgstr "只打印指向给定对象的引用"
9191
9192 #: builtin/for-each-ref.c:45
9193 msgid "print only refs that are merged"
9194 msgstr "只打印已经合并的引用"
9195
9196 #: builtin/for-each-ref.c:46
9197 msgid "print only refs that are not merged"
9198 msgstr "只打印没有合并的引用"
9199
9200 #: builtin/for-each-ref.c:47
9201 msgid "print only refs which contain the commit"
9202 msgstr "只打印包含该提交的引用"
9203
9204 #: builtin/for-each-ref.c:48
9205 msgid "print only refs which don't contain the commit"
9206 msgstr "只打印不包含该提交的引用"
9207
9208 #: builtin/fsck.c:569
9209 msgid "Checking object directories"
9210 msgstr "检查对象目录中"
9211
9212 #: builtin/fsck.c:661
9213 msgid "git fsck [<options>] [<object>...]"
9214 msgstr "git fsck [<选项>] [<对象>...]"
9215
9216 #: builtin/fsck.c:667
9217 msgid "show unreachable objects"
9218 msgstr "显示不可达的对象"
9219
9220 #: builtin/fsck.c:668
9221 msgid "show dangling objects"
9222 msgstr "显示摇摆的对象"
9223
9224 #: builtin/fsck.c:669
9225 msgid "report tags"
9226 msgstr "报告标签"
9227
9228 #: builtin/fsck.c:670
9229 msgid "report root nodes"
9230 msgstr "报告根节点"
9231
9232 #: builtin/fsck.c:671
9233 msgid "make index objects head nodes"
9234 msgstr "将索引亦作为检查的头节点"
9235
9236 #: builtin/fsck.c:672
9237 msgid "make reflogs head nodes (default)"
9238 msgstr "将引用日志作为检查的头节点(默认)"
9239
9240 #: builtin/fsck.c:673
9241 msgid "also consider packs and alternate objects"
9242 msgstr "也考虑包和备用对象"
9243
9244 #: builtin/fsck.c:674
9245 msgid "check only connectivity"
9246 msgstr "仅检查连通性"
9247
9248 #: builtin/fsck.c:675
9249 msgid "enable more strict checking"
9250 msgstr "启用更严格的检查"
9251
9252 #: builtin/fsck.c:677
9253 msgid "write dangling objects in .git/lost-found"
9254 msgstr "将摇摆对象写入 .git/lost-found 中"
9255
9256 #: builtin/fsck.c:678 builtin/prune.c:109
9257 msgid "show progress"
9258 msgstr "显示进度"
9259
9260 #: builtin/fsck.c:679
9261 msgid "show verbose names for reachable objects"
9262 msgstr "显示可达对象的详细名称"
9263
9264 #: builtin/fsck.c:745
9265 msgid "Checking objects"
9266 msgstr "检查对象中"
9267
9268 #: builtin/gc.c:33
9269 msgid "git gc [<options>]"
9270 msgstr "git gc [<选项>]"
9271
9272 #: builtin/gc.c:88
9273 #, c-format
9274 msgid "Failed to fstat %s: %s"
9275 msgstr "对 %s 调用 fstat 失败:%s"
9276
9277 #: builtin/gc.c:452
9278 #, c-format
9279 msgid "Can't stat %s"
9280 msgstr "不能对 %s 调用 stat"
9281
9282 #: builtin/gc.c:461
9283 #, c-format
9284 msgid ""
9285 "The last gc run reported the following. Please correct the root cause\n"
9286 "and remove %s.\n"
9287 "Automatic cleanup will not be performed until the file is removed.\n"
9288 "\n"
9289 "%s"
9290 msgstr ""
9291 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
9292 "在该文件被删除之前,自动清理将不会执行。\n"
9293 "\n"
9294 "%s"
9295
9296 #: builtin/gc.c:502
9297 msgid "prune unreferenced objects"
9298 msgstr "清除未引用的对象"
9299
9300 #: builtin/gc.c:504
9301 msgid "be more thorough (increased runtime)"
9302 msgstr "更彻底(增加运行时间)"
9303
9304 #: builtin/gc.c:505
9305 msgid "enable auto-gc mode"
9306 msgstr "启用自动垃圾回收模式"
9307
9308 #: builtin/gc.c:508
9309 msgid "force running gc even if there may be another gc running"
9310 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
9311
9312 #: builtin/gc.c:511
9313 msgid "repack all other packs except the largest pack"
9314 msgstr "除了最大的包之外,对所有其它包文件重新打包"
9315
9316 #: builtin/gc.c:528
9317 #, c-format
9318 msgid "failed to parse gc.logexpiry value %s"
9319 msgstr "无法解析 gc.logexpiry 的值 %s"
9320
9321 #: builtin/gc.c:539
9322 #, c-format
9323 msgid "failed to parse prune expiry value %s"
9324 msgstr "无法解析 gc.logexpiry 的值 %s"
9325
9326 #: builtin/gc.c:559
9327 #, c-format
9328 msgid "Auto packing the repository in background for optimum performance.\n"
9329 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
9330
9331 #: builtin/gc.c:561
9332 #, c-format
9333 msgid "Auto packing the repository for optimum performance.\n"
9334 msgstr "自动打包仓库以求最佳性能。\n"
9335
9336 #: builtin/gc.c:562
9337 #, c-format
9338 msgid "See \"git help gc\" for manual housekeeping.\n"
9339 msgstr "手工维护参见 \"git help gc\"。\n"
9340
9341 #: builtin/gc.c:598
9342 #, c-format
9343 msgid ""
9344 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
9345 msgstr ""
9346 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
9347
9348 #: builtin/gc.c:645
9349 msgid ""
9350 "There are too many unreachable loose objects; run 'git prune' to remove them."
9351 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
9352
9353 #: builtin/grep.c:28
9354 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
9355 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
9356
9357 #: builtin/grep.c:226
9358 #, c-format
9359 msgid "grep: failed to create thread: %s"
9360 msgstr "grep:无法创建线程:%s"
9361
9362 #: builtin/grep.c:284
9363 #, c-format
9364 msgid "invalid number of threads specified (%d) for %s"
9365 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
9366
9367 #. TRANSLATORS: %s is the configuration
9368 #. variable for tweaking threads, currently
9369 #. grep.threads
9370 #.
9371 #: builtin/grep.c:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727
9372 #, c-format
9373 msgid "no threads support, ignoring %s"
9374 msgstr "没有线程支持,忽略 %s"
9375
9376 #: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623
9377 #, c-format
9378 msgid "unable to read tree (%s)"
9379 msgstr "无法读取树(%s)"
9380
9381 #: builtin/grep.c:638
9382 #, c-format
9383 msgid "unable to grep from object of type %s"
9384 msgstr "无法抓取来自于 %s 类型的对象"
9385
9386 #: builtin/grep.c:703
9387 #, c-format
9388 msgid "switch `%c' expects a numerical value"
9389 msgstr "开关 `%c' 期望一个数字值"
9390
9391 #: builtin/grep.c:790
9392 msgid "search in index instead of in the work tree"
9393 msgstr "在索引区搜索而不是在工作区"
9394
9395 #: builtin/grep.c:792
9396 msgid "find in contents not managed by git"
9397 msgstr "在未被 git 管理的内容中查找"
9398
9399 # 译者:中文字符串拼接,可删除前导空格
9400 #: builtin/grep.c:794
9401 msgid "search in both tracked and untracked files"
9402 msgstr "在跟踪和未跟踪的文件中搜索"
9403
9404 #: builtin/grep.c:796
9405 msgid "ignore files specified via '.gitignore'"
9406 msgstr "忽略 '.gitignore' 包含的文件"
9407
9408 #: builtin/grep.c:798
9409 msgid "recursively search in each submodule"
9410 msgstr "在每一个子模组中递归搜索"
9411
9412 #: builtin/grep.c:801
9413 msgid "show non-matching lines"
9414 msgstr "显示未匹配的行"
9415
9416 #: builtin/grep.c:803
9417 msgid "case insensitive matching"
9418 msgstr "不区分大小写匹配"
9419
9420 #: builtin/grep.c:805
9421 msgid "match patterns only at word boundaries"
9422 msgstr "只在单词边界匹配模式"
9423
9424 #: builtin/grep.c:807
9425 msgid "process binary files as text"
9426 msgstr "把二进制文件当做文本处理"
9427
9428 #: builtin/grep.c:809
9429 msgid "don't match patterns in binary files"
9430 msgstr "不在二进制文件中匹配模式"
9431
9432 #: builtin/grep.c:812
9433 msgid "process binary files with textconv filters"
9434 msgstr "用 textconv 过滤器处理二进制文件"
9435
9436 #: builtin/grep.c:814
9437 msgid "descend at most <depth> levels"
9438 msgstr "最多以指定的深度向下寻找"
9439
9440 #: builtin/grep.c:818
9441 msgid "use extended POSIX regular expressions"
9442 msgstr "使用扩展的 POSIX 正则表达式"
9443
9444 #: builtin/grep.c:821
9445 msgid "use basic POSIX regular expressions (default)"
9446 msgstr "使用基本的 POSIX 正则表达式(默认)"
9447
9448 #: builtin/grep.c:824
9449 msgid "interpret patterns as fixed strings"
9450 msgstr "把模式解析为固定的字符串"
9451
9452 #: builtin/grep.c:827
9453 msgid "use Perl-compatible regular expressions"
9454 msgstr "使用 Perl 兼容的正则表达式"
9455
9456 #: builtin/grep.c:830
9457 msgid "show line numbers"
9458 msgstr "显示行号"
9459
9460 #: builtin/grep.c:831
9461 msgid "don't show filenames"
9462 msgstr "不显示文件名"
9463
9464 #: builtin/grep.c:832
9465 msgid "show filenames"
9466 msgstr "显示文件名"
9467
9468 #: builtin/grep.c:834
9469 msgid "show filenames relative to top directory"
9470 msgstr "显示相对于顶级目录的文件名"
9471
9472 #: builtin/grep.c:836
9473 msgid "show only filenames instead of matching lines"
9474 msgstr "只显示文件名而不显示匹配的行"
9475
9476 #: builtin/grep.c:838
9477 msgid "synonym for --files-with-matches"
9478 msgstr "和 --files-with-matches 同义"
9479
9480 #: builtin/grep.c:841
9481 msgid "show only the names of files without match"
9482 msgstr "只显示未匹配的文件名"
9483
9484 #: builtin/grep.c:843
9485 msgid "print NUL after filenames"
9486 msgstr "在文件名后输出 NUL 字符"
9487
9488 #: builtin/grep.c:846
9489 msgid "show the number of matches instead of matching lines"
9490 msgstr "显示总匹配行数,而不显示匹配的行"
9491
9492 #: builtin/grep.c:847
9493 msgid "highlight matches"
9494 msgstr "高亮显示匹配项"
9495
9496 #: builtin/grep.c:849
9497 msgid "print empty line between matches from different files"
9498 msgstr "在不同文件的匹配项之间打印空行"
9499
9500 #: builtin/grep.c:851
9501 msgid "show filename only once above matches from same file"
9502 msgstr "只在同一文件的匹配项的上面显示一次文件名"
9503
9504 #: builtin/grep.c:854
9505 msgid "show <n> context lines before and after matches"
9506 msgstr "显示匹配项前后的 <n> 行上下文"
9507
9508 #: builtin/grep.c:857
9509 msgid "show <n> context lines before matches"
9510 msgstr "显示匹配项前 <n> 行上下文"
9511
9512 #: builtin/grep.c:859
9513 msgid "show <n> context lines after matches"
9514 msgstr "显示匹配项后 <n> 行上下文"
9515
9516 #: builtin/grep.c:861
9517 msgid "use <n> worker threads"
9518 msgstr "使用 <n> 个工作线程"
9519
9520 #: builtin/grep.c:862
9521 msgid "shortcut for -C NUM"
9522 msgstr "快捷键 -C 数字"
9523
9524 #: builtin/grep.c:865
9525 msgid "show a line with the function name before matches"
9526 msgstr "在匹配的前面显示一行函数名"
9527
9528 #: builtin/grep.c:867
9529 msgid "show the surrounding function"
9530 msgstr "显示所在函数的前后内容"
9531
9532 #: builtin/grep.c:870
9533 msgid "read patterns from file"
9534 msgstr "从文件读取模式"
9535
9536 #: builtin/grep.c:872
9537 msgid "match <pattern>"
9538 msgstr "匹配 <模式>"
9539
9540 #: builtin/grep.c:874
9541 msgid "combine patterns specified with -e"
9542 msgstr "组合用 -e 参数设定的模式"
9543
9544 #: builtin/grep.c:886
9545 msgid "indicate hit with exit status without output"
9546 msgstr "不输出,而用退出码标识命中状态"
9547
9548 #: builtin/grep.c:888
9549 msgid "show only matches from files that match all patterns"
9550 msgstr "只显示匹配所有模式的文件中的匹配"
9551
9552 #: builtin/grep.c:890
9553 msgid "show parse tree for grep expression"
9554 msgstr "显示 grep 表达式的解析树"
9555
9556 #: builtin/grep.c:894
9557 msgid "pager"
9558 msgstr "分页"
9559
9560 #: builtin/grep.c:894
9561 msgid "show matching files in the pager"
9562 msgstr "分页显示匹配的文件"
9563
9564 #: builtin/grep.c:898
9565 msgid "allow calling of grep(1) (ignored by this build)"
9566 msgstr "允许调用 grep(1)(本次构建忽略)"
9567
9568 #: builtin/grep.c:962
9569 msgid "no pattern given."
9570 msgstr "未提供模式匹配。"
9571
9572 #: builtin/grep.c:994
9573 msgid "--no-index or --untracked cannot be used with revs"
9574 msgstr "--no-index 或 --untracked 不能和版本同时使用"
9575
9576 #: builtin/grep.c:1001
9577 #, c-format
9578 msgid "unable to resolve revision: %s"
9579 msgstr "不能解析版本:%s"
9580
9581 #: builtin/grep.c:1036 builtin/index-pack.c:1531
9582 #, c-format
9583 msgid "invalid number of threads specified (%d)"
9584 msgstr "指定的线程数无效(%d)"
9585
9586 #: builtin/grep.c:1041
9587 msgid "no threads support, ignoring --threads"
9588 msgstr "没有线程支持,忽略 --threads"
9589
9590 #: builtin/grep.c:1065
9591 msgid "--open-files-in-pager only works on the worktree"
9592 msgstr "--open-files-in-pager 仅用于工作区"
9593
9594 #: builtin/grep.c:1088
9595 msgid "option not supported with --recurse-submodules."
9596 msgstr "选项不支持和 --recurse-submodules 共用。"
9597
9598 #: builtin/grep.c:1094
9599 msgid "--cached or --untracked cannot be used with --no-index."
9600 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
9601
9602 #: builtin/grep.c:1100
9603 msgid "--[no-]exclude-standard cannot be used for tracked contents."
9604 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
9605
9606 #: builtin/grep.c:1108
9607 msgid "both --cached and trees are given."
9608 msgstr "同时给出了 --cached 和树对象。"
9609
9610 #: builtin/hash-object.c:83
9611 msgid ""
9612 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
9613 "[--] <file>..."
9614 msgstr ""
9615 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
9616 "[--] <文件>..."
9617
9618 #: builtin/hash-object.c:84
9619 msgid "git hash-object --stdin-paths"
9620 msgstr "git hash-object --stdin-paths"
9621
9622 #: builtin/hash-object.c:96
9623 msgid "type"
9624 msgstr "类型"
9625
9626 #: builtin/hash-object.c:96
9627 msgid "object type"
9628 msgstr "对象类型"
9629
9630 #: builtin/hash-object.c:97
9631 msgid "write the object into the object database"
9632 msgstr "将对象写入对象数据库"
9633
9634 #: builtin/hash-object.c:99
9635 msgid "read the object from stdin"
9636 msgstr "从标准输入读取对象"
9637
9638 #: builtin/hash-object.c:101
9639 msgid "store file as is without filters"
9640 msgstr "原样存储文件不使用过滤器"
9641
9642 #: builtin/hash-object.c:102
9643 msgid ""
9644 "just hash any random garbage to create corrupt objects for debugging Git"
9645 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
9646
9647 #: builtin/hash-object.c:103
9648 msgid "process file as it were from this path"
9649 msgstr "处理文件并假设其来自于此路径"
9650
9651 #: builtin/help.c:45
9652 msgid "print all available commands"
9653 msgstr "打印所有可用的命令"
9654
9655 #: builtin/help.c:46
9656 msgid "exclude guides"
9657 msgstr "排除向导"
9658
9659 #: builtin/help.c:47
9660 msgid "print list of useful guides"
9661 msgstr "显示有用的指南列表"
9662
9663 #: builtin/help.c:48
9664 msgid "show man page"
9665 msgstr "显示 man 手册"
9666
9667 #: builtin/help.c:49
9668 msgid "show manual in web browser"
9669 msgstr "在 web 浏览器中显示手册"
9670
9671 #: builtin/help.c:51
9672 msgid "show info page"
9673 msgstr "显示 info 手册"
9674
9675 #: builtin/help.c:53
9676 msgid "print command description"
9677 msgstr "打印命令描述"
9678
9679 #: builtin/help.c:58
9680 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
9681 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
9682
9683 #: builtin/help.c:70
9684 #, c-format
9685 msgid "unrecognized help format '%s'"
9686 msgstr "未能识别的帮助格式 '%s'"
9687
9688 #: builtin/help.c:97
9689 msgid "Failed to start emacsclient."
9690 msgstr "无法启动 emacsclient。"
9691
9692 #: builtin/help.c:110
9693 msgid "Failed to parse emacsclient version."
9694 msgstr "无法解析 emacsclient 版本。"
9695
9696 #: builtin/help.c:118
9697 #, c-format
9698 msgid "emacsclient version '%d' too old (< 22)."
9699 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
9700
9701 #: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176
9702 #, c-format
9703 msgid "failed to exec '%s'"
9704 msgstr "无法执行 '%s'"
9705
9706 #: builtin/help.c:214
9707 #, c-format
9708 msgid ""
9709 "'%s': path for unsupported man viewer.\n"
9710 "Please consider using 'man.<tool>.cmd' instead."
9711 msgstr ""
9712 "'%s':不支持的 man 手册查看器的路径。\n"
9713 "请使用 'man.<工具>.cmd'。"
9714
9715 #: builtin/help.c:226
9716 #, c-format
9717 msgid ""
9718 "'%s': cmd for supported man viewer.\n"
9719 "Please consider using 'man.<tool>.path' instead."
9720 msgstr ""
9721 "'%s': 支持的 man 手册查看器命令。\n"
9722 "请使用 'man.<工具>.path'。"
9723
9724 #: builtin/help.c:343
9725 #, c-format
9726 msgid "'%s': unknown man viewer."
9727 msgstr "'%s':未知的 man 查看器。"
9728
9729 #: builtin/help.c:360
9730 msgid "no man viewer handled the request"
9731 msgstr "没有 man 查看器处理此请求"
9732
9733 #: builtin/help.c:368
9734 msgid "no info viewer handled the request"
9735 msgstr "没有 info 查看器处理此请求"
9736
9737 #: builtin/help.c:415
9738 #, c-format
9739 msgid "'%s' is aliased to '%s'"
9740 msgstr "'%s' 是 '%s' 的别名"
9741
9742 #: builtin/help.c:442 builtin/help.c:459
9743 #, c-format
9744 msgid "usage: %s%s"
9745 msgstr "用法:%s%s"
9746
9747 #: builtin/index-pack.c:158
9748 #, c-format
9749 msgid "unable to open %s"
9750 msgstr "不能打开 %s"
9751
9752 #: builtin/index-pack.c:208
9753 #, c-format
9754 msgid "object type mismatch at %s"
9755 msgstr "%s 的对象类型不匹配"
9756
9757 #: builtin/index-pack.c:228
9758 #, c-format
9759 msgid "did not receive expected object %s"
9760 msgstr "未能获取预期的对象 %s"
9761
9762 #: builtin/index-pack.c:231
9763 #, c-format
9764 msgid "object %s: expected type %s, found %s"
9765 msgstr "对象 %s:应为类型 %s,却是 %s"
9766
9767 #: builtin/index-pack.c:273
9768 #, c-format
9769 msgid "cannot fill %d byte"
9770 msgid_plural "cannot fill %d bytes"
9771 msgstr[0] "无法填充 %d 字节"
9772 msgstr[1] "无法填充 %d 字节"
9773
9774 #: builtin/index-pack.c:283
9775 msgid "early EOF"
9776 msgstr "过早的文件结束符(EOF)"
9777
9778 #: builtin/index-pack.c:284
9779 msgid "read error on input"
9780 msgstr "输入上的读错误"
9781
9782 #: builtin/index-pack.c:296
9783 msgid "used more bytes than were available"
9784 msgstr "用掉了超过可用的字节"
9785
9786 #: builtin/index-pack.c:303
9787 msgid "pack too large for current definition of off_t"
9788 msgstr "包太大超过了当前 off_t 的定义"
9789
9790 #: builtin/index-pack.c:306 builtin/unpack-objects.c:93
9791 msgid "pack exceeds maximum allowed size"
9792 msgstr "包超过了最大允许值"
9793
9794 #: builtin/index-pack.c:321
9795 #, c-format
9796 msgid "unable to create '%s'"
9797 msgstr "不能创建 '%s'"
9798
9799 #: builtin/index-pack.c:327
9800 #, c-format
9801 msgid "cannot open packfile '%s'"
9802 msgstr "无法打开包文件 '%s'"
9803
9804 #: builtin/index-pack.c:341
9805 msgid "pack signature mismatch"
9806 msgstr "包签名不匹配"
9807
9808 #: builtin/index-pack.c:343
9809 #, c-format
9810 msgid "pack version %<PRIu32> unsupported"
9811 msgstr "不支持包版本 %<PRIu32>"
9812
9813 #: builtin/index-pack.c:361
9814 #, c-format
9815 msgid "pack has bad object at offset %<PRIuMAX>: %s"
9816 msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
9817
9818 #: builtin/index-pack.c:482
9819 #, c-format
9820 msgid "inflate returned %d"
9821 msgstr "解压缩返回 %d"
9822
9823 #: builtin/index-pack.c:531
9824 msgid "offset value overflow for delta base object"
9825 msgstr "偏移值覆盖了 delta 基准对象"
9826
9827 #: builtin/index-pack.c:539
9828 msgid "delta base offset is out of bound"
9829 msgstr "delta 基准偏移越界"
9830
9831 #: builtin/index-pack.c:547
9832 #, c-format
9833 msgid "unknown object type %d"
9834 msgstr "未知对象类型 %d"
9835
9836 #: builtin/index-pack.c:578
9837 msgid "cannot pread pack file"
9838 msgstr "无法读取包文件"
9839
9840 #: builtin/index-pack.c:580
9841 #, c-format
9842 msgid "premature end of pack file, %<PRIuMAX> byte missing"
9843 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
9844 msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
9845 msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
9846
9847 #: builtin/index-pack.c:606
9848 msgid "serious inflate inconsistency"
9849 msgstr "解压缩严重的不一致"
9850
9851 #: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780
9852 #: builtin/index-pack.c:819 builtin/index-pack.c:828
9853 #, c-format
9854 msgid "SHA1 COLLISION FOUND WITH %s !"
9855 msgstr "发现 %s 出现 SHA1 冲突!"
9856
9857 #: builtin/index-pack.c:754 builtin/pack-objects.c:198
9858 #: builtin/pack-objects.c:292
9859 #, c-format
9860 msgid "unable to read %s"
9861 msgstr "不能读 %s"
9862
9863 #: builtin/index-pack.c:817
9864 #, c-format
9865 msgid "cannot read existing object info %s"
9866 msgstr "不能读取现存对象信息 %s"
9867
9868 #: builtin/index-pack.c:825
9869 #, c-format
9870 msgid "cannot read existing object %s"
9871 msgstr "不能读取现存对象 %s"
9872
9873 #: builtin/index-pack.c:839
9874 #, c-format
9875 msgid "invalid blob object %s"
9876 msgstr "无效的数据对象 %s"
9877
9878 #: builtin/index-pack.c:842 builtin/index-pack.c:860
9879 msgid "fsck error in packed object"
9880 msgstr "对打包对象 fsck 检查出错"
9881
9882 #: builtin/index-pack.c:857
9883 #, c-format
9884 msgid "invalid %s"
9885 msgstr "无效的 %s"
9886
9887 #: builtin/index-pack.c:862
9888 #, c-format
9889 msgid "Not all child objects of %s are reachable"
9890 msgstr "%s 的所有子对象并非都可达"
9891
9892 #: builtin/index-pack.c:934 builtin/index-pack.c:965
9893 msgid "failed to apply delta"
9894 msgstr "无法应用 delta"
9895
9896 #: builtin/index-pack.c:1135
9897 msgid "Receiving objects"
9898 msgstr "接收对象中"
9899
9900 #: builtin/index-pack.c:1135
9901 msgid "Indexing objects"
9902 msgstr "索引对象中"
9903
9904 #: builtin/index-pack.c:1169
9905 msgid "pack is corrupted (SHA1 mismatch)"
9906 msgstr "包冲突(SHA1 不匹配)"
9907
9908 #: builtin/index-pack.c:1174
9909 msgid "cannot fstat packfile"
9910 msgstr "不能对包文件调用 fstat"
9911
9912 #: builtin/index-pack.c:1177
9913 msgid "pack has junk at the end"
9914 msgstr "包的结尾有垃圾数据"
9915
9916 #: builtin/index-pack.c:1189
9917 msgid "confusion beyond insanity in parse_pack_objects()"
9918 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
9919
9920 #: builtin/index-pack.c:1212
9921 msgid "Resolving deltas"
9922 msgstr "处理 delta 中"
9923
9924 #: builtin/index-pack.c:1223
9925 #, c-format
9926 msgid "unable to create thread: %s"
9927 msgstr "不能创建线程:%s"
9928
9929 #: builtin/index-pack.c:1265
9930 msgid "confusion beyond insanity"
9931 msgstr "不可理喻"
9932
9933 #: builtin/index-pack.c:1271
9934 #, c-format
9935 msgid "completed with %d local object"
9936 msgid_plural "completed with %d local objects"
9937 msgstr[0] "完成 %d 个本地对象"
9938 msgstr[1] "完成 %d 个本地对象"
9939
9940 #: builtin/index-pack.c:1283
9941 #, c-format
9942 msgid "Unexpected tail checksum for %s (disk corruption?)"
9943 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
9944
9945 #: builtin/index-pack.c:1287
9946 #, c-format
9947 msgid "pack has %d unresolved delta"
9948 msgid_plural "pack has %d unresolved deltas"
9949 msgstr[0] "包有 %d 个未解决的 delta"
9950 msgstr[1] "包有 %d 个未解决的 delta"
9951
9952 #: builtin/index-pack.c:1311
9953 #, c-format
9954 msgid "unable to deflate appended object (%d)"
9955 msgstr "不能压缩附加对象(%d)"
9956
9957 #: builtin/index-pack.c:1388
9958 #, c-format
9959 msgid "local object %s is corrupt"
9960 msgstr "本地对象 %s 已损坏"
9961
9962 #: builtin/index-pack.c:1402
9963 #, c-format
9964 msgid "packfile name '%s' does not end with '.pack'"
9965 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
9966
9967 #: builtin/index-pack.c:1427
9968 #, c-format
9969 msgid "cannot write %s file '%s'"
9970 msgstr "无法写入 %s 文件 '%s'"
9971
9972 #: builtin/index-pack.c:1435
9973 #, c-format
9974 msgid "cannot close written %s file '%s'"
9975 msgstr "无法关闭已写入的 %s 文件 '%s'"
9976
9977 #: builtin/index-pack.c:1459
9978 msgid "error while closing pack file"
9979 msgstr "关闭包文件时出错"
9980
9981 #: builtin/index-pack.c:1473
9982 msgid "cannot store pack file"
9983 msgstr "无法存储包文件"
9984
9985 #: builtin/index-pack.c:1481
9986 msgid "cannot store index file"
9987 msgstr "无法存储索引文件"
9988
9989 #: builtin/index-pack.c:1525
9990 #, c-format
9991 msgid "bad pack.indexversion=%<PRIu32>"
9992 msgstr "坏的 pack.indexversion=%<PRIu32>"
9993
9994 #: builtin/index-pack.c:1594
9995 #, c-format
9996 msgid "Cannot open existing pack file '%s'"
9997 msgstr "无法打开现存包文件 '%s'"
9998
9999 #: builtin/index-pack.c:1596
10000 #, c-format
10001 msgid "Cannot open existing pack idx file for '%s'"
10002 msgstr "无法为 %s 打开包索引文件"
10003
10004 #: builtin/index-pack.c:1644
10005 #, c-format
10006 msgid "non delta: %d object"
10007 msgid_plural "non delta: %d objects"
10008 msgstr[0] "非 delta:%d 个对象"
10009 msgstr[1] "非 delta:%d 个对象"
10010
10011 #: builtin/index-pack.c:1651
10012 #, c-format
10013 msgid "chain length = %d: %lu object"
10014 msgid_plural "chain length = %d: %lu objects"
10015 msgstr[0] "链长 = %d: %lu 对象"
10016 msgstr[1] "链长 = %d: %lu 对象"
10017
10018 #: builtin/index-pack.c:1688
10019 msgid "Cannot come back to cwd"
10020 msgstr "无法返回当前工作目录"
10021
10022 #: builtin/index-pack.c:1739 builtin/index-pack.c:1742
10023 #: builtin/index-pack.c:1758 builtin/index-pack.c:1762
10024 #, c-format
10025 msgid "bad %s"
10026 msgstr "错误选项 %s"
10027
10028 #: builtin/index-pack.c:1778
10029 msgid "--fix-thin cannot be used without --stdin"
10030 msgstr "--fix-thin 不能和 --stdin 同时使用"
10031
10032 #: builtin/index-pack.c:1780
10033 msgid "--stdin requires a git repository"
10034 msgstr "--stdin 需要一个 git 仓库"
10035
10036 #: builtin/index-pack.c:1786
10037 msgid "--verify with no packfile name given"
10038 msgstr "--verify 没有提供包文件名参数"
10039
10040 #: builtin/index-pack.c:1836 builtin/unpack-objects.c:578
10041 msgid "fsck error in pack objects"
10042 msgstr "在打包对象中 fsck 检查出错"
10043
10044 #: builtin/init-db.c:55
10045 #, c-format
10046 msgid "cannot stat '%s'"
10047 msgstr "不能对 '%s' 调用 stat"
10048
10049 #: builtin/init-db.c:61
10050 #, c-format
10051 msgid "cannot stat template '%s'"
10052 msgstr "不能对模版 '%s' 调用 stat"
10053
10054 #: builtin/init-db.c:66
10055 #, c-format
10056 msgid "cannot opendir '%s'"
10057 msgstr "不能打开目录 '%s'"
10058
10059 #: builtin/init-db.c:77
10060 #, c-format
10061 msgid "cannot readlink '%s'"
10062 msgstr "不能读取链接 '%s'"
10063
10064 #: builtin/init-db.c:79
10065 #, c-format
10066 msgid "cannot symlink '%s' '%s'"
10067 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
10068
10069 #: builtin/init-db.c:85
10070 #, c-format
10071 msgid "cannot copy '%s' to '%s'"
10072 msgstr "不能拷贝 '%s' 至 '%s'"
10073
10074 #: builtin/init-db.c:89
10075 #, c-format
10076 msgid "ignoring template %s"
10077 msgstr "忽略模版 %s"
10078
10079 #: builtin/init-db.c:120
10080 #, c-format
10081 msgid "templates not found in %s"
10082 msgstr "没有在 %s 中找到模版"
10083
10084 #: builtin/init-db.c:135
10085 #, c-format
10086 msgid "not copying templates from '%s': %s"
10087 msgstr "没有从 '%s' 复制模版:%s"
10088
10089 #: builtin/init-db.c:328
10090 #, c-format
10091 msgid "unable to handle file type %d"
10092 msgstr "不能处理 %d 类型的文件"
10093
10094 #: builtin/init-db.c:331
10095 #, c-format
10096 msgid "unable to move %s to %s"
10097 msgstr "不能移动 %s 至 %s"
10098
10099 #: builtin/init-db.c:348 builtin/init-db.c:351
10100 #, c-format
10101 msgid "%s already exists"
10102 msgstr "%s 已经存在"
10103
10104 #: builtin/init-db.c:404
10105 #, c-format
10106 msgid "Reinitialized existing shared Git repository in %s%s\n"
10107 msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
10108
10109 #: builtin/init-db.c:405
10110 #, c-format
10111 msgid "Reinitialized existing Git repository in %s%s\n"
10112 msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
10113
10114 #: builtin/init-db.c:409
10115 #, c-format
10116 msgid "Initialized empty shared Git repository in %s%s\n"
10117 msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
10118
10119 #: builtin/init-db.c:410
10120 #, c-format
10121 msgid "Initialized empty Git repository in %s%s\n"
10122 msgstr "已初始化空的 Git 仓库于 %s%s\n"
10123
10124 #: builtin/init-db.c:458
10125 msgid ""
10126 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
10127 "shared[=<permissions>]] [<directory>]"
10128 msgstr ""
10129 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
10130 "[<目录>]"
10131
10132 #: builtin/init-db.c:481
10133 msgid "permissions"
10134 msgstr "权限"
10135
10136 #: builtin/init-db.c:482
10137 msgid "specify that the git repository is to be shared amongst several users"
10138 msgstr "指定 git 仓库是多个用户之间共享的"
10139
10140 #: builtin/init-db.c:525
10141 #, c-format
10142 msgid "cannot chdir to %s"
10143 msgstr "不能切换目录到 %s"
10144
10145 #: builtin/init-db.c:546
10146 #, c-format
10147 msgid ""
10148 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
10149 "dir=<directory>)"
10150 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
10151
10152 #: builtin/init-db.c:574
10153 #, c-format
10154 msgid "Cannot access work tree '%s'"
10155 msgstr "不能访问工作区 '%s'"
10156
10157 #: builtin/interpret-trailers.c:15
10158 msgid ""
10159 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
10160 "<token>[(=|:)<value>])...] [<file>...]"
10161 msgstr ""
10162 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
10163 ">])...] [<文件>...]"
10164
10165 #: builtin/interpret-trailers.c:92
10166 msgid "edit files in place"
10167 msgstr "在原位编辑文件"
10168
10169 #: builtin/interpret-trailers.c:93
10170 msgid "trim empty trailers"
10171 msgstr "删除空的尾部署名"
10172
10173 #: builtin/interpret-trailers.c:96
10174 msgid "where to place the new trailer"
10175 msgstr "在哪里放置新的尾部署名"
10176
10177 #: builtin/interpret-trailers.c:98
10178 msgid "action if trailer already exists"
10179 msgstr "当尾部署名已经存在时所采取的动作"
10180
10181 #: builtin/interpret-trailers.c:100
10182 msgid "action if trailer is missing"
10183 msgstr "当尾部署名缺失时所采取的动作"
10184
10185 #: builtin/interpret-trailers.c:102
10186 msgid "output only the trailers"
10187 msgstr "只输出尾部署名"
10188
10189 #: builtin/interpret-trailers.c:103
10190 msgid "do not apply config rules"
10191 msgstr "不要应用配置规则"
10192
10193 #: builtin/interpret-trailers.c:104
10194 msgid "join whitespace-continued values"
10195 msgstr "连接空白折行的值"
10196
10197 #: builtin/interpret-trailers.c:105
10198 msgid "set parsing options"
10199 msgstr "设置解析选项"
10200
10201 #: builtin/interpret-trailers.c:107
10202 msgid "trailer"
10203 msgstr "尾部署名"
10204
10205 #: builtin/interpret-trailers.c:108
10206 msgid "trailer(s) to add"
10207 msgstr "要添加的尾部署名"
10208
10209 #: builtin/interpret-trailers.c:117
10210 msgid "--trailer with --only-input does not make sense"
10211 msgstr "--trailer 和 --only-input 同时使用没有意义"
10212
10213 #: builtin/interpret-trailers.c:127
10214 msgid "no input file given for in-place editing"
10215 msgstr "没有给出要原位编辑的文件"
10216
10217 #: builtin/log.c:48
10218 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
10219 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
10220
10221 #: builtin/log.c:49
10222 msgid "git show [<options>] <object>..."
10223 msgstr "git show [<选项>] <对象>..."
10224
10225 #: builtin/log.c:93
10226 #, c-format
10227 msgid "invalid --decorate option: %s"
10228 msgstr "无效的 --decorate 选项:%s"
10229
10230 #: builtin/log.c:153
10231 msgid "suppress diff output"
10232 msgstr "不显示差异输出"
10233
10234 #: builtin/log.c:154
10235 msgid "show source"
10236 msgstr "显示源"
10237
10238 #: builtin/log.c:155
10239 msgid "Use mail map file"
10240 msgstr "使用邮件映射文件"
10241
10242 #: builtin/log.c:157
10243 msgid "only decorate refs that match <pattern>"
10244 msgstr "只修饰与 <模式> 匹配的引用"
10245
10246 #: builtin/log.c:159
10247 msgid "do not decorate refs that match <pattern>"
10248 msgstr "不修饰和 <模式> 匹配的引用"
10249
10250 #: builtin/log.c:160
10251 msgid "decorate options"
10252 msgstr "修饰选项"
10253
10254 #: builtin/log.c:163
10255 msgid "Process line range n,m in file, counting from 1"
10256 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
10257
10258 #: builtin/log.c:259
10259 #, c-format
10260 msgid "Final output: %d %s\n"
10261 msgstr "最终输出:%d %s\n"
10262
10263 #: builtin/log.c:510
10264 #, c-format
10265 msgid "git show %s: bad file"
10266 msgstr "git show %s: 损坏的文件"
10267
10268 #: builtin/log.c:525 builtin/log.c:619
10269 #, c-format
10270 msgid "Could not read object %s"
10271 msgstr "不能读取对象 %s"
10272
10273 #: builtin/log.c:643
10274 #, c-format
10275 msgid "Unknown type: %d"
10276 msgstr "未知类型:%d"
10277
10278 #: builtin/log.c:764
10279 msgid "format.headers without value"
10280 msgstr "format.headers 没有值"
10281
10282 #: builtin/log.c:865
10283 msgid "name of output directory is too long"
10284 msgstr "输出目录名太长"
10285
10286 #: builtin/log.c:881
10287 #, c-format
10288 msgid "Cannot open patch file %s"
10289 msgstr "无法打开补丁文件 %s"
10290
10291 #: builtin/log.c:898
10292 msgid "Need exactly one range."
10293 msgstr "只需要一个范围。"
10294
10295 #: builtin/log.c:908
10296 msgid "Not a range."
10297 msgstr "不是一个范围。"
10298
10299 #: builtin/log.c:1014
10300 msgid "Cover letter needs email format"
10301 msgstr "信封需要邮件地址格式"
10302
10303 #: builtin/log.c:1095
10304 #, c-format
10305 msgid "insane in-reply-to: %s"
10306 msgstr "不正常的 in-reply-to:%s"
10307
10308 #: builtin/log.c:1122
10309 msgid "git format-patch [<options>] [<since> | <revision-range>]"
10310 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
10311
10312 #: builtin/log.c:1172
10313 msgid "Two output directories?"
10314 msgstr "两个输出目录?"
10315
10316 #: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
10317 #, c-format
10318 msgid "Unknown commit %s"
10319 msgstr "未知提交 %s"
10320
10321 #: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523
10322 #, c-format
10323 msgid "Failed to resolve '%s' as a valid ref."
10324 msgstr "无法解析 '%s' 为一个有效引用。"
10325
10326 #: builtin/log.c:1294
10327 msgid "Could not find exact merge base."
10328 msgstr "不能找到准确的合并基线。"
10329
10330 #: builtin/log.c:1298
10331 msgid ""
10332 "Failed to get upstream, if you want to record base commit automatically,\n"
10333 "please use git branch --set-upstream-to to track a remote branch.\n"
10334 "Or you could specify base commit by --base=<base-commit-id> manually."
10335 msgstr ""
10336 "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
10337 "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
10338 "参数 --base=<基线提交> 手动指定一个基线提交。"
10339
10340 #: builtin/log.c:1318
10341 msgid "Failed to find exact merge base"
10342 msgstr "无法找到准确的合并基线"
10343
10344 #: builtin/log.c:1329
10345 msgid "base commit should be the ancestor of revision list"
10346 msgstr "基线提交应该是版本列表的祖先"
10347
10348 #: builtin/log.c:1333
10349 msgid "base commit shouldn't be in revision list"
10350 msgstr "基线提交不应该出现在版本列表中"
10351
10352 #: builtin/log.c:1382
10353 msgid "cannot get patch id"
10354 msgstr "无法得到补丁 id"
10355
10356 #: builtin/log.c:1441
10357 msgid "use [PATCH n/m] even with a single patch"
10358 msgstr "使用 [PATCH n/m],即使只有一个补丁"
10359
10360 #: builtin/log.c:1444
10361 msgid "use [PATCH] even with multiple patches"
10362 msgstr "使用 [PATCH],即使有多个补丁"
10363
10364 #: builtin/log.c:1448
10365 msgid "print patches to standard out"
10366 msgstr "打印补丁到标准输出"
10367
10368 #: builtin/log.c:1450
10369 msgid "generate a cover letter"
10370 msgstr "生成一封附信"
10371
10372 #: builtin/log.c:1452
10373 msgid "use simple number sequence for output file names"
10374 msgstr "使用简单的数字序列作为输出文件名"
10375
10376 #: builtin/log.c:1453
10377 msgid "sfx"
10378 msgstr "后缀"
10379
10380 #: builtin/log.c:1454
10381 msgid "use <sfx> instead of '.patch'"
10382 msgstr "使用 <后缀> 代替 '.patch'"
10383
10384 #: builtin/log.c:1456
10385 msgid "start numbering patches at <n> instead of 1"
10386 msgstr "补丁以 <n> 开始编号,而不是1"
10387
10388 #: builtin/log.c:1458
10389 msgid "mark the series as Nth re-roll"
10390 msgstr "标记补丁系列是第几次重制"
10391
10392 #: builtin/log.c:1460
10393 msgid "Use [RFC PATCH] instead of [PATCH]"
10394 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
10395
10396 #: builtin/log.c:1463
10397 msgid "Use [<prefix>] instead of [PATCH]"
10398 msgstr "使用 [<前缀>] 代替 [PATCH]"
10399
10400 #: builtin/log.c:1466
10401 msgid "store resulting files in <dir>"
10402 msgstr "把结果文件存储在 <目录>"
10403
10404 #: builtin/log.c:1469
10405 msgid "don't strip/add [PATCH]"
10406 msgstr "不删除/添加 [PATCH]"
10407
10408 #: builtin/log.c:1472
10409 msgid "don't output binary diffs"
10410 msgstr "不输出二进制差异"
10411
10412 #: builtin/log.c:1474
10413 msgid "output all-zero hash in From header"
10414 msgstr "在 From 头信息中输出全为零的哈希值"
10415
10416 #: builtin/log.c:1476
10417 msgid "don't include a patch matching a commit upstream"
10418 msgstr "不包含已在上游提交中的补丁"
10419
10420 #: builtin/log.c:1478
10421 msgid "show patch format instead of default (patch + stat)"
10422 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
10423
10424 #: builtin/log.c:1480
10425 msgid "Messaging"
10426 msgstr "邮件发送"
10427
10428 #: builtin/log.c:1481
10429 msgid "header"
10430 msgstr "header"
10431
10432 #: builtin/log.c:1482
10433 msgid "add email header"
10434 msgstr "添加邮件头"
10435
10436 #: builtin/log.c:1483 builtin/log.c:1485
10437 msgid "email"
10438 msgstr "邮件地址"
10439
10440 #: builtin/log.c:1483
10441 msgid "add To: header"
10442 msgstr "添加收件人"
10443
10444 #: builtin/log.c:1485
10445 msgid "add Cc: header"
10446 msgstr "添加抄送"
10447
10448 #: builtin/log.c:1487
10449 msgid "ident"
10450 msgstr "标识"
10451
10452 #: builtin/log.c:1488
10453 msgid "set From address to <ident> (or committer ident if absent)"
10454 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
10455
10456 #: builtin/log.c:1490
10457 msgid "message-id"
10458 msgstr "邮件标识"
10459
10460 #: builtin/log.c:1491
10461 msgid "make first mail a reply to <message-id>"
10462 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
10463
10464 #: builtin/log.c:1492 builtin/log.c:1495
10465 msgid "boundary"
10466 msgstr "边界"
10467
10468 #: builtin/log.c:1493
10469 msgid "attach the patch"
10470 msgstr "附件方式添加补丁"
10471
10472 #: builtin/log.c:1496
10473 msgid "inline the patch"
10474 msgstr "内联显示补丁"
10475
10476 #: builtin/log.c:1500
10477 msgid "enable message threading, styles: shallow, deep"
10478 msgstr "启用邮件线索,风格:浅,深"
10479
10480 #: builtin/log.c:1502
10481 msgid "signature"
10482 msgstr "签名"
10483
10484 #: builtin/log.c:1503
10485 msgid "add a signature"
10486 msgstr "添加一个签名"
10487
10488 #: builtin/log.c:1504
10489 msgid "base-commit"
10490 msgstr "基线提交"
10491
10492 #: builtin/log.c:1505
10493 msgid "add prerequisite tree info to the patch series"
10494 msgstr "为补丁列表添加前置树信息"
10495
10496 #: builtin/log.c:1507
10497 msgid "add a signature from a file"
10498 msgstr "从文件添加一个签名"
10499
10500 #: builtin/log.c:1508
10501 msgid "don't print the patch filenames"
10502 msgstr "不要打印补丁文件名"
10503
10504 #: builtin/log.c:1510
10505 msgid "show progress while generating patches"
10506 msgstr "在生成补丁时显示进度"
10507
10508 #: builtin/log.c:1585
10509 #, c-format
10510 msgid "invalid ident line: %s"
10511 msgstr "包含无效的身份标识:%s"
10512
10513 #: builtin/log.c:1600
10514 msgid "-n and -k are mutually exclusive."
10515 msgstr "-n 和 -k 互斥。"
10516
10517 #: builtin/log.c:1602
10518 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
10519 msgstr "--subject-prefix/--rfc 和 -k 互斥。"
10520
10521 #: builtin/log.c:1610
10522 msgid "--name-only does not make sense"
10523 msgstr "--name-only 无意义"
10524
10525 #: builtin/log.c:1612
10526 msgid "--name-status does not make sense"
10527 msgstr "--name-status 无意义"
10528
10529 #: builtin/log.c:1614
10530 msgid "--check does not make sense"
10531 msgstr "--check 无意义"
10532
10533 #: builtin/log.c:1646
10534 msgid "standard output, or directory, which one?"
10535 msgstr "标准输出或目录,哪一个?"
10536
10537 #: builtin/log.c:1648
10538 #, c-format
10539 msgid "Could not create directory '%s'"
10540 msgstr "不能创建目录 '%s'"
10541
10542 #: builtin/log.c:1741
10543 #, c-format
10544 msgid "unable to read signature file '%s'"
10545 msgstr "无法读取签名文件 '%s'"
10546
10547 #: builtin/log.c:1773
10548 msgid "Generating patches"
10549 msgstr "生成补丁"
10550
10551 #: builtin/log.c:1817
10552 msgid "Failed to create output files"
10553 msgstr "无法创建输出文件"
10554
10555 #: builtin/log.c:1867
10556 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
10557 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
10558
10559 #: builtin/log.c:1921
10560 #, c-format
10561 msgid ""
10562 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
10563 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
10564
10565 #: builtin/ls-files.c:468
10566 msgid "git ls-files [<options>] [<file>...]"
10567 msgstr "git ls-files [<选项>] [<文件>...]"
10568
10569 #: builtin/ls-files.c:517
10570 msgid "identify the file status with tags"
10571 msgstr "用标签标识文件的状态"
10572
10573 #: builtin/ls-files.c:519
10574 msgid "use lowercase letters for 'assume unchanged' files"
10575 msgstr "使用小写字母表示 '假设未改变的' 文件"
10576
10577 #: builtin/ls-files.c:521
10578 msgid "use lowercase letters for 'fsmonitor clean' files"
10579 msgstr "使用小写字母表示 'fsmonitor clean' 文件"
10580
10581 #: builtin/ls-files.c:523
10582 msgid "show cached files in the output (default)"
10583 msgstr "显示缓存的文件(默认)"
10584
10585 #: builtin/ls-files.c:525
10586 msgid "show deleted files in the output"
10587 msgstr "显示已删除的文件"
10588
10589 #: builtin/ls-files.c:527
10590 msgid "show modified files in the output"
10591 msgstr "显示已修改的文件"
10592
10593 #: builtin/ls-files.c:529
10594 msgid "show other files in the output"
10595 msgstr "显示其它文件"
10596
10597 #: builtin/ls-files.c:531
10598 msgid "show ignored files in the output"
10599 msgstr "显示忽略的文件"
10600
10601 #: builtin/ls-files.c:534
10602 msgid "show staged contents' object name in the output"
10603 msgstr "显示暂存区内容的对象名称"
10604
10605 #: builtin/ls-files.c:536
10606 msgid "show files on the filesystem that need to be removed"
10607 msgstr "显示文件系统需要删除的文件"
10608
10609 #: builtin/ls-files.c:538
10610 msgid "show 'other' directories' names only"
10611 msgstr "只显示“其他”目录的名称"
10612
10613 #: builtin/ls-files.c:540
10614 msgid "show line endings of files"
10615 msgstr "显示文件换行符格式"
10616
10617 #: builtin/ls-files.c:542
10618 msgid "don't show empty directories"
10619 msgstr "不显示空目录"
10620
10621 #: builtin/ls-files.c:545
10622 msgid "show unmerged files in the output"
10623 msgstr "显示未合并的文件"
10624
10625 #: builtin/ls-files.c:547
10626 msgid "show resolve-undo information"
10627 msgstr "显示 resolve-undo 信息"
10628
10629 #: builtin/ls-files.c:549
10630 msgid "skip files matching pattern"
10631 msgstr "匹配排除文件的模式"
10632
10633 #: builtin/ls-files.c:552
10634 msgid "exclude patterns are read from <file>"
10635 msgstr "从 <文件> 中读取排除模式"
10636
10637 #: builtin/ls-files.c:555
10638 msgid "read additional per-directory exclude patterns in <file>"
10639 msgstr "从 <文件> 读取额外的每个目录的排除模式"
10640
10641 #: builtin/ls-files.c:557
10642 msgid "add the standard git exclusions"
10643 msgstr "添加标准的 git 排除"
10644
10645 #: builtin/ls-files.c:560
10646 msgid "make the output relative to the project top directory"
10647 msgstr "显示相对于顶级目录的文件名"
10648
10649 #: builtin/ls-files.c:563
10650 msgid "recurse through submodules"
10651 msgstr "在子模组中递归"
10652
10653 #: builtin/ls-files.c:565
10654 msgid "if any <file> is not in the index, treat this as an error"
10655 msgstr "如果任何 <文件> 都不在索引区,视为错误"
10656
10657 #: builtin/ls-files.c:566
10658 msgid "tree-ish"
10659 msgstr "树或提交"
10660
10661 #: builtin/ls-files.c:567
10662 msgid "pretend that paths removed since <tree-ish> are still present"
10663 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
10664
10665 #: builtin/ls-files.c:569
10666 msgid "show debugging data"
10667 msgstr "显示调试数据"
10668
10669 #: builtin/ls-remote.c:9
10670 msgid ""
10671 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
10672 " [-q | --quiet] [--exit-code] [--get-url]\n"
10673 " [--symref] [<repository> [<refs>...]]"
10674 msgstr ""
10675 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
10676 " [-q | --quiet] [--exit-code] [--get-url]\n"
10677 " [--symref] [<仓库> [<引用>...]]"
10678
10679 #: builtin/ls-remote.c:59
10680 msgid "do not print remote URL"
10681 msgstr "不打印远程 URL"
10682
10683 #: builtin/ls-remote.c:60 builtin/ls-remote.c:62
10684 msgid "exec"
10685 msgstr "exec"
10686
10687 #: builtin/ls-remote.c:61 builtin/ls-remote.c:63
10688 msgid "path of git-upload-pack on the remote host"
10689 msgstr "远程主机上的 git-upload-pack 路径"
10690
10691 #: builtin/ls-remote.c:65
10692 msgid "limit to tags"
10693 msgstr "仅限于标签"
10694
10695 #: builtin/ls-remote.c:66
10696 msgid "limit to heads"
10697 msgstr "仅限于分支"
10698
10699 #: builtin/ls-remote.c:67
10700 msgid "do not show peeled tags"
10701 msgstr "不显示已解析的标签"
10702
10703 #: builtin/ls-remote.c:69
10704 msgid "take url.<base>.insteadOf into account"
10705 msgstr "参考 url.<base>.insteadOf 设置"
10706
10707 #: builtin/ls-remote.c:73
10708 msgid "exit with exit code 2 if no matching refs are found"
10709 msgstr "若未找到匹配的引用则以退出码2退出"
10710
10711 #: builtin/ls-remote.c:76
10712 msgid "show underlying ref in addition to the object pointed by it"
10713 msgstr "除了显示指向的对象外,显示指向的引用名"
10714
10715 #: builtin/ls-tree.c:29
10716 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
10717 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
10718
10719 #: builtin/ls-tree.c:127
10720 msgid "only show trees"
10721 msgstr "只显示树"
10722
10723 #: builtin/ls-tree.c:129
10724 msgid "recurse into subtrees"
10725 msgstr "递归到子树"
10726
10727 #: builtin/ls-tree.c:131
10728 msgid "show trees when recursing"
10729 msgstr "当递归时显示树"
10730
10731 #: builtin/ls-tree.c:134
10732 msgid "terminate entries with NUL byte"
10733 msgstr "条目以 NUL 字符终止"
10734
10735 #: builtin/ls-tree.c:135
10736 msgid "include object size"
10737 msgstr "包括对象大小"
10738
10739 #: builtin/ls-tree.c:137 builtin/ls-tree.c:139
10740 msgid "list only filenames"
10741 msgstr "只列出文件名"
10742
10743 #: builtin/ls-tree.c:142
10744 msgid "use full path names"
10745 msgstr "使用文件的全路径"
10746
10747 #: builtin/ls-tree.c:144
10748 msgid "list entire tree; not just current directory (implies --full-name)"
10749 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
10750
10751 #: builtin/mailsplit.c:241
10752 #, c-format
10753 msgid "empty mbox: '%s'"
10754 msgstr "空的 mbox:'%s'"
10755
10756 #: builtin/merge.c:51
10757 msgid "git merge [<options>] [<commit>...]"
10758 msgstr "git merge [<选项>] [<提交>...]"
10759
10760 #: builtin/merge.c:52
10761 msgid "git merge --abort"
10762 msgstr "git merge --abort"
10763
10764 #: builtin/merge.c:53
10765 msgid "git merge --continue"
10766 msgstr "git merge --continue"
10767
10768 #: builtin/merge.c:110
10769 msgid "switch `m' requires a value"
10770 msgstr "开关 `m' 需要一个值"
10771
10772 #: builtin/merge.c:147
10773 #, c-format
10774 msgid "Could not find merge strategy '%s'.\n"
10775 msgstr "不能找到合并策略 '%s'。\n"
10776
10777 #: builtin/merge.c:148
10778 #, c-format
10779 msgid "Available strategies are:"
10780 msgstr "可用的策略有:"
10781
10782 #: builtin/merge.c:153
10783 #, c-format
10784 msgid "Available custom strategies are:"
10785 msgstr "可用的自定义策略有:"
10786
10787 #: builtin/merge.c:203 builtin/pull.c:142
10788 msgid "do not show a diffstat at the end of the merge"
10789 msgstr "在合并的最后不显示差异统计"
10790
10791 #: builtin/merge.c:206 builtin/pull.c:145
10792 msgid "show a diffstat at the end of the merge"
10793 msgstr "在合并的最后显示差异统计"
10794
10795 #: builtin/merge.c:207 builtin/pull.c:148
10796 msgid "(synonym to --stat)"
10797 msgstr "(和 --stat 同义)"
10798
10799 #: builtin/merge.c:209 builtin/pull.c:151
10800 msgid "add (at most <n>) entries from shortlog to merge commit message"
10801 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
10802
10803 #: builtin/merge.c:212 builtin/pull.c:157
10804 msgid "create a single commit instead of doing a merge"
10805 msgstr "创建一个单独的提交而不是做一次合并"
10806
10807 #: builtin/merge.c:214 builtin/pull.c:160
10808 msgid "perform a commit if the merge succeeds (default)"
10809 msgstr "如果合并成功,执行一次提交(默认)"
10810
10811 #: builtin/merge.c:216 builtin/pull.c:163
10812 msgid "edit message before committing"
10813 msgstr "在提交前编辑提交说明"
10814
10815 #: builtin/merge.c:217
10816 msgid "allow fast-forward (default)"
10817 msgstr "允许快进(默认)"
10818
10819 #: builtin/merge.c:219 builtin/pull.c:169
10820 msgid "abort if fast-forward is not possible"
10821 msgstr "如果不能快进就放弃合并"
10822
10823 #: builtin/merge.c:223 builtin/pull.c:172
10824 msgid "verify that the named commit has a valid GPG signature"
10825 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
10826
10827 #: builtin/merge.c:224 builtin/notes.c:777 builtin/pull.c:176
10828 #: builtin/revert.c:109
10829 msgid "strategy"
10830 msgstr "策略"
10831
10832 #: builtin/merge.c:225 builtin/pull.c:177
10833 msgid "merge strategy to use"
10834 msgstr "要使用的合并策略"
10835
10836 #: builtin/merge.c:226 builtin/pull.c:180
10837 msgid "option=value"
10838 msgstr "option=value"
10839
10840 #: builtin/merge.c:227 builtin/pull.c:181
10841 msgid "option for selected merge strategy"
10842 msgstr "所选的合并策略的选项"
10843
10844 #: builtin/merge.c:229
10845 msgid "merge commit message (for a non-fast-forward merge)"
10846 msgstr "合并的提交说明(针对非快进式合并)"
10847
10848 #: builtin/merge.c:233
10849 msgid "abort the current in-progress merge"
10850 msgstr "放弃当前正在进行的合并"
10851
10852 #: builtin/merge.c:235
10853 msgid "continue the current in-progress merge"
10854 msgstr "继续当前正在进行的合并"
10855
10856 #: builtin/merge.c:237 builtin/pull.c:188
10857 msgid "allow merging unrelated histories"
10858 msgstr "允许合并不相关的历史"
10859
10860 #: builtin/merge.c:243
10861 msgid "verify commit-msg hook"
10862 msgstr "校验 commit-msg 钩子"
10863
10864 #: builtin/merge.c:268
10865 msgid "could not run stash."
10866 msgstr "不能运行贮藏。"
10867
10868 #: builtin/merge.c:273
10869 msgid "stash failed"
10870 msgstr "贮藏失败"
10871
10872 #: builtin/merge.c:278
10873 #, c-format
10874 msgid "not a valid object: %s"
10875 msgstr "不是一个有效对象:%s"
10876
10877 #: builtin/merge.c:300 builtin/merge.c:317
10878 msgid "read-tree failed"
10879 msgstr "读取树失败"
10880
10881 # 译者:注意保持前导空格
10882 #: builtin/merge.c:347
10883 msgid " (nothing to squash)"
10884 msgstr " (无可压缩)"
10885
10886 #: builtin/merge.c:358
10887 #, c-format
10888 msgid "Squash commit -- not updating HEAD\n"
10889 msgstr "压缩提交 -- 未更新 HEAD\n"
10890
10891 #: builtin/merge.c:408
10892 #, c-format
10893 msgid "No merge message -- not updating HEAD\n"
10894 msgstr "无合并信息 -- 未更新 HEAD\n"
10895
10896 #: builtin/merge.c:458
10897 #, c-format
10898 msgid "'%s' does not point to a commit"
10899 msgstr "'%s' 没有指向一个提交"
10900
10901 #: builtin/merge.c:548
10902 #, c-format
10903 msgid "Bad branch.%s.mergeoptions string: %s"
10904 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
10905
10906 #: builtin/merge.c:669
10907 msgid "Not handling anything other than two heads merge."
10908 msgstr "未处理两个头合并之外的任何操作。"
10909
10910 #: builtin/merge.c:683
10911 #, c-format
10912 msgid "Unknown option for merge-recursive: -X%s"
10913 msgstr "merge-recursive 的未知选项:-X%s"
10914
10915 #: builtin/merge.c:698
10916 #, c-format
10917 msgid "unable to write %s"
10918 msgstr "不能写 %s"
10919
10920 #: builtin/merge.c:749
10921 #, c-format
10922 msgid "Could not read from '%s'"
10923 msgstr "不能从 '%s' 读取"
10924
10925 #: builtin/merge.c:758
10926 #, c-format
10927 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
10928 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
10929
10930 #: builtin/merge.c:764
10931 #, c-format
10932 msgid ""
10933 "Please enter a commit message to explain why this merge is necessary,\n"
10934 "especially if it merges an updated upstream into a topic branch.\n"
10935 "\n"
10936 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
10937 "the commit.\n"
10938 msgstr ""
10939 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
10940 "合并到主题分支。\n"
10941 "\n"
10942 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
10943
10944 #: builtin/merge.c:800
10945 msgid "Empty commit message."
10946 msgstr "空提交信息。"
10947
10948 #: builtin/merge.c:819
10949 #, c-format
10950 msgid "Wonderful.\n"
10951 msgstr "太棒了。\n"
10952
10953 #: builtin/merge.c:872
10954 #, c-format
10955 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
10956 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
10957
10958 #: builtin/merge.c:911
10959 msgid "No current branch."
10960 msgstr "没有当前分支。"
10961
10962 #: builtin/merge.c:913
10963 msgid "No remote for the current branch."
10964 msgstr "当前分支没有对应的远程仓库。"
10965
10966 #: builtin/merge.c:915
10967 msgid "No default upstream defined for the current branch."
10968 msgstr "当前分支没有定义默认的上游分支。"
10969
10970 #: builtin/merge.c:920
10971 #, c-format
10972 msgid "No remote-tracking branch for %s from %s"
10973 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
10974
10975 #: builtin/merge.c:973
10976 #, c-format
10977 msgid "Bad value '%s' in environment '%s'"
10978 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
10979
10980 #: builtin/merge.c:1075
10981 #, c-format
10982 msgid "not something we can merge in %s: %s"
10983 msgstr "不能在 %s 中合并:%s"
10984
10985 #: builtin/merge.c:1109
10986 msgid "not something we can merge"
10987 msgstr "不能合并"
10988
10989 #: builtin/merge.c:1211
10990 msgid "--abort expects no arguments"
10991 msgstr "--abort 不带参数"
10992
10993 #: builtin/merge.c:1215
10994 msgid "There is no merge to abort (MERGE_HEAD missing)."
10995 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
10996
10997 #: builtin/merge.c:1227
10998 msgid "--continue expects no arguments"
10999 msgstr "--continue 不带参数"
11000
11001 #: builtin/merge.c:1231
11002 msgid "There is no merge in progress (MERGE_HEAD missing)."
11003 msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
11004
11005 #: builtin/merge.c:1247
11006 msgid ""
11007 "You have not concluded your merge (MERGE_HEAD exists).\n"
11008 "Please, commit your changes before you merge."
11009 msgstr ""
11010 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
11011 "请在合并前先提交您的修改。"
11012
11013 #: builtin/merge.c:1254
11014 msgid ""
11015 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
11016 "Please, commit your changes before you merge."
11017 msgstr ""
11018 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
11019 "请在合并前先提交您的修改。"
11020
11021 #: builtin/merge.c:1257
11022 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
11023 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
11024
11025 #: builtin/merge.c:1266
11026 msgid "You cannot combine --squash with --no-ff."
11027 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
11028
11029 #: builtin/merge.c:1274
11030 msgid "No commit specified and merge.defaultToUpstream not set."
11031 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
11032
11033 #: builtin/merge.c:1291
11034 msgid "Squash commit into empty head not supported yet"
11035 msgstr "尚不支持到空分支的压缩提交"
11036
11037 #: builtin/merge.c:1293
11038 msgid "Non-fast-forward commit does not make sense into an empty head"
11039 msgstr "到空分支的非快进式提交没有意义"
11040
11041 #: builtin/merge.c:1298
11042 #, c-format
11043 msgid "%s - not something we can merge"
11044 msgstr "%s - 不能被合并"
11045
11046 #: builtin/merge.c:1300
11047 msgid "Can merge only exactly one commit into empty head"
11048 msgstr "只能将一个提交合并到空分支上"
11049
11050 #: builtin/merge.c:1334
11051 #, c-format
11052 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
11053 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
11054
11055 #: builtin/merge.c:1337
11056 #, c-format
11057 msgid "Commit %s has a bad GPG signature allegedly by %s."
11058 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
11059
11060 #: builtin/merge.c:1340
11061 #, c-format
11062 msgid "Commit %s does not have a GPG signature."
11063 msgstr "提交 %s 没有一个 GPG 签名。"
11064
11065 #: builtin/merge.c:1343
11066 #, c-format
11067 msgid "Commit %s has a good GPG signature by %s\n"
11068 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
11069
11070 #: builtin/merge.c:1402
11071 msgid "refusing to merge unrelated histories"
11072 msgstr "拒绝合并无关的历史"
11073
11074 #: builtin/merge.c:1411
11075 msgid "Already up to date."
11076 msgstr "已经是最新的。"
11077
11078 #: builtin/merge.c:1421
11079 #, c-format
11080 msgid "Updating %s..%s\n"
11081 msgstr "更新 %s..%s\n"
11082
11083 #: builtin/merge.c:1462
11084 #, c-format
11085 msgid "Trying really trivial in-index merge...\n"
11086 msgstr "尝试非常小的索引内合并...\n"
11087
11088 #: builtin/merge.c:1469
11089 #, c-format
11090 msgid "Nope.\n"
11091 msgstr "无。\n"
11092
11093 #: builtin/merge.c:1494
11094 msgid "Already up to date. Yeeah!"
11095 msgstr "已经是最新的。耶!"
11096
11097 #: builtin/merge.c:1500
11098 msgid "Not possible to fast-forward, aborting."
11099 msgstr "无法快进,终止。"
11100
11101 #: builtin/merge.c:1523 builtin/merge.c:1602
11102 #, c-format
11103 msgid "Rewinding the tree to pristine...\n"
11104 msgstr "将树回滚至原始状态...\n"
11105
11106 #: builtin/merge.c:1527
11107 #, c-format
11108 msgid "Trying merge strategy %s...\n"
11109 msgstr "尝试合并策略 %s...\n"
11110
11111 #: builtin/merge.c:1593
11112 #, c-format
11113 msgid "No merge strategy handled the merge.\n"
11114 msgstr "没有合并策略处理此合并。\n"
11115
11116 #: builtin/merge.c:1595
11117 #, c-format
11118 msgid "Merge with strategy %s failed.\n"
11119 msgstr "使用策略 %s 合并失败。\n"
11120
11121 #: builtin/merge.c:1604
11122 #, c-format
11123 msgid "Using the %s to prepare resolving by hand.\n"
11124 msgstr "使用 %s 以准备手工解决。\n"
11125
11126 #: builtin/merge.c:1616
11127 #, c-format
11128 msgid "Automatic merge went well; stopped before committing as requested\n"
11129 msgstr "自动合并进展顺利,按要求在提交前停止\n"
11130
11131 #: builtin/merge-base.c:30
11132 msgid "git merge-base [-a | --all] <commit> <commit>..."
11133 msgstr "git merge-base [-a | --all] <提交> <提交>..."
11134
11135 #: builtin/merge-base.c:31
11136 msgid "git merge-base [-a | --all] --octopus <commit>..."
11137 msgstr "git merge-base [-a | --all] --octopus <提交>..."
11138
11139 #: builtin/merge-base.c:32
11140 msgid "git merge-base --independent <commit>..."
11141 msgstr "git merge-base --independent <提交>..."
11142
11143 #: builtin/merge-base.c:33
11144 msgid "git merge-base --is-ancestor <commit> <commit>"
11145 msgstr "git merge-base --is-ancestor <提交> <提交>"
11146
11147 #: builtin/merge-base.c:34
11148 msgid "git merge-base --fork-point <ref> [<commit>]"
11149 msgstr "git merge-base --fork-point <引用> [<提交>]"
11150
11151 #: builtin/merge-base.c:220
11152 msgid "output all common ancestors"
11153 msgstr "输出所有共同的祖先"
11154
11155 #: builtin/merge-base.c:222
11156 msgid "find ancestors for a single n-way merge"
11157 msgstr "查找一个多路合并的祖先提交"
11158
11159 #: builtin/merge-base.c:224
11160 msgid "list revs not reachable from others"
11161 msgstr "显示不能被其他访问到的版本"
11162
11163 #: builtin/merge-base.c:226
11164 msgid "is the first one ancestor of the other?"
11165 msgstr "第一个是其他的祖先提交么?"
11166
11167 #: builtin/merge-base.c:228
11168 msgid "find where <commit> forked from reflog of <ref>"
11169 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
11170
11171 #: builtin/merge-file.c:9
11172 msgid ""
11173 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
11174 "<orig-file> <file2>"
11175 msgstr ""
11176 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
11177 "件> <文件2>"
11178
11179 #: builtin/merge-file.c:33
11180 msgid "send results to standard output"
11181 msgstr "将结果发送到标准输出"
11182
11183 #: builtin/merge-file.c:34
11184 msgid "use a diff3 based merge"
11185 msgstr "使用基于 diff3 的合并"
11186
11187 #: builtin/merge-file.c:35
11188 msgid "for conflicts, use our version"
11189 msgstr "如果冲突,使用我们的版本"
11190
11191 #: builtin/merge-file.c:37
11192 msgid "for conflicts, use their version"
11193 msgstr "如果冲突,使用他们的版本"
11194
11195 #: builtin/merge-file.c:39
11196 msgid "for conflicts, use a union version"
11197 msgstr "如果冲突,使用联合版本"
11198
11199 #: builtin/merge-file.c:42
11200 msgid "for conflicts, use this marker size"
11201 msgstr "如果冲突,使用指定长度的标记"
11202
11203 #: builtin/merge-file.c:43
11204 msgid "do not warn about conflicts"
11205 msgstr "不要警告冲突"
11206
11207 #: builtin/merge-file.c:45
11208 msgid "set labels for file1/orig-file/file2"
11209 msgstr "为 文件1/初始文件/文件2 设置标签"
11210
11211 #: builtin/merge-recursive.c:45
11212 #, c-format
11213 msgid "unknown option %s"
11214 msgstr "未知选项 %s"
11215
11216 #: builtin/merge-recursive.c:51
11217 #, c-format
11218 msgid "could not parse object '%s'"
11219 msgstr "不能解析对象 '%s'"
11220
11221 #: builtin/merge-recursive.c:55
11222 #, c-format
11223 msgid "cannot handle more than %d base. Ignoring %s."
11224 msgid_plural "cannot handle more than %d bases. Ignoring %s."
11225 msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
11226 msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
11227
11228 #: builtin/merge-recursive.c:63
11229 msgid "not handling anything other than two heads merge."
11230 msgstr "不能处理两个头合并之外的任何操作。"
11231
11232 #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
11233 #, c-format
11234 msgid "could not resolve ref '%s'"
11235 msgstr "无法解析引用 '%s'"
11236
11237 #: builtin/merge-recursive.c:77
11238 #, c-format
11239 msgid "Merging %s with %s\n"
11240 msgstr "合并 %s 和 %s\n"
11241
11242 #: builtin/mktree.c:65
11243 msgid "git mktree [-z] [--missing] [--batch]"
11244 msgstr "git mktree [-z] [--missing] [--batch]"
11245
11246 #: builtin/mktree.c:153
11247 msgid "input is NUL terminated"
11248 msgstr "输入以 NUL 字符终止"
11249
11250 #: builtin/mktree.c:154 builtin/write-tree.c:25
11251 msgid "allow missing objects"
11252 msgstr "允许丢失的对象"
11253
11254 #: builtin/mktree.c:155
11255 msgid "allow creation of more than one tree"
11256 msgstr "允许创建一个以上的树"
11257
11258 #: builtin/mv.c:17
11259 msgid "git mv [<options>] <source>... <destination>"
11260 msgstr "git mv [<选项>] <源>... <目标>"
11261
11262 #: builtin/mv.c:82
11263 #, c-format
11264 msgid "Directory %s is in index and no submodule?"
11265 msgstr "目录 %s 在索引中并且不是子模组?"
11266
11267 #: builtin/mv.c:84 builtin/rm.c:288
11268 msgid "Please stage your changes to .gitmodules or stash them to proceed"
11269 msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
11270
11271 #: builtin/mv.c:102
11272 #, c-format
11273 msgid "%.*s is in index"
11274 msgstr "%.*s 在索引中"
11275
11276 #: builtin/mv.c:124
11277 msgid "force move/rename even if target exists"
11278 msgstr "强制移动/重命令,即使目标存在"
11279
11280 #: builtin/mv.c:126
11281 msgid "skip move/rename errors"
11282 msgstr "跳过移动/重命名错误"
11283
11284 #: builtin/mv.c:168
11285 #, c-format
11286 msgid "destination '%s' is not a directory"
11287 msgstr "目标 '%s' 不是一个目录"
11288
11289 #: builtin/mv.c:179
11290 #, c-format
11291 msgid "Checking rename of '%s' to '%s'\n"
11292 msgstr "检查 '%s' 到 '%s' 的重命名\n"
11293
11294 #: builtin/mv.c:183
11295 msgid "bad source"
11296 msgstr "坏的源"
11297
11298 #: builtin/mv.c:186
11299 msgid "can not move directory into itself"
11300 msgstr "不能将目录移动到自身"
11301
11302 #: builtin/mv.c:189
11303 msgid "cannot move directory over file"
11304 msgstr "不能将目录移动到文件"
11305
11306 #: builtin/mv.c:198
11307 msgid "source directory is empty"
11308 msgstr "源目录为空"
11309
11310 #: builtin/mv.c:223
11311 msgid "not under version control"
11312 msgstr "不在版本控制之下"
11313
11314 #: builtin/mv.c:226
11315 msgid "destination exists"
11316 msgstr "目标已存在"
11317
11318 #: builtin/mv.c:234
11319 #, c-format
11320 msgid "overwriting '%s'"
11321 msgstr "覆盖 '%s'"
11322
11323 #: builtin/mv.c:237
11324 msgid "Cannot overwrite"
11325 msgstr "不能覆盖"
11326
11327 #: builtin/mv.c:240
11328 msgid "multiple sources for the same target"
11329 msgstr "同一目标具有多个源"
11330
11331 #: builtin/mv.c:242
11332 msgid "destination directory does not exist"
11333 msgstr "目标目录不存在"
11334
11335 #: builtin/mv.c:249
11336 #, c-format
11337 msgid "%s, source=%s, destination=%s"
11338 msgstr "%s,源=%s,目标=%s"
11339
11340 #: builtin/mv.c:270
11341 #, c-format
11342 msgid "Renaming %s to %s\n"
11343 msgstr "重命名 %s 至 %s\n"
11344
11345 #: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409
11346 #, c-format
11347 msgid "renaming '%s' failed"
11348 msgstr "重命名 '%s' 失败"
11349
11350 #: builtin/name-rev.c:338
11351 msgid "git name-rev [<options>] <commit>..."
11352 msgstr "git name-rev [<选项>] <提交>..."
11353
11354 #: builtin/name-rev.c:339
11355 msgid "git name-rev [<options>] --all"
11356 msgstr "git name-rev [<选项>] --all"
11357
11358 #: builtin/name-rev.c:340
11359 msgid "git name-rev [<options>] --stdin"
11360 msgstr "git name-rev [<选项>] --stdin"
11361
11362 #: builtin/name-rev.c:395
11363 msgid "print only names (no SHA-1)"
11364 msgstr "只打印名称(无 SHA-1)"
11365
11366 #: builtin/name-rev.c:396
11367 msgid "only use tags to name the commits"
11368 msgstr "只使用标签来命名提交"
11369
11370 #: builtin/name-rev.c:398
11371 msgid "only use refs matching <pattern>"
11372 msgstr "只使用和 <模式> 相匹配的引用"
11373
11374 #: builtin/name-rev.c:400
11375 msgid "ignore refs matching <pattern>"
11376 msgstr "忽略和 <模式> 相匹配的引用"
11377
11378 #: builtin/name-rev.c:402
11379 msgid "list all commits reachable from all refs"
11380 msgstr "列出可以从所有引用访问的提交"
11381
11382 #: builtin/name-rev.c:403
11383 msgid "read from stdin"
11384 msgstr "从标准输入读取"
11385
11386 #: builtin/name-rev.c:404
11387 msgid "allow to print `undefined` names (default)"
11388 msgstr "允许打印 `未定义` 的名称(默认)"
11389
11390 #: builtin/name-rev.c:410
11391 msgid "dereference tags in the input (internal use)"
11392 msgstr "反向解析输入中的标签(内部使用)"
11393
11394 #: builtin/notes.c:26
11395 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
11396 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
11397
11398 #: builtin/notes.c:27
11399 msgid ""
11400 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
11401 "| (-c | -C) <object>] [<object>]"
11402 msgstr ""
11403 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
11404 "| (-c | -C) <对象>] [<对象>]"
11405
11406 #: builtin/notes.c:28
11407 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
11408 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
11409
11410 #: builtin/notes.c:29
11411 msgid ""
11412 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
11413 "(-c | -C) <object>] [<object>]"
11414 msgstr ""
11415 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
11416 "(-c | -C) <对象>] [<对象>]"
11417
11418 #: builtin/notes.c:30
11419 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
11420 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
11421
11422 #: builtin/notes.c:31
11423 msgid "git notes [--ref <notes-ref>] show [<object>]"
11424 msgstr "git notes [--ref <注解引用>] show [<对象>]"
11425
11426 #: builtin/notes.c:32
11427 msgid ""
11428 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
11429 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
11430
11431 #: builtin/notes.c:33
11432 msgid "git notes merge --commit [-v | -q]"
11433 msgstr "git notes merge --commit [-v | -q]"
11434
11435 #: builtin/notes.c:34
11436 msgid "git notes merge --abort [-v | -q]"
11437 msgstr "git notes merge --abort [-v | -q]"
11438
11439 #: builtin/notes.c:35
11440 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
11441 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
11442
11443 #: builtin/notes.c:36
11444 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
11445 msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
11446
11447 #: builtin/notes.c:37
11448 msgid "git notes [--ref <notes-ref>] get-ref"
11449 msgstr "git notes [--ref <注解引用>] get-ref"
11450
11451 #: builtin/notes.c:42
11452 msgid "git notes [list [<object>]]"
11453 msgstr "git notes [list [<对象>]]"
11454
11455 #: builtin/notes.c:47
11456 msgid "git notes add [<options>] [<object>]"
11457 msgstr "git notes add [<选项>] [<对象>]"
11458
11459 #: builtin/notes.c:52
11460 msgid "git notes copy [<options>] <from-object> <to-object>"
11461 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
11462
11463 #: builtin/notes.c:53
11464 msgid "git notes copy --stdin [<from-object> <to-object>]..."
11465 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
11466
11467 #: builtin/notes.c:58
11468 msgid "git notes append [<options>] [<object>]"
11469 msgstr "git notes append [<选项>] [<对象>]"
11470
11471 #: builtin/notes.c:63
11472 msgid "git notes edit [<object>]"
11473 msgstr "git notes edit [<对象>]"
11474
11475 #: builtin/notes.c:68
11476 msgid "git notes show [<object>]"
11477 msgstr "git notes show [<对象>]"
11478
11479 #: builtin/notes.c:73
11480 msgid "git notes merge [<options>] <notes-ref>"
11481 msgstr "git notes merge [<选项>] <注解引用>"
11482
11483 #: builtin/notes.c:74
11484 msgid "git notes merge --commit [<options>]"
11485 msgstr "git notes merge --commit [<选项>]"
11486
11487 #: builtin/notes.c:75
11488 msgid "git notes merge --abort [<options>]"
11489 msgstr "git notes merge --abort [<选项>]"
11490
11491 #: builtin/notes.c:80
11492 msgid "git notes remove [<object>]"
11493 msgstr "git notes remove [<对象>]"
11494
11495 #: builtin/notes.c:85
11496 msgid "git notes prune [<options>]"
11497 msgstr "git notes prune [<选项>]"
11498
11499 #: builtin/notes.c:90
11500 msgid "git notes get-ref"
11501 msgstr "git notes get-ref"
11502
11503 #: builtin/notes.c:95
11504 msgid "Write/edit the notes for the following object:"
11505 msgstr "为下面的对象写/编辑说明:"
11506
11507 #: builtin/notes.c:148
11508 #, c-format
11509 msgid "unable to start 'show' for object '%s'"
11510 msgstr "不能为对象 '%s' 开始 'show'"
11511
11512 #: builtin/notes.c:152
11513 msgid "could not read 'show' output"
11514 msgstr "不能读取 'show' 的输出"
11515
11516 #: builtin/notes.c:160
11517 #, c-format
11518 msgid "failed to finish 'show' for object '%s'"
11519 msgstr "无法为对象 '%s' 完成 'show'"
11520
11521 #: builtin/notes.c:195
11522 msgid "please supply the note contents using either -m or -F option"
11523 msgstr "请通过 -m 或 -F 选项为注解提供内容"
11524
11525 #: builtin/notes.c:204
11526 msgid "unable to write note object"
11527 msgstr "不能写注解对象"
11528
11529 #: builtin/notes.c:206
11530 #, c-format
11531 msgid "the note contents have been left in %s"
11532 msgstr "注解内容被留在 %s 中"
11533
11534 #: builtin/notes.c:234 builtin/tag.c:507
11535 #, c-format
11536 msgid "cannot read '%s'"
11537 msgstr "不能读取 '%s'"
11538
11539 #: builtin/notes.c:236 builtin/tag.c:510
11540 #, c-format
11541 msgid "could not open or read '%s'"
11542 msgstr "不能打开或读取 '%s'"
11543
11544 #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
11545 #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
11546 #: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
11547 #, c-format
11548 msgid "failed to resolve '%s' as a valid ref."
11549 msgstr "无法解析 '%s' 为一个有效引用。"
11550
11551 #: builtin/notes.c:258
11552 #, c-format
11553 msgid "failed to read object '%s'."
11554 msgstr "无法读取对象 '%s'。"
11555
11556 #: builtin/notes.c:262
11557 #, c-format
11558 msgid "cannot read note data from non-blob object '%s'."
11559 msgstr "不能从非数据对象 '%s' 中读取注解数据。"
11560
11561 #: builtin/notes.c:302
11562 #, c-format
11563 msgid "malformed input line: '%s'."
11564 msgstr "格式错误的输入行:'%s'。"
11565
11566 #: builtin/notes.c:317
11567 #, c-format
11568 msgid "failed to copy notes from '%s' to '%s'"
11569 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
11570
11571 #. TRANSLATORS: the first %s will be replaced by a git
11572 #. notes command: 'add', 'merge', 'remove', etc.
11573 #.
11574 #: builtin/notes.c:349
11575 #, c-format
11576 msgid "refusing to %s notes in %s (outside of refs/notes/)"
11577 msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
11578
11579 #: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
11580 #: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
11581 #: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
11582 msgid "too many parameters"
11583 msgstr "参数太多"
11584
11585 #: builtin/notes.c:382 builtin/notes.c:668
11586 #, c-format
11587 msgid "no note found for object %s."
11588 msgstr "未发现对象 %s 的注解。"
11589
11590 #: builtin/notes.c:403 builtin/notes.c:566
11591 msgid "note contents as a string"
11592 msgstr "注解内容作为一个字符串"
11593
11594 #: builtin/notes.c:406 builtin/notes.c:569
11595 msgid "note contents in a file"
11596 msgstr "注解内容到一个文件中"
11597
11598 #: builtin/notes.c:409 builtin/notes.c:572
11599 msgid "reuse and edit specified note object"
11600 msgstr "重用和编辑指定的注解对象"
11601
11602 #: builtin/notes.c:412 builtin/notes.c:575
11603 msgid "reuse specified note object"
11604 msgstr "重用指定的注解对象"
11605
11606 #: builtin/notes.c:415 builtin/notes.c:578
11607 msgid "allow storing empty note"
11608 msgstr "允许保存空白注释"
11609
11610 #: builtin/notes.c:416 builtin/notes.c:487
11611 msgid "replace existing notes"
11612 msgstr "替换已存在的注解"
11613
11614 #: builtin/notes.c:441
11615 #, c-format
11616 msgid ""
11617 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
11618 "existing notes"
11619 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
11620
11621 #: builtin/notes.c:456 builtin/notes.c:535
11622 #, c-format
11623 msgid "Overwriting existing notes for object %s\n"
11624 msgstr "覆盖对象 %s 现存注解\n"
11625
11626 #: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
11627 #, c-format
11628 msgid "Removing note for object %s\n"
11629 msgstr "删除对象 %s 的注解\n"
11630
11631 #: builtin/notes.c:488
11632 msgid "read objects from stdin"
11633 msgstr "从标准输入读取对象"
11634
11635 #: builtin/notes.c:490
11636 msgid "load rewriting config for <command> (implies --stdin)"
11637 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
11638
11639 #: builtin/notes.c:508
11640 msgid "too few parameters"
11641 msgstr "参数太少"
11642
11643 #: builtin/notes.c:529
11644 #, c-format
11645 msgid ""
11646 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
11647 "existing notes"
11648 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
11649
11650 #: builtin/notes.c:541
11651 #, c-format
11652 msgid "missing notes on source object %s. Cannot copy."
11653 msgstr "源对象 %s 缺少注解。不能拷贝。"
11654
11655 #: builtin/notes.c:593
11656 #, c-format
11657 msgid ""
11658 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
11659 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
11660 msgstr ""
11661 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
11662 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
11663
11664 #: builtin/notes.c:688
11665 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
11666 msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
11667
11668 #: builtin/notes.c:690
11669 msgid "failed to delete ref NOTES_MERGE_REF"
11670 msgstr "无法删除引用 NOTES_MERGE_REF"
11671
11672 #: builtin/notes.c:692
11673 msgid "failed to remove 'git notes merge' worktree"
11674 msgstr "无法删除 'git notes merge' 工作区"
11675
11676 #: builtin/notes.c:712
11677 msgid "failed to read ref NOTES_MERGE_PARTIAL"
11678 msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
11679
11680 #: builtin/notes.c:714
11681 msgid "could not find commit from NOTES_MERGE_PARTIAL."
11682 msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
11683
11684 #: builtin/notes.c:716
11685 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
11686 msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
11687
11688 #: builtin/notes.c:729
11689 msgid "failed to resolve NOTES_MERGE_REF"
11690 msgstr "无法解析 NOTES_MERGE_REF"
11691
11692 #: builtin/notes.c:732
11693 msgid "failed to finalize notes merge"
11694 msgstr "无法完成注解合并"
11695
11696 #: builtin/notes.c:758
11697 #, c-format
11698 msgid "unknown notes merge strategy %s"
11699 msgstr "未知的注解合并策略 %s"
11700
11701 #: builtin/notes.c:774
11702 msgid "General options"
11703 msgstr "通用选项"
11704
11705 #: builtin/notes.c:776
11706 msgid "Merge options"
11707 msgstr "合并选项"
11708
11709 #: builtin/notes.c:778
11710 msgid ""
11711 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
11712 "cat_sort_uniq)"
11713 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
11714
11715 #: builtin/notes.c:780
11716 msgid "Committing unmerged notes"
11717 msgstr "提交未合并的注解"
11718
11719 #: builtin/notes.c:782
11720 msgid "finalize notes merge by committing unmerged notes"
11721 msgstr "通过提交未合并的注解来完成注解合并"
11722
11723 #: builtin/notes.c:784
11724 msgid "Aborting notes merge resolution"
11725 msgstr "中止注解合并的方案"
11726
11727 #: builtin/notes.c:786
11728 msgid "abort notes merge"
11729 msgstr "中止注解合并"
11730
11731 #: builtin/notes.c:797
11732 msgid "cannot mix --commit, --abort or -s/--strategy"
11733 msgstr "不能混用 --commit、--abort 或 -s/--strategy"
11734
11735 #: builtin/notes.c:802
11736 msgid "must specify a notes ref to merge"
11737 msgstr "必须指定一个注解引用来合并"
11738
11739 #: builtin/notes.c:826
11740 #, c-format
11741 msgid "unknown -s/--strategy: %s"
11742 msgstr "未知的 -s/--strategy:%s"
11743
11744 #: builtin/notes.c:863
11745 #, c-format
11746 msgid "a notes merge into %s is already in-progress at %s"
11747 msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
11748
11749 #: builtin/notes.c:866
11750 #, c-format
11751 msgid "failed to store link to current notes ref (%s)"
11752 msgstr "无法存储链接到当前的注解引用(%s)"
11753
11754 #: builtin/notes.c:868
11755 #, c-format
11756 msgid ""
11757 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
11758 "'git notes merge --commit', or abort the merge with 'git notes merge --"
11759 "abort'.\n"
11760 msgstr ""
11761 "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
11762 "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
11763
11764 #: builtin/notes.c:890
11765 #, c-format
11766 msgid "Object %s has no note\n"
11767 msgstr "对象 %s 没有注解\n"
11768
11769 #: builtin/notes.c:902
11770 msgid "attempt to remove non-existent note is not an error"
11771 msgstr "尝试删除不存在的注解不是一个错误"
11772
11773 #: builtin/notes.c:905
11774 msgid "read object names from the standard input"
11775 msgstr "从标准输入读取对象名称"
11776
11777 #: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151
11778 msgid "do not remove, show only"
11779 msgstr "不删除,只显示"
11780
11781 #: builtin/notes.c:944
11782 msgid "report pruned notes"
11783 msgstr "报告清除的注解"
11784
11785 #: builtin/notes.c:986
11786 msgid "notes-ref"
11787 msgstr "注解引用"
11788
11789 #: builtin/notes.c:987
11790 msgid "use notes from <notes-ref>"
11791 msgstr "从 <注解引用> 使用注解"
11792
11793 #: builtin/notes.c:1022
11794 #, c-format
11795 msgid "unknown subcommand: %s"
11796 msgstr "未知子命令:%s"
11797
11798 #: builtin/pack-objects.c:48
11799 msgid ""
11800 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
11801 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
11802
11803 #: builtin/pack-objects.c:49
11804 msgid ""
11805 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
11806 msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
11807
11808 #: builtin/pack-objects.c:211 builtin/pack-objects.c:214
11809 #, c-format
11810 msgid "deflate error (%d)"
11811 msgstr "压缩错误 (%d)"
11812
11813 #: builtin/pack-objects.c:810
11814 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
11815 msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
11816
11817 #: builtin/pack-objects.c:823
11818 msgid "Writing objects"
11819 msgstr "写入对象中"
11820
11821 #: builtin/pack-objects.c:1106
11822 msgid "disabling bitmap writing, as some objects are not being packed"
11823 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
11824
11825 #: builtin/pack-objects.c:1765
11826 msgid "Counting objects"
11827 msgstr "对象计数中"
11828
11829 #: builtin/pack-objects.c:1895
11830 #, c-format
11831 msgid "unable to get size of %s"
11832 msgstr "不能得到 %s 的大小"
11833
11834 #: builtin/pack-objects.c:1910
11835 #, c-format
11836 msgid "unable to parse object header of %s"
11837 msgstr "无法解析对象 %s 头信息"
11838
11839 #: builtin/pack-objects.c:2564
11840 msgid "Compressing objects"
11841 msgstr "压缩对象中"
11842
11843 #: builtin/pack-objects.c:2735
11844 msgid "invalid value for --missing"
11845 msgstr "选项 --missing 的值无效"
11846
11847 #: builtin/pack-objects.c:3067
11848 #, c-format
11849 msgid "unsupported index version %s"
11850 msgstr "不支持的索引版本 %s"
11851
11852 #: builtin/pack-objects.c:3071
11853 #, c-format
11854 msgid "bad index version '%s'"
11855 msgstr "坏的索引版本 '%s'"
11856
11857 #: builtin/pack-objects.c:3102
11858 msgid "do not show progress meter"
11859 msgstr "不显示进度表"
11860
11861 #: builtin/pack-objects.c:3104
11862 msgid "show progress meter"
11863 msgstr "显示进度表"
11864
11865 #: builtin/pack-objects.c:3106
11866 msgid "show progress meter during object writing phase"
11867 msgstr "在对象写入阶段显示进度表"
11868
11869 #: builtin/pack-objects.c:3109
11870 msgid "similar to --all-progress when progress meter is shown"
11871 msgstr "当进度表显示时类似于 --all-progress"
11872
11873 #: builtin/pack-objects.c:3110
11874 msgid "version[,offset]"
11875 msgstr "版本[,偏移]"
11876
11877 #: builtin/pack-objects.c:3111
11878 msgid "write the pack index file in the specified idx format version"
11879 msgstr "用指定的 idx 格式版本来写包索引文件"
11880
11881 #: builtin/pack-objects.c:3114
11882 msgid "maximum size of each output pack file"
11883 msgstr "每个输出包的最大尺寸"
11884
11885 #: builtin/pack-objects.c:3116
11886 msgid "ignore borrowed objects from alternate object store"
11887 msgstr "忽略从备用对象存储里借用对象"
11888
11889 #: builtin/pack-objects.c:3118
11890 msgid "ignore packed objects"
11891 msgstr "忽略包对象"
11892
11893 #: builtin/pack-objects.c:3120
11894 msgid "limit pack window by objects"
11895 msgstr "限制打包窗口的对象数"
11896
11897 #: builtin/pack-objects.c:3122
11898 msgid "limit pack window by memory in addition to object limit"
11899 msgstr "除对象数量限制外设置打包窗口的内存限制"
11900
11901 #: builtin/pack-objects.c:3124
11902 msgid "maximum length of delta chain allowed in the resulting pack"
11903 msgstr "打包允许的 delta 链的最大长度"
11904
11905 #: builtin/pack-objects.c:3126
11906 msgid "reuse existing deltas"
11907 msgstr "重用已存在的 deltas"
11908
11909 #: builtin/pack-objects.c:3128
11910 msgid "reuse existing objects"
11911 msgstr "重用已存在的对象"
11912
11913 #: builtin/pack-objects.c:3130
11914 msgid "use OFS_DELTA objects"
11915 msgstr "使用 OFS_DELTA 对象"
11916
11917 #: builtin/pack-objects.c:3132
11918 msgid "use threads when searching for best delta matches"
11919 msgstr "使用线程查询最佳 delta 匹配"
11920
11921 #: builtin/pack-objects.c:3134
11922 msgid "do not create an empty pack output"
11923 msgstr "不创建空的包输出"
11924
11925 #: builtin/pack-objects.c:3136
11926 msgid "read revision arguments from standard input"
11927 msgstr "从标准输入读取版本号参数"
11928
11929 #: builtin/pack-objects.c:3138
11930 msgid "limit the objects to those that are not yet packed"
11931 msgstr "限制那些尚未打包的对象"
11932
11933 #: builtin/pack-objects.c:3141
11934 msgid "include objects reachable from any reference"
11935 msgstr "包括可以从任何引用访问到的对象"
11936
11937 #: builtin/pack-objects.c:3144
11938 msgid "include objects referred by reflog entries"
11939 msgstr "包括被引用日志引用到的对象"
11940
11941 #: builtin/pack-objects.c:3147
11942 msgid "include objects referred to by the index"
11943 msgstr "包括被索引引用到的对象"
11944
11945 #: builtin/pack-objects.c:3150
11946 msgid "output pack to stdout"
11947 msgstr "输出包到标准输出"
11948
11949 #: builtin/pack-objects.c:3152
11950 msgid "include tag objects that refer to objects to be packed"
11951 msgstr "包括那些引用了待打包对象的标签对象"
11952
11953 #: builtin/pack-objects.c:3154
11954 msgid "keep unreachable objects"
11955 msgstr "维持不可达的对象"
11956
11957 #: builtin/pack-objects.c:3156
11958 msgid "pack loose unreachable objects"
11959 msgstr "打包松散的不可达对象"
11960
11961 #: builtin/pack-objects.c:3158
11962 msgid "unpack unreachable objects newer than <time>"
11963 msgstr "将比给定 <时间> 新的无法访问的对象解包"
11964
11965 #: builtin/pack-objects.c:3161
11966 msgid "create thin packs"
11967 msgstr "创建精简包"
11968
11969 #: builtin/pack-objects.c:3163
11970 msgid "create packs suitable for shallow fetches"
11971 msgstr "创建适合浅克隆仓库获取的包"
11972
11973 #: builtin/pack-objects.c:3165
11974 msgid "ignore packs that have companion .keep file"
11975 msgstr "忽略配有 .keep 文件的包"
11976
11977 #: builtin/pack-objects.c:3167
11978 msgid "ignore this pack"
11979 msgstr "忽略该 pack"
11980
11981 #: builtin/pack-objects.c:3169
11982 msgid "pack compression level"
11983 msgstr "打包压缩级别"
11984
11985 #: builtin/pack-objects.c:3171
11986 msgid "do not hide commits by grafts"
11987 msgstr "显示被移植隐藏的提交"
11988
11989 #: builtin/pack-objects.c:3173
11990 msgid "use a bitmap index if available to speed up counting objects"
11991 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
11992
11993 #: builtin/pack-objects.c:3175
11994 msgid "write a bitmap index together with the pack index"
11995 msgstr "在建立包索引的同时创建 bitmap 索引"
11996
11997 #: builtin/pack-objects.c:3178
11998 msgid "handling for missing objects"
11999 msgstr "处理丢失的对象"
12000
12001 #: builtin/pack-objects.c:3181
12002 msgid "do not pack objects in promisor packfiles"
12003 msgstr "不要打包 promisor 包文件中的对象"
12004
12005 #: builtin/pack-objects.c:3205
12006 #, c-format
12007 msgid "delta chain depth %d is too deep, forcing %d"
12008 msgstr "增量链深度 %d 太深了,强制为 %d"
12009
12010 #: builtin/pack-objects.c:3210
12011 #, c-format
12012 msgid "pack.deltaCacheLimit is too high, forcing %d"
12013 msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
12014
12015 #: builtin/pack-objects.c:3338
12016 msgid "Enumerating objects"
12017 msgstr "枚举对象"
12018
12019 #: builtin/pack-refs.c:7
12020 msgid "git pack-refs [<options>]"
12021 msgstr "git pack-refs [<选项>]"
12022
12023 #: builtin/pack-refs.c:15
12024 msgid "pack everything"
12025 msgstr "打包一切"
12026
12027 #: builtin/pack-refs.c:16
12028 msgid "prune loose refs (default)"
12029 msgstr "清除松散的引用(默认)"
12030
12031 #: builtin/prune-packed.c:8
12032 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
12033 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
12034
12035 #: builtin/prune-packed.c:41
12036 msgid "Removing duplicate objects"
12037 msgstr "正在删除重复对象"
12038
12039 #: builtin/prune.c:11
12040 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
12041 msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
12042
12043 #: builtin/prune.c:108
12044 msgid "report pruned objects"
12045 msgstr "报告清除的对象"
12046
12047 #: builtin/prune.c:111
12048 msgid "expire objects older than <time>"
12049 msgstr "使早于给定时间的对象过期"
12050
12051 #: builtin/prune.c:113
12052 msgid "limit traversal to objects outside promisor packfiles"
12053 msgstr "限制遍历 promisor 包以外的对象"
12054
12055 #: builtin/prune.c:127
12056 msgid "cannot prune in a precious-objects repo"
12057 msgstr "不能在珍品仓库中执行清理操作"
12058
12059 #: builtin/pull.c:59 builtin/pull.c:61
12060 #, c-format
12061 msgid "Invalid value for %s: %s"
12062 msgstr "%s 的值无效:%s"
12063
12064 #: builtin/pull.c:81
12065 msgid "git pull [<options>] [<repository> [<refspec>...]]"
12066 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
12067
12068 #: builtin/pull.c:132
12069 msgid "control for recursive fetching of submodules"
12070 msgstr "控制子模组的递归获取"
12071
12072 #: builtin/pull.c:136
12073 msgid "Options related to merging"
12074 msgstr "和合并相关的选项"
12075
12076 #: builtin/pull.c:139
12077 msgid "incorporate changes by rebasing rather than merging"
12078 msgstr "使用变基操作取代合并操作以合入修改"
12079
12080 #: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121
12081 msgid "allow fast-forward"
12082 msgstr "允许快进式"
12083
12084 #: builtin/pull.c:175
12085 msgid "automatically stash/stash pop before and after rebase"
12086 msgstr "变基操作前后执行自动贮藏和弹出贮藏"
12087
12088 #: builtin/pull.c:191
12089 msgid "Options related to fetching"
12090 msgstr "和获取相关的参数"
12091
12092 #: builtin/pull.c:209
12093 msgid "number of submodules pulled in parallel"
12094 msgstr "并发拉取的子模组的数量"
12095
12096 #: builtin/pull.c:304
12097 #, c-format
12098 msgid "Invalid value for pull.ff: %s"
12099 msgstr "pull.ff 的取值无效:%s"
12100
12101 #: builtin/pull.c:420
12102 msgid ""
12103 "There is no candidate for rebasing against among the refs that you just "
12104 "fetched."
12105 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
12106
12107 #: builtin/pull.c:422
12108 msgid ""
12109 "There are no candidates for merging among the refs that you just fetched."
12110 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
12111
12112 #: builtin/pull.c:423
12113 msgid ""
12114 "Generally this means that you provided a wildcard refspec which had no\n"
12115 "matches on the remote end."
12116 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
12117
12118 #: builtin/pull.c:426
12119 #, c-format
12120 msgid ""
12121 "You asked to pull from the remote '%s', but did not specify\n"
12122 "a branch. Because this is not the default configured remote\n"
12123 "for your current branch, you must specify a branch on the command line."
12124 msgstr ""
12125 "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
12126 "分支默认的远程仓库,您必须在命令行中指定一个分支名。"
12127
12128 #: builtin/pull.c:431 git-parse-remote.sh:73
12129 msgid "You are not currently on a branch."
12130 msgstr "您当前不在一个分支上。"
12131
12132 #: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79
12133 msgid "Please specify which branch you want to rebase against."
12134 msgstr "请指定您要变基到哪一个分支。"
12135
12136 #: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82
12137 msgid "Please specify which branch you want to merge with."
12138 msgstr "请指定您要合并哪一个分支。"
12139
12140 #: builtin/pull.c:436 builtin/pull.c:451
12141 msgid "See git-pull(1) for details."
12142 msgstr "详见 git-pull(1)。"
12143
12144 #: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453
12145 #: git-parse-remote.sh:64
12146 msgid "<remote>"
12147 msgstr "<远程>"
12148
12149 #: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523
12150 #: git-parse-remote.sh:65
12151 msgid "<branch>"
12152 msgstr "<分支>"
12153
12154 #: builtin/pull.c:446 git-parse-remote.sh:75
12155 msgid "There is no tracking information for the current branch."
12156 msgstr "当前分支没有跟踪信息。"
12157
12158 #: builtin/pull.c:455 git-parse-remote.sh:95
12159 msgid ""
12160 "If you wish to set tracking information for this branch you can do so with:"
12161 msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
12162
12163 #: builtin/pull.c:460
12164 #, c-format
12165 msgid ""
12166 "Your configuration specifies to merge with the ref '%s'\n"
12167 "from the remote, but no such ref was fetched."
12168 msgstr ""
12169 "您的配置中指定要合并远程的引用 '%s',\n"
12170 "但是没有获取到这个引用。"
12171
12172 #: builtin/pull.c:826
12173 msgid "ignoring --verify-signatures for rebase"
12174 msgstr "为变基操作忽略 --verify-signatures"
12175
12176 #: builtin/pull.c:874
12177 msgid "--[no-]autostash option is only valid with --rebase."
12178 msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
12179
12180 #: builtin/pull.c:882
12181 msgid "Updating an unborn branch with changes added to the index."
12182 msgstr "更新尚未诞生的分支,变更添加至索引。"
12183
12184 #: builtin/pull.c:885
12185 msgid "pull with rebase"
12186 msgstr "变基式拉取"
12187
12188 #: builtin/pull.c:886
12189 msgid "please commit or stash them."
12190 msgstr "请提交或贮藏它们。"
12191
12192 #: builtin/pull.c:911
12193 #, c-format
12194 msgid ""
12195 "fetch updated the current branch head.\n"
12196 "fast-forwarding your working tree from\n"
12197 "commit %s."
12198 msgstr ""
12199 "fetch 更新了当前的分支。快进您的工作区\n"
12200 "至提交 %s。"
12201
12202 #: builtin/pull.c:916
12203 #, c-format
12204 msgid ""
12205 "Cannot fast-forward your working tree.\n"
12206 "After making sure that you saved anything precious from\n"
12207 "$ git diff %s\n"
12208 "output, run\n"
12209 "$ git reset --hard\n"
12210 "to recover."
12211 msgstr ""
12212 "您当前的工作区无法执行快进操作。\n"
12213 "首先执行如下命令:\n"
12214 "$ git diff %s\n"
12215 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
12216 "$ git reset --hard\n"
12217 "恢复之前的状态。"
12218
12219 #: builtin/pull.c:931
12220 msgid "Cannot merge multiple branches into empty head."
12221 msgstr "无法将多个分支合并到空分支。"
12222
12223 #: builtin/pull.c:935
12224 msgid "Cannot rebase onto multiple branches."
12225 msgstr "无法变基到多个分支。"
12226
12227 #: builtin/pull.c:942
12228 msgid "cannot rebase with locally recorded submodule modifications"
12229 msgstr "本地子模组中有修改,无法变基"
12230
12231 #: builtin/push.c:19
12232 msgid "git push [<options>] [<repository> [<refspec>...]]"
12233 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
12234
12235 #: builtin/push.c:111
12236 msgid "tag shorthand without <tag>"
12237 msgstr "标签后面未提供 <标签> 参数"
12238
12239 #: builtin/push.c:121
12240 msgid "--delete only accepts plain target ref names"
12241 msgstr "--delete 只接受简单的目标引用名"
12242
12243 #: builtin/push.c:165
12244 msgid ""
12245 "\n"
12246 "To choose either option permanently, see push.default in 'git help config'."
12247 msgstr ""
12248 "\n"
12249 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
12250
12251 #: builtin/push.c:168
12252 #, c-format
12253 msgid ""
12254 "The upstream branch of your current branch does not match\n"
12255 "the name of your current branch. To push to the upstream branch\n"
12256 "on the remote, use\n"
12257 "\n"
12258 " git push %s HEAD:%s\n"
12259 "\n"
12260 "To push to the branch of the same name on the remote, use\n"
12261 "\n"
12262 " git push %s %s\n"
12263 "%s"
12264 msgstr ""
12265 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
12266 "上游分支,使用\n"
12267 "\n"
12268 " git push %s HEAD:%s\n"
12269 "\n"
12270 "为推送至远程同名分支,使用\n"
12271 "\n"
12272 " git push %s %s\n"
12273 "%s"
12274
12275 #: builtin/push.c:183
12276 #, c-format
12277 msgid ""
12278 "You are not currently on a branch.\n"
12279 "To push the history leading to the current (detached HEAD)\n"
12280 "state now, use\n"
12281 "\n"
12282 " git push %s HEAD:<name-of-remote-branch>\n"
12283 msgstr ""
12284 "您当前不在一个分支上。\n"
12285 "现在为推送当前(分离头指针)的历史,使用\n"
12286 "\n"
12287 " git push %s HEAD:<远程分支名字>\n"
12288
12289 #: builtin/push.c:197
12290 #, c-format
12291 msgid ""
12292 "The current branch %s has no upstream branch.\n"
12293 "To push the current branch and set the remote as upstream, use\n"
12294 "\n"
12295 " git push --set-upstream %s %s\n"
12296 msgstr ""
12297 "当前分支 %s 没有对应的上游分支。\n"
12298 "为推送当前分支并建立与远程上游的跟踪,使用\n"
12299 "\n"
12300 " git push --set-upstream %s %s\n"
12301
12302 #: builtin/push.c:205
12303 #, c-format
12304 msgid "The current branch %s has multiple upstream branches, refusing to push."
12305 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
12306
12307 #: builtin/push.c:208
12308 #, c-format
12309 msgid ""
12310 "You are pushing to remote '%s', which is not the upstream of\n"
12311 "your current branch '%s', without telling me what to push\n"
12312 "to update which remote branch."
12313 msgstr ""
12314 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
12315 "而没有告诉我要推送什么、更新哪个远程分支。"
12316
12317 #: builtin/push.c:267
12318 msgid ""
12319 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
12320 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
12321
12322 #: builtin/push.c:274
12323 msgid ""
12324 "Updates were rejected because the tip of your current branch is behind\n"
12325 "its remote counterpart. Integrate the remote changes (e.g.\n"
12326 "'git pull ...') before pushing again.\n"
12327 "See the 'Note about fast-forwards' in 'git push --help' for details."
12328 msgstr ""
12329 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
12330 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
12331 "'git push --help' 中的 'Note about fast-forwards' 小节。"
12332
12333 #: builtin/push.c:280
12334 msgid ""
12335 "Updates were rejected because a pushed branch tip is behind its remote\n"
12336 "counterpart. Check out this branch and integrate the remote changes\n"
12337 "(e.g. 'git pull ...') before pushing again.\n"
12338 "See the 'Note about fast-forwards' in 'git push --help' for details."
12339 msgstr ""
12340 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
12341 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
12342 "'git push --help' 中的 'Note about fast-forwards' 小节。"
12343
12344 #: builtin/push.c:286
12345 msgid ""
12346 "Updates were rejected because the remote contains work that you do\n"
12347 "not have locally. This is usually caused by another repository pushing\n"
12348 "to the same ref. You may want to first integrate the remote changes\n"
12349 "(e.g., 'git pull ...') before pushing again.\n"
12350 "See the 'Note about fast-forwards' in 'git push --help' for details."
12351 msgstr ""
12352 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
12353 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
12354 "(如 'git pull ...')。\n"
12355 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
12356
12357 #: builtin/push.c:293
12358 msgid "Updates were rejected because the tag already exists in the remote."
12359 msgstr "更新被拒绝,因为该标签在远程已经存在。"
12360
12361 #: builtin/push.c:296
12362 msgid ""
12363 "You cannot update a remote ref that points at a non-commit object,\n"
12364 "or update a remote ref to make it point at a non-commit object,\n"
12365 "without using the '--force' option.\n"
12366 msgstr ""
12367 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
12368 "也不能更新远程引用让其指向一个非提交对象。\n"
12369
12370 #: builtin/push.c:357
12371 #, c-format
12372 msgid "Pushing to %s\n"
12373 msgstr "推送到 %s\n"
12374
12375 #: builtin/push.c:361
12376 #, c-format
12377 msgid "failed to push some refs to '%s'"
12378 msgstr "无法推送一些引用到 '%s'"
12379
12380 #: builtin/push.c:395
12381 #, c-format
12382 msgid "bad repository '%s'"
12383 msgstr "坏的仓库 '%s'"
12384
12385 #: builtin/push.c:396
12386 msgid ""
12387 "No configured push destination.\n"
12388 "Either specify the URL from the command-line or configure a remote "
12389 "repository using\n"
12390 "\n"
12391 " git remote add <name> <url>\n"
12392 "\n"
12393 "and then push using the remote name\n"
12394 "\n"
12395 " git push <name>\n"
12396 msgstr ""
12397 "没有配置推送目标。\n"
12398 "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
12399 "\n"
12400 " git remote add <名称> <地址>\n"
12401 "\n"
12402 "然后使用该远程仓库名执行推送\n"
12403 "\n"
12404 " git push <名称>\n"
12405
12406 #: builtin/push.c:551
12407 msgid "repository"
12408 msgstr "仓库"
12409
12410 #: builtin/push.c:552 builtin/send-pack.c:164
12411 msgid "push all refs"
12412 msgstr "推送所有引用"
12413
12414 #: builtin/push.c:553 builtin/send-pack.c:166
12415 msgid "mirror all refs"
12416 msgstr "镜像所有引用"
12417
12418 #: builtin/push.c:555
12419 msgid "delete refs"
12420 msgstr "删除引用"
12421
12422 #: builtin/push.c:556
12423 msgid "push tags (can't be used with --all or --mirror)"
12424 msgstr "推送标签(不能使用 --all or --mirror)"
12425
12426 #: builtin/push.c:559 builtin/send-pack.c:167
12427 msgid "force updates"
12428 msgstr "强制更新"
12429
12430 #: builtin/push.c:561 builtin/send-pack.c:181
12431 msgid "refname>:<expect"
12432 msgstr "引用名>:<期望值"
12433
12434 #: builtin/push.c:562 builtin/send-pack.c:182
12435 msgid "require old value of ref to be at this value"
12436 msgstr "要求引用旧的取值为设定值"
12437
12438 #: builtin/push.c:565
12439 msgid "control recursive pushing of submodules"
12440 msgstr "控制子模组的递归推送"
12441
12442 #: builtin/push.c:567 builtin/send-pack.c:175
12443 msgid "use thin pack"
12444 msgstr "使用精简打包"
12445
12446 #: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
12447 #: builtin/send-pack.c:162
12448 msgid "receive pack program"
12449 msgstr "接收包程序"
12450
12451 #: builtin/push.c:570
12452 msgid "set upstream for git pull/status"
12453 msgstr "设置 git pull/status 的上游"
12454
12455 #: builtin/push.c:573
12456 msgid "prune locally removed refs"
12457 msgstr "清除本地删除的引用"
12458
12459 #: builtin/push.c:575
12460 msgid "bypass pre-push hook"
12461 msgstr "绕过 pre-push 钩子"
12462
12463 #: builtin/push.c:576
12464 msgid "push missing but relevant tags"
12465 msgstr "推送缺失但有关的标签"
12466
12467 #: builtin/push.c:579 builtin/send-pack.c:169
12468 msgid "GPG sign the push"
12469 msgstr "用 GPG 为推送签名"
12470
12471 #: builtin/push.c:581 builtin/send-pack.c:176
12472 msgid "request atomic transaction on remote side"
12473 msgstr "需要远端支持原子事务"
12474
12475 #: builtin/push.c:599
12476 msgid "--delete is incompatible with --all, --mirror and --tags"
12477 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
12478
12479 #: builtin/push.c:601
12480 msgid "--delete doesn't make sense without any refs"
12481 msgstr "--delete 未接任何引用没有意义"
12482
12483 #: builtin/push.c:604
12484 msgid "--all and --tags are incompatible"
12485 msgstr "--all 和 --tags 不兼容"
12486
12487 #: builtin/push.c:606
12488 msgid "--all can't be combined with refspecs"
12489 msgstr "--all 不能和引用规格同时使用"
12490
12491 #: builtin/push.c:610
12492 msgid "--mirror and --tags are incompatible"
12493 msgstr "--mirror 和 --tags 不兼容"
12494
12495 #: builtin/push.c:612
12496 msgid "--mirror can't be combined with refspecs"
12497 msgstr "--mirror 不能和引用规格同时使用"
12498
12499 #: builtin/push.c:615
12500 msgid "--all and --mirror are incompatible"
12501 msgstr "--all 和 --mirror 不兼容"
12502
12503 #: builtin/push.c:634
12504 msgid "push options must not have new line characters"
12505 msgstr "推送选项不能有换行符"
12506
12507 #: builtin/read-tree.c:40
12508 msgid ""
12509 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
12510 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
12511 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
12512 msgstr ""
12513 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
12514 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
12515 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
12516
12517 #: builtin/read-tree.c:120
12518 msgid "write resulting index to <file>"
12519 msgstr "将索引结果写入 <文件>"
12520
12521 #: builtin/read-tree.c:123
12522 msgid "only empty the index"
12523 msgstr "只是清空索引"
12524
12525 #: builtin/read-tree.c:125
12526 msgid "Merging"
12527 msgstr "合并"
12528
12529 #: builtin/read-tree.c:127
12530 msgid "perform a merge in addition to a read"
12531 msgstr "读取之余再执行一个合并"
12532
12533 #: builtin/read-tree.c:129
12534 msgid "3-way merge if no file level merging required"
12535 msgstr "如果没有文件级合并需要,执行三方合并"
12536
12537 #: builtin/read-tree.c:131
12538 msgid "3-way merge in presence of adds and removes"
12539 msgstr "存在添加和删除时,也执行三方合并"
12540
12541 #: builtin/read-tree.c:133
12542 msgid "same as -m, but discard unmerged entries"
12543 msgstr "类似于 -m,但丢弃未合并的条目"
12544
12545 #: builtin/read-tree.c:134
12546 msgid "<subdirectory>/"
12547 msgstr "<子目录>/"
12548
12549 #: builtin/read-tree.c:135
12550 msgid "read the tree into the index under <subdirectory>/"
12551 msgstr "读取树对象到索引的 <子目录>/ 下"
12552
12553 #: builtin/read-tree.c:138
12554 msgid "update working tree with merge result"
12555 msgstr "用合并的结果更新工作区"
12556
12557 #: builtin/read-tree.c:140
12558 msgid "gitignore"
12559 msgstr "gitignore"
12560
12561 #: builtin/read-tree.c:141
12562 msgid "allow explicitly ignored files to be overwritten"
12563 msgstr "允许忽略文件中设定的文件可以被覆盖"
12564
12565 #: builtin/read-tree.c:144
12566 msgid "don't check the working tree after merging"
12567 msgstr "合并后不检查工作区"
12568
12569 #: builtin/read-tree.c:145
12570 msgid "don't update the index or the work tree"
12571 msgstr "不更新索引区和工作区"
12572
12573 #: builtin/read-tree.c:147
12574 msgid "skip applying sparse checkout filter"
12575 msgstr "跳过应用稀疏检出过滤器"
12576
12577 #: builtin/read-tree.c:149
12578 msgid "debug unpack-trees"
12579 msgstr "调试 unpack-trees"
12580
12581 #: builtin/rebase--helper.c:8
12582 msgid "git rebase--helper [<options>]"
12583 msgstr "git rebase--helper [<选项>]"
12584
12585 #: builtin/rebase--helper.c:24
12586 msgid "keep empty commits"
12587 msgstr "保持空提交"
12588
12589 #: builtin/rebase--helper.c:26 builtin/revert.c:123
12590 msgid "allow commits with empty messages"
12591 msgstr "允许提交说明为空"
12592
12593 #: builtin/rebase--helper.c:27
12594 msgid "rebase merge commits"
12595 msgstr "对合并提交变基"
12596
12597 #: builtin/rebase--helper.c:29
12598 msgid "keep original branch points of cousins"
12599 msgstr "保持兄弟提交的原始分支点"
12600
12601 #: builtin/rebase--helper.c:30
12602 msgid "continue rebase"
12603 msgstr "继续变基"
12604
12605 #: builtin/rebase--helper.c:32
12606 msgid "abort rebase"
12607 msgstr "中止变基"
12608
12609 #: builtin/rebase--helper.c:35
12610 msgid "make rebase script"
12611 msgstr "制作变基脚本"
12612
12613 #: builtin/rebase--helper.c:37
12614 msgid "shorten commit ids in the todo list"
12615 msgstr "缩短待办列表中的提交号"
12616
12617 #: builtin/rebase--helper.c:39
12618 msgid "expand commit ids in the todo list"
12619 msgstr "扩展待办列表中的提交号"
12620
12621 #: builtin/rebase--helper.c:41
12622 msgid "check the todo list"
12623 msgstr "检查待办列表"
12624
12625 #: builtin/rebase--helper.c:43
12626 msgid "skip unnecessary picks"
12627 msgstr "跳过不必要的拣选"
12628
12629 #: builtin/rebase--helper.c:45
12630 msgid "rearrange fixup/squash lines"
12631 msgstr "重新排列 fixup/squash 行"
12632
12633 #: builtin/rebase--helper.c:47
12634 msgid "insert exec commands in todo list"
12635 msgstr "在待办列表中插入 exec 执行命令"
12636
12637 #: builtin/rebase--helper.c:68
12638 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
12639 msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果"
12640
12641 #: builtin/receive-pack.c:31
12642 msgid "git receive-pack <git-dir>"
12643 msgstr "git receive-pack <仓库目录>"
12644
12645 #: builtin/receive-pack.c:842
12646 msgid ""
12647 "By default, updating the current branch in a non-bare repository\n"
12648 "is denied, because it will make the index and work tree inconsistent\n"
12649 "with what you pushed, and will require 'git reset --hard' to match\n"
12650 "the work tree to HEAD.\n"
12651 "\n"
12652 "You can set the 'receive.denyCurrentBranch' configuration variable\n"
12653 "to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
12654 "its current branch; however, this is not recommended unless you\n"
12655 "arranged to update its work tree to match what you pushed in some\n"
12656 "other way.\n"
12657 "\n"
12658 "To squelch this message and still keep the default behaviour, set\n"
12659 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
12660 msgstr ""
12661 "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
12662 "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
12663 "\n"
12664 "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
12665 "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
12666 "用某种方式将其工作区更新至您推送的状态。\n"
12667 "\n"
12668 "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
12669 "配置变量为 'refuse'。"
12670
12671 #: builtin/receive-pack.c:862
12672 msgid ""
12673 "By default, deleting the current branch is denied, because the next\n"
12674 "'git clone' won't result in any file checked out, causing confusion.\n"
12675 "\n"
12676 "You can set 'receive.denyDeleteCurrent' configuration variable to\n"
12677 "'warn' or 'ignore' in the remote repository to allow deleting the\n"
12678 "current branch, with or without a warning message.\n"
12679 "\n"
12680 "To squelch this message, you can set it to 'refuse'."
12681 msgstr ""
12682 "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
12683 "导致困惑。\n"
12684 "\n"
12685 "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
12686 "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
12687 "\n"
12688 "若要屏蔽此信息,您可以设置它为 'refuse'。"
12689
12690 #: builtin/receive-pack.c:1935
12691 msgid "quiet"
12692 msgstr "静默模式"
12693
12694 #: builtin/receive-pack.c:1949
12695 msgid "You must specify a directory."
12696 msgstr "您必须指定一个目录。"
12697
12698 #: builtin/reflog.c:532 builtin/reflog.c:537
12699 #, c-format
12700 msgid "'%s' is not a valid timestamp"
12701 msgstr "'%s' 不是一个有效的时间戳"
12702
12703 #: builtin/remote.c:14
12704 msgid "git remote [-v | --verbose]"
12705 msgstr "git remote [-v | --verbose]"
12706
12707 #: builtin/remote.c:15
12708 msgid ""
12709 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
12710 "mirror=<fetch|push>] <name> <url>"
12711 msgstr ""
12712 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
12713 "mirror=<fetch|push>] <名称> <地址>"
12714
12715 #: builtin/remote.c:16 builtin/remote.c:36
12716 msgid "git remote rename <old> <new>"
12717 msgstr "git remote rename <旧名称> <新名称>"
12718
12719 #: builtin/remote.c:17 builtin/remote.c:41
12720 msgid "git remote remove <name>"
12721 msgstr "git remote remove <名称>"
12722
12723 #: builtin/remote.c:18 builtin/remote.c:46
12724 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
12725 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
12726
12727 #: builtin/remote.c:19
12728 msgid "git remote [-v | --verbose] show [-n] <name>"
12729 msgstr "git remote [-v | --verbose] show [-n] <名称>"
12730
12731 #: builtin/remote.c:20
12732 msgid "git remote prune [-n | --dry-run] <name>"
12733 msgstr "git remote prune [-n | --dry-run] <名称>"
12734
12735 #: builtin/remote.c:21
12736 msgid ""
12737 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
12738 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
12739
12740 #: builtin/remote.c:22
12741 msgid "git remote set-branches [--add] <name> <branch>..."
12742 msgstr "git remote set-branches [--add] <名称> <分支>..."
12743
12744 #: builtin/remote.c:23 builtin/remote.c:72
12745 msgid "git remote get-url [--push] [--all] <name>"
12746 msgstr "git remote get-url [--push] [--all] <名称>"
12747
12748 #: builtin/remote.c:24 builtin/remote.c:77
12749 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
12750 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
12751
12752 #: builtin/remote.c:25 builtin/remote.c:78
12753 msgid "git remote set-url --add <name> <newurl>"
12754 msgstr "git remote set-url --add <名称> <新的地址>"
12755
12756 #: builtin/remote.c:26 builtin/remote.c:79
12757 msgid "git remote set-url --delete <name> <url>"
12758 msgstr "git remote set-url --delete <名称> <地址>"
12759
12760 #: builtin/remote.c:31
12761 msgid "git remote add [<options>] <name> <url>"
12762 msgstr "git remote add [<选项>] <名称> <地址>"
12763
12764 #: builtin/remote.c:51
12765 msgid "git remote set-branches <name> <branch>..."
12766 msgstr "git remote set-branches <名称> <分支>..."
12767
12768 #: builtin/remote.c:52
12769 msgid "git remote set-branches --add <name> <branch>..."
12770 msgstr "git remote set-branches --add <名称> <分支>..."
12771
12772 #: builtin/remote.c:57
12773 msgid "git remote show [<options>] <name>"
12774 msgstr "git remote show [<选项>] <名称>"
12775
12776 #: builtin/remote.c:62
12777 msgid "git remote prune [<options>] <name>"
12778 msgstr "git remote prune [<选项>] <名称>"
12779
12780 #: builtin/remote.c:67
12781 msgid "git remote update [<options>] [<group> | <remote>]..."
12782 msgstr "git remote update [<选项>] [<组> | <远程>]..."
12783
12784 #: builtin/remote.c:96
12785 #, c-format
12786 msgid "Updating %s"
12787 msgstr "更新 %s 中"
12788
12789 #: builtin/remote.c:128
12790 msgid ""
12791 "--mirror is dangerous and deprecated; please\n"
12792 "\t use --mirror=fetch or --mirror=push instead"
12793 msgstr ""
12794 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
12795 "\t 或 --mirror=push"
12796
12797 #: builtin/remote.c:145
12798 #, c-format
12799 msgid "unknown mirror argument: %s"
12800 msgstr "未知的镜像参数:%s"
12801
12802 #: builtin/remote.c:161
12803 msgid "fetch the remote branches"
12804 msgstr "抓取远程的分支"
12805
12806 #: builtin/remote.c:163
12807 msgid "import all tags and associated objects when fetching"
12808 msgstr "抓取时导入所有的标签和关联对象"
12809
12810 #: builtin/remote.c:166
12811 msgid "or do not fetch any tag at all (--no-tags)"
12812 msgstr "或不抓取任何标签(--no-tags)"
12813
12814 #: builtin/remote.c:168
12815 msgid "branch(es) to track"
12816 msgstr "跟踪的分支"
12817
12818 #: builtin/remote.c:169
12819 msgid "master branch"
12820 msgstr "主线分支"
12821
12822 #: builtin/remote.c:170
12823 msgid "push|fetch"
12824 msgstr "push|fetch"
12825
12826 #: builtin/remote.c:171
12827 msgid "set up remote as a mirror to push to or fetch from"
12828 msgstr "把远程设置为用以推送或抓取的镜像"
12829
12830 #: builtin/remote.c:183
12831 msgid "specifying a master branch makes no sense with --mirror"
12832 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
12833
12834 #: builtin/remote.c:185
12835 msgid "specifying branches to track makes sense only with fetch mirrors"
12836 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
12837
12838 #: builtin/remote.c:192 builtin/remote.c:634
12839 #, c-format
12840 msgid "remote %s already exists."
12841 msgstr "远程 %s 已经存在。"
12842
12843 #: builtin/remote.c:196 builtin/remote.c:638
12844 #, c-format
12845 msgid "'%s' is not a valid remote name"
12846 msgstr "'%s' 不是一个有效的远程名称"
12847
12848 #: builtin/remote.c:236
12849 #, c-format
12850 msgid "Could not setup master '%s'"
12851 msgstr "无法设置 master '%s'"
12852
12853 #: builtin/remote.c:342
12854 #, c-format
12855 msgid "Could not get fetch map for refspec %s"
12856 msgstr "无法得到引用规格 %s 的获取列表"
12857
12858 #: builtin/remote.c:441 builtin/remote.c:449
12859 msgid "(matching)"
12860 msgstr "(匹配)"
12861
12862 #: builtin/remote.c:453
12863 msgid "(delete)"
12864 msgstr "(删除)"
12865
12866 #: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861
12867 #, c-format
12868 msgid "No such remote: %s"
12869 msgstr "没有这样的远程:%s"
12870
12871 #: builtin/remote.c:644
12872 #, c-format
12873 msgid "Could not rename config section '%s' to '%s'"
12874 msgstr "不能重命名配置小节 '%s' 到 '%s'"
12875
12876 #: builtin/remote.c:664
12877 #, c-format
12878 msgid ""
12879 "Not updating non-default fetch refspec\n"
12880 "\t%s\n"
12881 "\tPlease update the configuration manually if necessary."
12882 msgstr ""
12883 "没有更新非默认的获取引用规格\n"
12884 "\t%s\n"
12885 "\t如果必要请手动更新配置。"
12886
12887 #: builtin/remote.c:700
12888 #, c-format
12889 msgid "deleting '%s' failed"
12890 msgstr "删除 '%s' 失败"
12891
12892 #: builtin/remote.c:734
12893 #, c-format
12894 msgid "creating '%s' failed"
12895 msgstr "创建 '%s' 失败"
12896
12897 #: builtin/remote.c:799
12898 msgid ""
12899 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
12900 "to delete it, use:"
12901 msgid_plural ""
12902 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
12903 "to delete them, use:"
12904 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
12905 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
12906
12907 #: builtin/remote.c:813
12908 #, c-format
12909 msgid "Could not remove config section '%s'"
12910 msgstr "不能移除配置小节 '%s'"
12911
12912 #: builtin/remote.c:914
12913 #, c-format
12914 msgid " new (next fetch will store in remotes/%s)"
12915 msgstr " 新的(下一次获取将存储于 remotes/%s)"
12916
12917 #: builtin/remote.c:917
12918 msgid " tracked"
12919 msgstr " 已跟踪"
12920
12921 #: builtin/remote.c:919
12922 msgid " stale (use 'git remote prune' to remove)"
12923 msgstr " 过时(使用 'git remote prune' 来移除)"
12924
12925 #: builtin/remote.c:921
12926 msgid " ???"
12927 msgstr " ???"
12928
12929 #: builtin/remote.c:962
12930 #, c-format
12931 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
12932 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
12933
12934 #: builtin/remote.c:971
12935 #, c-format
12936 msgid "rebases interactively onto remote %s"
12937 msgstr "交互式变基到远程 %s"
12938
12939 #: builtin/remote.c:973
12940 #, c-format
12941 msgid "rebases interactively (with merges) onto remote %s"
12942 msgstr "交互式变基(含合并提交)到远程 %s"
12943
12944 #: builtin/remote.c:976
12945 #, c-format
12946 msgid "rebases onto remote %s"
12947 msgstr "变基到远程 %s"
12948
12949 #: builtin/remote.c:980
12950 #, c-format
12951 msgid " merges with remote %s"
12952 msgstr " 与远程 %s 合并"
12953
12954 #: builtin/remote.c:983
12955 #, c-format
12956 msgid "merges with remote %s"
12957 msgstr "与远程 %s 合并"
12958
12959 #: builtin/remote.c:986
12960 #, c-format
12961 msgid "%-*s and with remote %s\n"
12962 msgstr "%-*s 以及和远程 %s\n"
12963
12964 #: builtin/remote.c:1029
12965 msgid "create"
12966 msgstr "创建"
12967
12968 #: builtin/remote.c:1032
12969 msgid "delete"
12970 msgstr "删除"
12971
12972 #: builtin/remote.c:1036
12973 msgid "up to date"
12974 msgstr "最新"
12975
12976 #: builtin/remote.c:1039
12977 msgid "fast-forwardable"
12978 msgstr "可快进"
12979
12980 #: builtin/remote.c:1042
12981 msgid "local out of date"
12982 msgstr "本地已过时"
12983
12984 #: builtin/remote.c:1049
12985 #, c-format
12986 msgid " %-*s forces to %-*s (%s)"
12987 msgstr " %-*s 强制推送至 %-*s (%s)"
12988
12989 #: builtin/remote.c:1052
12990 #, c-format
12991 msgid " %-*s pushes to %-*s (%s)"
12992 msgstr " %-*s 推送至 %-*s (%s)"
12993
12994 #: builtin/remote.c:1056
12995 #, c-format
12996 msgid " %-*s forces to %s"
12997 msgstr " %-*s 强制推送至 %s"
12998
12999 #: builtin/remote.c:1059
13000 #, c-format
13001 msgid " %-*s pushes to %s"
13002 msgstr " %-*s 推送至 %s"
13003
13004 #: builtin/remote.c:1127
13005 msgid "do not query remotes"
13006 msgstr "不查询远程"
13007
13008 #: builtin/remote.c:1154
13009 #, c-format
13010 msgid "* remote %s"
13011 msgstr "* 远程 %s"
13012
13013 #: builtin/remote.c:1155
13014 #, c-format
13015 msgid " Fetch URL: %s"
13016 msgstr " 获取地址:%s"
13017
13018 #: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311
13019 msgid "(no URL)"
13020 msgstr "(无 URL)"
13021
13022 #. TRANSLATORS: the colon ':' should align
13023 #. with the one in " Fetch URL: %s"
13024 #. translation.
13025 #.
13026 #: builtin/remote.c:1170 builtin/remote.c:1172
13027 #, c-format
13028 msgid " Push URL: %s"
13029 msgstr " 推送地址:%s"
13030
13031 #: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178
13032 #, c-format
13033 msgid " HEAD branch: %s"
13034 msgstr " HEAD 分支:%s"
13035
13036 # 译者:中文字符串拼接,可删除前导空格
13037 #: builtin/remote.c:1174
13038 msgid "(not queried)"
13039 msgstr "(未查询)"
13040
13041 #: builtin/remote.c:1176
13042 msgid "(unknown)"
13043 msgstr "(未知)"
13044
13045 #: builtin/remote.c:1180
13046 #, c-format
13047 msgid ""
13048 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
13049 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
13050
13051 #: builtin/remote.c:1192
13052 #, c-format
13053 msgid " Remote branch:%s"
13054 msgid_plural " Remote branches:%s"
13055 msgstr[0] " 远程分支:%s"
13056 msgstr[1] " 远程分支:%s"
13057
13058 # 译者:中文字符串拼接,可删除前导空格
13059 #: builtin/remote.c:1195 builtin/remote.c:1221
13060 msgid " (status not queried)"
13061 msgstr "(状态未查询)"
13062
13063 #: builtin/remote.c:1204
13064 msgid " Local branch configured for 'git pull':"
13065 msgid_plural " Local branches configured for 'git pull':"
13066 msgstr[0] " 为 'git pull' 配置的本地分支:"
13067 msgstr[1] " 为 'git pull' 配置的本地分支:"
13068
13069 #: builtin/remote.c:1212
13070 msgid " Local refs will be mirrored by 'git push'"
13071 msgstr " 本地引用将在 'git push' 时被镜像"
13072
13073 #: builtin/remote.c:1218
13074 #, c-format
13075 msgid " Local ref configured for 'git push'%s:"
13076 msgid_plural " Local refs configured for 'git push'%s:"
13077 msgstr[0] " 为 'git push' 配置的本地引用%s:"
13078 msgstr[1] " 为 'git push' 配置的本地引用%s:"
13079
13080 #: builtin/remote.c:1239
13081 msgid "set refs/remotes/<name>/HEAD according to remote"
13082 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
13083
13084 #: builtin/remote.c:1241
13085 msgid "delete refs/remotes/<name>/HEAD"
13086 msgstr "删除 refs/remotes/<名称>/HEAD"
13087
13088 #: builtin/remote.c:1256
13089 msgid "Cannot determine remote HEAD"
13090 msgstr "无法确定远程 HEAD"
13091
13092 #: builtin/remote.c:1258
13093 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
13094 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
13095
13096 #: builtin/remote.c:1268
13097 #, c-format
13098 msgid "Could not delete %s"
13099 msgstr "无法删除 %s"
13100
13101 #: builtin/remote.c:1276
13102 #, c-format
13103 msgid "Not a valid ref: %s"
13104 msgstr "不是一个有效引用:%s"
13105
13106 #: builtin/remote.c:1278
13107 #, c-format
13108 msgid "Could not setup %s"
13109 msgstr "不能设置 %s"
13110
13111 # 译者:注意保持前导空格
13112 #: builtin/remote.c:1296
13113 #, c-format
13114 msgid " %s will become dangling!"
13115 msgstr " %s 将成为摇摆状态!"
13116
13117 # 译者:注意保持前导空格
13118 #: builtin/remote.c:1297
13119 #, c-format
13120 msgid " %s has become dangling!"
13121 msgstr " %s 已成为摇摆状态!"
13122
13123 #: builtin/remote.c:1307
13124 #, c-format
13125 msgid "Pruning %s"
13126 msgstr "修剪 %s"
13127
13128 #: builtin/remote.c:1308
13129 #, c-format
13130 msgid "URL: %s"
13131 msgstr "URL:%s"
13132
13133 #: builtin/remote.c:1324
13134 #, c-format
13135 msgid " * [would prune] %s"
13136 msgstr " * [将删除] %s"
13137
13138 #: builtin/remote.c:1327
13139 #, c-format
13140 msgid " * [pruned] %s"
13141 msgstr " * [已删除] %s"
13142
13143 #: builtin/remote.c:1372
13144 msgid "prune remotes after fetching"
13145 msgstr "抓取后清除远程"
13146
13147 #: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557
13148 #, c-format
13149 msgid "No such remote '%s'"
13150 msgstr "没有此远程 '%s'"
13151
13152 #: builtin/remote.c:1451
13153 msgid "add branch"
13154 msgstr "添加分支"
13155
13156 #: builtin/remote.c:1458
13157 msgid "no remote specified"
13158 msgstr "未指定远程"
13159
13160 #: builtin/remote.c:1475
13161 msgid "query push URLs rather than fetch URLs"
13162 msgstr "查询推送 URL 地址,而非获取 URL 地址"
13163
13164 #: builtin/remote.c:1477
13165 msgid "return all URLs"
13166 msgstr "返回所有 URL 地址"
13167
13168 #: builtin/remote.c:1505
13169 #, c-format
13170 msgid "no URLs configured for remote '%s'"
13171 msgstr "没有给远程仓库 '%s' 设定 URL"
13172
13173 #: builtin/remote.c:1531
13174 msgid "manipulate push URLs"
13175 msgstr "操作推送 URLS"
13176
13177 #: builtin/remote.c:1533
13178 msgid "add URL"
13179 msgstr "添加 URL"
13180
13181 #: builtin/remote.c:1535
13182 msgid "delete URLs"
13183 msgstr "删除 URLS"
13184
13185 #: builtin/remote.c:1542
13186 msgid "--add --delete doesn't make sense"
13187 msgstr "--add --delete 无意义"
13188
13189 #: builtin/remote.c:1581
13190 #, c-format
13191 msgid "Invalid old URL pattern: %s"
13192 msgstr "无效的旧 URL 匹配模版:%s"
13193
13194 #: builtin/remote.c:1589
13195 #, c-format
13196 msgid "No such URL found: %s"
13197 msgstr "未找到此 URL:%s"
13198
13199 #: builtin/remote.c:1591
13200 msgid "Will not delete all non-push URLs"
13201 msgstr "将不会删除所有非推送 URL 地址"
13202
13203 #: builtin/remote.c:1607
13204 msgid "be verbose; must be placed before a subcommand"
13205 msgstr "冗长输出;必须置于子命令之前"
13206
13207 #: builtin/remote.c:1638
13208 #, c-format
13209 msgid "Unknown subcommand: %s"
13210 msgstr "未知子命令:%s"
13211
13212 #: builtin/repack.c:18
13213 msgid "git repack [<options>]"
13214 msgstr "git repack [<选项>]"
13215
13216 #: builtin/repack.c:23
13217 msgid ""
13218 "Incremental repacks are incompatible with bitmap indexes. Use\n"
13219 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
13220 msgstr ""
13221 "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
13222 "或禁用 pack.writebitmaps 配置。"
13223
13224 #: builtin/repack.c:180
13225 msgid "pack everything in a single pack"
13226 msgstr "所有内容打包到一个包文件中"
13227
13228 #: builtin/repack.c:182
13229 msgid "same as -a, and turn unreachable objects loose"
13230 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
13231
13232 #: builtin/repack.c:185
13233 msgid "remove redundant packs, and run git-prune-packed"
13234 msgstr "删除多余的包,运行 git-prune-packed"
13235
13236 #: builtin/repack.c:187
13237 msgid "pass --no-reuse-delta to git-pack-objects"
13238 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
13239
13240 #: builtin/repack.c:189
13241 msgid "pass --no-reuse-object to git-pack-objects"
13242 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
13243
13244 #: builtin/repack.c:191
13245 msgid "do not run git-update-server-info"
13246 msgstr "不运行 git-update-server-info"
13247
13248 #: builtin/repack.c:194
13249 msgid "pass --local to git-pack-objects"
13250 msgstr "向 git-pack-objects 传递参数 --local"
13251
13252 #: builtin/repack.c:196
13253 msgid "write bitmap index"
13254 msgstr "写 bitmap 索引"
13255
13256 #: builtin/repack.c:197
13257 msgid "approxidate"
13258 msgstr "近似日期"
13259
13260 #: builtin/repack.c:198
13261 msgid "with -A, do not loosen objects older than this"
13262 msgstr "使用 -A,不要将早于给定时间的对象过期"
13263
13264 #: builtin/repack.c:200
13265 msgid "with -a, repack unreachable objects"
13266 msgstr "使用 -a ,重新对不可达对象打包"
13267
13268 #: builtin/repack.c:202
13269 msgid "size of the window used for delta compression"
13270 msgstr "用于增量压缩的窗口值"
13271
13272 #: builtin/repack.c:203 builtin/repack.c:209
13273 msgid "bytes"
13274 msgstr "字节"
13275
13276 #: builtin/repack.c:204
13277 msgid "same as the above, but limit memory size instead of entries count"
13278 msgstr "和上面的相似,但限制内存大小而非条目数"
13279
13280 #: builtin/repack.c:206
13281 msgid "limits the maximum delta depth"
13282 msgstr "限制最大增量深度"
13283
13284 #: builtin/repack.c:208
13285 msgid "limits the maximum number of threads"
13286 msgstr "限制最大线程数"
13287
13288 #: builtin/repack.c:210
13289 msgid "maximum size of each packfile"
13290 msgstr "每个包文件的最大尺寸"
13291
13292 #: builtin/repack.c:212
13293 msgid "repack objects in packs marked with .keep"
13294 msgstr "对标记为 .keep 的包中的对象重新打包"
13295
13296 #: builtin/repack.c:214
13297 msgid "do not repack this pack"
13298 msgstr "不要对该包文件重新打包"
13299
13300 #: builtin/repack.c:224
13301 msgid "cannot delete packs in a precious-objects repo"
13302 msgstr "不能删除珍品仓库中的打包文件"
13303
13304 #: builtin/repack.c:228
13305 msgid "--keep-unreachable and -A are incompatible"
13306 msgstr "--keep-unreachable 和 -A 不兼容"
13307
13308 #: builtin/repack.c:425 builtin/worktree.c:139
13309 #, c-format
13310 msgid "failed to remove '%s'"
13311 msgstr "无法删除 '%s'"
13312
13313 #: builtin/replace.c:22
13314 msgid "git replace [-f] <object> <replacement>"
13315 msgstr "git replace [-f] <对象> <替换物>"
13316
13317 #: builtin/replace.c:23
13318 msgid "git replace [-f] --edit <object>"
13319 msgstr "git replace [-f] --edit <对象>"
13320
13321 #: builtin/replace.c:24
13322 msgid "git replace [-f] --graft <commit> [<parent>...]"
13323 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
13324
13325 #: builtin/replace.c:25
13326 msgid "git replace [-f] --convert-graft-file"
13327 msgstr "git replace [-f] --convert-graft-file"
13328
13329 #: builtin/replace.c:26
13330 msgid "git replace -d <object>..."
13331 msgstr "git replace -d <对象>..."
13332
13333 #: builtin/replace.c:27
13334 msgid "git replace [--format=<format>] [-l [<pattern>]]"
13335 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
13336
13337 #: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445
13338 #, c-format
13339 msgid "Not a valid object name: '%s'"
13340 msgstr "不是一个有效的对象名:'%s'"
13341
13342 #: builtin/replace.c:407
13343 #, c-format
13344 msgid "bad mergetag in commit '%s'"
13345 msgstr "提交 '%s' 中含有损坏的合并标签"
13346
13347 #: builtin/replace.c:409
13348 #, c-format
13349 msgid "malformed mergetag in commit '%s'"
13350 msgstr "提交 '%s' 中含有格式错误的合并标签"
13351
13352 #: builtin/replace.c:421
13353 #, c-format
13354 msgid ""
13355 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
13356 "instead of --graft"
13357 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
13358
13359 #: builtin/replace.c:460
13360 #, c-format
13361 msgid "the original commit '%s' has a gpg signature."
13362 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
13363
13364 #: builtin/replace.c:461
13365 msgid "the signature will be removed in the replacement commit!"
13366 msgstr "在替换的提交中签名将被移除!"
13367
13368 #: builtin/replace.c:471
13369 #, c-format
13370 msgid "could not write replacement commit for: '%s'"
13371 msgstr "不能为 '%s' 写替换提交"
13372
13373 #: builtin/replace.c:514
13374 #, c-format
13375 msgid ""
13376 "could not convert the following graft(s):\n"
13377 "%s"
13378 msgstr ""
13379 "不能转换下列移植:\n"
13380 "%s"
13381
13382 #: builtin/replace.c:535
13383 msgid "list replace refs"
13384 msgstr "列出替换的引用"
13385
13386 #: builtin/replace.c:536
13387 msgid "delete replace refs"
13388 msgstr "删除替换的引用"
13389
13390 #: builtin/replace.c:537
13391 msgid "edit existing object"
13392 msgstr "编辑现存的对象"
13393
13394 #: builtin/replace.c:538
13395 msgid "change a commit's parents"
13396 msgstr "修改一个提交的父提交"
13397
13398 #: builtin/replace.c:539
13399 msgid "convert existing graft file"
13400 msgstr "转换现存的移植文件"
13401
13402 #: builtin/replace.c:540
13403 msgid "replace the ref if it exists"
13404 msgstr "如果存在则替换引用"
13405
13406 #: builtin/replace.c:542
13407 msgid "do not pretty-print contents for --edit"
13408 msgstr "不要为 --edit 操作美观显示内容"
13409
13410 #: builtin/replace.c:543
13411 msgid "use this format"
13412 msgstr "使用此格式"
13413
13414 #: builtin/rerere.c:13
13415 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
13416 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
13417
13418 #: builtin/rerere.c:59
13419 msgid "register clean resolutions in index"
13420 msgstr "在索引中注册干净的解决方案"
13421
13422 #: builtin/reset.c:29
13423 msgid ""
13424 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
13425 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
13426
13427 #: builtin/reset.c:30
13428 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
13429 msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
13430
13431 #: builtin/reset.c:31
13432 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
13433 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
13434
13435 #: builtin/reset.c:37
13436 msgid "mixed"
13437 msgstr "混杂"
13438
13439 #: builtin/reset.c:37
13440 msgid "soft"
13441 msgstr "软性"
13442
13443 #: builtin/reset.c:37
13444 msgid "hard"
13445 msgstr "硬性"
13446
13447 #: builtin/reset.c:37
13448 msgid "merge"
13449 msgstr "合并"
13450
13451 #: builtin/reset.c:37
13452 msgid "keep"
13453 msgstr "保持"
13454
13455 #: builtin/reset.c:78
13456 msgid "You do not have a valid HEAD."
13457 msgstr "您没有一个有效的 HEAD。"
13458
13459 #: builtin/reset.c:80
13460 msgid "Failed to find tree of HEAD."
13461 msgstr "无法找到 HEAD 指向的树。"
13462
13463 #: builtin/reset.c:86
13464 #, c-format
13465 msgid "Failed to find tree of %s."
13466 msgstr "无法找到 %s 指向的树。"
13467
13468 #: builtin/reset.c:111
13469 #, c-format
13470 msgid "HEAD is now at %s"
13471 msgstr "HEAD 现在位于 %s"
13472
13473 # 译者:汉字之间无空格,故删除%s前后空格
13474 #: builtin/reset.c:189
13475 #, c-format
13476 msgid "Cannot do a %s reset in the middle of a merge."
13477 msgstr "在合并过程中不能做%s重置操作。"
13478
13479 #: builtin/reset.c:289
13480 msgid "be quiet, only report errors"
13481 msgstr "安静模式,只报告错误"
13482
13483 #: builtin/reset.c:291
13484 msgid "reset HEAD and index"
13485 msgstr "重置 HEAD 和索引"
13486
13487 #: builtin/reset.c:292
13488 msgid "reset only HEAD"
13489 msgstr "只重置 HEAD"
13490
13491 #: builtin/reset.c:294 builtin/reset.c:296
13492 msgid "reset HEAD, index and working tree"
13493 msgstr "重置 HEAD、索引和工作区"
13494
13495 #: builtin/reset.c:298
13496 msgid "reset HEAD but keep local changes"
13497 msgstr "重置 HEAD 但保存本地变更"
13498
13499 #: builtin/reset.c:304
13500 msgid "record only the fact that removed paths will be added later"
13501 msgstr "将删除的路径标记为稍后添加"
13502
13503 #: builtin/reset.c:321
13504 #, c-format
13505 msgid "Failed to resolve '%s' as a valid revision."
13506 msgstr "无法将 '%s' 解析为一个有效的版本。"
13507
13508 #: builtin/reset.c:329
13509 #, c-format
13510 msgid "Failed to resolve '%s' as a valid tree."
13511 msgstr "无法将 '%s' 解析为一个有效的树对象。"
13512
13513 #: builtin/reset.c:338
13514 msgid "--patch is incompatible with --{hard,mixed,soft}"
13515 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
13516
13517 #: builtin/reset.c:347
13518 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
13519 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
13520
13521 # 译者:汉字之间无空格,故删除%s前后空格
13522 #: builtin/reset.c:349
13523 #, c-format
13524 msgid "Cannot do %s reset with paths."
13525 msgstr "不能带路径进行%s重置。"
13526
13527 # 译者:汉字之间无空格,故删除%s前后空格
13528 #: builtin/reset.c:359
13529 #, c-format
13530 msgid "%s reset is not allowed in a bare repository"
13531 msgstr "不能对纯仓库进行%s重置"
13532
13533 #: builtin/reset.c:363
13534 msgid "-N can only be used with --mixed"
13535 msgstr "-N 只能和 --mixed 同时使用"
13536
13537 #: builtin/reset.c:380
13538 msgid "Unstaged changes after reset:"
13539 msgstr "重置后取消暂存的变更:"
13540
13541 #: builtin/reset.c:386
13542 #, c-format
13543 msgid "Could not reset index file to revision '%s'."
13544 msgstr "不能重置索引文件至版本 '%s'。"
13545
13546 #: builtin/reset.c:390
13547 msgid "Could not write new index file."
13548 msgstr "不能写入新的索引文件。"
13549
13550 #: builtin/rev-list.c:397
13551 msgid "cannot combine --exclude-promisor-objects and --missing"
13552 msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
13553
13554 #: builtin/rev-list.c:455
13555 msgid "object filtering requires --objects"
13556 msgstr "对象过滤需要 --objects"
13557
13558 #: builtin/rev-list.c:458
13559 #, c-format
13560 msgid "invalid sparse value '%s'"
13561 msgstr "无效的稀疏值 '%s'"
13562
13563 #: builtin/rev-list.c:499
13564 msgid "rev-list does not support display of notes"
13565 msgstr "rev-list 不支持显示注解"
13566
13567 #: builtin/rev-list.c:502
13568 msgid "cannot combine --use-bitmap-index with object filtering"
13569 msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
13570
13571 #: builtin/rev-parse.c:406
13572 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
13573 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
13574
13575 #: builtin/rev-parse.c:411
13576 msgid "keep the `--` passed as an arg"
13577 msgstr "保持 `--` 作为一个参数传递"
13578
13579 #: builtin/rev-parse.c:413
13580 msgid "stop parsing after the first non-option argument"
13581 msgstr "遇到第一个非选项参数后停止解析"
13582
13583 #: builtin/rev-parse.c:416
13584 msgid "output in stuck long form"
13585 msgstr "以固定长格式输出"
13586
13587 #: builtin/rev-parse.c:549
13588 msgid ""
13589 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
13590 " or: git rev-parse --sq-quote [<arg>...]\n"
13591 " or: git rev-parse [<options>] [<arg>...]\n"
13592 "\n"
13593 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
13594 msgstr ""
13595 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
13596 " 或者:git rev-parse --sq-quote [<参数>...]\n"
13597 " 或者:git rev-parse [<选项>] [<参数>...]\n"
13598 "\n"
13599 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
13600
13601 #: builtin/revert.c:23
13602 msgid "git revert [<options>] <commit-ish>..."
13603 msgstr "git revert [<选项>] <提交号>..."
13604
13605 #: builtin/revert.c:24
13606 msgid "git revert <subcommand>"
13607 msgstr "git revert <子命令>"
13608
13609 #: builtin/revert.c:29
13610 msgid "git cherry-pick [<options>] <commit-ish>..."
13611 msgstr "git cherry-pick [<选项>] <提交号>..."
13612
13613 #: builtin/revert.c:30
13614 msgid "git cherry-pick <subcommand>"
13615 msgstr "git cherry-pick <子命令>"
13616
13617 #: builtin/revert.c:90
13618 #, c-format
13619 msgid "%s: %s cannot be used with %s"
13620 msgstr "%s:%s 不能和 %s 同时使用"
13621
13622 #: builtin/revert.c:99
13623 msgid "end revert or cherry-pick sequence"
13624 msgstr "终止反转或拣选操作"
13625
13626 #: builtin/revert.c:100
13627 msgid "resume revert or cherry-pick sequence"
13628 msgstr "继续反转或拣选操作"
13629
13630 #: builtin/revert.c:101
13631 msgid "cancel revert or cherry-pick sequence"
13632 msgstr "取消反转或拣选操作"
13633
13634 #: builtin/revert.c:102
13635 msgid "don't automatically commit"
13636 msgstr "不要自动提交"
13637
13638 #: builtin/revert.c:103
13639 msgid "edit the commit message"
13640 msgstr "编辑提交说明"
13641
13642 #: builtin/revert.c:106
13643 msgid "parent-number"
13644 msgstr "父编号"
13645
13646 #: builtin/revert.c:107
13647 msgid "select mainline parent"
13648 msgstr "选择主干父提交编号"
13649
13650 #: builtin/revert.c:109
13651 msgid "merge strategy"
13652 msgstr "合并策略"
13653
13654 #: builtin/revert.c:110
13655 msgid "option"
13656 msgstr "选项"
13657
13658 #: builtin/revert.c:111
13659 msgid "option for merge strategy"
13660 msgstr "合并策略的选项"
13661
13662 #: builtin/revert.c:120
13663 msgid "append commit name"
13664 msgstr "追加提交名称"
13665
13666 #: builtin/revert.c:122
13667 msgid "preserve initially empty commits"
13668 msgstr "保留初始化的空提交"
13669
13670 #: builtin/revert.c:124
13671 msgid "keep redundant, empty commits"
13672 msgstr "保持多余的、空的提交"
13673
13674 #: builtin/revert.c:214
13675 msgid "revert failed"
13676 msgstr "还原失败"
13677
13678 #: builtin/revert.c:227
13679 msgid "cherry-pick failed"
13680 msgstr "拣选失败"
13681
13682 #: builtin/rm.c:18
13683 msgid "git rm [<options>] [--] <file>..."
13684 msgstr "git rm [<选项>] [--] <文件>..."
13685
13686 #: builtin/rm.c:206
13687 msgid ""
13688 "the following file has staged content different from both the\n"
13689 "file and the HEAD:"
13690 msgid_plural ""
13691 "the following files have staged content different from both the\n"
13692 "file and the HEAD:"
13693 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
13694 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
13695
13696 #: builtin/rm.c:211
13697 msgid ""
13698 "\n"
13699 "(use -f to force removal)"
13700 msgstr ""
13701 "\n"
13702 "(使用 -f 强制删除)"
13703
13704 #: builtin/rm.c:215
13705 msgid "the following file has changes staged in the index:"
13706 msgid_plural "the following files have changes staged in the index:"
13707 msgstr[0] "下列文件索引中有变更"
13708 msgstr[1] "下列文件索引中有变更"
13709
13710 #: builtin/rm.c:219 builtin/rm.c:228
13711 msgid ""
13712 "\n"
13713 "(use --cached to keep the file, or -f to force removal)"
13714 msgstr ""
13715 "\n"
13716 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
13717
13718 #: builtin/rm.c:225
13719 msgid "the following file has local modifications:"
13720 msgid_plural "the following files have local modifications:"
13721 msgstr[0] "如下文件有本地修改:"
13722 msgstr[1] "如下文件有本地修改:"
13723
13724 #: builtin/rm.c:241
13725 msgid "do not list removed files"
13726 msgstr "不列出删除的文件"
13727
13728 #: builtin/rm.c:242
13729 msgid "only remove from the index"
13730 msgstr "只从索引区删除"
13731
13732 #: builtin/rm.c:243
13733 msgid "override the up-to-date check"
13734 msgstr "忽略文件更新状态检查"
13735
13736 #: builtin/rm.c:244
13737 msgid "allow recursive removal"
13738 msgstr "允许递归删除"
13739
13740 #: builtin/rm.c:246
13741 msgid "exit with a zero status even if nothing matched"
13742 msgstr "即使没有匹配,也以零状态退出"
13743
13744 #: builtin/rm.c:306
13745 #, c-format
13746 msgid "not removing '%s' recursively without -r"
13747 msgstr "未提供 -r 选项不会递归删除 '%s'"
13748
13749 #: builtin/rm.c:345
13750 #, c-format
13751 msgid "git rm: unable to remove %s"
13752 msgstr "git rm:不能删除 %s"
13753
13754 #: builtin/rm.c:368
13755 #, c-format
13756 msgid "could not remove '%s'"
13757 msgstr "无法删除 '%s'"
13758
13759 #: builtin/send-pack.c:20
13760 msgid ""
13761 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
13762 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
13763 "[<ref>...]\n"
13764 " --all and explicit <ref> specification are mutually exclusive."
13765 msgstr ""
13766 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
13767 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
13768 " --all 和明确的 <引用> 互斥。"
13769
13770 #: builtin/send-pack.c:163
13771 msgid "remote name"
13772 msgstr "远程名称"
13773
13774 #: builtin/send-pack.c:177
13775 msgid "use stateless RPC protocol"
13776 msgstr "使用无状态的 RPC 协议"
13777
13778 #: builtin/send-pack.c:178
13779 msgid "read refs from stdin"
13780 msgstr "从标准输入读取引用"
13781
13782 #: builtin/send-pack.c:179
13783 msgid "print status from remote helper"
13784 msgstr "打印来自远程 helper 的状态"
13785
13786 #: builtin/serve.c:7
13787 msgid "git serve [<options>]"
13788 msgstr "git serve [<选项>]"
13789
13790 #: builtin/serve.c:17 builtin/upload-pack.c:23
13791 msgid "quit after a single request/response exchange"
13792 msgstr "在一次单独的请求/响应之后退出"
13793
13794 #: builtin/serve.c:19
13795 msgid "exit immediately after advertising capabilities"
13796 msgstr "在广告功能后立即退出"
13797
13798 #: builtin/shortlog.c:14
13799 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
13800 msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
13801
13802 #: builtin/shortlog.c:15
13803 msgid "git log --pretty=short | git shortlog [<options>]"
13804 msgstr "git log --pretty=short | git shortlog [<选项>]"
13805
13806 #: builtin/shortlog.c:264
13807 msgid "Group by committer rather than author"
13808 msgstr "按照提交者分组而不是作者"
13809
13810 #: builtin/shortlog.c:266
13811 msgid "sort output according to the number of commits per author"
13812 msgstr "根据每个作者的提交数量排序"
13813
13814 #: builtin/shortlog.c:268
13815 msgid "Suppress commit descriptions, only provides commit count"
13816 msgstr "隐藏提交说明,只提供提交数量"
13817
13818 #: builtin/shortlog.c:270
13819 msgid "Show the email address of each author"
13820 msgstr "显示每个作者的电子邮件地址"
13821
13822 #: builtin/shortlog.c:271
13823 msgid "w[,i1[,i2]]"
13824 msgstr "w[,i1[,i2]]"
13825
13826 #: builtin/shortlog.c:272
13827 msgid "Linewrap output"
13828 msgstr "折行输出"
13829
13830 #: builtin/shortlog.c:298
13831 msgid "too many arguments given outside repository"
13832 msgstr "仓库外执行提供了太多的参数"
13833
13834 #: builtin/show-branch.c:12
13835 msgid ""
13836 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
13837 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
13838 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
13839 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
13840 msgstr ""
13841 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
13842 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
13843 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
13844 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
13845
13846 #: builtin/show-branch.c:16
13847 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
13848 msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
13849
13850 #: builtin/show-branch.c:376
13851 #, c-format
13852 msgid "ignoring %s; cannot handle more than %d ref"
13853 msgid_plural "ignoring %s; cannot handle more than %d refs"
13854 msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
13855 msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
13856
13857 #: builtin/show-branch.c:530
13858 #, c-format
13859 msgid "no matching refs with %s"
13860 msgstr "没有和 %s 匹配的引用"
13861
13862 #: builtin/show-branch.c:626
13863 msgid "show remote-tracking and local branches"
13864 msgstr "显示远程跟踪的和本地的分支"
13865
13866 #: builtin/show-branch.c:628
13867 msgid "show remote-tracking branches"
13868 msgstr "显示远程跟踪的分支"
13869
13870 #: builtin/show-branch.c:630
13871 msgid "color '*!+-' corresponding to the branch"
13872 msgstr "着色 '*!+-' 到相应的分支"
13873
13874 #: builtin/show-branch.c:632
13875 msgid "show <n> more commits after the common ancestor"
13876 msgstr "显示共同祖先后的 <n> 个提交"
13877
13878 #: builtin/show-branch.c:634
13879 msgid "synonym to more=-1"
13880 msgstr "和 more=-1 同义"
13881
13882 #: builtin/show-branch.c:635
13883 msgid "suppress naming strings"
13884 msgstr "不显示字符串命名"
13885
13886 #: builtin/show-branch.c:637
13887 msgid "include the current branch"
13888 msgstr "包括当前分支"
13889
13890 #: builtin/show-branch.c:639
13891 msgid "name commits with their object names"
13892 msgstr "以对象名字命名提交"
13893
13894 #: builtin/show-branch.c:641
13895 msgid "show possible merge bases"
13896 msgstr "显示可能合并的基线"
13897
13898 #: builtin/show-branch.c:643
13899 msgid "show refs unreachable from any other ref"
13900 msgstr "显示没有任何引用的的引用"
13901
13902 #: builtin/show-branch.c:645
13903 msgid "show commits in topological order"
13904 msgstr "以拓扑顺序显示提交"
13905
13906 #: builtin/show-branch.c:648
13907 msgid "show only commits not on the first branch"
13908 msgstr "只显示不在第一个分支上的提交"
13909
13910 #: builtin/show-branch.c:650
13911 msgid "show merges reachable from only one tip"
13912 msgstr "显示仅一个分支可访问的合并提交"
13913
13914 #: builtin/show-branch.c:652
13915 msgid "topologically sort, maintaining date order where possible"
13916 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
13917
13918 #: builtin/show-branch.c:655
13919 msgid "<n>[,<base>]"
13920 msgstr "<n>[,<base>]"
13921
13922 #: builtin/show-branch.c:656
13923 msgid "show <n> most recent ref-log entries starting at base"
13924 msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
13925
13926 #: builtin/show-branch.c:690
13927 msgid ""
13928 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
13929 msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
13930
13931 #: builtin/show-branch.c:714
13932 msgid "no branches given, and HEAD is not valid"
13933 msgstr "未提供分支,且 HEAD 无效"
13934
13935 #: builtin/show-branch.c:717
13936 msgid "--reflog option needs one branch name"
13937 msgstr "选项 --reflog 需要一个分支名"
13938
13939 #: builtin/show-branch.c:720
13940 #, c-format
13941 msgid "only %d entry can be shown at one time."
13942 msgid_plural "only %d entries can be shown at one time."
13943 msgstr[0] "一次只能显示 %d 个条目。"
13944 msgstr[1] "一次只能显示 %d 个条目。"
13945
13946 #: builtin/show-branch.c:724
13947 #, c-format
13948 msgid "no such ref %s"
13949 msgstr "无此引用 %s"
13950
13951 #: builtin/show-branch.c:808
13952 #, c-format
13953 msgid "cannot handle more than %d rev."
13954 msgid_plural "cannot handle more than %d revs."
13955 msgstr[0] "不能处理 %d 个以上的版本。"
13956 msgstr[1] "不能处理 %d 个以上的版本。"
13957
13958 #: builtin/show-branch.c:812
13959 #, c-format
13960 msgid "'%s' is not a valid ref."
13961 msgstr "'%s' 不是一个有效的引用。"
13962
13963 #: builtin/show-branch.c:815
13964 #, c-format
13965 msgid "cannot find commit %s (%s)"
13966 msgstr "不能找到提交 %s(%s)"
13967
13968 #: builtin/show-ref.c:10
13969 msgid ""
13970 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
13971 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
13972 msgstr ""
13973 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
13974 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
13975
13976 #: builtin/show-ref.c:11
13977 msgid "git show-ref --exclude-existing[=<pattern>]"
13978 msgstr "git show-ref --exclude-existing[=<模式>]"
13979
13980 #: builtin/show-ref.c:159
13981 msgid "only show tags (can be combined with heads)"
13982 msgstr "只显示标签(可以和头共用)"
13983
13984 #: builtin/show-ref.c:160
13985 msgid "only show heads (can be combined with tags)"
13986 msgstr "只显示头(可以和标签共用)"
13987
13988 #: builtin/show-ref.c:161
13989 msgid "stricter reference checking, requires exact ref path"
13990 msgstr "更严格的引用检测,需要精确的引用路径"
13991
13992 #: builtin/show-ref.c:164 builtin/show-ref.c:166
13993 msgid "show the HEAD reference, even if it would be filtered out"
13994 msgstr "显示 HEAD 引用,即使被过滤掉"
13995
13996 #: builtin/show-ref.c:168
13997 msgid "dereference tags into object IDs"
13998 msgstr "转换标签到对象 ID"
13999
14000 #: builtin/show-ref.c:170
14001 msgid "only show SHA1 hash using <n> digits"
14002 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
14003
14004 #: builtin/show-ref.c:174
14005 msgid "do not print results to stdout (useful with --verify)"
14006 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
14007
14008 #: builtin/show-ref.c:176
14009 msgid "show refs from stdin that aren't in local repository"
14010 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
14011
14012 #: builtin/stripspace.c:18
14013 msgid "git stripspace [-s | --strip-comments]"
14014 msgstr "git stripspace [-s | --strip-comments]"
14015
14016 #: builtin/stripspace.c:19
14017 msgid "git stripspace [-c | --comment-lines]"
14018 msgstr "git stripspace [-c | --comment-lines]"
14019
14020 #: builtin/stripspace.c:36
14021 msgid "skip and remove all lines starting with comment character"
14022 msgstr "跳过和移除所有的注释行"
14023
14024 #: builtin/stripspace.c:39
14025 msgid "prepend comment character and space to each line"
14026 msgstr "为每一行的行首添加注释符和空格"
14027
14028 #: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688
14029 #, c-format
14030 msgid "No such ref: %s"
14031 msgstr "没有这样的引用:%s"
14032
14033 #: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697
14034 #, c-format
14035 msgid "Expecting a full ref name, got %s"
14036 msgstr "期望一个完整的引用名称,却得到 %s"
14037
14038 #: builtin/submodule--helper.c:61
14039 msgid "submodule--helper print-default-remote takes no arguments"
14040 msgstr "submodule--helper print-default-remote 不带参数"
14041
14042 #: builtin/submodule--helper.c:98
14043 #, c-format
14044 msgid "cannot strip one component off url '%s'"
14045 msgstr "无法从 url '%s' 剥离一个组件"
14046
14047 #: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211
14048 msgid "alternative anchor for relative paths"
14049 msgstr "相对路径的替代锚记(anchor)"
14050
14051 #: builtin/submodule--helper.c:411
14052 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
14053 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
14054
14055 #: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485
14056 #, c-format
14057 msgid "No url found for submodule path '%s' in .gitmodules"
14058 msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
14059
14060 #: builtin/submodule--helper.c:500
14061 #, c-format
14062 msgid ""
14063 "could not lookup configuration '%s'. Assuming this repository is its own "
14064 "authoritative upstream."
14065 msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
14066
14067 #: builtin/submodule--helper.c:511
14068 #, c-format
14069 msgid "Failed to register url for submodule path '%s'"
14070 msgstr "无法为子模组 '%s' 注册 url"
14071
14072 #: builtin/submodule--helper.c:515
14073 #, c-format
14074 msgid "Submodule '%s' (%s) registered for path '%s'\n"
14075 msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
14076
14077 #
14078 #: builtin/submodule--helper.c:525
14079 #, c-format
14080 msgid "warning: command update mode suggested for submodule '%s'\n"
14081 msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
14082
14083 #: builtin/submodule--helper.c:532
14084 #, c-format
14085 msgid "Failed to register update mode for submodule path '%s'"
14086 msgstr "无法为子模组 '%s' 注册更新模式"
14087
14088 #: builtin/submodule--helper.c:554
14089 msgid "Suppress output for initializing a submodule"
14090 msgstr "阻止子模组初始化的输出"
14091
14092 #: builtin/submodule--helper.c:559
14093 msgid "git submodule--helper init [<path>]"
14094 msgstr "git submodule--helper init [<路径>]"
14095
14096 #: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757
14097 #, c-format
14098 msgid "no submodule mapping found in .gitmodules for path '%s'"
14099 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
14100
14101 #: builtin/submodule--helper.c:670
14102 #, c-format
14103 msgid "could not resolve HEAD ref inside the submodule '%s'"
14104 msgstr "无法解析子模组 '%s' 的 HEAD 引用"
14105
14106 #: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866
14107 #, c-format
14108 msgid "failed to recurse into submodule '%s'"
14109 msgstr "无法递归子模组 '%s'"
14110
14111 #: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031
14112 msgid "Suppress submodule status output"
14113 msgstr "阻止子模组状态输出"
14114
14115 #: builtin/submodule--helper.c:722
14116 msgid ""
14117 "Use commit stored in the index instead of the one stored in the submodule "
14118 "HEAD"
14119 msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
14120
14121 #: builtin/submodule--helper.c:723
14122 msgid "recurse into nested submodules"
14123 msgstr "递归进入嵌套子模组中"
14124
14125 #: builtin/submodule--helper.c:728
14126 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
14127 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
14128
14129 #: builtin/submodule--helper.c:752
14130 msgid "git submodule--helper name <path>"
14131 msgstr "git submodule--helper name <路径>"
14132
14133 #: builtin/submodule--helper.c:816
14134 #, c-format
14135 msgid "Synchronizing submodule url for '%s'\n"
14136 msgstr "为 '%s' 同步子模组 url\n"
14137
14138 #: builtin/submodule--helper.c:822
14139 #, c-format
14140 msgid "failed to register url for submodule path '%s'"
14141 msgstr "无法为子模组路径 '%s' 注册 url"
14142
14143 #: builtin/submodule--helper.c:836
14144 #, c-format
14145 msgid "failed to get the default remote for submodule '%s'"
14146 msgstr "无法得到子模组 '%s' 的默认远程关联"
14147
14148 #: builtin/submodule--helper.c:847
14149 #, c-format
14150 msgid "failed to update remote for submodule '%s'"
14151 msgstr "无法为子模组 '%s' 更新远程关联"
14152
14153 #: builtin/submodule--helper.c:895
14154 msgid "Suppress output of synchronizing submodule url"
14155 msgstr "阻止子模组 url 同步的输出"
14156
14157 #: builtin/submodule--helper.c:897
14158 msgid "Recurse into nested submodules"
14159 msgstr "递归进入嵌套子模组中"
14160
14161 #: builtin/submodule--helper.c:902
14162 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
14163 msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
14164
14165 #: builtin/submodule--helper.c:956
14166 #, c-format
14167 msgid ""
14168 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
14169 "really want to remove it including all of its history)"
14170 msgstr ""
14171 "子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
14172 "-rf' 命令)"
14173
14174 #: builtin/submodule--helper.c:968
14175 #, c-format
14176 msgid ""
14177 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
14178 "them"
14179 msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
14180
14181 #: builtin/submodule--helper.c:976
14182 #, c-format
14183 msgid "Cleared directory '%s'\n"
14184 msgstr "已清除目录 '%s'\n"
14185
14186 #: builtin/submodule--helper.c:978
14187 #, c-format
14188 msgid "Could not remove submodule work tree '%s'\n"
14189 msgstr "无法移除子模组工作区 '%s'\n"
14190
14191 #: builtin/submodule--helper.c:987
14192 #, c-format
14193 msgid "could not create empty submodule directory %s"
14194 msgstr "不能创建空的子模组目录 %s"
14195
14196 #: builtin/submodule--helper.c:1003
14197 #, c-format
14198 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
14199 msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
14200
14201 #: builtin/submodule--helper.c:1032
14202 msgid "Remove submodule working trees even if they contain local changes"
14203 msgstr "删除子模组工作区,即使包含本地修改"
14204
14205 #: builtin/submodule--helper.c:1033
14206 msgid "Unregister all submodules"
14207 msgstr "将所有子模组取消注册"
14208
14209 #: builtin/submodule--helper.c:1038
14210 msgid ""
14211 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
14212 msgstr ""
14213 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
14214
14215 #: builtin/submodule--helper.c:1052
14216 msgid "Use '--all' if you really want to deinitialize all submodules"
14217 msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
14218
14219 #: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148
14220 #, c-format
14221 msgid "submodule '%s' cannot add alternate: %s"
14222 msgstr "子模组 '%s' 不能添加仓库备选:%s"
14223
14224 #: builtin/submodule--helper.c:1184
14225 #, c-format
14226 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
14227 msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
14228
14229 #: builtin/submodule--helper.c:1191
14230 #, c-format
14231 msgid "Value '%s' for submodule.alternateLocation is not recognized"
14232 msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
14233
14234 #: builtin/submodule--helper.c:1214
14235 msgid "where the new submodule will be cloned to"
14236 msgstr "新的子模组将要克隆的路径"
14237
14238 #: builtin/submodule--helper.c:1217
14239 msgid "name of the new submodule"
14240 msgstr "新子模组的名称"
14241
14242 #: builtin/submodule--helper.c:1220
14243 msgid "url where to clone the submodule from"
14244 msgstr "克隆子模组的 url 地址"
14245
14246 #: builtin/submodule--helper.c:1228
14247 msgid "depth for shallow clones"
14248 msgstr "浅克隆的深度"
14249
14250 #: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606
14251 msgid "force cloning progress"
14252 msgstr "强制显示克隆进度"
14253
14254 #: builtin/submodule--helper.c:1236
14255 msgid ""
14256 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
14257 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
14258 msgstr ""
14259 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
14260 "[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
14261
14262 #: builtin/submodule--helper.c:1267
14263 #, c-format
14264 msgid "clone of '%s' into submodule path '%s' failed"
14265 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
14266
14267 #: builtin/submodule--helper.c:1281
14268 #, c-format
14269 msgid "could not get submodule directory for '%s'"
14270 msgstr "无法得到 '%s' 的子模组目录"
14271
14272 #: builtin/submodule--helper.c:1347
14273 #, c-format
14274 msgid "Submodule path '%s' not initialized"
14275 msgstr "子模组 '%s' 尚未初始化"
14276
14277 #: builtin/submodule--helper.c:1351
14278 msgid "Maybe you want to use 'update --init'?"
14279 msgstr "也许您想要执行 'update --init'?"
14280
14281 #: builtin/submodule--helper.c:1380
14282 #, c-format
14283 msgid "Skipping unmerged submodule %s"
14284 msgstr "略过未合并的子模组 %s"
14285
14286 #: builtin/submodule--helper.c:1409
14287 #, c-format
14288 msgid "Skipping submodule '%s'"
14289 msgstr "略过子模组 '%s'"
14290
14291 #: builtin/submodule--helper.c:1544
14292 #, c-format
14293 msgid "Failed to clone '%s'. Retry scheduled"
14294 msgstr "克隆 '%s' 失败。按计划重试"
14295
14296 #: builtin/submodule--helper.c:1555
14297 #, c-format
14298 msgid "Failed to clone '%s' a second time, aborting"
14299 msgstr "第二次尝试克隆 '%s' 失败,退出"
14300
14301 #: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808
14302 msgid "path into the working tree"
14303 msgstr "到工作区的路径"
14304
14305 #: builtin/submodule--helper.c:1588
14306 msgid "path into the working tree, across nested submodule boundaries"
14307 msgstr "工作区中的路径,递归嵌套子模组"
14308
14309 #: builtin/submodule--helper.c:1592
14310 msgid "rebase, merge, checkout or none"
14311 msgstr "rebase、merge、checkout 或 none"
14312
14313 #: builtin/submodule--helper.c:1598
14314 msgid "Create a shallow clone truncated to the specified number of revisions"
14315 msgstr "创建一个指定深度的浅克隆"
14316
14317 #: builtin/submodule--helper.c:1601
14318 msgid "parallel jobs"
14319 msgstr "并发任务"
14320
14321 #: builtin/submodule--helper.c:1603
14322 msgid "whether the initial clone should follow the shallow recommendation"
14323 msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
14324
14325 #: builtin/submodule--helper.c:1604
14326 msgid "don't print cloning progress"
14327 msgstr "不要输出克隆进度"
14328
14329 #: builtin/submodule--helper.c:1611
14330 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
14331 msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
14332
14333 #: builtin/submodule--helper.c:1624
14334 msgid "bad value for update parameter"
14335 msgstr "update 参数取值错误"
14336
14337 #: builtin/submodule--helper.c:1692
14338 #, c-format
14339 msgid ""
14340 "Submodule (%s) branch configured to inherit branch from superproject, but "
14341 "the superproject is not on any branch"
14342 msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
14343
14344 #: builtin/submodule--helper.c:1809
14345 msgid "recurse into submodules"
14346 msgstr "在子模组中递归"
14347
14348 #: builtin/submodule--helper.c:1815
14349 msgid "git submodule--helper embed-git-dir [<path>...]"
14350 msgstr "git submodule--helper embed-git-dir [<路径>...]"
14351
14352 #: builtin/submodule--helper.c:1901
14353 #, c-format
14354 msgid "%s doesn't support --super-prefix"
14355 msgstr "%s 不支持 --super-prefix"
14356
14357 #: builtin/submodule--helper.c:1907
14358 #, c-format
14359 msgid "'%s' is not a valid submodule--helper subcommand"
14360 msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
14361
14362 #: builtin/symbolic-ref.c:8
14363 msgid "git symbolic-ref [<options>] <name> [<ref>]"
14364 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
14365
14366 #: builtin/symbolic-ref.c:9
14367 msgid "git symbolic-ref -d [-q] <name>"
14368 msgstr "git symbolic-ref -d [-q] <名称>"
14369
14370 #: builtin/symbolic-ref.c:40
14371 msgid "suppress error message for non-symbolic (detached) refs"
14372 msgstr "不显示非符号(分离的)引用的错误信息"
14373
14374 #: builtin/symbolic-ref.c:41
14375 msgid "delete symbolic ref"
14376 msgstr "删除符号引用"
14377
14378 #: builtin/symbolic-ref.c:42
14379 msgid "shorten ref output"
14380 msgstr "缩短引用输出"
14381
14382 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
14383 msgid "reason"
14384 msgstr "原因"
14385
14386 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
14387 msgid "reason of the update"
14388 msgstr "更新的原因"
14389
14390 #: builtin/tag.c:24
14391 msgid ""
14392 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
14393 "[<head>]"
14394 msgstr ""
14395 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
14396
14397 #: builtin/tag.c:25
14398 msgid "git tag -d <tagname>..."
14399 msgstr "git tag -d <标签名>..."
14400
14401 #: builtin/tag.c:26
14402 msgid ""
14403 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
14404 "points-at <object>]\n"
14405 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
14406 msgstr ""
14407 "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
14408 "at <对象>]\n"
14409 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
14410
14411 #: builtin/tag.c:28
14412 msgid "git tag -v [--format=<format>] <tagname>..."
14413 msgstr "git tag -v [--format=<格式>] <标签名>..."
14414
14415 #: builtin/tag.c:86
14416 #, c-format
14417 msgid "tag '%s' not found."
14418 msgstr "未发现标签 '%s'。"
14419
14420 #: builtin/tag.c:102
14421 #, c-format
14422 msgid "Deleted tag '%s' (was %s)\n"
14423 msgstr "已删除标签 '%s'(曾为 %s)\n"
14424
14425 #: builtin/tag.c:132
14426 #, c-format
14427 msgid ""
14428 "\n"
14429 "Write a message for tag:\n"
14430 " %s\n"
14431 "Lines starting with '%c' will be ignored.\n"
14432 msgstr ""
14433 "\n"
14434 "输入一个标签说明:\n"
14435 " %s\n"
14436 "以 '%c' 开头的行将被忽略。\n"
14437
14438 #: builtin/tag.c:136
14439 #, c-format
14440 msgid ""
14441 "\n"
14442 "Write a message for tag:\n"
14443 " %s\n"
14444 "Lines starting with '%c' will be kept; you may remove them yourself if you "
14445 "want to.\n"
14446 msgstr ""
14447 "\n"
14448 "输入一个标签说明:\n"
14449 " %s\n"
14450 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
14451
14452 #: builtin/tag.c:190
14453 msgid "unable to sign the tag"
14454 msgstr "无法签署标签"
14455
14456 #: builtin/tag.c:192
14457 msgid "unable to write tag file"
14458 msgstr "无法写标签文件"
14459
14460 #: builtin/tag.c:217
14461 msgid "bad object type."
14462 msgstr "坏的对象类型。"
14463
14464 #: builtin/tag.c:266
14465 msgid "no tag message?"
14466 msgstr "无标签说明?"
14467
14468 #: builtin/tag.c:273
14469 #, c-format
14470 msgid "The tag message has been left in %s\n"
14471 msgstr "标签说明被保留在 %s\n"
14472
14473 #: builtin/tag.c:382
14474 msgid "list tag names"
14475 msgstr "列出标签名称"
14476
14477 #: builtin/tag.c:384
14478 msgid "print <n> lines of each tag message"
14479 msgstr "每个标签信息打印 <n> 行"
14480
14481 #: builtin/tag.c:386
14482 msgid "delete tags"
14483 msgstr "删除标签"
14484
14485 #: builtin/tag.c:387
14486 msgid "verify tags"
14487 msgstr "验证标签"
14488
14489 #: builtin/tag.c:389
14490 msgid "Tag creation options"
14491 msgstr "标签创建选项"
14492
14493 #: builtin/tag.c:391
14494 msgid "annotated tag, needs a message"
14495 msgstr "附注标签,需要一个说明"
14496
14497 #: builtin/tag.c:393
14498 msgid "tag message"
14499 msgstr "标签说明"
14500
14501 #: builtin/tag.c:395
14502 msgid "force edit of tag message"
14503 msgstr "强制编辑标签说明"
14504
14505 #: builtin/tag.c:396
14506 msgid "annotated and GPG-signed tag"
14507 msgstr "附注并附加 GPG 签名的标签"
14508
14509 #: builtin/tag.c:400
14510 msgid "use another key to sign the tag"
14511 msgstr "使用另外的私钥签名该标签"
14512
14513 #: builtin/tag.c:401
14514 msgid "replace the tag if exists"
14515 msgstr "如果存在,替换现有的标签"
14516
14517 #: builtin/tag.c:402 builtin/update-ref.c:368
14518 msgid "create a reflog"
14519 msgstr "创建引用日志"
14520
14521 #: builtin/tag.c:404
14522 msgid "Tag listing options"
14523 msgstr "标签列表选项"
14524
14525 #: builtin/tag.c:405
14526 msgid "show tag list in columns"
14527 msgstr "以列的方式显示标签列表"
14528
14529 #: builtin/tag.c:406 builtin/tag.c:408
14530 msgid "print only tags that contain the commit"
14531 msgstr "只打印包含该提交的标签"
14532
14533 #: builtin/tag.c:407 builtin/tag.c:409
14534 msgid "print only tags that don't contain the commit"
14535 msgstr "只打印不包含该提交的标签"
14536
14537 #: builtin/tag.c:410
14538 msgid "print only tags that are merged"
14539 msgstr "只打印已经合并的标签"
14540
14541 #: builtin/tag.c:411
14542 msgid "print only tags that are not merged"
14543 msgstr "只打印尚未合并的标签"
14544
14545 #: builtin/tag.c:416
14546 msgid "print only tags of the object"
14547 msgstr "只打印指向该对象的标签"
14548
14549 #: builtin/tag.c:460
14550 msgid "--column and -n are incompatible"
14551 msgstr "--column 和 -n 不兼容"
14552
14553 #: builtin/tag.c:482
14554 msgid "-n option is only allowed in list mode"
14555 msgstr "-n 选项只允许用在列表显示模式"
14556
14557 #: builtin/tag.c:484
14558 msgid "--contains option is only allowed in list mode"
14559 msgstr "--contains 选项只允许用在列表显示模式"
14560
14561 #: builtin/tag.c:486
14562 msgid "--no-contains option is only allowed in list mode"
14563 msgstr "--no-contains 选项只允许用在列表显示模式"
14564
14565 #: builtin/tag.c:488
14566 msgid "--points-at option is only allowed in list mode"
14567 msgstr "--points-at 选项只允许用在列表显示模式"
14568
14569 #: builtin/tag.c:490
14570 msgid "--merged and --no-merged options are only allowed in list mode"
14571 msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
14572
14573 #: builtin/tag.c:501
14574 msgid "only one -F or -m option is allowed."
14575 msgstr "只允许一个 -F 或 -m 选项。"
14576
14577 #: builtin/tag.c:520
14578 msgid "too many params"
14579 msgstr "太多参数"
14580
14581 #: builtin/tag.c:526
14582 #, c-format
14583 msgid "'%s' is not a valid tag name."
14584 msgstr "'%s' 不是一个有效的标签名称。"
14585
14586 #: builtin/tag.c:531
14587 #, c-format
14588 msgid "tag '%s' already exists"
14589 msgstr "标签 '%s' 已存在"
14590
14591 #: builtin/tag.c:562
14592 #, c-format
14593 msgid "Updated tag '%s' (was %s)\n"
14594 msgstr "已更新标签 '%s'(曾为 %s)\n"
14595
14596 #: builtin/unpack-objects.c:498
14597 msgid "Unpacking objects"
14598 msgstr "展开对象中"
14599
14600 #: builtin/update-index.c:82
14601 #, c-format
14602 msgid "failed to create directory %s"
14603 msgstr "无法创建目录 %s"
14604
14605 #: builtin/update-index.c:88
14606 #, c-format
14607 msgid "failed to stat %s"
14608 msgstr "对 %s 调用 stat 失败"
14609
14610 #: builtin/update-index.c:98
14611 #, c-format
14612 msgid "failed to create file %s"
14613 msgstr "无法创建文件 %s"
14614
14615 #: builtin/update-index.c:106
14616 #, c-format
14617 msgid "failed to delete file %s"
14618 msgstr "无法删除文件 %s"
14619
14620 #: builtin/update-index.c:113 builtin/update-index.c:219
14621 #, c-format
14622 msgid "failed to delete directory %s"
14623 msgstr "无法删除目录 %s"
14624
14625 #: builtin/update-index.c:138
14626 #, c-format
14627 msgid "Testing mtime in '%s' "
14628 msgstr "在 '%s' 中测试 mtime "
14629
14630 #: builtin/update-index.c:152
14631 msgid "directory stat info does not change after adding a new file"
14632 msgstr "添加一个新文件后,目录的状态信息未改变"
14633
14634 #: builtin/update-index.c:165
14635 msgid "directory stat info does not change after adding a new directory"
14636 msgstr "添加一个新目录后,目录的状态信息未改变"
14637
14638 #: builtin/update-index.c:178
14639 msgid "directory stat info changes after updating a file"
14640 msgstr "更新一个文件后,目录的状态信息被修改"
14641
14642 #: builtin/update-index.c:189
14643 msgid "directory stat info changes after adding a file inside subdirectory"
14644 msgstr "在子目录中添加文件后,目录的状态信息被修改"
14645
14646 #: builtin/update-index.c:200
14647 msgid "directory stat info does not change after deleting a file"
14648 msgstr "删除一个文件后,目录的状态信息未改变"
14649
14650 #: builtin/update-index.c:213
14651 msgid "directory stat info does not change after deleting a directory"
14652 msgstr "删除一个目录后,目录的状态信息未改变"
14653
14654 #: builtin/update-index.c:220
14655 msgid " OK"
14656 msgstr " OK"
14657
14658 #: builtin/update-index.c:589
14659 msgid "git update-index [<options>] [--] [<file>...]"
14660 msgstr "git update-index [<选项>] [--] [<文件>...]"
14661
14662 #: builtin/update-index.c:946
14663 msgid "continue refresh even when index needs update"
14664 msgstr "当索引需要更新时继续刷新"
14665
14666 #: builtin/update-index.c:949
14667 msgid "refresh: ignore submodules"
14668 msgstr "刷新:忽略子模组"
14669
14670 #: builtin/update-index.c:952
14671 msgid "do not ignore new files"
14672 msgstr "不忽略新的文件"
14673
14674 #: builtin/update-index.c:954
14675 msgid "let files replace directories and vice-versa"
14676 msgstr "让文件替换目录(反之亦然)"
14677
14678 #: builtin/update-index.c:956
14679 msgid "notice files missing from worktree"
14680 msgstr "通知文件从工作区丢失"
14681
14682 #: builtin/update-index.c:958
14683 msgid "refresh even if index contains unmerged entries"
14684 msgstr "即使索引区包含未合并的条目也执行刷新"
14685
14686 #: builtin/update-index.c:961
14687 msgid "refresh stat information"
14688 msgstr "刷新统计信息"
14689
14690 #: builtin/update-index.c:965
14691 msgid "like --refresh, but ignore assume-unchanged setting"
14692 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
14693
14694 #: builtin/update-index.c:969
14695 msgid "<mode>,<object>,<path>"
14696 msgstr "<存取模式>,<对象>,<路径>"
14697
14698 #: builtin/update-index.c:970
14699 msgid "add the specified entry to the index"
14700 msgstr "添加指定的条目到索引区"
14701
14702 #: builtin/update-index.c:979
14703 msgid "mark files as \"not changing\""
14704 msgstr "把文件标记为 \"没有变更\""
14705
14706 #: builtin/update-index.c:982
14707 msgid "clear assumed-unchanged bit"
14708 msgstr "清除 assumed-unchanged 位"
14709
14710 #: builtin/update-index.c:985
14711 msgid "mark files as \"index-only\""
14712 msgstr "把文件标记为 \"仅索引\""
14713
14714 #: builtin/update-index.c:988
14715 msgid "clear skip-worktree bit"
14716 msgstr "清除 skip-worktree 位"
14717
14718 #: builtin/update-index.c:991
14719 msgid "add to index only; do not add content to object database"
14720 msgstr "只添加到索引区;不添加对象到对象库"
14721
14722 #: builtin/update-index.c:993
14723 msgid "remove named paths even if present in worktree"
14724 msgstr "即使存在工作区里,也删除路径"
14725
14726 #: builtin/update-index.c:995
14727 msgid "with --stdin: input lines are terminated by null bytes"
14728 msgstr "携带 --stdin:输入的行以 null 字符终止"
14729
14730 #: builtin/update-index.c:997
14731 msgid "read list of paths to be updated from standard input"
14732 msgstr "从标准输入中读取需要更新的路径列表"
14733
14734 #: builtin/update-index.c:1001
14735 msgid "add entries from standard input to the index"
14736 msgstr "从标准输入添加条目到索引区"
14737
14738 #: builtin/update-index.c:1005
14739 msgid "repopulate stages #2 and #3 for the listed paths"
14740 msgstr "为指定文件重新生成第2和第3暂存区"
14741
14742 #: builtin/update-index.c:1009
14743 msgid "only update entries that differ from HEAD"
14744 msgstr "只更新与 HEAD 不同的条目"
14745
14746 #: builtin/update-index.c:1013
14747 msgid "ignore files missing from worktree"
14748 msgstr "忽略工作区丢失的文件"
14749
14750 #: builtin/update-index.c:1016
14751 msgid "report actions to standard output"
14752 msgstr "在标准输出显示操作"
14753
14754 #: builtin/update-index.c:1018
14755 msgid "(for porcelains) forget saved unresolved conflicts"
14756 msgstr "(for porcelains) 忘记保存的未解决的冲突"
14757
14758 #: builtin/update-index.c:1022
14759 msgid "write index in this format"
14760 msgstr "以这种格式写入索引区"
14761
14762 #: builtin/update-index.c:1024
14763 msgid "enable or disable split index"
14764 msgstr "启用或禁用索引拆分"
14765
14766 #: builtin/update-index.c:1026
14767 msgid "enable/disable untracked cache"
14768 msgstr "启用/禁用对未跟踪文件的缓存"
14769
14770 #: builtin/update-index.c:1028
14771 msgid "test if the filesystem supports untracked cache"
14772 msgstr "测试文件系统是否支持未跟踪文件缓存"
14773
14774 #: builtin/update-index.c:1030
14775 msgid "enable untracked cache without testing the filesystem"
14776 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
14777
14778 #: builtin/update-index.c:1032
14779 msgid "write out the index even if is not flagged as changed"
14780 msgstr "即使没有被标记为已更改,也要写出索引"
14781
14782 #: builtin/update-index.c:1034
14783 msgid "enable or disable file system monitor"
14784 msgstr "启用或禁用文件系统监控"
14785
14786 #: builtin/update-index.c:1036
14787 msgid "mark files as fsmonitor valid"
14788 msgstr "标记文件为 fsmonitor 有效"
14789
14790 #: builtin/update-index.c:1039
14791 msgid "clear fsmonitor valid bit"
14792 msgstr "清除 fsmonitor 有效位"
14793
14794 #: builtin/update-index.c:1138
14795 msgid ""
14796 "core.splitIndex is set to false; remove or change it, if you really want to "
14797 "enable split index"
14798 msgstr ""
14799 "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
14800
14801 #: builtin/update-index.c:1147
14802 msgid ""
14803 "core.splitIndex is set to true; remove or change it, if you really want to "
14804 "disable split index"
14805 msgstr ""
14806 "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
14807
14808 #: builtin/update-index.c:1158
14809 msgid ""
14810 "core.untrackedCache is set to true; remove or change it, if you really want "
14811 "to disable the untracked cache"
14812 msgstr ""
14813 "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
14814 "改它。"
14815
14816 #: builtin/update-index.c:1162
14817 msgid "Untracked cache disabled"
14818 msgstr "缓存未跟踪文件被禁用"
14819
14820 #: builtin/update-index.c:1170
14821 msgid ""
14822 "core.untrackedCache is set to false; remove or change it, if you really want "
14823 "to enable the untracked cache"
14824 msgstr ""
14825 "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
14826 "修改它。"
14827
14828 #: builtin/update-index.c:1174
14829 #, c-format
14830 msgid "Untracked cache enabled for '%s'"
14831 msgstr "缓存未跟踪文件在 '%s' 启用"
14832
14833 #: builtin/update-index.c:1182
14834 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
14835 msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
14836
14837 #: builtin/update-index.c:1186
14838 msgid "fsmonitor enabled"
14839 msgstr "fsmonitor 被启用"
14840
14841 #: builtin/update-index.c:1189
14842 msgid ""
14843 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
14844 msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
14845
14846 #: builtin/update-index.c:1193
14847 msgid "fsmonitor disabled"
14848 msgstr "fsmonitor 被禁用"
14849
14850 #: builtin/update-ref.c:10
14851 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
14852 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
14853
14854 #: builtin/update-ref.c:11
14855 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
14856 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
14857
14858 #: builtin/update-ref.c:12
14859 msgid "git update-ref [<options>] --stdin [-z]"
14860 msgstr "git update-ref [<选项>] --stdin [-z]"
14861
14862 #: builtin/update-ref.c:363
14863 msgid "delete the reference"
14864 msgstr "删除引用"
14865
14866 #: builtin/update-ref.c:365
14867 msgid "update <refname> not the one it points to"
14868 msgstr "更新 <引用名> 本身而不是它指向的引用"
14869
14870 #: builtin/update-ref.c:366
14871 msgid "stdin has NUL-terminated arguments"
14872 msgstr "标准输入有以 NUL 字符终止的参数"
14873
14874 #: builtin/update-ref.c:367
14875 msgid "read updates from stdin"
14876 msgstr "从标准输入读取更新"
14877
14878 #: builtin/update-server-info.c:7
14879 msgid "git update-server-info [--force]"
14880 msgstr "git update-server-info [--force]"
14881
14882 #: builtin/update-server-info.c:15
14883 msgid "update the info files from scratch"
14884 msgstr "从头开始更新文件信息"
14885
14886 #: builtin/upload-pack.c:11
14887 msgid "git upload-pack [<options>] <dir>"
14888 msgstr "git upload-pack [<选项>] <目录>"
14889
14890 #: builtin/upload-pack.c:25
14891 msgid "exit immediately after initial ref advertisement"
14892 msgstr "在初始的引用广告后立即退出"
14893
14894 #: builtin/upload-pack.c:27
14895 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
14896 msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
14897
14898 #: builtin/upload-pack.c:29
14899 msgid "interrupt transfer after <n> seconds of inactivity"
14900 msgstr "不活动 <n> 秒钟后终止传输"
14901
14902 #: builtin/verify-commit.c:18
14903 msgid "git verify-commit [-v | --verbose] <commit>..."
14904 msgstr "git verify-commit [-v | --verbose] <提交>..."
14905
14906 #: builtin/verify-commit.c:73
14907 msgid "print commit contents"
14908 msgstr "打印提交内容"
14909
14910 #: builtin/verify-commit.c:74 builtin/verify-tag.c:38
14911 msgid "print raw gpg status output"
14912 msgstr "打印原始 gpg 状态输出"
14913
14914 #: builtin/verify-pack.c:55
14915 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
14916 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
14917
14918 #: builtin/verify-pack.c:65
14919 msgid "verbose"
14920 msgstr "冗长输出"
14921
14922 #: builtin/verify-pack.c:67
14923 msgid "show statistics only"
14924 msgstr "只显示统计"
14925
14926 #: builtin/verify-tag.c:19
14927 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
14928 msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
14929
14930 #: builtin/verify-tag.c:37
14931 msgid "print tag contents"
14932 msgstr "打印标签内容"
14933
14934 #: builtin/worktree.c:17
14935 msgid "git worktree add [<options>] <path> [<commit-ish>]"
14936 msgstr "git worktree add [<选项>] <路径> [<提交>]"
14937
14938 #: builtin/worktree.c:18
14939 msgid "git worktree list [<options>]"
14940 msgstr "git worktree list [<选项>]"
14941
14942 #: builtin/worktree.c:19
14943 msgid "git worktree lock [<options>] <path>"
14944 msgstr "git worktree lock [<选项>] <路径>"
14945
14946 #: builtin/worktree.c:20
14947 msgid "git worktree move <worktree> <new-path>"
14948 msgstr "git worktree move <工作区> <新路径>"
14949
14950 #: builtin/worktree.c:21
14951 msgid "git worktree prune [<options>]"
14952 msgstr "git worktree prune [<选项>]"
14953
14954 #: builtin/worktree.c:22
14955 msgid "git worktree remove [<options>] <worktree>"
14956 msgstr "git worktree remove [<选项>] <工作区>"
14957
14958 #: builtin/worktree.c:23
14959 msgid "git worktree unlock <path>"
14960 msgstr "git worktree unlock <路径>"
14961
14962 #: builtin/worktree.c:58
14963 #, c-format
14964 msgid "Removing worktrees/%s: not a valid directory"
14965 msgstr "删除工作区/%s:不是一个有效的目录"
14966
14967 #: builtin/worktree.c:64
14968 #, c-format
14969 msgid "Removing worktrees/%s: gitdir file does not exist"
14970 msgstr "删除 worktrees/%s:gitdir 文件不存在"
14971
14972 #: builtin/worktree.c:69 builtin/worktree.c:78
14973 #, c-format
14974 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
14975 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
14976
14977 #: builtin/worktree.c:88
14978 #, c-format
14979 msgid ""
14980 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
14981 "%<PRIuMAX>)"
14982 msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
14983
14984 #: builtin/worktree.c:96
14985 #, c-format
14986 msgid "Removing worktrees/%s: invalid gitdir file"
14987 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
14988
14989 #: builtin/worktree.c:105
14990 #, c-format
14991 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
14992 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
14993
14994 #: builtin/worktree.c:152
14995 msgid "report pruned working trees"
14996 msgstr "报告清除的工作区"
14997
14998 #: builtin/worktree.c:154
14999 msgid "expire working trees older than <time>"
15000 msgstr "将早于 <时间> 的工作区过期"
15001
15002 #: builtin/worktree.c:229
15003 #, c-format
15004 msgid "'%s' already exists"
15005 msgstr "'%s' 已经存在"
15006
15007 #: builtin/worktree.c:260
15008 #, c-format
15009 msgid "could not create directory of '%s'"
15010 msgstr "不能创建目录 '%s'"
15011
15012 #: builtin/worktree.c:373 builtin/worktree.c:379
15013 #, c-format
15014 msgid "Preparing worktree (new branch '%s')"
15015 msgstr "准备工作区(新分支 '%s')"
15016
15017 #: builtin/worktree.c:375
15018 #, c-format
15019 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
15020 msgstr "准备工作区(重置分支 '%s',之前为 %s)"
15021
15022 #: builtin/worktree.c:384
15023 #, c-format
15024 msgid "Preparing worktree (checking out '%s')"
15025 msgstr "准备工作区(检出 '%s')"
15026
15027 #: builtin/worktree.c:390
15028 #, c-format
15029 msgid "Preparing worktree (detached HEAD %s)"
15030 msgstr "准备工作区(分离头指针 %s)"
15031
15032 #: builtin/worktree.c:431
15033 msgid "checkout <branch> even if already checked out in other worktree"
15034 msgstr "检出 <分支>,即使已经被检出到其它工作区"
15035
15036 #: builtin/worktree.c:434
15037 msgid "create a new branch"
15038 msgstr "创建一个新分支"
15039
15040 #: builtin/worktree.c:436
15041 msgid "create or reset a branch"
15042 msgstr "创建或重置一个分支"
15043
15044 #: builtin/worktree.c:438
15045 msgid "populate the new working tree"
15046 msgstr "生成新的工作区"
15047
15048 #: builtin/worktree.c:439
15049 msgid "keep the new working tree locked"
15050 msgstr "锁定新工作区"
15051
15052 #: builtin/worktree.c:441
15053 msgid "set up tracking mode (see git-branch(1))"
15054 msgstr "设置跟踪模式(参见 git-branch(1))"
15055
15056 #: builtin/worktree.c:444
15057 msgid "try to match the new branch name with a remote-tracking branch"
15058 msgstr "尝试为新分支名匹配一个远程跟踪分支"
15059
15060 #: builtin/worktree.c:452
15061 msgid "-b, -B, and --detach are mutually exclusive"
15062 msgstr "-b、-B 和 --detach 是互斥的"
15063
15064 #: builtin/worktree.c:511
15065 msgid "--[no-]track can only be used if a new branch is created"
15066 msgstr "只能在创建新分支时使用选项 --[no-]track "
15067
15068 #: builtin/worktree.c:611
15069 msgid "reason for locking"
15070 msgstr "锁定原因"
15071
15072 #: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710
15073 #: builtin/worktree.c:850
15074 #, c-format
15075 msgid "'%s' is not a working tree"
15076 msgstr "'%s' 不是一个工作区"
15077
15078 #: builtin/worktree.c:625 builtin/worktree.c:658
15079 msgid "The main working tree cannot be locked or unlocked"
15080 msgstr "主工作区无法被加锁或解锁"
15081
15082 #: builtin/worktree.c:630
15083 #, c-format
15084 msgid "'%s' is already locked, reason: %s"
15085 msgstr "'%s' 已被锁定,原因:%s"
15086
15087 #: builtin/worktree.c:632
15088 #, c-format
15089 msgid "'%s' is already locked"
15090 msgstr "'%s' 已被锁定"
15091
15092 #: builtin/worktree.c:660
15093 #, c-format
15094 msgid "'%s' is not locked"
15095 msgstr "'%s' 未被锁定"
15096
15097 #: builtin/worktree.c:685
15098 msgid "working trees containing submodules cannot be moved or removed"
15099 msgstr "不能移动或删除包含子模组的工作区"
15100
15101 #: builtin/worktree.c:712 builtin/worktree.c:852
15102 #, c-format
15103 msgid "'%s' is a main working tree"
15104 msgstr "'%s' 是一个主工作区"
15105
15106 #: builtin/worktree.c:717
15107 #, c-format
15108 msgid "could not figure out destination name from '%s'"
15109 msgstr "无法从 '%s' 算出目标名称"
15110
15111 #: builtin/worktree.c:723
15112 #, c-format
15113 msgid "target '%s' already exists"
15114 msgstr "目标 '%s' 已存在"
15115
15116 #: builtin/worktree.c:730
15117 #, c-format
15118 msgid "cannot move a locked working tree, lock reason: %s"
15119 msgstr "无法移动一个锁定的工作区,锁定原因:%s"
15120
15121 #: builtin/worktree.c:732
15122 msgid "cannot move a locked working tree"
15123 msgstr "无法移动一个锁定的工作区"
15124
15125 #: builtin/worktree.c:735
15126 #, c-format
15127 msgid "validation failed, cannot move working tree: %s"
15128 msgstr "验证失败,无法移动工作区:%s"
15129
15130 #: builtin/worktree.c:740
15131 #, c-format
15132 msgid "failed to move '%s' to '%s'"
15133 msgstr "无法移动 '%s' 到 '%s'"
15134
15135 #: builtin/worktree.c:788
15136 #, c-format
15137 msgid "failed to run 'git status' on '%s'"
15138 msgstr "无法在 '%s' 中执行 'git status'"
15139
15140 #: builtin/worktree.c:792
15141 #, c-format
15142 msgid "'%s' is dirty, use --force to delete it"
15143 msgstr "'%s' 是脏的,使用 --force 删除"
15144
15145 #: builtin/worktree.c:797
15146 #, c-format
15147 msgid "failed to run 'git status' on '%s', code %d"
15148 msgstr "无法在 '%s' 中执行 'git status',退出码 %d"
15149
15150 #: builtin/worktree.c:808 builtin/worktree.c:822
15151 #, c-format
15152 msgid "failed to delete '%s'"
15153 msgstr "无法删除 '%s'"
15154
15155 #: builtin/worktree.c:834
15156 msgid "force removing even if the worktree is dirty"
15157 msgstr "强制删除,即使工作区是脏的"
15158
15159 #: builtin/worktree.c:856
15160 #, c-format
15161 msgid "cannot remove a locked working tree, lock reason: %s"
15162 msgstr "无法删除一个锁定的工作区,锁定原因:%s"
15163
15164 #: builtin/worktree.c:858
15165 msgid "cannot remove a locked working tree"
15166 msgstr "无法删除一个锁定的工作区"
15167
15168 #: builtin/worktree.c:861
15169 #, c-format
15170 msgid "validation failed, cannot remove working tree: %s"
15171 msgstr "验证失败,无法删除工作区:%s"
15172
15173 #: builtin/write-tree.c:14
15174 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
15175 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
15176
15177 #: builtin/write-tree.c:27
15178 msgid "<prefix>/"
15179 msgstr "<前缀>/"
15180
15181 #: builtin/write-tree.c:28
15182 msgid "write tree object for a subdirectory <prefix>"
15183 msgstr "将 <前缀> 子目录内容写到一个树对象"
15184
15185 #: builtin/write-tree.c:31
15186 msgid "only useful for debugging"
15187 msgstr "只对调试有用"
15188
15189 #: credential-cache--daemon.c:222
15190 #, c-format
15191 msgid ""
15192 "The permissions on your socket directory are too loose; other\n"
15193 "users may be able to read your cached credentials. Consider running:\n"
15194 "\n"
15195 "\tchmod 0700 %s"
15196 msgstr ""
15197 "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
15198 "行:\n"
15199 "\n"
15200 "\tchmod 0700 %s"
15201
15202 #: credential-cache--daemon.c:271
15203 msgid "print debugging messages to stderr"
15204 msgstr "调试信息输出到标准错误"
15205
15206 #: git.c:27
15207 msgid ""
15208 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
15209 " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
15210 " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
15211 "bare]\n"
15212 " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
15213 " <command> [<args>]"
15214 msgstr ""
15215 "git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
15216 " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
15217 " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
15218 "bare]\n"
15219 " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
15220 " <命令> [<参数>]"
15221
15222 #: git.c:34
15223 msgid ""
15224 "'git help -a' and 'git help -g' list available subcommands and some\n"
15225 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
15226 "to read about a specific subcommand or concept."
15227 msgstr ""
15228 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
15229 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
15230 "帮助。"
15231
15232 #: git.c:173
15233 #, c-format
15234 msgid "no directory given for --git-dir\n"
15235 msgstr "没有为 --git-dir 提供目录\n"
15236
15237 #: git.c:187
15238 #, c-format
15239 msgid "no namespace given for --namespace\n"
15240 msgstr "没有为 --namespace 提供命名空间\n"
15241
15242 #: git.c:201
15243 #, c-format
15244 msgid "no directory given for --work-tree\n"
15245 msgstr "没有为 --work-tree 提供目录\n"
15246
15247 #: git.c:215
15248 #, c-format
15249 msgid "no prefix given for --super-prefix\n"
15250 msgstr "没有为 --super-prefix 提供前缀\n"
15251
15252 #: git.c:237
15253 #, c-format
15254 msgid "-c expects a configuration string\n"
15255 msgstr "应为 -c 提供一个配置字符串\n"
15256
15257 #: git.c:275
15258 #, c-format
15259 msgid "no directory given for -C\n"
15260 msgstr "没有为 -C 提供目录\n"
15261
15262 #: git.c:300
15263 #, c-format
15264 msgid "unknown option: %s\n"
15265 msgstr "未知选项:%s\n"
15266
15267 #: git.c:765
15268 #, c-format
15269 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
15270 msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
15271
15272 #: git.c:777
15273 #, c-format
15274 msgid "failed to run command '%s': %s\n"
15275 msgstr "无法运行命令 '%s':%s\n"
15276
15277 #: http.c:348
15278 #, c-format
15279 msgid "negative value for http.postbuffer; defaulting to %d"
15280 msgstr "http.postbuffer 为负值,默认为 %d"
15281
15282 #: http.c:369
15283 msgid "Delegation control is not supported with cURL < 7.22.0"
15284 msgstr "当 cURL < 7.22.0 时,不支持委托控制"
15285
15286 #: http.c:378
15287 msgid "Public key pinning not supported with cURL < 7.44.0"
15288 msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
15289
15290 #: http.c:1854
15291 #, c-format
15292 msgid ""
15293 "unable to update url base from redirection:\n"
15294 " asked for: %s\n"
15295 " redirect: %s"
15296 msgstr ""
15297 "不能更新重定向的 url base:\n"
15298 " 请求:%s\n"
15299 " 重定向:%s"
15300
15301 #: remote-curl.c:401
15302 #, c-format
15303 msgid "redirecting to %s"
15304 msgstr "重定向到 %s"
15305
15306 #: list-objects-filter-options.h:59
15307 msgid "args"
15308 msgstr "参数"
15309
15310 #: list-objects-filter-options.h:60
15311 msgid "object filtering"
15312 msgstr "对象过滤"
15313
15314 #: parse-options.h:157
15315 msgid "expiry-date"
15316 msgstr "到期时间"
15317
15318 #: parse-options.h:172
15319 msgid "no-op (backward compatibility)"
15320 msgstr "空操作(向后兼容)"
15321
15322 #: parse-options.h:251
15323 msgid "be more verbose"
15324 msgstr "更加详细"
15325
15326 #: parse-options.h:253
15327 msgid "be more quiet"
15328 msgstr "更加安静"
15329
15330 #: parse-options.h:259
15331 msgid "use <n> digits to display SHA-1s"
15332 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
15333
15334 #: command-list.h:50
15335 msgid "Add file contents to the index"
15336 msgstr "添加文件内容至索引"
15337
15338 #: command-list.h:51
15339 msgid "Apply a series of patches from a mailbox"
15340 msgstr "应用邮箱格式的系列补丁"
15341
15342 #: command-list.h:52
15343 msgid "Annotate file lines with commit information"
15344 msgstr "使用提交信息注释文件行"
15345
15346 #: command-list.h:53
15347 msgid "Apply a patch to files and/or to the index"
15348 msgstr "应用一个补丁到文件和/或索引区"
15349
15350 #: command-list.h:54
15351 msgid "Import an Arch repository into Git"
15352 msgstr "将一个 Arch 仓库导入到 Git"
15353
15354 #: command-list.h:55
15355 msgid "Create an archive of files from a named tree"
15356 msgstr "基于一个指定的树创建文件存档"
15357
15358 #: command-list.h:56
15359 msgid "Use binary search to find the commit that introduced a bug"
15360 msgstr "通过二分查找定位引入 bug 的提交"
15361
15362 #: command-list.h:57
15363 msgid "Show what revision and author last modified each line of a file"
15364 msgstr "显示文件每一行最后修改的版本和修改者"
15365
15366 #: command-list.h:58
15367 msgid "List, create, or delete branches"
15368 msgstr "列出、创建或删除分支"
15369
15370 #: command-list.h:59
15371 msgid "Move objects and refs by archive"
15372 msgstr "通过归档移动对象和引用"
15373
15374 #: command-list.h:60
15375 msgid "Provide content or type and size information for repository objects"
15376 msgstr "提供仓库对象的内容、类型或大小"
15377
15378 #: command-list.h:61
15379 msgid "Display gitattributes information"
15380 msgstr "显示 gitattributes 信息"
15381
15382 #: command-list.h:62
15383 msgid "Debug gitignore / exclude files"
15384 msgstr "调试 gitignore / exclude 文件"
15385
15386 #: command-list.h:63
15387 msgid "Show canonical names and email addresses of contacts"
15388 msgstr "显示联系人的规范名称和电子邮件"
15389
15390 #: command-list.h:64
15391 msgid "Switch branches or restore working tree files"
15392 msgstr "切换分支或恢复工作区文件"
15393
15394 #: command-list.h:65
15395 msgid "Copy files from the index to the working tree"
15396 msgstr "从索引拷贝文件到工作区"
15397
15398 #: command-list.h:66
15399 msgid "Ensures that a reference name is well formed"
15400 msgstr "确保引用名称格式正确"
15401
15402 #: command-list.h:67
15403 msgid "Find commits yet to be applied to upstream"
15404 msgstr "查找尚未应用到上游的提交"
15405
15406 #: command-list.h:68
15407 msgid "Apply the changes introduced by some existing commits"
15408 msgstr "应用一些现存提交引入的修改"
15409
15410 #: command-list.h:69
15411 msgid "Graphical alternative to git-commit"
15412 msgstr "git-commit 的图形替代界面"
15413
15414 #: command-list.h:70
15415 msgid "Remove untracked files from the working tree"
15416 msgstr "从工作区中删除未跟踪文件"
15417
15418 #: command-list.h:71
15419 msgid "Clone a repository into a new directory"
15420 msgstr "克隆一个仓库到一个新目录"
15421
15422 #: command-list.h:72
15423 msgid "Display data in columns"
15424 msgstr "以列的方式显示数据"
15425
15426 #: command-list.h:73
15427 msgid "Record changes to the repository"
15428 msgstr "记录变更到仓库"
15429
15430 #: command-list.h:74
15431 msgid "Write and verify Git commit graph files"
15432 msgstr "写入和校验 Git 提交图形文件"
15433
15434 #: command-list.h:75
15435 msgid "Create a new commit object"
15436 msgstr "创建一个新的提交对象"
15437
15438 #: command-list.h:76
15439 msgid "Get and set repository or global options"
15440 msgstr "获取和设置仓库或者全局选项"
15441
15442 #: command-list.h:77
15443 msgid "Count unpacked number of objects and their disk consumption"
15444 msgstr "计算未打包对象的数量和磁盘空间占用"
15445
15446 #: command-list.h:78
15447 msgid "Retrieve and store user credentials"
15448 msgstr "检索和存储用户密码"
15449
15450 #: command-list.h:79
15451 msgid "Helper to temporarily store passwords in memory"
15452 msgstr "在内存中临时存储密码的助手"
15453
15454 #: command-list.h:80
15455 msgid "Helper to store credentials on disk"
15456 msgstr "在磁盘存储密码的助手"
15457
15458 #: command-list.h:81
15459 msgid "Export a single commit to a CVS checkout"
15460 msgstr "将一个提交导出到 CVS 检出中"
15461
15462 #: command-list.h:82
15463 msgid "Salvage your data out of another SCM people love to hate"
15464 msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
15465
15466 #: command-list.h:83
15467 msgid "A CVS server emulator for Git"
15468 msgstr "Git 的一个 CVS 服务模拟器"
15469
15470 #: command-list.h:84
15471 msgid "A really simple server for Git repositories"
15472 msgstr "一个非常简单的 Git 仓库服务器"
15473
15474 #: command-list.h:85
15475 msgid "Give an object a human readable name based on an available ref"
15476 msgstr "基于一个现存的引用为一个对象起一个可读的名称"
15477
15478 #: command-list.h:86
15479 msgid "Show changes between commits, commit and working tree, etc"
15480 msgstr "显示提交之间、提交和工作区之间等的差异"
15481
15482 #: command-list.h:87
15483 msgid "Compares files in the working tree and the index"
15484 msgstr "比较工作区和索引区中的文件"
15485
15486 #: command-list.h:88
15487 msgid "Compare a tree to the working tree or index"
15488 msgstr "将一个树和工作区或索引做比较"
15489
15490 #: command-list.h:89
15491 msgid "Compares the content and mode of blobs found via two tree objects"
15492 msgstr "比较两个树对象的文件内容和模式"
15493
15494 #: command-list.h:90
15495 msgid "Show changes using common diff tools"
15496 msgstr "使用常见的差异工具显示更改"
15497
15498 #: command-list.h:91
15499 msgid "Git data exporter"
15500 msgstr "Git 数据导出器"
15501
15502 #: command-list.h:92
15503 msgid "Backend for fast Git data importers"
15504 msgstr "Git 快速数据导入器后端"
15505
15506 #: command-list.h:93
15507 msgid "Download objects and refs from another repository"
15508 msgstr "从另外一个仓库下载对象和引用"
15509
15510 #: command-list.h:94
15511 msgid "Receive missing objects from another repository"
15512 msgstr "从另一个仓库获取缺失的对象"
15513
15514 #: command-list.h:95
15515 msgid "Rewrite branches"
15516 msgstr "重写分支"
15517
15518 #: command-list.h:96
15519 msgid "Produce a merge commit message"
15520 msgstr "生成一个合并提交信息"
15521
15522 #: command-list.h:97
15523 msgid "Output information on each ref"
15524 msgstr "对每一个引用输出信息 "
15525
15526 #: command-list.h:98
15527 msgid "Prepare patches for e-mail submission"
15528 msgstr "准备电子邮件提交的补丁"
15529
15530 #: command-list.h:99
15531 msgid "Verifies the connectivity and validity of the objects in the database"
15532 msgstr "验证仓库中对象的连通性和有效性"
15533
15534 #: command-list.h:100
15535 msgid "Cleanup unnecessary files and optimize the local repository"
15536 msgstr "清除不必要的文件和优化本地仓库"
15537
15538 #: command-list.h:101
15539 msgid "Extract commit ID from an archive created using git-archive"
15540 msgstr "从 git-archive 创建的归档文件中提取提交ID"
15541
15542 #: command-list.h:102
15543 msgid "Print lines matching a pattern"
15544 msgstr "输出和模式匹配的行"
15545
15546 #: command-list.h:103
15547 msgid "A portable graphical interface to Git"
15548 msgstr "一个便携的 Git 图形客户端"
15549
15550 #: command-list.h:104
15551 msgid "Compute object ID and optionally creates a blob from a file"
15552 msgstr "从一个文件计算对象ID,并可以创建 blob 数据对象"
15553
15554 #: command-list.h:105
15555 msgid "Display help information about Git"
15556 msgstr "显示 Git 的帮助信息"
15557
15558 #: command-list.h:106
15559 msgid "Server side implementation of Git over HTTP"
15560 msgstr "Git HTTP 协议的服务端实现"
15561
15562 #: command-list.h:107
15563 msgid "Download from a remote Git repository via HTTP"
15564 msgstr "通过 HTTP 从远程 Git 仓库下载"
15565
15566 #: command-list.h:108
15567 msgid "Push objects over HTTP/DAV to another repository"
15568 msgstr "通过 HTTP/DAV 推送对象另一个仓库"
15569
15570 #: command-list.h:109
15571 msgid "Send a collection of patches from stdin to an IMAP folder"
15572 msgstr "从标准输入将一组补丁发送到IMAP文件夹"
15573
15574 #: command-list.h:110
15575 msgid "Build pack index file for an existing packed archive"
15576 msgstr "从一个现存的包存档文件创建包索引"
15577
15578 #: command-list.h:111
15579 msgid "Create an empty Git repository or reinitialize an existing one"
15580 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
15581
15582 #: command-list.h:112
15583 msgid "Instantly browse your working repository in gitweb"
15584 msgstr "在 gitweb 中即时浏览您的工作仓库"
15585
15586 #: command-list.h:113
15587 msgid "add or parse structured information in commit messages"
15588 msgstr "添加或解析提交说明中的结构化信息"
15589
15590 #: command-list.h:114
15591 msgid "The Git repository browser"
15592 msgstr "Git 仓库浏览器"
15593
15594 #: command-list.h:115
15595 msgid "Show commit logs"
15596 msgstr "显示提交日志"
15597
15598 #: command-list.h:116
15599 msgid "Show information about files in the index and the working tree"
15600 msgstr "显示索引和工作区中文件的信息"
15601
15602 #: command-list.h:117
15603 msgid "List references in a remote repository"
15604 msgstr "显示一个远程仓库的引用"
15605
15606 #: command-list.h:118
15607 msgid "List the contents of a tree object"
15608 msgstr "显示一个树对象的内容"
15609
15610 #: command-list.h:119
15611 msgid "Extracts patch and authorship from a single e-mail message"
15612 msgstr "从单个电子邮件中提取补丁和作者身份"
15613
15614 #: command-list.h:120
15615 msgid "Simple UNIX mbox splitter program"
15616 msgstr "简单的 UNIX mbox 邮箱切分程序"
15617
15618 #: command-list.h:121
15619 msgid "Join two or more development histories together"
15620 msgstr "合并两个或更多开发历史"
15621
15622 #: command-list.h:122
15623 msgid "Find as good common ancestors as possible for a merge"
15624 msgstr "为了合并查找尽可能好的公共祖先提交"
15625
15626 #: command-list.h:123
15627 msgid "Run a three-way file merge"
15628 msgstr "运行一个三路文件合并"
15629
15630 #: command-list.h:124
15631 msgid "Run a merge for files needing merging"
15632 msgstr "对于需要合并的文件执行合并"
15633
15634 #: command-list.h:125
15635 msgid "The standard helper program to use with git-merge-index"
15636 msgstr "与 git-merge-index 一起使用的标准向导程序"
15637
15638 #: command-list.h:126
15639 msgid "Run merge conflict resolution tools to resolve merge conflicts"
15640 msgstr "运行合并冲突解决工具以解决合并冲突"
15641
15642 #: command-list.h:127
15643 msgid "Show three-way merge without touching index"
15644 msgstr "显示三路合并而不动索引"
15645
15646 #: command-list.h:128
15647 msgid "Creates a tag object"
15648 msgstr "创建一个标签对象"
15649
15650 #: command-list.h:129
15651 msgid "Build a tree-object from ls-tree formatted text"
15652 msgstr "基于 ls-tree 的格式化文本创建一个树对象"
15653
15654 #: command-list.h:130
15655 msgid "Move or rename a file, a directory, or a symlink"
15656 msgstr "移动或重命名一个文件、目录或符号链接"
15657
15658 # 查找给定版本的符号名称
15659 #: command-list.h:131
15660 msgid "Find symbolic names for given revs"
15661 msgstr "查找给定版本的符号名称"
15662
15663 #: command-list.h:132
15664 msgid "Add or inspect object notes"
15665 msgstr "添加或检查对象注释"
15666
15667 #: command-list.h:133
15668 msgid "Import from and submit to Perforce repositories"
15669 msgstr "导入和提交到 Perforce 仓库中"
15670
15671 #: command-list.h:134
15672 msgid "Create a packed archive of objects"
15673 msgstr "创建对象的存档包"
15674
15675 #: command-list.h:135
15676 msgid "Find redundant pack files"
15677 msgstr "查找冗余的包文件"
15678
15679 #: command-list.h:136
15680 msgid "Pack heads and tags for efficient repository access"
15681 msgstr "打包头和标签以实现高效的仓库访问"
15682
15683 #: command-list.h:137
15684 msgid "Routines to help parsing remote repository access parameters"
15685 msgstr "帮助解析远程仓库访问参数的例程"
15686
15687 #: command-list.h:138
15688 msgid "Compute unique ID for a patch"
15689 msgstr "计算一个补丁的唯一ID"
15690
15691 #: command-list.h:139
15692 msgid "Prune all unreachable objects from the object database"
15693 msgstr "删除对象库中所有不可达对象"
15694
15695 #: command-list.h:140
15696 msgid "Remove extra objects that are already in pack files"
15697 msgstr "删除已经在包文件中的多余对象"
15698
15699 #: command-list.h:141
15700 msgid "Fetch from and integrate with another repository or a local branch"
15701 msgstr "获取并整合另外的仓库或一个本地分支"
15702
15703 #: command-list.h:142
15704 msgid "Update remote refs along with associated objects"
15705 msgstr "更新远程引用和相关的对象"
15706
15707 #: command-list.h:143
15708 msgid "Applies a quilt patchset onto the current branch"
15709 msgstr "将一个 quilt 补丁集应用到当前分支。"
15710
15711 #: command-list.h:144
15712 msgid "Reads tree information into the index"
15713 msgstr "将树信息读取到索引"
15714
15715 #: command-list.h:145
15716 msgid "Reapply commits on top of another base tip"
15717 msgstr "在另一个分支上重新应用提交"
15718
15719 #: command-list.h:146
15720 msgid "Receive what is pushed into the repository"
15721 msgstr "接收推送到仓库中的对象"
15722
15723 #: command-list.h:147
15724 msgid "Manage reflog information"
15725 msgstr "管理 reflog 信息"
15726
15727 #: command-list.h:148
15728 msgid "Manage set of tracked repositories"
15729 msgstr "管理已跟踪仓库"
15730
15731 #: command-list.h:149
15732 msgid "Pack unpacked objects in a repository"
15733 msgstr "打包仓库中未打包对象"
15734
15735 #: command-list.h:150
15736 msgid "Create, list, delete refs to replace objects"
15737 msgstr "创建、列出、删除对象替换引用"
15738
15739 #: command-list.h:151
15740 msgid "Generates a summary of pending changes"
15741 msgstr "生成待定更改的摘要"
15742
15743 #: command-list.h:152
15744 msgid "Reuse recorded resolution of conflicted merges"
15745 msgstr "重用冲突合并的解决方案记录"
15746
15747 #: command-list.h:153
15748 msgid "Reset current HEAD to the specified state"
15749 msgstr "重置当前 HEAD 到指定状态"
15750
15751 #: command-list.h:154
15752 msgid "Revert some existing commits"
15753 msgstr "回退一些现存提交"
15754
15755 #: command-list.h:155
15756 msgid "Lists commit objects in reverse chronological order"
15757 msgstr "按时间顺序列出提交对象"
15758
15759 #: command-list.h:156
15760 msgid "Pick out and massage parameters"
15761 msgstr "选出并处理参数"
15762
15763 #: command-list.h:157
15764 msgid "Remove files from the working tree and from the index"
15765 msgstr "从工作区和索引中删除文件"
15766
15767 #: command-list.h:158
15768 msgid "Send a collection of patches as emails"
15769 msgstr "通过电子邮件发送一组补丁"
15770
15771 #: command-list.h:159
15772 msgid "Push objects over Git protocol to another repository"
15773 msgstr "使用 Git 协议推送对象到另一个仓库"
15774
15775 #: command-list.h:160
15776 msgid "Restricted login shell for Git-only SSH access"
15777 msgstr "只允许 Git SSH 访问的受限登录shell"
15778
15779 #: command-list.h:161
15780 msgid "Summarize 'git log' output"
15781 msgstr "'git log' 输出摘要"
15782
15783 #: command-list.h:162
15784 msgid "Show various types of objects"
15785 msgstr "显示各种类型的对象"
15786
15787 #: command-list.h:163
15788 msgid "Show branches and their commits"
15789 msgstr "显示分支和提交"
15790
15791 #: command-list.h:164
15792 msgid "Show packed archive index"
15793 msgstr "显示打包归档索引"
15794
15795 #: command-list.h:165
15796 msgid "List references in a local repository"
15797 msgstr "显示本地仓库中的引用"
15798
15799 #: command-list.h:166
15800 msgid "Git's i18n setup code for shell scripts"
15801 msgstr "为 shell 脚本准备的 Git 国际化设置代码"
15802
15803 #: command-list.h:167
15804 msgid "Common Git shell script setup code"
15805 msgstr "常用的 Git shell 脚本设置代码"
15806
15807 #: command-list.h:168
15808 msgid "Stash the changes in a dirty working directory away"
15809 msgstr "贮藏脏工作区中的修改"
15810
15811 #: command-list.h:169
15812 msgid "Add file contents to the staging area"
15813 msgstr "将文件内容添加到索引"
15814
15815 #: command-list.h:170
15816 msgid "Show the working tree status"
15817 msgstr "显示工作区状态"
15818
15819 #: command-list.h:171
15820 msgid "Remove unnecessary whitespace"
15821 msgstr "删除不必要的空白字符"
15822
15823 #: command-list.h:172
15824 msgid "Initialize, update or inspect submodules"
15825 msgstr "初始化、更新或检查子模组"
15826
15827 #: command-list.h:173
15828 msgid "Bidirectional operation between a Subversion repository and Git"
15829 msgstr "Subersion 仓库和 Git 之间的双向操作"
15830
15831 #: command-list.h:174
15832 msgid "Read, modify and delete symbolic refs"
15833 msgstr "读取、修改和删除符号引用"
15834
15835 #: command-list.h:175
15836 msgid "Create, list, delete or verify a tag object signed with GPG"
15837 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
15838
15839 #: command-list.h:176
15840 msgid "Creates a temporary file with a blob's contents"
15841 msgstr "用 blob 数据对象的内容创建一个临时文件"
15842
15843 #: command-list.h:177
15844 msgid "Unpack objects from a packed archive"
15845 msgstr "从打包文件中解压缩对象"
15846
15847 #: command-list.h:178
15848 msgid "Register file contents in the working tree to the index"
15849 msgstr "将工作区的文件内容注册到索引"
15850
15851 #: command-list.h:179
15852 msgid "Update the object name stored in a ref safely"
15853 msgstr "安全地更新存储于引用中的对象名称"
15854
15855 #: command-list.h:180
15856 msgid "Update auxiliary info file to help dumb servers"
15857 msgstr "更新辅助信息文件以帮助哑协议服务"
15858
15859 #: command-list.h:181
15860 msgid "Send archive back to git-archive"
15861 msgstr "将存档发送回 git-archive"
15862
15863 #: command-list.h:182
15864 msgid "Send objects packed back to git-fetch-pack"
15865 msgstr "将对象压缩包发送回 git-fetch-pack"
15866
15867 #: command-list.h:183
15868 msgid "Show a Git logical variable"
15869 msgstr "显示一个Git逻辑变量"
15870
15871 #: command-list.h:184
15872 msgid "Check the GPG signature of commits"
15873 msgstr "检查 GPG 提交签名"
15874
15875 #: command-list.h:185
15876 msgid "Validate packed Git archive files"
15877 msgstr "校验打包的Git存仓文件"
15878
15879 #: command-list.h:186
15880 msgid "Check the GPG signature of tags"
15881 msgstr "检查标签的 GPG 签名"
15882
15883 #: command-list.h:187
15884 msgid "Git web interface (web frontend to Git repositories)"
15885 msgstr "Git web 界面(Git 仓库的 web 前端)"
15886
15887 #: command-list.h:188
15888 msgid "Show logs with difference each commit introduces"
15889 msgstr "显示每一个提交引入的差异日志"
15890
15891 #: command-list.h:189
15892 msgid "Manage multiple working trees"
15893 msgstr "管理多个工作区"
15894
15895 #: command-list.h:190
15896 msgid "Create a tree object from the current index"
15897 msgstr "从当前索引创建一个树对象"
15898
15899 #: command-list.h:191
15900 msgid "Defining attributes per path"
15901 msgstr "定义路径的属性"
15902
15903 #: command-list.h:192
15904 msgid "Git command-line interface and conventions"
15905 msgstr "Git 命令行界面和约定"
15906
15907 #: command-list.h:193
15908 msgid "A Git core tutorial for developers"
15909 msgstr "面向开发人员的 Git 核心教程"
15910
15911 #: command-list.h:194
15912 msgid "Git for CVS users"
15913 msgstr "适合 CVS 用户的 Git 帮助"
15914
15915 #: command-list.h:195
15916 msgid "Tweaking diff output"
15917 msgstr "调整差异输出"
15918
15919 #: command-list.h:196
15920 msgid "A useful minimum set of commands for Everyday Git"
15921 msgstr "每一天 Git 的一组有用的最小命令集合"
15922
15923 #: command-list.h:197
15924 msgid "A Git Glossary"
15925 msgstr "Git 词汇表"
15926
15927 #: command-list.h:198
15928 msgid "Hooks used by Git"
15929 msgstr "Git 使用的钩子"
15930
15931 #: command-list.h:199
15932 msgid "Specifies intentionally untracked files to ignore"
15933 msgstr "忽略指定的未跟踪文件"
15934
15935 #: command-list.h:200
15936 msgid "Defining submodule properties"
15937 msgstr "定义子模组属性"
15938
15939 #: command-list.h:201
15940 msgid "Git namespaces"
15941 msgstr "Git 名字空间"
15942
15943 #: command-list.h:202
15944 msgid "Git Repository Layout"
15945 msgstr "Git 仓库布局"
15946
15947 #: command-list.h:203
15948 msgid "Specifying revisions and ranges for Git"
15949 msgstr "指定 Git 的版本和版本范围"
15950
15951 #: command-list.h:204
15952 msgid "A tutorial introduction to Git: part two"
15953 msgstr "一个 Git 教程:第二部分"
15954
15955 #: command-list.h:205
15956 msgid "A tutorial introduction to Git"
15957 msgstr "一个 Git 教程"
15958
15959 #: command-list.h:206
15960 msgid "An overview of recommended workflows with Git"
15961 msgstr "Git 推荐的工作流概览"
15962
15963 #: rerere.h:40
15964 msgid "update the index with reused conflict resolution if possible"
15965 msgstr "如果可能,重用冲突解决更新索引"
15966
15967 #: git-bisect.sh:54
15968 msgid "You need to start by \"git bisect start\""
15969 msgstr "您需要执行 \"git bisect start\" 来开始"
15970
15971 # 译者:注意保持句尾空格
15972 #. TRANSLATORS: Make sure to include [Y] and [n] in your
15973 #. translation. The program will only accept English input
15974 #. at this point.
15975 #: git-bisect.sh:60
15976 msgid "Do you want me to do it for you [Y/n]? "
15977 msgstr "您想让我为您这样做么[Y/n]? "
15978
15979 #: git-bisect.sh:121
15980 #, sh-format
15981 msgid "unrecognised option: '$arg'"
15982 msgstr "未能识别的选项:'$arg'"
15983
15984 #: git-bisect.sh:125
15985 #, sh-format
15986 msgid "'$arg' does not appear to be a valid revision"
15987 msgstr "'$arg' 看起来不像是一个有效的版本"
15988
15989 #: git-bisect.sh:154
15990 msgid "Bad HEAD - I need a HEAD"
15991 msgstr "坏的 HEAD - 我需要一个 HEAD"
15992
15993 #: git-bisect.sh:167
15994 #, sh-format
15995 msgid ""
15996 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
15997 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
15998
15999 #: git-bisect.sh:177
16000 msgid "won't bisect on cg-seek'ed tree"
16001 msgstr "不会在做了 cg-seek 的树上做二分查找"
16002
16003 #: git-bisect.sh:181
16004 msgid "Bad HEAD - strange symbolic ref"
16005 msgstr "坏的 HEAD - 奇怪的符号引用"
16006
16007 #: git-bisect.sh:233
16008 #, sh-format
16009 msgid "Bad bisect_write argument: $state"
16010 msgstr "坏的 bisect_write 参数:$state"
16011
16012 #: git-bisect.sh:246
16013 #, sh-format
16014 msgid "Bad rev input: $arg"
16015 msgstr "坏的输入版本:$arg"
16016
16017 #: git-bisect.sh:265
16018 #, sh-format
16019 msgid "Bad rev input: $bisected_head"
16020 msgstr "坏的输入版本:$bisected_head"
16021
16022 #: git-bisect.sh:274
16023 #, sh-format
16024 msgid "Bad rev input: $rev"
16025 msgstr "坏的输入版本:$rev"
16026
16027 #: git-bisect.sh:283
16028 #, sh-format
16029 msgid "'git bisect $TERM_BAD' can take only one argument."
16030 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
16031
16032 #: git-bisect.sh:306
16033 #, sh-format
16034 msgid "Warning: bisecting only with a $TERM_BAD commit."
16035 msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
16036
16037 # 译者:注意保持句尾空格
16038 #. TRANSLATORS: Make sure to include [Y] and [n] in your
16039 #. translation. The program will only accept English input
16040 #. at this point.
16041 #: git-bisect.sh:312
16042 msgid "Are you sure [Y/n]? "
16043 msgstr "您确认么[Y/n]? "
16044
16045 #: git-bisect.sh:324
16046 #, sh-format
16047 msgid ""
16048 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
16049 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
16050 msgstr ""
16051 "您需要给我至少一个好版本和一个坏版本。\n"
16052 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
16053
16054 #: git-bisect.sh:327
16055 #, sh-format
16056 msgid ""
16057 "You need to start by \"git bisect start\".\n"
16058 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
16059 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
16060 msgstr ""
16061 "您需要执行 \"git bisect start\" 来开始。\n"
16062 "然后需要提供我至少一个好版本和一个坏版本。\n"
16063 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
16064
16065 #: git-bisect.sh:398 git-bisect.sh:512
16066 msgid "We are not bisecting."
16067 msgstr "我们没有在二分查找。"
16068
16069 #: git-bisect.sh:405
16070 #, sh-format
16071 msgid "'$invalid' is not a valid commit"
16072 msgstr "'$invalid' 不是一个有效的提交"
16073
16074 #: git-bisect.sh:414
16075 #, sh-format
16076 msgid ""
16077 "Could not check out original HEAD '$branch'.\n"
16078 "Try 'git bisect reset <commit>'."
16079 msgstr ""
16080 "不能检出原始 HEAD '$branch'。\n"
16081 "尝试 'git bisect reset <提交>'。"
16082
16083 #: git-bisect.sh:422
16084 msgid "No logfile given"
16085 msgstr "未提供日志文件"
16086
16087 #: git-bisect.sh:423
16088 #, sh-format
16089 msgid "cannot read $file for replaying"
16090 msgstr "不能读取 $file 来重放"
16091
16092 #: git-bisect.sh:444
16093 msgid "?? what are you talking about?"
16094 msgstr "?? 您在说什么?"
16095
16096 #: git-bisect.sh:453
16097 msgid "bisect run failed: no command provided."
16098 msgstr "二分查找运行失败:没有提供命令。"
16099
16100 #: git-bisect.sh:458
16101 #, sh-format
16102 msgid "running $command"
16103 msgstr "运行 $command"
16104
16105 #: git-bisect.sh:465
16106 #, sh-format
16107 msgid ""
16108 "bisect run failed:\n"
16109 "exit code $res from '$command' is < 0 or >= 128"
16110 msgstr ""
16111 "二分查找运行失败:\n"
16112 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
16113
16114 #: git-bisect.sh:491
16115 msgid "bisect run cannot continue any more"
16116 msgstr "二分查找不能继续运行"
16117
16118 #: git-bisect.sh:497
16119 #, sh-format
16120 msgid ""
16121 "bisect run failed:\n"
16122 "'bisect_state $state' exited with error code $res"
16123 msgstr ""
16124 "二分查找运行失败:\n"
16125 "'bisect_state $state' 退出码为 $res"
16126
16127 #: git-bisect.sh:504
16128 msgid "bisect run success"
16129 msgstr "二分查找运行成功"
16130
16131 #: git-bisect.sh:533
16132 #, sh-format
16133 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
16134 msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
16135
16136 #: git-bisect.sh:567
16137 msgid "no terms defined"
16138 msgstr "未定义术语"
16139
16140 #: git-bisect.sh:584
16141 #, sh-format
16142 msgid ""
16143 "invalid argument $arg for 'git bisect terms'.\n"
16144 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
16145 msgstr ""
16146 "参数 $arg 对命令 'git bisect terms' 无效。\n"
16147 "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
16148
16149 #: git-merge-octopus.sh:46
16150 msgid ""
16151 "Error: Your local changes to the following files would be overwritten by "
16152 "merge"
16153 msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
16154
16155 #: git-merge-octopus.sh:61
16156 msgid "Automated merge did not work."
16157 msgstr "自动合并未生效。"
16158
16159 #: git-merge-octopus.sh:62
16160 msgid "Should not be doing an octopus."
16161 msgstr "不应该执行章鱼式合并。"
16162
16163 #: git-merge-octopus.sh:73
16164 #, sh-format
16165 msgid "Unable to find common commit with $pretty_name"
16166 msgstr "无法找到和 $pretty_name 的基线提交"
16167
16168 #: git-merge-octopus.sh:77
16169 #, sh-format
16170 msgid "Already up to date with $pretty_name"
16171 msgstr "已经和 $pretty_name 保持一致"
16172
16173 #: git-merge-octopus.sh:89
16174 #, sh-format
16175 msgid "Fast-forwarding to: $pretty_name"
16176 msgstr "快进至:$pretty_name"
16177
16178 #: git-merge-octopus.sh:97
16179 #, sh-format
16180 msgid "Trying simple merge with $pretty_name"
16181 msgstr "尝试和 $pretty_name 的简单合并"
16182
16183 #: git-merge-octopus.sh:102
16184 msgid "Simple merge did not work, trying automatic merge."
16185 msgstr "简单合并未生效,尝试自动合并。"
16186
16187 #: git-rebase.sh:61
16188 msgid ""
16189 "Resolve all conflicts manually, mark them as resolved with\n"
16190 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
16191 "You can instead skip this commit: run \"git rebase --skip\".\n"
16192 "To abort and get back to the state before \"git rebase\", run \"git rebase --"
16193 "abort\"."
16194 msgstr ""
16195 "手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
16196 "冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
16197 "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
16198 "\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
16199
16200 #: git-rebase.sh:173 git-rebase.sh:442
16201 #, sh-format
16202 msgid "Could not move back to $head_name"
16203 msgstr "无法移回 $head_name"
16204
16205 #: git-rebase.sh:184
16206 msgid "Applied autostash."
16207 msgstr "成功应用 autostash。"
16208
16209 #: git-rebase.sh:187
16210 #, sh-format
16211 msgid "Cannot store $stash_sha1"
16212 msgstr "无法保存 $stash_sha1"
16213
16214 #: git-rebase.sh:229
16215 msgid "The pre-rebase hook refused to rebase."
16216 msgstr "钩子 pre-rebase 拒绝变基操作。"
16217
16218 #: git-rebase.sh:234
16219 msgid "It looks like 'git am' is in progress. Cannot rebase."
16220 msgstr "看起来 'git-am' 正在执行中。无法变基。"
16221
16222 #: git-rebase.sh:403
16223 msgid "No rebase in progress?"
16224 msgstr "没有正在进行的变基?"
16225
16226 #: git-rebase.sh:414
16227 msgid "The --edit-todo action can only be used during interactive rebase."
16228 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
16229
16230 #: git-rebase.sh:421
16231 msgid "Cannot read HEAD"
16232 msgstr "不能读取 HEAD"
16233
16234 #: git-rebase.sh:424
16235 msgid ""
16236 "You must edit all merge conflicts and then\n"
16237 "mark them as resolved using git add"
16238 msgstr ""
16239 "您必须编辑所有的合并冲突,然后通过 git add\n"
16240 "命令将它们标记为已解决"
16241
16242 #: git-rebase.sh:468
16243 #, sh-format
16244 msgid ""
16245 "It seems that there is already a $state_dir_base directory, and\n"
16246 "I wonder if you are in the middle of another rebase. If that is the\n"
16247 "case, please try\n"
16248 "\t$cmd_live_rebase\n"
16249 "If that is not the case, please\n"
16250 "\t$cmd_clear_stale_rebase\n"
16251 "and run me again. I am stopping in case you still have something\n"
16252 "valuable there."
16253 msgstr ""
16254 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
16255 "过程中。 如果是这样,请执行\n"
16256 "\t$cmd_live_rebase\n"
16257 "如果不是这样,请执行\n"
16258 "\t$cmd_clear_stale_rebase\n"
16259 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
16260
16261 #: git-rebase.sh:509
16262 msgid "error: cannot combine '--signoff' with '--preserve-merges'"
16263 msgstr "错误:不能组合参数 '--signoff' 和 '--preserve-merges'"
16264
16265 #: git-rebase.sh:537
16266 #, sh-format
16267 msgid "invalid upstream '$upstream_name'"
16268 msgstr "无效的上游 '$upstream_name'"
16269
16270 #: git-rebase.sh:561
16271 #, sh-format
16272 msgid "$onto_name: there are more than one merge bases"
16273 msgstr "$onto_name: 有一个以上的合并基准"
16274
16275 #: git-rebase.sh:564 git-rebase.sh:568
16276 #, sh-format
16277 msgid "$onto_name: there is no merge base"
16278 msgstr "$onto_name: 没有合并基准"
16279
16280 #: git-rebase.sh:573
16281 #, sh-format
16282 msgid "Does not point to a valid commit: $onto_name"
16283 msgstr "没有指向一个有效的提交:$onto_name"
16284
16285 #: git-rebase.sh:599
16286 #, sh-format
16287 msgid "fatal: no such branch/commit '$branch_name'"
16288 msgstr "严重错误:无此分支/提交 '$branch_name'"
16289
16290 #: git-rebase.sh:632
16291 msgid "Cannot autostash"
16292 msgstr "无法 autostash"
16293
16294 #: git-rebase.sh:637
16295 #, sh-format
16296 msgid "Created autostash: $stash_abbrev"
16297 msgstr "创建了 autostash: $stash_abbrev"
16298
16299 #: git-rebase.sh:641
16300 msgid "Please commit or stash them."
16301 msgstr "请提交或贮藏修改。"
16302
16303 #: git-rebase.sh:664
16304 #, sh-format
16305 msgid "HEAD is up to date."
16306 msgstr "HEAD 是最新的。"
16307
16308 #: git-rebase.sh:666
16309 #, sh-format
16310 msgid "Current branch $branch_name is up to date."
16311 msgstr "当前分支 $branch_name 是最新的。"
16312
16313 #: git-rebase.sh:674
16314 #, sh-format
16315 msgid "HEAD is up to date, rebase forced."
16316 msgstr "HEAD 是最新的,强制变基。"
16317
16318 #: git-rebase.sh:676
16319 #, sh-format
16320 msgid "Current branch $branch_name is up to date, rebase forced."
16321 msgstr "当前分支 $branch_name 是最新的,强制变基。"
16322
16323 #: git-rebase.sh:688
16324 #, sh-format
16325 msgid "Changes from $mb to $onto:"
16326 msgstr "变更从 $mb 到 $onto:"
16327
16328 #: git-rebase.sh:697
16329 msgid "First, rewinding head to replay your work on top of it..."
16330 msgstr "首先,回退分支以便在上面重放您的工作..."
16331
16332 #: git-rebase.sh:707
16333 #, sh-format
16334 msgid "Fast-forwarded $branch_name to $onto_name."
16335 msgstr "快进 $branch_name 至 $onto_name。"
16336
16337 #: git-stash.sh:61
16338 msgid "git stash clear with parameters is unimplemented"
16339 msgstr "git stash clear 不支持参数"
16340
16341 #: git-stash.sh:108
16342 msgid "You do not have the initial commit yet"
16343 msgstr "您尚未建立初始提交"
16344
16345 #: git-stash.sh:123
16346 msgid "Cannot save the current index state"
16347 msgstr "无法保存当前索引状态"
16348
16349 #: git-stash.sh:138
16350 msgid "Cannot save the untracked files"
16351 msgstr "无法保存未跟踪文件"
16352
16353 #: git-stash.sh:158 git-stash.sh:171
16354 msgid "Cannot save the current worktree state"
16355 msgstr "无法保存当前工作区状态"
16356
16357 #: git-stash.sh:175
16358 msgid "No changes selected"
16359 msgstr "没有选择变更"
16360
16361 #: git-stash.sh:178
16362 msgid "Cannot remove temporary index (can't happen)"
16363 msgstr "无法删除临时索引(不应发生)"
16364
16365 #: git-stash.sh:191
16366 msgid "Cannot record working tree state"
16367 msgstr "不能记录工作区状态"
16368
16369 #: git-stash.sh:229
16370 #, sh-format
16371 msgid "Cannot update $ref_stash with $w_commit"
16372 msgstr "无法用 $w_commit 更新 $ref_stash"
16373
16374 #: git-stash.sh:281
16375 #, sh-format
16376 msgid "error: unknown option for 'stash push': $option"
16377 msgstr "错误:'stash push' 的未知选项:$option"
16378
16379 #: git-stash.sh:295
16380 msgid "Can't use --patch and --include-untracked or --all at the same time"
16381 msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
16382
16383 #: git-stash.sh:303
16384 msgid "No local changes to save"
16385 msgstr "没有要保存的本地修改"
16386
16387 #: git-stash.sh:308
16388 msgid "Cannot initialize stash"
16389 msgstr "无法初始化贮藏"
16390
16391 #: git-stash.sh:312
16392 msgid "Cannot save the current status"
16393 msgstr "无法保存当前状态"
16394
16395 #: git-stash.sh:313
16396 #, sh-format
16397 msgid "Saved working directory and index state $stash_msg"
16398 msgstr "保存工作目录和索引状态 $stash_msg"
16399
16400 #: git-stash.sh:342
16401 msgid "Cannot remove worktree changes"
16402 msgstr "无法删除工作区变更"
16403
16404 #: git-stash.sh:490
16405 #, sh-format
16406 msgid "unknown option: $opt"
16407 msgstr "未知选项: $opt"
16408
16409 #: git-stash.sh:503
16410 msgid "No stash entries found."
16411 msgstr "未发现贮藏条目。"
16412
16413 #: git-stash.sh:510
16414 #, sh-format
16415 msgid "Too many revisions specified: $REV"
16416 msgstr "指定了太多的版本:$REV"
16417
16418 #: git-stash.sh:525
16419 #, sh-format
16420 msgid "$reference is not a valid reference"
16421 msgstr "$reference 不是一个有效的引用"
16422
16423 #: git-stash.sh:553
16424 #, sh-format
16425 msgid "'$args' is not a stash-like commit"
16426 msgstr "'$args' 不是贮藏式提交"
16427
16428 #: git-stash.sh:564
16429 #, sh-format
16430 msgid "'$args' is not a stash reference"
16431 msgstr "'$args' 不是一个贮藏引用"
16432
16433 #: git-stash.sh:572
16434 msgid "unable to refresh index"
16435 msgstr "无法刷新索引"
16436
16437 #: git-stash.sh:576
16438 msgid "Cannot apply a stash in the middle of a merge"
16439 msgstr "无法在合并过程应用贮藏"
16440
16441 #: git-stash.sh:584
16442 msgid "Conflicts in index. Try without --index."
16443 msgstr "索引中有冲突。尝试不使用 --index。"
16444
16445 #: git-stash.sh:586
16446 msgid "Could not save index tree"
16447 msgstr "不能保存索引树"
16448
16449 #: git-stash.sh:595
16450 msgid "Could not restore untracked files from stash entry"
16451 msgstr "无法从贮藏条目中恢复未跟踪文件"
16452
16453 #: git-stash.sh:620
16454 msgid "Cannot unstage modified files"
16455 msgstr "无法将修改的文件取消暂存"
16456
16457 #: git-stash.sh:635
16458 msgid "Index was not unstashed."
16459 msgstr "索引未从贮藏中恢复。"
16460
16461 #: git-stash.sh:649
16462 msgid "The stash entry is kept in case you need it again."
16463 msgstr "贮藏条目被保留以备您再次需要。"
16464
16465 #: git-stash.sh:658
16466 #, sh-format
16467 msgid "Dropped ${REV} ($s)"
16468 msgstr "丢弃了 ${REV} ($s)"
16469
16470 #: git-stash.sh:659
16471 #, sh-format
16472 msgid "${REV}: Could not drop stash entry"
16473 msgstr "${REV}:无法丢弃贮藏条目"
16474
16475 #: git-stash.sh:667
16476 msgid "No branch name specified"
16477 msgstr "未指定分支名"
16478
16479 #: git-stash.sh:746
16480 msgid "(To restore them type \"git stash apply\")"
16481 msgstr "(为恢复数据输入 \"git stash apply\")"
16482
16483 #: git-submodule.sh:188
16484 msgid "Relative path can only be used from the toplevel of the working tree"
16485 msgstr "只能在工作区的顶级目录中使用相对路径"
16486
16487 #: git-submodule.sh:198
16488 #, sh-format
16489 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
16490 msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
16491
16492 #: git-submodule.sh:217
16493 #, sh-format
16494 msgid "'$sm_path' already exists in the index"
16495 msgstr "'$sm_path' 已经存在于索引中"
16496
16497 #: git-submodule.sh:220
16498 #, sh-format
16499 msgid "'$sm_path' already exists in the index and is not a submodule"
16500 msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
16501
16502 #: git-submodule.sh:226
16503 #, sh-format
16504 msgid ""
16505 "The following path is ignored by one of your .gitignore files:\n"
16506 "$sm_path\n"
16507 "Use -f if you really want to add it."
16508 msgstr ""
16509 "以下路径被您的一个 .gitignore 文件所忽略:\n"
16510 "$sm_path\n"
16511 "如果您确实想添加它,使用 -f 参数。"
16512
16513 #: git-submodule.sh:249
16514 #, sh-format
16515 msgid "Adding existing repo at '$sm_path' to the index"
16516 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
16517
16518 #: git-submodule.sh:251
16519 #, sh-format
16520 msgid "'$sm_path' already exists and is not a valid git repo"
16521 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
16522
16523 #: git-submodule.sh:259
16524 #, sh-format
16525 msgid "A git directory for '$sm_name' is found locally with remote(s):"
16526 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
16527
16528 #: git-submodule.sh:261
16529 #, sh-format
16530 msgid ""
16531 "If you want to reuse this local git directory instead of cloning again from\n"
16532 " $realrepo\n"
16533 "use the '--force' option. If the local git directory is not the correct "
16534 "repo\n"
16535 "or you are unsure what this means choose another name with the '--name' "
16536 "option."
16537 msgstr ""
16538 "如果您想要重用这个本地 git 目录而非重新克隆自\n"
16539 " $realrepo\n"
16540 "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
16541 "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
16542
16543 #: git-submodule.sh:267
16544 #, sh-format
16545 msgid "Reactivating local git directory for submodule '$sm_name'."
16546 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
16547
16548 #: git-submodule.sh:279
16549 #, sh-format
16550 msgid "Unable to checkout submodule '$sm_path'"
16551 msgstr "不能检出子模组 '$sm_path'"
16552
16553 #: git-submodule.sh:284
16554 #, sh-format
16555 msgid "Failed to add submodule '$sm_path'"
16556 msgstr "无法添加子模组 '$sm_path'"
16557
16558 #: git-submodule.sh:293
16559 #, sh-format
16560 msgid "Failed to register submodule '$sm_path'"
16561 msgstr "无法注册子模组 '$sm_path'"
16562
16563 #: git-submodule.sh:354
16564 #, sh-format
16565 msgid "Entering '$displaypath'"
16566 msgstr "正在进入 '$displaypath'"
16567
16568 #: git-submodule.sh:374
16569 #, sh-format
16570 msgid "Stopping at '$displaypath'; script returned non-zero status."
16571 msgstr "停止于 '$displaypath';脚本返回非零值。"
16572
16573 #: git-submodule.sh:600
16574 #, sh-format
16575 msgid "Unable to find current revision in submodule path '$displaypath'"
16576 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
16577
16578 #: git-submodule.sh:610
16579 #, sh-format
16580 msgid "Unable to fetch in submodule path '$sm_path'"
16581 msgstr "无法在子模组路径 '$sm_path' 中获取"
16582
16583 #: git-submodule.sh:615
16584 #, sh-format
16585 msgid ""
16586 "Unable to find current ${remote_name}/${branch} revision in submodule path "
16587 "'$sm_path'"
16588 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
16589
16590 #: git-submodule.sh:633
16591 #, sh-format
16592 msgid "Unable to fetch in submodule path '$displaypath'"
16593 msgstr "无法在子模组路径 '$displaypath' 中获取"
16594
16595 #: git-submodule.sh:639
16596 #, sh-format
16597 msgid ""
16598 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
16599 "Direct fetching of that commit failed."
16600 msgstr ""
16601 "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
16602
16603 #: git-submodule.sh:646
16604 #, sh-format
16605 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
16606 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
16607
16608 #: git-submodule.sh:647
16609 #, sh-format
16610 msgid "Submodule path '$displaypath': checked out '$sha1'"
16611 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
16612
16613 #: git-submodule.sh:651
16614 #, sh-format
16615 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
16616 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
16617
16618 #: git-submodule.sh:652
16619 #, sh-format
16620 msgid "Submodule path '$displaypath': rebased into '$sha1'"
16621 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
16622
16623 #: git-submodule.sh:657
16624 #, sh-format
16625 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
16626 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
16627
16628 #: git-submodule.sh:658
16629 #, sh-format
16630 msgid "Submodule path '$displaypath': merged in '$sha1'"
16631 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
16632
16633 #: git-submodule.sh:663
16634 #, sh-format
16635 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
16636 msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
16637
16638 #: git-submodule.sh:664
16639 #, sh-format
16640 msgid "Submodule path '$displaypath': '$command $sha1'"
16641 msgstr "子模组 '$displaypath':'$command $sha1'"
16642
16643 #: git-submodule.sh:695
16644 #, sh-format
16645 msgid "Failed to recurse into submodule path '$displaypath'"
16646 msgstr "无法递归进子模组路径 '$displaypath'"
16647
16648 #: git-submodule.sh:791
16649 msgid "The --cached option cannot be used with the --files option"
16650 msgstr "选项 --cached 不能和选项 --files 同时使用"
16651
16652 #: git-submodule.sh:843
16653 #, sh-format
16654 msgid "unexpected mode $mod_dst"
16655 msgstr "意外的模式 $mod_dst"
16656
16657 # 译者:注意保持前导空格
16658 #: git-submodule.sh:863
16659 #, sh-format
16660 msgid " Warn: $display_name doesn't contain commit $sha1_src"
16661 msgstr " 警告:$display_name 未包含提交 $sha1_src"
16662
16663 # 译者:注意保持前导空格
16664 #: git-submodule.sh:866
16665 #, sh-format
16666 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
16667 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
16668
16669 # 译者:注意保持前导空格
16670 #: git-submodule.sh:869
16671 #, sh-format
16672 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
16673 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
16674
16675 #: git-parse-remote.sh:89
16676 #, sh-format
16677 msgid "See git-${cmd}(1) for details."
16678 msgstr "详见 git-${cmd}(1)。"
16679
16680 #: git-rebase--interactive.sh:142
16681 #, sh-format
16682 msgid "Rebasing ($new_count/$total)"
16683 msgstr "变基中($new_count/$total)"
16684
16685 #: git-rebase--interactive.sh:158
16686 msgid ""
16687 "\n"
16688 "Commands:\n"
16689 "p, pick <commit> = use commit\n"
16690 "r, reword <commit> = use commit, but edit the commit message\n"
16691 "e, edit <commit> = use commit, but stop for amending\n"
16692 "s, squash <commit> = use commit, but meld into previous commit\n"
16693 "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
16694 "x, exec <command> = run command (the rest of the line) using shell\n"
16695 "d, drop <commit> = remove commit\n"
16696 "l, label <label> = label current HEAD with a name\n"
16697 "t, reset <label> = reset HEAD to a label\n"
16698 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
16699 ". create a merge commit using the original merge commit's\n"
16700 ". message (or the oneline, if no original merge commit was\n"
16701 ". specified). Use -c <commit> to reword the commit message.\n"
16702 "\n"
16703 "These lines can be re-ordered; they are executed from top to bottom.\n"
16704 msgstr ""
16705 "\n"
16706 "命令:\n"
16707 "p, pick <提交> = 使用提交\n"
16708 "r, reword <提交> = 使用提交,但修改提交说明\n"
16709 "e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n"
16710 "s, squash <提交> = 使用提交,但融合到前一个提交\n"
16711 "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
16712 "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
16713 "d, drop <提交> = 删除提交\n"
16714 "l, label <label> = 为当前 HEAD 打上标记\n"
16715 "t, reset <label> = 重置 HEAD 到该标记\n"
16716 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
16717 ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
16718 ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
16719 ". -c <提交> 可以编辑提交说明。\n"
16720 "\n"
16721 "可以对这些行重新排序,将从上至下执行。\n"
16722
16723 #: git-rebase--interactive.sh:179
16724 msgid ""
16725 "\n"
16726 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
16727 msgstr ""
16728 "\n"
16729 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
16730
16731 #: git-rebase--interactive.sh:183
16732 msgid ""
16733 "\n"
16734 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
16735 msgstr ""
16736 "\n"
16737 "如果您在这里删除一行,对应的提交将会丢失。\n"
16738
16739 #: git-rebase--interactive.sh:221
16740 #, sh-format
16741 msgid ""
16742 "You can amend the commit now, with\n"
16743 "\n"
16744 "\tgit commit --amend $gpg_sign_opt_quoted\n"
16745 "\n"
16746 "Once you are satisfied with your changes, run\n"
16747 "\n"
16748 "\tgit rebase --continue"
16749 msgstr ""
16750 "您现在可以修补这个提交,使用\n"
16751 "\n"
16752 "\tgit commit --amend $gpg_sign_opt_quoted\n"
16753 "\n"
16754 "当您对变更感到满意,执行\n"
16755 "\n"
16756 "\tgit rebase --continue"
16757
16758 #: git-rebase--interactive.sh:246
16759 #, sh-format
16760 msgid "$sha1: not a commit that can be picked"
16761 msgstr "$sha1:不是一个可以被拣选的提交"
16762
16763 #: git-rebase--interactive.sh:285
16764 #, sh-format
16765 msgid "Invalid commit name: $sha1"
16766 msgstr "无效的提交名:$sha1"
16767
16768 #: git-rebase--interactive.sh:325
16769 msgid "Cannot write current commit's replacement sha1"
16770 msgstr "不能写入当前提交的替代 sha1"
16771
16772 #: git-rebase--interactive.sh:376
16773 #, sh-format
16774 msgid "Fast-forward to $sha1"
16775 msgstr "快进到 $sha1"
16776
16777 #: git-rebase--interactive.sh:378
16778 #, sh-format
16779 msgid "Cannot fast-forward to $sha1"
16780 msgstr "不能快进到 $sha1"
16781
16782 #: git-rebase--interactive.sh:387
16783 #, sh-format
16784 msgid "Cannot move HEAD to $first_parent"
16785 msgstr "不能移动 HEAD 到 $first_parent"
16786
16787 #: git-rebase--interactive.sh:392
16788 #, sh-format
16789 msgid "Refusing to squash a merge: $sha1"
16790 msgstr "拒绝压缩一个合并:$sha1"
16791
16792 #: git-rebase--interactive.sh:410
16793 #, sh-format
16794 msgid "Error redoing merge $sha1"
16795 msgstr "无法重做合并 $sha1"
16796
16797 #: git-rebase--interactive.sh:419
16798 #, sh-format
16799 msgid "Could not pick $sha1"
16800 msgstr "不能拣选 $sha1"
16801
16802 #: git-rebase--interactive.sh:428
16803 #, sh-format
16804 msgid "This is the commit message #${n}:"
16805 msgstr "这是提交说明 #${n}:"
16806
16807 #: git-rebase--interactive.sh:433
16808 #, sh-format
16809 msgid "The commit message #${n} will be skipped:"
16810 msgstr "提交说明 #${n} 将被跳过:"
16811
16812 #: git-rebase--interactive.sh:444
16813 #, sh-format
16814 msgid "This is a combination of $count commit."
16815 msgid_plural "This is a combination of $count commits."
16816 msgstr[0] "这是一个 $count 个提交的组合。"
16817 msgstr[1] "这是一个 $count 个提交的组合。"
16818
16819 #: git-rebase--interactive.sh:453
16820 #, sh-format
16821 msgid "Cannot write $fixup_msg"
16822 msgstr "不能写入 $fixup_msg"
16823
16824 #: git-rebase--interactive.sh:456
16825 msgid "This is a combination of 2 commits."
16826 msgstr "这是一个 2 个提交的组合。"
16827
16828 #: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540
16829 #: git-rebase--interactive.sh:543
16830 #, sh-format
16831 msgid "Could not apply $sha1... $rest"
16832 msgstr "不能应用 $sha1... $rest"
16833
16834 #: git-rebase--interactive.sh:572
16835 #, sh-format
16836 msgid ""
16837 "Could not amend commit after successfully picking $sha1... $rest\n"
16838 "This is most likely due to an empty commit message, or the pre-commit hook\n"
16839 "failed. If the pre-commit hook failed, you may need to resolve the issue "
16840 "before\n"
16841 "you are able to reword the commit."
16842 msgstr ""
16843 "不能在成功拣选 $sha1... $rest 之后修补提交\n"
16844 "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
16845 "钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
16846
16847 #: git-rebase--interactive.sh:587
16848 #, sh-format
16849 msgid "Stopped at $sha1_abbrev... $rest"
16850 msgstr "停止在 $sha1_abbrev... $rest"
16851
16852 #: git-rebase--interactive.sh:602
16853 #, sh-format
16854 msgid "Cannot '$squash_style' without a previous commit"
16855 msgstr "没有父提交的情况下不能 '$squash_style'"
16856
16857 #: git-rebase--interactive.sh:644
16858 #, sh-format
16859 msgid "Executing: $rest"
16860 msgstr "执行:$rest"
16861
16862 #: git-rebase--interactive.sh:652
16863 #, sh-format
16864 msgid "Execution failed: $rest"
16865 msgstr "执行失败:$rest"
16866
16867 #: git-rebase--interactive.sh:654
16868 msgid "and made changes to the index and/or the working tree"
16869 msgstr "并且修改索引和/或工作区"
16870
16871 # 译者:注意保持前导空格
16872 #: git-rebase--interactive.sh:656
16873 msgid ""
16874 "You can fix the problem, and then run\n"
16875 "\n"
16876 "\tgit rebase --continue"
16877 msgstr ""
16878 "您可以解决这个问题,然后运行\n"
16879 "\n"
16880 "\tgit rebase --continue"
16881
16882 #. TRANSLATORS: after these lines is a command to be issued by the user
16883 #: git-rebase--interactive.sh:669
16884 #, sh-format
16885 msgid ""
16886 "Execution succeeded: $rest\n"
16887 "but left changes to the index and/or the working tree\n"
16888 "Commit or stash your changes, and then run\n"
16889 "\n"
16890 "\tgit rebase --continue"
16891 msgstr ""
16892 "执行成功:$rest\n"
16893 "但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
16894 "\n"
16895 "\tgit rebase --continue"
16896
16897 #: git-rebase--interactive.sh:680
16898 #, sh-format
16899 msgid "Unknown command: $command $sha1 $rest"
16900 msgstr "未知命令:$command $sha1 $rest"
16901
16902 #: git-rebase--interactive.sh:681
16903 msgid "Please fix this using 'git rebase --edit-todo'."
16904 msgstr "要修改请使用命令 'git rebase --edit-todo'。"
16905
16906 #: git-rebase--interactive.sh:716
16907 #, sh-format
16908 msgid "Successfully rebased and updated $head_name."
16909 msgstr "成功变基并更新 $head_name。"
16910
16911 #: git-rebase--interactive.sh:740
16912 msgid "could not detach HEAD"
16913 msgstr "不能检出为分离头指针"
16914
16915 #: git-rebase--interactive.sh:778
16916 msgid "Could not remove CHERRY_PICK_HEAD"
16917 msgstr "不能删除 CHERRY_PICK_HEAD"
16918
16919 #: git-rebase--interactive.sh:783
16920 #, sh-format
16921 msgid ""
16922 "You have staged changes in your working tree.\n"
16923 "If these changes are meant to be\n"
16924 "squashed into the previous commit, run:\n"
16925 "\n"
16926 " git commit --amend $gpg_sign_opt_quoted\n"
16927 "\n"
16928 "If they are meant to go into a new commit, run:\n"
16929 "\n"
16930 " git commit $gpg_sign_opt_quoted\n"
16931 "\n"
16932 "In both cases, once you're done, continue with:\n"
16933 "\n"
16934 " git rebase --continue\n"
16935 msgstr ""
16936 "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
16937 "\n"
16938 " git commit --amend $gpg_sign_opt_quoted\n"
16939 "\n"
16940 "如果这些变更要形成一个新提交,执行:\n"
16941 "\n"
16942 " git commit $gpg_sign_opt_quoted\n"
16943 "\n"
16944 "无论哪种情况,当您完成提交,继续执行:\n"
16945 "\n"
16946 " git rebase --continue\n"
16947
16948 #: git-rebase--interactive.sh:800
16949 msgid "Error trying to find the author identity to amend commit"
16950 msgstr "在修补提交中查找作者信息时遇到错误"
16951
16952 #: git-rebase--interactive.sh:805
16953 msgid ""
16954 "You have uncommitted changes in your working tree. Please commit them\n"
16955 "first and then run 'git rebase --continue' again."
16956 msgstr ""
16957 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
16958
16959 #: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814
16960 msgid "Could not commit staged changes."
16961 msgstr "不能提交暂存的修改。"
16962
16963 #: git-rebase--interactive.sh:843
16964 msgid ""
16965 "\n"
16966 "You are editing the todo file of an ongoing interactive rebase.\n"
16967 "To continue rebase after editing, run:\n"
16968 " git rebase --continue\n"
16969 "\n"
16970 msgstr ""
16971 "\n"
16972 "您正在修改运行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
16973 "请执行:\n"
16974 " git rebase --continue\n"
16975 "\n"
16976
16977 #: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937
16978 msgid "Could not execute editor"
16979 msgstr "无法运行编辑器"
16980
16981 #: git-rebase--interactive.sh:872
16982 #, sh-format
16983 msgid "Could not checkout $switch_to"
16984 msgstr "不能检出 $switch_to"
16985
16986 #: git-rebase--interactive.sh:879
16987 msgid "No HEAD?"
16988 msgstr "没有 HEAD?"
16989
16990 #: git-rebase--interactive.sh:880
16991 #, sh-format
16992 msgid "Could not create temporary $state_dir"
16993 msgstr "不能创建临时 $state_dir"
16994
16995 #: git-rebase--interactive.sh:883
16996 msgid "Could not mark as interactive"
16997 msgstr "不能标记为交互式"
16998
16999 #: git-rebase--interactive.sh:915
17000 #, sh-format
17001 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
17002 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
17003 msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
17004 msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
17005
17006 #: git-rebase--interactive.sh:920
17007 msgid ""
17008 "\n"
17009 "\tHowever, if you remove everything, the rebase will be aborted.\n"
17010 "\n"
17011 "\t"
17012 msgstr ""
17013 "\n"
17014 "\t然而,如果您删除全部内容,变基操作将会终止。\n"
17015 "\n"
17016 "\t"
17017
17018 #: git-rebase--interactive.sh:927
17019 msgid "Note that empty commits are commented out"
17020 msgstr "注意空提交已被注释掉"
17021
17022 #: git-rebase--interactive.sh:980
17023 msgid "Could not generate todo list"
17024 msgstr "无法生成待办列表"
17025
17026 #: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006
17027 msgid "Could not init rewritten commits"
17028 msgstr "不能对重写提交进行初始化"
17029
17030 #: git-sh-setup.sh:89 git-sh-setup.sh:94
17031 #, sh-format
17032 msgid "usage: $dashless $USAGE"
17033 msgstr "用法:$dashless $USAGE"
17034
17035 #: git-sh-setup.sh:190
17036 #, sh-format
17037 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
17038 msgstr "不能切换目录到 $cdup,工作区的顶级目录"
17039
17040 #: git-sh-setup.sh:199 git-sh-setup.sh:206
17041 #, sh-format
17042 msgid "fatal: $program_name cannot be used without a working tree."
17043 msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
17044
17045 #: git-sh-setup.sh:220
17046 msgid "Cannot rebase: You have unstaged changes."
17047 msgstr "不能变基:您有未暂存的变更。"
17048
17049 #: git-sh-setup.sh:223
17050 msgid "Cannot rewrite branches: You have unstaged changes."
17051 msgstr "不能重写分支:您有未暂存的变更。"
17052
17053 #: git-sh-setup.sh:226
17054 msgid "Cannot pull with rebase: You have unstaged changes."
17055 msgstr "无法通过变基方式拉取:您有未暂存的变更。"
17056
17057 #: git-sh-setup.sh:229
17058 #, sh-format
17059 msgid "Cannot $action: You have unstaged changes."
17060 msgstr "不能 $action:您有未暂存的变更。"
17061
17062 #: git-sh-setup.sh:242
17063 msgid "Cannot rebase: Your index contains uncommitted changes."
17064 msgstr "不能变基:您的索引中包含未提交的变更。"
17065
17066 #: git-sh-setup.sh:245
17067 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
17068 msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
17069
17070 #: git-sh-setup.sh:248
17071 #, sh-format
17072 msgid "Cannot $action: Your index contains uncommitted changes."
17073 msgstr "不能 $action:您的索引中包含未提交的变更。"
17074
17075 #: git-sh-setup.sh:252
17076 msgid "Additionally, your index contains uncommitted changes."
17077 msgstr "而且您的索引中包含未提交的变更。"
17078
17079 #: git-sh-setup.sh:372
17080 msgid "You need to run this command from the toplevel of the working tree."
17081 msgstr "您需要在工作区的顶级目录中运行这个命令。"
17082
17083 #: git-sh-setup.sh:377
17084 msgid "Unable to determine absolute path of git directory"
17085 msgstr "不能确定 git 目录的绝对路径"
17086
17087 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
17088 #: git-add--interactive.perl:196
17089 #, perl-format
17090 msgid "%12s %12s %s"
17091 msgstr "%12s %12s %s"
17092
17093 #: git-add--interactive.perl:197
17094 msgid "staged"
17095 msgstr "缓存"
17096
17097 #: git-add--interactive.perl:197
17098 msgid "unstaged"
17099 msgstr "未缓存"
17100
17101 #: git-add--interactive.perl:253 git-add--interactive.perl:278
17102 msgid "binary"
17103 msgstr "二进制"
17104
17105 #: git-add--interactive.perl:262 git-add--interactive.perl:316
17106 msgid "nothing"
17107 msgstr "无"
17108
17109 #: git-add--interactive.perl:298 git-add--interactive.perl:313
17110 msgid "unchanged"
17111 msgstr "没有修改"
17112
17113 #: git-add--interactive.perl:609
17114 #, perl-format
17115 msgid "added %d path\n"
17116 msgid_plural "added %d paths\n"
17117 msgstr[0] "增加了 %d 个路径\n"
17118 msgstr[1] "增加了 %d 个路径\n"
17119
17120 #: git-add--interactive.perl:612
17121 #, perl-format
17122 msgid "updated %d path\n"
17123 msgid_plural "updated %d paths\n"
17124 msgstr[0] "更新了 %d 个路径\n"
17125 msgstr[1] "更新了 %d 个路径\n"
17126
17127 #: git-add--interactive.perl:615
17128 #, perl-format
17129 msgid "reverted %d path\n"
17130 msgid_plural "reverted %d paths\n"
17131 msgstr[0] "还原了 %d 个路径\n"
17132 msgstr[1] "还原了 %d 个路径\n"
17133
17134 #: git-add--interactive.perl:618
17135 #, perl-format
17136 msgid "touched %d path\n"
17137 msgid_plural "touched %d paths\n"
17138 msgstr[0] "触碰了 %d 个路径\n"
17139 msgstr[1] "触碰了 %d 个路径\n"
17140
17141 #: git-add--interactive.perl:627
17142 msgid "Update"
17143 msgstr "更新"
17144
17145 #: git-add--interactive.perl:639
17146 msgid "Revert"
17147 msgstr "还原"
17148
17149 #: git-add--interactive.perl:662
17150 #, perl-format
17151 msgid "note: %s is untracked now.\n"
17152 msgstr "说明:%s 现已成为未跟踪的。\n"
17153
17154 #: git-add--interactive.perl:673
17155 msgid "Add untracked"
17156 msgstr "添加未跟踪的"
17157
17158 #: git-add--interactive.perl:679
17159 msgid "No untracked files.\n"
17160 msgstr "没有未跟踪的文件。\n"
17161
17162 #: git-add--interactive.perl:1033
17163 msgid ""
17164 "If the patch applies cleanly, the edited hunk will immediately be\n"
17165 "marked for staging."
17166 msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
17167
17168 #: git-add--interactive.perl:1036
17169 msgid ""
17170 "If the patch applies cleanly, the edited hunk will immediately be\n"
17171 "marked for stashing."
17172 msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
17173
17174 #: git-add--interactive.perl:1039
17175 msgid ""
17176 "If the patch applies cleanly, the edited hunk will immediately be\n"
17177 "marked for unstaging."
17178 msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
17179
17180 #: git-add--interactive.perl:1042 git-add--interactive.perl:1051
17181 msgid ""
17182 "If the patch applies cleanly, the edited hunk will immediately be\n"
17183 "marked for applying."
17184 msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
17185
17186 #: git-add--interactive.perl:1045 git-add--interactive.perl:1048
17187 msgid ""
17188 "If the patch applies cleanly, the edited hunk will immediately be\n"
17189 "marked for discarding."
17190 msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
17191
17192 #: git-add--interactive.perl:1085
17193 #, perl-format
17194 msgid "failed to open hunk edit file for writing: %s"
17195 msgstr "无法写入块编辑文件:%s"
17196
17197 #: git-add--interactive.perl:1086
17198 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
17199 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
17200
17201 #: git-add--interactive.perl:1092
17202 #, perl-format
17203 msgid ""
17204 "---\n"
17205 "To remove '%s' lines, make them ' ' lines (context).\n"
17206 "To remove '%s' lines, delete them.\n"
17207 "Lines starting with %s will be removed.\n"
17208 msgstr ""
17209 "---\n"
17210 "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
17211 "要删除 '%s' 开始的行,删除它们。\n"
17212 "以 %s 开始的行将被删除。\n"
17213
17214 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
17215 #: git-add--interactive.perl:1100
17216 msgid ""
17217 "If it does not apply cleanly, you will be given an opportunity to\n"
17218 "edit again. If all lines of the hunk are removed, then the edit is\n"
17219 "aborted and the hunk is left unchanged.\n"
17220 msgstr ""
17221 "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
17222 "此次编辑被终止,该块不会被修改。\n"
17223
17224 #: git-add--interactive.perl:1114
17225 #, perl-format
17226 msgid "failed to open hunk edit file for reading: %s"
17227 msgstr "无法读取块编辑文件:%s"
17228
17229 #. TRANSLATORS: do not translate [y/n]
17230 #. The program will only accept that input
17231 #. at this point.
17232 #. Consider translating (saying "no" discards!) as
17233 #. (saying "n" for "no" discards!) if the translation
17234 #. of the word "no" does not start with n.
17235 #: git-add--interactive.perl:1213
17236 msgid ""
17237 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
17238 msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
17239
17240 #: git-add--interactive.perl:1222
17241 msgid ""
17242 "y - stage this hunk\n"
17243 "n - do not stage this hunk\n"
17244 "q - quit; do not stage this hunk or any of the remaining ones\n"
17245 "a - stage this hunk and all later hunks in the file\n"
17246 "d - do not stage this hunk or any of the later hunks in the file"
17247 msgstr ""
17248 "y - 暂存该块\n"
17249 "n - 不要暂存该块\n"
17250 "q - 退出。不暂存该块及后面的全部块\n"
17251 "a - 暂存该块和本文件中后面的全部块\n"
17252 "d - 不暂存该块和本文件中后面的全部块"
17253
17254 #: git-add--interactive.perl:1228
17255 msgid ""
17256 "y - stash this hunk\n"
17257 "n - do not stash this hunk\n"
17258 "q - quit; do not stash this hunk or any of the remaining ones\n"
17259 "a - stash this hunk and all later hunks in the file\n"
17260 "d - do not stash this hunk or any of the later hunks in the file"
17261 msgstr ""
17262 "y - 贮藏该块\n"
17263 "n - 不要贮藏该块\n"
17264 "q - 退出。不贮藏该块及后面的全部块\n"
17265 "a - 贮藏该块和本文件中后面的全部块\n"
17266 "d - 不贮藏该块和本文件中后面的全部块"
17267
17268 #: git-add--interactive.perl:1234
17269 msgid ""
17270 "y - unstage this hunk\n"
17271 "n - do not unstage this hunk\n"
17272 "q - quit; do not unstage this hunk or any of the remaining ones\n"
17273 "a - unstage this hunk and all later hunks in the file\n"
17274 "d - do not unstage this hunk or any of the later hunks in the file"
17275 msgstr ""
17276 "y - 不暂存该块\n"
17277 "n - 不要不暂存该块\n"
17278 "q - 退出。不要不暂存该块及后面的全部块\n"
17279 "a - 不暂存该块和本文件中后面的全部块\n"
17280 "d - 不要不暂存该块和本文件中后面的全部块"
17281
17282 #: git-add--interactive.perl:1240
17283 msgid ""
17284 "y - apply this hunk to index\n"
17285 "n - do not apply this hunk to index\n"
17286 "q - quit; do not apply this hunk or any of the remaining ones\n"
17287 "a - apply this hunk and all later hunks in the file\n"
17288 "d - do not apply this hunk or any of the later hunks in the file"
17289 msgstr ""
17290 "y - 在索引中应用该块\n"
17291 "n - 不要在索引中应用该块\n"
17292 "q - 退出。不要应用该块及后面的全部块\n"
17293 "a - 应用该块和本文件中后面的全部块\n"
17294 "d - 不要应用该块和本文件中后面的全部块"
17295
17296 #: git-add--interactive.perl:1246
17297 msgid ""
17298 "y - discard this hunk from worktree\n"
17299 "n - do not discard this hunk from worktree\n"
17300 "q - quit; do not discard this hunk or any of the remaining ones\n"
17301 "a - discard this hunk and all later hunks in the file\n"
17302 "d - do not discard this hunk or any of the later hunks in the file"
17303 msgstr ""
17304 "y - 在工作区中丢弃该块\n"
17305 "n - 不要在工作区中丢弃该块\n"
17306 "q - 退出。不要丢弃该块及后面的全部块\n"
17307 "a - 丢弃该块和本文件中后面的全部块\n"
17308 "d - 不要丢弃该块和本文件中后面的全部块"
17309
17310 #: git-add--interactive.perl:1252
17311 msgid ""
17312 "y - discard this hunk from index and worktree\n"
17313 "n - do not discard this hunk from index and worktree\n"
17314 "q - quit; do not discard this hunk or any of the remaining ones\n"
17315 "a - discard this hunk and all later hunks in the file\n"
17316 "d - do not discard this hunk or any of the later hunks in the file"
17317 msgstr ""
17318 "y - 在索引和工作区中丢弃该块\n"
17319 "n - 不要在索引和工作区中丢弃该块\n"
17320 "q - 退出。不要丢弃该块及后面的全部块\n"
17321 "a - 丢弃该块和本文件中后面的全部块\n"
17322 "d - 不要丢弃该块和本文件中后面的全部块"
17323
17324 #: git-add--interactive.perl:1258
17325 msgid ""
17326 "y - apply this hunk to index and worktree\n"
17327 "n - do not apply this hunk to index and worktree\n"
17328 "q - quit; do not apply this hunk or any of the remaining ones\n"
17329 "a - apply this hunk and all later hunks in the file\n"
17330 "d - do not apply this hunk or any of the later hunks in the file"
17331 msgstr ""
17332 "y - 在索引和工作区中应用该块\n"
17333 "n - 不要在索引和工作区中应用该块\n"
17334 "q - 退出。不要应用该块及后面的全部块\n"
17335 "a - 应用该块和本文件中后面的全部块\n"
17336 "d - 不要应用该块和本文件中后面的全部块"
17337
17338 #: git-add--interactive.perl:1273
17339 msgid ""
17340 "g - select a hunk to go to\n"
17341 "/ - search for a hunk matching the given regex\n"
17342 "j - leave this hunk undecided, see next undecided hunk\n"
17343 "J - leave this hunk undecided, see next hunk\n"
17344 "k - leave this hunk undecided, see previous undecided hunk\n"
17345 "K - leave this hunk undecided, see previous hunk\n"
17346 "s - split the current hunk into smaller hunks\n"
17347 "e - manually edit the current hunk\n"
17348 "? - print help\n"
17349 msgstr ""
17350 "g - 选择跳转到一个块\n"
17351 "/ - 查找和给定正则表达式匹配的块\n"
17352 "j - 维持该块未决状态,查看下一个未决块\n"
17353 "J - 维持该块未决状态,查看下一个块\n"
17354 "k - 维持该块未决状态,查看上一个未决块\n"
17355 "K - 维持该块未决状态,查看上一个块\n"
17356 "s - 拆分当前块为更小的块\n"
17357 "e - 手动编辑当前块\n"
17358 "? - 显示帮助\n"
17359
17360 #: git-add--interactive.perl:1304
17361 msgid "The selected hunks do not apply to the index!\n"
17362 msgstr "选中的块不能应用到索引!\n"
17363
17364 #: git-add--interactive.perl:1305
17365 msgid "Apply them to the worktree anyway? "
17366 msgstr "无论如何都要应用到工作区么?"
17367
17368 #: git-add--interactive.perl:1308
17369 msgid "Nothing was applied.\n"
17370 msgstr "未应用。\n"
17371
17372 #: git-add--interactive.perl:1319
17373 #, perl-format
17374 msgid "ignoring unmerged: %s\n"
17375 msgstr "忽略未合入的:%s\n"
17376
17377 #: git-add--interactive.perl:1328
17378 msgid "Only binary files changed.\n"
17379 msgstr "只有二进制文件被修改。\n"
17380
17381 #: git-add--interactive.perl:1330
17382 msgid "No changes.\n"
17383 msgstr "没有修改。\n"
17384
17385 #: git-add--interactive.perl:1338
17386 msgid "Patch update"
17387 msgstr "补丁更新"
17388
17389 #: git-add--interactive.perl:1390
17390 #, perl-format
17391 msgid "Stage mode change [y,n,q,a,d%s,?]? "
17392 msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
17393
17394 #: git-add--interactive.perl:1391
17395 #, perl-format
17396 msgid "Stage deletion [y,n,q,a,d%s,?]? "
17397 msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
17398
17399 #: git-add--interactive.perl:1392
17400 #, perl-format
17401 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
17402 msgstr "暂存该块 [y,n,q,a,d%s,?]? "
17403
17404 #: git-add--interactive.perl:1395
17405 #, perl-format
17406 msgid "Stash mode change [y,n,q,a,d%s,?]? "
17407 msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
17408
17409 #: git-add--interactive.perl:1396
17410 #, perl-format
17411 msgid "Stash deletion [y,n,q,a,d%s,?]? "
17412 msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
17413
17414 #: git-add--interactive.perl:1397
17415 #, perl-format
17416 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
17417 msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
17418
17419 #: git-add--interactive.perl:1400
17420 #, perl-format
17421 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
17422 msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
17423
17424 #: git-add--interactive.perl:1401
17425 #, perl-format
17426 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
17427 msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
17428
17429 #: git-add--interactive.perl:1402
17430 #, perl-format
17431 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
17432 msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
17433
17434 #: git-add--interactive.perl:1405
17435 #, perl-format
17436 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
17437 msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
17438
17439 #: git-add--interactive.perl:1406
17440 #, perl-format
17441 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
17442 msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? "
17443
17444 #: git-add--interactive.perl:1407
17445 #, perl-format
17446 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
17447 msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
17448
17449 #: git-add--interactive.perl:1410
17450 #, perl-format
17451 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
17452 msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
17453
17454 #: git-add--interactive.perl:1411
17455 #, perl-format
17456 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
17457 msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
17458
17459 #: git-add--interactive.perl:1412
17460 #, perl-format
17461 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
17462 msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
17463
17464 #: git-add--interactive.perl:1415
17465 #, perl-format
17466 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
17467 msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
17468
17469 #: git-add--interactive.perl:1416
17470 #, perl-format
17471 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
17472 msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
17473
17474 #: git-add--interactive.perl:1417
17475 #, perl-format
17476 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
17477 msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
17478
17479 #: git-add--interactive.perl:1420
17480 #, perl-format
17481 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
17482 msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
17483
17484 #: git-add--interactive.perl:1421
17485 #, perl-format
17486 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
17487 msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? "
17488
17489 #: git-add--interactive.perl:1422
17490 #, perl-format
17491 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
17492 msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
17493
17494 #: git-add--interactive.perl:1522
17495 msgid "No other hunks to goto\n"
17496 msgstr "没有其它可供跳转的块\n"
17497
17498 #: git-add--interactive.perl:1529
17499 msgid "go to which hunk (<ret> to see more)? "
17500 msgstr "跳转到哪个块(<回车> 查看更多)? "
17501
17502 #: git-add--interactive.perl:1531
17503 msgid "go to which hunk? "
17504 msgstr "跳转到哪个块?"
17505
17506 #: git-add--interactive.perl:1540
17507 #, perl-format
17508 msgid "Invalid number: '%s'\n"
17509 msgstr "无效数字:'%s'\n"
17510
17511 #: git-add--interactive.perl:1545
17512 #, perl-format
17513 msgid "Sorry, only %d hunk available.\n"
17514 msgid_plural "Sorry, only %d hunks available.\n"
17515 msgstr[0] "对不起,只有 %d 个可用块。\n"
17516 msgstr[1] "对不起,只有 %d 个可用块。\n"
17517
17518 #: git-add--interactive.perl:1571
17519 msgid "No other hunks to search\n"
17520 msgstr "没有其它可供查找的块\n"
17521
17522 #: git-add--interactive.perl:1575
17523 msgid "search for regex? "
17524 msgstr "使用正则表达式搜索?"
17525
17526 #: git-add--interactive.perl:1588
17527 #, perl-format
17528 msgid "Malformed search regexp %s: %s\n"
17529 msgstr "错误的正则表达式 %s:%s\n"
17530
17531 #: git-add--interactive.perl:1598
17532 msgid "No hunk matches the given pattern\n"
17533 msgstr "没有和给定模式相匹配的快\n"
17534
17535 #: git-add--interactive.perl:1610 git-add--interactive.perl:1632
17536 msgid "No previous hunk\n"
17537 msgstr "没有前一个块\n"
17538
17539 #: git-add--interactive.perl:1619 git-add--interactive.perl:1638
17540 msgid "No next hunk\n"
17541 msgstr "没有下一个块\n"
17542
17543 #: git-add--interactive.perl:1644
17544 msgid "Sorry, cannot split this hunk\n"
17545 msgstr "对不起,不能拆分这个块\n"
17546
17547 #: git-add--interactive.perl:1650
17548 #, perl-format
17549 msgid "Split into %d hunk.\n"
17550 msgid_plural "Split into %d hunks.\n"
17551 msgstr[0] "拆分为 %d 块。\n"
17552 msgstr[1] "拆分为 %d 块。\n"
17553
17554 #: git-add--interactive.perl:1660
17555 msgid "Sorry, cannot edit this hunk\n"
17556 msgstr "对不起,不能编辑这个块\n"
17557
17558 #: git-add--interactive.perl:1706
17559 msgid "Review diff"
17560 msgstr "检视 diff"
17561
17562 #. TRANSLATORS: please do not translate the command names
17563 #. 'status', 'update', 'revert', etc.
17564 #: git-add--interactive.perl:1725
17565 msgid ""
17566 "status - show paths with changes\n"
17567 "update - add working tree state to the staged set of changes\n"
17568 "revert - revert staged set of changes back to the HEAD version\n"
17569 "patch - pick hunks and update selectively\n"
17570 "diff - view diff between HEAD and index\n"
17571 "add untracked - add contents of untracked files to the staged set of "
17572 "changes\n"
17573 msgstr ""
17574 "status - 显示含变更的路径\n"
17575 "update - 添加工作区状态至暂存列表\n"
17576 "revert - 还原修改的暂存集至 HEAD 版本\n"
17577 "patch - 挑选块并且有选择地更新\n"
17578 "diff - 显示 HEAD 和索引间差异\n"
17579 "add untracked - 添加未跟踪文件的内容至暂存列表\n"
17580
17581 #: git-add--interactive.perl:1742 git-add--interactive.perl:1747
17582 #: git-add--interactive.perl:1750 git-add--interactive.perl:1757
17583 #: git-add--interactive.perl:1761 git-add--interactive.perl:1767
17584 msgid "missing --"
17585 msgstr "缺失 --"
17586
17587 #: git-add--interactive.perl:1763
17588 #, perl-format
17589 msgid "unknown --patch mode: %s"
17590 msgstr "未知的 --patch 模式:%s"
17591
17592 #: git-add--interactive.perl:1769 git-add--interactive.perl:1775
17593 #, perl-format
17594 msgid "invalid argument %s, expecting --"
17595 msgstr "无效的参数 %s,期望是 --"
17596
17597 #: git-send-email.perl:130
17598 msgid "local zone differs from GMT by a non-minute interval\n"
17599 msgstr "本地时间和 GMT 有不到一分钟间隔\n"
17600
17601 #: git-send-email.perl:137 git-send-email.perl:143
17602 msgid "local time offset greater than or equal to 24 hours\n"
17603 msgstr "本地时间偏移量大于等于 24 小时\n"
17604
17605 #: git-send-email.perl:211 git-send-email.perl:217
17606 msgid "the editor exited uncleanly, aborting everything"
17607 msgstr "编辑器非正常退出,终止所有操作"
17608
17609 #: git-send-email.perl:294
17610 #, perl-format
17611 msgid ""
17612 "'%s' contains an intermediate version of the email you were composing.\n"
17613 msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
17614
17615 #: git-send-email.perl:299
17616 #, perl-format
17617 msgid "'%s.final' contains the composed email.\n"
17618 msgstr "'%s.final' 包含编辑的邮件。\n"
17619
17620 #: git-send-email.perl:317
17621 msgid "--dump-aliases incompatible with other options\n"
17622 msgstr "--dump-aliases 和其它选项不兼容\n"
17623
17624 #: git-send-email.perl:383 git-send-email.perl:638
17625 msgid "Cannot run git format-patch from outside a repository\n"
17626 msgstr "不能在仓库之外运行 git format-patch\n"
17627
17628 #: git-send-email.perl:386
17629 msgid ""
17630 "`batch-size` and `relogin` must be specified together (via command-line or "
17631 "configuration option)\n"
17632 msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
17633
17634 #: git-send-email.perl:456
17635 #, perl-format
17636 msgid "Unknown --suppress-cc field: '%s'\n"
17637 msgstr "未知的 --suppress-cc 字段:'%s'\n"
17638
17639 #: git-send-email.perl:485
17640 #, perl-format
17641 msgid "Unknown --confirm setting: '%s'\n"
17642 msgstr "未知的 --confirm 设置:'%s'\n"
17643
17644 #: git-send-email.perl:513
17645 #, perl-format
17646 msgid "warning: sendmail alias with quotes is not supported: %s\n"
17647 msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
17648
17649 #: git-send-email.perl:515
17650 #, perl-format
17651 msgid "warning: `:include:` not supported: %s\n"
17652 msgstr "警告:不支持 `:include:`:%s\n"
17653
17654 #: git-send-email.perl:517
17655 #, perl-format
17656 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
17657 msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
17658
17659 #: git-send-email.perl:522
17660 #, perl-format
17661 msgid "warning: sendmail line is not recognized: %s\n"
17662 msgstr "警告:不能识别的 sendmail 行:%s\n"
17663
17664 #: git-send-email.perl:604
17665 #, perl-format
17666 msgid ""
17667 "File '%s' exists but it could also be the range of commits\n"
17668 "to produce patches for. Please disambiguate by...\n"
17669 "\n"
17670 " * Saying \"./%s\" if you mean a file; or\n"
17671 " * Giving --format-patch option if you mean a range.\n"
17672 msgstr ""
17673 "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
17674 "歧义:\n"
17675 "\n"
17676 " * 如果含义为一个文件,使用 \"./%s\",或者\n"
17677 " * 如果含义为一个范围,使用 --format-patch 选项。\n"
17678
17679 #: git-send-email.perl:625
17680 #, perl-format
17681 msgid "Failed to opendir %s: %s"
17682 msgstr "无法打开目录 %s: %s"
17683
17684 #: git-send-email.perl:649
17685 #, perl-format
17686 msgid ""
17687 "fatal: %s: %s\n"
17688 "warning: no patches were sent\n"
17689 msgstr ""
17690 "严重:%s:%s\n"
17691 "警告:补丁未能发送\n"
17692
17693 #: git-send-email.perl:660
17694 msgid ""
17695 "\n"
17696 "No patch files specified!\n"
17697 "\n"
17698 msgstr ""
17699 "\n"
17700 "未指定补丁文件!\n"
17701 "\n"
17702
17703 #: git-send-email.perl:673
17704 #, perl-format
17705 msgid "No subject line in %s?"
17706 msgstr "在 %s 中没有标题行?"
17707
17708 #: git-send-email.perl:683
17709 #, perl-format
17710 msgid "Failed to open for writing %s: %s"
17711 msgstr "无法写入 %s: %s"
17712
17713 #: git-send-email.perl:694
17714 msgid ""
17715 "Lines beginning in \"GIT:\" will be removed.\n"
17716 "Consider including an overall diffstat or table of contents\n"
17717 "for the patch you are writing.\n"
17718 "\n"
17719 "Clear the body content if you don't wish to send a summary.\n"
17720 msgstr ""
17721 "以 \"GIT:\" 开头的行将被删除。\n"
17722 "考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
17723 "\n"
17724 "如果您不想发送摘要,清除内容。\n"
17725
17726 #: git-send-email.perl:718
17727 #, perl-format
17728 msgid "Failed to open %s: %s"
17729 msgstr "无法打开 %s: %s"
17730
17731 #: git-send-email.perl:735
17732 #, perl-format
17733 msgid "Failed to open %s.final: %s"
17734 msgstr "无法打开 %s.final: %s"
17735
17736 #: git-send-email.perl:778
17737 msgid "Summary email is empty, skipping it\n"
17738 msgstr "摘要邮件为空,跳过\n"
17739
17740 #. TRANSLATORS: please keep [y/N] as is.
17741 #: git-send-email.perl:813
17742 #, perl-format
17743 msgid "Are you sure you want to use <%s> [y/N]? "
17744 msgstr "您确认要使用 <%s> [y/N]?"
17745
17746 #: git-send-email.perl:868
17747 msgid ""
17748 "The following files are 8bit, but do not declare a Content-Transfer-"
17749 "Encoding.\n"
17750 msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
17751
17752 #: git-send-email.perl:873
17753 msgid "Which 8bit encoding should I declare [UTF-8]? "
17754 msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
17755
17756 #: git-send-email.perl:881
17757 #, perl-format
17758 msgid ""
17759 "Refusing to send because the patch\n"
17760 "\t%s\n"
17761 "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
17762 "want to send.\n"
17763 msgstr ""
17764 "拒绝发送,因为补丁\n"
17765 "\t%s\n"
17766 "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
17767
17768 #: git-send-email.perl:900
17769 msgid "To whom should the emails be sent (if anyone)?"
17770 msgstr "邮件将要发送给谁?"
17771
17772 #: git-send-email.perl:918
17773 #, perl-format
17774 msgid "fatal: alias '%s' expands to itself\n"
17775 msgstr "严重:别名 '%s' 扩展为它自己\n"
17776
17777 #: git-send-email.perl:930
17778 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
17779 msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
17780
17781 #: git-send-email.perl:988 git-send-email.perl:996
17782 #, perl-format
17783 msgid "error: unable to extract a valid address from: %s\n"
17784 msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
17785
17786 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
17787 #. translation. The program will only accept English input
17788 #. at this point.
17789 #: git-send-email.perl:1000
17790 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
17791 msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
17792
17793 #: git-send-email.perl:1317
17794 #, perl-format
17795 msgid "CA path \"%s\" does not exist"
17796 msgstr "CA 路径 \"%s\" 不存在"
17797
17798 #: git-send-email.perl:1400
17799 msgid ""
17800 " The Cc list above has been expanded by additional\n"
17801 " addresses found in the patch commit message. By default\n"
17802 " send-email prompts before sending whenever this occurs.\n"
17803 " This behavior is controlled by the sendemail.confirm\n"
17804 " configuration setting.\n"
17805 "\n"
17806 " For additional information, run 'git send-email --help'.\n"
17807 " To retain the current behavior, but squelch this message,\n"
17808 " run 'git config --global sendemail.confirm auto'.\n"
17809 "\n"
17810 msgstr ""
17811 " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
17812 " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
17813 " sendemail.confirm 配置设置。\n"
17814 "\n"
17815 " 更多信息,执行 'git send-email --help'。\n"
17816 " 要保持当前行为,但不显示此信息,运行 'git config --global\n"
17817 " sendemail.confirm auto'。\n"
17818 "\n"
17819
17820 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
17821 #. translation. The program will only accept English input
17822 #. at this point.
17823 #: git-send-email.perl:1415
17824 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
17825 msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
17826
17827 #: git-send-email.perl:1418
17828 msgid "Send this email reply required"
17829 msgstr "发送要求的邮件回复"
17830
17831 #: git-send-email.perl:1446
17832 msgid "The required SMTP server is not properly defined."
17833 msgstr "要求的 SMTP 服务器未被正确定义。"
17834
17835 #: git-send-email.perl:1493
17836 #, perl-format
17837 msgid "Server does not support STARTTLS! %s"
17838 msgstr "服务器不支持 STARTTLS!%s"
17839
17840 #: git-send-email.perl:1498 git-send-email.perl:1502
17841 #, perl-format
17842 msgid "STARTTLS failed! %s"
17843 msgstr "STARTTLS 失败!%s"
17844
17845 #: git-send-email.perl:1512
17846 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
17847 msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
17848
17849 #: git-send-email.perl:1530
17850 #, perl-format
17851 msgid "Failed to send %s\n"
17852 msgstr "无法发送 %s\n"
17853
17854 #: git-send-email.perl:1533
17855 #, perl-format
17856 msgid "Dry-Sent %s\n"
17857 msgstr "演习发送 %s\n"
17858
17859 #: git-send-email.perl:1533
17860 #, perl-format
17861 msgid "Sent %s\n"
17862 msgstr "正发送 %s\n"
17863
17864 #: git-send-email.perl:1535
17865 msgid "Dry-OK. Log says:\n"
17866 msgstr "演习成功。日志说:\n"
17867
17868 #: git-send-email.perl:1535
17869 msgid "OK. Log says:\n"
17870 msgstr "OK。日志说:\n"
17871
17872 #: git-send-email.perl:1547
17873 msgid "Result: "
17874 msgstr "结果:"
17875
17876 #: git-send-email.perl:1550
17877 msgid "Result: OK\n"
17878 msgstr "结果:OK\n"
17879
17880 #: git-send-email.perl:1568
17881 #, perl-format
17882 msgid "can't open file %s"
17883 msgstr "无法打开文件 %s"
17884
17885 #: git-send-email.perl:1615 git-send-email.perl:1635
17886 #, perl-format
17887 msgid "(mbox) Adding cc: %s from line '%s'\n"
17888 msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
17889
17890 #: git-send-email.perl:1621
17891 #, perl-format
17892 msgid "(mbox) Adding to: %s from line '%s'\n"
17893 msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
17894
17895 #: git-send-email.perl:1674
17896 #, perl-format
17897 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
17898 msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
17899
17900 #: git-send-email.perl:1699
17901 #, perl-format
17902 msgid "(body) Adding cc: %s from line '%s'\n"
17903 msgstr "(body) 添加 cc: %s 自行 '%s'\n"
17904
17905 #: git-send-email.perl:1817
17906 #, perl-format
17907 msgid "(%s) Could not execute '%s'"
17908 msgstr "(%s) 不能执行 '%s'"
17909
17910 #: git-send-email.perl:1824
17911 #, perl-format
17912 msgid "(%s) Adding %s: %s from: '%s'\n"
17913 msgstr "(%s) 添加 %s: %s 自:'%s'\n"
17914
17915 #: git-send-email.perl:1828
17916 #, perl-format
17917 msgid "(%s) failed to close pipe to '%s'"
17918 msgstr "(%s) 无法关闭管道至 '%s'"
17919
17920 #: git-send-email.perl:1855
17921 msgid "cannot send message as 7bit"
17922 msgstr "不能以 7bit 形式发送信息"
17923
17924 #: git-send-email.perl:1863
17925 msgid "invalid transfer encoding"
17926 msgstr "无效的传送编码"
17927
17928 #: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962
17929 #, perl-format
17930 msgid "unable to open %s: %s\n"
17931 msgstr "不能打开 %s:%s\n"
17932
17933 #: git-send-email.perl:1904
17934 #, perl-format
17935 msgid "%s: patch contains a line longer than 998 characters"
17936 msgstr "%s:补丁包含一个超过 998 字符的行"
17937
17938 #: git-send-email.perl:1920
17939 #, perl-format
17940 msgid "Skipping %s with backup suffix '%s'.\n"
17941 msgstr "略过 %s 含备份后缀 '%s'。\n"
17942
17943 #. TRANSLATORS: please keep "[y|N]" as is.
17944 #: git-send-email.perl:1924
17945 #, perl-format
17946 msgid "Do you really want to send %s? [y|N]: "
17947 msgstr "您真的要发送 %s?[y|N]:"
17948
17949 #~ msgid "Everyday Git With 20 Commands Or So"
17950 #~ msgstr "每一天 Git 常用的约 20 条命令"
17951
17952 #~ msgid "Could not open '%s' for writing"
17953 #~ msgstr "无法打开 '%s' 进行写入"
17954
17955 #~ msgid "BUG: returned path string doesn't match cwd?"
17956 #~ msgstr "BUG:返回的路径和当前路径不匹配?"
17957
17958 #~ msgid "Error in object"
17959 #~ msgstr "对象中出错"
17960
17961 #~ msgid ""
17962 #~ "unexpected 1st line of squash message:\n"
17963 #~ "\n"
17964 #~ "\t%.*s"
17965 #~ msgstr ""
17966 #~ "意外的压缩提交首行提交信息:\n"
17967 #~ "\n"
17968 #~ "\t%.*s"
17969
17970 #~ msgid ""
17971 #~ "invalid 1st line of squash message:\n"
17972 #~ "\n"
17973 #~ "\t%.*s"
17974 #~ msgstr ""
17975 #~ "压缩提交的首行提交信息无效:\n"
17976 #~ "\n"
17977 #~ "\t%.*s"
17978
17979 #~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
17980 #~ msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n"
17981
17982 #~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
17983 #~ msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
17984
17985 #~ msgid "The copy of the patch that failed is found in: %s"
17986 #~ msgstr "失败的补丁文件副本位于:%s"
17987
17988 #~ msgid "invalid filter-spec expression '%s'"
17989 #~ msgstr "无效的 filter-spec 表达式 '%s'"
17990
17991 #~ msgid "pathspec and --all are incompatible"
17992 #~ msgstr "pathspec 和 --all 不兼容"
17993
17994 #~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
17995 #~ msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
17996
17997 #~ msgid ""
17998 #~ "empty strings as pathspecs will be made invalid in upcoming releases. "
17999 #~ "please use . instead if you meant to match all paths"
18000 #~ msgstr ""
18001 #~ "在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路"
18002 #~ "径,\n"
18003 #~ "请代之以 ."
18004
18005 #~ msgid "unable to open '%s' for writing"
18006 #~ msgstr "无法以写入方式打开 '%s'"
18007
18008 #~ msgid "could not truncate '%s'"
18009 #~ msgstr "无法截断 '%s'"
18010
18011 #~ msgid "could not finish '%s'"
18012 #~ msgstr "无法结束 '%s'"
18013
18014 #~ msgid "could not close %s"
18015 #~ msgstr "不能关闭 %s"
18016
18017 #~ msgid "Copied a misnamed branch '%s' away"
18018 #~ msgstr "已将错误命名的分支 '%s' 复制"
18019
18020 #~ msgid "it does not make sense to create 'HEAD' manually"
18021 #~ msgstr "手工创建 'HEAD' 没有意义"
18022
18023 #~ msgid "Don't know how to clone %s"
18024 #~ msgstr "不知道如何克隆 %s"
18025
18026 #~ msgid "show ignored files"
18027 #~ msgstr "显示忽略的文件"
18028
18029 #~ msgid "%s is not a valid '%s' object"
18030 #~ msgstr "%s 不是一个有效的 '%s' 对象"
18031
18032 #~ msgid "Don't know how to fetch from %s"
18033 #~ msgstr "不知道如何从 %s 获取"
18034
18035 #~ msgid "'$term' is not a valid term"
18036 #~ msgstr "'$term' 不是一个有效的名称"
18037
18038 #~ msgid ""
18039 #~ "error: unknown option for 'stash save': $option\n"
18040 #~ " To provide a message, use git stash save -- '$option'"
18041 #~ msgstr ""
18042 #~ "错误:'stash save' 的未知选项:$option\n"
18043 #~ " 要提供一个描述信息,使用 git stash save -- '$option'"
18044
18045 #~ msgid "Failed to recurse into submodule path '$sm_path'"
18046 #~ msgstr "无法递归进子模组路径 '$sm_path'"