]> git.ipfire.org Git - thirdparty/git.git/blob - po/zh_CN.po
blame.c: replace instance of !oidcmp for oideq
[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 <me AT fangyi.io>
7 # - Jiang Xin <worldhello.net AT gmail.com>
8 # - Lian Cheng <rhythm.mail AT gmail.com>
9 # - Ray Chen <oldsharp AT gmail.com>
10 # - Riku <lu.riku AT gmail.com>
11 # - Thynson <lanxingcan AT gmail.com>
12 # - ws3389 <willsmith3389 AT gmail.com>
13 # - Wang Sheng <wangsheng2008love AT 163.com>
14 # - 依云 <lilydjwg AT gmail.com>
15 # - Yichao Yu <yyc1992 AT gmail.com>
16 # - Zhuang Ya <zhuangya AT me.com>
17 #
18 # Git glossary for Chinese translators
19 #
20 # English | Chinese
21 # ---------------------------------+--------------------------------------
22 # 3-way merge | 三方合并
23 # abbreviate | 简写(的 SHA-1 值)
24 # alternate object database | 备用对象库
25 # amend | 修补
26 # ancestor | 祖先,祖先提交
27 # annotated tag | 附注标签
28 # bare repository | 纯仓库
29 # bisect | 二分查找
30 # blob object | 数据对象
31 # branch | 分支
32 # bundle | 包
33 # bypass | 绕过
34 # cache | 索引(的别称)
35 # chain | (提交)链
36 # changeset | 变更集
37 # checkout | 检出
38 # checksum | 校验,校验和
39 # cherry-picking | 拣选
40 # clean | 干净(的工作区)
41 # clone | 克隆
42 # commit | 提交
43 # commit message | 提交说明
44 # commit object | 提交对象
45 # commit-ish (also committish) | 提交号
46 # conflict | 冲突
47 # core Git | 核心 Git 工具
48 # cover letter | 附函
49 # DAG | 有向无环图
50 # dangling object | 悬空对象
51 # detached HEAD | 分离头指针
52 # directory | 目录
53 # dirty | 脏(的工作区)
54 # dumb HTTP protocol | 哑 HTTP 协议
55 # evil merge | 坏合并(合并引入了父提交没有的修改)
56 # fast-forward | 快进
57 # fetch | 获取
58 # file system | 文件系统
59 # fork | 派生
60 # Git archive | 仓库(对于 arch 用户)
61 # gitfile | gitfile(仓库链接文件)
62 # grafts | (提交)移植
63 # hash | 哈希值
64 # HEAD | HEAD(头指针,亦即当前分支)
65 # head | 头、分支
66 # head ref | 分支
67 # header | 头信息
68 # hook | 钩子
69 # hunk | 补丁片段
70 # index | 索引
71 # index entry | 索引条目
72 # loose object | 松散对象
73 # loose refs | 松散引用
74 # master | master(默认分支名)
75 # merge | 合并
76 # object | 对象
77 # object database | 对象库
78 # object identifier | 对象标识符
79 # object name | 对象名称
80 # object type | 对象类型
81 # octopus | 章鱼式合并(两分支以上的合并)
82 # origin | origin(默认的远程名称)
83 # pack | 包
84 # pack index | 包索引
85 # packfile | 包文件
86 # parent | 父提交
87 # patch | 补丁
88 # pathspec | 路径规格
89 # pattern | 模式
90 # pickaxe | 挖掘
91 # plumbing | 管件(Git 底层核心命令的别称)
92 # porcelain | 瓷件(Git 上层封装命令的别称)
93 # precious-objects repo | 珍品仓库
94 # prune | 清除
95 # pull | 拉,拉取
96 # push | 推,推送
97 # reachable | 可达
98 # rebase | 变基
99 # ref | 引用
100 # reflog | 引用日志
101 # refspec | 引用规格
102 # remote | 远程,远程仓库
103 # remote-tracking branch | 远程跟踪分支
104 # replay | 重放
105 # repo | 仓库
106 # repository | 仓库
107 # resolve | (冲突)解决
108 # revert | 还原
109 # revision | 版本
110 # rewind | 回退
111 # SCM | 源代码管理(工具)
112 # SHA-1 | SHA-1(安全哈希算法1)
113 # shallow repository | 浅(克隆)仓库
114 # signed tag | 签名标签
115 # smart HTTP protocol | 智能 HTTP 协议
116 # squash | 压缩
117 # stage | n. 暂存区(即索引); v. 暂存
118 # stash | n. 贮藏区; v. 贮藏
119 # submodule | 子模组
120 # symref | 符号引用
121 # tag | n. 标签; v. 打标签
122 # tag object | 标签对象
123 # tagger | 打标签者
124 # topic branch | 主题分支
125 # track | 跟踪
126 # trailer | 尾部署名
127 # tree | 树(工作区或树对象)
128 # tree object | 树对象
129 # tree-ish (also treeish) | 树对象(或可以解析为一树对象)
130 # unmerged index | 未合并索引
131 # unpack | 解包
132 # unreachable object | 不可达对象
133 # unstage | 取消暂存
134 # upstream | 上游
135 # upstream branch | 上游分支
136 # working tree | 工作区
137 #
138 msgid ""
139 msgstr ""
140 "Project-Id-Version: Git\n"
141 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
142 "POT-Creation-Date: 2020-03-11 15:26+0800\n"
143 "PO-Revision-Date: 2020-03-11 15:38+0800\n"
144 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
145 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
146 "Language: zh_CN\n"
147 "MIME-Version: 1.0\n"
148 "Content-Type: text/plain; charset=UTF-8\n"
149 "Content-Transfer-Encoding: 8bit\n"
150 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
151
152 #: add-interactive.c:368
153 #, c-format
154 msgid "Huh (%s)?"
155 msgstr "嗯(%s)?"
156
157 #: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
158 #: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
159 #: builtin/rebase.c:2086 builtin/rebase.c:2130
160 msgid "could not read index"
161 msgstr "不能读取索引"
162
163 #: add-interactive.c:576 git-add--interactive.perl:269
164 #: git-add--interactive.perl:294
165 msgid "binary"
166 msgstr "二进制"
167
168 #: add-interactive.c:634 git-add--interactive.perl:278
169 #: git-add--interactive.perl:332
170 msgid "nothing"
171 msgstr "无"
172
173 #: add-interactive.c:635 git-add--interactive.perl:314
174 #: git-add--interactive.perl:329
175 msgid "unchanged"
176 msgstr "没有修改"
177
178 #: add-interactive.c:672 git-add--interactive.perl:643
179 msgid "Update"
180 msgstr "更新"
181
182 #: add-interactive.c:689 add-interactive.c:877
183 #, c-format
184 msgid "could not stage '%s'"
185 msgstr "不能暂存 '%s'"
186
187 #: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
188 #: builtin/rebase.c:899
189 msgid "could not write index"
190 msgstr "不能写入索引"
191
192 #: add-interactive.c:698 git-add--interactive.perl:628
193 #, c-format, perl-format
194 msgid "updated %d path\n"
195 msgid_plural "updated %d paths\n"
196 msgstr[0] "更新了 %d 个路径\n"
197 msgstr[1] "更新了 %d 个路径\n"
198
199 #: add-interactive.c:716 git-add--interactive.perl:678
200 #, c-format, perl-format
201 msgid "note: %s is untracked now.\n"
202 msgstr "说明:%s 现已成为未跟踪的。\n"
203
204 #: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
205 #: builtin/reset.c:144
206 #, c-format
207 msgid "make_cache_entry failed for path '%s'"
208 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
209
210 #: add-interactive.c:751 git-add--interactive.perl:655
211 msgid "Revert"
212 msgstr "还原"
213
214 #: add-interactive.c:767
215 msgid "Could not parse HEAD^{tree}"
216 msgstr "不能解析 HEAD^{tree}"
217
218 #: add-interactive.c:805 git-add--interactive.perl:631
219 #, c-format, perl-format
220 msgid "reverted %d path\n"
221 msgid_plural "reverted %d paths\n"
222 msgstr[0] "还原了 %d 个路径\n"
223 msgstr[1] "还原了 %d 个路径\n"
224
225 #: add-interactive.c:856 git-add--interactive.perl:695
226 #, c-format
227 msgid "No untracked files.\n"
228 msgstr "没有未跟踪的文件。\n"
229
230 #: add-interactive.c:860 git-add--interactive.perl:689
231 msgid "Add untracked"
232 msgstr "添加未跟踪的"
233
234 #: add-interactive.c:887 git-add--interactive.perl:625
235 #, c-format, perl-format
236 msgid "added %d path\n"
237 msgid_plural "added %d paths\n"
238 msgstr[0] "增加了 %d 个路径\n"
239 msgstr[1] "增加了 %d 个路径\n"
240
241 #: add-interactive.c:917
242 #, c-format
243 msgid "ignoring unmerged: %s"
244 msgstr "忽略未合入的:%s"
245
246 #: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
247 #, c-format
248 msgid "Only binary files changed.\n"
249 msgstr "只有二进制文件被修改。\n"
250
251 #: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
252 #, c-format
253 msgid "No changes.\n"
254 msgstr "没有修改。\n"
255
256 #: add-interactive.c:935 git-add--interactive.perl:1376
257 msgid "Patch update"
258 msgstr "补丁更新"
259
260 #: add-interactive.c:974 git-add--interactive.perl:1754
261 msgid "Review diff"
262 msgstr "检视 diff"
263
264 #: add-interactive.c:1002
265 msgid "show paths with changes"
266 msgstr "显示含变更的路径"
267
268 #: add-interactive.c:1004
269 msgid "add working tree state to the staged set of changes"
270 msgstr "将工作区状态添加到暂存区修改集中"
271
272 #: add-interactive.c:1006
273 msgid "revert staged set of changes back to the HEAD version"
274 msgstr "将暂存的修改集恢复为 HEAD 版本"
275
276 #: add-interactive.c:1008
277 msgid "pick hunks and update selectively"
278 msgstr "挑选数据块并有选择地更新"
279
280 #: add-interactive.c:1010
281 msgid "view diff between HEAD and index"
282 msgstr "显示 HEAD 和索引的差异"
283
284 #: add-interactive.c:1012
285 msgid "add contents of untracked files to the staged set of changes"
286 msgstr "将未跟踪文件的内容添加到暂存区修改集中"
287
288 #: add-interactive.c:1020 add-interactive.c:1069
289 msgid "Prompt help:"
290 msgstr "帮助:"
291
292 #: add-interactive.c:1022
293 msgid "select a single item"
294 msgstr "选择一个条目"
295
296 #: add-interactive.c:1024
297 msgid "select a range of items"
298 msgstr "选择一系列条目"
299
300 #: add-interactive.c:1026
301 msgid "select multiple ranges"
302 msgstr "选择多个范围"
303
304 #: add-interactive.c:1028 add-interactive.c:1073
305 msgid "select item based on unique prefix"
306 msgstr "基于唯一前缀选择条目"
307
308 #: add-interactive.c:1030
309 msgid "unselect specified items"
310 msgstr "反选指定的条目"
311
312 #: add-interactive.c:1032
313 msgid "choose all items"
314 msgstr "选择所有条目"
315
316 #: add-interactive.c:1034
317 msgid "(empty) finish selecting"
318 msgstr "(空)结束选择"
319
320 #: add-interactive.c:1071
321 msgid "select a numbered item"
322 msgstr "选择一个编号条目"
323
324 #: add-interactive.c:1075
325 msgid "(empty) select nothing"
326 msgstr "(空)不选择任何内容"
327
328 #: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
329 msgid "*** Commands ***"
330 msgstr "*** 命令 ***"
331
332 #: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
333 msgid "What now"
334 msgstr "请选择"
335
336 #: add-interactive.c:1136 git-add--interactive.perl:213
337 msgid "staged"
338 msgstr "缓存"
339
340 #: add-interactive.c:1136 git-add--interactive.perl:213
341 msgid "unstaged"
342 msgstr "未缓存"
343
344 #: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
345 #: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
346 #: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
347 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
348 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
349 #: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
350 msgid "path"
351 msgstr "路径"
352
353 #: add-interactive.c:1143
354 msgid "could not refresh index"
355 msgstr "不能刷新索引"
356
357 #: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
358 #, c-format
359 msgid "Bye.\n"
360 msgstr "再见。\n"
361
362 #: add-patch.c:33 git-add--interactive.perl:1428
363 #, c-format, perl-format
364 msgid "Stage mode change [y,n,q,a,d%s,?]? "
365 msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
366
367 #: add-patch.c:34 git-add--interactive.perl:1429
368 #, c-format, perl-format
369 msgid "Stage deletion [y,n,q,a,d%s,?]? "
370 msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
371
372 #: add-patch.c:35 git-add--interactive.perl:1430
373 #, c-format, perl-format
374 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
375 msgstr "暂存该块 [y,n,q,a,d%s,?]? "
376
377 #: add-patch.c:37
378 msgid ""
379 "If the patch applies cleanly, the edited hunk will immediately be marked for "
380 "staging."
381 msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。"
382
383 #: add-patch.c:40
384 msgid ""
385 "y - stage this hunk\n"
386 "n - do not stage this hunk\n"
387 "q - quit; do not stage this hunk or any of the remaining ones\n"
388 "a - stage this hunk and all later hunks in the file\n"
389 "d - do not stage this hunk or any of the later hunks in the file\n"
390 msgstr ""
391 "y - 暂存该块\n"
392 "n - 不要暂存该块\n"
393 "q - 退出。不暂存该块及后面的全部块\n"
394 "a - 暂存该块和本文件中后面的全部块\n"
395 "d - 不暂存该块和本文件中后面的全部块\n"
396
397 #: add-patch.c:54 git-add--interactive.perl:1433
398 #, c-format, perl-format
399 msgid "Stash mode change [y,n,q,a,d%s,?]? "
400 msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
401
402 #: add-patch.c:55 git-add--interactive.perl:1434
403 #, c-format, perl-format
404 msgid "Stash deletion [y,n,q,a,d%s,?]? "
405 msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
406
407 #: add-patch.c:56 git-add--interactive.perl:1435
408 #, c-format, perl-format
409 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
410 msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
411
412 #: add-patch.c:58
413 msgid ""
414 "If the patch applies cleanly, the edited hunk will immediately be marked for "
415 "stashing."
416 msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。"
417
418 #: add-patch.c:61
419 msgid ""
420 "y - stash this hunk\n"
421 "n - do not stash this hunk\n"
422 "q - quit; do not stash this hunk or any of the remaining ones\n"
423 "a - stash this hunk and all later hunks in the file\n"
424 "d - do not stash this hunk or any of the later hunks in the file\n"
425 msgstr ""
426 "y - 贮藏该块\n"
427 "n - 不要贮藏该块\n"
428 "q - 退出。不贮藏该块及后面的全部块\n"
429 "a - 贮藏该块和本文件中后面的全部块\n"
430 "d - 不贮藏该块和本文件中后面的全部块\n"
431
432 #: add-patch.c:77 git-add--interactive.perl:1438
433 #, c-format, perl-format
434 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
435 msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
436
437 #: add-patch.c:78 git-add--interactive.perl:1439
438 #, c-format, perl-format
439 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
440 msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
441
442 #: add-patch.c:79 git-add--interactive.perl:1440
443 #, c-format, perl-format
444 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
445 msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
446
447 #: add-patch.c:81
448 msgid ""
449 "If the patch applies cleanly, the edited hunk will immediately be marked for "
450 "unstaging."
451 msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。"
452
453 #: add-patch.c:84
454 msgid ""
455 "y - unstage this hunk\n"
456 "n - do not unstage this hunk\n"
457 "q - quit; do not unstage this hunk or any of the remaining ones\n"
458 "a - unstage this hunk and all later hunks in the file\n"
459 "d - do not unstage this hunk or any of the later hunks in the file\n"
460 msgstr ""
461 "y - 取消暂存该块\n"
462 "n - 不要取消暂存该块\n"
463 "q - 退出。不要取消暂存该块及后面的全部块\n"
464 "a - 取消暂存该块和本文件中后面的全部块\n"
465 "d - 不要取消暂存该块和本文件中后面的全部块\n"
466
467 #: add-patch.c:99 git-add--interactive.perl:1443
468 #, c-format, perl-format
469 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
470 msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
471
472 #: add-patch.c:100 git-add--interactive.perl:1444
473 #, c-format, perl-format
474 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
475 msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
476
477 #: add-patch.c:101 git-add--interactive.perl:1445
478 #, c-format, perl-format
479 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
480 msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
481
482 #: add-patch.c:103 add-patch.c:168 add-patch.c:211
483 msgid ""
484 "If the patch applies cleanly, the edited hunk will immediately be marked for "
485 "applying."
486 msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。"
487
488 #: add-patch.c:106
489 msgid ""
490 "y - apply this hunk to index\n"
491 "n - do not apply this hunk to index\n"
492 "q - quit; do not apply this hunk or any of the remaining ones\n"
493 "a - apply this hunk and all later hunks in the file\n"
494 "d - do not apply this hunk or any of the later hunks in the file\n"
495 msgstr ""
496 "y - 在索引中应用该块\n"
497 "n - 不要在索引中应用该块\n"
498 "q - 退出。不要应用该块及后面的全部块\n"
499 "a - 应用该块和本文件中后面的全部块\n"
500 "d - 不要应用该块和本文件中后面的全部块\n"
501
502 #: add-patch.c:121 git-add--interactive.perl:1448
503 #: git-add--interactive.perl:1463
504 #, c-format, perl-format
505 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
506 msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
507
508 #: add-patch.c:122 git-add--interactive.perl:1449
509 #: git-add--interactive.perl:1464
510 #, c-format, perl-format
511 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
512 msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
513
514 #: add-patch.c:123 git-add--interactive.perl:1450
515 #: git-add--interactive.perl:1465
516 #, c-format, perl-format
517 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
518 msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
519
520 #: add-patch.c:125 add-patch.c:147 add-patch.c:190
521 msgid ""
522 "If the patch applies cleanly, the edited hunk will immediately be marked for "
523 "discarding."
524 msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。"
525
526 #: add-patch.c:128 add-patch.c:193
527 msgid ""
528 "y - discard this hunk from worktree\n"
529 "n - do not discard this hunk from worktree\n"
530 "q - quit; do not discard this hunk or any of the remaining ones\n"
531 "a - discard this hunk and all later hunks in the file\n"
532 "d - do not discard this hunk or any of the later hunks in the file\n"
533 msgstr ""
534 "y - 在工作区中丢弃该块\n"
535 "n - 不要在工作区中丢弃该块\n"
536 "q - 退出。不要丢弃该块及后面的全部块\n"
537 "a - 丢弃该块和本文件中后面的全部块\n"
538 "d - 不要丢弃该块和本文件中后面的全部块\n"
539
540 #: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
541 #, c-format, perl-format
542 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
543 msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
544
545 #: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
546 #, c-format, perl-format
547 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
548 msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
549
550 #: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
551 #, c-format, perl-format
552 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
553 msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
554
555 #: add-patch.c:150
556 msgid ""
557 "y - discard this hunk from index and worktree\n"
558 "n - do not discard this hunk from index and worktree\n"
559 "q - quit; do not discard this hunk or any of the remaining ones\n"
560 "a - discard this hunk and all later hunks in the file\n"
561 "d - do not discard this hunk or any of the later hunks in the file\n"
562 msgstr ""
563 "y - 在索引和工作区中丢弃该块\n"
564 "n - 不要在索引和工作区中丢弃该块\n"
565 "q - 退出。不要丢弃该块及后面的全部块\n"
566 "a - 丢弃该块和本文件中后面的全部块\n"
567 "d - 不要丢弃该块和本文件中后面的全部块\n"
568
569 #: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
570 #, c-format, perl-format
571 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
572 msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
573
574 #: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
575 #, c-format, perl-format
576 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
577 msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
578
579 #: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
580 #, c-format, perl-format
581 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
582 msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
583
584 #: add-patch.c:171
585 msgid ""
586 "y - apply this hunk to index and worktree\n"
587 "n - do not apply this hunk to index and worktree\n"
588 "q - quit; do not apply this hunk or any of the remaining ones\n"
589 "a - apply this hunk and all later hunks in the file\n"
590 "d - do not apply this hunk or any of the later hunks in the file\n"
591 msgstr ""
592 "y - 在索引和工作区中应用该块\n"
593 "n - 不要在索引和工作区中应用该块\n"
594 "q - 退出。不要应用该块及后面的全部块\n"
595 "a - 应用该块和本文件中后面的全部块\n"
596 "d - 不要应用该块和本文件中后面的全部块\n"
597
598 #: add-patch.c:214
599 msgid ""
600 "y - apply this hunk to worktree\n"
601 "n - do not apply this hunk to worktree\n"
602 "q - quit; do not apply this hunk or any of the remaining ones\n"
603 "a - apply this hunk and all later hunks in the file\n"
604 "d - do not apply this hunk or any of the later hunks in the file\n"
605 msgstr ""
606 "y - 在工作区中应用该块\n"
607 "n - 不要在工作区中应用该块\n"
608 "q - 退出。不要应用该块及后面的全部块\n"
609 "a - 应用该块和本文件中后面的全部块\n"
610 "d - 不要应用该块和本文件中后面的全部块\n"
611
612 #: add-patch.c:318
613 #, c-format
614 msgid "could not parse hunk header '%.*s'"
615 msgstr "无法解析数据块头信息 '%.*s'"
616
617 #: add-patch.c:337 add-patch.c:341
618 #, c-format
619 msgid "could not parse colored hunk header '%.*s'"
620 msgstr "无法解析彩色数据块头信息 '%.*s'"
621
622 #: add-patch.c:395
623 msgid "could not parse diff"
624 msgstr "不能解析差异信息"
625
626 #: add-patch.c:414
627 msgid "could not parse colored diff"
628 msgstr "不能解析彩色差异信息"
629
630 #: add-patch.c:428
631 #, c-format
632 msgid "failed to run '%s'"
633 msgstr "运行 '%s' 失败"
634
635 #: add-patch.c:587
636 msgid "mismatched output from interactive.diffFilter"
637 msgstr "interactive.diffFilter 的输出不匹配"
638
639 #: add-patch.c:588
640 msgid ""
641 "Your filter must maintain a one-to-one correspondence\n"
642 "between its input and output lines."
643 msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
644
645 #: add-patch.c:761
646 #, c-format
647 msgid ""
648 "expected context line #%d in\n"
649 "%.*s"
650 msgstr ""
651 "预期上下文行 #%d 于\n"
652 "%.*s"
653
654 #: add-patch.c:776
655 #, c-format
656 msgid ""
657 "hunks do not overlap:\n"
658 "%.*s\n"
659 "\tdoes not end with:\n"
660 "%.*s"
661 msgstr ""
662 "块不重叠:\n"
663 "%.*s\n"
664 "\t不是结尾于:\n"
665 "%.*s"
666
667 #: add-patch.c:1052 git-add--interactive.perl:1112
668 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
669 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
670
671 #: add-patch.c:1056
672 #, c-format
673 msgid ""
674 "---\n"
675 "To remove '%c' lines, make them ' ' lines (context).\n"
676 "To remove '%c' lines, delete them.\n"
677 "Lines starting with %c will be removed.\n"
678 msgstr ""
679 "---\n"
680 "要删除 '%c' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
681 "要删除 '%c' 开始的行,删除它们。\n"
682 "以 %c 开始的行将被删除。\n"
683
684 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
685 #: add-patch.c:1070 git-add--interactive.perl:1126
686 msgid ""
687 "If it does not apply cleanly, you will be given an opportunity to\n"
688 "edit again. If all lines of the hunk are removed, then the edit is\n"
689 "aborted and the hunk is left unchanged.\n"
690 msgstr ""
691 "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
692 "此次编辑被终止,该块不会被修改。\n"
693
694 #: add-patch.c:1103
695 msgid "could not parse hunk header"
696 msgstr "无法解析数据块头信息"
697
698 #: add-patch.c:1148
699 msgid "'git apply --cached' failed"
700 msgstr "'git apply --cached' 失败"
701
702 #. TRANSLATORS: do not translate [y/n]
703 #. The program will only accept that input at this point.
704 #. Consider translating (saying "no" discards!) as
705 #. (saying "n" for "no" discards!) if the translation
706 #. of the word "no" does not start with n.
707 #.
708 #. TRANSLATORS: do not translate [y/n]
709 #. The program will only accept that input
710 #. at this point.
711 #. Consider translating (saying "no" discards!) as
712 #. (saying "n" for "no" discards!) if the translation
713 #. of the word "no" does not start with n.
714 #: add-patch.c:1218 git-add--interactive.perl:1239
715 msgid ""
716 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
717 msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
718
719 #: add-patch.c:1261
720 msgid "The selected hunks do not apply to the index!"
721 msgstr "选中的块不能应用到索引!"
722
723 #: add-patch.c:1262 git-add--interactive.perl:1343
724 msgid "Apply them to the worktree anyway? "
725 msgstr "无论如何都要应用到工作区么?"
726
727 #: add-patch.c:1269 git-add--interactive.perl:1346
728 msgid "Nothing was applied.\n"
729 msgstr "未应用。\n"
730
731 #: add-patch.c:1326
732 msgid ""
733 "j - leave this hunk undecided, see next undecided hunk\n"
734 "J - leave this hunk undecided, see next hunk\n"
735 "k - leave this hunk undecided, see previous undecided hunk\n"
736 "K - leave this hunk undecided, see previous hunk\n"
737 "g - select a hunk to go to\n"
738 "/ - search for a hunk matching the given regex\n"
739 "s - split the current hunk into smaller hunks\n"
740 "e - manually edit the current hunk\n"
741 "? - print help\n"
742 msgstr ""
743 "j - 维持该块未决状态,查看下一个未决块\n"
744 "J - 维持该块未决状态,查看下一个块\n"
745 "k - 维持该块未决状态,查看上一个未决块\n"
746 "K - 维持该块未决状态,查看上一个块\n"
747 "g - 选择跳转到一个块\n"
748 "/ - 查找和给定正则表达式匹配的块\n"
749 "s - 拆分当前块为更小的块\n"
750 "e - 手动编辑当前块\n"
751 "? - 显示帮助\n"
752
753 #: add-patch.c:1447 add-patch.c:1457
754 msgid "No previous hunk"
755 msgstr "没有前一个块"
756
757 #: add-patch.c:1452 add-patch.c:1462
758 msgid "No next hunk"
759 msgstr "没有下一个块"
760
761 #: add-patch.c:1468
762 msgid "No other hunks to goto"
763 msgstr "没有其它可供跳转的块"
764
765 #: add-patch.c:1479 git-add--interactive.perl:1577
766 msgid "go to which hunk (<ret> to see more)? "
767 msgstr "跳转到哪个块(<回车> 查看更多)? "
768
769 #: add-patch.c:1480 git-add--interactive.perl:1579
770 msgid "go to which hunk? "
771 msgstr "跳转到哪个块?"
772
773 #: add-patch.c:1491
774 #, c-format
775 msgid "Invalid number: '%s'"
776 msgstr "无效数字:'%s'"
777
778 #: add-patch.c:1496
779 #, c-format
780 msgid "Sorry, only %d hunk available."
781 msgid_plural "Sorry, only %d hunks available."
782 msgstr[0] "对不起,只有 %d 个可用块。"
783 msgstr[1] "对不起,只有 %d 个可用块。"
784
785 #: add-patch.c:1505
786 msgid "No other hunks to search"
787 msgstr "没有其它可供查找的块"
788
789 #: add-patch.c:1511 git-add--interactive.perl:1623
790 msgid "search for regex? "
791 msgstr "使用正则表达式搜索?"
792
793 #: add-patch.c:1526
794 #, c-format
795 msgid "Malformed search regexp %s: %s"
796 msgstr "错误的正则表达式 %s:%s"
797
798 #: add-patch.c:1543
799 msgid "No hunk matches the given pattern"
800 msgstr "没有和给定模式相匹配的块"
801
802 #: add-patch.c:1550
803 msgid "Sorry, cannot split this hunk"
804 msgstr "对不起,不能拆分这个块"
805
806 #: add-patch.c:1554
807 #, c-format
808 msgid "Split into %d hunks."
809 msgstr "拆分为 %d 块。"
810
811 #: add-patch.c:1558
812 msgid "Sorry, cannot edit this hunk"
813 msgstr "对不起,不能编辑这个块"
814
815 #: add-patch.c:1609
816 msgid "'git apply' failed"
817 msgstr "'git apply' 失败"
818
819 #: advice.c:115
820 #, c-format
821 msgid "%shint: %.*s%s\n"
822 msgstr "%s提示:%.*s%s\n"
823
824 #: advice.c:168
825 msgid "Cherry-picking is not possible because you have unmerged files."
826 msgstr "无法拣选,因为您有未合并的文件。"
827
828 #: advice.c:170
829 msgid "Committing is not possible because you have unmerged files."
830 msgstr "无法提交,因为您有未合并的文件。"
831
832 #: advice.c:172
833 msgid "Merging is not possible because you have unmerged files."
834 msgstr "无法合并,因为您有未合并的文件。"
835
836 #: advice.c:174
837 msgid "Pulling is not possible because you have unmerged files."
838 msgstr "无法拉取,因为您有未合并的文件。"
839
840 #: advice.c:176
841 msgid "Reverting is not possible because you have unmerged files."
842 msgstr "无法回退,因为您有未合并的文件。"
843
844 #: advice.c:178
845 #, c-format
846 msgid "It is not possible to %s because you have unmerged files."
847 msgstr "无法 %s,因为您有未合并的文件。"
848
849 #: advice.c:186
850 msgid ""
851 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
852 "as appropriate to mark resolution and make a commit."
853 msgstr ""
854 "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
855 "解决方案并提交。"
856
857 #: advice.c:194
858 msgid "Exiting because of an unresolved conflict."
859 msgstr "因为存在未解决的冲突而退出。"
860
861 #: advice.c:199 builtin/merge.c:1335
862 msgid "You have not concluded your merge (MERGE_HEAD exists)."
863 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
864
865 #: advice.c:201
866 msgid "Please, commit your changes before merging."
867 msgstr "请在合并前先提交您的修改。"
868
869 #: advice.c:202
870 msgid "Exiting because of unfinished merge."
871 msgstr "因为存在未完成的合并而退出。"
872
873 #: advice.c:208
874 #, c-format
875 msgid ""
876 "Note: switching to '%s'.\n"
877 "\n"
878 "You are in 'detached HEAD' state. You can look around, make experimental\n"
879 "changes and commit them, and you can discard any commits you make in this\n"
880 "state without impacting any branches by switching back to a branch.\n"
881 "\n"
882 "If you want to create a new branch to retain commits you create, you may\n"
883 "do so (now or later) by using -c with the switch command. Example:\n"
884 "\n"
885 " git switch -c <new-branch-name>\n"
886 "\n"
887 "Or undo this operation with:\n"
888 "\n"
889 " git switch -\n"
890 "\n"
891 "Turn off this advice by setting config variable advice.detachedHead to "
892 "false\n"
893 "\n"
894 msgstr ""
895 "注意:正在切换到 '%s'。\n"
896 "\n"
897 "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n"
898 "回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n"
899 "\n"
900 "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n"
901 "中添加参数 -c 来实现(现在或稍后)。例如:\n"
902 "\n"
903 " git switch -c <新分支名>\n"
904 "\n"
905 "或者撤销此操作:\n"
906 "\n"
907 " git switch -\n"
908 "\n"
909 "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
910 "\n"
911
912 #: alias.c:50
913 msgid "cmdline ends with \\"
914 msgstr "命令行以 \\ 结尾"
915
916 #: alias.c:51
917 msgid "unclosed quote"
918 msgstr "未关闭的引号"
919
920 #: apply.c:69
921 #, c-format
922 msgid "unrecognized whitespace option '%s'"
923 msgstr "未能识别的空白字符选项 '%s'"
924
925 #: apply.c:85
926 #, c-format
927 msgid "unrecognized whitespace ignore option '%s'"
928 msgstr "未能识别的空白字符忽略选项 '%s'"
929
930 #: apply.c:135
931 msgid "--reject and --3way cannot be used together."
932 msgstr "--reject 和 --3way 不能同时使用。"
933
934 #: apply.c:137
935 msgid "--cached and --3way cannot be used together."
936 msgstr "--cached 和 --3way 不能同时使用。"
937
938 #: apply.c:140
939 msgid "--3way outside a repository"
940 msgstr "--3way 在一个仓库之外"
941
942 #: apply.c:151
943 msgid "--index outside a repository"
944 msgstr "--index 在一个仓库之外"
945
946 #: apply.c:154
947 msgid "--cached outside a repository"
948 msgstr "--cached 在一个仓库之外"
949
950 #: apply.c:801
951 #, c-format
952 msgid "Cannot prepare timestamp regexp %s"
953 msgstr "无法准备时间戳正则表达式 %s"
954
955 #: apply.c:810
956 #, c-format
957 msgid "regexec returned %d for input: %s"
958 msgstr "regexec 返回 %d,输入为:%s"
959
960 #: apply.c:884
961 #, c-format
962 msgid "unable to find filename in patch at line %d"
963 msgstr "不能在补丁的第 %d 行找到文件名"
964
965 #: apply.c:922
966 #, c-format
967 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
968 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
969
970 #: apply.c:928
971 #, c-format
972 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
973 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
974
975 #: apply.c:929
976 #, c-format
977 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
978 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
979
980 #: apply.c:934
981 #, c-format
982 msgid "git apply: bad git-diff - expected /dev/null on line %d"
983 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
984
985 #: apply.c:963
986 #, c-format
987 msgid "invalid mode on line %d: %s"
988 msgstr "第 %d 行包含无效文件模式:%s"
989
990 #: apply.c:1282
991 #, c-format
992 msgid "inconsistent header lines %d and %d"
993 msgstr "不一致的文件头,%d 行和 %d 行"
994
995 #: apply.c:1372
996 #, c-format
997 msgid ""
998 "git diff header lacks filename information when removing %d leading pathname "
999 "component (line %d)"
1000 msgid_plural ""
1001 "git diff header lacks filename information when removing %d leading pathname "
1002 "components (line %d)"
1003 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1004 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1005
1006 #: apply.c:1385
1007 #, c-format
1008 msgid "git diff header lacks filename information (line %d)"
1009 msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
1010
1011 #: apply.c:1481
1012 #, c-format
1013 msgid "recount: unexpected line: %.*s"
1014 msgstr "recount:意外的行:%.*s"
1015
1016 #: apply.c:1550
1017 #, c-format
1018 msgid "patch fragment without header at line %d: %.*s"
1019 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1020
1021 #: apply.c:1753
1022 msgid "new file depends on old contents"
1023 msgstr "新文件依赖旧内容"
1024
1025 #: apply.c:1755
1026 msgid "deleted file still has contents"
1027 msgstr "删除的文件仍有内容"
1028
1029 #: apply.c:1789
1030 #, c-format
1031 msgid "corrupt patch at line %d"
1032 msgstr "补丁在第 %d 行损坏"
1033
1034 #: apply.c:1826
1035 #, c-format
1036 msgid "new file %s depends on old contents"
1037 msgstr "新文件 %s 依赖旧内容"
1038
1039 #: apply.c:1828
1040 #, c-format
1041 msgid "deleted file %s still has contents"
1042 msgstr "删除的文件 %s 仍有内容"
1043
1044 #: apply.c:1831
1045 #, c-format
1046 msgid "** warning: file %s becomes empty but is not deleted"
1047 msgstr "** 警告:文件 %s 成为空文件但并未删除"
1048
1049 #: apply.c:1978
1050 #, c-format
1051 msgid "corrupt binary patch at line %d: %.*s"
1052 msgstr "二进制补丁在第 %d 行损坏:%.*s"
1053
1054 #: apply.c:2015
1055 #, c-format
1056 msgid "unrecognized binary patch at line %d"
1057 msgstr "未能识别的二进制补丁位于第 %d 行"
1058
1059 #: apply.c:2177
1060 #, c-format
1061 msgid "patch with only garbage at line %d"
1062 msgstr "补丁文件的第 %d 行只有垃圾数据"
1063
1064 #: apply.c:2263
1065 #, c-format
1066 msgid "unable to read symlink %s"
1067 msgstr "无法读取符号链接 %s"
1068
1069 #: apply.c:2267
1070 #, c-format
1071 msgid "unable to open or read %s"
1072 msgstr "不能打开或读取 %s"
1073
1074 #: apply.c:2936
1075 #, c-format
1076 msgid "invalid start of line: '%c'"
1077 msgstr "无效的行首字符:'%c'"
1078
1079 #: apply.c:3057
1080 #, c-format
1081 msgid "Hunk #%d succeeded at %d (offset %d line)."
1082 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1083 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1084 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
1085
1086 #: apply.c:3069
1087 #, c-format
1088 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1089 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1090
1091 #: apply.c:3075
1092 #, c-format
1093 msgid ""
1094 "while searching for:\n"
1095 "%.*s"
1096 msgstr ""
1097 "当查询:\n"
1098 "%.*s"
1099
1100 #: apply.c:3097
1101 #, c-format
1102 msgid "missing binary patch data for '%s'"
1103 msgstr "缺失 '%s' 的二进制补丁数据"
1104
1105 #: apply.c:3105
1106 #, c-format
1107 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
1108 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
1109
1110 #: apply.c:3152
1111 #, c-format
1112 msgid "cannot apply binary patch to '%s' without full index line"
1113 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
1114
1115 #: apply.c:3163
1116 #, c-format
1117 msgid ""
1118 "the patch applies to '%s' (%s), which does not match the current contents."
1119 msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
1120
1121 #: apply.c:3171
1122 #, c-format
1123 msgid "the patch applies to an empty '%s' but it is not empty"
1124 msgstr "补丁应用到空文件 '%s',但其并非空文件"
1125
1126 #: apply.c:3189
1127 #, c-format
1128 msgid "the necessary postimage %s for '%s' cannot be read"
1129 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
1130
1131 #: apply.c:3202
1132 #, c-format
1133 msgid "binary patch does not apply to '%s'"
1134 msgstr "二进制补丁未应用到 '%s'"
1135
1136 #: apply.c:3209
1137 #, c-format
1138 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1139 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
1140
1141 #: apply.c:3230
1142 #, c-format
1143 msgid "patch failed: %s:%ld"
1144 msgstr "打补丁失败:%s:%ld"
1145
1146 #: apply.c:3353
1147 #, c-format
1148 msgid "cannot checkout %s"
1149 msgstr "不能检出 %s"
1150
1151 #: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
1152 #, c-format
1153 msgid "failed to read %s"
1154 msgstr "无法读取 %s"
1155
1156 #: apply.c:3413
1157 #, c-format
1158 msgid "reading from '%s' beyond a symbolic link"
1159 msgstr "读取位于符号链接中的 '%s'"
1160
1161 #: apply.c:3442 apply.c:3685
1162 #, c-format
1163 msgid "path %s has been renamed/deleted"
1164 msgstr "路径 %s 已经被重命名/删除"
1165
1166 #: apply.c:3528 apply.c:3700
1167 #, c-format
1168 msgid "%s: does not exist in index"
1169 msgstr "%s:不存在于索引中"
1170
1171 #: apply.c:3537 apply.c:3708
1172 #, c-format
1173 msgid "%s: does not match index"
1174 msgstr "%s:和索引不匹配"
1175
1176 #: apply.c:3572
1177 msgid "repository lacks the necessary blob to fall back on 3-way merge."
1178 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
1179
1180 #: apply.c:3575
1181 #, c-format
1182 msgid "Falling back to three-way merge...\n"
1183 msgstr "回落到三方合并...\n"
1184
1185 #: apply.c:3591 apply.c:3595
1186 #, c-format
1187 msgid "cannot read the current contents of '%s'"
1188 msgstr "无法读取 '%s' 的当前内容"
1189
1190 #: apply.c:3607
1191 #, c-format
1192 msgid "Failed to fall back on three-way merge...\n"
1193 msgstr "无法回落到三方合并...\n"
1194
1195 #: apply.c:3621
1196 #, c-format
1197 msgid "Applied patch to '%s' with conflicts.\n"
1198 msgstr "应用补丁到 '%s' 存在冲突。\n"
1199
1200 #: apply.c:3626
1201 #, c-format
1202 msgid "Applied patch to '%s' cleanly.\n"
1203 msgstr "成功应用补丁到 '%s'。\n"
1204
1205 #: apply.c:3652
1206 msgid "removal patch leaves file contents"
1207 msgstr "移除补丁仍留下了文件内容"
1208
1209 #: apply.c:3725
1210 #, c-format
1211 msgid "%s: wrong type"
1212 msgstr "%s:错误类型"
1213
1214 #: apply.c:3727
1215 #, c-format
1216 msgid "%s has type %o, expected %o"
1217 msgstr "%s 的类型是 %o,应为 %o"
1218
1219 #: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
1220 #: read-cache.c:1325
1221 #, c-format
1222 msgid "invalid path '%s'"
1223 msgstr "无效路径 '%s'"
1224
1225 #: apply.c:3936
1226 #, c-format
1227 msgid "%s: already exists in index"
1228 msgstr "%s:已经存在于索引中"
1229
1230 #: apply.c:3939
1231 #, c-format
1232 msgid "%s: already exists in working directory"
1233 msgstr "%s:已经存在于工作区中"
1234
1235 #: apply.c:3959
1236 #, c-format
1237 msgid "new mode (%o) of %s does not match old mode (%o)"
1238 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1239
1240 #: apply.c:3964
1241 #, c-format
1242 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1243 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1244
1245 #: apply.c:3984
1246 #, c-format
1247 msgid "affected file '%s' is beyond a symbolic link"
1248 msgstr "受影响的文件 '%s' 位于符号链接中"
1249
1250 #: apply.c:3988
1251 #, c-format
1252 msgid "%s: patch does not apply"
1253 msgstr "%s:补丁未应用"
1254
1255 #: apply.c:4003
1256 #, c-format
1257 msgid "Checking patch %s..."
1258 msgstr "正在检查补丁 %s..."
1259
1260 #: apply.c:4095
1261 #, c-format
1262 msgid "sha1 information is lacking or useless for submodule %s"
1263 msgstr "子模组 %s 的 sha1 信息缺失或无效"
1264
1265 #: apply.c:4102
1266 #, c-format
1267 msgid "mode change for %s, which is not in current HEAD"
1268 msgstr "%s 的模式变更,但它不在当前 HEAD 中"
1269
1270 #: apply.c:4105
1271 #, c-format
1272 msgid "sha1 information is lacking or useless (%s)."
1273 msgstr "sha1 信息缺失或无效(%s)。"
1274
1275 #: apply.c:4114
1276 #, c-format
1277 msgid "could not add %s to temporary index"
1278 msgstr "不能在临时索引中添加 %s"
1279
1280 #: apply.c:4124
1281 #, c-format
1282 msgid "could not write temporary index to %s"
1283 msgstr "不能把临时索引写入到 %s"
1284
1285 #: apply.c:4262
1286 #, c-format
1287 msgid "unable to remove %s from index"
1288 msgstr "不能从索引中移除 %s"
1289
1290 #: apply.c:4296
1291 #, c-format
1292 msgid "corrupt patch for submodule %s"
1293 msgstr "子模组 %s 损坏的补丁"
1294
1295 #: apply.c:4302
1296 #, c-format
1297 msgid "unable to stat newly created file '%s'"
1298 msgstr "不能对新建文件 '%s' 调用 stat"
1299
1300 #: apply.c:4310
1301 #, c-format
1302 msgid "unable to create backing store for newly created file %s"
1303 msgstr "不能为新建文件 %s 创建后端存储"
1304
1305 #: apply.c:4316 apply.c:4461
1306 #, c-format
1307 msgid "unable to add cache entry for %s"
1308 msgstr "无法为 %s 添加缓存条目"
1309
1310 #: apply.c:4359
1311 #, c-format
1312 msgid "failed to write to '%s'"
1313 msgstr "写入 '%s' 失败"
1314
1315 #: apply.c:4363
1316 #, c-format
1317 msgid "closing file '%s'"
1318 msgstr "关闭文件 '%s'"
1319
1320 #: apply.c:4433
1321 #, c-format
1322 msgid "unable to write file '%s' mode %o"
1323 msgstr "不能写文件 '%s' 权限 %o"
1324
1325 #: apply.c:4531
1326 #, c-format
1327 msgid "Applied patch %s cleanly."
1328 msgstr "成功应用补丁 %s。"
1329
1330 #: apply.c:4539
1331 msgid "internal error"
1332 msgstr "内部错误"
1333
1334 #: apply.c:4542
1335 #, c-format
1336 msgid "Applying patch %%s with %d reject..."
1337 msgid_plural "Applying patch %%s with %d rejects..."
1338 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1339 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1340
1341 #: apply.c:4553
1342 #, c-format
1343 msgid "truncating .rej filename to %.*s.rej"
1344 msgstr "截短 .rej 文件名为 %.*s.rej"
1345
1346 #: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
1347 #, c-format
1348 msgid "cannot open %s"
1349 msgstr "不能打开 %s"
1350
1351 #: apply.c:4575
1352 #, c-format
1353 msgid "Hunk #%d applied cleanly."
1354 msgstr "第 #%d 个片段成功应用。"
1355
1356 #: apply.c:4579
1357 #, c-format
1358 msgid "Rejected hunk #%d."
1359 msgstr "拒绝第 #%d 个片段。"
1360
1361 #: apply.c:4698
1362 #, c-format
1363 msgid "Skipped patch '%s'."
1364 msgstr "略过补丁 '%s'。"
1365
1366 #: apply.c:4706
1367 msgid "unrecognized input"
1368 msgstr "未能识别的输入"
1369
1370 #: apply.c:4726
1371 msgid "unable to read index file"
1372 msgstr "无法读取索引文件"
1373
1374 #: apply.c:4883
1375 #, c-format
1376 msgid "can't open patch '%s': %s"
1377 msgstr "不能打开补丁 '%s':%s"
1378
1379 #: apply.c:4910
1380 #, c-format
1381 msgid "squelched %d whitespace error"
1382 msgid_plural "squelched %d whitespace errors"
1383 msgstr[0] "抑制下仍有 %d 个空白字符误用"
1384 msgstr[1] "抑制下仍有 %d 个空白字符误用"
1385
1386 #: apply.c:4916 apply.c:4931
1387 #, c-format
1388 msgid "%d line adds whitespace errors."
1389 msgid_plural "%d lines add whitespace errors."
1390 msgstr[0] "%d 行新增了空白字符误用。"
1391 msgstr[1] "%d 行新增了空白字符误用。"
1392
1393 #: apply.c:4924
1394 #, c-format
1395 msgid "%d line applied after fixing whitespace errors."
1396 msgid_plural "%d lines applied after fixing whitespace errors."
1397 msgstr[0] "修复空白错误后,应用了 %d 行。"
1398 msgstr[1] "修复空白错误后,应用了 %d 行。"
1399
1400 #: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
1401 msgid "Unable to write new index file"
1402 msgstr "无法写入新索引文件"
1403
1404 #: apply.c:4968
1405 msgid "don't apply changes matching the given path"
1406 msgstr "不要应用与给出路径向匹配的变更"
1407
1408 #: apply.c:4971
1409 msgid "apply changes matching the given path"
1410 msgstr "应用与给出路径向匹配的变更"
1411
1412 #: apply.c:4973 builtin/am.c:2260
1413 msgid "num"
1414 msgstr "数字"
1415
1416 #: apply.c:4974
1417 msgid "remove <num> leading slashes from traditional diff paths"
1418 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
1419
1420 #: apply.c:4977
1421 msgid "ignore additions made by the patch"
1422 msgstr "忽略补丁中的添加的文件"
1423
1424 #: apply.c:4979
1425 msgid "instead of applying the patch, output diffstat for the input"
1426 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
1427
1428 #: apply.c:4983
1429 msgid "show number of added and deleted lines in decimal notation"
1430 msgstr "以十进制数显示添加和删除的行数"
1431
1432 #: apply.c:4985
1433 msgid "instead of applying the patch, output a summary for the input"
1434 msgstr "不应用补丁,而是显示输入的概要"
1435
1436 #: apply.c:4987
1437 msgid "instead of applying the patch, see if the patch is applicable"
1438 msgstr "不应用补丁,而是查看补丁是否可应用"
1439
1440 #: apply.c:4989
1441 msgid "make sure the patch is applicable to the current index"
1442 msgstr "确认补丁可以应用到当前索引"
1443
1444 #: apply.c:4991
1445 msgid "mark new files with `git add --intent-to-add`"
1446 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1447
1448 #: apply.c:4993
1449 msgid "apply a patch without touching the working tree"
1450 msgstr "应用补丁而不修改工作区"
1451
1452 #: apply.c:4995
1453 msgid "accept a patch that touches outside the working area"
1454 msgstr "接受修改工作区之外文件的补丁"
1455
1456 #: apply.c:4998
1457 msgid "also apply the patch (use with --stat/--summary/--check)"
1458 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
1459
1460 #: apply.c:5000
1461 msgid "attempt three-way merge if a patch does not apply"
1462 msgstr "如果一个补丁不能应用则尝试三方合并"
1463
1464 #: apply.c:5002
1465 msgid "build a temporary index based on embedded index information"
1466 msgstr "创建一个临时索引基于嵌入的索引信息"
1467
1468 #: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
1469 msgid "paths are separated with NUL character"
1470 msgstr "路径以 NUL 字符分隔"
1471
1472 #: apply.c:5007
1473 msgid "ensure at least <n> lines of context match"
1474 msgstr "确保至少匹配 <n> 行上下文"
1475
1476 #: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
1477 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
1478 #: builtin/pack-objects.c:3457 builtin/rebase.c:1508
1479 msgid "action"
1480 msgstr "动作"
1481
1482 #: apply.c:5009
1483 msgid "detect new or modified lines that have whitespace errors"
1484 msgstr "检查新增和修改的行中间的空白字符滥用"
1485
1486 #: apply.c:5012 apply.c:5015
1487 msgid "ignore changes in whitespace when finding context"
1488 msgstr "查找上下文时忽略空白字符的变更"
1489
1490 #: apply.c:5018
1491 msgid "apply the patch in reverse"
1492 msgstr "反向应用补丁"
1493
1494 #: apply.c:5020
1495 msgid "don't expect at least one line of context"
1496 msgstr "无需至少一行上下文"
1497
1498 #: apply.c:5022
1499 msgid "leave the rejected hunks in corresponding *.rej files"
1500 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1501
1502 #: apply.c:5024
1503 msgid "allow overlapping hunks"
1504 msgstr "允许重叠的补丁片段"
1505
1506 #: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
1507 #: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
1508 #: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
1509 msgid "be verbose"
1510 msgstr "冗长输出"
1511
1512 #: apply.c:5027
1513 msgid "tolerate incorrectly detected missing new-line at the end of file"
1514 msgstr "允许不正确的文件末尾换行符"
1515
1516 #: apply.c:5030
1517 msgid "do not trust the line counts in the hunk headers"
1518 msgstr "不信任补丁片段的头信息中的行号"
1519
1520 #: apply.c:5032 builtin/am.c:2248
1521 msgid "root"
1522 msgstr "根目录"
1523
1524 #: apply.c:5033
1525 msgid "prepend <root> to all filenames"
1526 msgstr "为所有文件名前添加 <根目录>"
1527
1528 #: archive.c:14
1529 msgid "git archive [<options>] <tree-ish> [<path>...]"
1530 msgstr "git archive [<选项>] <树对象> [<路径>...]"
1531
1532 #: archive.c:15
1533 msgid "git archive --list"
1534 msgstr "git archive --list"
1535
1536 #: archive.c:16
1537 msgid ""
1538 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
1539 msgstr ""
1540 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
1541
1542 #: archive.c:17
1543 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1544 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
1545
1546 #: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
1547 #, c-format
1548 msgid "pathspec '%s' did not match any files"
1549 msgstr "路径规格 '%s' 未匹配任何文件"
1550
1551 #: archive.c:396
1552 #, c-format
1553 msgid "no such ref: %.*s"
1554 msgstr "无此引用:%.*s"
1555
1556 #: archive.c:401
1557 #, c-format
1558 msgid "not a valid object name: %s"
1559 msgstr "不是一个有效的对象名:%s"
1560
1561 #: archive.c:414
1562 #, c-format
1563 msgid "not a tree object: %s"
1564 msgstr "不是一个树对象:%s"
1565
1566 #: archive.c:426
1567 msgid "current working directory is untracked"
1568 msgstr "当前工作目录未被跟踪"
1569
1570 #: archive.c:457
1571 msgid "fmt"
1572 msgstr "格式"
1573
1574 #: archive.c:457
1575 msgid "archive format"
1576 msgstr "归档格式"
1577
1578 #: archive.c:458 builtin/log.c:1653
1579 msgid "prefix"
1580 msgstr "前缀"
1581
1582 #: archive.c:459
1583 msgid "prepend prefix to each pathname in the archive"
1584 msgstr "为归档中每个路径名加上前缀"
1585
1586 #: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
1587 #: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
1588 #: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
1589 #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
1590 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
1591 #: parse-options.h:190
1592 msgid "file"
1593 msgstr "文件"
1594
1595 #: archive.c:461 builtin/archive.c:90
1596 msgid "write the archive to this file"
1597 msgstr "归档写入此文件"
1598
1599 #: archive.c:463
1600 msgid "read .gitattributes in working directory"
1601 msgstr "读取工作区中的 .gitattributes"
1602
1603 #: archive.c:464
1604 msgid "report archived files on stderr"
1605 msgstr "在标准错误上报告归档文件"
1606
1607 #: archive.c:465
1608 msgid "store only"
1609 msgstr "只存储"
1610
1611 #: archive.c:466
1612 msgid "compress faster"
1613 msgstr "压缩速度更快"
1614
1615 #: archive.c:474
1616 msgid "compress better"
1617 msgstr "压缩效果更好"
1618
1619 #: archive.c:477
1620 msgid "list supported archive formats"
1621 msgstr "列出支持的归档格式"
1622
1623 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
1624 #: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
1625 msgid "repo"
1626 msgstr "仓库"
1627
1628 #: archive.c:480 builtin/archive.c:92
1629 msgid "retrieve the archive from remote repository <repo>"
1630 msgstr "从远程仓库(<仓库>)提取归档文件"
1631
1632 #: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
1633 #: builtin/notes.c:498
1634 msgid "command"
1635 msgstr "命令"
1636
1637 #: archive.c:482 builtin/archive.c:94
1638 msgid "path to the remote git-upload-archive command"
1639 msgstr "远程 git-upload-archive 命令的路径"
1640
1641 #: archive.c:489
1642 msgid "Unexpected option --remote"
1643 msgstr "未知参数 --remote"
1644
1645 #: archive.c:491
1646 msgid "Option --exec can only be used together with --remote"
1647 msgstr "选项 --exec 只能和 --remote 同时使用"
1648
1649 #: archive.c:493
1650 msgid "Unexpected option --output"
1651 msgstr "未知参数 --output"
1652
1653 #: archive.c:515
1654 #, c-format
1655 msgid "Unknown archive format '%s'"
1656 msgstr "未知归档格式 '%s'"
1657
1658 #: archive.c:522
1659 #, c-format
1660 msgid "Argument not supported for format '%s': -%d"
1661 msgstr "参数不支持此格式 '%s':-%d"
1662
1663 #: archive-tar.c:125 archive-zip.c:351
1664 #, c-format
1665 msgid "cannot stream blob %s"
1666 msgstr "不能打开数据对象 %s"
1667
1668 #: archive-tar.c:266 archive-zip.c:369
1669 #, c-format
1670 msgid "unsupported file mode: 0%o (SHA1: %s)"
1671 msgstr "不支持的文件模式:0%o (SHA1: %s)"
1672
1673 #: archive-tar.c:293 archive-zip.c:359
1674 #, c-format
1675 msgid "cannot read %s"
1676 msgstr "不能读取 %s"
1677
1678 #: archive-tar.c:465
1679 #, c-format
1680 msgid "unable to start '%s' filter"
1681 msgstr "无法启动 '%s' 过滤器"
1682
1683 #: archive-tar.c:468
1684 msgid "unable to redirect descriptor"
1685 msgstr "无法重定向描述符"
1686
1687 #: archive-tar.c:475
1688 #, c-format
1689 msgid "'%s' filter reported error"
1690 msgstr "'%s' 过滤器报告了错误"
1691
1692 #: archive-zip.c:319
1693 #, c-format
1694 msgid "path is not valid UTF-8: %s"
1695 msgstr "路径不是有效的 UTF-8:%s"
1696
1697 #: archive-zip.c:323
1698 #, c-format
1699 msgid "path too long (%d chars, SHA1: %s): %s"
1700 msgstr "路径太长(%d 字符,SHA1:%s):%s"
1701
1702 #: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
1703 #, c-format
1704 msgid "deflate error (%d)"
1705 msgstr "压缩错误 (%d)"
1706
1707 #: archive-zip.c:615
1708 #, c-format
1709 msgid "timestamp too large for this system: %<PRIuMAX>"
1710 msgstr "对于本系统时间戳太大:%<PRIuMAX>"
1711
1712 #: attr.c:212
1713 #, c-format
1714 msgid "%.*s is not a valid attribute name"
1715 msgstr "%.*s 不是一个有效的属性名"
1716
1717 #: attr.c:369
1718 #, c-format
1719 msgid "%s not allowed: %s:%d"
1720 msgstr "不允许 %s:%s:%d"
1721
1722 #: attr.c:409
1723 msgid ""
1724 "Negative patterns are ignored in git attributes\n"
1725 "Use '\\!' for literal leading exclamation."
1726 msgstr ""
1727 "负值模版在 git attributes 中被忽略\n"
1728 "当字符串确实要以感叹号开始时,使用 '\\!'。"
1729
1730 #: bisect.c:468
1731 #, c-format
1732 msgid "Badly quoted content in file '%s': %s"
1733 msgstr "文件 '%s' 包含错误的引用格式:%s"
1734
1735 #: bisect.c:678
1736 #, c-format
1737 msgid "We cannot bisect more!\n"
1738 msgstr "我们无法进行更多的二分查找!\n"
1739
1740 #: bisect.c:745
1741 #, c-format
1742 msgid "Not a valid commit name %s"
1743 msgstr "不是一个有效的提交名 %s"
1744
1745 #: bisect.c:770
1746 #, c-format
1747 msgid ""
1748 "The merge base %s is bad.\n"
1749 "This means the bug has been fixed between %s and [%s].\n"
1750 msgstr ""
1751 "合并基线 %s 是坏的。\n"
1752 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
1753
1754 #: bisect.c:775
1755 #, c-format
1756 msgid ""
1757 "The merge base %s is new.\n"
1758 "The property has changed between %s and [%s].\n"
1759 msgstr ""
1760 "合并基线 %s 是新的。\n"
1761 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
1762
1763 #: bisect.c:780
1764 #, c-format
1765 msgid ""
1766 "The merge base %s is %s.\n"
1767 "This means the first '%s' commit is between %s and [%s].\n"
1768 msgstr ""
1769 "合并基线 %s 是 %s。\n"
1770 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1771
1772 #: bisect.c:788
1773 #, c-format
1774 msgid ""
1775 "Some %s revs are not ancestors of the %s rev.\n"
1776 "git bisect cannot work properly in this case.\n"
1777 "Maybe you mistook %s and %s revs?\n"
1778 msgstr ""
1779 "一些 %s 版本不是 %s 版本的祖先。\n"
1780 "这种情况下 git 二分查找无法正常工作。\n"
1781 "您可能弄错了 %s 和 %s 版本?\n"
1782
1783 #: bisect.c:801
1784 #, c-format
1785 msgid ""
1786 "the merge base between %s and [%s] must be skipped.\n"
1787 "So we cannot be sure the first %s commit is between %s and %s.\n"
1788 "We continue anyway."
1789 msgstr ""
1790 "介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1791 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1792 "我们仍旧继续。"
1793
1794 #: bisect.c:840
1795 #, c-format
1796 msgid "Bisecting: a merge base must be tested\n"
1797 msgstr "二分查找中:合并基线必须是经过测试的\n"
1798
1799 #: bisect.c:890
1800 #, c-format
1801 msgid "a %s revision is needed"
1802 msgstr "需要一个 %s 版本"
1803
1804 #: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
1805 #, c-format
1806 msgid "could not create file '%s'"
1807 msgstr "不能创建文件 '%s'"
1808
1809 #: bisect.c:966 builtin/merge.c:149
1810 #, c-format
1811 msgid "could not read file '%s'"
1812 msgstr "不能读取文件 '%s'"
1813
1814 #: bisect.c:997
1815 msgid "reading bisect refs failed"
1816 msgstr "读取二分查找引用失败"
1817
1818 #: bisect.c:1019
1819 #, c-format
1820 msgid "%s was both %s and %s\n"
1821 msgstr "%s 同时为 %s 和 %s\n"
1822
1823 #: bisect.c:1028
1824 #, c-format
1825 msgid ""
1826 "No testable commit found.\n"
1827 "Maybe you started with bad path parameters?\n"
1828 msgstr ""
1829 "没有发现可测试的提交。\n"
1830 "可能您在运行时使用了错误的路径参数?\n"
1831
1832 #: bisect.c:1057
1833 #, c-format
1834 msgid "(roughly %d step)"
1835 msgid_plural "(roughly %d steps)"
1836 msgstr[0] "(大概 %d 步)"
1837 msgstr[1] "(大概 %d 步)"
1838
1839 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1840 #. steps)" translation.
1841 #.
1842 #: bisect.c:1063
1843 #, c-format
1844 msgid "Bisecting: %d revision left to test after this %s\n"
1845 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1846 msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1847 msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1848
1849 #: blame.c:2700
1850 msgid "--contents and --reverse do not blend well."
1851 msgstr "--contents 和 --reverse 不能混用。"
1852
1853 #: blame.c:2714
1854 msgid "cannot use --contents with final commit object name"
1855 msgstr "不能将 --contents 和最终的提交对象名共用"
1856
1857 #: blame.c:2735
1858 msgid "--reverse and --first-parent together require specified latest commit"
1859 msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1860
1861 #: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
1862 #: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
1863 #: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
1864 #: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
1865 #: builtin/shortlog.c:192
1866 msgid "revision walk setup failed"
1867 msgstr "版本遍历设置失败"
1868
1869 #: blame.c:2762
1870 msgid ""
1871 "--reverse --first-parent together require range along first-parent chain"
1872 msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1873
1874 #: blame.c:2773
1875 #, c-format
1876 msgid "no such path %s in %s"
1877 msgstr "在 %2$s 中无此路径 %1$s"
1878
1879 #: blame.c:2784
1880 #, c-format
1881 msgid "cannot read blob %s for path %s"
1882 msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1883
1884 #: branch.c:53
1885 #, c-format
1886 msgid ""
1887 "\n"
1888 "After fixing the error cause you may try to fix up\n"
1889 "the remote tracking information by invoking\n"
1890 "\"git branch --set-upstream-to=%s%s%s\"."
1891 msgstr ""
1892 "\n"
1893 "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1894 "\"git branch --set-upstream-to=%s%s%s\" 。"
1895
1896 #: branch.c:67
1897 #, c-format
1898 msgid "Not setting branch %s as its own upstream."
1899 msgstr "未设置分支 %s 作为它自己的上游。"
1900
1901 #: branch.c:93
1902 #, c-format
1903 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1904 msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
1905
1906 #: branch.c:94
1907 #, c-format
1908 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1909 msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
1910
1911 #: branch.c:98
1912 #, c-format
1913 msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1914 msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
1915
1916 #: branch.c:99
1917 #, c-format
1918 msgid "Branch '%s' set up to track local branch '%s'."
1919 msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
1920
1921 #: branch.c:104
1922 #, c-format
1923 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1924 msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
1925
1926 #: branch.c:105
1927 #, c-format
1928 msgid "Branch '%s' set up to track remote ref '%s'."
1929 msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
1930
1931 #: branch.c:109
1932 #, c-format
1933 msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1934 msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
1935
1936 #: branch.c:110
1937 #, c-format
1938 msgid "Branch '%s' set up to track local ref '%s'."
1939 msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
1940
1941 #: branch.c:119
1942 msgid "Unable to write upstream branch configuration"
1943 msgstr "无法写入上游分支配置"
1944
1945 #: branch.c:156
1946 #, c-format
1947 msgid "Not tracking: ambiguous information for ref %s"
1948 msgstr "未跟踪:引用 %s 有歧义"
1949
1950 #: branch.c:189
1951 #, c-format
1952 msgid "'%s' is not a valid branch name."
1953 msgstr "'%s' 不是一个有效的分支名称。"
1954
1955 #: branch.c:208
1956 #, c-format
1957 msgid "A branch named '%s' already exists."
1958 msgstr "一个分支名 '%s' 已经存在。"
1959
1960 #: branch.c:213
1961 msgid "Cannot force update the current branch."
1962 msgstr "无法强制更新当前分支。"
1963
1964 #: branch.c:233
1965 #, c-format
1966 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1967 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
1968
1969 #: branch.c:235
1970 #, c-format
1971 msgid "the requested upstream branch '%s' does not exist"
1972 msgstr "请求的上游分支 '%s' 不存在"
1973
1974 #: branch.c:237
1975 msgid ""
1976 "\n"
1977 "If you are planning on basing your work on an upstream\n"
1978 "branch that already exists at the remote, you may need to\n"
1979 "run \"git fetch\" to retrieve it.\n"
1980 "\n"
1981 "If you are planning to push out a new local branch that\n"
1982 "will track its remote counterpart, you may want to use\n"
1983 "\"git push -u\" to set the upstream config as you push."
1984 msgstr ""
1985 "\n"
1986 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1987 "您可能需要执行 \"git fetch\" 来获取分支。\n"
1988 "\n"
1989 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1990 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
1991
1992 #: branch.c:281
1993 #, c-format
1994 msgid "Not a valid object name: '%s'."
1995 msgstr "不是一个有效的对象名:'%s'。"
1996
1997 #: branch.c:301
1998 #, c-format
1999 msgid "Ambiguous object name: '%s'."
2000 msgstr "歧义的对象名:'%s'。"
2001
2002 #: branch.c:306
2003 #, c-format
2004 msgid "Not a valid branch point: '%s'."
2005 msgstr "无效的分支点:'%s'。"
2006
2007 #: branch.c:364
2008 #, c-format
2009 msgid "'%s' is already checked out at '%s'"
2010 msgstr "'%s' 已经检出到 '%s'"
2011
2012 #: branch.c:387
2013 #, c-format
2014 msgid "HEAD of working tree %s is not updated"
2015 msgstr "工作区 %s 的 HEAD 指向没有被更新"
2016
2017 #: bundle.c:36
2018 #, c-format
2019 msgid "'%s' does not look like a v2 bundle file"
2020 msgstr "'%s' 不像是一个 v2 版本的包文件"
2021
2022 #: bundle.c:64
2023 #, c-format
2024 msgid "unrecognized header: %s%s (%d)"
2025 msgstr "未能识别的包头:%s%s (%d)"
2026
2027 #: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
2028 #: builtin/commit.c:815
2029 #, c-format
2030 msgid "could not open '%s'"
2031 msgstr "不能打开 '%s'"
2032
2033 #: bundle.c:143
2034 msgid "Repository lacks these prerequisite commits:"
2035 msgstr "仓库中缺少这些必备的提交:"
2036
2037 #: bundle.c:146
2038 msgid "need a repository to verify a bundle"
2039 msgstr "需要一个仓库来校验一个包"
2040
2041 #: bundle.c:197
2042 #, c-format
2043 msgid "The bundle contains this ref:"
2044 msgid_plural "The bundle contains these %d refs:"
2045 msgstr[0] "这个包中含有这个引用:"
2046 msgstr[1] "这个包中含有 %d 个引用:"
2047
2048 #: bundle.c:204
2049 msgid "The bundle records a complete history."
2050 msgstr "这个包记录一个完整历史。"
2051
2052 #: bundle.c:206
2053 #, c-format
2054 msgid "The bundle requires this ref:"
2055 msgid_plural "The bundle requires these %d refs:"
2056 msgstr[0] "这个包需要这个引用:"
2057 msgstr[1] "这个包需要 %d 个引用:"
2058
2059 #: bundle.c:273
2060 msgid "unable to dup bundle descriptor"
2061 msgstr "无法复制 bundle 描述符"
2062
2063 #: bundle.c:280
2064 msgid "Could not spawn pack-objects"
2065 msgstr "不能生成 pack-objects 进程"
2066
2067 #: bundle.c:291
2068 msgid "pack-objects died"
2069 msgstr "pack-objects 终止"
2070
2071 #: bundle.c:333
2072 msgid "rev-list died"
2073 msgstr "rev-list 终止"
2074
2075 #: bundle.c:382
2076 #, c-format
2077 msgid "ref '%s' is excluded by the rev-list options"
2078 msgstr "引用 '%s' 被 rev-list 选项排除"
2079
2080 #: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
2081 #, c-format
2082 msgid "unrecognized argument: %s"
2083 msgstr "未能识别的参数:%s"
2084
2085 #: bundle.c:469
2086 msgid "Refusing to create empty bundle."
2087 msgstr "不能创建空包。"
2088
2089 #: bundle.c:479
2090 #, c-format
2091 msgid "cannot create '%s'"
2092 msgstr "不能创建 '%s'"
2093
2094 #: bundle.c:504
2095 msgid "index-pack died"
2096 msgstr "index-pack 终止"
2097
2098 #: color.c:329
2099 #, c-format
2100 msgid "invalid color value: %.*s"
2101 msgstr "无效的颜色值:%.*s"
2102
2103 #: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
2104 #: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
2105 #, c-format
2106 msgid "could not parse %s"
2107 msgstr "不能解析 %s"
2108
2109 #: commit.c:53
2110 #, c-format
2111 msgid "%s %s is not a commit!"
2112 msgstr "%s %s 不是一个提交!"
2113
2114 #: commit.c:193
2115 msgid ""
2116 "Support for <GIT_DIR>/info/grafts is deprecated\n"
2117 "and will be removed in a future Git version.\n"
2118 "\n"
2119 "Please use \"git replace --convert-graft-file\"\n"
2120 "to convert the grafts into replace refs.\n"
2121 "\n"
2122 "Turn this message off by running\n"
2123 "\"git config advice.graftFileDeprecated false\""
2124 msgstr ""
2125 "对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n"
2126 "未来的Git版本中被移除。\n"
2127 "\n"
2128 "请使用 \"git replace --convert-graft-file\" 将\n"
2129 "grafts 转换为替换引用。\n"
2130 "\n"
2131 "设置 \"git config advice.graftFileDeprecated false\"\n"
2132 "可关闭本消息"
2133
2134 #: commit.c:1153
2135 #, c-format
2136 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2137 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
2138
2139 #: commit.c:1157
2140 #, c-format
2141 msgid "Commit %s has a bad GPG signature allegedly by %s."
2142 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
2143
2144 #: commit.c:1160
2145 #, c-format
2146 msgid "Commit %s does not have a GPG signature."
2147 msgstr "提交 %s 没有 GPG 签名。"
2148
2149 #: commit.c:1163
2150 #, c-format
2151 msgid "Commit %s has a good GPG signature by %s\n"
2152 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
2153
2154 #: commit.c:1417
2155 msgid ""
2156 "Warning: commit message did not conform to UTF-8.\n"
2157 "You may want to amend it after fixing the message, or set the config\n"
2158 "variable i18n.commitencoding to the encoding your project uses.\n"
2159 msgstr ""
2160 "警告:提交说明不符合 UTF-8 字符编码。\n"
2161 "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
2162 "设置为您项目所用的字符编码。\n"
2163
2164 #: commit-graph.c:122
2165 msgid "commit-graph file is too small"
2166 msgstr "提交图形文件太小"
2167
2168 #: commit-graph.c:189
2169 #, c-format
2170 msgid "commit-graph signature %X does not match signature %X"
2171 msgstr "提交图形签名 %X 和签名 %X 不匹配"
2172
2173 #: commit-graph.c:196
2174 #, c-format
2175 msgid "commit-graph version %X does not match version %X"
2176 msgstr "提交图形版本 %X 和版本 %X 不匹配"
2177
2178 #: commit-graph.c:203
2179 #, c-format
2180 msgid "commit-graph hash version %X does not match version %X"
2181 msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
2182
2183 #: commit-graph.c:226
2184 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
2185 msgstr "提交图形块查找表条目丢失,文件可能不完整"
2186
2187 #: commit-graph.c:237
2188 #, c-format
2189 msgid "commit-graph improper chunk offset %08x%08x"
2190 msgstr "提交图形不正确的块偏移 %08x%08x"
2191
2192 #: commit-graph.c:280
2193 #, c-format
2194 msgid "commit-graph chunk id %08x appears multiple times"
2195 msgstr "提交图形块 id %08x 出现了多次"
2196
2197 #: commit-graph.c:343
2198 msgid "commit-graph has no base graphs chunk"
2199 msgstr "提交图形没有基础图形块"
2200
2201 #: commit-graph.c:353
2202 msgid "commit-graph chain does not match"
2203 msgstr "提交图形链不匹配"
2204
2205 #: commit-graph.c:401
2206 #, c-format
2207 msgid "invalid commit-graph chain: line '%s' not a hash"
2208 msgstr "无效的提交图形链:行 '%s' 不是一个哈希值"
2209
2210 #: commit-graph.c:425
2211 msgid "unable to find all commit-graph files"
2212 msgstr "无法找到所有提交图形文件"
2213
2214 #: commit-graph.c:558 commit-graph.c:618
2215 msgid "invalid commit position. commit-graph is likely corrupt"
2216 msgstr "无效的提交位置。提交图形可能已损坏"
2217
2218 #: commit-graph.c:579
2219 #, c-format
2220 msgid "could not find commit %s"
2221 msgstr "无法找到提交 %s"
2222
2223 #: commit-graph.c:852 builtin/am.c:1292
2224 #, c-format
2225 msgid "unable to parse commit %s"
2226 msgstr "不能解析提交 %s"
2227
2228 #: commit-graph.c:1011 builtin/pack-objects.c:2782
2229 #, c-format
2230 msgid "unable to get type of object %s"
2231 msgstr "无法获得对象 %s 类型"
2232
2233 #: commit-graph.c:1043
2234 msgid "Loading known commits in commit graph"
2235 msgstr "正在加载提交图中的已知提交"
2236
2237 #: commit-graph.c:1060
2238 msgid "Expanding reachable commits in commit graph"
2239 msgstr "正在扩展提交图中的可达提交"
2240
2241 #: commit-graph.c:1079
2242 msgid "Clearing commit marks in commit graph"
2243 msgstr "正在清除提交图中的提交标记"
2244
2245 #: commit-graph.c:1098
2246 msgid "Computing commit graph generation numbers"
2247 msgstr "正在计算提交图世代数字"
2248
2249 #: commit-graph.c:1173
2250 #, c-format
2251 msgid "Finding commits for commit graph in %d pack"
2252 msgid_plural "Finding commits for commit graph in %d packs"
2253 msgstr[0] "正在 %d 个包中查找提交图的提交"
2254 msgstr[1] "正在 %d 个包中查找提交图的提交"
2255
2256 #: commit-graph.c:1186
2257 #, c-format
2258 msgid "error adding pack %s"
2259 msgstr "添加包 %s 出错"
2260
2261 #: commit-graph.c:1190
2262 #, c-format
2263 msgid "error opening index for %s"
2264 msgstr "为 %s 打开索引出错"
2265
2266 #: commit-graph.c:1214
2267 #, c-format
2268 msgid "Finding commits for commit graph from %d ref"
2269 msgid_plural "Finding commits for commit graph from %d refs"
2270 msgstr[0] "正在从 %d 个引用中查找提交图的提交"
2271 msgstr[1] "正在从 %d 个引用中查找提交图的提交"
2272
2273 #: commit-graph.c:1234
2274 #, c-format
2275 msgid "invalid commit object id: %s"
2276 msgstr "无效的提交对象 ID:%s"
2277
2278 #: commit-graph.c:1249
2279 msgid "Finding commits for commit graph among packed objects"
2280 msgstr "正在打包对象中查找提交图的提交"
2281
2282 #: commit-graph.c:1264
2283 msgid "Counting distinct commits in commit graph"
2284 msgstr "正在计算提交图中不同的提交"
2285
2286 #: commit-graph.c:1294
2287 msgid "Finding extra edges in commit graph"
2288 msgstr "正在查找提交图中额外的边"
2289
2290 #: commit-graph.c:1340
2291 msgid "failed to write correct number of base graph ids"
2292 msgstr "无法写入正确数量的基础图形 ID"
2293
2294 #: commit-graph.c:1373 midx.c:814
2295 #, c-format
2296 msgid "unable to create leading directories of %s"
2297 msgstr "不能为 %s 创建先导目录"
2298
2299 #: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
2300 #, c-format
2301 msgid "unable to create '%s'"
2302 msgstr "不能创建 '%s'"
2303
2304 #: commit-graph.c:1445
2305 #, c-format
2306 msgid "Writing out commit graph in %d pass"
2307 msgid_plural "Writing out commit graph in %d passes"
2308 msgstr[0] "正在用 %d 步写出提交图"
2309 msgstr[1] "正在用 %d 步写出提交图"
2310
2311 #: commit-graph.c:1486
2312 msgid "unable to open commit-graph chain file"
2313 msgstr "无法打开提交图形链文件"
2314
2315 #: commit-graph.c:1498
2316 msgid "failed to rename base commit-graph file"
2317 msgstr "无法重命名基础提交图形文件"
2318
2319 #: commit-graph.c:1518
2320 msgid "failed to rename temporary commit-graph file"
2321 msgstr "无法重命名临时提交图形文件"
2322
2323 #: commit-graph.c:1631
2324 msgid "Scanning merged commits"
2325 msgstr "正在扫描合并提交"
2326
2327 #: commit-graph.c:1642
2328 #, c-format
2329 msgid "unexpected duplicate commit id %s"
2330 msgstr "意外的重复提交 ID %s"
2331
2332 #: commit-graph.c:1665
2333 msgid "Merging commit-graph"
2334 msgstr "正在合并提交图形"
2335
2336 #: commit-graph.c:1844
2337 #, c-format
2338 msgid "the commit graph format cannot write %d commits"
2339 msgstr "提交图格式不能写入 %d 个提交"
2340
2341 #: commit-graph.c:1855
2342 msgid "too many commits to write graph"
2343 msgstr "提交太多不能画图"
2344
2345 #: commit-graph.c:1944
2346 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2347 msgstr "提交图文件的校验码错误,可能已经损坏"
2348
2349 #: commit-graph.c:1954
2350 #, c-format
2351 msgid "commit-graph has incorrect OID order: %s then %s"
2352 msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s"
2353
2354 #: commit-graph.c:1964 commit-graph.c:1979
2355 #, c-format
2356 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2357 msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u"
2358
2359 #: commit-graph.c:1971
2360 #, c-format
2361 msgid "failed to parse commit %s from commit-graph"
2362 msgstr "无法从提交图形中解析提交 %s"
2363
2364 #: commit-graph.c:1989
2365 msgid "Verifying commits in commit graph"
2366 msgstr "正在校验提交图中的提交"
2367
2368 #: commit-graph.c:2003
2369 #, c-format
2370 msgid "failed to parse commit %s from object database for commit-graph"
2371 msgstr "无法从提交图形的对象库中解析提交 %s"
2372
2373 #: commit-graph.c:2010
2374 #, c-format
2375 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2376 msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
2377
2378 #: commit-graph.c:2020
2379 #, c-format
2380 msgid "commit-graph parent list for commit %s is too long"
2381 msgstr "提交 %s 的提交图形父提交列表太长了"
2382
2383 #: commit-graph.c:2029
2384 #, c-format
2385 msgid "commit-graph parent for %s is %s != %s"
2386 msgstr "%s 的提交图形父提交是 %s != %s"
2387
2388 #: commit-graph.c:2042
2389 #, c-format
2390 msgid "commit-graph parent list for commit %s terminates early"
2391 msgstr "提交 %s 的提交图形父提交列表过早终止"
2392
2393 #: commit-graph.c:2047
2394 #, c-format
2395 msgid ""
2396 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2397 msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零"
2398
2399 #: commit-graph.c:2051
2400 #, c-format
2401 msgid ""
2402 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2403 msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零"
2404
2405 #: commit-graph.c:2066
2406 #, c-format
2407 msgid "commit-graph generation for commit %s is %u != %u"
2408 msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
2409
2410 #: commit-graph.c:2072
2411 #, c-format
2412 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2413 msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2414
2415 #: compat/obstack.c:406 compat/obstack.c:408
2416 msgid "memory exhausted"
2417 msgstr "内存耗尽"
2418
2419 #: config.c:124
2420 #, c-format
2421 msgid ""
2422 "exceeded maximum include depth (%d) while including\n"
2423 "\t%s\n"
2424 "from\n"
2425 "\t%s\n"
2426 "This might be due to circular includes."
2427 msgstr ""
2428 "超过了最大包含深度(%1$d),当从\n"
2429 "\t%3$s\n"
2430 "包含\n"
2431 "\t%2$s\n"
2432 "这可能是因为循环包含。"
2433
2434 #: config.c:140
2435 #, c-format
2436 msgid "could not expand include path '%s'"
2437 msgstr "无法扩展包含路径 '%s'"
2438
2439 #: config.c:151
2440 msgid "relative config includes must come from files"
2441 msgstr "相对路径的配置文件引用必须来自于文件"
2442
2443 #: config.c:197
2444 msgid "relative config include conditionals must come from files"
2445 msgstr "相对路径的配置文件条件引用必须来自于文件"
2446
2447 #: config.c:376
2448 #, c-format
2449 msgid "key does not contain a section: %s"
2450 msgstr "键名没有包含一个小节名称:%s"
2451
2452 #: config.c:382
2453 #, c-format
2454 msgid "key does not contain variable name: %s"
2455 msgstr "键名没有包含变量名:%s"
2456
2457 #: config.c:406 sequencer.c:2444
2458 #, c-format
2459 msgid "invalid key: %s"
2460 msgstr "无效键名:%s"
2461
2462 #: config.c:412
2463 #, c-format
2464 msgid "invalid key (newline): %s"
2465 msgstr "无效键名(有换行符):%s"
2466
2467 #: config.c:448 config.c:460
2468 #, c-format
2469 msgid "bogus config parameter: %s"
2470 msgstr "伪配置参数:%s"
2471
2472 #: config.c:495
2473 #, c-format
2474 msgid "bogus format in %s"
2475 msgstr "%s 中格式错误"
2476
2477 #: config.c:821
2478 #, c-format
2479 msgid "bad config line %d in blob %s"
2480 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
2481
2482 #: config.c:825
2483 #, c-format
2484 msgid "bad config line %d in file %s"
2485 msgstr "文件 %2$s 中错误的配置行 %1$d"
2486
2487 #: config.c:829
2488 #, c-format
2489 msgid "bad config line %d in standard input"
2490 msgstr "标准输入中错误的配置行 %d"
2491
2492 #: config.c:833
2493 #, c-format
2494 msgid "bad config line %d in submodule-blob %s"
2495 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
2496
2497 #: config.c:837
2498 #, c-format
2499 msgid "bad config line %d in command line %s"
2500 msgstr "命令行 %2$s 中错误的配置行 %1$d"
2501
2502 #: config.c:841
2503 #, c-format
2504 msgid "bad config line %d in %s"
2505 msgstr "在 %2$s 中错误的配置行 %1$d"
2506
2507 #: config.c:978
2508 msgid "out of range"
2509 msgstr "超出范围"
2510
2511 #: config.c:978
2512 msgid "invalid unit"
2513 msgstr "无效的单位"
2514
2515 #: config.c:979
2516 #, c-format
2517 msgid "bad numeric config value '%s' for '%s': %s"
2518 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
2519
2520 #: config.c:998
2521 #, c-format
2522 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2523 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
2524
2525 #: config.c:1001
2526 #, c-format
2527 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2528 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
2529
2530 #: config.c:1004
2531 #, c-format
2532 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2533 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
2534
2535 #: config.c:1007
2536 #, c-format
2537 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2538 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
2539
2540 #: config.c:1010
2541 #, c-format
2542 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2543 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
2544
2545 #: config.c:1013
2546 #, c-format
2547 msgid "bad numeric config value '%s' for '%s' in %s: %s"
2548 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
2549
2550 #: config.c:1108
2551 #, c-format
2552 msgid "failed to expand user dir in: '%s'"
2553 msgstr "无法扩展用户目录:'%s'"
2554
2555 #: config.c:1117
2556 #, c-format
2557 msgid "'%s' for '%s' is not a valid timestamp"
2558 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
2559
2560 #: config.c:1208
2561 #, c-format
2562 msgid "abbrev length out of range: %d"
2563 msgstr "缩写长度超出范围:%d"
2564
2565 #: config.c:1222 config.c:1233
2566 #, c-format
2567 msgid "bad zlib compression level %d"
2568 msgstr "错误的 zlib 压缩级别 %d"
2569
2570 #: config.c:1325
2571 msgid "core.commentChar should only be one character"
2572 msgstr "core.commentChar 应该是一个字符"
2573
2574 #: config.c:1358
2575 #, c-format
2576 msgid "invalid mode for object creation: %s"
2577 msgstr "无效的对象创建模式:%s"
2578
2579 #: config.c:1430
2580 #, c-format
2581 msgid "malformed value for %s"
2582 msgstr "%s 的取值格式错误"
2583
2584 #: config.c:1456
2585 #, c-format
2586 msgid "malformed value for %s: %s"
2587 msgstr "%s 的取值格式错误:%s"
2588
2589 #: config.c:1457
2590 msgid "must be one of nothing, matching, simple, upstream or current"
2591 msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current"
2592
2593 #: config.c:1518 builtin/pack-objects.c:3541
2594 #, c-format
2595 msgid "bad pack compression level %d"
2596 msgstr "错误的打包压缩级别 %d"
2597
2598 #: config.c:1639
2599 #, c-format
2600 msgid "unable to load config blob object '%s'"
2601 msgstr "无法从数据对象 '%s' 加载配置"
2602
2603 #: config.c:1642
2604 #, c-format
2605 msgid "reference '%s' does not point to a blob"
2606 msgstr "引用 '%s' 没有指向一个数据对象"
2607
2608 #: config.c:1659
2609 #, c-format
2610 msgid "unable to resolve config blob '%s'"
2611 msgstr "不能解析配置对象 '%s'"
2612
2613 #: config.c:1689
2614 #, c-format
2615 msgid "failed to parse %s"
2616 msgstr "解析 %s 失败"
2617
2618 #: config.c:1743
2619 msgid "unable to parse command-line config"
2620 msgstr "无法解析命令行中的配置"
2621
2622 #: config.c:2097
2623 msgid "unknown error occurred while reading the configuration files"
2624 msgstr "在读取配置文件时遇到未知错误"
2625
2626 #: config.c:2267
2627 #, c-format
2628 msgid "Invalid %s: '%s'"
2629 msgstr "无效 %s:'%s'"
2630
2631 #: config.c:2312
2632 #, c-format
2633 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2634 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2635
2636 #: config.c:2358
2637 #, c-format
2638 msgid "unable to parse '%s' from command-line config"
2639 msgstr "无法解析命令行配置中的 '%s'"
2640
2641 #: config.c:2360
2642 #, c-format
2643 msgid "bad config variable '%s' in file '%s' at line %d"
2644 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
2645
2646 #: config.c:2441
2647 #, c-format
2648 msgid "invalid section name '%s'"
2649 msgstr "无效的小节名称 '%s'"
2650
2651 #: config.c:2473
2652 #, c-format
2653 msgid "%s has multiple values"
2654 msgstr "%s 有多个取值"
2655
2656 #: config.c:2502
2657 #, c-format
2658 msgid "failed to write new configuration file %s"
2659 msgstr "写入新的配置文件 %s 失败"
2660
2661 #: config.c:2754 config.c:3078
2662 #, c-format
2663 msgid "could not lock config file %s"
2664 msgstr "不能锁定配置文件 %s"
2665
2666 #: config.c:2765
2667 #, c-format
2668 msgid "opening %s"
2669 msgstr "打开 %s"
2670
2671 #: config.c:2800 builtin/config.c:344
2672 #, c-format
2673 msgid "invalid pattern: %s"
2674 msgstr "无效模式:%s"
2675
2676 #: config.c:2825
2677 #, c-format
2678 msgid "invalid config file %s"
2679 msgstr "无效的配置文件 %s"
2680
2681 #: config.c:2838 config.c:3091
2682 #, c-format
2683 msgid "fstat on %s failed"
2684 msgstr "对 %s 调用 fstat 失败"
2685
2686 #: config.c:2849
2687 #, c-format
2688 msgid "unable to mmap '%s'"
2689 msgstr "不能 mmap '%s'"
2690
2691 #: config.c:2858 config.c:3096
2692 #, c-format
2693 msgid "chmod on %s failed"
2694 msgstr "对 %s 调用 chmod 失败"
2695
2696 #: config.c:2943 config.c:3193
2697 #, c-format
2698 msgid "could not write config file %s"
2699 msgstr "不能写入配置文件 %s"
2700
2701 #: config.c:2977
2702 #, c-format
2703 msgid "could not set '%s' to '%s'"
2704 msgstr "不能设置 '%s' 为 '%s'"
2705
2706 #: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
2707 #, c-format
2708 msgid "could not unset '%s'"
2709 msgstr "不能取消设置 '%s'"
2710
2711 #: config.c:3069
2712 #, c-format
2713 msgid "invalid section name: %s"
2714 msgstr "无效的小节名称:%s"
2715
2716 #: config.c:3236
2717 #, c-format
2718 msgid "missing value for '%s'"
2719 msgstr "%s 的取值缺失"
2720
2721 #: connect.c:61
2722 msgid "the remote end hung up upon initial contact"
2723 msgstr "远端在初始连接时即挂断"
2724
2725 #: connect.c:63
2726 msgid ""
2727 "Could not read from remote repository.\n"
2728 "\n"
2729 "Please make sure you have the correct access rights\n"
2730 "and the repository exists."
2731 msgstr ""
2732 "无法读取远程仓库。\n"
2733 "\n"
2734 "请确认您有正确的访问权限并且仓库存在。"
2735
2736 #: connect.c:81
2737 #, c-format
2738 msgid "server doesn't support '%s'"
2739 msgstr "服务器不支持 '%s'"
2740
2741 #: connect.c:103
2742 #, c-format
2743 msgid "server doesn't support feature '%s'"
2744 msgstr "服务器不支持特性 '%s'"
2745
2746 #: connect.c:114
2747 msgid "expected flush after capabilities"
2748 msgstr "在能力之后应为一个 flush 包"
2749
2750 #: connect.c:233
2751 #, c-format
2752 msgid "ignoring capabilities after first line '%s'"
2753 msgstr "忽略第一行 '%s' 之后的能力字段"
2754
2755 #: connect.c:252
2756 msgid "protocol error: unexpected capabilities^{}"
2757 msgstr "协议错误:意外的 capabilities^{}"
2758
2759 #: connect.c:273
2760 #, c-format
2761 msgid "protocol error: expected shallow sha-1, got '%s'"
2762 msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'"
2763
2764 #: connect.c:275
2765 msgid "repository on the other end cannot be shallow"
2766 msgstr "另一端的仓库不能是浅克隆仓库"
2767
2768 #: connect.c:313
2769 msgid "invalid packet"
2770 msgstr "无效数据包"
2771
2772 #: connect.c:333
2773 #, c-format
2774 msgid "protocol error: unexpected '%s'"
2775 msgstr "协议错误:意外的 '%s'"
2776
2777 #: connect.c:441
2778 #, c-format
2779 msgid "invalid ls-refs response: %s"
2780 msgstr "无效的 ls-refs 响应:%s"
2781
2782 #: connect.c:445
2783 msgid "expected flush after ref listing"
2784 msgstr "在引用列表之后应该有一个 flush 包"
2785
2786 #: connect.c:544
2787 #, c-format
2788 msgid "protocol '%s' is not supported"
2789 msgstr "不支持 '%s' 协议"
2790
2791 #: connect.c:595
2792 msgid "unable to set SO_KEEPALIVE on socket"
2793 msgstr "无法为 socket 设置 SO_KEEPALIVE"
2794
2795 #: connect.c:635 connect.c:698
2796 #, c-format
2797 msgid "Looking up %s ... "
2798 msgstr "查找 %s ..."
2799
2800 #: connect.c:639
2801 #, c-format
2802 msgid "unable to look up %s (port %s) (%s)"
2803 msgstr "无法查找 %s(端口 %s)(%s)"
2804
2805 #. TRANSLATORS: this is the end of "Looking up %s ... "
2806 #: connect.c:643 connect.c:714
2807 #, c-format
2808 msgid ""
2809 "done.\n"
2810 "Connecting to %s (port %s) ... "
2811 msgstr ""
2812 "完成。\n"
2813 "连接到 %s(端口 %s)... "
2814
2815 #: connect.c:665 connect.c:742
2816 #, c-format
2817 msgid ""
2818 "unable to connect to %s:\n"
2819 "%s"
2820 msgstr ""
2821 "无法连接到 %s:\n"
2822 "%s"
2823
2824 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
2825 #: connect.c:671 connect.c:748
2826 msgid "done."
2827 msgstr "完成。"
2828
2829 #: connect.c:702
2830 #, c-format
2831 msgid "unable to look up %s (%s)"
2832 msgstr "无法查找 %s(%s)"
2833
2834 #: connect.c:708
2835 #, c-format
2836 msgid "unknown port %s"
2837 msgstr "未知端口 %s"
2838
2839 #: connect.c:845 connect.c:1175
2840 #, c-format
2841 msgid "strange hostname '%s' blocked"
2842 msgstr "已阻止奇怪的主机名 '%s'"
2843
2844 #: connect.c:847
2845 #, c-format
2846 msgid "strange port '%s' blocked"
2847 msgstr "已阻止奇怪的端口号 '%s'"
2848
2849 #: connect.c:857
2850 #, c-format
2851 msgid "cannot start proxy %s"
2852 msgstr "不能启动代理 %s"
2853
2854 #: connect.c:928
2855 msgid "no path specified; see 'git help pull' for valid url syntax"
2856 msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法"
2857
2858 #: connect.c:1123
2859 msgid "ssh variant 'simple' does not support -4"
2860 msgstr "ssh 变体 'simple' 不支持 -4"
2861
2862 #: connect.c:1135
2863 msgid "ssh variant 'simple' does not support -6"
2864 msgstr "ssh 变体 'simple' 不支持 -6"
2865
2866 #: connect.c:1152
2867 msgid "ssh variant 'simple' does not support setting port"
2868 msgstr "ssh 变体 'simple' 不支持设置端口"
2869
2870 #: connect.c:1264
2871 #, c-format
2872 msgid "strange pathname '%s' blocked"
2873 msgstr "已阻止奇怪的路径名 '%s'"
2874
2875 #: connect.c:1311
2876 msgid "unable to fork"
2877 msgstr "无法 fork"
2878
2879 #: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
2880 msgid "Checking connectivity"
2881 msgstr "正在检查连通性"
2882
2883 #: connected.c:110
2884 msgid "Could not run 'git rev-list'"
2885 msgstr "不能执行 'git rev-list'"
2886
2887 #: connected.c:130
2888 msgid "failed write to rev-list"
2889 msgstr "写入 rev-list 失败"
2890
2891 #: connected.c:137
2892 msgid "failed to close rev-list's stdin"
2893 msgstr "关闭 rev-list 的标准输入失败"
2894
2895 #: convert.c:194
2896 #, c-format
2897 msgid "illegal crlf_action %d"
2898 msgstr "非法的 crlf 动作 %d"
2899
2900 #: convert.c:207
2901 #, c-format
2902 msgid "CRLF would be replaced by LF in %s"
2903 msgstr "%s 中的 CRLF 将被 LF 替换"
2904
2905 #: convert.c:209
2906 #, c-format
2907 msgid ""
2908 "CRLF will be replaced by LF in %s.\n"
2909 "The file will have its original line endings in your working directory"
2910 msgstr ""
2911 "%s 中的 CRLF 将被 LF 替换。<\n"
2912 "在工作区中该文件仍保持原有的换行符。"
2913
2914 #: convert.c:217
2915 #, c-format
2916 msgid "LF would be replaced by CRLF in %s"
2917 msgstr "文件 %s 中的 LF 将被 CRLF 替换"
2918
2919 #: convert.c:219
2920 #, c-format
2921 msgid ""
2922 "LF will be replaced by CRLF in %s.\n"
2923 "The file will have its original line endings in your working directory"
2924 msgstr ""
2925 "%s 中的 LF 将被 CRLF 替换。\n"
2926 "在工作区中该文件仍保持原有的换行符"
2927
2928 #: convert.c:284
2929 #, c-format
2930 msgid "BOM is prohibited in '%s' if encoded as %s"
2931 msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
2932
2933 #: convert.c:291
2934 #, c-format
2935 msgid ""
2936 "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
2937 "working-tree-encoding."
2938 msgstr ""
2939 "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%.*s 作为工作区编码。"
2940
2941 #: convert.c:304
2942 #, c-format
2943 msgid "BOM is required in '%s' if encoded as %s"
2944 msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
2945
2946 #: convert.c:306
2947 #, c-format
2948 msgid ""
2949 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
2950 "%sLE (depending on the byte order) as working-tree-encoding."
2951 msgstr ""
2952 "文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
2953 "节序)作为工作区编码。"
2954
2955 #: convert.c:419 convert.c:490
2956 #, c-format
2957 msgid "failed to encode '%s' from %s to %s"
2958 msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
2959
2960 #: convert.c:462
2961 #, c-format
2962 msgid "encoding '%s' from %s to %s and back is not the same"
2963 msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
2964
2965 #: convert.c:668
2966 #, c-format
2967 msgid "cannot fork to run external filter '%s'"
2968 msgstr "不能 fork 以执行外部过滤器 '%s'"
2969
2970 #: convert.c:688
2971 #, c-format
2972 msgid "cannot feed the input to external filter '%s'"
2973 msgstr "不能将输入传递给外部过滤器 '%s'"
2974
2975 #: convert.c:695
2976 #, c-format
2977 msgid "external filter '%s' failed %d"
2978 msgstr "外部过滤器 '%s' 失败码 %d"
2979
2980 #: convert.c:730 convert.c:733
2981 #, c-format
2982 msgid "read from external filter '%s' failed"
2983 msgstr "从外部过滤器 '%s' 读取失败"
2984
2985 #: convert.c:736 convert.c:791
2986 #, c-format
2987 msgid "external filter '%s' failed"
2988 msgstr "外部过滤器 '%s' 失败"
2989
2990 #: convert.c:839
2991 msgid "unexpected filter type"
2992 msgstr "意外的过滤类型"
2993
2994 #: convert.c:850
2995 msgid "path name too long for external filter"
2996 msgstr "外部过滤器的路径名太长"
2997
2998 #: convert.c:924
2999 #, c-format
3000 msgid ""
3001 "external filter '%s' is not available anymore although not all paths have "
3002 "been filtered"
3003 msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤"
3004
3005 #: convert.c:1223
3006 msgid "true/false are no valid working-tree-encodings"
3007 msgstr "true/false 不是有效的工作区编码"
3008
3009 #: convert.c:1411 convert.c:1445
3010 #, c-format
3011 msgid "%s: clean filter '%s' failed"
3012 msgstr "%s:clean 过滤器 '%s' 失败"
3013
3014 #: convert.c:1489
3015 #, c-format
3016 msgid "%s: smudge filter %s failed"
3017 msgstr "%s:smudge 过滤器 %s 失败"
3018
3019 #: date.c:138
3020 msgid "in the future"
3021 msgstr "在将来"
3022
3023 #: date.c:144
3024 #, c-format
3025 msgid "%<PRIuMAX> second ago"
3026 msgid_plural "%<PRIuMAX> seconds ago"
3027 msgstr[0] "%<PRIuMAX> 秒钟前"
3028 msgstr[1] "%<PRIuMAX> 秒钟前"
3029
3030 #: date.c:151
3031 #, c-format
3032 msgid "%<PRIuMAX> minute ago"
3033 msgid_plural "%<PRIuMAX> minutes ago"
3034 msgstr[0] "%<PRIuMAX> 分钟前"
3035 msgstr[1] "%<PRIuMAX> 分钟前"
3036
3037 #: date.c:158
3038 #, c-format
3039 msgid "%<PRIuMAX> hour ago"
3040 msgid_plural "%<PRIuMAX> hours ago"
3041 msgstr[0] "%<PRIuMAX> 小时前"
3042 msgstr[1] "%<PRIuMAX> 小时前"
3043
3044 #: date.c:165
3045 #, c-format
3046 msgid "%<PRIuMAX> day ago"
3047 msgid_plural "%<PRIuMAX> days ago"
3048 msgstr[0] "%<PRIuMAX> 天前"
3049 msgstr[1] "%<PRIuMAX> 天前"
3050
3051 #: date.c:171
3052 #, c-format
3053 msgid "%<PRIuMAX> week ago"
3054 msgid_plural "%<PRIuMAX> weeks ago"
3055 msgstr[0] "%<PRIuMAX> 周前"
3056 msgstr[1] "%<PRIuMAX> 周前"
3057
3058 #: date.c:178
3059 #, c-format
3060 msgid "%<PRIuMAX> month ago"
3061 msgid_plural "%<PRIuMAX> months ago"
3062 msgstr[0] "%<PRIuMAX> 个月前"
3063 msgstr[1] "%<PRIuMAX> 个月前"
3064
3065 #: date.c:189
3066 #, c-format
3067 msgid "%<PRIuMAX> year"
3068 msgid_plural "%<PRIuMAX> years"
3069 msgstr[0] "%<PRIuMAX> 年"
3070 msgstr[1] "%<PRIuMAX> 年"
3071
3072 #. TRANSLATORS: "%s" is "<n> years"
3073 #: date.c:192
3074 #, c-format
3075 msgid "%s, %<PRIuMAX> month ago"
3076 msgid_plural "%s, %<PRIuMAX> months ago"
3077 msgstr[0] "%s %<PRIuMAX> 个月前"
3078 msgstr[1] "%s %<PRIuMAX> 个月前"
3079
3080 #: date.c:197 date.c:202
3081 #, c-format
3082 msgid "%<PRIuMAX> year ago"
3083 msgid_plural "%<PRIuMAX> years ago"
3084 msgstr[0] "%<PRIuMAX> 年前"
3085 msgstr[1] "%<PRIuMAX> 年前"
3086
3087 #: delta-islands.c:272
3088 msgid "Propagating island marks"
3089 msgstr "正在传播数据岛标记"
3090
3091 #: delta-islands.c:290
3092 #, c-format
3093 msgid "bad tree object %s"
3094 msgstr "坏的树对象 %s"
3095
3096 #: delta-islands.c:334
3097 #, c-format
3098 msgid "failed to load island regex for '%s': %s"
3099 msgstr "未能加载 '%s' 的数据岛正则表达式:%s"
3100
3101 #: delta-islands.c:390
3102 #, c-format
3103 msgid "island regex from config has too many capture groups (max=%d)"
3104 msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)"
3105
3106 #: delta-islands.c:467
3107 #, c-format
3108 msgid "Marked %d islands, done.\n"
3109 msgstr "已标记 %d 个数据岛,结束。\n"
3110
3111 #: diffcore-order.c:24
3112 #, c-format
3113 msgid "failed to read orderfile '%s'"
3114 msgstr "读取排序文件 '%s' 失败"
3115
3116 #: diffcore-rename.c:543
3117 msgid "Performing inexact rename detection"
3118 msgstr "正在进行非精确的重命名探测"
3119
3120 #: diff-no-index.c:238
3121 msgid "git diff --no-index [<options>] <path> <path>"
3122 msgstr "git diff --no-index [<选项>] <路径> <路径>"
3123
3124 #: diff-no-index.c:263
3125 msgid ""
3126 "Not a git repository. Use --no-index to compare two paths outside a working "
3127 "tree"
3128 msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径"
3129
3130 # 译者:注意保持前导空格
3131 #: diff.c:155
3132 #, c-format
3133 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3134 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
3135
3136 # 译者:注意保持前导空格
3137 #: diff.c:160
3138 #, c-format
3139 msgid " Unknown dirstat parameter '%s'\n"
3140 msgstr " 未知的 dirstat 参数 '%s'\n"
3141
3142 #: diff.c:296
3143 msgid ""
3144 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3145 "'dimmed-zebra', 'plain'"
3146 msgstr ""
3147 "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
3148 "'plain'"
3149
3150 #: diff.c:324
3151 #, c-format
3152 msgid ""
3153 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
3154 "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
3155 msgstr ""
3156 "未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
3157 "space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
3158
3159 #: diff.c:332
3160 msgid ""
3161 "color-moved-ws: allow-indentation-change cannot be combined with other "
3162 "whitespace modes"
3163 msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用"
3164
3165 #: diff.c:405
3166 #, c-format
3167 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3168 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
3169
3170 #: diff.c:465
3171 #, c-format
3172 msgid ""
3173 "Found errors in 'diff.dirstat' config variable:\n"
3174 "%s"
3175 msgstr ""
3176 "发现配置变量 'diff.dirstat' 中的错误:\n"
3177 "%s"
3178
3179 #: diff.c:4202
3180 #, c-format
3181 msgid "external diff died, stopping at %s"
3182 msgstr "外部 diff 退出,停止在 %s"
3183
3184 #: diff.c:4547
3185 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3186 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
3187
3188 #: diff.c:4550
3189 msgid "-G, -S and --find-object are mutually exclusive"
3190 msgstr "-G、-S 和 --find-object 是互斥的"
3191
3192 #: diff.c:4628
3193 msgid "--follow requires exactly one pathspec"
3194 msgstr "--follow 明确要求只跟一个路径规格"
3195
3196 #: diff.c:4676
3197 #, c-format
3198 msgid "invalid --stat value: %s"
3199 msgstr "无效的 --stat 值:%s"
3200
3201 #: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
3202 #: parse-options.c:197 parse-options.c:201
3203 #, c-format
3204 msgid "%s expects a numerical value"
3205 msgstr "%s 期望一个数字值"
3206
3207 #: diff.c:4713
3208 #, c-format
3209 msgid ""
3210 "Failed to parse --dirstat/-X option parameter:\n"
3211 "%s"
3212 msgstr ""
3213 "无法解析 --dirstat/-X 选项的参数:\n"
3214 "%s"
3215
3216 #: diff.c:4798
3217 #, c-format
3218 msgid "unknown change class '%c' in --diff-filter=%s"
3219 msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
3220
3221 #: diff.c:4822
3222 #, c-format
3223 msgid "unknown value after ws-error-highlight=%.*s"
3224 msgstr "ws-error-highlight=%.*s 之后未知的值"
3225
3226 #: diff.c:4836
3227 #, c-format
3228 msgid "unable to resolve '%s'"
3229 msgstr "不能解析 '%s'"
3230
3231 #: diff.c:4886 diff.c:4892
3232 #, c-format
3233 msgid "%s expects <n>/<m> form"
3234 msgstr "%s 期望 <n>/<m> 格式"
3235
3236 #: diff.c:4904
3237 #, c-format
3238 msgid "%s expects a character, got '%s'"
3239 msgstr "%s 期望一个字符,得到 '%s'"
3240
3241 #: diff.c:4925
3242 #, c-format
3243 msgid "bad --color-moved argument: %s"
3244 msgstr "坏的 --color-moved 参数:%s"
3245
3246 #: diff.c:4944
3247 #, c-format
3248 msgid "invalid mode '%s' in --color-moved-ws"
3249 msgstr "--color-moved-ws 中的无效模式 '%s' "
3250
3251 #: diff.c:4984
3252 msgid ""
3253 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3254 "\"histogram\""
3255 msgstr ""
3256 "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3257
3258 #: diff.c:5020 diff.c:5040
3259 #, c-format
3260 msgid "invalid argument to %s"
3261 msgstr "%s 的参数无效"
3262
3263 #: diff.c:5178
3264 #, c-format
3265 msgid "failed to parse --submodule option parameter: '%s'"
3266 msgstr "无法解析 --submodule 选项的参数:'%s'"
3267
3268 #: diff.c:5234
3269 #, c-format
3270 msgid "bad --word-diff argument: %s"
3271 msgstr "坏的 --word-diff 参数:%s"
3272
3273 #: diff.c:5257
3274 msgid "Diff output format options"
3275 msgstr "差异输出格式化选项"
3276
3277 #: diff.c:5259 diff.c:5265
3278 msgid "generate patch"
3279 msgstr "生成补丁"
3280
3281 #: diff.c:5262 builtin/log.c:173
3282 msgid "suppress diff output"
3283 msgstr "不显示差异输出"
3284
3285 #: diff.c:5267 diff.c:5381 diff.c:5388
3286 msgid "<n>"
3287 msgstr "<n>"
3288
3289 #: diff.c:5268 diff.c:5271
3290 msgid "generate diffs with <n> lines context"
3291 msgstr "生成含 <n> 行上下文的差异"
3292
3293 #: diff.c:5273
3294 msgid "generate the diff in raw format"
3295 msgstr "生成原始格式的差异"
3296
3297 #: diff.c:5276
3298 msgid "synonym for '-p --raw'"
3299 msgstr "和 '-p --raw' 同义"
3300
3301 #: diff.c:5280
3302 msgid "synonym for '-p --stat'"
3303 msgstr "和 '-p --stat' 同义"
3304
3305 #: diff.c:5284
3306 msgid "machine friendly --stat"
3307 msgstr "机器友好的 --stat"
3308
3309 #: diff.c:5287
3310 msgid "output only the last line of --stat"
3311 msgstr "只输出 --stat 的最后一行"
3312
3313 #: diff.c:5289 diff.c:5297
3314 msgid "<param1,param2>..."
3315 msgstr "<参数1,参数2>..."
3316
3317 #: diff.c:5290
3318 msgid ""
3319 "output the distribution of relative amount of changes for each sub-directory"
3320 msgstr "输出每个子目录相对变更的分布"
3321
3322 #: diff.c:5294
3323 msgid "synonym for --dirstat=cumulative"
3324 msgstr "和 --dirstat=cumulative 同义"
3325
3326 #: diff.c:5298
3327 msgid "synonym for --dirstat=files,param1,param2..."
3328 msgstr "是 --dirstat=files,param1,param2... 的同义词"
3329
3330 #: diff.c:5302
3331 msgid "warn if changes introduce conflict markers or whitespace errors"
3332 msgstr "如果变更中引入冲突定界符或空白错误,给出警告"
3333
3334 #: diff.c:5305
3335 msgid "condensed summary such as creations, renames and mode changes"
3336 msgstr "精简摘要,例如创建、重命名和模式变更"
3337
3338 #: diff.c:5308
3339 msgid "show only names of changed files"
3340 msgstr "只显示变更文件的文件名"
3341
3342 #: diff.c:5311
3343 msgid "show only names and status of changed files"
3344 msgstr "只显示变更文件的文件名和状态"
3345
3346 #: diff.c:5313
3347 msgid "<width>[,<name-width>[,<count>]]"
3348 msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3349
3350 #: diff.c:5314
3351 msgid "generate diffstat"
3352 msgstr "生成差异统计(diffstat)"
3353
3354 #: diff.c:5316 diff.c:5319 diff.c:5322
3355 msgid "<width>"
3356 msgstr "<宽度>"
3357
3358 #: diff.c:5317
3359 msgid "generate diffstat with a given width"
3360 msgstr "使用给定的长度生成差异统计"
3361
3362 #: diff.c:5320
3363 msgid "generate diffstat with a given name width"
3364 msgstr "使用给定的文件名长度生成差异统计"
3365
3366 #: diff.c:5323
3367 msgid "generate diffstat with a given graph width"
3368 msgstr "使用给定的图形长度生成差异统计"
3369
3370 #: diff.c:5325
3371 msgid "<count>"
3372 msgstr "<次数>"
3373
3374 #: diff.c:5326
3375 msgid "generate diffstat with limited lines"
3376 msgstr "生成有限行数的差异统计"
3377
3378 #: diff.c:5329
3379 msgid "generate compact summary in diffstat"
3380 msgstr "生成差异统计的简洁摘要"
3381
3382 #: diff.c:5332
3383 msgid "output a binary diff that can be applied"
3384 msgstr "输出一个可以应用的二进制差异"
3385
3386 #: diff.c:5335
3387 msgid "show full pre- and post-image object names on the \"index\" lines"
3388 msgstr "在 \"index\" 行显示完整的前后对象名称"
3389
3390 #: diff.c:5337
3391 msgid "show colored diff"
3392 msgstr "显示带颜色的差异"
3393
3394 #: diff.c:5338
3395 msgid "<kind>"
3396 msgstr "<类型>"
3397
3398 #: diff.c:5339
3399 msgid ""
3400 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3401 "diff"
3402 msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符"
3403
3404 #: diff.c:5342
3405 msgid ""
3406 "do not munge pathnames and use NULs as output field terminators in --raw or "
3407 "--numstat"
3408 msgstr ""
3409 "在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3410 "符"
3411
3412 #: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
3413 msgid "<prefix>"
3414 msgstr "<前缀>"
3415
3416 #: diff.c:5346
3417 msgid "show the given source prefix instead of \"a/\""
3418 msgstr "显示给定的源前缀取代 \"a/\""
3419
3420 #: diff.c:5349
3421 msgid "show the given destination prefix instead of \"b/\""
3422 msgstr "显示给定的目标前缀取代 \"b/\""
3423
3424 #: diff.c:5352
3425 msgid "prepend an additional prefix to every line of output"
3426 msgstr "输出的每一行附加前缀"
3427
3428 #: diff.c:5355
3429 msgid "do not show any source or destination prefix"
3430 msgstr "不显示任何源和目标前缀"
3431
3432 #: diff.c:5358
3433 msgid "show context between diff hunks up to the specified number of lines"
3434 msgstr "显示指定行数的差异块间的上下文"
3435
3436 #: diff.c:5362 diff.c:5367 diff.c:5372
3437 msgid "<char>"
3438 msgstr "<字符>"
3439
3440 #: diff.c:5363
3441 msgid "specify the character to indicate a new line instead of '+'"
3442 msgstr "指定一个字符取代 '+' 来表示新的一行"
3443
3444 #: diff.c:5368
3445 msgid "specify the character to indicate an old line instead of '-'"
3446 msgstr "指定一个字符取代 '-' 来表示旧的一行"
3447
3448 #: diff.c:5373
3449 msgid "specify the character to indicate a context instead of ' '"
3450 msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3451
3452 #: diff.c:5376
3453 msgid "Diff rename options"
3454 msgstr "差异重命名选项"
3455
3456 #: diff.c:5377
3457 msgid "<n>[/<m>]"
3458 msgstr "<n>[/<m>]"
3459
3460 #: diff.c:5378
3461 msgid "break complete rewrite changes into pairs of delete and create"
3462 msgstr "将完全重写的变更打破为成对的删除和创建"
3463
3464 #: diff.c:5382
3465 msgid "detect renames"
3466 msgstr "检测重命名"
3467
3468 #: diff.c:5386
3469 msgid "omit the preimage for deletes"
3470 msgstr "省略删除操作的差异输出"
3471
3472 #: diff.c:5389
3473 msgid "detect copies"
3474 msgstr "检测拷贝"
3475
3476 #: diff.c:5393
3477 msgid "use unmodified files as source to find copies"
3478 msgstr "使用未修改的文件做为发现拷贝的源"
3479
3480 #: diff.c:5395
3481 msgid "disable rename detection"
3482 msgstr "禁用重命名探测"
3483
3484 #: diff.c:5398
3485 msgid "use empty blobs as rename source"
3486 msgstr "使用空的数据对象做为重命名的源"
3487
3488 #: diff.c:5400
3489 msgid "continue listing the history of a file beyond renames"
3490 msgstr "继续列出文件重命名以外的历史记录"
3491
3492 #: diff.c:5403
3493 msgid ""
3494 "prevent rename/copy detection if the number of rename/copy targets exceeds "
3495 "given limit"
3496 msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测"
3497
3498 #: diff.c:5405
3499 msgid "Diff algorithm options"
3500 msgstr "差异算法选项"
3501
3502 #: diff.c:5407
3503 msgid "produce the smallest possible diff"
3504 msgstr "生成尽可能小的差异"
3505
3506 #: diff.c:5410
3507 msgid "ignore whitespace when comparing lines"
3508 msgstr "行比较时忽略空白字符"
3509
3510 #: diff.c:5413
3511 msgid "ignore changes in amount of whitespace"
3512 msgstr "忽略空白字符的变更"
3513
3514 #: diff.c:5416
3515 msgid "ignore changes in whitespace at EOL"
3516 msgstr "忽略行尾的空白字符变更"
3517
3518 #: diff.c:5419
3519 msgid "ignore carrier-return at the end of line"
3520 msgstr "忽略行尾的回车符(CR)"
3521
3522 #: diff.c:5422
3523 msgid "ignore changes whose lines are all blank"
3524 msgstr "忽略整行都是空白的变更"
3525
3526 #: diff.c:5425
3527 msgid "heuristic to shift diff hunk boundaries for easy reading"
3528 msgstr "启发式转换差异边界以便阅读"
3529
3530 #: diff.c:5428
3531 msgid "generate diff using the \"patience diff\" algorithm"
3532 msgstr "使用 \"patience diff\" 算法生成差异"
3533
3534 #: diff.c:5432
3535 msgid "generate diff using the \"histogram diff\" algorithm"
3536 msgstr "使用 \"histogram diff\" 算法生成差异"
3537
3538 #: diff.c:5434
3539 msgid "<algorithm>"
3540 msgstr "<算法>"
3541
3542 #: diff.c:5435
3543 msgid "choose a diff algorithm"
3544 msgstr "选择一个差异算法"
3545
3546 #: diff.c:5437
3547 msgid "<text>"
3548 msgstr "<文本>"
3549
3550 #: diff.c:5438
3551 msgid "generate diff using the \"anchored diff\" algorithm"
3552 msgstr "使用 \"anchored diff\" 算法生成差异"
3553
3554 #: diff.c:5440 diff.c:5449 diff.c:5452
3555 msgid "<mode>"
3556 msgstr "<模式>"
3557
3558 #: diff.c:5441
3559 msgid "show word diff, using <mode> to delimit changed words"
3560 msgstr "显示单词差异,使用 <模式> 分隔变更的单词"
3561
3562 #: diff.c:5443 diff.c:5446 diff.c:5491
3563 msgid "<regex>"
3564 msgstr "<正则>"
3565
3566 #: diff.c:5444
3567 msgid "use <regex> to decide what a word is"
3568 msgstr "使用 <正则表达式> 确定何为一个词"
3569
3570 #: diff.c:5447
3571 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3572 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3573
3574 #: diff.c:5450
3575 msgid "moved lines of code are colored differently"
3576 msgstr "移动的代码行用不同方式着色"
3577
3578 #: diff.c:5453
3579 msgid "how white spaces are ignored in --color-moved"
3580 msgstr "在 --color-moved 下如何忽略空白字符"
3581
3582 #: diff.c:5456
3583 msgid "Other diff options"
3584 msgstr "其它差异选项"
3585
3586 #: diff.c:5458
3587 msgid "when run from subdir, exclude changes outside and show relative paths"
3588 msgstr "当从子目录运行,排除目录之外的变更并显示相对路径"
3589
3590 #: diff.c:5462
3591 msgid "treat all files as text"
3592 msgstr "把所有文件当做文本处理"
3593
3594 #: diff.c:5464
3595 msgid "swap two inputs, reverse the diff"
3596 msgstr "交换两个输入,反转差异"
3597
3598 #: diff.c:5466
3599 msgid "exit with 1 if there were differences, 0 otherwise"
3600 msgstr "有差异时退出码为 1,否则为 0"
3601
3602 #: diff.c:5468
3603 msgid "disable all output of the program"
3604 msgstr "禁用本程序的所有输出"
3605
3606 #: diff.c:5470
3607 msgid "allow an external diff helper to be executed"
3608 msgstr "允许执行一个外置的差异助手"
3609
3610 #: diff.c:5472
3611 msgid "run external text conversion filters when comparing binary files"
3612 msgstr "当比较二进制文件时,运行外部的文本转换过滤器"
3613
3614 #: diff.c:5474
3615 msgid "<when>"
3616 msgstr "<何时>"
3617
3618 #: diff.c:5475
3619 msgid "ignore changes to submodules in the diff generation"
3620 msgstr "在生成差异时,忽略子模组的更改"
3621
3622 #: diff.c:5478
3623 msgid "<format>"
3624 msgstr "<格式>"
3625
3626 #: diff.c:5479
3627 msgid "specify how differences in submodules are shown"
3628 msgstr "指定子模组的差异如何显示"
3629
3630 #: diff.c:5483
3631 msgid "hide 'git add -N' entries from the index"
3632 msgstr "隐藏索引中 'git add -N' 条目"
3633
3634 #: diff.c:5486
3635 msgid "treat 'git add -N' entries as real in the index"
3636 msgstr "将索引中 'git add -N' 条目当做真实的"
3637
3638 #: diff.c:5488
3639 msgid "<string>"
3640 msgstr "<字符串>"
3641
3642 #: diff.c:5489
3643 msgid ""
3644 "look for differences that change the number of occurrences of the specified "
3645 "string"
3646 msgstr "查找改变了指定字符串出现次数的差异"
3647
3648 #: diff.c:5492
3649 msgid ""
3650 "look for differences that change the number of occurrences of the specified "
3651 "regex"
3652 msgstr "查找改变指定正则匹配出现次数的差异"
3653
3654 #: diff.c:5495
3655 msgid "show all changes in the changeset with -S or -G"
3656 msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3657
3658 #: diff.c:5498
3659 msgid "treat <string> in -S as extended POSIX regular expression"
3660 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3661
3662 #: diff.c:5501
3663 msgid "control the order in which files appear in the output"
3664 msgstr "控制输出中的文件显示顺序"
3665
3666 #: diff.c:5502
3667 msgid "<object-id>"
3668 msgstr "<对象 ID>"
3669
3670 #: diff.c:5503
3671 msgid ""
3672 "look for differences that change the number of occurrences of the specified "
3673 "object"
3674 msgstr "查找改变指定对象出现次数的差异"
3675
3676 #: diff.c:5505
3677 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3678 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3679
3680 #: diff.c:5506
3681 msgid "select files by diff type"
3682 msgstr "通过差异类型选择文件"
3683
3684 #: diff.c:5508
3685 msgid "<file>"
3686 msgstr "<文件>"
3687
3688 #: diff.c:5509
3689 msgid "Output to a specific file"
3690 msgstr "输出到一个指定的文件"
3691
3692 #: diff.c:6164
3693 msgid "inexact rename detection was skipped due to too many files."
3694 msgstr "因为文件太多,略过不严格的重命名检查。"
3695
3696 #: diff.c:6167
3697 msgid "only found copies from modified paths due to too many files."
3698 msgstr "因为文件太多,只在修改的路径中查找拷贝。"
3699
3700 #: diff.c:6170
3701 #, c-format
3702 msgid ""
3703 "you may want to set your %s variable to at least %d and retry the command."
3704 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
3705
3706 #: dir.c:555
3707 #, c-format
3708 msgid "pathspec '%s' did not match any file(s) known to git"
3709 msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
3710
3711 #: dir.c:695 dir.c:724 dir.c:737
3712 #, c-format
3713 msgid "unrecognized pattern: '%s'"
3714 msgstr "未识别的模式:'%s'"
3715
3716 #: dir.c:754 dir.c:768
3717 #, c-format
3718 msgid "unrecognized negative pattern: '%s'"
3719 msgstr "未识别的反向模式:'%s'"
3720
3721 #: dir.c:786
3722 #, c-format
3723 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3724 msgstr "您的 sparse-checkout 文件可能有问题:重复的模式 '%s'"
3725
3726 #: dir.c:796
3727 msgid "disabling cone pattern matching"
3728 msgstr "禁止 cone 模式匹配"
3729
3730 #: dir.c:1173
3731 #, c-format
3732 msgid "cannot use %s as an exclude file"
3733 msgstr "不能将 %s 用作排除文件"
3734
3735 #: dir.c:2144
3736 #, c-format
3737 msgid "could not open directory '%s'"
3738 msgstr "不能打开目录 '%s'"
3739
3740 #: dir.c:2479
3741 msgid "failed to get kernel name and information"
3742 msgstr "无法获得内核名称和信息"
3743
3744 #: dir.c:2603
3745 msgid "untracked cache is disabled on this system or location"
3746 msgstr "缓存未跟踪文件在本系统或位置中被禁用"
3747
3748 #: dir.c:3407
3749 #, c-format
3750 msgid "index file corrupt in repo %s"
3751 msgstr "仓库 %s 中的索引文件损坏"
3752
3753 #: dir.c:3452 dir.c:3457
3754 #, c-format
3755 msgid "could not create directories for %s"
3756 msgstr "不能为 %s 创建目录"
3757
3758 #: dir.c:3486
3759 #, c-format
3760 msgid "could not migrate git directory from '%s' to '%s'"
3761 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
3762
3763 #: editor.c:73
3764 #, c-format
3765 msgid "hint: Waiting for your editor to close the file...%c"
3766 msgstr "提示:等待您的编辑器关闭文件...%c"
3767
3768 #: entry.c:178
3769 msgid "Filtering content"
3770 msgstr "过滤内容"
3771
3772 #: entry.c:476
3773 #, c-format
3774 msgid "could not stat file '%s'"
3775 msgstr "不能对文件 '%s' 调用 stat"
3776
3777 #: environment.c:149
3778 #, c-format
3779 msgid "bad git namespace path \"%s\""
3780 msgstr "错误的 git 名字空间路径 \"%s\""
3781
3782 #: environment.c:331
3783 #, c-format
3784 msgid "could not set GIT_DIR to '%s'"
3785 msgstr "不能设置 GIT_DIR 为 '%s'"
3786
3787 #: exec-cmd.c:363
3788 #, c-format
3789 msgid "too many args to run %s"
3790 msgstr "执行 %s 的参数太多"
3791
3792 #: fetch-pack.c:150
3793 msgid "git fetch-pack: expected shallow list"
3794 msgstr "git fetch-pack:应为 shallow 列表"
3795
3796 #: fetch-pack.c:153
3797 msgid "git fetch-pack: expected a flush packet after shallow list"
3798 msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包"
3799
3800 #: fetch-pack.c:164
3801 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
3802 msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
3803
3804 #: fetch-pack.c:184
3805 #, c-format
3806 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
3807 msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
3808
3809 #: fetch-pack.c:195
3810 msgid "unable to write to remote"
3811 msgstr "无法写到远程"
3812
3813 #: fetch-pack.c:257
3814 msgid "--stateless-rpc requires multi_ack_detailed"
3815 msgstr "--stateless-rpc 需要 multi_ack_detailed"
3816
3817 #: fetch-pack.c:356 fetch-pack.c:1340
3818 #, c-format
3819 msgid "invalid shallow line: %s"
3820 msgstr "无效的 shallow 信息:%s"
3821
3822 #: fetch-pack.c:362 fetch-pack.c:1346
3823 #, c-format
3824 msgid "invalid unshallow line: %s"
3825 msgstr "无效的 unshallow 信息:%s"
3826
3827 #: fetch-pack.c:364 fetch-pack.c:1348
3828 #, c-format
3829 msgid "object not found: %s"
3830 msgstr "对象未找到:%s"
3831
3832 #: fetch-pack.c:367 fetch-pack.c:1351
3833 #, c-format
3834 msgid "error in object: %s"
3835 msgstr "对象中出错:%s"
3836
3837 #: fetch-pack.c:369 fetch-pack.c:1353
3838 #, c-format
3839 msgid "no shallow found: %s"
3840 msgstr "未发现 shallow:%s"
3841
3842 #: fetch-pack.c:372 fetch-pack.c:1357
3843 #, c-format
3844 msgid "expected shallow/unshallow, got %s"
3845 msgstr "应为 shallow/unshallow,却得到 %s"
3846
3847 #: fetch-pack.c:414
3848 #, c-format
3849 msgid "got %s %d %s"
3850 msgstr "得到 %s %d %s"
3851
3852 #: fetch-pack.c:431
3853 #, c-format
3854 msgid "invalid commit %s"
3855 msgstr "无效提交 %s"
3856
3857 #: fetch-pack.c:462
3858 msgid "giving up"
3859 msgstr "放弃"
3860
3861 #: fetch-pack.c:475 progress.c:323
3862 msgid "done"
3863 msgstr "完成"
3864
3865 #: fetch-pack.c:487
3866 #, c-format
3867 msgid "got %s (%d) %s"
3868 msgstr "得到 %s (%d) %s"
3869
3870 #: fetch-pack.c:533
3871 #, c-format
3872 msgid "Marking %s as complete"
3873 msgstr "标记 %s 为完成"
3874
3875 #: fetch-pack.c:754
3876 #, c-format
3877 msgid "already have %s (%s)"
3878 msgstr "已经有 %s(%s)"
3879
3880 #: fetch-pack.c:818
3881 msgid "fetch-pack: unable to fork off sideband demultiplexer"
3882 msgstr "fetch-pack:无法派生 sideband 多路输出"
3883
3884 #: fetch-pack.c:826
3885 msgid "protocol error: bad pack header"
3886 msgstr "协议错误:坏的包头"
3887
3888 #: fetch-pack.c:900
3889 #, c-format
3890 msgid "fetch-pack: unable to fork off %s"
3891 msgstr "fetch-pack:无法派生进程 %s"
3892
3893 #: fetch-pack.c:916
3894 #, c-format
3895 msgid "%s failed"
3896 msgstr "%s 失败"
3897
3898 #: fetch-pack.c:918
3899 msgid "error in sideband demultiplexer"
3900 msgstr "sideband 多路输出出错"
3901
3902 #: fetch-pack.c:965
3903 #, c-format
3904 msgid "Server version is %.*s"
3905 msgstr "服务器版本 %.*s"
3906
3907 #: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
3908 #: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
3909 #: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
3910 #: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
3911 #, c-format
3912 msgid "Server supports %s"
3913 msgstr "服务器支持 %s"
3914
3915 #: fetch-pack.c:972
3916 msgid "Server does not support shallow clients"
3917 msgstr "服务器不支持 shalllow 客户端"
3918
3919 #: fetch-pack.c:1032
3920 msgid "Server does not support --shallow-since"
3921 msgstr "服务器不支持 --shallow-since"
3922
3923 #: fetch-pack.c:1037
3924 msgid "Server does not support --shallow-exclude"
3925 msgstr "服务器不支持 --shallow-exclude"
3926
3927 #: fetch-pack.c:1041
3928 msgid "Server does not support --deepen"
3929 msgstr "服务器不支持 --deepen"
3930
3931 #: fetch-pack.c:1058
3932 msgid "no common commits"
3933 msgstr "没有共同的提交"
3934
3935 #: fetch-pack.c:1070 fetch-pack.c:1536
3936 msgid "git fetch-pack: fetch failed."
3937 msgstr "git fetch-pack:获取失败。"
3938
3939 #: fetch-pack.c:1209
3940 msgid "Server does not support shallow requests"
3941 msgstr "服务器不支持 shalllow 请求"
3942
3943 #: fetch-pack.c:1216
3944 msgid "Server supports filter"
3945 msgstr "服务器支持 filter"
3946
3947 #: fetch-pack.c:1239
3948 msgid "unable to write request to remote"
3949 msgstr "无法将请求写到远程"
3950
3951 #: fetch-pack.c:1257
3952 #, c-format
3953 msgid "error reading section header '%s'"
3954 msgstr "读取节标题 '%s' 出错"
3955
3956 #: fetch-pack.c:1263
3957 #, c-format
3958 msgid "expected '%s', received '%s'"
3959 msgstr "预期 '%s',得到 '%s'"
3960
3961 #: fetch-pack.c:1303
3962 #, c-format
3963 msgid "unexpected acknowledgment line: '%s'"
3964 msgstr "意外的确认行:'%s'"
3965
3966 #: fetch-pack.c:1308
3967 #, c-format
3968 msgid "error processing acks: %d"
3969 msgstr "处理 ack 出错:%d"
3970
3971 #: fetch-pack.c:1318
3972 msgid "expected packfile to be sent after 'ready'"
3973 msgstr "预期在 'ready' 之后发送 packfile"
3974
3975 #: fetch-pack.c:1320
3976 msgid "expected no other sections to be sent after no 'ready'"
3977 msgstr "在没有 'ready' 不应该发送其它小节"
3978
3979 #: fetch-pack.c:1362
3980 #, c-format
3981 msgid "error processing shallow info: %d"
3982 msgstr "处理浅克隆信息出错:%d"
3983
3984 #: fetch-pack.c:1409
3985 #, c-format
3986 msgid "expected wanted-ref, got '%s'"
3987 msgstr "预期 wanted-ref,得到 '%s'"
3988
3989 #: fetch-pack.c:1414
3990 #, c-format
3991 msgid "unexpected wanted-ref: '%s'"
3992 msgstr "意外的 wanted-ref:'%s'"
3993
3994 #: fetch-pack.c:1419
3995 #, c-format
3996 msgid "error processing wanted refs: %d"
3997 msgstr "处理要获取的引用出错:%d"
3998
3999 #: fetch-pack.c:1762
4000 msgid "no matching remote head"
4001 msgstr "没有匹配的远程分支"
4002
4003 #: fetch-pack.c:1785 builtin/clone.c:689
4004 msgid "remote did not send all necessary objects"
4005 msgstr "远程没有发送所有必需的对象"
4006
4007 #: fetch-pack.c:1812
4008 #, c-format
4009 msgid "no such remote ref %s"
4010 msgstr "没有这样的远程引用 %s"
4011
4012 #: fetch-pack.c:1815
4013 #, c-format
4014 msgid "Server does not allow request for unadvertised object %s"
4015 msgstr "服务器不允许请求未公开的对象 %s"
4016
4017 #: gpg-interface.c:408
4018 msgid "gpg failed to sign the data"
4019 msgstr "gpg 数据签名失败"
4020
4021 #: gpg-interface.c:434
4022 msgid "could not create temporary file"
4023 msgstr "不能创建临时文件"
4024
4025 #: gpg-interface.c:437
4026 #, c-format
4027 msgid "failed writing detached signature to '%s'"
4028 msgstr "无法将分离式签名写入 '%s'"
4029
4030 #: graph.c:98
4031 #, c-format
4032 msgid "ignore invalid color '%.*s' in log.graphColors"
4033 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
4034
4035 #: grep.c:668
4036 msgid ""
4037 "given pattern contains NULL byte (via -f <file>). This is only supported "
4038 "with -P under PCRE v2"
4039 msgstr ""
4040 "给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此"
4041 "功能"
4042
4043 #: grep.c:2128
4044 #, c-format
4045 msgid "'%s': unable to read %s"
4046 msgstr "'%s':无法读取 %s"
4047
4048 #: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
4049 #: builtin/rm.c:135
4050 #, c-format
4051 msgid "failed to stat '%s'"
4052 msgstr "对 '%s' 调用 stat 失败"
4053
4054 #: grep.c:2156
4055 #, c-format
4056 msgid "'%s': short read"
4057 msgstr "'%s':读取不完整"
4058
4059 #: help.c:23
4060 msgid "start a working area (see also: git help tutorial)"
4061 msgstr "开始一个工作区(参见:git help tutorial)"
4062
4063 #: help.c:24
4064 msgid "work on the current change (see also: git help everyday)"
4065 msgstr "在当前变更上工作(参见:git help everyday)"
4066
4067 #: help.c:25
4068 msgid "examine the history and state (see also: git help revisions)"
4069 msgstr "检查历史和状态(参见:git help revisions)"
4070
4071 #: help.c:26
4072 msgid "grow, mark and tweak your common history"
4073 msgstr "扩展、标记和调校您的历史记录"
4074
4075 #: help.c:27
4076 msgid "collaborate (see also: git help workflows)"
4077 msgstr "协同(参见:git help workflows)"
4078
4079 #: help.c:31
4080 msgid "Main Porcelain Commands"
4081 msgstr "主要的上层命令"
4082
4083 #: help.c:32
4084 msgid "Ancillary Commands / Manipulators"
4085 msgstr "辅助命令/操作者"
4086
4087 #: help.c:33
4088 msgid "Ancillary Commands / Interrogators"
4089 msgstr "辅助命令/询问者"
4090
4091 #: help.c:34
4092 msgid "Interacting with Others"
4093 msgstr "与其它系统交互"
4094
4095 #: help.c:35
4096 msgid "Low-level Commands / Manipulators"
4097 msgstr "低级命令/操作者"
4098
4099 #: help.c:36
4100 msgid "Low-level Commands / Interrogators"
4101 msgstr "低级命令/询问者"
4102
4103 #: help.c:37
4104 msgid "Low-level Commands / Syncing Repositories"
4105 msgstr "低级命令/同步仓库"
4106
4107 #: help.c:38
4108 msgid "Low-level Commands / Internal Helpers"
4109 msgstr "低级命令/内部助手"
4110
4111 #: help.c:298
4112 #, c-format
4113 msgid "available git commands in '%s'"
4114 msgstr "在 '%s' 下可用的 git 命令"
4115
4116 #: help.c:305
4117 msgid "git commands available from elsewhere on your $PATH"
4118 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
4119
4120 #: help.c:314
4121 msgid "These are common Git commands used in various situations:"
4122 msgstr "这些是各种场合常见的 Git 命令:"
4123
4124 #: help.c:363 git.c:98
4125 #, c-format
4126 msgid "unsupported command listing type '%s'"
4127 msgstr "不支持的命令列表类型 '%s'"
4128
4129 #: help.c:403
4130 msgid "The common Git guides are:"
4131 msgstr "最常用的 Git 向导有:"
4132
4133 #: help.c:512
4134 msgid "See 'git help <command>' to read about a specific subcommand"
4135 msgstr "执行 'git help <command>' 来查看特定子命令"
4136
4137 #: help.c:517
4138 msgid "External commands"
4139 msgstr "外部命令"
4140
4141 #: help.c:532
4142 msgid "Command aliases"
4143 msgstr "命令别名"
4144
4145 #: help.c:596
4146 #, c-format
4147 msgid ""
4148 "'%s' appears to be a git command, but we were not\n"
4149 "able to execute it. Maybe git-%s is broken?"
4150 msgstr ""
4151 "'%s' 像是一个 git 命令,但却无法运行。\n"
4152 "可能是 git-%s 受损?"
4153
4154 #: help.c:655
4155 msgid "Uh oh. Your system reports no Git commands at all."
4156 msgstr "唉呀,您的系统中未发现 Git 命令。"
4157
4158 #: help.c:677
4159 #, c-format
4160 msgid "WARNING: You called a Git command named '%s', which does not exist."
4161 msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
4162
4163 #: help.c:682
4164 #, c-format
4165 msgid "Continuing under the assumption that you meant '%s'."
4166 msgstr "假定你想要的是 '%s' 并继续。"
4167
4168 #: help.c:687
4169 #, c-format
4170 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
4171 msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
4172
4173 #: help.c:695
4174 #, c-format
4175 msgid "git: '%s' is not a git command. See 'git --help'."
4176 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
4177
4178 #: help.c:699
4179 msgid ""
4180 "\n"
4181 "The most similar command is"
4182 msgid_plural ""
4183 "\n"
4184 "The most similar commands are"
4185 msgstr[0] ""
4186 "\n"
4187 "最相似的命令是"
4188 msgstr[1] ""
4189 "\n"
4190 "最相似的命令是"
4191
4192 #: help.c:714
4193 msgid "git version [<options>]"
4194 msgstr "git version [<选项>]"
4195
4196 #: help.c:783
4197 #, c-format
4198 msgid "%s: %s - %s"
4199 msgstr "%s:%s - %s"
4200
4201 #: help.c:787
4202 msgid ""
4203 "\n"
4204 "Did you mean this?"
4205 msgid_plural ""
4206 "\n"
4207 "Did you mean one of these?"
4208 msgstr[0] ""
4209 "\n"
4210 "您指的是这个么?"
4211 msgstr[1] ""
4212 "\n"
4213 "您指的是这其中的某一个么?"
4214
4215 #: ident.c:349
4216 msgid ""
4217 "\n"
4218 "*** Please tell me who you are.\n"
4219 "\n"
4220 "Run\n"
4221 "\n"
4222 " git config --global user.email \"you@example.com\"\n"
4223 " git config --global user.name \"Your Name\"\n"
4224 "\n"
4225 "to set your account's default identity.\n"
4226 "Omit --global to set the identity only in this repository.\n"
4227 "\n"
4228 msgstr ""
4229 "\n"
4230 "*** 请告诉我你是谁。\n"
4231 "\n"
4232 "运行\n"
4233 "\n"
4234 " git config --global user.email \"you@example.com\"\n"
4235 " git config --global user.name \"Your Name\"\n"
4236 "\n"
4237 "来设置您账号的缺省身份标识。\n"
4238 "如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
4239
4240 #: ident.c:379
4241 msgid "no email was given and auto-detection is disabled"
4242 msgstr "未提供邮件地址且自动探测被禁用"
4243
4244 #: ident.c:384
4245 #, c-format
4246 msgid "unable to auto-detect email address (got '%s')"
4247 msgstr "无法自动探测邮件地址(得到 '%s')"
4248
4249 #: ident.c:401
4250 msgid "no name was given and auto-detection is disabled"
4251 msgstr "未提供姓名且自动探测被禁用"
4252
4253 #: ident.c:407
4254 #, c-format
4255 msgid "unable to auto-detect name (got '%s')"
4256 msgstr "无法自动探测姓名(得到 '%s')"
4257
4258 #: ident.c:415
4259 #, c-format
4260 msgid "empty ident name (for <%s>) not allowed"
4261 msgstr "不允许空的姓名(对于 <%s>)"
4262
4263 #: ident.c:421
4264 #, c-format
4265 msgid "name consists only of disallowed characters: %s"
4266 msgstr "姓名中仅包含禁用字符:%s"
4267
4268 #: ident.c:436 builtin/commit.c:635
4269 #, c-format
4270 msgid "invalid date format: %s"
4271 msgstr "无效的日期格式:%s"
4272
4273 #: list-objects.c:127
4274 #, c-format
4275 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4276 msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性,但不是一个树对象"
4277
4278 #: list-objects.c:140
4279 #, c-format
4280 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4281 msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性,但不是一个数据对象"
4282
4283 #: list-objects.c:375
4284 #, c-format
4285 msgid "unable to load root tree for commit %s"
4286 msgstr "无法为提交 %s 加载根树"
4287
4288 #: list-objects-filter.c:492
4289 #, c-format
4290 msgid "unable to access sparse blob in '%s'"
4291 msgstr "不能访问 '%s' 中的稀疏数据对象"
4292
4293 #: list-objects-filter.c:495
4294 #, c-format
4295 msgid "unable to parse sparse filter data in %s"
4296 msgstr "无法解析 %s 中的稀疏过滤器数据"
4297
4298 #: list-objects-filter-options.c:58
4299 msgid "expected 'tree:<depth>'"
4300 msgstr "期望 'tree:<深度>'"
4301
4302 #: list-objects-filter-options.c:73
4303 msgid "sparse:path filters support has been dropped"
4304 msgstr "sparse:path 过滤器支持已被删除"
4305
4306 #: list-objects-filter-options.c:86
4307 #, c-format
4308 msgid "invalid filter-spec '%s'"
4309 msgstr "无效的过滤器表达式 '%s'"
4310
4311 #: list-objects-filter-options.c:102
4312 #, c-format
4313 msgid "must escape char in sub-filter-spec: '%c'"
4314 msgstr "必须对 sub-filter-spec 中的字符进行转义:'%c'"
4315
4316 #: list-objects-filter-options.c:144
4317 msgid "expected something after combine:"
4318 msgstr "期望在组合后有一些东西:"
4319
4320 #: list-objects-filter-options.c:226
4321 msgid "multiple filter-specs cannot be combined"
4322 msgstr "不能混用多种过滤规格"
4323
4324 #: lockfile.c:151
4325 #, c-format
4326 msgid ""
4327 "Unable to create '%s.lock': %s.\n"
4328 "\n"
4329 "Another git process seems to be running in this repository, e.g.\n"
4330 "an editor opened by 'git commit'. Please make sure all processes\n"
4331 "are terminated then try again. If it still fails, a git process\n"
4332 "may have crashed in this repository earlier:\n"
4333 "remove the file manually to continue."
4334 msgstr ""
4335 "无法创建 '%s.lock':%s。\n"
4336 "\n"
4337 "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
4338 "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
4339 "可能之前有一个 git 进程在这个仓库中异常退出:\n"
4340 "手动删除这个文件再继续。"
4341
4342 #: lockfile.c:159
4343 #, c-format
4344 msgid "Unable to create '%s.lock': %s"
4345 msgstr "不能创建 '%s.lock':%s"
4346
4347 #: merge.c:41
4348 msgid "failed to read the cache"
4349 msgstr "读取缓存失败"
4350
4351 #: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
4352 #: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
4353 #: builtin/stash.c:265
4354 msgid "unable to write new index file"
4355 msgstr "无法写新的索引文件"
4356
4357 #: merge-recursive.c:356
4358 msgid "(bad commit)\n"
4359 msgstr "(坏提交)\n"
4360
4361 #: merge-recursive.c:379
4362 #, c-format
4363 msgid "add_cacheinfo failed for path '%s'; merge aborting."
4364 msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。"
4365
4366 #: merge-recursive.c:388
4367 #, c-format
4368 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
4369 msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。"
4370
4371 #: merge-recursive.c:874
4372 #, c-format
4373 msgid "failed to create path '%s'%s"
4374 msgstr "创建路径 '%s'%s 失败"
4375
4376 #: merge-recursive.c:885
4377 #, c-format
4378 msgid "Removing %s to make room for subdirectory\n"
4379 msgstr "删除 %s 以便为子目录留出空间\n"
4380
4381 #: merge-recursive.c:899 merge-recursive.c:918
4382 msgid ": perhaps a D/F conflict?"
4383 msgstr ":可能是一个目录/文件冲突?"
4384
4385 #: merge-recursive.c:908
4386 #, c-format
4387 msgid "refusing to lose untracked file at '%s'"
4388 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
4389
4390 #: merge-recursive.c:949 builtin/cat-file.c:41
4391 #, c-format
4392 msgid "cannot read object %s '%s'"
4393 msgstr "不能读取对象 %s '%s'"
4394
4395 #: merge-recursive.c:954
4396 #, c-format
4397 msgid "blob expected for %s '%s'"
4398 msgstr "%s '%s' 应为数据对象"
4399
4400 #: merge-recursive.c:979
4401 #, c-format
4402 msgid "failed to open '%s': %s"
4403 msgstr "打开 '%s' 失败:%s"
4404
4405 #: merge-recursive.c:990
4406 #, c-format
4407 msgid "failed to symlink '%s': %s"
4408 msgstr "创建符号链接 '%s' 失败:%s"
4409
4410 #: merge-recursive.c:995
4411 #, c-format
4412 msgid "do not know what to do with %06o %s '%s'"
4413 msgstr "不知道如何处理 %06o %s '%s'"
4414
4415 #: merge-recursive.c:1191
4416 #, c-format
4417 msgid "Failed to merge submodule %s (not checked out)"
4418 msgstr "无法合并子模组 %s (没有检出)"
4419
4420 #: merge-recursive.c:1198
4421 #, c-format
4422 msgid "Failed to merge submodule %s (commits not present)"
4423 msgstr "无法合并子模组 %s(提交不存在)"
4424
4425 #: merge-recursive.c:1205
4426 #, c-format
4427 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4428 msgstr "无法合并子模组 %s (提交未跟随合并基线)"
4429
4430 #: merge-recursive.c:1213 merge-recursive.c:1225
4431 #, c-format
4432 msgid "Fast-forwarding submodule %s to the following commit:"
4433 msgstr "子模组 %s 快进到如下提交:"
4434
4435 #: merge-recursive.c:1216 merge-recursive.c:1228
4436 #, c-format
4437 msgid "Fast-forwarding submodule %s"
4438 msgstr "快进子模组 %s"
4439
4440 #: merge-recursive.c:1251
4441 #, c-format
4442 msgid "Failed to merge submodule %s (merge following commits not found)"
4443 msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
4444
4445 #: merge-recursive.c:1255
4446 #, c-format
4447 msgid "Failed to merge submodule %s (not fast-forward)"
4448 msgstr "无法合并子模组 %s(非快进)"
4449
4450 #: merge-recursive.c:1256
4451 msgid "Found a possible merge resolution for the submodule:\n"
4452 msgstr "找到子模组的一个可能的合并方案:\n"
4453
4454 #: merge-recursive.c:1259
4455 #, c-format
4456 msgid ""
4457 "If this is correct simply add it to the index for example\n"
4458 "by using:\n"
4459 "\n"
4460 " git update-index --cacheinfo 160000 %s \"%s\"\n"
4461 "\n"
4462 "which will accept this suggestion.\n"
4463 msgstr ""
4464 "如果这个正确,将其添加到索引,例如使用命令:\n"
4465 "\n"
4466 " git update-index --cacheinfo 160000 %s \"%s\"\n"
4467 "\n"
4468 "以接受此建议。\n"
4469
4470 #: merge-recursive.c:1268
4471 #, c-format
4472 msgid "Failed to merge submodule %s (multiple merges found)"
4473 msgstr "无法合并子模组 %s (发现多个合并)"
4474
4475 #: merge-recursive.c:1341
4476 msgid "Failed to execute internal merge"
4477 msgstr "无法执行内部合并"
4478
4479 #: merge-recursive.c:1346
4480 #, c-format
4481 msgid "Unable to add %s to database"
4482 msgstr "不能添加 %s 至对象库"
4483
4484 #: merge-recursive.c:1378
4485 #, c-format
4486 msgid "Auto-merging %s"
4487 msgstr "自动合并 %s"
4488
4489 #: merge-recursive.c:1402
4490 #, c-format
4491 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
4492 msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
4493
4494 #: merge-recursive.c:1474
4495 #, c-format
4496 msgid ""
4497 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4498 "in tree."
4499 msgstr ""
4500 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4501 "本被保留。"
4502
4503 #: merge-recursive.c:1479
4504 #, c-format
4505 msgid ""
4506 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4507 "left in tree."
4508 msgstr ""
4509 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4510 "%7$s 版本被保留。"
4511
4512 #: merge-recursive.c:1486
4513 #, c-format
4514 msgid ""
4515 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4516 "in tree at %s."
4517 msgstr ""
4518 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4519 "本保留在 %8$s 中。"
4520
4521 #: merge-recursive.c:1491
4522 #, c-format
4523 msgid ""
4524 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4525 "left in tree at %s."
4526 msgstr ""
4527 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4528 "%7$s 版本保留在 %9$s 中。"
4529
4530 #: merge-recursive.c:1526
4531 msgid "rename"
4532 msgstr "重命名"
4533
4534 #: merge-recursive.c:1526
4535 msgid "renamed"
4536 msgstr "重命名"
4537
4538 #: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
4539 #, c-format
4540 msgid "Refusing to lose dirty file at %s"
4541 msgstr "拒绝丢失脏文件 '%s'"
4542
4543 #: merge-recursive.c:1587
4544 #, c-format
4545 msgid "Refusing to lose untracked file at %s, even though it's in the way."
4546 msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。"
4547
4548 #: merge-recursive.c:1645
4549 #, c-format
4550 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4551 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
4552
4553 #: merge-recursive.c:1676
4554 #, c-format
4555 msgid "%s is a directory in %s adding as %s instead"
4556 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
4557
4558 #: merge-recursive.c:1681
4559 #, c-format
4560 msgid "Refusing to lose untracked file at %s; adding as %s instead"
4561 msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
4562
4563 #: merge-recursive.c:1708
4564 #, c-format
4565 msgid ""
4566 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
4567 "\"->\"%s\" in \"%s\"%s"
4568 msgstr ""
4569 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
4570 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
4571
4572 #: merge-recursive.c:1713
4573 msgid " (left unresolved)"
4574 msgstr "(留下未解决)"
4575
4576 #: merge-recursive.c:1793
4577 #, c-format
4578 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
4579 msgstr ""
4580 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
4581 "%5$s"
4582
4583 #: merge-recursive.c:2056
4584 #, c-format
4585 msgid ""
4586 "CONFLICT (directory rename split): Unclear where to place %s because "
4587 "directory %s was renamed to multiple other directories, with no destination "
4588 "getting a majority of the files."
4589 msgstr ""
4590 "冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
4591 "其它目录,没有目录包含大部分文件。"
4592
4593 #: merge-recursive.c:2088
4594 #, c-format
4595 msgid ""
4596 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4597 "implicit directory rename(s) putting the following path(s) there: %s."
4598 msgstr ""
4599 "冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
4600 "在:%s。"
4601
4602 #: merge-recursive.c:2098
4603 #, c-format
4604 msgid ""
4605 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4606 "implicit directory renames tried to put these paths there: %s"
4607 msgstr ""
4608 "冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
4609 "径放置于此:%s"
4610
4611 #: merge-recursive.c:2190
4612 #, c-format
4613 msgid ""
4614 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
4615 ">%s in %s"
4616 msgstr ""
4617 "冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
4618 "%4$s->%5$s"
4619
4620 #: merge-recursive.c:2435
4621 #, c-format
4622 msgid ""
4623 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4624 "renamed."
4625 msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
4626
4627 #: merge-recursive.c:2961
4628 #, c-format
4629 msgid "cannot read object %s"
4630 msgstr "不能读取对象 %s"
4631
4632 #: merge-recursive.c:2964
4633 #, c-format
4634 msgid "object %s is not a blob"
4635 msgstr "对象 %s 不是一个数据对象"
4636
4637 #: merge-recursive.c:3028
4638 msgid "modify"
4639 msgstr "修改"
4640
4641 #: merge-recursive.c:3028
4642 msgid "modified"
4643 msgstr "修改"
4644
4645 #: merge-recursive.c:3040
4646 msgid "content"
4647 msgstr "内容"
4648
4649 #: merge-recursive.c:3044
4650 msgid "add/add"
4651 msgstr "添加/添加"
4652
4653 #: merge-recursive.c:3067
4654 #, c-format
4655 msgid "Skipped %s (merged same as existing)"
4656 msgstr "略过 %s(已经做过相同合并)"
4657
4658 #: merge-recursive.c:3089 git-submodule.sh:1003
4659 msgid "submodule"
4660 msgstr "子模组"
4661
4662 #: merge-recursive.c:3090
4663 #, c-format
4664 msgid "CONFLICT (%s): Merge conflict in %s"
4665 msgstr "冲突(%s):合并冲突于 %s"
4666
4667 #: merge-recursive.c:3120
4668 #, c-format
4669 msgid "Adding as %s instead"
4670 msgstr "而是以 %s 为名添加"
4671
4672 #: merge-recursive.c:3203
4673 #, c-format
4674 msgid ""
4675 "Path updated: %s added in %s inside a directory that was renamed in %s; "
4676 "moving it to %s."
4677 msgstr ""
4678 "路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。"
4679
4680 #: merge-recursive.c:3206
4681 #, c-format
4682 msgid ""
4683 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
4684 "in %s, suggesting it should perhaps be moved to %s."
4685 msgstr ""
4686 "冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动"
4687 "到 %s。"
4688
4689 #: merge-recursive.c:3210
4690 #, c-format
4691 msgid ""
4692 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4693 "%s; moving it to %s."
4694 msgstr ""
4695 "路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移"
4696 "动到 %5$s。"
4697
4698 #: merge-recursive.c:3213
4699 #, c-format
4700 msgid ""
4701 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4702 "was renamed in %s, suggesting it should perhaps be moved to %s."
4703 msgstr ""
4704 "冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,"
4705 "建议将其移动到 %5$s。"
4706
4707 #: merge-recursive.c:3327
4708 #, c-format
4709 msgid "Removing %s"
4710 msgstr "删除 %s"
4711
4712 #: merge-recursive.c:3350
4713 msgid "file/directory"
4714 msgstr "文件/目录"
4715
4716 #: merge-recursive.c:3355
4717 msgid "directory/file"
4718 msgstr "目录/文件"
4719
4720 #: merge-recursive.c:3362
4721 #, c-format
4722 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4723 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
4724
4725 #: merge-recursive.c:3371
4726 #, c-format
4727 msgid "Adding %s"
4728 msgstr "添加 %s"
4729
4730 #: merge-recursive.c:3380
4731 #, c-format
4732 msgid "CONFLICT (add/add): Merge conflict in %s"
4733 msgstr "冲突(add/add):合并冲突于 %s"
4734
4735 #: merge-recursive.c:3424
4736 msgid "Already up to date!"
4737 msgstr "已经是最新的!"
4738
4739 #: merge-recursive.c:3433
4740 #, c-format
4741 msgid "merging of trees %s and %s failed"
4742 msgstr "无法合并树 %s 和 %s"
4743
4744 #: merge-recursive.c:3537
4745 msgid "Merging:"
4746 msgstr "合并:"
4747
4748 #: merge-recursive.c:3550
4749 #, c-format
4750 msgid "found %u common ancestor:"
4751 msgid_plural "found %u common ancestors:"
4752 msgstr[0] "发现 %u 个共同祖先:"
4753 msgstr[1] "发现 %u 个共同祖先:"
4754
4755 #: merge-recursive.c:3600
4756 msgid "merge returned no commit"
4757 msgstr "合并未返回提交"
4758
4759 #: merge-recursive.c:3659
4760 #, c-format
4761 msgid ""
4762 "Your local changes to the following files would be overwritten by merge:\n"
4763 " %s"
4764 msgstr ""
4765 "您对下列文件的本地修改将被合并操作覆盖:\n"
4766 " %s"
4767
4768 #: merge-recursive.c:3756
4769 #, c-format
4770 msgid "Could not parse object '%s'"
4771 msgstr "不能解析对象 '%s'"
4772
4773 #: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
4774 msgid "Unable to write index."
4775 msgstr "不能写入索引。"
4776
4777 #: midx.c:68
4778 #, c-format
4779 msgid "multi-pack-index file %s is too small"
4780 msgstr "多包索引文件 %s 太小"
4781
4782 #: midx.c:84
4783 #, c-format
4784 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
4785 msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
4786
4787 #: midx.c:89
4788 #, c-format
4789 msgid "multi-pack-index version %d not recognized"
4790 msgstr "multi-pack-index 版本 %d 不能被识别"
4791
4792 #: midx.c:94
4793 #, c-format
4794 msgid "hash version %u does not match"
4795 msgstr "散列版本 %u 不匹配"
4796
4797 #: midx.c:108
4798 msgid "invalid chunk offset (too large)"
4799 msgstr "无效的块偏移(太大)"
4800
4801 #: midx.c:132
4802 msgid "terminating multi-pack-index chunk id appears earlier than expected"
4803 msgstr "终止多包索引块 id 出现时间早于预期"
4804
4805 #: midx.c:145
4806 msgid "multi-pack-index missing required pack-name chunk"
4807 msgstr "多包索引缺少必需的包名块"
4808
4809 #: midx.c:147
4810 msgid "multi-pack-index missing required OID fanout chunk"
4811 msgstr "多包索引缺少必需的对象 ID 扇出块"
4812
4813 #: midx.c:149
4814 msgid "multi-pack-index missing required OID lookup chunk"
4815 msgstr "多包索引缺少必需的对象 ID 查询块"
4816
4817 #: midx.c:151
4818 msgid "multi-pack-index missing required object offsets chunk"
4819 msgstr "多包索引缺少必需的对象偏移块"
4820
4821 #: midx.c:165
4822 #, c-format
4823 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
4824 msgstr "多包索引包名无序:'%s' 在 '%s' 之前"
4825
4826 #: midx.c:210
4827 #, c-format
4828 msgid "bad pack-int-id: %u (%u total packs)"
4829 msgstr "错的 pack-int-id:%u(共有 %u 个包)"
4830
4831 #: midx.c:260
4832 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
4833 msgstr "多包索引存储一个64位偏移,但是 off_t 太小"
4834
4835 #: midx.c:288
4836 msgid "error preparing packfile from multi-pack-index"
4837 msgstr "从多包索引准备 packfile 出错"
4838
4839 #: midx.c:472
4840 #, c-format
4841 msgid "failed to add packfile '%s'"
4842 msgstr "添加包文件 '%s' 失败"
4843
4844 #: midx.c:478
4845 #, c-format
4846 msgid "failed to open pack-index '%s'"
4847 msgstr "打开包索引 '%s' 失败"
4848
4849 #: midx.c:538
4850 #, c-format
4851 msgid "failed to locate object %d in packfile"
4852 msgstr "在包文件中定位对象 %d 失败"
4853
4854 #: midx.c:842
4855 msgid "Adding packfiles to multi-pack-index"
4856 msgstr "添加包文件到多包索引"
4857
4858 #: midx.c:875
4859 #, c-format
4860 msgid "did not see pack-file %s to drop"
4861 msgstr "没有看到要丢弃的包文件 %s"
4862
4863 #: midx.c:973
4864 msgid "Writing chunks to multi-pack-index"
4865 msgstr "写入块到多包索引"
4866
4867 #: midx.c:1052
4868 #, c-format
4869 msgid "failed to clear multi-pack-index at %s"
4870 msgstr "清理位于 %s 的多包索引失败"
4871
4872 #: midx.c:1108
4873 msgid "Looking for referenced packfiles"
4874 msgstr "正在查找引用的包文件"
4875
4876 #: midx.c:1123
4877 #, c-format
4878 msgid ""
4879 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4880 msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4881
4882 #: midx.c:1128
4883 msgid "Verifying OID order in multi-pack-index"
4884 msgstr "校验多包索引中的 OID 顺序"
4885
4886 #: midx.c:1137
4887 #, c-format
4888 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
4889 msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]"
4890
4891 #: midx.c:1157
4892 msgid "Sorting objects by packfile"
4893 msgstr "通过包文件为对象排序"
4894
4895 #: midx.c:1164
4896 msgid "Verifying object offsets"
4897 msgstr "校验对象偏移"
4898
4899 #: midx.c:1180
4900 #, c-format
4901 msgid "failed to load pack entry for oid[%d] = %s"
4902 msgstr "为 oid[%d] = %s 加载包条目失败"
4903
4904 #: midx.c:1186
4905 #, c-format
4906 msgid "failed to load pack-index for packfile %s"
4907 msgstr "为包文件 %s 加载包索引失败"
4908
4909 #: midx.c:1195
4910 #, c-format
4911 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
4912 msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>"
4913
4914 #: midx.c:1220
4915 msgid "Counting referenced objects"
4916 msgstr "正在对引用对象计数"
4917
4918 #: midx.c:1230
4919 msgid "Finding and deleting unreferenced packfiles"
4920 msgstr "正在查找和删除未引用的包文件"
4921
4922 #: midx.c:1388
4923 msgid "could not start pack-objects"
4924 msgstr "不能开始 pack-objects"
4925
4926 #: midx.c:1407
4927 msgid "could not finish pack-objects"
4928 msgstr "不能结束 pack-objects"
4929
4930 #: name-hash.c:537
4931 #, c-format
4932 msgid "unable to create lazy_dir thread: %s"
4933 msgstr "不能创建 lazy_dir 线程:%s"
4934
4935 #: name-hash.c:559
4936 #, c-format
4937 msgid "unable to create lazy_name thread: %s"
4938 msgstr "不能创建 lazy_name 线程:%s"
4939
4940 #: name-hash.c:565
4941 #, c-format
4942 msgid "unable to join lazy_name thread: %s"
4943 msgstr "不能加入 lasy_name 线程:%s"
4944
4945 #: notes-merge.c:277
4946 #, c-format
4947 msgid ""
4948 "You have not concluded your previous notes merge (%s exists).\n"
4949 "Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
4950 "commit/abort the previous merge before you start a new notes merge."
4951 msgstr ""
4952 "您的前一次注释合并尚未结束(存在 %s)。\n"
4953 "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
4954 "notes merge --abort' 来提交/终止前一次合并。"
4955
4956 #: notes-merge.c:284
4957 #, c-format
4958 msgid "You have not concluded your notes merge (%s exists)."
4959 msgstr "您尚未结束注释合并(存在 %s)。"
4960
4961 #: notes-utils.c:46
4962 msgid "Cannot commit uninitialized/unreferenced notes tree"
4963 msgstr "不能提交未初始化/未引用的注解树"
4964
4965 #: notes-utils.c:105
4966 #, c-format
4967 msgid "Bad notes.rewriteMode value: '%s'"
4968 msgstr "坏的 notes.rewriteMode 值:'%s'"
4969
4970 #: notes-utils.c:115
4971 #, c-format
4972 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
4973 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
4974
4975 #. TRANSLATORS: The first %s is the name of
4976 #. the environment variable, the second %s is
4977 #. its value.
4978 #.
4979 #: notes-utils.c:145
4980 #, c-format
4981 msgid "Bad %s value: '%s'"
4982 msgstr "坏的 %s 值:'%s'"
4983
4984 #: object.c:53
4985 #, c-format
4986 msgid "invalid object type \"%s\""
4987 msgstr "无效的对象类型 \"%s\""
4988
4989 #: object.c:173
4990 #, c-format
4991 msgid "object %s is a %s, not a %s"
4992 msgstr "对象 %s 是一个 %s,不是一个 %s"
4993
4994 #: object.c:233
4995 #, c-format
4996 msgid "object %s has unknown type id %d"
4997 msgstr "对象 %s 有未知的类型 id %d"
4998
4999 #: object.c:246
5000 #, c-format
5001 msgid "unable to parse object: %s"
5002 msgstr "不能解析对象:%s"
5003
5004 #: object.c:266 object.c:278
5005 #, c-format
5006 msgid "hash mismatch %s"
5007 msgstr "哈希值与 %s 不匹配"
5008
5009 #: packfile.c:629
5010 msgid "offset before end of packfile (broken .idx?)"
5011 msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
5012
5013 #: packfile.c:1899
5014 #, c-format
5015 msgid "offset before start of pack index for %s (corrupt index?)"
5016 msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
5017
5018 #: packfile.c:1903
5019 #, c-format
5020 msgid "offset beyond end of pack index for %s (truncated index?)"
5021 msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
5022
5023 #: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
5024 #, c-format
5025 msgid "unable to get size of %s"
5026 msgstr "无法得到 %s 的大小"
5027
5028 #: parse-options.c:38
5029 #, c-format
5030 msgid "%s requires a value"
5031 msgstr "%s 需要一个值"
5032
5033 #: parse-options.c:73
5034 #, c-format
5035 msgid "%s is incompatible with %s"
5036 msgstr "%s 与 %s 不兼容"
5037
5038 #: parse-options.c:78
5039 #, c-format
5040 msgid "%s : incompatible with something else"
5041 msgstr "%s:和其它的不兼容"
5042
5043 #: parse-options.c:92 parse-options.c:96 parse-options.c:317
5044 #, c-format
5045 msgid "%s takes no value"
5046 msgstr "%s 不取值"
5047
5048 #: parse-options.c:94
5049 #, c-format
5050 msgid "%s isn't available"
5051 msgstr "%s 不可用"
5052
5053 #: parse-options.c:217
5054 #, c-format
5055 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
5056 msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
5057
5058 #: parse-options.c:386
5059 #, c-format
5060 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
5061 msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)"
5062
5063 #: parse-options.c:420 parse-options.c:428
5064 #, c-format
5065 msgid "did you mean `--%s` (with two dashes)?"
5066 msgstr "你的意思是 `--%s`(有两个短线)?"
5067
5068 #: parse-options.c:857
5069 #, c-format
5070 msgid "unknown option `%s'"
5071 msgstr "未知选项 `%s'"
5072
5073 #: parse-options.c:859
5074 #, c-format
5075 msgid "unknown switch `%c'"
5076 msgstr "未知开关 `%c'"
5077
5078 #: parse-options.c:861
5079 #, c-format
5080 msgid "unknown non-ascii option in string: `%s'"
5081 msgstr "字符串中未知的非 ascii 字符选项:`%s'"
5082
5083 #: parse-options.c:885
5084 msgid "..."
5085 msgstr "..."
5086
5087 #: parse-options.c:904
5088 #, c-format
5089 msgid "usage: %s"
5090 msgstr "用法:%s"
5091
5092 #. TRANSLATORS: the colon here should align with the
5093 #. one in "usage: %s" translation.
5094 #.
5095 #: parse-options.c:910
5096 #, c-format
5097 msgid " or: %s"
5098 msgstr " 或:%s"
5099
5100 # 译者:为保证在输出中对齐,注意调整句中空格!
5101 #: parse-options.c:913
5102 #, c-format
5103 msgid " %s"
5104 msgstr " %s"
5105
5106 #: parse-options.c:952
5107 msgid "-NUM"
5108 msgstr "-数字"
5109
5110 #: parse-options.c:966
5111 #, c-format
5112 msgid "alias of --%s"
5113 msgstr "--%s 的别名"
5114
5115 #: parse-options-cb.c:20 parse-options-cb.c:24
5116 #, c-format
5117 msgid "option `%s' expects a numerical value"
5118 msgstr "选项 `%s' 期望一个数字值"
5119
5120 #: parse-options-cb.c:41
5121 #, c-format
5122 msgid "malformed expiration date '%s'"
5123 msgstr "格式错误的到期时间:'%s'"
5124
5125 #: parse-options-cb.c:54
5126 #, c-format
5127 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
5128 msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
5129
5130 #: parse-options-cb.c:130 parse-options-cb.c:147
5131 #, c-format
5132 msgid "malformed object name '%s'"
5133 msgstr "格式错误的对象名 '%s'"
5134
5135 #: path.c:915
5136 #, c-format
5137 msgid "Could not make %s writable by group"
5138 msgstr "不能设置 %s 为组可写"
5139
5140 #: pathspec.c:130
5141 msgid "Escape character '\\' not allowed as last character in attr value"
5142 msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
5143
5144 #: pathspec.c:148
5145 msgid "Only one 'attr:' specification is allowed."
5146 msgstr "只允许一个 'attr:' 规格。"
5147
5148 #: pathspec.c:151
5149 msgid "attr spec must not be empty"
5150 msgstr "属性规格不能为空"
5151
5152 #: pathspec.c:194
5153 #, c-format
5154 msgid "invalid attribute name %s"
5155 msgstr "无效的属性名 %s"
5156
5157 #: pathspec.c:259
5158 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
5159 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
5160
5161 #: pathspec.c:266
5162 msgid ""
5163 "global 'literal' pathspec setting is incompatible with all other global "
5164 "pathspec settings"
5165 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
5166
5167 #: pathspec.c:306
5168 msgid "invalid parameter for pathspec magic 'prefix'"
5169 msgstr "路径规格包含无效的神奇前缀"
5170
5171 #: pathspec.c:327
5172 #, c-format
5173 msgid "Invalid pathspec magic '%.*s' in '%s'"
5174 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
5175
5176 #: pathspec.c:332
5177 #, c-format
5178 msgid "Missing ')' at the end of pathspec magic in '%s'"
5179 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
5180
5181 #: pathspec.c:370
5182 #, c-format
5183 msgid "Unimplemented pathspec magic '%c' in '%s'"
5184 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
5185
5186 #: pathspec.c:429
5187 #, c-format
5188 msgid "%s: 'literal' and 'glob' are incompatible"
5189 msgstr "%s:'literal' 和 'glob' 不兼容"
5190
5191 #: pathspec.c:442
5192 #, c-format
5193 msgid "%s: '%s' is outside repository at '%s'"
5194 msgstr "%s:'%s' 在位于 '%s' 的仓库之外"
5195
5196 #: pathspec.c:517
5197 #, c-format
5198 msgid "'%s' (mnemonic: '%c')"
5199 msgstr "'%s'(助记符:'%c')"
5200
5201 #: pathspec.c:527
5202 #, c-format
5203 msgid "%s: pathspec magic not supported by this command: %s"
5204 msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
5205
5206 #: pathspec.c:594
5207 #, c-format
5208 msgid "pathspec '%s' is beyond a symbolic link"
5209 msgstr "路径规格 '%s' 位于符号链接中"
5210
5211 #: pathspec.c:639
5212 #, c-format
5213 msgid "line is badly quoted: %s"
5214 msgstr "行被错误地引用:%s"
5215
5216 #: pkt-line.c:92
5217 msgid "unable to write flush packet"
5218 msgstr "无法写 flush 包"
5219
5220 #: pkt-line.c:99
5221 msgid "unable to write delim packet"
5222 msgstr "无法写 delim 包"
5223
5224 #: pkt-line.c:106
5225 msgid "flush packet write failed"
5226 msgstr "flush 包写错误"
5227
5228 #: pkt-line.c:146 pkt-line.c:232
5229 msgid "protocol error: impossibly long line"
5230 msgstr "协议错误:不可能的长行"
5231
5232 #: pkt-line.c:162 pkt-line.c:164
5233 msgid "packet write with format failed"
5234 msgstr "格式化包写入错误"
5235
5236 #: pkt-line.c:196
5237 msgid "packet write failed - data exceeds max packet size"
5238 msgstr "写数据包失败:数据超过了包的最大长度"
5239
5240 #: pkt-line.c:203 pkt-line.c:210
5241 msgid "packet write failed"
5242 msgstr "数据包写入失败"
5243
5244 #: pkt-line.c:295
5245 msgid "read error"
5246 msgstr "读取错误"
5247
5248 #: pkt-line.c:303
5249 msgid "the remote end hung up unexpectedly"
5250 msgstr "远端意外挂断了"
5251
5252 #: pkt-line.c:331
5253 #, c-format
5254 msgid "protocol error: bad line length character: %.4s"
5255 msgstr "协议错误:错误的行长度字符串:%.4s"
5256
5257 #: pkt-line.c:341 pkt-line.c:346
5258 #, c-format
5259 msgid "protocol error: bad line length %d"
5260 msgstr "协议错误:错误的行长度 %d"
5261
5262 #: pkt-line.c:362
5263 #, c-format
5264 msgid "remote error: %s"
5265 msgstr "远程错误:%s"
5266
5267 #: preload-index.c:119
5268 msgid "Refreshing index"
5269 msgstr "正在刷新索引"
5270
5271 #: preload-index.c:138
5272 #, c-format
5273 msgid "unable to create threaded lstat: %s"
5274 msgstr "无法创建线程 lstat:%s"
5275
5276 #: pretty.c:981
5277 msgid "unable to parse --pretty format"
5278 msgstr "不能解析 --pretty 格式"
5279
5280 #: promisor-remote.c:23
5281 msgid "Remote with no URL"
5282 msgstr "远程未设置 URL"
5283
5284 #: promisor-remote.c:58
5285 #, c-format
5286 msgid "promisor remote name cannot begin with '/': %s"
5287 msgstr "promisor 远程名称不能以 '/' 开始:%s"
5288
5289 #: range-diff.c:75
5290 msgid "could not start `log`"
5291 msgstr "不能启动 `log`"
5292
5293 #: range-diff.c:77
5294 msgid "could not read `log` output"
5295 msgstr "不能读取 `log` 的输出"
5296
5297 #: range-diff.c:96 sequencer.c:5020
5298 #, c-format
5299 msgid "could not parse commit '%s'"
5300 msgstr "不能解析提交 '%s'"
5301
5302 #: range-diff.c:122
5303 #, c-format
5304 msgid "could not parse git header '%.*s'"
5305 msgstr "无法解析 git 头 '%.*s'"
5306
5307 #: range-diff.c:285
5308 msgid "failed to generate diff"
5309 msgstr "生成 diff 失败"
5310
5311 #: range-diff.c:518 range-diff.c:520
5312 #, c-format
5313 msgid "could not parse log for '%s'"
5314 msgstr "不能解析 '%s' 的日志"
5315
5316 #: read-cache.c:680
5317 #, c-format
5318 msgid "will not add file alias '%s' ('%s' already exists in index)"
5319 msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)"
5320
5321 #: read-cache.c:696
5322 msgid "cannot create an empty blob in the object database"
5323 msgstr "不能在对象数据库中创建空的数据对象"
5324
5325 #: read-cache.c:718
5326 #, c-format
5327 msgid "%s: can only add regular files, symbolic links or git-directories"
5328 msgstr "%s:只能添加常规文件、符号链接或 git 目录"
5329
5330 #: read-cache.c:723
5331 #, c-format
5332 msgid "'%s' does not have a commit checked out"
5333 msgstr "'%s' 没有检出一个提交"
5334
5335 #: read-cache.c:775
5336 #, c-format
5337 msgid "unable to index file '%s'"
5338 msgstr "无法索引文件 '%s'"
5339
5340 #: read-cache.c:794
5341 #, c-format
5342 msgid "unable to add '%s' to index"
5343 msgstr "无法在索引中添加 '%s'"
5344
5345 #: read-cache.c:805
5346 #, c-format
5347 msgid "unable to stat '%s'"
5348 msgstr "无法对 %s 执行 stat"
5349
5350 #: read-cache.c:1330
5351 #, c-format
5352 msgid "'%s' appears as both a file and as a directory"
5353 msgstr "'%s' 看起来既是文件又是目录"
5354
5355 #: read-cache.c:1536
5356 msgid "Refresh index"
5357 msgstr "刷新索引"
5358
5359 #: read-cache.c:1651
5360 #, c-format
5361 msgid ""
5362 "index.version set, but the value is invalid.\n"
5363 "Using version %i"
5364 msgstr ""
5365 "设置了 index.version,但是取值无效。\n"
5366 "使用版本 %i"
5367
5368 #: read-cache.c:1661
5369 #, c-format
5370 msgid ""
5371 "GIT_INDEX_VERSION set, but the value is invalid.\n"
5372 "Using version %i"
5373 msgstr ""
5374 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
5375 "使用版本 %i"
5376
5377 #: read-cache.c:1717
5378 #, c-format
5379 msgid "bad signature 0x%08x"
5380 msgstr "坏的签名 0x%08x"
5381
5382 #: read-cache.c:1720
5383 #, c-format
5384 msgid "bad index version %d"
5385 msgstr "坏的索引版本 %d"
5386
5387 #: read-cache.c:1729
5388 msgid "bad index file sha1 signature"
5389 msgstr "坏的索引文件 sha1 签名"
5390
5391 #: read-cache.c:1759
5392 #, c-format
5393 msgid "index uses %.4s extension, which we do not understand"
5394 msgstr "索引使用不被支持的 %.4s 扩展"
5395
5396 #
5397 #: read-cache.c:1761
5398 #, c-format
5399 msgid "ignoring %.4s extension"
5400 msgstr "忽略 %.4s 扩展"
5401
5402 #: read-cache.c:1798
5403 #, c-format
5404 msgid "unknown index entry format 0x%08x"
5405 msgstr "未知的索引条目格式 0x%08x"
5406
5407 #: read-cache.c:1814
5408 #, c-format
5409 msgid "malformed name field in the index, near path '%s'"
5410 msgstr "索引中靠近路径 '%s' 有错误的名称字段"
5411
5412 #: read-cache.c:1871
5413 msgid "unordered stage entries in index"
5414 msgstr "索引中有未排序的暂存条目"
5415
5416 #: read-cache.c:1874
5417 #, c-format
5418 msgid "multiple stage entries for merged file '%s'"
5419 msgstr "合并文件 '%s' 有多个暂存条目"
5420
5421 #: read-cache.c:1877
5422 #, c-format
5423 msgid "unordered stage entries for '%s'"
5424 msgstr "'%s' 的未排序暂存条目"
5425
5426 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
5427 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
5428 #: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
5429 #: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
5430 #: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
5431 #: builtin/submodule--helper.c:332
5432 msgid "index file corrupt"
5433 msgstr "索引文件损坏"
5434
5435 #: read-cache.c:2124
5436 #, c-format
5437 msgid "unable to create load_cache_entries thread: %s"
5438 msgstr "无法创建 load_cache_entries 线程:%s"
5439
5440 #: read-cache.c:2137
5441 #, c-format
5442 msgid "unable to join load_cache_entries thread: %s"
5443 msgstr "无法加入 load_cache_entries 线程:%s"
5444
5445 #: read-cache.c:2170
5446 #, c-format
5447 msgid "%s: index file open failed"
5448 msgstr "%s:打开索引文件失败"
5449
5450 #: read-cache.c:2174
5451 #, c-format
5452 msgid "%s: cannot stat the open index"
5453 msgstr "%s:不能对打开的索引执行 stat 操作"
5454
5455 #: read-cache.c:2178
5456 #, c-format
5457 msgid "%s: index file smaller than expected"
5458 msgstr "%s:索引文件比预期的小"
5459
5460 #: read-cache.c:2182
5461 #, c-format
5462 msgid "%s: unable to map index file"
5463 msgstr "%s:无法对索引文件执行 map 操作"
5464
5465 #: read-cache.c:2224
5466 #, c-format
5467 msgid "unable to create load_index_extensions thread: %s"
5468 msgstr "无法创建 load_index_extensions 线程:%s"
5469
5470 #: read-cache.c:2251
5471 #, c-format
5472 msgid "unable to join load_index_extensions thread: %s"
5473 msgstr "无法加入 load_index_extensions 线程:%s"
5474
5475 #: read-cache.c:2283
5476 #, c-format
5477 msgid "could not freshen shared index '%s'"
5478 msgstr "无法刷新共享索引 '%s'"
5479
5480 #: read-cache.c:2330
5481 #, c-format
5482 msgid "broken index, expect %s in %s, got %s"
5483 msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
5484
5485 #: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
5486 #, c-format
5487 msgid "could not close '%s'"
5488 msgstr "不能关闭 '%s'"
5489
5490 #: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
5491 #, c-format
5492 msgid "could not stat '%s'"
5493 msgstr "不能对 '%s' 调用 stat"
5494
5495 #: read-cache.c:3142
5496 #, c-format
5497 msgid "unable to open git dir: %s"
5498 msgstr "不能打开 git 目录:%s"
5499
5500 #: read-cache.c:3154
5501 #, c-format
5502 msgid "unable to unlink: %s"
5503 msgstr "无法删除:%s"
5504
5505 #: read-cache.c:3179
5506 #, c-format
5507 msgid "cannot fix permission bits on '%s'"
5508 msgstr "不能修复 '%s' 的权限位"
5509
5510 #: read-cache.c:3328
5511 #, c-format
5512 msgid "%s: cannot drop to stage #0"
5513 msgstr "%s:不能落到暂存区 #0"
5514
5515 #: rebase-interactive.c:11
5516 msgid ""
5517 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
5518 "continue'.\n"
5519 "Or you can abort the rebase with 'git rebase --abort'.\n"
5520 msgstr ""
5521 "您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
5522 "或者您可以用 'git rebase --abort' 终止变基。\n"
5523
5524 #: rebase-interactive.c:33
5525 #, c-format
5526 msgid ""
5527 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
5528 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
5529
5530 #: rebase-interactive.c:42
5531 msgid ""
5532 "\n"
5533 "Commands:\n"
5534 "p, pick <commit> = use commit\n"
5535 "r, reword <commit> = use commit, but edit the commit message\n"
5536 "e, edit <commit> = use commit, but stop for amending\n"
5537 "s, squash <commit> = use commit, but meld into previous commit\n"
5538 "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
5539 "x, exec <command> = run command (the rest of the line) using shell\n"
5540 "b, break = stop here (continue rebase later with 'git rebase --continue')\n"
5541 "d, drop <commit> = remove commit\n"
5542 "l, label <label> = label current HEAD with a name\n"
5543 "t, reset <label> = reset HEAD to a label\n"
5544 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
5545 ". create a merge commit using the original merge commit's\n"
5546 ". message (or the oneline, if no original merge commit was\n"
5547 ". specified). Use -c <commit> to reword the commit message.\n"
5548 "\n"
5549 "These lines can be re-ordered; they are executed from top to bottom.\n"
5550 msgstr ""
5551 "\n"
5552 "命令:\n"
5553 "p, pick <提交> = 使用提交\n"
5554 "r, reword <提交> = 使用提交,但修改提交说明\n"
5555 "e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n"
5556 "s, squash <提交> = 使用提交,但融合到前一个提交\n"
5557 "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
5558 "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
5559 "b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n"
5560 "d, drop <提交> = 删除提交\n"
5561 "l, label <label> = 为当前 HEAD 打上标记\n"
5562 "t, reset <label> = 重置 HEAD 到该标记\n"
5563 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
5564 ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
5565 ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
5566 ". -c <提交> 可以编辑提交说明。\n"
5567 "\n"
5568 "可以对这些行重新排序,将从上至下执行。\n"
5569
5570 #: rebase-interactive.c:63
5571 #, c-format
5572 msgid "Rebase %s onto %s (%d command)"
5573 msgid_plural "Rebase %s onto %s (%d commands)"
5574 msgstr[0] "变基 %s 到 %s(%d 个提交)"
5575 msgstr[1] "变基 %s 到 %s(%d 个提交)"
5576
5577 #: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
5578 msgid ""
5579 "\n"
5580 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
5581 msgstr ""
5582 "\n"
5583 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
5584
5585 #: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
5586 msgid ""
5587 "\n"
5588 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
5589 msgstr ""
5590 "\n"
5591 "如果您在这里删除一行,对应的提交将会丢失。\n"
5592
5593 #: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
5594 msgid ""
5595 "\n"
5596 "You are editing the todo file of an ongoing interactive rebase.\n"
5597 "To continue rebase after editing, run:\n"
5598 " git rebase --continue\n"
5599 "\n"
5600 msgstr ""
5601 "\n"
5602 "您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
5603 "请执行:\n"
5604 " git rebase --continue\n"
5605 "\n"
5606
5607 #: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
5608 msgid ""
5609 "\n"
5610 "However, if you remove everything, the rebase will be aborted.\n"
5611 "\n"
5612 msgstr ""
5613 "\n"
5614 "然而,如果您删除全部内容,变基操作将会终止。\n"
5615 "\n"
5616
5617 #: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
5618 #: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
5619 #, c-format
5620 msgid "could not write '%s'"
5621 msgstr "不能写入 '%s'"
5622
5623 #: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
5624 #: builtin/rebase.c:234
5625 #, c-format
5626 msgid "could not write '%s'."
5627 msgstr "不能写入 '%s'。"
5628
5629 #: rebase-interactive.c:193
5630 #, c-format
5631 msgid ""
5632 "Warning: some commits may have been dropped accidentally.\n"
5633 "Dropped commits (newer to older):\n"
5634 msgstr ""
5635 "警告:一些提交可能被意外丢弃。\n"
5636 "丢弃的提交(从新到旧):\n"
5637
5638 #: rebase-interactive.c:200
5639 #, c-format
5640 msgid ""
5641 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
5642 "\n"
5643 "Use 'git config rebase.missingCommitsCheck' to change the level of "
5644 "warnings.\n"
5645 "The possible behaviours are: ignore, warn, error.\n"
5646 "\n"
5647 msgstr ""
5648 "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
5649 "\n"
5650 "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
5651 "可选值有:ignore、warn、error。\n"
5652 "\n"
5653
5654 #: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
5655 #: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
5656 #: builtin/rebase.c:246
5657 #, c-format
5658 msgid "could not read '%s'."
5659 msgstr "不能读取 '%s'。"
5660
5661 #: refs.c:262
5662 #, c-format
5663 msgid "%s does not point to a valid object!"
5664 msgstr "%s 没有指向一个有效的对象!"
5665
5666 #: refs.c:667
5667 #, c-format
5668 msgid "ignoring dangling symref %s"
5669 msgstr "忽略悬空符号引用 %s"
5670
5671 #: refs.c:669 ref-filter.c:2098
5672 #, c-format
5673 msgid "ignoring broken ref %s"
5674 msgstr "忽略损坏的引用 %s"
5675
5676 #: refs.c:804
5677 #, c-format
5678 msgid "could not open '%s' for writing: %s"
5679 msgstr "无法为写入打开 '%s':%s"
5680
5681 #: refs.c:814 refs.c:865
5682 #, c-format
5683 msgid "could not read ref '%s'"
5684 msgstr "无法读取引用 '%s'"
5685
5686 #: refs.c:820
5687 #, c-format
5688 msgid "ref '%s' already exists"
5689 msgstr "引用 '%s' 已经存在"
5690
5691 #: refs.c:825
5692 #, c-format
5693 msgid "unexpected object ID when writing '%s'"
5694 msgstr "写入 '%s' 时意外的对象 ID"
5695
5696 #: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
5697 #: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
5698 #: wrapper.c:620
5699 #, c-format
5700 msgid "could not write to '%s'"
5701 msgstr "不能写入 '%s'"
5702
5703 #: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
5704 #: builtin/rebase.c:1029
5705 #, c-format
5706 msgid "could not open '%s' for writing"
5707 msgstr "无法打开 '%s' 进行写入"
5708
5709 #: refs.c:867
5710 #, c-format
5711 msgid "unexpected object ID when deleting '%s'"
5712 msgstr "删除 '%s' 时意外的对象 ID"
5713
5714 #: refs.c:998
5715 #, c-format
5716 msgid "log for ref %s has gap after %s"
5717 msgstr "引用 %s 的日志在 %s 之后有缺口"
5718
5719 #: refs.c:1004
5720 #, c-format
5721 msgid "log for ref %s unexpectedly ended on %s"
5722 msgstr "引用 %s 的日志意外终止于 %s "
5723
5724 #: refs.c:1063
5725 #, c-format
5726 msgid "log for %s is empty"
5727 msgstr "%s 的日志为空"
5728
5729 #: refs.c:1155
5730 #, c-format
5731 msgid "refusing to update ref with bad name '%s'"
5732 msgstr "拒绝更新有错误名称 '%s' 的引用"
5733
5734 #: refs.c:1231
5735 #, c-format
5736 msgid "update_ref failed for ref '%s': %s"
5737 msgstr "对引用 '%s' 执行 update_ref 失败:%s"
5738
5739 #: refs.c:2023
5740 #, c-format
5741 msgid "multiple updates for ref '%s' not allowed"
5742 msgstr "不允许对引用 '%s' 多次更新"
5743
5744 #: refs.c:2055
5745 msgid "ref updates forbidden inside quarantine environment"
5746 msgstr "在隔离环境中禁止更新引用"
5747
5748 #: refs.c:2151 refs.c:2181
5749 #, c-format
5750 msgid "'%s' exists; cannot create '%s'"
5751 msgstr "'%s' 已存在,无法创建 '%s'"
5752
5753 #: refs.c:2157 refs.c:2192
5754 #, c-format
5755 msgid "cannot process '%s' and '%s' at the same time"
5756 msgstr "无法同时处理 '%s' 和 '%s'"
5757
5758 #: refs/files-backend.c:1233
5759 #, c-format
5760 msgid "could not remove reference %s"
5761 msgstr "无法删除引用 %s"
5762
5763 #: refs/files-backend.c:1247 refs/packed-backend.c:1541
5764 #: refs/packed-backend.c:1551
5765 #, c-format
5766 msgid "could not delete reference %s: %s"
5767 msgstr "无法删除引用 %s:%s"
5768
5769 #: refs/files-backend.c:1250 refs/packed-backend.c:1554
5770 #, c-format
5771 msgid "could not delete references: %s"
5772 msgstr "无法删除引用:%s"
5773
5774 #: refspec.c:137
5775 #, c-format
5776 msgid "invalid refspec '%s'"
5777 msgstr "无效的引用表达式:'%s'"
5778
5779 #: ref-filter.c:42 wt-status.c:1938
5780 msgid "gone"
5781 msgstr "丢失"
5782
5783 #: ref-filter.c:43
5784 #, c-format
5785 msgid "ahead %d"
5786 msgstr "领先 %d"
5787
5788 #: ref-filter.c:44
5789 #, c-format
5790 msgid "behind %d"
5791 msgstr "落后 %d"
5792
5793 #: ref-filter.c:45
5794 #, c-format
5795 msgid "ahead %d, behind %d"
5796 msgstr "领先 %d,落后 %d"
5797
5798 #: ref-filter.c:165
5799 #, c-format
5800 msgid "expected format: %%(color:<color>)"
5801 msgstr "期望的格式:%%(color:<颜色>)"
5802
5803 #: ref-filter.c:167
5804 #, c-format
5805 msgid "unrecognized color: %%(color:%s)"
5806 msgstr "未能识别的颜色:%%(color:%s)"
5807
5808 #: ref-filter.c:189
5809 #, c-format
5810 msgid "Integer value expected refname:lstrip=%s"
5811 msgstr "期望整数值 refname:lstrip=%s"
5812
5813 #: ref-filter.c:193
5814 #, c-format
5815 msgid "Integer value expected refname:rstrip=%s"
5816 msgstr "期望整数值 refname:rstrip=%s"
5817
5818 #: ref-filter.c:195
5819 #, c-format
5820 msgid "unrecognized %%(%s) argument: %s"
5821 msgstr "未能识别的 %%(%s) 参数:%s"
5822
5823 #: ref-filter.c:250
5824 #, c-format
5825 msgid "%%(objecttype) does not take arguments"
5826 msgstr "%%(objecttype) 不带参数"
5827
5828 #: ref-filter.c:272
5829 #, c-format
5830 msgid "unrecognized %%(objectsize) argument: %s"
5831 msgstr "未能识别的 %%(objectsize) 参数:%s"
5832
5833 #: ref-filter.c:280
5834 #, c-format
5835 msgid "%%(deltabase) does not take arguments"
5836 msgstr "%%(deltabase) 不带参数"
5837
5838 #: ref-filter.c:292
5839 #, c-format
5840 msgid "%%(body) does not take arguments"
5841 msgstr "%%(body) 不带参数"
5842
5843 #: ref-filter.c:301
5844 #, c-format
5845 msgid "%%(subject) does not take arguments"
5846 msgstr "%%(subject) 不带参数"
5847
5848 #: ref-filter.c:323
5849 #, c-format
5850 msgid "unknown %%(trailers) argument: %s"
5851 msgstr "未知的 %%(trailers) 参数:%s"
5852
5853 #: ref-filter.c:352
5854 #, c-format
5855 msgid "positive value expected contents:lines=%s"
5856 msgstr "期望一个正数 contents:lines=%s"
5857
5858 #: ref-filter.c:354
5859 #, c-format
5860 msgid "unrecognized %%(contents) argument: %s"
5861 msgstr "未能识别的 %%(contents) 参数:%s"
5862
5863 #: ref-filter.c:369
5864 #, c-format
5865 msgid "positive value expected objectname:short=%s"
5866 msgstr "期望一个正数 objectname:short=%s"
5867
5868 #: ref-filter.c:373
5869 #, c-format
5870 msgid "unrecognized %%(objectname) argument: %s"
5871 msgstr "未能识别的 %%(objectname) 参数:%s"
5872
5873 #: ref-filter.c:403
5874 #, c-format
5875 msgid "expected format: %%(align:<width>,<position>)"
5876 msgstr "期望的格式:%%(align:<宽度>,<位置>)"
5877
5878 #: ref-filter.c:415
5879 #, c-format
5880 msgid "unrecognized position:%s"
5881 msgstr "未能识别的位置:%s"
5882
5883 #: ref-filter.c:422
5884 #, c-format
5885 msgid "unrecognized width:%s"
5886 msgstr "未能识别的宽度:%s"
5887
5888 #: ref-filter.c:431
5889 #, c-format
5890 msgid "unrecognized %%(align) argument: %s"
5891 msgstr "未能识别的 %%(align) 参数:%s"
5892
5893 #: ref-filter.c:439
5894 #, c-format
5895 msgid "positive width expected with the %%(align) atom"
5896 msgstr "元素 %%(align) 需要一个正数的宽度"
5897
5898 #: ref-filter.c:457
5899 #, c-format
5900 msgid "unrecognized %%(if) argument: %s"
5901 msgstr "未能识别的 %%(if) 参数:%s"
5902
5903 #: ref-filter.c:559
5904 #, c-format
5905 msgid "malformed field name: %.*s"
5906 msgstr "格式错误的字段名:%.*s"
5907
5908 #: ref-filter.c:586
5909 #, c-format
5910 msgid "unknown field name: %.*s"
5911 msgstr "未知的字段名:%.*s"
5912
5913 #: ref-filter.c:590
5914 #, c-format
5915 msgid ""
5916 "not a git repository, but the field '%.*s' requires access to object data"
5917 msgstr "不是一个 git 仓库,但是字段 '%.*s' 需要访问对象数据"
5918
5919 #: ref-filter.c:714
5920 #, c-format
5921 msgid "format: %%(if) atom used without a %%(then) atom"
5922 msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
5923
5924 #: ref-filter.c:777
5925 #, c-format
5926 msgid "format: %%(then) atom used without an %%(if) atom"
5927 msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
5928
5929 #: ref-filter.c:779
5930 #, c-format
5931 msgid "format: %%(then) atom used more than once"
5932 msgstr "格式:%%(then) 元素用了多次"
5933
5934 #: ref-filter.c:781
5935 #, c-format
5936 msgid "format: %%(then) atom used after %%(else)"
5937 msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
5938
5939 #: ref-filter.c:809
5940 #, c-format
5941 msgid "format: %%(else) atom used without an %%(if) atom"
5942 msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
5943
5944 #: ref-filter.c:811
5945 #, c-format
5946 msgid "format: %%(else) atom used without a %%(then) atom"
5947 msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
5948
5949 #: ref-filter.c:813
5950 #, c-format
5951 msgid "format: %%(else) atom used more than once"
5952 msgstr "格式:%%(else) 元素用了多次"
5953
5954 #: ref-filter.c:828
5955 #, c-format
5956 msgid "format: %%(end) atom used without corresponding atom"
5957 msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
5958
5959 #: ref-filter.c:885
5960 #, c-format
5961 msgid "malformed format string %s"
5962 msgstr "错误的格式化字符串 %s"
5963
5964 #: ref-filter.c:1488
5965 #, c-format
5966 msgid "no branch, rebasing %s"
5967 msgstr "非分支,正变基 %s"
5968
5969 #: ref-filter.c:1491
5970 #, c-format
5971 msgid "no branch, rebasing detached HEAD %s"
5972 msgstr "非分支,正变基分离头指针 %s"
5973
5974 #: ref-filter.c:1494
5975 #, c-format
5976 msgid "no branch, bisect started on %s"
5977 msgstr "非分支,二分查找开始于 %s"
5978
5979 #: ref-filter.c:1504
5980 msgid "no branch"
5981 msgstr "非分支"
5982
5983 #: ref-filter.c:1540 ref-filter.c:1749
5984 #, c-format
5985 msgid "missing object %s for %s"
5986 msgstr "缺失 %2$s 的对象 %1$s"
5987
5988 #: ref-filter.c:1550
5989 #, c-format
5990 msgid "parse_object_buffer failed on %s for %s"
5991 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
5992
5993 #: ref-filter.c:2004
5994 #, c-format
5995 msgid "malformed object at '%s'"
5996 msgstr "格式错误的对象 '%s'"
5997
5998 #: ref-filter.c:2093
5999 #, c-format
6000 msgid "ignoring ref with broken name %s"
6001 msgstr "忽略带有错误名称 %s 的引用"
6002
6003 #: ref-filter.c:2389
6004 #, c-format
6005 msgid "format: %%(end) atom missing"
6006 msgstr "格式:缺少 %%(end) 元素"
6007
6008 #: ref-filter.c:2489
6009 #, c-format
6010 msgid "option `%s' is incompatible with --merged"
6011 msgstr "选项 `%s' 和 --merged 不兼容"
6012
6013 #: ref-filter.c:2492
6014 #, c-format
6015 msgid "option `%s' is incompatible with --no-merged"
6016 msgstr "选项 `%s' 和 --no-merged 不兼容"
6017
6018 #: ref-filter.c:2502
6019 #, c-format
6020 msgid "malformed object name %s"
6021 msgstr "格式错误的对象名 %s"
6022
6023 #: ref-filter.c:2507
6024 #, c-format
6025 msgid "option `%s' must point to a commit"
6026 msgstr "选项 `%s' 必须指向一个提交"
6027
6028 #: remote.c:366
6029 #, c-format
6030 msgid "config remote shorthand cannot begin with '/': %s"
6031 msgstr "配置的远程短名称不能以 '/' 开始:%s"
6032
6033 #: remote.c:414
6034 msgid "more than one receivepack given, using the first"
6035 msgstr "提供了一个以上的 receivepack,使用第一个"
6036
6037 #: remote.c:422
6038 msgid "more than one uploadpack given, using the first"
6039 msgstr "提供了一个以上的 uploadpack,使用第一个"
6040
6041 #: remote.c:612
6042 #, c-format
6043 msgid "Cannot fetch both %s and %s to %s"
6044 msgstr "不能同时获取 %s 和 %s 至 %s"
6045
6046 #: remote.c:616
6047 #, c-format
6048 msgid "%s usually tracks %s, not %s"
6049 msgstr "%s 通常跟踪 %s,而非 %s"
6050
6051 #: remote.c:620
6052 #, c-format
6053 msgid "%s tracks both %s and %s"
6054 msgstr "%s 同时跟踪 %s 和 %s"
6055
6056 #: remote.c:688
6057 #, c-format
6058 msgid "key '%s' of pattern had no '*'"
6059 msgstr "模式的键 '%s' 没有 '*'"
6060
6061 #: remote.c:698
6062 #, c-format
6063 msgid "value '%s' of pattern has no '*'"
6064 msgstr "模式的值 '%s' 没有 '*'"
6065
6066 #: remote.c:1004
6067 #, c-format
6068 msgid "src refspec %s does not match any"
6069 msgstr "源引用表达式 %s 没有匹配"
6070
6071 #: remote.c:1009
6072 #, c-format
6073 msgid "src refspec %s matches more than one"
6074 msgstr "源引用表达式 %s 匹配超过一个"
6075
6076 #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
6077 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
6078 #. the <src>.
6079 #.
6080 #: remote.c:1024
6081 #, c-format
6082 msgid ""
6083 "The destination you provided is not a full refname (i.e.,\n"
6084 "starting with \"refs/\"). We tried to guess what you meant by:\n"
6085 "\n"
6086 "- Looking for a ref that matches '%s' on the remote side.\n"
6087 "- Checking if the <src> being pushed ('%s')\n"
6088 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
6089 " refs/{heads,tags}/ prefix on the remote side.\n"
6090 "\n"
6091 "Neither worked, so we gave up. You must fully qualify the ref."
6092 msgstr ""
6093 "您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n"
6094 "试着猜测您的想法:\n"
6095 "\n"
6096 "- 在远端查询和 '%s' 匹配的引用。\n"
6097 "- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n"
6098 " 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
6099 "\n"
6100 "都不行,所以我们已放弃。您必须给出完整的引用。"
6101
6102 #: remote.c:1044
6103 #, c-format
6104 msgid ""
6105 "The <src> part of the refspec is a commit object.\n"
6106 "Did you mean to create a new branch by pushing to\n"
6107 "'%s:refs/heads/%s'?"
6108 msgstr ""
6109 "引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
6110 "'%s:refs/heads/%s' 推送么?"
6111
6112 #: remote.c:1049
6113 #, c-format
6114 msgid ""
6115 "The <src> part of the refspec is a tag object.\n"
6116 "Did you mean to create a new tag by pushing to\n"
6117 "'%s:refs/tags/%s'?"
6118 msgstr ""
6119 "引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
6120 "'%s:refs/tags/%s' 推送么?"
6121
6122 #: remote.c:1054
6123 #, c-format
6124 msgid ""
6125 "The <src> part of the refspec is a tree object.\n"
6126 "Did you mean to tag a new tree by pushing to\n"
6127 "'%s:refs/tags/%s'?"
6128 msgstr ""
6129 "引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
6130 "'%s:refs/tags/%s' 推送么?"
6131
6132 #: remote.c:1059
6133 #, c-format
6134 msgid ""
6135 "The <src> part of the refspec is a blob object.\n"
6136 "Did you mean to tag a new blob by pushing to\n"
6137 "'%s:refs/tags/%s'?"
6138 msgstr ""
6139 "引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
6140 "'%s:refs/tags/%s' 推送么?"
6141
6142 #: remote.c:1095
6143 #, c-format
6144 msgid "%s cannot be resolved to branch"
6145 msgstr "%s 无法被解析为分支"
6146
6147 #: remote.c:1106
6148 #, c-format
6149 msgid "unable to delete '%s': remote ref does not exist"
6150 msgstr "无法删除 '%s':远程引用不存在"
6151
6152 #: remote.c:1118
6153 #, c-format
6154 msgid "dst refspec %s matches more than one"
6155 msgstr "目标引用表达式 %s 匹配超过一个"
6156
6157 #: remote.c:1125
6158 #, c-format
6159 msgid "dst ref %s receives from more than one src"
6160 msgstr "目标引用 %s 接收超过一个源"
6161
6162 #: remote.c:1628 remote.c:1729
6163 msgid "HEAD does not point to a branch"
6164 msgstr "HEAD 没有指向一个分支"
6165
6166 #: remote.c:1637
6167 #, c-format
6168 msgid "no such branch: '%s'"
6169 msgstr "没有此分支:'%s'"
6170
6171 #: remote.c:1640
6172 #, c-format
6173 msgid "no upstream configured for branch '%s'"
6174 msgstr "尚未给分支 '%s' 设置上游"
6175
6176 #: remote.c:1646
6177 #, c-format
6178 msgid "upstream branch '%s' not stored as a remote-tracking branch"
6179 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
6180
6181 #: remote.c:1661
6182 #, c-format
6183 msgid "push destination '%s' on remote '%s' has no local tracking branch"
6184 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
6185
6186 #: remote.c:1673
6187 #, c-format
6188 msgid "branch '%s' has no remote for pushing"
6189 msgstr "分支 '%s' 没有设置要推送的远程服务器"
6190
6191 #: remote.c:1683
6192 #, c-format
6193 msgid "push refspecs for '%s' do not include '%s'"
6194 msgstr "向 '%s' 推送引用规格未包含 '%s'"
6195
6196 #: remote.c:1696
6197 msgid "push has no destination (push.default is 'nothing')"
6198 msgstr "推送无目标(push.default 是 'nothing')"
6199
6200 #: remote.c:1718
6201 msgid "cannot resolve 'simple' push to a single destination"
6202 msgstr "无法解析 'simple' 推送至一个单独的目标"
6203
6204 #: remote.c:1844
6205 #, c-format
6206 msgid "couldn't find remote ref %s"
6207 msgstr "无法找到远程引用 %s"
6208
6209 #: remote.c:1857
6210 #, c-format
6211 msgid "* Ignoring funny ref '%s' locally"
6212 msgstr "* 在本地忽略可笑的引用 '%s'"
6213
6214 #: remote.c:2020
6215 #, c-format
6216 msgid "Your branch is based on '%s', but the upstream is gone.\n"
6217 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
6218
6219 #: remote.c:2024
6220 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
6221 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
6222
6223 #: remote.c:2027
6224 #, c-format
6225 msgid "Your branch is up to date with '%s'.\n"
6226 msgstr "您的分支与上游分支 '%s' 一致。\n"
6227
6228 #: remote.c:2031
6229 #, c-format
6230 msgid "Your branch and '%s' refer to different commits.\n"
6231 msgstr "您的分支和 '%s' 指向不同的提交。\n"
6232
6233 #: remote.c:2034
6234 #, c-format
6235 msgid " (use \"%s\" for details)\n"
6236 msgstr " (使用 \"%s\" 查看详情)\n"
6237
6238 #: remote.c:2038
6239 #, c-format
6240 msgid "Your branch is ahead of '%s' by %d commit.\n"
6241 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
6242 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
6243 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
6244
6245 #: remote.c:2044
6246 msgid " (use \"git push\" to publish your local commits)\n"
6247 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
6248
6249 #: remote.c:2047
6250 #, c-format
6251 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
6252 msgid_plural ""
6253 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
6254 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
6255 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
6256
6257 # 译者:注意保持前导空格
6258 #: remote.c:2055
6259 msgid " (use \"git pull\" to update your local branch)\n"
6260 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
6261
6262 #: remote.c:2058
6263 #, c-format
6264 msgid ""
6265 "Your branch and '%s' have diverged,\n"
6266 "and have %d and %d different commit each, respectively.\n"
6267 msgid_plural ""
6268 "Your branch and '%s' have diverged,\n"
6269 "and have %d and %d different commits each, respectively.\n"
6270 msgstr[0] ""
6271 "您的分支和 '%s' 出现了偏离,\n"
6272 "并且分别有 %d 和 %d 处不同的提交。\n"
6273 msgstr[1] ""
6274 "您的分支和 '%s' 出现了偏离,\n"
6275 "并且分别有 %d 和 %d 处不同的提交。\n"
6276
6277 # 译者:注意保持前导空格
6278 #: remote.c:2068
6279 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
6280 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
6281
6282 #: remote.c:2251
6283 #, c-format
6284 msgid "cannot parse expected object name '%s'"
6285 msgstr "无法解析期望的对象名 '%s'"
6286
6287 #: replace-object.c:21
6288 #, c-format
6289 msgid "bad replace ref name: %s"
6290 msgstr "错误的替换引用名称:%s"
6291
6292 #: replace-object.c:30
6293 #, c-format
6294 msgid "duplicate replace ref: %s"
6295 msgstr "重复的替换引用:%s"
6296
6297 #: replace-object.c:82
6298 #, c-format
6299 msgid "replace depth too high for object %s"
6300 msgstr "对象 %s 的替换层级太深"
6301
6302 #: rerere.c:217 rerere.c:226 rerere.c:229
6303 msgid "corrupt MERGE_RR"
6304 msgstr "损坏的 MERGE_RR"
6305
6306 #: rerere.c:264 rerere.c:269
6307 msgid "unable to write rerere record"
6308 msgstr "无法写入 rerere 记录"
6309
6310 #: rerere.c:495
6311 #, c-format
6312 msgid "there were errors while writing '%s' (%s)"
6313 msgstr "写入 '%s' (%s) 时出错"
6314
6315 #: rerere.c:498
6316 #, c-format
6317 msgid "failed to flush '%s'"
6318 msgstr "刷新 '%s' 失败"
6319
6320 #: rerere.c:503 rerere.c:1039
6321 #, c-format
6322 msgid "could not parse conflict hunks in '%s'"
6323 msgstr "不能解析 '%s' 中的冲突块"
6324
6325 #: rerere.c:684
6326 #, c-format
6327 msgid "failed utime() on '%s'"
6328 msgstr "在 '%s' 上调用 utime() 失败"
6329
6330 #: rerere.c:694
6331 #, c-format
6332 msgid "writing '%s' failed"
6333 msgstr "写入 '%s' 失败"
6334
6335 #: rerere.c:714
6336 #, c-format
6337 msgid "Staged '%s' using previous resolution."
6338 msgstr "使用之前的解决方案暂存 '%s'。"
6339
6340 #: rerere.c:753
6341 #, c-format
6342 msgid "Recorded resolution for '%s'."
6343 msgstr "已记录 '%s' 的解决方案。"
6344
6345 #: rerere.c:788
6346 #, c-format
6347 msgid "Resolved '%s' using previous resolution."
6348 msgstr "使用之前的解决方案解决 '%s'。"
6349
6350 #: rerere.c:803
6351 #, c-format
6352 msgid "cannot unlink stray '%s'"
6353 msgstr "不能删除 stray '%s'"
6354
6355 #: rerere.c:807
6356 #, c-format
6357 msgid "Recorded preimage for '%s'"
6358 msgstr "为 '%s' 记录 preimage"
6359
6360 #: rerere.c:881 submodule.c:2078 builtin/log.c:1871
6361 #: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
6362 #, c-format
6363 msgid "could not create directory '%s'"
6364 msgstr "不能创建目录 '%s'"
6365
6366 #: rerere.c:1057
6367 #, c-format
6368 msgid "failed to update conflicted state in '%s'"
6369 msgstr "更新 '%s' 中的冲突状态失败"
6370
6371 #: rerere.c:1068 rerere.c:1075
6372 #, c-format
6373 msgid "no remembered resolution for '%s'"
6374 msgstr "没有为 '%s' 记忆的解决方案"
6375
6376 #: rerere.c:1077
6377 #, c-format
6378 msgid "cannot unlink '%s'"
6379 msgstr "不能删除 '%s'"
6380
6381 #: rerere.c:1087
6382 #, c-format
6383 msgid "Updated preimage for '%s'"
6384 msgstr "已为 '%s' 更新 preimage"
6385
6386 #: rerere.c:1096
6387 #, c-format
6388 msgid "Forgot resolution for '%s'\n"
6389 msgstr "忘记 '%s' 的解决方案\n"
6390
6391 #: rerere.c:1199
6392 msgid "unable to open rr-cache directory"
6393 msgstr "不能打开 rr-cache 目录"
6394
6395 #: revision.c:2497
6396 msgid "your current branch appears to be broken"
6397 msgstr "您的当前分支好像被损坏"
6398
6399 #: revision.c:2500
6400 #, c-format
6401 msgid "your current branch '%s' does not have any commits yet"
6402 msgstr "您的当前分支 '%s' 尚无任何提交"
6403
6404 #: revision.c:2708
6405 msgid "--first-parent is incompatible with --bisect"
6406 msgstr "--first-parent 与 --bisect 不兼容"
6407
6408 #: revision.c:2712
6409 msgid "-L does not yet support diff formats besides -p and -s"
6410 msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
6411
6412 #: run-command.c:763
6413 msgid "open /dev/null failed"
6414 msgstr "不能打开 /dev/null"
6415
6416 #: run-command.c:1269
6417 #, c-format
6418 msgid "cannot create async thread: %s"
6419 msgstr "不能创建 async 线程:%s"
6420
6421 #: run-command.c:1333
6422 #, c-format
6423 msgid ""
6424 "The '%s' hook was ignored because it's not set as executable.\n"
6425 "You can disable this warning with `git config advice.ignoredHook false`."
6426 msgstr ""
6427 "因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
6428 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"
6429
6430 #: send-pack.c:144
6431 msgid "unexpected flush packet while reading remote unpack status"
6432 msgstr "读取远程解包状态时收到意外的 flush 包"
6433
6434 #: send-pack.c:146
6435 #, c-format
6436 msgid "unable to parse remote unpack status: %s"
6437 msgstr "不能解析远程解包状态:%s"
6438
6439 #: send-pack.c:148
6440 #, c-format
6441 msgid "remote unpack failed: %s"
6442 msgstr "远程解包失败:%s"
6443
6444 #: send-pack.c:309
6445 msgid "failed to sign the push certificate"
6446 msgstr "为推送证书签名失败"
6447
6448 #: send-pack.c:423
6449 msgid "the receiving end does not support --signed push"
6450 msgstr "接收端不支持签名推送"
6451
6452 #: send-pack.c:425
6453 msgid ""
6454 "not sending a push certificate since the receiving end does not support --"
6455 "signed push"
6456 msgstr "未发送推送证书,因为接收端不支持签名推送"
6457
6458 #: send-pack.c:437
6459 msgid "the receiving end does not support --atomic push"
6460 msgstr "接收端不支持原子推送"
6461
6462 #: send-pack.c:442
6463 msgid "the receiving end does not support push options"
6464 msgstr "接收端不支持推送选项"
6465
6466 #: sequencer.c:191
6467 #, c-format
6468 msgid "invalid commit message cleanup mode '%s'"
6469 msgstr "无效的提交信息清理模式 '%s'"
6470
6471 #: sequencer.c:296
6472 #, c-format
6473 msgid "could not delete '%s'"
6474 msgstr "无法删除 '%s'"
6475
6476 #: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
6477 #, c-format
6478 msgid "could not remove '%s'"
6479 msgstr "无法删除 '%s'"
6480
6481 #: sequencer.c:325
6482 msgid "revert"
6483 msgstr "还原"
6484
6485 #: sequencer.c:327
6486 msgid "cherry-pick"
6487 msgstr "拣选"
6488
6489 #: sequencer.c:329
6490 msgid "rebase"
6491 msgstr "变基"
6492
6493 #: sequencer.c:331
6494 #, c-format
6495 msgid "unknown action: %d"
6496 msgstr "未知动作:%d"
6497
6498 #: sequencer.c:389
6499 msgid ""
6500 "after resolving the conflicts, mark the corrected paths\n"
6501 "with 'git add <paths>' or 'git rm <paths>'"
6502 msgstr ""
6503 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
6504 "命令标记修正后的文件"
6505
6506 #: sequencer.c:392
6507 msgid ""
6508 "after resolving the conflicts, mark the corrected paths\n"
6509 "with 'git add <paths>' or 'git rm <paths>'\n"
6510 "and commit the result with 'git commit'"
6511 msgstr ""
6512 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
6513 "对修正后的文件做标记,然后用 'git commit' 提交"
6514
6515 #: sequencer.c:405 sequencer.c:2901
6516 #, c-format
6517 msgid "could not lock '%s'"
6518 msgstr "不能锁定 '%s'"
6519
6520 #: sequencer.c:412
6521 #, c-format
6522 msgid "could not write eol to '%s'"
6523 msgstr "不能将换行符写入 '%s'"
6524
6525 #: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
6526 #: sequencer.c:3185
6527 #, c-format
6528 msgid "failed to finalize '%s'"
6529 msgstr "无法完成 '%s'"
6530
6531 #: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
6532 #: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
6533 #: builtin/rebase.c:593
6534 #, c-format
6535 msgid "could not read '%s'"
6536 msgstr "不能读取 '%s'"
6537
6538 #: sequencer.c:466
6539 #, c-format
6540 msgid "your local changes would be overwritten by %s."
6541 msgstr "您的本地修改将被%s覆盖。"
6542
6543 #: sequencer.c:470
6544 msgid "commit your changes or stash them to proceed."
6545 msgstr "提交您的修改或贮藏后再继续。"
6546
6547 #: sequencer.c:502
6548 #, c-format
6549 msgid "%s: fast-forward"
6550 msgstr "%s:快进"
6551
6552 #: sequencer.c:541 builtin/tag.c:565
6553 #, c-format
6554 msgid "Invalid cleanup mode %s"
6555 msgstr "无效的清理模式 %s"
6556
6557 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
6558 #. "rebase".
6559 #.
6560 #: sequencer.c:635
6561 #, c-format
6562 msgid "%s: Unable to write new index file"
6563 msgstr "%s:无法写入新索引文件"
6564
6565 #: sequencer.c:652
6566 msgid "unable to update cache tree"
6567 msgstr "不能更新缓存树"
6568
6569 #: sequencer.c:666
6570 msgid "could not resolve HEAD commit"
6571 msgstr "不能解析 HEAD 提交"
6572
6573 #: sequencer.c:746
6574 #, c-format
6575 msgid "no key present in '%.*s'"
6576 msgstr "在 '%.*s' 中没有 key"
6577
6578 #: sequencer.c:757
6579 #, c-format
6580 msgid "unable to dequote value of '%s'"
6581 msgstr "无法为 '%s' 的值去引号"
6582
6583 #: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
6584 #: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
6585 #, c-format
6586 msgid "could not open '%s' for reading"
6587 msgstr "无法打开 '%s' 进行读取"
6588
6589 #: sequencer.c:804
6590 msgid "'GIT_AUTHOR_NAME' already given"
6591 msgstr "已经给出 'GIT_AUTHOR_NAME'"
6592
6593 #: sequencer.c:809
6594 msgid "'GIT_AUTHOR_EMAIL' already given"
6595 msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
6596
6597 #: sequencer.c:814
6598 msgid "'GIT_AUTHOR_DATE' already given"
6599 msgstr "已经给出 'GIT_AUTHOR_DATE'"
6600
6601 #: sequencer.c:818
6602 #, c-format
6603 msgid "unknown variable '%s'"
6604 msgstr "未知变量 '%s'"
6605
6606 #: sequencer.c:823
6607 msgid "missing 'GIT_AUTHOR_NAME'"
6608 msgstr "缺少 'GIT_AUTHOR_NAME'"
6609
6610 #: sequencer.c:825
6611 msgid "missing 'GIT_AUTHOR_EMAIL'"
6612 msgstr "缺少 'GIT_AUTHOR_EMAIL'"
6613
6614 #: sequencer.c:827
6615 msgid "missing 'GIT_AUTHOR_DATE'"
6616 msgstr "缺少 'GIT_AUTHOR_DATE'"
6617
6618 #: sequencer.c:876
6619 #, c-format
6620 msgid ""
6621 "you have staged changes in your working tree\n"
6622 "If these changes are meant to be squashed into the previous commit, run:\n"
6623 "\n"
6624 " git commit --amend %s\n"
6625 "\n"
6626 "If they are meant to go into a new commit, run:\n"
6627 "\n"
6628 " git commit %s\n"
6629 "\n"
6630 "In both cases, once you're done, continue with:\n"
6631 "\n"
6632 " git rebase --continue\n"
6633 msgstr ""
6634 "您的工作区中存在已暂存的修改\n"
6635 "如果这些修改需要被并入前一个提交,执行:\n"
6636 "\n"
6637 " git commit --amend %s\n"
6638 "\n"
6639 "如果这些修改要形成一个新提交,执行:\n"
6640 "\n"
6641 " git commit %s\n"
6642 "\n"
6643 "无论哪种情况,当您完成提交,继续执行:\n"
6644 "\n"
6645 " git rebase --continue\n"
6646
6647 #: sequencer.c:1148
6648 msgid "'prepare-commit-msg' hook failed"
6649 msgstr "'prepare-commit-msg' 钩子失败"
6650
6651 #: sequencer.c:1154
6652 msgid ""
6653 "Your name and email address were configured automatically based\n"
6654 "on your username and hostname. Please check that they are accurate.\n"
6655 "You can suppress this message by setting them explicitly. Run the\n"
6656 "following command and follow the instructions in your editor to edit\n"
6657 "your configuration file:\n"
6658 "\n"
6659 " git config --global --edit\n"
6660 "\n"
6661 "After doing this, you may fix the identity used for this commit with:\n"
6662 "\n"
6663 " git commit --amend --reset-author\n"
6664 msgstr ""
6665 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6666 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
6667 "中编辑您的配置文件:\n"
6668 "\n"
6669 " git config --global --edit\n"
6670 "\n"
6671 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6672 "\n"
6673 " git commit --amend --reset-author\n"
6674
6675 #: sequencer.c:1167
6676 msgid ""
6677 "Your name and email address were configured automatically based\n"
6678 "on your username and hostname. Please check that they are accurate.\n"
6679 "You can suppress this message by setting them explicitly:\n"
6680 "\n"
6681 " git config --global user.name \"Your Name\"\n"
6682 " git config --global user.email you@example.com\n"
6683 "\n"
6684 "After doing this, you may fix the identity used for this commit with:\n"
6685 "\n"
6686 " git commit --amend --reset-author\n"
6687 msgstr ""
6688 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6689 "与否。您可以对其进行设置以免再出现本提示信息:\n"
6690 "\n"
6691 " git config --global user.name \"Your Name\"\n"
6692 " git config --global user.email you@example.com\n"
6693 "\n"
6694 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6695 "\n"
6696 " git commit --amend --reset-author\n"
6697
6698 #: sequencer.c:1209
6699 msgid "couldn't look up newly created commit"
6700 msgstr "无法找到新创建的提交"
6701
6702 #: sequencer.c:1211
6703 msgid "could not parse newly created commit"
6704 msgstr "不能解析新创建的提交"
6705
6706 #: sequencer.c:1257
6707 msgid "unable to resolve HEAD after creating commit"
6708 msgstr "创建提交后,不能解析 HEAD"
6709
6710 #: sequencer.c:1259
6711 msgid "detached HEAD"
6712 msgstr "分离头指针"
6713
6714 # 译者:中文字符串拼接,可删除前导空格
6715 #: sequencer.c:1263
6716 msgid " (root-commit)"
6717 msgstr "(根提交)"
6718
6719 #: sequencer.c:1284
6720 msgid "could not parse HEAD"
6721 msgstr "不能解析 HEAD"
6722
6723 #: sequencer.c:1286
6724 #, c-format
6725 msgid "HEAD %s is not a commit!"
6726 msgstr "HEAD %s 不是一个提交!"
6727
6728 #: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
6729 msgid "could not parse HEAD commit"
6730 msgstr "不能解析 HEAD 提交"
6731
6732 #: sequencer.c:1342 sequencer.c:1968
6733 msgid "unable to parse commit author"
6734 msgstr "不能解析提交作者"
6735
6736 #: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
6737 msgid "git write-tree failed to write a tree"
6738 msgstr "git write-tree 无法写入树对象"
6739
6740 #: sequencer.c:1386 sequencer.c:1447
6741 #, c-format
6742 msgid "unable to read commit message from '%s'"
6743 msgstr "不能从 '%s' 读取提交说明"
6744
6745 #: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
6746 #: builtin/merge.c:911
6747 msgid "failed to write commit object"
6748 msgstr "写提交对象失败"
6749
6750 #: sequencer.c:1474
6751 #, c-format
6752 msgid "could not parse commit %s"
6753 msgstr "不能解析提交 %s"
6754
6755 #: sequencer.c:1479
6756 #, c-format
6757 msgid "could not parse parent commit %s"
6758 msgstr "不能解析父提交 %s"
6759
6760 #: sequencer.c:1562 sequencer.c:1673
6761 #, c-format
6762 msgid "unknown command: %d"
6763 msgstr "未知命令:%d"
6764
6765 #: sequencer.c:1620 sequencer.c:1645
6766 #, c-format
6767 msgid "This is a combination of %d commits."
6768 msgstr "这是一个 %d 个提交的组合。"
6769
6770 #: sequencer.c:1630
6771 msgid "need a HEAD to fixup"
6772 msgstr "需要一个 HEAD 来修复"
6773
6774 #: sequencer.c:1632 sequencer.c:3212
6775 msgid "could not read HEAD"
6776 msgstr "不能读取 HEAD"
6777
6778 #: sequencer.c:1634
6779 msgid "could not read HEAD's commit message"
6780 msgstr "不能读取 HEAD 的提交说明"
6781
6782 #: sequencer.c:1640
6783 #, c-format
6784 msgid "cannot write '%s'"
6785 msgstr "不能写 '%s'"
6786
6787 #: sequencer.c:1647 git-rebase--preserve-merges.sh:496
6788 msgid "This is the 1st commit message:"
6789 msgstr "这是第一个提交说明:"
6790
6791 #: sequencer.c:1655
6792 #, c-format
6793 msgid "could not read commit message of %s"
6794 msgstr "不能读取 %s 的提交说明"
6795
6796 #: sequencer.c:1662
6797 #, c-format
6798 msgid "This is the commit message #%d:"
6799 msgstr "这是提交说明 #%d:"
6800
6801 #: sequencer.c:1668
6802 #, c-format
6803 msgid "The commit message #%d will be skipped:"
6804 msgstr "提交说明 #%d 将被跳过:"
6805
6806 #: sequencer.c:1756
6807 msgid "your index file is unmerged."
6808 msgstr "您的索引文件未完成合并。"
6809
6810 #: sequencer.c:1763
6811 msgid "cannot fixup root commit"
6812 msgstr "不能修复根提交"
6813
6814 #: sequencer.c:1782
6815 #, c-format
6816 msgid "commit %s is a merge but no -m option was given."
6817 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
6818
6819 #: sequencer.c:1790 sequencer.c:1798
6820 #, c-format
6821 msgid "commit %s does not have parent %d"
6822 msgstr "提交 %s 没有第 %d 个父提交"
6823
6824 #: sequencer.c:1804
6825 #, c-format
6826 msgid "cannot get commit message for %s"
6827 msgstr "不能得到 %s 的提交说明"
6828
6829 #. TRANSLATORS: The first %s will be a "todo" command like
6830 #. "revert" or "pick", the second %s a SHA1.
6831 #: sequencer.c:1823
6832 #, c-format
6833 msgid "%s: cannot parse parent commit %s"
6834 msgstr "%s:不能解析父提交 %s"
6835
6836 #: sequencer.c:1888
6837 #, c-format
6838 msgid "could not rename '%s' to '%s'"
6839 msgstr "不能将 '%s' 重命名为 '%s'"
6840
6841 #: sequencer.c:1943
6842 #, c-format
6843 msgid "could not revert %s... %s"
6844 msgstr "不能还原 %s... %s"
6845
6846 #: sequencer.c:1944
6847 #, c-format
6848 msgid "could not apply %s... %s"
6849 msgstr "不能应用 %s... %s"
6850
6851 #: sequencer.c:1961
6852 #, c-format
6853 msgid "dropping %s %s -- patch contents already upstream\n"
6854 msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
6855
6856 #: sequencer.c:2018
6857 #, c-format
6858 msgid "git %s: failed to read the index"
6859 msgstr "git %s:无法读取索引"
6860
6861 #: sequencer.c:2025
6862 #, c-format
6863 msgid "git %s: failed to refresh the index"
6864 msgstr "git %s:无法刷新索引"
6865
6866 #: sequencer.c:2102
6867 #, c-format
6868 msgid "%s does not accept arguments: '%s'"
6869 msgstr "%s 不接受参数:'%s'"
6870
6871 #: sequencer.c:2111
6872 #, c-format
6873 msgid "missing arguments for %s"
6874 msgstr "缺少 %s 的参数"
6875
6876 #: sequencer.c:2142
6877 #, c-format
6878 msgid "could not parse '%s'"
6879 msgstr "无法解析 '%s'"
6880
6881 #: sequencer.c:2203
6882 #, c-format
6883 msgid "invalid line %d: %.*s"
6884 msgstr "无效行 %d:%.*s"
6885
6886 #: sequencer.c:2214
6887 #, c-format
6888 msgid "cannot '%s' without a previous commit"
6889 msgstr "没有父提交的情况下不能 '%s'"
6890
6891 #: sequencer.c:2298
6892 msgid "cancelling a cherry picking in progress"
6893 msgstr "正在取消一个进行中的拣选"
6894
6895 #: sequencer.c:2305
6896 msgid "cancelling a revert in progress"
6897 msgstr "正在取消一个进行中的还原"
6898
6899 #: sequencer.c:2349
6900 msgid "please fix this using 'git rebase --edit-todo'."
6901 msgstr "请用 'git rebase --edit-todo' 来修改。"
6902
6903 #: sequencer.c:2351
6904 #, c-format
6905 msgid "unusable instruction sheet: '%s'"
6906 msgstr "不可用的指令清单:'%s'"
6907
6908 #: sequencer.c:2356
6909 msgid "no commits parsed."
6910 msgstr "没有解析提交。"
6911
6912 #: sequencer.c:2367
6913 msgid "cannot cherry-pick during a revert."
6914 msgstr "不能在回退中执行拣选。"
6915
6916 #: sequencer.c:2369
6917 msgid "cannot revert during a cherry-pick."
6918 msgstr "不能在拣选中执行回退。"
6919
6920 #: sequencer.c:2447
6921 #, c-format
6922 msgid "invalid value for %s: %s"
6923 msgstr "%s 的值无效:%s"
6924
6925 #: sequencer.c:2540
6926 msgid "unusable squash-onto"
6927 msgstr "不可用的 squash-onto"
6928
6929 #: sequencer.c:2556
6930 #, c-format
6931 msgid "malformed options sheet: '%s'"
6932 msgstr "格式错误的选项清单:'%s'"
6933
6934 #: sequencer.c:2644 sequencer.c:4361
6935 msgid "empty commit set passed"
6936 msgstr "提供了空的提交集"
6937
6938 #: sequencer.c:2660
6939 msgid "revert is already in progress"
6940 msgstr "一个还原操作已在进行"
6941
6942 #: sequencer.c:2662
6943 #, c-format
6944 msgid "try \"git revert (--continue | %s--abort | --quit)\""
6945 msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
6946
6947 #: sequencer.c:2665
6948 msgid "cherry-pick is already in progress"
6949 msgstr "拣选操作已在进行"
6950
6951 #: sequencer.c:2667
6952 #, c-format
6953 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
6954 msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
6955
6956 #: sequencer.c:2681
6957 #, c-format
6958 msgid "could not create sequencer directory '%s'"
6959 msgstr "不能创建序列目录 '%s'"
6960
6961 #: sequencer.c:2696
6962 msgid "could not lock HEAD"
6963 msgstr "不能锁定 HEAD"
6964
6965 #: sequencer.c:2756 sequencer.c:4099
6966 msgid "no cherry-pick or revert in progress"
6967 msgstr "拣选或还原操作并未进行"
6968
6969 #: sequencer.c:2758 sequencer.c:2769
6970 msgid "cannot resolve HEAD"
6971 msgstr "不能解析 HEAD"
6972
6973 #: sequencer.c:2760 sequencer.c:2804
6974 msgid "cannot abort from a branch yet to be born"
6975 msgstr "不能从尚未建立的分支终止"
6976
6977 #: sequencer.c:2790 builtin/grep.c:724
6978 #, c-format
6979 msgid "cannot open '%s'"
6980 msgstr "不能打开 '%s'"
6981
6982 #: sequencer.c:2792
6983 #, c-format
6984 msgid "cannot read '%s': %s"
6985 msgstr "不能读取 '%s':%s"
6986
6987 #: sequencer.c:2793
6988 msgid "unexpected end of file"
6989 msgstr "意外的文件结束"
6990
6991 #: sequencer.c:2799
6992 #, c-format
6993 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
6994 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
6995
6996 #: sequencer.c:2810
6997 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
6998 msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
6999
7000 #: sequencer.c:2851
7001 msgid "no revert in progress"
7002 msgstr "没有正在进行的还原"
7003
7004 #: sequencer.c:2859
7005 msgid "no cherry-pick in progress"
7006 msgstr "没有正在进行的拣选"
7007
7008 #: sequencer.c:2869
7009 msgid "failed to skip the commit"
7010 msgstr "无法跳过这个提交"
7011
7012 #: sequencer.c:2876
7013 msgid "there is nothing to skip"
7014 msgstr "没有要跳过的"
7015
7016 #: sequencer.c:2879
7017 #, c-format
7018 msgid ""
7019 "have you committed already?\n"
7020 "try \"git %s --continue\""
7021 msgstr ""
7022 "您已经提交了么?\n"
7023 "试试 \"git %s --continue\""
7024
7025 #: sequencer.c:3003 sequencer.c:4011
7026 #, c-format
7027 msgid "could not update %s"
7028 msgstr "不能更新 %s"
7029
7030 #: sequencer.c:3042 sequencer.c:3991
7031 msgid "cannot read HEAD"
7032 msgstr "不能读取 HEAD"
7033
7034 #: sequencer.c:3059
7035 #, c-format
7036 msgid "unable to copy '%s' to '%s'"
7037 msgstr "无法拷贝 '%s' 至 '%s'"
7038
7039 #: sequencer.c:3067
7040 #, c-format
7041 msgid ""
7042 "You can amend the commit now, with\n"
7043 "\n"
7044 " git commit --amend %s\n"
7045 "\n"
7046 "Once you are satisfied with your changes, run\n"
7047 "\n"
7048 " git rebase --continue\n"
7049 msgstr ""
7050 "您现在可以修补这个提交,使用\n"
7051 "\n"
7052 " git commit --amend %s\n"
7053 "\n"
7054 "当您对变更感到满意,执行\n"
7055 "\n"
7056 " git rebase --continue\n"
7057
7058 #: sequencer.c:3077
7059 #, c-format
7060 msgid "Could not apply %s... %.*s"
7061 msgstr "不能应用 %s... %.*s"
7062
7063 #: sequencer.c:3084
7064 #, c-format
7065 msgid "Could not merge %.*s"
7066 msgstr "不能合并 %.*s"
7067
7068 #: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
7069 #, c-format
7070 msgid "could not copy '%s' to '%s'"
7071 msgstr "不能拷贝 '%s' 至 '%s'"
7072
7073 # 译者:注意保持前导空格
7074 #: sequencer.c:3129
7075 #, c-format
7076 msgid ""
7077 "execution failed: %s\n"
7078 "%sYou can fix the problem, and then run\n"
7079 "\n"
7080 " git rebase --continue\n"
7081 "\n"
7082 msgstr ""
7083 "执行失败:%s\n"
7084 "%s您可以改正该问题,然后运行\n"
7085 "\n"
7086 " git rebase --continue\n"
7087 "\n"
7088
7089 #: sequencer.c:3135
7090 msgid "and made changes to the index and/or the working tree\n"
7091 msgstr "并且修改索引和/或工作区\n"
7092
7093 #: sequencer.c:3141
7094 #, c-format
7095 msgid ""
7096 "execution succeeded: %s\n"
7097 "but left changes to the index and/or the working tree\n"
7098 "Commit or stash your changes, and then run\n"
7099 "\n"
7100 " git rebase --continue\n"
7101 "\n"
7102 msgstr ""
7103 "执行成功:%s\n"
7104 "但是在索引和/或工作区中存在变更\n"
7105 "提交或贮藏修改,然后运行\n"
7106 "\n"
7107 " git rebase --continue\n"
7108 "\n"
7109
7110 #: sequencer.c:3202
7111 #, c-format
7112 msgid "illegal label name: '%.*s'"
7113 msgstr "非法的标签名称:'%.*s'"
7114
7115 #: sequencer.c:3256
7116 msgid "writing fake root commit"
7117 msgstr "写伪根提交"
7118
7119 #: sequencer.c:3261
7120 msgid "writing squash-onto"
7121 msgstr "写入 squash-onto"
7122
7123 #: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
7124 #, c-format
7125 msgid "failed to find tree of %s"
7126 msgstr "无法找到 %s 指向的树。"
7127
7128 #: sequencer.c:3344
7129 #, c-format
7130 msgid "could not resolve '%s'"
7131 msgstr "无法解析 '%s'"
7132
7133 #: sequencer.c:3375
7134 msgid "cannot merge without a current revision"
7135 msgstr "没有当前版本不能合并"
7136
7137 #: sequencer.c:3397
7138 #, c-format
7139 msgid "unable to parse '%.*s'"
7140 msgstr "无法解析 '%.*s'"
7141
7142 #: sequencer.c:3406
7143 #, c-format
7144 msgid "nothing to merge: '%.*s'"
7145 msgstr "无可用合并:'%.*s'"
7146
7147 #: sequencer.c:3418
7148 msgid "octopus merge cannot be executed on top of a [new root]"
7149 msgstr "章鱼合并不能在一个新的根提交上执行"
7150
7151 #: sequencer.c:3434
7152 #, c-format
7153 msgid "could not get commit message of '%s'"
7154 msgstr "不能获取 '%s' 的提交说明"
7155
7156 #: sequencer.c:3594
7157 #, c-format
7158 msgid "could not even attempt to merge '%.*s'"
7159 msgstr "甚至不能尝试合并 '%.*s'"
7160
7161 #: sequencer.c:3610
7162 msgid "merge: Unable to write new index file"
7163 msgstr "合并:无法写入新索引文件"
7164
7165 #: sequencer.c:3679 builtin/rebase.c:737
7166 #, c-format
7167 msgid "Applied autostash.\n"
7168 msgstr "已应用 autostash。\n"
7169
7170 #: sequencer.c:3691
7171 #, c-format
7172 msgid "cannot store %s"
7173 msgstr "不能存储 %s"
7174
7175 #: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
7176 #, c-format
7177 msgid ""
7178 "Applying autostash resulted in conflicts.\n"
7179 "Your changes are safe in the stash.\n"
7180 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
7181 msgstr ""
7182 "应用 autostash 导致冲突。\n"
7183 "您的修改安全地保存在贮藏区中。\n"
7184 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
7185
7186 #: sequencer.c:3755
7187 #, c-format
7188 msgid "%s: not a valid OID"
7189 msgstr "%s:不是一个有效的对象 ID"
7190
7191 #: sequencer.c:3760 git-rebase--preserve-merges.sh:779
7192 msgid "could not detach HEAD"
7193 msgstr "不能分离头指针"
7194
7195 #: sequencer.c:3775
7196 #, c-format
7197 msgid "Stopped at HEAD\n"
7198 msgstr "停止在 HEAD\n"
7199
7200 #: sequencer.c:3777
7201 #, c-format
7202 msgid "Stopped at %s\n"
7203 msgstr "停止在 %s\n"
7204
7205 #: sequencer.c:3785
7206 #, c-format
7207 msgid ""
7208 "Could not execute the todo command\n"
7209 "\n"
7210 " %.*s\n"
7211 "It has been rescheduled; To edit the command before continuing, please\n"
7212 "edit the todo list first:\n"
7213 "\n"
7214 " git rebase --edit-todo\n"
7215 " git rebase --continue\n"
7216 msgstr ""
7217 "无法执行待办命令\n"
7218 "\n"
7219 " %.*s\n"
7220 "已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
7221 "\n"
7222 " git rebase --edit-todo\n"
7223 " git rebase --continue\n"
7224
7225 #: sequencer.c:3869
7226 #, c-format
7227 msgid "Stopped at %s... %.*s\n"
7228 msgstr "停止在 %s... %.*s\n"
7229
7230 #: sequencer.c:3940
7231 #, c-format
7232 msgid "unknown command %d"
7233 msgstr "未知命令 %d"
7234
7235 #: sequencer.c:3999
7236 msgid "could not read orig-head"
7237 msgstr "不能读取 orig-head"
7238
7239 #: sequencer.c:4004
7240 msgid "could not read 'onto'"
7241 msgstr "不能读取 'onto'"
7242
7243 #: sequencer.c:4018
7244 #, c-format
7245 msgid "could not update HEAD to %s"
7246 msgstr "不能更新 HEAD 为 %s"
7247
7248 #: sequencer.c:4111
7249 msgid "cannot rebase: You have unstaged changes."
7250 msgstr "不能变基:您有未暂存的变更。"
7251
7252 #: sequencer.c:4120
7253 msgid "cannot amend non-existing commit"
7254 msgstr "不能修补不存在的提交"
7255
7256 #: sequencer.c:4122
7257 #, c-format
7258 msgid "invalid file: '%s'"
7259 msgstr "无效文件:'%s'"
7260
7261 #: sequencer.c:4124
7262 #, c-format
7263 msgid "invalid contents: '%s'"
7264 msgstr "无效内容:'%s'"
7265
7266 #: sequencer.c:4127
7267 msgid ""
7268 "\n"
7269 "You have uncommitted changes in your working tree. Please, commit them\n"
7270 "first and then run 'git rebase --continue' again."
7271 msgstr ""
7272 "\n"
7273 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
7274
7275 #: sequencer.c:4163 sequencer.c:4202
7276 #, c-format
7277 msgid "could not write file: '%s'"
7278 msgstr "不能写入文件:'%s'"
7279
7280 #: sequencer.c:4217
7281 msgid "could not remove CHERRY_PICK_HEAD"
7282 msgstr "不能删除 CHERRY_PICK_HEAD"
7283
7284 #: sequencer.c:4224
7285 msgid "could not commit staged changes."
7286 msgstr "不能提交暂存的修改。"
7287
7288 #: sequencer.c:4338
7289 #, c-format
7290 msgid "%s: can't cherry-pick a %s"
7291 msgstr "%s:不能拣选一个%s"
7292
7293 #: sequencer.c:4342
7294 #, c-format
7295 msgid "%s: bad revision"
7296 msgstr "%s:错误的版本"
7297
7298 #: sequencer.c:4377
7299 msgid "can't revert as initial commit"
7300 msgstr "不能作为初始提交回退"
7301
7302 #: sequencer.c:4846
7303 msgid "make_script: unhandled options"
7304 msgstr "make_script:有未能处理的选项"
7305
7306 #: sequencer.c:4849
7307 msgid "make_script: error preparing revisions"
7308 msgstr "make_script:准备版本时错误"
7309
7310 #: sequencer.c:5083 sequencer.c:5100
7311 msgid "nothing to do"
7312 msgstr "无事可做"
7313
7314 #: sequencer.c:5119
7315 msgid "could not skip unnecessary pick commands"
7316 msgstr "无法跳过不必要的拣选"
7317
7318 #: sequencer.c:5213
7319 msgid "the script was already rearranged."
7320 msgstr "脚本已经重新编排。"
7321
7322 #: setup.c:124
7323 #, c-format
7324 msgid "'%s' is outside repository at '%s'"
7325 msgstr "'%s' 在位于 '%s' 的仓库之外"
7326
7327 #: setup.c:175
7328 #, c-format
7329 msgid ""
7330 "%s: no such path in the working tree.\n"
7331 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
7332 msgstr ""
7333 "%s:工作区中无此路径。\n"
7334 "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
7335
7336 #: setup.c:188
7337 #, c-format
7338 msgid ""
7339 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
7340 "Use '--' to separate paths from revisions, like this:\n"
7341 "'git <command> [<revision>...] -- [<file>...]'"
7342 msgstr ""
7343 "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
7344 "使用 '--' 来分隔版本和路径,例如:\n"
7345 "'git <命令> [<版本>...] -- [<文件>...]'"
7346
7347 #: setup.c:254
7348 #, c-format
7349 msgid "option '%s' must come before non-option arguments"
7350 msgstr "选项 '%s' 必须在其他非选项参数之前"
7351
7352 #: setup.c:273
7353 #, c-format
7354 msgid ""
7355 "ambiguous argument '%s': both revision and filename\n"
7356 "Use '--' to separate paths from revisions, like this:\n"
7357 "'git <command> [<revision>...] -- [<file>...]'"
7358 msgstr ""
7359 "有歧义的参数 '%s':可同时是版本和文件\n"
7360 "使用 '--' 来分隔版本和路径,例如:\n"
7361 "'git <命令> [<版本>...] -- [<文件>...]'"
7362
7363 #: setup.c:409
7364 msgid "unable to set up work tree using invalid config"
7365 msgstr "无法使用无效配置来创建工作区"
7366
7367 #: setup.c:413
7368 msgid "this operation must be run in a work tree"
7369 msgstr "该操作必须在一个工作区中运行"
7370
7371 #: setup.c:559
7372 #, c-format
7373 msgid "Expected git repo version <= %d, found %d"
7374 msgstr "期望 git 仓库版本 <= %d,却得到 %d"
7375
7376 #: setup.c:567
7377 msgid "unknown repository extensions found:"
7378 msgstr "发现未知的仓库扩展:"
7379
7380 #: setup.c:586
7381 #, c-format
7382 msgid "error opening '%s'"
7383 msgstr "打开 '%s' 出错"
7384
7385 #: setup.c:588
7386 #, c-format
7387 msgid "too large to be a .git file: '%s'"
7388 msgstr "文件太大,无法作为 .git 文件:'%s'"
7389
7390 #: setup.c:590
7391 #, c-format
7392 msgid "error reading %s"
7393 msgstr "读取 %s 出错"
7394
7395 #: setup.c:592
7396 #, c-format
7397 msgid "invalid gitfile format: %s"
7398 msgstr "无效的 gitfile 格式:%s"
7399
7400 #: setup.c:594
7401 #, c-format
7402 msgid "no path in gitfile: %s"
7403 msgstr "在 gitfile 中没有路径:%s"
7404
7405 #: setup.c:596
7406 #, c-format
7407 msgid "not a git repository: %s"
7408 msgstr "不是一个 git 仓库:%s"
7409
7410 #: setup.c:695
7411 #, c-format
7412 msgid "'$%s' too big"
7413 msgstr "'$%s' 太大"
7414
7415 #: setup.c:709
7416 #, c-format
7417 msgid "not a git repository: '%s'"
7418 msgstr "不是一个 git 仓库:'%s'"
7419
7420 #: setup.c:738 setup.c:740 setup.c:771
7421 #, c-format
7422 msgid "cannot chdir to '%s'"
7423 msgstr "不能切换目录到 '%s'"
7424
7425 #: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
7426 msgid "cannot come back to cwd"
7427 msgstr "无法返回当前工作目录"
7428
7429 #: setup.c:870
7430 #, c-format
7431 msgid "failed to stat '%*s%s%s'"
7432 msgstr "获取 '%*s%s%s' 状态(stat)失败"
7433
7434 #: setup.c:1108
7435 msgid "Unable to read current working directory"
7436 msgstr "不能读取当前工作目录"
7437
7438 #: setup.c:1117 setup.c:1123
7439 #, c-format
7440 msgid "cannot change to '%s'"
7441 msgstr "不能切换到 '%s'"
7442
7443 #: setup.c:1128
7444 #, c-format
7445 msgid "not a git repository (or any of the parent directories): %s"
7446 msgstr "不是一个 git 仓库(或者任何父目录):%s"
7447
7448 #: setup.c:1134
7449 #, c-format
7450 msgid ""
7451 "not a git repository (or any parent up to mount point %s)\n"
7452 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
7453 msgstr ""
7454 "不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
7455 "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
7456
7457 #: setup.c:1245
7458 #, c-format
7459 msgid ""
7460 "problem with core.sharedRepository filemode value (0%.3o).\n"
7461 "The owner of files must always have read and write permissions."
7462 msgstr ""
7463 "参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
7464 "文件属主必须始终拥有读写权限。"
7465
7466 #: setup.c:1289
7467 msgid "open /dev/null or dup failed"
7468 msgstr "不能打开或者复制 /dev/null"
7469
7470 #: setup.c:1304
7471 msgid "fork failed"
7472 msgstr "fork 失败"
7473
7474 #: setup.c:1309
7475 msgid "setsid failed"
7476 msgstr "setsid 失败"
7477
7478 #: sha1-file.c:452
7479 #, c-format
7480 msgid "object directory %s does not exist; check .git/objects/info/alternates"
7481 msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates"
7482
7483 #: sha1-file.c:503
7484 #, c-format
7485 msgid "unable to normalize alternate object path: %s"
7486 msgstr "无法规范化备用对象路径:%s"
7487
7488 #: sha1-file.c:575
7489 #, c-format
7490 msgid "%s: ignoring alternate object stores, nesting too deep"
7491 msgstr "%s:忽略备用对象库,嵌套太深"
7492
7493 #: sha1-file.c:582
7494 #, c-format
7495 msgid "unable to normalize object directory: %s"
7496 msgstr "无法规范化对象目录: %s"
7497
7498 #: sha1-file.c:625
7499 msgid "unable to fdopen alternates lockfile"
7500 msgstr "无法 fdopen 替换锁文件"
7501
7502 #: sha1-file.c:643
7503 msgid "unable to read alternates file"
7504 msgstr "无法读取替代文件"
7505
7506 #: sha1-file.c:650
7507 msgid "unable to move new alternates file into place"
7508 msgstr "无法将新的替代文件移动到位"
7509
7510 #: sha1-file.c:685
7511 #, c-format
7512 msgid "path '%s' does not exist"
7513 msgstr "路径 '%s' 不存在"
7514
7515 #: sha1-file.c:711
7516 #, c-format
7517 msgid "reference repository '%s' as a linked checkout is not supported yet."
7518 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
7519
7520 #: sha1-file.c:717
7521 #, c-format
7522 msgid "reference repository '%s' is not a local repository."
7523 msgstr "参考仓库 '%s' 不是一个本地仓库。"
7524
7525 #: sha1-file.c:723
7526 #, c-format
7527 msgid "reference repository '%s' is shallow"
7528 msgstr "参考仓库 '%s' 是一个浅克隆"
7529
7530 #: sha1-file.c:731
7531 #, c-format
7532 msgid "reference repository '%s' is grafted"
7533 msgstr "参考仓库 '%s' 已被移植"
7534
7535 #: sha1-file.c:791
7536 #, c-format
7537 msgid "invalid line while parsing alternate refs: %s"
7538 msgstr "解析备用引用时无效的行:%s"
7539
7540 #: sha1-file.c:943
7541 #, c-format
7542 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
7543 msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>"
7544
7545 #: sha1-file.c:964
7546 msgid "mmap failed"
7547 msgstr "mmap 失败"
7548
7549 #: sha1-file.c:1128
7550 #, c-format
7551 msgid "object file %s is empty"
7552 msgstr "对象文件 %s 为空"
7553
7554 #: sha1-file.c:1263 sha1-file.c:2443
7555 #, c-format
7556 msgid "corrupt loose object '%s'"
7557 msgstr "损坏的松散对象 '%s'"
7558
7559 #: sha1-file.c:1265 sha1-file.c:2447
7560 #, c-format
7561 msgid "garbage at end of loose object '%s'"
7562 msgstr "松散对象 '%s' 后面有垃圾数据"
7563
7564 #: sha1-file.c:1307
7565 msgid "invalid object type"
7566 msgstr "无效的对象类型"
7567
7568 #: sha1-file.c:1391
7569 #, c-format
7570 msgid "unable to unpack %s header with --allow-unknown-type"
7571 msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
7572
7573 #: sha1-file.c:1394
7574 #, c-format
7575 msgid "unable to unpack %s header"
7576 msgstr "无法解开 %s 头部"
7577
7578 #: sha1-file.c:1400
7579 #, c-format
7580 msgid "unable to parse %s header with --allow-unknown-type"
7581 msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
7582
7583 #: sha1-file.c:1403
7584 #, c-format
7585 msgid "unable to parse %s header"
7586 msgstr "无法解析 %s 头部"
7587
7588 #: sha1-file.c:1629
7589 #, c-format
7590 msgid "failed to read object %s"
7591 msgstr "读取对象 %s 失败"
7592
7593 #: sha1-file.c:1633
7594 #, c-format
7595 msgid "replacement %s not found for %s"
7596 msgstr "找不到 %2$s 的替代 %1$s"
7597
7598 #: sha1-file.c:1637
7599 #, c-format
7600 msgid "loose object %s (stored in %s) is corrupt"
7601 msgstr "松散对象 %s(保存在 %s)已损坏"
7602
7603 #: sha1-file.c:1641
7604 #, c-format
7605 msgid "packed object %s (stored in %s) is corrupt"
7606 msgstr "打包对象 %s(保存在 %s)已损坏"
7607
7608 #: sha1-file.c:1746
7609 #, c-format
7610 msgid "unable to write file %s"
7611 msgstr "无法写文件 %s"
7612
7613 #: sha1-file.c:1753
7614 #, c-format
7615 msgid "unable to set permission to '%s'"
7616 msgstr "无法为 '%s' 设置权限"
7617
7618 #: sha1-file.c:1760
7619 msgid "file write error"
7620 msgstr "文件写错误"
7621
7622 #: sha1-file.c:1780
7623 msgid "error when closing loose object file"
7624 msgstr "关闭松散对象文件时出错"
7625
7626 #: sha1-file.c:1845
7627 #, c-format
7628 msgid "insufficient permission for adding an object to repository database %s"
7629 msgstr "权限不足,无法在仓库对象库 %s 中添加对象"
7630
7631 #: sha1-file.c:1847
7632 msgid "unable to create temporary file"
7633 msgstr "无法创建临时文件"
7634
7635 #: sha1-file.c:1871
7636 msgid "unable to write loose object file"
7637 msgstr "不能写松散对象文件"
7638
7639 #: sha1-file.c:1877
7640 #, c-format
7641 msgid "unable to deflate new object %s (%d)"
7642 msgstr "不能压缩新对象 %s(%d)"
7643
7644 #: sha1-file.c:1881
7645 #, c-format
7646 msgid "deflateEnd on object %s failed (%d)"
7647 msgstr "在对象 %s 上调用 deflateEnd 失败(%d)"
7648
7649 #: sha1-file.c:1885
7650 #, c-format
7651 msgid "confused by unstable object source data for %s"
7652 msgstr "被 %s 的不稳定对象源数据搞糊涂了"
7653
7654 #: sha1-file.c:1895 builtin/pack-objects.c:1054
7655 #, c-format
7656 msgid "failed utime() on %s"
7657 msgstr "在 %s 上调用 utime() 失败"
7658
7659 #: sha1-file.c:1972
7660 #, c-format
7661 msgid "cannot read object for %s"
7662 msgstr "不能读取对象 %s"
7663
7664 #: sha1-file.c:2011
7665 msgid "corrupt commit"
7666 msgstr "损坏的提交"
7667
7668 #: sha1-file.c:2019
7669 msgid "corrupt tag"
7670 msgstr "损坏的标签"
7671
7672 #: sha1-file.c:2119
7673 #, c-format
7674 msgid "read error while indexing %s"
7675 msgstr "索引 %s 时读取错误"
7676
7677 #: sha1-file.c:2122
7678 #, c-format
7679 msgid "short read while indexing %s"
7680 msgstr "索引 %s 时读入不完整"
7681
7682 #: sha1-file.c:2195 sha1-file.c:2205
7683 #, c-format
7684 msgid "%s: failed to insert into database"
7685 msgstr "%s:插入数据库失败"
7686
7687 #: sha1-file.c:2211
7688 #, c-format
7689 msgid "%s: unsupported file type"
7690 msgstr "%s:不支持的文件类型"
7691
7692 #: sha1-file.c:2235
7693 #, c-format
7694 msgid "%s is not a valid object"
7695 msgstr "%s 不是一个有效的对象"
7696
7697 #: sha1-file.c:2237
7698 #, c-format
7699 msgid "%s is not a valid '%s' object"
7700 msgstr "%s 不是一个有效的 '%s' 对象"
7701
7702 #: sha1-file.c:2264 builtin/index-pack.c:155
7703 #, c-format
7704 msgid "unable to open %s"
7705 msgstr "不能打开 %s"
7706
7707 #: sha1-file.c:2454 sha1-file.c:2507
7708 #, c-format
7709 msgid "hash mismatch for %s (expected %s)"
7710 msgstr "%s 的哈希值不匹配(预期 %s)"
7711
7712 #: sha1-file.c:2478
7713 #, c-format
7714 msgid "unable to mmap %s"
7715 msgstr "不能 mmap %s"
7716
7717 #: sha1-file.c:2483
7718 #, c-format
7719 msgid "unable to unpack header of %s"
7720 msgstr "无法解压缩 %s 的头部"
7721
7722 #: sha1-file.c:2489
7723 #, c-format
7724 msgid "unable to parse header of %s"
7725 msgstr "无法解析 %s 的头部"
7726
7727 #: sha1-file.c:2500
7728 #, c-format
7729 msgid "unable to unpack contents of %s"
7730 msgstr "无法解压缩 %s 的内容"
7731
7732 #: sha1-name.c:486
7733 #, c-format
7734 msgid "short SHA1 %s is ambiguous"
7735 msgstr "短 SHA1 %s 存在歧义"
7736
7737 #: sha1-name.c:497
7738 msgid "The candidates are:"
7739 msgstr "候选者有:"
7740
7741 #: sha1-name.c:796
7742 msgid ""
7743 "Git normally never creates a ref that ends with 40 hex characters\n"
7744 "because it will be ignored when you just specify 40-hex. These refs\n"
7745 "may be created by mistake. For example,\n"
7746 "\n"
7747 " git switch -c $br $(git rev-parse ...)\n"
7748 "\n"
7749 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
7750 "examine these refs and maybe delete them. Turn this message off by\n"
7751 "running \"git config advice.objectNameWarning false\""
7752 msgstr ""
7753 "Git 通常不会创建一个以40个十六进制字符结尾的引用,因为当您只提供40\n"
7754 "个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n"
7755 "\n"
7756 " git switch -c $br $(git rev-parse ...)\n"
7757 "\n"
7758 "当 \"$br\" 某种原因空白时,一个40位十六进制的引用将被创建。请检查这些\n"
7759 "引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
7760 "false\" 命令关闭本消息通知。"
7761
7762 #: sha1-name.c:916
7763 #, c-format
7764 msgid "log for '%.*s' only goes back to %s"
7765 msgstr "'%.*s' 的日志仅能回到 %s"
7766
7767 #: sha1-name.c:924
7768 #, c-format
7769 msgid "log for '%.*s' only has %d entries"
7770 msgstr "'%.*s' 的日志仅有 %d 个条目"
7771
7772 #: sha1-name.c:1689
7773 #, c-format
7774 msgid "path '%s' exists on disk, but not in '%.*s'"
7775 msgstr "路径 '%s' 在磁盘上,但是不在 '%.*s' 中"
7776
7777 #: sha1-name.c:1695
7778 #, c-format
7779 msgid ""
7780 "path '%s' exists, but not '%s'\n"
7781 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
7782 msgstr ""
7783 "路径 '%s' 存在,而 '%s' 不存在\n"
7784 "提示:您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'?"
7785
7786 #: sha1-name.c:1704
7787 #, c-format
7788 msgid "path '%s' does not exist in '%.*s'"
7789 msgstr "路径 '%s' 不在 '%.*s' 中"
7790
7791 #: sha1-name.c:1732
7792 #, c-format
7793 msgid ""
7794 "path '%s' is in the index, but not at stage %d\n"
7795 "hint: Did you mean ':%d:%s'?"
7796 msgstr ""
7797 "路径 '%s' 在索引中,但不在暂存区 %d 中\n"
7798 "提示:您的意思是 ':%d:%s'?"
7799
7800 #: sha1-name.c:1748
7801 #, c-format
7802 msgid ""
7803 "path '%s' is in the index, but not '%s'\n"
7804 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
7805 msgstr ""
7806 "路径 '%s' 在索引中,但 '%s' 不在\n"
7807 "提示:您的意思是 ':%d:%s' 亦即 ':%d:./%s'?"
7808
7809 #: sha1-name.c:1756
7810 #, c-format
7811 msgid "path '%s' exists on disk, but not in the index"
7812 msgstr "路径 '%s' 在磁盘上,但不在索引里"
7813
7814 #: sha1-name.c:1758
7815 #, c-format
7816 msgid "path '%s' does not exist (neither on disk nor in the index)"
7817 msgstr "路径 '%s' 不存在(既不在磁盘上,也不在索引中)"
7818
7819 #: sha1-name.c:1771
7820 msgid "relative path syntax can't be used outside working tree"
7821 msgstr "不能在工作区之外使用相对路径语法"
7822
7823 #: sha1-name.c:1909
7824 #, c-format
7825 msgid "invalid object name '%.*s'."
7826 msgstr "无效的对象名 '%.*s'。"
7827
7828 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
7829 #: strbuf.c:837
7830 #, c-format
7831 msgid "%u.%2.2u GiB"
7832 msgstr "%u.%2.2u GiB"
7833
7834 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
7835 #: strbuf.c:839
7836 #, c-format
7837 msgid "%u.%2.2u GiB/s"
7838 msgstr "%u.%2.2u GiB/s"
7839
7840 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
7841 #: strbuf.c:847
7842 #, c-format
7843 msgid "%u.%2.2u MiB"
7844 msgstr "%u.%2.2u MiB"
7845
7846 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
7847 #: strbuf.c:849
7848 #, c-format
7849 msgid "%u.%2.2u MiB/s"
7850 msgstr "%u.%2.2u MiB/s"
7851
7852 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
7853 #: strbuf.c:856
7854 #, c-format
7855 msgid "%u.%2.2u KiB"
7856 msgstr "%u.%2.2u KiB"
7857
7858 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
7859 #: strbuf.c:858
7860 #, c-format
7861 msgid "%u.%2.2u KiB/s"
7862 msgstr "%u.%2.2u KiB/s"
7863
7864 #. TRANSLATORS: IEC 80000-13:2008 byte
7865 #: strbuf.c:864
7866 #, c-format
7867 msgid "%u byte"
7868 msgid_plural "%u bytes"
7869 msgstr[0] "%u 字节"
7870 msgstr[1] "%u 字节"
7871
7872 #. TRANSLATORS: IEC 80000-13:2008 byte/second
7873 #: strbuf.c:866
7874 #, c-format
7875 msgid "%u byte/s"
7876 msgid_plural "%u bytes/s"
7877 msgstr[0] "%u 字节/秒"
7878 msgstr[1] "%u 字节/秒"
7879
7880 #: strbuf.c:1164
7881 #, c-format
7882 msgid "could not edit '%s'"
7883 msgstr "不能编辑 '%s'"
7884
7885 #: submodule.c:114 submodule.c:143
7886 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
7887 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
7888
7889 #: submodule.c:118 submodule.c:147
7890 #, c-format
7891 msgid "Could not find section in .gitmodules where path=%s"
7892 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
7893
7894 #: submodule.c:154
7895 #, c-format
7896 msgid "Could not remove .gitmodules entry for %s"
7897 msgstr "无法移除 %s 的 .gitmodules 条目"
7898
7899 #: submodule.c:165
7900 msgid "staging updated .gitmodules failed"
7901 msgstr "将更新后 .gitmodules 添加暂存区失败"
7902
7903 #: submodule.c:327
7904 #, c-format
7905 msgid "in unpopulated submodule '%s'"
7906 msgstr "位于未检出的子模组 '%s'"
7907
7908 #: submodule.c:358
7909 #, c-format
7910 msgid "Pathspec '%s' is in submodule '%.*s'"
7911 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
7912
7913 #: submodule.c:434
7914 #, c-format
7915 msgid "bad --ignore-submodules argument: %s"
7916 msgstr "坏的 --ignore-submodules 参数:%s"
7917
7918 #: submodule.c:815
7919 #, c-format
7920 msgid ""
7921 "Submodule in commit %s at path: '%s' collides with a submodule named the "
7922 "same. Skipping it."
7923 msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
7924
7925 #: submodule.c:910
7926 #, c-format
7927 msgid "submodule entry '%s' (%s) is a %s, not a commit"
7928 msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
7929
7930 #: submodule.c:995
7931 #, c-format
7932 msgid ""
7933 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
7934 "submodule %s"
7935 msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'"
7936
7937 #: submodule.c:1118
7938 #, c-format
7939 msgid "process for submodule '%s' failed"
7940 msgstr "处理子模组 '%s' 失败"
7941
7942 #: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
7943 msgid "Failed to resolve HEAD as a valid ref."
7944 msgstr "无法将 HEAD 解析为有效引用。"
7945
7946 #: submodule.c:1158
7947 #, c-format
7948 msgid "Pushing submodule '%s'\n"
7949 msgstr "正在推送子模组 '%s'\n"
7950
7951 #: submodule.c:1161
7952 #, c-format
7953 msgid "Unable to push submodule '%s'\n"
7954 msgstr "无法推送子模组 '%s'\n"
7955
7956 #: submodule.c:1453
7957 #, c-format
7958 msgid "Fetching submodule %s%s\n"
7959 msgstr "正在获取子模组 %s%s\n"
7960
7961 #: submodule.c:1483
7962 #, c-format
7963 msgid "Could not access submodule '%s'\n"
7964 msgstr "无法访问子模组 '%s'\n"
7965
7966 #: submodule.c:1637
7967 #, c-format
7968 msgid ""
7969 "Errors during submodule fetch:\n"
7970 "%s"
7971 msgstr ""
7972 "获取子模组时的错误:\n"
7973 "%s"
7974
7975 #: submodule.c:1662
7976 #, c-format
7977 msgid "'%s' not recognized as a git repository"
7978 msgstr "无法将 '%s' 识别为一个 git 仓库"
7979
7980 #: submodule.c:1679
7981 #, c-format
7982 msgid "Could not run 'git status --porcelain=2' in submodule %s"
7983 msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
7984
7985 #: submodule.c:1720
7986 #, c-format
7987 msgid "'git status --porcelain=2' failed in submodule %s"
7988 msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
7989
7990 #: submodule.c:1800
7991 #, c-format
7992 msgid "could not start 'git status' in submodule '%s'"
7993 msgstr "无法在子模组 '%s' 中启动 'git status'"
7994
7995 #: submodule.c:1813
7996 #, c-format
7997 msgid "could not run 'git status' in submodule '%s'"
7998 msgstr "无法在子模组 '%s' 中执行 'git status'"
7999
8000 #: submodule.c:1828
8001 #, c-format
8002 msgid "Could not unset core.worktree setting in submodule '%s'"
8003 msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
8004
8005 #: submodule.c:1855 submodule.c:2165
8006 #, c-format
8007 msgid "could not recurse into submodule '%s'"
8008 msgstr "无法递归进子模组路径 '%s'"
8009
8010 #: submodule.c:1876
8011 msgid "could not reset submodule index"
8012 msgstr "无法重置子模组索引"
8013
8014 #: submodule.c:1918
8015 #, c-format
8016 msgid "submodule '%s' has dirty index"
8017 msgstr "子模组 '%s' 中有脏索引"
8018
8019 #: submodule.c:1970
8020 #, c-format
8021 msgid "Submodule '%s' could not be updated."
8022 msgstr "子模组 '%s' 无法被更新。"
8023
8024 #: submodule.c:2038
8025 #, c-format
8026 msgid "submodule git dir '%s' is inside git dir '%.*s'"
8027 msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
8028
8029 #: submodule.c:2059
8030 #, c-format
8031 msgid ""
8032 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
8033 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
8034
8035 #: submodule.c:2071 submodule.c:2130
8036 #, c-format
8037 msgid "could not lookup name for submodule '%s'"
8038 msgstr "不能查询子模组 '%s' 的名称"
8039
8040 #: submodule.c:2075
8041 #, c-format
8042 msgid "refusing to move '%s' into an existing git dir"
8043 msgstr "禁止移动 '%s' 到现存 git 目录中"
8044
8045 #: submodule.c:2082
8046 #, c-format
8047 msgid ""
8048 "Migrating git directory of '%s%s' from\n"
8049 "'%s' to\n"
8050 "'%s'\n"
8051 msgstr ""
8052 "将 '%s%s' 的 git 目录从\n"
8053 "'%s' 迁移至\n"
8054 "'%s'\n"
8055
8056 #: submodule.c:2209
8057 msgid "could not start ls-files in .."
8058 msgstr "无法在 .. 中启动 ls-files"
8059
8060 #: submodule.c:2248
8061 #, c-format
8062 msgid "ls-tree returned unexpected return code %d"
8063 msgstr "ls-tree 返回未知返回值 %d"
8064
8065 #: submodule-config.c:236
8066 #, c-format
8067 msgid "ignoring suspicious submodule name: %s"
8068 msgstr "忽略可疑的子模组名称:%s"
8069
8070 #: submodule-config.c:303
8071 msgid "negative values not allowed for submodule.fetchjobs"
8072 msgstr "submodule.fetchjobs 不允许为负值"
8073
8074 #: submodule-config.c:401
8075 #, c-format
8076 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
8077 msgstr "忽略可能被解析为命令行选项的 '%s':%s"
8078
8079 #: submodule-config.c:498
8080 #, c-format
8081 msgid "invalid value for %s"
8082 msgstr "%s 的值无效"
8083
8084 #: submodule-config.c:765
8085 #, c-format
8086 msgid "Could not update .gitmodules entry %s"
8087 msgstr "不能更新 .gitmodules 条目 %s"
8088
8089 #: trailer.c:238
8090 #, c-format
8091 msgid "running trailer command '%s' failed"
8092 msgstr "执行 trailer 命令 '%s' 失败"
8093
8094 #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
8095 #: trailer.c:557
8096 #, c-format
8097 msgid "unknown value '%s' for key '%s'"
8098 msgstr "键 '%2$s' 的未知取值 '%1$s'"
8099
8100 #: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
8101 #, c-format
8102 msgid "more than one %s"
8103 msgstr "多于一个 %s"
8104
8105 #: trailer.c:730
8106 #, c-format
8107 msgid "empty trailer token in trailer '%.*s'"
8108 msgstr "签名 '%.*s' 的键为空"
8109
8110 #: trailer.c:750
8111 #, c-format
8112 msgid "could not read input file '%s'"
8113 msgstr "不能读取输入文件 '%s'"
8114
8115 #: trailer.c:753
8116 msgid "could not read from stdin"
8117 msgstr "不能自标准输入读取"
8118
8119 #: trailer.c:1011 wrapper.c:665
8120 #, c-format
8121 msgid "could not stat %s"
8122 msgstr "不能对 %s 调用 stat"
8123
8124 #: trailer.c:1013
8125 #, c-format
8126 msgid "file %s is not a regular file"
8127 msgstr "文件 %s 不是一个正规文件"
8128
8129 #: trailer.c:1015
8130 #, c-format
8131 msgid "file %s is not writable by user"
8132 msgstr "文件 %s 用户不可写"
8133
8134 #: trailer.c:1027
8135 msgid "could not open temporary file"
8136 msgstr "不能打开临时文件"
8137
8138 #: trailer.c:1067
8139 #, c-format
8140 msgid "could not rename temporary file to %s"
8141 msgstr "不能重命名临时文件为 %s"
8142
8143 #: transport.c:116
8144 #, c-format
8145 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
8146 msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
8147
8148 #: transport.c:145
8149 #, c-format
8150 msgid "could not read bundle '%s'"
8151 msgstr "无法读取 bundle '%s'"
8152
8153 #: transport.c:214
8154 #, c-format
8155 msgid "transport: invalid depth option '%s'"
8156 msgstr "传输:无效的深度选项 '%s'"
8157
8158 #: transport.c:266
8159 msgid "see protocol.version in 'git help config' for more details"
8160 msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
8161
8162 #: transport.c:267
8163 msgid "server options require protocol version 2 or later"
8164 msgstr "服务端选项需要版本 2 协议或更高"
8165
8166 #: transport.c:632
8167 msgid "could not parse transport.color.* config"
8168 msgstr "不能解析 transport.color.* 配置"
8169
8170 #: transport.c:705
8171 msgid "support for protocol v2 not implemented yet"
8172 msgstr "协议 v2 的支持尚未实现"
8173
8174 #: transport.c:831
8175 #, c-format
8176 msgid "unknown value for config '%s': %s"
8177 msgstr "配置 '%s' 的取值未知:%s"
8178
8179 #: transport.c:897
8180 #, c-format
8181 msgid "transport '%s' not allowed"
8182 msgstr "传输 '%s' 不允许"
8183
8184 #: transport.c:949
8185 msgid "git-over-rsync is no longer supported"
8186 msgstr "不再支持 git-over-rsync"
8187
8188 #: transport.c:1044
8189 #, c-format
8190 msgid ""
8191 "The following submodule paths contain changes that can\n"
8192 "not be found on any remote:\n"
8193 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
8194
8195 #: transport.c:1048
8196 #, c-format
8197 msgid ""
8198 "\n"
8199 "Please try\n"
8200 "\n"
8201 "\tgit push --recurse-submodules=on-demand\n"
8202 "\n"
8203 "or cd to the path and use\n"
8204 "\n"
8205 "\tgit push\n"
8206 "\n"
8207 "to push them to a remote.\n"
8208 "\n"
8209 msgstr ""
8210 "\n"
8211 "请尝试\n"
8212 "\n"
8213 "\tgit push --recurse-submodules=on-demand\n"
8214 "\n"
8215 "或者进入到子目录执行\n"
8216 "\n"
8217 "\tgit push\n"
8218 "\n"
8219 "以推送至远程。\n"
8220 "\n"
8221
8222 #: transport.c:1056
8223 msgid "Aborting."
8224 msgstr "正在终止。"
8225
8226 #: transport.c:1201
8227 msgid "failed to push all needed submodules"
8228 msgstr "不能推送全部需要的子模组"
8229
8230 #: transport.c:1345 transport-helper.c:657
8231 msgid "operation not supported by protocol"
8232 msgstr "协议不支持该操作"
8233
8234 #: transport-helper.c:61 transport-helper.c:90
8235 msgid "full write to remote helper failed"
8236 msgstr "完整写入远程助手失败"
8237
8238 #: transport-helper.c:144
8239 #, c-format
8240 msgid "unable to find remote helper for '%s'"
8241 msgstr "无法为 '%s' 找到远程助手"
8242
8243 #: transport-helper.c:160 transport-helper.c:571
8244 msgid "can't dup helper output fd"
8245 msgstr "无法复制助手输出文件句柄"
8246
8247 #: transport-helper.c:211
8248 #, c-format
8249 msgid ""
8250 "unknown mandatory capability %s; this remote helper probably needs newer "
8251 "version of Git"
8252 msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git"
8253
8254 #: transport-helper.c:217
8255 msgid "this remote helper should implement refspec capability"
8256 msgstr "远程助手需要实现 refspec 能力"
8257
8258 #: transport-helper.c:284 transport-helper.c:425
8259 #, c-format
8260 msgid "%s unexpectedly said: '%s'"
8261 msgstr "%s 意外地说:'%s'"
8262
8263 #: transport-helper.c:414
8264 #, c-format
8265 msgid "%s also locked %s"
8266 msgstr "%s 也锁定了 %s"
8267
8268 #: transport-helper.c:493
8269 msgid "couldn't run fast-import"
8270 msgstr "不能执行 fast-import"
8271
8272 #: transport-helper.c:516
8273 msgid "error while running fast-import"
8274 msgstr "执行 fast-import 出错"
8275
8276 #: transport-helper.c:545 transport-helper.c:1134
8277 #, c-format
8278 msgid "could not read ref %s"
8279 msgstr "无法读取引用 %s"
8280
8281 #: transport-helper.c:590
8282 #, c-format
8283 msgid "unknown response to connect: %s"
8284 msgstr "连接时未知的响应:%s"
8285
8286 #: transport-helper.c:612
8287 msgid "setting remote service path not supported by protocol"
8288 msgstr "协议不支持设置远程服务路径"
8289
8290 #: transport-helper.c:614
8291 msgid "invalid remote service path"
8292 msgstr "无效的远程服务路径"
8293
8294 #: transport-helper.c:660
8295 #, c-format
8296 msgid "can't connect to subservice %s"
8297 msgstr "不能连接到子服务 %s"
8298
8299 #: transport-helper.c:736
8300 #, c-format
8301 msgid "expected ok/error, helper said '%s'"
8302 msgstr "预期 ok/error,助手说 '%s'"
8303
8304 #: transport-helper.c:789
8305 #, c-format
8306 msgid "helper reported unexpected status of %s"
8307 msgstr "助手报告 %s 的意外状态"
8308
8309 #: transport-helper.c:850
8310 #, c-format
8311 msgid "helper %s does not support dry-run"
8312 msgstr "助手 %s 不支持 dry-run"
8313
8314 #: transport-helper.c:853
8315 #, c-format
8316 msgid "helper %s does not support --signed"
8317 msgstr "助手 %s 不支持 --signed"
8318
8319 #: transport-helper.c:856
8320 #, c-format
8321 msgid "helper %s does not support --signed=if-asked"
8322 msgstr "助手 %s 不支持 --signed=if-asked"
8323
8324 #: transport-helper.c:861
8325 #, c-format
8326 msgid "helper %s does not support --atomic"
8327 msgstr "助手 %s 不支持 --atomic"
8328
8329 #: transport-helper.c:867
8330 #, c-format
8331 msgid "helper %s does not support 'push-option'"
8332 msgstr "助手 %s 不支持 'push-option'"
8333
8334 #: transport-helper.c:965
8335 msgid "remote-helper doesn't support push; refspec needed"
8336 msgstr "remote-heper 不支持 push,需要引用表达式"
8337
8338 #: transport-helper.c:970
8339 #, c-format
8340 msgid "helper %s does not support 'force'"
8341 msgstr "助手 %s 不支持 'force'"
8342
8343 #: transport-helper.c:1017
8344 msgid "couldn't run fast-export"
8345 msgstr "无法执行 fast-export"
8346
8347 #: transport-helper.c:1022
8348 msgid "error while running fast-export"
8349 msgstr "执行 fast-export 时出错"
8350
8351 #: transport-helper.c:1047
8352 #, c-format
8353 msgid ""
8354 "No refs in common and none specified; doing nothing.\n"
8355 "Perhaps you should specify a branch such as 'master'.\n"
8356 msgstr ""
8357 "没有共同的引用并且也没有指定,什么也不会做。\n"
8358 "可能您应该指定一个分支如 'master'。\n"
8359
8360 #: transport-helper.c:1120
8361 #, c-format
8362 msgid "malformed response in ref list: %s"
8363 msgstr "引用列表中格式错误的响应:%s"
8364
8365 #: transport-helper.c:1272
8366 #, c-format
8367 msgid "read(%s) failed"
8368 msgstr "读取(%s)失败"
8369
8370 #: transport-helper.c:1299
8371 #, c-format
8372 msgid "write(%s) failed"
8373 msgstr "写(%s)失败"
8374
8375 #: transport-helper.c:1348
8376 #, c-format
8377 msgid "%s thread failed"
8378 msgstr "%s 线程失败"
8379
8380 #: transport-helper.c:1352
8381 #, c-format
8382 msgid "%s thread failed to join: %s"
8383 msgstr "%s 线程等待失败:%s"
8384
8385 #: transport-helper.c:1371 transport-helper.c:1375
8386 #, c-format
8387 msgid "can't start thread for copying data: %s"
8388 msgstr "不能启动线程来拷贝数据:%s"
8389
8390 #: transport-helper.c:1412
8391 #, c-format
8392 msgid "%s process failed to wait"
8393 msgstr "%s 进程等待失败"
8394
8395 #: transport-helper.c:1416
8396 #, c-format
8397 msgid "%s process failed"
8398 msgstr "%s 进程失败"
8399
8400 #: transport-helper.c:1434 transport-helper.c:1443
8401 msgid "can't start thread for copying data"
8402 msgstr "不能启动线程来拷贝数据"
8403
8404 #: tree-walk.c:32
8405 msgid "too-short tree object"
8406 msgstr "太短的树对象"
8407
8408 #: tree-walk.c:38
8409 msgid "malformed mode in tree entry"
8410 msgstr "树对象中的条目模式错误"
8411
8412 #: tree-walk.c:42
8413 msgid "empty filename in tree entry"
8414 msgstr "树对象条目中空的文件名"
8415
8416 #: tree-walk.c:117
8417 msgid "too-short tree file"
8418 msgstr "太短的树文件"
8419
8420 #: unpack-trees.c:110
8421 #, c-format
8422 msgid ""
8423 "Your local changes to the following files would be overwritten by checkout:\n"
8424 "%%sPlease commit your changes or stash them before you switch branches."
8425 msgstr ""
8426 "您对下列文件的本地修改将被检出操作覆盖:\n"
8427 "%%s请在切换分支前提交或贮藏您的修改。"
8428
8429 #: unpack-trees.c:112
8430 #, c-format
8431 msgid ""
8432 "Your local changes to the following files would be overwritten by checkout:\n"
8433 "%%s"
8434 msgstr ""
8435 "您对下列文件的本地修改将被检出操作覆盖:\n"
8436 "%%s"
8437
8438 #: unpack-trees.c:115
8439 #, c-format
8440 msgid ""
8441 "Your local changes to the following files would be overwritten by merge:\n"
8442 "%%sPlease commit your changes or stash them before you merge."
8443 msgstr ""
8444 "您对下列文件的本地修改将被合并操作覆盖:\n"
8445 "%%s请在合并前提交或贮藏您的修改。"
8446
8447 #: unpack-trees.c:117
8448 #, c-format
8449 msgid ""
8450 "Your local changes to the following files would be overwritten by merge:\n"
8451 "%%s"
8452 msgstr ""
8453 "您对下列文件的本地修改将被合并操作覆盖:\n"
8454 "%%s"
8455
8456 #: unpack-trees.c:120
8457 #, c-format
8458 msgid ""
8459 "Your local changes to the following files would be overwritten by %s:\n"
8460 "%%sPlease commit your changes or stash them before you %s."
8461 msgstr ""
8462 "您对下列文件的本地修改将被 %s 覆盖:\n"
8463 "%%s请在 %s 之前提交或贮藏您的修改。"
8464
8465 #: unpack-trees.c:122
8466 #, c-format
8467 msgid ""
8468 "Your local changes to the following files would be overwritten by %s:\n"
8469 "%%s"
8470 msgstr ""
8471 "您对下列文件的本地修改将被 %s 覆盖:\n"
8472 "%%s"
8473
8474 #: unpack-trees.c:127
8475 #, c-format
8476 msgid ""
8477 "Updating the following directories would lose untracked files in them:\n"
8478 "%s"
8479 msgstr ""
8480 "更新如下目录将会丢失其中未跟踪的文件:\n"
8481 "%s"
8482
8483 #: unpack-trees.c:131
8484 #, c-format
8485 msgid ""
8486 "The following untracked working tree files would be removed by checkout:\n"
8487 "%%sPlease move or remove them before you switch branches."
8488 msgstr ""
8489 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
8490 "%%s请在切换分支之前移动或删除。"
8491
8492 #: unpack-trees.c:133
8493 #, c-format
8494 msgid ""
8495 "The following untracked working tree files would be removed by checkout:\n"
8496 "%%s"
8497 msgstr ""
8498 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
8499 "%%s"
8500
8501 #: unpack-trees.c:136
8502 #, c-format
8503 msgid ""
8504 "The following untracked working tree files would be removed by merge:\n"
8505 "%%sPlease move or remove them before you merge."
8506 msgstr ""
8507 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
8508 "%%s请在合并前移动或删除。"
8509
8510 #: unpack-trees.c:138
8511 #, c-format
8512 msgid ""
8513 "The following untracked working tree files would be removed by merge:\n"
8514 "%%s"
8515 msgstr ""
8516 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
8517 "%%s"
8518
8519 #: unpack-trees.c:141
8520 #, c-format
8521 msgid ""
8522 "The following untracked working tree files would be removed by %s:\n"
8523 "%%sPlease move or remove them before you %s."
8524 msgstr ""
8525 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
8526 "%%s请在 %s 前移动或删除。"
8527
8528 #: unpack-trees.c:143
8529 #, c-format
8530 msgid ""
8531 "The following untracked working tree files would be removed by %s:\n"
8532 "%%s"
8533 msgstr ""
8534 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
8535 "%%s"
8536
8537 #: unpack-trees.c:149
8538 #, c-format
8539 msgid ""
8540 "The following untracked working tree files would be overwritten by "
8541 "checkout:\n"
8542 "%%sPlease move or remove them before you switch branches."
8543 msgstr ""
8544 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
8545 "%%s请在切换分支前移动或删除。"
8546
8547 #: unpack-trees.c:151
8548 #, c-format
8549 msgid ""
8550 "The following untracked working tree files would be overwritten by "
8551 "checkout:\n"
8552 "%%s"
8553 msgstr ""
8554 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
8555 "%%s"
8556
8557 #: unpack-trees.c:154
8558 #, c-format
8559 msgid ""
8560 "The following untracked working tree files would be overwritten by merge:\n"
8561 "%%sPlease move or remove them before you merge."
8562 msgstr ""
8563 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
8564 "%%s请在合并前移动或删除。"
8565
8566 #: unpack-trees.c:156
8567 #, c-format
8568 msgid ""
8569 "The following untracked working tree files would be overwritten by merge:\n"
8570 "%%s"
8571 msgstr ""
8572 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
8573 "%%s"
8574
8575 #: unpack-trees.c:159
8576 #, c-format
8577 msgid ""
8578 "The following untracked working tree files would be overwritten by %s:\n"
8579 "%%sPlease move or remove them before you %s."
8580 msgstr ""
8581 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
8582 "%%s请在 %s 前移动或删除。"
8583
8584 #: unpack-trees.c:161
8585 #, c-format
8586 msgid ""
8587 "The following untracked working tree files would be overwritten by %s:\n"
8588 "%%s"
8589 msgstr ""
8590 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
8591 "%%s"
8592
8593 #: unpack-trees.c:169
8594 #, c-format
8595 msgid "Entry '%s' overlaps with '%s'. Cannot bind."
8596 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
8597
8598 #: unpack-trees.c:172
8599 #, c-format
8600 msgid ""
8601 "Cannot update sparse checkout: the following entries are not up to date:\n"
8602 "%s"
8603 msgstr ""
8604 "无法更新稀疏检出:如下条目不是最新:\n"
8605 "%s"
8606
8607 #: unpack-trees.c:174
8608 #, c-format
8609 msgid ""
8610 "The following working tree files would be overwritten by sparse checkout "
8611 "update:\n"
8612 "%s"
8613 msgstr ""
8614 "工作区中下列文件将被稀疏检出更新所覆盖:\n"
8615 "%s"
8616
8617 #: unpack-trees.c:176
8618 #, c-format
8619 msgid ""
8620 "The following working tree files would be removed by sparse checkout "
8621 "update:\n"
8622 "%s"
8623 msgstr ""
8624 "工作区中下列文件将被稀疏检出更新所删除:\n"
8625 "%s"
8626
8627 #: unpack-trees.c:178
8628 #, c-format
8629 msgid ""
8630 "Cannot update submodule:\n"
8631 "%s"
8632 msgstr ""
8633 "无法更新子模组:\n"
8634 "%s"
8635
8636 #: unpack-trees.c:255
8637 #, c-format
8638 msgid "Aborting\n"
8639 msgstr "正在终止\n"
8640
8641 #: unpack-trees.c:317
8642 msgid "Updating files"
8643 msgstr "正在更新文件"
8644
8645 #: unpack-trees.c:349
8646 msgid ""
8647 "the following paths have collided (e.g. case-sensitive paths\n"
8648 "on a case-insensitive filesystem) and only one from the same\n"
8649 "colliding group is in the working tree:\n"
8650 msgstr ""
8651 "以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n"
8652 "并且碰撞组中只有一个文件存在工作区中:\n"
8653
8654 #: unpack-trees.c:1445
8655 msgid "Updating index flags"
8656 msgstr "正在更新索引标志"
8657
8658 #: urlmatch.c:163
8659 msgid "invalid URL scheme name or missing '://' suffix"
8660 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
8661
8662 #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
8663 #, c-format
8664 msgid "invalid %XX escape sequence"
8665 msgstr "无效的 %XX 转义序列"
8666
8667 #: urlmatch.c:215
8668 msgid "missing host and scheme is not 'file:'"
8669 msgstr "缺失主机名且 URL 方案不是 'file:'"
8670
8671 #: urlmatch.c:232
8672 msgid "a 'file:' URL may not have a port number"
8673 msgstr "一个 'file:' URL 不应该包含端口号"
8674
8675 #: urlmatch.c:247
8676 msgid "invalid characters in host name"
8677 msgstr "主机名中包含无效的字符"
8678
8679 #: urlmatch.c:292 urlmatch.c:303
8680 msgid "invalid port number"
8681 msgstr "无效的端口号"
8682
8683 #: urlmatch.c:371
8684 msgid "invalid '..' path segment"
8685 msgstr "无效的 '..' 路径片段"
8686
8687 #: walker.c:170
8688 msgid "Fetching objects"
8689 msgstr "正在获取对象"
8690
8691 #: worktree.c:259 builtin/am.c:2099
8692 #, c-format
8693 msgid "failed to read '%s'"
8694 msgstr "读取 '%s' 失败"
8695
8696 #: worktree.c:305
8697 #, c-format
8698 msgid "'%s' at main working tree is not the repository directory"
8699 msgstr "在主工作区的 '%s' 不是仓库目录"
8700
8701 #: worktree.c:316
8702 #, c-format
8703 msgid "'%s' file does not contain absolute path to the working tree location"
8704 msgstr "文件 '%s' 不包含工作区的绝对路径"
8705
8706 #: worktree.c:328
8707 #, c-format
8708 msgid "'%s' does not exist"
8709 msgstr "'%s' 不存在"
8710
8711 #: worktree.c:334
8712 #, c-format
8713 msgid "'%s' is not a .git file, error code %d"
8714 msgstr "'%s' 不是一个 .git 文件,错误码 %d"
8715
8716 #: worktree.c:342
8717 #, c-format
8718 msgid "'%s' does not point back to '%s'"
8719 msgstr "'%s' 没有指回到 '%s'"
8720
8721 #: wrapper.c:186 wrapper.c:356
8722 #, c-format
8723 msgid "could not open '%s' for reading and writing"
8724 msgstr "无法打开 '%s' 进行读写"
8725
8726 #: wrapper.c:387 wrapper.c:588
8727 #, c-format
8728 msgid "unable to access '%s'"
8729 msgstr "不能访问 '%s'"
8730
8731 #: wrapper.c:596
8732 msgid "unable to get current working directory"
8733 msgstr "不能获取当前工作目录"
8734
8735 #: wt-status.c:158
8736 msgid "Unmerged paths:"
8737 msgstr "未合并的路径:"
8738
8739 # 译者:注意保持前导空格
8740 #: wt-status.c:187 wt-status.c:219
8741 msgid " (use \"git restore --staged <file>...\" to unstage)"
8742 msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)"
8743
8744 # 译者:注意保持前导空格
8745 #: wt-status.c:190 wt-status.c:222
8746 #, c-format
8747 msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
8748 msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)"
8749
8750 # 译者:注意保持前导空格
8751 #: wt-status.c:193 wt-status.c:225
8752 msgid " (use \"git rm --cached <file>...\" to unstage)"
8753 msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
8754
8755 # 译者:注意保持前导空格
8756 #: wt-status.c:197
8757 msgid " (use \"git add <file>...\" to mark resolution)"
8758 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8759
8760 # 译者:注意保持前导空格
8761 #: wt-status.c:199 wt-status.c:203
8762 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
8763 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8764
8765 # 译者:注意保持前导空格
8766 #: wt-status.c:201
8767 msgid " (use \"git rm <file>...\" to mark resolution)"
8768 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
8769
8770 #: wt-status.c:211 wt-status.c:1074
8771 msgid "Changes to be committed:"
8772 msgstr "要提交的变更:"
8773
8774 #: wt-status.c:234 wt-status.c:1083
8775 msgid "Changes not staged for commit:"
8776 msgstr "尚未暂存以备提交的变更:"
8777
8778 # 译者:注意保持前导空格
8779 #: wt-status.c:238
8780 msgid " (use \"git add <file>...\" to update what will be committed)"
8781 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
8782
8783 # 译者:注意保持前导空格
8784 #: wt-status.c:240
8785 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
8786 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
8787
8788 # 译者:注意保持前导空格
8789 #: wt-status.c:241
8790 msgid ""
8791 " (use \"git restore <file>...\" to discard changes in working directory)"
8792 msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)"
8793
8794 # 译者:注意保持前导空格
8795 #: wt-status.c:243
8796 msgid " (commit or discard the untracked or modified content in submodules)"
8797 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
8798
8799 # 译者:注意保持前导空格
8800 #: wt-status.c:254
8801 #, c-format
8802 msgid " (use \"git %s <file>...\" to include in what will be committed)"
8803 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
8804
8805 #: wt-status.c:268
8806 msgid "both deleted:"
8807 msgstr "双方删除:"
8808
8809 #: wt-status.c:270
8810 msgid "added by us:"
8811 msgstr "由我们添加:"
8812
8813 #: wt-status.c:272
8814 msgid "deleted by them:"
8815 msgstr "由他们删除:"
8816
8817 #: wt-status.c:274
8818 msgid "added by them:"
8819 msgstr "由他们添加:"
8820
8821 #: wt-status.c:276
8822 msgid "deleted by us:"
8823 msgstr "由我们删除:"
8824
8825 #: wt-status.c:278
8826 msgid "both added:"
8827 msgstr "双方添加:"
8828
8829 #: wt-status.c:280
8830 msgid "both modified:"
8831 msgstr "双方修改:"
8832
8833 #: wt-status.c:290
8834 msgid "new file:"
8835 msgstr "新文件:"
8836
8837 #: wt-status.c:292
8838 msgid "copied:"
8839 msgstr "拷贝:"
8840
8841 #: wt-status.c:294
8842 msgid "deleted:"
8843 msgstr "删除:"
8844
8845 #: wt-status.c:296
8846 msgid "modified:"
8847 msgstr "修改:"
8848
8849 #: wt-status.c:298
8850 msgid "renamed:"
8851 msgstr "重命名:"
8852
8853 #: wt-status.c:300
8854 msgid "typechange:"
8855 msgstr "类型变更:"
8856
8857 #: wt-status.c:302
8858 msgid "unknown:"
8859 msgstr "未知:"
8860
8861 #: wt-status.c:304
8862 msgid "unmerged:"
8863 msgstr "未合并:"
8864
8865 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
8866 #: wt-status.c:384
8867 msgid "new commits, "
8868 msgstr "新提交, "
8869
8870 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
8871 #: wt-status.c:386
8872 msgid "modified content, "
8873 msgstr "修改的内容, "
8874
8875 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
8876 #: wt-status.c:388
8877 msgid "untracked content, "
8878 msgstr "未跟踪的内容, "
8879
8880 #: wt-status.c:906
8881 #, c-format
8882 msgid "Your stash currently has %d entry"
8883 msgid_plural "Your stash currently has %d entries"
8884 msgstr[0] "您的贮藏区当前有 %d 条记录"
8885 msgstr[1] "您的贮藏区当前有 %d 条记录"
8886
8887 #: wt-status.c:938
8888 msgid "Submodules changed but not updated:"
8889 msgstr "子模组已修改但尚未更新:"
8890
8891 #: wt-status.c:940
8892 msgid "Submodule changes to be committed:"
8893 msgstr "要提交的子模组变更:"
8894
8895 #: wt-status.c:1022
8896 msgid ""
8897 "Do not modify or remove the line above.\n"
8898 "Everything below it will be ignored."
8899 msgstr ""
8900 "不要改动或删除上面的一行。\n"
8901 "其下所有内容都将被忽略。"
8902
8903 #: wt-status.c:1114
8904 #, c-format
8905 msgid ""
8906 "\n"
8907 "It took %.2f seconds to compute the branch ahead/behind values.\n"
8908 "You can use '--no-ahead-behind' to avoid this.\n"
8909 msgstr ""
8910 "\n"
8911 "花了 %.2f 秒才计算出分支的领先/落后范围。\n"
8912 "为避免,您可以使用 '--no-ahead-behind'。\n"
8913
8914 #: wt-status.c:1144
8915 msgid "You have unmerged paths."
8916 msgstr "您有尚未合并的路径。"
8917
8918 # 译者:注意保持前导空格
8919 #: wt-status.c:1147
8920 msgid " (fix conflicts and run \"git commit\")"
8921 msgstr " (解决冲突并运行 \"git commit\")"
8922
8923 # 译者:注意保持前导空格
8924 #: wt-status.c:1149
8925 msgid " (use \"git merge --abort\" to abort the merge)"
8926 msgstr " (使用 \"git merge --abort\" 终止合并)"
8927
8928 #: wt-status.c:1153
8929 msgid "All conflicts fixed but you are still merging."
8930 msgstr "所有冲突已解决但您仍处于合并中。"
8931
8932 # 译者:注意保持前导空格
8933 #: wt-status.c:1156
8934 msgid " (use \"git commit\" to conclude merge)"
8935 msgstr " (使用 \"git commit\" 结束合并)"
8936
8937 #: wt-status.c:1165
8938 msgid "You are in the middle of an am session."
8939 msgstr "您正处于 am 操作过程中。"
8940
8941 #: wt-status.c:1168
8942 msgid "The current patch is empty."
8943 msgstr "当前的补丁为空。"
8944
8945 # 译者:注意保持前导空格
8946 #: wt-status.c:1172
8947 msgid " (fix conflicts and then run \"git am --continue\")"
8948 msgstr " (解决冲突,然后运行 \"git am --continue\")"
8949
8950 # 译者:注意保持前导空格
8951 #: wt-status.c:1174
8952 msgid " (use \"git am --skip\" to skip this patch)"
8953 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
8954
8955 # 译者:注意保持前导空格
8956 #: wt-status.c:1176
8957 msgid " (use \"git am --abort\" to restore the original branch)"
8958 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
8959
8960 #: wt-status.c:1309
8961 msgid "git-rebase-todo is missing."
8962 msgstr "git-rebase-todo 丢失。"
8963
8964 #: wt-status.c:1311
8965 msgid "No commands done."
8966 msgstr "没有命令被执行。"
8967
8968 #: wt-status.c:1314
8969 #, c-format
8970 msgid "Last command done (%d command done):"
8971 msgid_plural "Last commands done (%d commands done):"
8972 msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
8973 msgstr[1] "最后的命令已完成(%d 条命令被执行):"
8974
8975 #: wt-status.c:1325
8976 #, c-format
8977 msgid " (see more in file %s)"
8978 msgstr " (更多参见文件 %s)"
8979
8980 #: wt-status.c:1330
8981 msgid "No commands remaining."
8982 msgstr "未剩下任何命令。"
8983
8984 #: wt-status.c:1333
8985 #, c-format
8986 msgid "Next command to do (%d remaining command):"
8987 msgid_plural "Next commands to do (%d remaining commands):"
8988 msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
8989 msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
8990
8991 # 译者:注意保持前导空格
8992 #: wt-status.c:1341
8993 msgid " (use \"git rebase --edit-todo\" to view and edit)"
8994 msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
8995
8996 #: wt-status.c:1353
8997 #, c-format
8998 msgid "You are currently rebasing branch '%s' on '%s'."
8999 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
9000
9001 #: wt-status.c:1358
9002 msgid "You are currently rebasing."
9003 msgstr "您在执行变基操作。"
9004
9005 # 译者:注意保持前导空格
9006 #: wt-status.c:1371
9007 msgid " (fix conflicts and then run \"git rebase --continue\")"
9008 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
9009
9010 # 译者:注意保持前导空格
9011 #: wt-status.c:1373
9012 msgid " (use \"git rebase --skip\" to skip this patch)"
9013 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
9014
9015 # 译者:注意保持前导空格
9016 #: wt-status.c:1375
9017 msgid " (use \"git rebase --abort\" to check out the original branch)"
9018 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
9019
9020 # 译者:注意保持前导空格
9021 #: wt-status.c:1382
9022 msgid " (all conflicts fixed: run \"git rebase --continue\")"
9023 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
9024
9025 #: wt-status.c:1386
9026 #, c-format
9027 msgid ""
9028 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
9029 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
9030
9031 #: wt-status.c:1391
9032 msgid "You are currently splitting a commit during a rebase."
9033 msgstr "您在执行变基操作时拆分提交。"
9034
9035 # 译者:注意保持前导空格
9036 #: wt-status.c:1394
9037 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
9038 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
9039
9040 #: wt-status.c:1398
9041 #, c-format
9042 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
9043 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
9044
9045 #: wt-status.c:1403
9046 msgid "You are currently editing a commit during a rebase."
9047 msgstr "您在执行变基操作时编辑提交。"
9048
9049 # 译者:注意保持前导空格
9050 #: wt-status.c:1406
9051 msgid " (use \"git commit --amend\" to amend the current commit)"
9052 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
9053
9054 # 译者:注意保持前导空格
9055 #: wt-status.c:1408
9056 msgid ""
9057 " (use \"git rebase --continue\" once you are satisfied with your changes)"
9058 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
9059
9060 #: wt-status.c:1419
9061 msgid "Cherry-pick currently in progress."
9062 msgstr "拣选操作正在进行中。"
9063
9064 #: wt-status.c:1422
9065 #, c-format
9066 msgid "You are currently cherry-picking commit %s."
9067 msgstr "您在执行拣选提交 %s 的操作。"
9068
9069 # 译者:注意保持前导空格
9070 #: wt-status.c:1429
9071 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
9072 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
9073
9074 # 译者:注意保持前导空格
9075 #: wt-status.c:1432
9076 msgid " (run \"git cherry-pick --continue\" to continue)"
9077 msgstr " (执行 \"git cherry-pick --continue\" 以继续)"
9078
9079 # 译者:注意保持前导空格
9080 #: wt-status.c:1435
9081 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
9082 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
9083
9084 # 译者:注意保持前导空格
9085 #: wt-status.c:1437
9086 msgid " (use \"git cherry-pick --skip\" to skip this patch)"
9087 msgstr " (使用 \"git cherry-pick --skip\" 跳过此补丁)"
9088
9089 # 译者:注意保持前导空格
9090 #: wt-status.c:1439
9091 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
9092 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
9093
9094 #: wt-status.c:1449
9095 msgid "Revert currently in progress."
9096 msgstr "还原操作正在行中。"
9097
9098 #: wt-status.c:1452
9099 #, c-format
9100 msgid "You are currently reverting commit %s."
9101 msgstr "您在执行反转提交 %s 的操作。"
9102
9103 # 译者:注意保持前导空格
9104 #: wt-status.c:1458
9105 msgid " (fix conflicts and run \"git revert --continue\")"
9106 msgstr " (解决冲突并执行 \"git revert --continue\")"
9107
9108 # 译者:注意保持前导空格
9109 #: wt-status.c:1461
9110 msgid " (run \"git revert --continue\" to continue)"
9111 msgstr " (执行 \"git revert --continue\" 以继续)"
9112
9113 # 译者:注意保持前导空格
9114 #: wt-status.c:1464
9115 msgid " (all conflicts fixed: run \"git revert --continue\")"
9116 msgstr " (所有冲突已解决:执行 \"git revert --continue\")"
9117
9118 # 译者:注意保持前导空格
9119 #: wt-status.c:1466
9120 msgid " (use \"git revert --skip\" to skip this patch)"
9121 msgstr " (使用 \"git revert --skip\" 跳过此补丁)"
9122
9123 # 译者:注意保持前导空格
9124 #: wt-status.c:1468
9125 msgid " (use \"git revert --abort\" to cancel the revert operation)"
9126 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
9127
9128 #: wt-status.c:1478
9129 #, c-format
9130 msgid "You are currently bisecting, started from branch '%s'."
9131 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
9132
9133 #: wt-status.c:1482
9134 msgid "You are currently bisecting."
9135 msgstr "您在执行二分查找操作。"
9136
9137 # 译者:注意保持前导空格
9138 #: wt-status.c:1485
9139 msgid " (use \"git bisect reset\" to get back to the original branch)"
9140 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
9141
9142 #: wt-status.c:1694
9143 msgid "On branch "
9144 msgstr "位于分支 "
9145
9146 #: wt-status.c:1701
9147 msgid "interactive rebase in progress; onto "
9148 msgstr "交互式变基操作正在进行中;至 "
9149
9150 #: wt-status.c:1703
9151 msgid "rebase in progress; onto "
9152 msgstr "变基操作正在进行中;至 "
9153
9154 #: wt-status.c:1713
9155 msgid "Not currently on any branch."
9156 msgstr "当前不在任何分支上。"
9157
9158 #: wt-status.c:1730
9159 msgid "Initial commit"
9160 msgstr "初始提交"
9161
9162 #: wt-status.c:1731
9163 msgid "No commits yet"
9164 msgstr "尚无提交"
9165
9166 #: wt-status.c:1745
9167 msgid "Untracked files"
9168 msgstr "未跟踪的文件"
9169
9170 #: wt-status.c:1747
9171 msgid "Ignored files"
9172 msgstr "忽略的文件"
9173
9174 #: wt-status.c:1751
9175 #, c-format
9176 msgid ""
9177 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
9178 "may speed it up, but you have to be careful not to forget to add\n"
9179 "new files yourself (see 'git help status')."
9180 msgstr ""
9181 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
9182 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
9183
9184 #: wt-status.c:1757
9185 #, c-format
9186 msgid "Untracked files not listed%s"
9187 msgstr "未跟踪的文件没有列出%s"
9188
9189 # 译者:中文字符串拼接,可删除前导空格
9190 #: wt-status.c:1759
9191 msgid " (use -u option to show untracked files)"
9192 msgstr "(使用 -u 参数显示未跟踪的文件)"
9193
9194 #: wt-status.c:1765
9195 msgid "No changes"
9196 msgstr "没有修改"
9197
9198 #: wt-status.c:1770
9199 #, c-format
9200 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
9201 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
9202
9203 #: wt-status.c:1773
9204 #, c-format
9205 msgid "no changes added to commit\n"
9206 msgstr "修改尚未加入提交\n"
9207
9208 #: wt-status.c:1776
9209 #, c-format
9210 msgid ""
9211 "nothing added to commit but untracked files present (use \"git add\" to "
9212 "track)\n"
9213 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
9214
9215 #: wt-status.c:1779
9216 #, c-format
9217 msgid "nothing added to commit but untracked files present\n"
9218 msgstr "提交为空,但是存在尚未跟踪的文件\n"
9219
9220 # 译者:中文字符串拼接,可删除前导空格
9221 #: wt-status.c:1782
9222 #, c-format
9223 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
9224 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
9225
9226 #: wt-status.c:1785 wt-status.c:1790
9227 #, c-format
9228 msgid "nothing to commit\n"
9229 msgstr "无文件要提交\n"
9230
9231 # 译者:中文字符串拼接,可删除前导空格
9232 #: wt-status.c:1788
9233 #, c-format
9234 msgid "nothing to commit (use -u to show untracked files)\n"
9235 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
9236
9237 # 译者:中文字符串拼接,可删除前导空格
9238 #: wt-status.c:1792
9239 #, c-format
9240 msgid "nothing to commit, working tree clean\n"
9241 msgstr "无文件要提交,干净的工作区\n"
9242
9243 #: wt-status.c:1905
9244 msgid "No commits yet on "
9245 msgstr "尚无提交在 "
9246
9247 #: wt-status.c:1909
9248 msgid "HEAD (no branch)"
9249 msgstr "HEAD(非分支)"
9250
9251 #: wt-status.c:1940
9252 msgid "different"
9253 msgstr "不同"
9254
9255 # 译者:注意保持句尾空格
9256 #: wt-status.c:1942 wt-status.c:1950
9257 msgid "behind "
9258 msgstr "落后 "
9259
9260 #: wt-status.c:1945 wt-status.c:1948
9261 msgid "ahead "
9262 msgstr "领先 "
9263
9264 #. TRANSLATORS: the action is e.g. "pull with rebase"
9265 #: wt-status.c:2470
9266 #, c-format
9267 msgid "cannot %s: You have unstaged changes."
9268 msgstr "不能%s:您有未暂存的变更。"
9269
9270 #: wt-status.c:2476
9271 msgid "additionally, your index contains uncommitted changes."
9272 msgstr "另外,您的索引中包含未提交的变更。"
9273
9274 #: wt-status.c:2478
9275 #, c-format
9276 msgid "cannot %s: Your index contains uncommitted changes."
9277 msgstr "不能%s:您的索引中包含未提交的变更。"
9278
9279 #: compat/precompose_utf8.c:58 builtin/clone.c:455
9280 #, c-format
9281 msgid "failed to unlink '%s'"
9282 msgstr "删除 '%s' 失败"
9283
9284 #: builtin/add.c:26
9285 msgid "git add [<options>] [--] <pathspec>..."
9286 msgstr "git add [<选项>] [--] <路径规格>..."
9287
9288 #: builtin/add.c:88
9289 #, c-format
9290 msgid "unexpected diff status %c"
9291 msgstr "意外的差异状态 %c"
9292
9293 #: builtin/add.c:93 builtin/commit.c:288
9294 msgid "updating files failed"
9295 msgstr "更新文件失败"
9296
9297 #: builtin/add.c:103
9298 #, c-format
9299 msgid "remove '%s'\n"
9300 msgstr "删除 '%s'\n"
9301
9302 #: builtin/add.c:178
9303 msgid "Unstaged changes after refreshing the index:"
9304 msgstr "刷新索引之后尚未被暂存的变更:"
9305
9306 #: builtin/add.c:266 builtin/rev-parse.c:899
9307 msgid "Could not read the index"
9308 msgstr "不能读取索引"
9309
9310 #: builtin/add.c:277
9311 #, c-format
9312 msgid "Could not open '%s' for writing."
9313 msgstr "无法为写入打开 '%s'。"
9314
9315 #: builtin/add.c:281
9316 msgid "Could not write patch"
9317 msgstr "不能生成补丁"
9318
9319 #: builtin/add.c:284
9320 msgid "editing patch failed"
9321 msgstr "编辑补丁失败"
9322
9323 #: builtin/add.c:287
9324 #, c-format
9325 msgid "Could not stat '%s'"
9326 msgstr "不能对 '%s' 调用 stat"
9327
9328 #: builtin/add.c:289
9329 msgid "Empty patch. Aborted."
9330 msgstr "空补丁。异常终止。"
9331
9332 #: builtin/add.c:294
9333 #, c-format
9334 msgid "Could not apply '%s'"
9335 msgstr "不能应用 '%s'"
9336
9337 #: builtin/add.c:302
9338 msgid "The following paths are ignored by one of your .gitignore files:\n"
9339 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
9340
9341 #: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
9342 #: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
9343 #: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
9344 msgid "dry run"
9345 msgstr "演习"
9346
9347 #: builtin/add.c:325
9348 msgid "interactive picking"
9349 msgstr "交互式拣选"
9350
9351 #: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
9352 msgid "select hunks interactively"
9353 msgstr "交互式挑选数据块"
9354
9355 #: builtin/add.c:327
9356 msgid "edit current diff and apply"
9357 msgstr "编辑当前差异并应用"
9358
9359 #: builtin/add.c:328
9360 msgid "allow adding otherwise ignored files"
9361 msgstr "允许添加忽略的文件"
9362
9363 #: builtin/add.c:329
9364 msgid "update tracked files"
9365 msgstr "更新已跟踪的文件"
9366
9367 #: builtin/add.c:330
9368 msgid "renormalize EOL of tracked files (implies -u)"
9369 msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
9370
9371 #: builtin/add.c:331
9372 msgid "record only the fact that the path will be added later"
9373 msgstr "只记录,该路径稍后再添加"
9374
9375 #: builtin/add.c:332
9376 msgid "add changes from all tracked and untracked files"
9377 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
9378
9379 #: builtin/add.c:335
9380 msgid "ignore paths removed in the working tree (same as --no-all)"
9381 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
9382
9383 #: builtin/add.c:337
9384 msgid "don't add, only refresh the index"
9385 msgstr "不添加,只刷新索引"
9386
9387 #: builtin/add.c:338
9388 msgid "just skip files which cannot be added because of errors"
9389 msgstr "跳过因出错不能添加的文件"
9390
9391 #: builtin/add.c:339
9392 msgid "check if - even missing - files are ignored in dry run"
9393 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
9394
9395 #: builtin/add.c:341 builtin/update-index.c:1004
9396 msgid "override the executable bit of the listed files"
9397 msgstr "覆盖列表里文件的可执行位"
9398
9399 #: builtin/add.c:343
9400 msgid "warn when adding an embedded repository"
9401 msgstr "创建一个嵌入式仓库时给予警告"
9402
9403 #: builtin/add.c:345
9404 msgid "backend for `git stash -p`"
9405 msgstr "`git stash -p` 的后端"
9406
9407 #: builtin/add.c:363
9408 #, c-format
9409 msgid ""
9410 "You've added another git repository inside your current repository.\n"
9411 "Clones of the outer repository will not contain the contents of\n"
9412 "the embedded repository and will not know how to obtain it.\n"
9413 "If you meant to add a submodule, use:\n"
9414 "\n"
9415 "\tgit submodule add <url> %s\n"
9416 "\n"
9417 "If you added this path by mistake, you can remove it from the\n"
9418 "index with:\n"
9419 "\n"
9420 "\tgit rm --cached %s\n"
9421 "\n"
9422 "See \"git help submodule\" for more information."
9423 msgstr ""
9424 "您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n"
9425 "内容,并且不知道该如何获取它。如果您要添加一个子模组,使用:\n"
9426 "\n"
9427 "\tgit submodule add <url> %s\n"
9428 "\n"
9429 "如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
9430 "\n"
9431 "\tgit rm --cached %s\n"
9432 "\n"
9433 "参见 \"git help submodule\" 获取更多信息。"
9434
9435 #: builtin/add.c:391
9436 #, c-format
9437 msgid "adding embedded git repository: %s"
9438 msgstr "正在添加嵌入式 git 仓库:%s"
9439
9440 #: builtin/add.c:410
9441 msgid ""
9442 "Use -f if you really want to add them.\n"
9443 "Turn this message off by running\n"
9444 "\"git config advice.addIgnoredFile false\""
9445 msgstr ""
9446 "如果您确实要添加它们,使用 -f 参数。\n"
9447 "运行下面的命令来关闭本消息\n"
9448 "\"git config advice.addIgnoredFile false\""
9449
9450 #: builtin/add.c:419
9451 msgid "adding files failed"
9452 msgstr "添加文件失败"
9453
9454 #: builtin/add.c:447 builtin/commit.c:348
9455 msgid "--pathspec-from-file is incompatible with --interactive/--patch"
9456 msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容"
9457
9458 #: builtin/add.c:464
9459 msgid "--pathspec-from-file is incompatible with --edit"
9460 msgstr "--pathspec-from-file 与 --edit 不兼容"
9461
9462 #: builtin/add.c:476
9463 msgid "-A and -u are mutually incompatible"
9464 msgstr "-A 和 -u 选项互斥"
9465
9466 #: builtin/add.c:479
9467 msgid "Option --ignore-missing can only be used together with --dry-run"
9468 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
9469
9470 #: builtin/add.c:483
9471 #, c-format
9472 msgid "--chmod param '%s' must be either -x or +x"
9473 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
9474
9475 #: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
9476 #: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
9477 msgid "--pathspec-from-file is incompatible with pathspec arguments"
9478 msgstr "--pathspec-from-file 与路径表达式参数不兼容"
9479
9480 #: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
9481 #: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
9482 msgid "--pathspec-file-nul requires --pathspec-from-file"
9483 msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
9484
9485 #: builtin/add.c:512
9486 #, c-format
9487 msgid "Nothing specified, nothing added.\n"
9488 msgstr "没有指定文件,也没有文件被添加。\n"
9489
9490 #: builtin/add.c:514
9491 msgid ""
9492 "Maybe you wanted to say 'git add .'?\n"
9493 "Turn this message off by running\n"
9494 "\"git config advice.addEmptyPathspec false\""
9495 msgstr ""
9496 "也许您想要执行 'git add .'?\n"
9497 "运行下面的命令来关闭本消息\n"
9498 "\"git config advice.addEmptyPathspec false\""
9499
9500 #: builtin/am.c:352
9501 msgid "could not parse author script"
9502 msgstr "不能解析作者脚本"
9503
9504 #: builtin/am.c:436
9505 #, c-format
9506 msgid "'%s' was deleted by the applypatch-msg hook"
9507 msgstr "'%s' 被 applypatch-msg 钩子删除"
9508
9509 #: builtin/am.c:478
9510 #, c-format
9511 msgid "Malformed input line: '%s'."
9512 msgstr "非法的输入行:'%s'。"
9513
9514 #: builtin/am.c:516
9515 #, c-format
9516 msgid "Failed to copy notes from '%s' to '%s'"
9517 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
9518
9519 #: builtin/am.c:542
9520 msgid "fseek failed"
9521 msgstr "fseek 失败"
9522
9523 #: builtin/am.c:730
9524 #, c-format
9525 msgid "could not parse patch '%s'"
9526 msgstr "无法解析补丁 '%s'"
9527
9528 #: builtin/am.c:795
9529 msgid "Only one StGIT patch series can be applied at once"
9530 msgstr "一次只能有一个 StGIT 补丁队列被应用"
9531
9532 #: builtin/am.c:843
9533 msgid "invalid timestamp"
9534 msgstr "无效的时间戳"
9535
9536 #: builtin/am.c:848 builtin/am.c:860
9537 msgid "invalid Date line"
9538 msgstr "无效的日期行"
9539
9540 #: builtin/am.c:855
9541 msgid "invalid timezone offset"
9542 msgstr "无效的时区偏移值"
9543
9544 #: builtin/am.c:948
9545 msgid "Patch format detection failed."
9546 msgstr "补丁格式探测失败。"
9547
9548 #: builtin/am.c:953 builtin/clone.c:409
9549 #, c-format
9550 msgid "failed to create directory '%s'"
9551 msgstr "创建目录 '%s' 失败"
9552
9553 #: builtin/am.c:958
9554 msgid "Failed to split patches."
9555 msgstr "拆分补丁失败。"
9556
9557 #: builtin/am.c:1089
9558 #, c-format
9559 msgid "When you have resolved this problem, run \"%s --continue\"."
9560 msgstr "当您解决这一问题,执行 \"%s --continue\"。"
9561
9562 #: builtin/am.c:1090
9563 #, c-format
9564 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
9565 msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
9566
9567 #: builtin/am.c:1091
9568 #, c-format
9569 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
9570 msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
9571
9572 #: builtin/am.c:1174
9573 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
9574 msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。"
9575
9576 #: builtin/am.c:1202
9577 msgid "Patch is empty."
9578 msgstr "补丁为空。"
9579
9580 #: builtin/am.c:1267
9581 #, c-format
9582 msgid "missing author line in commit %s"
9583 msgstr "在提交 %s 中缺失作者行"
9584
9585 #: builtin/am.c:1270
9586 #, c-format
9587 msgid "invalid ident line: %.*s"
9588 msgstr "无效的身份标识:%.*s"
9589
9590 #: builtin/am.c:1489
9591 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9592 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
9593
9594 #: builtin/am.c:1491
9595 msgid "Using index info to reconstruct a base tree..."
9596 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
9597
9598 #: builtin/am.c:1510
9599 msgid ""
9600 "Did you hand edit your patch?\n"
9601 "It does not apply to blobs recorded in its index."
9602 msgstr ""
9603 "您是否曾手动编辑过您的补丁?\n"
9604 "无法应用补丁到索引中的数据对象上。"
9605
9606 #: builtin/am.c:1516
9607 msgid "Falling back to patching base and 3-way merge..."
9608 msgstr "回落到基础版本上打补丁及进行三方合并..."
9609
9610 #: builtin/am.c:1542
9611 msgid "Failed to merge in the changes."
9612 msgstr "无法合并变更。"
9613
9614 #: builtin/am.c:1574
9615 msgid "applying to an empty history"
9616 msgstr "正应用到一个空历史上"
9617
9618 #: builtin/am.c:1621 builtin/am.c:1625
9619 #, c-format
9620 msgid "cannot resume: %s does not exist."
9621 msgstr "无法继续:%s 不存在。"
9622
9623 #: builtin/am.c:1643
9624 msgid "Commit Body is:"
9625 msgstr "提交内容为:"
9626
9627 # 译者:注意保持句尾空格
9628 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9629 #. in your translation. The program will only accept English
9630 #. input at this point.
9631 #.
9632 #: builtin/am.c:1653
9633 #, c-format
9634 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
9635 msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
9636
9637 #: builtin/am.c:1700 builtin/commit.c:398
9638 msgid "unable to write index file"
9639 msgstr "无法写入索引文件"
9640
9641 #: builtin/am.c:1704
9642 #, c-format
9643 msgid "Dirty index: cannot apply patches (dirty: %s)"
9644 msgstr "脏索引:不能应用补丁(脏文件:%s)"
9645
9646 #: builtin/am.c:1744 builtin/am.c:1812
9647 #, c-format
9648 msgid "Applying: %.*s"
9649 msgstr "应用:%.*s"
9650
9651 #: builtin/am.c:1761
9652 msgid "No changes -- Patch already applied."
9653 msgstr "没有变更 —— 补丁已经应用过。"
9654
9655 #: builtin/am.c:1767
9656 #, c-format
9657 msgid "Patch failed at %s %.*s"
9658 msgstr "打补丁失败于 %s %.*s"
9659
9660 #: builtin/am.c:1771
9661 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
9662 msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
9663
9664 #: builtin/am.c:1815
9665 msgid ""
9666 "No changes - did you forget to use 'git add'?\n"
9667 "If there is nothing left to stage, chances are that something else\n"
9668 "already introduced the same changes; you might want to skip this patch."
9669 msgstr ""
9670 "没有变更 —— 您是不是忘了执行 'git add'?\n"
9671 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9672 "您也许想要跳过这个补丁。"
9673
9674 #: builtin/am.c:1822
9675 msgid ""
9676 "You still have unmerged paths in your index.\n"
9677 "You should 'git add' each file with resolved conflicts to mark them as "
9678 "such.\n"
9679 "You might run `git rm` on a file to accept \"deleted by them\" for it."
9680 msgstr ""
9681 "在您的索引中仍存在未合并的路径。\n"
9682 "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
9683 "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
9684
9685 #: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
9686 #: builtin/reset.c:354
9687 #, c-format
9688 msgid "Could not parse object '%s'."
9689 msgstr "不能解析对象 '%s'。"
9690
9691 #: builtin/am.c:1981
9692 msgid "failed to clean index"
9693 msgstr "清空索引失败"
9694
9695 #: builtin/am.c:2025
9696 msgid ""
9697 "You seem to have moved HEAD since the last 'am' failure.\n"
9698 "Not rewinding to ORIG_HEAD"
9699 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
9700
9701 #: builtin/am.c:2132
9702 #, c-format
9703 msgid "Invalid value for --patch-format: %s"
9704 msgstr "无效的 --patch-format 值:%s"
9705
9706 #: builtin/am.c:2172
9707 #, c-format
9708 msgid "Invalid value for --show-current-patch: %s"
9709 msgstr "无效的 --show-current-patch 值:%s"
9710
9711 #: builtin/am.c:2176
9712 #, c-format
9713 msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
9714 msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容"
9715
9716 #: builtin/am.c:2207
9717 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
9718 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
9719
9720 #: builtin/am.c:2208
9721 msgid "git am [<options>] (--continue | --skip | --abort)"
9722 msgstr "git am [<选项>] (--continue | --skip | --abort)"
9723
9724 #: builtin/am.c:2214
9725 msgid "run interactively"
9726 msgstr "以交互式方式运行"
9727
9728 #: builtin/am.c:2216
9729 msgid "historical option -- no-op"
9730 msgstr "老的参数 —— 无作用"
9731
9732 #: builtin/am.c:2218
9733 msgid "allow fall back on 3way merging if needed"
9734 msgstr "如果必要,允许使用三方合并。"
9735
9736 #: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
9737 #: builtin/repack.c:304 builtin/stash.c:812
9738 msgid "be quiet"
9739 msgstr "静默模式"
9740
9741 #: builtin/am.c:2221
9742 msgid "add a Signed-off-by line to the commit message"
9743 msgstr "在提交说明中添加一个 Signed-off-by 签名"
9744
9745 #: builtin/am.c:2224
9746 msgid "recode into utf8 (default)"
9747 msgstr "使用 utf8 字符集(默认)"
9748
9749 #: builtin/am.c:2226
9750 msgid "pass -k flag to git-mailinfo"
9751 msgstr "向 git-mailinfo 传递 -k 参数"
9752
9753 #: builtin/am.c:2228
9754 msgid "pass -b flag to git-mailinfo"
9755 msgstr "向 git-mailinfo 传递 -b 参数"
9756
9757 #: builtin/am.c:2230
9758 msgid "pass -m flag to git-mailinfo"
9759 msgstr "向 git-mailinfo 传递 -m 参数"
9760
9761 #: builtin/am.c:2232
9762 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
9763 msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
9764
9765 #: builtin/am.c:2235
9766 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
9767 msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
9768
9769 #: builtin/am.c:2238
9770 msgid "strip everything before a scissors line"
9771 msgstr "丢弃裁切线前的所有内容"
9772
9773 #: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
9774 #: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
9775 #: builtin/am.c:2267
9776 msgid "pass it through git-apply"
9777 msgstr "传递给 git-apply"
9778
9779 #: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
9780 #: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
9781 #: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
9782 #: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
9783 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
9784 #: parse-options.h:154 parse-options.h:175 parse-options.h:316
9785 msgid "n"
9786 msgstr "n"
9787
9788 #: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
9789 #: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
9790 msgid "format"
9791 msgstr "格式"
9792
9793 #: builtin/am.c:2264
9794 msgid "format the patch(es) are in"
9795 msgstr "补丁的格式"
9796
9797 #: builtin/am.c:2270
9798 msgid "override error message when patch failure occurs"
9799 msgstr "打补丁失败时显示的错误信息"
9800
9801 #: builtin/am.c:2272
9802 msgid "continue applying patches after resolving a conflict"
9803 msgstr "冲突解决后继续应用补丁"
9804
9805 #: builtin/am.c:2275
9806 msgid "synonyms for --continue"
9807 msgstr "和 --continue 同义"
9808
9809 #: builtin/am.c:2278
9810 msgid "skip the current patch"
9811 msgstr "跳过当前补丁"
9812
9813 #: builtin/am.c:2281
9814 msgid "restore the original branch and abort the patching operation."
9815 msgstr "恢复原始分支并终止打补丁操作。"
9816
9817 #: builtin/am.c:2284
9818 msgid "abort the patching operation but keep HEAD where it is."
9819 msgstr "终止补丁操作但保持 HEAD 不变。"
9820
9821 #: builtin/am.c:2288
9822 msgid "show the patch being applied"
9823 msgstr "显示正在应用的补丁"
9824
9825 #: builtin/am.c:2293
9826 msgid "lie about committer date"
9827 msgstr "将作者日期作为提交日期"
9828
9829 #: builtin/am.c:2295
9830 msgid "use current timestamp for author date"
9831 msgstr "用当前时间作为作者日期"
9832
9833 #: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
9834 #: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
9835 #: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
9836 msgid "key-id"
9837 msgstr "key-id"
9838
9839 #: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
9840 msgid "GPG-sign commits"
9841 msgstr "使用 GPG 签名提交"
9842
9843 #: builtin/am.c:2301
9844 msgid "(internal use for git-rebase)"
9845 msgstr "(内部使用,用于 git-rebase)"
9846
9847 #: builtin/am.c:2319
9848 msgid ""
9849 "The -b/--binary option has been a no-op for long time, and\n"
9850 "it will be removed. Please do not use it anymore."
9851 msgstr ""
9852 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
9853 "请不要再使用它了。"
9854
9855 #: builtin/am.c:2326
9856 msgid "failed to read the index"
9857 msgstr "读取索引失败"
9858
9859 #: builtin/am.c:2341
9860 #, c-format
9861 msgid "previous rebase directory %s still exists but mbox given."
9862 msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
9863
9864 #: builtin/am.c:2365
9865 #, c-format
9866 msgid ""
9867 "Stray %s directory found.\n"
9868 "Use \"git am --abort\" to remove it."
9869 msgstr ""
9870 "发现了错误的 %s 目录。\n"
9871 "使用 \"git am --abort\" 删除它。"
9872
9873 #: builtin/am.c:2371
9874 msgid "Resolve operation not in progress, we are not resuming."
9875 msgstr "解决操作未进行,我们不会继续。"
9876
9877 #: builtin/am.c:2381
9878 msgid "interactive mode requires patches on the command line"
9879 msgstr "交互式模式需要命令行上提供补丁"
9880
9881 #: builtin/apply.c:8
9882 msgid "git apply [<options>] [<patch>...]"
9883 msgstr "git apply [<选项>] [<补丁>...]"
9884
9885 #: builtin/archive.c:17
9886 #, c-format
9887 msgid "could not create archive file '%s'"
9888 msgstr "不能创建归档文件 '%s'"
9889
9890 #: builtin/archive.c:20
9891 msgid "could not redirect output"
9892 msgstr "不能重定向输出"
9893
9894 #: builtin/archive.c:37
9895 msgid "git archive: Remote with no URL"
9896 msgstr "git archive:未提供远程 URL"
9897
9898 #: builtin/archive.c:61
9899 msgid "git archive: expected ACK/NAK, got a flush packet"
9900 msgstr "git archive:期望是 ACK/NAK,却得到 flush 包"
9901
9902 #: builtin/archive.c:64
9903 #, c-format
9904 msgid "git archive: NACK %s"
9905 msgstr "git archive:NACK %s"
9906
9907 #: builtin/archive.c:65
9908 msgid "git archive: protocol error"
9909 msgstr "git archive:协议错误"
9910
9911 #: builtin/archive.c:69
9912 msgid "git archive: expected a flush"
9913 msgstr "git archive:应有一个 flush 包"
9914
9915 #: builtin/bisect--helper.c:22
9916 msgid "git bisect--helper --next-all [--no-checkout]"
9917 msgstr "git bisect--helper --next-all [--no-checkout]"
9918
9919 #: builtin/bisect--helper.c:23
9920 msgid "git bisect--helper --write-terms <bad_term> <good_term>"
9921 msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
9922
9923 #: builtin/bisect--helper.c:24
9924 msgid "git bisect--helper --bisect-clean-state"
9925 msgstr "git bisect--helper --bisect-clean-state"
9926
9927 #: builtin/bisect--helper.c:25
9928 msgid "git bisect--helper --bisect-reset [<commit>]"
9929 msgstr "git bisect--helper --bisect-reset [<提交>]"
9930
9931 #: builtin/bisect--helper.c:26
9932 msgid ""
9933 "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
9934 "<bad_term>"
9935 msgstr ""
9936 "git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
9937 ">"
9938
9939 #: builtin/bisect--helper.c:27
9940 msgid ""
9941 "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
9942 "<bad_term>"
9943 msgstr ""
9944 "git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
9945
9946 #: builtin/bisect--helper.c:28
9947 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
9948 msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
9949
9950 #: builtin/bisect--helper.c:29
9951 msgid ""
9952 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
9953 "term-new]"
9954 msgstr ""
9955 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
9956 "term-new]"
9957
9958 #: builtin/bisect--helper.c:30
9959 msgid ""
9960 "git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
9961 "=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
9962 msgstr ""
9963 "git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}"
9964 "=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]"
9965
9966 #: builtin/bisect--helper.c:86
9967 #, c-format
9968 msgid "'%s' is not a valid term"
9969 msgstr "'%s' 不是一个有效的术语"
9970
9971 #: builtin/bisect--helper.c:90
9972 #, c-format
9973 msgid "can't use the builtin command '%s' as a term"
9974 msgstr "不能使用内置命令 '%s' 作为术语"
9975
9976 #: builtin/bisect--helper.c:100
9977 #, c-format
9978 msgid "can't change the meaning of the term '%s'"
9979 msgstr "不能修改术语 '%s' 的含义"
9980
9981 #: builtin/bisect--helper.c:111
9982 msgid "please use two different terms"
9983 msgstr "请使用两个不同的术语"
9984
9985 #: builtin/bisect--helper.c:118
9986 msgid "could not open the file BISECT_TERMS"
9987 msgstr "不能打开文件 BISECT_TERMS"
9988
9989 #: builtin/bisect--helper.c:155
9990 #, c-format
9991 msgid "We are not bisecting.\n"
9992 msgstr "我们没有在二分查找。\n"
9993
9994 #: builtin/bisect--helper.c:163
9995 #, c-format
9996 msgid "'%s' is not a valid commit"
9997 msgstr "'%s' 不是一个有效的提交"
9998
9999 #: builtin/bisect--helper.c:172
10000 #, c-format
10001 msgid ""
10002 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
10003 msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
10004
10005 #: builtin/bisect--helper.c:216
10006 #, c-format
10007 msgid "Bad bisect_write argument: %s"
10008 msgstr "坏的 bisect_write 参数:%s"
10009
10010 #: builtin/bisect--helper.c:221
10011 #, c-format
10012 msgid "couldn't get the oid of the rev '%s'"
10013 msgstr "无法获取版本 '%s' 的对象 ID"
10014
10015 #: builtin/bisect--helper.c:233
10016 #, c-format
10017 msgid "couldn't open the file '%s'"
10018 msgstr "无法打开文件 '%s'"
10019
10020 #: builtin/bisect--helper.c:259
10021 #, c-format
10022 msgid "Invalid command: you're currently in a %s/%s bisect"
10023 msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中"
10024
10025 #: builtin/bisect--helper.c:286
10026 #, c-format
10027 msgid ""
10028 "You need to give me at least one %s and %s revision.\n"
10029 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
10030 msgstr ""
10031 "您需要给我至少一个 %s 和一个 %s 版本。\n"
10032 "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
10033
10034 #: builtin/bisect--helper.c:290
10035 #, c-format
10036 msgid ""
10037 "You need to start by \"git bisect start\".\n"
10038 "You then need to give me at least one %s and %s revision.\n"
10039 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
10040 msgstr ""
10041 "您需要执行 \"git bisect start\" 来开始。\n"
10042 "然后需要提供我至少一个 %s 和一个 %s 版本。\n"
10043 "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
10044
10045 #: builtin/bisect--helper.c:310
10046 #, c-format
10047 msgid "bisecting only with a %s commit"
10048 msgstr "在只有一个 %s 提交的情况下二分查找"
10049
10050 # 译者:注意保持句尾空格
10051 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10052 #. translation. The program will only accept English input
10053 #. at this point.
10054 #.
10055 #: builtin/bisect--helper.c:318
10056 msgid "Are you sure [Y/n]? "
10057 msgstr "您确认么[Y/n]? "
10058
10059 #: builtin/bisect--helper.c:379
10060 msgid "no terms defined"
10061 msgstr "未定义术语"
10062
10063 #: builtin/bisect--helper.c:382
10064 #, c-format
10065 msgid ""
10066 "Your current terms are %s for the old state\n"
10067 "and %s for the new state.\n"
10068 msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n"
10069
10070 #: builtin/bisect--helper.c:392
10071 #, c-format
10072 msgid ""
10073 "invalid argument %s for 'git bisect terms'.\n"
10074 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
10075 msgstr ""
10076 "命令 'git bisect terms' 的参数 %s 无效。\n"
10077 "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
10078
10079 #: builtin/bisect--helper.c:478
10080 #, c-format
10081 msgid "unrecognized option: '%s'"
10082 msgstr "未识别的选项:'%s'"
10083
10084 #: builtin/bisect--helper.c:482
10085 #, c-format
10086 msgid "'%s' does not appear to be a valid revision"
10087 msgstr "'%s' 看起来不是一个有效的版本"
10088
10089 #: builtin/bisect--helper.c:514
10090 msgid "bad HEAD - I need a HEAD"
10091 msgstr "坏的 HEAD - 我需要一个 HEAD"
10092
10093 #: builtin/bisect--helper.c:529
10094 #, c-format
10095 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
10096 msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
10097
10098 #: builtin/bisect--helper.c:550
10099 msgid "won't bisect on cg-seek'ed tree"
10100 msgstr "不会在做了 cg-seek 的树上做二分查找"
10101
10102 #: builtin/bisect--helper.c:553
10103 msgid "bad HEAD - strange symbolic ref"
10104 msgstr "坏的 HEAD - 奇怪的符号引用"
10105
10106 #: builtin/bisect--helper.c:577
10107 #, c-format
10108 msgid "invalid ref: '%s'"
10109 msgstr "无效的引用:'%s'"
10110
10111 #: builtin/bisect--helper.c:633
10112 msgid "perform 'git bisect next'"
10113 msgstr "执行 'git bisect next'"
10114
10115 #: builtin/bisect--helper.c:635
10116 msgid "write the terms to .git/BISECT_TERMS"
10117 msgstr "将术语写入 .git/BISECT_TERMS"
10118
10119 #: builtin/bisect--helper.c:637
10120 msgid "cleanup the bisection state"
10121 msgstr "清除二分查找状态"
10122
10123 #: builtin/bisect--helper.c:639
10124 msgid "check for expected revs"
10125 msgstr "检查预期的版本"
10126
10127 #: builtin/bisect--helper.c:641
10128 msgid "reset the bisection state"
10129 msgstr "清除二分查找状态"
10130
10131 #: builtin/bisect--helper.c:643
10132 msgid "write out the bisection state in BISECT_LOG"
10133 msgstr "将二分查找的状态写入 BISECT_LOG"
10134
10135 #: builtin/bisect--helper.c:645
10136 msgid "check and set terms in a bisection state"
10137 msgstr "在一个二分查找状态中检查和设置术语"
10138
10139 #: builtin/bisect--helper.c:647
10140 msgid "check whether bad or good terms exist"
10141 msgstr "检查坏的或好的术语是否存在"
10142
10143 #: builtin/bisect--helper.c:649
10144 msgid "print out the bisect terms"
10145 msgstr "打印二分查找术语"
10146
10147 #: builtin/bisect--helper.c:651
10148 msgid "start the bisect session"
10149 msgstr "启动二分查找过程"
10150
10151 #: builtin/bisect--helper.c:653
10152 msgid "update BISECT_HEAD instead of checking out the current commit"
10153 msgstr "更新 BISECT_HEAD 而非检出当前提交"
10154
10155 #: builtin/bisect--helper.c:655
10156 msgid "no log for BISECT_WRITE"
10157 msgstr "BISECT_WRITE 无日志"
10158
10159 #: builtin/bisect--helper.c:673
10160 msgid "--write-terms requires two arguments"
10161 msgstr "--write-terms 需要两个参数"
10162
10163 #: builtin/bisect--helper.c:677
10164 msgid "--bisect-clean-state requires no arguments"
10165 msgstr "--bisect-clean-state 不带参数"
10166
10167 #: builtin/bisect--helper.c:684
10168 msgid "--bisect-reset requires either no argument or a commit"
10169 msgstr "--bisect-reset 无需参数或者需要一个提交"
10170
10171 #: builtin/bisect--helper.c:688
10172 msgid "--bisect-write requires either 4 or 5 arguments"
10173 msgstr "--bisect-write 需要 4 或 5 个参数"
10174
10175 #: builtin/bisect--helper.c:694
10176 msgid "--check-and-set-terms requires 3 arguments"
10177 msgstr "--check-and-set-terms 需要 3 个参数"
10178
10179 #: builtin/bisect--helper.c:700
10180 msgid "--bisect-next-check requires 2 or 3 arguments"
10181 msgstr "--bisect-next-check 需要 2 或 3 个参数"
10182
10183 #: builtin/bisect--helper.c:706
10184 msgid "--bisect-terms requires 0 or 1 argument"
10185 msgstr "--bisect-terms 需要 0 或 1 个参数"
10186
10187 #: builtin/blame.c:31
10188 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
10189 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
10190
10191 #: builtin/blame.c:36
10192 msgid "<rev-opts> are documented in git-rev-list(1)"
10193 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
10194
10195 #: builtin/blame.c:409
10196 #, c-format
10197 msgid "expecting a color: %s"
10198 msgstr "期望一个颜色:%s"
10199
10200 #: builtin/blame.c:416
10201 msgid "must end with a color"
10202 msgstr "必须以一个颜色结尾"
10203
10204 #: builtin/blame.c:729
10205 #, c-format
10206 msgid "invalid color '%s' in color.blame.repeatedLines"
10207 msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
10208
10209 #: builtin/blame.c:747
10210 msgid "invalid value for blame.coloring"
10211 msgstr "设置 blame.coloring 中的无效取值"
10212
10213 #: builtin/blame.c:822
10214 #, c-format
10215 msgid "cannot find revision %s to ignore"
10216 msgstr "不能找到要忽略的版本 %s"
10217
10218 #: builtin/blame.c:844
10219 msgid "Show blame entries as we find them, incrementally"
10220 msgstr "增量式地显示发现的 blame 条目"
10221
10222 #: builtin/blame.c:845
10223 msgid "Show blank SHA-1 for boundary commits (Default: off)"
10224 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
10225
10226 #: builtin/blame.c:846
10227 msgid "Do not treat root commits as boundaries (Default: off)"
10228 msgstr "不把根提交作为边界(默认:关闭)"
10229
10230 #: builtin/blame.c:847
10231 msgid "Show work cost statistics"
10232 msgstr "显示命令消耗统计"
10233
10234 #: builtin/blame.c:848
10235 msgid "Force progress reporting"
10236 msgstr "强制进度显示"
10237
10238 #: builtin/blame.c:849
10239 msgid "Show output score for blame entries"
10240 msgstr "显示判断 blame 条目位移的得分诊断信息"
10241
10242 #: builtin/blame.c:850
10243 msgid "Show original filename (Default: auto)"
10244 msgstr "显示原始文件名(默认:自动)"
10245
10246 #: builtin/blame.c:851
10247 msgid "Show original linenumber (Default: off)"
10248 msgstr "显示原始的行号(默认:关闭)"
10249
10250 #: builtin/blame.c:852
10251 msgid "Show in a format designed for machine consumption"
10252 msgstr "显示为一个适合机器读取的格式"
10253
10254 #: builtin/blame.c:853
10255 msgid "Show porcelain format with per-line commit information"
10256 msgstr "为每一行显示机器适用的提交信息"
10257
10258 #: builtin/blame.c:854
10259 msgid "Use the same output mode as git-annotate (Default: off)"
10260 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
10261
10262 #: builtin/blame.c:855
10263 msgid "Show raw timestamp (Default: off)"
10264 msgstr "显示原始时间戳(默认:关闭)"
10265
10266 #: builtin/blame.c:856
10267 msgid "Show long commit SHA1 (Default: off)"
10268 msgstr "显示长的 SHA1 提交号(默认:关闭)"
10269
10270 #: builtin/blame.c:857
10271 msgid "Suppress author name and timestamp (Default: off)"
10272 msgstr "隐藏作者名字和时间戳(默认:关闭)"
10273
10274 #: builtin/blame.c:858
10275 msgid "Show author email instead of name (Default: off)"
10276 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
10277
10278 #: builtin/blame.c:859
10279 msgid "Ignore whitespace differences"
10280 msgstr "忽略空白差异"
10281
10282 #: builtin/blame.c:860 builtin/log.c:1702
10283 msgid "rev"
10284 msgstr "版本"
10285
10286 #: builtin/blame.c:860
10287 msgid "Ignore <rev> when blaming"
10288 msgstr "在执行 blame 操作时忽略 <版本>"
10289
10290 #: builtin/blame.c:861
10291 msgid "Ignore revisions from <file>"
10292 msgstr "忽略来自 <文件> 中的版本"
10293
10294 #: builtin/blame.c:862
10295 msgid "color redundant metadata from previous line differently"
10296 msgstr "使用颜色间隔输出与前一行不同的重复元信息"
10297
10298 #: builtin/blame.c:863
10299 msgid "color lines by age"
10300 msgstr "依据时间着色"
10301
10302 #: builtin/blame.c:864
10303 msgid "Spend extra cycles to find better match"
10304 msgstr "花费额外的循环来找到更好的匹配"
10305
10306 #: builtin/blame.c:865
10307 msgid "Use revisions from <file> instead of calling git-rev-list"
10308 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
10309
10310 #: builtin/blame.c:866
10311 msgid "Use <file>'s contents as the final image"
10312 msgstr "使用 <文件> 的内容作为最终的图片"
10313
10314 #: builtin/blame.c:867 builtin/blame.c:868
10315 msgid "score"
10316 msgstr "得分"
10317
10318 #: builtin/blame.c:867
10319 msgid "Find line copies within and across files"
10320 msgstr "找到文件内及跨文件的行拷贝"
10321
10322 #: builtin/blame.c:868
10323 msgid "Find line movements within and across files"
10324 msgstr "找到文件内及跨文件的行移动"
10325
10326 #: builtin/blame.c:869
10327 msgid "n,m"
10328 msgstr "n,m"
10329
10330 #: builtin/blame.c:869
10331 msgid "Process only line range n,m, counting from 1"
10332 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
10333
10334 #: builtin/blame.c:921
10335 msgid "--progress can't be used with --incremental or porcelain formats"
10336 msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
10337
10338 #. TRANSLATORS: This string is used to tell us the
10339 #. maximum display width for a relative timestamp in
10340 #. "git blame" output. For C locale, "4 years, 11
10341 #. months ago", which takes 22 places, is the longest
10342 #. among various forms of relative timestamps, but
10343 #. your language may need more or fewer display
10344 #. columns.
10345 #.
10346 #: builtin/blame.c:972
10347 msgid "4 years, 11 months ago"
10348 msgstr "4 年 11 个月前"
10349
10350 #: builtin/blame.c:1079
10351 #, c-format
10352 msgid "file %s has only %lu line"
10353 msgid_plural "file %s has only %lu lines"
10354 msgstr[0] "文件 %s 只有 %lu 行"
10355 msgstr[1] "文件 %s 只有 %lu 行"
10356
10357 #: builtin/blame.c:1125
10358 msgid "Blaming lines"
10359 msgstr "追踪代码行"
10360
10361 #: builtin/branch.c:29
10362 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
10363 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
10364
10365 #: builtin/branch.c:30
10366 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
10367 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
10368
10369 #: builtin/branch.c:31
10370 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
10371 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
10372
10373 #: builtin/branch.c:32
10374 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
10375 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
10376
10377 #: builtin/branch.c:33
10378 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
10379 msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
10380
10381 #: builtin/branch.c:34
10382 msgid "git branch [<options>] [-r | -a] [--points-at]"
10383 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
10384
10385 #: builtin/branch.c:35
10386 msgid "git branch [<options>] [-r | -a] [--format]"
10387 msgstr "git branch [<选项>] [-r | -a] [--format]"
10388
10389 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
10390 #: builtin/branch.c:154
10391 #, c-format
10392 msgid ""
10393 "deleting branch '%s' that has been merged to\n"
10394 " '%s', but not yet merged to HEAD."
10395 msgstr ""
10396 "将要删除的分支 '%s' 已经被合并到\n"
10397 " '%s',但未合并到 HEAD。"
10398
10399 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
10400 #: builtin/branch.c:158
10401 #, c-format
10402 msgid ""
10403 "not deleting branch '%s' that is not yet merged to\n"
10404 " '%s', even though it is merged to HEAD."
10405 msgstr ""
10406 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
10407 " 然而却尚未被合并到分支 '%s' 。"
10408
10409 #: builtin/branch.c:172
10410 #, c-format
10411 msgid "Couldn't look up commit object for '%s'"
10412 msgstr "无法查询 '%s' 指向的提交对象"
10413
10414 #: builtin/branch.c:176
10415 #, c-format
10416 msgid ""
10417 "The branch '%s' is not fully merged.\n"
10418 "If you are sure you want to delete it, run 'git branch -D %s'."
10419 msgstr ""
10420 "分支 '%s' 没有完全合并。\n"
10421 "如果您确认要删除它,执行 'git branch -D %s'。"
10422
10423 #: builtin/branch.c:189
10424 msgid "Update of config-file failed"
10425 msgstr "更新配置文件失败"
10426
10427 #: builtin/branch.c:220
10428 msgid "cannot use -a with -d"
10429 msgstr "不能将 -a 和 -d 同时使用"
10430
10431 #: builtin/branch.c:226
10432 msgid "Couldn't look up commit object for HEAD"
10433 msgstr "无法查询 HEAD 指向的提交对象"
10434
10435 #: builtin/branch.c:240
10436 #, c-format
10437 msgid "Cannot delete branch '%s' checked out at '%s'"
10438 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
10439
10440 #: builtin/branch.c:255
10441 #, c-format
10442 msgid "remote-tracking branch '%s' not found."
10443 msgstr "未能找到远程跟踪分支 '%s'。"
10444
10445 #: builtin/branch.c:256
10446 #, c-format
10447 msgid "branch '%s' not found."
10448 msgstr "分支 '%s' 未发现。"
10449
10450 #: builtin/branch.c:271
10451 #, c-format
10452 msgid "Error deleting remote-tracking branch '%s'"
10453 msgstr "无法删除远程跟踪分支 '%s'"
10454
10455 #: builtin/branch.c:272
10456 #, c-format
10457 msgid "Error deleting branch '%s'"
10458 msgstr "无法删除分支 '%s'"
10459
10460 #: builtin/branch.c:279
10461 #, c-format
10462 msgid "Deleted remote-tracking branch %s (was %s).\n"
10463 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
10464
10465 #: builtin/branch.c:280
10466 #, c-format
10467 msgid "Deleted branch %s (was %s).\n"
10468 msgstr "已删除分支 %s(曾为 %s)。\n"
10469
10470 #: builtin/branch.c:429 builtin/tag.c:61
10471 msgid "unable to parse format string"
10472 msgstr "不能解析格式化字符串"
10473
10474 #: builtin/branch.c:460
10475 msgid "could not resolve HEAD"
10476 msgstr "不能解析 HEAD 提交"
10477
10478 #: builtin/branch.c:466
10479 #, c-format
10480 msgid "HEAD (%s) points outside of refs/heads/"
10481 msgstr "HEAD (%s) 指向 refs/heads/ 之外"
10482
10483 #: builtin/branch.c:481
10484 #, c-format
10485 msgid "Branch %s is being rebased at %s"
10486 msgstr "分支 %s 正被变基到 %s"
10487
10488 #: builtin/branch.c:485
10489 #, c-format
10490 msgid "Branch %s is being bisected at %s"
10491 msgstr "分支 %s 正被二分查找于 %s"
10492
10493 #: builtin/branch.c:502
10494 msgid "cannot copy the current branch while not on any."
10495 msgstr "无法拷贝当前分支因为不处于任何分支上。"
10496
10497 #: builtin/branch.c:504
10498 msgid "cannot rename the current branch while not on any."
10499 msgstr "无法重命名当前分支因为不处于任何分支上。"
10500
10501 #: builtin/branch.c:515
10502 #, c-format
10503 msgid "Invalid branch name: '%s'"
10504 msgstr "无效的分支名:'%s'"
10505
10506 #: builtin/branch.c:542
10507 msgid "Branch rename failed"
10508 msgstr "分支重命名失败"
10509
10510 #: builtin/branch.c:544
10511 msgid "Branch copy failed"
10512 msgstr "分支拷贝失败"
10513
10514 #: builtin/branch.c:548
10515 #, c-format
10516 msgid "Created a copy of a misnamed branch '%s'"
10517 msgstr "已为错误命名的分支 '%s' 创建了一个副本"
10518
10519 #: builtin/branch.c:551
10520 #, c-format
10521 msgid "Renamed a misnamed branch '%s' away"
10522 msgstr "已将错误命名的分支 '%s' 重命名"
10523
10524 #: builtin/branch.c:557
10525 #, c-format
10526 msgid "Branch renamed to %s, but HEAD is not updated!"
10527 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
10528
10529 #: builtin/branch.c:566
10530 msgid "Branch is renamed, but update of config-file failed"
10531 msgstr "分支被重命名,但更新配置文件失败"
10532
10533 #: builtin/branch.c:568
10534 msgid "Branch is copied, but update of config-file failed"
10535 msgstr "分支已拷贝,但更新配置文件失败"
10536
10537 #: builtin/branch.c:584
10538 #, c-format
10539 msgid ""
10540 "Please edit the description for the branch\n"
10541 " %s\n"
10542 "Lines starting with '%c' will be stripped.\n"
10543 msgstr ""
10544 "请编辑分支的描述\n"
10545 " %s\n"
10546 "以 '%c' 开头的行将被过滤。\n"
10547
10548 #: builtin/branch.c:618
10549 msgid "Generic options"
10550 msgstr "通用选项"
10551
10552 #: builtin/branch.c:620
10553 msgid "show hash and subject, give twice for upstream branch"
10554 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
10555
10556 #: builtin/branch.c:621
10557 msgid "suppress informational messages"
10558 msgstr "不显示信息"
10559
10560 #: builtin/branch.c:622
10561 msgid "set up tracking mode (see git-pull(1))"
10562 msgstr "设置跟踪模式(参见 git-pull(1))"
10563
10564 #: builtin/branch.c:624
10565 msgid "do not use"
10566 msgstr "不要使用"
10567
10568 #: builtin/branch.c:626 builtin/rebase.c:513
10569 msgid "upstream"
10570 msgstr "上游"
10571
10572 #: builtin/branch.c:626
10573 msgid "change the upstream info"
10574 msgstr "改变上游信息"
10575
10576 #: builtin/branch.c:627
10577 msgid "unset the upstream info"
10578 msgstr "取消上游信息的设置"
10579
10580 #: builtin/branch.c:628
10581 msgid "use colored output"
10582 msgstr "使用彩色输出"
10583
10584 #: builtin/branch.c:629
10585 msgid "act on remote-tracking branches"
10586 msgstr "作用于远程跟踪分支"
10587
10588 #: builtin/branch.c:631 builtin/branch.c:633
10589 msgid "print only branches that contain the commit"
10590 msgstr "只打印包含该提交的分支"
10591
10592 #: builtin/branch.c:632 builtin/branch.c:634
10593 msgid "print only branches that don't contain the commit"
10594 msgstr "只打印不包含该提交的分支"
10595
10596 #: builtin/branch.c:637
10597 msgid "Specific git-branch actions:"
10598 msgstr "具体的 git-branch 动作:"
10599
10600 #: builtin/branch.c:638
10601 msgid "list both remote-tracking and local branches"
10602 msgstr "列出远程跟踪及本地分支"
10603
10604 #: builtin/branch.c:640
10605 msgid "delete fully merged branch"
10606 msgstr "删除完全合并的分支"
10607
10608 #: builtin/branch.c:641
10609 msgid "delete branch (even if not merged)"
10610 msgstr "删除分支(即使没有合并)"
10611
10612 #: builtin/branch.c:642
10613 msgid "move/rename a branch and its reflog"
10614 msgstr "移动/重命名一个分支,以及它的引用日志"
10615
10616 #: builtin/branch.c:643
10617 msgid "move/rename a branch, even if target exists"
10618 msgstr "移动/重命名一个分支,即使目标已存在"
10619
10620 #: builtin/branch.c:644
10621 msgid "copy a branch and its reflog"
10622 msgstr "拷贝一个分支和它的引用日志"
10623
10624 #: builtin/branch.c:645
10625 msgid "copy a branch, even if target exists"
10626 msgstr "拷贝一个分支,即使目标已存在"
10627
10628 #: builtin/branch.c:646
10629 msgid "list branch names"
10630 msgstr "列出分支名"
10631
10632 #: builtin/branch.c:647
10633 msgid "show current branch name"
10634 msgstr "显示当前分支名"
10635
10636 #: builtin/branch.c:648
10637 msgid "create the branch's reflog"
10638 msgstr "创建分支的引用日志"
10639
10640 #: builtin/branch.c:650
10641 msgid "edit the description for the branch"
10642 msgstr "标记分支的描述"
10643
10644 #: builtin/branch.c:651
10645 msgid "force creation, move/rename, deletion"
10646 msgstr "强制创建、移动/重命名、删除"
10647
10648 #: builtin/branch.c:652
10649 msgid "print only branches that are merged"
10650 msgstr "只打印已经合并的分支"
10651
10652 #: builtin/branch.c:653
10653 msgid "print only branches that are not merged"
10654 msgstr "只打印尚未合并的分支"
10655
10656 #: builtin/branch.c:654
10657 msgid "list branches in columns"
10658 msgstr "以列的方式显示分支"
10659
10660 #: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
10661 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
10662 #: builtin/tag.c:433
10663 msgid "object"
10664 msgstr "对象"
10665
10666 #: builtin/branch.c:658
10667 msgid "print only branches of the object"
10668 msgstr "只打印指向该对象的分支"
10669
10670 #: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
10671 msgid "sorting and filtering are case insensitive"
10672 msgstr "排序和过滤属于大小写不敏感"
10673
10674 #: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
10675 #: builtin/verify-tag.c:38
10676 msgid "format to use for the output"
10677 msgstr "输出格式"
10678
10679 #: builtin/branch.c:684 builtin/clone.c:785
10680 msgid "HEAD not found below refs/heads!"
10681 msgstr "HEAD 没有位于 /refs/heads 之下!"
10682
10683 #: builtin/branch.c:708
10684 msgid "--column and --verbose are incompatible"
10685 msgstr "--column 和 --verbose 不兼容"
10686
10687 #: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
10688 msgid "branch name required"
10689 msgstr "必须提供分支名"
10690
10691 #: builtin/branch.c:753
10692 msgid "Cannot give description to detached HEAD"
10693 msgstr "不能向分离头指针提供描述"
10694
10695 #: builtin/branch.c:758
10696 msgid "cannot edit description of more than one branch"
10697 msgstr "不能为一个以上的分支编辑描述"
10698
10699 #: builtin/branch.c:765
10700 #, c-format
10701 msgid "No commit on branch '%s' yet."
10702 msgstr "分支 '%s' 尚无提交。"
10703
10704 #: builtin/branch.c:768
10705 #, c-format
10706 msgid "No branch named '%s'."
10707 msgstr "没有分支 '%s'。"
10708
10709 #: builtin/branch.c:783
10710 msgid "too many branches for a copy operation"
10711 msgstr "为拷贝操作提供了太多的分支名"
10712
10713 #: builtin/branch.c:792
10714 msgid "too many arguments for a rename operation"
10715 msgstr "为重命名操作提供了太多的参数"
10716
10717 #: builtin/branch.c:797
10718 msgid "too many arguments to set new upstream"
10719 msgstr "为设置新上游提供了太多的参数"
10720
10721 #: builtin/branch.c:801
10722 #, c-format
10723 msgid ""
10724 "could not set upstream of HEAD to %s when it does not point to any branch."
10725 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
10726
10727 #: builtin/branch.c:804 builtin/branch.c:827
10728 #, c-format
10729 msgid "no such branch '%s'"
10730 msgstr "没有此分支 '%s'"
10731
10732 #: builtin/branch.c:808
10733 #, c-format
10734 msgid "branch '%s' does not exist"
10735 msgstr "分支 '%s' 不存在"
10736
10737 #: builtin/branch.c:821
10738 msgid "too many arguments to unset upstream"
10739 msgstr "为取消上游设置操作提供了太多的参数"
10740
10741 #: builtin/branch.c:825
10742 msgid "could not unset upstream of HEAD when it does not point to any branch."
10743 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
10744
10745 #: builtin/branch.c:831
10746 #, c-format
10747 msgid "Branch '%s' has no upstream information"
10748 msgstr "分支 '%s' 没有上游信息"
10749
10750 #: builtin/branch.c:841
10751 msgid ""
10752 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
10753 "Did you mean to use: -a|-r --list <pattern>?"
10754 msgstr ""
10755 "'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
10756 "您是否想要使用:-a|-r --list <模式>?"
10757
10758 #: builtin/branch.c:845
10759 msgid ""
10760 "the '--set-upstream' option is no longer supported. Please use '--track' or "
10761 "'--set-upstream-to' instead."
10762 msgstr ""
10763 "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
10764
10765 #: builtin/bundle.c:15 builtin/bundle.c:23
10766 msgid "git bundle create [<options>] <file> <git-rev-list args>"
10767 msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>"
10768
10769 #: builtin/bundle.c:16 builtin/bundle.c:28
10770 msgid "git bundle verify [<options>] <file>"
10771 msgstr "git bundle verify [<选项>] <文件>"
10772
10773 #: builtin/bundle.c:17 builtin/bundle.c:33
10774 msgid "git bundle list-heads <file> [<refname>...]"
10775 msgstr "git bundle list-heads <文件> [<引用名>...]"
10776
10777 #: builtin/bundle.c:18 builtin/bundle.c:38
10778 msgid "git bundle unbundle <file> [<refname>...]"
10779 msgstr "git bundle unbundle <文件> [<引用名>...]"
10780
10781 #: builtin/bundle.c:66 builtin/pack-objects.c:3375
10782 msgid "do not show progress meter"
10783 msgstr "不显示进度表"
10784
10785 #: builtin/bundle.c:68 builtin/pack-objects.c:3377
10786 msgid "show progress meter"
10787 msgstr "显示进度表"
10788
10789 #: builtin/bundle.c:70 builtin/pack-objects.c:3379
10790 msgid "show progress meter during object writing phase"
10791 msgstr "在对象写入阶段显示进度表"
10792
10793 #: builtin/bundle.c:73 builtin/pack-objects.c:3382
10794 msgid "similar to --all-progress when progress meter is shown"
10795 msgstr "当进度表显示时类似于 --all-progress"
10796
10797 #: builtin/bundle.c:93
10798 msgid "Need a repository to create a bundle."
10799 msgstr "需要一个仓库来创建包。"
10800
10801 #: builtin/bundle.c:104
10802 msgid "do not show bundle details"
10803 msgstr "不显示 bundle 细节"
10804
10805 #: builtin/bundle.c:119
10806 #, c-format
10807 msgid "%s is okay\n"
10808 msgstr "%s 可以\n"
10809
10810 #: builtin/bundle.c:160
10811 msgid "Need a repository to unbundle."
10812 msgstr "需要一个仓库来解包。"
10813
10814 #: builtin/bundle.c:168 builtin/remote.c:1686
10815 msgid "be verbose; must be placed before a subcommand"
10816 msgstr "冗长输出;必须置于子命令之前"
10817
10818 #: builtin/bundle.c:190 builtin/remote.c:1717
10819 #, c-format
10820 msgid "Unknown subcommand: %s"
10821 msgstr "未知子命令:%s"
10822
10823 #: builtin/cat-file.c:595
10824 msgid ""
10825 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
10826 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
10827 msgstr ""
10828 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
10829 "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
10830
10831 #: builtin/cat-file.c:596
10832 msgid ""
10833 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
10834 "filters]"
10835 msgstr ""
10836 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
10837 "filters]"
10838
10839 #: builtin/cat-file.c:617
10840 msgid "only one batch option may be specified"
10841 msgstr "只能指定一个批处理选项"
10842
10843 #: builtin/cat-file.c:635
10844 msgid "<type> can be one of: blob, tree, commit, tag"
10845 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
10846
10847 #: builtin/cat-file.c:636
10848 msgid "show object type"
10849 msgstr "显示对象类型"
10850
10851 #: builtin/cat-file.c:637
10852 msgid "show object size"
10853 msgstr "显示对象大小"
10854
10855 #: builtin/cat-file.c:639
10856 msgid "exit with zero when there's no error"
10857 msgstr "当没有错误时退出并返回零"
10858
10859 #: builtin/cat-file.c:640
10860 msgid "pretty-print object's content"
10861 msgstr "美观地打印对象的内容"
10862
10863 #: builtin/cat-file.c:642
10864 msgid "for blob objects, run textconv on object's content"
10865 msgstr "对于数据对象,对其内容做文本转换"
10866
10867 #: builtin/cat-file.c:644
10868 msgid "for blob objects, run filters on object's content"
10869 msgstr "对于数据对象,对其内容做过滤"
10870
10871 #: builtin/cat-file.c:645 git-submodule.sh:1002
10872 msgid "blob"
10873 msgstr "数据对象"
10874
10875 #: builtin/cat-file.c:646
10876 msgid "use a specific path for --textconv/--filters"
10877 msgstr "对于 --textconv/--filters 使用一个特定的路径"
10878
10879 #: builtin/cat-file.c:648
10880 msgid "allow -s and -t to work with broken/corrupt objects"
10881 msgstr "允许 -s 和 -t 对损坏的对象生效"
10882
10883 #: builtin/cat-file.c:649
10884 msgid "buffer --batch output"
10885 msgstr "缓冲 --batch 的输出"
10886
10887 #: builtin/cat-file.c:651
10888 msgid "show info and content of objects fed from the standard input"
10889 msgstr "显示从标准输入提供的对象的信息和内容"
10890
10891 #: builtin/cat-file.c:655
10892 msgid "show info about objects fed from the standard input"
10893 msgstr "显示从标准输入提供的对象的信息"
10894
10895 #: builtin/cat-file.c:659
10896 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
10897 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
10898
10899 #: builtin/cat-file.c:661
10900 msgid "show all objects with --batch or --batch-check"
10901 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
10902
10903 #: builtin/cat-file.c:663
10904 msgid "do not order --batch-all-objects output"
10905 msgstr "不要对 --batch-all-objects 的输出排序"
10906
10907 #: builtin/check-attr.c:13
10908 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
10909 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
10910
10911 #: builtin/check-attr.c:14
10912 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
10913 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
10914
10915 #: builtin/check-attr.c:21
10916 msgid "report all attributes set on file"
10917 msgstr "报告设置在文件上的所有属性"
10918
10919 #: builtin/check-attr.c:22
10920 msgid "use .gitattributes only from the index"
10921 msgstr "只使用索引中的 .gitattributes"
10922
10923 #: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
10924 msgid "read file names from stdin"
10925 msgstr "从标准输入读出文件名"
10926
10927 #: builtin/check-attr.c:25 builtin/check-ignore.c:27
10928 msgid "terminate input and output records by a NUL character"
10929 msgstr "输入和输出的记录使用 NUL 字符终结"
10930
10931 #: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
10932 #: builtin/worktree.c:499
10933 msgid "suppress progress reporting"
10934 msgstr "不显示进度报告"
10935
10936 #: builtin/check-ignore.c:29
10937 msgid "show non-matching input paths"
10938 msgstr "显示未匹配的输入路径"
10939
10940 #: builtin/check-ignore.c:31
10941 msgid "ignore index when checking"
10942 msgstr "检查时忽略索引"
10943
10944 #: builtin/check-ignore.c:163
10945 msgid "cannot specify pathnames with --stdin"
10946 msgstr "不能同时指定路径及 --stdin 参数"
10947
10948 #: builtin/check-ignore.c:166
10949 msgid "-z only makes sense with --stdin"
10950 msgstr "-z 需要和 --stdin 参数共用才有意义"
10951
10952 #: builtin/check-ignore.c:168
10953 msgid "no path specified"
10954 msgstr "未指定路径"
10955
10956 #: builtin/check-ignore.c:172
10957 msgid "--quiet is only valid with a single pathname"
10958 msgstr "参数 --quiet 只在提供一个路径名时有效"
10959
10960 #: builtin/check-ignore.c:174
10961 msgid "cannot have both --quiet and --verbose"
10962 msgstr "不能同时提供 --quiet 和 --verbose 参数"
10963
10964 #: builtin/check-ignore.c:177
10965 msgid "--non-matching is only valid with --verbose"
10966 msgstr "--non-matching 选项只在使用 --verbose 时有效"
10967
10968 #: builtin/check-mailmap.c:9
10969 msgid "git check-mailmap [<options>] <contact>..."
10970 msgstr "git check-mailmap [<选项>] <联系地址>..."
10971
10972 #: builtin/check-mailmap.c:14
10973 msgid "also read contacts from stdin"
10974 msgstr "还从标准输入读取联系地址"
10975
10976 #: builtin/check-mailmap.c:25
10977 #, c-format
10978 msgid "unable to parse contact: %s"
10979 msgstr "不能解析联系地址:%s"
10980
10981 #: builtin/check-mailmap.c:48
10982 msgid "no contacts specified"
10983 msgstr "未指定联系地址"
10984
10985 #: builtin/checkout-index.c:131
10986 msgid "git checkout-index [<options>] [--] [<file>...]"
10987 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
10988
10989 #: builtin/checkout-index.c:148
10990 msgid "stage should be between 1 and 3 or all"
10991 msgstr "索引值应该取值 1 到 3 或者 all"
10992
10993 #: builtin/checkout-index.c:164
10994 msgid "check out all files in the index"
10995 msgstr "检出索引区的所有文件"
10996
10997 #: builtin/checkout-index.c:165
10998 msgid "force overwrite of existing files"
10999 msgstr "强制覆盖现有的文件"
11000
11001 #: builtin/checkout-index.c:167
11002 msgid "no warning for existing files and files not in index"
11003 msgstr "存在或不在索引中的文件都没有警告"
11004
11005 #: builtin/checkout-index.c:169
11006 msgid "don't checkout new files"
11007 msgstr "不检出新文件"
11008
11009 #: builtin/checkout-index.c:171
11010 msgid "update stat information in the index file"
11011 msgstr "更新索引中文件的状态信息"
11012
11013 #: builtin/checkout-index.c:175
11014 msgid "read list of paths from the standard input"
11015 msgstr "从标准输入读取路径列表"
11016
11017 #: builtin/checkout-index.c:177
11018 msgid "write the content to temporary files"
11019 msgstr "将内容写入临时文件"
11020
11021 #: builtin/checkout-index.c:178 builtin/column.c:31
11022 #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
11023 #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
11024 #: builtin/worktree.c:672
11025 msgid "string"
11026 msgstr "字符串"
11027
11028 #: builtin/checkout-index.c:179
11029 msgid "when creating files, prepend <string>"
11030 msgstr "在创建文件时,在前面加上 <字符串>"
11031
11032 #: builtin/checkout-index.c:181
11033 msgid "copy out the files from named stage"
11034 msgstr "从指定暂存区中拷出文件"
11035
11036 #: builtin/checkout.c:31
11037 msgid "git checkout [<options>] <branch>"
11038 msgstr "git checkout [<选项>] <分支>"
11039
11040 #: builtin/checkout.c:32
11041 msgid "git checkout [<options>] [<branch>] -- <file>..."
11042 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
11043
11044 #: builtin/checkout.c:37
11045 msgid "git switch [<options>] [<branch>]"
11046 msgstr "git switch [<选项>] [<分支>]"
11047
11048 #: builtin/checkout.c:42
11049 msgid "git restore [<options>] [--source=<branch>] <file>..."
11050 msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
11051
11052 #: builtin/checkout.c:175 builtin/checkout.c:214
11053 #, c-format
11054 msgid "path '%s' does not have our version"
11055 msgstr "路径 '%s' 没有我们的版本"
11056
11057 #: builtin/checkout.c:177 builtin/checkout.c:216
11058 #, c-format
11059 msgid "path '%s' does not have their version"
11060 msgstr "路径 '%s' 没有他们的版本"
11061
11062 #: builtin/checkout.c:193
11063 #, c-format
11064 msgid "path '%s' does not have all necessary versions"
11065 msgstr "路径 '%s' 没有全部必需的版本"
11066
11067 #: builtin/checkout.c:243
11068 #, c-format
11069 msgid "path '%s' does not have necessary versions"
11070 msgstr "路径 '%s' 没有必需的版本"
11071
11072 #: builtin/checkout.c:261
11073 #, c-format
11074 msgid "path '%s': cannot merge"
11075 msgstr "path '%s':无法合并"
11076
11077 #: builtin/checkout.c:277
11078 #, c-format
11079 msgid "Unable to add merge result for '%s'"
11080 msgstr "无法为 '%s' 添加合并结果"
11081
11082 #: builtin/checkout.c:377
11083 #, c-format
11084 msgid "Recreated %d merge conflict"
11085 msgid_plural "Recreated %d merge conflicts"
11086 msgstr[0] "重新创建了 %d 个合并冲突"
11087 msgstr[1] "重新创建了 %d 个合并冲突"
11088
11089 #: builtin/checkout.c:382
11090 #, c-format
11091 msgid "Updated %d path from %s"
11092 msgid_plural "Updated %d paths from %s"
11093 msgstr[0] "从 %2$s 更新了 %1$d 个路径"
11094 msgstr[1] "从 %2$s 更新了 %1$d 个路径"
11095
11096 #: builtin/checkout.c:389
11097 #, c-format
11098 msgid "Updated %d path from the index"
11099 msgid_plural "Updated %d paths from the index"
11100 msgstr[0] "从索引区更新了 %d 个路径"
11101 msgstr[1] "从索引区更新了 %d 个路径"
11102
11103 #: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
11104 #: builtin/checkout.c:422
11105 #, c-format
11106 msgid "'%s' cannot be used with updating paths"
11107 msgstr "'%s' 不能在更新路径时使用"
11108
11109 #: builtin/checkout.c:425 builtin/checkout.c:428
11110 #, c-format
11111 msgid "'%s' cannot be used with %s"
11112 msgstr "'%s' 不能和 %s 同时使用"
11113
11114 #: builtin/checkout.c:432
11115 #, c-format
11116 msgid "Cannot update paths and switch to branch '%s' at the same time."
11117 msgstr "不能同时更新路径并切换到分支'%s'。"
11118
11119 #: builtin/checkout.c:436
11120 #, c-format
11121 msgid "neither '%s' or '%s' is specified"
11122 msgstr "'%s' 或 '%s' 都没有指定"
11123
11124 #: builtin/checkout.c:440
11125 #, c-format
11126 msgid "'%s' must be used when '%s' is not specified"
11127 msgstr "未指定 '%2$s' 时,必须使用 '%1$s'"
11128
11129 #: builtin/checkout.c:445 builtin/checkout.c:450
11130 #, c-format
11131 msgid "'%s' or '%s' cannot be used with %s"
11132 msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
11133
11134 #: builtin/checkout.c:509 builtin/checkout.c:516
11135 #, c-format
11136 msgid "path '%s' is unmerged"
11137 msgstr "路径 '%s' 未合并"
11138
11139 #: builtin/checkout.c:684 builtin/sparse-checkout.c:106
11140 msgid "you need to resolve your current index first"
11141 msgstr "您需要先解决当前索引的冲突"
11142
11143 #: builtin/checkout.c:734
11144 #, c-format
11145 msgid ""
11146 "cannot continue with staged changes in the following files:\n"
11147 "%s"
11148 msgstr ""
11149 "不能继续,下列文件有暂存的修改:\n"
11150 "%s"
11151
11152 #: builtin/checkout.c:837
11153 #, c-format
11154 msgid "Can not do reflog for '%s': %s\n"
11155 msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
11156
11157 #: builtin/checkout.c:879
11158 msgid "HEAD is now at"
11159 msgstr "HEAD 目前位于"
11160
11161 #: builtin/checkout.c:883 builtin/clone.c:717
11162 msgid "unable to update HEAD"
11163 msgstr "不能更新 HEAD"
11164
11165 #: builtin/checkout.c:887
11166 #, c-format
11167 msgid "Reset branch '%s'\n"
11168 msgstr "重置分支 '%s'\n"
11169
11170 #: builtin/checkout.c:890
11171 #, c-format
11172 msgid "Already on '%s'\n"
11173 msgstr "已经位于 '%s'\n"
11174
11175 #: builtin/checkout.c:894
11176 #, c-format
11177 msgid "Switched to and reset branch '%s'\n"
11178 msgstr "切换并重置分支 '%s'\n"
11179
11180 #: builtin/checkout.c:896 builtin/checkout.c:1320
11181 #, c-format
11182 msgid "Switched to a new branch '%s'\n"
11183 msgstr "切换到一个新分支 '%s'\n"
11184
11185 #: builtin/checkout.c:898
11186 #, c-format
11187 msgid "Switched to branch '%s'\n"
11188 msgstr "切换到分支 '%s'\n"
11189
11190 # 译者:注意保持前导空格
11191 #: builtin/checkout.c:949
11192 #, c-format
11193 msgid " ... and %d more.\n"
11194 msgstr " ... 及其它 %d 个。\n"
11195
11196 #: builtin/checkout.c:955
11197 #, c-format
11198 msgid ""
11199 "Warning: you are leaving %d commit behind, not connected to\n"
11200 "any of your branches:\n"
11201 "\n"
11202 "%s\n"
11203 msgid_plural ""
11204 "Warning: you are leaving %d commits behind, not connected to\n"
11205 "any of your branches:\n"
11206 "\n"
11207 "%s\n"
11208 msgstr[0] ""
11209 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
11210 "\n"
11211 "%s\n"
11212 msgstr[1] ""
11213 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
11214 "\n"
11215 "%s\n"
11216
11217 #: builtin/checkout.c:974
11218 #, c-format
11219 msgid ""
11220 "If you want to keep it by creating a new branch, this may be a good time\n"
11221 "to do so with:\n"
11222 "\n"
11223 " git branch <new-branch-name> %s\n"
11224 "\n"
11225 msgid_plural ""
11226 "If you want to keep them by creating a new branch, this may be a good time\n"
11227 "to do so with:\n"
11228 "\n"
11229 " git branch <new-branch-name> %s\n"
11230 "\n"
11231 msgstr[0] ""
11232 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
11233 "如下操作:\n"
11234 "\n"
11235 " git branch <新分支名> %s\n"
11236 "\n"
11237 msgstr[1] ""
11238 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
11239 "如下操作:\n"
11240 "\n"
11241 " git branch <新分支名> %s\n"
11242 "\n"
11243
11244 #: builtin/checkout.c:1009
11245 msgid "internal error in revision walk"
11246 msgstr "在版本遍历时遇到内部错误"
11247
11248 #: builtin/checkout.c:1013
11249 msgid "Previous HEAD position was"
11250 msgstr "之前的 HEAD 位置是"
11251
11252 #: builtin/checkout.c:1053 builtin/checkout.c:1315
11253 msgid "You are on a branch yet to be born"
11254 msgstr "您位于一个尚未初始化的分支"
11255
11256 #: builtin/checkout.c:1128
11257 #, c-format
11258 msgid ""
11259 "'%s' could be both a local file and a tracking branch.\n"
11260 "Please use -- (and optionally --no-guess) to disambiguate"
11261 msgstr ""
11262 "'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n"
11263 "请使用 --(和可选的 --no-guess)来消除歧义"
11264
11265 #: builtin/checkout.c:1135
11266 msgid ""
11267 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
11268 "you can do so by fully qualifying the name with the --track option:\n"
11269 "\n"
11270 " git checkout --track origin/<name>\n"
11271 "\n"
11272 "If you'd like to always have checkouts of an ambiguous <name> prefer\n"
11273 "one remote, e.g. the 'origin' remote, consider setting\n"
11274 "checkout.defaultRemote=origin in your config."
11275 msgstr ""
11276 "如果您想要检出一个远程跟踪分支,例如在 'origin' 上的,您可以使用分支\n"
11277 "全名和 --track 选项:\n"
11278 "\n"
11279 " git checkout --track origin/<名称>\n"
11280 "\n"
11281 "如果您总是喜欢使用模糊的简短分支名 <名称>,而不喜欢如 'origin' 的远程\n"
11282 "名称,可以在配置中设置 checkout.defaultRemote=origin。"
11283
11284 #: builtin/checkout.c:1145
11285 #, c-format
11286 msgid "'%s' matched multiple (%d) remote tracking branches"
11287 msgstr "'%s' 匹配多个(%d 个)远程跟踪分支"
11288
11289 #: builtin/checkout.c:1211
11290 msgid "only one reference expected"
11291 msgstr "只期望一个引用"
11292
11293 #: builtin/checkout.c:1228
11294 #, c-format
11295 msgid "only one reference expected, %d given."
11296 msgstr "应只有一个引用,却给出了 %d 个"
11297
11298 #: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
11299 #, c-format
11300 msgid "invalid reference: %s"
11301 msgstr "无效引用:%s"
11302
11303 #: builtin/checkout.c:1287 builtin/checkout.c:1649
11304 #, c-format
11305 msgid "reference is not a tree: %s"
11306 msgstr "引用不是一个树:%s"
11307
11308 #: builtin/checkout.c:1334
11309 #, c-format
11310 msgid "a branch is expected, got tag '%s'"
11311 msgstr "期望一个分支,得到标签 '%s'"
11312
11313 #: builtin/checkout.c:1336
11314 #, c-format
11315 msgid "a branch is expected, got remote branch '%s'"
11316 msgstr "期望一个分支,得到远程分支 '%s'"
11317
11318 #: builtin/checkout.c:1337 builtin/checkout.c:1345
11319 #, c-format
11320 msgid "a branch is expected, got '%s'"
11321 msgstr "期望一个分支,得到 '%s'"
11322
11323 #: builtin/checkout.c:1340
11324 #, c-format
11325 msgid "a branch is expected, got commit '%s'"
11326 msgstr "期望一个分支,得到提交 '%s'"
11327
11328 #: builtin/checkout.c:1356
11329 msgid ""
11330 "cannot switch branch while merging\n"
11331 "Consider \"git merge --quit\" or \"git worktree add\"."
11332 msgstr ""
11333 "不能在合并时切换分支\n"
11334 "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
11335
11336 #: builtin/checkout.c:1360
11337 msgid ""
11338 "cannot switch branch in the middle of an am session\n"
11339 "Consider \"git am --quit\" or \"git worktree add\"."
11340 msgstr ""
11341 "不能在一个 am 会话期间切换分支\n"
11342 "考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
11343
11344 #: builtin/checkout.c:1364
11345 msgid ""
11346 "cannot switch branch while rebasing\n"
11347 "Consider \"git rebase --quit\" or \"git worktree add\"."
11348 msgstr ""
11349 "不能在变基时切换分支\n"
11350 "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
11351
11352 #: builtin/checkout.c:1368
11353 msgid ""
11354 "cannot switch branch while cherry-picking\n"
11355 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
11356 msgstr ""
11357 "不能在拣选时切换分支\n"
11358 "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
11359
11360 #: builtin/checkout.c:1372
11361 msgid ""
11362 "cannot switch branch while reverting\n"
11363 "Consider \"git revert --quit\" or \"git worktree add\"."
11364 msgstr ""
11365 "不能在还原时切换分支\n"
11366 "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
11367
11368 #: builtin/checkout.c:1376
11369 msgid "you are switching branch while bisecting"
11370 msgstr "您在执行二分查找时切换分支"
11371
11372 #: builtin/checkout.c:1383
11373 msgid "paths cannot be used with switching branches"
11374 msgstr "路径不能和切换分支同时使用"
11375
11376 #: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
11377 #, c-format
11378 msgid "'%s' cannot be used with switching branches"
11379 msgstr "'%s' 不能和切换分支同时使用"
11380
11381 #: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
11382 #: builtin/checkout.c:1409 builtin/checkout.c:1414
11383 #, c-format
11384 msgid "'%s' cannot be used with '%s'"
11385 msgstr "'%s' 不能和 '%s' 同时使用"
11386
11387 #: builtin/checkout.c:1411
11388 #, c-format
11389 msgid "'%s' cannot take <start-point>"
11390 msgstr "'%s' 不带 <起始点>"
11391
11392 #: builtin/checkout.c:1419
11393 #, c-format
11394 msgid "Cannot switch branch to a non-commit '%s'"
11395 msgstr "不能切换分支到一个非提交 '%s'"
11396
11397 #: builtin/checkout.c:1426
11398 msgid "missing branch or commit argument"
11399 msgstr "缺少分支或提交参数"
11400
11401 #: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
11402 #: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
11403 #: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
11404 #: builtin/send-pack.c:174
11405 msgid "force progress reporting"
11406 msgstr "强制显示进度报告"
11407
11408 #: builtin/checkout.c:1469
11409 msgid "perform a 3-way merge with the new branch"
11410 msgstr "和新的分支执行三方合并"
11411
11412 #: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
11413 msgid "style"
11414 msgstr "风格"
11415
11416 #: builtin/checkout.c:1471
11417 msgid "conflict style (merge or diff3)"
11418 msgstr "冲突输出风格(merge 或 diff3)"
11419
11420 #: builtin/checkout.c:1483 builtin/worktree.c:496
11421 msgid "detach HEAD at named commit"
11422 msgstr "HEAD 从指定的提交分离"
11423
11424 #: builtin/checkout.c:1484
11425 msgid "set upstream info for new branch"
11426 msgstr "为新的分支设置上游信息"
11427
11428 #: builtin/checkout.c:1486
11429 msgid "force checkout (throw away local modifications)"
11430 msgstr "强制检出(丢弃本地修改)"
11431
11432 #: builtin/checkout.c:1488
11433 msgid "new-branch"
11434 msgstr "新分支"
11435
11436 #: builtin/checkout.c:1488
11437 msgid "new unparented branch"
11438 msgstr "新的没有父提交的分支"
11439
11440 #: builtin/checkout.c:1490 builtin/merge.c:289
11441 msgid "update ignored files (default)"
11442 msgstr "更新忽略的文件(默认)"
11443
11444 #: builtin/checkout.c:1493
11445 msgid "do not check if another worktree is holding the given ref"
11446 msgstr "不检查指定的引用是否被其他工作区所占用"
11447
11448 #: builtin/checkout.c:1506
11449 msgid "checkout our version for unmerged files"
11450 msgstr "对尚未合并的文件检出我们的版本"
11451
11452 #: builtin/checkout.c:1509
11453 msgid "checkout their version for unmerged files"
11454 msgstr "对尚未合并的文件检出他们的版本"
11455
11456 #: builtin/checkout.c:1513
11457 msgid "do not limit pathspecs to sparse entries only"
11458 msgstr "对路径不做稀疏检出的限制"
11459
11460 #: builtin/checkout.c:1565
11461 msgid "-b, -B and --orphan are mutually exclusive"
11462 msgstr "-b、-B 和 --orphan 是互斥的"
11463
11464 #: builtin/checkout.c:1568
11465 msgid "-p and --overlay are mutually exclusive"
11466 msgstr "-p 和 --overlay 互斥"
11467
11468 #: builtin/checkout.c:1605
11469 msgid "--track needs a branch name"
11470 msgstr "--track 需要一个分支名"
11471
11472 #: builtin/checkout.c:1610
11473 msgid "missing branch name; try -b"
11474 msgstr "缺少分支名,尝试 -b"
11475
11476 #: builtin/checkout.c:1642
11477 #, c-format
11478 msgid "could not resolve %s"
11479 msgstr "无法解析 %s"
11480
11481 #: builtin/checkout.c:1658
11482 msgid "invalid path specification"
11483 msgstr "无效的路径规格"
11484
11485 #: builtin/checkout.c:1665
11486 #, c-format
11487 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
11488 msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
11489
11490 #: builtin/checkout.c:1669
11491 #, c-format
11492 msgid "git checkout: --detach does not take a path argument '%s'"
11493 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
11494
11495 #: builtin/checkout.c:1678
11496 msgid "--pathspec-from-file is incompatible with --detach"
11497 msgstr "--pathspec-from-file 与 --detach 不兼容"
11498
11499 #: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
11500 msgid "--pathspec-from-file is incompatible with --patch"
11501 msgstr "--pathspec-from-file 与 --patch 不兼容"
11502
11503 #: builtin/checkout.c:1692
11504 msgid ""
11505 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
11506 "checking out of the index."
11507 msgstr ""
11508 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
11509
11510 #: builtin/checkout.c:1697
11511 msgid "you must specify path(s) to restore"
11512 msgstr "您必须指定一个要恢复的路径"
11513
11514 #: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
11515 #: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
11516 #: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
11517 msgid "branch"
11518 msgstr "分支"
11519
11520 #: builtin/checkout.c:1724
11521 msgid "create and checkout a new branch"
11522 msgstr "创建并检出一个新的分支"
11523
11524 #: builtin/checkout.c:1726
11525 msgid "create/reset and checkout a branch"
11526 msgstr "创建/重置并检出一个分支"
11527
11528 #: builtin/checkout.c:1727
11529 msgid "create reflog for new branch"
11530 msgstr "为新的分支创建引用日志"
11531
11532 #: builtin/checkout.c:1729
11533 msgid "second guess 'git checkout <no-such-branch>' (default)"
11534 msgstr "二次猜测 'git checkout <无此分支>'(默认)"
11535
11536 #: builtin/checkout.c:1730
11537 msgid "use overlay mode (default)"
11538 msgstr "使用叠加模式(默认)"
11539
11540 #: builtin/checkout.c:1775
11541 msgid "create and switch to a new branch"
11542 msgstr "创建并切换一个新分支"
11543
11544 #: builtin/checkout.c:1777
11545 msgid "create/reset and switch to a branch"
11546 msgstr "创建/重置并切换一个分支"
11547
11548 #: builtin/checkout.c:1779
11549 msgid "second guess 'git switch <no-such-branch>'"
11550 msgstr "二次猜测 'git switch <无此分支>'"
11551
11552 #: builtin/checkout.c:1781
11553 msgid "throw away local modifications"
11554 msgstr "丢弃本地修改"
11555
11556 #: builtin/checkout.c:1813
11557 msgid "which tree-ish to checkout from"
11558 msgstr "要检出哪一个树"
11559
11560 #: builtin/checkout.c:1815
11561 msgid "restore the index"
11562 msgstr "恢复索引"
11563
11564 #: builtin/checkout.c:1817
11565 msgid "restore the working tree (default)"
11566 msgstr "恢复工作区(默认)"
11567
11568 #: builtin/checkout.c:1819
11569 msgid "ignore unmerged entries"
11570 msgstr "忽略未合并条目"
11571
11572 #: builtin/checkout.c:1820
11573 msgid "use overlay mode"
11574 msgstr "使用叠加模式"
11575
11576 #: builtin/clean.c:28
11577 msgid ""
11578 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
11579 msgstr ""
11580 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
11581
11582 #: builtin/clean.c:32
11583 #, c-format
11584 msgid "Removing %s\n"
11585 msgstr "正删除 %s\n"
11586
11587 #: builtin/clean.c:33
11588 #, c-format
11589 msgid "Would remove %s\n"
11590 msgstr "将删除 %s\n"
11591
11592 #: builtin/clean.c:34
11593 #, c-format
11594 msgid "Skipping repository %s\n"
11595 msgstr "忽略仓库 %s\n"
11596
11597 #: builtin/clean.c:35
11598 #, c-format
11599 msgid "Would skip repository %s\n"
11600 msgstr "将忽略仓库 %s\n"
11601
11602 #: builtin/clean.c:36
11603 #, c-format
11604 msgid "failed to remove %s"
11605 msgstr "删除 %s 失败"
11606
11607 #: builtin/clean.c:37
11608 #, c-format
11609 msgid "could not lstat %s\n"
11610 msgstr "不能对 %s 调用 lstat\n"
11611
11612 #: builtin/clean.c:301 git-add--interactive.perl:595
11613 #, c-format
11614 msgid ""
11615 "Prompt help:\n"
11616 "1 - select a numbered item\n"
11617 "foo - select item based on unique prefix\n"
11618 " - (empty) select nothing\n"
11619 msgstr ""
11620 "帮助:\n"
11621 "1 - 通过编号选择一个选项\n"
11622 "foo - 通过唯一前缀选择一个选项\n"
11623 " - (空)什么也不选择\n"
11624
11625 #: builtin/clean.c:305 git-add--interactive.perl:604
11626 #, c-format
11627 msgid ""
11628 "Prompt help:\n"
11629 "1 - select a single item\n"
11630 "3-5 - select a range of items\n"
11631 "2-3,6-9 - select multiple ranges\n"
11632 "foo - select item based on unique prefix\n"
11633 "-... - unselect specified items\n"
11634 "* - choose all items\n"
11635 " - (empty) finish selecting\n"
11636 msgstr ""
11637 "帮助:\n"
11638 "1 - 选择一个选项\n"
11639 "3-5 - 选择一个范围内的所有选项\n"
11640 "2-3,6-9 - 选择多个范围内的所有选项\n"
11641 "foo - 通过唯一前缀选择一个选项\n"
11642 "-... - 反选特定的选项\n"
11643 "* - 选择所有选项\n"
11644 " - (空)结束选择\n"
11645
11646 #: builtin/clean.c:521 git-add--interactive.perl:570
11647 #: git-add--interactive.perl:575
11648 #, c-format, perl-format
11649 msgid "Huh (%s)?\n"
11650 msgstr "嗯(%s)?\n"
11651
11652 #: builtin/clean.c:663
11653 #, c-format
11654 msgid "Input ignore patterns>> "
11655 msgstr "输入模版以排除条目>> "
11656
11657 #: builtin/clean.c:700
11658 #, c-format
11659 msgid "WARNING: Cannot find items matched by: %s"
11660 msgstr "警告:无法找到和 %s 匹配的条目"
11661
11662 #: builtin/clean.c:721
11663 msgid "Select items to delete"
11664 msgstr "选择要删除的条目"
11665
11666 #. TRANSLATORS: Make sure to keep [y/N] as is
11667 #: builtin/clean.c:762
11668 #, c-format
11669 msgid "Remove %s [y/N]? "
11670 msgstr "删除 %s [y/N]?"
11671
11672 #: builtin/clean.c:795
11673 msgid ""
11674 "clean - start cleaning\n"
11675 "filter by pattern - exclude items from deletion\n"
11676 "select by numbers - select items to be deleted by numbers\n"
11677 "ask each - confirm each deletion (like \"rm -i\")\n"
11678 "quit - stop cleaning\n"
11679 "help - this screen\n"
11680 "? - help for prompt selection"
11681 msgstr ""
11682 "clean - 开始清理\n"
11683 "filter by pattern - 通过模版排除要删除的条目\n"
11684 "select by numbers - 通过数字选择要删除的条目\n"
11685 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
11686 "quit - 停止删除并退出\n"
11687 "help - 显示本帮助\n"
11688 "? - 显示如何在提示符下选择的帮助"
11689
11690 #: builtin/clean.c:831
11691 msgid "Would remove the following item:"
11692 msgid_plural "Would remove the following items:"
11693 msgstr[0] "将删除如下条目:"
11694 msgstr[1] "将删除如下条目:"
11695
11696 #: builtin/clean.c:847
11697 msgid "No more files to clean, exiting."
11698 msgstr "没有要清理的文件,退出。"
11699
11700 #: builtin/clean.c:909
11701 msgid "do not print names of files removed"
11702 msgstr "不打印删除文件的名称"
11703
11704 #: builtin/clean.c:911
11705 msgid "force"
11706 msgstr "强制"
11707
11708 #: builtin/clean.c:912
11709 msgid "interactive cleaning"
11710 msgstr "交互式清除"
11711
11712 #: builtin/clean.c:914
11713 msgid "remove whole directories"
11714 msgstr "删除整个目录"
11715
11716 #: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
11717 #: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
11718 #: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
11719 #: builtin/show-ref.c:179
11720 msgid "pattern"
11721 msgstr "模式"
11722
11723 #: builtin/clean.c:916
11724 msgid "add <pattern> to ignore rules"
11725 msgstr "添加 <模式> 到忽略规则"
11726
11727 #: builtin/clean.c:917
11728 msgid "remove ignored files, too"
11729 msgstr "也删除忽略的文件"
11730
11731 #: builtin/clean.c:919
11732 msgid "remove only ignored files"
11733 msgstr "只删除忽略的文件"
11734
11735 #: builtin/clean.c:937
11736 msgid "-x and -X cannot be used together"
11737 msgstr "-x 和 -X 不能同时使用"
11738
11739 #: builtin/clean.c:941
11740 msgid ""
11741 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
11742 "clean"
11743 msgstr ""
11744 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
11745
11746 #: builtin/clean.c:944
11747 msgid ""
11748 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
11749 "refusing to clean"
11750 msgstr ""
11751 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
11752
11753 #: builtin/clone.c:45
11754 msgid "git clone [<options>] [--] <repo> [<dir>]"
11755 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
11756
11757 #: builtin/clone.c:93
11758 msgid "don't create a checkout"
11759 msgstr "不创建一个检出"
11760
11761 #: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
11762 msgid "create a bare repository"
11763 msgstr "创建一个纯仓库"
11764
11765 #: builtin/clone.c:98
11766 msgid "create a mirror repository (implies bare)"
11767 msgstr "创建一个镜像仓库(也是纯仓库)"
11768
11769 #: builtin/clone.c:100
11770 msgid "to clone from a local repository"
11771 msgstr "从本地仓库克隆"
11772
11773 #: builtin/clone.c:102
11774 msgid "don't use local hardlinks, always copy"
11775 msgstr "不使用本地硬链接,始终复制"
11776
11777 #: builtin/clone.c:104
11778 msgid "setup as shared repository"
11779 msgstr "设置为共享仓库"
11780
11781 #: builtin/clone.c:107
11782 msgid "pathspec"
11783 msgstr "路径规格"
11784
11785 #: builtin/clone.c:107
11786 msgid "initialize submodules in the clone"
11787 msgstr "在克隆时初始化子模组"
11788
11789 #: builtin/clone.c:110
11790 msgid "number of submodules cloned in parallel"
11791 msgstr "并发克隆的子模组的数量"
11792
11793 #: builtin/clone.c:111 builtin/init-db.c:486
11794 msgid "template-directory"
11795 msgstr "模板目录"
11796
11797 #: builtin/clone.c:112 builtin/init-db.c:487
11798 msgid "directory from which templates will be used"
11799 msgstr "模板目录将被使用"
11800
11801 #: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
11802 #: builtin/submodule--helper.c:1912
11803 msgid "reference repository"
11804 msgstr "参考仓库"
11805
11806 #: builtin/clone.c:118 builtin/submodule--helper.c:1409
11807 #: builtin/submodule--helper.c:1914
11808 msgid "use --reference only while cloning"
11809 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
11810
11811 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
11812 #: builtin/pack-objects.c:3441 builtin/repack.c:327
11813 msgid "name"
11814 msgstr "名称"
11815
11816 #: builtin/clone.c:120
11817 msgid "use <name> instead of 'origin' to track upstream"
11818 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
11819
11820 #: builtin/clone.c:122
11821 msgid "checkout <branch> instead of the remote's HEAD"
11822 msgstr "检出 <分支> 而不是远程 HEAD"
11823
11824 #: builtin/clone.c:124
11825 msgid "path to git-upload-pack on the remote"
11826 msgstr "远程 git-upload-pack 路径"
11827
11828 #: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
11829 #: builtin/pull.c:207
11830 msgid "depth"
11831 msgstr "深度"
11832
11833 #: builtin/clone.c:126
11834 msgid "create a shallow clone of that depth"
11835 msgstr "创建一个指定深度的浅克隆"
11836
11837 #: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
11838 msgid "time"
11839 msgstr "时间"
11840
11841 #: builtin/clone.c:128
11842 msgid "create a shallow clone since a specific time"
11843 msgstr "从一个特定时间创建一个浅克隆"
11844
11845 #: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
11846 #: builtin/rebase.c:1480
11847 msgid "revision"
11848 msgstr "版本"
11849
11850 #: builtin/clone.c:130 builtin/fetch.c:173
11851 msgid "deepen history of shallow clone, excluding rev"
11852 msgstr "深化浅克隆的历史,除了特定版本"
11853
11854 #: builtin/clone.c:132 builtin/submodule--helper.c:1419
11855 #: builtin/submodule--helper.c:1928
11856 msgid "clone only one branch, HEAD or --branch"
11857 msgstr "只克隆一个分支、HEAD 或 --branch"
11858
11859 #: builtin/clone.c:134
11860 msgid "don't clone any tags, and make later fetches not to follow them"
11861 msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
11862
11863 #: builtin/clone.c:136
11864 msgid "any cloned submodules will be shallow"
11865 msgstr "子模组将以浅下载模式克隆"
11866
11867 #: builtin/clone.c:137 builtin/init-db.c:495
11868 msgid "gitdir"
11869 msgstr "git目录"
11870
11871 #: builtin/clone.c:138 builtin/init-db.c:496
11872 msgid "separate git dir from working tree"
11873 msgstr "git目录和工作区分离"
11874
11875 #: builtin/clone.c:139
11876 msgid "key=value"
11877 msgstr "key=value"
11878
11879 #: builtin/clone.c:140
11880 msgid "set config inside the new repository"
11881 msgstr "在新仓库中设置配置信息"
11882
11883 #: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
11884 #: builtin/push.c:573 builtin/send-pack.c:172
11885 msgid "server-specific"
11886 msgstr "server-specific"
11887
11888 #: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
11889 #: builtin/push.c:573 builtin/send-pack.c:173
11890 msgid "option to transmit"
11891 msgstr "传输选项"
11892
11893 #: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
11894 #: builtin/push.c:574
11895 msgid "use IPv4 addresses only"
11896 msgstr "只使用 IPv4 地址"
11897
11898 #: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
11899 #: builtin/push.c:576
11900 msgid "use IPv6 addresses only"
11901 msgstr "只使用 IPv6 地址"
11902
11903 #: builtin/clone.c:149
11904 msgid "any cloned submodules will use their remote-tracking branch"
11905 msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
11906
11907 #: builtin/clone.c:151
11908 msgid "initialize sparse-checkout file to include only files at root"
11909 msgstr "初始化稀疏检出文件,只包含根目录文件"
11910
11911 #: builtin/clone.c:287
11912 msgid ""
11913 "No directory name could be guessed.\n"
11914 "Please specify a directory on the command line"
11915 msgstr ""
11916 "无法猜到目录名。\n"
11917 "请在命令行指定一个目录"
11918
11919 #: builtin/clone.c:340
11920 #, c-format
11921 msgid "info: Could not add alternate for '%s': %s\n"
11922 msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
11923
11924 #: builtin/clone.c:413
11925 #, c-format
11926 msgid "%s exists and is not a directory"
11927 msgstr "%s 存在且不是一个目录"
11928
11929 #: builtin/clone.c:430
11930 #, c-format
11931 msgid "failed to start iterator over '%s'"
11932 msgstr "无法在 '%s' 上启动迭代器"
11933
11934 #: builtin/clone.c:460
11935 #, c-format
11936 msgid "failed to create link '%s'"
11937 msgstr "创建链接 '%s' 失败"
11938
11939 #: builtin/clone.c:464
11940 #, c-format
11941 msgid "failed to copy file to '%s'"
11942 msgstr "拷贝文件至 '%s' 失败"
11943
11944 #: builtin/clone.c:469
11945 #, c-format
11946 msgid "failed to iterate over '%s'"
11947 msgstr "无法在 '%s' 上迭代"
11948
11949 #: builtin/clone.c:494
11950 #, c-format
11951 msgid "done.\n"
11952 msgstr "完成。\n"
11953
11954 #: builtin/clone.c:508
11955 msgid ""
11956 "Clone succeeded, but checkout failed.\n"
11957 "You can inspect what was checked out with 'git status'\n"
11958 "and retry with 'git restore --source=HEAD :/'\n"
11959 msgstr ""
11960 "克隆成功,但是检出失败。\n"
11961 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
11962 "'git restore --source=HEAD :/' 重试\n"
11963
11964 #: builtin/clone.c:585
11965 #, c-format
11966 msgid "Could not find remote branch %s to clone."
11967 msgstr "不能发现要克隆的远程分支 %s。"
11968
11969 #: builtin/clone.c:705
11970 #, c-format
11971 msgid "unable to update %s"
11972 msgstr "不能更新 %s"
11973
11974 #: builtin/clone.c:753
11975 msgid "failed to initialize sparse-checkout"
11976 msgstr "无法初始化稀疏检出"
11977
11978 #: builtin/clone.c:776
11979 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
11980 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
11981
11982 #: builtin/clone.c:807
11983 msgid "unable to checkout working tree"
11984 msgstr "不能检出工作区"
11985
11986 #: builtin/clone.c:862
11987 msgid "unable to write parameters to config file"
11988 msgstr "无法将参数写入配置文件"
11989
11990 #: builtin/clone.c:925
11991 msgid "cannot repack to clean up"
11992 msgstr "无法执行 repack 来清理"
11993
11994 #: builtin/clone.c:927
11995 msgid "cannot unlink temporary alternates file"
11996 msgstr "无法删除临时的 alternates 文件"
11997
11998 #: builtin/clone.c:965 builtin/receive-pack.c:1950
11999 msgid "Too many arguments."
12000 msgstr "太多参数。"
12001
12002 #: builtin/clone.c:969
12003 msgid "You must specify a repository to clone."
12004 msgstr "您必须指定一个仓库来克隆。"
12005
12006 #: builtin/clone.c:982
12007 #, c-format
12008 msgid "--bare and --origin %s options are incompatible."
12009 msgstr "--bare 和 --origin %s 选项不兼容。"
12010
12011 #: builtin/clone.c:985
12012 msgid "--bare and --separate-git-dir are incompatible."
12013 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
12014
12015 #: builtin/clone.c:998
12016 #, c-format
12017 msgid "repository '%s' does not exist"
12018 msgstr "仓库 '%s' 不存在"
12019
12020 #: builtin/clone.c:1004 builtin/fetch.c:1796
12021 #, c-format
12022 msgid "depth %s is not a positive number"
12023 msgstr "深度 %s 不是一个正数"
12024
12025 #: builtin/clone.c:1014
12026 #, c-format
12027 msgid "destination path '%s' already exists and is not an empty directory."
12028 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
12029
12030 #: builtin/clone.c:1024
12031 #, c-format
12032 msgid "working tree '%s' already exists."
12033 msgstr "工作区 '%s' 已经存在。"
12034
12035 #: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
12036 #: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
12037 #, c-format
12038 msgid "could not create leading directories of '%s'"
12039 msgstr "不能为 '%s' 创建先导目录"
12040
12041 #: builtin/clone.c:1044
12042 #, c-format
12043 msgid "could not create work tree dir '%s'"
12044 msgstr "不能创建工作区目录 '%s'"
12045
12046 #: builtin/clone.c:1064
12047 #, c-format
12048 msgid "Cloning into bare repository '%s'...\n"
12049 msgstr "克隆到纯仓库 '%s'...\n"
12050
12051 #: builtin/clone.c:1066
12052 #, c-format
12053 msgid "Cloning into '%s'...\n"
12054 msgstr "正克隆到 '%s'...\n"
12055
12056 #: builtin/clone.c:1090
12057 msgid ""
12058 "clone --recursive is not compatible with both --reference and --reference-if-"
12059 "able"
12060 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
12061
12062 #: builtin/clone.c:1154
12063 msgid "--depth is ignored in local clones; use file:// instead."
12064 msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
12065
12066 #: builtin/clone.c:1156
12067 msgid "--shallow-since is ignored in local clones; use file:// instead."
12068 msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
12069
12070 #: builtin/clone.c:1158
12071 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
12072 msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
12073
12074 #: builtin/clone.c:1160
12075 msgid "--filter is ignored in local clones; use file:// instead."
12076 msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
12077
12078 #: builtin/clone.c:1163
12079 msgid "source repository is shallow, ignoring --local"
12080 msgstr "源仓库是浅克隆,忽略 --local"
12081
12082 #: builtin/clone.c:1168
12083 msgid "--local is ignored"
12084 msgstr "--local 被忽略"
12085
12086 #: builtin/clone.c:1243 builtin/clone.c:1251
12087 #, c-format
12088 msgid "Remote branch %s not found in upstream %s"
12089 msgstr "远程分支 %s 在上游 %s 未发现"
12090
12091 #: builtin/clone.c:1254
12092 msgid "You appear to have cloned an empty repository."
12093 msgstr "您似乎克隆了一个空仓库。"
12094
12095 #: builtin/column.c:10
12096 msgid "git column [<options>]"
12097 msgstr "git column [<选项>]"
12098
12099 #: builtin/column.c:27
12100 msgid "lookup config vars"
12101 msgstr "查找配置变量"
12102
12103 #: builtin/column.c:28 builtin/column.c:29
12104 msgid "layout to use"
12105 msgstr "要使用的布局"
12106
12107 #: builtin/column.c:30
12108 msgid "Maximum width"
12109 msgstr "最大宽度"
12110
12111 #: builtin/column.c:31
12112 msgid "Padding space on left border"
12113 msgstr "左边框的填充空间"
12114
12115 #: builtin/column.c:32
12116 msgid "Padding space on right border"
12117 msgstr "右边框的填充空间"
12118
12119 #: builtin/column.c:33
12120 msgid "Padding space between columns"
12121 msgstr "两列之间的填充空间"
12122
12123 #: builtin/column.c:51
12124 msgid "--command must be the first argument"
12125 msgstr "--command 必须是第一个参数"
12126
12127 #: builtin/commit-tree.c:18
12128 msgid ""
12129 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
12130 "<file>)...] <tree>"
12131 msgstr ""
12132 "git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
12133 ">)...] <树>"
12134
12135 #: builtin/commit-tree.c:31
12136 #, c-format
12137 msgid "duplicate parent %s ignored"
12138 msgstr "忽略重复的父提交 %s"
12139
12140 #: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
12141 #, c-format
12142 msgid "not a valid object name %s"
12143 msgstr "不是一个有效的对象名 %s"
12144
12145 #: builtin/commit-tree.c:93
12146 #, c-format
12147 msgid "git commit-tree: failed to open '%s'"
12148 msgstr "git commit-tree:无法打开 '%s'"
12149
12150 #: builtin/commit-tree.c:96
12151 #, c-format
12152 msgid "git commit-tree: failed to read '%s'"
12153 msgstr "git commit-tree:无法读取 '%s'"
12154
12155 #: builtin/commit-tree.c:98
12156 #, c-format
12157 msgid "git commit-tree: failed to close '%s'"
12158 msgstr "git commit-tree:无法关闭 '%s'"
12159
12160 #: builtin/commit-tree.c:111
12161 msgid "parent"
12162 msgstr "父提交"
12163
12164 #: builtin/commit-tree.c:112
12165 msgid "id of a parent commit object"
12166 msgstr "父提交对象 ID"
12167
12168 #: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
12169 #: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
12170 #: builtin/tag.c:412
12171 msgid "message"
12172 msgstr "说明"
12173
12174 #: builtin/commit-tree.c:115 builtin/commit.c:1501
12175 msgid "commit message"
12176 msgstr "提交说明"
12177
12178 #: builtin/commit-tree.c:118
12179 msgid "read commit log message from file"
12180 msgstr "从文件中读取提交说明"
12181
12182 #: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
12183 #: builtin/pull.c:175 builtin/revert.c:118
12184 msgid "GPG sign commit"
12185 msgstr "GPG 提交签名"
12186
12187 #: builtin/commit-tree.c:133
12188 msgid "must give exactly one tree"
12189 msgstr "必须精确地提供一个树"
12190
12191 #: builtin/commit-tree.c:140
12192 msgid "git commit-tree: failed to read"
12193 msgstr "git commit-tree:读取失败"
12194
12195 #: builtin/commit.c:41
12196 msgid "git commit [<options>] [--] <pathspec>..."
12197 msgstr "git commit [<选项>] [--] <路径规格>..."
12198
12199 #: builtin/commit.c:46
12200 msgid "git status [<options>] [--] <pathspec>..."
12201 msgstr "git status [<选项>] [--] <路径规格>..."
12202
12203 #: builtin/commit.c:51
12204 msgid ""
12205 "You asked to amend the most recent commit, but doing so would make\n"
12206 "it empty. You can repeat your command with --allow-empty, or you can\n"
12207 "remove the commit entirely with \"git reset HEAD^\".\n"
12208 msgstr ""
12209 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
12210 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
12211
12212 #: builtin/commit.c:56
12213 msgid ""
12214 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
12215 "If you wish to commit it anyway, use:\n"
12216 "\n"
12217 " git commit --allow-empty\n"
12218 "\n"
12219 msgstr ""
12220 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
12221 "也要提交,使用命令:\n"
12222 "\n"
12223 " git commit --allow-empty\n"
12224 "\n"
12225
12226 #: builtin/commit.c:63
12227 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
12228 msgstr "否则,请使用 'git cherry-pick --skip'\n"
12229
12230 #: builtin/commit.c:66
12231 msgid ""
12232 "and then use:\n"
12233 "\n"
12234 " git cherry-pick --continue\n"
12235 "\n"
12236 "to resume cherry-picking the remaining commits.\n"
12237 "If you wish to skip this commit, use:\n"
12238 "\n"
12239 " git cherry-pick --skip\n"
12240 "\n"
12241 msgstr ""
12242 "然后使用:\n"
12243 "\n"
12244 " git cherry-pick --continue\n"
12245 "\n"
12246 "来继续拣选剩余提交。如果您想跳过此提交,使用:\n"
12247 "\n"
12248 " git cherry-pick --skip\n"
12249 "\n"
12250
12251 #: builtin/commit.c:315
12252 msgid "failed to unpack HEAD tree object"
12253 msgstr "解包 HEAD 树对象失败"
12254
12255 #: builtin/commit.c:351
12256 msgid "--pathspec-from-file with -a does not make sense"
12257 msgstr "--pathspec-from-file 和 -a 在一起没有意义"
12258
12259 #: builtin/commit.c:364
12260 msgid "No paths with --include/--only does not make sense."
12261 msgstr "参数 --include/--only 不跟路径没有意义。"
12262
12263 #: builtin/commit.c:376
12264 msgid "unable to create temporary index"
12265 msgstr "不能创建临时索引"
12266
12267 #: builtin/commit.c:385
12268 msgid "interactive add failed"
12269 msgstr "交互式添加失败"
12270
12271 #: builtin/commit.c:400
12272 msgid "unable to update temporary index"
12273 msgstr "无法更新临时索引"
12274
12275 #: builtin/commit.c:402
12276 msgid "Failed to update main cache tree"
12277 msgstr "不能更新树的主缓存"
12278
12279 #: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
12280 msgid "unable to write new_index file"
12281 msgstr "无法写 new_index 文件"
12282
12283 #: builtin/commit.c:479
12284 msgid "cannot do a partial commit during a merge."
12285 msgstr "在合并过程中不能做部分提交。"
12286
12287 #: builtin/commit.c:481
12288 msgid "cannot do a partial commit during a cherry-pick."
12289 msgstr "在拣选过程中不能做部分提交。"
12290
12291 #: builtin/commit.c:489
12292 msgid "cannot read the index"
12293 msgstr "无法读取索引"
12294
12295 #: builtin/commit.c:508
12296 msgid "unable to write temporary index file"
12297 msgstr "无法写临时索引文件"
12298
12299 #: builtin/commit.c:606
12300 #, c-format
12301 msgid "commit '%s' lacks author header"
12302 msgstr "提交 '%s' 缺少作者信息"
12303
12304 #: builtin/commit.c:608
12305 #, c-format
12306 msgid "commit '%s' has malformed author line"
12307 msgstr "提交 '%s' 有格式错误的作者信息"
12308
12309 #: builtin/commit.c:627
12310 msgid "malformed --author parameter"
12311 msgstr "格式错误的 --author 参数"
12312
12313 #: builtin/commit.c:680
12314 msgid ""
12315 "unable to select a comment character that is not used\n"
12316 "in the current commit message"
12317 msgstr "无法选择一个未被当前提交说明使用的注释字符"
12318
12319 #: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
12320 #, c-format
12321 msgid "could not lookup commit %s"
12322 msgstr "不能查询提交 %s"
12323
12324 #: builtin/commit.c:730 builtin/shortlog.c:319
12325 #, c-format
12326 msgid "(reading log message from standard input)\n"
12327 msgstr "(正从标准输入中读取日志信息)\n"
12328
12329 #: builtin/commit.c:732
12330 msgid "could not read log from standard input"
12331 msgstr "不能从标准输入中读取日志信息"
12332
12333 #: builtin/commit.c:736
12334 #, c-format
12335 msgid "could not read log file '%s'"
12336 msgstr "不能读取日志文件 '%s'"
12337
12338 #: builtin/commit.c:767 builtin/commit.c:783
12339 msgid "could not read SQUASH_MSG"
12340 msgstr "不能读取 SQUASH_MSG"
12341
12342 #: builtin/commit.c:774
12343 msgid "could not read MERGE_MSG"
12344 msgstr "不能读取 MERGE_MSG"
12345
12346 #: builtin/commit.c:834
12347 msgid "could not write commit template"
12348 msgstr "不能写提交模版"
12349
12350 #: builtin/commit.c:853
12351 #, c-format
12352 msgid ""
12353 "\n"
12354 "It looks like you may be committing a merge.\n"
12355 "If this is not correct, please remove the file\n"
12356 "\t%s\n"
12357 "and try again.\n"
12358 msgstr ""
12359 "\n"
12360 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
12361 "\t%s\n"
12362 "然后重试。\n"
12363
12364 #: builtin/commit.c:858
12365 #, c-format
12366 msgid ""
12367 "\n"
12368 "It looks like you may be committing a cherry-pick.\n"
12369 "If this is not correct, please remove the file\n"
12370 "\t%s\n"
12371 "and try again.\n"
12372 msgstr ""
12373 "\n"
12374 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
12375 "\t%s\n"
12376 "然后重试。\n"
12377
12378 #: builtin/commit.c:871
12379 #, c-format
12380 msgid ""
12381 "Please enter the commit message for your changes. Lines starting\n"
12382 "with '%c' will be ignored, and an empty message aborts the commit.\n"
12383 msgstr ""
12384 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
12385 "说明将会终止提交。\n"
12386
12387 #: builtin/commit.c:879
12388 #, c-format
12389 msgid ""
12390 "Please enter the commit message for your changes. Lines starting\n"
12391 "with '%c' will be kept; you may remove them yourself if you want to.\n"
12392 "An empty message aborts the commit.\n"
12393 msgstr ""
12394 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
12395 "也可以删除它们。一个空的提交说明将会终止提交。\n"
12396
12397 # 译者:为保证在输出中对齐,注意调整句中空格!
12398 #: builtin/commit.c:896
12399 #, c-format
12400 msgid "%sAuthor: %.*s <%.*s>"
12401 msgstr "%s作者: %.*s <%.*s>"
12402
12403 # 译者:为保证在输出中对齐,注意调整句中空格!
12404 #: builtin/commit.c:904
12405 #, c-format
12406 msgid "%sDate: %s"
12407 msgstr "%s日期: %s"
12408
12409 # 译者:为保证在输出中对齐,注意调整句中空格!
12410 #: builtin/commit.c:911
12411 #, c-format
12412 msgid "%sCommitter: %.*s <%.*s>"
12413 msgstr "%s提交者:%.*s <%.*s>"
12414
12415 #: builtin/commit.c:929
12416 msgid "Cannot read index"
12417 msgstr "无法读取索引"
12418
12419 #: builtin/commit.c:997
12420 msgid "Error building trees"
12421 msgstr "无法创建树对象"
12422
12423 #: builtin/commit.c:1011 builtin/tag.c:275
12424 #, c-format
12425 msgid "Please supply the message using either -m or -F option.\n"
12426 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
12427
12428 #: builtin/commit.c:1055
12429 #, c-format
12430 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
12431 msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
12432
12433 #: builtin/commit.c:1069
12434 #, c-format
12435 msgid "Invalid ignored mode '%s'"
12436 msgstr "无效的忽略模式 '%s'"
12437
12438 #: builtin/commit.c:1087 builtin/commit.c:1327
12439 #, c-format
12440 msgid "Invalid untracked files mode '%s'"
12441 msgstr "无效的未追踪文件参数 '%s'"
12442
12443 #: builtin/commit.c:1127
12444 msgid "--long and -z are incompatible"
12445 msgstr "--long 和 -z 选项不兼容"
12446
12447 #: builtin/commit.c:1171
12448 msgid "Using both --reset-author and --author does not make sense"
12449 msgstr "同时使用 --reset-author 和 --author 没有意义"
12450
12451 #: builtin/commit.c:1180
12452 msgid "You have nothing to amend."
12453 msgstr "您没有可修补的提交。"
12454
12455 #: builtin/commit.c:1183
12456 msgid "You are in the middle of a merge -- cannot amend."
12457 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
12458
12459 #: builtin/commit.c:1185
12460 msgid "You are in the middle of a cherry-pick -- cannot amend."
12461 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
12462
12463 #: builtin/commit.c:1188
12464 msgid "Options --squash and --fixup cannot be used together"
12465 msgstr "选项 --squash 和 --fixup 不能同时使用"
12466
12467 #: builtin/commit.c:1198
12468 msgid "Only one of -c/-C/-F/--fixup can be used."
12469 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
12470
12471 #: builtin/commit.c:1200
12472 msgid "Option -m cannot be combined with -c/-C/-F."
12473 msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
12474
12475 #: builtin/commit.c:1208
12476 msgid "--reset-author can be used only with -C, -c or --amend."
12477 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
12478
12479 #: builtin/commit.c:1225
12480 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
12481 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
12482
12483 #: builtin/commit.c:1231
12484 #, c-format
12485 msgid "paths '%s ...' with -a does not make sense"
12486 msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
12487
12488 #: builtin/commit.c:1362 builtin/commit.c:1524
12489 msgid "show status concisely"
12490 msgstr "以简洁的格式显示状态"
12491
12492 #: builtin/commit.c:1364 builtin/commit.c:1526
12493 msgid "show branch information"
12494 msgstr "显示分支信息"
12495
12496 #: builtin/commit.c:1366
12497 msgid "show stash information"
12498 msgstr "显示贮藏区信息"
12499
12500 #: builtin/commit.c:1368 builtin/commit.c:1528
12501 msgid "compute full ahead/behind values"
12502 msgstr "计算完整的领先/落后值"
12503
12504 #: builtin/commit.c:1370
12505 msgid "version"
12506 msgstr "版本"
12507
12508 #: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
12509 #: builtin/worktree.c:643
12510 msgid "machine-readable output"
12511 msgstr "机器可读的输出"
12512
12513 #: builtin/commit.c:1373 builtin/commit.c:1532
12514 msgid "show status in long format (default)"
12515 msgstr "以长格式显示状态(默认)"
12516
12517 #: builtin/commit.c:1376 builtin/commit.c:1535
12518 msgid "terminate entries with NUL"
12519 msgstr "条目以 NUL 字符结尾"
12520
12521 #: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
12522 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156
12523 #: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
12524 msgid "mode"
12525 msgstr "模式"
12526
12527 #: builtin/commit.c:1379 builtin/commit.c:1538
12528 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
12529 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
12530
12531 #: builtin/commit.c:1383
12532 msgid ""
12533 "show ignored files, optional modes: traditional, matching, no. (Default: "
12534 "traditional)"
12535 msgstr ""
12536 "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
12537
12538 #: builtin/commit.c:1385 parse-options.h:192
12539 msgid "when"
12540 msgstr "何时"
12541
12542 #: builtin/commit.c:1386
12543 msgid ""
12544 "ignore changes to submodules, optional when: all, dirty, untracked. "
12545 "(Default: all)"
12546 msgstr ""
12547 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
12548
12549 #: builtin/commit.c:1388
12550 msgid "list untracked files in columns"
12551 msgstr "以列的方式显示未跟踪的文件"
12552
12553 #: builtin/commit.c:1389
12554 msgid "do not detect renames"
12555 msgstr "不检测重命名"
12556
12557 #: builtin/commit.c:1391
12558 msgid "detect renames, optionally set similarity index"
12559 msgstr "检测重命名,可以设置索引相似度"
12560
12561 #: builtin/commit.c:1411
12562 msgid "Unsupported combination of ignored and untracked-files arguments"
12563 msgstr "不支持已忽略和未跟踪文件参数的组合"
12564
12565 #: builtin/commit.c:1494
12566 msgid "suppress summary after successful commit"
12567 msgstr "提交成功后不显示概述信息"
12568
12569 #: builtin/commit.c:1495
12570 msgid "show diff in commit message template"
12571 msgstr "在提交说明模板里显示差异"
12572
12573 #: builtin/commit.c:1497
12574 msgid "Commit message options"
12575 msgstr "提交说明选项"
12576
12577 #: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
12578 msgid "read message from file"
12579 msgstr "从文件中读取提交说明"
12580
12581 #: builtin/commit.c:1499
12582 msgid "author"
12583 msgstr "作者"
12584
12585 #: builtin/commit.c:1499
12586 msgid "override author for commit"
12587 msgstr "提交时覆盖作者"
12588
12589 #: builtin/commit.c:1500 builtin/gc.c:538
12590 msgid "date"
12591 msgstr "日期"
12592
12593 #: builtin/commit.c:1500
12594 msgid "override date for commit"
12595 msgstr "提交时覆盖日期"
12596
12597 #: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
12598 #: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
12599 msgid "commit"
12600 msgstr "提交"
12601
12602 #: builtin/commit.c:1502
12603 msgid "reuse and edit message from specified commit"
12604 msgstr "重用并编辑指定提交的提交说明"
12605
12606 #: builtin/commit.c:1503
12607 msgid "reuse message from specified commit"
12608 msgstr "重用指定提交的提交说明"
12609
12610 #: builtin/commit.c:1504
12611 msgid "use autosquash formatted message to fixup specified commit"
12612 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
12613
12614 #: builtin/commit.c:1505
12615 msgid "use autosquash formatted message to squash specified commit"
12616 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
12617
12618 #: builtin/commit.c:1506
12619 msgid "the commit is authored by me now (used with -C/-c/--amend)"
12620 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
12621
12622 #: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
12623 #: builtin/pull.c:144 builtin/revert.c:110
12624 msgid "add Signed-off-by:"
12625 msgstr "添加 Signed-off-by: 签名"
12626
12627 #: builtin/commit.c:1508
12628 msgid "use specified template file"
12629 msgstr "使用指定的模板文件"
12630
12631 #: builtin/commit.c:1509
12632 msgid "force edit of commit"
12633 msgstr "强制编辑提交"
12634
12635 #: builtin/commit.c:1511
12636 msgid "include status in commit message template"
12637 msgstr "在提交说明模板里包含状态信息"
12638
12639 #: builtin/commit.c:1516
12640 msgid "Commit contents options"
12641 msgstr "提交内容选项"
12642
12643 #: builtin/commit.c:1517
12644 msgid "commit all changed files"
12645 msgstr "提交所有改动的文件"
12646
12647 #: builtin/commit.c:1518
12648 msgid "add specified files to index for commit"
12649 msgstr "添加指定的文件到索引区等待提交"
12650
12651 #: builtin/commit.c:1519
12652 msgid "interactively add files"
12653 msgstr "交互式添加文件"
12654
12655 #: builtin/commit.c:1520
12656 msgid "interactively add changes"
12657 msgstr "交互式添加变更"
12658
12659 #: builtin/commit.c:1521
12660 msgid "commit only specified files"
12661 msgstr "只提交指定的文件"
12662
12663 #: builtin/commit.c:1522
12664 msgid "bypass pre-commit and commit-msg hooks"
12665 msgstr "绕过 pre-commit 和 commit-msg 钩子"
12666
12667 #: builtin/commit.c:1523
12668 msgid "show what would be committed"
12669 msgstr "显示将要提交的内容"
12670
12671 #: builtin/commit.c:1536
12672 msgid "amend previous commit"
12673 msgstr "修改先前的提交"
12674
12675 #: builtin/commit.c:1537
12676 msgid "bypass post-rewrite hook"
12677 msgstr "绕过 post-rewrite 钩子"
12678
12679 #: builtin/commit.c:1544
12680 msgid "ok to record an empty change"
12681 msgstr "允许一个空提交"
12682
12683 #: builtin/commit.c:1546
12684 msgid "ok to record a change with an empty message"
12685 msgstr "允许空的提交说明"
12686
12687 #: builtin/commit.c:1619
12688 #, c-format
12689 msgid "Corrupt MERGE_HEAD file (%s)"
12690 msgstr "损坏的 MERGE_HEAD 文件(%s)"
12691
12692 #: builtin/commit.c:1626
12693 msgid "could not read MERGE_MODE"
12694 msgstr "不能读取 MERGE_MODE"
12695
12696 #: builtin/commit.c:1645
12697 #, c-format
12698 msgid "could not read commit message: %s"
12699 msgstr "不能读取提交说明:%s"
12700
12701 #: builtin/commit.c:1652
12702 #, c-format
12703 msgid "Aborting commit due to empty commit message.\n"
12704 msgstr "终止提交因为提交说明为空。\n"
12705
12706 #: builtin/commit.c:1657
12707 #, c-format
12708 msgid "Aborting commit; you did not edit the message.\n"
12709 msgstr "终止提交;您未更改来自模版的提交说明。\n"
12710
12711 #: builtin/commit.c:1691
12712 msgid ""
12713 "repository has been updated, but unable to write\n"
12714 "new_index file. Check that disk is not full and quota is\n"
12715 "not exceeded, and then \"git restore --staged :/\" to recover."
12716 msgstr ""
12717 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n"
12718 "磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。"
12719
12720 #: builtin/commit-graph.c:11 builtin/commit-graph.c:17
12721 msgid ""
12722 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
12723 msgstr ""
12724 "git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
12725 "[no-]progress]"
12726
12727 #: builtin/commit-graph.c:12 builtin/commit-graph.c:22
12728 msgid ""
12729 "git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
12730 "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
12731 msgstr ""
12732 "git commit-graph write [--object-dir <对象目录>] [--append|--split] [--"
12733 "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
12734
12735 #: builtin/commit-graph.c:52
12736 #, c-format
12737 msgid "could not find object directory matching %s"
12738 msgstr "无法找到和 %s 匹配的对象目录"
12739
12740 #: builtin/commit-graph.c:68 builtin/commit-graph.c:125
12741 #: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
12742 msgid "dir"
12743 msgstr "目录"
12744
12745 #: builtin/commit-graph.c:69 builtin/commit-graph.c:126
12746 #: builtin/commit-graph.c:211
12747 msgid "The object directory to store the graph"
12748 msgstr "保存图形的对象目录"
12749
12750 #: builtin/commit-graph.c:71
12751 msgid "if the commit-graph is split, only verify the tip file"
12752 msgstr "如果提交图形被拆分,只验证头一个文件"
12753
12754 #: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
12755 #, c-format
12756 msgid "Could not open commit-graph '%s'"
12757 msgstr "无法打开提交图形 '%s'"
12758
12759 #: builtin/commit-graph.c:128
12760 msgid "start walk at all refs"
12761 msgstr "开始遍历所有引用"
12762
12763 #: builtin/commit-graph.c:130
12764 msgid "scan pack-indexes listed by stdin for commits"
12765 msgstr "从标准输入中的包索引文件列表中扫描提交"
12766
12767 #: builtin/commit-graph.c:132
12768 msgid "start walk at commits listed by stdin"
12769 msgstr "从标准输入中的提交开始扫描"
12770
12771 #: builtin/commit-graph.c:134
12772 msgid "include all commits already in the commit-graph file"
12773 msgstr "包含 commit-graph 文件中已有所有提交"
12774
12775 #: builtin/commit-graph.c:137
12776 msgid "allow writing an incremental commit-graph file"
12777 msgstr "允许写一个增量提交图形文件"
12778
12779 #: builtin/commit-graph.c:139 builtin/commit-graph.c:143
12780 msgid "maximum number of commits in a non-base split commit-graph"
12781 msgstr "在非基本拆分提交图形中的最大提交数"
12782
12783 #: builtin/commit-graph.c:141
12784 msgid "maximum ratio between two levels of a split commit-graph"
12785 msgstr "一个拆分提交图形的两个级别之间的最大比率"
12786
12787 #: builtin/commit-graph.c:159
12788 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
12789 msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
12790
12791 #: builtin/config.c:11
12792 msgid "git config [<options>]"
12793 msgstr "git config [<选项>]"
12794
12795 #: builtin/config.c:104 builtin/env--helper.c:23
12796 #, c-format
12797 msgid "unrecognized --type argument, %s"
12798 msgstr "未能识别的 --type 参数,%s"
12799
12800 #: builtin/config.c:116
12801 msgid "only one type at a time"
12802 msgstr "一次只能一个类型"
12803
12804 #: builtin/config.c:125
12805 msgid "Config file location"
12806 msgstr "配置文件位置"
12807
12808 #: builtin/config.c:126
12809 msgid "use global config file"
12810 msgstr "使用全局配置文件"
12811
12812 #: builtin/config.c:127
12813 msgid "use system config file"
12814 msgstr "使用系统级配置文件"
12815
12816 #: builtin/config.c:128
12817 msgid "use repository config file"
12818 msgstr "使用仓库级配置文件"
12819
12820 #: builtin/config.c:129
12821 msgid "use per-worktree config file"
12822 msgstr "使用工作区级别的配置文件"
12823
12824 #: builtin/config.c:130
12825 msgid "use given config file"
12826 msgstr "使用指定的配置文件"
12827
12828 #: builtin/config.c:131
12829 msgid "blob-id"
12830 msgstr "数据对象 ID"
12831
12832 #: builtin/config.c:131
12833 msgid "read config from given blob object"
12834 msgstr "从给定的数据对象读取配置"
12835
12836 #: builtin/config.c:132
12837 msgid "Action"
12838 msgstr "操作"
12839
12840 #: builtin/config.c:133
12841 msgid "get value: name [value-regex]"
12842 msgstr "获取值:name [value-regex]"
12843
12844 #: builtin/config.c:134
12845 msgid "get all values: key [value-regex]"
12846 msgstr "获得所有的值:key [value-regex]"
12847
12848 #: builtin/config.c:135
12849 msgid "get values for regexp: name-regex [value-regex]"
12850 msgstr "根据正则表达式获得值:name-regex [value-regex]"
12851
12852 #: builtin/config.c:136
12853 msgid "get value specific for the URL: section[.var] URL"
12854 msgstr "获得 URL 取值:section[.var] URL"
12855
12856 #: builtin/config.c:137
12857 msgid "replace all matching variables: name value [value_regex]"
12858 msgstr "替换所有匹配的变量:name value [value_regex]"
12859
12860 #: builtin/config.c:138
12861 msgid "add a new variable: name value"
12862 msgstr "添加一个新的变量:name value"
12863
12864 #: builtin/config.c:139
12865 msgid "remove a variable: name [value-regex]"
12866 msgstr "删除一个变量:name [value-regex]"
12867
12868 #: builtin/config.c:140
12869 msgid "remove all matches: name [value-regex]"
12870 msgstr "删除所有匹配项:name [value-regex]"
12871
12872 #: builtin/config.c:141
12873 msgid "rename section: old-name new-name"
12874 msgstr "重命名小节:old-name new-name"
12875
12876 #: builtin/config.c:142
12877 msgid "remove a section: name"
12878 msgstr "删除一个小节:name"
12879
12880 #: builtin/config.c:143
12881 msgid "list all"
12882 msgstr "列出所有"
12883
12884 #: builtin/config.c:144
12885 msgid "open an editor"
12886 msgstr "打开一个编辑器"
12887
12888 #: builtin/config.c:145
12889 msgid "find the color configured: slot [default]"
12890 msgstr "获得配置的颜色:配置 [默认]"
12891
12892 #: builtin/config.c:146
12893 msgid "find the color setting: slot [stdout-is-tty]"
12894 msgstr "获得颜色设置:配置 [stdout-is-tty]"
12895
12896 #: builtin/config.c:147
12897 msgid "Type"
12898 msgstr "类型"
12899
12900 #: builtin/config.c:148 builtin/env--helper.c:38
12901 msgid "value is given this type"
12902 msgstr "取值为该类型"
12903
12904 #: builtin/config.c:149
12905 msgid "value is \"true\" or \"false\""
12906 msgstr "值是 \"true\" 或 \"false\""
12907
12908 #: builtin/config.c:150
12909 msgid "value is decimal number"
12910 msgstr "值是十进制数"
12911
12912 #: builtin/config.c:151
12913 msgid "value is --bool or --int"
12914 msgstr "值是 --bool or --int"
12915
12916 #: builtin/config.c:152
12917 msgid "value is a path (file or directory name)"
12918 msgstr "值是一个路径(文件或目录名)"
12919
12920 #: builtin/config.c:153
12921 msgid "value is an expiry date"
12922 msgstr "值是一个到期日期"
12923
12924 #: builtin/config.c:154
12925 msgid "Other"
12926 msgstr "其它"
12927
12928 #: builtin/config.c:155
12929 msgid "terminate values with NUL byte"
12930 msgstr "终止值是 NUL 字节"
12931
12932 #: builtin/config.c:156
12933 msgid "show variable names only"
12934 msgstr "只显示变量名"
12935
12936 #: builtin/config.c:157
12937 msgid "respect include directives on lookup"
12938 msgstr "查询时参照 include 指令递归查找"
12939
12940 #: builtin/config.c:158
12941 msgid "show origin of config (file, standard input, blob, command line)"
12942 msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
12943
12944 #: builtin/config.c:159
12945 msgid "show scope of config (worktree, local, global, system, command)"
12946 msgstr "显示配置的作用域(工作区、本地、全局、系统、命令)"
12947
12948 #: builtin/config.c:160 builtin/env--helper.c:40
12949 msgid "value"
12950 msgstr "取值"
12951
12952 #: builtin/config.c:160
12953 msgid "with --get, use default value when missing entry"
12954 msgstr "使用 --get 参数,当缺少设置时使用默认值"
12955
12956 #: builtin/config.c:174
12957 #, c-format
12958 msgid "wrong number of arguments, should be %d"
12959 msgstr "错误的参数个数,应该为 %d 个"
12960
12961 #: builtin/config.c:176
12962 #, c-format
12963 msgid "wrong number of arguments, should be from %d to %d"
12964 msgstr "错误的参数个数,应该为从 %d 个到 %d 个"
12965
12966 #: builtin/config.c:324
12967 #, c-format
12968 msgid "invalid key pattern: %s"
12969 msgstr "无效键名模式:%s"
12970
12971 #: builtin/config.c:360
12972 #, c-format
12973 msgid "failed to format default config value: %s"
12974 msgstr "格式化默认配置值失败:%s"
12975
12976 #: builtin/config.c:417
12977 #, c-format
12978 msgid "cannot parse color '%s'"
12979 msgstr "无法解析颜色 '%s'"
12980
12981 #: builtin/config.c:459
12982 msgid "unable to parse default color value"
12983 msgstr "无法解析默认颜色值"
12984
12985 #: builtin/config.c:512 builtin/config.c:768
12986 msgid "not in a git directory"
12987 msgstr "不在 git 仓库中"
12988
12989 #: builtin/config.c:515
12990 msgid "writing to stdin is not supported"
12991 msgstr "不支持写到标准输入"
12992
12993 #: builtin/config.c:518
12994 msgid "writing config blobs is not supported"
12995 msgstr "不支持写到配置数据对象"
12996
12997 #: builtin/config.c:603
12998 #, c-format
12999 msgid ""
13000 "# This is Git's per-user configuration file.\n"
13001 "[user]\n"
13002 "# Please adapt and uncomment the following lines:\n"
13003 "#\tname = %s\n"
13004 "#\temail = %s\n"
13005 msgstr ""
13006 "# This is Git's per-user configuration file.\n"
13007 "[user]\n"
13008 "# Please adapt and uncomment the following lines:\n"
13009 "#\tname = %s\n"
13010 "#\temail = %s\n"
13011
13012 #: builtin/config.c:627
13013 msgid "only one config file at a time"
13014 msgstr "一次只能有一个配置文件"
13015
13016 #: builtin/config.c:632
13017 msgid "--local can only be used inside a git repository"
13018 msgstr "--local 只能在一个仓库内使用"
13019
13020 #: builtin/config.c:635
13021 msgid "--blob can only be used inside a git repository"
13022 msgstr "--blob 只能在一个仓库内使用"
13023
13024 #: builtin/config.c:655
13025 msgid "$HOME not set"
13026 msgstr "$HOME 未设置"
13027
13028 #: builtin/config.c:679
13029 msgid ""
13030 "--worktree cannot be used with multiple working trees unless the config\n"
13031 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
13032 "section in \"git help worktree\" for details"
13033 msgstr ""
13034 "不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n"
13035 "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
13036
13037 #: builtin/config.c:714
13038 msgid "--get-color and variable type are incoherent"
13039 msgstr "--get-color 和变量类型不兼容"
13040
13041 #: builtin/config.c:719
13042 msgid "only one action at a time"
13043 msgstr "一次只能有一个动作"
13044
13045 #: builtin/config.c:732
13046 msgid "--name-only is only applicable to --list or --get-regexp"
13047 msgstr "--name-only 仅适用于 --list 或 --get-regexp"
13048
13049 #: builtin/config.c:738
13050 msgid ""
13051 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
13052 "list"
13053 msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
13054
13055 #: builtin/config.c:744
13056 msgid "--default is only applicable to --get"
13057 msgstr "--default 仅适用于 --get"
13058
13059 #: builtin/config.c:757
13060 #, c-format
13061 msgid "unable to read config file '%s'"
13062 msgstr "无法读取配置文件 '%s'"
13063
13064 #: builtin/config.c:760
13065 msgid "error processing config file(s)"
13066 msgstr "处理配置文件出错"
13067
13068 #: builtin/config.c:770
13069 msgid "editing stdin is not supported"
13070 msgstr "不支持编辑标准输入"
13071
13072 #: builtin/config.c:772
13073 msgid "editing blobs is not supported"
13074 msgstr "不支持编辑数据对象"
13075
13076 #: builtin/config.c:786
13077 #, c-format
13078 msgid "cannot create configuration file %s"
13079 msgstr "不能创建配置文件 %s"
13080
13081 #: builtin/config.c:799
13082 #, c-format
13083 msgid ""
13084 "cannot overwrite multiple values with a single value\n"
13085 " Use a regexp, --add or --replace-all to change %s."
13086 msgstr ""
13087 "无法用一个值覆盖多个值\n"
13088 " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
13089
13090 #: builtin/config.c:873 builtin/config.c:884
13091 #, c-format
13092 msgid "no such section: %s"
13093 msgstr "无此小节:%s"
13094
13095 #: builtin/count-objects.c:90
13096 msgid "git count-objects [-v] [-H | --human-readable]"
13097 msgstr "git count-objects [-v] [-H | --human-readable]"
13098
13099 #: builtin/count-objects.c:100
13100 msgid "print sizes in human readable format"
13101 msgstr "以用户可读的格式显示大小"
13102
13103 #: builtin/describe.c:26
13104 msgid "git describe [<options>] [<commit-ish>...]"
13105 msgstr "git describe [<选项>] [<提交号>...]"
13106
13107 #: builtin/describe.c:27
13108 msgid "git describe [<options>] --dirty"
13109 msgstr "git describe [<选项>] --dirty"
13110
13111 #: builtin/describe.c:62
13112 msgid "head"
13113 msgstr "头"
13114
13115 #: builtin/describe.c:62
13116 msgid "lightweight"
13117 msgstr "轻量级的"
13118
13119 #: builtin/describe.c:62
13120 msgid "annotated"
13121 msgstr "附注的"
13122
13123 #: builtin/describe.c:275
13124 #, c-format
13125 msgid "annotated tag %s not available"
13126 msgstr "附注标签 %s 无效"
13127
13128 #: builtin/describe.c:279
13129 #, c-format
13130 msgid "annotated tag %s has no embedded name"
13131 msgstr "附注标签 %s 没有嵌入名称"
13132
13133 #: builtin/describe.c:281
13134 #, c-format
13135 msgid "tag '%s' is really '%s' here"
13136 msgstr "标签 '%s' 的确是在 '%s'"
13137
13138 #: builtin/describe.c:325
13139 #, c-format
13140 msgid "no tag exactly matches '%s'"
13141 msgstr "没有标签准确匹配 '%s'"
13142
13143 #: builtin/describe.c:327
13144 #, c-format
13145 msgid "No exact match on refs or tags, searching to describe\n"
13146 msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
13147
13148 #: builtin/describe.c:394
13149 #, c-format
13150 msgid "finished search at %s\n"
13151 msgstr "完成搜索 %s\n"
13152
13153 #: builtin/describe.c:421
13154 #, c-format
13155 msgid ""
13156 "No annotated tags can describe '%s'.\n"
13157 "However, there were unannotated tags: try --tags."
13158 msgstr ""
13159 "没有附注标签能描述 '%s'。\n"
13160 "然而,存在未附注标签:尝试 --tags。"
13161
13162 #: builtin/describe.c:425
13163 #, c-format
13164 msgid ""
13165 "No tags can describe '%s'.\n"
13166 "Try --always, or create some tags."
13167 msgstr ""
13168 "没有标签能描述 '%s'。\n"
13169 "尝试 --always,或者创建一些标签。"
13170
13171 #: builtin/describe.c:455
13172 #, c-format
13173 msgid "traversed %lu commits\n"
13174 msgstr "已遍历 %lu 个提交\n"
13175
13176 #: builtin/describe.c:458
13177 #, c-format
13178 msgid ""
13179 "more than %i tags found; listed %i most recent\n"
13180 "gave up search at %s\n"
13181 msgstr ""
13182 "发现多于 %i 个标签,列出最近的 %i 个\n"
13183 "在 %s 放弃搜索\n"
13184
13185 #: builtin/describe.c:526
13186 #, c-format
13187 msgid "describe %s\n"
13188 msgstr "描述 %s\n"
13189
13190 #: builtin/describe.c:529
13191 #, c-format
13192 msgid "Not a valid object name %s"
13193 msgstr "不是一个有效的对象名 %s"
13194
13195 #: builtin/describe.c:537
13196 #, c-format
13197 msgid "%s is neither a commit nor blob"
13198 msgstr "%s 既不是提交也不是数据对象"
13199
13200 #: builtin/describe.c:551
13201 msgid "find the tag that comes after the commit"
13202 msgstr "寻找该提交之后的标签"
13203
13204 #: builtin/describe.c:552
13205 msgid "debug search strategy on stderr"
13206 msgstr "在标准错误上调试搜索策略"
13207
13208 #: builtin/describe.c:553
13209 msgid "use any ref"
13210 msgstr "使用任意引用"
13211
13212 #: builtin/describe.c:554
13213 msgid "use any tag, even unannotated"
13214 msgstr "使用任意标签,即使未附带注释"
13215
13216 #: builtin/describe.c:555
13217 msgid "always use long format"
13218 msgstr "始终使用长提交号格式"
13219
13220 #: builtin/describe.c:556
13221 msgid "only follow first parent"
13222 msgstr "只跟随第一个父提交"
13223
13224 #: builtin/describe.c:559
13225 msgid "only output exact matches"
13226 msgstr "只输出精确匹配"
13227
13228 #: builtin/describe.c:561
13229 msgid "consider <n> most recent tags (default: 10)"
13230 msgstr "考虑最近 <n> 个标签(默认:10)"
13231
13232 #: builtin/describe.c:563
13233 msgid "only consider tags matching <pattern>"
13234 msgstr "只考虑匹配 <模式> 的标签"
13235
13236 #: builtin/describe.c:565
13237 msgid "do not consider tags matching <pattern>"
13238 msgstr "不考虑匹配 <模式> 的标签"
13239
13240 #: builtin/describe.c:567 builtin/name-rev.c:535
13241 msgid "show abbreviated commit object as fallback"
13242 msgstr "显示简写的提交号作为后备"
13243
13244 #: builtin/describe.c:568 builtin/describe.c:571
13245 msgid "mark"
13246 msgstr "标记"
13247
13248 #: builtin/describe.c:569
13249 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
13250 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
13251
13252 #: builtin/describe.c:572
13253 msgid "append <mark> on broken working tree (default: \"-broken\")"
13254 msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
13255
13256 #: builtin/describe.c:590
13257 msgid "--long is incompatible with --abbrev=0"
13258 msgstr "--long 与 --abbrev=0 不兼容"
13259
13260 #: builtin/describe.c:619
13261 msgid "No names found, cannot describe anything."
13262 msgstr "没有发现名称,无法描述任何东西。"
13263
13264 #: builtin/describe.c:670
13265 msgid "--dirty is incompatible with commit-ishes"
13266 msgstr "--dirty 与提交号不兼容"
13267
13268 #: builtin/describe.c:672
13269 msgid "--broken is incompatible with commit-ishes"
13270 msgstr "--broken 与提交号不兼容"
13271
13272 #: builtin/diff.c:84
13273 #, c-format
13274 msgid "'%s': not a regular file or symlink"
13275 msgstr "'%s':不是一个正规文件或符号链接"
13276
13277 #: builtin/diff.c:235
13278 #, c-format
13279 msgid "invalid option: %s"
13280 msgstr "无效选项:%s"
13281
13282 #: builtin/diff.c:350
13283 msgid "Not a git repository"
13284 msgstr "不是一个 git 仓库"
13285
13286 #: builtin/diff.c:394
13287 #, c-format
13288 msgid "invalid object '%s' given."
13289 msgstr "提供了无效对象 '%s'。"
13290
13291 #: builtin/diff.c:403
13292 #, c-format
13293 msgid "more than two blobs given: '%s'"
13294 msgstr "提供了超过两个数据对象:'%s'"
13295
13296 #: builtin/diff.c:408
13297 #, c-format
13298 msgid "unhandled object '%s' given."
13299 msgstr "无法处理的对象 '%s'。"
13300
13301 #: builtin/difftool.c:30
13302 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
13303 msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
13304
13305 #: builtin/difftool.c:260
13306 #, c-format
13307 msgid "failed: %d"
13308 msgstr "失败:%d"
13309
13310 #: builtin/difftool.c:302
13311 #, c-format
13312 msgid "could not read symlink %s"
13313 msgstr "无法读取符号链接 %s"
13314
13315 #: builtin/difftool.c:304
13316 #, c-format
13317 msgid "could not read symlink file %s"
13318 msgstr "无法读取符号链接文件 %s"
13319
13320 #: builtin/difftool.c:312
13321 #, c-format
13322 msgid "could not read object %s for symlink %s"
13323 msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
13324
13325 #: builtin/difftool.c:413
13326 msgid ""
13327 "combined diff formats('-c' and '--cc') are not supported in\n"
13328 "directory diff mode('-d' and '--dir-diff')."
13329 msgstr ""
13330 "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
13331 "cc')。"
13332
13333 #: builtin/difftool.c:634
13334 #, c-format
13335 msgid "both files modified: '%s' and '%s'."
13336 msgstr "两个文件都被修改:'%s' 和 '%s'。"
13337
13338 #: builtin/difftool.c:636
13339 msgid "working tree file has been left."
13340 msgstr "工作区文件被留了下来。"
13341
13342 #: builtin/difftool.c:647
13343 #, c-format
13344 msgid "temporary files exist in '%s'."
13345 msgstr "临时文件存在于 '%s'。"
13346
13347 #: builtin/difftool.c:648
13348 msgid "you may want to cleanup or recover these."
13349 msgstr "您可能想要清理或者恢复它们。"
13350
13351 #: builtin/difftool.c:697
13352 msgid "use `diff.guitool` instead of `diff.tool`"
13353 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
13354
13355 #: builtin/difftool.c:699
13356 msgid "perform a full-directory diff"
13357 msgstr "执行一个全目录差异比较"
13358
13359 #: builtin/difftool.c:701
13360 msgid "do not prompt before launching a diff tool"
13361 msgstr "启动差异比较工具之前不提示"
13362
13363 #: builtin/difftool.c:706
13364 msgid "use symlinks in dir-diff mode"
13365 msgstr "在 dir-diff 模式中使用符号链接"
13366
13367 #: builtin/difftool.c:707
13368 msgid "tool"
13369 msgstr "工具"
13370
13371 #: builtin/difftool.c:708
13372 msgid "use the specified diff tool"
13373 msgstr "使用指定的差异比较工具"
13374
13375 #: builtin/difftool.c:710
13376 msgid "print a list of diff tools that may be used with `--tool`"
13377 msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
13378
13379 #: builtin/difftool.c:713
13380 msgid ""
13381 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
13382 "code"
13383 msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
13384
13385 #: builtin/difftool.c:716
13386 msgid "specify a custom command for viewing diffs"
13387 msgstr "指定一个用于查看差异的自定义命令"
13388
13389 #: builtin/difftool.c:717
13390 msgid "passed to `diff`"
13391 msgstr "传递给 `diff`"
13392
13393 #: builtin/difftool.c:732
13394 msgid "difftool requires worktree or --no-index"
13395 msgstr "difftool 要求工作区或者 --no-index"
13396
13397 #: builtin/difftool.c:739
13398 msgid "--dir-diff is incompatible with --no-index"
13399 msgstr "--dir-diff 和 --no-index 不兼容"
13400
13401 #: builtin/difftool.c:742
13402 msgid "--gui, --tool and --extcmd are mutually exclusive"
13403 msgstr "--gui、--tool 和 --extcmd 互斥"
13404
13405 #: builtin/difftool.c:750
13406 msgid "no <tool> given for --tool=<tool>"
13407 msgstr "没有为 --tool=<工具> 参数提供 <工具>"
13408
13409 #: builtin/difftool.c:757
13410 msgid "no <cmd> given for --extcmd=<cmd>"
13411 msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
13412
13413 #: builtin/env--helper.c:6
13414 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
13415 msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
13416
13417 #: builtin/env--helper.c:37 builtin/hash-object.c:98
13418 msgid "type"
13419 msgstr "类型"
13420
13421 #: builtin/env--helper.c:41
13422 msgid "default for git_env_*(...) to fall back on"
13423 msgstr "git_env_*(...) 的默认值"
13424
13425 #: builtin/env--helper.c:43
13426 msgid "be quiet only use git_env_*() value as exit code"
13427 msgstr "安静模式,只使用 git_env_*() 的值作为退出码"
13428
13429 #: builtin/env--helper.c:62
13430 #, c-format
13431 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
13432 msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值,不是 `%s`"
13433
13434 #: builtin/env--helper.c:77
13435 #, c-format
13436 msgid ""
13437 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
13438 "%s`"
13439 msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型,不是 `%s`"
13440
13441 #: builtin/fast-export.c:29
13442 msgid "git fast-export [rev-list-opts]"
13443 msgstr "git fast-export [rev-list-opts]"
13444
13445 #: builtin/fast-export.c:853
13446 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
13447 msgstr "错误:除非指定 --mark-tags,否则无法导出嵌套标签。"
13448
13449 #: builtin/fast-export.c:1152
13450 msgid "show progress after <n> objects"
13451 msgstr "在 <n> 个对象之后显示进度"
13452
13453 #: builtin/fast-export.c:1154
13454 msgid "select handling of signed tags"
13455 msgstr "选择如何处理签名标签"
13456
13457 #: builtin/fast-export.c:1157
13458 msgid "select handling of tags that tag filtered objects"
13459 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
13460
13461 #: builtin/fast-export.c:1160
13462 msgid "select handling of commit messages in an alternate encoding"
13463 msgstr "选择使用备用编码处理提交说明"
13464
13465 #: builtin/fast-export.c:1163
13466 msgid "Dump marks to this file"
13467 msgstr "把标记存储到这个文件"
13468
13469 #: builtin/fast-export.c:1165
13470 msgid "Import marks from this file"
13471 msgstr "从这个文件导入标记"
13472
13473 #: builtin/fast-export.c:1169
13474 msgid "Import marks from this file if it exists"
13475 msgstr "从该文件导入标记(如果存在的话)"
13476
13477 #: builtin/fast-export.c:1171
13478 msgid "Fake a tagger when tags lack one"
13479 msgstr "当标签缺少标记者字段时,假装提供一个"
13480
13481 #: builtin/fast-export.c:1173
13482 msgid "Output full tree for each commit"
13483 msgstr "每次提交都输出整个树"
13484
13485 #: builtin/fast-export.c:1175
13486 msgid "Use the done feature to terminate the stream"
13487 msgstr "使用 done 功能来终止流"
13488
13489 #: builtin/fast-export.c:1176
13490 msgid "Skip output of blob data"
13491 msgstr "跳过数据对象的输出"
13492
13493 #: builtin/fast-export.c:1177 builtin/log.c:1705
13494 msgid "refspec"
13495 msgstr "引用规格"
13496
13497 #: builtin/fast-export.c:1178
13498 msgid "Apply refspec to exported refs"
13499 msgstr "对导出的引用应用引用规格"
13500
13501 #: builtin/fast-export.c:1179
13502 msgid "anonymize output"
13503 msgstr "匿名输出"
13504
13505 #: builtin/fast-export.c:1181
13506 msgid "Reference parents which are not in fast-export stream by object id"
13507 msgstr "引用父对象 ID 不在 fast-export 流中"
13508
13509 #: builtin/fast-export.c:1183
13510 msgid "Show original object ids of blobs/commits"
13511 msgstr "显示数据对象/提交的原始对象 ID"
13512
13513 #: builtin/fast-export.c:1185
13514 msgid "Label tags with mark ids"
13515 msgstr "对带有标记 ID 的标签做标记"
13516
13517 #: builtin/fast-export.c:1220
13518 msgid "Cannot pass both --import-marks and --import-marks-if-exists"
13519 msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
13520
13521 #: builtin/fetch.c:34
13522 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
13523 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
13524
13525 #: builtin/fetch.c:35
13526 msgid "git fetch [<options>] <group>"
13527 msgstr "git fetch [<选项>] <组>"
13528
13529 #: builtin/fetch.c:36
13530 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
13531 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
13532
13533 #: builtin/fetch.c:37
13534 msgid "git fetch --all [<options>]"
13535 msgstr "git fetch --all [<选项>]"
13536
13537 #: builtin/fetch.c:116
13538 msgid "fetch.parallel cannot be negative"
13539 msgstr "fetch.parallel 不能为负数"
13540
13541 #: builtin/fetch.c:139 builtin/pull.c:184
13542 msgid "fetch from all remotes"
13543 msgstr "从所有的远程抓取"
13544
13545 #: builtin/fetch.c:141 builtin/pull.c:228
13546 msgid "set upstream for git pull/fetch"
13547 msgstr "为 git pull/fetch 设置上游"
13548
13549 #: builtin/fetch.c:143 builtin/pull.c:187
13550 msgid "append to .git/FETCH_HEAD instead of overwriting"
13551 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
13552
13553 #: builtin/fetch.c:145 builtin/pull.c:190
13554 msgid "path to upload pack on remote end"
13555 msgstr "上传包到远程的路径"
13556
13557 #: builtin/fetch.c:146
13558 msgid "force overwrite of local reference"
13559 msgstr "强制覆盖本地引用"
13560
13561 #: builtin/fetch.c:148
13562 msgid "fetch from multiple remotes"
13563 msgstr "从多个远程抓取"
13564
13565 #: builtin/fetch.c:150 builtin/pull.c:194
13566 msgid "fetch all tags and associated objects"
13567 msgstr "抓取所有的标签和关联对象"
13568
13569 #: builtin/fetch.c:152
13570 msgid "do not fetch all tags (--no-tags)"
13571 msgstr "不抓取任何标签(--no-tags)"
13572
13573 #: builtin/fetch.c:154
13574 msgid "number of submodules fetched in parallel"
13575 msgstr "子模组获取的并发数"
13576
13577 #: builtin/fetch.c:156 builtin/pull.c:197
13578 msgid "prune remote-tracking branches no longer on remote"
13579 msgstr "清除远程已经不存在的分支的跟踪分支"
13580
13581 #: builtin/fetch.c:158
13582 msgid "prune local tags no longer on remote and clobber changed tags"
13583 msgstr "清除远程不存在的本地标签,并且替换变更标签"
13584
13585 # 译者:可选值,不能翻译
13586 #: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
13587 msgid "on-demand"
13588 msgstr "on-demand"
13589
13590 #: builtin/fetch.c:160
13591 msgid "control recursive fetching of submodules"
13592 msgstr "控制子模组的递归抓取"
13593
13594 #: builtin/fetch.c:164 builtin/pull.c:205
13595 msgid "keep downloaded pack"
13596 msgstr "保持下载包"
13597
13598 #: builtin/fetch.c:166
13599 msgid "allow updating of HEAD ref"
13600 msgstr "允许更新 HEAD 引用"
13601
13602 #: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
13603 msgid "deepen history of shallow clone"
13604 msgstr "深化浅克隆的历史"
13605
13606 #: builtin/fetch.c:171
13607 msgid "deepen history of shallow repository based on time"
13608 msgstr "基于时间来深化浅克隆的历史"
13609
13610 #: builtin/fetch.c:177 builtin/pull.c:211
13611 msgid "convert to a complete repository"
13612 msgstr "转换为一个完整的仓库"
13613
13614 #: builtin/fetch.c:180
13615 msgid "prepend this to submodule path output"
13616 msgstr "在子模组路径输出的前面加上此目录"
13617
13618 #: builtin/fetch.c:183
13619 msgid ""
13620 "default for recursive fetching of submodules (lower priority than config "
13621 "files)"
13622 msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
13623
13624 #: builtin/fetch.c:187 builtin/pull.c:214
13625 msgid "accept refs that update .git/shallow"
13626 msgstr "接受更新 .git/shallow 的引用"
13627
13628 #: builtin/fetch.c:188 builtin/pull.c:216
13629 msgid "refmap"
13630 msgstr "引用映射"
13631
13632 #: builtin/fetch.c:189 builtin/pull.c:217
13633 msgid "specify fetch refmap"
13634 msgstr "指定获取操作的引用映射"
13635
13636 #: builtin/fetch.c:196
13637 msgid "report that we have only objects reachable from this object"
13638 msgstr "报告我们只拥有从该对象开始可达的对象"
13639
13640 #: builtin/fetch.c:199
13641 msgid "run 'gc --auto' after fetching"
13642 msgstr "获取后执行 'gc --auto'"
13643
13644 #: builtin/fetch.c:201 builtin/pull.c:226
13645 msgid "check for forced-updates on all updated branches"
13646 msgstr "在所有更新分支上检查强制更新"
13647
13648 #: builtin/fetch.c:203
13649 msgid "write the commit-graph after fetching"
13650 msgstr "抓取后写提交图"
13651
13652 #: builtin/fetch.c:513
13653 msgid "Couldn't find remote ref HEAD"
13654 msgstr "无法发现远程 HEAD 引用"
13655
13656 #: builtin/fetch.c:653
13657 #, c-format
13658 msgid "configuration fetch.output contains invalid value %s"
13659 msgstr "配置变量 fetch.output 包含无效值 %s"
13660
13661 #: builtin/fetch.c:751
13662 #, c-format
13663 msgid "object %s not found"
13664 msgstr "对象 %s 未发现"
13665
13666 #: builtin/fetch.c:755
13667 msgid "[up to date]"
13668 msgstr "[最新]"
13669
13670 #: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
13671 msgid "[rejected]"
13672 msgstr "[已拒绝]"
13673
13674 #: builtin/fetch.c:769
13675 msgid "can't fetch in current branch"
13676 msgstr "当前分支下不能执行获取操作"
13677
13678 #: builtin/fetch.c:779
13679 msgid "[tag update]"
13680 msgstr "[标签更新]"
13681
13682 #: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
13683 #: builtin/fetch.c:851
13684 msgid "unable to update local ref"
13685 msgstr "不能更新本地引用"
13686
13687 #: builtin/fetch.c:784
13688 msgid "would clobber existing tag"
13689 msgstr "会破坏现有的标签"
13690
13691 #: builtin/fetch.c:806
13692 msgid "[new tag]"
13693 msgstr "[新标签]"
13694
13695 #: builtin/fetch.c:809
13696 msgid "[new branch]"
13697 msgstr "[新分支]"
13698
13699 #: builtin/fetch.c:812
13700 msgid "[new ref]"
13701 msgstr "[新引用]"
13702
13703 #: builtin/fetch.c:851
13704 msgid "forced update"
13705 msgstr "强制更新"
13706
13707 #: builtin/fetch.c:856
13708 msgid "non-fast-forward"
13709 msgstr "非快进"
13710
13711 #: builtin/fetch.c:877
13712 msgid ""
13713 "Fetch normally indicates which branches had a forced update,\n"
13714 "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
13715 "flag or run 'git config fetch.showForcedUpdates true'."
13716 msgstr ""
13717 "获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用。\n"
13718 "要重新启用,请使用 '--show-forced-updates' 选项或运行\n"
13719 "'git config fetch.showForcedUpdates true'。"
13720
13721 #: builtin/fetch.c:881
13722 #, c-format
13723 msgid ""
13724 "It took %.2f seconds to check forced updates. You can use\n"
13725 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
13726 "false'\n"
13727 " to avoid this check.\n"
13728 msgstr ""
13729 "花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
13730 "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
13731
13732 #: builtin/fetch.c:920
13733 #, c-format
13734 msgid "%s did not send all necessary objects\n"
13735 msgstr "%s 未发送所有必需的对象\n"
13736
13737 #: builtin/fetch.c:941
13738 #, c-format
13739 msgid "reject %s because shallow roots are not allowed to be updated"
13740 msgstr "拒绝 %s 因为浅克隆不允许被更新"
13741
13742 #: builtin/fetch.c:1026 builtin/fetch.c:1164
13743 #, c-format
13744 msgid "From %.*s\n"
13745 msgstr "来自 %.*s\n"
13746
13747 #: builtin/fetch.c:1037
13748 #, c-format
13749 msgid ""
13750 "some local refs could not be updated; try running\n"
13751 " 'git remote prune %s' to remove any old, conflicting branches"
13752 msgstr ""
13753 "一些本地引用不能被更新;尝试运行\n"
13754 " 'git remote prune %s' 来删除旧的、有冲突的分支"
13755
13756 # 译者:注意保持前导空格
13757 #: builtin/fetch.c:1134
13758 #, c-format
13759 msgid " (%s will become dangling)"
13760 msgstr " (%s 将成为悬空状态)"
13761
13762 # 译者:注意保持前导空格
13763 #: builtin/fetch.c:1135
13764 #, c-format
13765 msgid " (%s has become dangling)"
13766 msgstr " (%s 已成为悬空状态)"
13767
13768 #: builtin/fetch.c:1167
13769 msgid "[deleted]"
13770 msgstr "[已删除]"
13771
13772 #: builtin/fetch.c:1168 builtin/remote.c:1112
13773 msgid "(none)"
13774 msgstr "(无)"
13775
13776 #: builtin/fetch.c:1191
13777 #, c-format
13778 msgid "Refusing to fetch into current branch %s of non-bare repository"
13779 msgstr "拒绝获取到非纯仓库的当前分支 %s"
13780
13781 #: builtin/fetch.c:1210
13782 #, c-format
13783 msgid "Option \"%s\" value \"%s\" is not valid for %s"
13784 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
13785
13786 #: builtin/fetch.c:1213
13787 #, c-format
13788 msgid "Option \"%s\" is ignored for %s\n"
13789 msgstr "选项 \"%s\" 为 %s 所忽略\n"
13790
13791 #: builtin/fetch.c:1421
13792 msgid "multiple branches detected, incompatible with --set-upstream"
13793 msgstr "检测到多分支,和 --set-upstream 不兼容"
13794
13795 #: builtin/fetch.c:1436
13796 msgid "not setting upstream for a remote remote-tracking branch"
13797 msgstr "没有为一个远程跟踪分支设置上游"
13798
13799 #: builtin/fetch.c:1438
13800 msgid "not setting upstream for a remote tag"
13801 msgstr "没有为一个远程标签设置上游"
13802
13803 #: builtin/fetch.c:1440
13804 msgid "unknown branch type"
13805 msgstr "未知的分支类型"
13806
13807 #: builtin/fetch.c:1442
13808 msgid ""
13809 "no source branch found.\n"
13810 "you need to specify exactly one branch with the --set-upstream option."
13811 msgstr ""
13812 "未发现源分支。\n"
13813 "您需要使用 --set-upstream 选项指定一个分支。"
13814
13815 #: builtin/fetch.c:1568 builtin/fetch.c:1631
13816 #, c-format
13817 msgid "Fetching %s\n"
13818 msgstr "正在获取 %s\n"
13819
13820 #: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
13821 #, c-format
13822 msgid "Could not fetch %s"
13823 msgstr "不能获取 %s"
13824
13825 #: builtin/fetch.c:1590
13826 #, c-format
13827 msgid "could not fetch '%s' (exit code: %d)\n"
13828 msgstr "无法获取 '%s'(退出码:%d)\n"
13829
13830 #: builtin/fetch.c:1693
13831 msgid ""
13832 "No remote repository specified. Please, specify either a URL or a\n"
13833 "remote name from which new revisions should be fetched."
13834 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
13835
13836 #: builtin/fetch.c:1730
13837 msgid "You need to specify a tag name."
13838 msgstr "您需要指定一个标签名称。"
13839
13840 #: builtin/fetch.c:1780
13841 msgid "Negative depth in --deepen is not supported"
13842 msgstr "--deepen 不支持负数深度"
13843
13844 #: builtin/fetch.c:1782
13845 msgid "--deepen and --depth are mutually exclusive"
13846 msgstr "--deepen 和 --depth 是互斥的"
13847
13848 #: builtin/fetch.c:1787
13849 msgid "--depth and --unshallow cannot be used together"
13850 msgstr "--depth 和 --unshallow 不能同时使用"
13851
13852 #: builtin/fetch.c:1789
13853 msgid "--unshallow on a complete repository does not make sense"
13854 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
13855
13856 #: builtin/fetch.c:1805
13857 msgid "fetch --all does not take a repository argument"
13858 msgstr "fetch --all 不能带一个仓库参数"
13859
13860 #: builtin/fetch.c:1807
13861 msgid "fetch --all does not make sense with refspecs"
13862 msgstr "fetch --all 带引用规格没有任何意义"
13863
13864 #: builtin/fetch.c:1816
13865 #, c-format
13866 msgid "No such remote or remote group: %s"
13867 msgstr "没有这样的远程或远程组:%s"
13868
13869 #: builtin/fetch.c:1823
13870 msgid "Fetching a group and specifying refspecs does not make sense"
13871 msgstr "获取组并指定引用规格没有意义"
13872
13873 #: builtin/fetch.c:1841
13874 msgid ""
13875 "--filter can only be used with the remote configured in extensions."
13876 "partialclone"
13877 msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
13878
13879 #: builtin/fmt-merge-msg.c:18
13880 msgid ""
13881 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
13882 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
13883
13884 #: builtin/fmt-merge-msg.c:671
13885 msgid "populate log with at most <n> entries from shortlog"
13886 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
13887
13888 #: builtin/fmt-merge-msg.c:674
13889 msgid "alias for --log (deprecated)"
13890 msgstr "参数 --log 的别名(已弃用)"
13891
13892 #: builtin/fmt-merge-msg.c:677
13893 msgid "text"
13894 msgstr "文本"
13895
13896 #: builtin/fmt-merge-msg.c:678
13897 msgid "use <text> as start of message"
13898 msgstr "使用 <文本> 作为提交说明的开始"
13899
13900 #: builtin/fmt-merge-msg.c:679
13901 msgid "file to read from"
13902 msgstr "从文件中读取"
13903
13904 #: builtin/for-each-ref.c:10
13905 msgid "git for-each-ref [<options>] [<pattern>]"
13906 msgstr "git for-each-ref [<选项>] [<模式>]"
13907
13908 #: builtin/for-each-ref.c:11
13909 msgid "git for-each-ref [--points-at <object>]"
13910 msgstr "git for-each-ref [--points-at <对象>]"
13911
13912 #: builtin/for-each-ref.c:12
13913 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
13914 msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
13915
13916 #: builtin/for-each-ref.c:13
13917 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
13918 msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
13919
13920 #: builtin/for-each-ref.c:28
13921 msgid "quote placeholders suitably for shells"
13922 msgstr "引用占位符适用于 shells"
13923
13924 #: builtin/for-each-ref.c:30
13925 msgid "quote placeholders suitably for perl"
13926 msgstr "引用占位符适用于 perl"
13927
13928 #: builtin/for-each-ref.c:32
13929 msgid "quote placeholders suitably for python"
13930 msgstr "引用占位符适用于 python"
13931
13932 #: builtin/for-each-ref.c:34
13933 msgid "quote placeholders suitably for Tcl"
13934 msgstr "引用占位符适用于 Tcl"
13935
13936 #: builtin/for-each-ref.c:37
13937 msgid "show only <n> matched refs"
13938 msgstr "只显示 <n> 个匹配的引用"
13939
13940 #: builtin/for-each-ref.c:39 builtin/tag.c:439
13941 msgid "respect format colors"
13942 msgstr "遵照格式中的颜色输出"
13943
13944 #: builtin/for-each-ref.c:42
13945 msgid "print only refs which points at the given object"
13946 msgstr "只打印指向给定对象的引用"
13947
13948 #: builtin/for-each-ref.c:44
13949 msgid "print only refs that are merged"
13950 msgstr "只打印已经合并的引用"
13951
13952 #: builtin/for-each-ref.c:45
13953 msgid "print only refs that are not merged"
13954 msgstr "只打印没有合并的引用"
13955
13956 #: builtin/for-each-ref.c:46
13957 msgid "print only refs which contain the commit"
13958 msgstr "只打印包含该提交的引用"
13959
13960 #: builtin/for-each-ref.c:47
13961 msgid "print only refs which don't contain the commit"
13962 msgstr "只打印不包含该提交的引用"
13963
13964 #: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
13965 msgid "unknown"
13966 msgstr "未知"
13967
13968 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
13969 #: builtin/fsck.c:100 builtin/fsck.c:120
13970 #, c-format
13971 msgid "error in %s %s: %s"
13972 msgstr "%s %s 错误:%s"
13973
13974 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
13975 #: builtin/fsck.c:114
13976 #, c-format
13977 msgid "warning in %s %s: %s"
13978 msgstr "%s %s 警告:%s"
13979
13980 #: builtin/fsck.c:143 builtin/fsck.c:146
13981 #, c-format
13982 msgid "broken link from %7s %s"
13983 msgstr "来自 %7s %s 的损坏的链接"
13984
13985 #: builtin/fsck.c:155
13986 msgid "wrong object type in link"
13987 msgstr "链接中错误的对象类型"
13988
13989 #: builtin/fsck.c:171
13990 #, c-format
13991 msgid ""
13992 "broken link from %7s %s\n"
13993 " to %7s %s"
13994 msgstr ""
13995 "损坏的链接来自于 %7s %s\n"
13996 " 到 %7s %s"
13997
13998 #: builtin/fsck.c:282
13999 #, c-format
14000 msgid "missing %s %s"
14001 msgstr "缺失 %s %s"
14002
14003 #: builtin/fsck.c:309
14004 #, c-format
14005 msgid "unreachable %s %s"
14006 msgstr "不可达 %s %s"
14007
14008 #: builtin/fsck.c:329
14009 #, c-format
14010 msgid "dangling %s %s"
14011 msgstr "悬空 %s %s"
14012
14013 #: builtin/fsck.c:339
14014 msgid "could not create lost-found"
14015 msgstr "不能创建 lost-found"
14016
14017 #: builtin/fsck.c:350
14018 #, c-format
14019 msgid "could not finish '%s'"
14020 msgstr "不能完成 '%s'"
14021
14022 #: builtin/fsck.c:367
14023 #, c-format
14024 msgid "Checking %s"
14025 msgstr "正在检查 %s"
14026
14027 #: builtin/fsck.c:405
14028 #, c-format
14029 msgid "Checking connectivity (%d objects)"
14030 msgstr "正在检查连通性(%d 个对象)"
14031
14032 #: builtin/fsck.c:424
14033 #, c-format
14034 msgid "Checking %s %s"
14035 msgstr "正在检查 %s %s"
14036
14037 #: builtin/fsck.c:429
14038 msgid "broken links"
14039 msgstr "损坏的链接"
14040
14041 #: builtin/fsck.c:438
14042 #, c-format
14043 msgid "root %s"
14044 msgstr "根 %s"
14045
14046 #: builtin/fsck.c:446
14047 #, c-format
14048 msgid "tagged %s %s (%s) in %s"
14049 msgstr "标记 %s %s (%s) 于 %s"
14050
14051 #: builtin/fsck.c:475
14052 #, c-format
14053 msgid "%s: object corrupt or missing"
14054 msgstr "%s:对象损坏或丢失"
14055
14056 #: builtin/fsck.c:500
14057 #, c-format
14058 msgid "%s: invalid reflog entry %s"
14059 msgstr "%s:无效的引用日志条目 %s"
14060
14061 #: builtin/fsck.c:514
14062 #, c-format
14063 msgid "Checking reflog %s->%s"
14064 msgstr "正在检查引用日志 %s->%s"
14065
14066 #: builtin/fsck.c:548
14067 #, c-format
14068 msgid "%s: invalid sha1 pointer %s"
14069 msgstr "%s:无效的 sha1 指针 %s"
14070
14071 #: builtin/fsck.c:555
14072 #, c-format
14073 msgid "%s: not a commit"
14074 msgstr "%s:不是一个提交"
14075
14076 #: builtin/fsck.c:609
14077 msgid "notice: No default references"
14078 msgstr "注意:无默认引用"
14079
14080 #: builtin/fsck.c:624
14081 #, c-format
14082 msgid "%s: object corrupt or missing: %s"
14083 msgstr "%s:对象损坏或丢失:%s"
14084
14085 #: builtin/fsck.c:637
14086 #, c-format
14087 msgid "%s: object could not be parsed: %s"
14088 msgstr "%s:不能解析对象:%s"
14089
14090 #: builtin/fsck.c:657
14091 #, c-format
14092 msgid "bad sha1 file: %s"
14093 msgstr "坏的 sha1 文件:%s"
14094
14095 #: builtin/fsck.c:672
14096 msgid "Checking object directory"
14097 msgstr "正在检查对象目录"
14098
14099 #: builtin/fsck.c:675
14100 msgid "Checking object directories"
14101 msgstr "正在检查对象目录"
14102
14103 #: builtin/fsck.c:690
14104 #, c-format
14105 msgid "Checking %s link"
14106 msgstr "正在检查 %s 链接"
14107
14108 #: builtin/fsck.c:695 builtin/index-pack.c:843
14109 #, c-format
14110 msgid "invalid %s"
14111 msgstr "无效的 %s"
14112
14113 #: builtin/fsck.c:702
14114 #, c-format
14115 msgid "%s points to something strange (%s)"
14116 msgstr "%s 指向奇怪的东西(%s)"
14117
14118 #: builtin/fsck.c:708
14119 #, c-format
14120 msgid "%s: detached HEAD points at nothing"
14121 msgstr "%s:分离头指针的指向不存在"
14122
14123 #: builtin/fsck.c:712
14124 #, c-format
14125 msgid "notice: %s points to an unborn branch (%s)"
14126 msgstr "注意:%s 指向一个尚未诞生的分支(%s)"
14127
14128 #: builtin/fsck.c:724
14129 msgid "Checking cache tree"
14130 msgstr "正在检查缓存树"
14131
14132 #: builtin/fsck.c:729
14133 #, c-format
14134 msgid "%s: invalid sha1 pointer in cache-tree"
14135 msgstr "%s:cache-tree 中无效的 sha1 指针"
14136
14137 #: builtin/fsck.c:738
14138 msgid "non-tree in cache-tree"
14139 msgstr "cache-tree 中非树对象"
14140
14141 #: builtin/fsck.c:769
14142 msgid "git fsck [<options>] [<object>...]"
14143 msgstr "git fsck [<选项>] [<对象>...]"
14144
14145 #: builtin/fsck.c:775
14146 msgid "show unreachable objects"
14147 msgstr "显示不可达的对象"
14148
14149 #: builtin/fsck.c:776
14150 msgid "show dangling objects"
14151 msgstr "显示悬空的对象"
14152
14153 #: builtin/fsck.c:777
14154 msgid "report tags"
14155 msgstr "报告标签"
14156
14157 #: builtin/fsck.c:778
14158 msgid "report root nodes"
14159 msgstr "报告根节点"
14160
14161 #: builtin/fsck.c:779
14162 msgid "make index objects head nodes"
14163 msgstr "将索引亦作为检查的头节点"
14164
14165 #: builtin/fsck.c:780
14166 msgid "make reflogs head nodes (default)"
14167 msgstr "将引用日志作为检查的头节点(默认)"
14168
14169 #: builtin/fsck.c:781
14170 msgid "also consider packs and alternate objects"
14171 msgstr "也考虑包和备用对象"
14172
14173 #: builtin/fsck.c:782
14174 msgid "check only connectivity"
14175 msgstr "仅检查连通性"
14176
14177 #: builtin/fsck.c:783
14178 msgid "enable more strict checking"
14179 msgstr "启用更严格的检查"
14180
14181 #: builtin/fsck.c:785
14182 msgid "write dangling objects in .git/lost-found"
14183 msgstr "将悬空对象写入 .git/lost-found 中"
14184
14185 #: builtin/fsck.c:786 builtin/prune.c:132
14186 msgid "show progress"
14187 msgstr "显示进度"
14188
14189 #: builtin/fsck.c:787
14190 msgid "show verbose names for reachable objects"
14191 msgstr "显示可达对象的详细名称"
14192
14193 #: builtin/fsck.c:846 builtin/index-pack.c:225
14194 msgid "Checking objects"
14195 msgstr "正在检查对象"
14196
14197 #: builtin/fsck.c:874
14198 #, c-format
14199 msgid "%s: object missing"
14200 msgstr "%s:对象缺失"
14201
14202 #: builtin/fsck.c:885
14203 #, c-format
14204 msgid "invalid parameter: expected sha1, got '%s'"
14205 msgstr "无效的参数:期望 sha1,得到 '%s'"
14206
14207 #: builtin/gc.c:35
14208 msgid "git gc [<options>]"
14209 msgstr "git gc [<选项>]"
14210
14211 #: builtin/gc.c:90
14212 #, c-format
14213 msgid "Failed to fstat %s: %s"
14214 msgstr "对 %s 调用 fstat 失败:%s"
14215
14216 #: builtin/gc.c:126
14217 #, c-format
14218 msgid "failed to parse '%s' value '%s'"
14219 msgstr "无法解析 '%s' 值 '%s'"
14220
14221 #: builtin/gc.c:475 builtin/init-db.c:55
14222 #, c-format
14223 msgid "cannot stat '%s'"
14224 msgstr "不能对 '%s' 调用 stat"
14225
14226 #: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
14227 #, c-format
14228 msgid "cannot read '%s'"
14229 msgstr "不能读取 '%s'"
14230
14231 #: builtin/gc.c:491
14232 #, c-format
14233 msgid ""
14234 "The last gc run reported the following. Please correct the root cause\n"
14235 "and remove %s.\n"
14236 "Automatic cleanup will not be performed until the file is removed.\n"
14237 "\n"
14238 "%s"
14239 msgstr ""
14240 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
14241 "在该文件被删除之前,自动清理将不会执行。\n"
14242 "\n"
14243 "%s"
14244
14245 #: builtin/gc.c:539
14246 msgid "prune unreferenced objects"
14247 msgstr "清除未引用的对象"
14248
14249 #: builtin/gc.c:541
14250 msgid "be more thorough (increased runtime)"
14251 msgstr "更彻底(增加运行时间)"
14252
14253 #: builtin/gc.c:542
14254 msgid "enable auto-gc mode"
14255 msgstr "启用自动垃圾回收模式"
14256
14257 #: builtin/gc.c:545
14258 msgid "force running gc even if there may be another gc running"
14259 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
14260
14261 #: builtin/gc.c:548
14262 msgid "repack all other packs except the largest pack"
14263 msgstr "除了最大的包之外,对所有其它包文件重新打包"
14264
14265 #: builtin/gc.c:565
14266 #, c-format
14267 msgid "failed to parse gc.logexpiry value %s"
14268 msgstr "解析 gc.logexpiry 的值 %s 失败"
14269
14270 #: builtin/gc.c:576
14271 #, c-format
14272 msgid "failed to parse prune expiry value %s"
14273 msgstr "解析清除期限值 %s 失败"
14274
14275 #: builtin/gc.c:596
14276 #, c-format
14277 msgid "Auto packing the repository in background for optimum performance.\n"
14278 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
14279
14280 #: builtin/gc.c:598
14281 #, c-format
14282 msgid "Auto packing the repository for optimum performance.\n"
14283 msgstr "自动打包仓库以求最佳性能。\n"
14284
14285 #: builtin/gc.c:599
14286 #, c-format
14287 msgid "See \"git help gc\" for manual housekeeping.\n"
14288 msgstr "手工维护参见 \"git help gc\"。\n"
14289
14290 #: builtin/gc.c:639
14291 #, c-format
14292 msgid ""
14293 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
14294 msgstr ""
14295 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
14296
14297 #: builtin/gc.c:694
14298 msgid ""
14299 "There are too many unreachable loose objects; run 'git prune' to remove them."
14300 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
14301
14302 #: builtin/grep.c:30
14303 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
14304 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
14305
14306 #: builtin/grep.c:225
14307 #, c-format
14308 msgid "grep: failed to create thread: %s"
14309 msgstr "grep:无法创建线程:%s"
14310
14311 #: builtin/grep.c:279
14312 #, c-format
14313 msgid "invalid number of threads specified (%d) for %s"
14314 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
14315
14316 #. TRANSLATORS: %s is the configuration
14317 #. variable for tweaking threads, currently
14318 #. grep.threads
14319 #.
14320 #: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
14321 #: builtin/pack-objects.c:2854
14322 #, c-format
14323 msgid "no threads support, ignoring %s"
14324 msgstr "没有线程支持,忽略 %s"
14325
14326 #: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
14327 #, c-format
14328 msgid "unable to read tree (%s)"
14329 msgstr "无法读取树(%s)"
14330
14331 #: builtin/grep.c:633
14332 #, c-format
14333 msgid "unable to grep from object of type %s"
14334 msgstr "无法抓取来自于 %s 类型的对象"
14335
14336 #: builtin/grep.c:704
14337 #, c-format
14338 msgid "switch `%c' expects a numerical value"
14339 msgstr "开关 `%c' 期望一个数字值"
14340
14341 #: builtin/grep.c:803
14342 msgid "search in index instead of in the work tree"
14343 msgstr "在索引区搜索而不是在工作区"
14344
14345 #: builtin/grep.c:805
14346 msgid "find in contents not managed by git"
14347 msgstr "在未被 git 管理的内容中查找"
14348
14349 # 译者:中文字符串拼接,可删除前导空格
14350 #: builtin/grep.c:807
14351 msgid "search in both tracked and untracked files"
14352 msgstr "在跟踪和未跟踪的文件中搜索"
14353
14354 #: builtin/grep.c:809
14355 msgid "ignore files specified via '.gitignore'"
14356 msgstr "忽略 '.gitignore' 包含的文件"
14357
14358 #: builtin/grep.c:811
14359 msgid "recursively search in each submodule"
14360 msgstr "在每一个子模组中递归搜索"
14361
14362 #: builtin/grep.c:814
14363 msgid "show non-matching lines"
14364 msgstr "显示未匹配的行"
14365
14366 #: builtin/grep.c:816
14367 msgid "case insensitive matching"
14368 msgstr "不区分大小写匹配"
14369
14370 #: builtin/grep.c:818
14371 msgid "match patterns only at word boundaries"
14372 msgstr "只在单词边界匹配模式"
14373
14374 #: builtin/grep.c:820
14375 msgid "process binary files as text"
14376 msgstr "把二进制文件当做文本处理"
14377
14378 #: builtin/grep.c:822
14379 msgid "don't match patterns in binary files"
14380 msgstr "不在二进制文件中匹配模式"
14381
14382 #: builtin/grep.c:825
14383 msgid "process binary files with textconv filters"
14384 msgstr "用 textconv 过滤器处理二进制文件"
14385
14386 #: builtin/grep.c:827
14387 msgid "search in subdirectories (default)"
14388 msgstr "在子目录中寻找(默认)"
14389
14390 #: builtin/grep.c:829
14391 msgid "descend at most <depth> levels"
14392 msgstr "最多以指定的深度向下寻找"
14393
14394 #: builtin/grep.c:833
14395 msgid "use extended POSIX regular expressions"
14396 msgstr "使用扩展的 POSIX 正则表达式"
14397
14398 #: builtin/grep.c:836
14399 msgid "use basic POSIX regular expressions (default)"
14400 msgstr "使用基本的 POSIX 正则表达式(默认)"
14401
14402 #: builtin/grep.c:839
14403 msgid "interpret patterns as fixed strings"
14404 msgstr "把模式解析为固定的字符串"
14405
14406 #: builtin/grep.c:842
14407 msgid "use Perl-compatible regular expressions"
14408 msgstr "使用 Perl 兼容的正则表达式"
14409
14410 #: builtin/grep.c:845
14411 msgid "show line numbers"
14412 msgstr "显示行号"
14413
14414 #: builtin/grep.c:846
14415 msgid "show column number of first match"
14416 msgstr "显示第一个匹配的列号"
14417
14418 #: builtin/grep.c:847
14419 msgid "don't show filenames"
14420 msgstr "不显示文件名"
14421
14422 #: builtin/grep.c:848
14423 msgid "show filenames"
14424 msgstr "显示文件名"
14425
14426 #: builtin/grep.c:850
14427 msgid "show filenames relative to top directory"
14428 msgstr "显示相对于顶级目录的文件名"
14429
14430 #: builtin/grep.c:852
14431 msgid "show only filenames instead of matching lines"
14432 msgstr "只显示文件名而不显示匹配的行"
14433
14434 #: builtin/grep.c:854
14435 msgid "synonym for --files-with-matches"
14436 msgstr "和 --files-with-matches 同义"
14437
14438 #: builtin/grep.c:857
14439 msgid "show only the names of files without match"
14440 msgstr "只显示未匹配的文件名"
14441
14442 #: builtin/grep.c:859
14443 msgid "print NUL after filenames"
14444 msgstr "在文件名后输出 NUL 字符"
14445
14446 #: builtin/grep.c:862
14447 msgid "show only matching parts of a line"
14448 msgstr "只显示行中的匹配的部分"
14449
14450 #: builtin/grep.c:864
14451 msgid "show the number of matches instead of matching lines"
14452 msgstr "显示总匹配行数,而不显示匹配的行"
14453
14454 #: builtin/grep.c:865
14455 msgid "highlight matches"
14456 msgstr "高亮显示匹配项"
14457
14458 #: builtin/grep.c:867
14459 msgid "print empty line between matches from different files"
14460 msgstr "在不同文件的匹配项之间打印空行"
14461
14462 #: builtin/grep.c:869
14463 msgid "show filename only once above matches from same file"
14464 msgstr "只在同一文件的匹配项的上面显示一次文件名"
14465
14466 #: builtin/grep.c:872
14467 msgid "show <n> context lines before and after matches"
14468 msgstr "显示匹配项前后的 <n> 行上下文"
14469
14470 #: builtin/grep.c:875
14471 msgid "show <n> context lines before matches"
14472 msgstr "显示匹配项前 <n> 行上下文"
14473
14474 #: builtin/grep.c:877
14475 msgid "show <n> context lines after matches"
14476 msgstr "显示匹配项后 <n> 行上下文"
14477
14478 #: builtin/grep.c:879
14479 msgid "use <n> worker threads"
14480 msgstr "使用 <n> 个工作线程"
14481
14482 #: builtin/grep.c:880
14483 msgid "shortcut for -C NUM"
14484 msgstr "快捷键 -C 数字"
14485
14486 #: builtin/grep.c:883
14487 msgid "show a line with the function name before matches"
14488 msgstr "在匹配的前面显示一行函数名"
14489
14490 #: builtin/grep.c:885
14491 msgid "show the surrounding function"
14492 msgstr "显示所在函数的前后内容"
14493
14494 #: builtin/grep.c:888
14495 msgid "read patterns from file"
14496 msgstr "从文件读取模式"
14497
14498 #: builtin/grep.c:890
14499 msgid "match <pattern>"
14500 msgstr "匹配 <模式>"
14501
14502 #: builtin/grep.c:892
14503 msgid "combine patterns specified with -e"
14504 msgstr "组合用 -e 参数设定的模式"
14505
14506 #: builtin/grep.c:904
14507 msgid "indicate hit with exit status without output"
14508 msgstr "不输出,而用退出码标识命中状态"
14509
14510 #: builtin/grep.c:906
14511 msgid "show only matches from files that match all patterns"
14512 msgstr "只显示匹配所有模式的文件中的匹配"
14513
14514 #: builtin/grep.c:908
14515 msgid "show parse tree for grep expression"
14516 msgstr "显示 grep 表达式的解析树"
14517
14518 #: builtin/grep.c:912
14519 msgid "pager"
14520 msgstr "分页"
14521
14522 #: builtin/grep.c:912
14523 msgid "show matching files in the pager"
14524 msgstr "分页显示匹配的文件"
14525
14526 #: builtin/grep.c:916
14527 msgid "allow calling of grep(1) (ignored by this build)"
14528 msgstr "允许调用 grep(1)(本次构建忽略)"
14529
14530 #: builtin/grep.c:983
14531 msgid "no pattern given"
14532 msgstr "未提供匹配模式"
14533
14534 #: builtin/grep.c:1019
14535 msgid "--no-index or --untracked cannot be used with revs"
14536 msgstr "--no-index 或 --untracked 不能和版本同时使用"
14537
14538 #: builtin/grep.c:1027
14539 #, c-format
14540 msgid "unable to resolve revision: %s"
14541 msgstr "不能解析版本:%s"
14542
14543 #: builtin/grep.c:1057
14544 msgid "--untracked not supported with --recurse-submodules"
14545 msgstr "--untracked 不支持和 --recurse-submodules 共用"
14546
14547 #: builtin/grep.c:1061
14548 msgid "invalid option combination, ignoring --threads"
14549 msgstr "无效的选项组合,忽略 --threads"
14550
14551 #: builtin/grep.c:1064 builtin/pack-objects.c:3547
14552 msgid "no threads support, ignoring --threads"
14553 msgstr "没有线程支持,忽略 --threads"
14554
14555 #: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
14556 #, c-format
14557 msgid "invalid number of threads specified (%d)"
14558 msgstr "指定的线程数无效(%d)"
14559
14560 #: builtin/grep.c:1101
14561 msgid "--open-files-in-pager only works on the worktree"
14562 msgstr "--open-files-in-pager 仅用于工作区"
14563
14564 #: builtin/grep.c:1127
14565 msgid "--cached or --untracked cannot be used with --no-index"
14566 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
14567
14568 #: builtin/grep.c:1133
14569 msgid "--[no-]exclude-standard cannot be used for tracked contents"
14570 msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
14571
14572 #: builtin/grep.c:1141
14573 msgid "both --cached and trees are given"
14574 msgstr "同时给出了 --cached 和树对象"
14575
14576 #: builtin/hash-object.c:85
14577 msgid ""
14578 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
14579 "[--] <file>..."
14580 msgstr ""
14581 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
14582 "[--] <文件>..."
14583
14584 #: builtin/hash-object.c:86
14585 msgid "git hash-object --stdin-paths"
14586 msgstr "git hash-object --stdin-paths"
14587
14588 #: builtin/hash-object.c:98
14589 msgid "object type"
14590 msgstr "对象类型"
14591
14592 #: builtin/hash-object.c:99
14593 msgid "write the object into the object database"
14594 msgstr "将对象写入对象数据库"
14595
14596 #: builtin/hash-object.c:101
14597 msgid "read the object from stdin"
14598 msgstr "从标准输入读取对象"
14599
14600 #: builtin/hash-object.c:103
14601 msgid "store file as is without filters"
14602 msgstr "原样存储文件不使用过滤器"
14603
14604 #: builtin/hash-object.c:104
14605 msgid ""
14606 "just hash any random garbage to create corrupt objects for debugging Git"
14607 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
14608
14609 #: builtin/hash-object.c:105
14610 msgid "process file as it were from this path"
14611 msgstr "处理文件并假设其来自于此路径"
14612
14613 #: builtin/help.c:46
14614 msgid "print all available commands"
14615 msgstr "打印所有可用的命令"
14616
14617 #: builtin/help.c:47
14618 msgid "exclude guides"
14619 msgstr "排除向导"
14620
14621 #: builtin/help.c:48
14622 msgid "print list of useful guides"
14623 msgstr "显示有用的指南列表"
14624
14625 #: builtin/help.c:49
14626 msgid "print all configuration variable names"
14627 msgstr "打印所有配置变量名称"
14628
14629 #: builtin/help.c:51
14630 msgid "show man page"
14631 msgstr "显示 man 手册"
14632
14633 #: builtin/help.c:52
14634 msgid "show manual in web browser"
14635 msgstr "在 web 浏览器中显示手册"
14636
14637 #: builtin/help.c:54
14638 msgid "show info page"
14639 msgstr "显示 info 手册"
14640
14641 #: builtin/help.c:56
14642 msgid "print command description"
14643 msgstr "打印命令描述"
14644
14645 #: builtin/help.c:61
14646 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
14647 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
14648
14649 #: builtin/help.c:77
14650 #, c-format
14651 msgid "unrecognized help format '%s'"
14652 msgstr "未能识别的帮助格式 '%s'"
14653
14654 #: builtin/help.c:104
14655 msgid "Failed to start emacsclient."
14656 msgstr "无法启动 emacsclient。"
14657
14658 #: builtin/help.c:117
14659 msgid "Failed to parse emacsclient version."
14660 msgstr "无法解析 emacsclient 版本。"
14661
14662 #: builtin/help.c:125
14663 #, c-format
14664 msgid "emacsclient version '%d' too old (< 22)."
14665 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
14666
14667 #: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
14668 #, c-format
14669 msgid "failed to exec '%s'"
14670 msgstr "执行 '%s' 失败"
14671
14672 #: builtin/help.c:221
14673 #, c-format
14674 msgid ""
14675 "'%s': path for unsupported man viewer.\n"
14676 "Please consider using 'man.<tool>.cmd' instead."
14677 msgstr ""
14678 "'%s':不支持的 man 手册查看器的路径。\n"
14679 "请使用 'man.<工具>.cmd'。"
14680
14681 #: builtin/help.c:233
14682 #, c-format
14683 msgid ""
14684 "'%s': cmd for supported man viewer.\n"
14685 "Please consider using 'man.<tool>.path' instead."
14686 msgstr ""
14687 "'%s': 支持的 man 手册查看器命令。\n"
14688 "请使用 'man.<工具>.path'。"
14689
14690 #: builtin/help.c:350
14691 #, c-format
14692 msgid "'%s': unknown man viewer."
14693 msgstr "'%s':未知的 man 查看器。"
14694
14695 #: builtin/help.c:367
14696 msgid "no man viewer handled the request"
14697 msgstr "没有 man 查看器处理此请求"
14698
14699 #: builtin/help.c:375
14700 msgid "no info viewer handled the request"
14701 msgstr "没有 info 查看器处理此请求"
14702
14703 #: builtin/help.c:434 builtin/help.c:445 git.c:336
14704 #, c-format
14705 msgid "'%s' is aliased to '%s'"
14706 msgstr "'%s' 是 '%s' 的别名"
14707
14708 #: builtin/help.c:448 git.c:365
14709 #, c-format
14710 msgid "bad alias.%s string: %s"
14711 msgstr "坏的 alias.%s 字符串:%s"
14712
14713 #: builtin/help.c:477 builtin/help.c:507
14714 #, c-format
14715 msgid "usage: %s%s"
14716 msgstr "用法:%s%s"
14717
14718 #: builtin/help.c:491
14719 msgid "'git help config' for more information"
14720 msgstr "'git help config' 获取更多信息"
14721
14722 #: builtin/index-pack.c:185
14723 #, c-format
14724 msgid "object type mismatch at %s"
14725 msgstr "%s 的对象类型不匹配"
14726
14727 #: builtin/index-pack.c:205
14728 #, c-format
14729 msgid "did not receive expected object %s"
14730 msgstr "未能获取预期的对象 %s"
14731
14732 #: builtin/index-pack.c:208
14733 #, c-format
14734 msgid "object %s: expected type %s, found %s"
14735 msgstr "对象 %s:应为类型 %s,却是 %s"
14736
14737 #: builtin/index-pack.c:258
14738 #, c-format
14739 msgid "cannot fill %d byte"
14740 msgid_plural "cannot fill %d bytes"
14741 msgstr[0] "无法填充 %d 字节"
14742 msgstr[1] "无法填充 %d 字节"
14743
14744 #: builtin/index-pack.c:268
14745 msgid "early EOF"
14746 msgstr "过早的文件结束符(EOF)"
14747
14748 #: builtin/index-pack.c:269
14749 msgid "read error on input"
14750 msgstr "输入上的读错误"
14751
14752 #: builtin/index-pack.c:281
14753 msgid "used more bytes than were available"
14754 msgstr "用掉了超过可用的字节"
14755
14756 #: builtin/index-pack.c:288 builtin/pack-objects.c:606
14757 msgid "pack too large for current definition of off_t"
14758 msgstr "包太大超过了当前 off_t 的定义"
14759
14760 #: builtin/index-pack.c:291 builtin/unpack-objects.c:95
14761 msgid "pack exceeds maximum allowed size"
14762 msgstr "包超过了最大允许值"
14763
14764 #: builtin/index-pack.c:312
14765 #, c-format
14766 msgid "cannot open packfile '%s'"
14767 msgstr "无法打开包文件 '%s'"
14768
14769 #: builtin/index-pack.c:326
14770 msgid "pack signature mismatch"
14771 msgstr "包签名不匹配"
14772
14773 #: builtin/index-pack.c:328
14774 #, c-format
14775 msgid "pack version %<PRIu32> unsupported"
14776 msgstr "不支持包版本 %<PRIu32>"
14777
14778 #: builtin/index-pack.c:346
14779 #, c-format
14780 msgid "pack has bad object at offset %<PRIuMAX>: %s"
14781 msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
14782
14783 #: builtin/index-pack.c:466
14784 #, c-format
14785 msgid "inflate returned %d"
14786 msgstr "解压缩返回 %d"
14787
14788 #: builtin/index-pack.c:515
14789 msgid "offset value overflow for delta base object"
14790 msgstr "偏移值覆盖了 delta 基准对象"
14791
14792 #: builtin/index-pack.c:523
14793 msgid "delta base offset is out of bound"
14794 msgstr "delta 基准偏移越界"
14795
14796 #: builtin/index-pack.c:531
14797 #, c-format
14798 msgid "unknown object type %d"
14799 msgstr "未知对象类型 %d"
14800
14801 #: builtin/index-pack.c:562
14802 msgid "cannot pread pack file"
14803 msgstr "无法读取包文件"
14804
14805 #: builtin/index-pack.c:564
14806 #, c-format
14807 msgid "premature end of pack file, %<PRIuMAX> byte missing"
14808 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
14809 msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
14810 msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
14811
14812 #: builtin/index-pack.c:590
14813 msgid "serious inflate inconsistency"
14814 msgstr "解压缩严重的不一致"
14815
14816 #: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
14817 #: builtin/index-pack.c:804 builtin/index-pack.c:813
14818 #, c-format
14819 msgid "SHA1 COLLISION FOUND WITH %s !"
14820 msgstr "发现 %s 出现 SHA1 冲突!"
14821
14822 #: builtin/index-pack.c:738 builtin/pack-objects.c:158
14823 #: builtin/pack-objects.c:218 builtin/pack-objects.c:313
14824 #, c-format
14825 msgid "unable to read %s"
14826 msgstr "不能读 %s"
14827
14828 #: builtin/index-pack.c:802
14829 #, c-format
14830 msgid "cannot read existing object info %s"
14831 msgstr "不能读取现存对象信息 %s"
14832
14833 #: builtin/index-pack.c:810
14834 #, c-format
14835 msgid "cannot read existing object %s"
14836 msgstr "不能读取现存对象 %s"
14837
14838 #: builtin/index-pack.c:824
14839 #, c-format
14840 msgid "invalid blob object %s"
14841 msgstr "无效的数据对象 %s"
14842
14843 #: builtin/index-pack.c:827 builtin/index-pack.c:846
14844 msgid "fsck error in packed object"
14845 msgstr "对打包对象 fsck 检查出错"
14846
14847 #: builtin/index-pack.c:848
14848 #, c-format
14849 msgid "Not all child objects of %s are reachable"
14850 msgstr "%s 的所有子对象并非都可达"
14851
14852 #: builtin/index-pack.c:920 builtin/index-pack.c:951
14853 msgid "failed to apply delta"
14854 msgstr "应用 delta 失败"
14855
14856 #: builtin/index-pack.c:1121
14857 msgid "Receiving objects"
14858 msgstr "接收对象中"
14859
14860 #: builtin/index-pack.c:1121
14861 msgid "Indexing objects"
14862 msgstr "索引对象中"
14863
14864 #: builtin/index-pack.c:1155
14865 msgid "pack is corrupted (SHA1 mismatch)"
14866 msgstr "包冲突(SHA1 不匹配)"
14867
14868 #: builtin/index-pack.c:1160
14869 msgid "cannot fstat packfile"
14870 msgstr "不能对包文件调用 fstat"
14871
14872 #: builtin/index-pack.c:1163
14873 msgid "pack has junk at the end"
14874 msgstr "包的结尾有垃圾数据"
14875
14876 #: builtin/index-pack.c:1175
14877 msgid "confusion beyond insanity in parse_pack_objects()"
14878 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
14879
14880 #: builtin/index-pack.c:1198
14881 msgid "Resolving deltas"
14882 msgstr "处理 delta 中"
14883
14884 #: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
14885 #, c-format
14886 msgid "unable to create thread: %s"
14887 msgstr "不能创建线程:%s"
14888
14889 #: builtin/index-pack.c:1249
14890 msgid "confusion beyond insanity"
14891 msgstr "不可理喻"
14892
14893 #: builtin/index-pack.c:1255
14894 #, c-format
14895 msgid "completed with %d local object"
14896 msgid_plural "completed with %d local objects"
14897 msgstr[0] "完成 %d 个本地对象"
14898 msgstr[1] "完成 %d 个本地对象"
14899
14900 #: builtin/index-pack.c:1267
14901 #, c-format
14902 msgid "Unexpected tail checksum for %s (disk corruption?)"
14903 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
14904
14905 #: builtin/index-pack.c:1271
14906 #, c-format
14907 msgid "pack has %d unresolved delta"
14908 msgid_plural "pack has %d unresolved deltas"
14909 msgstr[0] "包有 %d 个未解决的 delta"
14910 msgstr[1] "包有 %d 个未解决的 delta"
14911
14912 #: builtin/index-pack.c:1295
14913 #, c-format
14914 msgid "unable to deflate appended object (%d)"
14915 msgstr "不能压缩附加对象(%d)"
14916
14917 #: builtin/index-pack.c:1392
14918 #, c-format
14919 msgid "local object %s is corrupt"
14920 msgstr "本地对象 %s 已损坏"
14921
14922 #: builtin/index-pack.c:1406
14923 #, c-format
14924 msgid "packfile name '%s' does not end with '.pack'"
14925 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
14926
14927 #: builtin/index-pack.c:1431
14928 #, c-format
14929 msgid "cannot write %s file '%s'"
14930 msgstr "无法写入 %s 文件 '%s'"
14931
14932 #: builtin/index-pack.c:1439
14933 #, c-format
14934 msgid "cannot close written %s file '%s'"
14935 msgstr "无法关闭已写入的 %s 文件 '%s'"
14936
14937 #: builtin/index-pack.c:1463
14938 msgid "error while closing pack file"
14939 msgstr "关闭包文件时出错"
14940
14941 #: builtin/index-pack.c:1477
14942 msgid "cannot store pack file"
14943 msgstr "无法存储包文件"
14944
14945 #: builtin/index-pack.c:1485
14946 msgid "cannot store index file"
14947 msgstr "无法存储索引文件"
14948
14949 #: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
14950 #, c-format
14951 msgid "bad pack.indexversion=%<PRIu32>"
14952 msgstr "坏的 pack.indexversion=%<PRIu32>"
14953
14954 #: builtin/index-pack.c:1597
14955 #, c-format
14956 msgid "Cannot open existing pack file '%s'"
14957 msgstr "无法打开现存包文件 '%s'"
14958
14959 #: builtin/index-pack.c:1599
14960 #, c-format
14961 msgid "Cannot open existing pack idx file for '%s'"
14962 msgstr "无法为 %s 打开包索引文件"
14963
14964 #: builtin/index-pack.c:1647
14965 #, c-format
14966 msgid "non delta: %d object"
14967 msgid_plural "non delta: %d objects"
14968 msgstr[0] "非 delta:%d 个对象"
14969 msgstr[1] "非 delta:%d 个对象"
14970
14971 #: builtin/index-pack.c:1654
14972 #, c-format
14973 msgid "chain length = %d: %lu object"
14974 msgid_plural "chain length = %d: %lu objects"
14975 msgstr[0] "链长 = %d: %lu 对象"
14976 msgstr[1] "链长 = %d: %lu 对象"
14977
14978 #: builtin/index-pack.c:1693
14979 msgid "Cannot come back to cwd"
14980 msgstr "无法返回当前工作目录"
14981
14982 #: builtin/index-pack.c:1742 builtin/index-pack.c:1745
14983 #: builtin/index-pack.c:1761 builtin/index-pack.c:1765
14984 #, c-format
14985 msgid "bad %s"
14986 msgstr "错误选项 %s"
14987
14988 #: builtin/index-pack.c:1781
14989 msgid "--fix-thin cannot be used without --stdin"
14990 msgstr "--fix-thin 不能和 --stdin 同时使用"
14991
14992 #: builtin/index-pack.c:1783
14993 msgid "--stdin requires a git repository"
14994 msgstr "--stdin 需要一个 git 仓库"
14995
14996 #: builtin/index-pack.c:1789
14997 msgid "--verify with no packfile name given"
14998 msgstr "--verify 没有提供包文件名参数"
14999
15000 #: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
15001 msgid "fsck error in pack objects"
15002 msgstr "在打包对象中 fsck 检查出错"
15003
15004 #: builtin/init-db.c:61
15005 #, c-format
15006 msgid "cannot stat template '%s'"
15007 msgstr "不能对模版 '%s' 调用 stat"
15008
15009 #: builtin/init-db.c:66
15010 #, c-format
15011 msgid "cannot opendir '%s'"
15012 msgstr "不能打开目录 '%s'"
15013
15014 #: builtin/init-db.c:78
15015 #, c-format
15016 msgid "cannot readlink '%s'"
15017 msgstr "不能读取链接 '%s'"
15018
15019 #: builtin/init-db.c:80
15020 #, c-format
15021 msgid "cannot symlink '%s' '%s'"
15022 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
15023
15024 #: builtin/init-db.c:86
15025 #, c-format
15026 msgid "cannot copy '%s' to '%s'"
15027 msgstr "不能拷贝 '%s' 至 '%s'"
15028
15029 #: builtin/init-db.c:90
15030 #, c-format
15031 msgid "ignoring template %s"
15032 msgstr "忽略模版 %s"
15033
15034 #: builtin/init-db.c:121
15035 #, c-format
15036 msgid "templates not found in %s"
15037 msgstr "没有在 %s 中找到模版"
15038
15039 #: builtin/init-db.c:136
15040 #, c-format
15041 msgid "not copying templates from '%s': %s"
15042 msgstr "没有从 '%s' 复制模版:%s"
15043
15044 #: builtin/init-db.c:334
15045 #, c-format
15046 msgid "unable to handle file type %d"
15047 msgstr "不能处理 %d 类型的文件"
15048
15049 #: builtin/init-db.c:337
15050 #, c-format
15051 msgid "unable to move %s to %s"
15052 msgstr "不能移动 %s 至 %s"
15053
15054 #: builtin/init-db.c:354 builtin/init-db.c:357
15055 #, c-format
15056 msgid "%s already exists"
15057 msgstr "%s 已经存在"
15058
15059 #: builtin/init-db.c:413
15060 #, c-format
15061 msgid "Reinitialized existing shared Git repository in %s%s\n"
15062 msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
15063
15064 #: builtin/init-db.c:414
15065 #, c-format
15066 msgid "Reinitialized existing Git repository in %s%s\n"
15067 msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
15068
15069 #: builtin/init-db.c:418
15070 #, c-format
15071 msgid "Initialized empty shared Git repository in %s%s\n"
15072 msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
15073
15074 #: builtin/init-db.c:419
15075 #, c-format
15076 msgid "Initialized empty Git repository in %s%s\n"
15077 msgstr "已初始化空的 Git 仓库于 %s%s\n"
15078
15079 #: builtin/init-db.c:468
15080 msgid ""
15081 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
15082 "shared[=<permissions>]] [<directory>]"
15083 msgstr ""
15084 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
15085 "[<目录>]"
15086
15087 #: builtin/init-db.c:491
15088 msgid "permissions"
15089 msgstr "权限"
15090
15091 #: builtin/init-db.c:492
15092 msgid "specify that the git repository is to be shared amongst several users"
15093 msgstr "指定 git 仓库是多个用户之间共享的"
15094
15095 #: builtin/init-db.c:529 builtin/init-db.c:534
15096 #, c-format
15097 msgid "cannot mkdir %s"
15098 msgstr "不能创建目录 %s"
15099
15100 #: builtin/init-db.c:538
15101 #, c-format
15102 msgid "cannot chdir to %s"
15103 msgstr "不能切换目录到 %s"
15104
15105 #: builtin/init-db.c:559
15106 #, c-format
15107 msgid ""
15108 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
15109 "dir=<directory>)"
15110 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
15111
15112 #: builtin/init-db.c:587
15113 #, c-format
15114 msgid "Cannot access work tree '%s'"
15115 msgstr "不能访问工作区 '%s'"
15116
15117 #: builtin/interpret-trailers.c:16
15118 msgid ""
15119 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
15120 "<token>[(=|:)<value>])...] [<file>...]"
15121 msgstr ""
15122 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
15123 ">])...] [<文件>...]"
15124
15125 #: builtin/interpret-trailers.c:95
15126 msgid "edit files in place"
15127 msgstr "在原位编辑文件"
15128
15129 #: builtin/interpret-trailers.c:96
15130 msgid "trim empty trailers"
15131 msgstr "删除空的尾部署名"
15132
15133 #: builtin/interpret-trailers.c:99
15134 msgid "where to place the new trailer"
15135 msgstr "在哪里放置新的尾部署名"
15136
15137 #: builtin/interpret-trailers.c:101
15138 msgid "action if trailer already exists"
15139 msgstr "当尾部署名已经存在时所采取的动作"
15140
15141 #: builtin/interpret-trailers.c:103
15142 msgid "action if trailer is missing"
15143 msgstr "当尾部署名缺失时所采取的动作"
15144
15145 #: builtin/interpret-trailers.c:105
15146 msgid "output only the trailers"
15147 msgstr "只输出尾部署名"
15148
15149 #: builtin/interpret-trailers.c:106
15150 msgid "do not apply config rules"
15151 msgstr "不要应用配置规则"
15152
15153 #: builtin/interpret-trailers.c:107
15154 msgid "join whitespace-continued values"
15155 msgstr "连接空白折行的值"
15156
15157 #: builtin/interpret-trailers.c:108
15158 msgid "set parsing options"
15159 msgstr "设置解析选项"
15160
15161 #: builtin/interpret-trailers.c:110
15162 msgid "do not treat --- specially"
15163 msgstr "不要对 --- 特殊处理"
15164
15165 #: builtin/interpret-trailers.c:111
15166 msgid "trailer"
15167 msgstr "尾部署名"
15168
15169 #: builtin/interpret-trailers.c:112
15170 msgid "trailer(s) to add"
15171 msgstr "要添加的尾部署名"
15172
15173 #: builtin/interpret-trailers.c:123
15174 msgid "--trailer with --only-input does not make sense"
15175 msgstr "--trailer 和 --only-input 同时使用没有意义"
15176
15177 #: builtin/interpret-trailers.c:133
15178 msgid "no input file given for in-place editing"
15179 msgstr "没有给出要原位编辑的文件"
15180
15181 #: builtin/log.c:56
15182 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
15183 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
15184
15185 #: builtin/log.c:57
15186 msgid "git show [<options>] <object>..."
15187 msgstr "git show [<选项>] <对象>..."
15188
15189 #: builtin/log.c:110
15190 #, c-format
15191 msgid "invalid --decorate option: %s"
15192 msgstr "无效的 --decorate 选项:%s"
15193
15194 #: builtin/log.c:174
15195 msgid "show source"
15196 msgstr "显示源"
15197
15198 #: builtin/log.c:175
15199 msgid "Use mail map file"
15200 msgstr "使用邮件映射文件"
15201
15202 #: builtin/log.c:177
15203 msgid "only decorate refs that match <pattern>"
15204 msgstr "只修饰与 <模式> 匹配的引用"
15205
15206 #: builtin/log.c:179
15207 msgid "do not decorate refs that match <pattern>"
15208 msgstr "不修饰和 <模式> 匹配的引用"
15209
15210 #: builtin/log.c:180
15211 msgid "decorate options"
15212 msgstr "修饰选项"
15213
15214 #: builtin/log.c:183
15215 msgid "Process line range n,m in file, counting from 1"
15216 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
15217
15218 #: builtin/log.c:281
15219 #, c-format
15220 msgid "Final output: %d %s\n"
15221 msgstr "最终输出:%d %s\n"
15222
15223 #: builtin/log.c:535
15224 #, c-format
15225 msgid "git show %s: bad file"
15226 msgstr "git show %s: 损坏的文件"
15227
15228 #: builtin/log.c:550 builtin/log.c:645
15229 #, c-format
15230 msgid "could not read object %s"
15231 msgstr "不能读取对象 %s"
15232
15233 #: builtin/log.c:670
15234 #, c-format
15235 msgid "unknown type: %d"
15236 msgstr "未知类型:%d"
15237
15238 #: builtin/log.c:814
15239 #, c-format
15240 msgid "%s: invalid cover from description mode"
15241 msgstr "%s:从描述生成附函的模式无效"
15242
15243 #: builtin/log.c:821
15244 msgid "format.headers without value"
15245 msgstr "format.headers 没有值"
15246
15247 #: builtin/log.c:936
15248 msgid "name of output directory is too long"
15249 msgstr "输出目录名太长"
15250
15251 #: builtin/log.c:952
15252 #, c-format
15253 msgid "cannot open patch file %s"
15254 msgstr "无法打开补丁文件 %s"
15255
15256 #: builtin/log.c:969
15257 msgid "need exactly one range"
15258 msgstr "只需要一个范围"
15259
15260 #: builtin/log.c:979
15261 msgid "not a range"
15262 msgstr "不是一个范围"
15263
15264 #: builtin/log.c:1143
15265 msgid "cover letter needs email format"
15266 msgstr "附函需要邮件地址格式"
15267
15268 #: builtin/log.c:1149
15269 msgid "failed to create cover-letter file"
15270 msgstr "无法创建附函文件"
15271
15272 #: builtin/log.c:1228
15273 #, c-format
15274 msgid "insane in-reply-to: %s"
15275 msgstr "不正常的 in-reply-to:%s"
15276
15277 #: builtin/log.c:1255
15278 msgid "git format-patch [<options>] [<since> | <revision-range>]"
15279 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
15280
15281 #: builtin/log.c:1313
15282 msgid "two output directories?"
15283 msgstr "两个输出目录?"
15284
15285 #: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
15286 #, c-format
15287 msgid "unknown commit %s"
15288 msgstr "未知提交 %s"
15289
15290 #: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
15291 #: builtin/replace.c:210
15292 #, c-format
15293 msgid "failed to resolve '%s' as a valid ref"
15294 msgstr "无法将 '%s' 解析为一个有效引用"
15295
15296 #: builtin/log.c:1439
15297 msgid "could not find exact merge base"
15298 msgstr "不能找到准确的合并基线"
15299
15300 #: builtin/log.c:1443
15301 msgid ""
15302 "failed to get upstream, if you want to record base commit automatically,\n"
15303 "please use git branch --set-upstream-to to track a remote branch.\n"
15304 "Or you could specify base commit by --base=<base-commit-id> manually"
15305 msgstr ""
15306 "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
15307 "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
15308 "参数 --base=<基线提交> 手动指定一个基线提交"
15309
15310 #: builtin/log.c:1463
15311 msgid "failed to find exact merge base"
15312 msgstr "无法找到准确的合并基线"
15313
15314 #: builtin/log.c:1474
15315 msgid "base commit should be the ancestor of revision list"
15316 msgstr "基线提交应该是版本列表的祖先"
15317
15318 #: builtin/log.c:1478
15319 msgid "base commit shouldn't be in revision list"
15320 msgstr "基线提交不应该出现在版本列表中"
15321
15322 #: builtin/log.c:1531
15323 msgid "cannot get patch id"
15324 msgstr "无法得到补丁 id"
15325
15326 #: builtin/log.c:1583
15327 msgid "failed to infer range-diff ranges"
15328 msgstr "无法推断 range-diff 范围"
15329
15330 #: builtin/log.c:1629
15331 msgid "use [PATCH n/m] even with a single patch"
15332 msgstr "使用 [PATCH n/m],即使只有一个补丁"
15333
15334 #: builtin/log.c:1632
15335 msgid "use [PATCH] even with multiple patches"
15336 msgstr "使用 [PATCH],即使有多个补丁"
15337
15338 #: builtin/log.c:1636
15339 msgid "print patches to standard out"
15340 msgstr "打印补丁到标准输出"
15341
15342 #: builtin/log.c:1638
15343 msgid "generate a cover letter"
15344 msgstr "生成一封附函"
15345
15346 #: builtin/log.c:1640
15347 msgid "use simple number sequence for output file names"
15348 msgstr "使用简单的数字序列作为输出文件名"
15349
15350 #: builtin/log.c:1641
15351 msgid "sfx"
15352 msgstr "后缀"
15353
15354 #: builtin/log.c:1642
15355 msgid "use <sfx> instead of '.patch'"
15356 msgstr "使用 <后缀> 代替 '.patch'"
15357
15358 #: builtin/log.c:1644
15359 msgid "start numbering patches at <n> instead of 1"
15360 msgstr "补丁以 <n> 开始编号,而不是1"
15361
15362 #: builtin/log.c:1646
15363 msgid "mark the series as Nth re-roll"
15364 msgstr "标记补丁系列是第几次重制"
15365
15366 #: builtin/log.c:1648
15367 msgid "Use [RFC PATCH] instead of [PATCH]"
15368 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
15369
15370 #: builtin/log.c:1651
15371 msgid "cover-from-description-mode"
15372 msgstr "从分支描述获取附函的模式"
15373
15374 #: builtin/log.c:1652
15375 msgid "generate parts of a cover letter based on a branch's description"
15376 msgstr "基于一个分支描述生成部分附函"
15377
15378 #: builtin/log.c:1654
15379 msgid "Use [<prefix>] instead of [PATCH]"
15380 msgstr "使用 [<前缀>] 代替 [PATCH]"
15381
15382 #: builtin/log.c:1657
15383 msgid "store resulting files in <dir>"
15384 msgstr "把结果文件存储在 <目录>"
15385
15386 #: builtin/log.c:1660
15387 msgid "don't strip/add [PATCH]"
15388 msgstr "不删除/添加 [PATCH]"
15389
15390 #: builtin/log.c:1663
15391 msgid "don't output binary diffs"
15392 msgstr "不输出二进制差异"
15393
15394 #: builtin/log.c:1665
15395 msgid "output all-zero hash in From header"
15396 msgstr "在 From 头信息中输出全为零的哈希值"
15397
15398 #: builtin/log.c:1667
15399 msgid "don't include a patch matching a commit upstream"
15400 msgstr "不包含已在上游提交中的补丁"
15401
15402 #: builtin/log.c:1669
15403 msgid "show patch format instead of default (patch + stat)"
15404 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
15405
15406 #: builtin/log.c:1671
15407 msgid "Messaging"
15408 msgstr "邮件发送"
15409
15410 #: builtin/log.c:1672
15411 msgid "header"
15412 msgstr "header"
15413
15414 #: builtin/log.c:1673
15415 msgid "add email header"
15416 msgstr "添加邮件头"
15417
15418 #: builtin/log.c:1674 builtin/log.c:1676
15419 msgid "email"
15420 msgstr "邮件地址"
15421
15422 #: builtin/log.c:1674
15423 msgid "add To: header"
15424 msgstr "添加收件人"
15425
15426 #: builtin/log.c:1676
15427 msgid "add Cc: header"
15428 msgstr "添加抄送"
15429
15430 #: builtin/log.c:1678
15431 msgid "ident"
15432 msgstr "标识"
15433
15434 #: builtin/log.c:1679
15435 msgid "set From address to <ident> (or committer ident if absent)"
15436 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
15437
15438 #: builtin/log.c:1681
15439 msgid "message-id"
15440 msgstr "邮件标识"
15441
15442 #: builtin/log.c:1682
15443 msgid "make first mail a reply to <message-id>"
15444 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
15445
15446 #: builtin/log.c:1683 builtin/log.c:1686
15447 msgid "boundary"
15448 msgstr "边界"
15449
15450 #: builtin/log.c:1684
15451 msgid "attach the patch"
15452 msgstr "附件方式添加补丁"
15453
15454 #: builtin/log.c:1687
15455 msgid "inline the patch"
15456 msgstr "内联显示补丁"
15457
15458 #: builtin/log.c:1691
15459 msgid "enable message threading, styles: shallow, deep"
15460 msgstr "启用邮件线索,风格:浅,深"
15461
15462 #: builtin/log.c:1693
15463 msgid "signature"
15464 msgstr "签名"
15465
15466 #: builtin/log.c:1694
15467 msgid "add a signature"
15468 msgstr "添加一个签名"
15469
15470 #: builtin/log.c:1695
15471 msgid "base-commit"
15472 msgstr "基线提交"
15473
15474 #: builtin/log.c:1696
15475 msgid "add prerequisite tree info to the patch series"
15476 msgstr "为补丁列表添加前置树信息"
15477
15478 #: builtin/log.c:1698
15479 msgid "add a signature from a file"
15480 msgstr "从文件添加一个签名"
15481
15482 #: builtin/log.c:1699
15483 msgid "don't print the patch filenames"
15484 msgstr "不要打印补丁文件名"
15485
15486 #: builtin/log.c:1701
15487 msgid "show progress while generating patches"
15488 msgstr "在生成补丁时显示进度"
15489
15490 #: builtin/log.c:1703
15491 msgid "show changes against <rev> in cover letter or single patch"
15492 msgstr "在附函或单个补丁中显示和 <rev> 的差异"
15493
15494 #: builtin/log.c:1706
15495 msgid "show changes against <refspec> in cover letter or single patch"
15496 msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
15497
15498 #: builtin/log.c:1708
15499 msgid "percentage by which creation is weighted"
15500 msgstr "创建权重的百分比"
15501
15502 #: builtin/log.c:1792
15503 #, c-format
15504 msgid "invalid ident line: %s"
15505 msgstr "包含无效的身份标识:%s"
15506
15507 #: builtin/log.c:1807
15508 msgid "-n and -k are mutually exclusive"
15509 msgstr "-n 和 -k 互斥"
15510
15511 #: builtin/log.c:1809
15512 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
15513 msgstr "--subject-prefix/--rfc 和 -k 互斥"
15514
15515 #: builtin/log.c:1817
15516 msgid "--name-only does not make sense"
15517 msgstr "--name-only 无意义"
15518
15519 #: builtin/log.c:1819
15520 msgid "--name-status does not make sense"
15521 msgstr "--name-status 无意义"
15522
15523 #: builtin/log.c:1821
15524 msgid "--check does not make sense"
15525 msgstr "--check 无意义"
15526
15527 #: builtin/log.c:1854
15528 msgid "standard output, or directory, which one?"
15529 msgstr "标准输出或目录,哪一个?"
15530
15531 #: builtin/log.c:1958
15532 msgid "--interdiff requires --cover-letter or single patch"
15533 msgstr "--interdiff 需要 --cover-letter 或单一补丁"
15534
15535 #: builtin/log.c:1962
15536 msgid "Interdiff:"
15537 msgstr "版本间差异:"
15538
15539 #: builtin/log.c:1963
15540 #, c-format
15541 msgid "Interdiff against v%d:"
15542 msgstr "对 v%d 的版本差异:"
15543
15544 #: builtin/log.c:1969
15545 msgid "--creation-factor requires --range-diff"
15546 msgstr "--creation-factor 需要 --range-diff"
15547
15548 #: builtin/log.c:1973
15549 msgid "--range-diff requires --cover-letter or single patch"
15550 msgstr "--range-diff 需要 --cover-letter 或单一补丁"
15551
15552 #: builtin/log.c:1981
15553 msgid "Range-diff:"
15554 msgstr "范围差异:"
15555
15556 #: builtin/log.c:1982
15557 #, c-format
15558 msgid "Range-diff against v%d:"
15559 msgstr "对 v%d 的范围差异:"
15560
15561 #: builtin/log.c:1993
15562 #, c-format
15563 msgid "unable to read signature file '%s'"
15564 msgstr "无法读取签名文件 '%s'"
15565
15566 #: builtin/log.c:2029
15567 msgid "Generating patches"
15568 msgstr "生成补丁"
15569
15570 #: builtin/log.c:2073
15571 msgid "failed to create output files"
15572 msgstr "无法创建输出文件"
15573
15574 #: builtin/log.c:2132
15575 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
15576 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
15577
15578 #: builtin/log.c:2186
15579 #, c-format
15580 msgid ""
15581 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
15582 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
15583
15584 #: builtin/ls-files.c:470
15585 msgid "git ls-files [<options>] [<file>...]"
15586 msgstr "git ls-files [<选项>] [<文件>...]"
15587
15588 #: builtin/ls-files.c:526
15589 msgid "identify the file status with tags"
15590 msgstr "用标签标识文件的状态"
15591
15592 #: builtin/ls-files.c:528
15593 msgid "use lowercase letters for 'assume unchanged' files"
15594 msgstr "使用小写字母表示 '假设未改变的' 文件"
15595
15596 #: builtin/ls-files.c:530
15597 msgid "use lowercase letters for 'fsmonitor clean' files"
15598 msgstr "使用小写字母表示 'fsmonitor clean' 文件"
15599
15600 #: builtin/ls-files.c:532
15601 msgid "show cached files in the output (default)"
15602 msgstr "显示缓存的文件(默认)"
15603
15604 #: builtin/ls-files.c:534
15605 msgid "show deleted files in the output"
15606 msgstr "显示已删除的文件"
15607
15608 #: builtin/ls-files.c:536
15609 msgid "show modified files in the output"
15610 msgstr "显示已修改的文件"
15611
15612 #: builtin/ls-files.c:538
15613 msgid "show other files in the output"
15614 msgstr "显示其它文件"
15615
15616 #: builtin/ls-files.c:540
15617 msgid "show ignored files in the output"
15618 msgstr "显示忽略的文件"
15619
15620 #: builtin/ls-files.c:543
15621 msgid "show staged contents' object name in the output"
15622 msgstr "显示暂存区内容的对象名称"
15623
15624 #: builtin/ls-files.c:545
15625 msgid "show files on the filesystem that need to be removed"
15626 msgstr "显示文件系统需要删除的文件"
15627
15628 #: builtin/ls-files.c:547
15629 msgid "show 'other' directories' names only"
15630 msgstr "只显示“其他”目录的名称"
15631
15632 #: builtin/ls-files.c:549
15633 msgid "show line endings of files"
15634 msgstr "显示文件换行符格式"
15635
15636 #: builtin/ls-files.c:551
15637 msgid "don't show empty directories"
15638 msgstr "不显示空目录"
15639
15640 #: builtin/ls-files.c:554
15641 msgid "show unmerged files in the output"
15642 msgstr "显示未合并的文件"
15643
15644 #: builtin/ls-files.c:556
15645 msgid "show resolve-undo information"
15646 msgstr "显示 resolve-undo 信息"
15647
15648 #: builtin/ls-files.c:558
15649 msgid "skip files matching pattern"
15650 msgstr "匹配排除文件的模式"
15651
15652 #: builtin/ls-files.c:561
15653 msgid "exclude patterns are read from <file>"
15654 msgstr "从 <文件> 中读取排除模式"
15655
15656 #: builtin/ls-files.c:564
15657 msgid "read additional per-directory exclude patterns in <file>"
15658 msgstr "从 <文件> 读取额外的每个目录的排除模式"
15659
15660 #: builtin/ls-files.c:566
15661 msgid "add the standard git exclusions"
15662 msgstr "添加标准的 git 排除"
15663
15664 #: builtin/ls-files.c:570
15665 msgid "make the output relative to the project top directory"
15666 msgstr "显示相对于顶级目录的文件名"
15667
15668 #: builtin/ls-files.c:573
15669 msgid "recurse through submodules"
15670 msgstr "在子模组中递归"
15671
15672 #: builtin/ls-files.c:575
15673 msgid "if any <file> is not in the index, treat this as an error"
15674 msgstr "如果任何 <文件> 都不在索引区,视为错误"
15675
15676 #: builtin/ls-files.c:576
15677 msgid "tree-ish"
15678 msgstr "树对象"
15679
15680 #: builtin/ls-files.c:577
15681 msgid "pretend that paths removed since <tree-ish> are still present"
15682 msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
15683
15684 #: builtin/ls-files.c:579
15685 msgid "show debugging data"
15686 msgstr "显示调试数据"
15687
15688 #: builtin/ls-remote.c:9
15689 msgid ""
15690 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
15691 " [-q | --quiet] [--exit-code] [--get-url]\n"
15692 " [--symref] [<repository> [<refs>...]]"
15693 msgstr ""
15694 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
15695 " [-q | --quiet] [--exit-code] [--get-url]\n"
15696 " [--symref] [<仓库> [<引用>...]]"
15697
15698 #: builtin/ls-remote.c:59
15699 msgid "do not print remote URL"
15700 msgstr "不打印远程 URL"
15701
15702 #: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
15703 msgid "exec"
15704 msgstr "exec"
15705
15706 #: builtin/ls-remote.c:61 builtin/ls-remote.c:63
15707 msgid "path of git-upload-pack on the remote host"
15708 msgstr "远程主机上的 git-upload-pack 路径"
15709
15710 #: builtin/ls-remote.c:65
15711 msgid "limit to tags"
15712 msgstr "仅限于标签"
15713
15714 #: builtin/ls-remote.c:66
15715 msgid "limit to heads"
15716 msgstr "仅限于分支"
15717
15718 #: builtin/ls-remote.c:67
15719 msgid "do not show peeled tags"
15720 msgstr "不显示已解析的标签"
15721
15722 #: builtin/ls-remote.c:69
15723 msgid "take url.<base>.insteadOf into account"
15724 msgstr "参考 url.<base>.insteadOf 设置"
15725
15726 #: builtin/ls-remote.c:72
15727 msgid "exit with exit code 2 if no matching refs are found"
15728 msgstr "若未找到匹配的引用则以退出码2退出"
15729
15730 #: builtin/ls-remote.c:75
15731 msgid "show underlying ref in addition to the object pointed by it"
15732 msgstr "除了显示指向的对象外,显示指向的引用名"
15733
15734 #: builtin/ls-tree.c:30
15735 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
15736 msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
15737
15738 #: builtin/ls-tree.c:128
15739 msgid "only show trees"
15740 msgstr "只显示树"
15741
15742 #: builtin/ls-tree.c:130
15743 msgid "recurse into subtrees"
15744 msgstr "递归到子树"
15745
15746 #: builtin/ls-tree.c:132
15747 msgid "show trees when recursing"
15748 msgstr "当递归时显示树"
15749
15750 #: builtin/ls-tree.c:135
15751 msgid "terminate entries with NUL byte"
15752 msgstr "条目以 NUL 字符终止"
15753
15754 #: builtin/ls-tree.c:136
15755 msgid "include object size"
15756 msgstr "包括对象大小"
15757
15758 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
15759 msgid "list only filenames"
15760 msgstr "只列出文件名"
15761
15762 #: builtin/ls-tree.c:143
15763 msgid "use full path names"
15764 msgstr "使用文件的全路径"
15765
15766 #: builtin/ls-tree.c:145
15767 msgid "list entire tree; not just current directory (implies --full-name)"
15768 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
15769
15770 #: builtin/mailsplit.c:241
15771 #, c-format
15772 msgid "empty mbox: '%s'"
15773 msgstr "空的 mbox:'%s'"
15774
15775 #: builtin/merge.c:55
15776 msgid "git merge [<options>] [<commit>...]"
15777 msgstr "git merge [<选项>] [<提交>...]"
15778
15779 #: builtin/merge.c:56
15780 msgid "git merge --abort"
15781 msgstr "git merge --abort"
15782
15783 #: builtin/merge.c:57
15784 msgid "git merge --continue"
15785 msgstr "git merge --continue"
15786
15787 #: builtin/merge.c:119
15788 msgid "switch `m' requires a value"
15789 msgstr "开关 `m' 需要一个值"
15790
15791 #: builtin/merge.c:142
15792 #, c-format
15793 msgid "option `%s' requires a value"
15794 msgstr "选项 `%s' 需要一个值"
15795
15796 #: builtin/merge.c:188
15797 #, c-format
15798 msgid "Could not find merge strategy '%s'.\n"
15799 msgstr "不能找到合并策略 '%s'。\n"
15800
15801 #: builtin/merge.c:189
15802 #, c-format
15803 msgid "Available strategies are:"
15804 msgstr "可用的策略有:"
15805
15806 #: builtin/merge.c:194
15807 #, c-format
15808 msgid "Available custom strategies are:"
15809 msgstr "可用的自定义策略有:"
15810
15811 #: builtin/merge.c:245 builtin/pull.c:132
15812 msgid "do not show a diffstat at the end of the merge"
15813 msgstr "在合并的最后不显示差异统计"
15814
15815 #: builtin/merge.c:248 builtin/pull.c:135
15816 msgid "show a diffstat at the end of the merge"
15817 msgstr "在合并的最后显示差异统计"
15818
15819 #: builtin/merge.c:249 builtin/pull.c:138
15820 msgid "(synonym to --stat)"
15821 msgstr "(和 --stat 同义)"
15822
15823 #: builtin/merge.c:251 builtin/pull.c:141
15824 msgid "add (at most <n>) entries from shortlog to merge commit message"
15825 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
15826
15827 #: builtin/merge.c:254 builtin/pull.c:147
15828 msgid "create a single commit instead of doing a merge"
15829 msgstr "创建一个单独的提交而不是做一次合并"
15830
15831 #: builtin/merge.c:256 builtin/pull.c:150
15832 msgid "perform a commit if the merge succeeds (default)"
15833 msgstr "如果合并成功,执行一次提交(默认)"
15834
15835 #: builtin/merge.c:258 builtin/pull.c:153
15836 msgid "edit message before committing"
15837 msgstr "在提交前编辑提交说明"
15838
15839 #: builtin/merge.c:260
15840 msgid "allow fast-forward (default)"
15841 msgstr "允许快进(默认)"
15842
15843 #: builtin/merge.c:262 builtin/pull.c:160
15844 msgid "abort if fast-forward is not possible"
15845 msgstr "如果不能快进就放弃合并"
15846
15847 #: builtin/merge.c:266 builtin/pull.c:163
15848 msgid "verify that the named commit has a valid GPG signature"
15849 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
15850
15851 #: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
15852 #: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
15853 msgid "strategy"
15854 msgstr "策略"
15855
15856 #: builtin/merge.c:268 builtin/pull.c:168
15857 msgid "merge strategy to use"
15858 msgstr "要使用的合并策略"
15859
15860 #: builtin/merge.c:269 builtin/pull.c:171
15861 msgid "option=value"
15862 msgstr "option=value"
15863
15864 #: builtin/merge.c:270 builtin/pull.c:172
15865 msgid "option for selected merge strategy"
15866 msgstr "所选的合并策略的选项"
15867
15868 #: builtin/merge.c:272
15869 msgid "merge commit message (for a non-fast-forward merge)"
15870 msgstr "合并的提交说明(针对非快进式合并)"
15871
15872 #: builtin/merge.c:279
15873 msgid "abort the current in-progress merge"
15874 msgstr "放弃当前正在进行的合并"
15875
15876 #
15877 #: builtin/merge.c:281
15878 msgid "--abort but leave index and working tree alone"
15879 msgstr "--abort,但是保留索引和工作区"
15880
15881 #: builtin/merge.c:283
15882 msgid "continue the current in-progress merge"
15883 msgstr "继续当前正在进行的合并"
15884
15885 #: builtin/merge.c:285 builtin/pull.c:179
15886 msgid "allow merging unrelated histories"
15887 msgstr "允许合并不相关的历史"
15888
15889 #: builtin/merge.c:291
15890 msgid "bypass pre-merge-commit and commit-msg hooks"
15891 msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
15892
15893 #: builtin/merge.c:308
15894 msgid "could not run stash."
15895 msgstr "不能运行贮藏。"
15896
15897 #: builtin/merge.c:313
15898 msgid "stash failed"
15899 msgstr "贮藏失败"
15900
15901 #: builtin/merge.c:318
15902 #, c-format
15903 msgid "not a valid object: %s"
15904 msgstr "不是一个有效对象:%s"
15905
15906 #: builtin/merge.c:340 builtin/merge.c:357
15907 msgid "read-tree failed"
15908 msgstr "读取树失败"
15909
15910 # 译者:注意保持前导空格
15911 #: builtin/merge.c:387
15912 msgid " (nothing to squash)"
15913 msgstr " (无可压缩)"
15914
15915 #: builtin/merge.c:398
15916 #, c-format
15917 msgid "Squash commit -- not updating HEAD\n"
15918 msgstr "压缩提交 -- 未更新 HEAD\n"
15919
15920 #: builtin/merge.c:448
15921 #, c-format
15922 msgid "No merge message -- not updating HEAD\n"
15923 msgstr "无合并信息 -- 未更新 HEAD\n"
15924
15925 #: builtin/merge.c:499
15926 #, c-format
15927 msgid "'%s' does not point to a commit"
15928 msgstr "'%s' 没有指向一个提交"
15929
15930 #: builtin/merge.c:586
15931 #, c-format
15932 msgid "Bad branch.%s.mergeoptions string: %s"
15933 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
15934
15935 #: builtin/merge.c:708
15936 msgid "Not handling anything other than two heads merge."
15937 msgstr "未处理两个头合并之外的任何操作。"
15938
15939 #: builtin/merge.c:722
15940 #, c-format
15941 msgid "Unknown option for merge-recursive: -X%s"
15942 msgstr "merge-recursive 的未知选项:-X%s"
15943
15944 #: builtin/merge.c:737
15945 #, c-format
15946 msgid "unable to write %s"
15947 msgstr "不能写 %s"
15948
15949 #: builtin/merge.c:789
15950 #, c-format
15951 msgid "Could not read from '%s'"
15952 msgstr "不能从 '%s' 读取"
15953
15954 #: builtin/merge.c:798
15955 #, c-format
15956 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
15957 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
15958
15959 #: builtin/merge.c:804
15960 msgid ""
15961 "Please enter a commit message to explain why this merge is necessary,\n"
15962 "especially if it merges an updated upstream into a topic branch.\n"
15963 "\n"
15964 msgstr ""
15965 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
15966 "合并到主题分支。\n"
15967 "\n"
15968
15969 #: builtin/merge.c:809
15970 msgid "An empty message aborts the commit.\n"
15971 msgstr "空的提交说明会终止提交。\n"
15972
15973 #: builtin/merge.c:812
15974 #, c-format
15975 msgid ""
15976 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
15977 "the commit.\n"
15978 msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n"
15979
15980 #: builtin/merge.c:865
15981 msgid "Empty commit message."
15982 msgstr "空提交信息。"
15983
15984 #: builtin/merge.c:880
15985 #, c-format
15986 msgid "Wonderful.\n"
15987 msgstr "太棒了。\n"
15988
15989 #: builtin/merge.c:941
15990 #, c-format
15991 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
15992 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
15993
15994 #: builtin/merge.c:980
15995 msgid "No current branch."
15996 msgstr "没有当前分支。"
15997
15998 #: builtin/merge.c:982
15999 msgid "No remote for the current branch."
16000 msgstr "当前分支没有对应的远程仓库。"
16001
16002 #: builtin/merge.c:984
16003 msgid "No default upstream defined for the current branch."
16004 msgstr "当前分支没有定义默认的上游分支。"
16005
16006 #: builtin/merge.c:989
16007 #, c-format
16008 msgid "No remote-tracking branch for %s from %s"
16009 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
16010
16011 #: builtin/merge.c:1046
16012 #, c-format
16013 msgid "Bad value '%s' in environment '%s'"
16014 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
16015
16016 #: builtin/merge.c:1149
16017 #, c-format
16018 msgid "not something we can merge in %s: %s"
16019 msgstr "不能在 %s 中合并:%s"
16020
16021 #: builtin/merge.c:1183
16022 msgid "not something we can merge"
16023 msgstr "不能合并"
16024
16025 #: builtin/merge.c:1286
16026 msgid "--abort expects no arguments"
16027 msgstr "--abort 不带参数"
16028
16029 #: builtin/merge.c:1290
16030 msgid "There is no merge to abort (MERGE_HEAD missing)."
16031 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
16032
16033 #: builtin/merge.c:1299
16034 msgid "--quit expects no arguments"
16035 msgstr "--quit 不带参数"
16036
16037 #: builtin/merge.c:1312
16038 msgid "--continue expects no arguments"
16039 msgstr "--continue 不带参数"
16040
16041 #: builtin/merge.c:1316
16042 msgid "There is no merge in progress (MERGE_HEAD missing)."
16043 msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
16044
16045 #: builtin/merge.c:1332
16046 msgid ""
16047 "You have not concluded your merge (MERGE_HEAD exists).\n"
16048 "Please, commit your changes before you merge."
16049 msgstr ""
16050 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
16051 "请在合并前先提交您的修改。"
16052
16053 #: builtin/merge.c:1339
16054 msgid ""
16055 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
16056 "Please, commit your changes before you merge."
16057 msgstr ""
16058 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
16059 "请在合并前先提交您的修改。"
16060
16061 #: builtin/merge.c:1342
16062 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
16063 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
16064
16065 #: builtin/merge.c:1356
16066 msgid "You cannot combine --squash with --no-ff."
16067 msgstr "您不能将 --squash 和 --no-ff 组合使用。"
16068
16069 #: builtin/merge.c:1358
16070 msgid "You cannot combine --squash with --commit."
16071 msgstr "您不能将 --squash 和 --commit 组合使用。"
16072
16073 #: builtin/merge.c:1374
16074 msgid "No commit specified and merge.defaultToUpstream not set."
16075 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
16076
16077 #: builtin/merge.c:1391
16078 msgid "Squash commit into empty head not supported yet"
16079 msgstr "尚不支持到空分支的压缩提交"
16080
16081 #: builtin/merge.c:1393
16082 msgid "Non-fast-forward commit does not make sense into an empty head"
16083 msgstr "到空分支的非快进式提交没有意义"
16084
16085 #: builtin/merge.c:1398
16086 #, c-format
16087 msgid "%s - not something we can merge"
16088 msgstr "%s - 不能被合并"
16089
16090 #: builtin/merge.c:1400
16091 msgid "Can merge only exactly one commit into empty head"
16092 msgstr "只能将一个提交合并到空分支上"
16093
16094 #: builtin/merge.c:1481
16095 msgid "refusing to merge unrelated histories"
16096 msgstr "拒绝合并无关的历史"
16097
16098 #: builtin/merge.c:1490
16099 msgid "Already up to date."
16100 msgstr "已经是最新的。"
16101
16102 #: builtin/merge.c:1500
16103 #, c-format
16104 msgid "Updating %s..%s\n"
16105 msgstr "更新 %s..%s\n"
16106
16107 #: builtin/merge.c:1542
16108 #, c-format
16109 msgid "Trying really trivial in-index merge...\n"
16110 msgstr "尝试非常小的索引内合并...\n"
16111
16112 #: builtin/merge.c:1549
16113 #, c-format
16114 msgid "Nope.\n"
16115 msgstr "无。\n"
16116
16117 #: builtin/merge.c:1574
16118 msgid "Already up to date. Yeeah!"
16119 msgstr "已经是最新的。耶!"
16120
16121 #: builtin/merge.c:1580
16122 msgid "Not possible to fast-forward, aborting."
16123 msgstr "无法快进,终止。"
16124
16125 #: builtin/merge.c:1603 builtin/merge.c:1668
16126 #, c-format
16127 msgid "Rewinding the tree to pristine...\n"
16128 msgstr "将树回滚至原始状态...\n"
16129
16130 #: builtin/merge.c:1607
16131 #, c-format
16132 msgid "Trying merge strategy %s...\n"
16133 msgstr "尝试合并策略 %s...\n"
16134
16135 #: builtin/merge.c:1659
16136 #, c-format
16137 msgid "No merge strategy handled the merge.\n"
16138 msgstr "没有合并策略处理此合并。\n"
16139
16140 #: builtin/merge.c:1661
16141 #, c-format
16142 msgid "Merge with strategy %s failed.\n"
16143 msgstr "使用策略 %s 合并失败。\n"
16144
16145 #: builtin/merge.c:1670
16146 #, c-format
16147 msgid "Using the %s to prepare resolving by hand.\n"
16148 msgstr "使用 %s 以准备手工解决。\n"
16149
16150 #: builtin/merge.c:1682
16151 #, c-format
16152 msgid "Automatic merge went well; stopped before committing as requested\n"
16153 msgstr "自动合并进展顺利,按要求在提交前停止\n"
16154
16155 #: builtin/merge-base.c:32
16156 msgid "git merge-base [-a | --all] <commit> <commit>..."
16157 msgstr "git merge-base [-a | --all] <提交> <提交>..."
16158
16159 #: builtin/merge-base.c:33
16160 msgid "git merge-base [-a | --all] --octopus <commit>..."
16161 msgstr "git merge-base [-a | --all] --octopus <提交>..."
16162
16163 #: builtin/merge-base.c:34
16164 msgid "git merge-base --independent <commit>..."
16165 msgstr "git merge-base --independent <提交>..."
16166
16167 #: builtin/merge-base.c:35
16168 msgid "git merge-base --is-ancestor <commit> <commit>"
16169 msgstr "git merge-base --is-ancestor <提交> <提交>"
16170
16171 #: builtin/merge-base.c:36
16172 msgid "git merge-base --fork-point <ref> [<commit>]"
16173 msgstr "git merge-base --fork-point <引用> [<提交>]"
16174
16175 #: builtin/merge-base.c:153
16176 msgid "output all common ancestors"
16177 msgstr "输出所有共同的祖先"
16178
16179 #: builtin/merge-base.c:155
16180 msgid "find ancestors for a single n-way merge"
16181 msgstr "查找一个多路合并的祖先提交"
16182
16183 #: builtin/merge-base.c:157
16184 msgid "list revs not reachable from others"
16185 msgstr "显示不能被其他访问到的版本"
16186
16187 #: builtin/merge-base.c:159
16188 msgid "is the first one ancestor of the other?"
16189 msgstr "第一个是其他的祖先提交么?"
16190
16191 #: builtin/merge-base.c:161
16192 msgid "find where <commit> forked from reflog of <ref>"
16193 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
16194
16195 #: builtin/merge-file.c:9
16196 msgid ""
16197 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
16198 "<orig-file> <file2>"
16199 msgstr ""
16200 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
16201 "件> <文件2>"
16202
16203 #: builtin/merge-file.c:35
16204 msgid "send results to standard output"
16205 msgstr "将结果发送到标准输出"
16206
16207 #: builtin/merge-file.c:36
16208 msgid "use a diff3 based merge"
16209 msgstr "使用基于 diff3 的合并"
16210
16211 #: builtin/merge-file.c:37
16212 msgid "for conflicts, use our version"
16213 msgstr "如果冲突,使用我们的版本"
16214
16215 #: builtin/merge-file.c:39
16216 msgid "for conflicts, use their version"
16217 msgstr "如果冲突,使用他们的版本"
16218
16219 #: builtin/merge-file.c:41
16220 msgid "for conflicts, use a union version"
16221 msgstr "如果冲突,使用联合版本"
16222
16223 #: builtin/merge-file.c:44
16224 msgid "for conflicts, use this marker size"
16225 msgstr "如果冲突,使用指定长度的标记"
16226
16227 #: builtin/merge-file.c:45
16228 msgid "do not warn about conflicts"
16229 msgstr "不要警告冲突"
16230
16231 #: builtin/merge-file.c:47
16232 msgid "set labels for file1/orig-file/file2"
16233 msgstr "为 文件1/初始文件/文件2 设置标签"
16234
16235 #: builtin/merge-recursive.c:47
16236 #, c-format
16237 msgid "unknown option %s"
16238 msgstr "未知选项 %s"
16239
16240 #: builtin/merge-recursive.c:53
16241 #, c-format
16242 msgid "could not parse object '%s'"
16243 msgstr "不能解析对象 '%s'"
16244
16245 #: builtin/merge-recursive.c:57
16246 #, c-format
16247 msgid "cannot handle more than %d base. Ignoring %s."
16248 msgid_plural "cannot handle more than %d bases. Ignoring %s."
16249 msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
16250 msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
16251
16252 #: builtin/merge-recursive.c:65
16253 msgid "not handling anything other than two heads merge."
16254 msgstr "不能处理两个头合并之外的任何操作。"
16255
16256 #: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
16257 #, c-format
16258 msgid "could not resolve ref '%s'"
16259 msgstr "无法解析引用 '%s'"
16260
16261 #: builtin/merge-recursive.c:82
16262 #, c-format
16263 msgid "Merging %s with %s\n"
16264 msgstr "合并 %s 和 %s\n"
16265
16266 #: builtin/mktree.c:66
16267 msgid "git mktree [-z] [--missing] [--batch]"
16268 msgstr "git mktree [-z] [--missing] [--batch]"
16269
16270 #: builtin/mktree.c:154
16271 msgid "input is NUL terminated"
16272 msgstr "输入以 NUL 字符终止"
16273
16274 #: builtin/mktree.c:155 builtin/write-tree.c:26
16275 msgid "allow missing objects"
16276 msgstr "允许丢失的对象"
16277
16278 #: builtin/mktree.c:156
16279 msgid "allow creation of more than one tree"
16280 msgstr "允许创建一个以上的树"
16281
16282 #: builtin/multi-pack-index.c:9
16283 msgid ""
16284 "git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
16285 "size=<size>)"
16286 msgstr ""
16287 "git multi-pack-index [<选项>] (write|verify|expire|repack --batch-size=<大小"
16288 ">)"
16289
16290 #: builtin/multi-pack-index.c:26
16291 msgid "object directory containing set of packfile and pack-index pairs"
16292 msgstr "包含成对包文件和包索引的对象目录"
16293
16294 #: builtin/multi-pack-index.c:29
16295 msgid ""
16296 "during repack, collect pack-files of smaller size into a batch that is "
16297 "larger than this size"
16298 msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中"
16299
16300 #: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
16301 msgid "too many arguments"
16302 msgstr "太多参数"
16303
16304 #: builtin/multi-pack-index.c:60
16305 msgid "--batch-size option is only for 'repack' subcommand"
16306 msgstr "--batch-size 选项仅用于 'repack' 子命令"
16307
16308 #: builtin/multi-pack-index.c:69
16309 #, c-format
16310 msgid "unrecognized subcommand: %s"
16311 msgstr "未识别的子命令:%s"
16312
16313 #: builtin/mv.c:18
16314 msgid "git mv [<options>] <source>... <destination>"
16315 msgstr "git mv [<选项>] <源>... <目标>"
16316
16317 #: builtin/mv.c:83
16318 #, c-format
16319 msgid "Directory %s is in index and no submodule?"
16320 msgstr "目录 %s 在索引中并且不是子模组?"
16321
16322 #: builtin/mv.c:85
16323 msgid "Please stage your changes to .gitmodules or stash them to proceed"
16324 msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
16325
16326 #: builtin/mv.c:103
16327 #, c-format
16328 msgid "%.*s is in index"
16329 msgstr "%.*s 在索引中"
16330
16331 #: builtin/mv.c:125
16332 msgid "force move/rename even if target exists"
16333 msgstr "强制移动/重命令,即使目标存在"
16334
16335 #: builtin/mv.c:127
16336 msgid "skip move/rename errors"
16337 msgstr "跳过移动/重命名错误"
16338
16339 #: builtin/mv.c:169
16340 #, c-format
16341 msgid "destination '%s' is not a directory"
16342 msgstr "目标 '%s' 不是一个目录"
16343
16344 #: builtin/mv.c:180
16345 #, c-format
16346 msgid "Checking rename of '%s' to '%s'\n"
16347 msgstr "检查 '%s' 到 '%s' 的重命名\n"
16348
16349 #: builtin/mv.c:184
16350 msgid "bad source"
16351 msgstr "坏的源"
16352
16353 #: builtin/mv.c:187
16354 msgid "can not move directory into itself"
16355 msgstr "不能将目录移动到自身"
16356
16357 #: builtin/mv.c:190
16358 msgid "cannot move directory over file"
16359 msgstr "不能将目录移动到文件"
16360
16361 #: builtin/mv.c:199
16362 msgid "source directory is empty"
16363 msgstr "源目录为空"
16364
16365 #: builtin/mv.c:224
16366 msgid "not under version control"
16367 msgstr "不在版本控制之下"
16368
16369 #: builtin/mv.c:227
16370 msgid "destination exists"
16371 msgstr "目标已存在"
16372
16373 #: builtin/mv.c:235
16374 #, c-format
16375 msgid "overwriting '%s'"
16376 msgstr "覆盖 '%s'"
16377
16378 #: builtin/mv.c:238
16379 msgid "Cannot overwrite"
16380 msgstr "不能覆盖"
16381
16382 #: builtin/mv.c:241
16383 msgid "multiple sources for the same target"
16384 msgstr "同一目标具有多个源"
16385
16386 #: builtin/mv.c:243
16387 msgid "destination directory does not exist"
16388 msgstr "目标目录不存在"
16389
16390 #: builtin/mv.c:250
16391 #, c-format
16392 msgid "%s, source=%s, destination=%s"
16393 msgstr "%s,源=%s,目标=%s"
16394
16395 #: builtin/mv.c:271
16396 #, c-format
16397 msgid "Renaming %s to %s\n"
16398 msgstr "重命名 %s 至 %s\n"
16399
16400 #: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
16401 #, c-format
16402 msgid "renaming '%s' failed"
16403 msgstr "重命名 '%s' 失败"
16404
16405 #: builtin/name-rev.c:465
16406 msgid "git name-rev [<options>] <commit>..."
16407 msgstr "git name-rev [<选项>] <提交>..."
16408
16409 #: builtin/name-rev.c:466
16410 msgid "git name-rev [<options>] --all"
16411 msgstr "git name-rev [<选项>] --all"
16412
16413 #: builtin/name-rev.c:467
16414 msgid "git name-rev [<options>] --stdin"
16415 msgstr "git name-rev [<选项>] --stdin"
16416
16417 #: builtin/name-rev.c:524
16418 msgid "print only names (no SHA-1)"
16419 msgstr "只打印名称(无 SHA-1)"
16420
16421 #: builtin/name-rev.c:525
16422 msgid "only use tags to name the commits"
16423 msgstr "只使用标签来命名提交"
16424
16425 #: builtin/name-rev.c:527
16426 msgid "only use refs matching <pattern>"
16427 msgstr "只使用和 <模式> 相匹配的引用"
16428
16429 #: builtin/name-rev.c:529
16430 msgid "ignore refs matching <pattern>"
16431 msgstr "忽略和 <模式> 相匹配的引用"
16432
16433 #: builtin/name-rev.c:531
16434 msgid "list all commits reachable from all refs"
16435 msgstr "列出可以从所有引用访问的提交"
16436
16437 #: builtin/name-rev.c:532
16438 msgid "read from stdin"
16439 msgstr "从标准输入读取"
16440
16441 #: builtin/name-rev.c:533
16442 msgid "allow to print `undefined` names (default)"
16443 msgstr "允许打印 `未定义` 的名称(默认)"
16444
16445 #: builtin/name-rev.c:539
16446 msgid "dereference tags in the input (internal use)"
16447 msgstr "反向解析输入中的标签(内部使用)"
16448
16449 #: builtin/notes.c:28
16450 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
16451 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
16452
16453 #: builtin/notes.c:29
16454 msgid ""
16455 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
16456 "| (-c | -C) <object>] [<object>]"
16457 msgstr ""
16458 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
16459 "| (-c | -C) <对象>] [<对象>]"
16460
16461 #: builtin/notes.c:30
16462 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
16463 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
16464
16465 #: builtin/notes.c:31
16466 msgid ""
16467 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
16468 "(-c | -C) <object>] [<object>]"
16469 msgstr ""
16470 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
16471 "(-c | -C) <对象>] [<对象>]"
16472
16473 #: builtin/notes.c:32
16474 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
16475 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
16476
16477 #: builtin/notes.c:33
16478 msgid "git notes [--ref <notes-ref>] show [<object>]"
16479 msgstr "git notes [--ref <注解引用>] show [<对象>]"
16480
16481 #: builtin/notes.c:34
16482 msgid ""
16483 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
16484 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
16485
16486 #: builtin/notes.c:35
16487 msgid "git notes merge --commit [-v | -q]"
16488 msgstr "git notes merge --commit [-v | -q]"
16489
16490 #: builtin/notes.c:36
16491 msgid "git notes merge --abort [-v | -q]"
16492 msgstr "git notes merge --abort [-v | -q]"
16493
16494 #: builtin/notes.c:37
16495 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
16496 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
16497
16498 #: builtin/notes.c:38
16499 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
16500 msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
16501
16502 #: builtin/notes.c:39
16503 msgid "git notes [--ref <notes-ref>] get-ref"
16504 msgstr "git notes [--ref <注解引用>] get-ref"
16505
16506 #: builtin/notes.c:44
16507 msgid "git notes [list [<object>]]"
16508 msgstr "git notes [list [<对象>]]"
16509
16510 #: builtin/notes.c:49
16511 msgid "git notes add [<options>] [<object>]"
16512 msgstr "git notes add [<选项>] [<对象>]"
16513
16514 #: builtin/notes.c:54
16515 msgid "git notes copy [<options>] <from-object> <to-object>"
16516 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
16517
16518 #: builtin/notes.c:55
16519 msgid "git notes copy --stdin [<from-object> <to-object>]..."
16520 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
16521
16522 #: builtin/notes.c:60
16523 msgid "git notes append [<options>] [<object>]"
16524 msgstr "git notes append [<选项>] [<对象>]"
16525
16526 #: builtin/notes.c:65
16527 msgid "git notes edit [<object>]"
16528 msgstr "git notes edit [<对象>]"
16529
16530 #: builtin/notes.c:70
16531 msgid "git notes show [<object>]"
16532 msgstr "git notes show [<对象>]"
16533
16534 #: builtin/notes.c:75
16535 msgid "git notes merge [<options>] <notes-ref>"
16536 msgstr "git notes merge [<选项>] <注解引用>"
16537
16538 #: builtin/notes.c:76
16539 msgid "git notes merge --commit [<options>]"
16540 msgstr "git notes merge --commit [<选项>]"
16541
16542 #: builtin/notes.c:77
16543 msgid "git notes merge --abort [<options>]"
16544 msgstr "git notes merge --abort [<选项>]"
16545
16546 #: builtin/notes.c:82
16547 msgid "git notes remove [<object>]"
16548 msgstr "git notes remove [<对象>]"
16549
16550 #: builtin/notes.c:87
16551 msgid "git notes prune [<options>]"
16552 msgstr "git notes prune [<选项>]"
16553
16554 #: builtin/notes.c:92
16555 msgid "git notes get-ref"
16556 msgstr "git notes get-ref"
16557
16558 #: builtin/notes.c:97
16559 msgid "Write/edit the notes for the following object:"
16560 msgstr "为下面的对象写/编辑说明:"
16561
16562 #: builtin/notes.c:150
16563 #, c-format
16564 msgid "unable to start 'show' for object '%s'"
16565 msgstr "不能为对象 '%s' 开始 'show'"
16566
16567 #: builtin/notes.c:154
16568 msgid "could not read 'show' output"
16569 msgstr "不能读取 'show' 的输出"
16570
16571 #: builtin/notes.c:162
16572 #, c-format
16573 msgid "failed to finish 'show' for object '%s'"
16574 msgstr "无法为对象 '%s' 完成 'show'"
16575
16576 #: builtin/notes.c:197
16577 msgid "please supply the note contents using either -m or -F option"
16578 msgstr "请通过 -m 或 -F 选项为注解提供内容"
16579
16580 #: builtin/notes.c:206
16581 msgid "unable to write note object"
16582 msgstr "不能写注解对象"
16583
16584 #: builtin/notes.c:208
16585 #, c-format
16586 msgid "the note contents have been left in %s"
16587 msgstr "注解内容被留在 %s 中"
16588
16589 #: builtin/notes.c:242 builtin/tag.c:532
16590 #, c-format
16591 msgid "could not open or read '%s'"
16592 msgstr "不能打开或读取 '%s'"
16593
16594 #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
16595 #: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
16596 #: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
16597 #, c-format
16598 msgid "failed to resolve '%s' as a valid ref."
16599 msgstr "无法解析 '%s' 为一个有效引用。"
16600
16601 #: builtin/notes.c:265
16602 #, c-format
16603 msgid "failed to read object '%s'."
16604 msgstr "读取对象 '%s' 失败。"
16605
16606 #: builtin/notes.c:268
16607 #, c-format
16608 msgid "cannot read note data from non-blob object '%s'."
16609 msgstr "不能从非数据对象 '%s' 中读取注解数据。"
16610
16611 #: builtin/notes.c:309
16612 #, c-format
16613 msgid "malformed input line: '%s'."
16614 msgstr "格式错误的输入行:'%s'。"
16615
16616 #: builtin/notes.c:324
16617 #, c-format
16618 msgid "failed to copy notes from '%s' to '%s'"
16619 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
16620
16621 #. TRANSLATORS: the first %s will be replaced by a git
16622 #. notes command: 'add', 'merge', 'remove', etc.
16623 #.
16624 #: builtin/notes.c:356
16625 #, c-format
16626 msgid "refusing to %s notes in %s (outside of refs/notes/)"
16627 msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
16628
16629 #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
16630 #: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
16631 #: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
16632 msgid "too many parameters"
16633 msgstr "参数太多"
16634
16635 #: builtin/notes.c:389 builtin/notes.c:678
16636 #, c-format
16637 msgid "no note found for object %s."
16638 msgstr "未发现对象 %s 的注解。"
16639
16640 #: builtin/notes.c:410 builtin/notes.c:576
16641 msgid "note contents as a string"
16642 msgstr "注解内容作为一个字符串"
16643
16644 #: builtin/notes.c:413 builtin/notes.c:579
16645 msgid "note contents in a file"
16646 msgstr "注解内容到一个文件中"
16647
16648 #: builtin/notes.c:416 builtin/notes.c:582
16649 msgid "reuse and edit specified note object"
16650 msgstr "重用和编辑指定的注解对象"
16651
16652 #: builtin/notes.c:419 builtin/notes.c:585
16653 msgid "reuse specified note object"
16654 msgstr "重用指定的注解对象"
16655
16656 #: builtin/notes.c:422 builtin/notes.c:588
16657 msgid "allow storing empty note"
16658 msgstr "允许保存空白注释"
16659
16660 #: builtin/notes.c:423 builtin/notes.c:496
16661 msgid "replace existing notes"
16662 msgstr "替换已存在的注解"
16663
16664 #: builtin/notes.c:448
16665 #, c-format
16666 msgid ""
16667 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
16668 "existing notes"
16669 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
16670
16671 #: builtin/notes.c:463 builtin/notes.c:544
16672 #, c-format
16673 msgid "Overwriting existing notes for object %s\n"
16674 msgstr "覆盖对象 %s 现存注解\n"
16675
16676 #: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
16677 #, c-format
16678 msgid "Removing note for object %s\n"
16679 msgstr "删除对象 %s 的注解\n"
16680
16681 #: builtin/notes.c:497
16682 msgid "read objects from stdin"
16683 msgstr "从标准输入读取对象"
16684
16685 #: builtin/notes.c:499
16686 msgid "load rewriting config for <command> (implies --stdin)"
16687 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
16688
16689 #: builtin/notes.c:517
16690 msgid "too few parameters"
16691 msgstr "参数太少"
16692
16693 #: builtin/notes.c:538
16694 #, c-format
16695 msgid ""
16696 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
16697 "existing notes"
16698 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
16699
16700 #: builtin/notes.c:550
16701 #, c-format
16702 msgid "missing notes on source object %s. Cannot copy."
16703 msgstr "源对象 %s 缺少注解。不能拷贝。"
16704
16705 #: builtin/notes.c:603
16706 #, c-format
16707 msgid ""
16708 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
16709 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
16710 msgstr ""
16711 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
16712 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
16713
16714 #: builtin/notes.c:698
16715 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
16716 msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
16717
16718 #: builtin/notes.c:700
16719 msgid "failed to delete ref NOTES_MERGE_REF"
16720 msgstr "删除引用 NOTES_MERGE_REF 失败"
16721
16722 #: builtin/notes.c:702
16723 msgid "failed to remove 'git notes merge' worktree"
16724 msgstr "删除 'git notes merge' 工作区失败"
16725
16726 #: builtin/notes.c:722
16727 msgid "failed to read ref NOTES_MERGE_PARTIAL"
16728 msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
16729
16730 #: builtin/notes.c:724
16731 msgid "could not find commit from NOTES_MERGE_PARTIAL."
16732 msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
16733
16734 #: builtin/notes.c:726
16735 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
16736 msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
16737
16738 #: builtin/notes.c:739
16739 msgid "failed to resolve NOTES_MERGE_REF"
16740 msgstr "解析 NOTES_MERGE_REF 失败"
16741
16742 #: builtin/notes.c:742
16743 msgid "failed to finalize notes merge"
16744 msgstr "无法完成注解合并"
16745
16746 #: builtin/notes.c:768
16747 #, c-format
16748 msgid "unknown notes merge strategy %s"
16749 msgstr "未知的注解合并策略 %s"
16750
16751 #: builtin/notes.c:784
16752 msgid "General options"
16753 msgstr "通用选项"
16754
16755 #: builtin/notes.c:786
16756 msgid "Merge options"
16757 msgstr "合并选项"
16758
16759 #: builtin/notes.c:788
16760 msgid ""
16761 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
16762 "cat_sort_uniq)"
16763 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
16764
16765 #: builtin/notes.c:790
16766 msgid "Committing unmerged notes"
16767 msgstr "提交未合并的注解"
16768
16769 #: builtin/notes.c:792
16770 msgid "finalize notes merge by committing unmerged notes"
16771 msgstr "通过提交未合并的注解来完成注解合并"
16772
16773 #: builtin/notes.c:794
16774 msgid "Aborting notes merge resolution"
16775 msgstr "中止注解合并的方案"
16776
16777 #: builtin/notes.c:796
16778 msgid "abort notes merge"
16779 msgstr "中止注解合并"
16780
16781 #: builtin/notes.c:807
16782 msgid "cannot mix --commit, --abort or -s/--strategy"
16783 msgstr "不能混用 --commit、--abort 或 -s/--strategy"
16784
16785 #: builtin/notes.c:812
16786 msgid "must specify a notes ref to merge"
16787 msgstr "必须指定一个注解引用来合并"
16788
16789 #: builtin/notes.c:836
16790 #, c-format
16791 msgid "unknown -s/--strategy: %s"
16792 msgstr "未知的 -s/--strategy:%s"
16793
16794 #: builtin/notes.c:873
16795 #, c-format
16796 msgid "a notes merge into %s is already in-progress at %s"
16797 msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
16798
16799 #: builtin/notes.c:876
16800 #, c-format
16801 msgid "failed to store link to current notes ref (%s)"
16802 msgstr "无法存储链接到当前的注解引用(%s)"
16803
16804 #: builtin/notes.c:878
16805 #, c-format
16806 msgid ""
16807 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
16808 "'git notes merge --commit', or abort the merge with 'git notes merge --"
16809 "abort'.\n"
16810 msgstr ""
16811 "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
16812 "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
16813
16814 #: builtin/notes.c:897 builtin/tag.c:545
16815 #, c-format
16816 msgid "Failed to resolve '%s' as a valid ref."
16817 msgstr "无法解析 '%s' 为一个有效引用。"
16818
16819 #: builtin/notes.c:900
16820 #, c-format
16821 msgid "Object %s has no note\n"
16822 msgstr "对象 %s 没有注解\n"
16823
16824 #: builtin/notes.c:912
16825 msgid "attempt to remove non-existent note is not an error"
16826 msgstr "尝试删除不存在的注解不是一个错误"
16827
16828 #: builtin/notes.c:915
16829 msgid "read object names from the standard input"
16830 msgstr "从标准输入读取对象名称"
16831
16832 #: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
16833 msgid "do not remove, show only"
16834 msgstr "不删除,只显示"
16835
16836 #: builtin/notes.c:955
16837 msgid "report pruned notes"
16838 msgstr "报告清除的注解"
16839
16840 #: builtin/notes.c:998
16841 msgid "notes-ref"
16842 msgstr "注解引用"
16843
16844 #: builtin/notes.c:999
16845 msgid "use notes from <notes-ref>"
16846 msgstr "从 <注解引用> 使用注解"
16847
16848 #: builtin/notes.c:1034 builtin/stash.c:1643
16849 #, c-format
16850 msgid "unknown subcommand: %s"
16851 msgstr "未知子命令:%s"
16852
16853 #: builtin/pack-objects.c:52
16854 msgid ""
16855 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
16856 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
16857
16858 #: builtin/pack-objects.c:53
16859 msgid ""
16860 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
16861 msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
16862
16863 #: builtin/pack-objects.c:430
16864 #, c-format
16865 msgid "bad packed object CRC for %s"
16866 msgstr "%s 错的包对象 CRC"
16867
16868 #: builtin/pack-objects.c:441
16869 #, c-format
16870 msgid "corrupt packed object for %s"
16871 msgstr "%s 损坏的包对象"
16872
16873 #: builtin/pack-objects.c:572
16874 #, c-format
16875 msgid "recursive delta detected for object %s"
16876 msgstr "发现对象 %s 递归 delta"
16877
16878 #: builtin/pack-objects.c:783
16879 #, c-format
16880 msgid "ordered %u objects, expected %<PRIu32>"
16881 msgstr "排序了 %u 个对象,预期 %<PRIu32> 个"
16882
16883 #: builtin/pack-objects.c:972
16884 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
16885 msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
16886
16887 #: builtin/pack-objects.c:985
16888 msgid "Writing objects"
16889 msgstr "写入对象中"
16890
16891 #: builtin/pack-objects.c:1046 builtin/update-index.c:90
16892 #, c-format
16893 msgid "failed to stat %s"
16894 msgstr "对 %s 调用 stat 失败"
16895
16896 #: builtin/pack-objects.c:1099
16897 #, c-format
16898 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
16899 msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
16900
16901 #: builtin/pack-objects.c:1297
16902 msgid "disabling bitmap writing, as some objects are not being packed"
16903 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
16904
16905 #: builtin/pack-objects.c:1724
16906 #, c-format
16907 msgid "delta base offset overflow in pack for %s"
16908 msgstr "%s 压缩中 delta 基准偏移越界"
16909
16910 #: builtin/pack-objects.c:1733
16911 #, c-format
16912 msgid "delta base offset out of bound for %s"
16913 msgstr "%s 的 delta 基准偏移越界"
16914
16915 #: builtin/pack-objects.c:2004
16916 msgid "Counting objects"
16917 msgstr "对象计数中"
16918
16919 #: builtin/pack-objects.c:2149
16920 #, c-format
16921 msgid "unable to parse object header of %s"
16922 msgstr "无法解析对象 %s 头信息"
16923
16924 #: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
16925 #: builtin/pack-objects.c:2245
16926 #, c-format
16927 msgid "object %s cannot be read"
16928 msgstr "对象 %s 无法读取"
16929
16930 #: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
16931 #, c-format
16932 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
16933 msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)"
16934
16935 #: builtin/pack-objects.c:2259
16936 msgid "suboptimal pack - out of memory"
16937 msgstr "次优(suboptimal)打包 - 内存不足"
16938
16939 #: builtin/pack-objects.c:2574
16940 #, c-format
16941 msgid "Delta compression using up to %d threads"
16942 msgstr "使用 %d 个线程进行压缩"
16943
16944 #: builtin/pack-objects.c:2713
16945 #, c-format
16946 msgid "unable to pack objects reachable from tag %s"
16947 msgstr "无法为标签 %s 压缩对象"
16948
16949 #: builtin/pack-objects.c:2801
16950 msgid "Compressing objects"
16951 msgstr "压缩对象中"
16952
16953 #: builtin/pack-objects.c:2807
16954 msgid "inconsistency with delta count"
16955 msgstr "不一致的差异计数"
16956
16957 #: builtin/pack-objects.c:2888
16958 #, c-format
16959 msgid ""
16960 "expected edge object ID, got garbage:\n"
16961 " %s"
16962 msgstr ""
16963 "预期边界对象(edge object)ID,却得到垃圾数据:\n"
16964 " %s"
16965
16966 #: builtin/pack-objects.c:2894
16967 #, c-format
16968 msgid ""
16969 "expected object ID, got garbage:\n"
16970 " %s"
16971 msgstr ""
16972 "预期对象 ID,却得到垃圾数据:\n"
16973 " %s"
16974
16975 #: builtin/pack-objects.c:2992
16976 msgid "invalid value for --missing"
16977 msgstr "选项 --missing 的值无效"
16978
16979 #: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
16980 msgid "cannot open pack index"
16981 msgstr "无法打开包文件索引"
16982
16983 #: builtin/pack-objects.c:3082
16984 #, c-format
16985 msgid "loose object at %s could not be examined"
16986 msgstr "无法检查 %s 处的松散对象"
16987
16988 #: builtin/pack-objects.c:3167
16989 msgid "unable to force loose object"
16990 msgstr "无法强制松散对象"
16991
16992 #: builtin/pack-objects.c:3260
16993 #, c-format
16994 msgid "not a rev '%s'"
16995 msgstr "不是一个版本 '%s'"
16996
16997 #: builtin/pack-objects.c:3263
16998 #, c-format
16999 msgid "bad revision '%s'"
17000 msgstr "坏的版本 '%s'"
17001
17002 #: builtin/pack-objects.c:3288
17003 msgid "unable to add recent objects"
17004 msgstr "无法添加最近的对象"
17005
17006 #: builtin/pack-objects.c:3341
17007 #, c-format
17008 msgid "unsupported index version %s"
17009 msgstr "不支持的索引版本 %s"
17010
17011 #: builtin/pack-objects.c:3345
17012 #, c-format
17013 msgid "bad index version '%s'"
17014 msgstr "坏的索引版本 '%s'"
17015
17016 #: builtin/pack-objects.c:3383
17017 msgid "<version>[,<offset>]"
17018 msgstr "<版本>[,<偏移>]"
17019
17020 #: builtin/pack-objects.c:3384
17021 msgid "write the pack index file in the specified idx format version"
17022 msgstr "用指定的 idx 格式版本来写包索引文件"
17023
17024 #: builtin/pack-objects.c:3387
17025 msgid "maximum size of each output pack file"
17026 msgstr "每个输出包的最大尺寸"
17027
17028 #: builtin/pack-objects.c:3389
17029 msgid "ignore borrowed objects from alternate object store"
17030 msgstr "忽略从备用对象存储里借用对象"
17031
17032 #: builtin/pack-objects.c:3391
17033 msgid "ignore packed objects"
17034 msgstr "忽略包对象"
17035
17036 #: builtin/pack-objects.c:3393
17037 msgid "limit pack window by objects"
17038 msgstr "限制打包窗口的对象数"
17039
17040 #: builtin/pack-objects.c:3395
17041 msgid "limit pack window by memory in addition to object limit"
17042 msgstr "除对象数量限制外设置打包窗口的内存限制"
17043
17044 #: builtin/pack-objects.c:3397
17045 msgid "maximum length of delta chain allowed in the resulting pack"
17046 msgstr "打包允许的 delta 链的最大长度"
17047
17048 #: builtin/pack-objects.c:3399
17049 msgid "reuse existing deltas"
17050 msgstr "重用已存在的 deltas"
17051
17052 #: builtin/pack-objects.c:3401
17053 msgid "reuse existing objects"
17054 msgstr "重用已存在的对象"
17055
17056 #: builtin/pack-objects.c:3403
17057 msgid "use OFS_DELTA objects"
17058 msgstr "使用 OFS_DELTA 对象"
17059
17060 #: builtin/pack-objects.c:3405
17061 msgid "use threads when searching for best delta matches"
17062 msgstr "使用线程查询最佳 delta 匹配"
17063
17064 #: builtin/pack-objects.c:3407
17065 msgid "do not create an empty pack output"
17066 msgstr "不创建空的包输出"
17067
17068 #: builtin/pack-objects.c:3409
17069 msgid "read revision arguments from standard input"
17070 msgstr "从标准输入读取版本号参数"
17071
17072 #: builtin/pack-objects.c:3411
17073 msgid "limit the objects to those that are not yet packed"
17074 msgstr "限制那些尚未打包的对象"
17075
17076 #: builtin/pack-objects.c:3414
17077 msgid "include objects reachable from any reference"
17078 msgstr "包括可以从任何引用访问到的对象"
17079
17080 #: builtin/pack-objects.c:3417
17081 msgid "include objects referred by reflog entries"
17082 msgstr "包括被引用日志引用到的对象"
17083
17084 #: builtin/pack-objects.c:3420
17085 msgid "include objects referred to by the index"
17086 msgstr "包括被索引引用到的对象"
17087
17088 #: builtin/pack-objects.c:3423
17089 msgid "output pack to stdout"
17090 msgstr "输出包到标准输出"
17091
17092 #: builtin/pack-objects.c:3425
17093 msgid "include tag objects that refer to objects to be packed"
17094 msgstr "包括那些引用了待打包对象的标签对象"
17095
17096 #: builtin/pack-objects.c:3427
17097 msgid "keep unreachable objects"
17098 msgstr "维持不可达的对象"
17099
17100 #: builtin/pack-objects.c:3429
17101 msgid "pack loose unreachable objects"
17102 msgstr "打包松散的不可达对象"
17103
17104 #: builtin/pack-objects.c:3431
17105 msgid "unpack unreachable objects newer than <time>"
17106 msgstr "将比给定 <时间> 新的无法访问的对象解包"
17107
17108 #: builtin/pack-objects.c:3434
17109 msgid "use the sparse reachability algorithm"
17110 msgstr "使用稀疏可达性算法"
17111
17112 #: builtin/pack-objects.c:3436
17113 msgid "create thin packs"
17114 msgstr "创建精简包"
17115
17116 #: builtin/pack-objects.c:3438
17117 msgid "create packs suitable for shallow fetches"
17118 msgstr "创建适合浅克隆仓库获取的包"
17119
17120 #: builtin/pack-objects.c:3440
17121 msgid "ignore packs that have companion .keep file"
17122 msgstr "忽略配有 .keep 文件的包"
17123
17124 #: builtin/pack-objects.c:3442
17125 msgid "ignore this pack"
17126 msgstr "忽略该 pack"
17127
17128 #: builtin/pack-objects.c:3444
17129 msgid "pack compression level"
17130 msgstr "打包压缩级别"
17131
17132 #: builtin/pack-objects.c:3446
17133 msgid "do not hide commits by grafts"
17134 msgstr "显示被移植隐藏的提交"
17135
17136 #: builtin/pack-objects.c:3448
17137 msgid "use a bitmap index if available to speed up counting objects"
17138 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
17139
17140 #: builtin/pack-objects.c:3450
17141 msgid "write a bitmap index together with the pack index"
17142 msgstr "在建立包索引的同时创建 bitmap 索引"
17143
17144 #: builtin/pack-objects.c:3454
17145 msgid "write a bitmap index if possible"
17146 msgstr "如果可能,写 bitmap 索引"
17147
17148 #: builtin/pack-objects.c:3458
17149 msgid "handling for missing objects"
17150 msgstr "处理丢失的对象"
17151
17152 #: builtin/pack-objects.c:3461
17153 msgid "do not pack objects in promisor packfiles"
17154 msgstr "不要打包 promisor 包文件中的对象"
17155
17156 #: builtin/pack-objects.c:3463
17157 msgid "respect islands during delta compression"
17158 msgstr "在增量压缩时参考数据岛"
17159
17160 #: builtin/pack-objects.c:3492
17161 #, c-format
17162 msgid "delta chain depth %d is too deep, forcing %d"
17163 msgstr "增量链深度 %d 太深了,强制为 %d"
17164
17165 #: builtin/pack-objects.c:3497
17166 #, c-format
17167 msgid "pack.deltaCacheLimit is too high, forcing %d"
17168 msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
17169
17170 #: builtin/pack-objects.c:3551
17171 msgid "--max-pack-size cannot be used to build a pack for transfer"
17172 msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
17173
17174 #: builtin/pack-objects.c:3553
17175 msgid "minimum pack size limit is 1 MiB"
17176 msgstr "最小的包文件大小是 1 MiB"
17177
17178 #: builtin/pack-objects.c:3558
17179 msgid "--thin cannot be used to build an indexable pack"
17180 msgstr "--thin 不能用于创建一个可索引包"
17181
17182 #: builtin/pack-objects.c:3561
17183 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
17184 msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
17185
17186 #: builtin/pack-objects.c:3567
17187 msgid "cannot use --filter without --stdout"
17188 msgstr "不能在没有 --stdout 的情况下使用 --filter"
17189
17190 #: builtin/pack-objects.c:3627
17191 msgid "Enumerating objects"
17192 msgstr "枚举对象"
17193
17194 #: builtin/pack-objects.c:3657
17195 #, c-format
17196 msgid ""
17197 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
17198 "reused %<PRIu32>"
17199 msgstr ""
17200 "总共 %<PRIu32>(差异 %<PRIu32>),复用 %<PRIu32>(差异 %<PRIu32>),包复用 "
17201 "%<PRIu32>"
17202
17203 #: builtin/pack-refs.c:8
17204 msgid "git pack-refs [<options>]"
17205 msgstr "git pack-refs [<选项>]"
17206
17207 #: builtin/pack-refs.c:16
17208 msgid "pack everything"
17209 msgstr "打包一切"
17210
17211 #: builtin/pack-refs.c:17
17212 msgid "prune loose refs (default)"
17213 msgstr "清除松散的引用(默认)"
17214
17215 #: builtin/prune-packed.c:9
17216 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
17217 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
17218
17219 #: builtin/prune-packed.c:42
17220 msgid "Removing duplicate objects"
17221 msgstr "正在删除重复对象"
17222
17223 #: builtin/prune.c:12
17224 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
17225 msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
17226
17227 #: builtin/prune.c:131
17228 msgid "report pruned objects"
17229 msgstr "报告清除的对象"
17230
17231 #: builtin/prune.c:134
17232 msgid "expire objects older than <time>"
17233 msgstr "使早于给定时间的对象过期"
17234
17235 #: builtin/prune.c:136
17236 msgid "limit traversal to objects outside promisor packfiles"
17237 msgstr "限制遍历 promisor 包以外的对象"
17238
17239 #: builtin/prune.c:150
17240 msgid "cannot prune in a precious-objects repo"
17241 msgstr "不能在珍品仓库中执行清理操作"
17242
17243 #: builtin/pull.c:45 builtin/pull.c:47
17244 #, c-format
17245 msgid "Invalid value for %s: %s"
17246 msgstr "%s 的值无效:%s"
17247
17248 #: builtin/pull.c:67
17249 msgid "git pull [<options>] [<repository> [<refspec>...]]"
17250 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
17251
17252 #: builtin/pull.c:122
17253 msgid "control for recursive fetching of submodules"
17254 msgstr "控制子模组的递归获取"
17255
17256 #: builtin/pull.c:126
17257 msgid "Options related to merging"
17258 msgstr "和合并相关的选项"
17259
17260 #: builtin/pull.c:129
17261 msgid "incorporate changes by rebasing rather than merging"
17262 msgstr "使用变基操作取代合并操作以合入修改"
17263
17264 #: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
17265 msgid "allow fast-forward"
17266 msgstr "允许快进式"
17267
17268 #: builtin/pull.c:166
17269 msgid "automatically stash/stash pop before and after rebase"
17270 msgstr "变基操作前后执行自动贮藏和弹出贮藏"
17271
17272 #: builtin/pull.c:182
17273 msgid "Options related to fetching"
17274 msgstr "和获取相关的参数"
17275
17276 #: builtin/pull.c:192
17277 msgid "force overwrite of local branch"
17278 msgstr "强制覆盖本地分支"
17279
17280 #: builtin/pull.c:200
17281 msgid "number of submodules pulled in parallel"
17282 msgstr "并发拉取的子模组的数量"
17283
17284 #: builtin/pull.c:300
17285 #, c-format
17286 msgid "Invalid value for pull.ff: %s"
17287 msgstr "pull.ff 的取值无效:%s"
17288
17289 #: builtin/pull.c:426
17290 msgid ""
17291 "There is no candidate for rebasing against among the refs that you just "
17292 "fetched."
17293 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
17294
17295 #: builtin/pull.c:428
17296 msgid ""
17297 "There are no candidates for merging among the refs that you just fetched."
17298 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
17299
17300 #: builtin/pull.c:429
17301 msgid ""
17302 "Generally this means that you provided a wildcard refspec which had no\n"
17303 "matches on the remote end."
17304 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
17305
17306 #: builtin/pull.c:432
17307 #, c-format
17308 msgid ""
17309 "You asked to pull from the remote '%s', but did not specify\n"
17310 "a branch. Because this is not the default configured remote\n"
17311 "for your current branch, you must specify a branch on the command line."
17312 msgstr ""
17313 "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
17314 "分支默认的远程仓库,您必须在命令行中指定一个分支名。"
17315
17316 #: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
17317 msgid "You are not currently on a branch."
17318 msgstr "您当前不在一个分支上。"
17319
17320 #: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
17321 msgid "Please specify which branch you want to rebase against."
17322 msgstr "请指定您要变基到哪一个分支。"
17323
17324 #: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
17325 msgid "Please specify which branch you want to merge with."
17326 msgstr "请指定您要合并哪一个分支。"
17327
17328 #: builtin/pull.c:442 builtin/pull.c:457
17329 msgid "See git-pull(1) for details."
17330 msgstr "详见 git-pull(1)。"
17331
17332 #: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
17333 #: builtin/rebase.c:1415 git-parse-remote.sh:64
17334 msgid "<remote>"
17335 msgstr "<远程>"
17336
17337 #: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
17338 #: git-parse-remote.sh:65
17339 msgid "<branch>"
17340 msgstr "<分支>"
17341
17342 #: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
17343 msgid "There is no tracking information for the current branch."
17344 msgstr "当前分支没有跟踪信息。"
17345
17346 #: builtin/pull.c:461 git-parse-remote.sh:95
17347 msgid ""
17348 "If you wish to set tracking information for this branch you can do so with:"
17349 msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
17350
17351 #: builtin/pull.c:466
17352 #, c-format
17353 msgid ""
17354 "Your configuration specifies to merge with the ref '%s'\n"
17355 "from the remote, but no such ref was fetched."
17356 msgstr ""
17357 "您的配置中指定要合并远程的引用 '%s',\n"
17358 "但是没有获取到这个引用。"
17359
17360 #: builtin/pull.c:576
17361 #, c-format
17362 msgid "unable to access commit %s"
17363 msgstr "无法访问提交 %s"
17364
17365 #: builtin/pull.c:857
17366 msgid "ignoring --verify-signatures for rebase"
17367 msgstr "为变基操作忽略 --verify-signatures"
17368
17369 #: builtin/pull.c:912
17370 msgid "--[no-]autostash option is only valid with --rebase."
17371 msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
17372
17373 #: builtin/pull.c:920
17374 msgid "Updating an unborn branch with changes added to the index."
17375 msgstr "更新尚未诞生的分支,变更添加至索引。"
17376
17377 #: builtin/pull.c:924
17378 msgid "pull with rebase"
17379 msgstr "变基式拉取"
17380
17381 #: builtin/pull.c:925
17382 msgid "please commit or stash them."
17383 msgstr "请提交或贮藏它们。"
17384
17385 #: builtin/pull.c:950
17386 #, c-format
17387 msgid ""
17388 "fetch updated the current branch head.\n"
17389 "fast-forwarding your working tree from\n"
17390 "commit %s."
17391 msgstr ""
17392 "fetch 更新了当前的分支。快进您的工作区\n"
17393 "至提交 %s。"
17394
17395 #: builtin/pull.c:956
17396 #, c-format
17397 msgid ""
17398 "Cannot fast-forward your working tree.\n"
17399 "After making sure that you saved anything precious from\n"
17400 "$ git diff %s\n"
17401 "output, run\n"
17402 "$ git reset --hard\n"
17403 "to recover."
17404 msgstr ""
17405 "您当前的工作区无法执行快进操作。\n"
17406 "首先执行如下命令:\n"
17407 "$ git diff %s\n"
17408 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
17409 "$ git reset --hard\n"
17410 "恢复之前的状态。"
17411
17412 #: builtin/pull.c:971
17413 msgid "Cannot merge multiple branches into empty head."
17414 msgstr "无法将多个分支合并到空分支。"
17415
17416 #: builtin/pull.c:975
17417 msgid "Cannot rebase onto multiple branches."
17418 msgstr "无法变基到多个分支。"
17419
17420 #: builtin/pull.c:982
17421 msgid "cannot rebase with locally recorded submodule modifications"
17422 msgstr "本地子模组中有修改,无法变基"
17423
17424 #: builtin/push.c:19
17425 msgid "git push [<options>] [<repository> [<refspec>...]]"
17426 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
17427
17428 #: builtin/push.c:112
17429 msgid "tag shorthand without <tag>"
17430 msgstr "标签后面未提供 <标签> 参数"
17431
17432 #: builtin/push.c:122
17433 msgid "--delete only accepts plain target ref names"
17434 msgstr "--delete 只接受简单的目标引用名"
17435
17436 #: builtin/push.c:168
17437 msgid ""
17438 "\n"
17439 "To choose either option permanently, see push.default in 'git help config'."
17440 msgstr ""
17441 "\n"
17442 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
17443
17444 #: builtin/push.c:171
17445 #, c-format
17446 msgid ""
17447 "The upstream branch of your current branch does not match\n"
17448 "the name of your current branch. To push to the upstream branch\n"
17449 "on the remote, use\n"
17450 "\n"
17451 " git push %s HEAD:%s\n"
17452 "\n"
17453 "To push to the branch of the same name on the remote, use\n"
17454 "\n"
17455 " git push %s HEAD\n"
17456 "%s"
17457 msgstr ""
17458 "您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n"
17459 "使用\n"
17460 "\n"
17461 " git push %s HEAD:%s\n"
17462 "\n"
17463 "为推送至远程同名分支,使用\n"
17464 "\n"
17465 " git push %s HEAD\n"
17466 "%s"
17467
17468 #: builtin/push.c:186
17469 #, c-format
17470 msgid ""
17471 "You are not currently on a branch.\n"
17472 "To push the history leading to the current (detached HEAD)\n"
17473 "state now, use\n"
17474 "\n"
17475 " git push %s HEAD:<name-of-remote-branch>\n"
17476 msgstr ""
17477 "您当前不在一个分支上。\n"
17478 "现在为推送当前(分离头指针)的历史,使用\n"
17479 "\n"
17480 " git push %s HEAD:<远程分支名字>\n"
17481
17482 #: builtin/push.c:200
17483 #, c-format
17484 msgid ""
17485 "The current branch %s has no upstream branch.\n"
17486 "To push the current branch and set the remote as upstream, use\n"
17487 "\n"
17488 " git push --set-upstream %s %s\n"
17489 msgstr ""
17490 "当前分支 %s 没有对应的上游分支。\n"
17491 "为推送当前分支并建立与远程上游的跟踪,使用\n"
17492 "\n"
17493 " git push --set-upstream %s %s\n"
17494
17495 #: builtin/push.c:208
17496 #, c-format
17497 msgid "The current branch %s has multiple upstream branches, refusing to push."
17498 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
17499
17500 #: builtin/push.c:211
17501 #, c-format
17502 msgid ""
17503 "You are pushing to remote '%s', which is not the upstream of\n"
17504 "your current branch '%s', without telling me what to push\n"
17505 "to update which remote branch."
17506 msgstr ""
17507 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
17508 "而没有告诉我要推送什么、更新哪个远程分支。"
17509
17510 #: builtin/push.c:270
17511 msgid ""
17512 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
17513 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
17514
17515 #: builtin/push.c:277
17516 msgid ""
17517 "Updates were rejected because the tip of your current branch is behind\n"
17518 "its remote counterpart. Integrate the remote changes (e.g.\n"
17519 "'git pull ...') before pushing again.\n"
17520 "See the 'Note about fast-forwards' in 'git push --help' for details."
17521 msgstr ""
17522 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
17523 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
17524 "'git push --help' 中的 'Note about fast-forwards' 小节。"
17525
17526 #: builtin/push.c:283
17527 msgid ""
17528 "Updates were rejected because a pushed branch tip is behind its remote\n"
17529 "counterpart. Check out this branch and integrate the remote changes\n"
17530 "(e.g. 'git pull ...') before pushing again.\n"
17531 "See the 'Note about fast-forwards' in 'git push --help' for details."
17532 msgstr ""
17533 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
17534 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
17535 "'git push --help' 中的 'Note about fast-forwards' 小节。"
17536
17537 #: builtin/push.c:289
17538 msgid ""
17539 "Updates were rejected because the remote contains work that you do\n"
17540 "not have locally. This is usually caused by another repository pushing\n"
17541 "to the same ref. You may want to first integrate the remote changes\n"
17542 "(e.g., 'git pull ...') before pushing again.\n"
17543 "See the 'Note about fast-forwards' in 'git push --help' for details."
17544 msgstr ""
17545 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
17546 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
17547 "(如 'git pull ...')。\n"
17548 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
17549
17550 #: builtin/push.c:296
17551 msgid "Updates were rejected because the tag already exists in the remote."
17552 msgstr "更新被拒绝,因为该标签在远程已经存在。"
17553
17554 #: builtin/push.c:299
17555 msgid ""
17556 "You cannot update a remote ref that points at a non-commit object,\n"
17557 "or update a remote ref to make it point at a non-commit object,\n"
17558 "without using the '--force' option.\n"
17559 msgstr ""
17560 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
17561 "也不能更新远程引用让其指向一个非提交对象。\n"
17562
17563 #: builtin/push.c:360
17564 #, c-format
17565 msgid "Pushing to %s\n"
17566 msgstr "推送到 %s\n"
17567
17568 #: builtin/push.c:367
17569 #, c-format
17570 msgid "failed to push some refs to '%s'"
17571 msgstr "推送一些引用到 '%s' 失败"
17572
17573 #: builtin/push.c:542
17574 msgid "repository"
17575 msgstr "仓库"
17576
17577 #: builtin/push.c:543 builtin/send-pack.c:164
17578 msgid "push all refs"
17579 msgstr "推送所有引用"
17580
17581 #: builtin/push.c:544 builtin/send-pack.c:166
17582 msgid "mirror all refs"
17583 msgstr "镜像所有引用"
17584
17585 #: builtin/push.c:546
17586 msgid "delete refs"
17587 msgstr "删除引用"
17588
17589 #: builtin/push.c:547
17590 msgid "push tags (can't be used with --all or --mirror)"
17591 msgstr "推送标签(不能使用 --all or --mirror)"
17592
17593 #: builtin/push.c:550 builtin/send-pack.c:167
17594 msgid "force updates"
17595 msgstr "强制更新"
17596
17597 #: builtin/push.c:552 builtin/send-pack.c:181
17598 msgid "<refname>:<expect>"
17599 msgstr "<引用名>:<期望值>"
17600
17601 #: builtin/push.c:553 builtin/send-pack.c:182
17602 msgid "require old value of ref to be at this value"
17603 msgstr "要求引用旧的取值为设定值"
17604
17605 #: builtin/push.c:556
17606 msgid "control recursive pushing of submodules"
17607 msgstr "控制子模组的递归推送"
17608
17609 #: builtin/push.c:558 builtin/send-pack.c:175
17610 msgid "use thin pack"
17611 msgstr "使用精简打包"
17612
17613 #: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
17614 #: builtin/send-pack.c:162
17615 msgid "receive pack program"
17616 msgstr "接收包程序"
17617
17618 #: builtin/push.c:561
17619 msgid "set upstream for git pull/status"
17620 msgstr "设置 git pull/status 的上游"
17621
17622 #: builtin/push.c:564
17623 msgid "prune locally removed refs"
17624 msgstr "清除本地删除的引用"
17625
17626 #: builtin/push.c:566
17627 msgid "bypass pre-push hook"
17628 msgstr "绕过 pre-push 钩子"
17629
17630 #: builtin/push.c:567
17631 msgid "push missing but relevant tags"
17632 msgstr "推送缺失但有关的标签"
17633
17634 #: builtin/push.c:570 builtin/send-pack.c:169
17635 msgid "GPG sign the push"
17636 msgstr "用 GPG 为推送签名"
17637
17638 #: builtin/push.c:572 builtin/send-pack.c:176
17639 msgid "request atomic transaction on remote side"
17640 msgstr "需要远端支持原子事务"
17641
17642 #: builtin/push.c:590
17643 msgid "--delete is incompatible with --all, --mirror and --tags"
17644 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
17645
17646 #: builtin/push.c:592
17647 msgid "--delete doesn't make sense without any refs"
17648 msgstr "--delete 未接任何引用没有意义"
17649
17650 #: builtin/push.c:612
17651 #, c-format
17652 msgid "bad repository '%s'"
17653 msgstr "坏的仓库 '%s'"
17654
17655 #: builtin/push.c:613
17656 msgid ""
17657 "No configured push destination.\n"
17658 "Either specify the URL from the command-line or configure a remote "
17659 "repository using\n"
17660 "\n"
17661 " git remote add <name> <url>\n"
17662 "\n"
17663 "and then push using the remote name\n"
17664 "\n"
17665 " git push <name>\n"
17666 msgstr ""
17667 "没有配置推送目标。\n"
17668 "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
17669 "\n"
17670 " git remote add <名称> <地址>\n"
17671 "\n"
17672 "然后使用该远程仓库名执行推送\n"
17673 "\n"
17674 " git push <名称>\n"
17675
17676 #: builtin/push.c:628
17677 msgid "--all and --tags are incompatible"
17678 msgstr "--all 和 --tags 不兼容"
17679
17680 #: builtin/push.c:630
17681 msgid "--all can't be combined with refspecs"
17682 msgstr "--all 不能和引用规格同时使用"
17683
17684 #: builtin/push.c:634
17685 msgid "--mirror and --tags are incompatible"
17686 msgstr "--mirror 和 --tags 不兼容"
17687
17688 #: builtin/push.c:636
17689 msgid "--mirror can't be combined with refspecs"
17690 msgstr "--mirror 不能和引用规格同时使用"
17691
17692 #: builtin/push.c:639
17693 msgid "--all and --mirror are incompatible"
17694 msgstr "--all 和 --mirror 不兼容"
17695
17696 #: builtin/push.c:643
17697 msgid "push options must not have new line characters"
17698 msgstr "推送选项不能有换行符"
17699
17700 #: builtin/range-diff.c:8
17701 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
17702 msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
17703
17704 #: builtin/range-diff.c:9
17705 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
17706 msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
17707
17708 #: builtin/range-diff.c:10
17709 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
17710 msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
17711
17712 #: builtin/range-diff.c:22
17713 msgid "Percentage by which creation is weighted"
17714 msgstr "创建权重的百分比"
17715
17716 #: builtin/range-diff.c:24
17717 msgid "use simple diff colors"
17718 msgstr "使用简单差异颜色"
17719
17720 #: builtin/range-diff.c:26
17721 msgid "notes"
17722 msgstr "注解"
17723
17724 #: builtin/range-diff.c:26
17725 msgid "passed to 'git log'"
17726 msgstr "传递给 'git log'"
17727
17728 #: builtin/range-diff.c:50 builtin/range-diff.c:54
17729 #, c-format
17730 msgid "no .. in range: '%s'"
17731 msgstr "没有在范围中使用 ..:'%s'"
17732
17733 #: builtin/range-diff.c:64
17734 msgid "single arg format must be symmetric range"
17735 msgstr "单个参数格式必须是对称范围(即包含...)"
17736
17737 #: builtin/range-diff.c:79
17738 msgid "need two commit ranges"
17739 msgstr "需要两个提交范围"
17740
17741 #: builtin/read-tree.c:41
17742 msgid ""
17743 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
17744 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
17745 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
17746 msgstr ""
17747 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
17748 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
17749 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
17750
17751 #: builtin/read-tree.c:124
17752 msgid "write resulting index to <file>"
17753 msgstr "将索引结果写入 <文件>"
17754
17755 #: builtin/read-tree.c:127
17756 msgid "only empty the index"
17757 msgstr "只是清空索引"
17758
17759 #: builtin/read-tree.c:129
17760 msgid "Merging"
17761 msgstr "合并"
17762
17763 #: builtin/read-tree.c:131
17764 msgid "perform a merge in addition to a read"
17765 msgstr "读取之余再执行一个合并"
17766
17767 #: builtin/read-tree.c:133
17768 msgid "3-way merge if no file level merging required"
17769 msgstr "如果没有文件级合并需要,执行三方合并"
17770
17771 #: builtin/read-tree.c:135
17772 msgid "3-way merge in presence of adds and removes"
17773 msgstr "存在添加和删除时,也执行三方合并"
17774
17775 #: builtin/read-tree.c:137
17776 msgid "same as -m, but discard unmerged entries"
17777 msgstr "类似于 -m,但丢弃未合并的条目"
17778
17779 #: builtin/read-tree.c:138
17780 msgid "<subdirectory>/"
17781 msgstr "<子目录>/"
17782
17783 #: builtin/read-tree.c:139
17784 msgid "read the tree into the index under <subdirectory>/"
17785 msgstr "读取树对象到索引的 <子目录>/ 下"
17786
17787 #: builtin/read-tree.c:142
17788 msgid "update working tree with merge result"
17789 msgstr "用合并的结果更新工作区"
17790
17791 #: builtin/read-tree.c:144
17792 msgid "gitignore"
17793 msgstr "gitignore"
17794
17795 #: builtin/read-tree.c:145
17796 msgid "allow explicitly ignored files to be overwritten"
17797 msgstr "允许忽略文件中设定的文件可以被覆盖"
17798
17799 #: builtin/read-tree.c:148
17800 msgid "don't check the working tree after merging"
17801 msgstr "合并后不检查工作区"
17802
17803 #: builtin/read-tree.c:149
17804 msgid "don't update the index or the work tree"
17805 msgstr "不更新索引区和工作区"
17806
17807 #: builtin/read-tree.c:151
17808 msgid "skip applying sparse checkout filter"
17809 msgstr "跳过应用稀疏检出过滤器"
17810
17811 #: builtin/read-tree.c:153
17812 msgid "debug unpack-trees"
17813 msgstr "调试 unpack-trees"
17814
17815 #: builtin/read-tree.c:157
17816 msgid "suppress feedback messages"
17817 msgstr "抑制反馈信息"
17818
17819 #: builtin/read-tree.c:188
17820 msgid "You need to resolve your current index first"
17821 msgstr "您需要先解决当前索引的冲突"
17822
17823 #: builtin/rebase.c:32
17824 msgid ""
17825 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
17826 "[<upstream> [<branch>]]"
17827 msgstr ""
17828 "git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<"
17829 "上游> [<分支>]]"
17830
17831 #: builtin/rebase.c:34
17832 msgid ""
17833 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
17834 msgstr ""
17835 "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
17836
17837 #: builtin/rebase.c:36
17838 msgid "git rebase --continue | --abort | --skip | --edit-todo"
17839 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
17840
17841 #: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
17842 #, c-format
17843 msgid "unusable todo list: '%s'"
17844 msgstr "不可用的待办列表:'%s'"
17845
17846 #: builtin/rebase.c:292
17847 #, c-format
17848 msgid "could not create temporary %s"
17849 msgstr "无法创建临时的 %s"
17850
17851 #: builtin/rebase.c:298
17852 msgid "could not mark as interactive"
17853 msgstr "无法标记为交互式"
17854
17855 #: builtin/rebase.c:352
17856 msgid "could not generate todo list"
17857 msgstr "无法生成待办列表"
17858
17859 #: builtin/rebase.c:391
17860 msgid "a base commit must be provided with --upstream or --onto"
17861 msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
17862
17863 #: builtin/rebase.c:461
17864 msgid "git rebase--interactive [<options>]"
17865 msgstr "git rebase--interactive [<选项>]"
17866
17867 #: builtin/rebase.c:474 builtin/rebase.c:1550
17868 msgid "(DEPRECATED) keep empty commits"
17869 msgstr "(已弃用)保留空提交"
17870
17871 #: builtin/rebase.c:478 builtin/revert.c:128
17872 msgid "allow commits with empty messages"
17873 msgstr "允许提交说明为空"
17874
17875 #: builtin/rebase.c:480
17876 msgid "rebase merge commits"
17877 msgstr "对合并提交变基"
17878
17879 #: builtin/rebase.c:482
17880 msgid "keep original branch points of cousins"
17881 msgstr "保持兄弟提交的原始分支点"
17882
17883 #: builtin/rebase.c:484
17884 msgid "move commits that begin with squash!/fixup!"
17885 msgstr "移动以 squash!/fixup! 开头的提交"
17886
17887 #: builtin/rebase.c:485
17888 msgid "sign commits"
17889 msgstr "签名提交"
17890
17891 #: builtin/rebase.c:487 builtin/rebase.c:1490
17892 msgid "display a diffstat of what changed upstream"
17893 msgstr "显示上游变化的差异统计"
17894
17895 #: builtin/rebase.c:489
17896 msgid "continue rebase"
17897 msgstr "继续变基"
17898
17899 #: builtin/rebase.c:491
17900 msgid "skip commit"
17901 msgstr "跳过提交"
17902
17903 #: builtin/rebase.c:492
17904 msgid "edit the todo list"
17905 msgstr "变基待办列表"
17906
17907 #: builtin/rebase.c:494
17908 msgid "show the current patch"
17909 msgstr "显示当前补丁"
17910
17911 #: builtin/rebase.c:497
17912 msgid "shorten commit ids in the todo list"
17913 msgstr "缩短待办列表中的提交号"
17914
17915 #: builtin/rebase.c:499
17916 msgid "expand commit ids in the todo list"
17917 msgstr "扩展待办列表中的提交号"
17918
17919 #: builtin/rebase.c:501
17920 msgid "check the todo list"
17921 msgstr "检查待办列表"
17922
17923 #: builtin/rebase.c:503
17924 msgid "rearrange fixup/squash lines"
17925 msgstr "重新排列 fixup/squash 行"
17926
17927 #: builtin/rebase.c:505
17928 msgid "insert exec commands in todo list"
17929 msgstr "在待办列表中插入 exec 执行命令"
17930
17931 #: builtin/rebase.c:506
17932 msgid "onto"
17933 msgstr "onto"
17934
17935 #: builtin/rebase.c:509
17936 msgid "restrict-revision"
17937 msgstr "restrict-revision"
17938
17939 #: builtin/rebase.c:509
17940 msgid "restrict revision"
17941 msgstr "限制版本"
17942
17943 #: builtin/rebase.c:511
17944 msgid "squash-onto"
17945 msgstr "squash-onto"
17946
17947 #: builtin/rebase.c:512
17948 msgid "squash onto"
17949 msgstr "squash onto"
17950
17951 #: builtin/rebase.c:514
17952 msgid "the upstream commit"
17953 msgstr "上游提交"
17954
17955 #: builtin/rebase.c:516
17956 msgid "head-name"
17957 msgstr "head-name"
17958
17959 #: builtin/rebase.c:516
17960 msgid "head name"
17961 msgstr "head 名称"
17962
17963 #: builtin/rebase.c:521
17964 msgid "rebase strategy"
17965 msgstr "变基策略"
17966
17967 #: builtin/rebase.c:522
17968 msgid "strategy-opts"
17969 msgstr "strategy-opts"
17970
17971 #: builtin/rebase.c:523
17972 msgid "strategy options"
17973 msgstr "策略选项"
17974
17975 #: builtin/rebase.c:524
17976 msgid "switch-to"
17977 msgstr "切换到"
17978
17979 #: builtin/rebase.c:525
17980 msgid "the branch or commit to checkout"
17981 msgstr "要检出的分支或提交"
17982
17983 #: builtin/rebase.c:526
17984 msgid "onto-name"
17985 msgstr "onto-name"
17986
17987 #: builtin/rebase.c:526
17988 msgid "onto name"
17989 msgstr "onto name"
17990
17991 #: builtin/rebase.c:527
17992 msgid "cmd"
17993 msgstr "cmd"
17994
17995 #: builtin/rebase.c:527
17996 msgid "the command to run"
17997 msgstr "要执行的命令"
17998
17999 #: builtin/rebase.c:530 builtin/rebase.c:1584
18000 msgid "automatically re-schedule any `exec` that fails"
18001 msgstr "自动重新安排任何失败的 `exec`"
18002
18003 #: builtin/rebase.c:546
18004 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
18005 msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果"
18006
18007 #: builtin/rebase.c:562
18008 #, c-format
18009 msgid "%s requires an interactive rebase"
18010 msgstr "%s 需要交互式变基"
18011
18012 #: builtin/rebase.c:612
18013 #, c-format
18014 msgid "could not get 'onto': '%s'"
18015 msgstr "无法获取 'onto':'%s'"
18016
18017 #: builtin/rebase.c:627
18018 #, c-format
18019 msgid "invalid orig-head: '%s'"
18020 msgstr "无效的原始 head:'%s'"
18021
18022 #: builtin/rebase.c:652
18023 #, c-format
18024 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
18025 msgstr "忽略无效的 allow_rerere_autoupdate:'%s'"
18026
18027 #: builtin/rebase.c:728
18028 #, c-format
18029 msgid "Could not read '%s'"
18030 msgstr "不能读取 '%s'"
18031
18032 #: builtin/rebase.c:746
18033 #, c-format
18034 msgid "Cannot store %s"
18035 msgstr "不能存储 %s"
18036
18037 #: builtin/rebase.c:853
18038 msgid "could not determine HEAD revision"
18039 msgstr "不能确定 HEAD 版本"
18040
18041 #: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
18042 msgid ""
18043 "Resolve all conflicts manually, mark them as resolved with\n"
18044 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
18045 "You can instead skip this commit: run \"git rebase --skip\".\n"
18046 "To abort and get back to the state before \"git rebase\", run \"git rebase --"
18047 "abort\"."
18048 msgstr ""
18049 "手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
18050 "冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
18051 "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
18052 "\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
18053
18054 #: builtin/rebase.c:1058
18055 #, c-format
18056 msgid ""
18057 "\n"
18058 "git encountered an error while preparing the patches to replay\n"
18059 "these revisions:\n"
18060 "\n"
18061 " %s\n"
18062 "\n"
18063 "As a result, git cannot rebase them."
18064 msgstr ""
18065 "\n"
18066 "在为重放这些版本而准备补丁时,git 遇到了一个错误:\n"
18067 "\n"
18068 " %s\n"
18069 "\n"
18070 "因此 git 无法对其变基。"
18071
18072 #: builtin/rebase.c:1383
18073 #, c-format
18074 msgid ""
18075 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
18076 "\"."
18077 msgstr "无法识别的空类型 '%s';有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
18078
18079 #: builtin/rebase.c:1401
18080 #, c-format
18081 msgid ""
18082 "%s\n"
18083 "Please specify which branch you want to rebase against.\n"
18084 "See git-rebase(1) for details.\n"
18085 "\n"
18086 " git rebase '<branch>'\n"
18087 "\n"
18088 msgstr ""
18089 "%s\n"
18090 "请指定您要变基到哪个分支。\n"
18091 "详见 git-rebase(1)。\n"
18092 "\n"
18093 " git rebase '<branch>'\n"
18094 "\n"
18095
18096 #: builtin/rebase.c:1417
18097 #, c-format
18098 msgid ""
18099 "If you wish to set tracking information for this branch you can do so with:\n"
18100 "\n"
18101 " git branch --set-upstream-to=%s/<branch> %s\n"
18102 "\n"
18103 msgstr ""
18104 "如果您想要为此分支创建跟踪信息,您可以执行:\n"
18105 "\n"
18106 " git branch --set-upstream-to=%s/<branch> %s\n"
18107 "\n"
18108
18109 #: builtin/rebase.c:1447
18110 msgid "exec commands cannot contain newlines"
18111 msgstr "exec 命令不能包含换行符"
18112
18113 #: builtin/rebase.c:1451
18114 msgid "empty exec command"
18115 msgstr "空的 exec 命令"
18116
18117 #: builtin/rebase.c:1481
18118 msgid "rebase onto given branch instead of upstream"
18119 msgstr "变基到给定的分支而非上游"
18120
18121 #: builtin/rebase.c:1483
18122 msgid "use the merge-base of upstream and branch as the current base"
18123 msgstr "使用上游和分支的合并基线做为当前基线"
18124
18125 #: builtin/rebase.c:1485
18126 msgid "allow pre-rebase hook to run"
18127 msgstr "允许执行 pre-rebase 钩子"
18128
18129 #: builtin/rebase.c:1487
18130 msgid "be quiet. implies --no-stat"
18131 msgstr "安静。暗示 --no-stat"
18132
18133 #: builtin/rebase.c:1493
18134 msgid "do not show diffstat of what changed upstream"
18135 msgstr "不显示上游变化的差异统计"
18136
18137 #: builtin/rebase.c:1496
18138 msgid "add a Signed-off-by: line to each commit"
18139 msgstr "为每一个提交添加一个 Signed-off-by: 签名"
18140
18141 #: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
18142 msgid "passed to 'git am'"
18143 msgstr "传递给 'git am"
18144
18145 #: builtin/rebase.c:1506 builtin/rebase.c:1508
18146 msgid "passed to 'git apply'"
18147 msgstr "传递给 'git apply'"
18148
18149 #: builtin/rebase.c:1510 builtin/rebase.c:1513
18150 msgid "cherry-pick all commits, even if unchanged"
18151 msgstr "拣选所有提交,即使未修改"
18152
18153 #: builtin/rebase.c:1515
18154 msgid "continue"
18155 msgstr "继续"
18156
18157 #: builtin/rebase.c:1518
18158 msgid "skip current patch and continue"
18159 msgstr "跳过当前补丁并继续"
18160
18161 # 译者:注意保持前导空格
18162 #: builtin/rebase.c:1520
18163 msgid "abort and check out the original branch"
18164 msgstr "终止并检出原有分支"
18165
18166 #: builtin/rebase.c:1523
18167 msgid "abort but keep HEAD where it is"
18168 msgstr "终止但保持 HEAD 不变"
18169
18170 #: builtin/rebase.c:1524
18171 msgid "edit the todo list during an interactive rebase"
18172 msgstr "在交互式变基中编辑待办列表"
18173
18174 #: builtin/rebase.c:1527
18175 msgid "show the patch file being applied or merged"
18176 msgstr "显示正在应用或合并的补丁文件"
18177
18178 #: builtin/rebase.c:1530
18179 msgid "use apply strategies to rebase"
18180 msgstr "使用应用策略进行变基"
18181
18182 #: builtin/rebase.c:1534
18183 msgid "use merging strategies to rebase"
18184 msgstr "使用合并策略进行变基"
18185
18186 #: builtin/rebase.c:1538
18187 msgid "let the user edit the list of commits to rebase"
18188 msgstr "让用户编辑要变基的提交列表"
18189
18190 #: builtin/rebase.c:1542
18191 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
18192 msgstr "(已弃用)尝试重建合并提交而非忽略它们"
18193
18194 #: builtin/rebase.c:1547
18195 msgid "how to handle commits that become empty"
18196 msgstr "如何处理成为空提交的提交"
18197
18198 #: builtin/rebase.c:1554
18199 msgid "move commits that begin with squash!/fixup! under -i"
18200 msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交"
18201
18202 #: builtin/rebase.c:1560
18203 msgid "automatically stash/stash pop before and after"
18204 msgstr "在操作前后执行自动贮藏和弹出贮藏"
18205
18206 #: builtin/rebase.c:1562
18207 msgid "add exec lines after each commit of the editable list"
18208 msgstr "可编辑列表的每一个提交下面增加一行 exec"
18209
18210 #: builtin/rebase.c:1566
18211 msgid "allow rebasing commits with empty messages"
18212 msgstr "允许针对空提交说明的提交变基"
18213
18214 #: builtin/rebase.c:1570
18215 msgid "try to rebase merges instead of skipping them"
18216 msgstr "尝试对合并提交变基而不是忽略它们"
18217
18218 #: builtin/rebase.c:1573
18219 msgid "use 'merge-base --fork-point' to refine upstream"
18220 msgstr "使用 'merge-base --fork-point' 来优化上游"
18221
18222 #: builtin/rebase.c:1575
18223 msgid "use the given merge strategy"
18224 msgstr "使用给定的合并策略"
18225
18226 #: builtin/rebase.c:1577 builtin/revert.c:115
18227 msgid "option"
18228 msgstr "选项"
18229
18230 #: builtin/rebase.c:1578
18231 msgid "pass the argument through to the merge strategy"
18232 msgstr "将参数传递给合并策略"
18233
18234 #: builtin/rebase.c:1581
18235 msgid "rebase all reachable commits up to the root(s)"
18236 msgstr "将所有可达的提交变基到根提交"
18237
18238 #: builtin/rebase.c:1598
18239 msgid ""
18240 "the rebase.useBuiltin support has been removed!\n"
18241 "See its entry in 'git help config' for details."
18242 msgstr ""
18243 "对 rebase.useBuiltin 的支持已被删除!\n"
18244 "详见 'git help config' 中的条目。"
18245
18246 #: builtin/rebase.c:1604
18247 msgid "It looks like 'git am' is in progress. Cannot rebase."
18248 msgstr "看起来 'git-am' 正在执行中。无法变基。"
18249
18250 #: builtin/rebase.c:1645
18251 msgid ""
18252 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
18253 msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
18254
18255 #: builtin/rebase.c:1650
18256 msgid "cannot combine '--keep-base' with '--onto'"
18257 msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
18258
18259 #: builtin/rebase.c:1652
18260 msgid "cannot combine '--keep-base' with '--root'"
18261 msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
18262
18263 #: builtin/rebase.c:1656
18264 msgid "No rebase in progress?"
18265 msgstr "没有正在进行的变基?"
18266
18267 #: builtin/rebase.c:1660
18268 msgid "The --edit-todo action can only be used during interactive rebase."
18269 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
18270
18271 #: builtin/rebase.c:1683
18272 msgid "Cannot read HEAD"
18273 msgstr "不能读取 HEAD"
18274
18275 #: builtin/rebase.c:1695
18276 msgid ""
18277 "You must edit all merge conflicts and then\n"
18278 "mark them as resolved using git add"
18279 msgstr ""
18280 "您必须编辑所有的合并冲突,然后通过 git add\n"
18281 "命令将它们标记为已解决"
18282
18283 #: builtin/rebase.c:1714
18284 msgid "could not discard worktree changes"
18285 msgstr "无法丢弃工作区变更"
18286
18287 #: builtin/rebase.c:1733
18288 #, c-format
18289 msgid "could not move back to %s"
18290 msgstr "无法移回 %s"
18291
18292 #: builtin/rebase.c:1778
18293 #, c-format
18294 msgid ""
18295 "It seems that there is already a %s directory, and\n"
18296 "I wonder if you are in the middle of another rebase. If that is the\n"
18297 "case, please try\n"
18298 "\t%s\n"
18299 "If that is not the case, please\n"
18300 "\t%s\n"
18301 "and run me again. I am stopping in case you still have something\n"
18302 "valuable there.\n"
18303 msgstr ""
18304 "似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n"
18305 "如果是这样,请执行\n"
18306 "\t%s\n"
18307 "如果不是这样,请执行\n"
18308 "\t%s\n"
18309 "然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n"
18310
18311 #: builtin/rebase.c:1806
18312 msgid "switch `C' expects a numerical value"
18313 msgstr "开关 `C' 期望一个数字值"
18314
18315 #: builtin/rebase.c:1847
18316 #, c-format
18317 msgid "Unknown mode: %s"
18318 msgstr "未知模式:%s"
18319
18320 #: builtin/rebase.c:1869
18321 msgid "--strategy requires --merge or --interactive"
18322 msgstr "--strategy 需要 --merge 或 --interactive"
18323
18324 #: builtin/rebase.c:1899
18325 msgid "cannot combine apply options with merge options"
18326 msgstr "不能组合使用应用选项和合并选项"
18327
18328 #: builtin/rebase.c:1912
18329 #, c-format
18330 msgid "Unknown rebase backend: %s"
18331 msgstr "未知的变基后端:%s"
18332
18333 #: builtin/rebase.c:1937
18334 msgid "--reschedule-failed-exec requires --exec or --interactive"
18335 msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
18336
18337 #: builtin/rebase.c:1957
18338 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
18339 msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
18340
18341 #: builtin/rebase.c:1961
18342 msgid ""
18343 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
18344 msgstr ""
18345 "错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
18346
18347 #: builtin/rebase.c:1985
18348 #, c-format
18349 msgid "invalid upstream '%s'"
18350 msgstr "无效的上游 '%s'"
18351
18352 #: builtin/rebase.c:1991
18353 msgid "Could not create new root commit"
18354 msgstr "不能创建新的根提交"
18355
18356 #: builtin/rebase.c:2017
18357 #, c-format
18358 msgid "'%s': need exactly one merge base with branch"
18359 msgstr "'%s':只需要与分支的一个合并基线"
18360
18361 #: builtin/rebase.c:2020
18362 #, c-format
18363 msgid "'%s': need exactly one merge base"
18364 msgstr "'%s':只需要一个合并基线"
18365
18366 #: builtin/rebase.c:2028
18367 #, c-format
18368 msgid "Does not point to a valid commit '%s'"
18369 msgstr "没有指向一个有效的提交 '%s'"
18370
18371 #: builtin/rebase.c:2054
18372 #, c-format
18373 msgid "fatal: no such branch/commit '%s'"
18374 msgstr "致命错误:无此分支/提交 '%s'"
18375
18376 #: builtin/rebase.c:2062 builtin/submodule--helper.c:40
18377 #: builtin/submodule--helper.c:1990
18378 #, c-format
18379 msgid "No such ref: %s"
18380 msgstr "没有这样的引用:%s"
18381
18382 #: builtin/rebase.c:2073
18383 msgid "Could not resolve HEAD to a revision"
18384 msgstr "无法将 HEAD 解析为一个版本"
18385
18386 #: builtin/rebase.c:2111
18387 msgid "Cannot autostash"
18388 msgstr "无法 autostash"
18389
18390 #: builtin/rebase.c:2114
18391 #, c-format
18392 msgid "Unexpected stash response: '%s'"
18393 msgstr "意外的 stash 响应:'%s'"
18394
18395 #: builtin/rebase.c:2120
18396 #, c-format
18397 msgid "Could not create directory for '%s'"
18398 msgstr "不能为 '%s' 创建目录"
18399
18400 #: builtin/rebase.c:2123
18401 #, c-format
18402 msgid "Created autostash: %s\n"
18403 msgstr "创建了 autostash:%s\n"
18404
18405 #: builtin/rebase.c:2126
18406 msgid "could not reset --hard"
18407 msgstr "无法 reset --hard"
18408
18409 #: builtin/rebase.c:2135
18410 msgid "Please commit or stash them."
18411 msgstr "请提交或贮藏修改。"
18412
18413 #: builtin/rebase.c:2169
18414 #, c-format
18415 msgid "could not switch to %s"
18416 msgstr "无法切换到 %s"
18417
18418 #: builtin/rebase.c:2180
18419 msgid "HEAD is up to date."
18420 msgstr "HEAD 是最新的。"
18421
18422 #: builtin/rebase.c:2182
18423 #, c-format
18424 msgid "Current branch %s is up to date.\n"
18425 msgstr "当前分支 %s 是最新的。\n"
18426
18427 #: builtin/rebase.c:2190
18428 msgid "HEAD is up to date, rebase forced."
18429 msgstr "HEAD 是最新的,强制变基。"
18430
18431 #: builtin/rebase.c:2192
18432 #, c-format
18433 msgid "Current branch %s is up to date, rebase forced.\n"
18434 msgstr "当前分支 %s 是最新的,强制变基。\n"
18435
18436 #: builtin/rebase.c:2200
18437 msgid "The pre-rebase hook refused to rebase."
18438 msgstr "pre-rebase 钩子拒绝了变基操作。"
18439
18440 #: builtin/rebase.c:2207
18441 #, c-format
18442 msgid "Changes to %s:\n"
18443 msgstr "到 %s 的变更:\n"
18444
18445 #: builtin/rebase.c:2210
18446 #, c-format
18447 msgid "Changes from %s to %s:\n"
18448 msgstr "从 %s 到 %s 的变更:\n"
18449
18450 #: builtin/rebase.c:2235
18451 #, c-format
18452 msgid "First, rewinding head to replay your work on top of it...\n"
18453 msgstr "首先,回退头指针以便在其上重放您的工作...\n"
18454
18455 #: builtin/rebase.c:2244
18456 msgid "Could not detach HEAD"
18457 msgstr "无法分离头指针"
18458
18459 #: builtin/rebase.c:2253
18460 #, c-format
18461 msgid "Fast-forwarded %s to %s.\n"
18462 msgstr "快进 %s 到 %s。\n"
18463
18464 #: builtin/receive-pack.c:33
18465 msgid "git receive-pack <git-dir>"
18466 msgstr "git receive-pack <仓库目录>"
18467
18468 #: builtin/receive-pack.c:821
18469 msgid ""
18470 "By default, updating the current branch in a non-bare repository\n"
18471 "is denied, because it will make the index and work tree inconsistent\n"
18472 "with what you pushed, and will require 'git reset --hard' to match\n"
18473 "the work tree to HEAD.\n"
18474 "\n"
18475 "You can set the 'receive.denyCurrentBranch' configuration variable\n"
18476 "to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
18477 "its current branch; however, this is not recommended unless you\n"
18478 "arranged to update its work tree to match what you pushed in some\n"
18479 "other way.\n"
18480 "\n"
18481 "To squelch this message and still keep the default behaviour, set\n"
18482 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
18483 msgstr ""
18484 "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
18485 "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
18486 "\n"
18487 "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
18488 "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
18489 "用某种方式将其工作区更新至您推送的状态。\n"
18490 "\n"
18491 "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
18492 "配置变量为 'refuse'。"
18493
18494 #: builtin/receive-pack.c:841
18495 msgid ""
18496 "By default, deleting the current branch is denied, because the next\n"
18497 "'git clone' won't result in any file checked out, causing confusion.\n"
18498 "\n"
18499 "You can set 'receive.denyDeleteCurrent' configuration variable to\n"
18500 "'warn' or 'ignore' in the remote repository to allow deleting the\n"
18501 "current branch, with or without a warning message.\n"
18502 "\n"
18503 "To squelch this message, you can set it to 'refuse'."
18504 msgstr ""
18505 "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
18506 "导致困惑。\n"
18507 "\n"
18508 "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
18509 "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
18510 "\n"
18511 "若要屏蔽此信息,您可以设置它为 'refuse'。"
18512
18513 #: builtin/receive-pack.c:1938
18514 msgid "quiet"
18515 msgstr "静默模式"
18516
18517 #: builtin/receive-pack.c:1952
18518 msgid "You must specify a directory."
18519 msgstr "您必须指定一个目录。"
18520
18521 #: builtin/reflog.c:17
18522 msgid ""
18523 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
18524 "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
18525 "<refs>..."
18526 msgstr ""
18527 "git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
18528 "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
18529 "用>..."
18530
18531 #: builtin/reflog.c:22
18532 msgid ""
18533 "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
18534 "<refs>..."
18535 msgstr ""
18536 "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
18537 "用>..."
18538
18539 #: builtin/reflog.c:25
18540 msgid "git reflog exists <ref>"
18541 msgstr "git reflog exists <引用>"
18542
18543 #: builtin/reflog.c:568 builtin/reflog.c:573
18544 #, c-format
18545 msgid "'%s' is not a valid timestamp"
18546 msgstr "'%s' 不是一个有效的时间戳"
18547
18548 #: builtin/reflog.c:606
18549 #, c-format
18550 msgid "Marking reachable objects..."
18551 msgstr "正在标记可达对象..."
18552
18553 #: builtin/reflog.c:644
18554 #, c-format
18555 msgid "%s points nowhere!"
18556 msgstr "%s 指向不存在!"
18557
18558 #: builtin/reflog.c:696
18559 msgid "no reflog specified to delete"
18560 msgstr "未指定要删除的引用日志"
18561
18562 #: builtin/reflog.c:705
18563 #, c-format
18564 msgid "not a reflog: %s"
18565 msgstr "不是一个引用日志:%s"
18566
18567 #: builtin/reflog.c:710
18568 #, c-format
18569 msgid "no reflog for '%s'"
18570 msgstr "没有 '%s' 的引用日志"
18571
18572 #: builtin/reflog.c:756
18573 #, c-format
18574 msgid "invalid ref format: %s"
18575 msgstr "无效的引用格式:%s"
18576
18577 #: builtin/reflog.c:765
18578 msgid "git reflog [ show | expire | delete | exists ]"
18579 msgstr "git reflog [ show | expire | delete | exists ]"
18580
18581 #: builtin/remote.c:17
18582 msgid "git remote [-v | --verbose]"
18583 msgstr "git remote [-v | --verbose]"
18584
18585 #: builtin/remote.c:18
18586 msgid ""
18587 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
18588 "mirror=<fetch|push>] <name> <url>"
18589 msgstr ""
18590 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
18591 "mirror=<fetch|push>] <名称> <地址>"
18592
18593 #: builtin/remote.c:19 builtin/remote.c:39
18594 msgid "git remote rename <old> <new>"
18595 msgstr "git remote rename <旧名称> <新名称>"
18596
18597 #: builtin/remote.c:20 builtin/remote.c:44
18598 msgid "git remote remove <name>"
18599 msgstr "git remote remove <名称>"
18600
18601 #: builtin/remote.c:21 builtin/remote.c:49
18602 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
18603 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
18604
18605 #: builtin/remote.c:22
18606 msgid "git remote [-v | --verbose] show [-n] <name>"
18607 msgstr "git remote [-v | --verbose] show [-n] <名称>"
18608
18609 #: builtin/remote.c:23
18610 msgid "git remote prune [-n | --dry-run] <name>"
18611 msgstr "git remote prune [-n | --dry-run] <名称>"
18612
18613 #: builtin/remote.c:24
18614 msgid ""
18615 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
18616 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
18617
18618 #: builtin/remote.c:25
18619 msgid "git remote set-branches [--add] <name> <branch>..."
18620 msgstr "git remote set-branches [--add] <名称> <分支>..."
18621
18622 #: builtin/remote.c:26 builtin/remote.c:75
18623 msgid "git remote get-url [--push] [--all] <name>"
18624 msgstr "git remote get-url [--push] [--all] <名称>"
18625
18626 #: builtin/remote.c:27 builtin/remote.c:80
18627 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
18628 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
18629
18630 #: builtin/remote.c:28 builtin/remote.c:81
18631 msgid "git remote set-url --add <name> <newurl>"
18632 msgstr "git remote set-url --add <名称> <新的地址>"
18633
18634 #: builtin/remote.c:29 builtin/remote.c:82
18635 msgid "git remote set-url --delete <name> <url>"
18636 msgstr "git remote set-url --delete <名称> <地址>"
18637
18638 #: builtin/remote.c:34
18639 msgid "git remote add [<options>] <name> <url>"
18640 msgstr "git remote add [<选项>] <名称> <地址>"
18641
18642 #: builtin/remote.c:54
18643 msgid "git remote set-branches <name> <branch>..."
18644 msgstr "git remote set-branches <名称> <分支>..."
18645
18646 #: builtin/remote.c:55
18647 msgid "git remote set-branches --add <name> <branch>..."
18648 msgstr "git remote set-branches --add <名称> <分支>..."
18649
18650 #: builtin/remote.c:60
18651 msgid "git remote show [<options>] <name>"
18652 msgstr "git remote show [<选项>] <名称>"
18653
18654 #: builtin/remote.c:65
18655 msgid "git remote prune [<options>] <name>"
18656 msgstr "git remote prune [<选项>] <名称>"
18657
18658 #: builtin/remote.c:70
18659 msgid "git remote update [<options>] [<group> | <remote>]..."
18660 msgstr "git remote update [<选项>] [<组> | <远程>]..."
18661
18662 #: builtin/remote.c:99
18663 #, c-format
18664 msgid "Updating %s"
18665 msgstr "更新 %s 中"
18666
18667 #: builtin/remote.c:131
18668 msgid ""
18669 "--mirror is dangerous and deprecated; please\n"
18670 "\t use --mirror=fetch or --mirror=push instead"
18671 msgstr ""
18672 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
18673 "\t 或 --mirror=push"
18674
18675 #: builtin/remote.c:148
18676 #, c-format
18677 msgid "unknown mirror argument: %s"
18678 msgstr "未知的镜像参数:%s"
18679
18680 #: builtin/remote.c:164
18681 msgid "fetch the remote branches"
18682 msgstr "抓取远程的分支"
18683
18684 #: builtin/remote.c:166
18685 msgid "import all tags and associated objects when fetching"
18686 msgstr "抓取时导入所有的标签和关联对象"
18687
18688 #: builtin/remote.c:169
18689 msgid "or do not fetch any tag at all (--no-tags)"
18690 msgstr "或不抓取任何标签(--no-tags)"
18691
18692 #: builtin/remote.c:171
18693 msgid "branch(es) to track"
18694 msgstr "跟踪的分支"
18695
18696 #: builtin/remote.c:172
18697 msgid "master branch"
18698 msgstr "主线分支"
18699
18700 #: builtin/remote.c:174
18701 msgid "set up remote as a mirror to push to or fetch from"
18702 msgstr "把远程设置为用以推送或抓取的镜像"
18703
18704 #: builtin/remote.c:186
18705 msgid "specifying a master branch makes no sense with --mirror"
18706 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
18707
18708 #: builtin/remote.c:188
18709 msgid "specifying branches to track makes sense only with fetch mirrors"
18710 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
18711
18712 #: builtin/remote.c:195 builtin/remote.c:696
18713 #, c-format
18714 msgid "remote %s already exists."
18715 msgstr "远程 %s 已经存在。"
18716
18717 #: builtin/remote.c:199 builtin/remote.c:700
18718 #, c-format
18719 msgid "'%s' is not a valid remote name"
18720 msgstr "'%s' 不是一个有效的远程名称"
18721
18722 #: builtin/remote.c:239
18723 #, c-format
18724 msgid "Could not setup master '%s'"
18725 msgstr "无法设置 master '%s'"
18726
18727 #: builtin/remote.c:354
18728 #, c-format
18729 msgid "Could not get fetch map for refspec %s"
18730 msgstr "无法得到引用规格 %s 的获取列表"
18731
18732 #: builtin/remote.c:453 builtin/remote.c:461
18733 msgid "(matching)"
18734 msgstr "(匹配)"
18735
18736 #: builtin/remote.c:465
18737 msgid "(delete)"
18738 msgstr "(删除)"
18739
18740 #: builtin/remote.c:653
18741 #, c-format
18742 msgid "could not set '%s'"
18743 msgstr "不能设置 '%s'"
18744
18745 #: builtin/remote.c:658
18746 #, c-format
18747 msgid ""
18748 "The %s configuration remote.pushDefault in:\n"
18749 "\t%s:%d\n"
18750 "now names the non-existent remote '%s'"
18751 msgstr ""
18752 "配置(%s)remote.pushDefault 位于:\n"
18753 "\t%s:%d\n"
18754 "现在在为不存在的远程名 '%s' 命名"
18755
18756 #: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
18757 #, c-format
18758 msgid "No such remote: '%s'"
18759 msgstr "没有此远程仓库:'%s'"
18760
18761 #: builtin/remote.c:706
18762 #, c-format
18763 msgid "Could not rename config section '%s' to '%s'"
18764 msgstr "不能重命名配置小节 '%s' 到 '%s'"
18765
18766 #: builtin/remote.c:726
18767 #, c-format
18768 msgid ""
18769 "Not updating non-default fetch refspec\n"
18770 "\t%s\n"
18771 "\tPlease update the configuration manually if necessary."
18772 msgstr ""
18773 "没有更新非默认的获取引用规格\n"
18774 "\t%s\n"
18775 "\t如果必要请手动更新配置。"
18776
18777 #: builtin/remote.c:766
18778 #, c-format
18779 msgid "deleting '%s' failed"
18780 msgstr "删除 '%s' 失败"
18781
18782 #: builtin/remote.c:800
18783 #, c-format
18784 msgid "creating '%s' failed"
18785 msgstr "创建 '%s' 失败"
18786
18787 #: builtin/remote.c:876
18788 msgid ""
18789 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
18790 "to delete it, use:"
18791 msgid_plural ""
18792 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
18793 "to delete them, use:"
18794 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
18795 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
18796
18797 #: builtin/remote.c:890
18798 #, c-format
18799 msgid "Could not remove config section '%s'"
18800 msgstr "不能移除配置小节 '%s'"
18801
18802 #: builtin/remote.c:993
18803 #, c-format
18804 msgid " new (next fetch will store in remotes/%s)"
18805 msgstr " 新的(下一次获取将存储于 remotes/%s)"
18806
18807 #: builtin/remote.c:996
18808 msgid " tracked"
18809 msgstr " 已跟踪"
18810
18811 #: builtin/remote.c:998
18812 msgid " stale (use 'git remote prune' to remove)"
18813 msgstr " 过时(使用 'git remote prune' 来移除)"
18814
18815 #: builtin/remote.c:1000
18816 msgid " ???"
18817 msgstr " ???"
18818
18819 #: builtin/remote.c:1041
18820 #, c-format
18821 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
18822 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
18823
18824 #: builtin/remote.c:1050
18825 #, c-format
18826 msgid "rebases interactively onto remote %s"
18827 msgstr "交互式变基到远程 %s"
18828
18829 #: builtin/remote.c:1052
18830 #, c-format
18831 msgid "rebases interactively (with merges) onto remote %s"
18832 msgstr "交互式变基(含合并提交)到远程 %s"
18833
18834 #: builtin/remote.c:1055
18835 #, c-format
18836 msgid "rebases onto remote %s"
18837 msgstr "变基到远程 %s"
18838
18839 #: builtin/remote.c:1059
18840 #, c-format
18841 msgid " merges with remote %s"
18842 msgstr " 与远程 %s 合并"
18843
18844 #: builtin/remote.c:1062
18845 #, c-format
18846 msgid "merges with remote %s"
18847 msgstr "与远程 %s 合并"
18848
18849 #: builtin/remote.c:1065
18850 #, c-format
18851 msgid "%-*s and with remote %s\n"
18852 msgstr "%-*s 以及和远程 %s\n"
18853
18854 #: builtin/remote.c:1108
18855 msgid "create"
18856 msgstr "创建"
18857
18858 #: builtin/remote.c:1111
18859 msgid "delete"
18860 msgstr "删除"
18861
18862 #: builtin/remote.c:1115
18863 msgid "up to date"
18864 msgstr "最新"
18865
18866 #: builtin/remote.c:1118
18867 msgid "fast-forwardable"
18868 msgstr "可快进"
18869
18870 #: builtin/remote.c:1121
18871 msgid "local out of date"
18872 msgstr "本地已过时"
18873
18874 #: builtin/remote.c:1128
18875 #, c-format
18876 msgid " %-*s forces to %-*s (%s)"
18877 msgstr " %-*s 强制推送至 %-*s (%s)"
18878
18879 #: builtin/remote.c:1131
18880 #, c-format
18881 msgid " %-*s pushes to %-*s (%s)"
18882 msgstr " %-*s 推送至 %-*s (%s)"
18883
18884 #: builtin/remote.c:1135
18885 #, c-format
18886 msgid " %-*s forces to %s"
18887 msgstr " %-*s 强制推送至 %s"
18888
18889 #: builtin/remote.c:1138
18890 #, c-format
18891 msgid " %-*s pushes to %s"
18892 msgstr " %-*s 推送至 %s"
18893
18894 #: builtin/remote.c:1206
18895 msgid "do not query remotes"
18896 msgstr "不查询远程"
18897
18898 #: builtin/remote.c:1233
18899 #, c-format
18900 msgid "* remote %s"
18901 msgstr "* 远程 %s"
18902
18903 #: builtin/remote.c:1234
18904 #, c-format
18905 msgid " Fetch URL: %s"
18906 msgstr " 获取地址:%s"
18907
18908 #: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
18909 msgid "(no URL)"
18910 msgstr "(无 URL)"
18911
18912 #. TRANSLATORS: the colon ':' should align
18913 #. with the one in " Fetch URL: %s"
18914 #. translation.
18915 #.
18916 #: builtin/remote.c:1249 builtin/remote.c:1251
18917 #, c-format
18918 msgid " Push URL: %s"
18919 msgstr " 推送地址:%s"
18920
18921 #: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
18922 #, c-format
18923 msgid " HEAD branch: %s"
18924 msgstr " HEAD 分支:%s"
18925
18926 # 译者:中文字符串拼接,可删除前导空格
18927 #: builtin/remote.c:1253
18928 msgid "(not queried)"
18929 msgstr "(未查询)"
18930
18931 #: builtin/remote.c:1255
18932 msgid "(unknown)"
18933 msgstr "(未知)"
18934
18935 #: builtin/remote.c:1259
18936 #, c-format
18937 msgid ""
18938 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
18939 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
18940
18941 #: builtin/remote.c:1271
18942 #, c-format
18943 msgid " Remote branch:%s"
18944 msgid_plural " Remote branches:%s"
18945 msgstr[0] " 远程分支:%s"
18946 msgstr[1] " 远程分支:%s"
18947
18948 # 译者:中文字符串拼接,可删除前导空格
18949 #: builtin/remote.c:1274 builtin/remote.c:1300
18950 msgid " (status not queried)"
18951 msgstr "(状态未查询)"
18952
18953 #: builtin/remote.c:1283
18954 msgid " Local branch configured for 'git pull':"
18955 msgid_plural " Local branches configured for 'git pull':"
18956 msgstr[0] " 为 'git pull' 配置的本地分支:"
18957 msgstr[1] " 为 'git pull' 配置的本地分支:"
18958
18959 #: builtin/remote.c:1291
18960 msgid " Local refs will be mirrored by 'git push'"
18961 msgstr " 本地引用将在 'git push' 时被镜像"
18962
18963 #: builtin/remote.c:1297
18964 #, c-format
18965 msgid " Local ref configured for 'git push'%s:"
18966 msgid_plural " Local refs configured for 'git push'%s:"
18967 msgstr[0] " 为 'git push' 配置的本地引用%s:"
18968 msgstr[1] " 为 'git push' 配置的本地引用%s:"
18969
18970 #: builtin/remote.c:1318
18971 msgid "set refs/remotes/<name>/HEAD according to remote"
18972 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
18973
18974 #: builtin/remote.c:1320
18975 msgid "delete refs/remotes/<name>/HEAD"
18976 msgstr "删除 refs/remotes/<名称>/HEAD"
18977
18978 #: builtin/remote.c:1335
18979 msgid "Cannot determine remote HEAD"
18980 msgstr "无法确定远程 HEAD"
18981
18982 #: builtin/remote.c:1337
18983 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
18984 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
18985
18986 #: builtin/remote.c:1347
18987 #, c-format
18988 msgid "Could not delete %s"
18989 msgstr "无法删除 %s"
18990
18991 #: builtin/remote.c:1355
18992 #, c-format
18993 msgid "Not a valid ref: %s"
18994 msgstr "不是一个有效引用:%s"
18995
18996 #: builtin/remote.c:1357
18997 #, c-format
18998 msgid "Could not setup %s"
18999 msgstr "不能设置 %s"
19000
19001 # 译者:注意保持前导空格
19002 #: builtin/remote.c:1375
19003 #, c-format
19004 msgid " %s will become dangling!"
19005 msgstr " %s 将成为悬空状态!"
19006
19007 # 译者:注意保持前导空格
19008 #: builtin/remote.c:1376
19009 #, c-format
19010 msgid " %s has become dangling!"
19011 msgstr " %s 已成为悬空状态!"
19012
19013 #: builtin/remote.c:1386
19014 #, c-format
19015 msgid "Pruning %s"
19016 msgstr "修剪 %s"
19017
19018 #: builtin/remote.c:1387
19019 #, c-format
19020 msgid "URL: %s"
19021 msgstr "URL:%s"
19022
19023 #: builtin/remote.c:1403
19024 #, c-format
19025 msgid " * [would prune] %s"
19026 msgstr " * [将删除] %s"
19027
19028 #: builtin/remote.c:1406
19029 #, c-format
19030 msgid " * [pruned] %s"
19031 msgstr " * [已删除] %s"
19032
19033 #: builtin/remote.c:1451
19034 msgid "prune remotes after fetching"
19035 msgstr "抓取后清除远程"
19036
19037 #: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
19038 #, c-format
19039 msgid "No such remote '%s'"
19040 msgstr "没有此远程 '%s'"
19041
19042 #: builtin/remote.c:1530
19043 msgid "add branch"
19044 msgstr "添加分支"
19045
19046 #: builtin/remote.c:1537
19047 msgid "no remote specified"
19048 msgstr "未指定远程"
19049
19050 #: builtin/remote.c:1554
19051 msgid "query push URLs rather than fetch URLs"
19052 msgstr "查询推送 URL 地址,而非获取 URL 地址"
19053
19054 #: builtin/remote.c:1556
19055 msgid "return all URLs"
19056 msgstr "返回所有 URL 地址"
19057
19058 #: builtin/remote.c:1584
19059 #, c-format
19060 msgid "no URLs configured for remote '%s'"
19061 msgstr "没有给远程仓库 '%s' 设定 URL"
19062
19063 #: builtin/remote.c:1610
19064 msgid "manipulate push URLs"
19065 msgstr "操作推送 URLS"
19066
19067 #: builtin/remote.c:1612
19068 msgid "add URL"
19069 msgstr "添加 URL"
19070
19071 #: builtin/remote.c:1614
19072 msgid "delete URLs"
19073 msgstr "删除 URLS"
19074
19075 #: builtin/remote.c:1621
19076 msgid "--add --delete doesn't make sense"
19077 msgstr "--add --delete 无意义"
19078
19079 #: builtin/remote.c:1660
19080 #, c-format
19081 msgid "Invalid old URL pattern: %s"
19082 msgstr "无效的旧 URL 匹配模版:%s"
19083
19084 #: builtin/remote.c:1668
19085 #, c-format
19086 msgid "No such URL found: %s"
19087 msgstr "未找到此 URL:%s"
19088
19089 #: builtin/remote.c:1670
19090 msgid "Will not delete all non-push URLs"
19091 msgstr "将不会删除所有非推送 URL 地址"
19092
19093 #: builtin/repack.c:23
19094 msgid "git repack [<options>]"
19095 msgstr "git repack [<选项>]"
19096
19097 #: builtin/repack.c:28
19098 msgid ""
19099 "Incremental repacks are incompatible with bitmap indexes. Use\n"
19100 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
19101 msgstr ""
19102 "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
19103 "或禁用 pack.writebitmaps 配置。"
19104
19105 #: builtin/repack.c:191
19106 msgid "could not start pack-objects to repack promisor objects"
19107 msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
19108
19109 #: builtin/repack.c:230 builtin/repack.c:416
19110 msgid "repack: Expecting full hex object ID lines only from pack-objects."
19111 msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。"
19112
19113 #: builtin/repack.c:254
19114 msgid "could not finish pack-objects to repack promisor objects"
19115 msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
19116
19117 #: builtin/repack.c:292
19118 msgid "pack everything in a single pack"
19119 msgstr "所有内容打包到一个包文件中"
19120
19121 #: builtin/repack.c:294
19122 msgid "same as -a, and turn unreachable objects loose"
19123 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
19124
19125 #: builtin/repack.c:297
19126 msgid "remove redundant packs, and run git-prune-packed"
19127 msgstr "删除多余的包,运行 git-prune-packed"
19128
19129 #: builtin/repack.c:299
19130 msgid "pass --no-reuse-delta to git-pack-objects"
19131 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
19132
19133 #: builtin/repack.c:301
19134 msgid "pass --no-reuse-object to git-pack-objects"
19135 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
19136
19137 #: builtin/repack.c:303
19138 msgid "do not run git-update-server-info"
19139 msgstr "不运行 git-update-server-info"
19140
19141 #: builtin/repack.c:306
19142 msgid "pass --local to git-pack-objects"
19143 msgstr "向 git-pack-objects 传递参数 --local"
19144
19145 #: builtin/repack.c:308
19146 msgid "write bitmap index"
19147 msgstr "写 bitmap 索引"
19148
19149 #: builtin/repack.c:310
19150 msgid "pass --delta-islands to git-pack-objects"
19151 msgstr "向 git-pack-objects 传递参数 --delta-islands"
19152
19153 #: builtin/repack.c:311
19154 msgid "approxidate"
19155 msgstr "近似日期"
19156
19157 #: builtin/repack.c:312
19158 msgid "with -A, do not loosen objects older than this"
19159 msgstr "使用 -A,不要将早于给定时间的对象过期"
19160
19161 #: builtin/repack.c:314
19162 msgid "with -a, repack unreachable objects"
19163 msgstr "使用 -a ,重新对不可达对象打包"
19164
19165 #: builtin/repack.c:316
19166 msgid "size of the window used for delta compression"
19167 msgstr "用于增量压缩的窗口值"
19168
19169 #: builtin/repack.c:317 builtin/repack.c:323
19170 msgid "bytes"
19171 msgstr "字节"
19172
19173 #: builtin/repack.c:318
19174 msgid "same as the above, but limit memory size instead of entries count"
19175 msgstr "和上面的相似,但限制内存大小而非条目数"
19176
19177 #: builtin/repack.c:320
19178 msgid "limits the maximum delta depth"
19179 msgstr "限制最大增量深度"
19180
19181 #: builtin/repack.c:322
19182 msgid "limits the maximum number of threads"
19183 msgstr "限制最大线程数"
19184
19185 #: builtin/repack.c:324
19186 msgid "maximum size of each packfile"
19187 msgstr "每个包文件的最大尺寸"
19188
19189 #: builtin/repack.c:326
19190 msgid "repack objects in packs marked with .keep"
19191 msgstr "对标记为 .keep 的包中的对象重新打包"
19192
19193 #: builtin/repack.c:328
19194 msgid "do not repack this pack"
19195 msgstr "不要对该包文件重新打包"
19196
19197 #: builtin/repack.c:338
19198 msgid "cannot delete packs in a precious-objects repo"
19199 msgstr "不能删除珍品仓库中的打包文件"
19200
19201 #: builtin/repack.c:342
19202 msgid "--keep-unreachable and -A are incompatible"
19203 msgstr "--keep-unreachable 和 -A 不兼容"
19204
19205 #: builtin/repack.c:425
19206 msgid "Nothing new to pack."
19207 msgstr "没有新的要打包。"
19208
19209 #: builtin/repack.c:486
19210 #, c-format
19211 msgid ""
19212 "WARNING: Some packs in use have been renamed by\n"
19213 "WARNING: prefixing old- to their name, in order to\n"
19214 "WARNING: replace them with the new version of the\n"
19215 "WARNING: file. But the operation failed, and the\n"
19216 "WARNING: attempt to rename them back to their\n"
19217 "WARNING: original names also failed.\n"
19218 "WARNING: Please rename them in %s manually:\n"
19219 msgstr ""
19220 "警告:为了将包文件替换为新版本,一些使用中的包已经\n"
19221 "警告:通过添加 old- 前缀的方式重命名。但是操作失败,\n"
19222 "警告:并且尝试重命名改回原有文件名的操作也失败。\n"
19223 "警告:请手动将 %s 下的这些文件重命名:\n"
19224
19225 #: builtin/repack.c:534
19226 #, c-format
19227 msgid "failed to remove '%s'"
19228 msgstr "删除 '%s' 失败"
19229
19230 #: builtin/replace.c:22
19231 msgid "git replace [-f] <object> <replacement>"
19232 msgstr "git replace [-f] <对象> <替换物>"
19233
19234 #: builtin/replace.c:23
19235 msgid "git replace [-f] --edit <object>"
19236 msgstr "git replace [-f] --edit <对象>"
19237
19238 #: builtin/replace.c:24
19239 msgid "git replace [-f] --graft <commit> [<parent>...]"
19240 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
19241
19242 #: builtin/replace.c:25
19243 msgid "git replace [-f] --convert-graft-file"
19244 msgstr "git replace [-f] --convert-graft-file"
19245
19246 #: builtin/replace.c:26
19247 msgid "git replace -d <object>..."
19248 msgstr "git replace -d <对象>..."
19249
19250 #: builtin/replace.c:27
19251 msgid "git replace [--format=<format>] [-l [<pattern>]]"
19252 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
19253
19254 #: builtin/replace.c:90
19255 #, c-format
19256 msgid ""
19257 "invalid replace format '%s'\n"
19258 "valid formats are 'short', 'medium' and 'long'"
19259 msgstr ""
19260 "无效的替换格式 '%s'\n"
19261 "有效的格式有 'short'、'medium' 和 'long'"
19262
19263 #: builtin/replace.c:125
19264 #, c-format
19265 msgid "replace ref '%s' not found"
19266 msgstr "未发现替换引用 '%s'"
19267
19268 #: builtin/replace.c:141
19269 #, c-format
19270 msgid "Deleted replace ref '%s'"
19271 msgstr "已删除替换引用 '%s'"
19272
19273 #: builtin/replace.c:153
19274 #, c-format
19275 msgid "'%s' is not a valid ref name"
19276 msgstr "'%s' 不是一个有效的引用名"
19277
19278 #: builtin/replace.c:158
19279 #, c-format
19280 msgid "replace ref '%s' already exists"
19281 msgstr "替换引用 '%s' 已经存在"
19282
19283 #: builtin/replace.c:178
19284 #, c-format
19285 msgid ""
19286 "Objects must be of the same type.\n"
19287 "'%s' points to a replaced object of type '%s'\n"
19288 "while '%s' points to a replacement object of type '%s'."
19289 msgstr ""
19290 "对象必须属于同一类型。\n"
19291 "'%s' 指向 '%s' 类型的替换对象\n"
19292 "而 '%s' 指向 '%s' 类型的替换对象。"
19293
19294 #: builtin/replace.c:229
19295 #, c-format
19296 msgid "unable to open %s for writing"
19297 msgstr "无法为写入打开 %s"
19298
19299 #: builtin/replace.c:242
19300 msgid "cat-file reported failure"
19301 msgstr "cat-file 报告失败"
19302
19303 #: builtin/replace.c:258
19304 #, c-format
19305 msgid "unable to open %s for reading"
19306 msgstr "无法为读取打开 %s"
19307
19308 #: builtin/replace.c:272
19309 msgid "unable to spawn mktree"
19310 msgstr "无法启动 mktree"
19311
19312 #: builtin/replace.c:276
19313 msgid "unable to read from mktree"
19314 msgstr "无法从 mktree 读取"
19315
19316 #: builtin/replace.c:285
19317 msgid "mktree reported failure"
19318 msgstr "mktree 报告失败"
19319
19320 #: builtin/replace.c:289
19321 msgid "mktree did not return an object name"
19322 msgstr "mktree 没有返回一个对象名"
19323
19324 #: builtin/replace.c:298
19325 #, c-format
19326 msgid "unable to fstat %s"
19327 msgstr "无法对 %s 执行 fstat"
19328
19329 #: builtin/replace.c:303
19330 msgid "unable to write object to database"
19331 msgstr "无法向数据库写入对象"
19332
19333 #: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
19334 #: builtin/replace.c:454
19335 #, c-format
19336 msgid "not a valid object name: '%s'"
19337 msgstr "不是一个有效的对象名:'%s'"
19338
19339 #: builtin/replace.c:326
19340 #, c-format
19341 msgid "unable to get object type for %s"
19342 msgstr "无法得到 %s 的对象类型"
19343
19344 #: builtin/replace.c:342
19345 msgid "editing object file failed"
19346 msgstr "编辑对象文件失败"
19347
19348 #: builtin/replace.c:351
19349 #, c-format
19350 msgid "new object is the same as the old one: '%s'"
19351 msgstr "新对象和旧对象相同:'%s'"
19352
19353 #: builtin/replace.c:384
19354 #, c-format
19355 msgid "could not parse %s as a commit"
19356 msgstr "无法将 %s 解析为一个提交"
19357
19358 #: builtin/replace.c:416
19359 #, c-format
19360 msgid "bad mergetag in commit '%s'"
19361 msgstr "提交 '%s' 中含有损坏的合并标签"
19362
19363 #: builtin/replace.c:418
19364 #, c-format
19365 msgid "malformed mergetag in commit '%s'"
19366 msgstr "提交 '%s' 中含有格式错误的合并标签"
19367
19368 #: builtin/replace.c:430
19369 #, c-format
19370 msgid ""
19371 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
19372 "instead of --graft"
19373 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
19374
19375 #: builtin/replace.c:469
19376 #, c-format
19377 msgid "the original commit '%s' has a gpg signature"
19378 msgstr "原始提交 '%s' 中有一个 gpg 签名"
19379
19380 #: builtin/replace.c:470
19381 msgid "the signature will be removed in the replacement commit!"
19382 msgstr "在替换的提交中签名将被移除!"
19383
19384 #: builtin/replace.c:480
19385 #, c-format
19386 msgid "could not write replacement commit for: '%s'"
19387 msgstr "不能为 '%s' 写替换提交"
19388
19389 #: builtin/replace.c:488
19390 #, c-format
19391 msgid "graft for '%s' unnecessary"
19392 msgstr "对 '%s' 移植没有必要"
19393
19394 #: builtin/replace.c:492
19395 #, c-format
19396 msgid "new commit is the same as the old one: '%s'"
19397 msgstr "新提交和旧的一样:'%s'"
19398
19399 #: builtin/replace.c:527
19400 #, c-format
19401 msgid ""
19402 "could not convert the following graft(s):\n"
19403 "%s"
19404 msgstr ""
19405 "不能转换下列移植:\n"
19406 "%s"
19407
19408 #: builtin/replace.c:548
19409 msgid "list replace refs"
19410 msgstr "列出替换的引用"
19411
19412 #: builtin/replace.c:549
19413 msgid "delete replace refs"
19414 msgstr "删除替换的引用"
19415
19416 #: builtin/replace.c:550
19417 msgid "edit existing object"
19418 msgstr "编辑现存的对象"
19419
19420 #: builtin/replace.c:551
19421 msgid "change a commit's parents"
19422 msgstr "修改一个提交的父提交"
19423
19424 #: builtin/replace.c:552
19425 msgid "convert existing graft file"
19426 msgstr "转换现存的移植文件"
19427
19428 #: builtin/replace.c:553
19429 msgid "replace the ref if it exists"
19430 msgstr "如果存在则替换引用"
19431
19432 #: builtin/replace.c:555
19433 msgid "do not pretty-print contents for --edit"
19434 msgstr "不要为 --edit 操作美观显示内容"
19435
19436 #: builtin/replace.c:556
19437 msgid "use this format"
19438 msgstr "使用此格式"
19439
19440 #: builtin/replace.c:569
19441 msgid "--format cannot be used when not listing"
19442 msgstr "不列出时不能使用 --format"
19443
19444 #: builtin/replace.c:577
19445 msgid "-f only makes sense when writing a replacement"
19446 msgstr "只有写一个替换时 -f 才有意义"
19447
19448 #: builtin/replace.c:581
19449 msgid "--raw only makes sense with --edit"
19450 msgstr "--raw 只有和 --edit 共用才有意义"
19451
19452 #: builtin/replace.c:587
19453 msgid "-d needs at least one argument"
19454 msgstr "-d 需要至少一个参数"
19455
19456 #: builtin/replace.c:593
19457 msgid "bad number of arguments"
19458 msgstr "错误的参数个数"
19459
19460 #: builtin/replace.c:599
19461 msgid "-e needs exactly one argument"
19462 msgstr "-e 需要且仅需要一个参数"
19463
19464 #: builtin/replace.c:605
19465 msgid "-g needs at least one argument"
19466 msgstr "-g 需要至少一个参数"
19467
19468 #: builtin/replace.c:611
19469 msgid "--convert-graft-file takes no argument"
19470 msgstr "--convert-graft-file 不带参数"
19471
19472 #: builtin/replace.c:617
19473 msgid "only one pattern can be given with -l"
19474 msgstr "只能为 -l 提供一个模式"
19475
19476 #: builtin/rerere.c:13
19477 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
19478 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
19479
19480 #: builtin/rerere.c:60
19481 msgid "register clean resolutions in index"
19482 msgstr "在索引中注册干净的解决方案"
19483
19484 #: builtin/rerere.c:79
19485 msgid "'git rerere forget' without paths is deprecated"
19486 msgstr "没有路径的 'git rerere forget' 已经过时"
19487
19488 #: builtin/rerere.c:113
19489 #, c-format
19490 msgid "unable to generate diff for '%s'"
19491 msgstr "无法为 '%s' 生成差异"
19492
19493 #: builtin/reset.c:32
19494 msgid ""
19495 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
19496 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
19497
19498 #: builtin/reset.c:33
19499 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
19500 msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
19501
19502 #: builtin/reset.c:34
19503 msgid ""
19504 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
19505 msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
19506
19507 #: builtin/reset.c:35
19508 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
19509 msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"
19510
19511 #: builtin/reset.c:41
19512 msgid "mixed"
19513 msgstr "混杂"
19514
19515 #: builtin/reset.c:41
19516 msgid "soft"
19517 msgstr "软性"
19518
19519 #: builtin/reset.c:41
19520 msgid "hard"
19521 msgstr "硬性"
19522
19523 #: builtin/reset.c:41
19524 msgid "merge"
19525 msgstr "合并"
19526
19527 #: builtin/reset.c:41
19528 msgid "keep"
19529 msgstr "保持"
19530
19531 #: builtin/reset.c:82
19532 msgid "You do not have a valid HEAD."
19533 msgstr "您没有一个有效的 HEAD。"
19534
19535 #: builtin/reset.c:84
19536 msgid "Failed to find tree of HEAD."
19537 msgstr "无法找到 HEAD 指向的树。"
19538
19539 #: builtin/reset.c:90
19540 #, c-format
19541 msgid "Failed to find tree of %s."
19542 msgstr "无法找到 %s 指向的树。"
19543
19544 #: builtin/reset.c:115
19545 #, c-format
19546 msgid "HEAD is now at %s"
19547 msgstr "HEAD 现在位于 %s"
19548
19549 # 译者:汉字之间无空格,故删除%s前后空格
19550 #: builtin/reset.c:194
19551 #, c-format
19552 msgid "Cannot do a %s reset in the middle of a merge."
19553 msgstr "在合并过程中不能做%s重置操作。"
19554
19555 #: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
19556 #: builtin/stash.c:619
19557 msgid "be quiet, only report errors"
19558 msgstr "安静模式,只报告错误"
19559
19560 #: builtin/reset.c:296
19561 msgid "reset HEAD and index"
19562 msgstr "重置 HEAD 和索引"
19563
19564 #: builtin/reset.c:297
19565 msgid "reset only HEAD"
19566 msgstr "只重置 HEAD"
19567
19568 #: builtin/reset.c:299 builtin/reset.c:301
19569 msgid "reset HEAD, index and working tree"
19570 msgstr "重置 HEAD、索引和工作区"
19571
19572 #: builtin/reset.c:303
19573 msgid "reset HEAD but keep local changes"
19574 msgstr "重置 HEAD 但保存本地变更"
19575
19576 #: builtin/reset.c:309
19577 msgid "record only the fact that removed paths will be added later"
19578 msgstr "将删除的路径标记为稍后添加"
19579
19580 #: builtin/reset.c:343
19581 #, c-format
19582 msgid "Failed to resolve '%s' as a valid revision."
19583 msgstr "无法将 '%s' 解析为一个有效的版本。"
19584
19585 #: builtin/reset.c:351
19586 #, c-format
19587 msgid "Failed to resolve '%s' as a valid tree."
19588 msgstr "无法将 '%s' 解析为一个有效的树对象。"
19589
19590 #: builtin/reset.c:360
19591 msgid "--patch is incompatible with --{hard,mixed,soft}"
19592 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
19593
19594 #: builtin/reset.c:370
19595 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
19596 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
19597
19598 # 译者:汉字之间无空格,故删除%s前后空格
19599 #: builtin/reset.c:372
19600 #, c-format
19601 msgid "Cannot do %s reset with paths."
19602 msgstr "不能带路径进行%s重置。"
19603
19604 # 译者:汉字之间无空格,故删除%s前后空格
19605 #: builtin/reset.c:387
19606 #, c-format
19607 msgid "%s reset is not allowed in a bare repository"
19608 msgstr "不能对纯仓库进行%s重置"
19609
19610 #: builtin/reset.c:391
19611 msgid "-N can only be used with --mixed"
19612 msgstr "-N 只能和 --mixed 同时使用"
19613
19614 #: builtin/reset.c:412
19615 msgid "Unstaged changes after reset:"
19616 msgstr "重置后取消暂存的变更:"
19617
19618 #: builtin/reset.c:415
19619 #, c-format
19620 msgid ""
19621 "\n"
19622 "It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
19623 "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
19624 "to make this the default.\n"
19625 msgstr ""
19626 "\n"
19627 "重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
19628 "将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
19629
19630 #: builtin/reset.c:425
19631 #, c-format
19632 msgid "Could not reset index file to revision '%s'."
19633 msgstr "不能重置索引文件至版本 '%s'。"
19634
19635 #: builtin/reset.c:429
19636 msgid "Could not write new index file."
19637 msgstr "不能写入新的索引文件。"
19638
19639 #: builtin/rev-list.c:499
19640 msgid "cannot combine --exclude-promisor-objects and --missing"
19641 msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
19642
19643 #: builtin/rev-list.c:560
19644 msgid "object filtering requires --objects"
19645 msgstr "对象过滤需要 --objects"
19646
19647 #: builtin/rev-list.c:610
19648 msgid "rev-list does not support display of notes"
19649 msgstr "rev-list 不支持显示注解"
19650
19651 #: builtin/rev-list.c:615
19652 msgid "marked counting is incompatible with --objects"
19653 msgstr "标记计数和 --objects 不兼容"
19654
19655 #: builtin/rev-parse.c:408
19656 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
19657 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
19658
19659 #: builtin/rev-parse.c:413
19660 msgid "keep the `--` passed as an arg"
19661 msgstr "保持 `--` 作为一个参数传递"
19662
19663 #: builtin/rev-parse.c:415
19664 msgid "stop parsing after the first non-option argument"
19665 msgstr "遇到第一个非选项参数后停止解析"
19666
19667 #: builtin/rev-parse.c:418
19668 msgid "output in stuck long form"
19669 msgstr "以固定长格式输出"
19670
19671 #: builtin/rev-parse.c:551
19672 msgid ""
19673 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
19674 " or: git rev-parse --sq-quote [<arg>...]\n"
19675 " or: git rev-parse [<options>] [<arg>...]\n"
19676 "\n"
19677 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
19678 msgstr ""
19679 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
19680 " 或者:git rev-parse --sq-quote [<参数>...]\n"
19681 " 或者:git rev-parse [<选项>] [<参数>...]\n"
19682 "\n"
19683 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
19684
19685 #: builtin/revert.c:24
19686 msgid "git revert [<options>] <commit-ish>..."
19687 msgstr "git revert [<选项>] <提交号>..."
19688
19689 #: builtin/revert.c:25
19690 msgid "git revert <subcommand>"
19691 msgstr "git revert <子命令>"
19692
19693 #: builtin/revert.c:30
19694 msgid "git cherry-pick [<options>] <commit-ish>..."
19695 msgstr "git cherry-pick [<选项>] <提交号>..."
19696
19697 #: builtin/revert.c:31
19698 msgid "git cherry-pick <subcommand>"
19699 msgstr "git cherry-pick <子命令>"
19700
19701 #: builtin/revert.c:72
19702 #, c-format
19703 msgid "option `%s' expects a number greater than zero"
19704 msgstr "选项 `%s' 期望一个大于零的数字"
19705
19706 #: builtin/revert.c:92
19707 #, c-format
19708 msgid "%s: %s cannot be used with %s"
19709 msgstr "%s:%s 不能和 %s 同时使用"
19710
19711 #: builtin/revert.c:102
19712 msgid "end revert or cherry-pick sequence"
19713 msgstr "终止反转或拣选操作"
19714
19715 #: builtin/revert.c:103
19716 msgid "resume revert or cherry-pick sequence"
19717 msgstr "继续反转或拣选操作"
19718
19719 #: builtin/revert.c:104
19720 msgid "cancel revert or cherry-pick sequence"
19721 msgstr "取消反转或拣选操作"
19722
19723 #: builtin/revert.c:105
19724 msgid "skip current commit and continue"
19725 msgstr "跳过当前提交并继续"
19726
19727 #: builtin/revert.c:107
19728 msgid "don't automatically commit"
19729 msgstr "不要自动提交"
19730
19731 #: builtin/revert.c:108
19732 msgid "edit the commit message"
19733 msgstr "编辑提交说明"
19734
19735 #: builtin/revert.c:111
19736 msgid "parent-number"
19737 msgstr "父编号"
19738
19739 #: builtin/revert.c:112
19740 msgid "select mainline parent"
19741 msgstr "选择主干父提交编号"
19742
19743 #: builtin/revert.c:114
19744 msgid "merge strategy"
19745 msgstr "合并策略"
19746
19747 #: builtin/revert.c:116
19748 msgid "option for merge strategy"
19749 msgstr "合并策略的选项"
19750
19751 #: builtin/revert.c:125
19752 msgid "append commit name"
19753 msgstr "追加提交名称"
19754
19755 #: builtin/revert.c:127
19756 msgid "preserve initially empty commits"
19757 msgstr "保留初始化的空提交"
19758
19759 #: builtin/revert.c:129
19760 msgid "keep redundant, empty commits"
19761 msgstr "保持多余的、空的提交"
19762
19763 #: builtin/revert.c:232
19764 msgid "revert failed"
19765 msgstr "还原失败"
19766
19767 #: builtin/revert.c:245
19768 msgid "cherry-pick failed"
19769 msgstr "拣选失败"
19770
19771 #: builtin/rm.c:19
19772 msgid "git rm [<options>] [--] <file>..."
19773 msgstr "git rm [<选项>] [--] <文件>..."
19774
19775 #: builtin/rm.c:207
19776 msgid ""
19777 "the following file has staged content different from both the\n"
19778 "file and the HEAD:"
19779 msgid_plural ""
19780 "the following files have staged content different from both the\n"
19781 "file and the HEAD:"
19782 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
19783 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
19784
19785 #: builtin/rm.c:212
19786 msgid ""
19787 "\n"
19788 "(use -f to force removal)"
19789 msgstr ""
19790 "\n"
19791 "(使用 -f 强制删除)"
19792
19793 #: builtin/rm.c:216
19794 msgid "the following file has changes staged in the index:"
19795 msgid_plural "the following files have changes staged in the index:"
19796 msgstr[0] "下列文件索引中有变更"
19797 msgstr[1] "下列文件索引中有变更"
19798
19799 #: builtin/rm.c:220 builtin/rm.c:229
19800 msgid ""
19801 "\n"
19802 "(use --cached to keep the file, or -f to force removal)"
19803 msgstr ""
19804 "\n"
19805 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
19806
19807 #: builtin/rm.c:226
19808 msgid "the following file has local modifications:"
19809 msgid_plural "the following files have local modifications:"
19810 msgstr[0] "如下文件有本地修改:"
19811 msgstr[1] "如下文件有本地修改:"
19812
19813 #: builtin/rm.c:243
19814 msgid "do not list removed files"
19815 msgstr "不列出删除的文件"
19816
19817 #: builtin/rm.c:244
19818 msgid "only remove from the index"
19819 msgstr "只从索引区删除"
19820
19821 #: builtin/rm.c:245
19822 msgid "override the up-to-date check"
19823 msgstr "忽略文件更新状态检查"
19824
19825 #: builtin/rm.c:246
19826 msgid "allow recursive removal"
19827 msgstr "允许递归删除"
19828
19829 #: builtin/rm.c:248
19830 msgid "exit with a zero status even if nothing matched"
19831 msgstr "即使没有匹配,也以零状态退出"
19832
19833 #: builtin/rm.c:282
19834 msgid "No pathspec was given. Which files should I remove?"
19835 msgstr "没有提供路径规格。我应该删除哪些文件?"
19836
19837 #: builtin/rm.c:305
19838 msgid "please stage your changes to .gitmodules or stash them to proceed"
19839 msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
19840
19841 #: builtin/rm.c:323
19842 #, c-format
19843 msgid "not removing '%s' recursively without -r"
19844 msgstr "未提供 -r 选项不会递归删除 '%s'"
19845
19846 #: builtin/rm.c:362
19847 #, c-format
19848 msgid "git rm: unable to remove %s"
19849 msgstr "git rm:不能删除 %s"
19850
19851 #: builtin/send-pack.c:20
19852 msgid ""
19853 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
19854 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
19855 "[<ref>...]\n"
19856 " --all and explicit <ref> specification are mutually exclusive."
19857 msgstr ""
19858 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
19859 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
19860 " --all 和明确的 <引用> 互斥。"
19861
19862 #: builtin/send-pack.c:163
19863 msgid "remote name"
19864 msgstr "远程名称"
19865
19866 #: builtin/send-pack.c:177
19867 msgid "use stateless RPC protocol"
19868 msgstr "使用无状态的 RPC 协议"
19869
19870 #: builtin/send-pack.c:178
19871 msgid "read refs from stdin"
19872 msgstr "从标准输入读取引用"
19873
19874 #: builtin/send-pack.c:179
19875 msgid "print status from remote helper"
19876 msgstr "打印来自远程 helper 的状态"
19877
19878 #: builtin/shortlog.c:14
19879 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
19880 msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
19881
19882 #: builtin/shortlog.c:15
19883 msgid "git log --pretty=short | git shortlog [<options>]"
19884 msgstr "git log --pretty=short | git shortlog [<选项>]"
19885
19886 #: builtin/shortlog.c:264
19887 msgid "Group by committer rather than author"
19888 msgstr "按照提交者分组而不是作者"
19889
19890 #: builtin/shortlog.c:266
19891 msgid "sort output according to the number of commits per author"
19892 msgstr "根据每个作者的提交数量排序"
19893
19894 #: builtin/shortlog.c:268
19895 msgid "Suppress commit descriptions, only provides commit count"
19896 msgstr "隐藏提交说明,只提供提交数量"
19897
19898 #: builtin/shortlog.c:270
19899 msgid "Show the email address of each author"
19900 msgstr "显示每个作者的电子邮件地址"
19901
19902 #: builtin/shortlog.c:271
19903 msgid "<w>[,<i1>[,<i2>]]"
19904 msgstr "<w>[,<i1>[,<i2>]]"
19905
19906 #: builtin/shortlog.c:272
19907 msgid "Linewrap output"
19908 msgstr "折行输出"
19909
19910 #: builtin/shortlog.c:301
19911 msgid "too many arguments given outside repository"
19912 msgstr "仓库外执行提供了太多的参数"
19913
19914 #: builtin/show-branch.c:13
19915 msgid ""
19916 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
19917 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
19918 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
19919 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
19920 msgstr ""
19921 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
19922 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
19923 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
19924 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
19925
19926 #: builtin/show-branch.c:17
19927 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
19928 msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
19929
19930 #: builtin/show-branch.c:395
19931 #, c-format
19932 msgid "ignoring %s; cannot handle more than %d ref"
19933 msgid_plural "ignoring %s; cannot handle more than %d refs"
19934 msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
19935 msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
19936
19937 #: builtin/show-branch.c:548
19938 #, c-format
19939 msgid "no matching refs with %s"
19940 msgstr "没有和 %s 匹配的引用"
19941
19942 #: builtin/show-branch.c:645
19943 msgid "show remote-tracking and local branches"
19944 msgstr "显示远程跟踪的和本地的分支"
19945
19946 #: builtin/show-branch.c:647
19947 msgid "show remote-tracking branches"
19948 msgstr "显示远程跟踪的分支"
19949
19950 #: builtin/show-branch.c:649
19951 msgid "color '*!+-' corresponding to the branch"
19952 msgstr "着色 '*!+-' 到相应的分支"
19953
19954 #: builtin/show-branch.c:651
19955 msgid "show <n> more commits after the common ancestor"
19956 msgstr "显示共同祖先后的 <n> 个提交"
19957
19958 #: builtin/show-branch.c:653
19959 msgid "synonym to more=-1"
19960 msgstr "和 more=-1 同义"
19961
19962 #: builtin/show-branch.c:654
19963 msgid "suppress naming strings"
19964 msgstr "不显示字符串命名"
19965
19966 #: builtin/show-branch.c:656
19967 msgid "include the current branch"
19968 msgstr "包括当前分支"
19969
19970 #: builtin/show-branch.c:658
19971 msgid "name commits with their object names"
19972 msgstr "以对象名字命名提交"
19973
19974 #: builtin/show-branch.c:660
19975 msgid "show possible merge bases"
19976 msgstr "显示可能合并的基线"
19977
19978 #: builtin/show-branch.c:662
19979 msgid "show refs unreachable from any other ref"
19980 msgstr "显示没有任何引用的的引用"
19981
19982 #: builtin/show-branch.c:664
19983 msgid "show commits in topological order"
19984 msgstr "以拓扑顺序显示提交"
19985
19986 #: builtin/show-branch.c:667
19987 msgid "show only commits not on the first branch"
19988 msgstr "只显示不在第一个分支上的提交"
19989
19990 #: builtin/show-branch.c:669
19991 msgid "show merges reachable from only one tip"
19992 msgstr "显示仅一个分支可访问的合并提交"
19993
19994 #: builtin/show-branch.c:671
19995 msgid "topologically sort, maintaining date order where possible"
19996 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
19997
19998 #: builtin/show-branch.c:674
19999 msgid "<n>[,<base>]"
20000 msgstr "<n>[,<base>]"
20001
20002 #: builtin/show-branch.c:675
20003 msgid "show <n> most recent ref-log entries starting at base"
20004 msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
20005
20006 #: builtin/show-branch.c:711
20007 msgid ""
20008 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
20009 msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
20010
20011 #: builtin/show-branch.c:735
20012 msgid "no branches given, and HEAD is not valid"
20013 msgstr "未提供分支,且 HEAD 无效"
20014
20015 #: builtin/show-branch.c:738
20016 msgid "--reflog option needs one branch name"
20017 msgstr "选项 --reflog 需要一个分支名"
20018
20019 #: builtin/show-branch.c:741
20020 #, c-format
20021 msgid "only %d entry can be shown at one time."
20022 msgid_plural "only %d entries can be shown at one time."
20023 msgstr[0] "一次只能显示 %d 个条目。"
20024 msgstr[1] "一次只能显示 %d 个条目。"
20025
20026 #: builtin/show-branch.c:745
20027 #, c-format
20028 msgid "no such ref %s"
20029 msgstr "无此引用 %s"
20030
20031 #: builtin/show-branch.c:831
20032 #, c-format
20033 msgid "cannot handle more than %d rev."
20034 msgid_plural "cannot handle more than %d revs."
20035 msgstr[0] "不能处理 %d 个以上的版本。"
20036 msgstr[1] "不能处理 %d 个以上的版本。"
20037
20038 #: builtin/show-branch.c:835
20039 #, c-format
20040 msgid "'%s' is not a valid ref."
20041 msgstr "'%s' 不是一个有效的引用。"
20042
20043 #: builtin/show-branch.c:838
20044 #, c-format
20045 msgid "cannot find commit %s (%s)"
20046 msgstr "不能找到提交 %s(%s)"
20047
20048 #: builtin/show-ref.c:12
20049 msgid ""
20050 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
20051 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
20052 msgstr ""
20053 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
20054 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
20055
20056 #: builtin/show-ref.c:13
20057 msgid "git show-ref --exclude-existing[=<pattern>]"
20058 msgstr "git show-ref --exclude-existing[=<模式>]"
20059
20060 #: builtin/show-ref.c:162
20061 msgid "only show tags (can be combined with heads)"
20062 msgstr "只显示标签(可以和头共用)"
20063
20064 #: builtin/show-ref.c:163
20065 msgid "only show heads (can be combined with tags)"
20066 msgstr "只显示头(可以和标签共用)"
20067
20068 #: builtin/show-ref.c:164
20069 msgid "stricter reference checking, requires exact ref path"
20070 msgstr "更严格的引用检测,需要精确的引用路径"
20071
20072 #: builtin/show-ref.c:167 builtin/show-ref.c:169
20073 msgid "show the HEAD reference, even if it would be filtered out"
20074 msgstr "显示 HEAD 引用,即使被过滤掉"
20075
20076 #: builtin/show-ref.c:171
20077 msgid "dereference tags into object IDs"
20078 msgstr "转换标签到对象 ID"
20079
20080 #: builtin/show-ref.c:173
20081 msgid "only show SHA1 hash using <n> digits"
20082 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
20083
20084 #: builtin/show-ref.c:177
20085 msgid "do not print results to stdout (useful with --verify)"
20086 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
20087
20088 #: builtin/show-ref.c:179
20089 msgid "show refs from stdin that aren't in local repository"
20090 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
20091
20092 #: builtin/sparse-checkout.c:21
20093 msgid "git sparse-checkout (init|list|set|add|disable) <options>"
20094 msgstr "git sparse-checkout (init|list|set|add|disable) <选项>"
20095
20096 #: builtin/sparse-checkout.c:64
20097 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
20098 msgstr "本工作区不是稀疏模式(稀疏检出文件可能不存在)"
20099
20100 #: builtin/sparse-checkout.c:225
20101 msgid "failed to create directory for sparse-checkout file"
20102 msgstr "无法为稀疏检出文件创建目录"
20103
20104 #: builtin/sparse-checkout.c:266
20105 msgid "failed to set extensions.worktreeConfig setting"
20106 msgstr "无法设置 extensions.worktreeConfig"
20107
20108 #: builtin/sparse-checkout.c:283
20109 msgid "git sparse-checkout init [--cone]"
20110 msgstr "git sparse-checkout init [--cone]"
20111
20112 #: builtin/sparse-checkout.c:302
20113 msgid "initialize the sparse-checkout in cone mode"
20114 msgstr "初始化稀疏检出为 cone 模式"
20115
20116 #: builtin/sparse-checkout.c:308
20117 msgid "initialize sparse-checkout"
20118 msgstr "初始化稀疏检出"
20119
20120 #: builtin/sparse-checkout.c:341
20121 #, c-format
20122 msgid "failed to open '%s'"
20123 msgstr "无法打开 '%s'"
20124
20125 #: builtin/sparse-checkout.c:398
20126 #, c-format
20127 msgid "could not normalize path %s"
20128 msgstr "无法规范化路径 %s"
20129
20130 #: builtin/sparse-checkout.c:410
20131 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
20132 msgstr "git sparse-checkout (set|add) (--stdin | <模式>)"
20133
20134 #: builtin/sparse-checkout.c:435
20135 #, c-format
20136 msgid "unable to unquote C-style string '%s'"
20137 msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
20138
20139 #: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
20140 msgid "unable to load existing sparse-checkout patterns"
20141 msgstr "无法加载现存的稀疏检出模式"
20142
20143 #: builtin/sparse-checkout.c:558
20144 msgid "read patterns from standard in"
20145 msgstr "从标准输入读取模式"
20146
20147 #: builtin/sparse-checkout.c:564
20148 msgid "set sparse-checkout patterns"
20149 msgstr "设置稀疏检出模式"
20150
20151 #: builtin/sparse-checkout.c:581
20152 msgid "disable sparse-checkout"
20153 msgstr "禁用稀疏检出"
20154
20155 #: builtin/sparse-checkout.c:593
20156 msgid "error while refreshing working directory"
20157 msgstr "刷新工作目录时出错"
20158
20159 #: builtin/stash.c:22 builtin/stash.c:38
20160 msgid "git stash list [<options>]"
20161 msgstr "git stash list [<选项>]"
20162
20163 #: builtin/stash.c:23 builtin/stash.c:43
20164 msgid "git stash show [<options>] [<stash>]"
20165 msgstr "git stash show [<选项>] [<stash>]"
20166
20167 #: builtin/stash.c:24 builtin/stash.c:48
20168 msgid "git stash drop [-q|--quiet] [<stash>]"
20169 msgstr "git stash drop [-q|--quiet] [<stash>]"
20170
20171 #: builtin/stash.c:25
20172 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
20173 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
20174
20175 #: builtin/stash.c:26 builtin/stash.c:63
20176 msgid "git stash branch <branchname> [<stash>]"
20177 msgstr "git stash branch <分支名> [<stash>]"
20178
20179 #: builtin/stash.c:27 builtin/stash.c:68
20180 msgid "git stash clear"
20181 msgstr "git stash clear"
20182
20183 #: builtin/stash.c:28
20184 msgid ""
20185 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20186 " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
20187 " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
20188 " [--] [<pathspec>...]]"
20189 msgstr ""
20190 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20191 " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
20192 " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
20193 " [--] [<路径规格>...]]"
20194
20195 #: builtin/stash.c:32 builtin/stash.c:85
20196 msgid ""
20197 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20198 " [-u|--include-untracked] [-a|--all] [<message>]"
20199 msgstr ""
20200 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20201 " [-u|--include-untracked] [-a|--all] [<消息>]"
20202
20203 #: builtin/stash.c:53
20204 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
20205 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
20206
20207 #: builtin/stash.c:58
20208 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
20209 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
20210
20211 #: builtin/stash.c:73
20212 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
20213 msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
20214
20215 #: builtin/stash.c:78
20216 msgid ""
20217 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20218 " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
20219 " [--] [<pathspec>...]]"
20220 msgstr ""
20221 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20222 " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
20223 " [--] [<路径规格>...]]"
20224
20225 #: builtin/stash.c:128
20226 #, c-format
20227 msgid "'%s' is not a stash-like commit"
20228 msgstr "'%s' 不像是一个贮藏提交"
20229
20230 #: builtin/stash.c:148
20231 #, c-format
20232 msgid "Too many revisions specified:%s"
20233 msgstr "指定了太多的版本:%s"
20234
20235 #: builtin/stash.c:162 git-legacy-stash.sh:549
20236 msgid "No stash entries found."
20237 msgstr "未发现贮藏条目。"
20238
20239 #: builtin/stash.c:176
20240 #, c-format
20241 msgid "%s is not a valid reference"
20242 msgstr "%s 不是一个有效的引用名"
20243
20244 #: builtin/stash.c:225 git-legacy-stash.sh:75
20245 msgid "git stash clear with parameters is unimplemented"
20246 msgstr "git stash clear 不支持参数"
20247
20248 #: builtin/stash.c:404
20249 msgid "cannot apply a stash in the middle of a merge"
20250 msgstr "无法在合并过程应用贮藏"
20251
20252 #: builtin/stash.c:415
20253 #, c-format
20254 msgid "could not generate diff %s^!."
20255 msgstr "无法生成差异 %s^!."
20256
20257 #: builtin/stash.c:422
20258 msgid "conflicts in index.Try without --index."
20259 msgstr "索引中有冲突。尝试不用 --index。"
20260
20261 #: builtin/stash.c:428
20262 msgid "could not save index tree"
20263 msgstr "不能保存索引树"
20264
20265 #: builtin/stash.c:437
20266 msgid "could not restore untracked files from stash"
20267 msgstr "无法从贮藏条目中恢复未跟踪文件"
20268
20269 #: builtin/stash.c:451
20270 #, c-format
20271 msgid "Merging %s with %s"
20272 msgstr "正在合并 %s 和 %s"
20273
20274 #: builtin/stash.c:461 git-legacy-stash.sh:681
20275 msgid "Index was not unstashed."
20276 msgstr "索引未从贮藏中恢复。"
20277
20278 #: builtin/stash.c:522 builtin/stash.c:621
20279 msgid "attempt to recreate the index"
20280 msgstr "尝试重建索引"
20281
20282 #: builtin/stash.c:555
20283 #, c-format
20284 msgid "Dropped %s (%s)"
20285 msgstr "丢弃了 %s(%s)"
20286
20287 #: builtin/stash.c:558
20288 #, c-format
20289 msgid "%s: Could not drop stash entry"
20290 msgstr "%s:无法丢弃贮藏条目"
20291
20292 #: builtin/stash.c:583
20293 #, c-format
20294 msgid "'%s' is not a stash reference"
20295 msgstr "'%s' 不是一个贮藏引用"
20296
20297 #: builtin/stash.c:633 git-legacy-stash.sh:695
20298 msgid "The stash entry is kept in case you need it again."
20299 msgstr "贮藏条目被保留以备您再次需要。"
20300
20301 #: builtin/stash.c:656 git-legacy-stash.sh:713
20302 msgid "No branch name specified"
20303 msgstr "未指定分支名"
20304
20305 #: builtin/stash.c:796 builtin/stash.c:833
20306 #, c-format
20307 msgid "Cannot update %s with %s"
20308 msgstr "无法用 %2$s 更新 %1$s"
20309
20310 #: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
20311 msgid "stash message"
20312 msgstr "贮藏说明"
20313
20314 #: builtin/stash.c:824
20315 msgid "\"git stash store\" requires one <commit> argument"
20316 msgstr "\"git stash store\" 需要一个 <提交> 参数"
20317
20318 #: builtin/stash.c:1049 git-legacy-stash.sh:218
20319 msgid "No changes selected"
20320 msgstr "没有选择变更"
20321
20322 #: builtin/stash.c:1149 git-legacy-stash.sh:150
20323 msgid "You do not have the initial commit yet"
20324 msgstr "您尚未建立初始提交"
20325
20326 #: builtin/stash.c:1176 git-legacy-stash.sh:165
20327 msgid "Cannot save the current index state"
20328 msgstr "无法保存当前索引状态"
20329
20330 #: builtin/stash.c:1185 git-legacy-stash.sh:180
20331 msgid "Cannot save the untracked files"
20332 msgstr "无法保存未跟踪文件"
20333
20334 #: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
20335 #: git-legacy-stash.sh:214
20336 msgid "Cannot save the current worktree state"
20337 msgstr "无法保存当前工作区状态"
20338
20339 #: builtin/stash.c:1233 git-legacy-stash.sh:234
20340 msgid "Cannot record working tree state"
20341 msgstr "不能记录工作区状态"
20342
20343 #: builtin/stash.c:1282 git-legacy-stash.sh:338
20344 msgid "Can't use --patch and --include-untracked or --all at the same time"
20345 msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
20346
20347 #: builtin/stash.c:1298
20348 msgid "Did you forget to 'git add'?"
20349 msgstr "您是否忘了执行 'git add'?"
20350
20351 #: builtin/stash.c:1313 git-legacy-stash.sh:346
20352 msgid "No local changes to save"
20353 msgstr "没有要保存的本地修改"
20354
20355 #: builtin/stash.c:1320 git-legacy-stash.sh:351
20356 msgid "Cannot initialize stash"
20357 msgstr "无法初始化贮藏"
20358
20359 #: builtin/stash.c:1335 git-legacy-stash.sh:355
20360 msgid "Cannot save the current status"
20361 msgstr "无法保存当前状态"
20362
20363 #: builtin/stash.c:1340
20364 #, c-format
20365 msgid "Saved working directory and index state %s"
20366 msgstr "保存工作目录和索引状态 %s"
20367
20368 #: builtin/stash.c:1430 git-legacy-stash.sh:385
20369 msgid "Cannot remove worktree changes"
20370 msgstr "无法删除工作区变更"
20371
20372 #: builtin/stash.c:1469 builtin/stash.c:1534
20373 msgid "keep index"
20374 msgstr "保持索引"
20375
20376 #: builtin/stash.c:1471 builtin/stash.c:1536
20377 msgid "stash in patch mode"
20378 msgstr "以补丁模式贮藏"
20379
20380 #: builtin/stash.c:1472 builtin/stash.c:1537
20381 msgid "quiet mode"
20382 msgstr "静默模式"
20383
20384 #: builtin/stash.c:1474 builtin/stash.c:1539
20385 msgid "include untracked files in stash"
20386 msgstr "贮藏中包含未跟踪文件"
20387
20388 #: builtin/stash.c:1476 builtin/stash.c:1541
20389 msgid "include ignore files"
20390 msgstr "包含忽略的文件"
20391
20392 #: builtin/stash.c:1600
20393 #, c-format
20394 msgid "could not exec %s"
20395 msgstr "不能执行 %s"
20396
20397 #: builtin/stripspace.c:18
20398 msgid "git stripspace [-s | --strip-comments]"
20399 msgstr "git stripspace [-s | --strip-comments]"
20400
20401 #: builtin/stripspace.c:19
20402 msgid "git stripspace [-c | --comment-lines]"
20403 msgstr "git stripspace [-c | --comment-lines]"
20404
20405 #: builtin/stripspace.c:37
20406 msgid "skip and remove all lines starting with comment character"
20407 msgstr "跳过和移除所有的注释行"
20408
20409 #: builtin/stripspace.c:40
20410 msgid "prepend comment character and space to each line"
20411 msgstr "为每一行的行首添加注释符和空格"
20412
20413 #: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
20414 #, c-format
20415 msgid "Expecting a full ref name, got %s"
20416 msgstr "期望一个完整的引用名称,却得到 %s"
20417
20418 #: builtin/submodule--helper.c:64
20419 msgid "submodule--helper print-default-remote takes no arguments"
20420 msgstr "submodule--helper print-default-remote 不带参数"
20421
20422 #: builtin/submodule--helper.c:102
20423 #, c-format
20424 msgid "cannot strip one component off url '%s'"
20425 msgstr "无法从 url '%s' 剥离一个组件"
20426
20427 #: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
20428 msgid "alternative anchor for relative paths"
20429 msgstr "相对路径的替代锚记(anchor)"
20430
20431 #: builtin/submodule--helper.c:415
20432 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
20433 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
20434
20435 #: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
20436 #: builtin/submodule--helper.c:653
20437 #, c-format
20438 msgid "No url found for submodule path '%s' in .gitmodules"
20439 msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
20440
20441 #: builtin/submodule--helper.c:524
20442 #, c-format
20443 msgid "Entering '%s'\n"
20444 msgstr "进入 '%s'\n"
20445
20446 #: builtin/submodule--helper.c:527
20447 #, c-format
20448 msgid ""
20449 "run_command returned non-zero status for %s\n"
20450 "."
20451 msgstr ""
20452 "对 %s 执行 run_command 返回非零值。\n"
20453 "."
20454
20455 #: builtin/submodule--helper.c:549
20456 #, c-format
20457 msgid ""
20458 "run_command returned non-zero status while recursing in the nested "
20459 "submodules of %s\n"
20460 "."
20461 msgstr ""
20462 "在递归 %s 的子模组执行 run_command 时返回非零值。\n"
20463 "."
20464
20465 #: builtin/submodule--helper.c:565
20466 msgid "Suppress output of entering each submodule command"
20467 msgstr "阻止进入每一个子模组命令的输出"
20468
20469 #: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
20470 msgid "Recurse into nested submodules"
20471 msgstr "递归进入嵌套子模组中"
20472
20473 #: builtin/submodule--helper.c:572
20474 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
20475 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
20476
20477 #: builtin/submodule--helper.c:599
20478 #, c-format
20479 msgid ""
20480 "could not look up configuration '%s'. Assuming this repository is its own "
20481 "authoritative upstream."
20482 msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
20483
20484 #: builtin/submodule--helper.c:667
20485 #, c-format
20486 msgid "Failed to register url for submodule path '%s'"
20487 msgstr "无法为子模组 '%s' 注册 url"
20488
20489 #: builtin/submodule--helper.c:671
20490 #, c-format
20491 msgid "Submodule '%s' (%s) registered for path '%s'\n"
20492 msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n"
20493
20494 #: builtin/submodule--helper.c:681
20495 #, c-format
20496 msgid "warning: command update mode suggested for submodule '%s'\n"
20497 msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
20498
20499 #: builtin/submodule--helper.c:688
20500 #, c-format
20501 msgid "Failed to register update mode for submodule path '%s'"
20502 msgstr "无法为子模组 '%s' 注册更新模式"
20503
20504 #: builtin/submodule--helper.c:710
20505 msgid "Suppress output for initializing a submodule"
20506 msgstr "阻止子模组初始化的输出"
20507
20508 #: builtin/submodule--helper.c:715
20509 msgid "git submodule--helper init [<options>] [<path>]"
20510 msgstr "git submodule--helper init [<选项>] [<路径>]"
20511
20512 #: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
20513 #, c-format
20514 msgid "no submodule mapping found in .gitmodules for path '%s'"
20515 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
20516
20517 #: builtin/submodule--helper.c:837
20518 #, c-format
20519 msgid "could not resolve HEAD ref inside the submodule '%s'"
20520 msgstr "无法解析子模组 '%s' 的 HEAD 引用"
20521
20522 #: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
20523 #, c-format
20524 msgid "failed to recurse into submodule '%s'"
20525 msgstr "递归子模组 '%s' 失败"
20526
20527 #: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
20528 msgid "Suppress submodule status output"
20529 msgstr "阻止子模组状态输出"
20530
20531 #: builtin/submodule--helper.c:889
20532 msgid ""
20533 "Use commit stored in the index instead of the one stored in the submodule "
20534 "HEAD"
20535 msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
20536
20537 #: builtin/submodule--helper.c:890
20538 msgid "recurse into nested submodules"
20539 msgstr "递归进入嵌套子模组中"
20540
20541 #: builtin/submodule--helper.c:895
20542 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
20543 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
20544
20545 #: builtin/submodule--helper.c:919
20546 msgid "git submodule--helper name <path>"
20547 msgstr "git submodule--helper name <路径>"
20548
20549 #: builtin/submodule--helper.c:983
20550 #, c-format
20551 msgid "Synchronizing submodule url for '%s'\n"
20552 msgstr "为 '%s' 同步子模组 url\n"
20553
20554 #: builtin/submodule--helper.c:989
20555 #, c-format
20556 msgid "failed to register url for submodule path '%s'"
20557 msgstr "无法为子模组路径 '%s' 注册 url"
20558
20559 #: builtin/submodule--helper.c:1003
20560 #, c-format
20561 msgid "failed to get the default remote for submodule '%s'"
20562 msgstr "无法得到子模组 '%s' 的默认远程关联"
20563
20564 #: builtin/submodule--helper.c:1014
20565 #, c-format
20566 msgid "failed to update remote for submodule '%s'"
20567 msgstr "无法为子模组 '%s' 更新远程关联"
20568
20569 #: builtin/submodule--helper.c:1061
20570 msgid "Suppress output of synchronizing submodule url"
20571 msgstr "阻止子模组 url 同步的输出"
20572
20573 #: builtin/submodule--helper.c:1068
20574 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
20575 msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
20576
20577 #: builtin/submodule--helper.c:1122
20578 #, c-format
20579 msgid ""
20580 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
20581 "really want to remove it including all of its history)"
20582 msgstr ""
20583 "子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
20584 "-rf' 命令)"
20585
20586 #: builtin/submodule--helper.c:1134
20587 #, c-format
20588 msgid ""
20589 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
20590 "them"
20591 msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
20592
20593 #: builtin/submodule--helper.c:1142
20594 #, c-format
20595 msgid "Cleared directory '%s'\n"
20596 msgstr "已清除目录 '%s'\n"
20597
20598 #: builtin/submodule--helper.c:1144
20599 #, c-format
20600 msgid "Could not remove submodule work tree '%s'\n"
20601 msgstr "无法移除子模组工作区 '%s'\n"
20602
20603 #: builtin/submodule--helper.c:1155
20604 #, c-format
20605 msgid "could not create empty submodule directory %s"
20606 msgstr "不能创建空的子模组目录 %s"
20607
20608 #: builtin/submodule--helper.c:1171
20609 #, c-format
20610 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
20611 msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
20612
20613 #: builtin/submodule--helper.c:1200
20614 msgid "Remove submodule working trees even if they contain local changes"
20615 msgstr "删除子模组工作区,即使包含本地修改"
20616
20617 #: builtin/submodule--helper.c:1201
20618 msgid "Unregister all submodules"
20619 msgstr "将所有子模组取消注册"
20620
20621 #: builtin/submodule--helper.c:1206
20622 msgid ""
20623 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
20624 msgstr ""
20625 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
20626
20627 #: builtin/submodule--helper.c:1220
20628 msgid "Use '--all' if you really want to deinitialize all submodules"
20629 msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
20630
20631 #: builtin/submodule--helper.c:1289
20632 msgid ""
20633 "An alternate computed from a superproject's alternate is invalid.\n"
20634 "To allow Git to clone without an alternate in such a case, set\n"
20635 "submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
20636 "'--reference-if-able' instead of '--reference'."
20637 msgstr ""
20638 "从一个父项目的备用仓库中计算出的备用仓库无效。\n"
20639 "此场景下,设置 submodule.alternateErrorStrategy 为 'info',以允许\n"
20640 "Git 不使用备用仓库克隆,或者等效地使用 '--reference-if-able' 而非\n"
20641 "'--reference' 来克隆。"
20642
20643 #: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
20644 #, c-format
20645 msgid "submodule '%s' cannot add alternate: %s"
20646 msgstr "子模组 '%s' 不能添加仓库备选:%s"
20647
20648 #: builtin/submodule--helper.c:1367
20649 #, c-format
20650 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
20651 msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
20652
20653 #: builtin/submodule--helper.c:1374
20654 #, c-format
20655 msgid "Value '%s' for submodule.alternateLocation is not recognized"
20656 msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
20657
20658 #: builtin/submodule--helper.c:1398
20659 msgid "where the new submodule will be cloned to"
20660 msgstr "新的子模组将要克隆的路径"
20661
20662 #: builtin/submodule--helper.c:1401
20663 msgid "name of the new submodule"
20664 msgstr "新子模组的名称"
20665
20666 #: builtin/submodule--helper.c:1404
20667 msgid "url where to clone the submodule from"
20668 msgstr "克隆子模组的 url 地址"
20669
20670 #: builtin/submodule--helper.c:1412
20671 msgid "depth for shallow clones"
20672 msgstr "浅克隆的深度"
20673
20674 #: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
20675 msgid "force cloning progress"
20676 msgstr "强制显示克隆进度"
20677
20678 #: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
20679 msgid "disallow cloning into non-empty directory"
20680 msgstr "不允许克隆到一个非空目录"
20681
20682 #: builtin/submodule--helper.c:1424
20683 msgid ""
20684 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
20685 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
20686 "<url> --path <path>"
20687 msgstr ""
20688 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
20689 "[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
20690
20691 #: builtin/submodule--helper.c:1449
20692 #, c-format
20693 msgid "refusing to create/use '%s' in another submodule's git dir"
20694 msgstr "拒绝在另一个子模组的 git dir 中创建/使用 '%s'"
20695
20696 #: builtin/submodule--helper.c:1460
20697 #, c-format
20698 msgid "clone of '%s' into submodule path '%s' failed"
20699 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
20700
20701 #: builtin/submodule--helper.c:1464
20702 #, c-format
20703 msgid "directory not empty: '%s'"
20704 msgstr "目录非空:'%s'"
20705
20706 #: builtin/submodule--helper.c:1476
20707 #, c-format
20708 msgid "could not get submodule directory for '%s'"
20709 msgstr "无法得到 '%s' 的子模组目录"
20710
20711 #: builtin/submodule--helper.c:1512
20712 #, c-format
20713 msgid "Invalid update mode '%s' for submodule path '%s'"
20714 msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
20715
20716 #: builtin/submodule--helper.c:1516
20717 #, c-format
20718 msgid "Invalid update mode '%s' configured for submodule path '%s'"
20719 msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
20720
20721 #: builtin/submodule--helper.c:1617
20722 #, c-format
20723 msgid "Submodule path '%s' not initialized"
20724 msgstr "子模组 '%s' 尚未初始化"
20725
20726 #: builtin/submodule--helper.c:1621
20727 msgid "Maybe you want to use 'update --init'?"
20728 msgstr "也许您想要执行 'update --init'?"
20729
20730 #: builtin/submodule--helper.c:1651
20731 #, c-format
20732 msgid "Skipping unmerged submodule %s"
20733 msgstr "略过未合并的子模组 %s"
20734
20735 #: builtin/submodule--helper.c:1680
20736 #, c-format
20737 msgid "Skipping submodule '%s'"
20738 msgstr "略过子模组 '%s'"
20739
20740 #: builtin/submodule--helper.c:1830
20741 #, c-format
20742 msgid "Failed to clone '%s'. Retry scheduled"
20743 msgstr "克隆 '%s' 失败。按计划重试"
20744
20745 #: builtin/submodule--helper.c:1841
20746 #, c-format
20747 msgid "Failed to clone '%s' a second time, aborting"
20748 msgstr "第二次尝试克隆 '%s' 失败,退出"
20749
20750 #: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
20751 msgid "path into the working tree"
20752 msgstr "到工作区的路径"
20753
20754 #: builtin/submodule--helper.c:1906
20755 msgid "path into the working tree, across nested submodule boundaries"
20756 msgstr "工作区中的路径,递归嵌套子模组"
20757
20758 #: builtin/submodule--helper.c:1910
20759 msgid "rebase, merge, checkout or none"
20760 msgstr "rebase、merge、checkout 或 none"
20761
20762 #: builtin/submodule--helper.c:1916
20763 msgid "Create a shallow clone truncated to the specified number of revisions"
20764 msgstr "创建一个指定深度的浅克隆"
20765
20766 #: builtin/submodule--helper.c:1919
20767 msgid "parallel jobs"
20768 msgstr "并发任务"
20769
20770 #: builtin/submodule--helper.c:1921
20771 msgid "whether the initial clone should follow the shallow recommendation"
20772 msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
20773
20774 #: builtin/submodule--helper.c:1922
20775 msgid "don't print cloning progress"
20776 msgstr "不要输出克隆进度"
20777
20778 #: builtin/submodule--helper.c:1933
20779 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
20780 msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
20781
20782 #: builtin/submodule--helper.c:1946
20783 msgid "bad value for update parameter"
20784 msgstr "update 参数取值错误"
20785
20786 #: builtin/submodule--helper.c:1994
20787 #, c-format
20788 msgid ""
20789 "Submodule (%s) branch configured to inherit branch from superproject, but "
20790 "the superproject is not on any branch"
20791 msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
20792
20793 #: builtin/submodule--helper.c:2117
20794 #, c-format
20795 msgid "could not get a repository handle for submodule '%s'"
20796 msgstr "无法获得子模组 '%s' 的仓库句柄"
20797
20798 #: builtin/submodule--helper.c:2150
20799 msgid "recurse into submodules"
20800 msgstr "在子模组中递归"
20801
20802 #: builtin/submodule--helper.c:2156
20803 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
20804 msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
20805
20806 #: builtin/submodule--helper.c:2212
20807 msgid "check if it is safe to write to the .gitmodules file"
20808 msgstr "检查写入 .gitmodules 文件是否安全"
20809
20810 #: builtin/submodule--helper.c:2215
20811 msgid "unset the config in the .gitmodules file"
20812 msgstr "取消 .gitmodules 文件中的设置"
20813
20814 #: builtin/submodule--helper.c:2220
20815 msgid "git submodule--helper config <name> [<value>]"
20816 msgstr "git submodule--helper config <名称> [<值>]"
20817
20818 #: builtin/submodule--helper.c:2221
20819 msgid "git submodule--helper config --unset <name>"
20820 msgstr "git submodule--helper config --unset <名称>"
20821
20822 #: builtin/submodule--helper.c:2222
20823 msgid "git submodule--helper config --check-writeable"
20824 msgstr "git submodule--helper config --check-writeable"
20825
20826 #: builtin/submodule--helper.c:2241 git-submodule.sh:174
20827 #, sh-format
20828 msgid "please make sure that the .gitmodules file is in the working tree"
20829 msgstr "请确认 .gitmodules 文件在工作区里"
20830
20831 #: builtin/submodule--helper.c:2291 git.c:433 git.c:684
20832 #, c-format
20833 msgid "%s doesn't support --super-prefix"
20834 msgstr "%s 不支持 --super-prefix"
20835
20836 #: builtin/submodule--helper.c:2297
20837 #, c-format
20838 msgid "'%s' is not a valid submodule--helper subcommand"
20839 msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
20840
20841 #: builtin/symbolic-ref.c:8
20842 msgid "git symbolic-ref [<options>] <name> [<ref>]"
20843 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
20844
20845 #: builtin/symbolic-ref.c:9
20846 msgid "git symbolic-ref -d [-q] <name>"
20847 msgstr "git symbolic-ref -d [-q] <名称>"
20848
20849 #: builtin/symbolic-ref.c:40
20850 msgid "suppress error message for non-symbolic (detached) refs"
20851 msgstr "不显示非符号(分离的)引用的错误信息"
20852
20853 #: builtin/symbolic-ref.c:41
20854 msgid "delete symbolic ref"
20855 msgstr "删除符号引用"
20856
20857 #: builtin/symbolic-ref.c:42
20858 msgid "shorten ref output"
20859 msgstr "缩短引用输出"
20860
20861 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
20862 msgid "reason"
20863 msgstr "原因"
20864
20865 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
20866 msgid "reason of the update"
20867 msgstr "更新的原因"
20868
20869 #: builtin/tag.c:25
20870 msgid ""
20871 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
20872 "\t\t<tagname> [<head>]"
20873 msgstr ""
20874 "git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
20875 "\t\t<标签名> [<头>]"
20876
20877 #: builtin/tag.c:27
20878 msgid "git tag -d <tagname>..."
20879 msgstr "git tag -d <标签名>..."
20880
20881 #: builtin/tag.c:28
20882 msgid ""
20883 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
20884 "points-at <object>]\n"
20885 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
20886 msgstr ""
20887 "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
20888 "at <对象>]\n"
20889 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
20890
20891 #: builtin/tag.c:30
20892 msgid "git tag -v [--format=<format>] <tagname>..."
20893 msgstr "git tag -v [--format=<格式>] <标签名>..."
20894
20895 #: builtin/tag.c:89
20896 #, c-format
20897 msgid "tag '%s' not found."
20898 msgstr "未发现标签 '%s'。"
20899
20900 #: builtin/tag.c:105
20901 #, c-format
20902 msgid "Deleted tag '%s' (was %s)\n"
20903 msgstr "已删除标签 '%s'(曾为 %s)\n"
20904
20905 #: builtin/tag.c:135
20906 #, c-format
20907 msgid ""
20908 "\n"
20909 "Write a message for tag:\n"
20910 " %s\n"
20911 "Lines starting with '%c' will be ignored.\n"
20912 msgstr ""
20913 "\n"
20914 "输入一个标签说明:\n"
20915 " %s\n"
20916 "以 '%c' 开头的行将被忽略。\n"
20917
20918 #: builtin/tag.c:139
20919 #, c-format
20920 msgid ""
20921 "\n"
20922 "Write a message for tag:\n"
20923 " %s\n"
20924 "Lines starting with '%c' will be kept; you may remove them yourself if you "
20925 "want to.\n"
20926 msgstr ""
20927 "\n"
20928 "输入一个标签说明:\n"
20929 " %s\n"
20930 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
20931
20932 #: builtin/tag.c:198
20933 msgid "unable to sign the tag"
20934 msgstr "无法签署标签"
20935
20936 #: builtin/tag.c:200
20937 msgid "unable to write tag file"
20938 msgstr "无法写标签文件"
20939
20940 #: builtin/tag.c:216
20941 #, c-format
20942 msgid ""
20943 "You have created a nested tag. The object referred to by your new tag is\n"
20944 "already a tag. If you meant to tag the object that it points to, use:\n"
20945 "\n"
20946 "\tgit tag -f %s %s^{}"
20947 msgstr ""
20948 "您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n"
20949 "对其指向的目标创建标签,使用:\n"
20950 "\n"
20951 "\tgit tag -f %s %s^{}"
20952
20953 #: builtin/tag.c:232
20954 msgid "bad object type."
20955 msgstr "坏的对象类型。"
20956
20957 #: builtin/tag.c:284
20958 msgid "no tag message?"
20959 msgstr "无标签说明?"
20960
20961 #: builtin/tag.c:291
20962 #, c-format
20963 msgid "The tag message has been left in %s\n"
20964 msgstr "标签说明被保留在 %s\n"
20965
20966 #: builtin/tag.c:402
20967 msgid "list tag names"
20968 msgstr "列出标签名称"
20969
20970 #: builtin/tag.c:404
20971 msgid "print <n> lines of each tag message"
20972 msgstr "每个标签信息打印 <n> 行"
20973
20974 #: builtin/tag.c:406
20975 msgid "delete tags"
20976 msgstr "删除标签"
20977
20978 #: builtin/tag.c:407
20979 msgid "verify tags"
20980 msgstr "验证标签"
20981
20982 #: builtin/tag.c:409
20983 msgid "Tag creation options"
20984 msgstr "标签创建选项"
20985
20986 #: builtin/tag.c:411
20987 msgid "annotated tag, needs a message"
20988 msgstr "附注标签,需要一个说明"
20989
20990 #: builtin/tag.c:413
20991 msgid "tag message"
20992 msgstr "标签说明"
20993
20994 #: builtin/tag.c:415
20995 msgid "force edit of tag message"
20996 msgstr "强制编辑标签说明"
20997
20998 #: builtin/tag.c:416
20999 msgid "annotated and GPG-signed tag"
21000 msgstr "附注并附加 GPG 签名的标签"
21001
21002 #: builtin/tag.c:419
21003 msgid "use another key to sign the tag"
21004 msgstr "使用另外的私钥签名该标签"
21005
21006 #: builtin/tag.c:420
21007 msgid "replace the tag if exists"
21008 msgstr "如果存在,替换现有的标签"
21009
21010 #: builtin/tag.c:421 builtin/update-ref.c:369
21011 msgid "create a reflog"
21012 msgstr "创建引用日志"
21013
21014 #: builtin/tag.c:423
21015 msgid "Tag listing options"
21016 msgstr "标签列表选项"
21017
21018 #: builtin/tag.c:424
21019 msgid "show tag list in columns"
21020 msgstr "以列的方式显示标签列表"
21021
21022 #: builtin/tag.c:425 builtin/tag.c:427
21023 msgid "print only tags that contain the commit"
21024 msgstr "只打印包含该提交的标签"
21025
21026 #: builtin/tag.c:426 builtin/tag.c:428
21027 msgid "print only tags that don't contain the commit"
21028 msgstr "只打印不包含该提交的标签"
21029
21030 #: builtin/tag.c:429
21031 msgid "print only tags that are merged"
21032 msgstr "只打印已经合并的标签"
21033
21034 #: builtin/tag.c:430
21035 msgid "print only tags that are not merged"
21036 msgstr "只打印尚未合并的标签"
21037
21038 #: builtin/tag.c:434
21039 msgid "print only tags of the object"
21040 msgstr "只打印指向该对象的标签"
21041
21042 #: builtin/tag.c:482
21043 msgid "--column and -n are incompatible"
21044 msgstr "--column 和 -n 不兼容"
21045
21046 #: builtin/tag.c:504
21047 msgid "-n option is only allowed in list mode"
21048 msgstr "-n 选项只允许用在列表显示模式"
21049
21050 #: builtin/tag.c:506
21051 msgid "--contains option is only allowed in list mode"
21052 msgstr "--contains 选项只允许用在列表显示模式"
21053
21054 #: builtin/tag.c:508
21055 msgid "--no-contains option is only allowed in list mode"
21056 msgstr "--no-contains 选项只允许用在列表显示模式"
21057
21058 #: builtin/tag.c:510
21059 msgid "--points-at option is only allowed in list mode"
21060 msgstr "--points-at 选项只允许用在列表显示模式"
21061
21062 #: builtin/tag.c:512
21063 msgid "--merged and --no-merged options are only allowed in list mode"
21064 msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
21065
21066 #: builtin/tag.c:523
21067 msgid "only one -F or -m option is allowed."
21068 msgstr "只允许一个 -F 或 -m 选项。"
21069
21070 #: builtin/tag.c:542
21071 msgid "too many params"
21072 msgstr "太多参数"
21073
21074 #: builtin/tag.c:548
21075 #, c-format
21076 msgid "'%s' is not a valid tag name."
21077 msgstr "'%s' 不是一个有效的标签名称。"
21078
21079 #: builtin/tag.c:553
21080 #, c-format
21081 msgid "tag '%s' already exists"
21082 msgstr "标签 '%s' 已存在"
21083
21084 #: builtin/tag.c:584
21085 #, c-format
21086 msgid "Updated tag '%s' (was %s)\n"
21087 msgstr "已更新标签 '%s'(曾为 %s)\n"
21088
21089 #: builtin/unpack-objects.c:502
21090 msgid "Unpacking objects"
21091 msgstr "展开对象中"
21092
21093 #: builtin/update-index.c:84
21094 #, c-format
21095 msgid "failed to create directory %s"
21096 msgstr "创建目录 %s 失败"
21097
21098 #: builtin/update-index.c:100
21099 #, c-format
21100 msgid "failed to create file %s"
21101 msgstr "创建文件 %s 失败"
21102
21103 #: builtin/update-index.c:108
21104 #, c-format
21105 msgid "failed to delete file %s"
21106 msgstr "删除文件 %s 失败"
21107
21108 #: builtin/update-index.c:115 builtin/update-index.c:221
21109 #, c-format
21110 msgid "failed to delete directory %s"
21111 msgstr "删除目录 %s 失败"
21112
21113 #: builtin/update-index.c:140
21114 #, c-format
21115 msgid "Testing mtime in '%s' "
21116 msgstr "在 '%s' 中测试 mtime "
21117
21118 #: builtin/update-index.c:154
21119 msgid "directory stat info does not change after adding a new file"
21120 msgstr "添加一个新文件后,目录的状态信息未改变"
21121
21122 #: builtin/update-index.c:167
21123 msgid "directory stat info does not change after adding a new directory"
21124 msgstr "添加一个新目录后,目录的状态信息未改变"
21125
21126 #: builtin/update-index.c:180
21127 msgid "directory stat info changes after updating a file"
21128 msgstr "更新一个文件后,目录的状态信息被修改"
21129
21130 #: builtin/update-index.c:191
21131 msgid "directory stat info changes after adding a file inside subdirectory"
21132 msgstr "在子目录中添加文件后,目录的状态信息被修改"
21133
21134 #: builtin/update-index.c:202
21135 msgid "directory stat info does not change after deleting a file"
21136 msgstr "删除一个文件后,目录的状态信息未改变"
21137
21138 #: builtin/update-index.c:215
21139 msgid "directory stat info does not change after deleting a directory"
21140 msgstr "删除一个目录后,目录的状态信息未改变"
21141
21142 #: builtin/update-index.c:222
21143 msgid " OK"
21144 msgstr " OK"
21145
21146 #: builtin/update-index.c:591
21147 msgid "git update-index [<options>] [--] [<file>...]"
21148 msgstr "git update-index [<选项>] [--] [<文件>...]"
21149
21150 #: builtin/update-index.c:974
21151 msgid "continue refresh even when index needs update"
21152 msgstr "当索引需要更新时继续刷新"
21153
21154 #: builtin/update-index.c:977
21155 msgid "refresh: ignore submodules"
21156 msgstr "刷新:忽略子模组"
21157
21158 #: builtin/update-index.c:980
21159 msgid "do not ignore new files"
21160 msgstr "不忽略新的文件"
21161
21162 #: builtin/update-index.c:982
21163 msgid "let files replace directories and vice-versa"
21164 msgstr "让文件替换目录(反之亦然)"
21165
21166 #: builtin/update-index.c:984
21167 msgid "notice files missing from worktree"
21168 msgstr "通知文件从工作区丢失"
21169
21170 #: builtin/update-index.c:986
21171 msgid "refresh even if index contains unmerged entries"
21172 msgstr "即使索引区包含未合并的条目也执行刷新"
21173
21174 #: builtin/update-index.c:989
21175 msgid "refresh stat information"
21176 msgstr "刷新统计信息"
21177
21178 #: builtin/update-index.c:993
21179 msgid "like --refresh, but ignore assume-unchanged setting"
21180 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
21181
21182 #: builtin/update-index.c:997
21183 msgid "<mode>,<object>,<path>"
21184 msgstr "<存取模式>,<对象>,<路径>"
21185
21186 #: builtin/update-index.c:998
21187 msgid "add the specified entry to the index"
21188 msgstr "添加指定的条目到索引区"
21189
21190 #: builtin/update-index.c:1008
21191 msgid "mark files as \"not changing\""
21192 msgstr "把文件标记为 \"没有变更\""
21193
21194 #: builtin/update-index.c:1011
21195 msgid "clear assumed-unchanged bit"
21196 msgstr "清除 assumed-unchanged 位"
21197
21198 #: builtin/update-index.c:1014
21199 msgid "mark files as \"index-only\""
21200 msgstr "把文件标记为 \"仅索引\""
21201
21202 #: builtin/update-index.c:1017
21203 msgid "clear skip-worktree bit"
21204 msgstr "清除 skip-worktree 位"
21205
21206 #: builtin/update-index.c:1020
21207 msgid "do not touch index-only entries"
21208 msgstr "不要触碰仅索引条目"
21209
21210 #: builtin/update-index.c:1022
21211 msgid "add to index only; do not add content to object database"
21212 msgstr "只添加到索引区;不添加对象到对象库"
21213
21214 #: builtin/update-index.c:1024
21215 msgid "remove named paths even if present in worktree"
21216 msgstr "即使存在工作区里,也删除路径"
21217
21218 #: builtin/update-index.c:1026
21219 msgid "with --stdin: input lines are terminated by null bytes"
21220 msgstr "携带 --stdin:输入的行以 null 字符终止"
21221
21222 #: builtin/update-index.c:1028
21223 msgid "read list of paths to be updated from standard input"
21224 msgstr "从标准输入中读取需要更新的路径列表"
21225
21226 #: builtin/update-index.c:1032
21227 msgid "add entries from standard input to the index"
21228 msgstr "从标准输入添加条目到索引区"
21229
21230 #: builtin/update-index.c:1036
21231 msgid "repopulate stages #2 and #3 for the listed paths"
21232 msgstr "为指定文件重新生成第2和第3暂存区"
21233
21234 #: builtin/update-index.c:1040
21235 msgid "only update entries that differ from HEAD"
21236 msgstr "只更新与 HEAD 不同的条目"
21237
21238 #: builtin/update-index.c:1044
21239 msgid "ignore files missing from worktree"
21240 msgstr "忽略工作区丢失的文件"
21241
21242 #: builtin/update-index.c:1047
21243 msgid "report actions to standard output"
21244 msgstr "在标准输出显示操作"
21245
21246 #: builtin/update-index.c:1049
21247 msgid "(for porcelains) forget saved unresolved conflicts"
21248 msgstr "(for porcelains) 忘记保存的未解决的冲突"
21249
21250 #: builtin/update-index.c:1053
21251 msgid "write index in this format"
21252 msgstr "以这种格式写入索引区"
21253
21254 #: builtin/update-index.c:1055
21255 msgid "enable or disable split index"
21256 msgstr "启用或禁用索引拆分"
21257
21258 #: builtin/update-index.c:1057
21259 msgid "enable/disable untracked cache"
21260 msgstr "启用/禁用对未跟踪文件的缓存"
21261
21262 #: builtin/update-index.c:1059
21263 msgid "test if the filesystem supports untracked cache"
21264 msgstr "测试文件系统是否支持未跟踪文件缓存"
21265
21266 #: builtin/update-index.c:1061
21267 msgid "enable untracked cache without testing the filesystem"
21268 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
21269
21270 #: builtin/update-index.c:1063
21271 msgid "write out the index even if is not flagged as changed"
21272 msgstr "即使没有被标记为已更改,也要写出索引"
21273
21274 #: builtin/update-index.c:1065
21275 msgid "enable or disable file system monitor"
21276 msgstr "启用或禁用文件系统监控"
21277
21278 #: builtin/update-index.c:1067
21279 msgid "mark files as fsmonitor valid"
21280 msgstr "标记文件为 fsmonitor 有效"
21281
21282 #: builtin/update-index.c:1070
21283 msgid "clear fsmonitor valid bit"
21284 msgstr "清除 fsmonitor 有效位"
21285
21286 #: builtin/update-index.c:1173
21287 msgid ""
21288 "core.splitIndex is set to false; remove or change it, if you really want to "
21289 "enable split index"
21290 msgstr ""
21291 "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
21292
21293 #: builtin/update-index.c:1182
21294 msgid ""
21295 "core.splitIndex is set to true; remove or change it, if you really want to "
21296 "disable split index"
21297 msgstr ""
21298 "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
21299
21300 #: builtin/update-index.c:1194
21301 msgid ""
21302 "core.untrackedCache is set to true; remove or change it, if you really want "
21303 "to disable the untracked cache"
21304 msgstr ""
21305 "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
21306 "改它。"
21307
21308 #: builtin/update-index.c:1198
21309 msgid "Untracked cache disabled"
21310 msgstr "缓存未跟踪文件被禁用"
21311
21312 #: builtin/update-index.c:1206
21313 msgid ""
21314 "core.untrackedCache is set to false; remove or change it, if you really want "
21315 "to enable the untracked cache"
21316 msgstr ""
21317 "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
21318 "修改它。"
21319
21320 #: builtin/update-index.c:1210
21321 #, c-format
21322 msgid "Untracked cache enabled for '%s'"
21323 msgstr "缓存未跟踪文件在 '%s' 启用"
21324
21325 #: builtin/update-index.c:1218
21326 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
21327 msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
21328
21329 #: builtin/update-index.c:1222
21330 msgid "fsmonitor enabled"
21331 msgstr "fsmonitor 被启用"
21332
21333 #: builtin/update-index.c:1225
21334 msgid ""
21335 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
21336 msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
21337
21338 #: builtin/update-index.c:1229
21339 msgid "fsmonitor disabled"
21340 msgstr "fsmonitor 被禁用"
21341
21342 #: builtin/update-ref.c:10
21343 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
21344 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
21345
21346 #: builtin/update-ref.c:11
21347 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
21348 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
21349
21350 #: builtin/update-ref.c:12
21351 msgid "git update-ref [<options>] --stdin [-z]"
21352 msgstr "git update-ref [<选项>] --stdin [-z]"
21353
21354 #: builtin/update-ref.c:364
21355 msgid "delete the reference"
21356 msgstr "删除引用"
21357
21358 #: builtin/update-ref.c:366
21359 msgid "update <refname> not the one it points to"
21360 msgstr "更新 <引用名> 本身而不是它指向的引用"
21361
21362 #: builtin/update-ref.c:367
21363 msgid "stdin has NUL-terminated arguments"
21364 msgstr "标准输入有以 NUL 字符终止的参数"
21365
21366 #: builtin/update-ref.c:368
21367 msgid "read updates from stdin"
21368 msgstr "从标准输入读取更新"
21369
21370 #: builtin/update-server-info.c:7
21371 msgid "git update-server-info [--force]"
21372 msgstr "git update-server-info [--force]"
21373
21374 #: builtin/update-server-info.c:15
21375 msgid "update the info files from scratch"
21376 msgstr "从头开始更新文件信息"
21377
21378 #: builtin/upload-pack.c:11
21379 msgid "git upload-pack [<options>] <dir>"
21380 msgstr "git upload-pack [<选项>] <目录>"
21381
21382 #: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
21383 msgid "quit after a single request/response exchange"
21384 msgstr "在一次单独的请求/响应之后退出"
21385
21386 #: builtin/upload-pack.c:25
21387 msgid "exit immediately after initial ref advertisement"
21388 msgstr "在初始的引用广告后立即退出"
21389
21390 #: builtin/upload-pack.c:27
21391 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
21392 msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
21393
21394 #: builtin/upload-pack.c:29
21395 msgid "interrupt transfer after <n> seconds of inactivity"
21396 msgstr "不活动 <n> 秒钟后终止传输"
21397
21398 #: builtin/verify-commit.c:19
21399 msgid "git verify-commit [-v | --verbose] <commit>..."
21400 msgstr "git verify-commit [-v | --verbose] <提交>..."
21401
21402 #: builtin/verify-commit.c:68
21403 msgid "print commit contents"
21404 msgstr "打印提交内容"
21405
21406 #: builtin/verify-commit.c:69 builtin/verify-tag.c:37
21407 msgid "print raw gpg status output"
21408 msgstr "打印原始 gpg 状态输出"
21409
21410 #: builtin/verify-pack.c:55
21411 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
21412 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
21413
21414 #: builtin/verify-pack.c:65
21415 msgid "verbose"
21416 msgstr "冗长输出"
21417
21418 #: builtin/verify-pack.c:67
21419 msgid "show statistics only"
21420 msgstr "只显示统计"
21421
21422 #: builtin/verify-tag.c:18
21423 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
21424 msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
21425
21426 #: builtin/verify-tag.c:36
21427 msgid "print tag contents"
21428 msgstr "打印标签内容"
21429
21430 #: builtin/worktree.c:17
21431 msgid "git worktree add [<options>] <path> [<commit-ish>]"
21432 msgstr "git worktree add [<选项>] <路径> [<提交>]"
21433
21434 #: builtin/worktree.c:18
21435 msgid "git worktree list [<options>]"
21436 msgstr "git worktree list [<选项>]"
21437
21438 #: builtin/worktree.c:19
21439 msgid "git worktree lock [<options>] <path>"
21440 msgstr "git worktree lock [<选项>] <路径>"
21441
21442 #: builtin/worktree.c:20
21443 msgid "git worktree move <worktree> <new-path>"
21444 msgstr "git worktree move <工作区> <新路径>"
21445
21446 #: builtin/worktree.c:21
21447 msgid "git worktree prune [<options>]"
21448 msgstr "git worktree prune [<选项>]"
21449
21450 #: builtin/worktree.c:22
21451 msgid "git worktree remove [<options>] <worktree>"
21452 msgstr "git worktree remove [<选项>] <工作区>"
21453
21454 #: builtin/worktree.c:23
21455 msgid "git worktree unlock <path>"
21456 msgstr "git worktree unlock <路径>"
21457
21458 #: builtin/worktree.c:60 builtin/worktree.c:891
21459 #, c-format
21460 msgid "failed to delete '%s'"
21461 msgstr "删除 '%s' 失败"
21462
21463 #: builtin/worktree.c:79
21464 #, c-format
21465 msgid "Removing worktrees/%s: not a valid directory"
21466 msgstr "删除工作区/%s:不是一个有效的目录"
21467
21468 #: builtin/worktree.c:85
21469 #, c-format
21470 msgid "Removing worktrees/%s: gitdir file does not exist"
21471 msgstr "删除 worktrees/%s:gitdir 文件不存在"
21472
21473 #: builtin/worktree.c:90 builtin/worktree.c:99
21474 #, c-format
21475 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
21476 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
21477
21478 #: builtin/worktree.c:109
21479 #, c-format
21480 msgid ""
21481 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
21482 "%<PRIuMAX>)"
21483 msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
21484
21485 #: builtin/worktree.c:117
21486 #, c-format
21487 msgid "Removing worktrees/%s: invalid gitdir file"
21488 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
21489
21490 #: builtin/worktree.c:126
21491 #, c-format
21492 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
21493 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
21494
21495 #: builtin/worktree.c:165
21496 msgid "report pruned working trees"
21497 msgstr "报告清除的工作区"
21498
21499 #: builtin/worktree.c:167
21500 msgid "expire working trees older than <time>"
21501 msgstr "将早于 <时间> 的工作区过期"
21502
21503 #: builtin/worktree.c:234
21504 #, c-format
21505 msgid "'%s' already exists"
21506 msgstr "'%s' 已经存在"
21507
21508 #: builtin/worktree.c:244
21509 #, c-format
21510 msgid "unable to re-add worktree '%s'"
21511 msgstr "无法再次添加工作区 '%s'"
21512
21513 #: builtin/worktree.c:249
21514 #, c-format
21515 msgid ""
21516 "'%s' is a missing but locked worktree;\n"
21517 "use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
21518 msgstr ""
21519 "'%s' 是一个丢失但锁定的工作区,使用\n"
21520 "'add -f -f' 覆盖,或 'unlock' 和 'prune' 或 'remove' 清除"
21521
21522 #: builtin/worktree.c:251
21523 #, c-format
21524 msgid ""
21525 "'%s' is a missing but already registered worktree;\n"
21526 "use 'add -f' to override, or 'prune' or 'remove' to clear"
21527 msgstr ""
21528 "'%s' 是一个丢失但已经注册的工作区,使用\n"
21529 "'add -f' 覆盖,或 'prune' 或 'remove' 清除"
21530
21531 #: builtin/worktree.c:301
21532 #, c-format
21533 msgid "could not create directory of '%s'"
21534 msgstr "不能创建目录 '%s'"
21535
21536 #: builtin/worktree.c:432 builtin/worktree.c:438
21537 #, c-format
21538 msgid "Preparing worktree (new branch '%s')"
21539 msgstr "准备工作区(新分支 '%s')"
21540
21541 #: builtin/worktree.c:434
21542 #, c-format
21543 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
21544 msgstr "准备工作区(重置分支 '%s',之前为 %s)"
21545
21546 #: builtin/worktree.c:443
21547 #, c-format
21548 msgid "Preparing worktree (checking out '%s')"
21549 msgstr "准备工作区(检出 '%s')"
21550
21551 #: builtin/worktree.c:449
21552 #, c-format
21553 msgid "Preparing worktree (detached HEAD %s)"
21554 msgstr "准备工作区(分离头指针 %s)"
21555
21556 #: builtin/worktree.c:490
21557 msgid "checkout <branch> even if already checked out in other worktree"
21558 msgstr "检出 <分支>,即使已经被检出到其它工作区"
21559
21560 #: builtin/worktree.c:493
21561 msgid "create a new branch"
21562 msgstr "创建一个新分支"
21563
21564 #: builtin/worktree.c:495
21565 msgid "create or reset a branch"
21566 msgstr "创建或重置一个分支"
21567
21568 #: builtin/worktree.c:497
21569 msgid "populate the new working tree"
21570 msgstr "生成新的工作区"
21571
21572 #: builtin/worktree.c:498
21573 msgid "keep the new working tree locked"
21574 msgstr "锁定新工作区"
21575
21576 #: builtin/worktree.c:501
21577 msgid "set up tracking mode (see git-branch(1))"
21578 msgstr "设置跟踪模式(参见 git-branch(1))"
21579
21580 #: builtin/worktree.c:504
21581 msgid "try to match the new branch name with a remote-tracking branch"
21582 msgstr "尝试为新分支名匹配一个远程跟踪分支"
21583
21584 #: builtin/worktree.c:512
21585 msgid "-b, -B, and --detach are mutually exclusive"
21586 msgstr "-b、-B 和 --detach 是互斥的"
21587
21588 #: builtin/worktree.c:573
21589 msgid "--[no-]track can only be used if a new branch is created"
21590 msgstr "只能在创建新分支时使用选项 --[no-]track "
21591
21592 #: builtin/worktree.c:673
21593 msgid "reason for locking"
21594 msgstr "锁定原因"
21595
21596 #: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
21597 #: builtin/worktree.c:919
21598 #, c-format
21599 msgid "'%s' is not a working tree"
21600 msgstr "'%s' 不是一个工作区"
21601
21602 #: builtin/worktree.c:687 builtin/worktree.c:720
21603 msgid "The main working tree cannot be locked or unlocked"
21604 msgstr "主工作区无法被加锁或解锁"
21605
21606 #: builtin/worktree.c:692
21607 #, c-format
21608 msgid "'%s' is already locked, reason: %s"
21609 msgstr "'%s' 已被锁定,原因:%s"
21610
21611 #: builtin/worktree.c:694
21612 #, c-format
21613 msgid "'%s' is already locked"
21614 msgstr "'%s' 已被锁定"
21615
21616 #: builtin/worktree.c:722
21617 #, c-format
21618 msgid "'%s' is not locked"
21619 msgstr "'%s' 未被锁定"
21620
21621 #: builtin/worktree.c:763
21622 msgid "working trees containing submodules cannot be moved or removed"
21623 msgstr "不能移动或删除包含子模组的工作区"
21624
21625 #: builtin/worktree.c:771
21626 msgid "force move even if worktree is dirty or locked"
21627 msgstr "强制移动,即使工作区是脏的或已锁定"
21628
21629 #: builtin/worktree.c:794 builtin/worktree.c:921
21630 #, c-format
21631 msgid "'%s' is a main working tree"
21632 msgstr "'%s' 是一个主工作区"
21633
21634 #: builtin/worktree.c:799
21635 #, c-format
21636 msgid "could not figure out destination name from '%s'"
21637 msgstr "无法从 '%s' 算出目标名称"
21638
21639 #: builtin/worktree.c:805
21640 #, c-format
21641 msgid "target '%s' already exists"
21642 msgstr "目标 '%s' 已存在"
21643
21644 #: builtin/worktree.c:813
21645 #, c-format
21646 msgid ""
21647 "cannot move a locked working tree, lock reason: %s\n"
21648 "use 'move -f -f' to override or unlock first"
21649 msgstr ""
21650 "无法移动一个锁定的工作区,锁定原因:%s\n"
21651 "使用 'move -f -f' 覆盖或先解锁"
21652
21653 #: builtin/worktree.c:815
21654 msgid ""
21655 "cannot move a locked working tree;\n"
21656 "use 'move -f -f' to override or unlock first"
21657 msgstr ""
21658 "无法移动一个锁定的工作区,\n"
21659 "使用 'move -f -f' 覆盖或先解锁"
21660
21661 #: builtin/worktree.c:818
21662 #, c-format
21663 msgid "validation failed, cannot move working tree: %s"
21664 msgstr "验证失败,无法移动工作区:%s"
21665
21666 #: builtin/worktree.c:823
21667 #, c-format
21668 msgid "failed to move '%s' to '%s'"
21669 msgstr "移动 '%s' 到 '%s' 失败"
21670
21671 #: builtin/worktree.c:871
21672 #, c-format
21673 msgid "failed to run 'git status' on '%s'"
21674 msgstr "在 '%s' 中执行 'git status' 失败"
21675
21676 #: builtin/worktree.c:875
21677 #, c-format
21678 msgid "'%s' contains modified or untracked files, use --force to delete it"
21679 msgstr "'%s' 包含修改或未跟踪的文件,使用 --force 删除"
21680
21681 #: builtin/worktree.c:880
21682 #, c-format
21683 msgid "failed to run 'git status' on '%s', code %d"
21684 msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d"
21685
21686 #: builtin/worktree.c:903
21687 msgid "force removal even if worktree is dirty or locked"
21688 msgstr "强制删除,即使工作区是脏的或已锁定"
21689
21690 #: builtin/worktree.c:926
21691 #, c-format
21692 msgid ""
21693 "cannot remove a locked working tree, lock reason: %s\n"
21694 "use 'remove -f -f' to override or unlock first"
21695 msgstr ""
21696 "无法删除一个锁定的工作区,锁定原因:%s\n"
21697 "使用 'remove -f -f' 覆盖或先解锁"
21698
21699 #: builtin/worktree.c:928
21700 msgid ""
21701 "cannot remove a locked working tree;\n"
21702 "use 'remove -f -f' to override or unlock first"
21703 msgstr ""
21704 "无法删除一个锁定的工作区,\n"
21705 "使用 'remove -f -f' 覆盖或先解锁"
21706
21707 #: builtin/worktree.c:931
21708 #, c-format
21709 msgid "validation failed, cannot remove working tree: %s"
21710 msgstr "验证失败,无法删除工作区:%s"
21711
21712 #: builtin/write-tree.c:15
21713 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
21714 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
21715
21716 #: builtin/write-tree.c:28
21717 msgid "<prefix>/"
21718 msgstr "<前缀>/"
21719
21720 #: builtin/write-tree.c:29
21721 msgid "write tree object for a subdirectory <prefix>"
21722 msgstr "将 <前缀> 子目录内容写到一个树对象"
21723
21724 #: builtin/write-tree.c:31
21725 msgid "only useful for debugging"
21726 msgstr "只对调试有用"
21727
21728 #: fast-import.c:3125
21729 #, c-format
21730 msgid "Expected 'mark' command, got %s"
21731 msgstr "预期 'mark' 命令,得到 %s"
21732
21733 #: fast-import.c:3130
21734 #, c-format
21735 msgid "Expected 'to' command, got %s"
21736 msgstr "预期 'to' 命令,得到 %s"
21737
21738 #: fast-import.c:3254
21739 #, c-format
21740 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
21741 msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
21742
21743 #: credential-cache--daemon.c:223
21744 #, c-format
21745 msgid ""
21746 "The permissions on your socket directory are too loose; other\n"
21747 "users may be able to read your cached credentials. Consider running:\n"
21748 "\n"
21749 "\tchmod 0700 %s"
21750 msgstr ""
21751 "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
21752 "行:\n"
21753 "\n"
21754 "\tchmod 0700 %s"
21755
21756 #: credential-cache--daemon.c:272
21757 msgid "print debugging messages to stderr"
21758 msgstr "调试信息输出到标准错误"
21759
21760 #: t/helper/test-reach.c:152
21761 #, c-format
21762 msgid "commit %s is not marked reachable"
21763 msgstr "提交 %s 没有标记为可达"
21764
21765 #: t/helper/test-reach.c:162
21766 msgid "too many commits marked reachable"
21767 msgstr "太多提交标记为可达"
21768
21769 #: t/helper/test-serve-v2.c:7
21770 msgid "test-tool serve-v2 [<options>]"
21771 msgstr "test-tool serve-v2 [<选项>]"
21772
21773 #: t/helper/test-serve-v2.c:19
21774 msgid "exit immediately after advertising capabilities"
21775 msgstr "对能力广告之后立即退出"
21776
21777 #: git.c:27
21778 msgid ""
21779 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
21780 " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
21781 " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
21782 "bare]\n"
21783 " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
21784 " <command> [<args>]"
21785 msgstr ""
21786 "git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
21787 " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
21788 " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
21789 "bare]\n"
21790 " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
21791 " <命令> [<参数>]"
21792
21793 #: git.c:34
21794 msgid ""
21795 "'git help -a' and 'git help -g' list available subcommands and some\n"
21796 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
21797 "to read about a specific subcommand or concept.\n"
21798 "See 'git help git' for an overview of the system."
21799 msgstr ""
21800 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
21801 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
21802 "帮助。\n"
21803 "有关系统的概述,查看 'git help git'。"
21804
21805 #: git.c:186
21806 #, c-format
21807 msgid "no directory given for --git-dir\n"
21808 msgstr "没有为 --git-dir 提供目录\n"
21809
21810 #: git.c:200
21811 #, c-format
21812 msgid "no namespace given for --namespace\n"
21813 msgstr "没有为 --namespace 提供命名空间\n"
21814
21815 #: git.c:214
21816 #, c-format
21817 msgid "no directory given for --work-tree\n"
21818 msgstr "没有为 --work-tree 提供目录\n"
21819
21820 #: git.c:228
21821 #, c-format
21822 msgid "no prefix given for --super-prefix\n"
21823 msgstr "没有为 --super-prefix 提供前缀\n"
21824
21825 #: git.c:250
21826 #, c-format
21827 msgid "-c expects a configuration string\n"
21828 msgstr "应为 -c 提供一个配置字符串\n"
21829
21830 #: git.c:288
21831 #, c-format
21832 msgid "no directory given for -C\n"
21833 msgstr "没有为 -C 提供目录\n"
21834
21835 #: git.c:314
21836 #, c-format
21837 msgid "unknown option: %s\n"
21838 msgstr "未知选项:%s\n"
21839
21840 #: git.c:360
21841 #, c-format
21842 msgid "while expanding alias '%s': '%s'"
21843 msgstr "在扩展别名 '%s' 时:'%s'"
21844
21845 #: git.c:369
21846 #, c-format
21847 msgid ""
21848 "alias '%s' changes environment variables.\n"
21849 "You can use '!git' in the alias to do this"
21850 msgstr ""
21851 "别名 '%s' 修改环境变量。您可以使用在别名中\n"
21852 "使用 '!git'"
21853
21854 #: git.c:376
21855 #, c-format
21856 msgid "empty alias for %s"
21857 msgstr "%s 的空别名"
21858
21859 #: git.c:379
21860 #, c-format
21861 msgid "recursive alias: %s"
21862 msgstr "递归的别名:%s"
21863
21864 #: git.c:459
21865 msgid "write failure on standard output"
21866 msgstr "在标准输出写入失败"
21867
21868 #: git.c:461
21869 msgid "unknown write failure on standard output"
21870 msgstr "到标准输出的未知写入错误"
21871
21872 #: git.c:463
21873 msgid "close failed on standard output"
21874 msgstr "标准输出关闭失败"
21875
21876 #: git.c:793
21877 #, c-format
21878 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
21879 msgstr "检测到别名循环:'%s'的扩展未终止:%s"
21880
21881 #: git.c:843
21882 #, c-format
21883 msgid "cannot handle %s as a builtin"
21884 msgstr "不能作为内置命令处理 %s"
21885
21886 #: git.c:856
21887 #, c-format
21888 msgid ""
21889 "usage: %s\n"
21890 "\n"
21891 msgstr ""
21892 "用法:%s\n"
21893 "\n"
21894
21895 #: git.c:876
21896 #, c-format
21897 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
21898 msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
21899
21900 #: git.c:888
21901 #, c-format
21902 msgid "failed to run command '%s': %s\n"
21903 msgstr "运行命令 '%s' 失败:%s\n"
21904
21905 #: http.c:378
21906 #, c-format
21907 msgid "negative value for http.postbuffer; defaulting to %d"
21908 msgstr "http.postbuffer 为负值,默认为 %d"
21909
21910 #: http.c:399
21911 msgid "Delegation control is not supported with cURL < 7.22.0"
21912 msgstr "不支持委托控制,因为 cURL < 7.22.0"
21913
21914 #: http.c:408
21915 msgid "Public key pinning not supported with cURL < 7.44.0"
21916 msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
21917
21918 #: http.c:876
21919 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
21920 msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0"
21921
21922 #: http.c:949
21923 msgid "Protocol restrictions not supported with cURL < 7.19.4"
21924 msgstr "不支持协议限制,因为 cURL < 7.19.4"
21925
21926 #: http.c:1086
21927 #, c-format
21928 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
21929 msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:"
21930
21931 #: http.c:1093
21932 #, c-format
21933 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
21934 msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建"
21935
21936 #: http.c:1097
21937 #, c-format
21938 msgid "Could not set SSL backend to '%s': already set"
21939 msgstr "无法将 SSL 后端设置为 '%s':已经设置"
21940
21941 #: http.c:1966
21942 #, c-format
21943 msgid ""
21944 "unable to update url base from redirection:\n"
21945 " asked for: %s\n"
21946 " redirect: %s"
21947 msgstr ""
21948 "不能更新重定向的 url base:\n"
21949 " 请求:%s\n"
21950 " 重定向:%s"
21951
21952 #: remote-curl.c:166
21953 #, c-format
21954 msgid "invalid quoting in push-option value: '%s'"
21955 msgstr "在 push-option 取值中无效的引号:'%s'"
21956
21957 #: remote-curl.c:263
21958 #, c-format
21959 msgid "%sinfo/refs not valid: is this a git repository?"
21960 msgstr "%sinfo/refs 无效:这是一个 git 仓库么?"
21961
21962 #: remote-curl.c:364
21963 msgid "invalid server response; expected service, got flush packet"
21964 msgstr "无效的服务端响应。预期服务,得到 flush 包"
21965
21966 #: remote-curl.c:395
21967 #, c-format
21968 msgid "invalid server response; got '%s'"
21969 msgstr "无效的服务端响应,得到 '%s'"
21970
21971 #: remote-curl.c:455
21972 #, c-format
21973 msgid "repository '%s' not found"
21974 msgstr "仓库 '%s' 未找到"
21975
21976 #: remote-curl.c:459
21977 #, c-format
21978 msgid "Authentication failed for '%s'"
21979 msgstr "'%s' 鉴权失败"
21980
21981 #: remote-curl.c:463
21982 #, c-format
21983 msgid "unable to access '%s': %s"
21984 msgstr "无法访问 '%s':%s"
21985
21986 #: remote-curl.c:469
21987 #, c-format
21988 msgid "redirecting to %s"
21989 msgstr "重定向到 %s"
21990
21991 #: remote-curl.c:593
21992 msgid "shouldn't have EOF when not gentle on EOF"
21993 msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符"
21994
21995 #: remote-curl.c:673
21996 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
21997 msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
21998
21999 #: remote-curl.c:733
22000 #, c-format
22001 msgid "RPC failed; %s"
22002 msgstr "RPC 失败。%s"
22003
22004 #: remote-curl.c:773
22005 msgid "cannot handle pushes this big"
22006 msgstr "不能处理这么大的推送"
22007
22008 #: remote-curl.c:888
22009 #, c-format
22010 msgid "cannot deflate request; zlib deflate error %d"
22011 msgstr "不能压缩请求,zlib 压缩错误 %d"
22012
22013 #: remote-curl.c:892
22014 #, c-format
22015 msgid "cannot deflate request; zlib end error %d"
22016 msgstr "不能压缩请求,zlib 结束错误 %d"
22017
22018 #: remote-curl.c:1023
22019 msgid "dumb http transport does not support shallow capabilities"
22020 msgstr "哑 http 传输不支持 shalllow 能力"
22021
22022 #: remote-curl.c:1038
22023 msgid "fetch failed."
22024 msgstr "获取失败。"
22025
22026 #: remote-curl.c:1086
22027 msgid "cannot fetch by sha1 over smart http"
22028 msgstr "无法通过智能 HTTP 获取 sha1"
22029
22030 #: remote-curl.c:1130 remote-curl.c:1136
22031 #, c-format
22032 msgid "protocol error: expected sha/ref, got '%s'"
22033 msgstr "协议错误:期望 sha/ref,却得到 '%s'"
22034
22035 #: remote-curl.c:1148 remote-curl.c:1263
22036 #, c-format
22037 msgid "http transport does not support %s"
22038 msgstr "http 传输协议不支持 %s"
22039
22040 #: remote-curl.c:1184
22041 msgid "git-http-push failed"
22042 msgstr "git-http-push 失败"
22043
22044 #: remote-curl.c:1369
22045 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
22046 msgstr "remote-curl:用法:git remote-curl <远程> [<url>]"
22047
22048 #: remote-curl.c:1401
22049 msgid "remote-curl: error reading command stream from git"
22050 msgstr "remote-curl:错误读取来自 git 的命令流"
22051
22052 #: remote-curl.c:1408
22053 msgid "remote-curl: fetch attempted without a local repo"
22054 msgstr "remote-curl:尝试没有本地仓库下获取"
22055
22056 #: remote-curl.c:1448
22057 #, c-format
22058 msgid "remote-curl: unknown command '%s' from git"
22059 msgstr "remote-curl:未知的来自 git 的命令 '%s'"
22060
22061 #: list-objects-filter-options.h:85
22062 msgid "args"
22063 msgstr "参数"
22064
22065 #: list-objects-filter-options.h:86
22066 msgid "object filtering"
22067 msgstr "对象过滤"
22068
22069 #: parse-options.h:183
22070 msgid "expiry-date"
22071 msgstr "到期时间"
22072
22073 #: parse-options.h:197
22074 msgid "no-op (backward compatibility)"
22075 msgstr "空操作(向后兼容)"
22076
22077 #: parse-options.h:309
22078 msgid "be more verbose"
22079 msgstr "更加详细"
22080
22081 #: parse-options.h:311
22082 msgid "be more quiet"
22083 msgstr "更加安静"
22084
22085 #: parse-options.h:317
22086 msgid "use <n> digits to display SHA-1s"
22087 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
22088
22089 #: parse-options.h:336
22090 msgid "how to strip spaces and #comments from message"
22091 msgstr "设置如何删除提交说明里的空格和#注释"
22092
22093 #: parse-options.h:337
22094 msgid "read pathspec from file"
22095 msgstr "从文件读取路径表达式"
22096
22097 #: parse-options.h:338
22098 msgid ""
22099 "with --pathspec-from-file, pathspec elements are separated with NUL character"
22100 msgstr "使用 --pathspec-from-file,路径表达式用空字符分隔"
22101
22102 #: ref-filter.h:101
22103 msgid "key"
22104 msgstr "key"
22105
22106 #: ref-filter.h:101
22107 msgid "field name to sort on"
22108 msgstr "排序的字段名"
22109
22110 #: rerere.h:44
22111 msgid "update the index with reused conflict resolution if possible"
22112 msgstr "如果可能,重用冲突解决更新索引"
22113
22114 #: wt-status.h:67
22115 msgid "HEAD detached at "
22116 msgstr "头指针分离于 "
22117
22118 #: wt-status.h:68
22119 msgid "HEAD detached from "
22120 msgstr "头指针分离自 "
22121
22122 #: command-list.h:50
22123 msgid "Add file contents to the index"
22124 msgstr "添加文件内容至索引"
22125
22126 #: command-list.h:51
22127 msgid "Apply a series of patches from a mailbox"
22128 msgstr "应用邮箱格式的系列补丁"
22129
22130 #: command-list.h:52
22131 msgid "Annotate file lines with commit information"
22132 msgstr "使用提交信息注释文件行"
22133
22134 #: command-list.h:53
22135 msgid "Apply a patch to files and/or to the index"
22136 msgstr "应用一个补丁到文件和/或索引区"
22137
22138 #: command-list.h:54
22139 msgid "Import a GNU Arch repository into Git"
22140 msgstr "将一个 GNU Arch 仓库导入到 Git"
22141
22142 #: command-list.h:55
22143 msgid "Create an archive of files from a named tree"
22144 msgstr "基于一个指定的树创建文件存档"
22145
22146 #: command-list.h:56
22147 msgid "Use binary search to find the commit that introduced a bug"
22148 msgstr "通过二分查找定位引入 bug 的提交"
22149
22150 #: command-list.h:57
22151 msgid "Show what revision and author last modified each line of a file"
22152 msgstr "显示文件每一行最后修改的版本和修改者"
22153
22154 #: command-list.h:58
22155 msgid "List, create, or delete branches"
22156 msgstr "列出、创建或删除分支"
22157
22158 #: command-list.h:59
22159 msgid "Move objects and refs by archive"
22160 msgstr "通过归档移动对象和引用"
22161
22162 #: command-list.h:60
22163 msgid "Provide content or type and size information for repository objects"
22164 msgstr "提供仓库对象的内容、类型或大小"
22165
22166 #: command-list.h:61
22167 msgid "Display gitattributes information"
22168 msgstr "显示 gitattributes 信息"
22169
22170 #: command-list.h:62
22171 msgid "Debug gitignore / exclude files"
22172 msgstr "调试 gitignore / exclude 文件"
22173
22174 #: command-list.h:63
22175 msgid "Show canonical names and email addresses of contacts"
22176 msgstr "显示联系人的规范名称和电子邮件"
22177
22178 #: command-list.h:64
22179 msgid "Switch branches or restore working tree files"
22180 msgstr "切换分支或恢复工作区文件"
22181
22182 #: command-list.h:65
22183 msgid "Copy files from the index to the working tree"
22184 msgstr "从索引拷贝文件到工作区"
22185
22186 #: command-list.h:66
22187 msgid "Ensures that a reference name is well formed"
22188 msgstr "确保引用名称格式正确"
22189
22190 #: command-list.h:67
22191 msgid "Find commits yet to be applied to upstream"
22192 msgstr "查找尚未应用到上游的提交"
22193
22194 #: command-list.h:68
22195 msgid "Apply the changes introduced by some existing commits"
22196 msgstr "应用一些现存提交引入的修改"
22197
22198 #: command-list.h:69
22199 msgid "Graphical alternative to git-commit"
22200 msgstr "git-commit 的图形替代界面"
22201
22202 #: command-list.h:70
22203 msgid "Remove untracked files from the working tree"
22204 msgstr "从工作区中删除未跟踪文件"
22205
22206 #: command-list.h:71
22207 msgid "Clone a repository into a new directory"
22208 msgstr "克隆仓库到一个新目录"
22209
22210 #: command-list.h:72
22211 msgid "Display data in columns"
22212 msgstr "以列的方式显示数据"
22213
22214 #: command-list.h:73
22215 msgid "Record changes to the repository"
22216 msgstr "记录变更到仓库"
22217
22218 #: command-list.h:74
22219 msgid "Write and verify Git commit-graph files"
22220 msgstr "写入和校验 Git 提交图文件"
22221
22222 #: command-list.h:75
22223 msgid "Create a new commit object"
22224 msgstr "创建一个新的提交对象"
22225
22226 #: command-list.h:76
22227 msgid "Get and set repository or global options"
22228 msgstr "获取和设置仓库或者全局选项"
22229
22230 #: command-list.h:77
22231 msgid "Count unpacked number of objects and their disk consumption"
22232 msgstr "计算未打包对象的数量和磁盘空间占用"
22233
22234 #: command-list.h:78
22235 msgid "Retrieve and store user credentials"
22236 msgstr "检索和存储用户密码"
22237
22238 #: command-list.h:79
22239 msgid "Helper to temporarily store passwords in memory"
22240 msgstr "在内存中临时存储密码的助手"
22241
22242 #: command-list.h:80
22243 msgid "Helper to store credentials on disk"
22244 msgstr "在磁盘存储密码的助手"
22245
22246 #: command-list.h:81
22247 msgid "Export a single commit to a CVS checkout"
22248 msgstr "将一个提交导出到 CVS 检出中"
22249
22250 #: command-list.h:82
22251 msgid "Salvage your data out of another SCM people love to hate"
22252 msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
22253
22254 #: command-list.h:83
22255 msgid "A CVS server emulator for Git"
22256 msgstr "Git 的一个 CVS 服务模拟器"
22257
22258 #: command-list.h:84
22259 msgid "A really simple server for Git repositories"
22260 msgstr "一个非常简单的 Git 仓库服务器"
22261
22262 #: command-list.h:85
22263 msgid "Give an object a human readable name based on an available ref"
22264 msgstr "基于一个现存的引用为一个对象起一个可读的名称"
22265
22266 #: command-list.h:86
22267 msgid "Show changes between commits, commit and working tree, etc"
22268 msgstr "显示提交之间、提交和工作区之间等的差异"
22269
22270 #: command-list.h:87
22271 msgid "Compares files in the working tree and the index"
22272 msgstr "比较工作区和索引区中的文件"
22273
22274 #: command-list.h:88
22275 msgid "Compare a tree to the working tree or index"
22276 msgstr "将一个树和工作区或索引做比较"
22277
22278 #: command-list.h:89
22279 msgid "Compares the content and mode of blobs found via two tree objects"
22280 msgstr "比较两个树对象的文件内容和模式"
22281
22282 #: command-list.h:90
22283 msgid "Show changes using common diff tools"
22284 msgstr "使用常见的差异工具显示更改"
22285
22286 #: command-list.h:91
22287 msgid "Git data exporter"
22288 msgstr "Git 数据导出器"
22289
22290 #: command-list.h:92
22291 msgid "Backend for fast Git data importers"
22292 msgstr "Git 快速数据导入器后端"
22293
22294 #: command-list.h:93
22295 msgid "Download objects and refs from another repository"
22296 msgstr "从另外一个仓库下载对象和引用"
22297
22298 #: command-list.h:94
22299 msgid "Receive missing objects from another repository"
22300 msgstr "从另一个仓库获取缺失的对象"
22301
22302 #: command-list.h:95
22303 msgid "Rewrite branches"
22304 msgstr "重写分支"
22305
22306 #: command-list.h:96
22307 msgid "Produce a merge commit message"
22308 msgstr "生成一个合并提交信息"
22309
22310 #: command-list.h:97
22311 msgid "Output information on each ref"
22312 msgstr "对每一个引用输出信息 "
22313
22314 #: command-list.h:98
22315 msgid "Prepare patches for e-mail submission"
22316 msgstr "准备电子邮件提交的补丁"
22317
22318 #: command-list.h:99
22319 msgid "Verifies the connectivity and validity of the objects in the database"
22320 msgstr "验证仓库中对象的连通性和有效性"
22321
22322 #: command-list.h:100
22323 msgid "Cleanup unnecessary files and optimize the local repository"
22324 msgstr "清除不必要的文件和优化本地仓库"
22325
22326 #: command-list.h:101
22327 msgid "Extract commit ID from an archive created using git-archive"
22328 msgstr "从 git-archive 创建的归档文件中提取提交 ID"
22329
22330 #: command-list.h:102
22331 msgid "Print lines matching a pattern"
22332 msgstr "输出和模式匹配的行"
22333
22334 #: command-list.h:103
22335 msgid "A portable graphical interface to Git"
22336 msgstr "一个便携的 Git 图形客户端"
22337
22338 #: command-list.h:104
22339 msgid "Compute object ID and optionally creates a blob from a file"
22340 msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象"
22341
22342 #: command-list.h:105
22343 msgid "Display help information about Git"
22344 msgstr "显示 Git 的帮助信息"
22345
22346 #: command-list.h:106
22347 msgid "Server side implementation of Git over HTTP"
22348 msgstr "Git HTTP 协议的服务端实现"
22349
22350 #: command-list.h:107
22351 msgid "Download from a remote Git repository via HTTP"
22352 msgstr "通过 HTTP 从远程 Git 仓库下载"
22353
22354 #: command-list.h:108
22355 msgid "Push objects over HTTP/DAV to another repository"
22356 msgstr "通过 HTTP/DAV 推送对象另一个仓库"
22357
22358 #: command-list.h:109
22359 msgid "Send a collection of patches from stdin to an IMAP folder"
22360 msgstr "从标准输入将一组补丁发送到IMAP文件夹"
22361
22362 #: command-list.h:110
22363 msgid "Build pack index file for an existing packed archive"
22364 msgstr "从一个现存的包存档文件创建包索引"
22365
22366 #: command-list.h:111
22367 msgid "Create an empty Git repository or reinitialize an existing one"
22368 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
22369
22370 #: command-list.h:112
22371 msgid "Instantly browse your working repository in gitweb"
22372 msgstr "在 gitweb 中即时浏览您的工作仓库"
22373
22374 #: command-list.h:113
22375 msgid "Add or parse structured information in commit messages"
22376 msgstr "添加或解析提交说明中的结构化信息"
22377
22378 #: command-list.h:114
22379 msgid "The Git repository browser"
22380 msgstr "Git 仓库浏览器"
22381
22382 #: command-list.h:115
22383 msgid "Show commit logs"
22384 msgstr "显示提交日志"
22385
22386 #: command-list.h:116
22387 msgid "Show information about files in the index and the working tree"
22388 msgstr "显示索引和工作区中文件的信息"
22389
22390 #: command-list.h:117
22391 msgid "List references in a remote repository"
22392 msgstr "显示一个远程仓库的引用"
22393
22394 #: command-list.h:118
22395 msgid "List the contents of a tree object"
22396 msgstr "显示一个树对象的内容"
22397
22398 #: command-list.h:119
22399 msgid "Extracts patch and authorship from a single e-mail message"
22400 msgstr "从单个电子邮件中提取补丁和作者身份"
22401
22402 #: command-list.h:120
22403 msgid "Simple UNIX mbox splitter program"
22404 msgstr "简单的 UNIX mbox 邮箱切分程序"
22405
22406 #: command-list.h:121
22407 msgid "Join two or more development histories together"
22408 msgstr "合并两个或更多开发历史"
22409
22410 #: command-list.h:122
22411 msgid "Find as good common ancestors as possible for a merge"
22412 msgstr "为了合并查找尽可能好的公共祖先提交"
22413
22414 #: command-list.h:123
22415 msgid "Run a three-way file merge"
22416 msgstr "运行一个三路文件合并"
22417
22418 #: command-list.h:124
22419 msgid "Run a merge for files needing merging"
22420 msgstr "对于需要合并的文件执行合并"
22421
22422 #: command-list.h:125
22423 msgid "The standard helper program to use with git-merge-index"
22424 msgstr "与 git-merge-index 一起使用的标准向导程序"
22425
22426 #: command-list.h:126
22427 msgid "Run merge conflict resolution tools to resolve merge conflicts"
22428 msgstr "运行合并冲突解决工具以解决合并冲突"
22429
22430 #: command-list.h:127
22431 msgid "Show three-way merge without touching index"
22432 msgstr "显示三路合并而不动索引"
22433
22434 #: command-list.h:128
22435 msgid "Write and verify multi-pack-indexes"
22436 msgstr "写入和校验多包索引"
22437
22438 #: command-list.h:129
22439 msgid "Creates a tag object"
22440 msgstr "创建一个标签对象"
22441
22442 #: command-list.h:130
22443 msgid "Build a tree-object from ls-tree formatted text"
22444 msgstr "基于 ls-tree 的格式化文本创建一个树对象"
22445
22446 #: command-list.h:131
22447 msgid "Move or rename a file, a directory, or a symlink"
22448 msgstr "移动或重命名一个文件、目录或符号链接"
22449
22450 # 查找给定版本的符号名称
22451 #: command-list.h:132
22452 msgid "Find symbolic names for given revs"
22453 msgstr "查找给定版本的符号名称"
22454
22455 #: command-list.h:133
22456 msgid "Add or inspect object notes"
22457 msgstr "添加或检查对象注释"
22458
22459 #: command-list.h:134
22460 msgid "Import from and submit to Perforce repositories"
22461 msgstr "导入和提交到 Perforce 仓库中"
22462
22463 #: command-list.h:135
22464 msgid "Create a packed archive of objects"
22465 msgstr "创建对象的存档包"
22466
22467 #: command-list.h:136
22468 msgid "Find redundant pack files"
22469 msgstr "查找冗余的包文件"
22470
22471 #: command-list.h:137
22472 msgid "Pack heads and tags for efficient repository access"
22473 msgstr "打包头和标签以实现高效的仓库访问"
22474
22475 #: command-list.h:138
22476 msgid "Routines to help parsing remote repository access parameters"
22477 msgstr "帮助解析远程仓库访问参数的例程"
22478
22479 #: command-list.h:139
22480 msgid "Compute unique ID for a patch"
22481 msgstr "计算一个补丁的唯一 ID"
22482
22483 #: command-list.h:140
22484 msgid "Prune all unreachable objects from the object database"
22485 msgstr "删除对象库中所有不可达对象"
22486
22487 #: command-list.h:141
22488 msgid "Remove extra objects that are already in pack files"
22489 msgstr "删除已经在包文件中的多余对象"
22490
22491 #: command-list.h:142
22492 msgid "Fetch from and integrate with another repository or a local branch"
22493 msgstr "获取并整合另外的仓库或一个本地分支"
22494
22495 #: command-list.h:143
22496 msgid "Update remote refs along with associated objects"
22497 msgstr "更新远程引用和相关的对象"
22498
22499 #: command-list.h:144
22500 msgid "Applies a quilt patchset onto the current branch"
22501 msgstr "将一个 quilt 补丁集应用到当前分支。"
22502
22503 #: command-list.h:145
22504 msgid "Compare two commit ranges (e.g. two versions of a branch)"
22505 msgstr "比较两个提交范围(如一个分支的两个版本)"
22506
22507 #: command-list.h:146
22508 msgid "Reads tree information into the index"
22509 msgstr "将树信息读取到索引"
22510
22511 #: command-list.h:147
22512 msgid "Reapply commits on top of another base tip"
22513 msgstr "在另一个分支上重新应用提交"
22514
22515 #: command-list.h:148
22516 msgid "Receive what is pushed into the repository"
22517 msgstr "接收推送到仓库中的对象"
22518
22519 #: command-list.h:149
22520 msgid "Manage reflog information"
22521 msgstr "管理 reflog 信息"
22522
22523 #: command-list.h:150
22524 msgid "Manage set of tracked repositories"
22525 msgstr "管理已跟踪仓库"
22526
22527 #: command-list.h:151
22528 msgid "Pack unpacked objects in a repository"
22529 msgstr "打包仓库中未打包对象"
22530
22531 #: command-list.h:152
22532 msgid "Create, list, delete refs to replace objects"
22533 msgstr "创建、列出、删除对象替换引用"
22534
22535 #: command-list.h:153
22536 msgid "Generates a summary of pending changes"
22537 msgstr "生成待定更改的摘要"
22538
22539 #: command-list.h:154
22540 msgid "Reuse recorded resolution of conflicted merges"
22541 msgstr "重用冲突合并的解决方案记录"
22542
22543 #: command-list.h:155
22544 msgid "Reset current HEAD to the specified state"
22545 msgstr "重置当前 HEAD 到指定状态"
22546
22547 #: command-list.h:156
22548 msgid "Restore working tree files"
22549 msgstr "恢复工作区文件"
22550
22551 #: command-list.h:157
22552 msgid "Revert some existing commits"
22553 msgstr "回退一些现存提交"
22554
22555 #: command-list.h:158
22556 msgid "Lists commit objects in reverse chronological order"
22557 msgstr "按时间顺序列出提交对象"
22558
22559 #: command-list.h:159
22560 msgid "Pick out and massage parameters"
22561 msgstr "选出并处理参数"
22562
22563 #: command-list.h:160
22564 msgid "Remove files from the working tree and from the index"
22565 msgstr "从工作区和索引中删除文件"
22566
22567 #: command-list.h:161
22568 msgid "Send a collection of patches as emails"
22569 msgstr "通过电子邮件发送一组补丁"
22570
22571 #: command-list.h:162
22572 msgid "Push objects over Git protocol to another repository"
22573 msgstr "使用 Git 协议推送对象到另一个仓库"
22574
22575 #: command-list.h:163
22576 msgid "Restricted login shell for Git-only SSH access"
22577 msgstr "只允许 Git SSH 访问的受限登录shell"
22578
22579 #: command-list.h:164
22580 msgid "Summarize 'git log' output"
22581 msgstr "'git log' 输出摘要"
22582
22583 #: command-list.h:165
22584 msgid "Show various types of objects"
22585 msgstr "显示各种类型的对象"
22586
22587 #: command-list.h:166
22588 msgid "Show branches and their commits"
22589 msgstr "显示分支和提交"
22590
22591 #: command-list.h:167
22592 msgid "Show packed archive index"
22593 msgstr "显示打包归档索引"
22594
22595 #: command-list.h:168
22596 msgid "List references in a local repository"
22597 msgstr "显示本地仓库中的引用"
22598
22599 #: command-list.h:169
22600 msgid "Git's i18n setup code for shell scripts"
22601 msgstr "为 shell 脚本准备的 Git 国际化设置代码"
22602
22603 #: command-list.h:170
22604 msgid "Common Git shell script setup code"
22605 msgstr "常用的 Git shell 脚本设置代码"
22606
22607 #: command-list.h:171
22608 msgid "Initialize and modify the sparse-checkout"
22609 msgstr "初始化及修改稀疏检出"
22610
22611 #: command-list.h:172
22612 msgid "Stash the changes in a dirty working directory away"
22613 msgstr "贮藏脏工作区中的修改"
22614
22615 #: command-list.h:173
22616 msgid "Add file contents to the staging area"
22617 msgstr "将文件内容添加到索引"
22618
22619 #: command-list.h:174
22620 msgid "Show the working tree status"
22621 msgstr "显示工作区状态"
22622
22623 #: command-list.h:175
22624 msgid "Remove unnecessary whitespace"
22625 msgstr "删除不必要的空白字符"
22626
22627 #: command-list.h:176
22628 msgid "Initialize, update or inspect submodules"
22629 msgstr "初始化、更新或检查子模组"
22630
22631 #: command-list.h:177
22632 msgid "Bidirectional operation between a Subversion repository and Git"
22633 msgstr "Subersion 仓库和 Git 之间的双向操作"
22634
22635 #: command-list.h:178
22636 msgid "Switch branches"
22637 msgstr "切换分支"
22638
22639 #: command-list.h:179
22640 msgid "Read, modify and delete symbolic refs"
22641 msgstr "读取、修改和删除符号引用"
22642
22643 #: command-list.h:180
22644 msgid "Create, list, delete or verify a tag object signed with GPG"
22645 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
22646
22647 #: command-list.h:181
22648 msgid "Creates a temporary file with a blob's contents"
22649 msgstr "用 blob 数据对象的内容创建一个临时文件"
22650
22651 #: command-list.h:182
22652 msgid "Unpack objects from a packed archive"
22653 msgstr "从打包文件中解压缩对象"
22654
22655 #: command-list.h:183
22656 msgid "Register file contents in the working tree to the index"
22657 msgstr "将工作区的文件内容注册到索引"
22658
22659 #: command-list.h:184
22660 msgid "Update the object name stored in a ref safely"
22661 msgstr "安全地更新存储于引用中的对象名称"
22662
22663 #: command-list.h:185
22664 msgid "Update auxiliary info file to help dumb servers"
22665 msgstr "更新辅助信息文件以帮助哑协议服务"
22666
22667 #: command-list.h:186
22668 msgid "Send archive back to git-archive"
22669 msgstr "将存档发送回 git-archive"
22670
22671 #: command-list.h:187
22672 msgid "Send objects packed back to git-fetch-pack"
22673 msgstr "将对象压缩包发送回 git-fetch-pack"
22674
22675 #: command-list.h:188
22676 msgid "Show a Git logical variable"
22677 msgstr "显示一个Git逻辑变量"
22678
22679 #: command-list.h:189
22680 msgid "Check the GPG signature of commits"
22681 msgstr "检查 GPG 提交签名"
22682
22683 #: command-list.h:190
22684 msgid "Validate packed Git archive files"
22685 msgstr "校验打包的Git存仓文件"
22686
22687 #: command-list.h:191
22688 msgid "Check the GPG signature of tags"
22689 msgstr "检查标签的 GPG 签名"
22690
22691 #: command-list.h:192
22692 msgid "Git web interface (web frontend to Git repositories)"
22693 msgstr "Git web 界面(Git 仓库的 web 前端)"
22694
22695 #: command-list.h:193
22696 msgid "Show logs with difference each commit introduces"
22697 msgstr "显示每一个提交引入的差异日志"
22698
22699 #: command-list.h:194
22700 msgid "Manage multiple working trees"
22701 msgstr "管理多个工作区"
22702
22703 #: command-list.h:195
22704 msgid "Create a tree object from the current index"
22705 msgstr "从当前索引创建一个树对象"
22706
22707 #: command-list.h:196
22708 msgid "Defining attributes per path"
22709 msgstr "定义路径的属性"
22710
22711 #: command-list.h:197
22712 msgid "Git command-line interface and conventions"
22713 msgstr "Git 命令行界面和约定"
22714
22715 #: command-list.h:198
22716 msgid "A Git core tutorial for developers"
22717 msgstr "面向开发人员的 Git 核心教程"
22718
22719 #: command-list.h:199
22720 msgid "Git for CVS users"
22721 msgstr "适合 CVS 用户的 Git 帮助"
22722
22723 #: command-list.h:200
22724 msgid "Tweaking diff output"
22725 msgstr "调整差异输出"
22726
22727 #: command-list.h:201
22728 msgid "A useful minimum set of commands for Everyday Git"
22729 msgstr "每一天 Git 的一组有用的最小命令集合"
22730
22731 #: command-list.h:202
22732 msgid "A Git Glossary"
22733 msgstr "Git 词汇表"
22734
22735 #: command-list.h:203
22736 msgid "Hooks used by Git"
22737 msgstr "Git 使用的钩子"
22738
22739 #: command-list.h:204
22740 msgid "Specifies intentionally untracked files to ignore"
22741 msgstr "忽略指定的未跟踪文件"
22742
22743 #: command-list.h:205
22744 msgid "Defining submodule properties"
22745 msgstr "定义子模组属性"
22746
22747 #: command-list.h:206
22748 msgid "Git namespaces"
22749 msgstr "Git 名字空间"
22750
22751 #: command-list.h:207
22752 msgid "Git Repository Layout"
22753 msgstr "Git 仓库布局"
22754
22755 #: command-list.h:208
22756 msgid "Specifying revisions and ranges for Git"
22757 msgstr "指定 Git 的版本和版本范围"
22758
22759 #: command-list.h:209
22760 msgid "Mounting one repository inside another"
22761 msgstr "将一个仓库安装到另外一个仓库中"
22762
22763 #: command-list.h:210
22764 msgid "A tutorial introduction to Git: part two"
22765 msgstr "一个 Git 教程:第二部分"
22766
22767 #: command-list.h:211
22768 msgid "A tutorial introduction to Git"
22769 msgstr "一个 Git 教程"
22770
22771 #: command-list.h:212
22772 msgid "An overview of recommended workflows with Git"
22773 msgstr "Git 推荐的工作流概览"
22774
22775 #: git-bisect.sh:54
22776 msgid "You need to start by \"git bisect start\""
22777 msgstr "您需要执行 \"git bisect start\" 来开始"
22778
22779 # 译者:注意保持句尾空格
22780 #. TRANSLATORS: Make sure to include [Y] and [n] in your
22781 #. translation. The program will only accept English input
22782 #. at this point.
22783 #: git-bisect.sh:60
22784 msgid "Do you want me to do it for you [Y/n]? "
22785 msgstr "您想让我为您这样做么[Y/n]? "
22786
22787 #: git-bisect.sh:101
22788 #, sh-format
22789 msgid "Bad rev input: $arg"
22790 msgstr "坏的输入版本:$arg"
22791
22792 #: git-bisect.sh:121
22793 #, sh-format
22794 msgid "Bad rev input: $bisected_head"
22795 msgstr "坏的输入版本:$bisected_head"
22796
22797 #: git-bisect.sh:130
22798 #, sh-format
22799 msgid "Bad rev input: $rev"
22800 msgstr "坏的输入版本:$rev"
22801
22802 #: git-bisect.sh:139
22803 #, sh-format
22804 msgid "'git bisect $TERM_BAD' can take only one argument."
22805 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
22806
22807 #: git-bisect.sh:209
22808 msgid "No logfile given"
22809 msgstr "未提供日志文件"
22810
22811 #: git-bisect.sh:210
22812 #, sh-format
22813 msgid "cannot read $file for replaying"
22814 msgstr "不能读取 $file 来重放"
22815
22816 #: git-bisect.sh:232
22817 msgid "?? what are you talking about?"
22818 msgstr "?? 您在说什么?"
22819
22820 #: git-bisect.sh:241
22821 msgid "bisect run failed: no command provided."
22822 msgstr "二分查找运行失败:没有提供命令。"
22823
22824 #: git-bisect.sh:246
22825 #, sh-format
22826 msgid "running $command"
22827 msgstr "运行 $command"
22828
22829 #: git-bisect.sh:253
22830 #, sh-format
22831 msgid ""
22832 "bisect run failed:\n"
22833 "exit code $res from '$command' is < 0 or >= 128"
22834 msgstr ""
22835 "二分查找运行失败:\n"
22836 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
22837
22838 #: git-bisect.sh:279
22839 msgid "bisect run cannot continue any more"
22840 msgstr "二分查找不能继续运行"
22841
22842 #: git-bisect.sh:285
22843 #, sh-format
22844 msgid ""
22845 "bisect run failed:\n"
22846 "'bisect_state $state' exited with error code $res"
22847 msgstr ""
22848 "二分查找运行失败:\n"
22849 "'bisect_state $state' 退出码为 $res"
22850
22851 #: git-bisect.sh:292
22852 msgid "bisect run success"
22853 msgstr "二分查找运行成功"
22854
22855 #: git-bisect.sh:300
22856 msgid "We are not bisecting."
22857 msgstr "我们没有在二分查找。"
22858
22859 #: git-merge-octopus.sh:46
22860 msgid ""
22861 "Error: Your local changes to the following files would be overwritten by "
22862 "merge"
22863 msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
22864
22865 #: git-merge-octopus.sh:61
22866 msgid "Automated merge did not work."
22867 msgstr "自动合并未生效。"
22868
22869 #: git-merge-octopus.sh:62
22870 msgid "Should not be doing an octopus."
22871 msgstr "不应该执行章鱼式合并。"
22872
22873 #: git-merge-octopus.sh:73
22874 #, sh-format
22875 msgid "Unable to find common commit with $pretty_name"
22876 msgstr "无法找到和 $pretty_name 的基线提交"
22877
22878 #: git-merge-octopus.sh:77
22879 #, sh-format
22880 msgid "Already up to date with $pretty_name"
22881 msgstr "已经和 $pretty_name 保持一致"
22882
22883 #: git-merge-octopus.sh:89
22884 #, sh-format
22885 msgid "Fast-forwarding to: $pretty_name"
22886 msgstr "快进至:$pretty_name"
22887
22888 #: git-merge-octopus.sh:97
22889 #, sh-format
22890 msgid "Trying simple merge with $pretty_name"
22891 msgstr "尝试和 $pretty_name 的简单合并"
22892
22893 #: git-merge-octopus.sh:102
22894 msgid "Simple merge did not work, trying automatic merge."
22895 msgstr "简单合并未生效,尝试自动合并。"
22896
22897 #: git-legacy-stash.sh:221
22898 msgid "Cannot remove temporary index (can't happen)"
22899 msgstr "无法删除临时索引(不应发生)"
22900
22901 #: git-legacy-stash.sh:272
22902 #, sh-format
22903 msgid "Cannot update $ref_stash with $w_commit"
22904 msgstr "无法用 $w_commit 更新 $ref_stash"
22905
22906 #: git-legacy-stash.sh:324
22907 #, sh-format
22908 msgid "error: unknown option for 'stash push': $option"
22909 msgstr "错误:'stash push' 的未知选项:$option"
22910
22911 #: git-legacy-stash.sh:356
22912 #, sh-format
22913 msgid "Saved working directory and index state $stash_msg"
22914 msgstr "保存工作目录和索引状态 $stash_msg"
22915
22916 #: git-legacy-stash.sh:536
22917 #, sh-format
22918 msgid "unknown option: $opt"
22919 msgstr "未知选项: $opt"
22920
22921 #: git-legacy-stash.sh:556
22922 #, sh-format
22923 msgid "Too many revisions specified: $REV"
22924 msgstr "指定了太多的版本:$REV"
22925
22926 #: git-legacy-stash.sh:571
22927 #, sh-format
22928 msgid "$reference is not a valid reference"
22929 msgstr "$reference 不是一个有效的引用"
22930
22931 #: git-legacy-stash.sh:599
22932 #, sh-format
22933 msgid "'$args' is not a stash-like commit"
22934 msgstr "'$args' 不是贮藏式提交"
22935
22936 #: git-legacy-stash.sh:610
22937 #, sh-format
22938 msgid "'$args' is not a stash reference"
22939 msgstr "'$args' 不是一个贮藏引用"
22940
22941 #: git-legacy-stash.sh:618
22942 msgid "unable to refresh index"
22943 msgstr "无法刷新索引"
22944
22945 #: git-legacy-stash.sh:622
22946 msgid "Cannot apply a stash in the middle of a merge"
22947 msgstr "无法在合并过程应用贮藏"
22948
22949 #: git-legacy-stash.sh:630
22950 msgid "Conflicts in index. Try without --index."
22951 msgstr "索引中有冲突。尝试不使用 --index。"
22952
22953 #: git-legacy-stash.sh:632
22954 msgid "Could not save index tree"
22955 msgstr "不能保存索引树"
22956
22957 #: git-legacy-stash.sh:641
22958 msgid "Could not restore untracked files from stash entry"
22959 msgstr "无法从贮藏条目中恢复未跟踪文件"
22960
22961 #: git-legacy-stash.sh:666
22962 msgid "Cannot unstage modified files"
22963 msgstr "无法将修改的文件取消暂存"
22964
22965 #: git-legacy-stash.sh:704
22966 #, sh-format
22967 msgid "Dropped ${REV} ($s)"
22968 msgstr "丢弃了 ${REV} ($s)"
22969
22970 #: git-legacy-stash.sh:705
22971 #, sh-format
22972 msgid "${REV}: Could not drop stash entry"
22973 msgstr "${REV}:无法丢弃贮藏条目"
22974
22975 #: git-legacy-stash.sh:792
22976 msgid "(To restore them type \"git stash apply\")"
22977 msgstr "(为恢复数据输入 \"git stash apply\")"
22978
22979 #: git-submodule.sh:203
22980 msgid "Relative path can only be used from the toplevel of the working tree"
22981 msgstr "只能在工作区的顶级目录中使用相对路径"
22982
22983 #: git-submodule.sh:213
22984 #, sh-format
22985 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
22986 msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
22987
22988 #: git-submodule.sh:232
22989 #, sh-format
22990 msgid "'$sm_path' already exists in the index"
22991 msgstr "'$sm_path' 已经存在于索引中"
22992
22993 #: git-submodule.sh:235
22994 #, sh-format
22995 msgid "'$sm_path' already exists in the index and is not a submodule"
22996 msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
22997
22998 #: git-submodule.sh:242
22999 #, sh-format
23000 msgid "'$sm_path' does not have a commit checked out"
23001 msgstr "'$sm_path' 没有检出的提交"
23002
23003 #: git-submodule.sh:273
23004 #, sh-format
23005 msgid "Adding existing repo at '$sm_path' to the index"
23006 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
23007
23008 #: git-submodule.sh:275
23009 #, sh-format
23010 msgid "'$sm_path' already exists and is not a valid git repo"
23011 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
23012
23013 #: git-submodule.sh:283
23014 #, sh-format
23015 msgid "A git directory for '$sm_name' is found locally with remote(s):"
23016 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
23017
23018 #: git-submodule.sh:285
23019 #, sh-format
23020 msgid ""
23021 "If you want to reuse this local git directory instead of cloning again from\n"
23022 " $realrepo\n"
23023 "use the '--force' option. If the local git directory is not the correct "
23024 "repo\n"
23025 "or you are unsure what this means choose another name with the '--name' "
23026 "option."
23027 msgstr ""
23028 "如果您想要重用这个本地 git 目录而非重新克隆自\n"
23029 " $realrepo\n"
23030 "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
23031 "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
23032
23033 #: git-submodule.sh:291
23034 #, sh-format
23035 msgid "Reactivating local git directory for submodule '$sm_name'."
23036 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
23037
23038 #: git-submodule.sh:303
23039 #, sh-format
23040 msgid "Unable to checkout submodule '$sm_path'"
23041 msgstr "不能检出子模组 '$sm_path'"
23042
23043 #: git-submodule.sh:308
23044 #, sh-format
23045 msgid "Failed to add submodule '$sm_path'"
23046 msgstr "无法添加子模组 '$sm_path'"
23047
23048 #: git-submodule.sh:317
23049 #, sh-format
23050 msgid "Failed to register submodule '$sm_path'"
23051 msgstr "无法注册子模组 '$sm_path'"
23052
23053 #: git-submodule.sh:590
23054 #, sh-format
23055 msgid "Unable to find current revision in submodule path '$displaypath'"
23056 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
23057
23058 #: git-submodule.sh:600
23059 #, sh-format
23060 msgid "Unable to fetch in submodule path '$sm_path'"
23061 msgstr "无法在子模组路径 '$sm_path' 中获取"
23062
23063 #: git-submodule.sh:605
23064 #, sh-format
23065 msgid ""
23066 "Unable to find current ${remote_name}/${branch} revision in submodule path "
23067 "'$sm_path'"
23068 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
23069
23070 #: git-submodule.sh:623
23071 #, sh-format
23072 msgid ""
23073 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
23074 "$sha1:"
23075 msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:"
23076
23077 #: git-submodule.sh:629
23078 #, sh-format
23079 msgid ""
23080 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
23081 "Direct fetching of that commit failed."
23082 msgstr ""
23083 "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
23084
23085 #: git-submodule.sh:636
23086 #, sh-format
23087 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
23088 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
23089
23090 #: git-submodule.sh:637
23091 #, sh-format
23092 msgid "Submodule path '$displaypath': checked out '$sha1'"
23093 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
23094
23095 #: git-submodule.sh:641
23096 #, sh-format
23097 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
23098 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
23099
23100 #: git-submodule.sh:642
23101 #, sh-format
23102 msgid "Submodule path '$displaypath': rebased into '$sha1'"
23103 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
23104
23105 #: git-submodule.sh:647
23106 #, sh-format
23107 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
23108 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
23109
23110 #: git-submodule.sh:648
23111 #, sh-format
23112 msgid "Submodule path '$displaypath': merged in '$sha1'"
23113 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
23114
23115 #: git-submodule.sh:653
23116 #, sh-format
23117 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
23118 msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
23119
23120 #: git-submodule.sh:654
23121 #, sh-format
23122 msgid "Submodule path '$displaypath': '$command $sha1'"
23123 msgstr "子模组 '$displaypath':'$command $sha1'"
23124
23125 #: git-submodule.sh:685
23126 #, sh-format
23127 msgid "Failed to recurse into submodule path '$displaypath'"
23128 msgstr "无法递归进子模组路径 '$displaypath'"
23129
23130 #: git-submodule.sh:896
23131 msgid "The --cached option cannot be used with the --files option"
23132 msgstr "选项 --cached 不能和选项 --files 同时使用"
23133
23134 #: git-submodule.sh:948
23135 #, sh-format
23136 msgid "unexpected mode $mod_dst"
23137 msgstr "意外的模式 $mod_dst"
23138
23139 # 译者:注意保持前导空格
23140 #: git-submodule.sh:968
23141 #, sh-format
23142 msgid " Warn: $display_name doesn't contain commit $sha1_src"
23143 msgstr " 警告:$display_name 未包含提交 $sha1_src"
23144
23145 # 译者:注意保持前导空格
23146 #: git-submodule.sh:971
23147 #, sh-format
23148 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
23149 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
23150
23151 # 译者:注意保持前导空格
23152 #: git-submodule.sh:974
23153 #, sh-format
23154 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
23155 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
23156
23157 #: git-parse-remote.sh:89
23158 #, sh-format
23159 msgid "See git-${cmd}(1) for details."
23160 msgstr "详见 git-${cmd}(1)。"
23161
23162 #: git-rebase--preserve-merges.sh:109
23163 msgid "Applied autostash."
23164 msgstr "已应用 autostash。"
23165
23166 #: git-rebase--preserve-merges.sh:112
23167 #, sh-format
23168 msgid "Cannot store $stash_sha1"
23169 msgstr "不能存储 $stash_sha1"
23170
23171 #: git-rebase--preserve-merges.sh:191
23172 #, sh-format
23173 msgid "Rebasing ($new_count/$total)"
23174 msgstr "变基中($new_count/$total)"
23175
23176 #: git-rebase--preserve-merges.sh:207
23177 msgid ""
23178 "\n"
23179 "Commands:\n"
23180 "p, pick <commit> = use commit\n"
23181 "r, reword <commit> = use commit, but edit the commit message\n"
23182 "e, edit <commit> = use commit, but stop for amending\n"
23183 "s, squash <commit> = use commit, but meld into previous commit\n"
23184 "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
23185 "x, exec <commit> = run command (the rest of the line) using shell\n"
23186 "d, drop <commit> = remove commit\n"
23187 "l, label <label> = label current HEAD with a name\n"
23188 "t, reset <label> = reset HEAD to a label\n"
23189 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
23190 ". create a merge commit using the original merge commit's\n"
23191 ". message (or the oneline, if no original merge commit was\n"
23192 ". specified). Use -c <commit> to reword the commit message.\n"
23193 "\n"
23194 "These lines can be re-ordered; they are executed from top to bottom.\n"
23195 msgstr ""
23196 "\n"
23197 "命令:\n"
23198 "p, pick <提交> = 使用提交\n"
23199 "r, reword <提交> = 使用提交,但修改提交说明\n"
23200 "e, edit <提交> = 使用提交,但停下来修补\n"
23201 "s, squash <提交> = 使用提交,但融合到前一个提交\n"
23202 "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
23203 "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
23204 "d, drop <提交> = 删除提交\n"
23205 "l, label <标签> = 为当前 HEAD 打上标签\n"
23206 "t, reset <标签> = 重置 HEAD 到该标签\n"
23207 "m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
23208 ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
23209 ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
23210 ". -c <提交> 可以编辑提交说明。\n"
23211 "\n"
23212 "可以对这些行重新排序,将从上至下执行。\n"
23213
23214 #: git-rebase--preserve-merges.sh:270
23215 #, sh-format
23216 msgid ""
23217 "You can amend the commit now, with\n"
23218 "\n"
23219 "\tgit commit --amend $gpg_sign_opt_quoted\n"
23220 "\n"
23221 "Once you are satisfied with your changes, run\n"
23222 "\n"
23223 "\tgit rebase --continue"
23224 msgstr ""
23225 "您现在可以修补这个提交,使用\n"
23226 "\n"
23227 "\tgit commit --amend $gpg_sign_opt_quoted\n"
23228 "\n"
23229 "当您对变更感到满意,执行\n"
23230 "\n"
23231 "\tgit rebase --continue"
23232
23233 #: git-rebase--preserve-merges.sh:295
23234 #, sh-format
23235 msgid "$sha1: not a commit that can be picked"
23236 msgstr "$sha1:不是一个可以被拣选的提交"
23237
23238 #: git-rebase--preserve-merges.sh:334
23239 #, sh-format
23240 msgid "Invalid commit name: $sha1"
23241 msgstr "无效的提交名:$sha1"
23242
23243 #: git-rebase--preserve-merges.sh:364
23244 msgid "Cannot write current commit's replacement sha1"
23245 msgstr "不能写入当前提交的替代 sha1"
23246
23247 #: git-rebase--preserve-merges.sh:415
23248 #, sh-format
23249 msgid "Fast-forward to $sha1"
23250 msgstr "快进到 $sha1"
23251
23252 #: git-rebase--preserve-merges.sh:417
23253 #, sh-format
23254 msgid "Cannot fast-forward to $sha1"
23255 msgstr "不能快进到 $sha1"
23256
23257 #: git-rebase--preserve-merges.sh:426
23258 #, sh-format
23259 msgid "Cannot move HEAD to $first_parent"
23260 msgstr "不能移动 HEAD 到 $first_parent"
23261
23262 #: git-rebase--preserve-merges.sh:431
23263 #, sh-format
23264 msgid "Refusing to squash a merge: $sha1"
23265 msgstr "拒绝压缩一个合并:$sha1"
23266
23267 #: git-rebase--preserve-merges.sh:449
23268 #, sh-format
23269 msgid "Error redoing merge $sha1"
23270 msgstr "无法重做合并 $sha1"
23271
23272 #: git-rebase--preserve-merges.sh:458
23273 #, sh-format
23274 msgid "Could not pick $sha1"
23275 msgstr "不能拣选 $sha1"
23276
23277 #: git-rebase--preserve-merges.sh:467
23278 #, sh-format
23279 msgid "This is the commit message #${n}:"
23280 msgstr "这是提交说明 #${n}:"
23281
23282 #: git-rebase--preserve-merges.sh:472
23283 #, sh-format
23284 msgid "The commit message #${n} will be skipped:"
23285 msgstr "提交说明 #${n} 将被跳过:"
23286
23287 #: git-rebase--preserve-merges.sh:483
23288 #, sh-format
23289 msgid "This is a combination of $count commit."
23290 msgid_plural "This is a combination of $count commits."
23291 msgstr[0] "这是一个 $count 个提交的组合。"
23292 msgstr[1] "这是一个 $count 个提交的组合。"
23293
23294 #: git-rebase--preserve-merges.sh:492
23295 #, sh-format
23296 msgid "Cannot write $fixup_msg"
23297 msgstr "不能写入 $fixup_msg"
23298
23299 #: git-rebase--preserve-merges.sh:495
23300 msgid "This is a combination of 2 commits."
23301 msgstr "这是一个 2 个提交的组合。"
23302
23303 #: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
23304 #: git-rebase--preserve-merges.sh:582
23305 #, sh-format
23306 msgid "Could not apply $sha1... $rest"
23307 msgstr "不能应用 $sha1... $rest"
23308
23309 #: git-rebase--preserve-merges.sh:611
23310 #, sh-format
23311 msgid ""
23312 "Could not amend commit after successfully picking $sha1... $rest\n"
23313 "This is most likely due to an empty commit message, or the pre-commit hook\n"
23314 "failed. If the pre-commit hook failed, you may need to resolve the issue "
23315 "before\n"
23316 "you are able to reword the commit."
23317 msgstr ""
23318 "不能在成功拣选 $sha1... $rest 之后修补提交\n"
23319 "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
23320 "钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
23321
23322 #: git-rebase--preserve-merges.sh:626
23323 #, sh-format
23324 msgid "Stopped at $sha1_abbrev... $rest"
23325 msgstr "停止在 $sha1_abbrev... $rest"
23326
23327 #: git-rebase--preserve-merges.sh:641
23328 #, sh-format
23329 msgid "Cannot '$squash_style' without a previous commit"
23330 msgstr "没有父提交的情况下不能 '$squash_style'"
23331
23332 #: git-rebase--preserve-merges.sh:683
23333 #, sh-format
23334 msgid "Executing: $rest"
23335 msgstr "执行:$rest"
23336
23337 #: git-rebase--preserve-merges.sh:691
23338 #, sh-format
23339 msgid "Execution failed: $rest"
23340 msgstr "执行失败:$rest"
23341
23342 #: git-rebase--preserve-merges.sh:693
23343 msgid "and made changes to the index and/or the working tree"
23344 msgstr "并且修改索引和/或工作区"
23345
23346 # 译者:注意保持前导空格
23347 #: git-rebase--preserve-merges.sh:695
23348 msgid ""
23349 "You can fix the problem, and then run\n"
23350 "\n"
23351 "\tgit rebase --continue"
23352 msgstr ""
23353 "您可以解决这个问题,然后运行\n"
23354 "\n"
23355 "\tgit rebase --continue"
23356
23357 #. TRANSLATORS: after these lines is a command to be issued by the user
23358 #: git-rebase--preserve-merges.sh:708
23359 #, sh-format
23360 msgid ""
23361 "Execution succeeded: $rest\n"
23362 "but left changes to the index and/or the working tree\n"
23363 "Commit or stash your changes, and then run\n"
23364 "\n"
23365 "\tgit rebase --continue"
23366 msgstr ""
23367 "执行成功:$rest\n"
23368 "但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
23369 "\n"
23370 "\tgit rebase --continue"
23371
23372 #: git-rebase--preserve-merges.sh:719
23373 #, sh-format
23374 msgid "Unknown command: $command $sha1 $rest"
23375 msgstr "未知命令:$command $sha1 $rest"
23376
23377 #: git-rebase--preserve-merges.sh:720
23378 msgid "Please fix this using 'git rebase --edit-todo'."
23379 msgstr "要修改请使用命令 'git rebase --edit-todo'。"
23380
23381 #: git-rebase--preserve-merges.sh:755
23382 #, sh-format
23383 msgid "Successfully rebased and updated $head_name."
23384 msgstr "成功变基并更新 $head_name。"
23385
23386 #: git-rebase--preserve-merges.sh:812
23387 msgid "Could not remove CHERRY_PICK_HEAD"
23388 msgstr "不能删除 CHERRY_PICK_HEAD"
23389
23390 #: git-rebase--preserve-merges.sh:817
23391 #, sh-format
23392 msgid ""
23393 "You have staged changes in your working tree.\n"
23394 "If these changes are meant to be\n"
23395 "squashed into the previous commit, run:\n"
23396 "\n"
23397 " git commit --amend $gpg_sign_opt_quoted\n"
23398 "\n"
23399 "If they are meant to go into a new commit, run:\n"
23400 "\n"
23401 " git commit $gpg_sign_opt_quoted\n"
23402 "\n"
23403 "In both cases, once you're done, continue with:\n"
23404 "\n"
23405 " git rebase --continue\n"
23406 msgstr ""
23407 "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
23408 "\n"
23409 " git commit --amend $gpg_sign_opt_quoted\n"
23410 "\n"
23411 "如果这些变更要形成一个新提交,执行:\n"
23412 "\n"
23413 " git commit $gpg_sign_opt_quoted\n"
23414 "\n"
23415 "无论哪种情况,当您完成提交,继续执行:\n"
23416 "\n"
23417 " git rebase --continue\n"
23418
23419 #: git-rebase--preserve-merges.sh:834
23420 msgid "Error trying to find the author identity to amend commit"
23421 msgstr "在修补提交中查找作者信息时遇到错误"
23422
23423 #: git-rebase--preserve-merges.sh:839
23424 msgid ""
23425 "You have uncommitted changes in your working tree. Please commit them\n"
23426 "first and then run 'git rebase --continue' again."
23427 msgstr ""
23428 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
23429
23430 #: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
23431 msgid "Could not commit staged changes."
23432 msgstr "不能提交暂存的修改。"
23433
23434 #: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
23435 msgid "Could not execute editor"
23436 msgstr "无法运行编辑器"
23437
23438 #: git-rebase--preserve-merges.sh:900
23439 #, sh-format
23440 msgid "Could not checkout $switch_to"
23441 msgstr "不能检出 $switch_to"
23442
23443 #: git-rebase--preserve-merges.sh:907
23444 msgid "No HEAD?"
23445 msgstr "没有 HEAD?"
23446
23447 #: git-rebase--preserve-merges.sh:908
23448 #, sh-format
23449 msgid "Could not create temporary $state_dir"
23450 msgstr "不能创建临时 $state_dir"
23451
23452 #: git-rebase--preserve-merges.sh:911
23453 msgid "Could not mark as interactive"
23454 msgstr "不能标记为交互式"
23455
23456 #: git-rebase--preserve-merges.sh:943
23457 #, sh-format
23458 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
23459 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
23460 msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
23461 msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
23462
23463 #: git-rebase--preserve-merges.sh:955
23464 msgid "Note that empty commits are commented out"
23465 msgstr "注意空提交已被注释掉"
23466
23467 #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
23468 msgid "Could not init rewritten commits"
23469 msgstr "不能对重写提交进行初始化"
23470
23471 #: git-sh-setup.sh:89 git-sh-setup.sh:94
23472 #, sh-format
23473 msgid "usage: $dashless $USAGE"
23474 msgstr "用法:$dashless $USAGE"
23475
23476 #: git-sh-setup.sh:191
23477 #, sh-format
23478 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
23479 msgstr "不能切换目录到 $cdup,工作区的顶级目录"
23480
23481 #: git-sh-setup.sh:200 git-sh-setup.sh:207
23482 #, sh-format
23483 msgid "fatal: $program_name cannot be used without a working tree."
23484 msgstr "致命错误:$program_name 不能在没有工作区的情况下使用"
23485
23486 #: git-sh-setup.sh:221
23487 msgid "Cannot rebase: You have unstaged changes."
23488 msgstr "不能变基:您有未暂存的变更。"
23489
23490 #: git-sh-setup.sh:224
23491 msgid "Cannot rewrite branches: You have unstaged changes."
23492 msgstr "不能重写分支:您有未暂存的变更。"
23493
23494 #: git-sh-setup.sh:227
23495 msgid "Cannot pull with rebase: You have unstaged changes."
23496 msgstr "无法通过变基方式拉取:您有未暂存的变更。"
23497
23498 #: git-sh-setup.sh:230
23499 #, sh-format
23500 msgid "Cannot $action: You have unstaged changes."
23501 msgstr "不能 $action:您有未暂存的变更。"
23502
23503 #: git-sh-setup.sh:243
23504 msgid "Cannot rebase: Your index contains uncommitted changes."
23505 msgstr "不能变基:您的索引中包含未提交的变更。"
23506
23507 #: git-sh-setup.sh:246
23508 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
23509 msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
23510
23511 #: git-sh-setup.sh:249
23512 #, sh-format
23513 msgid "Cannot $action: Your index contains uncommitted changes."
23514 msgstr "不能 $action:您的索引中包含未提交的变更。"
23515
23516 #: git-sh-setup.sh:253
23517 msgid "Additionally, your index contains uncommitted changes."
23518 msgstr "而且您的索引中包含未提交的变更。"
23519
23520 #: git-sh-setup.sh:373
23521 msgid "You need to run this command from the toplevel of the working tree."
23522 msgstr "您需要在工作区的顶级目录中运行这个命令。"
23523
23524 #: git-sh-setup.sh:378
23525 msgid "Unable to determine absolute path of git directory"
23526 msgstr "不能确定 git 目录的绝对路径"
23527
23528 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
23529 #: git-add--interactive.perl:212
23530 #, perl-format
23531 msgid "%12s %12s %s"
23532 msgstr "%12s %12s %s"
23533
23534 #: git-add--interactive.perl:634
23535 #, perl-format
23536 msgid "touched %d path\n"
23537 msgid_plural "touched %d paths\n"
23538 msgstr[0] "触碰了 %d 个路径\n"
23539 msgstr[1] "触碰了 %d 个路径\n"
23540
23541 #: git-add--interactive.perl:1053
23542 msgid ""
23543 "If the patch applies cleanly, the edited hunk will immediately be\n"
23544 "marked for staging."
23545 msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
23546
23547 #: git-add--interactive.perl:1056
23548 msgid ""
23549 "If the patch applies cleanly, the edited hunk will immediately be\n"
23550 "marked for stashing."
23551 msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
23552
23553 #: git-add--interactive.perl:1059
23554 msgid ""
23555 "If the patch applies cleanly, the edited hunk will immediately be\n"
23556 "marked for unstaging."
23557 msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
23558
23559 #: git-add--interactive.perl:1062 git-add--interactive.perl:1071
23560 #: git-add--interactive.perl:1077
23561 msgid ""
23562 "If the patch applies cleanly, the edited hunk will immediately be\n"
23563 "marked for applying."
23564 msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
23565
23566 #: git-add--interactive.perl:1065 git-add--interactive.perl:1068
23567 #: git-add--interactive.perl:1074
23568 msgid ""
23569 "If the patch applies cleanly, the edited hunk will immediately be\n"
23570 "marked for discarding."
23571 msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
23572
23573 #: git-add--interactive.perl:1111
23574 #, perl-format
23575 msgid "failed to open hunk edit file for writing: %s"
23576 msgstr "为写入打开块编辑文件失败:%s"
23577
23578 #: git-add--interactive.perl:1118
23579 #, perl-format
23580 msgid ""
23581 "---\n"
23582 "To remove '%s' lines, make them ' ' lines (context).\n"
23583 "To remove '%s' lines, delete them.\n"
23584 "Lines starting with %s will be removed.\n"
23585 msgstr ""
23586 "---\n"
23587 "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
23588 "要删除 '%s' 开始的行,删除它们。\n"
23589 "以 %s 开始的行将被删除。\n"
23590
23591 #: git-add--interactive.perl:1140
23592 #, perl-format
23593 msgid "failed to open hunk edit file for reading: %s"
23594 msgstr "无法读取块编辑文件:%s"
23595
23596 #: git-add--interactive.perl:1248
23597 msgid ""
23598 "y - stage this hunk\n"
23599 "n - do not stage this hunk\n"
23600 "q - quit; do not stage this hunk or any of the remaining ones\n"
23601 "a - stage this hunk and all later hunks in the file\n"
23602 "d - do not stage this hunk or any of the later hunks in the file"
23603 msgstr ""
23604 "y - 暂存该块\n"
23605 "n - 不要暂存该块\n"
23606 "q - 退出。不暂存该块及后面的全部块\n"
23607 "a - 暂存该块和本文件中后面的全部块\n"
23608 "d - 不暂存该块和本文件中后面的全部块"
23609
23610 #: git-add--interactive.perl:1254
23611 msgid ""
23612 "y - stash this hunk\n"
23613 "n - do not stash this hunk\n"
23614 "q - quit; do not stash this hunk or any of the remaining ones\n"
23615 "a - stash this hunk and all later hunks in the file\n"
23616 "d - do not stash this hunk or any of the later hunks in the file"
23617 msgstr ""
23618 "y - 贮藏该块\n"
23619 "n - 不要贮藏该块\n"
23620 "q - 退出。不贮藏该块及后面的全部块\n"
23621 "a - 贮藏该块和本文件中后面的全部块\n"
23622 "d - 不贮藏该块和本文件中后面的全部块"
23623
23624 #: git-add--interactive.perl:1260
23625 msgid ""
23626 "y - unstage this hunk\n"
23627 "n - do not unstage this hunk\n"
23628 "q - quit; do not unstage this hunk or any of the remaining ones\n"
23629 "a - unstage this hunk and all later hunks in the file\n"
23630 "d - do not unstage this hunk or any of the later hunks in the file"
23631 msgstr ""
23632 "y - 不暂存该块\n"
23633 "n - 不要不暂存该块\n"
23634 "q - 退出。不要不暂存该块及后面的全部块\n"
23635 "a - 不暂存该块和本文件中后面的全部块\n"
23636 "d - 不要不暂存该块和本文件中后面的全部块"
23637
23638 #: git-add--interactive.perl:1266
23639 msgid ""
23640 "y - apply this hunk to index\n"
23641 "n - do not apply this hunk to index\n"
23642 "q - quit; do not apply this hunk or any of the remaining ones\n"
23643 "a - apply this hunk and all later hunks in the file\n"
23644 "d - do not apply this hunk or any of the later hunks in the file"
23645 msgstr ""
23646 "y - 在索引中应用该块\n"
23647 "n - 不要在索引中应用该块\n"
23648 "q - 退出。不要应用该块及后面的全部块\n"
23649 "a - 应用该块和本文件中后面的全部块\n"
23650 "d - 不要应用该块和本文件中后面的全部块"
23651
23652 #: git-add--interactive.perl:1272 git-add--interactive.perl:1290
23653 msgid ""
23654 "y - discard this hunk from worktree\n"
23655 "n - do not discard this hunk from worktree\n"
23656 "q - quit; do not discard this hunk or any of the remaining ones\n"
23657 "a - discard this hunk and all later hunks in the file\n"
23658 "d - do not discard this hunk or any of the later hunks in the file"
23659 msgstr ""
23660 "y - 在工作区中丢弃该块\n"
23661 "n - 不要在工作区中丢弃该块\n"
23662 "q - 退出。不要丢弃该块及后面的全部块\n"
23663 "a - 丢弃该块和本文件中后面的全部块\n"
23664 "d - 不要丢弃该块和本文件中后面的全部块"
23665
23666 #: git-add--interactive.perl:1278
23667 msgid ""
23668 "y - discard this hunk from index and worktree\n"
23669 "n - do not discard this hunk from index and worktree\n"
23670 "q - quit; do not discard this hunk or any of the remaining ones\n"
23671 "a - discard this hunk and all later hunks in the file\n"
23672 "d - do not discard this hunk or any of the later hunks in the file"
23673 msgstr ""
23674 "y - 在索引和工作区中丢弃该块\n"
23675 "n - 不要在索引和工作区中丢弃该块\n"
23676 "q - 退出。不要丢弃该块及后面的全部块\n"
23677 "a - 丢弃该块和本文件中后面的全部块\n"
23678 "d - 不要丢弃该块和本文件中后面的全部块"
23679
23680 #: git-add--interactive.perl:1284
23681 msgid ""
23682 "y - apply this hunk to index and worktree\n"
23683 "n - do not apply this hunk to index and worktree\n"
23684 "q - quit; do not apply this hunk or any of the remaining ones\n"
23685 "a - apply this hunk and all later hunks in the file\n"
23686 "d - do not apply this hunk or any of the later hunks in the file"
23687 msgstr ""
23688 "y - 在索引和工作区中应用该块\n"
23689 "n - 不要在索引和工作区中应用该块\n"
23690 "q - 退出。不要应用该块及后面的全部块\n"
23691 "a - 应用该块和本文件中后面的全部块\n"
23692 "d - 不要应用该块和本文件中后面的全部块"
23693
23694 #: git-add--interactive.perl:1296
23695 msgid ""
23696 "y - apply this hunk to worktree\n"
23697 "n - do not apply this hunk to worktree\n"
23698 "q - quit; do not apply this hunk or any of the remaining ones\n"
23699 "a - apply this hunk and all later hunks in the file\n"
23700 "d - do not apply this hunk or any of the later hunks in the file"
23701 msgstr ""
23702 "y - 在工作区中应用该块\n"
23703 "n - 不要在工作区中应用该块\n"
23704 "q - 退出。不要应用该块及后面的全部块\n"
23705 "a - 应用该块和本文件中后面的全部块\n"
23706 "d - 不要应用该块和本文件中后面的全部块"
23707
23708 #: git-add--interactive.perl:1311
23709 msgid ""
23710 "g - select a hunk to go to\n"
23711 "/ - search for a hunk matching the given regex\n"
23712 "j - leave this hunk undecided, see next undecided hunk\n"
23713 "J - leave this hunk undecided, see next hunk\n"
23714 "k - leave this hunk undecided, see previous undecided hunk\n"
23715 "K - leave this hunk undecided, see previous hunk\n"
23716 "s - split the current hunk into smaller hunks\n"
23717 "e - manually edit the current hunk\n"
23718 "? - print help\n"
23719 msgstr ""
23720 "g - 选择跳转到一个块\n"
23721 "/ - 查找和给定正则表达式匹配的块\n"
23722 "j - 维持该块未决状态,查看下一个未决块\n"
23723 "J - 维持该块未决状态,查看下一个块\n"
23724 "k - 维持该块未决状态,查看上一个未决块\n"
23725 "K - 维持该块未决状态,查看上一个块\n"
23726 "s - 拆分当前块为更小的块\n"
23727 "e - 手动编辑当前块\n"
23728 "? - 显示帮助\n"
23729
23730 #: git-add--interactive.perl:1342
23731 msgid "The selected hunks do not apply to the index!\n"
23732 msgstr "选中的块不能应用到索引!\n"
23733
23734 #: git-add--interactive.perl:1357
23735 #, perl-format
23736 msgid "ignoring unmerged: %s\n"
23737 msgstr "忽略未合入的:%s\n"
23738
23739 #: git-add--interactive.perl:1468
23740 #, perl-format
23741 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
23742 msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
23743
23744 #: git-add--interactive.perl:1469
23745 #, perl-format
23746 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
23747 msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
23748
23749 #: git-add--interactive.perl:1470
23750 #, perl-format
23751 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
23752 msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
23753
23754 #: git-add--interactive.perl:1570
23755 msgid "No other hunks to goto\n"
23756 msgstr "没有其它可供跳转的块\n"
23757
23758 #: git-add--interactive.perl:1588
23759 #, perl-format
23760 msgid "Invalid number: '%s'\n"
23761 msgstr "无效数字:'%s'\n"
23762
23763 #: git-add--interactive.perl:1593
23764 #, perl-format
23765 msgid "Sorry, only %d hunk available.\n"
23766 msgid_plural "Sorry, only %d hunks available.\n"
23767 msgstr[0] "对不起,只有 %d 个可用块。\n"
23768 msgstr[1] "对不起,只有 %d 个可用块。\n"
23769
23770 #: git-add--interactive.perl:1619
23771 msgid "No other hunks to search\n"
23772 msgstr "没有其它可供查找的块\n"
23773
23774 #: git-add--interactive.perl:1636
23775 #, perl-format
23776 msgid "Malformed search regexp %s: %s\n"
23777 msgstr "错误的正则表达式 %s:%s\n"
23778
23779 #: git-add--interactive.perl:1646
23780 msgid "No hunk matches the given pattern\n"
23781 msgstr "没有和给定模式相匹配的块\n"
23782
23783 #: git-add--interactive.perl:1658 git-add--interactive.perl:1680
23784 msgid "No previous hunk\n"
23785 msgstr "没有前一个块\n"
23786
23787 #: git-add--interactive.perl:1667 git-add--interactive.perl:1686
23788 msgid "No next hunk\n"
23789 msgstr "没有下一个块\n"
23790
23791 #: git-add--interactive.perl:1692
23792 msgid "Sorry, cannot split this hunk\n"
23793 msgstr "对不起,不能拆分这个块\n"
23794
23795 #: git-add--interactive.perl:1698
23796 #, perl-format
23797 msgid "Split into %d hunk.\n"
23798 msgid_plural "Split into %d hunks.\n"
23799 msgstr[0] "拆分为 %d 块。\n"
23800 msgstr[1] "拆分为 %d 块。\n"
23801
23802 #: git-add--interactive.perl:1708
23803 msgid "Sorry, cannot edit this hunk\n"
23804 msgstr "对不起,不能编辑这个块\n"
23805
23806 #. TRANSLATORS: please do not translate the command names
23807 #. 'status', 'update', 'revert', etc.
23808 #: git-add--interactive.perl:1773
23809 msgid ""
23810 "status - show paths with changes\n"
23811 "update - add working tree state to the staged set of changes\n"
23812 "revert - revert staged set of changes back to the HEAD version\n"
23813 "patch - pick hunks and update selectively\n"
23814 "diff - view diff between HEAD and index\n"
23815 "add untracked - add contents of untracked files to the staged set of "
23816 "changes\n"
23817 msgstr ""
23818 "status - 显示含变更的路径\n"
23819 "update - 添加工作区状态至暂存列表\n"
23820 "revert - 还原修改的暂存集至 HEAD 版本\n"
23821 "patch - 挑选块并且有选择地更新\n"
23822 "diff - 显示 HEAD 和索引间差异\n"
23823 "add untracked - 添加未跟踪文件的内容至暂存列表\n"
23824
23825 #: git-add--interactive.perl:1790 git-add--interactive.perl:1795
23826 #: git-add--interactive.perl:1798 git-add--interactive.perl:1805
23827 #: git-add--interactive.perl:1808 git-add--interactive.perl:1815
23828 #: git-add--interactive.perl:1819 git-add--interactive.perl:1825
23829 msgid "missing --"
23830 msgstr "缺失 --"
23831
23832 #: git-add--interactive.perl:1821
23833 #, perl-format
23834 msgid "unknown --patch mode: %s"
23835 msgstr "未知的 --patch 模式:%s"
23836
23837 #: git-add--interactive.perl:1827 git-add--interactive.perl:1833
23838 #, perl-format
23839 msgid "invalid argument %s, expecting --"
23840 msgstr "无效的参数 %s,期望是 --"
23841
23842 #: git-send-email.perl:138
23843 msgid "local zone differs from GMT by a non-minute interval\n"
23844 msgstr "本地时间和 GMT 有不到一分钟间隔\n"
23845
23846 #: git-send-email.perl:145 git-send-email.perl:151
23847 msgid "local time offset greater than or equal to 24 hours\n"
23848 msgstr "本地时间偏移量大于等于 24 小时\n"
23849
23850 #: git-send-email.perl:223 git-send-email.perl:229
23851 msgid "the editor exited uncleanly, aborting everything"
23852 msgstr "编辑器非正常退出,终止所有操作"
23853
23854 #: git-send-email.perl:310
23855 #, perl-format
23856 msgid ""
23857 "'%s' contains an intermediate version of the email you were composing.\n"
23858 msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
23859
23860 #: git-send-email.perl:315
23861 #, perl-format
23862 msgid "'%s.final' contains the composed email.\n"
23863 msgstr "'%s.final' 包含编辑的邮件。\n"
23864
23865 #: git-send-email.perl:408
23866 msgid "--dump-aliases incompatible with other options\n"
23867 msgstr "--dump-aliases 和其它选项不兼容\n"
23868
23869 #: git-send-email.perl:481 git-send-email.perl:683
23870 msgid "Cannot run git format-patch from outside a repository\n"
23871 msgstr "不能在仓库之外运行 git format-patch\n"
23872
23873 #: git-send-email.perl:484
23874 msgid ""
23875 "`batch-size` and `relogin` must be specified together (via command-line or "
23876 "configuration option)\n"
23877 msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
23878
23879 #: git-send-email.perl:497
23880 #, perl-format
23881 msgid "Unknown --suppress-cc field: '%s'\n"
23882 msgstr "未知的 --suppress-cc 字段:'%s'\n"
23883
23884 #: git-send-email.perl:528
23885 #, perl-format
23886 msgid "Unknown --confirm setting: '%s'\n"
23887 msgstr "未知的 --confirm 设置:'%s'\n"
23888
23889 #: git-send-email.perl:556
23890 #, perl-format
23891 msgid "warning: sendmail alias with quotes is not supported: %s\n"
23892 msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
23893
23894 #: git-send-email.perl:558
23895 #, perl-format
23896 msgid "warning: `:include:` not supported: %s\n"
23897 msgstr "警告:不支持 `:include:`:%s\n"
23898
23899 #: git-send-email.perl:560
23900 #, perl-format
23901 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
23902 msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
23903
23904 #: git-send-email.perl:565
23905 #, perl-format
23906 msgid "warning: sendmail line is not recognized: %s\n"
23907 msgstr "警告:不能识别的 sendmail 行:%s\n"
23908
23909 #: git-send-email.perl:649
23910 #, perl-format
23911 msgid ""
23912 "File '%s' exists but it could also be the range of commits\n"
23913 "to produce patches for. Please disambiguate by...\n"
23914 "\n"
23915 " * Saying \"./%s\" if you mean a file; or\n"
23916 " * Giving --format-patch option if you mean a range.\n"
23917 msgstr ""
23918 "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
23919 "歧义:\n"
23920 "\n"
23921 " * 如果含义为一个文件,使用 \"./%s\",或者\n"
23922 " * 如果含义为一个范围,使用 --format-patch 选项。\n"
23923
23924 #: git-send-email.perl:670
23925 #, perl-format
23926 msgid "Failed to opendir %s: %s"
23927 msgstr "无法打开目录 %s: %s"
23928
23929 #: git-send-email.perl:694
23930 #, perl-format
23931 msgid ""
23932 "fatal: %s: %s\n"
23933 "warning: no patches were sent\n"
23934 msgstr ""
23935 "致命错误:%s:%s\n"
23936 "警告:补丁未能发送\n"
23937
23938 #: git-send-email.perl:705
23939 msgid ""
23940 "\n"
23941 "No patch files specified!\n"
23942 "\n"
23943 msgstr ""
23944 "\n"
23945 "未指定补丁文件!\n"
23946 "\n"
23947
23948 #: git-send-email.perl:718
23949 #, perl-format
23950 msgid "No subject line in %s?"
23951 msgstr "在 %s 中没有标题行?"
23952
23953 #: git-send-email.perl:728
23954 #, perl-format
23955 msgid "Failed to open for writing %s: %s"
23956 msgstr "为写入打开 %s 失败: %s"
23957
23958 #: git-send-email.perl:739
23959 msgid ""
23960 "Lines beginning in \"GIT:\" will be removed.\n"
23961 "Consider including an overall diffstat or table of contents\n"
23962 "for the patch you are writing.\n"
23963 "\n"
23964 "Clear the body content if you don't wish to send a summary.\n"
23965 msgstr ""
23966 "以 \"GIT:\" 开头的行将被删除。\n"
23967 "考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n"
23968 "\n"
23969 "如果您不想发送摘要,清除内容。\n"
23970
23971 #: git-send-email.perl:763
23972 #, perl-format
23973 msgid "Failed to open %s: %s"
23974 msgstr "无法打开 %s: %s"
23975
23976 #: git-send-email.perl:780
23977 #, perl-format
23978 msgid "Failed to open %s.final: %s"
23979 msgstr "无法打开 %s.final: %s"
23980
23981 #: git-send-email.perl:823
23982 msgid "Summary email is empty, skipping it\n"
23983 msgstr "摘要邮件为空,跳过\n"
23984
23985 #. TRANSLATORS: please keep [y/N] as is.
23986 #: git-send-email.perl:858
23987 #, perl-format
23988 msgid "Are you sure you want to use <%s> [y/N]? "
23989 msgstr "您确认要使用 <%s> [y/N]?"
23990
23991 #: git-send-email.perl:913
23992 msgid ""
23993 "The following files are 8bit, but do not declare a Content-Transfer-"
23994 "Encoding.\n"
23995 msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
23996
23997 #: git-send-email.perl:918
23998 msgid "Which 8bit encoding should I declare [UTF-8]? "
23999 msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
24000
24001 #: git-send-email.perl:926
24002 #, perl-format
24003 msgid ""
24004 "Refusing to send because the patch\n"
24005 "\t%s\n"
24006 "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
24007 "want to send.\n"
24008 msgstr ""
24009 "拒绝发送,因为补丁\n"
24010 "\t%s\n"
24011 "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
24012
24013 #: git-send-email.perl:945
24014 msgid "To whom should the emails be sent (if anyone)?"
24015 msgstr "邮件将要发送给谁?"
24016
24017 #: git-send-email.perl:963
24018 #, perl-format
24019 msgid "fatal: alias '%s' expands to itself\n"
24020 msgstr "致命错误:别名 '%s' 扩展为它自己\n"
24021
24022 #: git-send-email.perl:975
24023 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
24024 msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
24025
24026 #: git-send-email.perl:1033 git-send-email.perl:1041
24027 #, perl-format
24028 msgid "error: unable to extract a valid address from: %s\n"
24029 msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
24030
24031 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
24032 #. translation. The program will only accept English input
24033 #. at this point.
24034 #: git-send-email.perl:1045
24035 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
24036 msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
24037
24038 #: git-send-email.perl:1362
24039 #, perl-format
24040 msgid "CA path \"%s\" does not exist"
24041 msgstr "CA 路径 \"%s\" 不存在"
24042
24043 #: git-send-email.perl:1445
24044 msgid ""
24045 " The Cc list above has been expanded by additional\n"
24046 " addresses found in the patch commit message. By default\n"
24047 " send-email prompts before sending whenever this occurs.\n"
24048 " This behavior is controlled by the sendemail.confirm\n"
24049 " configuration setting.\n"
24050 "\n"
24051 " For additional information, run 'git send-email --help'.\n"
24052 " To retain the current behavior, but squelch this message,\n"
24053 " run 'git config --global sendemail.confirm auto'.\n"
24054 "\n"
24055 msgstr ""
24056 " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
24057 " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
24058 " sendemail.confirm 配置设置。\n"
24059 "\n"
24060 " 更多信息,执行 'git send-email --help'。\n"
24061 " 要保持当前行为,但不显示此信息,运行 'git config --global\n"
24062 " sendemail.confirm auto'。\n"
24063 "\n"
24064
24065 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
24066 #. translation. The program will only accept English input
24067 #. at this point.
24068 #: git-send-email.perl:1460
24069 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
24070 msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
24071
24072 #: git-send-email.perl:1463
24073 msgid "Send this email reply required"
24074 msgstr "发送要求的邮件回复"
24075
24076 #: git-send-email.perl:1491
24077 msgid "The required SMTP server is not properly defined."
24078 msgstr "要求的 SMTP 服务器未被正确定义。"
24079
24080 #: git-send-email.perl:1538
24081 #, perl-format
24082 msgid "Server does not support STARTTLS! %s"
24083 msgstr "服务器不支持 STARTTLS!%s"
24084
24085 #: git-send-email.perl:1543 git-send-email.perl:1547
24086 #, perl-format
24087 msgid "STARTTLS failed! %s"
24088 msgstr "STARTTLS 失败!%s"
24089
24090 #: git-send-email.perl:1556
24091 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
24092 msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
24093
24094 #: git-send-email.perl:1574
24095 #, perl-format
24096 msgid "Failed to send %s\n"
24097 msgstr "无法发送 %s\n"
24098
24099 #: git-send-email.perl:1577
24100 #, perl-format
24101 msgid "Dry-Sent %s\n"
24102 msgstr "演习发送 %s\n"
24103
24104 #: git-send-email.perl:1577
24105 #, perl-format
24106 msgid "Sent %s\n"
24107 msgstr "正发送 %s\n"
24108
24109 #: git-send-email.perl:1579
24110 msgid "Dry-OK. Log says:\n"
24111 msgstr "演习成功。日志说:\n"
24112
24113 #: git-send-email.perl:1579
24114 msgid "OK. Log says:\n"
24115 msgstr "OK。日志说:\n"
24116
24117 #: git-send-email.perl:1591
24118 msgid "Result: "
24119 msgstr "结果:"
24120
24121 #: git-send-email.perl:1594
24122 msgid "Result: OK\n"
24123 msgstr "结果:OK\n"
24124
24125 #: git-send-email.perl:1612
24126 #, perl-format
24127 msgid "can't open file %s"
24128 msgstr "无法打开文件 %s"
24129
24130 #: git-send-email.perl:1659 git-send-email.perl:1679
24131 #, perl-format
24132 msgid "(mbox) Adding cc: %s from line '%s'\n"
24133 msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
24134
24135 #: git-send-email.perl:1665
24136 #, perl-format
24137 msgid "(mbox) Adding to: %s from line '%s'\n"
24138 msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
24139
24140 #: git-send-email.perl:1718
24141 #, perl-format
24142 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
24143 msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
24144
24145 #: git-send-email.perl:1753
24146 #, perl-format
24147 msgid "(body) Adding cc: %s from line '%s'\n"
24148 msgstr "(body) 添加 cc: %s 自行 '%s'\n"
24149
24150 #: git-send-email.perl:1864
24151 #, perl-format
24152 msgid "(%s) Could not execute '%s'"
24153 msgstr "(%s) 不能执行 '%s'"
24154
24155 #: git-send-email.perl:1871
24156 #, perl-format
24157 msgid "(%s) Adding %s: %s from: '%s'\n"
24158 msgstr "(%s) 添加 %s: %s 自:'%s'\n"
24159
24160 #: git-send-email.perl:1875
24161 #, perl-format
24162 msgid "(%s) failed to close pipe to '%s'"
24163 msgstr "(%s) 无法关闭管道至 '%s'"
24164
24165 #: git-send-email.perl:1905
24166 msgid "cannot send message as 7bit"
24167 msgstr "不能以 7bit 形式发送信息"
24168
24169 #: git-send-email.perl:1913
24170 msgid "invalid transfer encoding"
24171 msgstr "无效的传送编码"
24172
24173 #: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
24174 #, perl-format
24175 msgid "unable to open %s: %s\n"
24176 msgstr "不能打开 %s:%s\n"
24177
24178 #: git-send-email.perl:1957
24179 #, perl-format
24180 msgid "%s: patch contains a line longer than 998 characters"
24181 msgstr "%s:补丁包含一个超过 998 字符的行"
24182
24183 #: git-send-email.perl:1974
24184 #, perl-format
24185 msgid "Skipping %s with backup suffix '%s'.\n"
24186 msgstr "略过 %s 含备份后缀 '%s'。\n"
24187
24188 #. TRANSLATORS: please keep "[y|N]" as is.
24189 #: git-send-email.perl:1978
24190 #, perl-format
24191 msgid "Do you really want to send %s? [y|N]: "
24192 msgstr "您真的要发送 %s?[y|N]:"