]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
Merge branch 'jk/index-pack-dupfix' into maint
[thirdparty/git.git] / po / zh_CN.po
CommitLineData
c04f5ac3
JX
1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
07432cef 3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
c04f5ac3 4# This file is distributed under the same license as the Git package.
814ff314 5# Contributors:
5b533632 6# - Fangyi Zhou <me AT fangyi.io>
c04f5ac3 7# - Jiang Xin <worldhello.net AT gmail.com>
bbdf0acc
JX
8# - Lian Cheng <rhythm.mail AT gmail.com>
9# - Ray Chen <oldsharp AT gmail.com>
c04f5ac3 10# - Riku <lu.riku AT gmail.com>
bbdf0acc
JX
11# - Thynson <lanxingcan AT gmail.com>
12# - ws3389 <willsmith3389 AT gmail.com>
13# - Wang Sheng <wangsheng2008love AT 163.com>
554e8501 14# - 依云 <lilydjwg AT gmail.com>
bbdf0acc 15# - Yichao Yu <yyc1992 AT gmail.com>
c04f5ac3 16# - Zhuang Ya <zhuangya AT me.com>
c04f5ac3 17#
160fb2b2
JX
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 | 提交
667599e8 43# commit message | 提交说明
160fb2b2
JX
44# commit object | 提交对象
45# commit-ish (also committish) | 提交号
46# conflict | 冲突
47# core Git | 核心 Git 工具
d46c5519 48# cover letter | 附函
160fb2b2 49# DAG | 有向无环图
e640d114 50# dangling object | 悬空对象
160fb2b2
JX
51# detached HEAD | 分离头指针
52# directory | 目录
53# dirty | 脏(的工作区)
755c831b 54# dumb HTTP protocol | 哑 HTTP 协议
160fb2b2
JX
55# evil merge | 坏合并(合并引入了父提交没有的修改)
56# fast-forward | 快进
57# fetch | 获取
58# file system | 文件系统
e397e7e3 59# fork | 派生
160fb2b2
JX
60# Git archive | 仓库(对于 arch 用户)
61# gitfile | gitfile(仓库链接文件)
fd8cb379 62# grafts | (提交)移植
160fb2b2
JX
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 | 模式
12e59059 90# pickaxe | 挖掘
160fb2b2
JX
91# plumbing | 管件(Git 底层核心命令的别称)
92# porcelain | 瓷件(Git 上层封装命令的别称)
94550ed3 93# precious-objects repo | 珍品仓库
160fb2b2
JX
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 | 源代码管理(工具)
ee7589bb 112# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
113# shallow repository | 浅(克隆)仓库
114# signed tag | 签名标签
755c831b 115# smart HTTP protocol | 智能 HTTP 协议
160fb2b2
JX
116# squash | 压缩
117# stage | n. 暂存区(即索引); v. 暂存
a4f16749 118# stash | n. 贮藏区; v. 贮藏
160fb2b2
JX
119# submodule | 子模组
120# symref | 符号引用
933c015e 121# tag | n. 标签; v. 打标签
160fb2b2
JX
122# tag object | 标签对象
123# tagger | 打标签者
124# topic branch | 主题分支
125# track | 跟踪
6937cb4e 126# trailer | 尾部署名
160fb2b2
JX
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#
c04f5ac3
JX
138msgid ""
139msgstr ""
140"Project-Id-Version: Git\n"
141"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
ddc12c42
JX
142"POT-Creation-Date: 2019-12-30 08:48+0800\n"
143"PO-Revision-Date: 2020-01-12 17:16+0800\n"
c04f5ac3 144"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 145"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
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"
5ae481e0 150"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 151
ddc12c42
JX
152#: add-interactive.c:347
153#, c-format
154msgid "Huh (%s)?"
155msgstr "嗯(%s)?"
156
157#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216
158#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643
159#: builtin/rebase.c:2019 builtin/rebase.c:2063
160msgid "could not read index"
161msgstr "不能读取索引"
162
163#: add-interactive.c:555 git-add--interactive.perl:269
164#: git-add--interactive.perl:294
165msgid "binary"
166msgstr "二进制"
167
168#: add-interactive.c:613 git-add--interactive.perl:278
169#: git-add--interactive.perl:332
170msgid "nothing"
171msgstr "无"
172
173#: add-interactive.c:614 git-add--interactive.perl:314
174#: git-add--interactive.perl:329
175msgid "unchanged"
176msgstr "没有修改"
177
178#: add-interactive.c:651 git-add--interactive.perl:643
179msgid "Update"
180msgstr "更新"
181
182#: add-interactive.c:668 add-interactive.c:856
183#, c-format
184msgid "could not stage '%s'"
185msgstr "不能暂存 '%s'"
186
187#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409
188#: builtin/rebase.c:895
189msgid "could not write index"
190msgstr "不能写入索引"
191
192#: add-interactive.c:677 git-add--interactive.perl:628
193#, c-format, perl-format
194msgid "updated %d path\n"
195msgid_plural "updated %d paths\n"
196msgstr[0] "更新了 %d 个路径\n"
197msgstr[1] "更新了 %d 个路径\n"
198
199#: add-interactive.c:695 git-add--interactive.perl:678
200#, c-format, perl-format
201msgid "note: %s is untracked now.\n"
202msgstr "说明:%s 现已成为未跟踪的。\n"
203
204#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281
205#: builtin/reset.c:144
206#, c-format
207msgid "make_cache_entry failed for path '%s'"
208msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
209
210#: add-interactive.c:730 git-add--interactive.perl:655
211msgid "Revert"
212msgstr "还原"
213
214#: add-interactive.c:746
215msgid "Could not parse HEAD^{tree}"
216msgstr "不能解析 HEAD^{tree}"
217
218#: add-interactive.c:784 git-add--interactive.perl:631
219#, c-format, perl-format
220msgid "reverted %d path\n"
221msgid_plural "reverted %d paths\n"
222msgstr[0] "还原了 %d 个路径\n"
223msgstr[1] "还原了 %d 个路径\n"
224
225#: add-interactive.c:835 git-add--interactive.perl:695
226#, c-format
227msgid "No untracked files.\n"
228msgstr "没有未跟踪的文件。\n"
229
230#: add-interactive.c:839 git-add--interactive.perl:689
231msgid "Add untracked"
232msgstr "添加未跟踪的"
233
234#: add-interactive.c:866 git-add--interactive.perl:625
235#, c-format, perl-format
236msgid "added %d path\n"
237msgid_plural "added %d paths\n"
238msgstr[0] "增加了 %d 个路径\n"
239msgstr[1] "增加了 %d 个路径\n"
240
241#: add-interactive.c:896
242#, c-format
243msgid "ignoring unmerged: %s"
244msgstr "忽略未合入的:%s"
245
246#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366
247#, c-format
248msgid "Only binary files changed.\n"
249msgstr "只有二进制文件被修改。\n"
250
251#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368
252#, c-format
253msgid "No changes.\n"
254msgstr "没有修改。\n"
255
256#: add-interactive.c:914 git-add--interactive.perl:1376
257msgid "Patch update"
258msgstr "补丁更新"
259
260#: add-interactive.c:953 git-add--interactive.perl:1754
261msgid "Review diff"
262msgstr "检视 diff"
263
264#: add-interactive.c:981
265msgid "show paths with changes"
266msgstr "显示含变更的路径"
267
268#: add-interactive.c:983
269msgid "add working tree state to the staged set of changes"
270msgstr "将工作区状态添加到暂存区修改集中"
271
272#: add-interactive.c:985
273msgid "revert staged set of changes back to the HEAD version"
274msgstr "将暂存的修改集恢复为 HEAD 版本"
275
276#: add-interactive.c:987
277msgid "pick hunks and update selectively"
278msgstr "挑选数据块并有选择地更新"
279
280#: add-interactive.c:989
281msgid "view diff between HEAD and index"
282msgstr "显示 HEAD 和索引的差异"
283
284#: add-interactive.c:991
285msgid "add contents of untracked files to the staged set of changes"
286msgstr "将未跟踪文件的内容添加到暂存区修改集中"
287
288#: add-interactive.c:999 add-interactive.c:1048
289msgid "Prompt help:"
290msgstr "帮助:"
291
292#: add-interactive.c:1001
293msgid "select a single item"
294msgstr "选择一个条目"
295
296#: add-interactive.c:1003
297msgid "select a range of items"
298msgstr "选择一系列条目"
299
300#: add-interactive.c:1005
301msgid "select multiple ranges"
302msgstr "选择多个范围"
303
304#: add-interactive.c:1007 add-interactive.c:1052
305msgid "select item based on unique prefix"
306msgstr "基于唯一前缀选择条目"
307
308#: add-interactive.c:1009
309msgid "unselect specified items"
310msgstr "反选指定的条目"
311
312#: add-interactive.c:1011
313msgid "choose all items"
314msgstr "选择所有条目"
315
316#: add-interactive.c:1013
317msgid "(empty) finish selecting"
318msgstr "(空)结束选择"
319
320#: add-interactive.c:1050
321msgid "select a numbered item"
322msgstr "选择一个编号条目"
323
324#: add-interactive.c:1054
325msgid "(empty) select nothing"
326msgstr "(空)不选择任何内容"
327
328#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851
329msgid "*** Commands ***"
330msgstr "*** 命令 ***"
331
332#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848
333msgid "What now"
334msgstr "请选择"
335
336#: add-interactive.c:1115 git-add--interactive.perl:213
337msgid "staged"
338msgstr "缓存"
339
340#: add-interactive.c:1115 git-add--interactive.perl:213
341msgid "unstaged"
342msgstr "未缓存"
343
344#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197
345#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144
346#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409
347#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382
348#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878
349#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213
350msgid "path"
351msgstr "路径"
352
353#: add-interactive.c:1122
354msgid "could not refresh index"
355msgstr "不能刷新索引"
356
357#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765
358#, c-format
359msgid "Bye.\n"
360msgstr "再见。\n"
361
362#: add-patch.c:15
363#, c-format
364msgid "Stage mode change [y,n,a,q,d%s,?]? "
365msgstr "暂存模式变更 [y,n,a,q,d%s,?]? "
366
367#: add-patch.c:16
368#, c-format
369msgid "Stage deletion [y,n,a,q,d%s,?]? "
370msgstr "暂存删除动作 [y,n,a,q,d%s,?]? "
371
372#: add-patch.c:17
373#, c-format
374msgid "Stage this hunk [y,n,a,q,d%s,?]? "
375msgstr "暂存该块 [y,n,a,q,d%s,?]? "
376
377#: add-patch.c:111
378#, c-format
379msgid "could not parse hunk header '%.*s'"
380msgstr "无法解析数据块头信息 '%.*s'"
381
382#: add-patch.c:130 add-patch.c:134
383#, c-format
384msgid "could not parse colored hunk header '%.*s'"
385msgstr "无法解析彩色数据块头信息 '%.*s'"
386
387#: add-patch.c:176
388msgid "could not parse diff"
389msgstr "不能解析差异信息"
390
391#: add-patch.c:194
392msgid "could not parse colored diff"
393msgstr "不能解析彩色差异信息"
394
395#: add-patch.c:508
396#, c-format
397msgid ""
398"expected context line #%d in\n"
399"%.*s"
400msgstr ""
401"预期上下文行 #%d 于\n"
402"%.*s"
403
404#: add-patch.c:523
405#, c-format
406msgid ""
407"hunks do not overlap:\n"
408"%.*s\n"
409"\tdoes not end with:\n"
410"%.*s"
411msgstr ""
412"块不重叠:\n"
413"%.*s\n"
414"\t不是结尾于:\n"
415"%.*s"
416
417#: add-patch.c:799 git-add--interactive.perl:1112
418msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
419msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
420
421#: add-patch.c:803
422#, c-format
423msgid ""
424"---\n"
425"To remove '%c' lines, make them ' ' lines (context).\n"
426"To remove '%c' lines, delete them.\n"
427"Lines starting with %c will be removed.\n"
428msgstr ""
429"---\n"
430"要删除 '%c' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
431"要删除 '%c' 开始的行,删除它们。\n"
432"以 %c 开始的行将被删除。\n"
433
434#: add-patch.c:810
435msgid ""
436"If the patch applies cleanly, the edited hunk will immediately be\n"
437"marked for staging.\n"
438msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。\n"
439
440#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
441#: add-patch.c:818 git-add--interactive.perl:1126
442msgid ""
443"If it does not apply cleanly, you will be given an opportunity to\n"
444"edit again. If all lines of the hunk are removed, then the edit is\n"
445"aborted and the hunk is left unchanged.\n"
446msgstr ""
447"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
448"此次编辑被终止,该块不会被修改。\n"
449
450#: add-patch.c:851
451msgid "could not parse hunk header"
452msgstr "无法解析数据块头信息"
453
454#: add-patch.c:895 add-patch.c:1294
455msgid "'git apply --cached' failed"
456msgstr "'git apply --cached' 失败"
457
458#. TRANSLATORS: do not translate [y/n]
459#. The program will only accept that input at this point.
460#. Consider translating (saying "no" discards!) as
461#. (saying "n" for "no" discards!) if the translation
462#. of the word "no" does not start with n.
463#.
464#. TRANSLATORS: do not translate [y/n]
465#. The program will only accept that input
466#. at this point.
467#. Consider translating (saying "no" discards!) as
468#. (saying "n" for "no" discards!) if the translation
469#. of the word "no" does not start with n.
470#: add-patch.c:952 git-add--interactive.perl:1239
471msgid ""
472"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
473msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
474
475#: add-patch.c:1009
476msgid ""
477"y - stage this hunk\n"
478"n - do not stage this hunk\n"
479"q - quit; do not stage this hunk or any of the remaining ones\n"
480"a - stage this and all the remaining hunks\n"
481"d - do not stage this hunk nor any of the remaining hunks\n"
482msgstr ""
483"y - 暂存该块\n"
484"n - 不要暂存该块\n"
485"q - 退出。不暂存该块及后面的全部块\n"
486"a - 暂存该块和所有剩余的块\n"
487"d - 不暂存该块和任何剩余的块\n"
488
489#: add-patch.c:1016
490msgid ""
491"j - leave this hunk undecided, see next undecided hunk\n"
492"J - leave this hunk undecided, see next hunk\n"
493"k - leave this hunk undecided, see previous undecided hunk\n"
494"K - leave this hunk undecided, see previous hunk\n"
495"g - select a hunk to go to\n"
496"/ - search for a hunk matching the given regex\n"
497"s - split the current hunk into smaller hunks\n"
498"e - manually edit the current hunk\n"
499"? - print help\n"
500msgstr ""
501"j - 维持该块未决状态,查看下一个未决块\n"
502"J - 维持该块未决状态,查看下一个块\n"
503"k - 维持该块未决状态,查看上一个未决块\n"
504"K - 维持该块未决状态,查看上一个块\n"
505"g - 选择跳转到一个块\n"
506"/ - 查找和给定正则表达式匹配的块\n"
507"s - 拆分当前块为更小的块\n"
508"e - 手动编辑当前块\n"
509"? - 显示帮助\n"
510
511#: add-patch.c:1137 add-patch.c:1147
512msgid "No previous hunk"
513msgstr "没有前一个块"
514
515#: add-patch.c:1142 add-patch.c:1152
516msgid "No next hunk"
517msgstr "没有下一个块"
518
519#: add-patch.c:1158
520msgid "No other hunks to goto"
521msgstr "没有其它可供跳转的块"
522
523#: add-patch.c:1169 git-add--interactive.perl:1577
524msgid "go to which hunk (<ret> to see more)? "
525msgstr "跳转到哪个块(<回车> 查看更多)? "
526
527#: add-patch.c:1170 git-add--interactive.perl:1579
528msgid "go to which hunk? "
529msgstr "跳转到哪个块?"
530
531#: add-patch.c:1181
532#, c-format
533msgid "Invalid number: '%s'"
534msgstr "无效数字:'%s'"
535
536#: add-patch.c:1186
537#, c-format
538msgid "Sorry, only %d hunk available."
539msgid_plural "Sorry, only %d hunks available."
540msgstr[0] "对不起,只有 %d 个可用块。"
541msgstr[1] "对不起,只有 %d 个可用块。"
542
543#: add-patch.c:1195
544msgid "No other hunks to search"
545msgstr "没有其它可供查找的块"
546
547#: add-patch.c:1201 git-add--interactive.perl:1623
548msgid "search for regex? "
549msgstr "使用正则表达式搜索?"
550
551#: add-patch.c:1216
552#, c-format
553msgid "Malformed search regexp %s: %s"
554msgstr "错误的正则表达式 %s:%s"
555
556#: add-patch.c:1233
557msgid "No hunk matches the given pattern"
558msgstr "没有和给定模式相匹配的块"
559
560#: add-patch.c:1240
561msgid "Sorry, cannot split this hunk"
562msgstr "对不起,不能拆分这个块"
563
564#: add-patch.c:1244
565#, c-format
566msgid "Split into %d hunks."
567msgstr "拆分为 %d 块。"
568
569#: add-patch.c:1248
570msgid "Sorry, cannot edit this hunk"
571msgstr "对不起,不能编辑这个块"
572
573#: advice.c:111
c04f5ac3 574#, c-format
fd8cb379
JX
575msgid "%shint: %.*s%s\n"
576msgstr "%s提示:%.*s%s\n"
c04f5ac3 577
ddc12c42 578#: advice.c:164
5c57d762
JX
579msgid "Cherry-picking is not possible because you have unmerged files."
580msgstr "无法拣选,因为您有未合并的文件。"
581
ddc12c42 582#: advice.c:166
5c57d762
JX
583msgid "Committing is not possible because you have unmerged files."
584msgstr "无法提交,因为您有未合并的文件。"
585
ddc12c42 586#: advice.c:168
5c57d762
JX
587msgid "Merging is not possible because you have unmerged files."
588msgstr "无法合并,因为您有未合并的文件。"
589
ddc12c42 590#: advice.c:170
5c57d762
JX
591msgid "Pulling is not possible because you have unmerged files."
592msgstr "无法拉取,因为您有未合并的文件。"
593
ddc12c42 594#: advice.c:172
5c57d762
JX
595msgid "Reverting is not possible because you have unmerged files."
596msgstr "无法回退,因为您有未合并的文件。"
597
ddc12c42 598#: advice.c:174
5c57d762
JX
599#, c-format
600msgid "It is not possible to %s because you have unmerged files."
601msgstr "无法 %s,因为您有未合并的文件。"
602
ddc12c42 603#: advice.c:182
c04f5ac3 604msgid ""
6acbf033 605"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 606"as appropriate to mark resolution and make a commit."
c04f5ac3 607msgstr ""
d9d56b23 608"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 609"解决方案并提交。"
c04f5ac3 610
ddc12c42 611#: advice.c:190
5c57d762
JX
612msgid "Exiting because of an unresolved conflict."
613msgstr "因为存在未解决的冲突而退出。"
614
ddc12c42 615#: advice.c:195 builtin/merge.c:1332
1b7f4a34
JX
616msgid "You have not concluded your merge (MERGE_HEAD exists)."
617msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
618
ddc12c42 619#: advice.c:197
94550ed3 620msgid "Please, commit your changes before merging."
1b7f4a34
JX
621msgstr "请在合并前先提交您的修改。"
622
ddc12c42 623#: advice.c:198
1b7f4a34
JX
624msgid "Exiting because of unfinished merge."
625msgstr "因为存在未完成的合并而退出。"
626
ddc12c42 627#: advice.c:204
5c57d762
JX
628#, c-format
629msgid ""
a6cd2cc4 630"Note: switching to '%s'.\n"
5c57d762
JX
631"\n"
632"You are in 'detached HEAD' state. You can look around, make experimental\n"
633"changes and commit them, and you can discard any commits you make in this\n"
a6cd2cc4 634"state without impacting any branches by switching back to a branch.\n"
5c57d762
JX
635"\n"
636"If you want to create a new branch to retain commits you create, you may\n"
a6cd2cc4 637"do so (now or later) by using -c with the switch command. Example:\n"
5c57d762 638"\n"
a6cd2cc4
JX
639" git switch -c <new-branch-name>\n"
640"\n"
641"Or undo this operation with:\n"
642"\n"
643" git switch -\n"
644"\n"
645"Turn off this advice by setting config variable advice.detachedHead to "
646"false\n"
5c57d762
JX
647"\n"
648msgstr ""
a6cd2cc4
JX
649"注意:正在切换到 '%s'。\n"
650"\n"
651"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n"
652"回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n"
5c57d762 653"\n"
a6cd2cc4
JX
654"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n"
655"中添加参数 -c 来实现(现在或稍后)。例如:\n"
5c57d762 656"\n"
a6cd2cc4 657" git switch -c <新分支名>\n"
5c57d762 658"\n"
a6cd2cc4
JX
659"或者撤销此操作:\n"
660"\n"
661" git switch -\n"
662"\n"
663"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
5c57d762
JX
664"\n"
665
06991777
JX
666#: alias.c:50
667msgid "cmdline ends with \\"
668msgstr "命令行以 \\ 结尾"
669
670#: alias.c:51
671msgid "unclosed quote"
672msgstr "未关闭的引号"
673
a6cd2cc4 674#: apply.c:69
a0b6b246
JX
675#, c-format
676msgid "unrecognized whitespace option '%s'"
677msgstr "未能识别的空白字符选项 '%s'"
ef317cd5 678
a6cd2cc4 679#: apply.c:85
90314792 680#, c-format
a0b6b246
JX
681msgid "unrecognized whitespace ignore option '%s'"
682msgstr "未能识别的空白字符忽略选项 '%s'"
90314792 683
a6cd2cc4 684#: apply.c:135
a0b6b246 685msgid "--reject and --3way cannot be used together."
2090d5b4 686msgstr "--reject 和 --3way 不能同时使用。"
ef317cd5 687
a6cd2cc4 688#: apply.c:137
a0b6b246
JX
689msgid "--cached and --3way cannot be used together."
690msgstr "--cached 和 --3way 不能同时使用。"
ef317cd5 691
a6cd2cc4 692#: apply.c:140
a0b6b246
JX
693msgid "--3way outside a repository"
694msgstr "--3way 在一个仓库之外"
ef317cd5 695
a6cd2cc4 696#: apply.c:151
a0b6b246
JX
697msgid "--index outside a repository"
698msgstr "--index 在一个仓库之外"
ef317cd5 699
a6cd2cc4 700#: apply.c:154
a0b6b246
JX
701msgid "--cached outside a repository"
702msgstr "--cached 在一个仓库之外"
ef317cd5 703
a6cd2cc4 704#: apply.c:801
a0b6b246
JX
705#, c-format
706msgid "Cannot prepare timestamp regexp %s"
707msgstr "无法准备时间戳正则表达式 %s"
ef317cd5 708
a6cd2cc4 709#: apply.c:810
a0b6b246
JX
710#, c-format
711msgid "regexec returned %d for input: %s"
712msgstr "regexec 返回 %d,输入为:%s"
ef317cd5 713
a6cd2cc4 714#: apply.c:884
a0b6b246
JX
715#, c-format
716msgid "unable to find filename in patch at line %d"
717msgstr "不能在补丁的第 %d 行找到文件名"
ef317cd5 718
a6cd2cc4 719#: apply.c:922
a0b6b246
JX
720#, c-format
721msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
722msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
ef317cd5 723
a6cd2cc4 724#: apply.c:928
a0b6b246
JX
725#, c-format
726msgid "git apply: bad git-diff - inconsistent new filename on line %d"
727msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
ef317cd5 728
a6cd2cc4 729#: apply.c:929
a0b6b246
JX
730#, c-format
731msgid "git apply: bad git-diff - inconsistent old filename on line %d"
732msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
ef317cd5 733
a6cd2cc4 734#: apply.c:934
a0b6b246
JX
735#, c-format
736msgid "git apply: bad git-diff - expected /dev/null on line %d"
737msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
ef317cd5 738
a6cd2cc4 739#: apply.c:963
a4f16749
JX
740#, c-format
741msgid "invalid mode on line %d: %s"
742msgstr "第 %d 行包含无效文件模式:%s"
743
a6cd2cc4 744#: apply.c:1282
a4f16749
JX
745#, c-format
746msgid "inconsistent header lines %d and %d"
747msgstr "不一致的文件头,%d 行和 %d 行"
748
a5cd71ca 749#: apply.c:1372
a0b6b246
JX
750#, c-format
751msgid ""
752"git diff header lacks filename information when removing %d leading pathname "
753"component (line %d)"
754msgid_plural ""
755"git diff header lacks filename information when removing %d leading pathname "
756"components (line %d)"
757msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
758msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
ef317cd5 759
a5cd71ca 760#: apply.c:1385
a0b6b246
JX
761#, c-format
762msgid "git diff header lacks filename information (line %d)"
763msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
07432cef 764
a5cd71ca
JX
765#: apply.c:1481
766#, c-format
767msgid "recount: unexpected line: %.*s"
768msgstr "recount:意外的行:%.*s"
769
770#: apply.c:1550
771#, c-format
772msgid "patch fragment without header at line %d: %.*s"
773msgstr "第 %d 行的补丁片段没有头信息:%.*s"
774
775#: apply.c:1753
a0b6b246
JX
776msgid "new file depends on old contents"
777msgstr "新文件依赖旧内容"
5c57d762 778
a5cd71ca 779#: apply.c:1755
a0b6b246
JX
780msgid "deleted file still has contents"
781msgstr "删除的文件仍有内容"
5c57d762 782
a5cd71ca 783#: apply.c:1789
a0b6b246
JX
784#, c-format
785msgid "corrupt patch at line %d"
786msgstr "补丁在第 %d 行损坏"
5c57d762 787
a5cd71ca 788#: apply.c:1826
5c57d762 789#, c-format
a0b6b246
JX
790msgid "new file %s depends on old contents"
791msgstr "新文件 %s 依赖旧内容"
5c57d762 792
a5cd71ca 793#: apply.c:1828
5c57d762 794#, c-format
a0b6b246
JX
795msgid "deleted file %s still has contents"
796msgstr "删除的文件 %s 仍有内容"
5c57d762 797
a5cd71ca 798#: apply.c:1831
a0b6b246
JX
799#, c-format
800msgid "** warning: file %s becomes empty but is not deleted"
801msgstr "** 警告:文件 %s 成为空文件但并未删除"
ef317cd5 802
a5cd71ca 803#: apply.c:1978
5c57d762 804#, c-format
a0b6b246
JX
805msgid "corrupt binary patch at line %d: %.*s"
806msgstr "二进制补丁在第 %d 行损坏:%.*s"
5c57d762 807
a5cd71ca 808#: apply.c:2015
5c57d762 809#, c-format
a0b6b246
JX
810msgid "unrecognized binary patch at line %d"
811msgstr "未能识别的二进制补丁位于第 %d 行"
5c57d762 812
a5cd71ca 813#: apply.c:2177
5c57d762 814#, c-format
a0b6b246
JX
815msgid "patch with only garbage at line %d"
816msgstr "补丁文件的第 %d 行只有垃圾数据"
5c57d762 817
a5cd71ca 818#: apply.c:2263
5c57d762 819#, c-format
a0b6b246
JX
820msgid "unable to read symlink %s"
821msgstr "无法读取符号链接 %s"
5c57d762 822
a5cd71ca 823#: apply.c:2267
5c57d762 824#, c-format
a0b6b246
JX
825msgid "unable to open or read %s"
826msgstr "不能打开或读取 %s"
5c57d762 827
ddc12c42 828#: apply.c:2936
5c57d762 829#, c-format
a0b6b246
JX
830msgid "invalid start of line: '%c'"
831msgstr "无效的行首字符:'%c'"
5c57d762 832
ddc12c42 833#: apply.c:3057
5c57d762 834#, c-format
a0b6b246
JX
835msgid "Hunk #%d succeeded at %d (offset %d line)."
836msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
837msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
838msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
5c57d762 839
ddc12c42 840#: apply.c:3069
5c57d762 841#, c-format
a0b6b246
JX
842msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
843msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
5c57d762 844
ddc12c42 845#: apply.c:3075
5c57d762
JX
846#, c-format
847msgid ""
a0b6b246
JX
848"while searching for:\n"
849"%.*s"
5c57d762 850msgstr ""
a0b6b246
JX
851"当查询:\n"
852"%.*s"
5c57d762 853
ddc12c42 854#: apply.c:3097
5c57d762 855#, c-format
a0b6b246
JX
856msgid "missing binary patch data for '%s'"
857msgstr "缺失 '%s' 的二进制补丁数据"
5c57d762 858
ddc12c42 859#: apply.c:3105
5c57d762 860#, c-format
a0b6b246 861msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
29004bbb 862msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
5c57d762 863
ddc12c42 864#: apply.c:3152
5c57d762 865#, c-format
a0b6b246
JX
866msgid "cannot apply binary patch to '%s' without full index line"
867msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
5c57d762 868
ddc12c42 869#: apply.c:3162
5c57d762 870#, c-format
a0b6b246
JX
871msgid ""
872"the patch applies to '%s' (%s), which does not match the current contents."
29004bbb 873msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
5c57d762 874
ddc12c42 875#: apply.c:3170
a0b6b246
JX
876#, c-format
877msgid "the patch applies to an empty '%s' but it is not empty"
29004bbb 878msgstr "补丁应用到空文件 '%s',但其并非空文件"
5c57d762 879
ddc12c42 880#: apply.c:3188
5c57d762 881#, c-format
a0b6b246 882msgid "the necessary postimage %s for '%s' cannot be read"
e640d114 883msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
5c57d762 884
ddc12c42 885#: apply.c:3201
5c57d762 886#, c-format
a0b6b246
JX
887msgid "binary patch does not apply to '%s'"
888msgstr "二进制补丁未应用到 '%s'"
5c57d762 889
ddc12c42 890#: apply.c:3207
5c57d762 891#, c-format
a0b6b246
JX
892msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
893msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
5c57d762 894
ddc12c42 895#: apply.c:3228
276ceeaa 896#, c-format
a0b6b246
JX
897msgid "patch failed: %s:%ld"
898msgstr "打补丁失败:%s:%ld"
276ceeaa 899
ddc12c42 900#: apply.c:3351
4dcdc3d8 901#, c-format
a0b6b246
JX
902msgid "cannot checkout %s"
903msgstr "不能检出 %s"
4dcdc3d8 904
ddc12c42 905#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280
4dcdc3d8 906#, c-format
a0b6b246
JX
907msgid "failed to read %s"
908msgstr "无法读取 %s"
4dcdc3d8 909
ddc12c42 910#: apply.c:3411
4dcdc3d8 911#, c-format
a0b6b246
JX
912msgid "reading from '%s' beyond a symbolic link"
913msgstr "读取位于符号链接中的 '%s'"
4dcdc3d8 914
ddc12c42 915#: apply.c:3440 apply.c:3683
4dcdc3d8 916#, c-format
a0b6b246
JX
917msgid "path %s has been renamed/deleted"
918msgstr "路径 %s 已经被重命名/删除"
4dcdc3d8 919
ddc12c42 920#: apply.c:3526 apply.c:3698
4dcdc3d8 921#, c-format
a0b6b246
JX
922msgid "%s: does not exist in index"
923msgstr "%s:不存在于索引中"
4dcdc3d8 924
ddc12c42 925#: apply.c:3535 apply.c:3706
4dcdc3d8 926#, c-format
a0b6b246
JX
927msgid "%s: does not match index"
928msgstr "%s:和索引不匹配"
4dcdc3d8 929
ddc12c42 930#: apply.c:3570
a0b6b246
JX
931msgid "repository lacks the necessary blob to fall back on 3-way merge."
932msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4dcdc3d8 933
ddc12c42 934#: apply.c:3573
4dcdc3d8 935#, c-format
a0b6b246
JX
936msgid "Falling back to three-way merge...\n"
937msgstr "回落到三方合并...\n"
4dcdc3d8 938
ddc12c42 939#: apply.c:3589 apply.c:3593
4dcdc3d8 940#, c-format
a0b6b246
JX
941msgid "cannot read the current contents of '%s'"
942msgstr "无法读取 '%s' 的当前内容"
276ceeaa 943
ddc12c42 944#: apply.c:3605
4dcdc3d8 945#, c-format
a0b6b246
JX
946msgid "Failed to fall back on three-way merge...\n"
947msgstr "无法回落到三方合并...\n"
4dcdc3d8 948
ddc12c42 949#: apply.c:3619
4dcdc3d8 950#, c-format
a0b6b246
JX
951msgid "Applied patch to '%s' with conflicts.\n"
952msgstr "应用补丁到 '%s' 存在冲突。\n"
4dcdc3d8 953
ddc12c42 954#: apply.c:3624
4dcdc3d8 955#, c-format
a0b6b246
JX
956msgid "Applied patch to '%s' cleanly.\n"
957msgstr "成功应用补丁到 '%s'。\n"
4dcdc3d8 958
ddc12c42 959#: apply.c:3650
a0b6b246
JX
960msgid "removal patch leaves file contents"
961msgstr "移除补丁仍留下了文件内容"
4dcdc3d8 962
ddc12c42 963#: apply.c:3723
1003b3a5 964#, c-format
a0b6b246
JX
965msgid "%s: wrong type"
966msgstr "%s:错误类型"
1003b3a5 967
ddc12c42 968#: apply.c:3725
1003b3a5 969#, c-format
a0b6b246
JX
970msgid "%s has type %o, expected %o"
971msgstr "%s 的类型是 %o,应为 %o"
1003b3a5 972
ddc12c42
JX
973#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856
974#: read-cache.c:1320
4dcdc3d8 975#, c-format
a0b6b246
JX
976msgid "invalid path '%s'"
977msgstr "无效路径 '%s'"
4dcdc3d8 978
ddc12c42 979#: apply.c:3934
4dcdc3d8 980#, c-format
a0b6b246
JX
981msgid "%s: already exists in index"
982msgstr "%s:已经存在于索引中"
4dcdc3d8 983
ddc12c42 984#: apply.c:3937
4dcdc3d8 985#, c-format
a0b6b246
JX
986msgid "%s: already exists in working directory"
987msgstr "%s:已经存在于工作区中"
4dcdc3d8 988
ddc12c42 989#: apply.c:3957
1b7f4a34 990#, c-format
a0b6b246
JX
991msgid "new mode (%o) of %s does not match old mode (%o)"
992msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1b7f4a34 993
ddc12c42 994#: apply.c:3962
5b04ee3b 995#, c-format
a0b6b246
JX
996msgid "new mode (%o) of %s does not match old mode (%o) of %s"
997msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
5b04ee3b 998
ddc12c42 999#: apply.c:3982
8ada9598 1000#, c-format
a0b6b246
JX
1001msgid "affected file '%s' is beyond a symbolic link"
1002msgstr "受影响的文件 '%s' 位于符号链接中"
8ada9598 1003
ddc12c42 1004#: apply.c:3986
81809b99 1005#, c-format
a0b6b246
JX
1006msgid "%s: patch does not apply"
1007msgstr "%s:补丁未应用"
8ada9598 1008
ddc12c42 1009#: apply.c:4001
8ada9598 1010#, c-format
a0b6b246 1011msgid "Checking patch %s..."
06991777 1012msgstr "正在检查补丁 %s..."
8ada9598 1013
ddc12c42 1014#: apply.c:4093
a0b6b246
JX
1015#, c-format
1016msgid "sha1 information is lacking or useless for submodule %s"
1017msgstr "子模组 %s 的 sha1 信息缺失或无效"
8ada9598 1018
ddc12c42 1019#: apply.c:4100
8ada9598 1020#, c-format
a0b6b246 1021msgid "mode change for %s, which is not in current HEAD"
31e5e17b 1022msgstr "%s 的模式变更,但它不在当前 HEAD 中"
8ada9598 1023
ddc12c42 1024#: apply.c:4103
a0b6b246
JX
1025#, c-format
1026msgid "sha1 information is lacking or useless (%s)."
1027msgstr "sha1 信息缺失或无效(%s)。"
6792b93b 1028
ddc12c42 1029#: apply.c:4112
a0b6b246
JX
1030#, c-format
1031msgid "could not add %s to temporary index"
1032msgstr "不能在临时索引中添加 %s"
9aeb4c2b 1033
ddc12c42 1034#: apply.c:4122
a0b6b246
JX
1035#, c-format
1036msgid "could not write temporary index to %s"
1037msgstr "不能把临时索引写入到 %s"
9aeb4c2b 1038
ddc12c42 1039#: apply.c:4260
a0b6b246
JX
1040#, c-format
1041msgid "unable to remove %s from index"
1042msgstr "不能从索引中移除 %s"
8ada9598 1043
ddc12c42 1044#: apply.c:4294
8ada9598 1045#, c-format
a0b6b246
JX
1046msgid "corrupt patch for submodule %s"
1047msgstr "子模组 %s 损坏的补丁"
8ada9598 1048
ddc12c42 1049#: apply.c:4300
9aeb4c2b 1050#, c-format
a0b6b246 1051msgid "unable to stat newly created file '%s'"
65e2041e 1052msgstr "不能对新建文件 '%s' 调用 stat"
9aeb4c2b 1053
ddc12c42 1054#: apply.c:4308
a0b6b246
JX
1055#, c-format
1056msgid "unable to create backing store for newly created file %s"
1057msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 1058
ddc12c42 1059#: apply.c:4314 apply.c:4459
81809b99 1060#, c-format
a0b6b246
JX
1061msgid "unable to add cache entry for %s"
1062msgstr "无法为 %s 添加缓存条目"
8ada9598 1063
ddc12c42 1064#: apply.c:4357
a0b6b246
JX
1065#, c-format
1066msgid "failed to write to '%s'"
c1ac5258 1067msgstr "写入 '%s' 失败"
8ada9598 1068
ddc12c42 1069#: apply.c:4361
220c313c 1070#, c-format
a0b6b246
JX
1071msgid "closing file '%s'"
1072msgstr "关闭文件 '%s'"
220c313c 1073
ddc12c42 1074#: apply.c:4431
c04f5ac3 1075#, c-format
a0b6b246
JX
1076msgid "unable to write file '%s' mode %o"
1077msgstr "不能写文件 '%s' 权限 %o"
c04f5ac3 1078
ddc12c42 1079#: apply.c:4529
c04f5ac3 1080#, c-format
a0b6b246
JX
1081msgid "Applied patch %s cleanly."
1082msgstr "成功应用补丁 %s。"
c04f5ac3 1083
ddc12c42 1084#: apply.c:4537
a0b6b246
JX
1085msgid "internal error"
1086msgstr "内部错误"
c04f5ac3 1087
ddc12c42 1088#: apply.c:4540
5c57d762 1089#, c-format
a0b6b246
JX
1090msgid "Applying patch %%s with %d reject..."
1091msgid_plural "Applying patch %%s with %d rejects..."
1092msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1093msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
5c57d762 1094
ddc12c42 1095#: apply.c:4551
5c57d762 1096#, c-format
a0b6b246
JX
1097msgid "truncating .rej filename to %.*s.rej"
1098msgstr "截短 .rej 文件名为 %.*s.rej"
5c57d762 1099
ddc12c42 1100#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192
220c313c 1101#, c-format
a0b6b246
JX
1102msgid "cannot open %s"
1103msgstr "不能打开 %s"
220c313c 1104
ddc12c42 1105#: apply.c:4573
220c313c 1106#, c-format
a0b6b246
JX
1107msgid "Hunk #%d applied cleanly."
1108msgstr "第 #%d 个片段成功应用。"
220c313c 1109
ddc12c42 1110#: apply.c:4577
5c57d762 1111#, c-format
a0b6b246
JX
1112msgid "Rejected hunk #%d."
1113msgstr "拒绝第 #%d 个片段。"
5c57d762 1114
ddc12c42 1115#: apply.c:4696
5c57d762 1116#, c-format
a0b6b246
JX
1117msgid "Skipped patch '%s'."
1118msgstr "略过补丁 '%s'。"
5c57d762 1119
ddc12c42 1120#: apply.c:4704
a0b6b246
JX
1121msgid "unrecognized input"
1122msgstr "未能识别的输入"
5c57d762 1123
ddc12c42 1124#: apply.c:4724
a0b6b246
JX
1125msgid "unable to read index file"
1126msgstr "无法读取索引文件"
5c57d762 1127
ddc12c42 1128#: apply.c:4881
220c313c 1129#, c-format
a0b6b246
JX
1130msgid "can't open patch '%s': %s"
1131msgstr "不能打开补丁 '%s':%s"
220c313c 1132
ddc12c42 1133#: apply.c:4908
5c57d762 1134#, c-format
a0b6b246
JX
1135msgid "squelched %d whitespace error"
1136msgid_plural "squelched %d whitespace errors"
1137msgstr[0] "抑制下仍有 %d 个空白字符误用"
1138msgstr[1] "抑制下仍有 %d 个空白字符误用"
5c57d762 1139
ddc12c42 1140#: apply.c:4914 apply.c:4929
5c57d762 1141#, c-format
a0b6b246
JX
1142msgid "%d line adds whitespace errors."
1143msgid_plural "%d lines add whitespace errors."
a4f16749
JX
1144msgstr[0] "%d 行新增了空白字符误用。"
1145msgstr[1] "%d 行新增了空白字符误用。"
5c57d762 1146
ddc12c42 1147#: apply.c:4922
5c57d762 1148#, c-format
a0b6b246
JX
1149msgid "%d line applied after fixing whitespace errors."
1150msgid_plural "%d lines applied after fixing whitespace errors."
1151msgstr[0] "修复空白错误后,应用了 %d 行。"
1152msgstr[1] "修复空白错误后,应用了 %d 行。"
5c57d762 1153
ddc12c42 1154#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390
a0b6b246
JX
1155msgid "Unable to write new index file"
1156msgstr "无法写入新索引文件"
5c57d762 1157
ddc12c42 1158#: apply.c:4966
a0b6b246
JX
1159msgid "don't apply changes matching the given path"
1160msgstr "不要应用与给出路径向匹配的变更"
5c57d762 1161
ddc12c42 1162#: apply.c:4969
a0b6b246
JX
1163msgid "apply changes matching the given path"
1164msgstr "应用与给出路径向匹配的变更"
220c313c 1165
ddc12c42 1166#: apply.c:4971 builtin/am.c:2206
a0b6b246
JX
1167msgid "num"
1168msgstr "数字"
220c313c 1169
ddc12c42 1170#: apply.c:4972
a0b6b246
JX
1171msgid "remove <num> leading slashes from traditional diff paths"
1172msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
220c313c 1173
ddc12c42 1174#: apply.c:4975
a0b6b246
JX
1175msgid "ignore additions made by the patch"
1176msgstr "忽略补丁中的添加的文件"
220c313c 1177
ddc12c42 1178#: apply.c:4977
a0b6b246
JX
1179msgid "instead of applying the patch, output diffstat for the input"
1180msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
220c313c 1181
ddc12c42 1182#: apply.c:4981
a0b6b246
JX
1183msgid "show number of added and deleted lines in decimal notation"
1184msgstr "以十进制数显示添加和删除的行数"
220c313c 1185
ddc12c42 1186#: apply.c:4983
a0b6b246
JX
1187msgid "instead of applying the patch, output a summary for the input"
1188msgstr "不应用补丁,而是显示输入的概要"
220c313c 1189
ddc12c42 1190#: apply.c:4985
a0b6b246
JX
1191msgid "instead of applying the patch, see if the patch is applicable"
1192msgstr "不应用补丁,而是查看补丁是否可应用"
220c313c 1193
ddc12c42 1194#: apply.c:4987
a0b6b246
JX
1195msgid "make sure the patch is applicable to the current index"
1196msgstr "确认补丁可以应用到当前索引"
276ceeaa 1197
ddc12c42 1198#: apply.c:4989
c1ac5258
JX
1199msgid "mark new files with `git add --intent-to-add`"
1200msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1201
ddc12c42 1202#: apply.c:4991
a0b6b246
JX
1203msgid "apply a patch without touching the working tree"
1204msgstr "应用补丁而不修改工作区"
5b04ee3b 1205
ddc12c42 1206#: apply.c:4993
a0b6b246
JX
1207msgid "accept a patch that touches outside the working area"
1208msgstr "接受修改工作区之外文件的补丁"
5c57d762 1209
ddc12c42 1210#: apply.c:4996
a0b6b246
JX
1211msgid "also apply the patch (use with --stat/--summary/--check)"
1212msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
c04f5ac3 1213
ddc12c42 1214#: apply.c:4998
a0b6b246
JX
1215msgid "attempt three-way merge if a patch does not apply"
1216msgstr "如果一个补丁不能应用则尝试三方合并"
c04f5ac3 1217
ddc12c42 1218#: apply.c:5000
a0b6b246
JX
1219msgid "build a temporary index based on embedded index information"
1220msgstr "创建一个临时索引基于嵌入的索引信息"
c04f5ac3 1221
ddc12c42 1222#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524
a0b6b246
JX
1223msgid "paths are separated with NUL character"
1224msgstr "路径以 NUL 字符分隔"
8ada9598 1225
ddc12c42 1226#: apply.c:5005
a0b6b246
JX
1227msgid "ensure at least <n> lines of context match"
1228msgstr "确保至少匹配 <n> 行上下文"
8ada9598 1229
ddc12c42 1230#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98
a6cd2cc4 1231#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
ddc12c42 1232#: builtin/pack-objects.c:3310 builtin/rebase.c:1474
a0b6b246
JX
1233msgid "action"
1234msgstr "动作"
8ada9598 1235
ddc12c42 1236#: apply.c:5007
a0b6b246
JX
1237msgid "detect new or modified lines that have whitespace errors"
1238msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 1239
ddc12c42 1240#: apply.c:5010 apply.c:5013
a0b6b246
JX
1241msgid "ignore changes in whitespace when finding context"
1242msgstr "查找上下文时忽略空白字符的变更"
8ada9598 1243
ddc12c42 1244#: apply.c:5016
a0b6b246
JX
1245msgid "apply the patch in reverse"
1246msgstr "反向应用补丁"
8ada9598 1247
ddc12c42 1248#: apply.c:5018
a0b6b246
JX
1249msgid "don't expect at least one line of context"
1250msgstr "无需至少一行上下文"
8ada9598 1251
ddc12c42 1252#: apply.c:5020
a0b6b246
JX
1253msgid "leave the rejected hunks in corresponding *.rej files"
1254msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 1255
ddc12c42 1256#: apply.c:5022
a0b6b246
JX
1257msgid "allow overlapping hunks"
1258msgstr "允许重叠的补丁片段"
8ada9598 1259
ddc12c42
JX
1260#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22
1261#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774
1262#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
a0b6b246
JX
1263msgid "be verbose"
1264msgstr "冗长输出"
8ada9598 1265
ddc12c42 1266#: apply.c:5025
a0b6b246
JX
1267msgid "tolerate incorrectly detected missing new-line at the end of file"
1268msgstr "允许不正确的文件末尾换行符"
cfff71a9 1269
ddc12c42 1270#: apply.c:5028
a0b6b246
JX
1271msgid "do not trust the line counts in the hunk headers"
1272msgstr "不信任补丁片段的头信息中的行号"
6c94aba5 1273
ddc12c42 1274#: apply.c:5030 builtin/am.c:2194
a0b6b246
JX
1275msgid "root"
1276msgstr "根目录"
c04f5ac3 1277
ddc12c42 1278#: apply.c:5031
a0b6b246
JX
1279msgid "prepend <root> to all filenames"
1280msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 1281
c1ac5258 1282#: archive.c:14
a0b6b246 1283msgid "git archive [<options>] <tree-ish> [<path>...]"
ddc12c42 1284msgstr "git archive [<选项>] <树对象> [<路径>...]"
07432cef 1285
c1ac5258 1286#: archive.c:15
a0b6b246
JX
1287msgid "git archive --list"
1288msgstr "git archive --list"
1289
c1ac5258 1290#: archive.c:16
c04f5ac3 1291msgid ""
a0b6b246 1292"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
c04f5ac3 1293msgstr ""
ddc12c42 1294"git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
6acbf033 1295
c1ac5258 1296#: archive.c:17
a0b6b246
JX
1297msgid "git archive --remote <repo> [--exec <cmd>] --list"
1298msgstr "git archive --remote <仓库> [--exec <命令>] --list"
6acbf033 1299
ddc12c42 1300#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299
c04f5ac3 1301#, c-format
a0b6b246
JX
1302msgid "pathspec '%s' did not match any files"
1303msgstr "路径规格 '%s' 未匹配任何文件"
c04f5ac3 1304
06991777
JX
1305#: archive.c:396
1306#, c-format
1307msgid "no such ref: %.*s"
1308msgstr "无此引用:%.*s"
1309
1310#: archive.c:401
1311#, c-format
1312msgid "not a valid object name: %s"
1313msgstr "不是一个有效的对象名:%s"
1314
1315#: archive.c:414
1316#, c-format
1317msgid "not a tree object: %s"
1318msgstr "不是一个树对象:%s"
1319
a6cd2cc4 1320#: archive.c:426
06991777
JX
1321msgid "current working directory is untracked"
1322msgstr "当前工作目录未被跟踪"
1323
a6cd2cc4 1324#: archive.c:457
a0b6b246
JX
1325msgid "fmt"
1326msgstr "格式"
07432cef 1327
a6cd2cc4 1328#: archive.c:457
a0b6b246
JX
1329msgid "archive format"
1330msgstr "归档格式"
7aea43ff 1331
ddc12c42 1332#: archive.c:458 builtin/log.c:1653
a0b6b246
JX
1333msgid "prefix"
1334msgstr "前缀"
7aea43ff 1335
a6cd2cc4 1336#: archive.c:459
a0b6b246
JX
1337msgid "prepend prefix to each pathname in the archive"
1338msgstr "为归档中每个路径名加上前缀"
c04f5ac3 1339
ddc12c42 1340#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
a5cd71ca
JX
1341#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
1342#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
1343#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
1344#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
ddc12c42 1345#: parse-options.h:190
a0b6b246
JX
1346msgid "file"
1347msgstr "文件"
a77c07d9 1348
a6cd2cc4 1349#: archive.c:461 builtin/archive.c:90
a0b6b246
JX
1350msgid "write the archive to this file"
1351msgstr "归档写入此文件"
a77c07d9 1352
a6cd2cc4 1353#: archive.c:463
a0b6b246
JX
1354msgid "read .gitattributes in working directory"
1355msgstr "读取工作区中的 .gitattributes"
7ac1c0ad 1356
a6cd2cc4 1357#: archive.c:464
a0b6b246
JX
1358msgid "report archived files on stderr"
1359msgstr "在标准错误上报告归档文件"
7ac1c0ad 1360
a6cd2cc4 1361#: archive.c:465
a0b6b246
JX
1362msgid "store only"
1363msgstr "只存储"
7ac1c0ad 1364
a6cd2cc4 1365#: archive.c:466
a0b6b246
JX
1366msgid "compress faster"
1367msgstr "压缩速度更快"
8ada9598 1368
a6cd2cc4 1369#: archive.c:474
a0b6b246
JX
1370msgid "compress better"
1371msgstr "压缩效果更好"
8ada9598 1372
a6cd2cc4 1373#: archive.c:477
a0b6b246
JX
1374msgid "list supported archive formats"
1375msgstr "列出支持的归档格式"
a77c07d9 1376
ddc12c42
JX
1377#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
1378#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884
a0b6b246
JX
1379msgid "repo"
1380msgstr "仓库"
c04f5ac3 1381
a6cd2cc4 1382#: archive.c:480 builtin/archive.c:92
a0b6b246
JX
1383msgid "retrieve the archive from remote repository <repo>"
1384msgstr "从远程仓库(<仓库>)提取归档文件"
8ada9598 1385
a5cd71ca 1386#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
06991777 1387#: builtin/notes.c:498
a0b6b246
JX
1388msgid "command"
1389msgstr "命令"
1390
a6cd2cc4 1391#: archive.c:482 builtin/archive.c:94
a0b6b246
JX
1392msgid "path to the remote git-upload-archive command"
1393msgstr "远程 git-upload-archive 命令的路径"
1394
a6cd2cc4 1395#: archive.c:489
a0b6b246
JX
1396msgid "Unexpected option --remote"
1397msgstr "未知参数 --remote"
1398
a6cd2cc4 1399#: archive.c:491
a0b6b246
JX
1400msgid "Option --exec can only be used together with --remote"
1401msgstr "选项 --exec 只能和 --remote 同时使用"
1402
a6cd2cc4 1403#: archive.c:493
a0b6b246
JX
1404msgid "Unexpected option --output"
1405msgstr "未知参数 --output"
1406
a6cd2cc4 1407#: archive.c:515
a0b6b246
JX
1408#, c-format
1409msgid "Unknown archive format '%s'"
1410msgstr "未知归档格式 '%s'"
1411
a6cd2cc4 1412#: archive.c:522
8ada9598 1413#, c-format
a0b6b246
JX
1414msgid "Argument not supported for format '%s': -%d"
1415msgstr "参数不支持此格式 '%s':-%d"
1416
ddc12c42 1417#: archive-tar.c:125 archive-zip.c:350
c1ac5258
JX
1418#, c-format
1419msgid "cannot stream blob %s"
e640d114 1420msgstr "不能打开数据对象 %s"
c1ac5258 1421
ddc12c42 1422#: archive-tar.c:266 archive-zip.c:368
c1ac5258
JX
1423#, c-format
1424msgid "unsupported file mode: 0%o (SHA1: %s)"
e640d114 1425msgstr "不支持的文件模式:0%o (SHA1: %s)"
c1ac5258 1426
ddc12c42 1427#: archive-tar.c:293 archive-zip.c:358
c1ac5258
JX
1428#, c-format
1429msgid "cannot read %s"
1430msgstr "不能读取 %s"
1431
a5cd71ca 1432#: archive-tar.c:465
c1ac5258
JX
1433#, c-format
1434msgid "unable to start '%s' filter"
1435msgstr "无法启动 '%s' 过滤器"
1436
a5cd71ca 1437#: archive-tar.c:468
c1ac5258
JX
1438msgid "unable to redirect descriptor"
1439msgstr "无法重定向描述符"
1440
a5cd71ca 1441#: archive-tar.c:475
c1ac5258
JX
1442#, c-format
1443msgid "'%s' filter reported error"
e640d114 1444msgstr "'%s' 过滤器报告了错误"
c1ac5258 1445
ddc12c42 1446#: archive-zip.c:319
c1ac5258
JX
1447#, c-format
1448msgid "path is not valid UTF-8: %s"
1449msgstr "路径不是有效的 UTF-8:%s"
1450
ddc12c42 1451#: archive-zip.c:323
c1ac5258
JX
1452#, c-format
1453msgid "path too long (%d chars, SHA1: %s): %s"
1454msgstr "路径太长(%d 字符,SHA1:%s):%s"
1455
ddc12c42 1456#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233
c1ac5258
JX
1457#, c-format
1458msgid "deflate error (%d)"
1459msgstr "压缩错误 (%d)"
1460
ddc12c42 1461#: archive-zip.c:614
c1ac5258
JX
1462#, c-format
1463msgid "timestamp too large for this system: %<PRIuMAX>"
e640d114 1464msgstr "对于本系统时间戳太大:%<PRIuMAX>"
c1ac5258 1465
ddc12c42 1466#: attr.c:212
87cb7997
JX
1467#, c-format
1468msgid "%.*s is not a valid attribute name"
1469msgstr "%.*s 不是一个有效的属性名"
1470
ddc12c42 1471#: attr.c:369
06991777
JX
1472#, c-format
1473msgid "%s not allowed: %s:%d"
5b533632 1474msgstr "不允许 %s:%s:%d"
06991777 1475
ddc12c42 1476#: attr.c:409
8ada9598 1477msgid ""
a0b6b246
JX
1478"Negative patterns are ignored in git attributes\n"
1479"Use '\\!' for literal leading exclamation."
8ada9598 1480msgstr ""
a0b6b246
JX
1481"负值模版在 git attributes 中被忽略\n"
1482"当字符串确实要以感叹号开始时,使用 '\\!'。"
8ada9598 1483
4c27fcb5 1484#: bisect.c:468
8ada9598 1485#, c-format
a0b6b246
JX
1486msgid "Badly quoted content in file '%s': %s"
1487msgstr "文件 '%s' 包含错误的引用格式:%s"
8ada9598 1488
06991777 1489#: bisect.c:678
a0b6b246
JX
1490#, c-format
1491msgid "We cannot bisect more!\n"
1492msgstr "我们无法进行更多的二分查找!\n"
8ada9598 1493
06991777 1494#: bisect.c:733
2e8451e8 1495#, c-format
a0b6b246
JX
1496msgid "Not a valid commit name %s"
1497msgstr "不是一个有效的提交名 %s"
2e8451e8 1498
06991777 1499#: bisect.c:758
5b04ee3b
JX
1500#, c-format
1501msgid ""
a0b6b246
JX
1502"The merge base %s is bad.\n"
1503"This means the bug has been fixed between %s and [%s].\n"
5b04ee3b 1504msgstr ""
a0b6b246
JX
1505"合并基线 %s 是坏的。\n"
1506"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
5b04ee3b 1507
06991777 1508#: bisect.c:763
5b04ee3b 1509#, c-format
a0b6b246
JX
1510msgid ""
1511"The merge base %s is new.\n"
1512"The property has changed between %s and [%s].\n"
1513msgstr ""
1514"合并基线 %s 是新的。\n"
1515"介于 %s 和 [%s] 之间的属性已经被修改。\n"
5b04ee3b 1516
06991777 1517#: bisect.c:768
a0b6b246
JX
1518#, c-format
1519msgid ""
1520"The merge base %s is %s.\n"
1521"This means the first '%s' commit is between %s and [%s].\n"
1522msgstr ""
1523"合并基线 %s 是 %s。\n"
1524"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
07432cef 1525
06991777 1526#: bisect.c:776
a0b6b246
JX
1527#, c-format
1528msgid ""
1a79b2f1 1529"Some %s revs are not ancestors of the %s rev.\n"
a0b6b246
JX
1530"git bisect cannot work properly in this case.\n"
1531"Maybe you mistook %s and %s revs?\n"
1532msgstr ""
1533"一些 %s 版本不是 %s 版本的祖先。\n"
1534"这种情况下 git 二分查找无法正常工作。\n"
1535"您可能弄错了 %s 和 %s 版本?\n"
07432cef 1536
06991777 1537#: bisect.c:789
a0b6b246
JX
1538#, c-format
1539msgid ""
1540"the merge base between %s and [%s] must be skipped.\n"
1541"So we cannot be sure the first %s commit is between %s and %s.\n"
1542"We continue anyway."
1543msgstr ""
1544"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1545"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1546"我们仍旧继续。"
649900bc 1547
06991777 1548#: bisect.c:822
649900bc 1549#, c-format
a0b6b246
JX
1550msgid "Bisecting: a merge base must be tested\n"
1551msgstr "二分查找中:合并基线必须是经过测试的\n"
649900bc 1552
06991777 1553#: bisect.c:865
a0b6b246
JX
1554#, c-format
1555msgid "a %s revision is needed"
1556msgstr "需要一个 %s 版本"
649900bc 1557
a6cd2cc4 1558#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
649900bc 1559#, c-format
a0b6b246
JX
1560msgid "could not create file '%s'"
1561msgstr "不能创建文件 '%s'"
649900bc 1562
a6cd2cc4 1563#: bisect.c:928 builtin/merge.c:148
649900bc 1564#, c-format
a0b6b246
JX
1565msgid "could not read file '%s'"
1566msgstr "不能读取文件 '%s'"
649900bc 1567
d46c5519 1568#: bisect.c:958
a0b6b246
JX
1569msgid "reading bisect refs failed"
1570msgstr "读取二分查找引用失败"
649900bc 1571
d46c5519 1572#: bisect.c:977
649900bc 1573#, c-format
a0b6b246
JX
1574msgid "%s was both %s and %s\n"
1575msgstr "%s 同时为 %s 和 %s\n"
649900bc 1576
d46c5519 1577#: bisect.c:985
649900bc 1578#, c-format
a0b6b246
JX
1579msgid ""
1580"No testable commit found.\n"
1581"Maybe you started with bad path parameters?\n"
1582msgstr ""
1583"没有发现可测试的提交。\n"
1584"可能您在运行时使用了错误的路径参数?\n"
649900bc 1585
d46c5519 1586#: bisect.c:1004
649900bc 1587#, c-format
a0b6b246
JX
1588msgid "(roughly %d step)"
1589msgid_plural "(roughly %d steps)"
1590msgstr[0] "(大概 %d 步)"
1591msgstr[1] "(大概 %d 步)"
649900bc 1592
a4f16749
JX
1593#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1594#. steps)" translation.
1595#.
d46c5519 1596#: bisect.c:1010
649900bc 1597#, c-format
a0b6b246
JX
1598msgid "Bisecting: %d revision left to test after this %s\n"
1599msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1600msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1601msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
649900bc 1602
a5cd71ca 1603#: blame.c:2700
a4f16749
JX
1604msgid "--contents and --reverse do not blend well."
1605msgstr "--contents 和 --reverse 不能混用。"
1606
a5cd71ca 1607#: blame.c:2714
a4f16749
JX
1608msgid "cannot use --contents with final commit object name"
1609msgstr "不能将 --contents 和最终的提交对象名共用"
1610
a5cd71ca 1611#: blame.c:2735
a4f16749
JX
1612msgid "--reverse and --first-parent together require specified latest commit"
1613msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1614
ddc12c42
JX
1615#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093
1616#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991
1617#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411
a5cd71ca 1618#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
fd8cb379 1619#: builtin/shortlog.c:192
a4f16749
JX
1620msgid "revision walk setup failed"
1621msgstr "版本遍历设置失败"
1622
a5cd71ca 1623#: blame.c:2762
a4f16749
JX
1624msgid ""
1625"--reverse --first-parent together require range along first-parent chain"
1626msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1627
a5cd71ca 1628#: blame.c:2773
a4f16749
JX
1629#, c-format
1630msgid "no such path %s in %s"
1631msgstr "在 %2$s 中无此路径 %1$s"
1632
a5cd71ca 1633#: blame.c:2784
a4f16749
JX
1634#, c-format
1635msgid "cannot read blob %s for path %s"
1636msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1637
d46c5519 1638#: branch.c:53
649900bc 1639#, c-format
a0b6b246
JX
1640msgid ""
1641"\n"
1642"After fixing the error cause you may try to fix up\n"
1643"the remote tracking information by invoking\n"
1644"\"git branch --set-upstream-to=%s%s%s\"."
1645msgstr ""
1646"\n"
1647"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1648"\"git branch --set-upstream-to=%s%s%s\" 。"
649900bc 1649
d46c5519 1650#: branch.c:67
649900bc 1651#, c-format
a0b6b246
JX
1652msgid "Not setting branch %s as its own upstream."
1653msgstr "未设置分支 %s 作为它自己的上游。"
649900bc 1654
d46c5519 1655#: branch.c:93
649900bc 1656#, c-format
6937cb4e
JX
1657msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1658msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1659
d46c5519 1660#: branch.c:94
649900bc 1661#, c-format
6937cb4e
JX
1662msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1663msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1664
d46c5519 1665#: branch.c:98
649900bc 1666#, c-format
6937cb4e
JX
1667msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1668msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
649900bc 1669
d46c5519 1670#: branch.c:99
649900bc 1671#, c-format
6937cb4e 1672msgid "Branch '%s' set up to track local branch '%s'."
493a9322 1673msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
649900bc 1674
d46c5519 1675#: branch.c:104
649900bc 1676#, c-format
6937cb4e
JX
1677msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1678msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
649900bc 1679
d46c5519 1680#: branch.c:105
649900bc 1681#, c-format
6937cb4e
JX
1682msgid "Branch '%s' set up to track remote ref '%s'."
1683msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
649900bc 1684
d46c5519 1685#: branch.c:109
649900bc 1686#, c-format
6937cb4e
JX
1687msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1688msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
649900bc 1689
d46c5519 1690#: branch.c:110
649900bc 1691#, c-format
6937cb4e
JX
1692msgid "Branch '%s' set up to track local ref '%s'."
1693msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
649900bc 1694
d46c5519 1695#: branch.c:119
a0b6b246
JX
1696msgid "Unable to write upstream branch configuration"
1697msgstr "无法写入上游分支配置"
649900bc 1698
d46c5519 1699#: branch.c:156
649900bc 1700#, c-format
a0b6b246
JX
1701msgid "Not tracking: ambiguous information for ref %s"
1702msgstr "未跟踪:引用 %s 有歧义"
649900bc 1703
d46c5519 1704#: branch.c:189
649900bc 1705#, c-format
a0b6b246
JX
1706msgid "'%s' is not a valid branch name."
1707msgstr "'%s' 不是一个有效的分支名称。"
649900bc 1708
d46c5519 1709#: branch.c:208
649900bc 1710#, c-format
a0b6b246
JX
1711msgid "A branch named '%s' already exists."
1712msgstr "一个分支名 '%s' 已经存在。"
649900bc 1713
d46c5519 1714#: branch.c:213
a0b6b246
JX
1715msgid "Cannot force update the current branch."
1716msgstr "无法强制更新当前分支。"
649900bc 1717
d46c5519 1718#: branch.c:233
649900bc 1719#, c-format
a0b6b246
JX
1720msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1721msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
649900bc 1722
d46c5519 1723#: branch.c:235
649900bc 1724#, c-format
a0b6b246
JX
1725msgid "the requested upstream branch '%s' does not exist"
1726msgstr "请求的上游分支 '%s' 不存在"
649900bc 1727
d46c5519 1728#: branch.c:237
a0b6b246
JX
1729msgid ""
1730"\n"
1731"If you are planning on basing your work on an upstream\n"
1732"branch that already exists at the remote, you may need to\n"
1733"run \"git fetch\" to retrieve it.\n"
1734"\n"
1735"If you are planning to push out a new local branch that\n"
1736"will track its remote counterpart, you may want to use\n"
1737"\"git push -u\" to set the upstream config as you push."
1738msgstr ""
1739"\n"
1740"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1741"您可能需要执行 \"git fetch\" 来获取分支。\n"
1742"\n"
1743"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1744"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
649900bc 1745
d46c5519 1746#: branch.c:281
649900bc 1747#, c-format
a0b6b246
JX
1748msgid "Not a valid object name: '%s'."
1749msgstr "不是一个有效的对象名:'%s'。"
649900bc 1750
d46c5519 1751#: branch.c:301
649900bc 1752#, c-format
a0b6b246
JX
1753msgid "Ambiguous object name: '%s'."
1754msgstr "歧义的对象名:'%s'。"
649900bc 1755
d46c5519 1756#: branch.c:306
649900bc 1757#, c-format
a0b6b246
JX
1758msgid "Not a valid branch point: '%s'."
1759msgstr "无效的分支点:'%s'。"
649900bc 1760
a6cd2cc4 1761#: branch.c:364
649900bc 1762#, c-format
a0b6b246
JX
1763msgid "'%s' is already checked out at '%s'"
1764msgstr "'%s' 已经检出到 '%s'"
649900bc 1765
a6cd2cc4 1766#: branch.c:387
a0b6b246
JX
1767#, c-format
1768msgid "HEAD of working tree %s is not updated"
1769msgstr "工作区 %s 的 HEAD 指向没有被更新"
649900bc 1770
c1ac5258 1771#: bundle.c:36
649900bc 1772#, c-format
a0b6b246
JX
1773msgid "'%s' does not look like a v2 bundle file"
1774msgstr "'%s' 不像是一个 v2 版本的包文件"
649900bc 1775
c1ac5258 1776#: bundle.c:64
a0b6b246
JX
1777#, c-format
1778msgid "unrecognized header: %s%s (%d)"
1779msgstr "未能识别的包头:%s%s (%d)"
649900bc 1780
ddc12c42
JX
1781#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108
1782#: builtin/commit.c:811
649900bc 1783#, c-format
a0b6b246
JX
1784msgid "could not open '%s'"
1785msgstr "不能打开 '%s'"
649900bc 1786
06991777 1787#: bundle.c:143
a0b6b246
JX
1788msgid "Repository lacks these prerequisite commits:"
1789msgstr "仓库中缺少这些必备的提交:"
649900bc 1790
a6cd2cc4
JX
1791#: bundle.c:146
1792msgid "need a repository to verify a bundle"
1793msgstr "需要一个仓库来校验一个包"
1794
1795#: bundle.c:197
2e8451e8 1796#, c-format
a0b6b246
JX
1797msgid "The bundle contains this ref:"
1798msgid_plural "The bundle contains these %d refs:"
1799msgstr[0] "这个包中含有这个引用:"
1800msgstr[1] "这个包中含有 %d 个引用:"
2e8451e8 1801
a6cd2cc4 1802#: bundle.c:204
a0b6b246
JX
1803msgid "The bundle records a complete history."
1804msgstr "这个包记录一个完整历史。"
2e8451e8 1805
a6cd2cc4 1806#: bundle.c:206
2e8451e8 1807#, c-format
a0b6b246
JX
1808msgid "The bundle requires this ref:"
1809msgid_plural "The bundle requires these %d refs:"
1810msgstr[0] "这个包需要这个引用:"
1811msgstr[1] "这个包需要 %d 个引用:"
2e8451e8 1812
ddc12c42 1813#: bundle.c:273
4c27fcb5
JX
1814msgid "unable to dup bundle descriptor"
1815msgstr "无法复制 bundle 描述符"
1816
ddc12c42 1817#: bundle.c:280
a0b6b246
JX
1818msgid "Could not spawn pack-objects"
1819msgstr "不能生成 pack-objects 进程"
1003b3a5 1820
ddc12c42 1821#: bundle.c:291
a0b6b246
JX
1822msgid "pack-objects died"
1823msgstr "pack-objects 终止"
8ada9598 1824
ddc12c42 1825#: bundle.c:333
a0b6b246
JX
1826msgid "rev-list died"
1827msgstr "rev-list 终止"
1828
ddc12c42 1829#: bundle.c:382
81809b99 1830#, c-format
a0b6b246
JX
1831msgid "ref '%s' is excluded by the rev-list options"
1832msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 1833
ddc12c42 1834#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
81809b99 1835#, c-format
a0b6b246
JX
1836msgid "unrecognized argument: %s"
1837msgstr "未能识别的参数:%s"
8ada9598 1838
ddc12c42 1839#: bundle.c:469
a0b6b246
JX
1840msgid "Refusing to create empty bundle."
1841msgstr "不能创建空包。"
1842
ddc12c42 1843#: bundle.c:479
81809b99 1844#, c-format
a0b6b246
JX
1845msgid "cannot create '%s'"
1846msgstr "不能创建 '%s'"
8ada9598 1847
ddc12c42 1848#: bundle.c:504
a0b6b246
JX
1849msgid "index-pack died"
1850msgstr "index-pack 终止"
63af42fe 1851
31e5e17b 1852#: color.c:296
94550ed3 1853#, c-format
a0b6b246
JX
1854msgid "invalid color value: %.*s"
1855msgstr "无效的颜色值:%.*s"
94550ed3 1856
ddc12c42 1857#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398
a5cd71ca 1858#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
94550ed3 1859#, c-format
a0b6b246
JX
1860msgid "could not parse %s"
1861msgstr "不能解析 %s"
94550ed3 1862
ddc12c42 1863#: commit.c:53
a0b6b246
JX
1864#, c-format
1865msgid "%s %s is not a commit!"
31e5e17b 1866msgstr "%s %s 不是一个提交!"
90314792 1867
ddc12c42 1868#: commit.c:193
fd8cb379
JX
1869msgid ""
1870"Support for <GIT_DIR>/info/grafts is deprecated\n"
1871"and will be removed in a future Git version.\n"
1872"\n"
1873"Please use \"git replace --convert-graft-file\"\n"
1874"to convert the grafts into replace refs.\n"
1875"\n"
1876"Turn this message off by running\n"
1877"\"git config advice.graftFileDeprecated false\""
1878msgstr ""
1879"对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n"
1880"未来的Git版本中被移除。\n"
1881"\n"
1882"请使用 \"git replace --convert-graft-file\" 将\n"
1883"grafts 转换为替换引用。\n"
1884"\n"
1885"设置 \"git config advice.graftFileDeprecated false\"\n"
1886"可关闭本消息"
1887
ddc12c42 1888#: commit.c:1152
4c27fcb5
JX
1889#, c-format
1890msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
1891msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
1892
ddc12c42 1893#: commit.c:1155
4c27fcb5
JX
1894#, c-format
1895msgid "Commit %s has a bad GPG signature allegedly by %s."
1896msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
1897
ddc12c42 1898#: commit.c:1158
4c27fcb5
JX
1899#, c-format
1900msgid "Commit %s does not have a GPG signature."
1901msgstr "提交 %s 没有 GPG 签名。"
1902
ddc12c42 1903#: commit.c:1161
4c27fcb5
JX
1904#, c-format
1905msgid "Commit %s has a good GPG signature by %s\n"
1906msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
1907
ddc12c42 1908#: commit.c:1415
90314792 1909msgid ""
a0b6b246
JX
1910"Warning: commit message did not conform to UTF-8.\n"
1911"You may want to amend it after fixing the message, or set the config\n"
1912"variable i18n.commitencoding to the encoding your project uses.\n"
1913msgstr ""
29004bbb 1914"警告:提交说明不符合 UTF-8 字符编码。\n"
a0b6b246 1915"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
29004bbb 1916"设置为您项目所用的字符编码。\n"
90314792 1917
ddc12c42 1918#: commit-graph.c:130
d46c5519
JX
1919msgid "commit-graph file is too small"
1920msgstr "提交图形文件太小"
c1ac5258 1921
ddc12c42 1922#: commit-graph.c:195
c1ac5258 1923#, c-format
d46c5519
JX
1924msgid "commit-graph signature %X does not match signature %X"
1925msgstr "提交图形签名 %X 和签名 %X 不匹配"
c1ac5258 1926
ddc12c42 1927#: commit-graph.c:202
c1ac5258 1928#, c-format
d46c5519
JX
1929msgid "commit-graph version %X does not match version %X"
1930msgstr "提交图形版本 %X 和版本 %X 不匹配"
c1ac5258 1931
ddc12c42 1932#: commit-graph.c:209
c1ac5258 1933#, c-format
d46c5519
JX
1934msgid "commit-graph hash version %X does not match version %X"
1935msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
c1ac5258 1936
ddc12c42 1937#: commit-graph.c:232
d46c5519
JX
1938msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
1939msgstr "提交图形块查找表条目丢失,文件可能不完整"
06991777 1940
ddc12c42 1941#: commit-graph.c:243
c1ac5258 1942#, c-format
d46c5519
JX
1943msgid "commit-graph improper chunk offset %08x%08x"
1944msgstr "提交图形不正确的块偏移 %08x%08x"
c1ac5258 1945
ddc12c42 1946#: commit-graph.c:286
c1ac5258 1947#, c-format
d46c5519
JX
1948msgid "commit-graph chunk id %08x appears multiple times"
1949msgstr "提交图形块 id %08x 出现了多次"
c1ac5258 1950
ddc12c42 1951#: commit-graph.c:350
a6cd2cc4
JX
1952msgid "commit-graph has no base graphs chunk"
1953msgstr "提交图形没有基础图形块"
1954
ddc12c42 1955#: commit-graph.c:360
a6cd2cc4
JX
1956msgid "commit-graph chain does not match"
1957msgstr "提交图形链不匹配"
1958
ddc12c42 1959#: commit-graph.c:407
a6cd2cc4
JX
1960#, c-format
1961msgid "invalid commit-graph chain: line '%s' not a hash"
1962msgstr "无效的提交图形链:行 '%s' 不是一个哈希值"
1963
ddc12c42 1964#: commit-graph.c:433
a6cd2cc4
JX
1965msgid "unable to find all commit-graph files"
1966msgstr "无法找到所有提交图形文件"
1967
ddc12c42 1968#: commit-graph.c:564 commit-graph.c:624
a6cd2cc4
JX
1969msgid "invalid commit position. commit-graph is likely corrupt"
1970msgstr "无效的提交位置。提交图形可能已损坏"
1971
ddc12c42 1972#: commit-graph.c:585
c1ac5258
JX
1973#, c-format
1974msgid "could not find commit %s"
1975msgstr "无法找到提交 %s"
1976
ddc12c42 1977#: commit-graph.c:858 builtin/am.c:1287
a5cd71ca
JX
1978#, c-format
1979msgid "unable to parse commit %s"
1980msgstr "不能解析提交 %s"
1981
a5cd71ca 1982#: commit-graph.c:1017 builtin/pack-objects.c:2641
c1ac5258
JX
1983#, c-format
1984msgid "unable to get type of object %s"
1985msgstr "无法获得对象 %s 类型"
1986
a5cd71ca 1987#: commit-graph.c:1049
06991777
JX
1988msgid "Loading known commits in commit graph"
1989msgstr "正在加载提交图中的已知提交"
1990
a5cd71ca 1991#: commit-graph.c:1066
06991777
JX
1992msgid "Expanding reachable commits in commit graph"
1993msgstr "正在扩展提交图中的可达提交"
1994
a5cd71ca 1995#: commit-graph.c:1085
06991777
JX
1996msgid "Clearing commit marks in commit graph"
1997msgstr "正在清除提交图中的提交标记"
4c27fcb5 1998
a5cd71ca 1999#: commit-graph.c:1104
4c27fcb5
JX
2000msgid "Computing commit graph generation numbers"
2001msgstr "正在计算提交图世代数字"
2002
a5cd71ca 2003#: commit-graph.c:1179
06991777
JX
2004#, c-format
2005msgid "Finding commits for commit graph in %d pack"
2006msgid_plural "Finding commits for commit graph in %d packs"
2007msgstr[0] "正在 %d 个包中查找提交图的提交"
2008msgstr[1] "正在 %d 个包中查找提交图的提交"
4c27fcb5 2009
a5cd71ca 2010#: commit-graph.c:1192
c1ac5258
JX
2011#, c-format
2012msgid "error adding pack %s"
2013msgstr "添加包 %s 出错"
2014
a5cd71ca 2015#: commit-graph.c:1196
c1ac5258
JX
2016#, c-format
2017msgid "error opening index for %s"
2018msgstr "为 %s 打开索引出错"
2019
a5cd71ca 2020#: commit-graph.c:1220
06991777
JX
2021#, c-format
2022msgid "Finding commits for commit graph from %d ref"
2023msgid_plural "Finding commits for commit graph from %d refs"
2024msgstr[0] "正在从 %d 个引用中查找提交图的提交"
2025msgstr[1] "正在从 %d 个引用中查找提交图的提交"
2026
a5cd71ca
JX
2027#: commit-graph.c:1240
2028#, c-format
2029msgid "invalid commit object id: %s"
2030msgstr "无效的提交对象 ID:%s"
2031
2032#: commit-graph.c:1255
06991777
JX
2033msgid "Finding commits for commit graph among packed objects"
2034msgstr "正在打包对象中查找提交图的提交"
2035
a5cd71ca 2036#: commit-graph.c:1270
06991777 2037msgid "Counting distinct commits in commit graph"
8e4e0555 2038msgstr "正在计算提交图中不同的提交"
06991777 2039
a5cd71ca 2040#: commit-graph.c:1300
06991777 2041msgid "Finding extra edges in commit graph"
8e4e0555 2042msgstr "正在查找提交图中额外的边"
06991777 2043
a5cd71ca 2044#: commit-graph.c:1346
a6cd2cc4
JX
2045msgid "failed to write correct number of base graph ids"
2046msgstr "无法写入正确数量的基础图形 ID"
fd8cb379 2047
ddc12c42 2048#: commit-graph.c:1379 midx.c:814
fd8cb379 2049#, c-format
c1ac5258
JX
2050msgid "unable to create leading directories of %s"
2051msgstr "不能为 %s 创建先导目录"
2052
ddc12c42 2053#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248
a6cd2cc4
JX
2054#, c-format
2055msgid "unable to create '%s'"
2056msgstr "不能创建 '%s'"
2057
a5cd71ca 2058#: commit-graph.c:1451
06991777
JX
2059#, c-format
2060msgid "Writing out commit graph in %d pass"
2061msgid_plural "Writing out commit graph in %d passes"
8e4e0555
FZ
2062msgstr[0] "正在用 %d 步写出提交图"
2063msgstr[1] "正在用 %d 步写出提交图"
06991777 2064
a5cd71ca 2065#: commit-graph.c:1492
a6cd2cc4
JX
2066msgid "unable to open commit-graph chain file"
2067msgstr "无法打开提交图形链文件"
2068
a5cd71ca 2069#: commit-graph.c:1504
a6cd2cc4
JX
2070msgid "failed to rename base commit-graph file"
2071msgstr "无法重命名基础提交图形文件"
2072
a5cd71ca 2073#: commit-graph.c:1524
a6cd2cc4
JX
2074msgid "failed to rename temporary commit-graph file"
2075msgstr "无法重命名临时提交图形文件"
2076
a5cd71ca 2077#: commit-graph.c:1635
a6cd2cc4
JX
2078msgid "Scanning merged commits"
2079msgstr "正在扫描合并提交"
2080
a5cd71ca 2081#: commit-graph.c:1646
a6cd2cc4
JX
2082#, c-format
2083msgid "unexpected duplicate commit id %s"
2084msgstr "意外的重复提交 ID %s"
2085
a5cd71ca 2086#: commit-graph.c:1670
a6cd2cc4
JX
2087msgid "Merging commit-graph"
2088msgstr "正在合并提交图形"
2089
a5cd71ca 2090#: commit-graph.c:1860
a6cd2cc4
JX
2091#, c-format
2092msgid "the commit graph format cannot write %d commits"
2093msgstr "提交图格式不能写入 %d 个提交"
2094
a5cd71ca 2095#: commit-graph.c:1871
a6cd2cc4
JX
2096msgid "too many commits to write graph"
2097msgstr "提交太多不能画图"
2098
a5cd71ca 2099#: commit-graph.c:1961
c1ac5258 2100msgid "the commit-graph file has incorrect checksum and is likely corrupt"
4c27fcb5
JX
2101msgstr "提交图文件的校验码错误,可能已经损坏"
2102
a5cd71ca 2103#: commit-graph.c:1971
d46c5519
JX
2104#, c-format
2105msgid "commit-graph has incorrect OID order: %s then %s"
5b533632 2106msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s"
d46c5519 2107
a5cd71ca 2108#: commit-graph.c:1981 commit-graph.c:1996
d46c5519
JX
2109#, c-format
2110msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2111msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u"
2112
a5cd71ca 2113#: commit-graph.c:1988
d46c5519
JX
2114#, c-format
2115msgid "failed to parse commit %s from commit-graph"
2116msgstr "无法从提交图形中解析提交 %s"
2117
a5cd71ca 2118#: commit-graph.c:2006
4c27fcb5 2119msgid "Verifying commits in commit graph"
8e4e0555 2120msgstr "正在校验提交图中的提交"
fd8cb379 2121
a5cd71ca 2122#: commit-graph.c:2020
d46c5519
JX
2123#, c-format
2124msgid "failed to parse commit %s from object database for commit-graph"
2125msgstr "无法从提交图形的对象库中解析提交 %s"
2126
a5cd71ca 2127#: commit-graph.c:2027
d46c5519
JX
2128#, c-format
2129msgid "root tree OID for commit %s in commit-graph is %s != %s"
5b533632 2130msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
d46c5519 2131
a5cd71ca 2132#: commit-graph.c:2037
d46c5519
JX
2133#, c-format
2134msgid "commit-graph parent list for commit %s is too long"
2135msgstr "提交 %s 的提交图形父提交列表太长了"
2136
a5cd71ca 2137#: commit-graph.c:2046
d46c5519
JX
2138#, c-format
2139msgid "commit-graph parent for %s is %s != %s"
2140msgstr "%s 的提交图形父提交是 %s != %s"
2141
a5cd71ca 2142#: commit-graph.c:2059
d46c5519
JX
2143#, c-format
2144msgid "commit-graph parent list for commit %s terminates early"
2145msgstr "提交 %s 的提交图形父提交列表过早终止"
2146
a5cd71ca 2147#: commit-graph.c:2064
d46c5519
JX
2148#, c-format
2149msgid ""
2150"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2151msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零"
2152
a5cd71ca 2153#: commit-graph.c:2068
d46c5519
JX
2154#, c-format
2155msgid ""
2156"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2157msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零"
2158
a5cd71ca 2159#: commit-graph.c:2083
d46c5519
JX
2160#, c-format
2161msgid "commit-graph generation for commit %s is %u != %u"
2162msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
2163
a5cd71ca 2164#: commit-graph.c:2089
d46c5519
JX
2165#, c-format
2166msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2167msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2168
06991777 2169#: compat/obstack.c:406 compat/obstack.c:408
a0b6b246
JX
2170msgid "memory exhausted"
2171msgstr "内存耗尽"
90314792 2172
a6cd2cc4 2173#: config.c:124
c1ac5258
JX
2174#, c-format
2175msgid ""
2176"exceeded maximum include depth (%d) while including\n"
2177"\t%s\n"
2178"from\n"
2179"\t%s\n"
2180"This might be due to circular includes."
2181msgstr ""
e640d114 2182"超过了最大包含深度(%1$d),当从\n"
c1ac5258
JX
2183"\t%3$s\n"
2184"包含\n"
2185"\t%2$s\n"
e640d114 2186"这可能是因为循环包含。"
c1ac5258 2187
a6cd2cc4 2188#: config.c:140
c1ac5258
JX
2189#, c-format
2190msgid "could not expand include path '%s'"
2191msgstr "无法扩展包含路径 '%s'"
2192
a6cd2cc4 2193#: config.c:151
c1ac5258
JX
2194msgid "relative config includes must come from files"
2195msgstr "相对路径的配置文件引用必须来自于文件"
2196
a6cd2cc4 2197#: config.c:197
87cb7997 2198msgid "relative config include conditionals must come from files"
c1ac5258
JX
2199msgstr "相对路径的配置文件条件引用必须来自于文件"
2200
a6cd2cc4 2201#: config.c:376
c1ac5258
JX
2202#, c-format
2203msgid "key does not contain a section: %s"
2204msgstr "键名没有包含一个小节名称:%s"
87cb7997 2205
a6cd2cc4 2206#: config.c:382
c1ac5258
JX
2207#, c-format
2208msgid "key does not contain variable name: %s"
2209msgstr "键名没有包含变量名:%s"
2210
ddc12c42 2211#: config.c:406 sequencer.c:2530
c1ac5258
JX
2212#, c-format
2213msgid "invalid key: %s"
2214msgstr "无效键名:%s"
2215
a6cd2cc4 2216#: config.c:412
c1ac5258
JX
2217#, c-format
2218msgid "invalid key (newline): %s"
2219msgstr "无效键名(有换行符):%s"
2220
a6cd2cc4 2221#: config.c:448 config.c:460
c1ac5258
JX
2222#, c-format
2223msgid "bogus config parameter: %s"
2224msgstr "伪配置参数:%s"
2225
a6cd2cc4 2226#: config.c:495
c1ac5258
JX
2227#, c-format
2228msgid "bogus format in %s"
2229msgstr "%s 中格式错误"
2230
a6cd2cc4 2231#: config.c:821
90314792 2232#, c-format
a0b6b246
JX
2233msgid "bad config line %d in blob %s"
2234msgstr "数据对象 %2$s 中错误的配置行 %1$d"
90314792 2235
a6cd2cc4 2236#: config.c:825
a77c07d9 2237#, c-format
a0b6b246
JX
2238msgid "bad config line %d in file %s"
2239msgstr "文件 %2$s 中错误的配置行 %1$d"
a77c07d9 2240
a6cd2cc4 2241#: config.c:829
a77c07d9 2242#, c-format
a0b6b246
JX
2243msgid "bad config line %d in standard input"
2244msgstr "标准输入中错误的配置行 %d"
a77c07d9 2245
a6cd2cc4 2246#: config.c:833
90314792 2247#, c-format
a0b6b246
JX
2248msgid "bad config line %d in submodule-blob %s"
2249msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
90314792 2250
a6cd2cc4 2251#: config.c:837
90314792 2252#, c-format
a0b6b246
JX
2253msgid "bad config line %d in command line %s"
2254msgstr "命令行 %2$s 中错误的配置行 %1$d"
90314792 2255
a6cd2cc4 2256#: config.c:841
90314792 2257#, c-format
a0b6b246
JX
2258msgid "bad config line %d in %s"
2259msgstr "在 %2$s 中错误的配置行 %1$d"
220c313c 2260
a6cd2cc4 2261#: config.c:978
a0b6b246
JX
2262msgid "out of range"
2263msgstr "超出范围"
6c94aba5 2264
a6cd2cc4 2265#: config.c:978
a0b6b246
JX
2266msgid "invalid unit"
2267msgstr "无效的单位"
6c94aba5 2268
a6cd2cc4 2269#: config.c:979
6c94aba5 2270#, c-format
a0b6b246
JX
2271msgid "bad numeric config value '%s' for '%s': %s"
2272msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
6c94aba5 2273
a6cd2cc4 2274#: config.c:998
1b7f4a34 2275#, c-format
a0b6b246
JX
2276msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2277msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2278
a6cd2cc4 2279#: config.c:1001
1b7f4a34 2280#, c-format
a0b6b246
JX
2281msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2282msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2283
a6cd2cc4 2284#: config.c:1004
1b7f4a34 2285#, c-format
a0b6b246
JX
2286msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2287msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1b7f4a34 2288
a6cd2cc4 2289#: config.c:1007
1b7f4a34 2290#, c-format
a0b6b246
JX
2291msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2292msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2293
a6cd2cc4 2294#: config.c:1010
94550ed3 2295#, c-format
a0b6b246
JX
2296msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2297msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 2298
a6cd2cc4 2299#: config.c:1013
276ceeaa 2300#, c-format
a0b6b246
JX
2301msgid "bad numeric config value '%s' for '%s' in %s: %s"
2302msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 2303
a6cd2cc4 2304#: config.c:1108
276ceeaa 2305#, c-format
a0b6b246 2306msgid "failed to expand user dir in: '%s'"
c1ac5258 2307msgstr "无法扩展用户目录:'%s'"
94550ed3 2308
a6cd2cc4 2309#: config.c:1117
5809aa05
JX
2310#, c-format
2311msgid "'%s' for '%s' is not a valid timestamp"
2312msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
2313
a6cd2cc4 2314#: config.c:1208
c1ac5258
JX
2315#, c-format
2316msgid "abbrev length out of range: %d"
2317msgstr "缩写长度超出范围:%d"
2318
a6cd2cc4 2319#: config.c:1222 config.c:1233
3495628d 2320#, c-format
a0b6b246
JX
2321msgid "bad zlib compression level %d"
2322msgstr "错误的 zlib 压缩级别 %d"
3495628d 2323
a6cd2cc4 2324#: config.c:1325
c1ac5258
JX
2325msgid "core.commentChar should only be one character"
2326msgstr "core.commentChar 应该是一个字符"
2327
a6cd2cc4 2328#: config.c:1358
3495628d 2329#, c-format
a0b6b246
JX
2330msgid "invalid mode for object creation: %s"
2331msgstr "无效的对象创建模式:%s"
3495628d 2332
ddc12c42 2333#: config.c:1430
c1ac5258
JX
2334#, c-format
2335msgid "malformed value for %s"
2336msgstr "%s 的取值格式错误"
2337
ddc12c42 2338#: config.c:1456
c1ac5258
JX
2339#, c-format
2340msgid "malformed value for %s: %s"
2341msgstr "%s 的取值格式错误:%s"
2342
ddc12c42 2343#: config.c:1457
c1ac5258
JX
2344msgid "must be one of nothing, matching, simple, upstream or current"
2345msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current"
2346
ddc12c42 2347#: config.c:1518 builtin/pack-objects.c:3394
1a79b2f1
JX
2348#, c-format
2349msgid "bad pack compression level %d"
2350msgstr "错误的打包压缩级别 %d"
2351
ddc12c42 2352#: config.c:1639
c1ac5258
JX
2353#, c-format
2354msgid "unable to load config blob object '%s'"
2355msgstr "无法从数据对象 '%s' 加载配置"
2356
ddc12c42 2357#: config.c:1642
c1ac5258
JX
2358#, c-format
2359msgid "reference '%s' does not point to a blob"
2360msgstr "引用 '%s' 没有指向一个数据对象"
2361
ddc12c42 2362#: config.c:1659
c1ac5258
JX
2363#, c-format
2364msgid "unable to resolve config blob '%s'"
2365msgstr "不能解析配置对象 '%s'"
2366
ddc12c42 2367#: config.c:1689
c1ac5258
JX
2368#, c-format
2369msgid "failed to parse %s"
2370msgstr "解析 %s 失败"
2371
ddc12c42 2372#: config.c:1745
a0b6b246
JX
2373msgid "unable to parse command-line config"
2374msgstr "无法解析命令行中的配置"
94550ed3 2375
ddc12c42 2376#: config.c:2096
a0b6b246
JX
2377msgid "unknown error occurred while reading the configuration files"
2378msgstr "在读取配置文件时遇到未知错误"
94550ed3 2379
ddc12c42 2380#: config.c:2266
87cb7997
JX
2381#, c-format
2382msgid "Invalid %s: '%s'"
2383msgstr "无效 %s:'%s'"
2384
ddc12c42 2385#: config.c:2311
87cb7997
JX
2386#, c-format
2387msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2388msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2389
ddc12c42 2390#: config.c:2357
276ceeaa 2391#, c-format
a0b6b246
JX
2392msgid "unable to parse '%s' from command-line config"
2393msgstr "无法解析命令行配置中的 '%s'"
1b7f4a34 2394
ddc12c42 2395#: config.c:2359
94550ed3 2396#, c-format
a0b6b246
JX
2397msgid "bad config variable '%s' in file '%s' at line %d"
2398msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
94550ed3 2399
ddc12c42 2400#: config.c:2440
c1ac5258
JX
2401#, c-format
2402msgid "invalid section name '%s'"
2403msgstr "无效的小节名称 '%s'"
2404
ddc12c42 2405#: config.c:2472
276ceeaa 2406#, c-format
a0b6b246
JX
2407msgid "%s has multiple values"
2408msgstr "%s 有多个取值"
276ceeaa 2409
ddc12c42 2410#: config.c:2501
c1ac5258
JX
2411#, c-format
2412msgid "failed to write new configuration file %s"
2413msgstr "写入新的配置文件 %s 失败"
2414
ddc12c42 2415#: config.c:2753 config.c:3077
c1ac5258
JX
2416#, c-format
2417msgid "could not lock config file %s"
2418msgstr "不能锁定配置文件 %s"
2419
ddc12c42 2420#: config.c:2764
c1ac5258
JX
2421#, c-format
2422msgid "opening %s"
2423msgstr "打开 %s"
2424
ddc12c42 2425#: config.c:2799 builtin/config.c:328
c1ac5258
JX
2426#, c-format
2427msgid "invalid pattern: %s"
2428msgstr "无效模式:%s"
2429
ddc12c42 2430#: config.c:2824
c1ac5258
JX
2431#, c-format
2432msgid "invalid config file %s"
2433msgstr "无效的配置文件 %s"
2434
ddc12c42 2435#: config.c:2837 config.c:3090
1a79b2f1
JX
2436#, c-format
2437msgid "fstat on %s failed"
65e2041e 2438msgstr "对 %s 调用 fstat 失败"
1a79b2f1 2439
ddc12c42 2440#: config.c:2848
c1ac5258
JX
2441#, c-format
2442msgid "unable to mmap '%s'"
2443msgstr "不能 mmap '%s'"
2444
ddc12c42 2445#: config.c:2857 config.c:3095
c1ac5258
JX
2446#, c-format
2447msgid "chmod on %s failed"
2448msgstr "对 %s 调用 chmod 失败"
2449
ddc12c42 2450#: config.c:2942 config.c:3192
c1ac5258
JX
2451#, c-format
2452msgid "could not write config file %s"
2453msgstr "不能写入配置文件 %s"
2454
ddc12c42 2455#: config.c:2976
94550ed3 2456#, c-format
a0b6b246
JX
2457msgid "could not set '%s' to '%s'"
2458msgstr "不能设置 '%s' 为 '%s'"
94550ed3 2459
ddc12c42 2460#: config.c:2978 builtin/remote.c:781
276ceeaa 2461#, c-format
a0b6b246
JX
2462msgid "could not unset '%s'"
2463msgstr "不能取消设置 '%s'"
276ceeaa 2464
ddc12c42 2465#: config.c:3068
c1ac5258
JX
2466#, c-format
2467msgid "invalid section name: %s"
2468msgstr "无效的小节名称:%s"
2469
ddc12c42 2470#: config.c:3235
c1ac5258
JX
2471#, c-format
2472msgid "missing value for '%s'"
2473msgstr "%s 的取值缺失"
2474
fd8cb379 2475#: connect.c:61
c1ac5258
JX
2476msgid "the remote end hung up upon initial contact"
2477msgstr "远端在初始连接时即挂断"
94550ed3 2478
fd8cb379 2479#: connect.c:63
a0b6b246
JX
2480msgid ""
2481"Could not read from remote repository.\n"
2482"\n"
2483"Please make sure you have the correct access rights\n"
2484"and the repository exists."
2485msgstr ""
2486"无法读取远程仓库。\n"
2487"\n"
2488"请确认您有正确的访问权限并且仓库存在。"
2489
c1ac5258
JX
2490#: connect.c:81
2491#, c-format
2492msgid "server doesn't support '%s'"
2493msgstr "服务器不支持 '%s'"
2494
2495#: connect.c:103
2496#, c-format
2497msgid "server doesn't support feature '%s'"
2498msgstr "服务器不支持特性 '%s'"
2499
2500#: connect.c:114
2501msgid "expected flush after capabilities"
2502msgstr "在能力之后应为一个 flush 包"
2503
2504#: connect.c:233
2505#, c-format
2506msgid "ignoring capabilities after first line '%s'"
e640d114 2507msgstr "忽略第一行 '%s' 之后的能力字段"
c1ac5258
JX
2508
2509#: connect.c:252
2510msgid "protocol error: unexpected capabilities^{}"
2511msgstr "协议错误:意外的 capabilities^{}"
2512
2513#: connect.c:273
2514#, c-format
2515msgid "protocol error: expected shallow sha-1, got '%s'"
2516msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'"
2517
2518#: connect.c:275
2519msgid "repository on the other end cannot be shallow"
2520msgstr "另一端的仓库不能是浅克隆仓库"
2521
06991777 2522#: connect.c:313
c1ac5258
JX
2523msgid "invalid packet"
2524msgstr "无效数据包"
2525
06991777 2526#: connect.c:333
c1ac5258
JX
2527#, c-format
2528msgid "protocol error: unexpected '%s'"
2529msgstr "协议错误:意外的 '%s'"
2530
06991777 2531#: connect.c:441
c1ac5258
JX
2532#, c-format
2533msgid "invalid ls-refs response: %s"
2534msgstr "无效的 ls-refs 响应:%s"
2535
06991777 2536#: connect.c:445
c1ac5258
JX
2537msgid "expected flush after ref listing"
2538msgstr "在引用列表之后应该有一个 flush 包"
2539
06991777 2540#: connect.c:544
c1ac5258
JX
2541#, c-format
2542msgid "protocol '%s' is not supported"
2543msgstr "不支持 '%s' 协议"
2544
06991777 2545#: connect.c:595
c1ac5258
JX
2546msgid "unable to set SO_KEEPALIVE on socket"
2547msgstr "无法为 socket 设置 SO_KEEPALIVE"
2548
06991777 2549#: connect.c:635 connect.c:698
c1ac5258
JX
2550#, c-format
2551msgid "Looking up %s ... "
2552msgstr "查找 %s ..."
2553
06991777 2554#: connect.c:639
c1ac5258
JX
2555#, c-format
2556msgid "unable to look up %s (port %s) (%s)"
2557msgstr "无法查找 %s(端口 %s)(%s)"
2558
2559#. TRANSLATORS: this is the end of "Looking up %s ... "
06991777 2560#: connect.c:643 connect.c:714
c1ac5258
JX
2561#, c-format
2562msgid ""
2563"done.\n"
2564"Connecting to %s (port %s) ... "
2565msgstr ""
2566"完成。\n"
2567"连接到 %s(端口 %s)... "
2568
06991777 2569#: connect.c:665 connect.c:742
c1ac5258
JX
2570#, c-format
2571msgid ""
2572"unable to connect to %s:\n"
2573"%s"
2574msgstr ""
2575"无法连接到 %s:\n"
2576"%s"
2577
2578#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
06991777 2579#: connect.c:671 connect.c:748
c1ac5258
JX
2580msgid "done."
2581msgstr "完成。"
2582
06991777 2583#: connect.c:702
c1ac5258
JX
2584#, c-format
2585msgid "unable to look up %s (%s)"
2586msgstr "无法查找 %s(%s)"
2587
06991777 2588#: connect.c:708
c1ac5258
JX
2589#, c-format
2590msgid "unknown port %s"
2591msgstr "未知端口 %s"
2592
a5cd71ca 2593#: connect.c:845 connect.c:1175
c1ac5258
JX
2594#, c-format
2595msgid "strange hostname '%s' blocked"
2596msgstr "已阻止奇怪的主机名 '%s'"
2597
06991777 2598#: connect.c:847
c1ac5258
JX
2599#, c-format
2600msgid "strange port '%s' blocked"
2601msgstr "已阻止奇怪的端口号 '%s'"
2602
06991777 2603#: connect.c:857
c1ac5258
JX
2604#, c-format
2605msgid "cannot start proxy %s"
2606msgstr "不能启动代理 %s"
2607
a5cd71ca 2608#: connect.c:928
c1ac5258
JX
2609msgid "no path specified; see 'git help pull' for valid url syntax"
2610msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法"
2611
a5cd71ca 2612#: connect.c:1123
c1ac5258
JX
2613msgid "ssh variant 'simple' does not support -4"
2614msgstr "ssh 变体 'simple' 不支持 -4"
2615
a5cd71ca 2616#: connect.c:1135
c1ac5258
JX
2617msgid "ssh variant 'simple' does not support -6"
2618msgstr "ssh 变体 'simple' 不支持 -6"
2619
a5cd71ca 2620#: connect.c:1152
c1ac5258 2621msgid "ssh variant 'simple' does not support setting port"
e640d114 2622msgstr "ssh 变体 'simple' 不支持设置端口"
c1ac5258 2623
a5cd71ca 2624#: connect.c:1264
c1ac5258
JX
2625#, c-format
2626msgid "strange pathname '%s' blocked"
2627msgstr "已阻止奇怪的路径名 '%s'"
2628
a5cd71ca 2629#: connect.c:1311
c1ac5258
JX
2630msgid "unable to fork"
2631msgstr "无法 fork"
2632
ddc12c42 2633#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43
a0b6b246 2634msgid "Checking connectivity"
06991777 2635msgstr "正在检查连通性"
a0b6b246 2636
ddc12c42 2637#: connected.c:101
a0b6b246
JX
2638msgid "Could not run 'git rev-list'"
2639msgstr "不能执行 'git rev-list'"
2640
ddc12c42 2641#: connected.c:121
a0b6b246 2642msgid "failed write to rev-list"
c1ac5258 2643msgstr "写入 rev-list 失败"
a0b6b246 2644
ddc12c42 2645#: connected.c:128
a0b6b246 2646msgid "failed to close rev-list's stdin"
c1ac5258
JX
2647msgstr "关闭 rev-list 的标准输入失败"
2648
a5cd71ca 2649#: convert.c:194
c1ac5258
JX
2650#, c-format
2651msgid "illegal crlf_action %d"
2652msgstr "非法的 crlf 动作 %d"
a0b6b246 2653
a5cd71ca 2654#: convert.c:207
3495628d 2655#, c-format
c1ac5258
JX
2656msgid "CRLF would be replaced by LF in %s"
2657msgstr "%s 中的 CRLF 将被 LF 替换"
31e5e17b 2658
a5cd71ca 2659#: convert.c:209
31e5e17b 2660#, c-format
a0b6b246
JX
2661msgid ""
2662"CRLF will be replaced by LF in %s.\n"
c1ac5258 2663"The file will have its original line endings in your working directory"
a0b6b246 2664msgstr ""
c1ac5258 2665"%s 中的 CRLF 将被 LF 替换。<\n"
a0b6b246 2666"在工作区中该文件仍保持原有的换行符。"
3495628d 2667
a5cd71ca 2668#: convert.c:217
3495628d 2669#, c-format
31e5e17b
JX
2670msgid "LF would be replaced by CRLF in %s"
2671msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3495628d 2672
a5cd71ca 2673#: convert.c:219
276ceeaa 2674#, c-format
a0b6b246
JX
2675msgid ""
2676"LF will be replaced by CRLF in %s.\n"
c1ac5258 2677"The file will have its original line endings in your working directory"
a0b6b246 2678msgstr ""
c1ac5258
JX
2679"%s 中的 LF 将被 CRLF 替换。\n"
2680"在工作区中该文件仍保持原有的换行符"
276ceeaa 2681
ddc12c42 2682#: convert.c:284
fd8cb379
JX
2683#, c-format
2684msgid "BOM is prohibited in '%s' if encoded as %s"
2685msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
2686
ddc12c42 2687#: convert.c:291
fd8cb379
JX
2688#, c-format
2689msgid ""
ddc12c42
JX
2690"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
2691"working-tree-encoding."
2692msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%.*s 作为工作区编码。"
fd8cb379 2693
ddc12c42 2694#: convert.c:304
fd8cb379
JX
2695#, c-format
2696msgid "BOM is required in '%s' if encoded as %s"
2697msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
2698
ddc12c42 2699#: convert.c:306
fd8cb379
JX
2700#, c-format
2701msgid ""
2702"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
2703"%sLE (depending on the byte order) as working-tree-encoding."
2704msgstr ""
2705"文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
2706"节序)作为工作区编码。"
2707
ddc12c42 2708#: convert.c:419 convert.c:490
fd8cb379
JX
2709#, c-format
2710msgid "failed to encode '%s' from %s to %s"
2711msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
2712
ddc12c42 2713#: convert.c:462
fd8cb379
JX
2714#, c-format
2715msgid "encoding '%s' from %s to %s and back is not the same"
2716msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
2717
ddc12c42 2718#: convert.c:668
c1ac5258
JX
2719#, c-format
2720msgid "cannot fork to run external filter '%s'"
e640d114 2721msgstr "不能 fork 以执行外部过滤器 '%s'"
c1ac5258 2722
ddc12c42 2723#: convert.c:688
c1ac5258
JX
2724#, c-format
2725msgid "cannot feed the input to external filter '%s'"
e640d114 2726msgstr "不能将输入传递给外部过滤器 '%s'"
c1ac5258 2727
ddc12c42 2728#: convert.c:695
c1ac5258
JX
2729#, c-format
2730msgid "external filter '%s' failed %d"
e640d114 2731msgstr "外部过滤器 '%s' 失败码 %d"
c1ac5258 2732
ddc12c42 2733#: convert.c:730 convert.c:733
c1ac5258
JX
2734#, c-format
2735msgid "read from external filter '%s' failed"
2736msgstr "从外部过滤器 '%s' 读取失败"
2737
ddc12c42 2738#: convert.c:736 convert.c:791
c1ac5258
JX
2739#, c-format
2740msgid "external filter '%s' failed"
2741msgstr "外部过滤器 '%s' 失败"
2742
ddc12c42 2743#: convert.c:839
c1ac5258
JX
2744msgid "unexpected filter type"
2745msgstr "意外的过滤类型"
2746
ddc12c42 2747#: convert.c:850
c1ac5258
JX
2748msgid "path name too long for external filter"
2749msgstr "外部过滤器的路径名太长"
2750
ddc12c42 2751#: convert.c:924
c1ac5258
JX
2752#, c-format
2753msgid ""
2754"external filter '%s' is not available anymore although not all paths have "
2755"been filtered"
2756msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤"
2757
ddc12c42 2758#: convert.c:1223
fd8cb379
JX
2759msgid "true/false are no valid working-tree-encodings"
2760msgstr "true/false 不是有效的工作区编码"
2761
ddc12c42 2762#: convert.c:1411 convert.c:1445
c1ac5258
JX
2763#, c-format
2764msgid "%s: clean filter '%s' failed"
2765msgstr "%s:clean 过滤器 '%s' 失败"
2766
ddc12c42 2767#: convert.c:1489
c1ac5258
JX
2768#, c-format
2769msgid "%s: smudge filter %s failed"
2770msgstr "%s:smudge 过滤器 %s 失败"
2771
a5cd71ca 2772#: date.c:138
a0b6b246
JX
2773msgid "in the future"
2774msgstr "在将来"
3495628d 2775
a5cd71ca 2776#: date.c:144
3495628d 2777#, c-format
a4f16749
JX
2778msgid "%<PRIuMAX> second ago"
2779msgid_plural "%<PRIuMAX> seconds ago"
2780msgstr[0] "%<PRIuMAX> 秒钟前"
2781msgstr[1] "%<PRIuMAX> 秒钟前"
3495628d 2782
a5cd71ca 2783#: date.c:151
3495628d 2784#, c-format
a4f16749
JX
2785msgid "%<PRIuMAX> minute ago"
2786msgid_plural "%<PRIuMAX> minutes ago"
2787msgstr[0] "%<PRIuMAX> 分钟前"
2788msgstr[1] "%<PRIuMAX> 分钟前"
3495628d 2789
a5cd71ca 2790#: date.c:158
3495628d 2791#, c-format
a4f16749
JX
2792msgid "%<PRIuMAX> hour ago"
2793msgid_plural "%<PRIuMAX> hours ago"
2794msgstr[0] "%<PRIuMAX> 小时前"
2795msgstr[1] "%<PRIuMAX> 小时前"
3495628d 2796
a5cd71ca 2797#: date.c:165
3495628d 2798#, c-format
a4f16749
JX
2799msgid "%<PRIuMAX> day ago"
2800msgid_plural "%<PRIuMAX> days ago"
2801msgstr[0] "%<PRIuMAX> 天前"
2802msgstr[1] "%<PRIuMAX> 天前"
3495628d 2803
a5cd71ca 2804#: date.c:171
94550ed3 2805#, c-format
a4f16749
JX
2806msgid "%<PRIuMAX> week ago"
2807msgid_plural "%<PRIuMAX> weeks ago"
2808msgstr[0] "%<PRIuMAX> 周前"
2809msgstr[1] "%<PRIuMAX> 周前"
94550ed3 2810
a5cd71ca 2811#: date.c:178
3495628d 2812#, c-format
a4f16749
JX
2813msgid "%<PRIuMAX> month ago"
2814msgid_plural "%<PRIuMAX> months ago"
2815msgstr[0] "%<PRIuMAX> 个月前"
2816msgstr[1] "%<PRIuMAX> 个月前"
3495628d 2817
a5cd71ca 2818#: date.c:189
3495628d 2819#, c-format
a4f16749
JX
2820msgid "%<PRIuMAX> year"
2821msgid_plural "%<PRIuMAX> years"
2822msgstr[0] "%<PRIuMAX> 年"
2823msgstr[1] "%<PRIuMAX> 年"
3495628d 2824
a0b6b246 2825#. TRANSLATORS: "%s" is "<n> years"
a5cd71ca 2826#: date.c:192
94550ed3 2827#, c-format
a4f16749
JX
2828msgid "%s, %<PRIuMAX> month ago"
2829msgid_plural "%s, %<PRIuMAX> months ago"
2830msgstr[0] "%s %<PRIuMAX> 个月前"
2831msgstr[1] "%s %<PRIuMAX> 个月前"
94550ed3 2832
a5cd71ca 2833#: date.c:197 date.c:202
94550ed3 2834#, c-format
a4f16749
JX
2835msgid "%<PRIuMAX> year ago"
2836msgid_plural "%<PRIuMAX> years ago"
2837msgstr[0] "%<PRIuMAX> 年前"
2838msgstr[1] "%<PRIuMAX> 年前"
94550ed3 2839
06991777 2840#: delta-islands.c:272
4c27fcb5
JX
2841msgid "Propagating island marks"
2842msgstr "正在传播数据岛标记"
2843
06991777 2844#: delta-islands.c:290
4c27fcb5
JX
2845#, c-format
2846msgid "bad tree object %s"
2847msgstr "坏的树对象 %s"
2848
06991777 2849#: delta-islands.c:334
4c27fcb5
JX
2850#, c-format
2851msgid "failed to load island regex for '%s': %s"
2852msgstr "未能加载 '%s' 的数据岛正则表达式:%s"
2853
06991777 2854#: delta-islands.c:390
4c27fcb5
JX
2855#, c-format
2856msgid "island regex from config has too many capture groups (max=%d)"
2857msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)"
2858
a6cd2cc4 2859#: delta-islands.c:467
4c27fcb5
JX
2860#, c-format
2861msgid "Marked %d islands, done.\n"
2862msgstr "已标记 %d 个数据岛,结束。\n"
2863
a0b6b246 2864#: diffcore-order.c:24
cfff71a9 2865#, c-format
a0b6b246 2866msgid "failed to read orderfile '%s'"
c1ac5258 2867msgstr "读取排序文件 '%s' 失败"
cfff71a9 2868
a5cd71ca 2869#: diffcore-rename.c:543
a0b6b246 2870msgid "Performing inexact rename detection"
87cb7997 2871msgstr "正在进行非精确的重命名探测"
cfff71a9 2872
d46c5519
JX
2873#: diff-no-index.c:238
2874msgid "git diff --no-index [<options>] <path> <path>"
2875msgstr "git diff --no-index [<选项>] <路径> <路径>"
2876
2877#: diff-no-index.c:263
2878msgid ""
2879"Not a git repository. Use --no-index to compare two paths outside a working "
2880"tree"
2881msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径"
cfff71a9 2882
a0b6b246 2883# 译者:注意保持前导空格
d46c5519 2884#: diff.c:155
a0b6b246
JX
2885#, c-format
2886msgid " Failed to parse dirstat cut-off percentage '%s'\n"
2887msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
cfff71a9 2888
a0b6b246 2889# 译者:注意保持前导空格
d46c5519 2890#: diff.c:160
a0b6b246
JX
2891#, c-format
2892msgid " Unknown dirstat parameter '%s'\n"
2893msgstr " 未知的 dirstat 参数 '%s'\n"
7aea43ff 2894
d46c5519 2895#: diff.c:296
6937cb4e 2896msgid ""
c1ac5258
JX
2897"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
2898"'dimmed-zebra', 'plain'"
5809aa05 2899msgstr ""
c1ac5258
JX
2900"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
2901"'plain'"
2902
d46c5519 2903#: diff.c:324
c1ac5258 2904#, c-format
06991777
JX
2905msgid ""
2906"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
2907"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
2908msgstr ""
2909"未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
2910"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
c1ac5258 2911
d46c5519 2912#: diff.c:332
c1ac5258 2913msgid ""
06991777
JX
2914"color-moved-ws: allow-indentation-change cannot be combined with other "
2915"whitespace modes"
c1ac5258 2916msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用"
6937cb4e 2917
d46c5519 2918#: diff.c:405
7aea43ff 2919#, c-format
a0b6b246
JX
2920msgid "Unknown value for 'diff.submodule' config variable: '%s'"
2921msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
7aea43ff 2922
d46c5519 2923#: diff.c:465
7aea43ff 2924#, c-format
a0b6b246
JX
2925msgid ""
2926"Found errors in 'diff.dirstat' config variable:\n"
2927"%s"
2928msgstr ""
2929"发现配置变量 'diff.dirstat' 中的错误:\n"
2930"%s"
7aea43ff 2931
ddc12c42 2932#: diff.c:4202
7aea43ff 2933#, c-format
a0b6b246
JX
2934msgid "external diff died, stopping at %s"
2935msgstr "外部 diff 退出,停止在 %s"
7aea43ff 2936
ddc12c42 2937#: diff.c:4547
a0b6b246
JX
2938msgid "--name-only, --name-status, --check and -s are mutually exclusive"
2939msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
2940
ddc12c42 2941#: diff.c:4550
31e5e17b
JX
2942msgid "-G, -S and --find-object are mutually exclusive"
2943msgstr "-G、-S 和 --find-object 是互斥的"
2944
ddc12c42 2945#: diff.c:4628
a0b6b246
JX
2946msgid "--follow requires exactly one pathspec"
2947msgstr "--follow 明确要求只跟一个路径规格"
2948
ddc12c42 2949#: diff.c:4676
d46c5519
JX
2950#, c-format
2951msgid "invalid --stat value: %s"
2952msgstr "无效的 --stat 值:%s"
2953
ddc12c42 2954#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
d46c5519
JX
2955#: parse-options.c:199 parse-options.c:203
2956#, c-format
2957msgid "%s expects a numerical value"
2958msgstr "%s 期望一个数字值"
2959
ddc12c42 2960#: diff.c:4713
7aea43ff 2961#, c-format
a0b6b246
JX
2962msgid ""
2963"Failed to parse --dirstat/-X option parameter:\n"
2964"%s"
2965msgstr ""
2966"无法解析 --dirstat/-X 选项的参数:\n"
2967"%s"
7aea43ff 2968
ddc12c42 2969#: diff.c:4798
d46c5519
JX
2970#, c-format
2971msgid "unknown change class '%c' in --diff-filter=%s"
2972msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
2973
ddc12c42 2974#: diff.c:4822
d46c5519
JX
2975#, c-format
2976msgid "unknown value after ws-error-highlight=%.*s"
2977msgstr "ws-error-highlight=%.*s 之后未知的值"
2978
ddc12c42 2979#: diff.c:4836
7aea43ff 2980#, c-format
d46c5519
JX
2981msgid "unable to resolve '%s'"
2982msgstr "不能解析 '%s'"
2983
ddc12c42 2984#: diff.c:4886 diff.c:4892
d46c5519
JX
2985#, c-format
2986msgid "%s expects <n>/<m> form"
2987msgstr "%s 期望 <n>/<m> 格式"
2988
ddc12c42 2989#: diff.c:4904
d46c5519
JX
2990#, c-format
2991msgid "%s expects a character, got '%s'"
2992msgstr "%s 期望一个字符,得到 '%s'"
2993
ddc12c42 2994#: diff.c:4925
d46c5519
JX
2995#, c-format
2996msgid "bad --color-moved argument: %s"
2997msgstr "坏的 --color-moved 参数:%s"
2998
ddc12c42 2999#: diff.c:4944
d46c5519
JX
3000#, c-format
3001msgid "invalid mode '%s' in --color-moved-ws"
3002msgstr "--color-moved-ws 中的无效模式 '%s' "
3003
ddc12c42 3004#: diff.c:4984
d46c5519
JX
3005msgid ""
3006"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3007"\"histogram\""
3008msgstr ""
3009"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3010
ddc12c42 3011#: diff.c:5020 diff.c:5040
d46c5519
JX
3012#, c-format
3013msgid "invalid argument to %s"
3014msgstr "%s 的参数无效"
3015
ddc12c42 3016#: diff.c:5178
d46c5519
JX
3017#, c-format
3018msgid "failed to parse --submodule option parameter: '%s'"
a0b6b246 3019msgstr "无法解析 --submodule 选项的参数:'%s'"
7aea43ff 3020
ddc12c42 3021#: diff.c:5234
d46c5519
JX
3022#, c-format
3023msgid "bad --word-diff argument: %s"
3024msgstr "坏的 --word-diff 参数:%s"
3025
ddc12c42 3026#: diff.c:5257
d46c5519
JX
3027msgid "Diff output format options"
3028msgstr "差异输出格式化选项"
3029
ddc12c42 3030#: diff.c:5259 diff.c:5265
d46c5519
JX
3031msgid "generate patch"
3032msgstr "生成补丁"
3033
ddc12c42 3034#: diff.c:5262 builtin/log.c:173
d46c5519
JX
3035msgid "suppress diff output"
3036msgstr "不显示差异输出"
3037
ddc12c42 3038#: diff.c:5267 diff.c:5381 diff.c:5388
d46c5519
JX
3039msgid "<n>"
3040msgstr "<n>"
3041
ddc12c42 3042#: diff.c:5268 diff.c:5271
d46c5519
JX
3043msgid "generate diffs with <n> lines context"
3044msgstr "生成含 <n> 行上下文的差异"
3045
ddc12c42 3046#: diff.c:5273
d46c5519
JX
3047msgid "generate the diff in raw format"
3048msgstr "生成原始格式的差异"
3049
ddc12c42 3050#: diff.c:5276
d46c5519
JX
3051msgid "synonym for '-p --raw'"
3052msgstr "和 '-p --raw' 同义"
3053
ddc12c42 3054#: diff.c:5280
d46c5519
JX
3055msgid "synonym for '-p --stat'"
3056msgstr "和 '-p --stat' 同义"
3057
ddc12c42 3058#: diff.c:5284
d46c5519
JX
3059msgid "machine friendly --stat"
3060msgstr "机器友好的 --stat"
3061
ddc12c42 3062#: diff.c:5287
d46c5519
JX
3063msgid "output only the last line of --stat"
3064msgstr "只输出 --stat 的最后一行"
3065
ddc12c42 3066#: diff.c:5289 diff.c:5297
d46c5519
JX
3067msgid "<param1,param2>..."
3068msgstr "<参数1,参数2>..."
3069
ddc12c42 3070#: diff.c:5290
d46c5519
JX
3071msgid ""
3072"output the distribution of relative amount of changes for each sub-directory"
3073msgstr "输出每个子目录相对变更的分布"
3074
ddc12c42 3075#: diff.c:5294
d46c5519
JX
3076msgid "synonym for --dirstat=cumulative"
3077msgstr "和 --dirstat=cumulative 同义"
3078
ddc12c42 3079#: diff.c:5298
d46c5519
JX
3080msgid "synonym for --dirstat=files,param1,param2..."
3081msgstr "是 --dirstat=files,param1,param2... 的同义词"
3082
ddc12c42 3083#: diff.c:5302
d46c5519
JX
3084msgid "warn if changes introduce conflict markers or whitespace errors"
3085msgstr "如果变更中引入冲突定界符或空白错误,给出警告"
3086
ddc12c42 3087#: diff.c:5305
d46c5519
JX
3088msgid "condensed summary such as creations, renames and mode changes"
3089msgstr "精简摘要,例如创建、重命名和模式变更"
3090
ddc12c42 3091#: diff.c:5308
d46c5519
JX
3092msgid "show only names of changed files"
3093msgstr "只显示变更文件的文件名"
3094
ddc12c42 3095#: diff.c:5311
d46c5519
JX
3096msgid "show only names and status of changed files"
3097msgstr "只显示变更文件的文件名和状态"
3098
ddc12c42 3099#: diff.c:5313
d46c5519
JX
3100msgid "<width>[,<name-width>[,<count>]]"
3101msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3102
ddc12c42 3103#: diff.c:5314
d46c5519 3104msgid "generate diffstat"
5b533632 3105msgstr "生成差异统计(diffstat)"
d46c5519 3106
ddc12c42 3107#: diff.c:5316 diff.c:5319 diff.c:5322
d46c5519
JX
3108msgid "<width>"
3109msgstr "<宽度>"
3110
ddc12c42 3111#: diff.c:5317
d46c5519
JX
3112msgid "generate diffstat with a given width"
3113msgstr "使用给定的长度生成差异统计"
3114
ddc12c42 3115#: diff.c:5320
d46c5519
JX
3116msgid "generate diffstat with a given name width"
3117msgstr "使用给定的文件名长度生成差异统计"
3118
ddc12c42 3119#: diff.c:5323
d46c5519
JX
3120msgid "generate diffstat with a given graph width"
3121msgstr "使用给定的图形长度生成差异统计"
3122
ddc12c42 3123#: diff.c:5325
d46c5519
JX
3124msgid "<count>"
3125msgstr "<次数>"
3126
ddc12c42 3127#: diff.c:5326
d46c5519
JX
3128msgid "generate diffstat with limited lines"
3129msgstr "生成有限行数的差异统计"
3130
ddc12c42 3131#: diff.c:5329
d46c5519
JX
3132msgid "generate compact summary in diffstat"
3133msgstr "生成差异统计的简洁摘要"
3134
ddc12c42 3135#: diff.c:5332
d46c5519
JX
3136msgid "output a binary diff that can be applied"
3137msgstr "输出一个可以应用的二进制差异"
3138
ddc12c42 3139#: diff.c:5335
d46c5519
JX
3140msgid "show full pre- and post-image object names on the \"index\" lines"
3141msgstr "在 \"index\" 行显示完整的前后对象名称"
3142
ddc12c42 3143#: diff.c:5337
d46c5519
JX
3144msgid "show colored diff"
3145msgstr "显示带颜色的差异"
3146
ddc12c42 3147#: diff.c:5338
d46c5519
JX
3148msgid "<kind>"
3149msgstr "<类型>"
3150
ddc12c42 3151#: diff.c:5339
d46c5519
JX
3152msgid ""
3153"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3154"diff"
3155msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符"
3156
ddc12c42 3157#: diff.c:5342
d46c5519
JX
3158msgid ""
3159"do not munge pathnames and use NULs as output field terminators in --raw or "
3160"--numstat"
3161msgstr ""
3162"在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3163"符"
3164
ddc12c42 3165#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
d46c5519
JX
3166msgid "<prefix>"
3167msgstr "<前缀>"
3168
ddc12c42 3169#: diff.c:5346
d46c5519
JX
3170msgid "show the given source prefix instead of \"a/\""
3171msgstr "显示给定的源前缀取代 \"a/\""
3172
ddc12c42 3173#: diff.c:5349
d46c5519
JX
3174msgid "show the given destination prefix instead of \"b/\""
3175msgstr "显示给定的目标前缀取代 \"b/\""
3176
ddc12c42 3177#: diff.c:5352
d46c5519
JX
3178msgid "prepend an additional prefix to every line of output"
3179msgstr "输出的每一行附加前缀"
3180
ddc12c42 3181#: diff.c:5355
d46c5519
JX
3182msgid "do not show any source or destination prefix"
3183msgstr "不显示任何源和目标前缀"
3184
ddc12c42 3185#: diff.c:5358
d46c5519
JX
3186msgid "show context between diff hunks up to the specified number of lines"
3187msgstr "显示指定行数的差异块间的上下文"
3188
ddc12c42 3189#: diff.c:5362 diff.c:5367 diff.c:5372
d46c5519
JX
3190msgid "<char>"
3191msgstr "<字符>"
3192
ddc12c42 3193#: diff.c:5363
d46c5519
JX
3194msgid "specify the character to indicate a new line instead of '+'"
3195msgstr "指定一个字符取代 '+' 来表示新的一行"
3196
ddc12c42 3197#: diff.c:5368
d46c5519
JX
3198msgid "specify the character to indicate an old line instead of '-'"
3199msgstr "指定一个字符取代 '-' 来表示旧的一行"
3200
ddc12c42 3201#: diff.c:5373
d46c5519
JX
3202msgid "specify the character to indicate a context instead of ' '"
3203msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3204
ddc12c42 3205#: diff.c:5376
d46c5519
JX
3206msgid "Diff rename options"
3207msgstr "差异重命名选项"
3208
ddc12c42 3209#: diff.c:5377
d46c5519
JX
3210msgid "<n>[/<m>]"
3211msgstr "<n>[/<m>]"
3212
ddc12c42 3213#: diff.c:5378
d46c5519 3214msgid "break complete rewrite changes into pairs of delete and create"
5b533632 3215msgstr "将完全重写的变更打破为成对的删除和创建"
d46c5519 3216
ddc12c42 3217#: diff.c:5382
d46c5519
JX
3218msgid "detect renames"
3219msgstr "检测重命名"
3220
ddc12c42 3221#: diff.c:5386
d46c5519
JX
3222msgid "omit the preimage for deletes"
3223msgstr "省略删除操作的差异输出"
3224
ddc12c42 3225#: diff.c:5389
d46c5519
JX
3226msgid "detect copies"
3227msgstr "检测拷贝"
3228
ddc12c42 3229#: diff.c:5393
d46c5519
JX
3230msgid "use unmodified files as source to find copies"
3231msgstr "使用未修改的文件做为发现拷贝的源"
3232
ddc12c42 3233#: diff.c:5395
d46c5519
JX
3234msgid "disable rename detection"
3235msgstr "禁用重命名探测"
3236
ddc12c42 3237#: diff.c:5398
d46c5519
JX
3238msgid "use empty blobs as rename source"
3239msgstr "使用空的数据对象做为重命名的源"
3240
ddc12c42 3241#: diff.c:5400
d46c5519
JX
3242msgid "continue listing the history of a file beyond renames"
3243msgstr "继续列出文件重命名以外的历史记录"
3244
ddc12c42 3245#: diff.c:5403
d46c5519
JX
3246msgid ""
3247"prevent rename/copy detection if the number of rename/copy targets exceeds "
3248"given limit"
3249msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测"
3250
ddc12c42 3251#: diff.c:5405
d46c5519
JX
3252msgid "Diff algorithm options"
3253msgstr "差异算法选项"
3254
ddc12c42 3255#: diff.c:5407
d46c5519
JX
3256msgid "produce the smallest possible diff"
3257msgstr "生成尽可能小的差异"
3258
ddc12c42 3259#: diff.c:5410
d46c5519
JX
3260msgid "ignore whitespace when comparing lines"
3261msgstr "行比较时忽略空白字符"
3262
ddc12c42 3263#: diff.c:5413
d46c5519
JX
3264msgid "ignore changes in amount of whitespace"
3265msgstr "忽略空白字符的变更"
3266
ddc12c42 3267#: diff.c:5416
d46c5519
JX
3268msgid "ignore changes in whitespace at EOL"
3269msgstr "忽略行尾的空白字符变更"
3270
ddc12c42 3271#: diff.c:5419
d46c5519
JX
3272msgid "ignore carrier-return at the end of line"
3273msgstr "忽略行尾的回车符(CR)"
3274
ddc12c42 3275#: diff.c:5422
d46c5519
JX
3276msgid "ignore changes whose lines are all blank"
3277msgstr "忽略整行都是空白的变更"
3278
ddc12c42 3279#: diff.c:5425
d46c5519
JX
3280msgid "heuristic to shift diff hunk boundaries for easy reading"
3281msgstr "启发式转换差异边界以便阅读"
3282
ddc12c42 3283#: diff.c:5428
d46c5519
JX
3284msgid "generate diff using the \"patience diff\" algorithm"
3285msgstr "使用 \"patience diff\" 算法生成差异"
3286
ddc12c42 3287#: diff.c:5432
d46c5519
JX
3288msgid "generate diff using the \"histogram diff\" algorithm"
3289msgstr "使用 \"histogram diff\" 算法生成差异"
3290
ddc12c42 3291#: diff.c:5434
d46c5519
JX
3292msgid "<algorithm>"
3293msgstr "<算法>"
3294
ddc12c42 3295#: diff.c:5435
d46c5519
JX
3296msgid "choose a diff algorithm"
3297msgstr "选择一个差异算法"
3298
ddc12c42 3299#: diff.c:5437
d46c5519
JX
3300msgid "<text>"
3301msgstr "<文本>"
3302
ddc12c42 3303#: diff.c:5438
d46c5519 3304msgid "generate diff using the \"anchored diff\" algorithm"
5b533632 3305msgstr "使用 \"anchored diff\" 算法生成差异"
d46c5519 3306
ddc12c42 3307#: diff.c:5440 diff.c:5449 diff.c:5452
d46c5519
JX
3308msgid "<mode>"
3309msgstr "<模式>"
3310
ddc12c42 3311#: diff.c:5441
d46c5519
JX
3312msgid "show word diff, using <mode> to delimit changed words"
3313msgstr "显示单词差异,使用 <模式> 分隔变更的单词"
3314
ddc12c42 3315#: diff.c:5443 diff.c:5446 diff.c:5491
d46c5519
JX
3316msgid "<regex>"
3317msgstr "<正则>"
3318
ddc12c42 3319#: diff.c:5444
d46c5519
JX
3320msgid "use <regex> to decide what a word is"
3321msgstr "使用 <正则表达式> 确定何为一个词"
3322
ddc12c42 3323#: diff.c:5447
d46c5519
JX
3324msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3325msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3326
ddc12c42 3327#: diff.c:5450
d46c5519
JX
3328msgid "moved lines of code are colored differently"
3329msgstr "移动的代码行用不同方式着色"
3330
ddc12c42 3331#: diff.c:5453
d46c5519
JX
3332msgid "how white spaces are ignored in --color-moved"
3333msgstr "在 --color-moved 下如何忽略空白字符"
3334
ddc12c42 3335#: diff.c:5456
d46c5519
JX
3336msgid "Other diff options"
3337msgstr "其它差异选项"
3338
ddc12c42 3339#: diff.c:5458
d46c5519
JX
3340msgid "when run from subdir, exclude changes outside and show relative paths"
3341msgstr "当从子目录运行,排除目录之外的变更并显示相对路径"
3342
ddc12c42 3343#: diff.c:5462
d46c5519
JX
3344msgid "treat all files as text"
3345msgstr "把所有文件当做文本处理"
3346
ddc12c42 3347#: diff.c:5464
d46c5519
JX
3348msgid "swap two inputs, reverse the diff"
3349msgstr "交换两个输入,反转差异"
3350
ddc12c42 3351#: diff.c:5466
d46c5519
JX
3352msgid "exit with 1 if there were differences, 0 otherwise"
3353msgstr "有差异时退出码为 1,否则为 0"
3354
ddc12c42 3355#: diff.c:5468
d46c5519
JX
3356msgid "disable all output of the program"
3357msgstr "禁用本程序的所有输出"
3358
ddc12c42 3359#: diff.c:5470
d46c5519
JX
3360msgid "allow an external diff helper to be executed"
3361msgstr "允许执行一个外置的差异助手"
3362
ddc12c42 3363#: diff.c:5472
d46c5519
JX
3364msgid "run external text conversion filters when comparing binary files"
3365msgstr "当比较二进制文件时,运行外部的文本转换过滤器"
3366
ddc12c42 3367#: diff.c:5474
d46c5519
JX
3368msgid "<when>"
3369msgstr "<何时>"
3370
ddc12c42 3371#: diff.c:5475
d46c5519
JX
3372msgid "ignore changes to submodules in the diff generation"
3373msgstr "在生成差异时,忽略子模组的更改"
3374
ddc12c42 3375#: diff.c:5478
d46c5519
JX
3376msgid "<format>"
3377msgstr "<格式>"
3378
ddc12c42 3379#: diff.c:5479
d46c5519
JX
3380msgid "specify how differences in submodules are shown"
3381msgstr "指定子模组的差异如何显示"
3382
ddc12c42 3383#: diff.c:5483
d46c5519
JX
3384msgid "hide 'git add -N' entries from the index"
3385msgstr "隐藏索引中 'git add -N' 条目"
3386
ddc12c42 3387#: diff.c:5486
d46c5519
JX
3388msgid "treat 'git add -N' entries as real in the index"
3389msgstr "将索引中 'git add -N' 条目当做真实的"
3390
ddc12c42 3391#: diff.c:5488
d46c5519
JX
3392msgid "<string>"
3393msgstr "<字符串>"
3394
ddc12c42 3395#: diff.c:5489
d46c5519
JX
3396msgid ""
3397"look for differences that change the number of occurrences of the specified "
3398"string"
3399msgstr "查找改变了指定字符串出现次数的差异"
3400
ddc12c42 3401#: diff.c:5492
d46c5519
JX
3402msgid ""
3403"look for differences that change the number of occurrences of the specified "
3404"regex"
3405msgstr "查找改变指定正则匹配出现次数的差异"
3406
ddc12c42 3407#: diff.c:5495
d46c5519
JX
3408msgid "show all changes in the changeset with -S or -G"
3409msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3410
ddc12c42 3411#: diff.c:5498
d46c5519
JX
3412msgid "treat <string> in -S as extended POSIX regular expression"
3413msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3414
ddc12c42 3415#: diff.c:5501
d46c5519
JX
3416msgid "control the order in which files appear in the output"
3417msgstr "控制输出中的文件显示顺序"
3418
ddc12c42 3419#: diff.c:5502
d46c5519 3420msgid "<object-id>"
5b533632 3421msgstr "<对象 ID>"
d46c5519 3422
ddc12c42 3423#: diff.c:5503
d46c5519
JX
3424msgid ""
3425"look for differences that change the number of occurrences of the specified "
3426"object"
3427msgstr "查找改变指定对象出现次数的差异"
3428
ddc12c42 3429#: diff.c:5505
d46c5519
JX
3430msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3431msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3432
ddc12c42 3433#: diff.c:5506
d46c5519
JX
3434msgid "select files by diff type"
3435msgstr "通过差异类型选择文件"
3436
ddc12c42 3437#: diff.c:5508
d46c5519
JX
3438msgid "<file>"
3439msgstr "<文件>"
3440
ddc12c42 3441#: diff.c:5509
d46c5519
JX
3442msgid "Output to a specific file"
3443msgstr "输出到一个指定的文件"
3444
ddc12c42 3445#: diff.c:6164
a0b6b246
JX
3446msgid "inexact rename detection was skipped due to too many files."
3447msgstr "因为文件太多,略过不严格的重命名检查。"
3448
ddc12c42 3449#: diff.c:6167
a0b6b246
JX
3450msgid "only found copies from modified paths due to too many files."
3451msgstr "因为文件太多,只在修改的路径中查找拷贝。"
3452
ddc12c42 3453#: diff.c:6170
7aea43ff 3454#, c-format
a0b6b246
JX
3455msgid ""
3456"you may want to set your %s variable to at least %d and retry the command."
29004bbb 3457msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
7aea43ff 3458
ddc12c42 3459#: dir.c:554
c1ac5258
JX
3460#, c-format
3461msgid "pathspec '%s' did not match any file(s) known to git"
3462msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
3463
ddc12c42
JX
3464#: dir.c:664
3465#, c-format
3466msgid "unrecognized pattern: '%s'"
3467msgstr "未识别的模式:'%s'"
3468
3469#: dir.c:682 dir.c:696
3470#, c-format
3471msgid "unrecognized negative pattern: '%s'"
3472msgstr "未识别的反向模式:'%s'"
3473
3474#: dir.c:714
3475#, c-format
3476msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3477msgstr "您的 sparse-checkout 文件可能有问题:重复的模式 '%s'"
3478
3479#: dir.c:724
3480msgid "disabling cone pattern matching"
3481msgstr "禁止 cone 模式匹配"
3482
3483#: dir.c:1101
c1ac5258
JX
3484#, c-format
3485msgid "cannot use %s as an exclude file"
3486msgstr "不能将 %s 用作排除文件"
3487
ddc12c42 3488#: dir.c:2078
31e5e17b
JX
3489#, c-format
3490msgid "could not open directory '%s'"
3491msgstr "不能打开目录 '%s'"
3492
ddc12c42 3493#: dir.c:2415
a0b6b246
JX
3494msgid "failed to get kernel name and information"
3495msgstr "无法获得内核名称和信息"
7aea43ff 3496
ddc12c42 3497#: dir.c:2539
c1ac5258
JX
3498msgid "untracked cache is disabled on this system or location"
3499msgstr "缓存未跟踪文件在本系统或位置中被禁用"
3500
ddc12c42 3501#: dir.c:3343
c1ac5258
JX
3502#, c-format
3503msgid "index file corrupt in repo %s"
3504msgstr "仓库 %s 中的索引文件损坏"
7aea43ff 3505
ddc12c42 3506#: dir.c:3388 dir.c:3393
87cb7997
JX
3507#, c-format
3508msgid "could not create directories for %s"
3509msgstr "不能为 %s 创建目录"
3510
ddc12c42 3511#: dir.c:3422
1a79b2f1
JX
3512#, c-format
3513msgid "could not migrate git directory from '%s' to '%s'"
3514msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
3515
4c27fcb5 3516#: editor.c:73
5809aa05
JX
3517#, c-format
3518msgid "hint: Waiting for your editor to close the file...%c"
3519msgstr "提示:等待您的编辑器关闭文件...%c"
3520
c1ac5258 3521#: entry.c:178
6937cb4e
JX
3522msgid "Filtering content"
3523msgstr "过滤内容"
3524
d46c5519 3525#: entry.c:476
87cb7997
JX
3526#, c-format
3527msgid "could not stat file '%s'"
65e2041e 3528msgstr "不能对文件 '%s' 调用 stat"
87cb7997 3529
ddc12c42 3530#: environment.c:149
c1ac5258
JX
3531#, c-format
3532msgid "bad git namespace path \"%s\""
e640d114 3533msgstr "错误的 git 名字空间路径 \"%s\""
c1ac5258 3534
ddc12c42 3535#: environment.c:331
c1ac5258
JX
3536#, c-format
3537msgid "could not set GIT_DIR to '%s'"
3538msgstr "不能设置 GIT_DIR 为 '%s'"
3539
d46c5519 3540#: exec-cmd.c:363
c1ac5258
JX
3541#, c-format
3542msgid "too many args to run %s"
3543msgstr "执行 %s 的参数太多"
3544
a5cd71ca 3545#: fetch-pack.c:150
a0b6b246
JX
3546msgid "git fetch-pack: expected shallow list"
3547msgstr "git fetch-pack:应为 shallow 列表"
3548
a5cd71ca 3549#: fetch-pack.c:153
06991777
JX
3550msgid "git fetch-pack: expected a flush packet after shallow list"
3551msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包"
3552
a5cd71ca 3553#: fetch-pack.c:164
31e5e17b
JX
3554msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
3555msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
a0b6b246 3556
a5cd71ca 3557#: fetch-pack.c:184
90314792 3558#, c-format
275588f9 3559msgid "git fetch-pack: expected ACK/NAK, got '%s'"
a0b6b246 3560msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
90314792 3561
a5cd71ca 3562#: fetch-pack.c:195
d46c5519
JX
3563msgid "unable to write to remote"
3564msgstr "无法写到远程"
3565
a5cd71ca 3566#: fetch-pack.c:257
a0b6b246
JX
3567msgid "--stateless-rpc requires multi_ack_detailed"
3568msgstr "--stateless-rpc 需要 multi_ack_detailed"
90314792 3569
ddc12c42 3570#: fetch-pack.c:356 fetch-pack.c:1340
90314792 3571#, c-format
a0b6b246
JX
3572msgid "invalid shallow line: %s"
3573msgstr "无效的 shallow 信息:%s"
90314792 3574
ddc12c42 3575#: fetch-pack.c:362 fetch-pack.c:1346
c04f5ac3 3576#, c-format
a0b6b246
JX
3577msgid "invalid unshallow line: %s"
3578msgstr "无效的 unshallow 信息:%s"
c04f5ac3 3579
ddc12c42 3580#: fetch-pack.c:364 fetch-pack.c:1348
a0b6b246
JX
3581#, c-format
3582msgid "object not found: %s"
3583msgstr "对象未找到:%s"
07432cef 3584
ddc12c42 3585#: fetch-pack.c:367 fetch-pack.c:1351
c04f5ac3 3586#, c-format
a0b6b246
JX
3587msgid "error in object: %s"
3588msgstr "对象中出错:%s"
07432cef 3589
ddc12c42 3590#: fetch-pack.c:369 fetch-pack.c:1353
c04f5ac3 3591#, c-format
a0b6b246
JX
3592msgid "no shallow found: %s"
3593msgstr "未发现 shallow:%s"
c04f5ac3 3594
ddc12c42 3595#: fetch-pack.c:372 fetch-pack.c:1357
a0b6b246
JX
3596#, c-format
3597msgid "expected shallow/unshallow, got %s"
3598msgstr "应为 shallow/unshallow,却得到 %s"
07432cef 3599
a5cd71ca 3600#: fetch-pack.c:414
a0b6b246
JX
3601#, c-format
3602msgid "got %s %d %s"
3603msgstr "得到 %s %d %s"
1b7f4a34 3604
a5cd71ca 3605#: fetch-pack.c:431
1b7f4a34 3606#, c-format
a0b6b246
JX
3607msgid "invalid commit %s"
3608msgstr "无效提交 %s"
1b7f4a34 3609
a5cd71ca 3610#: fetch-pack.c:462
a0b6b246
JX
3611msgid "giving up"
3612msgstr "放弃"
814ff314 3613
ddc12c42 3614#: fetch-pack.c:475 progress.c:323
a0b6b246
JX
3615msgid "done"
3616msgstr "完成"
2e8451e8 3617
a5cd71ca 3618#: fetch-pack.c:487
2e8451e8 3619#, c-format
a0b6b246
JX
3620msgid "got %s (%d) %s"
3621msgstr "得到 %s (%d) %s"
2e8451e8 3622
a5cd71ca 3623#: fetch-pack.c:533
a0b6b246
JX
3624#, c-format
3625msgid "Marking %s as complete"
3626msgstr "标记 %s 为完成"
220c313c 3627
ddc12c42 3628#: fetch-pack.c:754
a0b6b246
JX
3629#, c-format
3630msgid "already have %s (%s)"
29004bbb 3631msgstr "已经有 %s(%s)"
220c313c 3632
ddc12c42 3633#: fetch-pack.c:818
a0b6b246
JX
3634msgid "fetch-pack: unable to fork off sideband demultiplexer"
3635msgstr "fetch-pack:无法派生 sideband 多路输出"
1b7f4a34 3636
ddc12c42 3637#: fetch-pack.c:826
a0b6b246
JX
3638msgid "protocol error: bad pack header"
3639msgstr "协议错误:坏的包头"
814ff314 3640
ddc12c42 3641#: fetch-pack.c:900
a0b6b246
JX
3642#, c-format
3643msgid "fetch-pack: unable to fork off %s"
3644msgstr "fetch-pack:无法派生进程 %s"
5c57d762 3645
ddc12c42 3646#: fetch-pack.c:916
a0b6b246
JX
3647#, c-format
3648msgid "%s failed"
3649msgstr "%s 失败"
14c8bced 3650
ddc12c42 3651#: fetch-pack.c:918
a0b6b246
JX
3652msgid "error in sideband demultiplexer"
3653msgstr "sideband 多路输出出错"
c04f5ac3 3654
ddc12c42 3655#: fetch-pack.c:965
81809b99 3656#, c-format
a0b6b246
JX
3657msgid "Server version is %.*s"
3658msgstr "服务器版本 %.*s"
8ada9598 3659
ddc12c42
JX
3660#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
3661#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
3662#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
3663#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
a6cd2cc4
JX
3664#, c-format
3665msgid "Server supports %s"
3666msgstr "服务器支持 %s"
3667
ddc12c42 3668#: fetch-pack.c:972
a6cd2cc4
JX
3669msgid "Server does not support shallow clients"
3670msgstr "服务器不支持 shalllow 客户端"
3671
ddc12c42 3672#: fetch-pack.c:1032
a0b6b246
JX
3673msgid "Server does not support --shallow-since"
3674msgstr "服务器不支持 --shallow-since"
8ada9598 3675
ddc12c42 3676#: fetch-pack.c:1037
a0b6b246
JX
3677msgid "Server does not support --shallow-exclude"
3678msgstr "服务器不支持 --shallow-exclude"
c04f5ac3 3679
ddc12c42 3680#: fetch-pack.c:1041
a0b6b246
JX
3681msgid "Server does not support --deepen"
3682msgstr "服务器不支持 --deepen"
c04f5ac3 3683
ddc12c42 3684#: fetch-pack.c:1058
a0b6b246
JX
3685msgid "no common commits"
3686msgstr "没有共同的提交"
c04f5ac3 3687
ddc12c42 3688#: fetch-pack.c:1070 fetch-pack.c:1536
a0b6b246
JX
3689msgid "git fetch-pack: fetch failed."
3690msgstr "git fetch-pack:获取失败。"
c04f5ac3 3691
ddc12c42 3692#: fetch-pack.c:1209
fd8cb379
JX
3693msgid "Server does not support shallow requests"
3694msgstr "服务器不支持 shalllow 请求"
3695
ddc12c42 3696#: fetch-pack.c:1216
a6cd2cc4
JX
3697msgid "Server supports filter"
3698msgstr "服务器支持 filter"
3699
ddc12c42 3700#: fetch-pack.c:1239
d46c5519
JX
3701msgid "unable to write request to remote"
3702msgstr "无法将请求写到远程"
3703
ddc12c42 3704#: fetch-pack.c:1257
c1ac5258
JX
3705#, c-format
3706msgid "error reading section header '%s'"
3707msgstr "读取节标题 '%s' 出错"
3708
ddc12c42 3709#: fetch-pack.c:1263
c1ac5258
JX
3710#, c-format
3711msgid "expected '%s', received '%s'"
3712msgstr "预期 '%s',得到 '%s'"
3713
ddc12c42 3714#: fetch-pack.c:1303
c1ac5258
JX
3715#, c-format
3716msgid "unexpected acknowledgment line: '%s'"
3717msgstr "意外的确认行:'%s'"
3718
ddc12c42 3719#: fetch-pack.c:1308
c1ac5258
JX
3720#, c-format
3721msgid "error processing acks: %d"
3722msgstr "处理 ack 出错:%d"
3723
ddc12c42 3724#: fetch-pack.c:1318
4c27fcb5
JX
3725msgid "expected packfile to be sent after 'ready'"
3726msgstr "预期在 'ready' 之后发送 packfile"
3727
ddc12c42 3728#: fetch-pack.c:1320
4c27fcb5
JX
3729msgid "expected no other sections to be sent after no 'ready'"
3730msgstr "在没有 'ready' 不应该发送其它小节"
3731
ddc12c42 3732#: fetch-pack.c:1362
c1ac5258
JX
3733#, c-format
3734msgid "error processing shallow info: %d"
3735msgstr "处理浅克隆信息出错:%d"
3736
ddc12c42 3737#: fetch-pack.c:1409
c1ac5258
JX
3738#, c-format
3739msgid "expected wanted-ref, got '%s'"
3740msgstr "预期 wanted-ref,得到 '%s'"
3741
ddc12c42 3742#: fetch-pack.c:1414
c1ac5258
JX
3743#, c-format
3744msgid "unexpected wanted-ref: '%s'"
3745msgstr "意外的 wanted-ref:'%s'"
3746
ddc12c42 3747#: fetch-pack.c:1419
c1ac5258
JX
3748#, c-format
3749msgid "error processing wanted refs: %d"
3750msgstr "处理要获取的引用出错:%d"
3751
ddc12c42 3752#: fetch-pack.c:1762
a0b6b246
JX
3753msgid "no matching remote head"
3754msgstr "没有匹配的远程分支"
c04f5ac3 3755
ddc12c42 3756#: fetch-pack.c:1785 builtin/clone.c:688
c1ac5258 3757msgid "remote did not send all necessary objects"
e640d114 3758msgstr "远程没有发送所有必需的对象"
c1ac5258 3759
ddc12c42 3760#: fetch-pack.c:1812
87cb7997
JX
3761#, c-format
3762msgid "no such remote ref %s"
3763msgstr "没有这样的远程引用 %s"
3764
ddc12c42 3765#: fetch-pack.c:1815
87cb7997
JX
3766#, c-format
3767msgid "Server does not allow request for unadvertised object %s"
3768msgstr "服务器不允许请求未公开的对象 %s"
3769
ddc12c42 3770#: gpg-interface.c:223
a0b6b246
JX
3771msgid "could not create temporary file"
3772msgstr "不能创建临时文件"
c04f5ac3 3773
ddc12c42 3774#: gpg-interface.c:226
c04f5ac3 3775#, c-format
a0b6b246
JX
3776msgid "failed writing detached signature to '%s'"
3777msgstr "无法将分离式签名写入 '%s'"
c04f5ac3 3778
ddc12c42
JX
3779#: gpg-interface.c:390
3780msgid "gpg failed to sign the data"
3781msgstr "gpg 无法为数据签名"
3782
3783#: graph.c:98
1a79b2f1
JX
3784#, c-format
3785msgid "ignore invalid color '%.*s' in log.graphColors"
3786msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
3787
a5cd71ca
JX
3788#: grep.c:668
3789msgid ""
3790"given pattern contains NULL byte (via -f <file>). This is only supported "
3791"with -P under PCRE v2"
3792msgstr ""
ddc12c42
JX
3793"给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此"
3794"功能"
a5cd71ca
JX
3795
3796#: grep.c:2124
c04f5ac3 3797#, c-format
a0b6b246
JX
3798msgid "'%s': unable to read %s"
3799msgstr "'%s':无法读取 %s"
c04f5ac3 3800
ddc12c42 3801#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82
06991777 3802#: builtin/rm.c:135
c04f5ac3 3803#, c-format
a0b6b246 3804msgid "failed to stat '%s'"
65e2041e 3805msgstr "对 '%s' 调用 stat 失败"
c04f5ac3 3806
a5cd71ca 3807#: grep.c:2152
a0b6b246
JX
3808#, c-format
3809msgid "'%s': short read"
3810msgstr "'%s':读取不完整"
5c57d762 3811
fd8cb379
JX
3812#: help.c:23
3813msgid "start a working area (see also: git help tutorial)"
3814msgstr "开始一个工作区(参见:git help tutorial)"
3815
3816#: help.c:24
3817msgid "work on the current change (see also: git help everyday)"
3818msgstr "在当前变更上工作(参见:git help everyday)"
3819
3820#: help.c:25
3821msgid "examine the history and state (see also: git help revisions)"
3822msgstr "检查历史和状态(参见:git help revisions)"
3823
3824#: help.c:26
3825msgid "grow, mark and tweak your common history"
3826msgstr "扩展、标记和调校您的历史记录"
3827
3828#: help.c:27
3829msgid "collaborate (see also: git help workflows)"
3830msgstr "协同(参见:git help workflows)"
3831
3832#: help.c:31
3833msgid "Main Porcelain Commands"
3834msgstr "主要的上层命令"
3835
3836#: help.c:32
3837msgid "Ancillary Commands / Manipulators"
3838msgstr "辅助命令/操作者"
3839
3840#: help.c:33
3841msgid "Ancillary Commands / Interrogators"
3842msgstr "辅助命令/询问者"
3843
3844#: help.c:34
3845msgid "Interacting with Others"
3846msgstr "与其它系统交互"
3847
3848#: help.c:35
3849msgid "Low-level Commands / Manipulators"
3850msgstr "低级命令/操作者"
3851
3852#: help.c:36
3853msgid "Low-level Commands / Interrogators"
3854msgstr "低级命令/询问者"
3855
3856#: help.c:37
ddc12c42 3857msgid "Low-level Commands / Syncing Repositories"
fd8cb379
JX
3858msgstr "低级命令/同步仓库"
3859
3860#: help.c:38
3861msgid "Low-level Commands / Internal Helpers"
3862msgstr "低级命令/内部助手"
3863
06991777 3864#: help.c:298
a0b6b246
JX
3865#, c-format
3866msgid "available git commands in '%s'"
3867msgstr "在 '%s' 下可用的 git 命令"
c04f5ac3 3868
06991777 3869#: help.c:305
a0b6b246
JX
3870msgid "git commands available from elsewhere on your $PATH"
3871msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
5c57d762 3872
06991777 3873#: help.c:314
a0b6b246
JX
3874msgid "These are common Git commands used in various situations:"
3875msgstr "这些是各种场合常见的 Git 命令:"
5c57d762 3876
a6cd2cc4 3877#: help.c:363 git.c:98
fd8cb379
JX
3878#, c-format
3879msgid "unsupported command listing type '%s'"
3880msgstr "不支持的命令列表类型 '%s'"
3881
d46c5519 3882#: help.c:403
fd8cb379
JX
3883msgid "The common Git guides are:"
3884msgstr "最常用的 Git 向导有:"
3885
d46c5519 3886#: help.c:512
4c27fcb5
JX
3887msgid "See 'git help <command>' to read about a specific subcommand"
3888msgstr "执行 'git help <command>' 来查看特定子命令"
3889
d46c5519 3890#: help.c:517
4c27fcb5
JX
3891msgid "External commands"
3892msgstr "外部命令"
3893
d46c5519 3894#: help.c:532
4c27fcb5
JX
3895msgid "Command aliases"
3896msgstr "命令别名"
3897
d46c5519 3898#: help.c:596
c04f5ac3 3899#, c-format
a0b6b246
JX
3900msgid ""
3901"'%s' appears to be a git command, but we were not\n"
3902"able to execute it. Maybe git-%s is broken?"
3903msgstr ""
3904"'%s' 像是一个 git 命令,但却无法运行。\n"
3905"可能是 git-%s 受损?"
c04f5ac3 3906
d46c5519 3907#: help.c:655
a0b6b246
JX
3908msgid "Uh oh. Your system reports no Git commands at all."
3909msgstr "唉呀,您的系统中未发现 Git 命令。"
c04f5ac3 3910
d46c5519 3911#: help.c:677
c04f5ac3 3912#, c-format
a4f16749 3913msgid "WARNING: You called a Git command named '%s', which does not exist."
554e8501 3914msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
a4f16749 3915
d46c5519 3916#: help.c:682
a4f16749
JX
3917#, c-format
3918msgid "Continuing under the assumption that you meant '%s'."
554e8501 3919msgstr "假定你想要的是 '%s' 并继续。"
c04f5ac3 3920
d46c5519 3921#: help.c:687
c04f5ac3 3922#, c-format
a4f16749 3923msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
554e8501 3924msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
c04f5ac3 3925
d46c5519 3926#: help.c:695
c04f5ac3 3927#, c-format
a0b6b246
JX
3928msgid "git: '%s' is not a git command. See 'git --help'."
3929msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
c04f5ac3 3930
d46c5519 3931#: help.c:699
a4f16749
JX
3932msgid ""
3933"\n"
3934"The most similar command is"
3935msgid_plural ""
3936"\n"
3937"The most similar commands are"
6937cb4e
JX
3938msgstr[0] ""
3939"\n"
3940"最相似的命令是"
3941msgstr[1] ""
3942"\n"
3943"最相似的命令是"
a4f16749 3944
d46c5519 3945#: help.c:714
a4f16749
JX
3946msgid "git version [<options>]"
3947msgstr "git version [<选项>]"
3948
a5cd71ca 3949#: help.c:783
a4f16749
JX
3950#, c-format
3951msgid "%s: %s - %s"
3952msgstr "%s:%s - %s"
3953
a5cd71ca 3954#: help.c:787
a0b6b246
JX
3955msgid ""
3956"\n"
3957"Did you mean this?"
3958msgid_plural ""
3959"\n"
3960"Did you mean one of these?"
3961msgstr[0] ""
3962"\n"
3963"您指的是这个么?"
3964msgstr[1] ""
3965"\n"
3966"您指的是这其中的某一个么?"
c04f5ac3 3967
d46c5519 3968#: ident.c:349
a0b6b246
JX
3969msgid ""
3970"\n"
3971"*** Please tell me who you are.\n"
3972"\n"
3973"Run\n"
3974"\n"
3975" git config --global user.email \"you@example.com\"\n"
3976" git config --global user.name \"Your Name\"\n"
3977"\n"
3978"to set your account's default identity.\n"
3979"Omit --global to set the identity only in this repository.\n"
3980"\n"
3981msgstr ""
3982"\n"
3983"*** 请告诉我你是谁。\n"
3984"\n"
3985"运行\n"
3986"\n"
3987" git config --global user.email \"you@example.com\"\n"
3988" git config --global user.name \"Your Name\"\n"
3989"\n"
3990"来设置您账号的缺省身份标识。\n"
3991"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
c04f5ac3 3992
d46c5519 3993#: ident.c:379
87cb7997 3994msgid "no email was given and auto-detection is disabled"
65e2041e 3995msgstr "未提供邮件地址且自动探测被禁用"
87cb7997 3996
d46c5519 3997#: ident.c:384
87cb7997
JX
3998#, c-format
3999msgid "unable to auto-detect email address (got '%s')"
4000msgstr "无法自动探测邮件地址(得到 '%s')"
4001
d46c5519 4002#: ident.c:401
87cb7997
JX
4003msgid "no name was given and auto-detection is disabled"
4004msgstr "未提供姓名且自动探测被禁用"
4005
d46c5519 4006#: ident.c:407
87cb7997
JX
4007#, c-format
4008msgid "unable to auto-detect name (got '%s')"
4009msgstr "无法自动探测姓名(得到 '%s')"
4010
d46c5519 4011#: ident.c:415
87cb7997
JX
4012#, c-format
4013msgid "empty ident name (for <%s>) not allowed"
4014msgstr "不允许空的姓名(对于 <%s>)"
4015
d46c5519 4016#: ident.c:421
87cb7997
JX
4017#, c-format
4018msgid "name consists only of disallowed characters: %s"
4019msgstr "姓名中仅包含禁用字符:%s"
4020
ddc12c42 4021#: ident.c:436 builtin/commit.c:631
87cb7997
JX
4022#, c-format
4023msgid "invalid date format: %s"
4024msgstr "无效的日期格式:%s"
4025
a5cd71ca 4026#: list-objects.c:127
d46c5519
JX
4027#, c-format
4028msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4029msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性,但不是一个树对象"
4030
a5cd71ca 4031#: list-objects.c:140
d46c5519
JX
4032#, c-format
4033msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4034msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性,但不是一个数据对象"
4035
a5cd71ca 4036#: list-objects.c:375
d46c5519
JX
4037#, c-format
4038msgid "unable to load root tree for commit %s"
4039msgstr "无法为提交 %s 加载根树"
4040
a5cd71ca
JX
4041#: list-objects-filter.c:492
4042#, c-format
4043msgid "unable to access sparse blob in '%s'"
4044msgstr "不能访问 '%s' 中的稀疏数据对象"
4045
4046#: list-objects-filter.c:495
4047#, c-format
4048msgid "unable to parse sparse filter data in %s"
4049msgstr "无法解析 %s 中的稀疏过滤器数据"
5809aa05 4050
4c27fcb5 4051#: list-objects-filter-options.c:58
06991777
JX
4052msgid "expected 'tree:<depth>'"
4053msgstr "期望 'tree:<深度>'"
4c27fcb5 4054
a5cd71ca 4055#: list-objects-filter-options.c:73
d46c5519
JX
4056msgid "sparse:path filters support has been dropped"
4057msgstr "sparse:path 过滤器支持已被删除"
4058
a5cd71ca 4059#: list-objects-filter-options.c:86
a6cd2cc4
JX
4060#, c-format
4061msgid "invalid filter-spec '%s'"
4062msgstr "无效的过滤器表达式 '%s'"
4063
a5cd71ca
JX
4064#: list-objects-filter-options.c:102
4065#, c-format
4066msgid "must escape char in sub-filter-spec: '%c'"
4067msgstr "必须对 sub-filter-spec 中的字符进行转义:'%c'"
4068
4069#: list-objects-filter-options.c:144
4070msgid "expected something after combine:"
4071msgstr "期望在组合后有一些东西:"
4072
4073#: list-objects-filter-options.c:226
4074msgid "multiple filter-specs cannot be combined"
4075msgstr "不能混用多种过滤规格"
5809aa05 4076
6937cb4e 4077#: lockfile.c:151
c04f5ac3 4078#, c-format
a0b6b246
JX
4079msgid ""
4080"Unable to create '%s.lock': %s.\n"
4081"\n"
4082"Another git process seems to be running in this repository, e.g.\n"
4083"an editor opened by 'git commit'. Please make sure all processes\n"
4084"are terminated then try again. If it still fails, a git process\n"
4085"may have crashed in this repository earlier:\n"
4086"remove the file manually to continue."
4087msgstr ""
4088"无法创建 '%s.lock':%s。\n"
4089"\n"
4090"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
4091"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
4092"可能之前有一个 git 进程在这个仓库中异常退出:\n"
4093"手动删除这个文件再继续。"
c04f5ac3 4094
6937cb4e 4095#: lockfile.c:159
a0b6b246
JX
4096#, c-format
4097msgid "Unable to create '%s.lock': %s"
4098msgstr "不能创建 '%s.lock':%s"
c04f5ac3 4099
4c27fcb5 4100#: merge.c:41
a0b6b246 4101msgid "failed to read the cache"
c1ac5258 4102msgstr "读取缓存失败"
c04f5ac3 4103
a5cd71ca 4104#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
ddc12c42 4105#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809
d46c5519 4106#: builtin/stash.c:264
a0b6b246
JX
4107msgid "unable to write new index file"
4108msgstr "无法写新的索引文件"
c04f5ac3 4109
a5cd71ca 4110#: merge-recursive.c:367
a0b6b246
JX
4111msgid "(bad commit)\n"
4112msgstr "(坏提交)\n"
c04f5ac3 4113
a5cd71ca 4114#: merge-recursive.c:390
a0b6b246 4115#, c-format
fd8cb379 4116msgid "add_cacheinfo failed for path '%s'; merge aborting."
0fcd668f 4117msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。"
c04f5ac3 4118
a5cd71ca 4119#: merge-recursive.c:399
fd8cb379
JX
4120#, c-format
4121msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
0fcd668f 4122msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。"
fd8cb379 4123
a5cd71ca 4124#: merge-recursive.c:885
c04f5ac3 4125#, c-format
a0b6b246 4126msgid "failed to create path '%s'%s"
c1ac5258 4127msgstr "创建路径 '%s'%s 失败"
c04f5ac3 4128
a5cd71ca 4129#: merge-recursive.c:896
c04f5ac3 4130#, c-format
a0b6b246
JX
4131msgid "Removing %s to make room for subdirectory\n"
4132msgstr "删除 %s 以便为子目录留出空间\n"
c04f5ac3 4133
a5cd71ca 4134#: merge-recursive.c:910 merge-recursive.c:929
a0b6b246
JX
4135msgid ": perhaps a D/F conflict?"
4136msgstr ":可能是一个目录/文件冲突?"
c04f5ac3 4137
a5cd71ca 4138#: merge-recursive.c:919
c04f5ac3 4139#, c-format
a0b6b246
JX
4140msgid "refusing to lose untracked file at '%s'"
4141msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
c04f5ac3 4142
a5cd71ca 4143#: merge-recursive.c:960 builtin/cat-file.c:41
c04f5ac3 4144#, c-format
a0b6b246
JX
4145msgid "cannot read object %s '%s'"
4146msgstr "不能读取对象 %s '%s'"
c04f5ac3 4147
a5cd71ca 4148#: merge-recursive.c:965
4dcdc3d8 4149#, c-format
a0b6b246
JX
4150msgid "blob expected for %s '%s'"
4151msgstr "%s '%s' 应为数据对象"
4dcdc3d8 4152
a5cd71ca 4153#: merge-recursive.c:990
4dcdc3d8 4154#, c-format
a0b6b246 4155msgid "failed to open '%s': %s"
c1ac5258 4156msgstr "打开 '%s' 失败:%s"
4dcdc3d8 4157
a5cd71ca 4158#: merge-recursive.c:1001
a0b6b246
JX
4159#, c-format
4160msgid "failed to symlink '%s': %s"
c1ac5258 4161msgstr "创建符号链接 '%s' 失败:%s"
c04f5ac3 4162
a5cd71ca 4163#: merge-recursive.c:1006
5c57d762 4164#, c-format
a0b6b246
JX
4165msgid "do not know what to do with %06o %s '%s'"
4166msgstr "不知道如何处理 %06o %s '%s'"
5c57d762 4167
a5cd71ca 4168#: merge-recursive.c:1199
fd8cb379
JX
4169#, c-format
4170msgid "Failed to merge submodule %s (not checked out)"
4171msgstr "无法合并子模组 %s (没有检出)"
4172
a5cd71ca 4173#: merge-recursive.c:1206
fd8cb379
JX
4174#, c-format
4175msgid "Failed to merge submodule %s (commits not present)"
4176msgstr "无法合并子模组 %s(提交不存在)"
4177
a5cd71ca 4178#: merge-recursive.c:1213
fd8cb379
JX
4179#, c-format
4180msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4181msgstr "无法合并子模组 %s (提交未跟随合并基线)"
4182
a5cd71ca 4183#: merge-recursive.c:1221 merge-recursive.c:1233
fd8cb379
JX
4184#, c-format
4185msgid "Fast-forwarding submodule %s to the following commit:"
4186msgstr "子模组 %s 快进到如下提交:"
4187
a5cd71ca 4188#: merge-recursive.c:1224 merge-recursive.c:1236
fd8cb379
JX
4189#, c-format
4190msgid "Fast-forwarding submodule %s"
4191msgstr "快进子模组 %s"
4192
a5cd71ca 4193#: merge-recursive.c:1259
fd8cb379
JX
4194#, c-format
4195msgid "Failed to merge submodule %s (merge following commits not found)"
4196msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
4197
a5cd71ca 4198#: merge-recursive.c:1263
fd8cb379
JX
4199#, c-format
4200msgid "Failed to merge submodule %s (not fast-forward)"
4201msgstr "无法合并子模组 %s(非快进)"
4202
a5cd71ca 4203#: merge-recursive.c:1264
fd8cb379
JX
4204msgid "Found a possible merge resolution for the submodule:\n"
4205msgstr "找到子模组的一个可能的合并方案:\n"
4206
a5cd71ca 4207#: merge-recursive.c:1267
fd8cb379
JX
4208#, c-format
4209msgid ""
4210"If this is correct simply add it to the index for example\n"
4211"by using:\n"
4212"\n"
4213" git update-index --cacheinfo 160000 %s \"%s\"\n"
4214"\n"
4215"which will accept this suggestion.\n"
4216msgstr ""
4217"如果这个正确,将其添加到索引,例如使用命令:\n"
4218"\n"
4219" git update-index --cacheinfo 160000 %s \"%s\"\n"
4220"\n"
4221"以接受此建议。\n"
4222
a5cd71ca 4223#: merge-recursive.c:1276
fd8cb379
JX
4224#, c-format
4225msgid "Failed to merge submodule %s (multiple merges found)"
4226msgstr "无法合并子模组 %s (发现多个合并)"
4227
a5cd71ca 4228#: merge-recursive.c:1349
a0b6b246
JX
4229msgid "Failed to execute internal merge"
4230msgstr "无法执行内部合并"
4231
a5cd71ca 4232#: merge-recursive.c:1354
5c57d762 4233#, c-format
a0b6b246
JX
4234msgid "Unable to add %s to database"
4235msgstr "不能添加 %s 至对象库"
5c57d762 4236
a5cd71ca 4237#: merge-recursive.c:1386
fd8cb379
JX
4238#, c-format
4239msgid "Auto-merging %s"
4240msgstr "自动合并 %s"
4241
a5cd71ca 4242#: merge-recursive.c:1410
fd8cb379
JX
4243#, c-format
4244msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
4245msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
4246
a5cd71ca 4247#: merge-recursive.c:1482
5c57d762
JX
4248#, c-format
4249msgid ""
a0b6b246
JX
4250"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4251"in tree."
5c57d762 4252msgstr ""
87cb7997
JX
4253"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4254"本被保留。"
4255
a5cd71ca 4256#: merge-recursive.c:1487
87cb7997
JX
4257#, c-format
4258msgid ""
4259"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4260"left in tree."
4261msgstr ""
4262"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4263"%7$s 版本被保留。"
c04f5ac3 4264
a5cd71ca 4265#: merge-recursive.c:1494
7aea43ff 4266#, c-format
a0b6b246
JX
4267msgid ""
4268"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4269"in tree at %s."
4270msgstr ""
87cb7997
JX
4271"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4272"本保留在 %8$s 中。"
7aea43ff 4273
a5cd71ca 4274#: merge-recursive.c:1499
87cb7997
JX
4275#, c-format
4276msgid ""
4277"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4278"left in tree at %s."
4279msgstr ""
4280"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4281"%7$s 版本保留在 %9$s 中。"
4282
a5cd71ca 4283#: merge-recursive.c:1534
a0b6b246
JX
4284msgid "rename"
4285msgstr "重命名"
5b04ee3b 4286
a5cd71ca 4287#: merge-recursive.c:1534
a0b6b246
JX
4288msgid "renamed"
4289msgstr "重命名"
5b04ee3b 4290
ddc12c42 4291#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175
fd8cb379
JX
4292#, c-format
4293msgid "Refusing to lose dirty file at %s"
4294msgstr "拒绝丢失脏文件 '%s'"
4295
a5cd71ca 4296#: merge-recursive.c:1624
06991777
JX
4297#, c-format
4298msgid "Refusing to lose untracked file at %s, even though it's in the way."
4299msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。"
4300
a5cd71ca 4301#: merge-recursive.c:1682
06991777
JX
4302#, c-format
4303msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4304msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
4305
a5cd71ca 4306#: merge-recursive.c:1713
5c57d762 4307#, c-format
a0b6b246
JX
4308msgid "%s is a directory in %s adding as %s instead"
4309msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5c57d762 4310
a5cd71ca 4311#: merge-recursive.c:1718
fd8cb379
JX
4312#, c-format
4313msgid "Refusing to lose untracked file at %s; adding as %s instead"
4314msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
4315
a5cd71ca 4316#: merge-recursive.c:1737
5c57d762
JX
4317#, c-format
4318msgid ""
a0b6b246
JX
4319"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
4320"\"->\"%s\" in \"%s\"%s"
5c57d762 4321msgstr ""
a0b6b246
JX
4322"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
4323"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5c57d762 4324
a5cd71ca 4325#: merge-recursive.c:1742
a0b6b246
JX
4326msgid " (left unresolved)"
4327msgstr "(留下未解决)"
5c57d762 4328
a5cd71ca 4329#: merge-recursive.c:1851
5c57d762 4330#, c-format
a0b6b246 4331msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5c57d762 4332msgstr ""
a0b6b246
JX
4333"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
4334"%5$s"
3495628d 4335
ddc12c42 4336#: merge-recursive.c:2114
fd8cb379
JX
4337#, c-format
4338msgid ""
4339"CONFLICT (directory rename split): Unclear where to place %s because "
4340"directory %s was renamed to multiple other directories, with no destination "
4341"getting a majority of the files."
c1ac5258
JX
4342msgstr ""
4343"冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
4344"其它目录,没有目录包含大部分文件。"
fd8cb379 4345
ddc12c42 4346#: merge-recursive.c:2146
fd8cb379
JX
4347#, c-format
4348msgid ""
4349"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4350"implicit directory rename(s) putting the following path(s) there: %s."
4351msgstr ""
4352"冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
4353"在:%s。"
4354
ddc12c42 4355#: merge-recursive.c:2156
fd8cb379
JX
4356#, c-format
4357msgid ""
4358"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4359"implicit directory renames tried to put these paths there: %s"
4360msgstr ""
4361"冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
4362"径放置于此:%s"
4363
ddc12c42 4364#: merge-recursive.c:2248
fd8cb379
JX
4365#, c-format
4366msgid ""
4367"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
4368">%s in %s"
4369msgstr ""
4370"冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
4371"%4$s->%5$s"
4372
ddc12c42 4373#: merge-recursive.c:2493
fd8cb379
JX
4374#, c-format
4375msgid ""
4376"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4377"renamed."
4378msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
4379
ddc12c42 4380#: merge-recursive.c:3019
90314792 4381#, c-format
a0b6b246
JX
4382msgid "cannot read object %s"
4383msgstr "不能读取对象 %s"
90314792 4384
ddc12c42 4385#: merge-recursive.c:3022
90314792 4386#, c-format
a0b6b246
JX
4387msgid "object %s is not a blob"
4388msgstr "对象 %s 不是一个数据对象"
90314792 4389
ddc12c42 4390#: merge-recursive.c:3086
a0b6b246
JX
4391msgid "modify"
4392msgstr "修改"
90314792 4393
ddc12c42 4394#: merge-recursive.c:3086
a0b6b246
JX
4395msgid "modified"
4396msgstr "修改"
5b04ee3b 4397
ddc12c42 4398#: merge-recursive.c:3098
a0b6b246
JX
4399msgid "content"
4400msgstr "内容"
5b04ee3b 4401
ddc12c42 4402#: merge-recursive.c:3102
a0b6b246
JX
4403msgid "add/add"
4404msgstr "添加/添加"
3495628d 4405
ddc12c42 4406#: merge-recursive.c:3125
220c313c 4407#, c-format
a0b6b246
JX
4408msgid "Skipped %s (merged same as existing)"
4409msgstr "略过 %s(已经做过相同合并)"
220c313c 4410
ddc12c42 4411#: merge-recursive.c:3147 git-submodule.sh:993
a0b6b246
JX
4412msgid "submodule"
4413msgstr "子模组"
4414
ddc12c42 4415#: merge-recursive.c:3148
220c313c 4416#, c-format
a0b6b246
JX
4417msgid "CONFLICT (%s): Merge conflict in %s"
4418msgstr "冲突(%s):合并冲突于 %s"
220c313c 4419
ddc12c42 4420#: merge-recursive.c:3178
220c313c 4421#, c-format
06991777
JX
4422msgid "Adding as %s instead"
4423msgstr "而是以 %s 为名添加"
4424
ddc12c42 4425#: merge-recursive.c:3261
06991777 4426#, c-format
d46c5519
JX
4427msgid ""
4428"Path updated: %s added in %s inside a directory that was renamed in %s; "
4429"moving it to %s."
4430msgstr ""
5b533632 4431"路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。"
220c313c 4432
ddc12c42 4433#: merge-recursive.c:3264
d46c5519
JX
4434#, c-format
4435msgid ""
4436"CONFLICT (file location): %s added in %s inside a directory that was renamed "
4437"in %s, suggesting it should perhaps be moved to %s."
4438msgstr ""
4439"冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动"
4440"到 %s。"
4441
ddc12c42 4442#: merge-recursive.c:3268
d46c5519
JX
4443#, c-format
4444msgid ""
4445"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4446"%s; moving it to %s."
4447msgstr ""
5b533632
FZ
4448"路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移"
4449"动到 %5$s。"
d46c5519 4450
ddc12c42 4451#: merge-recursive.c:3271
d46c5519
JX
4452#, c-format
4453msgid ""
4454"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4455"was renamed in %s, suggesting it should perhaps be moved to %s."
4456msgstr ""
5b533632 4457"冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,"
d46c5519
JX
4458"建议将其移动到 %5$s。"
4459
ddc12c42 4460#: merge-recursive.c:3385
d46c5519
JX
4461#, c-format
4462msgid "Removing %s"
4463msgstr "删除 %s"
4464
ddc12c42 4465#: merge-recursive.c:3408
d46c5519
JX
4466msgid "file/directory"
4467msgstr "文件/目录"
220c313c 4468
ddc12c42 4469#: merge-recursive.c:3413
a0b6b246
JX
4470msgid "directory/file"
4471msgstr "目录/文件"
276ceeaa 4472
ddc12c42 4473#: merge-recursive.c:3420
276ceeaa 4474#, c-format
a0b6b246
JX
4475msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4476msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
276ceeaa 4477
ddc12c42 4478#: merge-recursive.c:3429
276ceeaa 4479#, c-format
a0b6b246
JX
4480msgid "Adding %s"
4481msgstr "添加 %s"
276ceeaa 4482
ddc12c42 4483#: merge-recursive.c:3438
06991777
JX
4484#, c-format
4485msgid "CONFLICT (add/add): Merge conflict in %s"
4486msgstr "冲突(add/add):合并冲突于 %s"
4487
ddc12c42 4488#: merge-recursive.c:3482
6937cb4e 4489msgid "Already up to date!"
a0b6b246 4490msgstr "已经是最新的!"
276ceeaa 4491
ddc12c42 4492#: merge-recursive.c:3491
276ceeaa 4493#, c-format
a0b6b246
JX
4494msgid "merging of trees %s and %s failed"
4495msgstr "无法合并树 %s 和 %s"
276ceeaa 4496
ddc12c42 4497#: merge-recursive.c:3595
a0b6b246
JX
4498msgid "Merging:"
4499msgstr "合并:"
5c57d762 4500
ddc12c42 4501#: merge-recursive.c:3608
5c57d762 4502#, c-format
a0b6b246
JX
4503msgid "found %u common ancestor:"
4504msgid_plural "found %u common ancestors:"
4505msgstr[0] "发现 %u 个共同祖先:"
4506msgstr[1] "发现 %u 个共同祖先:"
4507
ddc12c42 4508#: merge-recursive.c:3658
a0b6b246
JX
4509msgid "merge returned no commit"
4510msgstr "合并未返回提交"
4511
ddc12c42 4512#: merge-recursive.c:3717
a5cd71ca
JX
4513#, c-format
4514msgid ""
4515"Your local changes to the following files would be overwritten by merge:\n"
4516" %s"
4517msgstr ""
4518"您对下列文件的本地修改将被合并操作覆盖:\n"
4519" %s"
4520
ddc12c42 4521#: merge-recursive.c:3814
5c57d762 4522#, c-format
a0b6b246
JX
4523msgid "Could not parse object '%s'"
4524msgstr "不能解析对象 '%s'"
5c57d762 4525
ddc12c42 4526#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874
a0b6b246
JX
4527msgid "Unable to write index."
4528msgstr "不能写入索引。"
4529
a5cd71ca 4530#: midx.c:68
4c27fcb5
JX
4531#, c-format
4532msgid "multi-pack-index file %s is too small"
4533msgstr "多包索引文件 %s 太小"
4534
a5cd71ca 4535#: midx.c:84
4c27fcb5
JX
4536#, c-format
4537msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
4538msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
4539
a5cd71ca 4540#: midx.c:89
4c27fcb5
JX
4541#, c-format
4542msgid "multi-pack-index version %d not recognized"
4543msgstr "multi-pack-index 版本 %d 不能被识别"
4544
a5cd71ca 4545#: midx.c:94
4c27fcb5
JX
4546#, c-format
4547msgid "hash version %u does not match"
4548msgstr "散列版本 %u 不匹配"
4549
a5cd71ca 4550#: midx.c:108
4c27fcb5
JX
4551msgid "invalid chunk offset (too large)"
4552msgstr "无效的块偏移(太大)"
4553
a5cd71ca 4554#: midx.c:132
4c27fcb5
JX
4555msgid "terminating multi-pack-index chunk id appears earlier than expected"
4556msgstr "终止多包索引块 id 出现时间早于预期"
4557
a5cd71ca 4558#: midx.c:145
4c27fcb5
JX
4559msgid "multi-pack-index missing required pack-name chunk"
4560msgstr "多包索引缺少必需的包名块"
4561
a5cd71ca 4562#: midx.c:147
4c27fcb5 4563msgid "multi-pack-index missing required OID fanout chunk"
5b533632 4564msgstr "多包索引缺少必需的对象 ID 扇出块"
4c27fcb5 4565
a5cd71ca 4566#: midx.c:149
4c27fcb5 4567msgid "multi-pack-index missing required OID lookup chunk"
5b533632 4568msgstr "多包索引缺少必需的对象 ID 查询块"
4c27fcb5 4569
a5cd71ca 4570#: midx.c:151
4c27fcb5
JX
4571msgid "multi-pack-index missing required object offsets chunk"
4572msgstr "多包索引缺少必需的对象偏移块"
4573
a5cd71ca 4574#: midx.c:165
4c27fcb5
JX
4575#, c-format
4576msgid "multi-pack-index pack names out of order: '%s' before '%s'"
4577msgstr "多包索引包名无序:'%s' 在 '%s' 之前"
4578
a5cd71ca 4579#: midx.c:210
4c27fcb5
JX
4580#, c-format
4581msgid "bad pack-int-id: %u (%u total packs)"
4582msgstr "错的 pack-int-id:%u(共有 %u 个包)"
4583
a5cd71ca 4584#: midx.c:260
4c27fcb5
JX
4585msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
4586msgstr "多包索引存储一个64位偏移,但是 off_t 太小"
4587
a5cd71ca 4588#: midx.c:288
4c27fcb5
JX
4589msgid "error preparing packfile from multi-pack-index"
4590msgstr "从多包索引准备 packfile 出错"
4591
ddc12c42 4592#: midx.c:472
4c27fcb5
JX
4593#, c-format
4594msgid "failed to add packfile '%s'"
4595msgstr "添加包文件 '%s' 失败"
4596
ddc12c42 4597#: midx.c:478
4c27fcb5
JX
4598#, c-format
4599msgid "failed to open pack-index '%s'"
4600msgstr "打开包索引 '%s' 失败"
4601
ddc12c42 4602#: midx.c:538
4c27fcb5
JX
4603#, c-format
4604msgid "failed to locate object %d in packfile"
4605msgstr "在包文件中定位对象 %d 失败"
4606
ddc12c42
JX
4607#: midx.c:842
4608msgid "Adding packfiles to multi-pack-index"
4609msgstr "添加包文件到多包索引"
4610
4611#: midx.c:875
a6cd2cc4
JX
4612#, c-format
4613msgid "did not see pack-file %s to drop"
4614msgstr "没有看到要丢弃的包文件 %s"
4615
ddc12c42
JX
4616#: midx.c:973
4617msgid "Writing chunks to multi-pack-index"
4618msgstr "写入块到多包索引"
4619
4620#: midx.c:1052
4c27fcb5
JX
4621#, c-format
4622msgid "failed to clear multi-pack-index at %s"
4623msgstr "清理位于 %s 的多包索引失败"
4624
ddc12c42 4625#: midx.c:1108
d46c5519
JX
4626msgid "Looking for referenced packfiles"
4627msgstr "正在查找引用的包文件"
4628
ddc12c42 4629#: midx.c:1123
4c27fcb5
JX
4630#, c-format
4631msgid ""
4632"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5b533632 4633msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4c27fcb5 4634
ddc12c42
JX
4635#: midx.c:1128
4636msgid "Verifying OID order in multi-pack-index"
4637msgstr "校验多包索引中的 OID 顺序"
d46c5519 4638
ddc12c42 4639#: midx.c:1137
4c27fcb5
JX
4640#, c-format
4641msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
5b533632 4642msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]"
4c27fcb5 4643
ddc12c42 4644#: midx.c:1157
d46c5519
JX
4645msgid "Sorting objects by packfile"
4646msgstr "通过包文件为对象排序"
4647
ddc12c42 4648#: midx.c:1164
4c27fcb5
JX
4649msgid "Verifying object offsets"
4650msgstr "校验对象偏移"
4651
ddc12c42 4652#: midx.c:1180
4c27fcb5
JX
4653#, c-format
4654msgid "failed to load pack entry for oid[%d] = %s"
4655msgstr "为 oid[%d] = %s 加载包条目失败"
4656
ddc12c42 4657#: midx.c:1186
4c27fcb5
JX
4658#, c-format
4659msgid "failed to load pack-index for packfile %s"
4660msgstr "为包文件 %s 加载包索引失败"
4661
ddc12c42 4662#: midx.c:1195
4c27fcb5
JX
4663#, c-format
4664msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
4665msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>"
4666
ddc12c42
JX
4667#: midx.c:1220
4668msgid "Counting referenced objects"
4669msgstr "正在对引用对象计数"
4670
4671#: midx.c:1230
4672msgid "Finding and deleting unreferenced packfiles"
4673msgstr "正在查找和删除未引用的包文件"
4674
4675#: midx.c:1388
a6cd2cc4
JX
4676msgid "could not start pack-objects"
4677msgstr "不能开始 pack-objects"
4678
ddc12c42 4679#: midx.c:1407
a6cd2cc4
JX
4680msgid "could not finish pack-objects"
4681msgstr "不能结束 pack-objects"
4682
a5cd71ca 4683#: name-hash.c:537
4c27fcb5
JX
4684#, c-format
4685msgid "unable to create lazy_dir thread: %s"
4686msgstr "不能创建 lazy_dir 线程:%s"
4687
a5cd71ca 4688#: name-hash.c:559
4c27fcb5
JX
4689#, c-format
4690msgid "unable to create lazy_name thread: %s"
4691msgstr "不能创建 lazy_name 线程:%s"
4692
a5cd71ca 4693#: name-hash.c:565
4c27fcb5
JX
4694#, c-format
4695msgid "unable to join lazy_name thread: %s"
4696msgstr "不能加入 lasy_name 线程:%s"
4697
06991777 4698#: notes-merge.c:277
5c57d762
JX
4699#, c-format
4700msgid ""
a0b6b246
JX
4701"You have not concluded your previous notes merge (%s exists).\n"
4702"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
4703"commit/abort the previous merge before you start a new notes merge."
5c57d762 4704msgstr ""
29004bbb 4705"您的前一次注释合并尚未结束(存在 %s)。\n"
1a79b2f1
JX
4706"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
4707"notes merge --abort' 来提交/终止前一次合并。"
5c57d762 4708
06991777 4709#: notes-merge.c:284
a0b6b246
JX
4710#, c-format
4711msgid "You have not concluded your notes merge (%s exists)."
4712msgstr "您尚未结束注释合并(存在 %s)。"
4713
06991777 4714#: notes-utils.c:46
a0b6b246
JX
4715msgid "Cannot commit uninitialized/unreferenced notes tree"
4716msgstr "不能提交未初始化/未引用的注解树"
5c57d762 4717
06991777 4718#: notes-utils.c:105
1b7f4a34 4719#, c-format
a0b6b246
JX
4720msgid "Bad notes.rewriteMode value: '%s'"
4721msgstr "坏的 notes.rewriteMode 值:'%s'"
1b7f4a34 4722
06991777 4723#: notes-utils.c:115
5b04ee3b 4724#, c-format
a0b6b246
JX
4725msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
4726msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
5b04ee3b 4727
a4f16749
JX
4728#. TRANSLATORS: The first %s is the name of
4729#. the environment variable, the second %s is
4730#. its value.
4731#.
06991777 4732#: notes-utils.c:145
5b04ee3b 4733#, c-format
a0b6b246
JX
4734msgid "Bad %s value: '%s'"
4735msgstr "坏的 %s 值:'%s'"
5b04ee3b 4736
a5cd71ca 4737#: object.c:53
c1ac5258
JX
4738#, c-format
4739msgid "invalid object type \"%s\""
4740msgstr "无效的对象类型 \"%s\""
4741
a5cd71ca 4742#: object.c:173
c1ac5258
JX
4743#, c-format
4744msgid "object %s is a %s, not a %s"
4745msgstr "对象 %s 是一个 %s,不是一个 %s"
4746
a5cd71ca 4747#: object.c:233
c1ac5258
JX
4748#, c-format
4749msgid "object %s has unknown type id %d"
4750msgstr "对象 %s 有未知的类型 id %d"
4751
a5cd71ca 4752#: object.c:246
5b04ee3b 4753#, c-format
a0b6b246
JX
4754msgid "unable to parse object: %s"
4755msgstr "不能解析对象:%s"
5b04ee3b 4756
a5cd71ca 4757#: object.c:266 object.c:277
c1ac5258 4758#, c-format
06991777
JX
4759msgid "hash mismatch %s"
4760msgstr "哈希值与 %s 不匹配"
c1ac5258 4761
a5cd71ca 4762#: packfile.c:641
6937cb4e
JX
4763msgid "offset before end of packfile (broken .idx?)"
4764msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
4765
ddc12c42 4766#: packfile.c:1888
6937cb4e
JX
4767#, c-format
4768msgid "offset before start of pack index for %s (corrupt index?)"
4769msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
4770
ddc12c42 4771#: packfile.c:1892
6937cb4e
JX
4772#, c-format
4773msgid "offset beyond end of pack index for %s (truncated index?)"
4774msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
4775
d46c5519 4776#: parse-options.c:38
06991777
JX
4777#, c-format
4778msgid "%s requires a value"
8e4e0555 4779msgstr "%s 需要一个值"
06991777 4780
d46c5519 4781#: parse-options.c:73
06991777
JX
4782#, c-format
4783msgid "%s is incompatible with %s"
4784msgstr "%s 与 %s 不兼容"
4785
d46c5519 4786#: parse-options.c:78
06991777
JX
4787#, c-format
4788msgid "%s : incompatible with something else"
4789msgstr "%s:和其它的不兼容"
4790
d46c5519 4791#: parse-options.c:92 parse-options.c:96 parse-options.c:319
06991777
JX
4792#, c-format
4793msgid "%s takes no value"
8e4e0555 4794msgstr "%s 不取值"
06991777 4795
d46c5519 4796#: parse-options.c:94
06991777
JX
4797#, c-format
4798msgid "%s isn't available"
4799msgstr "%s 不可用"
4800
d46c5519 4801#: parse-options.c:219
06991777
JX
4802#, c-format
4803msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
4804msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
4805
d46c5519 4806#: parse-options.c:389
06991777
JX
4807#, c-format
4808msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
8e4e0555 4809msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)"
06991777 4810
d46c5519 4811#: parse-options.c:423 parse-options.c:431
06991777
JX
4812#, c-format
4813msgid "did you mean `--%s` (with two dashes ?)"
4814msgstr "你的意思是 `--%s`(有两个短线?)"
4815
a5cd71ca 4816#: parse-options.c:860
06991777
JX
4817#, c-format
4818msgid "unknown option `%s'"
4819msgstr "未知选项 `%s'"
4820
a5cd71ca 4821#: parse-options.c:862
06991777
JX
4822#, c-format
4823msgid "unknown switch `%c'"
4824msgstr "未知开关 `%c'"
4825
a5cd71ca 4826#: parse-options.c:864
06991777
JX
4827#, c-format
4828msgid "unknown non-ascii option in string: `%s'"
5b533632 4829msgstr "字符串中未知的非 ascii 字符选项:`%s'"
06991777 4830
a5cd71ca 4831#: parse-options.c:888
a0b6b246
JX
4832msgid "..."
4833msgstr "..."
4834
a5cd71ca 4835#: parse-options.c:907
5b04ee3b 4836#, c-format
a0b6b246
JX
4837msgid "usage: %s"
4838msgstr "用法:%s"
5b04ee3b 4839
a0b6b246 4840#. TRANSLATORS: the colon here should align with the
a4f16749
JX
4841#. one in "usage: %s" translation.
4842#.
a5cd71ca 4843#: parse-options.c:913
5b04ee3b 4844#, c-format
a0b6b246
JX
4845msgid " or: %s"
4846msgstr " 或:%s"
5b04ee3b 4847
a0b6b246 4848# 译者:为保证在输出中对齐,注意调整句中空格!
a5cd71ca 4849#: parse-options.c:916
5b04ee3b 4850#, c-format
a0b6b246
JX
4851msgid " %s"
4852msgstr " %s"
5b04ee3b 4853
a5cd71ca 4854#: parse-options.c:955
a0b6b246
JX
4855msgid "-NUM"
4856msgstr "-数字"
4857
a5cd71ca 4858#: parse-options.c:969
d46c5519
JX
4859#, c-format
4860msgid "alias of --%s"
4861msgstr "--%s 的别名"
4862
4863#: parse-options-cb.c:20 parse-options-cb.c:24
06991777
JX
4864#, c-format
4865msgid "option `%s' expects a numerical value"
4866msgstr "选项 `%s' 期望一个数字值"
4867
d46c5519 4868#: parse-options-cb.c:41
fd8cb379
JX
4869#, c-format
4870msgid "malformed expiration date '%s'"
4871msgstr "格式错误的到期时间:'%s'"
4872
d46c5519 4873#: parse-options-cb.c:54
06991777
JX
4874#, c-format
4875msgid "option `%s' expects \"always\", \"auto\", or \"never\""
4876msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
4877
d46c5519 4878#: parse-options-cb.c:130 parse-options-cb.c:147
5b04ee3b 4879#, c-format
a0b6b246 4880msgid "malformed object name '%s'"
fd8cb379 4881msgstr "格式错误的对象名 '%s'"
5b04ee3b 4882
ddc12c42 4883#: path.c:915
5b04ee3b 4884#, c-format
a0b6b246
JX
4885msgid "Could not make %s writable by group"
4886msgstr "不能设置 %s 为组可写"
4887
ddc12c42 4888#: pathspec.c:130
87cb7997
JX
4889msgid "Escape character '\\' not allowed as last character in attr value"
4890msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
4891
ddc12c42 4892#: pathspec.c:148
87cb7997
JX
4893msgid "Only one 'attr:' specification is allowed."
4894msgstr "只允许一个 'attr:' 规格。"
4895
ddc12c42 4896#: pathspec.c:151
87cb7997
JX
4897msgid "attr spec must not be empty"
4898msgstr "属性规格不能为空"
4899
ddc12c42 4900#: pathspec.c:194
87cb7997
JX
4901#, c-format
4902msgid "invalid attribute name %s"
4903msgstr "无效的属性名 %s"
4904
ddc12c42 4905#: pathspec.c:259
a0b6b246
JX
4906msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
4907msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
4908
ddc12c42 4909#: pathspec.c:266
5b04ee3b 4910msgid ""
a0b6b246
JX
4911"global 'literal' pathspec setting is incompatible with all other global "
4912"pathspec settings"
4913msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
5b04ee3b 4914
ddc12c42 4915#: pathspec.c:306
a0b6b246
JX
4916msgid "invalid parameter for pathspec magic 'prefix'"
4917msgstr "路径规格包含无效的神奇前缀"
4918
ddc12c42 4919#: pathspec.c:327
5b04ee3b 4920#, c-format
a0b6b246
JX
4921msgid "Invalid pathspec magic '%.*s' in '%s'"
4922msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
5b04ee3b 4923
ddc12c42 4924#: pathspec.c:332
5b04ee3b 4925#, c-format
a0b6b246
JX
4926msgid "Missing ')' at the end of pathspec magic in '%s'"
4927msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
5b04ee3b 4928
ddc12c42 4929#: pathspec.c:370
5b04ee3b 4930#, c-format
a0b6b246
JX
4931msgid "Unimplemented pathspec magic '%c' in '%s'"
4932msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
5b04ee3b 4933
ddc12c42 4934#: pathspec.c:429
5b04ee3b 4935#, c-format
a0b6b246
JX
4936msgid "%s: 'literal' and 'glob' are incompatible"
4937msgstr "%s:'literal' 和 'glob' 不兼容"
5b04ee3b 4938
ddc12c42 4939#: pathspec.c:442
5b04ee3b 4940#, c-format
a0b6b246
JX
4941msgid "%s: '%s' is outside repository"
4942msgstr "%s:'%s' 在仓库之外"
5b04ee3b 4943
ddc12c42 4944#: pathspec.c:516
5b04ee3b 4945#, c-format
1a79b2f1
JX
4946msgid "'%s' (mnemonic: '%c')"
4947msgstr "'%s'(助记符:'%c')"
5b04ee3b 4948
ddc12c42 4949#: pathspec.c:526
5b04ee3b 4950#, c-format
a0b6b246
JX
4951msgid "%s: pathspec magic not supported by this command: %s"
4952msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
4953
ddc12c42 4954#: pathspec.c:593
5b04ee3b 4955#, c-format
a0b6b246
JX
4956msgid "pathspec '%s' is beyond a symbolic link"
4957msgstr "路径规格 '%s' 位于符号链接中"
4958
ddc12c42
JX
4959#: pathspec.c:638
4960#, c-format
4961msgid "line is badly quoted: %s"
4962msgstr "行被错误地引用:%s"
4963
d46c5519
JX
4964#: pkt-line.c:92
4965msgid "unable to write flush packet"
4966msgstr "无法写 flush 包"
4967
4968#: pkt-line.c:99
4969msgid "unable to write delim packet"
4970msgstr "无法写 delim 包"
4971
4972#: pkt-line.c:106
c1ac5258
JX
4973msgid "flush packet write failed"
4974msgstr "flush 包写错误"
4975
d46c5519 4976#: pkt-line.c:146 pkt-line.c:232
c1ac5258
JX
4977msgid "protocol error: impossibly long line"
4978msgstr "协议错误:不可能的长行"
4979
d46c5519 4980#: pkt-line.c:162 pkt-line.c:164
c1ac5258
JX
4981msgid "packet write with format failed"
4982msgstr "格式化包写入错误"
4983
d46c5519 4984#: pkt-line.c:196
c1ac5258
JX
4985msgid "packet write failed - data exceeds max packet size"
4986msgstr "写数据包失败:数据超过了包的最大长度"
4987
d46c5519 4988#: pkt-line.c:203 pkt-line.c:210
c1ac5258
JX
4989msgid "packet write failed"
4990msgstr "数据包写入失败"
4991
d46c5519 4992#: pkt-line.c:295
c1ac5258
JX
4993msgid "read error"
4994msgstr "读取错误"
4995
d46c5519 4996#: pkt-line.c:303
c1ac5258
JX
4997msgid "the remote end hung up unexpectedly"
4998msgstr "远端意外挂断了"
4999
d46c5519 5000#: pkt-line.c:331
c1ac5258
JX
5001#, c-format
5002msgid "protocol error: bad line length character: %.4s"
5003msgstr "协议错误:错误的行长度字符串:%.4s"
5004
d46c5519 5005#: pkt-line.c:341 pkt-line.c:346
c1ac5258
JX
5006#, c-format
5007msgid "protocol error: bad line length %d"
5008msgstr "协议错误:错误的行长度 %d"
5009
d46c5519 5010#: pkt-line.c:362
06991777
JX
5011#, c-format
5012msgid "remote error: %s"
5013msgstr "远程错误:%s"
5014
5015#: preload-index.c:119
4c27fcb5
JX
5016msgid "Refreshing index"
5017msgstr "正在刷新索引"
5018
06991777 5019#: preload-index.c:138
4c27fcb5
JX
5020#, c-format
5021msgid "unable to create threaded lstat: %s"
5022msgstr "无法创建线程 lstat:%s"
5023
ddc12c42 5024#: pretty.c:981
a0b6b246
JX
5025msgid "unable to parse --pretty format"
5026msgstr "不能解析 --pretty 格式"
5027
ddc12c42 5028#: promisor-remote.c:23
a5cd71ca
JX
5029msgid "Remote with no URL"
5030msgstr "远程未设置 URL"
5031
ddc12c42 5032#: promisor-remote.c:58
a5cd71ca
JX
5033#, c-format
5034msgid "promisor remote name cannot begin with '/': %s"
5035msgstr "promisor 远程名称不能以 '/' 开始:%s"
5036
ddc12c42 5037#: range-diff.c:75
c1ac5258
JX
5038msgid "could not start `log`"
5039msgstr "不能启动 `log`"
5040
ddc12c42 5041#: range-diff.c:77
c1ac5258
JX
5042msgid "could not read `log` output"
5043msgstr "不能读取 `log` 的输出"
5044
ddc12c42 5045#: range-diff.c:96 sequencer.c:5163
c1ac5258
JX
5046#, c-format
5047msgid "could not parse commit '%s'"
5048msgstr "不能解析提交 '%s'"
5049
ddc12c42 5050#: range-diff.c:122
a6cd2cc4
JX
5051#, c-format
5052msgid "could not parse git header '%.*s'"
5053msgstr "无法解析 git 头 '%.*s'"
5054
ddc12c42 5055#: range-diff.c:285
c1ac5258
JX
5056msgid "failed to generate diff"
5057msgstr "生成 diff 失败"
5058
ddc12c42 5059#: range-diff.c:518 range-diff.c:520
c1ac5258
JX
5060#, c-format
5061msgid "could not parse log for '%s'"
5062msgstr "不能解析 '%s' 的日志"
5063
d46c5519 5064#: read-cache.c:680
06991777
JX
5065#, c-format
5066msgid "will not add file alias '%s' ('%s' already exists in index)"
5067msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)"
5068
d46c5519 5069#: read-cache.c:696
06991777
JX
5070msgid "cannot create an empty blob in the object database"
5071msgstr "不能在对象数据库中创建空的数据对象"
5072
d46c5519 5073#: read-cache.c:718
06991777
JX
5074#, c-format
5075msgid "%s: can only add regular files, symbolic links or git-directories"
5076msgstr "%s:只能添加常规文件、符号链接或 git 目录"
5077
d46c5519
JX
5078#: read-cache.c:723
5079#, c-format
5080msgid "'%s' does not have a commit checked out"
5081msgstr "'%s' 没有检出一个提交"
5082
5083#: read-cache.c:775
06991777
JX
5084#, c-format
5085msgid "unable to index file '%s'"
5086msgstr "无法索引文件 '%s'"
5087
d46c5519 5088#: read-cache.c:794
06991777
JX
5089#, c-format
5090msgid "unable to add '%s' to index"
5091msgstr "无法在索引中添加 '%s'"
5092
d46c5519 5093#: read-cache.c:805
06991777
JX
5094#, c-format
5095msgid "unable to stat '%s'"
5096msgstr "无法对 %s 执行 stat"
5097
ddc12c42 5098#: read-cache.c:1325
06991777
JX
5099#, c-format
5100msgid "'%s' appears as both a file and as a directory"
5b533632 5101msgstr "'%s' 看起来既是文件又是目录"
06991777 5102
ddc12c42 5103#: read-cache.c:1531
4c27fcb5
JX
5104msgid "Refresh index"
5105msgstr "刷新索引"
5106
ddc12c42 5107#: read-cache.c:1646
5b04ee3b
JX
5108#, c-format
5109msgid ""
a0b6b246
JX
5110"index.version set, but the value is invalid.\n"
5111"Using version %i"
5b04ee3b 5112msgstr ""
a0b6b246
JX
5113"设置了 index.version,但是取值无效。\n"
5114"使用版本 %i"
5b04ee3b 5115
ddc12c42 5116#: read-cache.c:1656
5b04ee3b
JX
5117#, c-format
5118msgid ""
a0b6b246
JX
5119"GIT_INDEX_VERSION set, but the value is invalid.\n"
5120"Using version %i"
5b04ee3b 5121msgstr ""
a0b6b246
JX
5122"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
5123"使用版本 %i"
5b04ee3b 5124
ddc12c42 5125#: read-cache.c:1712
06991777
JX
5126#, c-format
5127msgid "bad signature 0x%08x"
5128msgstr "坏的签名 0x%08x"
5129
ddc12c42 5130#: read-cache.c:1715
06991777
JX
5131#, c-format
5132msgid "bad index version %d"
5133msgstr "坏的索引版本 %d"
5134
ddc12c42 5135#: read-cache.c:1724
06991777 5136msgid "bad index file sha1 signature"
5b533632 5137msgstr "坏的索引文件 sha1 签名"
06991777 5138
ddc12c42 5139#: read-cache.c:1754
06991777
JX
5140#, c-format
5141msgid "index uses %.4s extension, which we do not understand"
5142msgstr "索引使用不被支持的 %.4s 扩展"
5143
5144#
ddc12c42 5145#: read-cache.c:1756
06991777
JX
5146#, c-format
5147msgid "ignoring %.4s extension"
5148msgstr "忽略 %.4s 扩展"
5149
ddc12c42 5150#: read-cache.c:1793
06991777
JX
5151#, c-format
5152msgid "unknown index entry format 0x%08x"
5153msgstr "未知的索引条目格式 0x%08x"
5154
ddc12c42 5155#: read-cache.c:1809
4c27fcb5
JX
5156#, c-format
5157msgid "malformed name field in the index, near path '%s'"
5158msgstr "索引中靠近路径 '%s' 有错误的名称字段"
5159
ddc12c42 5160#: read-cache.c:1866
06991777
JX
5161msgid "unordered stage entries in index"
5162msgstr "索引中有未排序的暂存条目"
5163
ddc12c42 5164#: read-cache.c:1869
06991777
JX
5165#, c-format
5166msgid "multiple stage entries for merged file '%s'"
5167msgstr "合并文件 '%s' 有多个暂存条目"
5168
ddc12c42 5169#: read-cache.c:1872
06991777
JX
5170#, c-format
5171msgid "unordered stage entries for '%s'"
5172msgstr "'%s' 的未排序暂存条目"
5173
ddc12c42
JX
5174#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111
5175#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470
5176#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367
a6cd2cc4 5177#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
ddc12c42 5178#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332
4c27fcb5
JX
5179msgid "index file corrupt"
5180msgstr "索引文件损坏"
5181
ddc12c42 5182#: read-cache.c:2119
4c27fcb5
JX
5183#, c-format
5184msgid "unable to create load_cache_entries thread: %s"
5185msgstr "无法创建 load_cache_entries 线程:%s"
5186
ddc12c42 5187#: read-cache.c:2132
4c27fcb5
JX
5188#, c-format
5189msgid "unable to join load_cache_entries thread: %s"
5190msgstr "无法加入 load_cache_entries 线程:%s"
5191
ddc12c42 5192#: read-cache.c:2165
06991777
JX
5193#, c-format
5194msgid "%s: index file open failed"
5195msgstr "%s:打开索引文件失败"
5196
ddc12c42 5197#: read-cache.c:2169
06991777
JX
5198#, c-format
5199msgid "%s: cannot stat the open index"
5200msgstr "%s:不能对打开的索引执行 stat 操作"
5201
ddc12c42 5202#: read-cache.c:2173
06991777
JX
5203#, c-format
5204msgid "%s: index file smaller than expected"
5205msgstr "%s:索引文件比预期的小"
5206
ddc12c42 5207#: read-cache.c:2177
06991777
JX
5208#, c-format
5209msgid "%s: unable to map index file"
5210msgstr "%s:无法对索引文件执行 map 操作"
5211
ddc12c42 5212#: read-cache.c:2219
4c27fcb5
JX
5213#, c-format
5214msgid "unable to create load_index_extensions thread: %s"
5215msgstr "无法创建 load_index_extensions 线程:%s"
5216
ddc12c42 5217#: read-cache.c:2246
4c27fcb5
JX
5218#, c-format
5219msgid "unable to join load_index_extensions thread: %s"
5220msgstr "无法加入 load_index_extensions 线程:%s"
5221
ddc12c42 5222#: read-cache.c:2278
06991777
JX
5223#, c-format
5224msgid "could not freshen shared index '%s'"
5225msgstr "无法刷新共享索引 '%s'"
5226
ddc12c42 5227#: read-cache.c:2325
06991777
JX
5228#, c-format
5229msgid "broken index, expect %s in %s, got %s"
5230msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
5231
ddc12c42 5232#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119
a4f16749
JX
5233#, c-format
5234msgid "could not close '%s'"
5235msgstr "不能关闭 '%s'"
5236
ddc12c42 5237#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069
87cb7997 5238#, c-format
60638e98 5239msgid "could not stat '%s'"
65e2041e 5240msgstr "不能对 '%s' 调用 stat"
87cb7997 5241
ddc12c42 5242#: read-cache.c:3137
87cb7997
JX
5243#, c-format
5244msgid "unable to open git dir: %s"
5245msgstr "不能打开 git 目录:%s"
5246
ddc12c42 5247#: read-cache.c:3149
87cb7997
JX
5248#, c-format
5249msgid "unable to unlink: %s"
5250msgstr "无法删除:%s"
5251
ddc12c42 5252#: read-cache.c:3174
06991777
JX
5253#, c-format
5254msgid "cannot fix permission bits on '%s'"
5255msgstr "不能修复 '%s' 的权限位"
5256
ddc12c42 5257#: read-cache.c:3323
06991777
JX
5258#, c-format
5259msgid "%s: cannot drop to stage #0"
5260msgstr "%s:不能落到暂存区 #0"
5261
d46c5519
JX
5262#: rebase-interactive.c:26
5263#, c-format
5264msgid ""
5265"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
5266msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
5267
5268#: rebase-interactive.c:35
4c27fcb5
JX
5269msgid ""
5270"\n"
5271"Commands:\n"
5272"p, pick <commit> = use commit\n"
5273"r, reword <commit> = use commit, but edit the commit message\n"
5274"e, edit <commit> = use commit, but stop for amending\n"
5275"s, squash <commit> = use commit, but meld into previous commit\n"
5276"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
5277"x, exec <command> = run command (the rest of the line) using shell\n"
5278"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
5279"d, drop <commit> = remove commit\n"
5280"l, label <label> = label current HEAD with a name\n"
5281"t, reset <label> = reset HEAD to a label\n"
5282"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
5283". create a merge commit using the original merge commit's\n"
5284". message (or the oneline, if no original merge commit was\n"
5285". specified). Use -c <commit> to reword the commit message.\n"
5286"\n"
5287"These lines can be re-ordered; they are executed from top to bottom.\n"
5288msgstr ""
5289"\n"
5290"命令:\n"
5291"p, pick <提交> = 使用提交\n"
5292"r, reword <提交> = 使用提交,但修改提交说明\n"
5293"e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n"
5294"s, squash <提交> = 使用提交,但融合到前一个提交\n"
5295"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
5296"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
5297"b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n"
5298"d, drop <提交> = 删除提交\n"
5299"l, label <label> = 为当前 HEAD 打上标记\n"
5300"t, reset <label> = 重置 HEAD 到该标记\n"
5301"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
5302". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
5303". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
5304". -c <提交> 可以编辑提交说明。\n"
5305"\n"
5306"可以对这些行重新排序,将从上至下执行。\n"
5307
d46c5519
JX
5308#: rebase-interactive.c:56
5309#, c-format
5310msgid "Rebase %s onto %s (%d command)"
5311msgid_plural "Rebase %s onto %s (%d commands)"
5312msgstr[0] "变基 %s 到 %s(%d 个提交)"
5313msgstr[1] "变基 %s 到 %s(%d 个提交)"
5314
a6cd2cc4 5315#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
4c27fcb5
JX
5316msgid ""
5317"\n"
5318"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
5319msgstr ""
5320"\n"
5321"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
5322
a6cd2cc4 5323#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
4c27fcb5
JX
5324msgid ""
5325"\n"
5326"If you remove a line here THAT COMMIT WILL BE LOST.\n"
5327msgstr ""
5328"\n"
5329"如果您在这里删除一行,对应的提交将会丢失。\n"
5330
a6cd2cc4 5331#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
4c27fcb5
JX
5332msgid ""
5333"\n"
5334"You are editing the todo file of an ongoing interactive rebase.\n"
5335"To continue rebase after editing, run:\n"
5336" git rebase --continue\n"
5337"\n"
5338msgstr ""
5339"\n"
5340"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
5341"请执行:\n"
5342" git rebase --continue\n"
5343"\n"
5344
a6cd2cc4 5345#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
4c27fcb5
JX
5346msgid ""
5347"\n"
5348"However, if you remove everything, the rebase will be aborted.\n"
5349"\n"
5350msgstr ""
5351"\n"
5352"然而,如果您删除全部内容,变基操作将会终止。\n"
5353"\n"
5354
a6cd2cc4 5355#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
4c27fcb5
JX
5356msgid "Note that empty commits are commented out"
5357msgstr "注意空提交已被注释掉"
5358
ddc12c42
JX
5359#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536
5360#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254
4c27fcb5 5361#, c-format
d46c5519
JX
5362msgid "could not write '%s'"
5363msgstr "不能写入 '%s'"
5364
5365#: rebase-interactive.c:108
5366#, c-format
5367msgid "could not copy '%s' to '%s'."
5368msgstr "不能拷贝 '%s' 至 '%s'。"
5369
5370#: rebase-interactive.c:173
5371#, c-format
5372msgid ""
5373"Warning: some commits may have been dropped accidentally.\n"
5374"Dropped commits (newer to older):\n"
5375msgstr ""
5376"警告:一些提交可能被意外丢弃。\n"
5377"丢弃的提交(从新到旧):\n"
5378
5379#: rebase-interactive.c:180
5380#, c-format
5381msgid ""
5382"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
5383"\n"
5384"Use 'git config rebase.missingCommitsCheck' to change the level of "
5385"warnings.\n"
5386"The possible behaviours are: ignore, warn, error.\n"
5387"\n"
5388msgstr ""
5389"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
5390"\n"
5391"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
5392"可选值有:ignore、warn、error。\n"
5393"\n"
4c27fcb5 5394
a6cd2cc4 5395#: refs.c:262
c1ac5258
JX
5396#, c-format
5397msgid "%s does not point to a valid object!"
5398msgstr "%s 没有指向一个有效的对象!"
5399
a6cd2cc4 5400#: refs.c:667
c1ac5258
JX
5401#, c-format
5402msgid "ignoring dangling symref %s"
e640d114 5403msgstr "忽略悬空符号引用 %s"
c1ac5258 5404
a5cd71ca 5405#: refs.c:669 ref-filter.c:2098
c1ac5258
JX
5406#, c-format
5407msgid "ignoring broken ref %s"
5408msgstr "忽略损坏的引用 %s"
5409
a6cd2cc4 5410#: refs.c:804
c1ac5258
JX
5411#, c-format
5412msgid "could not open '%s' for writing: %s"
5413msgstr "无法为写入打开 '%s':%s"
5414
a6cd2cc4 5415#: refs.c:814 refs.c:865
c1ac5258
JX
5416#, c-format
5417msgid "could not read ref '%s'"
5418msgstr "无法读取引用 '%s'"
5419
a6cd2cc4 5420#: refs.c:820
c1ac5258
JX
5421#, c-format
5422msgid "ref '%s' already exists"
5423msgstr "引用 '%s' 已经存在"
5424
a6cd2cc4 5425#: refs.c:825
c1ac5258
JX
5426#, c-format
5427msgid "unexpected object ID when writing '%s'"
5428msgstr "写入 '%s' 时意外的对象 ID"
5429
ddc12c42
JX
5430#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997
5431#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142
5432#: wrapper.c:620
c1ac5258
JX
5433#, c-format
5434msgid "could not write to '%s'"
5435msgstr "不能写入 '%s'"
5436
ddc12c42
JX
5437#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714
5438#: builtin/rebase.c:1031
5b04ee3b 5439#, c-format
fd8cb379 5440msgid "could not open '%s' for writing"
a0b6b246 5441msgstr "无法打开 '%s' 进行写入"
5b04ee3b 5442
a6cd2cc4 5443#: refs.c:867
c1ac5258
JX
5444#, c-format
5445msgid "unexpected object ID when deleting '%s'"
5446msgstr "删除 '%s' 时意外的对象 ID"
5447
a6cd2cc4 5448#: refs.c:998
c1ac5258
JX
5449#, c-format
5450msgid "log for ref %s has gap after %s"
5451msgstr "引用 %s 的日志在 %s 之后有缺口"
5452
a6cd2cc4 5453#: refs.c:1004
c1ac5258
JX
5454#, c-format
5455msgid "log for ref %s unexpectedly ended on %s"
5456msgstr "引用 %s 的日志意外终止于 %s "
5457
a6cd2cc4 5458#: refs.c:1063
c1ac5258
JX
5459#, c-format
5460msgid "log for %s is empty"
5461msgstr "%s 的日志为空"
5462
a6cd2cc4 5463#: refs.c:1155
c1ac5258
JX
5464#, c-format
5465msgid "refusing to update ref with bad name '%s'"
5466msgstr "拒绝更新有错误名称 '%s' 的引用"
5467
a6cd2cc4 5468#: refs.c:1231
c1ac5258
JX
5469#, c-format
5470msgid "update_ref failed for ref '%s': %s"
5471msgstr "对引用 '%s' 执行 update_ref 失败:%s"
5472
a5cd71ca 5473#: refs.c:2023
c1ac5258
JX
5474#, c-format
5475msgid "multiple updates for ref '%s' not allowed"
5476msgstr "不允许对引用 '%s' 多次更新"
5477
a5cd71ca 5478#: refs.c:2055
60638e98
JX
5479msgid "ref updates forbidden inside quarantine environment"
5480msgstr "在隔离环境中禁止更新引用"
5481
a5cd71ca 5482#: refs.c:2151 refs.c:2181
c1ac5258
JX
5483#, c-format
5484msgid "'%s' exists; cannot create '%s'"
5485msgstr "'%s' 已存在,无法创建 '%s'"
5486
a5cd71ca 5487#: refs.c:2157 refs.c:2192
c1ac5258
JX
5488#, c-format
5489msgid "cannot process '%s' and '%s' at the same time"
5490msgstr "无法同时处理 '%s' 和 '%s'"
5491
d46c5519 5492#: refs/files-backend.c:1234
6937cb4e
JX
5493#, c-format
5494msgid "could not remove reference %s"
5495msgstr "无法删除引用 %s"
5496
a5cd71ca
JX
5497#: refs/files-backend.c:1248 refs/packed-backend.c:1541
5498#: refs/packed-backend.c:1551
5b04ee3b 5499#, c-format
a0b6b246
JX
5500msgid "could not delete reference %s: %s"
5501msgstr "无法删除引用 %s:%s"
5b04ee3b 5502
a5cd71ca 5503#: refs/files-backend.c:1251 refs/packed-backend.c:1554
5b04ee3b 5504#, c-format
a0b6b246
JX
5505msgid "could not delete references: %s"
5506msgstr "无法删除引用:%s"
5b04ee3b 5507
c1ac5258
JX
5508#: refspec.c:137
5509#, c-format
5510msgid "invalid refspec '%s'"
5511msgstr "无效的引用表达式:'%s'"
5512
a5cd71ca 5513#: ref-filter.c:42 wt-status.c:1938
87cb7997
JX
5514msgid "gone"
5515msgstr "丢失"
5516
a6cd2cc4 5517#: ref-filter.c:43
87cb7997
JX
5518#, c-format
5519msgid "ahead %d"
5520msgstr "领先 %d"
5521
a6cd2cc4 5522#: ref-filter.c:44
87cb7997
JX
5523#, c-format
5524msgid "behind %d"
5525msgstr "落后 %d"
5526
a6cd2cc4 5527#: ref-filter.c:45
87cb7997
JX
5528#, c-format
5529msgid "ahead %d, behind %d"
5530msgstr "领先 %d,落后 %d"
5531
a5cd71ca 5532#: ref-filter.c:165
5b04ee3b 5533#, c-format
a0b6b246 5534msgid "expected format: %%(color:<color>)"
58b6f078 5535msgstr "期望的格式:%%(color:<颜色>)"
5b04ee3b 5536
a5cd71ca 5537#: ref-filter.c:167
5b04ee3b 5538#, c-format
a0b6b246
JX
5539msgid "unrecognized color: %%(color:%s)"
5540msgstr "未能识别的颜色:%%(color:%s)"
6c94aba5 5541
a5cd71ca 5542#: ref-filter.c:189
a0b6b246 5543#, c-format
87cb7997
JX
5544msgid "Integer value expected refname:lstrip=%s"
5545msgstr "期望整数值 refname:lstrip=%s"
90314792 5546
a5cd71ca 5547#: ref-filter.c:193
87cb7997
JX
5548#, c-format
5549msgid "Integer value expected refname:rstrip=%s"
5550msgstr "期望整数值 refname:rstrip=%s"
5551
a5cd71ca 5552#: ref-filter.c:195
87cb7997
JX
5553#, c-format
5554msgid "unrecognized %%(%s) argument: %s"
5555msgstr "未能识别的 %%(%s) 参数:%s"
5556
a5cd71ca 5557#: ref-filter.c:250
c1ac5258
JX
5558#, c-format
5559msgid "%%(objecttype) does not take arguments"
5560msgstr "%%(objecttype) 不带参数"
5561
a5cd71ca 5562#: ref-filter.c:272
06991777
JX
5563#, c-format
5564msgid "unrecognized %%(objectsize) argument: %s"
5565msgstr "未能识别的 %%(objectsize) 参数:%s"
5566
a5cd71ca 5567#: ref-filter.c:280
c1ac5258 5568#, c-format
06991777
JX
5569msgid "%%(deltabase) does not take arguments"
5570msgstr "%%(deltabase) 不带参数"
c1ac5258 5571
a5cd71ca 5572#: ref-filter.c:292
90314792 5573#, c-format
a0b6b246
JX
5574msgid "%%(body) does not take arguments"
5575msgstr "%%(body) 不带参数"
90314792 5576
a5cd71ca 5577#: ref-filter.c:301
a0b6b246
JX
5578#, c-format
5579msgid "%%(subject) does not take arguments"
5580msgstr "%%(subject) 不带参数"
90314792 5581
a5cd71ca 5582#: ref-filter.c:323
1a79b2f1 5583#, c-format
6937cb4e
JX
5584msgid "unknown %%(trailers) argument: %s"
5585msgstr "未知的 %%(trailers) 参数:%s"
1a79b2f1 5586
a5cd71ca 5587#: ref-filter.c:352
a0b6b246
JX
5588#, c-format
5589msgid "positive value expected contents:lines=%s"
87cb7997 5590msgstr "期望一个正数 contents:lines=%s"
90314792 5591
a5cd71ca 5592#: ref-filter.c:354
a0b6b246
JX
5593#, c-format
5594msgid "unrecognized %%(contents) argument: %s"
5595msgstr "未能识别的 %%(contents) 参数:%s"
90314792 5596
a5cd71ca 5597#: ref-filter.c:369
87cb7997
JX
5598#, c-format
5599msgid "positive value expected objectname:short=%s"
5600msgstr "期望一个正数 objectname:short=%s"
5601
a5cd71ca 5602#: ref-filter.c:373
a0b6b246
JX
5603#, c-format
5604msgid "unrecognized %%(objectname) argument: %s"
5605msgstr "未能识别的 %%(objectname) 参数:%s"
90314792 5606
a5cd71ca 5607#: ref-filter.c:403
a0b6b246
JX
5608#, c-format
5609msgid "expected format: %%(align:<width>,<position>)"
58b6f078 5610msgstr "期望的格式:%%(align:<宽度>,<位置>)"
90314792 5611
a5cd71ca 5612#: ref-filter.c:415
5c57d762 5613#, c-format
a0b6b246
JX
5614msgid "unrecognized position:%s"
5615msgstr "未能识别的位置:%s"
5c57d762 5616
a5cd71ca 5617#: ref-filter.c:422
1b7f4a34 5618#, c-format
a0b6b246
JX
5619msgid "unrecognized width:%s"
5620msgstr "未能识别的宽度:%s"
1b7f4a34 5621
a5cd71ca 5622#: ref-filter.c:431
1b7f4a34 5623#, c-format
a0b6b246
JX
5624msgid "unrecognized %%(align) argument: %s"
5625msgstr "未能识别的 %%(align) 参数:%s"
1b7f4a34 5626
a5cd71ca 5627#: ref-filter.c:439
1b7f4a34 5628#, c-format
a0b6b246
JX
5629msgid "positive width expected with the %%(align) atom"
5630msgstr "元素 %%(align) 需要一个正数的宽度"
1b7f4a34 5631
a5cd71ca 5632#: ref-filter.c:457
87cb7997
JX
5633#, c-format
5634msgid "unrecognized %%(if) argument: %s"
5635msgstr "未能识别的 %%(if) 参数:%s"
5636
a5cd71ca 5637#: ref-filter.c:559
07432cef 5638#, c-format
a0b6b246 5639msgid "malformed field name: %.*s"
fd8cb379 5640msgstr "格式错误的字段名:%.*s"
ef317cd5 5641
a5cd71ca 5642#: ref-filter.c:586
a0b6b246
JX
5643#, c-format
5644msgid "unknown field name: %.*s"
5645msgstr "未知的字段名:%.*s"
220c313c 5646
a5cd71ca 5647#: ref-filter.c:590
4c27fcb5
JX
5648#, c-format
5649msgid ""
5650"not a git repository, but the field '%.*s' requires access to object data"
5651msgstr "不是一个 git 仓库,但是字段 '%.*s' 需要访问对象数据"
5652
a5cd71ca 5653#: ref-filter.c:714
87cb7997
JX
5654#, c-format
5655msgid "format: %%(if) atom used without a %%(then) atom"
5656msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
5657
a5cd71ca 5658#: ref-filter.c:777
87cb7997
JX
5659#, c-format
5660msgid "format: %%(then) atom used without an %%(if) atom"
5661msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
5662
a5cd71ca 5663#: ref-filter.c:779
87cb7997
JX
5664#, c-format
5665msgid "format: %%(then) atom used more than once"
5666msgstr "格式:%%(then) 元素用了多次"
5667
a5cd71ca 5668#: ref-filter.c:781
87cb7997
JX
5669#, c-format
5670msgid "format: %%(then) atom used after %%(else)"
5671msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
5672
a5cd71ca 5673#: ref-filter.c:809
87cb7997
JX
5674#, c-format
5675msgid "format: %%(else) atom used without an %%(if) atom"
5676msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
5677
a5cd71ca 5678#: ref-filter.c:811
87cb7997
JX
5679#, c-format
5680msgid "format: %%(else) atom used without a %%(then) atom"
5681msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
5682
a5cd71ca 5683#: ref-filter.c:813
87cb7997
JX
5684#, c-format
5685msgid "format: %%(else) atom used more than once"
5686msgstr "格式:%%(else) 元素用了多次"
5687
a5cd71ca 5688#: ref-filter.c:828
7aea43ff 5689#, c-format
a0b6b246
JX
5690msgid "format: %%(end) atom used without corresponding atom"
5691msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
7aea43ff 5692
a5cd71ca 5693#: ref-filter.c:885
7aea43ff 5694#, c-format
a0b6b246 5695msgid "malformed format string %s"
fd8cb379 5696msgstr "错误的格式化字符串 %s"
7aea43ff 5697
a5cd71ca 5698#: ref-filter.c:1488
87cb7997 5699#, c-format
a6cd2cc4
JX
5700msgid "no branch, rebasing %s"
5701msgstr "非分支,正变基 %s"
c04f5ac3 5702
a5cd71ca 5703#: ref-filter.c:1491
c04f5ac3 5704#, c-format
a6cd2cc4
JX
5705msgid "no branch, rebasing detached HEAD %s"
5706msgstr "非分支,正变基分离头指针 %s"
c04f5ac3 5707
a5cd71ca 5708#: ref-filter.c:1494
a0b6b246 5709#, c-format
a6cd2cc4
JX
5710msgid "no branch, bisect started on %s"
5711msgstr "非分支,二分查找开始于 %s"
6792b93b 5712
a5cd71ca 5713#: ref-filter.c:1504
a6cd2cc4
JX
5714msgid "no branch"
5715msgstr "非分支"
87cb7997 5716
a5cd71ca 5717#: ref-filter.c:1540 ref-filter.c:1749
a0b6b246
JX
5718#, c-format
5719msgid "missing object %s for %s"
5720msgstr "缺失 %2$s 的对象 %1$s"
c04f5ac3 5721
a5cd71ca 5722#: ref-filter.c:1550
a0b6b246
JX
5723#, c-format
5724msgid "parse_object_buffer failed on %s for %s"
5725msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
6792b93b 5726
a5cd71ca 5727#: ref-filter.c:2004
a0b6b246
JX
5728#, c-format
5729msgid "malformed object at '%s'"
fd8cb379 5730msgstr "格式错误的对象 '%s'"
c04f5ac3 5731
a5cd71ca 5732#: ref-filter.c:2093
a0b6b246
JX
5733#, c-format
5734msgid "ignoring ref with broken name %s"
5735msgstr "忽略带有错误名称 %s 的引用"
c04f5ac3 5736
a5cd71ca 5737#: ref-filter.c:2389
a0b6b246
JX
5738#, c-format
5739msgid "format: %%(end) atom missing"
5740msgstr "格式:缺少 %%(end) 元素"
c04f5ac3 5741
a5cd71ca 5742#: ref-filter.c:2489
06991777
JX
5743#, c-format
5744msgid "option `%s' is incompatible with --merged"
5745msgstr "选项 `%s' 和 --merged 不兼容"
5746
a5cd71ca 5747#: ref-filter.c:2492
06991777
JX
5748#, c-format
5749msgid "option `%s' is incompatible with --no-merged"
5750msgstr "选项 `%s' 和 --no-merged 不兼容"
5751
a5cd71ca 5752#: ref-filter.c:2502
a0b6b246
JX
5753#, c-format
5754msgid "malformed object name %s"
fd8cb379 5755msgstr "格式错误的对象名 %s"
c04f5ac3 5756
a5cd71ca 5757#: ref-filter.c:2507
06991777
JX
5758#, c-format
5759msgid "option `%s' must point to a commit"
5760msgstr "选项 `%s' 必须指向一个提交"
5761
a5cd71ca 5762#: remote.c:366
06991777
JX
5763#, c-format
5764msgid "config remote shorthand cannot begin with '/': %s"
5b533632 5765msgstr "配置的远程短名称不能以 '/' 开始:%s"
06991777 5766
a5cd71ca 5767#: remote.c:413
06991777
JX
5768msgid "more than one receivepack given, using the first"
5769msgstr "提供了一个以上的 receivepack,使用第一个"
5770
a5cd71ca 5771#: remote.c:421
06991777
JX
5772msgid "more than one uploadpack given, using the first"
5773msgstr "提供了一个以上的 uploadpack,使用第一个"
5774
a5cd71ca 5775#: remote.c:611
a0b6b246
JX
5776#, c-format
5777msgid "Cannot fetch both %s and %s to %s"
5778msgstr "不能同时获取 %s 和 %s 至 %s"
c04f5ac3 5779
a5cd71ca 5780#: remote.c:615
c04f5ac3 5781#, c-format
a0b6b246
JX
5782msgid "%s usually tracks %s, not %s"
5783msgstr "%s 通常跟踪 %s,而非 %s"
c04f5ac3 5784
a5cd71ca 5785#: remote.c:619
a0b6b246
JX
5786#, c-format
5787msgid "%s tracks both %s and %s"
5788msgstr "%s 同时跟踪 %s 和 %s"
c04f5ac3 5789
a5cd71ca 5790#: remote.c:687
06991777
JX
5791#, c-format
5792msgid "key '%s' of pattern had no '*'"
5793msgstr "模式的键 '%s' 没有 '*'"
5794
a5cd71ca 5795#: remote.c:697
06991777
JX
5796#, c-format
5797msgid "value '%s' of pattern has no '*'"
5798msgstr "模式的值 '%s' 没有 '*'"
5799
a5cd71ca 5800#: remote.c:1003
06991777
JX
5801#, c-format
5802msgid "src refspec %s does not match any"
5803msgstr "源引用表达式 %s 没有匹配"
5804
a5cd71ca 5805#: remote.c:1008
06991777
JX
5806#, c-format
5807msgid "src refspec %s matches more than one"
5808msgstr "源引用表达式 %s 匹配超过一个"
5809
5810#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
5811#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
5812#. the <src>.
5813#.
a5cd71ca 5814#: remote.c:1023
06991777
JX
5815#, c-format
5816msgid ""
5817"The destination you provided is not a full refname (i.e.,\n"
5818"starting with \"refs/\"). We tried to guess what you meant by:\n"
5819"\n"
5820"- Looking for a ref that matches '%s' on the remote side.\n"
5821"- Checking if the <src> being pushed ('%s')\n"
5822" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
5823" refs/{heads,tags}/ prefix on the remote side.\n"
5824"\n"
5825"Neither worked, so we gave up. You must fully qualify the ref."
5826msgstr ""
5827"您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n"
5828"试着猜测您的想法:\n"
5829"\n"
5830"- 在远端查询和 '%s' 匹配的引用。\n"
5831"- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n"
5832" 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
5833"\n"
5834"都不行,所以我们已放弃。您必须给出完整的引用。"
5835
a5cd71ca 5836#: remote.c:1043
06991777
JX
5837#, c-format
5838msgid ""
5839"The <src> part of the refspec is a commit object.\n"
5840"Did you mean to create a new branch by pushing to\n"
5841"'%s:refs/heads/%s'?"
5842msgstr ""
5843"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
5844"'%s:refs/heads/%s' 推送么?"
5845
a5cd71ca 5846#: remote.c:1048
06991777
JX
5847#, c-format
5848msgid ""
5849"The <src> part of the refspec is a tag object.\n"
5850"Did you mean to create a new tag by pushing to\n"
5851"'%s:refs/tags/%s'?"
5852msgstr ""
5853"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
5854"'%s:refs/tags/%s' 推送么?"
5855
a5cd71ca 5856#: remote.c:1053
06991777
JX
5857#, c-format
5858msgid ""
5859"The <src> part of the refspec is a tree object.\n"
5860"Did you mean to tag a new tree by pushing to\n"
5861"'%s:refs/tags/%s'?"
5862msgstr ""
5863"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
5864"'%s:refs/tags/%s' 推送么?"
5865
a5cd71ca 5866#: remote.c:1058
06991777
JX
5867#, c-format
5868msgid ""
5869"The <src> part of the refspec is a blob object.\n"
5870"Did you mean to tag a new blob by pushing to\n"
5871"'%s:refs/tags/%s'?"
5872msgstr ""
5873"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
5874"'%s:refs/tags/%s' 推送么?"
5875
a5cd71ca 5876#: remote.c:1094
06991777
JX
5877#, c-format
5878msgid "%s cannot be resolved to branch"
5879msgstr "%s 无法被解析为分支"
5880
a5cd71ca 5881#: remote.c:1105
06991777
JX
5882#, c-format
5883msgid "unable to delete '%s': remote ref does not exist"
8e4e0555 5884msgstr "无法删除 '%s':远程引用不存在"
06991777 5885
a5cd71ca 5886#: remote.c:1117
06991777
JX
5887#, c-format
5888msgid "dst refspec %s matches more than one"
5889msgstr "目标引用表达式 %s 匹配超过一个"
5890
a5cd71ca 5891#: remote.c:1124
06991777
JX
5892#, c-format
5893msgid "dst ref %s receives from more than one src"
5894msgstr "目标引用 %s 接收超过一个源"
c04f5ac3 5895
a5cd71ca 5896#: remote.c:1627 remote.c:1728
a0b6b246
JX
5897msgid "HEAD does not point to a branch"
5898msgstr "HEAD 没有指向一个分支"
c04f5ac3 5899
a5cd71ca 5900#: remote.c:1636
a0b6b246
JX
5901#, c-format
5902msgid "no such branch: '%s'"
5903msgstr "没有此分支:'%s'"
c04f5ac3 5904
a5cd71ca 5905#: remote.c:1639
a0b6b246
JX
5906#, c-format
5907msgid "no upstream configured for branch '%s'"
5908msgstr "尚未给分支 '%s' 设置上游"
c04f5ac3 5909
a5cd71ca 5910#: remote.c:1645
a0b6b246
JX
5911#, c-format
5912msgid "upstream branch '%s' not stored as a remote-tracking branch"
5913msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
c04f5ac3 5914
a5cd71ca 5915#: remote.c:1660
a0b6b246
JX
5916#, c-format
5917msgid "push destination '%s' on remote '%s' has no local tracking branch"
5918msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
c04f5ac3 5919
a5cd71ca 5920#: remote.c:1672
a0b6b246
JX
5921#, c-format
5922msgid "branch '%s' has no remote for pushing"
5923msgstr "分支 '%s' 没有设置要推送的远程服务器"
cfff71a9 5924
a5cd71ca 5925#: remote.c:1682
a0b6b246
JX
5926#, c-format
5927msgid "push refspecs for '%s' do not include '%s'"
5928msgstr "向 '%s' 推送引用规格未包含 '%s'"
cfff71a9 5929
a5cd71ca 5930#: remote.c:1695
a0b6b246
JX
5931msgid "push has no destination (push.default is 'nothing')"
5932msgstr "推送无目标(push.default 是 'nothing')"
cfff71a9 5933
a5cd71ca 5934#: remote.c:1717
a0b6b246
JX
5935msgid "cannot resolve 'simple' push to a single destination"
5936msgstr "无法解析 'simple' 推送至一个单独的目标"
6c94aba5 5937
a5cd71ca 5938#: remote.c:1843
06991777
JX
5939#, c-format
5940msgid "couldn't find remote ref %s"
8e4e0555 5941msgstr "无法找到远程引用 %s"
06991777 5942
a5cd71ca 5943#: remote.c:1856
06991777
JX
5944#, c-format
5945msgid "* Ignoring funny ref '%s' locally"
5946msgstr "* 在本地忽略可笑的引用 '%s'"
5947
a5cd71ca 5948#: remote.c:2019
a0b6b246
JX
5949#, c-format
5950msgid "Your branch is based on '%s', but the upstream is gone.\n"
5951msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
6c94aba5 5952
a5cd71ca 5953#: remote.c:2023
a0b6b246
JX
5954msgid " (use \"git branch --unset-upstream\" to fixup)\n"
5955msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
6c94aba5 5956
a5cd71ca 5957#: remote.c:2026
a0b6b246 5958#, c-format
6937cb4e 5959msgid "Your branch is up to date with '%s'.\n"
a0b6b246 5960msgstr "您的分支与上游分支 '%s' 一致。\n"
cfff71a9 5961
a5cd71ca 5962#: remote.c:2030
31e5e17b
JX
5963#, c-format
5964msgid "Your branch and '%s' refer to different commits.\n"
5965msgstr "您的分支和 '%s' 指向不同的提交。\n"
5966
a5cd71ca 5967#: remote.c:2033
31e5e17b
JX
5968#, c-format
5969msgid " (use \"%s\" for details)\n"
5970msgstr " (使用 \"%s\" 查看详情)\n"
5971
a5cd71ca 5972#: remote.c:2037
a0b6b246
JX
5973#, c-format
5974msgid "Your branch is ahead of '%s' by %d commit.\n"
5975msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
5976msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5977msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
cfff71a9 5978
a5cd71ca 5979#: remote.c:2043
a0b6b246
JX
5980msgid " (use \"git push\" to publish your local commits)\n"
5981msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
c04f5ac3 5982
a5cd71ca 5983#: remote.c:2046
a0b6b246
JX
5984#, c-format
5985msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
5986msgid_plural ""
5987"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
5988msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5989msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 5990
a0b6b246 5991# 译者:注意保持前导空格
a5cd71ca 5992#: remote.c:2054
a0b6b246
JX
5993msgid " (use \"git pull\" to update your local branch)\n"
5994msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
c04f5ac3 5995
a5cd71ca 5996#: remote.c:2057
a0b6b246
JX
5997#, c-format
5998msgid ""
5999"Your branch and '%s' have diverged,\n"
6000"and have %d and %d different commit each, respectively.\n"
6001msgid_plural ""
6002"Your branch and '%s' have diverged,\n"
6003"and have %d and %d different commits each, respectively.\n"
6004msgstr[0] ""
6005"您的分支和 '%s' 出现了偏离,\n"
6006"并且分别有 %d 和 %d 处不同的提交。\n"
6007msgstr[1] ""
6008"您的分支和 '%s' 出现了偏离,\n"
6009"并且分别有 %d 和 %d 处不同的提交。\n"
90314792 6010
a0b6b246 6011# 译者:注意保持前导空格
a5cd71ca 6012#: remote.c:2067
a0b6b246
JX
6013msgid " (use \"git pull\" to merge the remote branch into yours)\n"
6014msgstr " (使用 \"git pull\" 来合并远程分支)\n"
90314792 6015
a5cd71ca 6016#: remote.c:2250
06991777
JX
6017#, c-format
6018msgid "cannot parse expected object name '%s'"
6019msgstr "无法解析期望的对象名 '%s'"
6020
4c27fcb5 6021#: replace-object.c:21
c1ac5258
JX
6022#, c-format
6023msgid "bad replace ref name: %s"
6024msgstr "错误的替换引用名称:%s"
6025
4c27fcb5 6026#: replace-object.c:30
c1ac5258
JX
6027#, c-format
6028msgid "duplicate replace ref: %s"
6029msgstr "重复的替换引用:%s"
6030
4c27fcb5 6031#: replace-object.c:73
c1ac5258
JX
6032#, c-format
6033msgid "replace depth too high for object %s"
6034msgstr "对象 %s 的替换层级太深"
6035
4c27fcb5
JX
6036#: rerere.c:217 rerere.c:226 rerere.c:229
6037msgid "corrupt MERGE_RR"
6038msgstr "损坏的 MERGE_RR"
6039
6040#: rerere.c:264 rerere.c:269
6041msgid "unable to write rerere record"
6042msgstr "无法写入 rerere 记录"
cfff71a9 6043
4c27fcb5
JX
6044#: rerere.c:495
6045#, c-format
6046msgid "there were errors while writing '%s' (%s)"
6047msgstr "写入 '%s' (%s) 时出错"
6792b93b 6048
4c27fcb5
JX
6049#: rerere.c:498
6050#, c-format
6051msgid "failed to flush '%s'"
6052msgstr "刷新 '%s' 失败"
5c57d762 6053
4c27fcb5 6054#: rerere.c:503 rerere.c:1039
5809aa05 6055#, c-format
4c27fcb5
JX
6056msgid "could not parse conflict hunks in '%s'"
6057msgstr "不能解析 '%s' 中的冲突块"
5809aa05 6058
4c27fcb5
JX
6059#: rerere.c:684
6060#, c-format
6061msgid "failed utime() on '%s'"
6062msgstr "在 '%s' 上调用 utime() 失败"
31e5e17b 6063
4c27fcb5 6064#: rerere.c:694
87cb7997 6065#, c-format
4c27fcb5
JX
6066msgid "writing '%s' failed"
6067msgstr "写入 '%s' 失败"
87cb7997 6068
4c27fcb5 6069#: rerere.c:714
87cb7997 6070#, c-format
4c27fcb5
JX
6071msgid "Staged '%s' using previous resolution."
6072msgstr "使用之前的解决方案暂存 '%s'。"
87cb7997 6073
4c27fcb5
JX
6074#: rerere.c:753
6075#, c-format
6076msgid "Recorded resolution for '%s'."
6077msgstr "已记录 '%s' 的解决方案。"
6792b93b 6078
4c27fcb5
JX
6079#: rerere.c:788
6080#, c-format
6081msgid "Resolved '%s' using previous resolution."
6082msgstr "使用之前的解决方案解决 '%s'。"
6083
6084#: rerere.c:803
6085#, c-format
6086msgid "cannot unlink stray '%s'"
6087msgstr "不能删除 stray '%s'"
6088
6089#: rerere.c:807
6090#, c-format
6091msgid "Recorded preimage for '%s'"
6092msgstr "为 '%s' 记录 preimage"
6093
ddc12c42
JX
6094#: rerere.c:881 submodule.c:2067 builtin/log.c:1871
6095#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448
4c27fcb5
JX
6096#, c-format
6097msgid "could not create directory '%s'"
6098msgstr "不能创建目录 '%s'"
6099
6100#: rerere.c:1057
6101#, c-format
6102msgid "failed to update conflicted state in '%s'"
6103msgstr "更新 '%s' 中的冲突状态失败"
6104
6105#: rerere.c:1068 rerere.c:1075
6106#, c-format
6107msgid "no remembered resolution for '%s'"
6108msgstr "没有为 '%s' 记忆的解决方案"
6109
6110#: rerere.c:1077
6111#, c-format
6112msgid "cannot unlink '%s'"
6113msgstr "不能删除 '%s'"
6114
6115#: rerere.c:1087
6116#, c-format
6117msgid "Updated preimage for '%s'"
6118msgstr "已为 '%s' 更新 preimage"
6119
6120#: rerere.c:1096
6121#, c-format
6122msgid "Forgot resolution for '%s'\n"
6123msgstr "忘记 '%s' 的解决方案\n"
6124
6125#: rerere.c:1199
6126msgid "unable to open rr-cache directory"
6127msgstr "不能打开 rr-cache 目录"
6128
ddc12c42 6129#: revision.c:2497
4c27fcb5
JX
6130msgid "your current branch appears to be broken"
6131msgstr "您的当前分支好像被损坏"
6132
ddc12c42 6133#: revision.c:2500
4c27fcb5
JX
6134#, c-format
6135msgid "your current branch '%s' does not have any commits yet"
6136msgstr "您的当前分支 '%s' 尚无任何提交"
6137
ddc12c42 6138#: revision.c:2708
4c27fcb5
JX
6139msgid "--first-parent is incompatible with --bisect"
6140msgstr "--first-parent 与 --bisect 不兼容"
6141
ddc12c42 6142#: revision.c:2712
d46c5519
JX
6143msgid "-L does not yet support diff formats besides -p and -s"
6144msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
6145
ddc12c42 6146#: run-command.c:762
4c27fcb5
JX
6147msgid "open /dev/null failed"
6148msgstr "不能打开 /dev/null"
6149
ddc12c42 6150#: run-command.c:1268
4c27fcb5
JX
6151#, c-format
6152msgid "cannot create async thread: %s"
6153msgstr "不能创建 async 线程:%s"
6154
ddc12c42 6155#: run-command.c:1332
4c27fcb5
JX
6156#, c-format
6157msgid ""
6158"The '%s' hook was ignored because it's not set as executable.\n"
6159"You can disable this warning with `git config advice.ignoredHook false`."
6160msgstr ""
6161"因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
6162"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
6163
ddc12c42 6164#: send-pack.c:144
4c27fcb5
JX
6165msgid "unexpected flush packet while reading remote unpack status"
6166msgstr "读取远程解包状态时收到意外的 flush 包"
6167
ddc12c42 6168#: send-pack.c:146
4c27fcb5
JX
6169#, c-format
6170msgid "unable to parse remote unpack status: %s"
6171msgstr "不能解析远程解包状态:%s"
6172
ddc12c42 6173#: send-pack.c:148
4c27fcb5
JX
6174#, c-format
6175msgid "remote unpack failed: %s"
6176msgstr "远程解包失败:%s"
6177
ddc12c42 6178#: send-pack.c:309
4c27fcb5
JX
6179msgid "failed to sign the push certificate"
6180msgstr "为推送证书签名失败"
6181
ddc12c42 6182#: send-pack.c:423
a0b6b246
JX
6183msgid "the receiving end does not support --signed push"
6184msgstr "接收端不支持签名推送"
6792b93b 6185
ddc12c42 6186#: send-pack.c:425
a0b6b246
JX
6187msgid ""
6188"not sending a push certificate since the receiving end does not support --"
6189"signed push"
6190msgstr "未发送推送证书,因为接收端不支持签名推送"
6792b93b 6191
ddc12c42 6192#: send-pack.c:437
a0b6b246
JX
6193msgid "the receiving end does not support --atomic push"
6194msgstr "接收端不支持原子推送"
6792b93b 6195
ddc12c42 6196#: send-pack.c:442
a0b6b246
JX
6197msgid "the receiving end does not support push options"
6198msgstr "接收端不支持推送选项"
6792b93b 6199
ddc12c42 6200#: sequencer.c:189
31e5e17b
JX
6201#, c-format
6202msgid "invalid commit message cleanup mode '%s'"
6203msgstr "无效的提交信息清理模式 '%s'"
6204
ddc12c42 6205#: sequencer.c:294
fd8cb379
JX
6206#, c-format
6207msgid "could not delete '%s'"
6208msgstr "无法删除 '%s'"
6209
ddc12c42 6210#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369
a6cd2cc4
JX
6211#, c-format
6212msgid "could not remove '%s'"
6213msgstr "无法删除 '%s'"
6214
ddc12c42 6215#: sequencer.c:323
a0b6b246
JX
6216msgid "revert"
6217msgstr "还原"
6792b93b 6218
ddc12c42 6219#: sequencer.c:325
a0b6b246
JX
6220msgid "cherry-pick"
6221msgstr "拣选"
6222
ddc12c42 6223#: sequencer.c:327
1a79b2f1
JX
6224msgid "rebase -i"
6225msgstr "rebase -i"
6226
ddc12c42 6227#: sequencer.c:329
1a79b2f1 6228#, c-format
c1ac5258 6229msgid "unknown action: %d"
1a79b2f1
JX
6230msgstr "未知动作:%d"
6231
ddc12c42 6232#: sequencer.c:387
a0b6b246
JX
6233msgid ""
6234"after resolving the conflicts, mark the corrected paths\n"
6235"with 'git add <paths>' or 'git rm <paths>'"
6236msgstr ""
6237"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
6238"命令标记修正后的文件"
6239
ddc12c42 6240#: sequencer.c:390
a0b6b246
JX
6241msgid ""
6242"after resolving the conflicts, mark the corrected paths\n"
6243"with 'git add <paths>' or 'git rm <paths>'\n"
6244"and commit the result with 'git commit'"
6245msgstr ""
6246"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
6247"对修正后的文件做标记,然后用 'git commit' 提交"
1b7f4a34 6248
ddc12c42 6249#: sequencer.c:403 sequencer.c:2993
1b7f4a34 6250#, c-format
a0b6b246
JX
6251msgid "could not lock '%s'"
6252msgstr "不能锁定 '%s'"
1b7f4a34 6253
ddc12c42 6254#: sequencer.c:410
a0b6b246 6255#, c-format
72351d7d 6256msgid "could not write eol to '%s'"
a0b6b246 6257msgstr "不能将换行符写入 '%s'"
1b7f4a34 6258
ddc12c42
JX
6259#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013
6260#: sequencer.c:3277
1b7f4a34 6261#, c-format
31e5e17b
JX
6262msgid "failed to finalize '%s'"
6263msgstr "无法完成 '%s'"
1b7f4a34 6264
ddc12c42
JX
6265#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259
6266#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117
6267#: builtin/rebase.c:589
a0b6b246
JX
6268#, c-format
6269msgid "could not read '%s'"
6270msgstr "不能读取 '%s'"
1b7f4a34 6271
ddc12c42 6272#: sequencer.c:464
63af42fe 6273#, c-format
a0b6b246
JX
6274msgid "your local changes would be overwritten by %s."
6275msgstr "您的本地修改将被%s覆盖。"
63af42fe 6276
ddc12c42 6277#: sequencer.c:468
a0b6b246 6278msgid "commit your changes or stash them to proceed."
a4f16749 6279msgstr "提交您的修改或贮藏后再继续。"
6792b93b 6280
ddc12c42 6281#: sequencer.c:500
a0b6b246
JX
6282#, c-format
6283msgid "%s: fast-forward"
6284msgstr "%s:快进"
6792b93b 6285
ddc12c42 6286#: sequencer.c:539 builtin/tag.c:565
d46c5519
JX
6287#, c-format
6288msgid "Invalid cleanup mode %s"
6289msgstr "无效的清理模式 %s"
6290
1a79b2f1 6291#. TRANSLATORS: %s will be "revert", "cherry-pick" or
a4f16749 6292#. "rebase -i".
1a79b2f1 6293#.
ddc12c42 6294#: sequencer.c:633
a0b6b246
JX
6295#, c-format
6296msgid "%s: Unable to write new index file"
6297msgstr "%s:无法写入新索引文件"
6792b93b 6298
ddc12c42 6299#: sequencer.c:650
5809aa05
JX
6300msgid "unable to update cache tree"
6301msgstr "不能更新缓存树"
6792b93b 6302
ddc12c42 6303#: sequencer.c:664
fd8cb379
JX
6304msgid "could not resolve HEAD commit"
6305msgstr "不能解析 HEAD 提交"
6306
ddc12c42 6307#: sequencer.c:744
4c27fcb5
JX
6308#, c-format
6309msgid "no key present in '%.*s'"
6310msgstr "在 '%.*s' 中没有 key"
6311
ddc12c42 6312#: sequencer.c:755
c1ac5258 6313#, c-format
4c27fcb5
JX
6314msgid "unable to dequote value of '%s'"
6315msgstr "无法为 '%s' 的值去引号"
c1ac5258 6316
ddc12c42
JX
6317#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705
6318#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074
c1ac5258 6319#, c-format
4c27fcb5
JX
6320msgid "could not open '%s' for reading"
6321msgstr "无法打开 '%s' 进行读取"
6322
ddc12c42 6323#: sequencer.c:802
4c27fcb5
JX
6324msgid "'GIT_AUTHOR_NAME' already given"
6325msgstr "已经给出 'GIT_AUTHOR_NAME'"
c1ac5258 6326
ddc12c42 6327#: sequencer.c:807
4c27fcb5
JX
6328msgid "'GIT_AUTHOR_EMAIL' already given"
6329msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
6330
ddc12c42 6331#: sequencer.c:812
4c27fcb5
JX
6332msgid "'GIT_AUTHOR_DATE' already given"
6333msgstr "已经给出 'GIT_AUTHOR_DATE'"
6334
ddc12c42 6335#: sequencer.c:816
4c27fcb5
JX
6336#, c-format
6337msgid "unknown variable '%s'"
6338msgstr "未知变量 '%s'"
6339
ddc12c42 6340#: sequencer.c:821
4c27fcb5
JX
6341msgid "missing 'GIT_AUTHOR_NAME'"
6342msgstr "缺少 'GIT_AUTHOR_NAME'"
6343
ddc12c42 6344#: sequencer.c:823
4c27fcb5
JX
6345msgid "missing 'GIT_AUTHOR_EMAIL'"
6346msgstr "缺少 'GIT_AUTHOR_EMAIL'"
6347
ddc12c42 6348#: sequencer.c:825
4c27fcb5
JX
6349msgid "missing 'GIT_AUTHOR_DATE'"
6350msgstr "缺少 'GIT_AUTHOR_DATE'"
6351
ddc12c42
JX
6352#: sequencer.c:902 sequencer.c:1427
6353msgid "malformed ident line"
6354msgstr "错误的身份信息"
6355
6356#: sequencer.c:925
63af42fe
JX
6357#, c-format
6358msgid ""
a0b6b246
JX
6359"you have staged changes in your working tree\n"
6360"If these changes are meant to be squashed into the previous commit, run:\n"
6361"\n"
6362" git commit --amend %s\n"
6363"\n"
6364"If they are meant to go into a new commit, run:\n"
6365"\n"
6366" git commit %s\n"
6367"\n"
6368"In both cases, once you're done, continue with:\n"
6369"\n"
6370" git rebase --continue\n"
6371msgstr ""
1a79b2f1
JX
6372"您的工作区中存在已暂存的修改\n"
6373"如果这些修改需要被并入前一个提交,执行:\n"
a0b6b246
JX
6374"\n"
6375" git commit --amend %s\n"
6376"\n"
29004bbb 6377"如果这些修改要形成一个新提交,执行:\n"
a0b6b246
JX
6378"\n"
6379" git commit %s\n"
6380"\n"
6381"无论哪种情况,当您完成提交,继续执行:\n"
6382"\n"
6383" git rebase --continue\n"
6792b93b 6384
ddc12c42 6385#: sequencer.c:1218
31e5e17b
JX
6386msgid "'prepare-commit-msg' hook failed"
6387msgstr "'prepare-commit-msg' 钩子失败"
6388
ddc12c42 6389#: sequencer.c:1224
31e5e17b
JX
6390msgid ""
6391"Your name and email address were configured automatically based\n"
6392"on your username and hostname. Please check that they are accurate.\n"
6393"You can suppress this message by setting them explicitly. Run the\n"
6394"following command and follow the instructions in your editor to edit\n"
6395"your configuration file:\n"
6396"\n"
6397" git config --global --edit\n"
6398"\n"
6399"After doing this, you may fix the identity used for this commit with:\n"
6400"\n"
6401" git commit --amend --reset-author\n"
6402msgstr ""
6403"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6404"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
6405"中编辑您的配置文件:\n"
6406"\n"
6407" git config --global --edit\n"
6408"\n"
6409"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6410"\n"
6411" git commit --amend --reset-author\n"
6412
ddc12c42 6413#: sequencer.c:1237
31e5e17b
JX
6414msgid ""
6415"Your name and email address were configured automatically based\n"
6416"on your username and hostname. Please check that they are accurate.\n"
6417"You can suppress this message by setting them explicitly:\n"
6418"\n"
6419" git config --global user.name \"Your Name\"\n"
6420" git config --global user.email you@example.com\n"
6421"\n"
6422"After doing this, you may fix the identity used for this commit with:\n"
6423"\n"
6424" git commit --amend --reset-author\n"
6425msgstr ""
6426"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6427"与否。您可以对其进行设置以免再出现本提示信息:\n"
6428"\n"
6429" git config --global user.name \"Your Name\"\n"
6430" git config --global user.email you@example.com\n"
6431"\n"
6432"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6433"\n"
6434" git commit --amend --reset-author\n"
6435
ddc12c42 6436#: sequencer.c:1279
31e5e17b
JX
6437msgid "couldn't look up newly created commit"
6438msgstr "无法找到新创建的提交"
6439
ddc12c42 6440#: sequencer.c:1281
31e5e17b
JX
6441msgid "could not parse newly created commit"
6442msgstr "不能解析新创建的提交"
6443
ddc12c42 6444#: sequencer.c:1327
31e5e17b
JX
6445msgid "unable to resolve HEAD after creating commit"
6446msgstr "创建提交后,不能解析 HEAD"
6447
ddc12c42 6448#: sequencer.c:1329
31e5e17b
JX
6449msgid "detached HEAD"
6450msgstr "分离头指针"
6451
6452# 译者:中文字符串拼接,可删除前导空格
ddc12c42 6453#: sequencer.c:1333
31e5e17b
JX
6454msgid " (root-commit)"
6455msgstr "(根提交)"
6456
ddc12c42 6457#: sequencer.c:1354
31e5e17b
JX
6458msgid "could not parse HEAD"
6459msgstr "不能解析 HEAD"
6460
ddc12c42 6461#: sequencer.c:1356
31e5e17b
JX
6462#, c-format
6463msgid "HEAD %s is not a commit!"
6464msgstr "HEAD %s 不是一个提交!"
6465
ddc12c42 6466#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569
31e5e17b
JX
6467msgid "could not parse HEAD commit"
6468msgstr "不能解析 HEAD 提交"
6469
ddc12c42 6470#: sequencer.c:1411 sequencer.c:2055
31e5e17b
JX
6471msgid "unable to parse commit author"
6472msgstr "不能解析提交作者"
6473
ddc12c42
JX
6474#: sequencer.c:1431
6475msgid "corrupted author without date information"
6476msgstr "损坏的没有日期的作者信息"
6477
6478#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684
31e5e17b
JX
6479msgid "git write-tree failed to write a tree"
6480msgstr "git write-tree 无法写入树对象"
6481
ddc12c42 6482#: sequencer.c:1480 sequencer.c:1550
31e5e17b
JX
6483#, c-format
6484msgid "unable to read commit message from '%s'"
6485msgstr "不能从 '%s' 读取提交说明"
6486
ddc12c42 6487#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883
a5cd71ca 6488#: builtin/merge.c:908
31e5e17b 6489msgid "failed to write commit object"
c1ac5258 6490msgstr "写提交对象失败"
31e5e17b 6491
ddc12c42 6492#: sequencer.c:1577
a0b6b246 6493#, c-format
5809aa05
JX
6494msgid "could not parse commit %s"
6495msgstr "不能解析提交 %s"
6792b93b 6496
ddc12c42 6497#: sequencer.c:1582
63af42fe 6498#, c-format
5809aa05
JX
6499msgid "could not parse parent commit %s"
6500msgstr "不能解析父提交 %s"
63af42fe 6501
ddc12c42 6502#: sequencer.c:1656 sequencer.c:1767
c1ac5258
JX
6503#, c-format
6504msgid "unknown command: %d"
6505msgstr "未知命令:%d"
6506
ddc12c42 6507#: sequencer.c:1714 sequencer.c:1739
1a79b2f1
JX
6508#, c-format
6509msgid "This is a combination of %d commits."
6510msgstr "这是一个 %d 个提交的组合。"
6511
ddc12c42 6512#: sequencer.c:1724
1a79b2f1
JX
6513msgid "need a HEAD to fixup"
6514msgstr "需要一个 HEAD 来修复"
6515
ddc12c42 6516#: sequencer.c:1726 sequencer.c:3304
1a79b2f1
JX
6517msgid "could not read HEAD"
6518msgstr "不能读取 HEAD"
6519
ddc12c42 6520#: sequencer.c:1728
1a79b2f1
JX
6521msgid "could not read HEAD's commit message"
6522msgstr "不能读取 HEAD 的提交说明"
6523
ddc12c42 6524#: sequencer.c:1734
1a79b2f1
JX
6525#, c-format
6526msgid "cannot write '%s'"
6527msgstr "不能写 '%s'"
6528
ddc12c42 6529#: sequencer.c:1741 git-rebase--preserve-merges.sh:496
1a79b2f1
JX
6530msgid "This is the 1st commit message:"
6531msgstr "这是第一个提交说明:"
6532
ddc12c42 6533#: sequencer.c:1749
1a79b2f1
JX
6534#, c-format
6535msgid "could not read commit message of %s"
6536msgstr "不能读取 %s 的提交说明"
6537
ddc12c42 6538#: sequencer.c:1756
1a79b2f1
JX
6539#, c-format
6540msgid "This is the commit message #%d:"
6541msgstr "这是提交说明 #%d:"
6542
ddc12c42 6543#: sequencer.c:1762
1a79b2f1
JX
6544#, c-format
6545msgid "The commit message #%d will be skipped:"
6546msgstr "提交说明 #%d 将被跳过:"
6547
ddc12c42 6548#: sequencer.c:1850
a0b6b246
JX
6549msgid "your index file is unmerged."
6550msgstr "您的索引文件未完成合并。"
6792b93b 6551
ddc12c42 6552#: sequencer.c:1857
fd8cb379
JX
6553msgid "cannot fixup root commit"
6554msgstr "不能修复根提交"
6555
ddc12c42 6556#: sequencer.c:1876
a0b6b246
JX
6557#, c-format
6558msgid "commit %s is a merge but no -m option was given."
6559msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
6792b93b 6560
ddc12c42 6561#: sequencer.c:1884 sequencer.c:1892
a0b6b246
JX
6562#, c-format
6563msgid "commit %s does not have parent %d"
6564msgstr "提交 %s 没有第 %d 个父提交"
6565
ddc12c42 6566#: sequencer.c:1898
1a79b2f1
JX
6567#, c-format
6568msgid "cannot get commit message for %s"
6569msgstr "不能得到 %s 的提交说明"
6570
a0b6b246
JX
6571#. TRANSLATORS: The first %s will be a "todo" command like
6572#. "revert" or "pick", the second %s a SHA1.
ddc12c42 6573#: sequencer.c:1917
a0b6b246
JX
6574#, c-format
6575msgid "%s: cannot parse parent commit %s"
6576msgstr "%s:不能解析父提交 %s"
6577
ddc12c42 6578#: sequencer.c:1982
a0b6b246 6579#, c-format
1a79b2f1
JX
6580msgid "could not rename '%s' to '%s'"
6581msgstr "不能将 '%s' 重命名为 '%s'"
a0b6b246 6582
ddc12c42 6583#: sequencer.c:2037
a0b6b246
JX
6584#, c-format
6585msgid "could not revert %s... %s"
6586msgstr "不能还原 %s... %s"
6587
ddc12c42 6588#: sequencer.c:2038
a0b6b246
JX
6589#, c-format
6590msgid "could not apply %s... %s"
6591msgstr "不能应用 %s... %s"
6592
ddc12c42 6593#: sequencer.c:2105
a0b6b246
JX
6594#, c-format
6595msgid "git %s: failed to read the index"
6596msgstr "git %s:无法读取索引"
6597
ddc12c42 6598#: sequencer.c:2112
a0b6b246
JX
6599#, c-format
6600msgid "git %s: failed to refresh the index"
6601msgstr "git %s:无法刷新索引"
6602
ddc12c42 6603#: sequencer.c:2189
5809aa05
JX
6604#, c-format
6605msgid "%s does not accept arguments: '%s'"
6606msgstr "%s 不接受参数:'%s'"
6607
ddc12c42 6608#: sequencer.c:2198
5809aa05
JX
6609#, c-format
6610msgid "missing arguments for %s"
6611msgstr "缺少 %s 的参数"
6612
ddc12c42 6613#: sequencer.c:2235
d46c5519
JX
6614#, c-format
6615msgid "could not parse '%.*s'"
6616msgstr "无法解析 '%.*s'"
6617
ddc12c42 6618#: sequencer.c:2289
a0b6b246
JX
6619#, c-format
6620msgid "invalid line %d: %.*s"
6621msgstr "无效行 %d:%.*s"
6622
ddc12c42 6623#: sequencer.c:2300
1a79b2f1
JX
6624#, c-format
6625msgid "cannot '%s' without a previous commit"
6626msgstr "没有父提交的情况下不能 '%s'"
a0b6b246 6627
ddc12c42
JX
6628#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197
6629#: builtin/rebase.c:223 builtin/rebase.c:248
d46c5519
JX
6630#, c-format
6631msgid "could not read '%s'."
6632msgstr "不能读取 '%s'。"
6633
ddc12c42 6634#: sequencer.c:2384
a6cd2cc4
JX
6635msgid "cancelling a cherry picking in progress"
6636msgstr "正在取消一个进行中的拣选"
6637
ddc12c42 6638#: sequencer.c:2391
a6cd2cc4
JX
6639msgid "cancelling a revert in progress"
6640msgstr "正在取消一个进行中的还原"
6641
ddc12c42 6642#: sequencer.c:2435
1a79b2f1
JX
6643msgid "please fix this using 'git rebase --edit-todo'."
6644msgstr "请用 'git rebase --edit-todo' 来修改。"
6645
ddc12c42 6646#: sequencer.c:2437
a0b6b246
JX
6647#, c-format
6648msgid "unusable instruction sheet: '%s'"
29004bbb 6649msgstr "不可用的指令清单:'%s'"
a0b6b246 6650
ddc12c42 6651#: sequencer.c:2442
1a79b2f1
JX
6652msgid "no commits parsed."
6653msgstr "没有解析提交。"
6654
ddc12c42 6655#: sequencer.c:2453
a0b6b246
JX
6656msgid "cannot cherry-pick during a revert."
6657msgstr "不能在回退中执行拣选。"
6658
ddc12c42 6659#: sequencer.c:2455
a0b6b246
JX
6660msgid "cannot revert during a cherry-pick."
6661msgstr "不能在拣选中执行回退。"
6662
ddc12c42 6663#: sequencer.c:2533
a0b6b246
JX
6664#, c-format
6665msgid "invalid value for %s: %s"
6666msgstr "%s 的值无效:%s"
6667
ddc12c42 6668#: sequencer.c:2630
fd8cb379
JX
6669msgid "unusable squash-onto"
6670msgstr "不可用的 squash-onto"
6671
ddc12c42 6672#: sequencer.c:2646
a0b6b246
JX
6673#, c-format
6674msgid "malformed options sheet: '%s'"
fd8cb379 6675msgstr "格式错误的选项清单:'%s'"
a0b6b246 6676
ddc12c42 6677#: sequencer.c:2736 sequencer.c:4463
c1ac5258
JX
6678msgid "empty commit set passed"
6679msgstr "提供了空的提交集"
6680
ddc12c42 6681#: sequencer.c:2752
a6cd2cc4
JX
6682msgid "revert is already in progress"
6683msgstr "一个还原操作已在进行"
a0b6b246 6684
ddc12c42 6685#: sequencer.c:2754
a6cd2cc4
JX
6686#, c-format
6687msgid "try \"git revert (--continue | %s--abort | --quit)\""
6688msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
6689
ddc12c42 6690#: sequencer.c:2757
a6cd2cc4
JX
6691msgid "cherry-pick is already in progress"
6692msgstr "拣选操作已在进行"
6693
ddc12c42 6694#: sequencer.c:2759
a6cd2cc4
JX
6695#, c-format
6696msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
6697msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
a0b6b246 6698
ddc12c42 6699#: sequencer.c:2773
a0b6b246
JX
6700#, c-format
6701msgid "could not create sequencer directory '%s'"
6702msgstr "不能创建序列目录 '%s'"
6703
ddc12c42 6704#: sequencer.c:2788
a0b6b246
JX
6705msgid "could not lock HEAD"
6706msgstr "不能锁定 HEAD"
6707
ddc12c42 6708#: sequencer.c:2848 sequencer.c:4209
a0b6b246
JX
6709msgid "no cherry-pick or revert in progress"
6710msgstr "拣选或还原操作并未进行"
6711
ddc12c42 6712#: sequencer.c:2850 sequencer.c:2861
a0b6b246
JX
6713msgid "cannot resolve HEAD"
6714msgstr "不能解析 HEAD"
6715
ddc12c42 6716#: sequencer.c:2852 sequencer.c:2896
a0b6b246
JX
6717msgid "cannot abort from a branch yet to be born"
6718msgstr "不能从尚未建立的分支终止"
6719
ddc12c42 6720#: sequencer.c:2882 builtin/grep.c:736
a0b6b246
JX
6721#, c-format
6722msgid "cannot open '%s'"
6723msgstr "不能打开 '%s'"
6724
ddc12c42 6725#: sequencer.c:2884
a0b6b246
JX
6726#, c-format
6727msgid "cannot read '%s': %s"
6728msgstr "不能读取 '%s':%s"
6729
ddc12c42 6730#: sequencer.c:2885
a0b6b246
JX
6731msgid "unexpected end of file"
6732msgstr "意外的文件结束"
6733
ddc12c42 6734#: sequencer.c:2891
a0b6b246
JX
6735#, c-format
6736msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
6737msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
6738
ddc12c42 6739#: sequencer.c:2902
1a79b2f1
JX
6740msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
6741msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
6742
ddc12c42 6743#: sequencer.c:2943
a6cd2cc4
JX
6744msgid "no revert in progress"
6745msgstr "没有正在进行的还原"
6746
ddc12c42 6747#: sequencer.c:2951
a6cd2cc4
JX
6748msgid "no cherry-pick in progress"
6749msgstr "没有正在进行的拣选"
6750
ddc12c42 6751#: sequencer.c:2961
a6cd2cc4
JX
6752msgid "failed to skip the commit"
6753msgstr "无法跳过这个提交"
6754
ddc12c42 6755#: sequencer.c:2968
a6cd2cc4
JX
6756msgid "there is nothing to skip"
6757msgstr "没有要跳过的"
6758
ddc12c42 6759#: sequencer.c:2971
a6cd2cc4
JX
6760#, c-format
6761msgid ""
6762"have you committed already?\n"
6763"try \"git %s --continue\""
6764msgstr ""
6765"您已经提交了么?\n"
6766"试试 \"git %s --continue\""
6767
ddc12c42 6768#: sequencer.c:3095 sequencer.c:4121
31e5e17b
JX
6769#, c-format
6770msgid "could not update %s"
6771msgstr "不能更新 %s"
6772
ddc12c42 6773#: sequencer.c:3134 sequencer.c:4101
1a79b2f1
JX
6774msgid "cannot read HEAD"
6775msgstr "不能读取 HEAD"
6776
ddc12c42 6777#: sequencer.c:3151
c1ac5258
JX
6778#, c-format
6779msgid "unable to copy '%s' to '%s'"
6780msgstr "无法拷贝 '%s' 至 '%s'"
6781
ddc12c42 6782#: sequencer.c:3159
c1ac5258
JX
6783#, c-format
6784msgid ""
6785"You can amend the commit now, with\n"
6786"\n"
6787" git commit --amend %s\n"
6788"\n"
6789"Once you are satisfied with your changes, run\n"
6790"\n"
6791" git rebase --continue\n"
6792msgstr ""
6793"您现在可以修补这个提交,使用\n"
6794"\n"
6795" git commit --amend %s\n"
6796"\n"
6797"当您对变更感到满意,执行\n"
6798"\n"
6799" git rebase --continue\n"
6800
ddc12c42 6801#: sequencer.c:3169
c1ac5258
JX
6802#, c-format
6803msgid "Could not apply %s... %.*s"
6804msgstr "不能应用 %s... %.*s"
6805
ddc12c42 6806#: sequencer.c:3176
c1ac5258
JX
6807#, c-format
6808msgid "Could not merge %.*s"
6809msgstr "不能合并 %.*s"
6810
ddc12c42 6811#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641
1a79b2f1
JX
6812#, c-format
6813msgid "could not copy '%s' to '%s'"
6814msgstr "不能拷贝 '%s' 至 '%s'"
6815
1a79b2f1 6816# 译者:注意保持前导空格
ddc12c42 6817#: sequencer.c:3221
1a79b2f1
JX
6818#, c-format
6819msgid ""
6820"execution failed: %s\n"
6821"%sYou can fix the problem, and then run\n"
6822"\n"
6823" git rebase --continue\n"
6824"\n"
6825msgstr ""
6826"执行失败:%s\n"
6827"%s您可以改正该问题,然后运行\n"
6828"\n"
6829" git rebase --continue\n"
6830"\n"
6831
ddc12c42 6832#: sequencer.c:3227
1a79b2f1
JX
6833msgid "and made changes to the index and/or the working tree\n"
6834msgstr "并且修改索引和/或工作区\n"
6835
ddc12c42 6836#: sequencer.c:3233
1a79b2f1
JX
6837#, c-format
6838msgid ""
6839"execution succeeded: %s\n"
6840"but left changes to the index and/or the working tree\n"
6841"Commit or stash your changes, and then run\n"
6842"\n"
6843" git rebase --continue\n"
6844"\n"
6845msgstr ""
6846"执行成功:%s\n"
6847"但是在索引和/或工作区中存在变更\n"
a4f16749 6848"提交或贮藏修改,然后运行\n"
1a79b2f1
JX
6849"\n"
6850" git rebase --continue\n"
6851"\n"
6852
ddc12c42 6853#: sequencer.c:3294
c1ac5258
JX
6854#, c-format
6855msgid "illegal label name: '%.*s'"
6856msgstr "非法的标签名称:'%.*s'"
6857
ddc12c42 6858#: sequencer.c:3348
fd8cb379
JX
6859msgid "writing fake root commit"
6860msgstr "写伪根提交"
6861
ddc12c42 6862#: sequencer.c:3353
fd8cb379
JX
6863msgid "writing squash-onto"
6864msgstr "写入 squash-onto"
6865
ddc12c42 6866#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882
fd8cb379
JX
6867#, c-format
6868msgid "failed to find tree of %s"
6869msgstr "无法找到 %s 指向的树。"
6870
ddc12c42 6871#: sequencer.c:3436
c1ac5258
JX
6872#, c-format
6873msgid "could not resolve '%s'"
6874msgstr "无法解析 '%s'"
6875
ddc12c42 6876#: sequencer.c:3467
fd8cb379
JX
6877msgid "cannot merge without a current revision"
6878msgstr "没有当前版本不能合并"
6879
ddc12c42 6880#: sequencer.c:3489
fd8cb379 6881#, c-format
c1ac5258
JX
6882msgid "unable to parse '%.*s'"
6883msgstr "无法解析 '%.*s'"
6884
ddc12c42 6885#: sequencer.c:3498
c1ac5258
JX
6886#, c-format
6887msgid "nothing to merge: '%.*s'"
6888msgstr "无可用合并:'%.*s'"
6889
ddc12c42 6890#: sequencer.c:3510
c1ac5258
JX
6891msgid "octopus merge cannot be executed on top of a [new root]"
6892msgstr "章鱼合并不能在一个新的根提交上执行"
fd8cb379 6893
ddc12c42 6894#: sequencer.c:3526
fd8cb379
JX
6895#, c-format
6896msgid "could not get commit message of '%s'"
6897msgstr "不能获取 '%s' 的提交说明"
6898
ddc12c42 6899#: sequencer.c:3688
fd8cb379
JX
6900#, c-format
6901msgid "could not even attempt to merge '%.*s'"
6902msgstr "甚至不能尝试合并 '%.*s'"
6903
ddc12c42 6904#: sequencer.c:3704
fd8cb379
JX
6905msgid "merge: Unable to write new index file"
6906msgstr "合并:无法写入新索引文件"
6907
ddc12c42 6908#: sequencer.c:3773 builtin/rebase.c:733
1a79b2f1 6909#, c-format
a4f16749
JX
6910msgid "Applied autostash.\n"
6911msgstr "已应用 autostash。\n"
1a79b2f1 6912
ddc12c42 6913#: sequencer.c:3785
1a79b2f1
JX
6914#, c-format
6915msgid "cannot store %s"
6916msgstr "不能存储 %s"
6917
ddc12c42 6918#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113
1a79b2f1
JX
6919#, c-format
6920msgid ""
6921"Applying autostash resulted in conflicts.\n"
6922"Your changes are safe in the stash.\n"
6923"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
6924msgstr ""
6925"应用 autostash 导致冲突。\n"
a4f16749 6926"您的修改安全地保存在贮藏区中。\n"
1a79b2f1
JX
6927"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
6928
ddc12c42 6929#: sequencer.c:3849
4c27fcb5
JX
6930#, c-format
6931msgid "could not checkout %s"
6932msgstr "不能检出 %s"
6933
ddc12c42 6934#: sequencer.c:3863
4c27fcb5
JX
6935#, c-format
6936msgid "%s: not a valid OID"
5b533632 6937msgstr "%s:不是一个有效的对象 ID"
4c27fcb5 6938
ddc12c42 6939#: sequencer.c:3868 git-rebase--preserve-merges.sh:779
4c27fcb5
JX
6940msgid "could not detach HEAD"
6941msgstr "不能分离头指针"
6942
ddc12c42 6943#: sequencer.c:3883
4c27fcb5
JX
6944#, c-format
6945msgid "Stopped at HEAD\n"
6946msgstr "停止在 HEAD\n"
6947
ddc12c42 6948#: sequencer.c:3885
4c27fcb5
JX
6949#, c-format
6950msgid "Stopped at %s\n"
6951msgstr "停止在 %s\n"
6952
ddc12c42 6953#: sequencer.c:3893
fd8cb379
JX
6954#, c-format
6955msgid ""
6956"Could not execute the todo command\n"
6957"\n"
6958" %.*s\n"
6959"It has been rescheduled; To edit the command before continuing, please\n"
6960"edit the todo list first:\n"
6961"\n"
6962" git rebase --edit-todo\n"
6963" git rebase --continue\n"
6964msgstr ""
6965"无法执行待办命令\n"
6966"\n"
6967" %.*s\n"
6968"已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
6969"\n"
6970" git rebase --edit-todo\n"
6971" git rebase --continue\n"
6972
ddc12c42 6973#: sequencer.c:3979
1a79b2f1 6974#, c-format
87cb7997
JX
6975msgid "Stopped at %s... %.*s\n"
6976msgstr "停止在 %s... %.*s\n"
1a79b2f1 6977
ddc12c42 6978#: sequencer.c:4050
1a79b2f1
JX
6979#, c-format
6980msgid "unknown command %d"
6981msgstr "未知命令 %d"
6982
ddc12c42 6983#: sequencer.c:4109
1a79b2f1
JX
6984msgid "could not read orig-head"
6985msgstr "不能读取 orig-head"
6986
ddc12c42 6987#: sequencer.c:4114
1a79b2f1
JX
6988msgid "could not read 'onto'"
6989msgstr "不能读取 'onto'"
6990
ddc12c42 6991#: sequencer.c:4128
1a79b2f1
JX
6992#, c-format
6993msgid "could not update HEAD to %s"
6994msgstr "不能更新 HEAD 为 %s"
6995
ddc12c42 6996#: sequencer.c:4221
1a79b2f1
JX
6997msgid "cannot rebase: You have unstaged changes."
6998msgstr "不能变基:您有未暂存的变更。"
6999
ddc12c42 7000#: sequencer.c:4230
1a79b2f1
JX
7001msgid "cannot amend non-existing commit"
7002msgstr "不能修补不存在的提交"
7003
ddc12c42 7004#: sequencer.c:4232
1a79b2f1
JX
7005#, c-format
7006msgid "invalid file: '%s'"
7007msgstr "无效文件:'%s'"
7008
ddc12c42 7009#: sequencer.c:4234
1a79b2f1
JX
7010#, c-format
7011msgid "invalid contents: '%s'"
7012msgstr "无效内容:'%s'"
7013
ddc12c42 7014#: sequencer.c:4237
1a79b2f1
JX
7015msgid ""
7016"\n"
7017"You have uncommitted changes in your working tree. Please, commit them\n"
7018"first and then run 'git rebase --continue' again."
87cb7997
JX
7019msgstr ""
7020"\n"
7021"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
1a79b2f1 7022
ddc12c42 7023#: sequencer.c:4273 sequencer.c:4312
fd8cb379
JX
7024#, c-format
7025msgid "could not write file: '%s'"
7026msgstr "不能写入文件:'%s'"
7027
ddc12c42 7028#: sequencer.c:4327
fd8cb379
JX
7029msgid "could not remove CHERRY_PICK_HEAD"
7030msgstr "不能删除 CHERRY_PICK_HEAD"
7031
ddc12c42 7032#: sequencer.c:4334
1a79b2f1
JX
7033msgid "could not commit staged changes."
7034msgstr "不能提交暂存的修改。"
7035
ddc12c42 7036#: sequencer.c:4440
a0b6b246
JX
7037#, c-format
7038msgid "%s: can't cherry-pick a %s"
7039msgstr "%s:不能拣选一个%s"
7040
ddc12c42 7041#: sequencer.c:4444
a0b6b246
JX
7042#, c-format
7043msgid "%s: bad revision"
7044msgstr "%s:错误的版本"
7045
ddc12c42 7046#: sequencer.c:4479
a0b6b246
JX
7047msgid "can't revert as initial commit"
7048msgstr "不能作为初始提交回退"
7049
ddc12c42 7050#: sequencer.c:4952
6937cb4e
JX
7051msgid "make_script: unhandled options"
7052msgstr "make_script:有未能处理的选项"
7053
ddc12c42 7054#: sequencer.c:4955
6937cb4e
JX
7055msgid "make_script: error preparing revisions"
7056msgstr "make_script:准备版本时错误"
7057
ddc12c42 7058#: sequencer.c:5113
6937cb4e
JX
7059msgid ""
7060"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
7061"continue'.\n"
7062"Or you can abort the rebase with 'git rebase --abort'.\n"
7063msgstr ""
7064"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
7065"或者您可以用 'git rebase --abort' 终止变基。\n"
7066
ddc12c42 7067#: sequencer.c:5226 sequencer.c:5243
4c27fcb5
JX
7068msgid "nothing to do"
7069msgstr "无事可做"
7070
ddc12c42 7071#: sequencer.c:5257
4c27fcb5
JX
7072msgid "could not skip unnecessary pick commands"
7073msgstr "无法跳过不必要的拣选"
7074
ddc12c42 7075#: sequencer.c:5351
6937cb4e
JX
7076msgid "the script was already rearranged."
7077msgstr "脚本已经重新编排。"
7078
a5cd71ca 7079#: setup.c:124
31e5e17b
JX
7080#, c-format
7081msgid "'%s' is outside repository"
7082msgstr "'%s' 在仓库之外"
7083
a5cd71ca 7084#: setup.c:174
a0b6b246 7085#, c-format
6792b93b 7086msgid ""
a0b6b246
JX
7087"%s: no such path in the working tree.\n"
7088"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
7089msgstr ""
7090"%s:工作区中无此路径。\n"
58b6f078 7091"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
6792b93b 7092
a5cd71ca 7093#: setup.c:187
90314792 7094#, c-format
a0b6b246
JX
7095msgid ""
7096"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
7097"Use '--' to separate paths from revisions, like this:\n"
7098"'git <command> [<revision>...] -- [<file>...]'"
7099msgstr ""
7100"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
7101"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 7102"'git <命令> [<版本>...] -- [<文件>...]'"
6792b93b 7103
a5cd71ca 7104#: setup.c:236
31e5e17b
JX
7105#, c-format
7106msgid "option '%s' must come before non-option arguments"
7107msgstr "选项 '%s' 必须在其他非选项参数之前"
7108
a5cd71ca 7109#: setup.c:255
a0b6b246
JX
7110#, c-format
7111msgid ""
7112"ambiguous argument '%s': both revision and filename\n"
7113"Use '--' to separate paths from revisions, like this:\n"
7114"'git <command> [<revision>...] -- [<file>...]'"
7115msgstr ""
7116"有歧义的参数 '%s':可同时是版本和文件\n"
7117"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 7118"'git <命令> [<版本>...] -- [<文件>...]'"
2e8451e8 7119
a5cd71ca 7120#: setup.c:391
31e5e17b
JX
7121msgid "unable to set up work tree using invalid config"
7122msgstr "无法使用无效配置来创建工作区"
7123
a5cd71ca 7124#: setup.c:395
31e5e17b 7125msgid "this operation must be run in a work tree"
610f8099 7126msgstr "该操作必须在一个工作区中运行"
31e5e17b 7127
a5cd71ca 7128#: setup.c:541
a0b6b246
JX
7129#, c-format
7130msgid "Expected git repo version <= %d, found %d"
7131msgstr "期望 git 仓库版本 <= %d,却得到 %d"
6792b93b 7132
a5cd71ca 7133#: setup.c:549
a0b6b246
JX
7134msgid "unknown repository extensions found:"
7135msgstr "发现未知的仓库扩展:"
2e8451e8 7136
a5cd71ca 7137#: setup.c:568
1003b3a5 7138#, c-format
31e5e17b 7139msgid "error opening '%s'"
c1ac5258 7140msgstr "打开 '%s' 出错"
1003b3a5 7141
a5cd71ca 7142#: setup.c:570
31e5e17b
JX
7143#, c-format
7144msgid "too large to be a .git file: '%s'"
610f8099 7145msgstr "文件太大,无法作为 .git 文件:'%s'"
31e5e17b 7146
a5cd71ca 7147#: setup.c:572
31e5e17b
JX
7148#, c-format
7149msgid "error reading %s"
c1ac5258 7150msgstr "读取 %s 出错"
31e5e17b 7151
a5cd71ca 7152#: setup.c:574
31e5e17b
JX
7153#, c-format
7154msgid "invalid gitfile format: %s"
7155msgstr "无效的 gitfile 格式:%s"
7156
a5cd71ca 7157#: setup.c:576
31e5e17b
JX
7158#, c-format
7159msgid "no path in gitfile: %s"
7160msgstr "在 gitfile 中没有路径:%s"
7161
a5cd71ca 7162#: setup.c:578
31e5e17b
JX
7163#, c-format
7164msgid "not a git repository: %s"
7165msgstr "不是一个 git 仓库:%s"
7166
a5cd71ca 7167#: setup.c:677
31e5e17b
JX
7168#, c-format
7169msgid "'$%s' too big"
7170msgstr "'$%s' 太大"
7171
a5cd71ca 7172#: setup.c:691
31e5e17b
JX
7173#, c-format
7174msgid "not a git repository: '%s'"
7175msgstr "不是一个 git 仓库:'%s'"
7176
a5cd71ca 7177#: setup.c:720 setup.c:722 setup.c:753
31e5e17b
JX
7178#, c-format
7179msgid "cannot chdir to '%s'"
7180msgstr "不能切换目录到 '%s'"
7181
a5cd71ca 7182#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
31e5e17b 7183msgid "cannot come back to cwd"
a0b6b246 7184msgstr "无法返回当前工作目录"
1003b3a5 7185
a5cd71ca 7186#: setup.c:852
31e5e17b
JX
7187#, c-format
7188msgid "failed to stat '%*s%s%s'"
c1ac5258 7189msgstr "获取 '%*s%s%s' 状态(stat)失败"
31e5e17b 7190
a5cd71ca 7191#: setup.c:1090
a0b6b246
JX
7192msgid "Unable to read current working directory"
7193msgstr "不能读取当前工作目录"
1003b3a5 7194
a5cd71ca 7195#: setup.c:1099 setup.c:1105
87cb7997 7196#, c-format
31e5e17b 7197msgid "cannot change to '%s'"
87cb7997
JX
7198msgstr "不能切换到 '%s'"
7199
a5cd71ca 7200#: setup.c:1110
06991777
JX
7201#, c-format
7202msgid "not a git repository (or any of the parent directories): %s"
7203msgstr "不是一个 git 仓库(或者任何父目录):%s"
7204
a5cd71ca 7205#: setup.c:1116
a0b6b246
JX
7206#, c-format
7207msgid ""
31e5e17b 7208"not a git repository (or any parent up to mount point %s)\n"
a0b6b246
JX
7209"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
7210msgstr ""
31e5e17b 7211"不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
a0b6b246 7212"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
1003b3a5 7213
a5cd71ca 7214#: setup.c:1227
a0b6b246
JX
7215#, c-format
7216msgid ""
31e5e17b 7217"problem with core.sharedRepository filemode value (0%.3o).\n"
a0b6b246
JX
7218"The owner of files must always have read and write permissions."
7219msgstr ""
31e5e17b 7220"参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
a0b6b246 7221"文件属主必须始终拥有读写权限。"
6792b93b 7222
a5cd71ca 7223#: setup.c:1271
31e5e17b
JX
7224msgid "open /dev/null or dup failed"
7225msgstr "不能打开或者复制 /dev/null"
7226
a5cd71ca 7227#: setup.c:1286
31e5e17b
JX
7228msgid "fork failed"
7229msgstr "fork 失败"
7230
a5cd71ca 7231#: setup.c:1291
31e5e17b
JX
7232msgid "setsid failed"
7233msgstr "setsid 失败"
7234
a5cd71ca 7235#: sha1-file.c:452
c1ac5258
JX
7236#, c-format
7237msgid "object directory %s does not exist; check .git/objects/info/alternates"
7238msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates"
7239
a5cd71ca 7240#: sha1-file.c:503
c1ac5258
JX
7241#, c-format
7242msgid "unable to normalize alternate object path: %s"
7243msgstr "无法规范化备用对象路径:%s"
7244
a5cd71ca 7245#: sha1-file.c:575
c1ac5258
JX
7246#, c-format
7247msgid "%s: ignoring alternate object stores, nesting too deep"
7248msgstr "%s:忽略备用对象库,嵌套太深"
7249
a5cd71ca 7250#: sha1-file.c:582
c1ac5258
JX
7251#, c-format
7252msgid "unable to normalize object directory: %s"
7253msgstr "无法规范化对象目录: %s"
7254
a5cd71ca 7255#: sha1-file.c:625
c1ac5258
JX
7256msgid "unable to fdopen alternates lockfile"
7257msgstr "无法 fdopen 替换锁文件"
7258
a5cd71ca 7259#: sha1-file.c:643
c1ac5258
JX
7260msgid "unable to read alternates file"
7261msgstr "无法读取替代文件"
7262
a5cd71ca 7263#: sha1-file.c:650
c1ac5258
JX
7264msgid "unable to move new alternates file into place"
7265msgstr "无法将新的替代文件移动到位"
7266
a5cd71ca 7267#: sha1-file.c:685
a0b6b246
JX
7268#, c-format
7269msgid "path '%s' does not exist"
7270msgstr "路径 '%s' 不存在"
7271
a5cd71ca 7272#: sha1-file.c:711
a0b6b246
JX
7273#, c-format
7274msgid "reference repository '%s' as a linked checkout is not supported yet."
7275msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
7276
a5cd71ca 7277#: sha1-file.c:717
a0b6b246
JX
7278#, c-format
7279msgid "reference repository '%s' is not a local repository."
7280msgstr "参考仓库 '%s' 不是一个本地仓库。"
7281
a5cd71ca 7282#: sha1-file.c:723
a0b6b246
JX
7283#, c-format
7284msgid "reference repository '%s' is shallow"
7285msgstr "参考仓库 '%s' 是一个浅克隆"
7286
a5cd71ca 7287#: sha1-file.c:731
a0b6b246
JX
7288#, c-format
7289msgid "reference repository '%s' is grafted"
fd8cb379 7290msgstr "参考仓库 '%s' 已被移植"
a0b6b246 7291
a5cd71ca 7292#: sha1-file.c:791
a6cd2cc4
JX
7293#, c-format
7294msgid "invalid line while parsing alternate refs: %s"
7295msgstr "解析备用引用时无效的行:%s"
7296
a5cd71ca 7297#: sha1-file.c:943
c1ac5258
JX
7298#, c-format
7299msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
7300msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>"
7301
a5cd71ca 7302#: sha1-file.c:964
c1ac5258
JX
7303msgid "mmap failed"
7304msgstr "mmap 失败"
7305
a5cd71ca 7306#: sha1-file.c:1128
c1ac5258
JX
7307#, c-format
7308msgid "object file %s is empty"
7309msgstr "对象文件 %s 为空"
7310
a5cd71ca 7311#: sha1-file.c:1252 sha1-file.c:2392
c1ac5258
JX
7312#, c-format
7313msgid "corrupt loose object '%s'"
7314msgstr "损坏的松散对象 '%s'"
7315
a5cd71ca 7316#: sha1-file.c:1254 sha1-file.c:2396
c1ac5258
JX
7317#, c-format
7318msgid "garbage at end of loose object '%s'"
7319msgstr "松散对象 '%s' 后面有垃圾数据"
7320
a5cd71ca 7321#: sha1-file.c:1296
c1ac5258
JX
7322msgid "invalid object type"
7323msgstr "无效的对象类型"
7324
a5cd71ca 7325#: sha1-file.c:1380
c1ac5258
JX
7326#, c-format
7327msgid "unable to unpack %s header with --allow-unknown-type"
7328msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
7329
a5cd71ca 7330#: sha1-file.c:1383
c1ac5258
JX
7331#, c-format
7332msgid "unable to unpack %s header"
7333msgstr "无法解开 %s 头部"
7334
a5cd71ca 7335#: sha1-file.c:1389
c1ac5258
JX
7336#, c-format
7337msgid "unable to parse %s header with --allow-unknown-type"
7338msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
7339
a5cd71ca 7340#: sha1-file.c:1392
c1ac5258
JX
7341#, c-format
7342msgid "unable to parse %s header"
7343msgstr "无法解析 %s 头部"
7344
a5cd71ca 7345#: sha1-file.c:1584
c1ac5258
JX
7346#, c-format
7347msgid "failed to read object %s"
7348msgstr "读取对象 %s 失败"
7349
a5cd71ca 7350#: sha1-file.c:1588
c1ac5258
JX
7351#, c-format
7352msgid "replacement %s not found for %s"
7353msgstr "找不到 %2$s 的替代 %1$s"
7354
a5cd71ca 7355#: sha1-file.c:1592
c1ac5258
JX
7356#, c-format
7357msgid "loose object %s (stored in %s) is corrupt"
7358msgstr "松散对象 %s(保存在 %s)已损坏"
7359
a5cd71ca 7360#: sha1-file.c:1596
c1ac5258
JX
7361#, c-format
7362msgid "packed object %s (stored in %s) is corrupt"
7363msgstr "打包对象 %s(保存在 %s)已损坏"
7364
a5cd71ca 7365#: sha1-file.c:1699
c1ac5258 7366#, c-format
06991777
JX
7367msgid "unable to write file %s"
7368msgstr "无法写文件 %s"
c1ac5258 7369
a5cd71ca 7370#: sha1-file.c:1706
c1ac5258
JX
7371#, c-format
7372msgid "unable to set permission to '%s'"
7373msgstr "无法为 '%s' 设置权限"
7374
a5cd71ca 7375#: sha1-file.c:1713
c1ac5258
JX
7376msgid "file write error"
7377msgstr "文件写错误"
7378
a5cd71ca 7379#: sha1-file.c:1732
06991777
JX
7380msgid "error when closing loose object file"
7381msgstr "关闭松散对象文件时出错"
c1ac5258 7382
a5cd71ca 7383#: sha1-file.c:1797
c1ac5258
JX
7384#, c-format
7385msgid "insufficient permission for adding an object to repository database %s"
7386msgstr "权限不足,无法在仓库对象库 %s 中添加对象"
7387
a5cd71ca 7388#: sha1-file.c:1799
c1ac5258
JX
7389msgid "unable to create temporary file"
7390msgstr "无法创建临时文件"
7391
a5cd71ca 7392#: sha1-file.c:1823
06991777
JX
7393msgid "unable to write loose object file"
7394msgstr "不能写松散对象文件"
c1ac5258 7395
a5cd71ca 7396#: sha1-file.c:1829
c1ac5258
JX
7397#, c-format
7398msgid "unable to deflate new object %s (%d)"
7399msgstr "不能压缩新对象 %s(%d)"
7400
a5cd71ca 7401#: sha1-file.c:1833
c1ac5258
JX
7402#, c-format
7403msgid "deflateEnd on object %s failed (%d)"
7404msgstr "在对象 %s 上调用 deflateEnd 失败(%d)"
7405
a5cd71ca 7406#: sha1-file.c:1837
c1ac5258
JX
7407#, c-format
7408msgid "confused by unstable object source data for %s"
7409msgstr "被 %s 的不稳定对象源数据搞糊涂了"
7410
a5cd71ca 7411#: sha1-file.c:1847 builtin/pack-objects.c:925
c1ac5258
JX
7412#, c-format
7413msgid "failed utime() on %s"
7414msgstr "在 %s 上调用 utime() 失败"
7415
a5cd71ca 7416#: sha1-file.c:1922
c1ac5258 7417#, c-format
06991777
JX
7418msgid "cannot read object for %s"
7419msgstr "不能读取对象 %s"
c1ac5258 7420
a5cd71ca 7421#: sha1-file.c:1962
c1ac5258
JX
7422msgid "corrupt commit"
7423msgstr "损坏的提交"
7424
a5cd71ca 7425#: sha1-file.c:1970
c1ac5258
JX
7426msgid "corrupt tag"
7427msgstr "损坏的标签"
7428
a5cd71ca 7429#: sha1-file.c:2069
c1ac5258
JX
7430#, c-format
7431msgid "read error while indexing %s"
7432msgstr "索引 %s 时读取错误"
7433
a5cd71ca 7434#: sha1-file.c:2072
c1ac5258
JX
7435#, c-format
7436msgid "short read while indexing %s"
7437msgstr "索引 %s 时读入不完整"
7438
a5cd71ca 7439#: sha1-file.c:2145 sha1-file.c:2154
c1ac5258
JX
7440#, c-format
7441msgid "%s: failed to insert into database"
7442msgstr "%s:插入数据库失败"
7443
a5cd71ca 7444#: sha1-file.c:2160
c1ac5258
JX
7445#, c-format
7446msgid "%s: unsupported file type"
7447msgstr "%s:不支持的文件类型"
7448
a5cd71ca 7449#: sha1-file.c:2184
c1ac5258
JX
7450#, c-format
7451msgid "%s is not a valid object"
7452msgstr "%s 不是一个有效的对象"
7453
a5cd71ca 7454#: sha1-file.c:2186
c1ac5258
JX
7455#, c-format
7456msgid "%s is not a valid '%s' object"
7457msgstr "%s 不是一个有效的 '%s' 对象"
7458
a5cd71ca 7459#: sha1-file.c:2213 builtin/index-pack.c:155
c1ac5258
JX
7460#, c-format
7461msgid "unable to open %s"
7462msgstr "不能打开 %s"
7463
a5cd71ca 7464#: sha1-file.c:2403 sha1-file.c:2455
c1ac5258 7465#, c-format
06991777
JX
7466msgid "hash mismatch for %s (expected %s)"
7467msgstr "%s 的哈希值不匹配(预期 %s)"
c1ac5258 7468
a5cd71ca 7469#: sha1-file.c:2427
c1ac5258
JX
7470#, c-format
7471msgid "unable to mmap %s"
7472msgstr "不能 mmap %s"
7473
a5cd71ca 7474#: sha1-file.c:2432
c1ac5258
JX
7475#, c-format
7476msgid "unable to unpack header of %s"
7477msgstr "无法解压缩 %s 的头部"
7478
a5cd71ca 7479#: sha1-file.c:2438
c1ac5258
JX
7480#, c-format
7481msgid "unable to parse header of %s"
7482msgstr "无法解析 %s 的头部"
7483
a5cd71ca 7484#: sha1-file.c:2449
c1ac5258
JX
7485#, c-format
7486msgid "unable to unpack contents of %s"
7487msgstr "无法解压缩 %s 的内容"
7488
a5cd71ca 7489#: sha1-name.c:487
a0b6b246
JX
7490#, c-format
7491msgid "short SHA1 %s is ambiguous"
29004bbb 7492msgstr "短 SHA1 %s 存在歧义"
a0b6b246 7493
a5cd71ca 7494#: sha1-name.c:498
a0b6b246
JX
7495msgid "The candidates are:"
7496msgstr "候选者有:"
7497
a5cd71ca 7498#: sha1-name.c:797
a0b6b246
JX
7499msgid ""
7500"Git normally never creates a ref that ends with 40 hex characters\n"
7501"because it will be ignored when you just specify 40-hex. These refs\n"
7502"may be created by mistake. For example,\n"
7503"\n"
a6cd2cc4 7504" git switch -c $br $(git rev-parse ...)\n"
a0b6b246
JX
7505"\n"
7506"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
7507"examine these refs and maybe delete them. Turn this message off by\n"
7508"running \"git config advice.objectNameWarning false\""
7509msgstr ""
a6cd2cc4
JX
7510"Git 通常不会创建一个以40个十六进制字符结尾的引用,因为当您只提供40\n"
7511"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n"
a0b6b246 7512"\n"
a6cd2cc4 7513" git switch -c $br $(git rev-parse ...)\n"
a0b6b246 7514"\n"
a6cd2cc4
JX
7515"当 \"$br\" 某种原因空白时,一个40位十六进制的引用将被创建。请检查这些\n"
7516"引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
7517"false\" 命令关闭本消息通知。"
7518
7519#. TRANSLATORS: IEC 80000-13:2008 gibibyte
a5cd71ca 7520#: strbuf.c:822
a6cd2cc4
JX
7521#, c-format
7522msgid "%u.%2.2u GiB"
7523msgstr "%u.%2.2u GiB"
7524
7525#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
a5cd71ca 7526#: strbuf.c:824
a6cd2cc4
JX
7527#, c-format
7528msgid "%u.%2.2u GiB/s"
7529msgstr "%u.%2.2u GiB/s"
7530
7531#. TRANSLATORS: IEC 80000-13:2008 mebibyte
a5cd71ca 7532#: strbuf.c:832
a6cd2cc4
JX
7533#, c-format
7534msgid "%u.%2.2u MiB"
7535msgstr "%u.%2.2u MiB"
7536
7537#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
a5cd71ca 7538#: strbuf.c:834
a6cd2cc4
JX
7539#, c-format
7540msgid "%u.%2.2u MiB/s"
7541msgstr "%u.%2.2u MiB/s"
7542
7543#. TRANSLATORS: IEC 80000-13:2008 kibibyte
a5cd71ca 7544#: strbuf.c:841
a6cd2cc4
JX
7545#, c-format
7546msgid "%u.%2.2u KiB"
7547msgstr "%u.%2.2u KiB"
7548
7549#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
a5cd71ca 7550#: strbuf.c:843
a6cd2cc4
JX
7551#, c-format
7552msgid "%u.%2.2u KiB/s"
7553msgstr "%u.%2.2u KiB/s"
7554
7555#. TRANSLATORS: IEC 80000-13:2008 byte
a5cd71ca 7556#: strbuf.c:849
a6cd2cc4
JX
7557#, c-format
7558msgid "%u byte"
7559msgid_plural "%u bytes"
7560msgstr[0] "%u 字节"
7561msgstr[1] "%u 字节"
7562
7563#. TRANSLATORS: IEC 80000-13:2008 byte/second
a5cd71ca 7564#: strbuf.c:851
a6cd2cc4
JX
7565#, c-format
7566msgid "%u byte/s"
7567msgid_plural "%u bytes/s"
7568msgstr[0] "%u 字节/秒"
7569msgstr[1] "%u 字节/秒"
a0b6b246 7570
ddc12c42
JX
7571#: strbuf.c:1149
7572#, c-format
7573msgid "could not edit '%s'"
7574msgstr "不能编辑 '%s'"
7575
06991777 7576#: submodule.c:114 submodule.c:143
a0b6b246
JX
7577msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
7578msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
7579
06991777 7580#: submodule.c:118 submodule.c:147
a0b6b246
JX
7581#, c-format
7582msgid "Could not find section in .gitmodules where path=%s"
7583msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
7584
06991777 7585#: submodule.c:154
a0b6b246
JX
7586#, c-format
7587msgid "Could not remove .gitmodules entry for %s"
7588msgstr "无法移除 %s 的 .gitmodules 条目"
7589
06991777 7590#: submodule.c:165
a0b6b246
JX
7591msgid "staging updated .gitmodules failed"
7592msgstr "将更新后 .gitmodules 添加暂存区失败"
7593
06991777 7594#: submodule.c:327
a4f16749
JX
7595#, c-format
7596msgid "in unpopulated submodule '%s'"
7597msgstr "位于未检出的子模组 '%s'"
7598
06991777 7599#: submodule.c:358
a4f16749
JX
7600#, c-format
7601msgid "Pathspec '%s' is in submodule '%.*s'"
7602msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
7603
d46c5519 7604#: submodule.c:910
6937cb4e
JX
7605#, c-format
7606msgid "submodule entry '%s' (%s) is a %s, not a commit"
493a9322 7607msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
6937cb4e 7608
ddc12c42 7609#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016
6937cb4e
JX
7610msgid "Failed to resolve HEAD as a valid ref."
7611msgstr "无法将 HEAD 解析为有效引用。"
7612
d46c5519 7613#: submodule.c:1481
06991777
JX
7614#, c-format
7615msgid "Could not access submodule '%s'"
7616msgstr "无法访问子模组 '%s'"
7617
d46c5519 7618#: submodule.c:1651
1a79b2f1 7619#, c-format
87cb7997 7620msgid "'%s' not recognized as a git repository"
65e2041e 7621msgstr "无法将 '%s' 识别为一个 git 仓库"
1a79b2f1 7622
d46c5519 7623#: submodule.c:1789
1a79b2f1 7624#, c-format
87cb7997
JX
7625msgid "could not start 'git status' in submodule '%s'"
7626msgstr "无法在子模组 '%s' 中启动 'git status'"
1a79b2f1 7627
d46c5519 7628#: submodule.c:1802
87cb7997
JX
7629#, c-format
7630msgid "could not run 'git status' in submodule '%s'"
7631msgstr "无法在子模组 '%s' 中执行 'git status'"
7632
d46c5519 7633#: submodule.c:1817
06991777
JX
7634#, c-format
7635msgid "Could not unset core.worktree setting in submodule '%s'"
7636msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
7637
d46c5519 7638#: submodule.c:1907
87cb7997
JX
7639#, c-format
7640msgid "submodule '%s' has dirty index"
7641msgstr "子模组 '%s' 中有脏索引"
7642
d46c5519 7643#: submodule.c:1959
c1ac5258
JX
7644#, c-format
7645msgid "Submodule '%s' could not be updated."
7646msgstr "子模组 '%s' 无法被更新。"
7647
ddc12c42
JX
7648#: submodule.c:2027
7649#, c-format
7650msgid "submodule git dir '%s' is inside git dir '%.*s'"
7651msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
7652
7653#: submodule.c:2048
1a79b2f1
JX
7654#, c-format
7655msgid ""
7656"relocate_gitdir for submodule '%s' with more than one worktree not supported"
7657msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
7658
ddc12c42 7659#: submodule.c:2060 submodule.c:2119
1a79b2f1
JX
7660#, c-format
7661msgid "could not lookup name for submodule '%s'"
7662msgstr "不能查询子模组 '%s' 的名称"
7663
ddc12c42
JX
7664#: submodule.c:2064
7665#, c-format
7666msgid "refusing to move '%s' into an existing git dir"
7667msgstr "禁止移动 '%s' 到现存 git 目录中"
7668
7669#: submodule.c:2071
1a79b2f1
JX
7670#, c-format
7671msgid ""
7672"Migrating git directory of '%s%s' from\n"
7673"'%s' to\n"
7674"'%s'\n"
7675msgstr ""
7676"将 '%s%s' 的 git 目录从\n"
7677"'%s' 迁移至\n"
7678"'%s'\n"
7679
ddc12c42 7680#: submodule.c:2154
1a79b2f1
JX
7681#, c-format
7682msgid "could not recurse into submodule '%s'"
7683msgstr "无法递归进子模组路径 '%s'"
7684
ddc12c42 7685#: submodule.c:2198
87cb7997
JX
7686msgid "could not start ls-files in .."
7687msgstr "无法在 .. 中启动 ls-files"
7688
ddc12c42 7689#: submodule.c:2237
87cb7997
JX
7690#, c-format
7691msgid "ls-tree returned unexpected return code %d"
7692msgstr "ls-tree 返回未知返回值 %d"
7693
a5cd71ca 7694#: submodule-config.c:236
fd8cb379
JX
7695#, c-format
7696msgid "ignoring suspicious submodule name: %s"
7697msgstr "忽略可疑的子模组名称:%s"
7698
a5cd71ca 7699#: submodule-config.c:303
6937cb4e
JX
7700msgid "negative values not allowed for submodule.fetchjobs"
7701msgstr "submodule.fetchjobs 不允许为负值"
7702
a5cd71ca 7703#: submodule-config.c:401
4c27fcb5
JX
7704#, c-format
7705msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
7706msgstr "忽略可能被解析为命令行选项的 '%s':%s"
7707
ddc12c42 7708#: submodule-config.c:498
a0b6b246
JX
7709#, c-format
7710msgid "invalid value for %s"
7711msgstr "%s 的值无效"
7712
ddc12c42 7713#: submodule-config.c:769
4c27fcb5
JX
7714#, c-format
7715msgid "Could not update .gitmodules entry %s"
7716msgstr "不能更新 .gitmodules 条目 %s"
7717
6937cb4e 7718#: trailer.c:238
a0b6b246
JX
7719#, c-format
7720msgid "running trailer command '%s' failed"
7721msgstr "执行 trailer 命令 '%s' 失败"
7722
6937cb4e
JX
7723#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
7724#: trailer.c:557
a0b6b246
JX
7725#, c-format
7726msgid "unknown value '%s' for key '%s'"
7727msgstr "键 '%2$s' 的未知取值 '%1$s'"
7728
4c27fcb5 7729#: trailer.c:539 trailer.c:544 builtin/remote.c:295
a0b6b246
JX
7730#, c-format
7731msgid "more than one %s"
7732msgstr "多于一个 %s"
7733
6937cb4e 7734#: trailer.c:730
a0b6b246
JX
7735#, c-format
7736msgid "empty trailer token in trailer '%.*s'"
7737msgstr "签名 '%.*s' 的键为空"
7738
6937cb4e 7739#: trailer.c:750
a0b6b246
JX
7740#, c-format
7741msgid "could not read input file '%s'"
7742msgstr "不能读取输入文件 '%s'"
7743
6937cb4e 7744#: trailer.c:753
a0b6b246
JX
7745msgid "could not read from stdin"
7746msgstr "不能自标准输入读取"
7747
a5cd71ca 7748#: trailer.c:1011 wrapper.c:665
a0b6b246
JX
7749#, c-format
7750msgid "could not stat %s"
65e2041e 7751msgstr "不能对 %s 调用 stat"
a0b6b246 7752
4c27fcb5 7753#: trailer.c:1013
a0b6b246
JX
7754#, c-format
7755msgid "file %s is not a regular file"
7756msgstr "文件 %s 不是一个正规文件"
7757
4c27fcb5 7758#: trailer.c:1015
a0b6b246
JX
7759#, c-format
7760msgid "file %s is not writable by user"
7761msgstr "文件 %s 用户不可写"
7762
4c27fcb5 7763#: trailer.c:1027
a0b6b246
JX
7764msgid "could not open temporary file"
7765msgstr "不能打开临时文件"
7766
4c27fcb5 7767#: trailer.c:1067
a0b6b246
JX
7768#, c-format
7769msgid "could not rename temporary file to %s"
7770msgstr "不能重命名临时文件为 %s"
7771
fd8cb379 7772#: transport.c:116
a0b6b246
JX
7773#, c-format
7774msgid "Would set upstream of '%s' to '%s' of '%s'\n"
7775msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
7776
a5cd71ca 7777#: transport.c:145
c1ac5258
JX
7778#, c-format
7779msgid "could not read bundle '%s'"
7780msgstr "无法读取 bundle '%s'"
7781
a5cd71ca 7782#: transport.c:214
a0b6b246
JX
7783#, c-format
7784msgid "transport: invalid depth option '%s'"
7785msgstr "传输:无效的深度选项 '%s'"
7786
a5cd71ca 7787#: transport.c:266
d46c5519
JX
7788msgid "see protocol.version in 'git help config' for more details"
7789msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
7790
a5cd71ca 7791#: transport.c:267
d46c5519
JX
7792msgid "server options require protocol version 2 or later"
7793msgstr "服务端选项需要版本 2 协议或更高"
7794
a5cd71ca 7795#: transport.c:632
fd8cb379
JX
7796msgid "could not parse transport.color.* config"
7797msgstr "不能解析 transport.color.* 配置"
7798
a5cd71ca 7799#: transport.c:705
c1ac5258
JX
7800msgid "support for protocol v2 not implemented yet"
7801msgstr "协议 v2 的支持尚未实现"
7802
a5cd71ca 7803#: transport.c:831
c1ac5258
JX
7804#, c-format
7805msgid "unknown value for config '%s': %s"
7806msgstr "配置 '%s' 的取值未知:%s"
7807
a5cd71ca 7808#: transport.c:897
c1ac5258
JX
7809#, c-format
7810msgid "transport '%s' not allowed"
7811msgstr "传输 '%s' 不允许"
7812
a5cd71ca 7813#: transport.c:949
c1ac5258
JX
7814msgid "git-over-rsync is no longer supported"
7815msgstr "不再支持 git-over-rsync"
7816
a5cd71ca 7817#: transport.c:1044
a0b6b246
JX
7818#, c-format
7819msgid ""
7820"The following submodule paths contain changes that can\n"
7821"not be found on any remote:\n"
7822msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
7823
a5cd71ca 7824#: transport.c:1048
a0b6b246
JX
7825#, c-format
7826msgid ""
7827"\n"
7828"Please try\n"
7829"\n"
7830"\tgit push --recurse-submodules=on-demand\n"
7831"\n"
7832"or cd to the path and use\n"
7833"\n"
7834"\tgit push\n"
7835"\n"
7836"to push them to a remote.\n"
7837"\n"
7838msgstr ""
7839"\n"
7840"请尝试\n"
7841"\n"
7842"\tgit push --recurse-submodules=on-demand\n"
7843"\n"
7844"或者进入到子目录执行\n"
7845"\n"
7846"\tgit push\n"
7847"\n"
7848"以推送至远程。\n"
7849"\n"
7850
a5cd71ca 7851#: transport.c:1056
a0b6b246
JX
7852msgid "Aborting."
7853msgstr "正在终止。"
7854
a5cd71ca 7855#: transport.c:1201
c1ac5258
JX
7856msgid "failed to push all needed submodules"
7857msgstr "不能推送全部需要的子模组"
7858
ddc12c42 7859#: transport.c:1345 transport-helper.c:656
c1ac5258
JX
7860msgid "operation not supported by protocol"
7861msgstr "协议不支持该操作"
7862
a5cd71ca 7863#: transport-helper.c:61 transport-helper.c:90
c1ac5258
JX
7864msgid "full write to remote helper failed"
7865msgstr "完整写入远程助手失败"
7866
a5cd71ca 7867#: transport-helper.c:144
c1ac5258
JX
7868#, c-format
7869msgid "unable to find remote helper for '%s'"
7870msgstr "无法为 '%s' 找到远程助手"
7871
ddc12c42 7872#: transport-helper.c:160 transport-helper.c:570
c1ac5258
JX
7873msgid "can't dup helper output fd"
7874msgstr "无法复制助手输出文件句柄"
7875
a5cd71ca 7876#: transport-helper.c:211
c1ac5258
JX
7877#, c-format
7878msgid ""
7879"unknown mandatory capability %s; this remote helper probably needs newer "
7880"version of Git"
7881msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git"
7882
a5cd71ca 7883#: transport-helper.c:217
c1ac5258
JX
7884msgid "this remote helper should implement refspec capability"
7885msgstr "远程助手需要实现 refspec 能力"
7886
a5cd71ca 7887#: transport-helper.c:284 transport-helper.c:424
c1ac5258
JX
7888#, c-format
7889msgid "%s unexpectedly said: '%s'"
7890msgstr "%s 意外地说:'%s'"
7891
a5cd71ca 7892#: transport-helper.c:413
c1ac5258
JX
7893#, c-format
7894msgid "%s also locked %s"
7895msgstr "%s 也锁定了 %s"
7896
ddc12c42 7897#: transport-helper.c:492
c1ac5258
JX
7898msgid "couldn't run fast-import"
7899msgstr "不能执行 fast-import"
7900
ddc12c42 7901#: transport-helper.c:515
c1ac5258
JX
7902msgid "error while running fast-import"
7903msgstr "执行 fast-import 出错"
7904
ddc12c42 7905#: transport-helper.c:544 transport-helper.c:1133
c1ac5258
JX
7906#, c-format
7907msgid "could not read ref %s"
7908msgstr "无法读取引用 %s"
7909
ddc12c42 7910#: transport-helper.c:589
c1ac5258
JX
7911#, c-format
7912msgid "unknown response to connect: %s"
7913msgstr "连接时未知的响应:%s"
7914
ddc12c42 7915#: transport-helper.c:611
c1ac5258
JX
7916msgid "setting remote service path not supported by protocol"
7917msgstr "协议不支持设置远程服务路径"
7918
ddc12c42 7919#: transport-helper.c:613
c1ac5258
JX
7920msgid "invalid remote service path"
7921msgstr "无效的远程服务路径"
7922
ddc12c42 7923#: transport-helper.c:659
c1ac5258
JX
7924#, c-format
7925msgid "can't connect to subservice %s"
7926msgstr "不能连接到子服务 %s"
7927
ddc12c42 7928#: transport-helper.c:735
c1ac5258
JX
7929#, c-format
7930msgid "expected ok/error, helper said '%s'"
7931msgstr "预期 ok/error,助手说 '%s'"
7932
ddc12c42 7933#: transport-helper.c:788
c1ac5258
JX
7934#, c-format
7935msgid "helper reported unexpected status of %s"
7936msgstr "助手报告 %s 的意外状态"
7937
ddc12c42 7938#: transport-helper.c:849
a0b6b246 7939#, c-format
c1ac5258
JX
7940msgid "helper %s does not support dry-run"
7941msgstr "助手 %s 不支持 dry-run"
a0b6b246 7942
ddc12c42 7943#: transport-helper.c:852
c1ac5258
JX
7944#, c-format
7945msgid "helper %s does not support --signed"
7946msgstr "助手 %s 不支持 --signed"
7947
ddc12c42 7948#: transport-helper.c:855
c1ac5258
JX
7949#, c-format
7950msgid "helper %s does not support --signed=if-asked"
7951msgstr "助手 %s 不支持 --signed=if-asked"
7952
ddc12c42 7953#: transport-helper.c:860
a5cd71ca
JX
7954#, c-format
7955msgid "helper %s does not support --atomic"
7956msgstr "助手 %s 不支持 --atomic"
7957
ddc12c42 7958#: transport-helper.c:866
c1ac5258
JX
7959#, c-format
7960msgid "helper %s does not support 'push-option'"
7961msgstr "助手 %s 不支持 'push-option'"
7962
ddc12c42 7963#: transport-helper.c:964
c1ac5258
JX
7964msgid "remote-helper doesn't support push; refspec needed"
7965msgstr "remote-heper 不支持 push,需要引用表达式"
7966
ddc12c42 7967#: transport-helper.c:969
c1ac5258
JX
7968#, c-format
7969msgid "helper %s does not support 'force'"
7970msgstr "助手 %s 不支持 'force'"
7971
ddc12c42 7972#: transport-helper.c:1016
c1ac5258
JX
7973msgid "couldn't run fast-export"
7974msgstr "无法执行 fast-export"
7975
ddc12c42 7976#: transport-helper.c:1021
c1ac5258
JX
7977msgid "error while running fast-export"
7978msgstr "执行 fast-export 时出错"
7979
ddc12c42 7980#: transport-helper.c:1046
c1ac5258
JX
7981#, c-format
7982msgid ""
7983"No refs in common and none specified; doing nothing.\n"
7984"Perhaps you should specify a branch such as 'master'.\n"
7985msgstr ""
7986"没有共同的引用并且也没有指定,什么也不会做。\n"
7987"可能您应该指定一个分支如 'master'。\n"
7988
ddc12c42 7989#: transport-helper.c:1119
c1ac5258
JX
7990#, c-format
7991msgid "malformed response in ref list: %s"
7992msgstr "引用列表中格式错误的响应:%s"
7993
ddc12c42 7994#: transport-helper.c:1271
c1ac5258
JX
7995#, c-format
7996msgid "read(%s) failed"
7997msgstr "读取(%s)失败"
7998
ddc12c42 7999#: transport-helper.c:1298
c1ac5258
JX
8000#, c-format
8001msgid "write(%s) failed"
8002msgstr "写(%s)失败"
8003
ddc12c42 8004#: transport-helper.c:1347
c1ac5258
JX
8005#, c-format
8006msgid "%s thread failed"
8007msgstr "%s 线程失败"
8008
ddc12c42 8009#: transport-helper.c:1351
c1ac5258
JX
8010#, c-format
8011msgid "%s thread failed to join: %s"
e640d114 8012msgstr "%s 线程等待失败:%s"
c1ac5258 8013
ddc12c42 8014#: transport-helper.c:1370 transport-helper.c:1374
c1ac5258
JX
8015#, c-format
8016msgid "can't start thread for copying data: %s"
8017msgstr "不能启动线程来拷贝数据:%s"
8018
ddc12c42 8019#: transport-helper.c:1411
c1ac5258
JX
8020#, c-format
8021msgid "%s process failed to wait"
8022msgstr "%s 进程等待失败"
8023
ddc12c42 8024#: transport-helper.c:1415
c1ac5258
JX
8025#, c-format
8026msgid "%s process failed"
8027msgstr "%s 进程失败"
8028
ddc12c42 8029#: transport-helper.c:1433 transport-helper.c:1442
c1ac5258
JX
8030msgid "can't start thread for copying data"
8031msgstr "不能启动线程来拷贝数据"
8032
8033#: tree-walk.c:33
a0b6b246
JX
8034msgid "too-short tree object"
8035msgstr "太短的树对象"
8036
c1ac5258 8037#: tree-walk.c:39
a0b6b246 8038msgid "malformed mode in tree entry"
29004bbb 8039msgstr "树对象中的条目模式错误"
a0b6b246 8040
c1ac5258 8041#: tree-walk.c:43
a0b6b246
JX
8042msgid "empty filename in tree entry"
8043msgstr "树对象条目中空的文件名"
8044
ddc12c42
JX
8045#: tree-walk.c:48
8046#, c-format
8047msgid "filename in tree entry contains backslash: '%s'"
8048msgstr "树条目中的文件名包含反斜杠:'%s'"
8049
8050#: tree-walk.c:124
a0b6b246
JX
8051msgid "too-short tree file"
8052msgstr "太短的树文件"
8053
a5cd71ca 8054#: unpack-trees.c:110
a0b6b246
JX
8055#, c-format
8056msgid ""
8057"Your local changes to the following files would be overwritten by checkout:\n"
8058"%%sPlease commit your changes or stash them before you switch branches."
8059msgstr ""
8060"您对下列文件的本地修改将被检出操作覆盖:\n"
a4f16749 8061"%%s请在切换分支前提交或贮藏您的修改。"
a0b6b246 8062
a5cd71ca 8063#: unpack-trees.c:112
a0b6b246
JX
8064#, c-format
8065msgid ""
8066"Your local changes to the following files would be overwritten by checkout:\n"
8067"%%s"
8068msgstr ""
8069"您对下列文件的本地修改将被检出操作覆盖:\n"
8070"%%s"
8071
a5cd71ca 8072#: unpack-trees.c:115
a0b6b246
JX
8073#, c-format
8074msgid ""
8075"Your local changes to the following files would be overwritten by merge:\n"
8076"%%sPlease commit your changes or stash them before you merge."
8077msgstr ""
8078"您对下列文件的本地修改将被合并操作覆盖:\n"
a4f16749 8079"%%s请在合并前提交或贮藏您的修改。"
a0b6b246 8080
a5cd71ca 8081#: unpack-trees.c:117
a0b6b246
JX
8082#, c-format
8083msgid ""
8084"Your local changes to the following files would be overwritten by merge:\n"
8085"%%s"
8086msgstr ""
8087"您对下列文件的本地修改将被合并操作覆盖:\n"
8088"%%s"
8089
a5cd71ca 8090#: unpack-trees.c:120
a0b6b246
JX
8091#, c-format
8092msgid ""
8093"Your local changes to the following files would be overwritten by %s:\n"
8094"%%sPlease commit your changes or stash them before you %s."
8095msgstr ""
8096"您对下列文件的本地修改将被 %s 覆盖:\n"
a4f16749 8097"%%s请在 %s 之前提交或贮藏您的修改。"
6792b93b 8098
a5cd71ca 8099#: unpack-trees.c:122
a0b6b246
JX
8100#, c-format
8101msgid ""
8102"Your local changes to the following files would be overwritten by %s:\n"
8103"%%s"
8104msgstr ""
8105"您对下列文件的本地修改将被 %s 覆盖:\n"
8106"%%s"
c04f5ac3 8107
a5cd71ca 8108#: unpack-trees.c:127
a0b6b246
JX
8109#, c-format
8110msgid ""
1a79b2f1 8111"Updating the following directories would lose untracked files in them:\n"
a0b6b246
JX
8112"%s"
8113msgstr ""
8114"更新如下目录将会丢失其中未跟踪的文件:\n"
8115"%s"
1b7f4a34 8116
a5cd71ca 8117#: unpack-trees.c:131
a0b6b246
JX
8118#, c-format
8119msgid ""
8120"The following untracked working tree files would be removed by checkout:\n"
8121"%%sPlease move or remove them before you switch branches."
8122msgstr ""
8123"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
8124"%%s请在切换分支之前移动或删除。"
2e8451e8 8125
a5cd71ca 8126#: unpack-trees.c:133
a0b6b246
JX
8127#, c-format
8128msgid ""
8129"The following untracked working tree files would be removed by checkout:\n"
8130"%%s"
8131msgstr ""
8132"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
8133"%%s"
1003b3a5 8134
a5cd71ca 8135#: unpack-trees.c:136
a0b6b246
JX
8136#, c-format
8137msgid ""
8138"The following untracked working tree files would be removed by merge:\n"
8139"%%sPlease move or remove them before you merge."
8140msgstr ""
8141"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
8142"%%s请在合并前移动或删除。"
1003b3a5 8143
a5cd71ca 8144#: unpack-trees.c:138
a0b6b246
JX
8145#, c-format
8146msgid ""
8147"The following untracked working tree files would be removed by merge:\n"
8148"%%s"
8149msgstr ""
8150"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
8151"%%s"
c04f5ac3 8152
a5cd71ca 8153#: unpack-trees.c:141
a0b6b246
JX
8154#, c-format
8155msgid ""
8156"The following untracked working tree files would be removed by %s:\n"
8157"%%sPlease move or remove them before you %s."
8158msgstr ""
8159"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
8160"%%s请在 %s 前移动或删除。"
c04f5ac3 8161
a5cd71ca 8162#: unpack-trees.c:143
a0b6b246
JX
8163#, c-format
8164msgid ""
8165"The following untracked working tree files would be removed by %s:\n"
8166"%%s"
8167msgstr ""
8168"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
8169"%%s"
c04f5ac3 8170
a5cd71ca 8171#: unpack-trees.c:149
a0b6b246
JX
8172#, c-format
8173msgid ""
8174"The following untracked working tree files would be overwritten by "
8175"checkout:\n"
8176"%%sPlease move or remove them before you switch branches."
8177msgstr ""
8178"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
8179"%%s请在切换分支前移动或删除。"
c04f5ac3 8180
a5cd71ca 8181#: unpack-trees.c:151
1003b3a5 8182#, c-format
4dcdc3d8 8183msgid ""
a0b6b246
JX
8184"The following untracked working tree files would be overwritten by "
8185"checkout:\n"
8186"%%s"
4dcdc3d8 8187msgstr ""
a0b6b246
JX
8188"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
8189"%%s"
1003b3a5 8190
a5cd71ca 8191#: unpack-trees.c:154
c04f5ac3 8192#, c-format
a0b6b246
JX
8193msgid ""
8194"The following untracked working tree files would be overwritten by merge:\n"
8195"%%sPlease move or remove them before you merge."
8196msgstr ""
8197"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
8198"%%s请在合并前移动或删除。"
c04f5ac3 8199
a5cd71ca 8200#: unpack-trees.c:156
a0b6b246
JX
8201#, c-format
8202msgid ""
8203"The following untracked working tree files would be overwritten by merge:\n"
8204"%%s"
8205msgstr ""
8206"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
8207"%%s"
c04f5ac3 8208
a5cd71ca 8209#: unpack-trees.c:159
a0b6b246
JX
8210#, c-format
8211msgid ""
8212"The following untracked working tree files would be overwritten by %s:\n"
8213"%%sPlease move or remove them before you %s."
8214msgstr ""
8215"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
8216"%%s请在 %s 前移动或删除。"
c04f5ac3 8217
a5cd71ca 8218#: unpack-trees.c:161
07432cef 8219#, c-format
a0b6b246
JX
8220msgid ""
8221"The following untracked working tree files would be overwritten by %s:\n"
8222"%%s"
8223msgstr ""
8224"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
8225"%%s"
c04f5ac3 8226
a5cd71ca 8227#: unpack-trees.c:169
07432cef 8228#, c-format
a0b6b246
JX
8229msgid "Entry '%s' overlaps with '%s'. Cannot bind."
8230msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
c04f5ac3 8231
a5cd71ca 8232#: unpack-trees.c:172
07432cef 8233#, c-format
ef317cd5 8234msgid ""
6937cb4e 8235"Cannot update sparse checkout: the following entries are not up to date:\n"
a0b6b246
JX
8236"%s"
8237msgstr ""
8238"无法更新稀疏检出:如下条目不是最新:\n"
8239"%s"
c04f5ac3 8240
a5cd71ca 8241#: unpack-trees.c:174
07432cef 8242#, c-format
a0b6b246
JX
8243msgid ""
8244"The following working tree files would be overwritten by sparse checkout "
8245"update:\n"
8246"%s"
8247msgstr ""
8248"工作区中下列文件将被稀疏检出更新所覆盖:\n"
8249"%s"
c04f5ac3 8250
a5cd71ca 8251#: unpack-trees.c:176
07432cef 8252#, c-format
a0b6b246
JX
8253msgid ""
8254"The following working tree files would be removed by sparse checkout "
8255"update:\n"
8256"%s"
8257msgstr ""
8258"工作区中下列文件将被稀疏检出更新所删除:\n"
8259"%s"
c04f5ac3 8260
a5cd71ca 8261#: unpack-trees.c:178
87cb7997
JX
8262#, c-format
8263msgid ""
8264"Cannot update submodule:\n"
8265"%s"
8266msgstr ""
8267"无法更新子模组:\n"
8268"%s"
8269
a5cd71ca 8270#: unpack-trees.c:255
07432cef 8271#, c-format
a0b6b246 8272msgid "Aborting\n"
a6cd2cc4 8273msgstr "正在终止\n"
ef317cd5 8274
a5cd71ca 8275#: unpack-trees.c:317
a6cd2cc4
JX
8276msgid "Updating files"
8277msgstr "正在更新文件"
c04f5ac3 8278
a5cd71ca 8279#: unpack-trees.c:349
4c27fcb5
JX
8280msgid ""
8281"the following paths have collided (e.g. case-sensitive paths\n"
8282"on a case-insensitive filesystem) and only one from the same\n"
8283"colliding group is in the working tree:\n"
8284msgstr ""
8285"以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n"
8286"并且碰撞组中只有一个文件存在工作区中:\n"
8287
ddc12c42
JX
8288#: unpack-trees.c:1441
8289msgid "Updating index flags"
8290msgstr "正在更新索引标志"
8291
87cb7997 8292#: urlmatch.c:163
a0b6b246
JX
8293msgid "invalid URL scheme name or missing '://' suffix"
8294msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
8295
87cb7997 8296#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
07432cef 8297#, c-format
a0b6b246
JX
8298msgid "invalid %XX escape sequence"
8299msgstr "无效的 %XX 转义序列"
c04f5ac3 8300
87cb7997 8301#: urlmatch.c:215
a0b6b246
JX
8302msgid "missing host and scheme is not 'file:'"
8303msgstr "缺失主机名且 URL 方案不是 'file:'"
c04f5ac3 8304
87cb7997 8305#: urlmatch.c:232
a0b6b246
JX
8306msgid "a 'file:' URL may not have a port number"
8307msgstr "一个 'file:' URL 不应该包含端口号"
94550ed3 8308
87cb7997 8309#: urlmatch.c:247
a0b6b246
JX
8310msgid "invalid characters in host name"
8311msgstr "主机名中包含无效的字符"
90314792 8312
87cb7997 8313#: urlmatch.c:292 urlmatch.c:303
a0b6b246
JX
8314msgid "invalid port number"
8315msgstr "无效的端口号"
c04f5ac3 8316
87cb7997 8317#: urlmatch.c:371
a0b6b246
JX
8318msgid "invalid '..' path segment"
8319msgstr "无效的 '..' 路径片段"
5c0c220c 8320
a5cd71ca 8321#: worktree.c:258 builtin/am.c:2084
a77c07d9 8322#, c-format
a0b6b246 8323msgid "failed to read '%s'"
c1ac5258 8324msgstr "读取 '%s' 失败"
ef317cd5 8325
a6cd2cc4 8326#: worktree.c:304
31e5e17b
JX
8327#, c-format
8328msgid "'%s' at main working tree is not the repository directory"
8329msgstr "在主工作区的 '%s' 不是仓库目录"
8330
a6cd2cc4 8331#: worktree.c:315
31e5e17b
JX
8332#, c-format
8333msgid "'%s' file does not contain absolute path to the working tree location"
8334msgstr "文件 '%s' 不包含工作区的绝对路径"
8335
a6cd2cc4 8336#: worktree.c:327
31e5e17b
JX
8337#, c-format
8338msgid "'%s' does not exist"
8339msgstr "'%s' 不存在"
8340
a6cd2cc4 8341#: worktree.c:333
31e5e17b
JX
8342#, c-format
8343msgid "'%s' is not a .git file, error code %d"
8344msgstr "'%s' 不是一个 .git 文件,错误码 %d"
8345
a6cd2cc4 8346#: worktree.c:341
31e5e17b
JX
8347#, c-format
8348msgid "'%s' does not point back to '%s'"
8349msgstr "'%s' 没有指回到 '%s'"
8350
a5cd71ca 8351#: wrapper.c:186 wrapper.c:356
c04f5ac3 8352#, c-format
a0b6b246
JX
8353msgid "could not open '%s' for reading and writing"
8354msgstr "无法打开 '%s' 进行读写"
c04f5ac3 8355
a5cd71ca 8356#: wrapper.c:387 wrapper.c:588
a0b6b246
JX
8357#, c-format
8358msgid "unable to access '%s'"
8359msgstr "不能访问 '%s'"
c04f5ac3 8360
a5cd71ca 8361#: wrapper.c:596
a0b6b246
JX
8362msgid "unable to get current working directory"
8363msgstr "不能获取当前工作目录"
c04f5ac3 8364
a6cd2cc4 8365#: wt-status.c:158
a0b6b246
JX
8366msgid "Unmerged paths:"
8367msgstr "未合并的路径:"
7aea43ff 8368
a0b6b246 8369# 译者:注意保持前导空格
a6cd2cc4
JX
8370#: wt-status.c:187 wt-status.c:219
8371msgid " (use \"git restore --staged <file>...\" to unstage)"
8372msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)"
8373
8374# 译者:注意保持前导空格
8375#: wt-status.c:190 wt-status.c:222
c04f5ac3 8376#, c-format
a6cd2cc4
JX
8377msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
8378msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)"
c04f5ac3 8379
a0b6b246 8380# 译者:注意保持前导空格
a6cd2cc4 8381#: wt-status.c:193 wt-status.c:225
a0b6b246
JX
8382msgid " (use \"git rm --cached <file>...\" to unstage)"
8383msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 8384
a0b6b246 8385# 译者:注意保持前导空格
a6cd2cc4 8386#: wt-status.c:197
a0b6b246
JX
8387msgid " (use \"git add <file>...\" to mark resolution)"
8388msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8ada9598 8389
a0b6b246 8390# 译者:注意保持前导空格
a6cd2cc4 8391#: wt-status.c:199 wt-status.c:203
a0b6b246
JX
8392msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
8393msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8ada9598 8394
a0b6b246 8395# 译者:注意保持前导空格
a6cd2cc4 8396#: wt-status.c:201
a0b6b246
JX
8397msgid " (use \"git rm <file>...\" to mark resolution)"
8398msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
ef317cd5 8399
a6cd2cc4 8400#: wt-status.c:211 wt-status.c:1074
a0b6b246
JX
8401msgid "Changes to be committed:"
8402msgstr "要提交的变更:"
ef317cd5 8403
a6cd2cc4 8404#: wt-status.c:234 wt-status.c:1083
a0b6b246
JX
8405msgid "Changes not staged for commit:"
8406msgstr "尚未暂存以备提交的变更:"
ef317cd5 8407
a0b6b246 8408# 译者:注意保持前导空格
a6cd2cc4 8409#: wt-status.c:238
a0b6b246
JX
8410msgid " (use \"git add <file>...\" to update what will be committed)"
8411msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
ef317cd5 8412
a0b6b246 8413# 译者:注意保持前导空格
a6cd2cc4 8414#: wt-status.c:240
a0b6b246
JX
8415msgid " (use \"git add/rm <file>...\" to update what will be committed)"
8416msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
ef317cd5 8417
a0b6b246 8418# 译者:注意保持前导空格
a6cd2cc4 8419#: wt-status.c:241
a0b6b246 8420msgid ""
a6cd2cc4
JX
8421" (use \"git restore <file>...\" to discard changes in working directory)"
8422msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)"
ef317cd5 8423
a0b6b246 8424# 译者:注意保持前导空格
a6cd2cc4 8425#: wt-status.c:243
a0b6b246
JX
8426msgid " (commit or discard the untracked or modified content in submodules)"
8427msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
ef317cd5 8428
a0b6b246 8429# 译者:注意保持前导空格
a6cd2cc4 8430#: wt-status.c:254
a0b6b246
JX
8431#, c-format
8432msgid " (use \"git %s <file>...\" to include in what will be committed)"
8433msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
ef317cd5 8434
a6cd2cc4 8435#: wt-status.c:268
a0b6b246
JX
8436msgid "both deleted:"
8437msgstr "双方删除:"
ef317cd5 8438
a6cd2cc4 8439#: wt-status.c:270
a0b6b246
JX
8440msgid "added by us:"
8441msgstr "由我们添加:"
4dcdc3d8 8442
a6cd2cc4 8443#: wt-status.c:272
a0b6b246
JX
8444msgid "deleted by them:"
8445msgstr "由他们删除:"
ef317cd5 8446
a6cd2cc4 8447#: wt-status.c:274
a0b6b246
JX
8448msgid "added by them:"
8449msgstr "由他们添加:"
ef317cd5 8450
a6cd2cc4 8451#: wt-status.c:276
a0b6b246
JX
8452msgid "deleted by us:"
8453msgstr "由我们删除:"
ef317cd5 8454
a6cd2cc4 8455#: wt-status.c:278
a0b6b246
JX
8456msgid "both added:"
8457msgstr "双方添加:"
5c57d762 8458
a6cd2cc4 8459#: wt-status.c:280
a0b6b246
JX
8460msgid "both modified:"
8461msgstr "双方修改:"
5c57d762 8462
a6cd2cc4 8463#: wt-status.c:290
a0b6b246
JX
8464msgid "new file:"
8465msgstr "新文件:"
8ada9598 8466
a6cd2cc4 8467#: wt-status.c:292
a0b6b246
JX
8468msgid "copied:"
8469msgstr "拷贝:"
8ada9598 8470
a6cd2cc4 8471#: wt-status.c:294
a0b6b246
JX
8472msgid "deleted:"
8473msgstr "删除:"
8ada9598 8474
a6cd2cc4 8475#: wt-status.c:296
a0b6b246
JX
8476msgid "modified:"
8477msgstr "修改:"
8ada9598 8478
a6cd2cc4 8479#: wt-status.c:298
a0b6b246
JX
8480msgid "renamed:"
8481msgstr "重命名:"
5c57d762 8482
a6cd2cc4 8483#: wt-status.c:300
a0b6b246
JX
8484msgid "typechange:"
8485msgstr "类型变更:"
8ada9598 8486
a6cd2cc4 8487#: wt-status.c:302
a0b6b246
JX
8488msgid "unknown:"
8489msgstr "未知:"
8ada9598 8490
a6cd2cc4 8491#: wt-status.c:304
a0b6b246
JX
8492msgid "unmerged:"
8493msgstr "未合并:"
8ada9598 8494
a0b6b246 8495# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
a6cd2cc4 8496#: wt-status.c:384
a0b6b246
JX
8497msgid "new commits, "
8498msgstr "新提交, "
8ada9598 8499
a0b6b246 8500# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
a6cd2cc4 8501#: wt-status.c:386
a0b6b246
JX
8502msgid "modified content, "
8503msgstr "修改的内容, "
1b7f4a34 8504
a0b6b246 8505# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
a6cd2cc4 8506#: wt-status.c:388
a0b6b246
JX
8507msgid "untracked content, "
8508msgstr "未跟踪的内容, "
1b7f4a34 8509
a6cd2cc4 8510#: wt-status.c:906
a4f16749
JX
8511#, c-format
8512msgid "Your stash currently has %d entry"
8513msgid_plural "Your stash currently has %d entries"
8514msgstr[0] "您的贮藏区当前有 %d 条记录"
8515msgstr[1] "您的贮藏区当前有 %d 条记录"
8516
a6cd2cc4 8517#: wt-status.c:938
a0b6b246
JX
8518msgid "Submodules changed but not updated:"
8519msgstr "子模组已修改但尚未更新:"
1b7f4a34 8520
a6cd2cc4 8521#: wt-status.c:940
a0b6b246
JX
8522msgid "Submodule changes to be committed:"
8523msgstr "要提交的子模组变更:"
1b7f4a34 8524
a6cd2cc4 8525#: wt-status.c:1022
a0b6b246 8526msgid ""
6937cb4e
JX
8527"Do not modify or remove the line above.\n"
8528"Everything below it will be ignored."
a0b6b246 8529msgstr ""
6937cb4e
JX
8530"不要改动或删除上面的一行。\n"
8531"其下所有内容都将被忽略。"
1b7f4a34 8532
a6cd2cc4
JX
8533#: wt-status.c:1114
8534#, c-format
8535msgid ""
8536"\n"
8537"It took %.2f seconds to compute the branch ahead/behind values.\n"
8538"You can use '--no-ahead-behind' to avoid this.\n"
8539msgstr ""
8540"\n"
8541"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
8542"为避免,您可以使用 '--no-ahead-behind'。\n"
8543
8544#: wt-status.c:1144
a0b6b246
JX
8545msgid "You have unmerged paths."
8546msgstr "您有尚未合并的路径。"
1b7f4a34 8547
a0b6b246 8548# 译者:注意保持前导空格
a6cd2cc4 8549#: wt-status.c:1147
a0b6b246
JX
8550msgid " (fix conflicts and run \"git commit\")"
8551msgstr " (解决冲突并运行 \"git commit\")"
1b7f4a34 8552
a0b6b246 8553# 译者:注意保持前导空格
a6cd2cc4 8554#: wt-status.c:1149
a0b6b246
JX
8555msgid " (use \"git merge --abort\" to abort the merge)"
8556msgstr " (使用 \"git merge --abort\" 终止合并)"
1b7f4a34 8557
a6cd2cc4 8558#: wt-status.c:1153
a0b6b246
JX
8559msgid "All conflicts fixed but you are still merging."
8560msgstr "所有冲突已解决但您仍处于合并中。"
1b7f4a34 8561
a0b6b246 8562# 译者:注意保持前导空格
a6cd2cc4 8563#: wt-status.c:1156
a0b6b246
JX
8564msgid " (use \"git commit\" to conclude merge)"
8565msgstr " (使用 \"git commit\" 结束合并)"
1b7f4a34 8566
a6cd2cc4 8567#: wt-status.c:1165
a0b6b246
JX
8568msgid "You are in the middle of an am session."
8569msgstr "您正处于 am 操作过程中。"
1b7f4a34 8570
a6cd2cc4 8571#: wt-status.c:1168
a0b6b246
JX
8572msgid "The current patch is empty."
8573msgstr "当前的补丁为空。"
1b7f4a34 8574
a0b6b246 8575# 译者:注意保持前导空格
a6cd2cc4 8576#: wt-status.c:1172
a0b6b246
JX
8577msgid " (fix conflicts and then run \"git am --continue\")"
8578msgstr " (解决冲突,然后运行 \"git am --continue\")"
1b7f4a34 8579
a0b6b246 8580# 译者:注意保持前导空格
a6cd2cc4 8581#: wt-status.c:1174
a0b6b246
JX
8582msgid " (use \"git am --skip\" to skip this patch)"
8583msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1b7f4a34 8584
a0b6b246 8585# 译者:注意保持前导空格
a6cd2cc4 8586#: wt-status.c:1176
a0b6b246
JX
8587msgid " (use \"git am --abort\" to restore the original branch)"
8588msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1b7f4a34 8589
a6cd2cc4 8590#: wt-status.c:1309
1a79b2f1
JX
8591msgid "git-rebase-todo is missing."
8592msgstr "git-rebase-todo 丢失。"
8593
a6cd2cc4 8594#: wt-status.c:1311
a0b6b246
JX
8595msgid "No commands done."
8596msgstr "没有命令被执行。"
8597
a6cd2cc4 8598#: wt-status.c:1314
1b7f4a34 8599#, c-format
a0b6b246
JX
8600msgid "Last command done (%d command done):"
8601msgid_plural "Last commands done (%d commands done):"
8602msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
8603msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1b7f4a34 8604
a6cd2cc4 8605#: wt-status.c:1325
1b7f4a34 8606#, c-format
a0b6b246
JX
8607msgid " (see more in file %s)"
8608msgstr " (更多参见文件 %s)"
8609
a6cd2cc4 8610#: wt-status.c:1330
a0b6b246
JX
8611msgid "No commands remaining."
8612msgstr "未剩下任何命令。"
1b7f4a34 8613
a6cd2cc4 8614#: wt-status.c:1333
1b7f4a34 8615#, c-format
a0b6b246
JX
8616msgid "Next command to do (%d remaining command):"
8617msgid_plural "Next commands to do (%d remaining commands):"
8618msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
8619msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
1b7f4a34 8620
a0b6b246 8621# 译者:注意保持前导空格
a6cd2cc4 8622#: wt-status.c:1341
a0b6b246
JX
8623msgid " (use \"git rebase --edit-todo\" to view and edit)"
8624msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
1b7f4a34 8625
a6cd2cc4 8626#: wt-status.c:1353
1b7f4a34 8627#, c-format
a0b6b246
JX
8628msgid "You are currently rebasing branch '%s' on '%s'."
8629msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1b7f4a34 8630
a6cd2cc4 8631#: wt-status.c:1358
a0b6b246
JX
8632msgid "You are currently rebasing."
8633msgstr "您在执行变基操作。"
1b7f4a34 8634
a0b6b246 8635# 译者:注意保持前导空格
a6cd2cc4 8636#: wt-status.c:1371
a0b6b246
JX
8637msgid " (fix conflicts and then run \"git rebase --continue\")"
8638msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1b7f4a34 8639
a0b6b246 8640# 译者:注意保持前导空格
a6cd2cc4 8641#: wt-status.c:1373
a0b6b246
JX
8642msgid " (use \"git rebase --skip\" to skip this patch)"
8643msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
8644
8645# 译者:注意保持前导空格
a6cd2cc4 8646#: wt-status.c:1375
a0b6b246
JX
8647msgid " (use \"git rebase --abort\" to check out the original branch)"
8648msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
8649
8650# 译者:注意保持前导空格
a6cd2cc4 8651#: wt-status.c:1382
a0b6b246
JX
8652msgid " (all conflicts fixed: run \"git rebase --continue\")"
8653msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1b7f4a34 8654
a6cd2cc4 8655#: wt-status.c:1386
a0b6b246 8656#, c-format
1b7f4a34 8657msgid ""
a0b6b246
JX
8658"You are currently splitting a commit while rebasing branch '%s' on '%s'."
8659msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1b7f4a34 8660
a6cd2cc4 8661#: wt-status.c:1391
a0b6b246
JX
8662msgid "You are currently splitting a commit during a rebase."
8663msgstr "您在执行变基操作时拆分提交。"
1b7f4a34 8664
a0b6b246 8665# 译者:注意保持前导空格
a6cd2cc4 8666#: wt-status.c:1394
a0b6b246
JX
8667msgid " (Once your working directory is clean, run \"git rebase --continue\")"
8668msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1b7f4a34 8669
a6cd2cc4 8670#: wt-status.c:1398
a0b6b246
JX
8671#, c-format
8672msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
8673msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1b7f4a34 8674
a6cd2cc4 8675#: wt-status.c:1403
a0b6b246
JX
8676msgid "You are currently editing a commit during a rebase."
8677msgstr "您在执行变基操作时编辑提交。"
1b7f4a34 8678
a0b6b246 8679# 译者:注意保持前导空格
a6cd2cc4 8680#: wt-status.c:1406
a0b6b246
JX
8681msgid " (use \"git commit --amend\" to amend the current commit)"
8682msgstr " (使用 \"git commit --amend\" 修补当前提交)"
8683
8684# 译者:注意保持前导空格
a6cd2cc4 8685#: wt-status.c:1408
a0b6b246
JX
8686msgid ""
8687" (use \"git rebase --continue\" once you are satisfied with your changes)"
8688msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1b7f4a34 8689
a6cd2cc4 8690#: wt-status.c:1419
d46c5519
JX
8691msgid "Cherry-pick currently in progress."
8692msgstr "拣选操作正在进行中。"
8693
a6cd2cc4 8694#: wt-status.c:1422
1b7f4a34 8695#, c-format
a0b6b246
JX
8696msgid "You are currently cherry-picking commit %s."
8697msgstr "您在执行拣选提交 %s 的操作。"
1b7f4a34 8698
a0b6b246 8699# 译者:注意保持前导空格
a6cd2cc4 8700#: wt-status.c:1429
a0b6b246
JX
8701msgid " (fix conflicts and run \"git cherry-pick --continue\")"
8702msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1b7f4a34 8703
a0b6b246 8704# 译者:注意保持前导空格
a6cd2cc4 8705#: wt-status.c:1432
d46c5519
JX
8706msgid " (run \"git cherry-pick --continue\" to continue)"
8707msgstr " (执行 \"git cherry-pick --continue\" 以继续)"
8708
8709# 译者:注意保持前导空格
a6cd2cc4 8710#: wt-status.c:1435
a0b6b246
JX
8711msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
8712msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1b7f4a34 8713
a0b6b246 8714# 译者:注意保持前导空格
a6cd2cc4 8715#: wt-status.c:1437
a5cd71ca
JX
8716msgid " (use \"git cherry-pick --skip\" to skip this patch)"
8717msgstr " (使用 \"git cherry-pick --skip\" 跳过此补丁)"
8718
8719# 译者:注意保持前导空格
8720#: wt-status.c:1439
a0b6b246
JX
8721msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
8722msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1b7f4a34 8723
a5cd71ca 8724#: wt-status.c:1449
d46c5519
JX
8725msgid "Revert currently in progress."
8726msgstr "还原操作正在行中。"
8727
a5cd71ca 8728#: wt-status.c:1452
1b7f4a34 8729#, c-format
a0b6b246
JX
8730msgid "You are currently reverting commit %s."
8731msgstr "您在执行反转提交 %s 的操作。"
1b7f4a34 8732
a0b6b246 8733# 译者:注意保持前导空格
a5cd71ca 8734#: wt-status.c:1458
a0b6b246 8735msgid " (fix conflicts and run \"git revert --continue\")"
5b533632 8736msgstr " (解决冲突并执行 \"git revert --continue\")"
1b7f4a34 8737
a0b6b246 8738# 译者:注意保持前导空格
a5cd71ca 8739#: wt-status.c:1461
d46c5519 8740msgid " (run \"git revert --continue\" to continue)"
5b533632 8741msgstr " (执行 \"git revert --continue\" 以继续)"
d46c5519
JX
8742
8743# 译者:注意保持前导空格
a5cd71ca 8744#: wt-status.c:1464
a0b6b246 8745msgid " (all conflicts fixed: run \"git revert --continue\")"
5b533632 8746msgstr " (所有冲突已解决:执行 \"git revert --continue\")"
1b7f4a34 8747
a0b6b246 8748# 译者:注意保持前导空格
a5cd71ca
JX
8749#: wt-status.c:1466
8750msgid " (use \"git revert --skip\" to skip this patch)"
8751msgstr " (使用 \"git revert --skip\" 跳过此补丁)"
8752
8753# 译者:注意保持前导空格
8754#: wt-status.c:1468
a0b6b246
JX
8755msgid " (use \"git revert --abort\" to cancel the revert operation)"
8756msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1b7f4a34 8757
a5cd71ca 8758#: wt-status.c:1478
1b7f4a34 8759#, c-format
a0b6b246
JX
8760msgid "You are currently bisecting, started from branch '%s'."
8761msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1b7f4a34 8762
a5cd71ca 8763#: wt-status.c:1482
a0b6b246
JX
8764msgid "You are currently bisecting."
8765msgstr "您在执行二分查找操作。"
1b7f4a34 8766
a0b6b246 8767# 译者:注意保持前导空格
a5cd71ca 8768#: wt-status.c:1485
a0b6b246
JX
8769msgid " (use \"git bisect reset\" to get back to the original branch)"
8770msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1b7f4a34 8771
a5cd71ca 8772#: wt-status.c:1694
a0b6b246
JX
8773msgid "On branch "
8774msgstr "位于分支 "
1b7f4a34 8775
a5cd71ca 8776#: wt-status.c:1701
a0b6b246
JX
8777msgid "interactive rebase in progress; onto "
8778msgstr "交互式变基操作正在进行中;至 "
1b7f4a34 8779
a5cd71ca 8780#: wt-status.c:1703
a0b6b246
JX
8781msgid "rebase in progress; onto "
8782msgstr "变基操作正在进行中;至 "
1b7f4a34 8783
a5cd71ca 8784#: wt-status.c:1713
a0b6b246
JX
8785msgid "Not currently on any branch."
8786msgstr "当前不在任何分支上。"
1b7f4a34 8787
a5cd71ca 8788#: wt-status.c:1730
a0b6b246
JX
8789msgid "Initial commit"
8790msgstr "初始提交"
1b7f4a34 8791
a5cd71ca 8792#: wt-status.c:1731
a4f16749
JX
8793msgid "No commits yet"
8794msgstr "尚无提交"
8795
a5cd71ca 8796#: wt-status.c:1745
a0b6b246
JX
8797msgid "Untracked files"
8798msgstr "未跟踪的文件"
1b7f4a34 8799
a5cd71ca 8800#: wt-status.c:1747
a0b6b246
JX
8801msgid "Ignored files"
8802msgstr "忽略的文件"
1b7f4a34 8803
a5cd71ca 8804#: wt-status.c:1751
a0b6b246
JX
8805#, c-format
8806msgid ""
8807"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
8808"may speed it up, but you have to be careful not to forget to add\n"
8809"new files yourself (see 'git help status')."
8810msgstr ""
8811"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
8812"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1b7f4a34 8813
a5cd71ca 8814#: wt-status.c:1757
a0b6b246
JX
8815#, c-format
8816msgid "Untracked files not listed%s"
8817msgstr "未跟踪的文件没有列出%s"
1b7f4a34 8818
a0b6b246 8819# 译者:中文字符串拼接,可删除前导空格
a5cd71ca 8820#: wt-status.c:1759
a0b6b246
JX
8821msgid " (use -u option to show untracked files)"
8822msgstr "(使用 -u 参数显示未跟踪的文件)"
1b7f4a34 8823
a5cd71ca 8824#: wt-status.c:1765
a0b6b246
JX
8825msgid "No changes"
8826msgstr "没有修改"
1b7f4a34 8827
a5cd71ca 8828#: wt-status.c:1770
a0b6b246
JX
8829#, c-format
8830msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
8831msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1b7f4a34 8832
a5cd71ca 8833#: wt-status.c:1773
a0b6b246
JX
8834#, c-format
8835msgid "no changes added to commit\n"
8836msgstr "修改尚未加入提交\n"
1b7f4a34 8837
a5cd71ca 8838#: wt-status.c:1776
a0b6b246
JX
8839#, c-format
8840msgid ""
8841"nothing added to commit but untracked files present (use \"git add\" to "
8842"track)\n"
8843msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1b7f4a34 8844
a5cd71ca 8845#: wt-status.c:1779
a0b6b246
JX
8846#, c-format
8847msgid "nothing added to commit but untracked files present\n"
8848msgstr "提交为空,但是存在尚未跟踪的文件\n"
1b7f4a34 8849
a0b6b246 8850# 译者:中文字符串拼接,可删除前导空格
a5cd71ca 8851#: wt-status.c:1782
a0b6b246
JX
8852#, c-format
8853msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
8854msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1b7f4a34 8855
a5cd71ca 8856#: wt-status.c:1785 wt-status.c:1790
a0b6b246
JX
8857#, c-format
8858msgid "nothing to commit\n"
8859msgstr "无文件要提交\n"
1b7f4a34 8860
a0b6b246 8861# 译者:中文字符串拼接,可删除前导空格
a5cd71ca 8862#: wt-status.c:1788
a0b6b246
JX
8863#, c-format
8864msgid "nothing to commit (use -u to show untracked files)\n"
8865msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1b7f4a34 8866
a0b6b246 8867# 译者:中文字符串拼接,可删除前导空格
a5cd71ca 8868#: wt-status.c:1792
a0b6b246
JX
8869#, c-format
8870msgid "nothing to commit, working tree clean\n"
8871msgstr "无文件要提交,干净的工作区\n"
8872
a5cd71ca 8873#: wt-status.c:1905
a4f16749
JX
8874msgid "No commits yet on "
8875msgstr "尚无提交在 "
1b7f4a34 8876
a5cd71ca 8877#: wt-status.c:1909
a0b6b246
JX
8878msgid "HEAD (no branch)"
8879msgstr "HEAD(非分支)"
1b7f4a34 8880
a5cd71ca 8881#: wt-status.c:1940
31e5e17b
JX
8882msgid "different"
8883msgstr "不同"
8884
a0b6b246 8885# 译者:注意保持句尾空格
a5cd71ca 8886#: wt-status.c:1942 wt-status.c:1950
a0b6b246
JX
8887msgid "behind "
8888msgstr "落后 "
1b7f4a34 8889
a5cd71ca 8890#: wt-status.c:1945 wt-status.c:1948
a0b6b246
JX
8891msgid "ahead "
8892msgstr "领先 "
1b7f4a34 8893
a0b6b246 8894#. TRANSLATORS: the action is e.g. "pull with rebase"
a5cd71ca 8895#: wt-status.c:2470
a0b6b246
JX
8896#, c-format
8897msgid "cannot %s: You have unstaged changes."
8898msgstr "不能%s:您有未暂存的变更。"
1b7f4a34 8899
a5cd71ca 8900#: wt-status.c:2476
a0b6b246 8901msgid "additionally, your index contains uncommitted changes."
29004bbb 8902msgstr "另外,您的索引中包含未提交的变更。"
1b7f4a34 8903
a5cd71ca 8904#: wt-status.c:2478
a0b6b246
JX
8905#, c-format
8906msgid "cannot %s: Your index contains uncommitted changes."
8907msgstr "不能%s:您的索引中包含未提交的变更。"
1b7f4a34 8908
ddc12c42 8909#: compat/precompose_utf8.c:58 builtin/clone.c:455
a5cd71ca
JX
8910#, c-format
8911msgid "failed to unlink '%s'"
8912msgstr "删除 '%s' 失败"
8913
ddc12c42 8914#: builtin/add.c:26
a0b6b246
JX
8915msgid "git add [<options>] [--] <pathspec>..."
8916msgstr "git add [<选项>] [--] <路径规格>..."
1b7f4a34 8917
ddc12c42 8918#: builtin/add.c:87
a0b6b246
JX
8919#, c-format
8920msgid "unexpected diff status %c"
8921msgstr "意外的差异状态 %c"
1b7f4a34 8922
ddc12c42 8923#: builtin/add.c:92 builtin/commit.c:288
a0b6b246
JX
8924msgid "updating files failed"
8925msgstr "更新文件失败"
1b7f4a34 8926
ddc12c42 8927#: builtin/add.c:102
a0b6b246
JX
8928#, c-format
8929msgid "remove '%s'\n"
8930msgstr "删除 '%s'\n"
1b7f4a34 8931
ddc12c42 8932#: builtin/add.c:177
a0b6b246
JX
8933msgid "Unstaged changes after refreshing the index:"
8934msgstr "刷新索引之后尚未被暂存的变更:"
1b7f4a34 8935
ddc12c42 8936#: builtin/add.c:252 builtin/rev-parse.c:899
a0b6b246
JX
8937msgid "Could not read the index"
8938msgstr "不能读取索引"
1b7f4a34 8939
ddc12c42 8940#: builtin/add.c:263
a0b6b246
JX
8941#, c-format
8942msgid "Could not open '%s' for writing."
c1ac5258 8943msgstr "无法为写入打开 '%s'。"
1b7f4a34 8944
ddc12c42 8945#: builtin/add.c:267
a0b6b246
JX
8946msgid "Could not write patch"
8947msgstr "不能生成补丁"
1b7f4a34 8948
ddc12c42 8949#: builtin/add.c:270
a0b6b246
JX
8950msgid "editing patch failed"
8951msgstr "编辑补丁失败"
1b7f4a34 8952
ddc12c42 8953#: builtin/add.c:273
1b7f4a34 8954#, c-format
a0b6b246 8955msgid "Could not stat '%s'"
65e2041e 8956msgstr "不能对 '%s' 调用 stat"
1b7f4a34 8957
ddc12c42 8958#: builtin/add.c:275
a0b6b246
JX
8959msgid "Empty patch. Aborted."
8960msgstr "空补丁。异常终止。"
1b7f4a34 8961
ddc12c42 8962#: builtin/add.c:280
a0b6b246
JX
8963#, c-format
8964msgid "Could not apply '%s'"
8965msgstr "不能应用 '%s'"
1b7f4a34 8966
ddc12c42 8967#: builtin/add.c:288
a0b6b246
JX
8968msgid "The following paths are ignored by one of your .gitignore files:\n"
8969msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 8970
ddc12c42
JX
8971#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
8972#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548
8973#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165
a0b6b246
JX
8974msgid "dry run"
8975msgstr "演习"
8ada9598 8976
ddc12c42 8977#: builtin/add.c:311
a0b6b246
JX
8978msgid "interactive picking"
8979msgstr "交互式拣选"
8ada9598 8980
ddc12c42 8981#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307
a0b6b246
JX
8982msgid "select hunks interactively"
8983msgstr "交互式挑选数据块"
8ada9598 8984
ddc12c42 8985#: builtin/add.c:313
a0b6b246
JX
8986msgid "edit current diff and apply"
8987msgstr "编辑当前差异并应用"
8ada9598 8988
ddc12c42 8989#: builtin/add.c:314
a0b6b246
JX
8990msgid "allow adding otherwise ignored files"
8991msgstr "允许添加忽略的文件"
8ada9598 8992
ddc12c42 8993#: builtin/add.c:315
a0b6b246
JX
8994msgid "update tracked files"
8995msgstr "更新已跟踪的文件"
8ada9598 8996
ddc12c42 8997#: builtin/add.c:316
5809aa05
JX
8998msgid "renormalize EOL of tracked files (implies -u)"
8999msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
9000
ddc12c42 9001#: builtin/add.c:317
a0b6b246
JX
9002msgid "record only the fact that the path will be added later"
9003msgstr "只记录,该路径稍后再添加"
8ada9598 9004
ddc12c42 9005#: builtin/add.c:318
a0b6b246
JX
9006msgid "add changes from all tracked and untracked files"
9007msgstr "添加所有改变的已跟踪文件和未跟踪文件"
8ada9598 9008
ddc12c42 9009#: builtin/add.c:321
a0b6b246
JX
9010msgid "ignore paths removed in the working tree (same as --no-all)"
9011msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
8ada9598 9012
ddc12c42 9013#: builtin/add.c:323
a0b6b246
JX
9014msgid "don't add, only refresh the index"
9015msgstr "不添加,只刷新索引"
8ada9598 9016
ddc12c42 9017#: builtin/add.c:324
a0b6b246
JX
9018msgid "just skip files which cannot be added because of errors"
9019msgstr "跳过因出错不能添加的文件"
8ada9598 9020
ddc12c42 9021#: builtin/add.c:325
a0b6b246
JX
9022msgid "check if - even missing - files are ignored in dry run"
9023msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
8ada9598 9024
ddc12c42 9025#: builtin/add.c:327 builtin/update-index.c:1004
a0b6b246
JX
9026msgid "override the executable bit of the listed files"
9027msgstr "覆盖列表里文件的可执行位"
8ada9598 9028
ddc12c42 9029#: builtin/add.c:329
a4f16749
JX
9030msgid "warn when adding an embedded repository"
9031msgstr "创建一个嵌入式仓库时给予警告"
9032
ddc12c42 9033#: builtin/add.c:347
a4f16749
JX
9034#, c-format
9035msgid ""
9036"You've added another git repository inside your current repository.\n"
9037"Clones of the outer repository will not contain the contents of\n"
9038"the embedded repository and will not know how to obtain it.\n"
9039"If you meant to add a submodule, use:\n"
9040"\n"
9041"\tgit submodule add <url> %s\n"
9042"\n"
9043"If you added this path by mistake, you can remove it from the\n"
9044"index with:\n"
9045"\n"
9046"\tgit rm --cached %s\n"
9047"\n"
9048"See \"git help submodule\" for more information."
9049msgstr ""
ddc12c42
JX
9050"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n"
9051"内容,并且不知道该如何获取它。如果您要添加一个子模组,使用:\n"
a4f16749
JX
9052"\n"
9053"\tgit submodule add <url> %s\n"
9054"\n"
9055"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
9056"\n"
9057"\tgit rm --cached %s\n"
9058"\n"
9059"参见 \"git help submodule\" 获取更多信息。"
9060
ddc12c42 9061#: builtin/add.c:375
a4f16749
JX
9062#, c-format
9063msgid "adding embedded git repository: %s"
9064msgstr "正在添加嵌入式 git 仓库:%s"
9065
ddc12c42 9066#: builtin/add.c:393
8ada9598 9067#, c-format
a0b6b246
JX
9068msgid "Use -f if you really want to add them.\n"
9069msgstr "使用 -f 参数如果您确实要添加它们。\n"
8ada9598 9070
ddc12c42 9071#: builtin/add.c:400
a0b6b246
JX
9072msgid "adding files failed"
9073msgstr "添加文件失败"
8ada9598 9074
ddc12c42
JX
9075#: builtin/add.c:428 builtin/commit.c:348
9076msgid "--pathspec-from-file is incompatible with --interactive/--patch"
9077msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容"
9078
9079#: builtin/add.c:434
9080msgid "--pathspec-from-file is incompatible with --edit"
9081msgstr "--pathspec-from-file 与 --edit 不兼容"
9082
9083#: builtin/add.c:446
a0b6b246
JX
9084msgid "-A and -u are mutually incompatible"
9085msgstr "-A 和 -u 选项互斥"
8ada9598 9086
ddc12c42 9087#: builtin/add.c:449
a0b6b246
JX
9088msgid "Option --ignore-missing can only be used together with --dry-run"
9089msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 9090
ddc12c42 9091#: builtin/add.c:453
8ada9598 9092#, c-format
a0b6b246
JX
9093msgid "--chmod param '%s' must be either -x or +x"
9094msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
8ada9598 9095
ddc12c42
JX
9096#: builtin/add.c:471 builtin/checkout.c:1648 builtin/commit.c:354
9097#: builtin/reset.c:327
9098msgid "--pathspec-from-file is incompatible with pathspec arguments"
9099msgstr "--pathspec-from-file 与路径表达式参数不兼容"
9100
9101#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360
9102#: builtin/reset.c:333
9103msgid "--pathspec-file-nul requires --pathspec-from-file"
9104msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
9105
9106#: builtin/add.c:482
8ada9598 9107#, c-format
a0b6b246
JX
9108msgid "Nothing specified, nothing added.\n"
9109msgstr "没有指定文件,也没有文件被添加。\n"
8ada9598 9110
ddc12c42 9111#: builtin/add.c:483
8ada9598 9112#, c-format
a0b6b246
JX
9113msgid "Maybe you wanted to say 'git add .'?\n"
9114msgstr "也许您想要执行 'git add .'?\n"
8ada9598 9115
a5cd71ca 9116#: builtin/am.c:347
a0b6b246
JX
9117msgid "could not parse author script"
9118msgstr "不能解析作者脚本"
8ada9598 9119
a5cd71ca 9120#: builtin/am.c:431
81809b99 9121#, c-format
a0b6b246
JX
9122msgid "'%s' was deleted by the applypatch-msg hook"
9123msgstr "'%s' 被 applypatch-msg 钩子删除"
8ada9598 9124
a5cd71ca 9125#: builtin/am.c:473
8ada9598 9126#, c-format
a0b6b246
JX
9127msgid "Malformed input line: '%s'."
9128msgstr "非法的输入行:'%s'。"
8ada9598 9129
a5cd71ca 9130#: builtin/am.c:511
8ada9598 9131#, c-format
a0b6b246
JX
9132msgid "Failed to copy notes from '%s' to '%s'"
9133msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
8ada9598 9134
a5cd71ca 9135#: builtin/am.c:537
a0b6b246
JX
9136msgid "fseek failed"
9137msgstr "fseek 失败"
8ada9598 9138
a5cd71ca 9139#: builtin/am.c:725
8ada9598 9140#, c-format
a0b6b246
JX
9141msgid "could not parse patch '%s'"
9142msgstr "无法解析补丁 '%s'"
8ada9598 9143
a5cd71ca 9144#: builtin/am.c:790
a0b6b246
JX
9145msgid "Only one StGIT patch series can be applied at once"
9146msgstr "一次只能有一个 StGIT 补丁队列被应用"
9147
a5cd71ca 9148#: builtin/am.c:838
a0b6b246
JX
9149msgid "invalid timestamp"
9150msgstr "无效的时间戳"
9151
a5cd71ca 9152#: builtin/am.c:843 builtin/am.c:855
a0b6b246
JX
9153msgid "invalid Date line"
9154msgstr "无效的日期行"
8ada9598 9155
a5cd71ca 9156#: builtin/am.c:850
a0b6b246
JX
9157msgid "invalid timezone offset"
9158msgstr "无效的时区偏移值"
8ada9598 9159
a5cd71ca 9160#: builtin/am.c:943
a0b6b246 9161msgid "Patch format detection failed."
87cb7997 9162msgstr "补丁格式探测失败。"
8ada9598 9163
ddc12c42 9164#: builtin/am.c:948 builtin/clone.c:409
8ada9598 9165#, c-format
a0b6b246 9166msgid "failed to create directory '%s'"
c1ac5258 9167msgstr "创建目录 '%s' 失败"
8ada9598 9168
a5cd71ca 9169#: builtin/am.c:953
a0b6b246 9170msgid "Failed to split patches."
c1ac5258 9171msgstr "拆分补丁失败。"
814ff314 9172
a5cd71ca 9173#: builtin/am.c:1084
8ada9598 9174#, c-format
a0b6b246
JX
9175msgid "When you have resolved this problem, run \"%s --continue\"."
9176msgstr "当您解决这一问题,执行 \"%s --continue\"。"
8ada9598 9177
a5cd71ca 9178#: builtin/am.c:1085
81809b99 9179#, c-format
a0b6b246
JX
9180msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
9181msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
8ada9598 9182
a5cd71ca 9183#: builtin/am.c:1086
81809b99 9184#, c-format
a0b6b246
JX
9185msgid "To restore the original branch and stop patching, run \"%s --abort\"."
9186msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
8ada9598 9187
a5cd71ca 9188#: builtin/am.c:1169
4c27fcb5
JX
9189msgid "Patch sent with format=flowed; space at the end of lines might be lost."
9190msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。"
9191
a5cd71ca 9192#: builtin/am.c:1197
a4f16749
JX
9193msgid "Patch is empty."
9194msgstr "补丁为空。"
23ff3338 9195
a5cd71ca
JX
9196#: builtin/am.c:1262
9197#, c-format
9198msgid "missing author line in commit %s"
9199msgstr "在提交 %s 中缺失作者行"
9200
9201#: builtin/am.c:1265
8ada9598 9202#, c-format
a4f16749
JX
9203msgid "invalid ident line: %.*s"
9204msgstr "无效的身份标识:%.*s"
8ada9598 9205
a5cd71ca 9206#: builtin/am.c:1484
a0b6b246
JX
9207msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9208msgstr "仓库缺乏必要的数据对象以进行三方合并。"
814ff314 9209
a5cd71ca 9210#: builtin/am.c:1486
a0b6b246
JX
9211msgid "Using index info to reconstruct a base tree..."
9212msgstr "使用索引来重建一个(三方合并的)基础目录树..."
8ada9598 9213
a5cd71ca 9214#: builtin/am.c:1505
a0b6b246
JX
9215msgid ""
9216"Did you hand edit your patch?\n"
9217"It does not apply to blobs recorded in its index."
9218msgstr ""
9219"您是否曾手动编辑过您的补丁?\n"
9220"无法应用补丁到索引中的数据对象上。"
23ff3338 9221
a5cd71ca 9222#: builtin/am.c:1511
a0b6b246
JX
9223msgid "Falling back to patching base and 3-way merge..."
9224msgstr "回落到基础版本上打补丁及进行三方合并..."
8ada9598 9225
a5cd71ca 9226#: builtin/am.c:1537
a0b6b246
JX
9227msgid "Failed to merge in the changes."
9228msgstr "无法合并变更。"
d691f479 9229
a5cd71ca 9230#: builtin/am.c:1569
a0b6b246
JX
9231msgid "applying to an empty history"
9232msgstr "正应用到一个空历史上"
8ada9598 9233
a5cd71ca 9234#: builtin/am.c:1616 builtin/am.c:1620
8ada9598 9235#, c-format
a0b6b246
JX
9236msgid "cannot resume: %s does not exist."
9237msgstr "无法继续:%s 不存在。"
8ada9598 9238
a5cd71ca 9239#: builtin/am.c:1638
a0b6b246
JX
9240msgid "Commit Body is:"
9241msgstr "提交内容为:"
8ada9598 9242
a0b6b246
JX
9243# 译者:注意保持句尾空格
9244#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9245#. in your translation. The program will only accept English
9246#. input at this point.
9247#.
a5cd71ca 9248#: builtin/am.c:1648
a6cd2cc4 9249#, c-format
a0b6b246
JX
9250msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
9251msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
8ada9598 9252
ddc12c42 9253#: builtin/am.c:1695 builtin/commit.c:394
a5cd71ca
JX
9254msgid "unable to write index file"
9255msgstr "无法写入索引文件"
9256
9257#: builtin/am.c:1699
8ada9598 9258#, c-format
a0b6b246
JX
9259msgid "Dirty index: cannot apply patches (dirty: %s)"
9260msgstr "脏索引:不能应用补丁(脏文件:%s)"
8ada9598 9261
a5cd71ca 9262#: builtin/am.c:1739 builtin/am.c:1807
81809b99 9263#, c-format
a0b6b246
JX
9264msgid "Applying: %.*s"
9265msgstr "应用:%.*s"
8ada9598 9266
a5cd71ca 9267#: builtin/am.c:1756
a0b6b246
JX
9268msgid "No changes -- Patch already applied."
9269msgstr "没有变更 —— 补丁已经应用过。"
8ada9598 9270
a5cd71ca 9271#: builtin/am.c:1762
81809b99 9272#, c-format
a0b6b246
JX
9273msgid "Patch failed at %s %.*s"
9274msgstr "打补丁失败于 %s %.*s"
8ada9598 9275
a5cd71ca 9276#: builtin/am.c:1766
31e5e17b
JX
9277msgid "Use 'git am --show-current-patch' to see the failed patch"
9278msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"
8ada9598 9279
a5cd71ca 9280#: builtin/am.c:1810
a0b6b246
JX
9281msgid ""
9282"No changes - did you forget to use 'git add'?\n"
9283"If there is nothing left to stage, chances are that something else\n"
9284"already introduced the same changes; you might want to skip this patch."
9285msgstr ""
9286"没有变更 —— 您是不是忘了执行 'git add'?\n"
9287"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9288"您也许想要跳过这个补丁。"
8ada9598 9289
a5cd71ca 9290#: builtin/am.c:1817
a0b6b246
JX
9291msgid ""
9292"You still have unmerged paths in your index.\n"
a4f16749
JX
9293"You should 'git add' each file with resolved conflicts to mark them as "
9294"such.\n"
9295"You might run `git rm` on a file to accept \"deleted by them\" for it."
a0b6b246 9296msgstr ""
a4f16749
JX
9297"在您的索引中仍存在未合并的路径。\n"
9298"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
9299"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
8ada9598 9300
ddc12c42
JX
9301#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346
9302#: builtin/reset.c:354
8ada9598 9303#, c-format
a0b6b246
JX
9304msgid "Could not parse object '%s'."
9305msgstr "不能解析对象 '%s'。"
8ada9598 9306
a5cd71ca 9307#: builtin/am.c:1976
a0b6b246 9308msgid "failed to clean index"
c1ac5258 9309msgstr "清空索引失败"
5b04ee3b 9310
a5cd71ca 9311#: builtin/am.c:2020
a0b6b246
JX
9312msgid ""
9313"You seem to have moved HEAD since the last 'am' failure.\n"
9314"Not rewinding to ORIG_HEAD"
9315msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8ada9598 9316
a5cd71ca 9317#: builtin/am.c:2117
8ada9598 9318#, c-format
a0b6b246
JX
9319msgid "Invalid value for --patch-format: %s"
9320msgstr "无效的 --patch-format 值:%s"
8ada9598 9321
a5cd71ca 9322#: builtin/am.c:2153
a0b6b246
JX
9323msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
9324msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5b04ee3b 9325
a5cd71ca 9326#: builtin/am.c:2154
a0b6b246
JX
9327msgid "git am [<options>] (--continue | --skip | --abort)"
9328msgstr "git am [<选项>] (--continue | --skip | --abort)"
8ada9598 9329
a5cd71ca 9330#: builtin/am.c:2160
a0b6b246
JX
9331msgid "run interactively"
9332msgstr "以交互式方式运行"
8ada9598 9333
a5cd71ca 9334#: builtin/am.c:2162
a0b6b246
JX
9335msgid "historical option -- no-op"
9336msgstr "老的参数 —— 无作用"
8ada9598 9337
a5cd71ca 9338#: builtin/am.c:2164
a0b6b246
JX
9339msgid "allow fall back on 3way merging if needed"
9340msgstr "如果必要,允许使用三方合并。"
8ada9598 9341
a5cd71ca 9342#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
ddc12c42 9343#: builtin/repack.c:304 builtin/stash.c:811
a0b6b246
JX
9344msgid "be quiet"
9345msgstr "静默模式"
8ada9598 9346
a5cd71ca 9347#: builtin/am.c:2167
a0b6b246
JX
9348msgid "add a Signed-off-by line to the commit message"
9349msgstr "在提交说明中添加一个 Signed-off-by 签名"
5c57d762 9350
a5cd71ca 9351#: builtin/am.c:2170
a0b6b246
JX
9352msgid "recode into utf8 (default)"
9353msgstr "使用 utf8 字符集(默认)"
5c57d762 9354
a5cd71ca 9355#: builtin/am.c:2172
a0b6b246
JX
9356msgid "pass -k flag to git-mailinfo"
9357msgstr "向 git-mailinfo 传递 -k 参数"
5c57d762 9358
a5cd71ca 9359#: builtin/am.c:2174
a0b6b246
JX
9360msgid "pass -b flag to git-mailinfo"
9361msgstr "向 git-mailinfo 传递 -b 参数"
5c57d762 9362
a5cd71ca 9363#: builtin/am.c:2176
a0b6b246
JX
9364msgid "pass -m flag to git-mailinfo"
9365msgstr "向 git-mailinfo 传递 -m 参数"
5c57d762 9366
a5cd71ca 9367#: builtin/am.c:2178
a0b6b246
JX
9368msgid "pass --keep-cr flag to git-mailsplit for mbox format"
9369msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5c57d762 9370
a5cd71ca 9371#: builtin/am.c:2181
a0b6b246
JX
9372msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
9373msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
8ada9598 9374
a5cd71ca 9375#: builtin/am.c:2184
a0b6b246
JX
9376msgid "strip everything before a scissors line"
9377msgstr "丢弃裁切线前的所有内容"
8ada9598 9378
a5cd71ca
JX
9379#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
9380#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
9381#: builtin/am.c:2213
a0b6b246
JX
9382msgid "pass it through git-apply"
9383msgstr "传递给 git-apply"
8ada9598 9384
ddc12c42
JX
9385#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673
9386#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249
9387#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469
9388#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
a6cd2cc4 9389#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
ddc12c42 9390#: parse-options.h:154 parse-options.h:175 parse-options.h:316
a0b6b246
JX
9391msgid "n"
9392msgstr "n"
8ada9598 9393
a5cd71ca
JX
9394#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
9395#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
a0b6b246
JX
9396msgid "format"
9397msgstr "格式"
8ada9598 9398
a5cd71ca 9399#: builtin/am.c:2210
a0b6b246
JX
9400msgid "format the patch(es) are in"
9401msgstr "补丁的格式"
8ada9598 9402
a5cd71ca 9403#: builtin/am.c:2216
a0b6b246
JX
9404msgid "override error message when patch failure occurs"
9405msgstr "打补丁失败时显示的错误信息"
8ada9598 9406
a5cd71ca 9407#: builtin/am.c:2218
a0b6b246
JX
9408msgid "continue applying patches after resolving a conflict"
9409msgstr "冲突解决后继续应用补丁"
814ff314 9410
a5cd71ca 9411#: builtin/am.c:2221
a0b6b246
JX
9412msgid "synonyms for --continue"
9413msgstr "和 --continue 同义"
8ada9598 9414
a5cd71ca 9415#: builtin/am.c:2224
a0b6b246
JX
9416msgid "skip the current patch"
9417msgstr "跳过当前补丁"
23ff3338 9418
a5cd71ca 9419#: builtin/am.c:2227
a0b6b246
JX
9420msgid "restore the original branch and abort the patching operation."
9421msgstr "恢复原始分支并终止打补丁操作。"
8ada9598 9422
a5cd71ca 9423#: builtin/am.c:2230
31e5e17b
JX
9424msgid "abort the patching operation but keep HEAD where it is."
9425msgstr "终止补丁操作但保持 HEAD 不变。"
9426
a5cd71ca 9427#: builtin/am.c:2233
31e5e17b
JX
9428msgid "show the patch being applied."
9429msgstr "显示正在应用的补丁。"
9430
a5cd71ca 9431#: builtin/am.c:2237
a0b6b246
JX
9432msgid "lie about committer date"
9433msgstr "将作者日期作为提交日期"
8ada9598 9434
a5cd71ca 9435#: builtin/am.c:2239
a0b6b246
JX
9436msgid "use current timestamp for author date"
9437msgstr "用当前时间作为作者日期"
8ada9598 9438
ddc12c42
JX
9439#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507
9440#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509
9441#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418
a0b6b246
JX
9442msgid "key-id"
9443msgstr "key-id"
8ada9598 9444
ddc12c42 9445#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514
a0b6b246
JX
9446msgid "GPG-sign commits"
9447msgstr "使用 GPG 签名提交"
8ada9598 9448
a5cd71ca 9449#: builtin/am.c:2245
a0b6b246
JX
9450msgid "(internal use for git-rebase)"
9451msgstr "(内部使用,用于 git-rebase)"
8ada9598 9452
a5cd71ca 9453#: builtin/am.c:2263
a0b6b246
JX
9454msgid ""
9455"The -b/--binary option has been a no-op for long time, and\n"
9456"it will be removed. Please do not use it anymore."
9457msgstr ""
9458"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
9459"请不要再使用它了。"
8ada9598 9460
a5cd71ca 9461#: builtin/am.c:2270
a0b6b246 9462msgid "failed to read the index"
c1ac5258 9463msgstr "读取索引失败"
8ada9598 9464
a5cd71ca 9465#: builtin/am.c:2285
a0b6b246
JX
9466#, c-format
9467msgid "previous rebase directory %s still exists but mbox given."
9468msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
8ada9598 9469
a5cd71ca 9470#: builtin/am.c:2309
a0b6b246
JX
9471#, c-format
9472msgid ""
9473"Stray %s directory found.\n"
9474"Use \"git am --abort\" to remove it."
9475msgstr ""
9476"发现了错误的 %s 目录。\n"
9477"使用 \"git am --abort\" 删除它。"
c04f5ac3 9478
a5cd71ca 9479#: builtin/am.c:2315
a0b6b246
JX
9480msgid "Resolve operation not in progress, we are not resuming."
9481msgstr "解决操作未进行,我们不会继续。"
c04f5ac3 9482
a5cd71ca 9483#: builtin/am.c:2325
a6cd2cc4
JX
9484msgid "interactive mode requires patches on the command line"
9485msgstr "交互式模式需要命令行上提供补丁"
9486
a0b6b246
JX
9487#: builtin/apply.c:8
9488msgid "git apply [<options>] [<patch>...]"
9489msgstr "git apply [<选项>] [<补丁>...]"
c04f5ac3 9490
c04f5ac3
JX
9491#: builtin/archive.c:17
9492#, c-format
9493msgid "could not create archive file '%s'"
90e6ef53 9494msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
9495
9496#: builtin/archive.c:20
9497msgid "could not redirect output"
195febda 9498msgstr "不能重定向输出"
c04f5ac3
JX
9499
9500#: builtin/archive.c:37
9501msgid "git archive: Remote with no URL"
4375c10e 9502msgstr "git archive:未提供远程 URL"
c04f5ac3 9503
06991777 9504#: builtin/archive.c:61
31e5e17b
JX
9505msgid "git archive: expected ACK/NAK, got a flush packet"
9506msgstr "git archive:期望是 ACK/NAK,却得到 flush 包"
c04f5ac3 9507
06991777 9508#: builtin/archive.c:64
c04f5ac3
JX
9509#, c-format
9510msgid "git archive: NACK %s"
90e6ef53 9511msgstr "git archive:NACK %s"
c04f5ac3 9512
06991777 9513#: builtin/archive.c:65
c04f5ac3 9514msgid "git archive: protocol error"
90e6ef53 9515msgstr "git archive:协议错误"
c04f5ac3 9516
06991777 9517#: builtin/archive.c:69
c04f5ac3 9518msgid "git archive: expected a flush"
31e5e17b 9519msgstr "git archive:应有一个 flush 包"
c04f5ac3 9520
06991777 9521#: builtin/bisect--helper.c:22
ef317cd5 9522msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 9523msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5 9524
06991777 9525#: builtin/bisect--helper.c:23
5809aa05
JX
9526msgid "git bisect--helper --write-terms <bad_term> <good_term>"
9527msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
9528
06991777 9529#: builtin/bisect--helper.c:24
5809aa05
JX
9530msgid "git bisect--helper --bisect-clean-state"
9531msgstr "git bisect--helper --bisect-clean-state"
9532
06991777
JX
9533#: builtin/bisect--helper.c:25
9534msgid "git bisect--helper --bisect-reset [<commit>]"
9535msgstr "git bisect--helper --bisect-reset [<提交>]"
9536
9537#: builtin/bisect--helper.c:26
9538msgid ""
9539"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
9540"<bad_term>"
9541msgstr ""
9542"git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
9543">"
9544
9545#: builtin/bisect--helper.c:27
9546msgid ""
9547"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
9548"<bad_term>"
9549msgstr ""
9550"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
9551
9552#: builtin/bisect--helper.c:28
9553msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
9554msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
9555
9556#: builtin/bisect--helper.c:29
9557msgid ""
9558"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
9559"term-new]"
9560msgstr ""
9561"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
9562"term-new]"
9563
9564#: builtin/bisect--helper.c:30
9565msgid ""
9566"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
9567"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
9568msgstr ""
9569"git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}"
9570"=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]"
9571
9572#: builtin/bisect--helper.c:86
5809aa05
JX
9573#, c-format
9574msgid "'%s' is not a valid term"
9575msgstr "'%s' 不是一个有效的术语"
9576
06991777 9577#: builtin/bisect--helper.c:90
5809aa05
JX
9578#, c-format
9579msgid "can't use the builtin command '%s' as a term"
9580msgstr "不能使用内置命令 '%s' 作为术语"
9581
06991777 9582#: builtin/bisect--helper.c:100
5809aa05
JX
9583#, c-format
9584msgid "can't change the meaning of the term '%s'"
9585msgstr "不能修改术语 '%s' 的含义"
9586
06991777 9587#: builtin/bisect--helper.c:111
5809aa05
JX
9588msgid "please use two different terms"
9589msgstr "请使用两个不同的术语"
9590
06991777 9591#: builtin/bisect--helper.c:118
5809aa05
JX
9592msgid "could not open the file BISECT_TERMS"
9593msgstr "不能打开文件 BISECT_TERMS"
9594
06991777
JX
9595#: builtin/bisect--helper.c:155
9596#, c-format
9597msgid "We are not bisecting.\n"
9598msgstr "我们没有在二分查找。\n"
9599
9600#: builtin/bisect--helper.c:163
9601#, c-format
9602msgid "'%s' is not a valid commit"
9603msgstr "'%s' 不是一个有效的提交"
9604
ddc12c42 9605#: builtin/bisect--helper.c:172
06991777
JX
9606#, c-format
9607msgid ""
9608"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
9609msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
9610
ddc12c42 9611#: builtin/bisect--helper.c:216
06991777
JX
9612#, c-format
9613msgid "Bad bisect_write argument: %s"
9614msgstr "坏的 bisect_write 参数:%s"
9615
ddc12c42 9616#: builtin/bisect--helper.c:221
06991777
JX
9617#, c-format
9618msgid "couldn't get the oid of the rev '%s'"
5b533632 9619msgstr "无法获取版本 '%s' 的对象 ID"
06991777 9620
ddc12c42 9621#: builtin/bisect--helper.c:233
06991777
JX
9622#, c-format
9623msgid "couldn't open the file '%s'"
9624msgstr "无法打开文件 '%s'"
9625
ddc12c42 9626#: builtin/bisect--helper.c:259
06991777
JX
9627#, c-format
9628msgid "Invalid command: you're currently in a %s/%s bisect"
9629msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中"
9630
ddc12c42 9631#: builtin/bisect--helper.c:286
06991777
JX
9632#, c-format
9633msgid ""
9634"You need to give me at least one %s and %s revision.\n"
9635"You can use \"git bisect %s\" and \"git bisect %s\" for that."
9636msgstr ""
9637"您需要给我至少一个 %s 和一个 %s 版本。\n"
9638"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
9639
ddc12c42 9640#: builtin/bisect--helper.c:290
06991777
JX
9641#, c-format
9642msgid ""
9643"You need to start by \"git bisect start\".\n"
9644"You then need to give me at least one %s and %s revision.\n"
9645"You can use \"git bisect %s\" and \"git bisect %s\" for that."
9646msgstr ""
9647"您需要执行 \"git bisect start\" 来开始。\n"
9648"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
9649"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
9650
ddc12c42 9651#: builtin/bisect--helper.c:322
06991777
JX
9652#, c-format
9653msgid "bisecting only with a %s commit"
5b533632 9654msgstr "在只有一个 %s 提交的情况下二分查找"
06991777
JX
9655
9656# 译者:注意保持句尾空格
9657#. TRANSLATORS: Make sure to include [Y] and [n] in your
9658#. translation. The program will only accept English input
9659#. at this point.
9660#.
ddc12c42 9661#: builtin/bisect--helper.c:330
06991777
JX
9662msgid "Are you sure [Y/n]? "
9663msgstr "您确认么[Y/n]? "
9664
ddc12c42 9665#: builtin/bisect--helper.c:377
06991777
JX
9666msgid "no terms defined"
9667msgstr "未定义术语"
9668
ddc12c42 9669#: builtin/bisect--helper.c:380
06991777
JX
9670#, c-format
9671msgid ""
9672"Your current terms are %s for the old state\n"
9673"and %s for the new state.\n"
9674msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n"
9675
ddc12c42 9676#: builtin/bisect--helper.c:390
06991777
JX
9677#, c-format
9678msgid ""
9679"invalid argument %s for 'git bisect terms'.\n"
9680"Supported options are: --term-good|--term-old and --term-bad|--term-new."
9681msgstr ""
9682"命令 'git bisect terms' 的参数 %s 无效。\n"
9683"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
9684
ddc12c42 9685#: builtin/bisect--helper.c:476
06991777
JX
9686#, c-format
9687msgid "unrecognized option: '%s'"
9688msgstr "未识别的选项:'%s'"
9689
ddc12c42 9690#: builtin/bisect--helper.c:480
06991777
JX
9691#, c-format
9692msgid "'%s' does not appear to be a valid revision"
8e4e0555 9693msgstr "'%s' 看起来不是一个有效的版本"
06991777 9694
ddc12c42 9695#: builtin/bisect--helper.c:512
06991777
JX
9696msgid "bad HEAD - I need a HEAD"
9697msgstr "坏的 HEAD - 我需要一个 HEAD"
9698
ddc12c42 9699#: builtin/bisect--helper.c:527
06991777
JX
9700#, c-format
9701msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
9702msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
9703
ddc12c42 9704#: builtin/bisect--helper.c:548
06991777
JX
9705msgid "won't bisect on cg-seek'ed tree"
9706msgstr "不会在做了 cg-seek 的树上做二分查找"
9707
ddc12c42 9708#: builtin/bisect--helper.c:551
06991777
JX
9709msgid "bad HEAD - strange symbolic ref"
9710msgstr "坏的 HEAD - 奇怪的符号引用"
9711
ddc12c42 9712#: builtin/bisect--helper.c:575
a6cd2cc4
JX
9713#, c-format
9714msgid "invalid ref: '%s'"
9715msgstr "无效的引用:'%s'"
9716
ddc12c42 9717#: builtin/bisect--helper.c:631
ef317cd5 9718msgid "perform 'git bisect next'"
07432cef 9719msgstr "执行 'git bisect next'"
ef317cd5 9720
ddc12c42 9721#: builtin/bisect--helper.c:633
5809aa05
JX
9722msgid "write the terms to .git/BISECT_TERMS"
9723msgstr "将术语写入 .git/BISECT_TERMS"
9724
ddc12c42 9725#: builtin/bisect--helper.c:635
5809aa05
JX
9726msgid "cleanup the bisection state"
9727msgstr "清除二分查找状态"
9728
ddc12c42 9729#: builtin/bisect--helper.c:637
5809aa05
JX
9730msgid "check for expected revs"
9731msgstr "检查预期的版本"
9732
ddc12c42 9733#: builtin/bisect--helper.c:639
06991777
JX
9734msgid "reset the bisection state"
9735msgstr "清除二分查找状态"
9736
ddc12c42 9737#: builtin/bisect--helper.c:641
06991777
JX
9738msgid "write out the bisection state in BISECT_LOG"
9739msgstr "将二分查找的状态写入 BISECT_LOG"
9740
ddc12c42 9741#: builtin/bisect--helper.c:643
06991777
JX
9742msgid "check and set terms in a bisection state"
9743msgstr "在一个二分查找状态中检查和设置术语"
9744
ddc12c42 9745#: builtin/bisect--helper.c:645
06991777
JX
9746msgid "check whether bad or good terms exist"
9747msgstr "检查坏的或好的术语是否存在"
9748
ddc12c42 9749#: builtin/bisect--helper.c:647
06991777
JX
9750msgid "print out the bisect terms"
9751msgstr "打印二分查找术语"
9752
ddc12c42 9753#: builtin/bisect--helper.c:649
06991777 9754msgid "start the bisect session"
5b533632 9755msgstr "启动二分查找过程"
06991777 9756
ddc12c42 9757#: builtin/bisect--helper.c:651
ef317cd5 9758msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 9759msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 9760
ddc12c42 9761#: builtin/bisect--helper.c:653
06991777
JX
9762msgid "no log for BISECT_WRITE"
9763msgstr "BISECT_WRITE 无日志"
9764
ddc12c42 9765#: builtin/bisect--helper.c:670
5809aa05
JX
9766msgid "--write-terms requires two arguments"
9767msgstr "--write-terms 需要两个参数"
9768
ddc12c42 9769#: builtin/bisect--helper.c:674
5809aa05 9770msgid "--bisect-clean-state requires no arguments"
8e4e0555 9771msgstr "--bisect-clean-state 不带参数"
5809aa05 9772
ddc12c42 9773#: builtin/bisect--helper.c:681
06991777
JX
9774msgid "--bisect-reset requires either no argument or a commit"
9775msgstr "--bisect-reset 无需参数或者需要一个提交"
9776
ddc12c42 9777#: builtin/bisect--helper.c:685
06991777
JX
9778msgid "--bisect-write requires either 4 or 5 arguments"
9779msgstr "--bisect-write 需要 4 或 5 个参数"
9780
ddc12c42 9781#: builtin/bisect--helper.c:691
06991777
JX
9782msgid "--check-and-set-terms requires 3 arguments"
9783msgstr "--check-and-set-terms 需要 3 个参数"
9784
ddc12c42 9785#: builtin/bisect--helper.c:697
06991777
JX
9786msgid "--bisect-next-check requires 2 or 3 arguments"
9787msgstr "--bisect-next-check 需要 2 或 3 个参数"
9788
ddc12c42 9789#: builtin/bisect--helper.c:703
06991777
JX
9790msgid "--bisect-terms requires 0 or 1 argument"
9791msgstr "--bisect-terms 需要 0 或 1 个参数"
9792
a5cd71ca 9793#: builtin/blame.c:31
7aea43ff
JX
9794msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
9795msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 9796
a5cd71ca 9797#: builtin/blame.c:36
814ff314
JX
9798msgid "<rev-opts> are documented in git-rev-list(1)"
9799msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 9800
a5cd71ca 9801#: builtin/blame.c:409
fd8cb379
JX
9802#, c-format
9803msgid "expecting a color: %s"
9804msgstr "期望一个颜色:%s"
9805
a5cd71ca 9806#: builtin/blame.c:416
fd8cb379
JX
9807msgid "must end with a color"
9808msgstr "必须以一个颜色结尾"
9809
a5cd71ca 9810#: builtin/blame.c:729
fd8cb379
JX
9811#, c-format
9812msgid "invalid color '%s' in color.blame.repeatedLines"
9813msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
9814
a5cd71ca 9815#: builtin/blame.c:747
fd8cb379
JX
9816msgid "invalid value for blame.coloring"
9817msgstr "设置 blame.coloring 中的无效取值"
9818
a5cd71ca 9819#: builtin/blame.c:822
a6cd2cc4
JX
9820#, c-format
9821msgid "cannot find revision %s to ignore"
9822msgstr "不能找到要忽略的版本 %s"
9823
a5cd71ca 9824#: builtin/blame.c:844
ef317cd5 9825msgid "Show blame entries as we find them, incrementally"
07432cef 9826msgstr "增量式地显示发现的 blame 条目"
ef317cd5 9827
a5cd71ca 9828#: builtin/blame.c:845
ef317cd5 9829msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 9830msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 9831
a5cd71ca 9832#: builtin/blame.c:846
ef317cd5 9833msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 9834msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 9835
a5cd71ca 9836#: builtin/blame.c:847
ef317cd5 9837msgid "Show work cost statistics"
07432cef 9838msgstr "显示命令消耗统计"
ef317cd5 9839
a5cd71ca 9840#: builtin/blame.c:848
276ceeaa
JX
9841msgid "Force progress reporting"
9842msgstr "强制进度显示"
9843
a5cd71ca 9844#: builtin/blame.c:849
ef317cd5 9845msgid "Show output score for blame entries"
07432cef 9846msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 9847
a5cd71ca 9848#: builtin/blame.c:850
ef317cd5 9849msgid "Show original filename (Default: auto)"
07432cef 9850msgstr "显示原始文件名(默认:自动)"
ef317cd5 9851
a5cd71ca 9852#: builtin/blame.c:851
ef317cd5 9853msgid "Show original linenumber (Default: off)"
07432cef 9854msgstr "显示原始的行号(默认:关闭)"
ef317cd5 9855
a5cd71ca 9856#: builtin/blame.c:852
ef317cd5 9857msgid "Show in a format designed for machine consumption"
07432cef 9858msgstr "显示为一个适合机器读取的格式"
ef317cd5 9859
a5cd71ca 9860#: builtin/blame.c:853
ef317cd5 9861msgid "Show porcelain format with per-line commit information"
07432cef 9862msgstr "为每一行显示机器适用的提交信息"
ef317cd5 9863
a5cd71ca 9864#: builtin/blame.c:854
ef317cd5 9865msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 9866msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 9867
a5cd71ca 9868#: builtin/blame.c:855
ef317cd5 9869msgid "Show raw timestamp (Default: off)"
07432cef 9870msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 9871
a5cd71ca 9872#: builtin/blame.c:856
ef317cd5 9873msgid "Show long commit SHA1 (Default: off)"
4375c10e 9874msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 9875
a5cd71ca 9876#: builtin/blame.c:857
ef317cd5 9877msgid "Suppress author name and timestamp (Default: off)"
07432cef 9878msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 9879
a5cd71ca 9880#: builtin/blame.c:858
ef317cd5 9881msgid "Show author email instead of name (Default: off)"
07432cef 9882msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 9883
a5cd71ca 9884#: builtin/blame.c:859
ef317cd5 9885msgid "Ignore whitespace differences"
07432cef 9886msgstr "忽略空白差异"
ef317cd5 9887
ddc12c42 9888#: builtin/blame.c:860 builtin/log.c:1702
a6cd2cc4
JX
9889msgid "rev"
9890msgstr "版本"
9891
a5cd71ca 9892#: builtin/blame.c:860
a6cd2cc4
JX
9893msgid "Ignore <rev> when blaming"
9894msgstr "在执行 blame 操作时忽略 <版本>"
9895
a5cd71ca 9896#: builtin/blame.c:861
a6cd2cc4
JX
9897msgid "Ignore revisions from <file>"
9898msgstr "忽略来自 <文件> 中的版本"
9899
a5cd71ca 9900#: builtin/blame.c:862
fd8cb379
JX
9901msgid "color redundant metadata from previous line differently"
9902msgstr "使用颜色间隔输出与前一行不同的重复元信息"
9903
a5cd71ca 9904#: builtin/blame.c:863
fd8cb379
JX
9905msgid "color lines by age"
9906msgstr "依据时间着色"
9907
ddc12c42 9908#: builtin/blame.c:864
ef317cd5 9909msgid "Spend extra cycles to find better match"
07432cef 9910msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 9911
ddc12c42 9912#: builtin/blame.c:865
ef317cd5 9913msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 9914msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 9915
ddc12c42 9916#: builtin/blame.c:866
ef317cd5 9917msgid "Use <file>'s contents as the final image"
d9d56b23 9918msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 9919
ddc12c42 9920#: builtin/blame.c:867 builtin/blame.c:868
ef317cd5 9921msgid "score"
07432cef 9922msgstr "得分"
ef317cd5 9923
ddc12c42 9924#: builtin/blame.c:867
ef317cd5 9925msgid "Find line copies within and across files"
07432cef 9926msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 9927
ddc12c42 9928#: builtin/blame.c:868
ef317cd5 9929msgid "Find line movements within and across files"
07432cef 9930msgstr "找到文件内及跨文件的行移动"
ef317cd5 9931
ddc12c42 9932#: builtin/blame.c:869
ef317cd5 9933msgid "n,m"
07432cef 9934msgstr "n,m"
ef317cd5 9935
ddc12c42 9936#: builtin/blame.c:869
ef317cd5 9937msgid "Process only line range n,m, counting from 1"
07432cef 9938msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 9939
ddc12c42 9940#: builtin/blame.c:921
a0b6b246
JX
9941msgid "--progress can't be used with --incremental or porcelain formats"
9942msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
9943
a4f16749
JX
9944#. TRANSLATORS: This string is used to tell us the
9945#. maximum display width for a relative timestamp in
9946#. "git blame" output. For C locale, "4 years, 11
9947#. months ago", which takes 22 places, is the longest
9948#. among various forms of relative timestamps, but
9949#. your language may need more or fewer display
9950#. columns.
9951#.
ddc12c42 9952#: builtin/blame.c:972
6c94aba5
JX
9953msgid "4 years, 11 months ago"
9954msgstr "4 年 11 个月前"
9955
ddc12c42 9956#: builtin/blame.c:1079
a0b6b246
JX
9957#, c-format
9958msgid "file %s has only %lu line"
9959msgid_plural "file %s has only %lu lines"
9960msgstr[0] "文件 %s 只有 %lu 行"
9961msgstr[1] "文件 %s 只有 %lu 行"
9962
ddc12c42 9963#: builtin/blame.c:1125
a4f16749
JX
9964msgid "Blaming lines"
9965msgstr "追踪代码行"
9966
4c27fcb5 9967#: builtin/branch.c:29
814ff314
JX
9968msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
9969msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 9970
4c27fcb5 9971#: builtin/branch.c:30
814ff314
JX
9972msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
9973msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 9974
4c27fcb5 9975#: builtin/branch.c:31
814ff314
JX
9976msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
9977msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 9978
4c27fcb5 9979#: builtin/branch.c:32
814ff314
JX
9980msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
9981msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 9982
4c27fcb5 9983#: builtin/branch.c:33
6937cb4e
JX
9984msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
9985msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
9986
4c27fcb5 9987#: builtin/branch.c:34
94550ed3
JX
9988msgid "git branch [<options>] [-r | -a] [--points-at]"
9989msgstr "git branch [<选项>] [-r | -a] [--points-at]"
9990
4c27fcb5 9991#: builtin/branch.c:35
87cb7997
JX
9992msgid "git branch [<options>] [-r | -a] [--format]"
9993msgstr "git branch [<选项>] [-r | -a] [--format]"
9994
90e6ef53 9995# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
a6cd2cc4 9996#: builtin/branch.c:154
c04f5ac3
JX
9997#, c-format
9998msgid ""
9999"deleting branch '%s' that has been merged to\n"
10000" '%s', but not yet merged to HEAD."
10001msgstr ""
70fc47bf 10002"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
10003" '%s',但未合并到 HEAD。"
10004
90e6ef53 10005# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
a6cd2cc4 10006#: builtin/branch.c:158
c04f5ac3
JX
10007#, c-format
10008msgid ""
10009"not deleting branch '%s' that is not yet merged to\n"
10010" '%s', even though it is merged to HEAD."
10011msgstr ""
70fc47bf
T
10012"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
10013" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 10014
a6cd2cc4 10015#: builtin/branch.c:172
07432cef
WS
10016#, c-format
10017msgid "Couldn't look up commit object for '%s'"
10018msgstr "无法查询 '%s' 指向的提交对象"
10019
a6cd2cc4 10020#: builtin/branch.c:176
07432cef
WS
10021#, c-format
10022msgid ""
10023"The branch '%s' is not fully merged.\n"
10024"If you are sure you want to delete it, run 'git branch -D %s'."
10025msgstr ""
10026"分支 '%s' 没有完全合并。\n"
10027"如果您确认要删除它,执行 'git branch -D %s'。"
10028
a6cd2cc4 10029#: builtin/branch.c:189
07432cef 10030msgid "Update of config-file failed"
6937cb4e 10031msgstr "更新配置文件失败"
07432cef 10032
a6cd2cc4 10033#: builtin/branch.c:220
c04f5ac3 10034msgid "cannot use -a with -d"
649900bc 10035msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 10036
a6cd2cc4 10037#: builtin/branch.c:226
c04f5ac3
JX
10038msgid "Couldn't look up commit object for HEAD"
10039msgstr "无法查询 HEAD 指向的提交对象"
10040
a6cd2cc4 10041#: builtin/branch.c:240
c04f5ac3 10042#, c-format
5b04ee3b
JX
10043msgid "Cannot delete branch '%s' checked out at '%s'"
10044msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
c04f5ac3 10045
a6cd2cc4 10046#: builtin/branch.c:255
5ae481e0 10047#, c-format
7aea43ff
JX
10048msgid "remote-tracking branch '%s' not found."
10049msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 10050
a6cd2cc4 10051#: builtin/branch.c:256
81809b99 10052#, c-format
8ada9598 10053msgid "branch '%s' not found."
81809b99 10054msgstr "分支 '%s' 未发现。"
8ada9598 10055
a6cd2cc4 10056#: builtin/branch.c:271
81809b99 10057#, c-format
7aea43ff
JX
10058msgid "Error deleting remote-tracking branch '%s'"
10059msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 10060
a6cd2cc4 10061#: builtin/branch.c:272
81809b99 10062#, c-format
8ada9598 10063msgid "Error deleting branch '%s'"
7aea43ff 10064msgstr "无法删除分支 '%s'"
8ada9598 10065
a6cd2cc4 10066#: builtin/branch.c:279
81809b99 10067#, c-format
7aea43ff
JX
10068msgid "Deleted remote-tracking branch %s (was %s).\n"
10069msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 10070
a6cd2cc4 10071#: builtin/branch.c:280
81809b99 10072#, c-format
8ada9598 10073msgid "Deleted branch %s (was %s).\n"
81809b99 10074msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 10075
a6cd2cc4 10076#: builtin/branch.c:429 builtin/tag.c:61
6937cb4e
JX
10077msgid "unable to parse format string"
10078msgstr "不能解析格式化字符串"
10079
a6cd2cc4 10080#: builtin/branch.c:460
d46c5519
JX
10081msgid "could not resolve HEAD"
10082msgstr "不能解析 HEAD 提交"
10083
a6cd2cc4 10084#: builtin/branch.c:466
5b04ee3b 10085#, c-format
d46c5519
JX
10086msgid "HEAD (%s) points outside of refs/heads/"
10087msgstr "HEAD (%s) 指向 refs/heads/ 之外"
10088
a6cd2cc4 10089#: builtin/branch.c:481
d46c5519 10090#, c-format
5b04ee3b
JX
10091msgid "Branch %s is being rebased at %s"
10092msgstr "分支 %s 正被变基到 %s"
10093
a6cd2cc4 10094#: builtin/branch.c:485
5b04ee3b
JX
10095#, c-format
10096msgid "Branch %s is being bisected at %s"
10097msgstr "分支 %s 正被二分查找于 %s"
10098
a6cd2cc4 10099#: builtin/branch.c:502
6937cb4e
JX
10100msgid "cannot copy the current branch while not on any."
10101msgstr "无法拷贝当前分支因为不处于任何分支上。"
10102
a6cd2cc4 10103#: builtin/branch.c:504
c04f5ac3 10104msgid "cannot rename the current branch while not on any."
90e6ef53 10105msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 10106
a6cd2cc4 10107#: builtin/branch.c:515
c04f5ac3
JX
10108#, c-format
10109msgid "Invalid branch name: '%s'"
10110msgstr "无效的分支名:'%s'"
10111
a6cd2cc4 10112#: builtin/branch.c:542
c04f5ac3
JX
10113msgid "Branch rename failed"
10114msgstr "分支重命名失败"
10115
a6cd2cc4 10116#: builtin/branch.c:544
6937cb4e
JX
10117msgid "Branch copy failed"
10118msgstr "分支拷贝失败"
10119
a6cd2cc4 10120#: builtin/branch.c:548
6937cb4e 10121#, c-format
5809aa05
JX
10122msgid "Created a copy of a misnamed branch '%s'"
10123msgstr "已为错误命名的分支 '%s' 创建了一个副本"
6937cb4e 10124
a6cd2cc4 10125#: builtin/branch.c:551
c04f5ac3
JX
10126#, c-format
10127msgid "Renamed a misnamed branch '%s' away"
6937cb4e 10128msgstr "已将错误命名的分支 '%s' 重命名"
c04f5ac3 10129
a6cd2cc4 10130#: builtin/branch.c:557
c04f5ac3
JX
10131#, c-format
10132msgid "Branch renamed to %s, but HEAD is not updated!"
10133msgstr "分支重命名为 %s,但 HEAD 没有更新!"
10134
a6cd2cc4 10135#: builtin/branch.c:566
c04f5ac3 10136msgid "Branch is renamed, but update of config-file failed"
6937cb4e
JX
10137msgstr "分支被重命名,但更新配置文件失败"
10138
a6cd2cc4 10139#: builtin/branch.c:568
6937cb4e
JX
10140msgid "Branch is copied, but update of config-file failed"
10141msgstr "分支已拷贝,但更新配置文件失败"
c04f5ac3 10142
a6cd2cc4 10143#: builtin/branch.c:584
5c57d762
JX
10144#, c-format
10145msgid ""
10146"Please edit the description for the branch\n"
10147" %s\n"
10148"Lines starting with '%c' will be stripped.\n"
10149msgstr ""
10150"请编辑分支的描述\n"
10151" %s\n"
10152"以 '%c' 开头的行将被过滤。\n"
c04f5ac3 10153
a6cd2cc4 10154#: builtin/branch.c:618
ef317cd5 10155msgid "Generic options"
07432cef 10156msgstr "通用选项"
c04f5ac3 10157
a6cd2cc4 10158#: builtin/branch.c:620
ef317cd5 10159msgid "show hash and subject, give twice for upstream branch"
07432cef 10160msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 10161
a6cd2cc4 10162#: builtin/branch.c:621
ef317cd5 10163msgid "suppress informational messages"
07432cef 10164msgstr "不显示信息"
8ada9598 10165
a6cd2cc4 10166#: builtin/branch.c:622
ef317cd5 10167msgid "set up tracking mode (see git-pull(1))"
07432cef 10168msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 10169
a6cd2cc4 10170#: builtin/branch.c:624
6937cb4e
JX
10171msgid "do not use"
10172msgstr "不要使用"
c04f5ac3 10173
ddc12c42 10174#: builtin/branch.c:626 builtin/rebase.c:505
5b04ee3b
JX
10175msgid "upstream"
10176msgstr "上游"
10177
a6cd2cc4 10178#: builtin/branch.c:626
5b04ee3b
JX
10179msgid "change the upstream info"
10180msgstr "改变上游信息"
10181
a6cd2cc4 10182#: builtin/branch.c:627
ddc12c42 10183msgid "unset the upstream info"
a0b6b246
JX
10184msgstr "取消上游信息的设置"
10185
a6cd2cc4 10186#: builtin/branch.c:628
ef317cd5 10187msgid "use colored output"
07432cef 10188msgstr "使用彩色输出"
c04f5ac3 10189
a6cd2cc4 10190#: builtin/branch.c:629
ef317cd5 10191msgid "act on remote-tracking branches"
07432cef 10192msgstr "作用于远程跟踪分支"
c04f5ac3 10193
a6cd2cc4 10194#: builtin/branch.c:631 builtin/branch.c:633
ef317cd5 10195msgid "print only branches that contain the commit"
07432cef 10196msgstr "只打印包含该提交的分支"
c04f5ac3 10197
a6cd2cc4 10198#: builtin/branch.c:632 builtin/branch.c:634
87cb7997
JX
10199msgid "print only branches that don't contain the commit"
10200msgstr "只打印不包含该提交的分支"
10201
a6cd2cc4 10202#: builtin/branch.c:637
ef317cd5 10203msgid "Specific git-branch actions:"
07432cef 10204msgstr "具体的 git-branch 动作:"
c04f5ac3 10205
a6cd2cc4 10206#: builtin/branch.c:638
ef317cd5 10207msgid "list both remote-tracking and local branches"
07432cef 10208msgstr "列出远程跟踪及本地分支"
c04f5ac3 10209
a6cd2cc4 10210#: builtin/branch.c:640
ef317cd5 10211msgid "delete fully merged branch"
07432cef 10212msgstr "删除完全合并的分支"
c04f5ac3 10213
a6cd2cc4 10214#: builtin/branch.c:641
ef317cd5 10215msgid "delete branch (even if not merged)"
07432cef 10216msgstr "删除分支(即使没有合并)"
c04f5ac3 10217
a6cd2cc4 10218#: builtin/branch.c:642
ef317cd5 10219msgid "move/rename a branch and its reflog"
07432cef 10220msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 10221
a6cd2cc4 10222#: builtin/branch.c:643
ef317cd5 10223msgid "move/rename a branch, even if target exists"
07432cef 10224msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 10225
a6cd2cc4 10226#: builtin/branch.c:644
6937cb4e
JX
10227msgid "copy a branch and its reflog"
10228msgstr "拷贝一个分支和它的引用日志"
10229
a6cd2cc4 10230#: builtin/branch.c:645
6937cb4e
JX
10231msgid "copy a branch, even if target exists"
10232msgstr "拷贝一个分支,即使目标已存在"
10233
a6cd2cc4 10234#: builtin/branch.c:646
ef317cd5 10235msgid "list branch names"
07432cef 10236msgstr "列出分支名"
c04f5ac3 10237
a6cd2cc4 10238#: builtin/branch.c:647
d46c5519
JX
10239msgid "show current branch name"
10240msgstr "显示当前分支名"
10241
a6cd2cc4 10242#: builtin/branch.c:648
ef317cd5 10243msgid "create the branch's reflog"
07432cef 10244msgstr "创建分支的引用日志"
ef317cd5 10245
a6cd2cc4 10246#: builtin/branch.c:650
ef317cd5 10247msgid "edit the description for the branch"
07432cef 10248msgstr "标记分支的描述"
ef317cd5 10249
a6cd2cc4 10250#: builtin/branch.c:651
04cb2f28
JX
10251msgid "force creation, move/rename, deletion"
10252msgstr "强制创建、移动/重命名、删除"
ef317cd5 10253
a6cd2cc4 10254#: builtin/branch.c:652
94550ed3
JX
10255msgid "print only branches that are merged"
10256msgstr "只打印已经合并的分支"
ef317cd5 10257
a6cd2cc4 10258#: builtin/branch.c:653
94550ed3
JX
10259msgid "print only branches that are not merged"
10260msgstr "只打印尚未合并的分支"
ef317cd5 10261
a6cd2cc4 10262#: builtin/branch.c:654
ef317cd5 10263msgid "list branches in columns"
07432cef 10264msgstr "以列的方式显示分支"
ef317cd5 10265
a6cd2cc4 10266#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
06991777 10267#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
a6cd2cc4 10268#: builtin/tag.c:433
94550ed3
JX
10269msgid "object"
10270msgstr "对象"
10271
a6cd2cc4 10272#: builtin/branch.c:658
94550ed3
JX
10273msgid "print only branches of the object"
10274msgstr "只打印指向该对象的分支"
10275
a6cd2cc4 10276#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
1a79b2f1
JX
10277msgid "sorting and filtering are case insensitive"
10278msgstr "排序和过滤属于大小写不敏感"
10279
a6cd2cc4
JX
10280#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
10281#: builtin/verify-tag.c:38
87cb7997
JX
10282msgid "format to use for the output"
10283msgstr "输出格式"
10284
ddc12c42 10285#: builtin/branch.c:684 builtin/clone.c:784
c04f5ac3 10286msgid "HEAD not found below refs/heads!"
90e6ef53 10287msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 10288
a6cd2cc4 10289#: builtin/branch.c:708
8ada9598 10290msgid "--column and --verbose are incompatible"
81809b99 10291msgstr "--column 和 --verbose 不兼容"
8ada9598 10292
a6cd2cc4 10293#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
a77c07d9
JX
10294msgid "branch name required"
10295msgstr "必须提供分支名"
10296
a6cd2cc4 10297#: builtin/branch.c:753
a77c07d9
JX
10298msgid "Cannot give description to detached HEAD"
10299msgstr "不能向分离头指针提供描述"
10300
a6cd2cc4 10301#: builtin/branch.c:758
a77c07d9
JX
10302msgid "cannot edit description of more than one branch"
10303msgstr "不能为一个以上的分支编辑描述"
10304
a6cd2cc4 10305#: builtin/branch.c:765
a77c07d9
JX
10306#, c-format
10307msgid "No commit on branch '%s' yet."
10308msgstr "分支 '%s' 尚无提交。"
10309
a6cd2cc4 10310#: builtin/branch.c:768
a77c07d9
JX
10311#, c-format
10312msgid "No branch named '%s'."
10313msgstr "没有分支 '%s'。"
10314
a6cd2cc4 10315#: builtin/branch.c:783
6937cb4e
JX
10316msgid "too many branches for a copy operation"
10317msgstr "为拷贝操作提供了太多的分支名"
a77c07d9 10318
a6cd2cc4 10319#: builtin/branch.c:792
6937cb4e
JX
10320msgid "too many arguments for a rename operation"
10321msgstr "为重命名操作提供了太多的参数"
1003b3a5 10322
a6cd2cc4 10323#: builtin/branch.c:797
6937cb4e
JX
10324msgid "too many arguments to set new upstream"
10325msgstr "为设置新上游提供了太多的参数"
10326
a6cd2cc4 10327#: builtin/branch.c:801
1003b3a5
JX
10328#, c-format
10329msgid ""
10330"could not set upstream of HEAD to %s when it does not point to any branch."
10331msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
10332
a6cd2cc4 10333#: builtin/branch.c:804 builtin/branch.c:827
1003b3a5
JX
10334#, c-format
10335msgid "no such branch '%s'"
10336msgstr "没有此分支 '%s'"
10337
a6cd2cc4 10338#: builtin/branch.c:808
07432cef 10339#, c-format
ef317cd5 10340msgid "branch '%s' does not exist"
07432cef 10341msgstr "分支 '%s' 不存在"
ef317cd5 10342
a6cd2cc4 10343#: builtin/branch.c:821
6937cb4e
JX
10344msgid "too many arguments to unset upstream"
10345msgstr "为取消上游设置操作提供了太多的参数"
1003b3a5 10346
a6cd2cc4 10347#: builtin/branch.c:825
1003b3a5
JX
10348msgid "could not unset upstream of HEAD when it does not point to any branch."
10349msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
10350
a6cd2cc4 10351#: builtin/branch.c:831
ef317cd5
JX
10352#, c-format
10353msgid "Branch '%s' has no upstream information"
07432cef 10354msgstr "分支 '%s' 没有上游信息"
ef317cd5 10355
a6cd2cc4
JX
10356#: builtin/branch.c:841
10357msgid ""
10358"The -a, and -r, options to 'git branch' do not take a branch name.\n"
10359"Did you mean to use: -a|-r --list <pattern>?"
10360msgstr ""
10361"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
10362"您是否想要使用:-a|-r --list <模式>?"
c04f5ac3 10363
ddc12c42
JX
10364#: builtin/branch.c:845
10365msgid ""
10366"the '--set-upstream' option is no longer supported. Please use '--track' or "
10367"'--set-upstream-to' instead."
10368msgstr ""
10369"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
10370
10371#: builtin/bundle.c:15 builtin/bundle.c:23
10372msgid "git bundle create [<options>] <file> <git-rev-list args>"
10373msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>"
10374
10375#: builtin/bundle.c:16 builtin/bundle.c:28
10376msgid "git bundle verify [<options>] <file>"
10377msgstr "git bundle verify [<选项>] <文件>"
10378
10379#: builtin/bundle.c:17 builtin/bundle.c:33
10380msgid "git bundle list-heads <file> [<refname>...]"
10381msgstr "git bundle list-heads <文件> [<引用名>...]"
10382
10383#: builtin/bundle.c:18 builtin/bundle.c:38
10384msgid "git bundle unbundle <file> [<refname>...]"
10385msgstr "git bundle unbundle <文件> [<引用名>...]"
10386
10387#: builtin/bundle.c:66 builtin/pack-objects.c:3228
10388msgid "do not show progress meter"
10389msgstr "不显示进度表"
10390
10391#: builtin/bundle.c:68 builtin/pack-objects.c:3230
10392msgid "show progress meter"
10393msgstr "显示进度表"
10394
10395#: builtin/bundle.c:70 builtin/pack-objects.c:3232
10396msgid "show progress meter during object writing phase"
10397msgstr "在对象写入阶段显示进度表"
10398
10399#: builtin/bundle.c:73 builtin/pack-objects.c:3235
10400msgid "similar to --all-progress when progress meter is shown"
10401msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 10402
ddc12c42
JX
10403#: builtin/bundle.c:93
10404msgid "Need a repository to create a bundle."
10405msgstr "需要一个仓库来创建包。"
10406
10407#: builtin/bundle.c:104
10408msgid "do not show bundle details"
10409msgstr "不显示 bundle 细节"
10410
10411#: builtin/bundle.c:119
c04f5ac3
JX
10412#, c-format
10413msgid "%s is okay\n"
10414msgstr "%s 可以\n"
10415
ddc12c42 10416#: builtin/bundle.c:160
c04f5ac3 10417msgid "Need a repository to unbundle."
160fb2b2 10418msgstr "需要一个仓库来解包。"
c04f5ac3 10419
ddc12c42
JX
10420#: builtin/bundle.c:168 builtin/remote.c:1609
10421msgid "be verbose; must be placed before a subcommand"
10422msgstr "冗长输出;必须置于子命令之前"
10423
10424#: builtin/bundle.c:190 builtin/remote.c:1640
10425#, c-format
10426msgid "Unknown subcommand: %s"
10427msgstr "未知子命令:%s"
10428
a5cd71ca 10429#: builtin/cat-file.c:595
7aea43ff 10430msgid ""
a0b6b246
JX
10431"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
10432"p | <type> | --textconv | --filters) [--path=<path>] <object>"
275588f9
JX
10433msgstr ""
10434"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
10435"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
ef317cd5 10436
a5cd71ca 10437#: builtin/cat-file.c:596
a0b6b246
JX
10438msgid ""
10439"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
10440"filters]"
275588f9
JX
10441msgstr ""
10442"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
10443"filters]"
ef317cd5 10444
a5cd71ca 10445#: builtin/cat-file.c:617
4c27fcb5
JX
10446msgid "only one batch option may be specified"
10447msgstr "只能指定一个批处理选项"
10448
a5cd71ca 10449#: builtin/cat-file.c:635
ef317cd5 10450msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 10451msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 10452
a5cd71ca 10453#: builtin/cat-file.c:636
ef317cd5 10454msgid "show object type"
07432cef 10455msgstr "显示对象类型"
ef317cd5 10456
a5cd71ca 10457#: builtin/cat-file.c:637
ef317cd5 10458msgid "show object size"
07432cef 10459msgstr "显示对象大小"
ef317cd5 10460
a5cd71ca 10461#: builtin/cat-file.c:639
ef317cd5 10462msgid "exit with zero when there's no error"
07432cef 10463msgstr "当没有错误时退出并返回零"
ef317cd5 10464
a5cd71ca 10465#: builtin/cat-file.c:640
ef317cd5 10466msgid "pretty-print object's content"
07432cef 10467msgstr "美观地打印对象的内容"
ef317cd5 10468
a5cd71ca 10469#: builtin/cat-file.c:642
ef317cd5 10470msgid "for blob objects, run textconv on object's content"
a0b6b246
JX
10471msgstr "对于数据对象,对其内容做文本转换"
10472
a5cd71ca 10473#: builtin/cat-file.c:644
a0b6b246
JX
10474msgid "for blob objects, run filters on object's content"
10475msgstr "对于数据对象,对其内容做过滤"
10476
ddc12c42 10477#: builtin/cat-file.c:645 git-submodule.sh:992
a0b6b246
JX
10478msgid "blob"
10479msgstr "数据对象"
10480
a5cd71ca 10481#: builtin/cat-file.c:646
a0b6b246
JX
10482msgid "use a specific path for --textconv/--filters"
10483msgstr "对于 --textconv/--filters 使用一个特定的路径"
ef317cd5 10484
a5cd71ca 10485#: builtin/cat-file.c:648
7aea43ff
JX
10486msgid "allow -s and -t to work with broken/corrupt objects"
10487msgstr "允许 -s 和 -t 对损坏的对象生效"
10488
a5cd71ca 10489#: builtin/cat-file.c:649
1b7f4a34
JX
10490msgid "buffer --batch output"
10491msgstr "缓冲 --batch 的输出"
10492
a5cd71ca 10493#: builtin/cat-file.c:651
ef317cd5 10494msgid "show info and content of objects fed from the standard input"
07432cef 10495msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 10496
a5cd71ca 10497#: builtin/cat-file.c:655
ef317cd5 10498msgid "show info about objects fed from the standard input"
07432cef 10499msgstr "显示从标准输入提供的对象的信息"
ef317cd5 10500
a5cd71ca 10501#: builtin/cat-file.c:659
7aea43ff
JX
10502msgid "follow in-tree symlinks (used with --batch or --batch-check)"
10503msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
10504
a5cd71ca 10505#: builtin/cat-file.c:661
1b7f4a34
JX
10506msgid "show all objects with --batch or --batch-check"
10507msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
10508
a5cd71ca 10509#: builtin/cat-file.c:663
c1ac5258
JX
10510msgid "do not order --batch-all-objects output"
10511msgstr "不要对 --batch-all-objects 的输出排序"
10512
06991777 10513#: builtin/check-attr.c:13
814ff314
JX
10514msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
10515msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5 10516
06991777 10517#: builtin/check-attr.c:14
94550ed3
JX
10518msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
10519msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5 10520
06991777 10521#: builtin/check-attr.c:21
ef317cd5 10522msgid "report all attributes set on file"
07432cef 10523msgstr "报告设置在文件上的所有属性"
ef317cd5 10524
06991777 10525#: builtin/check-attr.c:22
ef317cd5 10526msgid "use .gitattributes only from the index"
07432cef 10527msgstr "只使用索引中的 .gitattributes"
ef317cd5 10528
06991777 10529#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
ef317cd5 10530msgid "read file names from stdin"
07432cef 10531msgstr "从标准输入读出文件名"
ef317cd5 10532
06991777 10533#: builtin/check-attr.c:25 builtin/check-ignore.c:27
90314792
JX
10534msgid "terminate input and output records by a NUL character"
10535msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 10536
ddc12c42 10537#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537
a5cd71ca 10538#: builtin/worktree.c:506
a77c07d9
JX
10539msgid "suppress progress reporting"
10540msgstr "不显示进度报告"
10541
06991777 10542#: builtin/check-ignore.c:29
2e8451e8
JX
10543msgid "show non-matching input paths"
10544msgstr "显示未匹配的输入路径"
10545
06991777 10546#: builtin/check-ignore.c:31
90314792
JX
10547msgid "ignore index when checking"
10548msgstr "检查时忽略索引"
10549
06991777 10550#: builtin/check-ignore.c:160
a77c07d9 10551msgid "cannot specify pathnames with --stdin"
1b7f4a34 10552msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 10553
06991777 10554#: builtin/check-ignore.c:163
a77c07d9
JX
10555msgid "-z only makes sense with --stdin"
10556msgstr "-z 需要和 --stdin 参数共用才有意义"
10557
06991777 10558#: builtin/check-ignore.c:165
a77c07d9
JX
10559msgid "no path specified"
10560msgstr "未指定路径"
10561
06991777 10562#: builtin/check-ignore.c:169
a77c07d9
JX
10563msgid "--quiet is only valid with a single pathname"
10564msgstr "参数 --quiet 只在提供一个路径名时有效"
10565
06991777 10566#: builtin/check-ignore.c:171
a77c07d9
JX
10567msgid "cannot have both --quiet and --verbose"
10568msgstr "不能同时提供 --quiet 和 --verbose 参数"
10569
06991777 10570#: builtin/check-ignore.c:174
2e8451e8
JX
10571msgid "--non-matching is only valid with --verbose"
10572msgstr "--non-matching 选项只在使用 --verbose 时有效"
10573
a4f16749 10574#: builtin/check-mailmap.c:9
814ff314
JX
10575msgid "git check-mailmap [<options>] <contact>..."
10576msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8 10577
a4f16749 10578#: builtin/check-mailmap.c:14
2e8451e8
JX
10579msgid "also read contacts from stdin"
10580msgstr "还从标准输入读取联系地址"
10581
a4f16749 10582#: builtin/check-mailmap.c:25
2e8451e8
JX
10583#, c-format
10584msgid "unable to parse contact: %s"
10585msgstr "不能解析联系地址:%s"
10586
a4f16749 10587#: builtin/check-mailmap.c:48
2e8451e8
JX
10588msgid "no contacts specified"
10589msgstr "未指定联系地址"
10590
06991777 10591#: builtin/checkout-index.c:131
814ff314
JX
10592msgid "git checkout-index [<options>] [--] [<file>...]"
10593msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 10594
06991777 10595#: builtin/checkout-index.c:148
276ceeaa
JX
10596msgid "stage should be between 1 and 3 or all"
10597msgstr "索引值应该取值 1 到 3 或者 all"
10598
06991777 10599#: builtin/checkout-index.c:164
ef317cd5 10600msgid "check out all files in the index"
07432cef 10601msgstr "检出索引区的所有文件"
ef317cd5 10602
06991777 10603#: builtin/checkout-index.c:165
ef317cd5 10604msgid "force overwrite of existing files"
07432cef 10605msgstr "强制覆盖现有的文件"
ef317cd5 10606
06991777 10607#: builtin/checkout-index.c:167
ef317cd5 10608msgid "no warning for existing files and files not in index"
07432cef 10609msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 10610
06991777 10611#: builtin/checkout-index.c:169
ef317cd5 10612msgid "don't checkout new files"
07432cef 10613msgstr "不检出新文件"
ef317cd5 10614
06991777 10615#: builtin/checkout-index.c:171
ef317cd5 10616msgid "update stat information in the index file"
07432cef 10617msgstr "更新索引中文件的状态信息"
ef317cd5 10618
06991777 10619#: builtin/checkout-index.c:175
ef317cd5 10620msgid "read list of paths from the standard input"
07432cef 10621msgstr "从标准输入读取路径列表"
ef317cd5 10622
06991777 10623#: builtin/checkout-index.c:177
ef317cd5 10624msgid "write the content to temporary files"
07432cef 10625msgstr "将内容写入临时文件"
ef317cd5 10626
06991777 10627#: builtin/checkout-index.c:178 builtin/column.c:31
ddc12c42
JX
10628#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388
10629#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882
a5cd71ca 10630#: builtin/worktree.c:679
ef317cd5 10631msgid "string"
07432cef 10632msgstr "字符串"
ef317cd5 10633
06991777 10634#: builtin/checkout-index.c:179
ef317cd5 10635msgid "when creating files, prepend <string>"
4375c10e 10636msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 10637
06991777 10638#: builtin/checkout-index.c:181
ef317cd5 10639msgid "copy out the files from named stage"
07432cef 10640msgstr "从指定暂存区中拷出文件"
ef317cd5 10641
a6cd2cc4 10642#: builtin/checkout.c:31
814ff314
JX
10643msgid "git checkout [<options>] <branch>"
10644msgstr "git checkout [<选项>] <分支>"
ef317cd5 10645
a6cd2cc4 10646#: builtin/checkout.c:32
814ff314
JX
10647msgid "git checkout [<options>] [<branch>] -- <file>..."
10648msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 10649
a6cd2cc4
JX
10650#: builtin/checkout.c:37
10651msgid "git switch [<options>] [<branch>]"
10652msgstr "git switch [<选项>] [<分支>]"
10653
10654#: builtin/checkout.c:42
10655msgid "git restore [<options>] [--source=<branch>] <file>..."
10656msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
10657
ddc12c42 10658#: builtin/checkout.c:175 builtin/checkout.c:214
c04f5ac3
JX
10659#, c-format
10660msgid "path '%s' does not have our version"
10661msgstr "路径 '%s' 没有我们的版本"
10662
ddc12c42 10663#: builtin/checkout.c:177 builtin/checkout.c:216
c04f5ac3
JX
10664#, c-format
10665msgid "path '%s' does not have their version"
10666msgstr "路径 '%s' 没有他们的版本"
10667
ddc12c42 10668#: builtin/checkout.c:193
c04f5ac3
JX
10669#, c-format
10670msgid "path '%s' does not have all necessary versions"
e640d114 10671msgstr "路径 '%s' 没有全部必需的版本"
c04f5ac3 10672
ddc12c42 10673#: builtin/checkout.c:243
c04f5ac3
JX
10674#, c-format
10675msgid "path '%s' does not have necessary versions"
e640d114 10676msgstr "路径 '%s' 没有必需的版本"
c04f5ac3 10677
ddc12c42 10678#: builtin/checkout.c:261
c04f5ac3
JX
10679#, c-format
10680msgid "path '%s': cannot merge"
90e6ef53 10681msgstr "path '%s':无法合并"
c04f5ac3 10682
ddc12c42 10683#: builtin/checkout.c:277
c04f5ac3
JX
10684#, c-format
10685msgid "Unable to add merge result for '%s'"
10686msgstr "无法为 '%s' 添加合并结果"
10687
ddc12c42 10688#: builtin/checkout.c:377
a6cd2cc4
JX
10689#, c-format
10690msgid "Recreated %d merge conflict"
10691msgid_plural "Recreated %d merge conflicts"
10692msgstr[0] "重新创建了 %d 个合并冲突"
10693msgstr[1] "重新创建了 %d 个合并冲突"
10694
ddc12c42 10695#: builtin/checkout.c:382
a6cd2cc4
JX
10696#, c-format
10697msgid "Updated %d path from %s"
10698msgid_plural "Updated %d paths from %s"
10699msgstr[0] "从 %2$s 更新了 %1$d 个路径"
10700msgstr[1] "从 %2$s 更新了 %1$d 个路径"
10701
ddc12c42 10702#: builtin/checkout.c:389
a6cd2cc4
JX
10703#, c-format
10704msgid "Updated %d path from the index"
10705msgid_plural "Updated %d paths from the index"
10706msgstr[0] "从索引区更新了 %d 个路径"
10707msgstr[1] "从索引区更新了 %d 个路径"
10708
ddc12c42
JX
10709#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
10710#: builtin/checkout.c:422
07432cef 10711#, c-format
ef317cd5 10712msgid "'%s' cannot be used with updating paths"
07432cef 10713msgstr "'%s' 不能在更新路径时使用"
ef317cd5 10714
ddc12c42 10715#: builtin/checkout.c:425 builtin/checkout.c:428
07432cef 10716#, c-format
ef317cd5 10717msgid "'%s' cannot be used with %s"
07432cef 10718msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 10719
ddc12c42 10720#: builtin/checkout.c:432
ef317cd5
JX
10721#, c-format
10722msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 10723msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 10724
ddc12c42 10725#: builtin/checkout.c:436
c04f5ac3 10726#, c-format
a6cd2cc4
JX
10727msgid "neither '%s' or '%s' is specified"
10728msgstr "'%s' 或 '%s' 都没有指定"
c04f5ac3 10729
ddc12c42 10730#: builtin/checkout.c:440
06991777 10731#, c-format
a6cd2cc4
JX
10732msgid "'%s' must be used when '%s' is not specified"
10733msgstr "未指定 '%2$s' 时,必须使用 '%1$s'"
06991777 10734
ddc12c42 10735#: builtin/checkout.c:445 builtin/checkout.c:450
06991777 10736#, c-format
a6cd2cc4
JX
10737msgid "'%s' or '%s' cannot be used with %s"
10738msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
06991777 10739
ddc12c42 10740#: builtin/checkout.c:509 builtin/checkout.c:516
06991777 10741#, c-format
a6cd2cc4
JX
10742msgid "path '%s' is unmerged"
10743msgstr "路径 '%s' 未合并"
06991777 10744
ddc12c42 10745#: builtin/checkout.c:682 builtin/sparse-checkout.c:82
c04f5ac3 10746msgid "you need to resolve your current index first"
90e6ef53 10747msgstr "您需要先解决当前索引的冲突"
c04f5ac3 10748
ddc12c42 10749#: builtin/checkout.c:732
d46c5519
JX
10750#, c-format
10751msgid ""
10752"cannot continue with staged changes in the following files:\n"
10753"%s"
10754msgstr ""
10755"不能继续,下列文件有暂存的修改:\n"
10756"%s"
10757
ddc12c42 10758#: builtin/checkout.c:835
c04f5ac3 10759#, c-format
1b7f4a34
JX
10760msgid "Can not do reflog for '%s': %s\n"
10761msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 10762
ddc12c42 10763#: builtin/checkout.c:877
c04f5ac3
JX
10764msgid "HEAD is now at"
10765msgstr "HEAD 目前位于"
10766
ddc12c42 10767#: builtin/checkout.c:881 builtin/clone.c:716
3495628d
JX
10768msgid "unable to update HEAD"
10769msgstr "不能更新 HEAD"
10770
ddc12c42 10771#: builtin/checkout.c:885
c04f5ac3
JX
10772#, c-format
10773msgid "Reset branch '%s'\n"
10774msgstr "重置分支 '%s'\n"
10775
ddc12c42 10776#: builtin/checkout.c:888
c04f5ac3
JX
10777#, c-format
10778msgid "Already on '%s'\n"
10779msgstr "已经位于 '%s'\n"
10780
ddc12c42 10781#: builtin/checkout.c:892
c04f5ac3
JX
10782#, c-format
10783msgid "Switched to and reset branch '%s'\n"
10784msgstr "切换并重置分支 '%s'\n"
10785
ddc12c42 10786#: builtin/checkout.c:894 builtin/checkout.c:1291
c04f5ac3
JX
10787#, c-format
10788msgid "Switched to a new branch '%s'\n"
10789msgstr "切换到一个新分支 '%s'\n"
10790
ddc12c42 10791#: builtin/checkout.c:896
c04f5ac3
JX
10792#, c-format
10793msgid "Switched to branch '%s'\n"
10794msgstr "切换到分支 '%s'\n"
10795
90e6ef53 10796# 译者:注意保持前导空格
ddc12c42 10797#: builtin/checkout.c:947
c04f5ac3
JX
10798#, c-format
10799msgid " ... and %d more.\n"
90e6ef53 10800msgstr " ... 及其它 %d 个。\n"
c04f5ac3 10801
ddc12c42 10802#: builtin/checkout.c:953
c04f5ac3
JX
10803#, c-format
10804msgid ""
10805"Warning: you are leaving %d commit behind, not connected to\n"
10806"any of your branches:\n"
10807"\n"
10808"%s\n"
10809msgid_plural ""
10810"Warning: you are leaving %d commits behind, not connected to\n"
10811"any of your branches:\n"
10812"\n"
10813"%s\n"
10814msgstr[0] ""
10815"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
10816"\n"
10817"%s\n"
5ae481e0
JX
10818msgstr[1] ""
10819"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
10820"\n"
10821"%s\n"
c04f5ac3 10822
ddc12c42 10823#: builtin/checkout.c:972
c04f5ac3
JX
10824#, c-format
10825msgid ""
7aea43ff
JX
10826"If you want to keep it by creating a new branch, this may be a good time\n"
10827"to do so with:\n"
10828"\n"
10829" git branch <new-branch-name> %s\n"
10830"\n"
10831msgid_plural ""
c04f5ac3
JX
10832"If you want to keep them by creating a new branch, this may be a good time\n"
10833"to do so with:\n"
10834"\n"
814ff314 10835" git branch <new-branch-name> %s\n"
c04f5ac3 10836"\n"
7aea43ff
JX
10837msgstr[0] ""
10838"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
10839"如下操作:\n"
10840"\n"
10841" git branch <新分支名> %s\n"
10842"\n"
10843msgstr[1] ""
10844"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
10845"如下操作:\n"
10846"\n"
814ff314 10847" git branch <新分支名> %s\n"
c04f5ac3
JX
10848"\n"
10849
ddc12c42 10850#: builtin/checkout.c:1007
c04f5ac3
JX
10851msgid "internal error in revision walk"
10852msgstr "在版本遍历时遇到内部错误"
10853
ddc12c42 10854#: builtin/checkout.c:1011
c04f5ac3
JX
10855msgid "Previous HEAD position was"
10856msgstr "之前的 HEAD 位置是"
10857
ddc12c42 10858#: builtin/checkout.c:1051 builtin/checkout.c:1286
c04f5ac3 10859msgid "You are on a branch yet to be born"
90e6ef53 10860msgstr "您位于一个尚未初始化的分支"
c04f5ac3 10861
ddc12c42 10862#: builtin/checkout.c:1178
a6cd2cc4
JX
10863msgid "only one reference expected"
10864msgstr "预期只有一个引用"
10865
ddc12c42 10866#: builtin/checkout.c:1195
90314792
JX
10867#, c-format
10868msgid "only one reference expected, %d given."
a0b6b246 10869msgstr "应只有一个引用,却给出了 %d 个"
90314792 10870
ddc12c42 10871#: builtin/checkout.c:1232
06991777
JX
10872#, c-format
10873msgid ""
10874"'%s' could be both a local file and a tracking branch.\n"
10875"Please use -- (and optionally --no-guess) to disambiguate"
10876msgstr ""
10877"'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n"
10878"请使用 --(和可选的 --no-guess)来消除歧义"
10879
ddc12c42 10880#: builtin/checkout.c:1245 builtin/worktree.c:290 builtin/worktree.c:455
c04f5ac3
JX
10881#, c-format
10882msgid "invalid reference: %s"
10883msgstr "无效引用:%s"
10884
ddc12c42 10885#: builtin/checkout.c:1258 builtin/checkout.c:1622
c04f5ac3
JX
10886#, c-format
10887msgid "reference is not a tree: %s"
10888msgstr "引用不是一个树:%s"
10889
ddc12c42 10890#: builtin/checkout.c:1305
a6cd2cc4
JX
10891#, c-format
10892msgid "a branch is expected, got tag '%s'"
10893msgstr "期望一个分支,得到标签 '%s'"
10894
ddc12c42 10895#: builtin/checkout.c:1307
a6cd2cc4
JX
10896#, c-format
10897msgid "a branch is expected, got remote branch '%s'"
10898msgstr "期望一个分支,得到远程分支 '%s'"
10899
ddc12c42 10900#: builtin/checkout.c:1308 builtin/checkout.c:1316
a6cd2cc4
JX
10901#, c-format
10902msgid "a branch is expected, got '%s'"
10903msgstr "期望一个分支,得到 '%s'"
10904
ddc12c42 10905#: builtin/checkout.c:1311
a6cd2cc4
JX
10906#, c-format
10907msgid "a branch is expected, got commit '%s'"
10908msgstr "期望一个分支,得到提交 '%s'"
10909
ddc12c42 10910#: builtin/checkout.c:1327
a6cd2cc4
JX
10911msgid ""
10912"cannot switch branch while merging\n"
10913"Consider \"git merge --quit\" or \"git worktree add\"."
10914msgstr ""
10915"不能在合并时切换分支\n"
10916"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
10917
ddc12c42 10918#: builtin/checkout.c:1331
a6cd2cc4
JX
10919msgid ""
10920"cannot switch branch in the middle of an am session\n"
10921"Consider \"git am --quit\" or \"git worktree add\"."
10922msgstr ""
10923"不能在一个 am 会话期间切换分支\n"
10924"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
10925
ddc12c42 10926#: builtin/checkout.c:1335
a6cd2cc4
JX
10927msgid ""
10928"cannot switch branch while rebasing\n"
10929"Consider \"git rebase --quit\" or \"git worktree add\"."
10930msgstr ""
10931"不能在变基时切换分支\n"
10932"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
10933
ddc12c42 10934#: builtin/checkout.c:1339
a6cd2cc4
JX
10935msgid ""
10936"cannot switch branch while cherry-picking\n"
10937"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
10938msgstr ""
10939"不能在拣选时切换分支\n"
10940"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
10941
ddc12c42 10942#: builtin/checkout.c:1343
a6cd2cc4
JX
10943msgid ""
10944"cannot switch branch while reverting\n"
10945"Consider \"git revert --quit\" or \"git worktree add\"."
10946msgstr ""
10947"不能在还原时切换分支\n"
10948"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
10949
ddc12c42 10950#: builtin/checkout.c:1347
a6cd2cc4
JX
10951msgid "you are switching branch while bisecting"
10952msgstr "您在执行二分查找时切换分支"
10953
ddc12c42 10954#: builtin/checkout.c:1354
ef317cd5 10955msgid "paths cannot be used with switching branches"
07432cef 10956msgstr "路径不能和切换分支同时使用"
c04f5ac3 10957
ddc12c42 10958#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365
07432cef 10959#, c-format
ef317cd5 10960msgid "'%s' cannot be used with switching branches"
07432cef 10961msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 10962
ddc12c42
JX
10963#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375
10964#: builtin/checkout.c:1380 builtin/checkout.c:1385
07432cef 10965#, c-format
ef317cd5 10966msgid "'%s' cannot be used with '%s'"
07432cef 10967msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 10968
ddc12c42 10969#: builtin/checkout.c:1382
a6cd2cc4
JX
10970#, c-format
10971msgid "'%s' cannot take <start-point>"
10972msgstr "'%s' 不带 <起始点>"
10973
ddc12c42 10974#: builtin/checkout.c:1390
07432cef 10975#, c-format
ef317cd5 10976msgid "Cannot switch branch to a non-commit '%s'"
07432cef 10977msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 10978
ddc12c42 10979#: builtin/checkout.c:1397
a6cd2cc4
JX
10980msgid "missing branch or commit argument"
10981msgstr "缺少分支或提交参数"
c04f5ac3 10982
ddc12c42
JX
10983#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52
10984#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285
10985#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563
10986#: builtin/send-pack.c:174
a6cd2cc4
JX
10987msgid "force progress reporting"
10988msgstr "强制显示进度报告"
c04f5ac3 10989
ddc12c42 10990#: builtin/checkout.c:1440
a6cd2cc4
JX
10991msgid "perform a 3-way merge with the new branch"
10992msgstr "和新的分支执行三方合并"
c04f5ac3 10993
ddc12c42 10994#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322
a6cd2cc4
JX
10995msgid "style"
10996msgstr "风格"
ef317cd5 10997
ddc12c42 10998#: builtin/checkout.c:1442
a6cd2cc4
JX
10999msgid "conflict style (merge or diff3)"
11000msgstr "冲突输出风格(merge 或 diff3)"
11001
ddc12c42 11002#: builtin/checkout.c:1454 builtin/worktree.c:503
5c57d762
JX
11003msgid "detach HEAD at named commit"
11004msgstr "HEAD 从指定的提交分离"
ef317cd5 11005
ddc12c42 11006#: builtin/checkout.c:1455
ef317cd5 11007msgid "set upstream info for new branch"
07432cef 11008msgstr "为新的分支设置上游信息"
ef317cd5 11009
ddc12c42 11010#: builtin/checkout.c:1457
a6cd2cc4
JX
11011msgid "force checkout (throw away local modifications)"
11012msgstr "强制检出(丢弃本地修改)"
11013
ddc12c42 11014#: builtin/checkout.c:1459
6c94aba5 11015msgid "new-branch"
07432cef 11016msgstr "新分支"
ef317cd5 11017
ddc12c42 11018#: builtin/checkout.c:1459
ef317cd5 11019msgid "new unparented branch"
07432cef 11020msgstr "新的没有父提交的分支"
ef317cd5 11021
ddc12c42 11022#: builtin/checkout.c:1461 builtin/merge.c:288
a6cd2cc4
JX
11023msgid "update ignored files (default)"
11024msgstr "更新忽略的文件(默认)"
11025
ddc12c42 11026#: builtin/checkout.c:1464
a6cd2cc4
JX
11027msgid "do not check if another worktree is holding the given ref"
11028msgstr "不检查指定的引用是否被其他工作区所占用"
11029
ddc12c42 11030#: builtin/checkout.c:1477
ef317cd5 11031msgid "checkout our version for unmerged files"
07432cef 11032msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 11033
ddc12c42 11034#: builtin/checkout.c:1480
ef317cd5 11035msgid "checkout their version for unmerged files"
07432cef 11036msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 11037
ddc12c42 11038#: builtin/checkout.c:1484
4dcdc3d8
JX
11039msgid "do not limit pathspecs to sparse entries only"
11040msgstr "对路径不做稀疏检出的限制"
11041
ddc12c42 11042#: builtin/checkout.c:1537
ef317cd5 11043msgid "-b, -B and --orphan are mutually exclusive"
07432cef 11044msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 11045
ddc12c42 11046#: builtin/checkout.c:1540
d46c5519
JX
11047msgid "-p and --overlay are mutually exclusive"
11048msgstr "-p 和 --overlay 互斥"
11049
ddc12c42 11050#: builtin/checkout.c:1577
ef317cd5
JX
11051msgid "--track needs a branch name"
11052msgstr "--track 需要一个分支名"
11053
ddc12c42 11054#: builtin/checkout.c:1582
c1ac5258
JX
11055msgid "missing branch name; try -b"
11056msgstr "缺少分支名,尝试 -b"
ef317cd5 11057
ddc12c42 11058#: builtin/checkout.c:1615
a6cd2cc4
JX
11059#, c-format
11060msgid "could not resolve %s"
11061msgstr "无法解析 %s"
11062
a6cd2cc4 11063#: builtin/checkout.c:1631
c04f5ac3 11064msgid "invalid path specification"
90e6ef53 11065msgstr "无效的路径规格"
c04f5ac3 11066
a6cd2cc4 11067#: builtin/checkout.c:1638
07432cef 11068#, c-format
a4f16749
JX
11069msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
11070msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
c04f5ac3 11071
a6cd2cc4 11072#: builtin/checkout.c:1642
07432cef 11073#, c-format
ef317cd5 11074msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 11075msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 11076
ddc12c42
JX
11077#: builtin/checkout.c:1651
11078msgid "--pathspec-from-file is incompatible with --detach"
11079msgstr "--pathspec-from-file 与 --detach 不兼容"
11080
11081#: builtin/checkout.c:1654 builtin/reset.c:324
11082msgid "--pathspec-from-file is incompatible with --patch"
11083msgstr "--pathspec-from-file 与 --patch 不兼容"
11084
11085#: builtin/checkout.c:1665
c04f5ac3
JX
11086msgid ""
11087"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
11088"checking out of the index."
11089msgstr ""
90e6ef53 11090"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 11091
ddc12c42
JX
11092#: builtin/checkout.c:1670
11093msgid "you must specify path(s) to restore"
11094msgstr "您必须指定一个要恢复的路径"
11095
11096#: builtin/checkout.c:1689
c1ac5258
JX
11097#, c-format
11098msgid ""
11099"'%s' matched more than one remote tracking branch.\n"
11100"We found %d remotes with a reference that matched. So we fell back\n"
11101"on trying to resolve the argument as a path, but failed there too!\n"
11102"\n"
11103"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
11104"you can do so by fully qualifying the name with the --track option:\n"
11105"\n"
11106" git checkout --track origin/<name>\n"
11107"\n"
11108"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
11109"one remote, e.g. the 'origin' remote, consider setting\n"
11110"checkout.defaultRemote=origin in your config."
11111msgstr ""
11112"'%s' 匹配了一个以上的远程跟踪分支。\n"
11113"我们发现 %d 个远程仓库具有同名分支。所以我们转而尝试将这个参数解析为\n"
11114"路径,但是也失败了!\n"
11115"\n"
11116"如果您想要检出一个远程跟踪分支,例如在远程仓库 'origin' 上的,您可以\n"
11117"使用分支全名和 --track 选项:\n"
11118"\n"
11119" git checkout --track origin/<name>\n"
11120"\n"
11121"如果您总是喜欢使用模糊的简短分支名 <name>,而不喜欢如 'origin' 的远程\n"
11122"仓库名,可以在配置中设置 checkout.defaultRemote=origin。"
11123
ddc12c42
JX
11124#: builtin/checkout.c:1714 builtin/checkout.c:1716 builtin/checkout.c:1765
11125#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169
a5cd71ca 11126#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
a6cd2cc4
JX
11127msgid "branch"
11128msgstr "分支"
11129
ddc12c42 11130#: builtin/checkout.c:1715
a6cd2cc4
JX
11131msgid "create and checkout a new branch"
11132msgstr "创建并检出一个新的分支"
11133
ddc12c42 11134#: builtin/checkout.c:1717
a6cd2cc4
JX
11135msgid "create/reset and checkout a branch"
11136msgstr "创建/重置并检出一个分支"
11137
ddc12c42 11138#: builtin/checkout.c:1718
a6cd2cc4
JX
11139msgid "create reflog for new branch"
11140msgstr "为新的分支创建引用日志"
11141
ddc12c42 11142#: builtin/checkout.c:1720
a6cd2cc4
JX
11143msgid "second guess 'git checkout <no-such-branch>' (default)"
11144msgstr "二次猜测 'git checkout <无此分支>'(默认)"
11145
ddc12c42 11146#: builtin/checkout.c:1721
a6cd2cc4
JX
11147msgid "use overlay mode (default)"
11148msgstr "使用叠加模式(默认)"
11149
ddc12c42 11150#: builtin/checkout.c:1766
a6cd2cc4
JX
11151msgid "create and switch to a new branch"
11152msgstr "创建并切换一个新分支"
11153
ddc12c42 11154#: builtin/checkout.c:1768
a6cd2cc4
JX
11155msgid "create/reset and switch to a branch"
11156msgstr "创建/重置并切换一个分支"
11157
ddc12c42 11158#: builtin/checkout.c:1770
a6cd2cc4
JX
11159msgid "second guess 'git switch <no-such-branch>'"
11160msgstr "二次猜测 'git switch <无此分支>'"
11161
ddc12c42 11162#: builtin/checkout.c:1772
a6cd2cc4
JX
11163msgid "throw away local modifications"
11164msgstr "丢弃本地修改"
11165
ddc12c42 11166#: builtin/checkout.c:1804
a6cd2cc4
JX
11167msgid "which tree-ish to checkout from"
11168msgstr "要检出哪一个树"
11169
ddc12c42 11170#: builtin/checkout.c:1806
a6cd2cc4
JX
11171msgid "restore the index"
11172msgstr "恢复索引"
11173
ddc12c42 11174#: builtin/checkout.c:1808
a6cd2cc4
JX
11175msgid "restore the working tree (default)"
11176msgstr "恢复工作区(默认)"
11177
ddc12c42 11178#: builtin/checkout.c:1810
a6cd2cc4
JX
11179msgid "ignore unmerged entries"
11180msgstr "忽略未合并条目"
11181
ddc12c42 11182#: builtin/checkout.c:1811
a6cd2cc4
JX
11183msgid "use overlay mode"
11184msgstr "使用叠加模式"
11185
06991777 11186#: builtin/clean.c:28
2e8451e8
JX
11187msgid ""
11188"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
11189msgstr ""
11190"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 11191
06991777 11192#: builtin/clean.c:32
07432cef
WS
11193#, c-format
11194msgid "Removing %s\n"
11195msgstr "正删除 %s\n"
11196
06991777 11197#: builtin/clean.c:33
07432cef
WS
11198#, c-format
11199msgid "Would remove %s\n"
11200msgstr "将删除 %s\n"
11201
06991777 11202#: builtin/clean.c:34
07432cef
WS
11203#, c-format
11204msgid "Skipping repository %s\n"
160fb2b2 11205msgstr "忽略仓库 %s\n"
07432cef 11206
06991777 11207#: builtin/clean.c:35
07432cef
WS
11208#, c-format
11209msgid "Would skip repository %s\n"
160fb2b2 11210msgstr "将忽略仓库 %s\n"
07432cef 11211
06991777 11212#: builtin/clean.c:36
07432cef
WS
11213#, c-format
11214msgid "failed to remove %s"
c1ac5258 11215msgstr "删除 %s 失败"
07432cef 11216
a6cd2cc4
JX
11217#: builtin/clean.c:37
11218#, c-format
11219msgid "could not lstat %s\n"
11220msgstr "不能对 %s 调用 lstat\n"
11221
ddc12c42 11222#: builtin/clean.c:301 git-add--interactive.perl:595
1a79b2f1 11223#, c-format
2e8451e8
JX
11224msgid ""
11225"Prompt help:\n"
11226"1 - select a numbered item\n"
11227"foo - select item based on unique prefix\n"
1a79b2f1 11228" - (empty) select nothing\n"
2e8451e8
JX
11229msgstr ""
11230"帮助:\n"
11231"1 - 通过编号选择一个选项\n"
1a79b2f1
JX
11232"foo - 通过唯一前缀选择一个选项\n"
11233" - (空)什么也不选择\n"
2e8451e8 11234
ddc12c42 11235#: builtin/clean.c:305 git-add--interactive.perl:604
1a79b2f1 11236#, c-format
2e8451e8
JX
11237msgid ""
11238"Prompt help:\n"
11239"1 - select a single item\n"
11240"3-5 - select a range of items\n"
11241"2-3,6-9 - select multiple ranges\n"
11242"foo - select item based on unique prefix\n"
11243"-... - unselect specified items\n"
11244"* - choose all items\n"
1a79b2f1 11245" - (empty) finish selecting\n"
2e8451e8
JX
11246msgstr ""
11247"帮助:\n"
11248"1 - 选择一个选项\n"
11249"3-5 - 选择一个范围内的所有选项\n"
11250"2-3,6-9 - 选择多个范围内的所有选项\n"
1a79b2f1 11251"foo - 通过唯一前缀选择一个选项\n"
2e8451e8
JX
11252"-... - 反选特定的选项\n"
11253"* - 选择所有选项\n"
1a79b2f1 11254" - (空)结束选择\n"
2e8451e8 11255
ddc12c42
JX
11256#: builtin/clean.c:521 git-add--interactive.perl:570
11257#: git-add--interactive.perl:575
1a79b2f1
JX
11258#, c-format, perl-format
11259msgid "Huh (%s)?\n"
11260msgstr "嗯(%s)?\n"
2e8451e8 11261
a5cd71ca 11262#: builtin/clean.c:663
2e8451e8
JX
11263#, c-format
11264msgid "Input ignore patterns>> "
11265msgstr "输入模版以排除条目>> "
11266
a5cd71ca 11267#: builtin/clean.c:700
2e8451e8
JX
11268#, c-format
11269msgid "WARNING: Cannot find items matched by: %s"
11270msgstr "警告:无法找到和 %s 匹配的条目"
11271
a5cd71ca 11272#: builtin/clean.c:721
2e8451e8
JX
11273msgid "Select items to delete"
11274msgstr "选择要删除的条目"
11275
814ff314 11276#. TRANSLATORS: Make sure to keep [y/N] as is
a5cd71ca 11277#: builtin/clean.c:762
2e8451e8 11278#, c-format
814ff314
JX
11279msgid "Remove %s [y/N]? "
11280msgstr "删除 %s [y/N]?"
2e8451e8 11281
a5cd71ca 11282#: builtin/clean.c:795
2e8451e8
JX
11283msgid ""
11284"clean - start cleaning\n"
11285"filter by pattern - exclude items from deletion\n"
11286"select by numbers - select items to be deleted by numbers\n"
11287"ask each - confirm each deletion (like \"rm -i\")\n"
11288"quit - stop cleaning\n"
11289"help - this screen\n"
11290"? - help for prompt selection"
11291msgstr ""
11292"clean - 开始清理\n"
11293"filter by pattern - 通过模版排除要删除的条目\n"
11294"select by numbers - 通过数字选择要删除的条目\n"
11295"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
11296"quit - 停止删除并退出\n"
11297"help - 显示本帮助\n"
11298"? - 显示如何在提示符下选择的帮助"
11299
a5cd71ca 11300#: builtin/clean.c:831
2e8451e8
JX
11301msgid "Would remove the following item:"
11302msgid_plural "Would remove the following items:"
11303msgstr[0] "将删除如下条目:"
11304msgstr[1] "将删除如下条目:"
11305
a5cd71ca 11306#: builtin/clean.c:847
2e8451e8
JX
11307msgid "No more files to clean, exiting."
11308msgstr "没有要清理的文件,退出。"
11309
a5cd71ca 11310#: builtin/clean.c:909
ef317cd5 11311msgid "do not print names of files removed"
07432cef 11312msgstr "不打印删除文件的名称"
ef317cd5 11313
a5cd71ca 11314#: builtin/clean.c:911
ef317cd5 11315msgid "force"
07432cef 11316msgstr "强制"
ef317cd5 11317
a5cd71ca 11318#: builtin/clean.c:912
2e8451e8
JX
11319msgid "interactive cleaning"
11320msgstr "交互式清除"
11321
a5cd71ca 11322#: builtin/clean.c:914
ef317cd5 11323msgid "remove whole directories"
07432cef 11324msgstr "删除整个目录"
ef317cd5 11325
a5cd71ca 11326#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
ddc12c42
JX
11327#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179
11328#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466
d46c5519 11329#: builtin/show-ref.c:179
ef317cd5 11330msgid "pattern"
07432cef 11331msgstr "模式"
ef317cd5 11332
a5cd71ca 11333#: builtin/clean.c:916
ef317cd5 11334msgid "add <pattern> to ignore rules"
4375c10e 11335msgstr "添加 <模式> 到忽略规则"
ef317cd5 11336
a5cd71ca 11337#: builtin/clean.c:917
ef317cd5 11338msgid "remove ignored files, too"
07432cef 11339msgstr "也删除忽略的文件"
ef317cd5 11340
a5cd71ca 11341#: builtin/clean.c:919
ef317cd5 11342msgid "remove only ignored files"
07432cef 11343msgstr "只删除忽略的文件"
c04f5ac3 11344
a5cd71ca 11345#: builtin/clean.c:937
c04f5ac3 11346msgid "-x and -X cannot be used together"
649900bc 11347msgstr "-x 和 -X 不能同时使用"
c04f5ac3 11348
a5cd71ca 11349#: builtin/clean.c:941
c04f5ac3 11350msgid ""
6c94aba5 11351"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 11352"clean"
c04f5ac3 11353msgstr ""
2e8451e8 11354"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 11355
a5cd71ca 11356#: builtin/clean.c:944
c04f5ac3 11357msgid ""
6c94aba5 11358"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 11359"refusing to clean"
c04f5ac3 11360msgstr ""
2e8451e8 11361"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 11362
a5cd71ca 11363#: builtin/clone.c:45
814ff314 11364msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 11365msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 11366
ddc12c42 11367#: builtin/clone.c:93
ef317cd5 11368msgid "don't create a checkout"
07432cef 11369msgstr "不创建一个检出"
ef317cd5 11370
ddc12c42 11371#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
ef317cd5 11372msgid "create a bare repository"
160fb2b2 11373msgstr "创建一个纯仓库"
ef317cd5 11374
ddc12c42 11375#: builtin/clone.c:98
ef317cd5 11376msgid "create a mirror repository (implies bare)"
160fb2b2 11377msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 11378
ddc12c42 11379#: builtin/clone.c:100
ef317cd5 11380msgid "to clone from a local repository"
160fb2b2 11381msgstr "从本地仓库克隆"
ef317cd5 11382
ddc12c42 11383#: builtin/clone.c:102
ef317cd5 11384msgid "don't use local hardlinks, always copy"
07432cef 11385msgstr "不使用本地硬链接,始终复制"
ef317cd5 11386
ddc12c42 11387#: builtin/clone.c:104
ef317cd5 11388msgid "setup as shared repository"
160fb2b2 11389msgstr "设置为共享仓库"
ef317cd5 11390
ddc12c42 11391#: builtin/clone.c:107
87cb7997 11392msgid "pathspec"
65e2041e 11393msgstr "路径规格"
87cb7997 11394
ddc12c42 11395#: builtin/clone.c:107
ef317cd5 11396msgid "initialize submodules in the clone"
07432cef 11397msgstr "在克隆时初始化子模组"
ef317cd5 11398
ddc12c42 11399#: builtin/clone.c:110
5b04ee3b
JX
11400msgid "number of submodules cloned in parallel"
11401msgstr "并发克隆的子模组的数量"
11402
ddc12c42 11403#: builtin/clone.c:111 builtin/init-db.c:486
ef317cd5 11404msgid "template-directory"
07432cef 11405msgstr "模板目录"
ef317cd5 11406
ddc12c42 11407#: builtin/clone.c:112 builtin/init-db.c:487
ef317cd5 11408msgid "directory from which templates will be used"
07432cef 11409msgstr "模板目录将被使用"
ef317cd5 11410
ddc12c42
JX
11411#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392
11412#: builtin/submodule--helper.c:1885
ef317cd5 11413msgid "reference repository"
160fb2b2 11414msgstr "参考仓库"
ef317cd5 11415
ddc12c42
JX
11416#: builtin/clone.c:118 builtin/submodule--helper.c:1394
11417#: builtin/submodule--helper.c:1887
7aea43ff 11418msgid "use --reference only while cloning"
160fb2b2 11419msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff 11420
ddc12c42
JX
11421#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
11422#: builtin/pack-objects.c:3294 builtin/repack.c:327
ef317cd5 11423msgid "name"
07432cef 11424msgstr "名称"
ef317cd5 11425
ddc12c42 11426#: builtin/clone.c:120
ef317cd5 11427msgid "use <name> instead of 'origin' to track upstream"
4375c10e 11428msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 11429
ddc12c42 11430#: builtin/clone.c:122
ef317cd5 11431msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 11432msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 11433
ddc12c42 11434#: builtin/clone.c:124
ef317cd5 11435msgid "path to git-upload-pack on the remote"
07432cef 11436msgstr "远程 git-upload-pack 路径"
ef317cd5 11437
ddc12c42 11438#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840
a5cd71ca 11439#: builtin/pull.c:227
ef317cd5 11440msgid "depth"
07432cef 11441msgstr "深度"
ef317cd5 11442
ddc12c42 11443#: builtin/clone.c:126
ef317cd5 11444msgid "create a shallow clone of that depth"
07432cef 11445msgstr "创建一个指定深度的浅克隆"
ef317cd5 11446
ddc12c42 11447#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283
a0b6b246
JX
11448msgid "time"
11449msgstr "时间"
11450
ddc12c42 11451#: builtin/clone.c:128
a0b6b246
JX
11452msgid "create a shallow clone since a specific time"
11453msgstr "从一个特定时间创建一个浅克隆"
11454
ddc12c42
JX
11455#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
11456#: builtin/rebase.c:1445
a0b6b246
JX
11457msgid "revision"
11458msgstr "版本"
11459
ddc12c42 11460#: builtin/clone.c:130 builtin/fetch.c:173
1a79b2f1
JX
11461msgid "deepen history of shallow clone, excluding rev"
11462msgstr "深化浅克隆的历史,除了特定版本"
a0b6b246 11463
ddc12c42 11464#: builtin/clone.c:132
ef317cd5 11465msgid "clone only one branch, HEAD or --branch"
07432cef 11466msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 11467
ddc12c42 11468#: builtin/clone.c:134
a4f16749
JX
11469msgid "don't clone any tags, and make later fetches not to follow them"
11470msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
11471
ddc12c42 11472#: builtin/clone.c:136
5b04ee3b
JX
11473msgid "any cloned submodules will be shallow"
11474msgstr "子模组将以浅下载模式克隆"
11475
ddc12c42 11476#: builtin/clone.c:137 builtin/init-db.c:495
ef317cd5 11477msgid "gitdir"
07432cef 11478msgstr "git目录"
ef317cd5 11479
ddc12c42 11480#: builtin/clone.c:138 builtin/init-db.c:496
ef317cd5 11481msgid "separate git dir from working tree"
07432cef 11482msgstr "git目录和工作区分离"
ef317cd5 11483
ddc12c42 11484#: builtin/clone.c:139
ef317cd5 11485msgid "key=value"
07432cef 11486msgstr "key=value"
ef317cd5 11487
ddc12c42 11488#: builtin/clone.c:140
ef317cd5 11489msgid "set config inside the new repository"
160fb2b2 11490msgstr "在新仓库中设置配置信息"
ef317cd5 11491
ddc12c42
JX
11492#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
11493#: builtin/push.c:573 builtin/send-pack.c:172
d46c5519
JX
11494msgid "server-specific"
11495msgstr "server-specific"
11496
ddc12c42
JX
11497#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
11498#: builtin/push.c:573 builtin/send-pack.c:173
d46c5519
JX
11499msgid "option to transmit"
11500msgstr "传输选项"
11501
ddc12c42
JX
11502#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240
11503#: builtin/push.c:574
276ceeaa
JX
11504msgid "use IPv4 addresses only"
11505msgstr "只使用 IPv4 地址"
11506
ddc12c42
JX
11507#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243
11508#: builtin/push.c:576
276ceeaa
JX
11509msgid "use IPv6 addresses only"
11510msgstr "只使用 IPv6 地址"
11511
ddc12c42 11512#: builtin/clone.c:149
a6cd2cc4
JX
11513msgid "any cloned submodules will use their remote-tracking branch"
11514msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
11515
ddc12c42
JX
11516#: builtin/clone.c:151
11517msgid "initialize sparse-checkout file to include only files at root"
11518msgstr "初始化稀疏检出文件,只包含根目录文件"
11519
11520#: builtin/clone.c:287
3495628d
JX
11521msgid ""
11522"No directory name could be guessed.\n"
11523"Please specify a directory on the command line"
11524msgstr ""
11525"无法猜到目录名。\n"
26e4cbec 11526"请在命令行指定一个目录"
3495628d 11527
ddc12c42 11528#: builtin/clone.c:340
cfff71a9 11529#, c-format
a0b6b246
JX
11530msgid "info: Could not add alternate for '%s': %s\n"
11531msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
cfff71a9 11532
ddc12c42 11533#: builtin/clone.c:413
c04f5ac3
JX
11534#, c-format
11535msgid "%s exists and is not a directory"
11536msgstr "%s 存在且不是一个目录"
11537
ddc12c42 11538#: builtin/clone.c:430
c04f5ac3 11539#, c-format
a6cd2cc4
JX
11540msgid "failed to start iterator over '%s'"
11541msgstr "无法在 '%s' 上启动迭代器"
c04f5ac3 11542
ddc12c42 11543#: builtin/clone.c:460
c04f5ac3
JX
11544#, c-format
11545msgid "failed to create link '%s'"
c1ac5258 11546msgstr "创建链接 '%s' 失败"
c04f5ac3 11547
ddc12c42 11548#: builtin/clone.c:464
c04f5ac3
JX
11549#, c-format
11550msgid "failed to copy file to '%s'"
c1ac5258 11551msgstr "拷贝文件至 '%s' 失败"
c04f5ac3 11552
ddc12c42 11553#: builtin/clone.c:469
a6cd2cc4
JX
11554#, c-format
11555msgid "failed to iterate over '%s'"
11556msgstr "无法在 '%s' 上迭代"
11557
ddc12c42 11558#: builtin/clone.c:494
c04f5ac3
JX
11559#, c-format
11560msgid "done.\n"
11561msgstr "完成。\n"
11562
ddc12c42 11563#: builtin/clone.c:508
1003b3a5
JX
11564msgid ""
11565"Clone succeeded, but checkout failed.\n"
11566"You can inspect what was checked out with 'git status'\n"
a6cd2cc4 11567"and retry with 'git restore --source=HEAD :/'\n"
1003b3a5
JX
11568msgstr ""
11569"克隆成功,但是检出失败。\n"
11570"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
a6cd2cc4 11571"'git restore --source=HEAD :/' 重试\n"
1003b3a5 11572
ddc12c42 11573#: builtin/clone.c:585
c04f5ac3
JX
11574#, c-format
11575msgid "Could not find remote branch %s to clone."
90e6ef53 11576msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 11577
ddc12c42 11578#: builtin/clone.c:704
3495628d
JX
11579#, c-format
11580msgid "unable to update %s"
11581msgstr "不能更新 %s"
11582
ddc12c42
JX
11583#: builtin/clone.c:752
11584msgid "failed to initialize sparse-checkout"
11585msgstr "无法初始化稀疏检出"
11586
11587#: builtin/clone.c:775
c04f5ac3
JX
11588msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
11589msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
11590
ddc12c42 11591#: builtin/clone.c:806
1003b3a5
JX
11592msgid "unable to checkout working tree"
11593msgstr "不能检出工作区"
11594
ddc12c42 11595#: builtin/clone.c:856
3495628d
JX
11596msgid "unable to write parameters to config file"
11597msgstr "无法将参数写入配置文件"
11598
ddc12c42 11599#: builtin/clone.c:919
04cb2f28
JX
11600msgid "cannot repack to clean up"
11601msgstr "无法执行 repack 来清理"
11602
ddc12c42 11603#: builtin/clone.c:921
04cb2f28
JX
11604msgid "cannot unlink temporary alternates file"
11605msgstr "无法删除临时的 alternates 文件"
11606
ddc12c42 11607#: builtin/clone.c:959 builtin/receive-pack.c:1948
c04f5ac3
JX
11608msgid "Too many arguments."
11609msgstr "太多参数。"
11610
ddc12c42 11611#: builtin/clone.c:963
c04f5ac3 11612msgid "You must specify a repository to clone."
160fb2b2 11613msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 11614
ddc12c42 11615#: builtin/clone.c:976
c04f5ac3
JX
11616#, c-format
11617msgid "--bare and --origin %s options are incompatible."
11618msgstr "--bare 和 --origin %s 选项不兼容。"
11619
ddc12c42 11620#: builtin/clone.c:979
07432cef
WS
11621msgid "--bare and --separate-git-dir are incompatible."
11622msgstr "--bare 和 --separate-git-dir 选项不兼容。"
11623
ddc12c42 11624#: builtin/clone.c:992
c04f5ac3
JX
11625#, c-format
11626msgid "repository '%s' does not exist"
160fb2b2 11627msgstr "仓库 '%s' 不存在"
c04f5ac3 11628
ddc12c42 11629#: builtin/clone.c:998 builtin/fetch.c:1787
cfff71a9
JX
11630#, c-format
11631msgid "depth %s is not a positive number"
11632msgstr "深度 %s 不是一个正数"
11633
ddc12c42 11634#: builtin/clone.c:1008
c04f5ac3
JX
11635#, c-format
11636msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 11637msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 11638
ddc12c42 11639#: builtin/clone.c:1018
c04f5ac3
JX
11640#, c-format
11641msgid "working tree '%s' already exists."
11642msgstr "工作区 '%s' 已经存在。"
11643
ddc12c42
JX
11644#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271
11645#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334
5bb01d4f
JX
11646#, c-format
11647msgid "could not create leading directories of '%s'"
11648msgstr "不能为 '%s' 创建先导目录"
11649
ddc12c42 11650#: builtin/clone.c:1038
c04f5ac3 11651#, c-format
814ff314
JX
11652msgid "could not create work tree dir '%s'"
11653msgstr "不能创建工作区目录 '%s'"
c04f5ac3 11654
ddc12c42 11655#: builtin/clone.c:1058
c04f5ac3
JX
11656#, c-format
11657msgid "Cloning into bare repository '%s'...\n"
160fb2b2 11658msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 11659
ddc12c42 11660#: builtin/clone.c:1060
c04f5ac3
JX
11661#, c-format
11662msgid "Cloning into '%s'...\n"
11663msgstr "正克隆到 '%s'...\n"
11664
ddc12c42 11665#: builtin/clone.c:1084
a0b6b246
JX
11666msgid ""
11667"clone --recursive is not compatible with both --reference and --reference-if-"
11668"able"
11669msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
11670
ddc12c42 11671#: builtin/clone.c:1148
6acbf033 11672msgid "--depth is ignored in local clones; use file:// instead."
a0b6b246
JX
11673msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
11674
ddc12c42 11675#: builtin/clone.c:1150
a0b6b246
JX
11676msgid "--shallow-since is ignored in local clones; use file:// instead."
11677msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6acbf033 11678
ddc12c42 11679#: builtin/clone.c:1152
a0b6b246
JX
11680msgid "--shallow-exclude is ignored in local clones; use file:// instead."
11681msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
11682
ddc12c42 11683#: builtin/clone.c:1154
31e5e17b
JX
11684msgid "--filter is ignored in local clones; use file:// instead."
11685msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
11686
ddc12c42 11687#: builtin/clone.c:1157
6acbf033 11688msgid "source repository is shallow, ignoring --local"
160fb2b2 11689msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 11690
ddc12c42 11691#: builtin/clone.c:1162
6acbf033
JX
11692msgid "--local is ignored"
11693msgstr "--local 被忽略"
11694
ddc12c42 11695#: builtin/clone.c:1237 builtin/clone.c:1245
c04f5ac3
JX
11696#, c-format
11697msgid "Remote branch %s not found in upstream %s"
11698msgstr "远程分支 %s 在上游 %s 未发现"
11699
ddc12c42 11700#: builtin/clone.c:1248
c04f5ac3 11701msgid "You appear to have cloned an empty repository."
160fb2b2 11702msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 11703
a4f16749 11704#: builtin/column.c:10
814ff314
JX
11705msgid "git column [<options>]"
11706msgstr "git column [<选项>]"
ef317cd5 11707
a4f16749 11708#: builtin/column.c:27
ef317cd5 11709msgid "lookup config vars"
07432cef 11710msgstr "查找配置变量"
ef317cd5 11711
a4f16749 11712#: builtin/column.c:28 builtin/column.c:29
ef317cd5 11713msgid "layout to use"
07432cef 11714msgstr "要使用的布局"
ef317cd5 11715
a4f16749 11716#: builtin/column.c:30
ef317cd5 11717msgid "Maximum width"
07432cef 11718msgstr "最大宽度"
ef317cd5 11719
a4f16749 11720#: builtin/column.c:31
ef317cd5 11721msgid "Padding space on left border"
07432cef 11722msgstr "左边框的填充空间"
ef317cd5 11723
a4f16749 11724#: builtin/column.c:32
ef317cd5 11725msgid "Padding space on right border"
07432cef 11726msgstr "右边框的填充空间"
ef317cd5 11727
a4f16749 11728#: builtin/column.c:33
ef317cd5 11729msgid "Padding space between columns"
07432cef 11730msgstr "两列之间的填充空间"
ef317cd5 11731
fd8cb379 11732#: builtin/column.c:51
8ada9598 11733msgid "--command must be the first argument"
81809b99 11734msgstr "--command 必须是第一个参数"
8ada9598 11735
d46c5519
JX
11736#: builtin/commit-tree.c:18
11737msgid ""
11738"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
11739"<file>)...] <tree>"
11740msgstr ""
11741"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
11742">)...] <树>"
11743
11744#: builtin/commit-tree.c:31
11745#, c-format
11746msgid "duplicate parent %s ignored"
11747msgstr "忽略重复的父提交 %s"
11748
ddc12c42 11749#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
d46c5519
JX
11750#, c-format
11751msgid "not a valid object name %s"
11752msgstr "不是一个有效的对象名 %s"
11753
11754#: builtin/commit-tree.c:93
11755#, c-format
11756msgid "git commit-tree: failed to open '%s'"
11757msgstr "git commit-tree:无法打开 '%s'"
11758
11759#: builtin/commit-tree.c:96
11760#, c-format
11761msgid "git commit-tree: failed to read '%s'"
11762msgstr "git commit-tree:无法读取 '%s'"
11763
11764#: builtin/commit-tree.c:98
11765#, c-format
11766msgid "git commit-tree: failed to close '%s'"
11767msgstr "git commit-tree:无法关闭 '%s'"
11768
11769#: builtin/commit-tree.c:111
11770msgid "parent"
11771msgstr "父提交"
11772
11773#: builtin/commit-tree.c:112
11774msgid "id of a parent commit object"
5b533632 11775msgstr "父提交对象 ID"
d46c5519 11776
ddc12c42 11777#: builtin/commit-tree.c:114 builtin/commit.c:1496 builtin/merge.c:270
a5cd71ca 11778#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
a6cd2cc4 11779#: builtin/tag.c:412
d46c5519
JX
11780msgid "message"
11781msgstr "说明"
11782
ddc12c42 11783#: builtin/commit-tree.c:115 builtin/commit.c:1496
d46c5519
JX
11784msgid "commit message"
11785msgstr "提交说明"
11786
11787#: builtin/commit-tree.c:118
11788msgid "read commit log message from file"
11789msgstr "从文件中读取提交说明"
11790
ddc12c42 11791#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287
a5cd71ca 11792#: builtin/pull.c:195 builtin/revert.c:118
d46c5519
JX
11793msgid "GPG sign commit"
11794msgstr "GPG 提交签名"
11795
11796#: builtin/commit-tree.c:133
11797msgid "must give exactly one tree"
11798msgstr "必须精确地提供一个树"
11799
11800#: builtin/commit-tree.c:140
11801msgid "git commit-tree: failed to read"
11802msgstr "git commit-tree:读取失败"
11803
06991777 11804#: builtin/commit.c:41
814ff314 11805msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 11806msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 11807
06991777 11808#: builtin/commit.c:46
814ff314 11809msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 11810msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 11811
06991777 11812#: builtin/commit.c:51
c04f5ac3
JX
11813msgid ""
11814"You asked to amend the most recent commit, but doing so would make\n"
11815"it empty. You can repeat your command with --allow-empty, or you can\n"
11816"remove the commit entirely with \"git reset HEAD^\".\n"
11817msgstr ""
1b150dc9
T
11818"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
11819"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 11820
06991777 11821#: builtin/commit.c:56
c04f5ac3
JX
11822msgid ""
11823"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
11824"If you wish to commit it anyway, use:\n"
11825"\n"
11826" git commit --allow-empty\n"
11827"\n"
c04f5ac3 11828msgstr ""
a9ce4543
T
11829"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
11830"也要提交,使用命令:\n"
c04f5ac3
JX
11831"\n"
11832" git commit --allow-empty\n"
11833"\n"
c04f5ac3 11834
06991777 11835#: builtin/commit.c:63
a6cd2cc4
JX
11836msgid "Otherwise, please use 'git cherry-pick --skip'\n"
11837msgstr "否则,请使用 'git cherry-pick --skip'\n"
b1894384 11838
06991777 11839#: builtin/commit.c:66
b1894384 11840msgid ""
a6cd2cc4
JX
11841"and then use:\n"
11842"\n"
11843" git cherry-pick --continue\n"
11844"\n"
11845"to resume cherry-picking the remaining commits.\n"
b1894384
JX
11846"If you wish to skip this commit, use:\n"
11847"\n"
a6cd2cc4 11848" git cherry-pick --skip\n"
b1894384 11849"\n"
b1894384 11850msgstr ""
a6cd2cc4
JX
11851"然后使用:\n"
11852"\n"
11853" git cherry-pick --continue\n"
b1894384 11854"\n"
a6cd2cc4
JX
11855"来继续拣选剩余提交。如果您想跳过此提交,使用:\n"
11856"\n"
11857" git cherry-pick --skip\n"
b1894384 11858"\n"
b1894384 11859
a6cd2cc4 11860#: builtin/commit.c:315
c04f5ac3 11861msgid "failed to unpack HEAD tree object"
c1ac5258 11862msgstr "解包 HEAD 树对象失败"
c04f5ac3 11863
ddc12c42
JX
11864#: builtin/commit.c:351
11865msgid "--pathspec-from-file with -a does not make sense"
11866msgstr "--pathspec-from-file 和 -a 在一起没有意义"
11867
11868#: builtin/commit.c:364
11869msgid "No paths with --include/--only does not make sense."
11870msgstr "参数 --include/--only 不跟路径没有意义。"
11871
11872#: builtin/commit.c:376
c04f5ac3 11873msgid "unable to create temporary index"
90e6ef53 11874msgstr "不能创建临时索引"
c04f5ac3 11875
ddc12c42 11876#: builtin/commit.c:382
c04f5ac3
JX
11877msgid "interactive add failed"
11878msgstr "交互式添加失败"
11879
ddc12c42 11880#: builtin/commit.c:396
220c313c
JX
11881msgid "unable to update temporary index"
11882msgstr "无法更新临时索引"
11883
ddc12c42 11884#: builtin/commit.c:398
220c313c
JX
11885msgid "Failed to update main cache tree"
11886msgstr "不能更新树的主缓存"
11887
ddc12c42 11888#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492
c04f5ac3 11889msgid "unable to write new_index file"
90e6ef53 11890msgstr "无法写 new_index 文件"
c04f5ac3 11891
ddc12c42 11892#: builtin/commit.c:475
8ada9598 11893msgid "cannot do a partial commit during a merge."
81809b99 11894msgstr "在合并过程中不能做部分提交。"
c04f5ac3 11895
ddc12c42 11896#: builtin/commit.c:477
8ada9598 11897msgid "cannot do a partial commit during a cherry-pick."
81809b99 11898msgstr "在拣选过程中不能做部分提交。"
8ada9598 11899
ddc12c42 11900#: builtin/commit.c:485
c04f5ac3 11901msgid "cannot read the index"
90e6ef53 11902msgstr "无法读取索引"
c04f5ac3 11903
ddc12c42 11904#: builtin/commit.c:504
c04f5ac3 11905msgid "unable to write temporary index file"
90e6ef53 11906msgstr "无法写临时索引文件"
c04f5ac3 11907
ddc12c42 11908#: builtin/commit.c:602
220c313c
JX
11909#, c-format
11910msgid "commit '%s' lacks author header"
11911msgstr "提交 '%s' 缺少作者信息"
11912
ddc12c42 11913#: builtin/commit.c:604
c04f5ac3 11914#, c-format
220c313c 11915msgid "commit '%s' has malformed author line"
fd8cb379 11916msgstr "提交 '%s' 有格式错误的作者信息"
c04f5ac3 11917
ddc12c42 11918#: builtin/commit.c:623
c04f5ac3 11919msgid "malformed --author parameter"
fd8cb379 11920msgstr "格式错误的 --author 参数"
c04f5ac3 11921
ddc12c42 11922#: builtin/commit.c:676
6acbf033
JX
11923msgid ""
11924"unable to select a comment character that is not used\n"
11925"in the current commit message"
11926msgstr "无法选择一个未被当前提交说明使用的注释字符"
11927
ddc12c42 11928#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092
c04f5ac3
JX
11929#, c-format
11930msgid "could not lookup commit %s"
11931msgstr "不能查询提交 %s"
11932
ddc12c42 11933#: builtin/commit.c:726 builtin/shortlog.c:319
c04f5ac3
JX
11934#, c-format
11935msgid "(reading log message from standard input)\n"
90e6ef53 11936msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 11937
ddc12c42 11938#: builtin/commit.c:728
c04f5ac3 11939msgid "could not read log from standard input"
90e6ef53 11940msgstr "不能从标准输入中读取日志信息"
c04f5ac3 11941
ddc12c42 11942#: builtin/commit.c:732
c04f5ac3
JX
11943#, c-format
11944msgid "could not read log file '%s'"
90e6ef53 11945msgstr "不能读取日志文件 '%s'"
c04f5ac3 11946
ddc12c42 11947#: builtin/commit.c:763 builtin/commit.c:779
c04f5ac3 11948msgid "could not read SQUASH_MSG"
90e6ef53 11949msgstr "不能读取 SQUASH_MSG"
c04f5ac3 11950
ddc12c42 11951#: builtin/commit.c:770
5b04ee3b
JX
11952msgid "could not read MERGE_MSG"
11953msgstr "不能读取 MERGE_MSG"
11954
ddc12c42 11955#: builtin/commit.c:830
c04f5ac3 11956msgid "could not write commit template"
90e6ef53 11957msgstr "不能写提交模版"
c04f5ac3 11958
ddc12c42 11959#: builtin/commit.c:849
81809b99 11960#, c-format
c04f5ac3
JX
11961msgid ""
11962"\n"
8ada9598 11963"It looks like you may be committing a merge.\n"
c04f5ac3
JX
11964"If this is not correct, please remove the file\n"
11965"\t%s\n"
11966"and try again.\n"
11967msgstr ""
11968"\n"
649900bc 11969"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
11970"\t%s\n"
11971"然后重试。\n"
11972
ddc12c42 11973#: builtin/commit.c:854
81809b99 11974#, c-format
8ada9598
JX
11975msgid ""
11976"\n"
11977"It looks like you may be committing a cherry-pick.\n"
11978"If this is not correct, please remove the file\n"
11979"\t%s\n"
11980"and try again.\n"
11981msgstr ""
11982"\n"
649900bc 11983"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
11984"\t%s\n"
11985"然后重试。\n"
c04f5ac3 11986
ddc12c42 11987#: builtin/commit.c:867
a77c07d9 11988#, c-format
c04f5ac3 11989msgid ""
8ada9598 11990"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 11991"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 11992msgstr ""
a77c07d9 11993"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 11994"说明将会终止提交。\n"
c04f5ac3 11995
ddc12c42 11996#: builtin/commit.c:875
a77c07d9 11997#, c-format
c04f5ac3 11998msgid ""
8ada9598 11999"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 12000"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
12001"An empty message aborts the commit.\n"
12002msgstr ""
a77c07d9
JX
12003"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
12004"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 12005
90e6ef53 12006# 译者:为保证在输出中对齐,注意调整句中空格!
ddc12c42 12007#: builtin/commit.c:892
6acbf033
JX
12008#, c-format
12009msgid "%sAuthor: %.*s <%.*s>"
12010msgstr "%s作者: %.*s <%.*s>"
12011
12012# 译者:为保证在输出中对齐,注意调整句中空格!
ddc12c42 12013#: builtin/commit.c:900
c04f5ac3 12014#, c-format
6acbf033
JX
12015msgid "%sDate: %s"
12016msgstr "%s日期: %s"
c04f5ac3 12017
90e6ef53 12018# 译者:为保证在输出中对齐,注意调整句中空格!
ddc12c42 12019#: builtin/commit.c:907
c04f5ac3 12020#, c-format
6acbf033
JX
12021msgid "%sCommitter: %.*s <%.*s>"
12022msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 12023
ddc12c42 12024#: builtin/commit.c:925
c04f5ac3 12025msgid "Cannot read index"
90e6ef53 12026msgstr "无法读取索引"
c04f5ac3 12027
ddc12c42 12028#: builtin/commit.c:992
c04f5ac3
JX
12029msgid "Error building trees"
12030msgstr "无法创建树对象"
12031
ddc12c42 12032#: builtin/commit.c:1006 builtin/tag.c:275
c04f5ac3
JX
12033#, c-format
12034msgid "Please supply the message using either -m or -F option.\n"
07432cef 12035msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 12036
ddc12c42 12037#: builtin/commit.c:1050
c04f5ac3 12038#, c-format
814ff314 12039msgid "--author '%s' is not 'Name <email>' and matches no existing author"
58b6f078 12040msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 12041
ddc12c42 12042#: builtin/commit.c:1064
5809aa05
JX
12043#, c-format
12044msgid "Invalid ignored mode '%s'"
12045msgstr "无效的忽略模式 '%s'"
12046
ddc12c42 12047#: builtin/commit.c:1082 builtin/commit.c:1322
c04f5ac3
JX
12048#, c-format
12049msgid "Invalid untracked files mode '%s'"
90e6ef53 12050msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 12051
ddc12c42 12052#: builtin/commit.c:1122
2e8451e8
JX
12053msgid "--long and -z are incompatible"
12054msgstr "--long 和 -z 选项不兼容"
12055
ddc12c42 12056#: builtin/commit.c:1166
c04f5ac3
JX
12057msgid "Using both --reset-author and --author does not make sense"
12058msgstr "同时使用 --reset-author 和 --author 没有意义"
12059
ddc12c42 12060#: builtin/commit.c:1175
c04f5ac3 12061msgid "You have nothing to amend."
90e6ef53 12062msgstr "您没有可修补的提交。"
c04f5ac3 12063
ddc12c42 12064#: builtin/commit.c:1178
8ada9598 12065msgid "You are in the middle of a merge -- cannot amend."
81809b99 12066msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 12067
ddc12c42 12068#: builtin/commit.c:1180
8ada9598 12069msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 12070msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 12071
ddc12c42 12072#: builtin/commit.c:1183
c04f5ac3 12073msgid "Options --squash and --fixup cannot be used together"
649900bc 12074msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 12075
ddc12c42 12076#: builtin/commit.c:1193
c04f5ac3
JX
12077msgid "Only one of -c/-C/-F/--fixup can be used."
12078msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
12079
ddc12c42 12080#: builtin/commit.c:1195
31e5e17b
JX
12081msgid "Option -m cannot be combined with -c/-C/-F."
12082msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
c04f5ac3 12083
ddc12c42 12084#: builtin/commit.c:1203
c04f5ac3 12085msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 12086msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 12087
ddc12c42 12088#: builtin/commit.c:1220
c04f5ac3
JX
12089msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
12090msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
12091
ddc12c42 12092#: builtin/commit.c:1226
c04f5ac3 12093#, c-format
d46c5519
JX
12094msgid "paths '%s ...' with -a does not make sense"
12095msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
c04f5ac3 12096
ddc12c42 12097#: builtin/commit.c:1357 builtin/commit.c:1519
ef317cd5 12098msgid "show status concisely"
07432cef 12099msgstr "以简洁的格式显示状态"
ef317cd5 12100
ddc12c42 12101#: builtin/commit.c:1359 builtin/commit.c:1521
ef317cd5 12102msgid "show branch information"
07432cef 12103msgstr "显示分支信息"
ef317cd5 12104
ddc12c42 12105#: builtin/commit.c:1361
a4f16749
JX
12106msgid "show stash information"
12107msgstr "显示贮藏区信息"
12108
ddc12c42 12109#: builtin/commit.c:1363 builtin/commit.c:1523
31e5e17b
JX
12110msgid "compute full ahead/behind values"
12111msgstr "计算完整的领先/落后值"
12112
ddc12c42 12113#: builtin/commit.c:1365
a0b6b246
JX
12114msgid "version"
12115msgstr "版本"
12116
ddc12c42 12117#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549
a5cd71ca 12118#: builtin/worktree.c:650
ef317cd5 12119msgid "machine-readable output"
07432cef
WS
12120msgstr "机器可读的输出"
12121
ddc12c42 12122#: builtin/commit.c:1368 builtin/commit.c:1527
07432cef
WS
12123msgid "show status in long format (default)"
12124msgstr "以长格式显示状态(默认)"
ef317cd5 12125
ddc12c42 12126#: builtin/commit.c:1371 builtin/commit.c:1530
ef317cd5 12127msgid "terminate entries with NUL"
4375c10e 12128msgstr "条目以 NUL 字符结尾"
ef317cd5 12129
ddc12c42 12130#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533
a5cd71ca 12131#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
ddc12c42 12132#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336
ef317cd5 12133msgid "mode"
07432cef 12134msgstr "模式"
ef317cd5 12135
ddc12c42 12136#: builtin/commit.c:1374 builtin/commit.c:1533
ef317cd5 12137msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 12138msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 12139
ddc12c42 12140#: builtin/commit.c:1378
5809aa05
JX
12141msgid ""
12142"show ignored files, optional modes: traditional, matching, no. (Default: "
12143"traditional)"
31e5e17b
JX
12144msgstr ""
12145"显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
ef317cd5 12146
ddc12c42 12147#: builtin/commit.c:1380 parse-options.h:192
ef317cd5
JX
12148msgid "when"
12149msgstr "何时"
12150
ddc12c42 12151#: builtin/commit.c:1381
ef317cd5
JX
12152msgid ""
12153"ignore changes to submodules, optional when: all, dirty, untracked. "
12154"(Default: all)"
12155msgstr ""
07432cef 12156"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 12157
ddc12c42 12158#: builtin/commit.c:1383
ef317cd5 12159msgid "list untracked files in columns"
07432cef 12160msgstr "以列的方式显示未跟踪的文件"
ef317cd5 12161
ddc12c42 12162#: builtin/commit.c:1384
fd8cb379
JX
12163msgid "do not detect renames"
12164msgstr "不检测重命名"
12165
ddc12c42 12166#: builtin/commit.c:1386
fd8cb379
JX
12167msgid "detect renames, optionally set similarity index"
12168msgstr "检测重命名,可以设置索引相似度"
12169
ddc12c42 12170#: builtin/commit.c:1406
5809aa05
JX
12171msgid "Unsupported combination of ignored and untracked-files arguments"
12172msgstr "不支持已忽略和未跟踪文件参数的组合"
12173
ddc12c42 12174#: builtin/commit.c:1489
ef317cd5 12175msgid "suppress summary after successful commit"
07432cef 12176msgstr "提交成功后不显示概述信息"
c04f5ac3 12177
ddc12c42 12178#: builtin/commit.c:1490
ef317cd5 12179msgid "show diff in commit message template"
07432cef 12180msgstr "在提交说明模板里显示差异"
c04f5ac3 12181
ddc12c42 12182#: builtin/commit.c:1492
ef317cd5 12183msgid "Commit message options"
07432cef 12184msgstr "提交说明选项"
c04f5ac3 12185
ddc12c42 12186#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414
ef317cd5 12187msgid "read message from file"
07432cef 12188msgstr "从文件中读取提交说明"
c04f5ac3 12189
ddc12c42 12190#: builtin/commit.c:1494
ef317cd5 12191msgid "author"
07432cef 12192msgstr "作者"
c04f5ac3 12193
ddc12c42 12194#: builtin/commit.c:1494
ef317cd5 12195msgid "override author for commit"
07432cef 12196msgstr "提交时覆盖作者"
73a60cd2 12197
ddc12c42 12198#: builtin/commit.c:1495 builtin/gc.c:538
ef317cd5 12199msgid "date"
07432cef 12200msgstr "日期"
c04f5ac3 12201
ddc12c42 12202#: builtin/commit.c:1495
ef317cd5 12203msgid "override date for commit"
07432cef 12204msgstr "提交时覆盖日期"
c04f5ac3 12205
ddc12c42
JX
12206#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499
12207#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92
94550ed3
JX
12208msgid "commit"
12209msgstr "提交"
12210
ddc12c42 12211#: builtin/commit.c:1497
ef317cd5 12212msgid "reuse and edit message from specified commit"
07432cef 12213msgstr "重用并编辑指定提交的提交说明"
ef317cd5 12214
ddc12c42 12215#: builtin/commit.c:1498
ef317cd5 12216msgid "reuse message from specified commit"
07432cef 12217msgstr "重用指定提交的提交说明"
ef317cd5 12218
ddc12c42 12219#: builtin/commit.c:1499
ef317cd5 12220msgid "use autosquash formatted message to fixup specified commit"
07432cef 12221msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 12222
ddc12c42 12223#: builtin/commit.c:1500
ef317cd5 12224msgid "use autosquash formatted message to squash specified commit"
07432cef 12225msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 12226
ddc12c42 12227#: builtin/commit.c:1501
ef317cd5 12228msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 12229msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 12230
ddc12c42 12231#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289
a5cd71ca 12232#: builtin/pull.c:164 builtin/revert.c:110
ef317cd5 12233msgid "add Signed-off-by:"
07432cef 12234msgstr "添加 Signed-off-by: 签名"
ef317cd5 12235
ddc12c42 12236#: builtin/commit.c:1503
ef317cd5 12237msgid "use specified template file"
07432cef 12238msgstr "使用指定的模板文件"
ef317cd5 12239
ddc12c42 12240#: builtin/commit.c:1504
ef317cd5 12241msgid "force edit of commit"
07432cef 12242msgstr "强制编辑提交"
ef317cd5 12243
ddc12c42 12244#: builtin/commit.c:1506
ef317cd5 12245msgid "include status in commit message template"
07432cef 12246msgstr "在提交说明模板里包含状态信息"
ef317cd5 12247
ddc12c42 12248#: builtin/commit.c:1511
ef317cd5 12249msgid "Commit contents options"
07432cef 12250msgstr "提交内容选项"
ef317cd5 12251
ddc12c42 12252#: builtin/commit.c:1512
ef317cd5 12253msgid "commit all changed files"
07432cef 12254msgstr "提交所有改动的文件"
ef317cd5 12255
ddc12c42 12256#: builtin/commit.c:1513
ef317cd5 12257msgid "add specified files to index for commit"
07432cef 12258msgstr "添加指定的文件到索引区等待提交"
ef317cd5 12259
ddc12c42 12260#: builtin/commit.c:1514
ef317cd5 12261msgid "interactively add files"
07432cef 12262msgstr "交互式添加文件"
ef317cd5 12263
ddc12c42 12264#: builtin/commit.c:1515
ef317cd5 12265msgid "interactively add changes"
07432cef 12266msgstr "交互式添加变更"
ef317cd5 12267
ddc12c42 12268#: builtin/commit.c:1516
ef317cd5 12269msgid "commit only specified files"
07432cef 12270msgstr "只提交指定的文件"
ef317cd5 12271
ddc12c42 12272#: builtin/commit.c:1517
5c57d762
JX
12273msgid "bypass pre-commit and commit-msg hooks"
12274msgstr "绕过 pre-commit 和 commit-msg 钩子"
12275
ddc12c42 12276#: builtin/commit.c:1518
ef317cd5 12277msgid "show what would be committed"
07432cef 12278msgstr "显示将要提交的内容"
ef317cd5 12279
ddc12c42 12280#: builtin/commit.c:1531
ef317cd5 12281msgid "amend previous commit"
07432cef 12282msgstr "修改先前的提交"
ef317cd5 12283
ddc12c42 12284#: builtin/commit.c:1532
ef317cd5 12285msgid "bypass post-rewrite hook"
07432cef 12286msgstr "绕过 post-rewrite 钩子"
ef317cd5 12287
ddc12c42 12288#: builtin/commit.c:1539
ef317cd5 12289msgid "ok to record an empty change"
07432cef 12290msgstr "允许一个空提交"
ef317cd5 12291
ddc12c42 12292#: builtin/commit.c:1541
ef317cd5 12293msgid "ok to record a change with an empty message"
07432cef 12294msgstr "允许空的提交说明"
ef317cd5 12295
ddc12c42 12296#: builtin/commit.c:1614
c04f5ac3
JX
12297#, c-format
12298msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 12299msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 12300
ddc12c42 12301#: builtin/commit.c:1621
c04f5ac3 12302msgid "could not read MERGE_MODE"
90e6ef53 12303msgstr "不能读取 MERGE_MODE"
c04f5ac3 12304
ddc12c42 12305#: builtin/commit.c:1640
c04f5ac3
JX
12306#, c-format
12307msgid "could not read commit message: %s"
90e6ef53 12308msgstr "不能读取提交说明:%s"
c04f5ac3 12309
ddc12c42 12310#: builtin/commit.c:1647
c04f5ac3
JX
12311#, c-format
12312msgid "Aborting commit due to empty commit message.\n"
12313msgstr "终止提交因为提交说明为空。\n"
12314
ddc12c42 12315#: builtin/commit.c:1652
6937cb4e
JX
12316#, c-format
12317msgid "Aborting commit; you did not edit the message.\n"
12318msgstr "终止提交;您未更改来自模版的提交说明。\n"
12319
ddc12c42 12320#: builtin/commit.c:1686
c04f5ac3 12321msgid ""
c1ac5258 12322"repository has been updated, but unable to write\n"
220c313c 12323"new_index file. Check that disk is not full and quota is\n"
a6cd2cc4 12324"not exceeded, and then \"git restore --staged :/\" to recover."
c04f5ac3 12325msgstr ""
a6cd2cc4
JX
12326"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n"
12327"磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。"
c04f5ac3 12328
ddc12c42 12329#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
a5cd71ca
JX
12330msgid ""
12331"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
12332msgstr ""
12333"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
12334"[no-]progress]"
c1ac5258 12335
ddc12c42 12336#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
fd8cb379 12337msgid ""
a6cd2cc4 12338"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
a5cd71ca
JX
12339"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
12340msgstr ""
12341"git commit-graph write [--object-dir <对象目录>] [--append|--split] [--"
12342"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
fd8cb379 12343
ddc12c42
JX
12344#: builtin/commit-graph.c:48 builtin/commit-graph.c:103
12345#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657
fd8cb379
JX
12346msgid "dir"
12347msgstr "目录"
12348
ddc12c42
JX
12349#: builtin/commit-graph.c:49 builtin/commit-graph.c:104
12350#: builtin/commit-graph.c:188
fd8cb379
JX
12351msgid "The object directory to store the graph"
12352msgstr "保存图形的对象目录"
12353
ddc12c42 12354#: builtin/commit-graph.c:51
a6cd2cc4
JX
12355msgid "if the commit-graph is split, only verify the tip file"
12356msgstr "如果提交图形被拆分,只验证头一个文件"
12357
ddc12c42 12358#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23
d46c5519
JX
12359#, c-format
12360msgid "Could not open commit-graph '%s'"
12361msgstr "无法打开提交图形 '%s'"
12362
ddc12c42 12363#: builtin/commit-graph.c:106
c1ac5258
JX
12364msgid "start walk at all refs"
12365msgstr "开始遍历所有引用"
12366
ddc12c42 12367#: builtin/commit-graph.c:108
fd8cb379
JX
12368msgid "scan pack-indexes listed by stdin for commits"
12369msgstr "从标准输入中的包索引文件列表中扫描提交"
12370
ddc12c42 12371#: builtin/commit-graph.c:110
fd8cb379
JX
12372msgid "start walk at commits listed by stdin"
12373msgstr "从标准输入中的提交开始扫描"
12374
ddc12c42 12375#: builtin/commit-graph.c:112
fd8cb379
JX
12376msgid "include all commits already in the commit-graph file"
12377msgstr "包含 commit-graph 文件中已有所有提交"
12378
ddc12c42 12379#: builtin/commit-graph.c:115
a6cd2cc4
JX
12380msgid "allow writing an incremental commit-graph file"
12381msgstr "允许写一个增量提交图形文件"
12382
ddc12c42 12383#: builtin/commit-graph.c:117 builtin/commit-graph.c:121
a6cd2cc4
JX
12384msgid "maximum number of commits in a non-base split commit-graph"
12385msgstr "在非基本拆分提交图形中的最大提交数"
12386
ddc12c42 12387#: builtin/commit-graph.c:119
a6cd2cc4
JX
12388msgid "maximum ratio between two levels of a split commit-graph"
12389msgstr "一个拆分提交图形的两个级别之间的最大比率"
12390
ddc12c42 12391#: builtin/commit-graph.c:137
c1ac5258
JX
12392msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
12393msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
fd8cb379 12394
4c27fcb5 12395#: builtin/config.c:11
814ff314
JX
12396msgid "git config [<options>]"
12397msgstr "git config [<选项>]"
ef317cd5 12398
a6cd2cc4 12399#: builtin/config.c:103 builtin/env--helper.c:23
fd8cb379
JX
12400#, c-format
12401msgid "unrecognized --type argument, %s"
12402msgstr "未能识别的 --type 参数,%s"
12403
4c27fcb5 12404#: builtin/config.c:115
c1ac5258
JX
12405msgid "only one type at a time"
12406msgstr "一次只能一个类型"
12407
4c27fcb5 12408#: builtin/config.c:124
ef317cd5 12409msgid "Config file location"
07432cef 12410msgstr "配置文件位置"
ef317cd5 12411
4c27fcb5 12412#: builtin/config.c:125
ef317cd5 12413msgid "use global config file"
07432cef 12414msgstr "使用全局配置文件"
ef317cd5 12415
4c27fcb5 12416#: builtin/config.c:126
ef317cd5 12417msgid "use system config file"
07432cef 12418msgstr "使用系统级配置文件"
ef317cd5 12419
4c27fcb5 12420#: builtin/config.c:127
ef317cd5 12421msgid "use repository config file"
160fb2b2 12422msgstr "使用仓库级配置文件"
ef317cd5 12423
4c27fcb5
JX
12424#: builtin/config.c:128
12425msgid "use per-worktree config file"
12426msgstr "使用工作区级别的配置文件"
12427
12428#: builtin/config.c:129
ef317cd5 12429msgid "use given config file"
07432cef 12430msgstr "使用指定的配置文件"
ef317cd5 12431
4c27fcb5 12432#: builtin/config.c:130
2e8451e8 12433msgid "blob-id"
4375c10e 12434msgstr "数据对象 ID"
2e8451e8 12435
4c27fcb5 12436#: builtin/config.c:130
2e8451e8
JX
12437msgid "read config from given blob object"
12438msgstr "从给定的数据对象读取配置"
12439
4c27fcb5 12440#: builtin/config.c:131
ef317cd5 12441msgid "Action"
07432cef 12442msgstr "操作"
ef317cd5 12443
4c27fcb5 12444#: builtin/config.c:132
ef317cd5 12445msgid "get value: name [value-regex]"
07432cef 12446msgstr "获取值:name [value-regex]"
ef317cd5 12447
4c27fcb5 12448#: builtin/config.c:133
ef317cd5 12449msgid "get all values: key [value-regex]"
07432cef 12450msgstr "获得所有的值:key [value-regex]"
ef317cd5 12451
4c27fcb5 12452#: builtin/config.c:134
ef317cd5 12453msgid "get values for regexp: name-regex [value-regex]"
07432cef 12454msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 12455
4c27fcb5 12456#: builtin/config.c:135
90314792
JX
12457msgid "get value specific for the URL: section[.var] URL"
12458msgstr "获得 URL 取值:section[.var] URL"
12459
4c27fcb5 12460#: builtin/config.c:136
ef317cd5 12461msgid "replace all matching variables: name value [value_regex]"
07432cef 12462msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 12463
4c27fcb5 12464#: builtin/config.c:137
ef317cd5 12465msgid "add a new variable: name value"
07432cef 12466msgstr "添加一个新的变量:name value"
ef317cd5 12467
4c27fcb5 12468#: builtin/config.c:138
ef317cd5 12469msgid "remove a variable: name [value-regex]"
07432cef 12470msgstr "删除一个变量:name [value-regex]"
ef317cd5 12471
4c27fcb5 12472#: builtin/config.c:139
ef317cd5 12473msgid "remove all matches: name [value-regex]"
07432cef 12474msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 12475
4c27fcb5 12476#: builtin/config.c:140
ef317cd5 12477msgid "rename section: old-name new-name"
07432cef 12478msgstr "重命名小节:old-name new-name"
ef317cd5 12479
4c27fcb5 12480#: builtin/config.c:141
ef317cd5 12481msgid "remove a section: name"
07432cef 12482msgstr "删除一个小节:name"
ef317cd5 12483
4c27fcb5 12484#: builtin/config.c:142
ef317cd5 12485msgid "list all"
07432cef 12486msgstr "列出所有"
ef317cd5 12487
4c27fcb5 12488#: builtin/config.c:143
ef317cd5 12489msgid "open an editor"
07432cef 12490msgstr "打开一个编辑器"
ef317cd5 12491
4c27fcb5 12492#: builtin/config.c:144
04cb2f28
JX
12493msgid "find the color configured: slot [default]"
12494msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 12495
4c27fcb5 12496#: builtin/config.c:145
04cb2f28
JX
12497msgid "find the color setting: slot [stdout-is-tty]"
12498msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 12499
4c27fcb5 12500#: builtin/config.c:146
ef317cd5 12501msgid "Type"
07432cef 12502msgstr "类型"
ef317cd5 12503
a6cd2cc4 12504#: builtin/config.c:147 builtin/env--helper.c:38
fd8cb379
JX
12505msgid "value is given this type"
12506msgstr "取值为该类型"
12507
4c27fcb5 12508#: builtin/config.c:148
ef317cd5 12509msgid "value is \"true\" or \"false\""
07432cef 12510msgstr "值是 \"true\" 或 \"false\""
ef317cd5 12511
4c27fcb5 12512#: builtin/config.c:149
ef317cd5 12513msgid "value is decimal number"
07432cef 12514msgstr "值是十进制数"
ef317cd5 12515
4c27fcb5 12516#: builtin/config.c:150
ef317cd5 12517msgid "value is --bool or --int"
07432cef 12518msgstr "值是 --bool or --int"
ef317cd5 12519
4c27fcb5 12520#: builtin/config.c:151
ef317cd5 12521msgid "value is a path (file or directory name)"
07432cef 12522msgstr "值是一个路径(文件或目录名)"
ef317cd5 12523
4c27fcb5 12524#: builtin/config.c:152
5809aa05
JX
12525msgid "value is an expiry date"
12526msgstr "值是一个到期日期"
12527
4c27fcb5 12528#: builtin/config.c:153
ef317cd5 12529msgid "Other"
07432cef 12530msgstr "其它"
ef317cd5 12531
4c27fcb5 12532#: builtin/config.c:154
ef317cd5 12533msgid "terminate values with NUL byte"
4375c10e 12534msgstr "终止值是 NUL 字节"
ef317cd5 12535
4c27fcb5 12536#: builtin/config.c:155
1b7f4a34
JX
12537msgid "show variable names only"
12538msgstr "只显示变量名"
12539
4c27fcb5 12540#: builtin/config.c:156
ef317cd5 12541msgid "respect include directives on lookup"
07432cef 12542msgstr "查询时参照 include 指令递归查找"
ef317cd5 12543
4c27fcb5 12544#: builtin/config.c:157
276ceeaa
JX
12545msgid "show origin of config (file, standard input, blob, command line)"
12546msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
12547
a6cd2cc4 12548#: builtin/config.c:158 builtin/env--helper.c:40
fd8cb379
JX
12549msgid "value"
12550msgstr "取值"
12551
4c27fcb5 12552#: builtin/config.c:158
fd8cb379
JX
12553msgid "with --get, use default value when missing entry"
12554msgstr "使用 --get 参数,当缺少设置时使用默认值"
12555
06991777 12556#: builtin/config.c:172
c1ac5258
JX
12557#, c-format
12558msgid "wrong number of arguments, should be %d"
12559msgstr "错误的参数个数,应该为 %d 个"
12560
06991777 12561#: builtin/config.c:174
c1ac5258
JX
12562#, c-format
12563msgid "wrong number of arguments, should be from %d to %d"
12564msgstr "错误的参数个数,应该为从 %d 个到 %d 个"
12565
06991777 12566#: builtin/config.c:308
c1ac5258
JX
12567#, c-format
12568msgid "invalid key pattern: %s"
12569msgstr "无效键名模式:%s"
12570
06991777 12571#: builtin/config.c:344
fd8cb379
JX
12572#, c-format
12573msgid "failed to format default config value: %s"
c1ac5258
JX
12574msgstr "格式化默认配置值失败:%s"
12575
06991777 12576#: builtin/config.c:401
c1ac5258
JX
12577#, c-format
12578msgid "cannot parse color '%s'"
12579msgstr "无法解析颜色 '%s'"
fd8cb379 12580
06991777 12581#: builtin/config.c:443
220c313c 12582msgid "unable to parse default color value"
c1ac5258
JX
12583msgstr "无法解析默认颜色值"
12584
06991777 12585#: builtin/config.c:496 builtin/config.c:742
c1ac5258
JX
12586msgid "not in a git directory"
12587msgstr "不在 git 仓库中"
12588
06991777 12589#: builtin/config.c:499
c1ac5258
JX
12590msgid "writing to stdin is not supported"
12591msgstr "不支持写到标准输入"
12592
06991777 12593#: builtin/config.c:502
c1ac5258
JX
12594msgid "writing config blobs is not supported"
12595msgstr "不支持写到配置数据对象"
220c313c 12596
06991777 12597#: builtin/config.c:587
220c313c
JX
12598#, c-format
12599msgid ""
12600"# This is Git's per-user configuration file.\n"
7aea43ff 12601"[user]\n"
220c313c 12602"# Please adapt and uncomment the following lines:\n"
7aea43ff 12603"#\tname = %s\n"
220c313c
JX
12604"#\temail = %s\n"
12605msgstr ""
12606"# This is Git's per-user configuration file.\n"
7aea43ff 12607"[user]\n"
220c313c 12608"# Please adapt and uncomment the following lines:\n"
7aea43ff 12609"#\tname = %s\n"
220c313c
JX
12610"#\temail = %s\n"
12611
06991777 12612#: builtin/config.c:611
c1ac5258
JX
12613msgid "only one config file at a time"
12614msgstr "一次只能有一个配置文件"
12615
06991777 12616#: builtin/config.c:616
a4f16749
JX
12617msgid "--local can only be used inside a git repository"
12618msgstr "--local 只能在一个仓库内使用"
12619
06991777 12620#: builtin/config.c:619
fd8cb379
JX
12621msgid "--blob can only be used inside a git repository"
12622msgstr "--blob 只能在一个仓库内使用"
12623
06991777 12624#: builtin/config.c:638
c1ac5258
JX
12625msgid "$HOME not set"
12626msgstr "$HOME 未设置"
12627
06991777 12628#: builtin/config.c:658
4c27fcb5
JX
12629msgid ""
12630"--worktree cannot be used with multiple working trees unless the config\n"
12631"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
12632"section in \"git help worktree\" for details"
12633msgstr ""
12634"不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n"
12635"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
12636
06991777 12637#: builtin/config.c:688
c1ac5258
JX
12638msgid "--get-color and variable type are incoherent"
12639msgstr "--get-color 和变量类型不兼容"
12640
06991777 12641#: builtin/config.c:693
c1ac5258
JX
12642msgid "only one action at a time"
12643msgstr "一次只能有一个动作"
12644
06991777 12645#: builtin/config.c:706
c1ac5258
JX
12646msgid "--name-only is only applicable to --list or --get-regexp"
12647msgstr "--name-only 仅适用于 --list 或 --get-regexp"
12648
06991777 12649#: builtin/config.c:712
c1ac5258
JX
12650msgid ""
12651"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
12652"list"
12653msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
12654
06991777 12655#: builtin/config.c:718
c1ac5258
JX
12656msgid "--default is only applicable to --get"
12657msgstr "--default 仅适用于 --get"
12658
06991777 12659#: builtin/config.c:731
c1ac5258
JX
12660#, c-format
12661msgid "unable to read config file '%s'"
12662msgstr "无法读取配置文件 '%s'"
12663
06991777 12664#: builtin/config.c:734
c1ac5258
JX
12665msgid "error processing config file(s)"
12666msgstr "处理配置文件出错"
12667
06991777 12668#: builtin/config.c:744
c1ac5258
JX
12669msgid "editing stdin is not supported"
12670msgstr "不支持编辑标准输入"
12671
06991777 12672#: builtin/config.c:746
c1ac5258
JX
12673msgid "editing blobs is not supported"
12674msgstr "不支持编辑数据对象"
12675
06991777 12676#: builtin/config.c:760
220c313c
JX
12677#, c-format
12678msgid "cannot create configuration file %s"
12679msgstr "不能创建配置文件 %s"
12680
06991777 12681#: builtin/config.c:773
a0b6b246
JX
12682#, c-format
12683msgid ""
12684"cannot overwrite multiple values with a single value\n"
12685" Use a regexp, --add or --replace-all to change %s."
12686msgstr ""
12687"无法用一个值覆盖多个值\n"
12688" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
12689
06991777 12690#: builtin/config.c:847 builtin/config.c:858
c1ac5258
JX
12691#, c-format
12692msgid "no such section: %s"
12693msgstr "无此小节:%s"
12694
fd8cb379 12695#: builtin/count-objects.c:90
4dcdc3d8
JX
12696msgid "git count-objects [-v] [-H | --human-readable]"
12697msgstr "git count-objects [-v] [-H | --human-readable]"
12698
fd8cb379 12699#: builtin/count-objects.c:100
4dcdc3d8
JX
12700msgid "print sizes in human readable format"
12701msgstr "以用户可读的格式显示大小"
ef317cd5 12702
a5cd71ca 12703#: builtin/describe.c:26
814ff314
JX
12704msgid "git describe [<options>] [<commit-ish>...]"
12705msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 12706
a5cd71ca 12707#: builtin/describe.c:27
814ff314
JX
12708msgid "git describe [<options>] --dirty"
12709msgstr "git describe [<选项>] --dirty"
ef317cd5 12710
a5cd71ca 12711#: builtin/describe.c:62
87cb7997
JX
12712msgid "head"
12713msgstr "头"
12714
a5cd71ca 12715#: builtin/describe.c:62
87cb7997
JX
12716msgid "lightweight"
12717msgstr "轻量级的"
12718
a5cd71ca 12719#: builtin/describe.c:62
87cb7997
JX
12720msgid "annotated"
12721msgstr "附注的"
12722
a5cd71ca 12723#: builtin/describe.c:275
c04f5ac3
JX
12724#, c-format
12725msgid "annotated tag %s not available"
55a16ee4 12726msgstr "附注标签 %s 无效"
c04f5ac3 12727
a5cd71ca 12728#: builtin/describe.c:279
c04f5ac3
JX
12729#, c-format
12730msgid "annotated tag %s has no embedded name"
55a16ee4 12731msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 12732
a5cd71ca 12733#: builtin/describe.c:281
c04f5ac3
JX
12734#, c-format
12735msgid "tag '%s' is really '%s' here"
55a16ee4 12736msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 12737
a5cd71ca 12738#: builtin/describe.c:325
c04f5ac3
JX
12739#, c-format
12740msgid "no tag exactly matches '%s'"
55a16ee4 12741msgstr "没有标签准确匹配 '%s'"
c04f5ac3 12742
a5cd71ca 12743#: builtin/describe.c:327
c04f5ac3 12744#, c-format
5809aa05
JX
12745msgid "No exact match on refs or tags, searching to describe\n"
12746msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
c04f5ac3 12747
a5cd71ca 12748#: builtin/describe.c:381
c04f5ac3
JX
12749#, c-format
12750msgid "finished search at %s\n"
12751msgstr "完成搜索 %s\n"
12752
a5cd71ca 12753#: builtin/describe.c:407
c04f5ac3
JX
12754#, c-format
12755msgid ""
12756"No annotated tags can describe '%s'.\n"
12757"However, there were unannotated tags: try --tags."
12758msgstr ""
55a16ee4
RC
12759"没有附注标签能描述 '%s'。\n"
12760"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 12761
a5cd71ca 12762#: builtin/describe.c:411
c04f5ac3
JX
12763#, c-format
12764msgid ""
12765"No tags can describe '%s'.\n"
12766"Try --always, or create some tags."
12767msgstr ""
55a16ee4
RC
12768"没有标签能描述 '%s'。\n"
12769"尝试 --always,或者创建一些标签。"
c04f5ac3 12770
a5cd71ca 12771#: builtin/describe.c:441
c04f5ac3
JX
12772#, c-format
12773msgid "traversed %lu commits\n"
12774msgstr "已遍历 %lu 个提交\n"
12775
a5cd71ca 12776#: builtin/describe.c:444
c04f5ac3
JX
12777#, c-format
12778msgid ""
12779"more than %i tags found; listed %i most recent\n"
12780"gave up search at %s\n"
12781msgstr ""
55a16ee4 12782"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 12783"在 %s 放弃搜索\n"
c04f5ac3 12784
a5cd71ca 12785#: builtin/describe.c:512
5809aa05
JX
12786#, c-format
12787msgid "describe %s\n"
12788msgstr "描述 %s\n"
12789
a5cd71ca 12790#: builtin/describe.c:515
5809aa05
JX
12791#, c-format
12792msgid "Not a valid object name %s"
12793msgstr "不是一个有效的对象名 %s"
12794
a5cd71ca 12795#: builtin/describe.c:523
5809aa05
JX
12796#, c-format
12797msgid "%s is neither a commit nor blob"
12798msgstr "%s 既不是提交也不是数据对象"
12799
a5cd71ca 12800#: builtin/describe.c:537
ef317cd5 12801msgid "find the tag that comes after the commit"
55a16ee4 12802msgstr "寻找该提交之后的标签"
ef317cd5 12803
a5cd71ca 12804#: builtin/describe.c:538
ef317cd5 12805msgid "debug search strategy on stderr"
07432cef 12806msgstr "在标准错误上调试搜索策略"
ef317cd5 12807
a5cd71ca 12808#: builtin/describe.c:539
1003b3a5
JX
12809msgid "use any ref"
12810msgstr "使用任意引用"
12811
a5cd71ca 12812#: builtin/describe.c:540
1003b3a5 12813msgid "use any tag, even unannotated"
55a16ee4 12814msgstr "使用任意标签,即使未附带注释"
ef317cd5 12815
a5cd71ca 12816#: builtin/describe.c:541
ef317cd5 12817msgid "always use long format"
07432cef 12818msgstr "始终使用长提交号格式"
ef317cd5 12819
a5cd71ca 12820#: builtin/describe.c:542
2e8451e8
JX
12821msgid "only follow first parent"
12822msgstr "只跟随第一个父提交"
12823
a5cd71ca 12824#: builtin/describe.c:545
ef317cd5 12825msgid "only output exact matches"
07432cef 12826msgstr "只输出精确匹配"
ef317cd5 12827
a5cd71ca 12828#: builtin/describe.c:547
ef317cd5 12829msgid "consider <n> most recent tags (default: 10)"
55a16ee4 12830msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 12831
a5cd71ca 12832#: builtin/describe.c:549
ef317cd5 12833msgid "only consider tags matching <pattern>"
55a16ee4 12834msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 12835
a5cd71ca 12836#: builtin/describe.c:551
87cb7997
JX
12837msgid "do not consider tags matching <pattern>"
12838msgstr "不考虑匹配 <模式> 的标签"
12839
ddc12c42 12840#: builtin/describe.c:553 builtin/name-rev.c:473
ef317cd5 12841msgid "show abbreviated commit object as fallback"
07432cef 12842msgstr "显示简写的提交号作为后备"
ef317cd5 12843
a5cd71ca 12844#: builtin/describe.c:554 builtin/describe.c:557
ef317cd5 12845msgid "mark"
07432cef 12846msgstr "标记"
ef317cd5 12847
a5cd71ca 12848#: builtin/describe.c:555
ef317cd5 12849msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 12850msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 12851
a5cd71ca 12852#: builtin/describe.c:558
87cb7997
JX
12853msgid "append <mark> on broken working tree (default: \"-broken\")"
12854msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
12855
a5cd71ca 12856#: builtin/describe.c:576
c04f5ac3
JX
12857msgid "--long is incompatible with --abbrev=0"
12858msgstr "--long 与 --abbrev=0 不兼容"
12859
a5cd71ca 12860#: builtin/describe.c:605
c04f5ac3 12861msgid "No names found, cannot describe anything."
90e6ef53 12862msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 12863
a5cd71ca 12864#: builtin/describe.c:656
a8a5406a 12865msgid "--dirty is incompatible with commit-ishes"
87cb7997
JX
12866msgstr "--dirty 与提交号不兼容"
12867
a5cd71ca 12868#: builtin/describe.c:658
87cb7997
JX
12869msgid "--broken is incompatible with commit-ishes"
12870msgstr "--broken 与提交号不兼容"
c04f5ac3 12871
06991777 12872#: builtin/diff.c:84
c04f5ac3
JX
12873#, c-format
12874msgid "'%s': not a regular file or symlink"
12875msgstr "'%s':不是一个正规文件或符号链接"
12876
06991777 12877#: builtin/diff.c:235
c04f5ac3
JX
12878#, c-format
12879msgid "invalid option: %s"
12880msgstr "无效选项:%s"
12881
d46c5519 12882#: builtin/diff.c:350
c04f5ac3 12883msgid "Not a git repository"
160fb2b2 12884msgstr "不是一个 git 仓库"
c04f5ac3 12885
d46c5519 12886#: builtin/diff.c:394
c04f5ac3
JX
12887#, c-format
12888msgid "invalid object '%s' given."
12889msgstr "提供了无效对象 '%s'。"
12890
d46c5519 12891#: builtin/diff.c:403
c04f5ac3
JX
12892#, c-format
12893msgid "more than two blobs given: '%s'"
160fb2b2 12894msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 12895
d46c5519 12896#: builtin/diff.c:408
c04f5ac3
JX
12897#, c-format
12898msgid "unhandled object '%s' given."
6c94aba5 12899msgstr "无法处理的对象 '%s'。"
c04f5ac3 12900
d46c5519 12901#: builtin/difftool.c:30
1a79b2f1
JX
12902msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
12903msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
12904
a5cd71ca 12905#: builtin/difftool.c:260
1a79b2f1
JX
12906#, c-format
12907msgid "failed: %d"
12908msgstr "失败:%d"
12909
a5cd71ca 12910#: builtin/difftool.c:302
87cb7997
JX
12911#, c-format
12912msgid "could not read symlink %s"
12913msgstr "无法读取符号链接 %s"
12914
a5cd71ca 12915#: builtin/difftool.c:304
87cb7997
JX
12916#, c-format
12917msgid "could not read symlink file %s"
12918msgstr "无法读取符号链接文件 %s"
12919
a5cd71ca 12920#: builtin/difftool.c:312
87cb7997
JX
12921#, c-format
12922msgid "could not read object %s for symlink %s"
12923msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
12924
a5cd71ca 12925#: builtin/difftool.c:413
1a79b2f1
JX
12926msgid ""
12927"combined diff formats('-c' and '--cc') are not supported in\n"
12928"directory diff mode('-d' and '--dir-diff')."
87cb7997
JX
12929msgstr ""
12930"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
12931"cc')。"
1a79b2f1 12932
a5cd71ca 12933#: builtin/difftool.c:634
1a79b2f1
JX
12934#, c-format
12935msgid "both files modified: '%s' and '%s'."
12936msgstr "两个文件都被修改:'%s' 和 '%s'。"
12937
a5cd71ca 12938#: builtin/difftool.c:636
1a79b2f1
JX
12939msgid "working tree file has been left."
12940msgstr "工作区文件被留了下来。"
12941
a5cd71ca 12942#: builtin/difftool.c:647
1a79b2f1
JX
12943#, c-format
12944msgid "temporary files exist in '%s'."
12945msgstr "临时文件存在于 '%s'。"
12946
a5cd71ca 12947#: builtin/difftool.c:648
1a79b2f1
JX
12948msgid "you may want to cleanup or recover these."
12949msgstr "您可能想要清理或者恢复它们。"
12950
a5cd71ca 12951#: builtin/difftool.c:697
1a79b2f1
JX
12952msgid "use `diff.guitool` instead of `diff.tool`"
12953msgstr "使用 `diff.guitool` 代替 `diff.tool`"
12954
a5cd71ca 12955#: builtin/difftool.c:699
1a79b2f1
JX
12956msgid "perform a full-directory diff"
12957msgstr "执行一个全目录差异比较"
12958
a5cd71ca 12959#: builtin/difftool.c:701
1a79b2f1
JX
12960msgid "do not prompt before launching a diff tool"
12961msgstr "启动差异比较工具之前不提示"
12962
a5cd71ca 12963#: builtin/difftool.c:706
1a79b2f1
JX
12964msgid "use symlinks in dir-diff mode"
12965msgstr "在 dir-diff 模式中使用符号链接"
12966
a5cd71ca 12967#: builtin/difftool.c:707
c1ac5258
JX
12968msgid "tool"
12969msgstr "工具"
12970
a5cd71ca 12971#: builtin/difftool.c:708
1a79b2f1
JX
12972msgid "use the specified diff tool"
12973msgstr "使用指定的差异比较工具"
12974
a5cd71ca 12975#: builtin/difftool.c:710
1a79b2f1
JX
12976msgid "print a list of diff tools that may be used with `--tool`"
12977msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
12978
a5cd71ca 12979#: builtin/difftool.c:713
1a79b2f1
JX
12980msgid ""
12981"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
12982"code"
12983msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
12984
a5cd71ca 12985#: builtin/difftool.c:716
1a79b2f1
JX
12986msgid "specify a custom command for viewing diffs"
12987msgstr "指定一个用于查看差异的自定义命令"
12988
a5cd71ca 12989#: builtin/difftool.c:717
d46c5519
JX
12990msgid "passed to `diff`"
12991msgstr "传递给 `diff`"
12992
a5cd71ca 12993#: builtin/difftool.c:732
d46c5519
JX
12994msgid "difftool requires worktree or --no-index"
12995msgstr "difftool 要求工作区或者 --no-index"
12996
a5cd71ca 12997#: builtin/difftool.c:739
d46c5519
JX
12998msgid "--dir-diff is incompatible with --no-index"
12999msgstr "--dir-diff 和 --no-index 不兼容"
13000
a5cd71ca 13001#: builtin/difftool.c:742
d46c5519
JX
13002msgid "--gui, --tool and --extcmd are mutually exclusive"
13003msgstr "--gui、--tool 和 --extcmd 互斥"
13004
a5cd71ca 13005#: builtin/difftool.c:750
1a79b2f1
JX
13006msgid "no <tool> given for --tool=<tool>"
13007msgstr "没有为 --tool=<工具> 参数提供 <工具>"
13008
a5cd71ca 13009#: builtin/difftool.c:757
1a79b2f1
JX
13010msgid "no <cmd> given for --extcmd=<cmd>"
13011msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
13012
a6cd2cc4
JX
13013#: builtin/env--helper.c:6
13014msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
13015msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
13016
13017#: builtin/env--helper.c:37 builtin/hash-object.c:98
13018msgid "type"
13019msgstr "类型"
13020
13021#: builtin/env--helper.c:41
13022msgid "default for git_env_*(...) to fall back on"
13023msgstr "git_env_*(...) 的默认值"
13024
13025#: builtin/env--helper.c:43
13026msgid "be quiet only use git_env_*() value as exit code"
13027msgstr "安静模式,只使用 git_env_*() 的值作为退出码"
13028
13029#: builtin/env--helper.c:62
13030#, c-format
13031msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
13032msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值,不是 `%s`"
13033
13034#: builtin/env--helper.c:77
13035#, c-format
13036msgid ""
13037"option `--default' expects an unsigned long value with `--type=ulong`, not `"
13038"%s`"
13039msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型,不是 `%s`"
13040
c1ac5258 13041#: builtin/fast-export.c:29
ef317cd5 13042msgid "git fast-export [rev-list-opts]"
07432cef 13043msgstr "git fast-export [rev-list-opts]"
ef317cd5 13044
a5cd71ca
JX
13045#: builtin/fast-export.c:852
13046msgid "Error: Cannot export nested tags unless --mark-tags is specified."
13047msgstr "错误:除非指定 --mark-tags,否则无法导出嵌套标签。"
13048
13049#: builtin/fast-export.c:1152
ef317cd5 13050msgid "show progress after <n> objects"
07432cef 13051msgstr "在 <n> 个对象之后显示进度"
ef317cd5 13052
a5cd71ca 13053#: builtin/fast-export.c:1154
ef317cd5 13054msgid "select handling of signed tags"
55a16ee4 13055msgstr "选择如何处理签名标签"
ef317cd5 13056
a5cd71ca 13057#: builtin/fast-export.c:1157
ef317cd5 13058msgid "select handling of tags that tag filtered objects"
55a16ee4 13059msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 13060
a5cd71ca 13061#: builtin/fast-export.c:1160
a6cd2cc4
JX
13062msgid "select handling of commit messages in an alternate encoding"
13063msgstr "选择使用备用编码处理提交说明"
13064
a5cd71ca 13065#: builtin/fast-export.c:1163
ef317cd5 13066msgid "Dump marks to this file"
07432cef 13067msgstr "把标记存储到这个文件"
ef317cd5 13068
a5cd71ca 13069#: builtin/fast-export.c:1165
ef317cd5 13070msgid "Import marks from this file"
07432cef 13071msgstr "从这个文件导入标记"
ef317cd5 13072
a5cd71ca
JX
13073#: builtin/fast-export.c:1169
13074msgid "Import marks from this file if it exists"
13075msgstr "从该文件导入标记(如果存在的话)"
13076
13077#: builtin/fast-export.c:1171
ef317cd5 13078msgid "Fake a tagger when tags lack one"
55a16ee4 13079msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 13080
a5cd71ca 13081#: builtin/fast-export.c:1173
ef317cd5 13082msgid "Output full tree for each commit"
07432cef 13083msgstr "每次提交都输出整个树"
ef317cd5 13084
a5cd71ca 13085#: builtin/fast-export.c:1175
ef317cd5 13086msgid "Use the done feature to terminate the stream"
07432cef 13087msgstr "使用 done 功能来终止流"
ef317cd5 13088
a5cd71ca 13089#: builtin/fast-export.c:1176
ef317cd5 13090msgid "Skip output of blob data"
07432cef 13091msgstr "跳过数据对象的输出"
ef317cd5 13092
ddc12c42 13093#: builtin/fast-export.c:1177 builtin/log.c:1705
6acbf033 13094msgid "refspec"
160fb2b2 13095msgstr "引用规格"
6acbf033 13096
a5cd71ca 13097#: builtin/fast-export.c:1178
6acbf033 13098msgid "Apply refspec to exported refs"
160fb2b2 13099msgstr "对导出的引用应用引用规格"
6acbf033 13100
a5cd71ca 13101#: builtin/fast-export.c:1179
220c313c
JX
13102msgid "anonymize output"
13103msgstr "匿名输出"
13104
a5cd71ca 13105#: builtin/fast-export.c:1181
06991777 13106msgid "Reference parents which are not in fast-export stream by object id"
5b533632 13107msgstr "引用父对象 ID 不在 fast-export 流中"
06991777 13108
a5cd71ca 13109#: builtin/fast-export.c:1183
06991777 13110msgid "Show original object ids of blobs/commits"
5b533632 13111msgstr "显示数据对象/提交的原始对象 ID"
06991777 13112
a5cd71ca
JX
13113#: builtin/fast-export.c:1185
13114msgid "Label tags with mark ids"
13115msgstr "对带有标记 ID 的标签做标记"
13116
13117#: builtin/fast-export.c:1220
13118msgid "Cannot pass both --import-marks and --import-marks-if-exists"
13119msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
13120
13121#: builtin/fetch.c:34
ef317cd5 13122msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 13123msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 13124
a5cd71ca 13125#: builtin/fetch.c:35
ef317cd5 13126msgid "git fetch [<options>] <group>"
07432cef 13127msgstr "git fetch [<选项>] <组>"
ef317cd5 13128
a5cd71ca 13129#: builtin/fetch.c:36
ef317cd5 13130msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 13131msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 13132
a5cd71ca 13133#: builtin/fetch.c:37
ef317cd5 13134msgid "git fetch --all [<options>]"
07432cef 13135msgstr "git fetch --all [<选项>]"
ef317cd5 13136
ddc12c42 13137#: builtin/fetch.c:116
a5cd71ca
JX
13138msgid "fetch.parallel cannot be negative"
13139msgstr "fetch.parallel 不能为负数"
13140
ddc12c42 13141#: builtin/fetch.c:139 builtin/pull.c:204
ef317cd5 13142msgid "fetch from all remotes"
07432cef 13143msgstr "从所有的远程抓取"
ef317cd5 13144
ddc12c42 13145#: builtin/fetch.c:141 builtin/pull.c:248
a5cd71ca
JX
13146msgid "set upstream for git pull/fetch"
13147msgstr "为 git pull/fetch 设置上游"
13148
ddc12c42 13149#: builtin/fetch.c:143 builtin/pull.c:207
ef317cd5 13150msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 13151msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 13152
ddc12c42 13153#: builtin/fetch.c:145 builtin/pull.c:210
ef317cd5 13154msgid "path to upload pack on remote end"
07432cef 13155msgstr "上传包到远程的路径"
ef317cd5 13156
ddc12c42 13157#: builtin/fetch.c:146
4c27fcb5
JX
13158msgid "force overwrite of local reference"
13159msgstr "强制覆盖本地引用"
ef317cd5 13160
ddc12c42 13161#: builtin/fetch.c:148
ef317cd5 13162msgid "fetch from multiple remotes"
07432cef 13163msgstr "从多个远程抓取"
ef317cd5 13164
ddc12c42 13165#: builtin/fetch.c:150 builtin/pull.c:214
ef317cd5 13166msgid "fetch all tags and associated objects"
55a16ee4 13167msgstr "抓取所有的标签和关联对象"
ef317cd5 13168
ddc12c42 13169#: builtin/fetch.c:152
ef317cd5 13170msgid "do not fetch all tags (--no-tags)"
55a16ee4 13171msgstr "不抓取任何标签(--no-tags)"
ef317cd5 13172
ddc12c42 13173#: builtin/fetch.c:154
276ceeaa
JX
13174msgid "number of submodules fetched in parallel"
13175msgstr "子模组获取的并发数"
13176
ddc12c42 13177#: builtin/fetch.c:156 builtin/pull.c:217
ef317cd5 13178msgid "prune remote-tracking branches no longer on remote"
07432cef 13179msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 13180
ddc12c42 13181#: builtin/fetch.c:158
31e5e17b
JX
13182msgid "prune local tags no longer on remote and clobber changed tags"
13183msgstr "清除远程不存在的本地标签,并且替换变更标签"
13184
07432cef 13185# 译者:可选值,不能翻译
ddc12c42 13186#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141
ef317cd5 13187msgid "on-demand"
07432cef 13188msgstr "on-demand"
ef317cd5 13189
ddc12c42 13190#: builtin/fetch.c:160
ef317cd5 13191msgid "control recursive fetching of submodules"
07432cef 13192msgstr "控制子模组的递归抓取"
ef317cd5 13193
ddc12c42 13194#: builtin/fetch.c:164 builtin/pull.c:225
ef317cd5 13195msgid "keep downloaded pack"
07432cef 13196msgstr "保持下载包"
ef317cd5 13197
ddc12c42 13198#: builtin/fetch.c:166
ef317cd5 13199msgid "allow updating of HEAD ref"
07432cef 13200msgstr "允许更新 HEAD 引用"
ef317cd5 13201
ddc12c42 13202#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228
ef317cd5 13203msgid "deepen history of shallow clone"
07432cef 13204msgstr "深化浅克隆的历史"
ef317cd5 13205
ddc12c42 13206#: builtin/fetch.c:171
a0b6b246
JX
13207msgid "deepen history of shallow repository based on time"
13208msgstr "基于时间来深化浅克隆的历史"
13209
ddc12c42 13210#: builtin/fetch.c:177 builtin/pull.c:231
a77c07d9 13211msgid "convert to a complete repository"
160fb2b2 13212msgstr "转换为一个完整的仓库"
a77c07d9 13213
ddc12c42 13214#: builtin/fetch.c:180
ef317cd5 13215msgid "prepend this to submodule path output"
07432cef 13216msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 13217
ddc12c42 13218#: builtin/fetch.c:183
a4f16749
JX
13219msgid ""
13220"default for recursive fetching of submodules (lower priority than config "
13221"files)"
13222msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
ef317cd5 13223
ddc12c42 13224#: builtin/fetch.c:187 builtin/pull.c:234
cfff71a9
JX
13225msgid "accept refs that update .git/shallow"
13226msgstr "接受更新 .git/shallow 的引用"
13227
ddc12c42 13228#: builtin/fetch.c:188 builtin/pull.c:236
6acbf033
JX
13229msgid "refmap"
13230msgstr "引用映射"
13231
ddc12c42 13232#: builtin/fetch.c:189 builtin/pull.c:237
6acbf033
JX
13233msgid "specify fetch refmap"
13234msgstr "指定获取操作的引用映射"
13235
ddc12c42 13236#: builtin/fetch.c:196
c1ac5258
JX
13237msgid "report that we have only objects reachable from this object"
13238msgstr "报告我们只拥有从该对象开始可达的对象"
13239
ddc12c42 13240#: builtin/fetch.c:199
a6cd2cc4
JX
13241msgid "run 'gc --auto' after fetching"
13242msgstr "获取后执行 'gc --auto'"
13243
ddc12c42 13244#: builtin/fetch.c:201 builtin/pull.c:246
a6cd2cc4
JX
13245msgid "check for forced-updates on all updated branches"
13246msgstr "在所有更新分支上检查强制更新"
13247
ddc12c42
JX
13248#: builtin/fetch.c:203
13249msgid "write the commit-graph after fetching"
13250msgstr "抓取后写提交图"
13251
13252#: builtin/fetch.c:513
c04f5ac3
JX
13253msgid "Couldn't find remote ref HEAD"
13254msgstr "无法发现远程 HEAD 引用"
13255
ddc12c42 13256#: builtin/fetch.c:653
5c57d762
JX
13257#, c-format
13258msgid "configuration fetch.output contains invalid value %s"
13259msgstr "配置变量 fetch.output 包含无效值 %s"
13260
ddc12c42 13261#: builtin/fetch.c:751
c04f5ac3
JX
13262#, c-format
13263msgid "object %s not found"
13264msgstr "对象 %s 未发现"
13265
ddc12c42 13266#: builtin/fetch.c:755
c04f5ac3
JX
13267msgid "[up to date]"
13268msgstr "[最新]"
13269
ddc12c42 13270#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
c04f5ac3
JX
13271msgid "[rejected]"
13272msgstr "[已拒绝]"
13273
ddc12c42 13274#: builtin/fetch.c:769
5c57d762 13275msgid "can't fetch in current branch"
9a4b694c 13276msgstr "当前分支下不能执行获取操作"
5c57d762 13277
ddc12c42 13278#: builtin/fetch.c:779
c04f5ac3 13279msgid "[tag update]"
55a16ee4 13280msgstr "[标签更新]"
c04f5ac3 13281
ddc12c42
JX
13282#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
13283#: builtin/fetch.c:851
5c57d762
JX
13284msgid "unable to update local ref"
13285msgstr "不能更新本地引用"
c04f5ac3 13286
ddc12c42 13287#: builtin/fetch.c:784
4c27fcb5
JX
13288msgid "would clobber existing tag"
13289msgstr "会破坏现有的标签"
13290
ddc12c42 13291#: builtin/fetch.c:806
c04f5ac3 13292msgid "[new tag]"
55a16ee4 13293msgstr "[新标签]"
c04f5ac3 13294
ddc12c42 13295#: builtin/fetch.c:809
c04f5ac3
JX
13296msgid "[new branch]"
13297msgstr "[新分支]"
13298
ddc12c42 13299#: builtin/fetch.c:812
170e9899
JX
13300msgid "[new ref]"
13301msgstr "[新引用]"
13302
ddc12c42 13303#: builtin/fetch.c:851
c04f5ac3
JX
13304msgid "forced update"
13305msgstr "强制更新"
13306
ddc12c42 13307#: builtin/fetch.c:856
5c57d762
JX
13308msgid "non-fast-forward"
13309msgstr "非快进"
c04f5ac3 13310
ddc12c42 13311#: builtin/fetch.c:877
a6cd2cc4
JX
13312msgid ""
13313"Fetch normally indicates which branches had a forced update,\n"
13314"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
13315"flag or run 'git config fetch.showForcedUpdates true'."
13316msgstr ""
13317"获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用。\n"
13318"要重新启用,请使用 '--show-forced-updates' 选项或运行\n"
13319"'git config fetch.showForcedUpdates true'。"
13320
ddc12c42 13321#: builtin/fetch.c:881
a6cd2cc4
JX
13322#, c-format
13323msgid ""
13324"It took %.2f seconds to check forced updates. You can use\n"
13325"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
13326"false'\n"
13327" to avoid this check.\n"
13328msgstr ""
13329"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
13330"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
13331
ddc12c42 13332#: builtin/fetch.c:911
c04f5ac3
JX
13333#, c-format
13334msgid "%s did not send all necessary objects\n"
e640d114 13335msgstr "%s 未发送所有必需的对象\n"
c04f5ac3 13336
ddc12c42 13337#: builtin/fetch.c:932
cfff71a9
JX
13338#, c-format
13339msgid "reject %s because shallow roots are not allowed to be updated"
13340msgstr "拒绝 %s 因为浅克隆不允许被更新"
13341
ddc12c42 13342#: builtin/fetch.c:1017 builtin/fetch.c:1155
c04f5ac3
JX
13343#, c-format
13344msgid "From %.*s\n"
13345msgstr "来自 %.*s\n"
13346
ddc12c42 13347#: builtin/fetch.c:1028
c04f5ac3
JX
13348#, c-format
13349msgid ""
13350"some local refs could not be updated; try running\n"
13351" 'git remote prune %s' to remove any old, conflicting branches"
13352msgstr ""
13353"一些本地引用不能被更新;尝试运行\n"
13354" 'git remote prune %s' 来删除旧的、有冲突的分支"
13355
90e6ef53 13356# 译者:注意保持前导空格
ddc12c42 13357#: builtin/fetch.c:1125
81809b99 13358#, c-format
8ada9598 13359msgid " (%s will become dangling)"
e640d114 13360msgstr " (%s 将成为悬空状态)"
c04f5ac3 13361
90e6ef53 13362# 译者:注意保持前导空格
ddc12c42 13363#: builtin/fetch.c:1126
81809b99 13364#, c-format
8ada9598 13365msgid " (%s has become dangling)"
e640d114 13366msgstr " (%s 已成为悬空状态)"
c04f5ac3 13367
ddc12c42 13368#: builtin/fetch.c:1158
c04f5ac3
JX
13369msgid "[deleted]"
13370msgstr "[已删除]"
13371
ddc12c42 13372#: builtin/fetch.c:1159 builtin/remote.c:1035
c04f5ac3
JX
13373msgid "(none)"
13374msgstr "(无)"
13375
ddc12c42 13376#: builtin/fetch.c:1182
c04f5ac3
JX
13377#, c-format
13378msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 13379msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 13380
ddc12c42 13381#: builtin/fetch.c:1201
c04f5ac3
JX
13382#, c-format
13383msgid "Option \"%s\" value \"%s\" is not valid for %s"
13384msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
13385
ddc12c42 13386#: builtin/fetch.c:1204
c04f5ac3
JX
13387#, c-format
13388msgid "Option \"%s\" is ignored for %s\n"
81809b99 13389msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 13390
ddc12c42
JX
13391#: builtin/fetch.c:1412
13392msgid "multiple branches detected, incompatible with --set-upstream"
a5cd71ca
JX
13393msgstr "检测到多分支,和 --set-upstream 不兼容"
13394
ddc12c42 13395#: builtin/fetch.c:1427
a5cd71ca
JX
13396msgid "not setting upstream for a remote remote-tracking branch"
13397msgstr "没有为一个远程跟踪分支设置上游"
13398
ddc12c42 13399#: builtin/fetch.c:1429
a5cd71ca
JX
13400msgid "not setting upstream for a remote tag"
13401msgstr "没有为一个远程标签设置上游"
13402
ddc12c42 13403#: builtin/fetch.c:1431
a5cd71ca
JX
13404msgid "unknown branch type"
13405msgstr "未知的分支类型"
13406
ddc12c42 13407#: builtin/fetch.c:1433
a5cd71ca
JX
13408msgid ""
13409"no source branch found.\n"
13410"you need to specify exactly one branch with the --set-upstream option."
13411msgstr ""
13412"未发现源分支。\n"
13413"您需要使用 --set-upstream 选项指定一个分支。"
13414
ddc12c42 13415#: builtin/fetch.c:1559 builtin/fetch.c:1622
c04f5ac3
JX
13416#, c-format
13417msgid "Fetching %s\n"
d4a8e00b 13418msgstr "正在获取 %s\n"
c04f5ac3 13419
ddc12c42 13420#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100
c04f5ac3
JX
13421#, c-format
13422msgid "Could not fetch %s"
13423msgstr "不能获取 %s"
13424
ddc12c42 13425#: builtin/fetch.c:1581
a5cd71ca
JX
13426#, c-format
13427msgid "could not fetch '%s' (exit code: %d)\n"
13428msgstr "无法获取 '%s'(退出码:%d)\n"
31e5e17b 13429
ddc12c42 13430#: builtin/fetch.c:1684
c04f5ac3
JX
13431msgid ""
13432"No remote repository specified. Please, specify either a URL or a\n"
13433"remote name from which new revisions should be fetched."
4375c10e 13434msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 13435
ddc12c42 13436#: builtin/fetch.c:1721
c04f5ac3 13437msgid "You need to specify a tag name."
55a16ee4 13438msgstr "您需要指定一个标签名称。"
c04f5ac3 13439
ddc12c42 13440#: builtin/fetch.c:1771
a0b6b246
JX
13441msgid "Negative depth in --deepen is not supported"
13442msgstr "--deepen 不支持负数深度"
13443
ddc12c42 13444#: builtin/fetch.c:1773
a0b6b246
JX
13445msgid "--deepen and --depth are mutually exclusive"
13446msgstr "--deepen 和 --depth 是互斥的"
13447
ddc12c42 13448#: builtin/fetch.c:1778
a77c07d9
JX
13449msgid "--depth and --unshallow cannot be used together"
13450msgstr "--depth 和 --unshallow 不能同时使用"
13451
ddc12c42 13452#: builtin/fetch.c:1780
a77c07d9 13453msgid "--unshallow on a complete repository does not make sense"
160fb2b2 13454msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 13455
ddc12c42 13456#: builtin/fetch.c:1796
c04f5ac3 13457msgid "fetch --all does not take a repository argument"
160fb2b2 13458msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 13459
ddc12c42 13460#: builtin/fetch.c:1798
c04f5ac3 13461msgid "fetch --all does not make sense with refspecs"
160fb2b2 13462msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 13463
ddc12c42 13464#: builtin/fetch.c:1807
c04f5ac3
JX
13465#, c-format
13466msgid "No such remote or remote group: %s"
13467msgstr "没有这样的远程或远程组:%s"
13468
ddc12c42 13469#: builtin/fetch.c:1814
c04f5ac3 13470msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 13471msgstr "获取组并指定引用规格没有意义"
c04f5ac3 13472
ddc12c42 13473#: builtin/fetch.c:1832
06991777
JX
13474msgid ""
13475"--filter can only be used with the remote configured in extensions."
13476"partialclone"
13477msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
13478
4c27fcb5 13479#: builtin/fmt-merge-msg.c:18
814ff314
JX
13480msgid ""
13481"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
13482msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 13483
ddc12c42 13484#: builtin/fmt-merge-msg.c:674
ef317cd5 13485msgid "populate log with at most <n> entries from shortlog"
07432cef 13486msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 13487
ddc12c42 13488#: builtin/fmt-merge-msg.c:677
ef317cd5 13489msgid "alias for --log (deprecated)"
07432cef 13490msgstr "参数 --log 的别名(已弃用)"
ef317cd5 13491
ddc12c42 13492#: builtin/fmt-merge-msg.c:680
ef317cd5 13493msgid "text"
07432cef 13494msgstr "文本"
ef317cd5 13495
ddc12c42 13496#: builtin/fmt-merge-msg.c:681
ef317cd5 13497msgid "use <text> as start of message"
07432cef 13498msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 13499
ddc12c42 13500#: builtin/fmt-merge-msg.c:682
ef317cd5 13501msgid "file to read from"
07432cef 13502msgstr "从文件中读取"
ef317cd5 13503
a4f16749 13504#: builtin/for-each-ref.c:10
814ff314
JX
13505msgid "git for-each-ref [<options>] [<pattern>]"
13506msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 13507
a4f16749 13508#: builtin/for-each-ref.c:11
94550ed3
JX
13509msgid "git for-each-ref [--points-at <object>]"
13510msgstr "git for-each-ref [--points-at <对象>]"
13511
a4f16749 13512#: builtin/for-each-ref.c:12
87cb7997
JX
13513msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
13514msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
94550ed3 13515
a4f16749 13516#: builtin/for-each-ref.c:13
87cb7997
JX
13517msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
13518msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
94550ed3 13519
a4f16749 13520#: builtin/for-each-ref.c:28
ef317cd5 13521msgid "quote placeholders suitably for shells"
07432cef 13522msgstr "引用占位符适用于 shells"
ef317cd5 13523
a4f16749 13524#: builtin/for-each-ref.c:30
ef317cd5 13525msgid "quote placeholders suitably for perl"
07432cef 13526msgstr "引用占位符适用于 perl"
ef317cd5 13527
a4f16749 13528#: builtin/for-each-ref.c:32
ef317cd5 13529msgid "quote placeholders suitably for python"
07432cef 13530msgstr "引用占位符适用于 python"
ef317cd5 13531
a4f16749 13532#: builtin/for-each-ref.c:34
04cb2f28
JX
13533msgid "quote placeholders suitably for Tcl"
13534msgstr "引用占位符适用于 Tcl"
ef317cd5 13535
a4f16749 13536#: builtin/for-each-ref.c:37
ef317cd5 13537msgid "show only <n> matched refs"
07432cef 13538msgstr "只显示 <n> 个匹配的引用"
ef317cd5 13539
a6cd2cc4 13540#: builtin/for-each-ref.c:39 builtin/tag.c:439
6937cb4e
JX
13541msgid "respect format colors"
13542msgstr "遵照格式中的颜色输出"
13543
d46c5519 13544#: builtin/for-each-ref.c:42
94550ed3
JX
13545msgid "print only refs which points at the given object"
13546msgstr "只打印指向给定对象的引用"
ef317cd5 13547
d46c5519 13548#: builtin/for-each-ref.c:44
94550ed3
JX
13549msgid "print only refs that are merged"
13550msgstr "只打印已经合并的引用"
13551
d46c5519 13552#: builtin/for-each-ref.c:45
94550ed3
JX
13553msgid "print only refs that are not merged"
13554msgstr "只打印没有合并的引用"
ef317cd5 13555
d46c5519 13556#: builtin/for-each-ref.c:46
94550ed3
JX
13557msgid "print only refs which contain the commit"
13558msgstr "只打印包含该提交的引用"
13559
d46c5519 13560#: builtin/for-each-ref.c:47
87cb7997
JX
13561msgid "print only refs which don't contain the commit"
13562msgstr "只打印不包含该提交的引用"
13563
ddc12c42 13564#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
06991777
JX
13565msgid "unknown"
13566msgstr "未知"
13567
13568#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
ddc12c42 13569#: builtin/fsck.c:100 builtin/fsck.c:120
06991777
JX
13570#, c-format
13571msgid "error in %s %s: %s"
13572msgstr "%s %s 错误:%s"
13573
13574#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
ddc12c42 13575#: builtin/fsck.c:114
06991777
JX
13576#, c-format
13577msgid "warning in %s %s: %s"
13578msgstr "%s %s 警告:%s"
13579
ddc12c42 13580#: builtin/fsck.c:143 builtin/fsck.c:146
06991777
JX
13581#, c-format
13582msgid "broken link from %7s %s"
13583msgstr "来自 %7s %s 的损坏的链接"
13584
ddc12c42 13585#: builtin/fsck.c:155
06991777
JX
13586msgid "wrong object type in link"
13587msgstr "链接中错误的对象类型"
13588
ddc12c42 13589#: builtin/fsck.c:171
06991777
JX
13590#, c-format
13591msgid ""
13592"broken link from %7s %s\n"
13593" to %7s %s"
13594msgstr ""
13595"损坏的链接来自于 %7s %s\n"
13596" 到 %7s %s"
13597
ddc12c42 13598#: builtin/fsck.c:282
06991777
JX
13599#, c-format
13600msgid "missing %s %s"
13601msgstr "缺失 %s %s"
13602
ddc12c42 13603#: builtin/fsck.c:309
06991777
JX
13604#, c-format
13605msgid "unreachable %s %s"
5b533632 13606msgstr "不可达 %s %s"
06991777 13607
ddc12c42 13608#: builtin/fsck.c:329
06991777
JX
13609#, c-format
13610msgid "dangling %s %s"
13611msgstr "悬空 %s %s"
13612
ddc12c42 13613#: builtin/fsck.c:339
06991777
JX
13614msgid "could not create lost-found"
13615msgstr "不能创建 lost-found"
13616
ddc12c42 13617#: builtin/fsck.c:350
06991777
JX
13618#, c-format
13619msgid "could not finish '%s'"
13620msgstr "不能完成 '%s'"
13621
ddc12c42 13622#: builtin/fsck.c:367
06991777
JX
13623#, c-format
13624msgid "Checking %s"
13625msgstr "正在检查 %s"
13626
ddc12c42 13627#: builtin/fsck.c:405
06991777
JX
13628#, c-format
13629msgid "Checking connectivity (%d objects)"
13630msgstr "正在检查连通性(%d 个对象)"
13631
ddc12c42 13632#: builtin/fsck.c:424
06991777
JX
13633#, c-format
13634msgid "Checking %s %s"
13635msgstr "正在检查 %s %s"
13636
ddc12c42 13637#: builtin/fsck.c:429
06991777
JX
13638msgid "broken links"
13639msgstr "损坏的链接"
13640
ddc12c42 13641#: builtin/fsck.c:438
06991777
JX
13642#, c-format
13643msgid "root %s"
13644msgstr "根 %s"
13645
ddc12c42 13646#: builtin/fsck.c:446
06991777
JX
13647#, c-format
13648msgid "tagged %s %s (%s) in %s"
13649msgstr "标记 %s %s (%s) 于 %s"
13650
ddc12c42 13651#: builtin/fsck.c:475
06991777
JX
13652#, c-format
13653msgid "%s: object corrupt or missing"
13654msgstr "%s:对象损坏或丢失"
13655
ddc12c42 13656#: builtin/fsck.c:500
06991777
JX
13657#, c-format
13658msgid "%s: invalid reflog entry %s"
13659msgstr "%s:无效的引用日志条目 %s"
13660
ddc12c42 13661#: builtin/fsck.c:514
06991777
JX
13662#, c-format
13663msgid "Checking reflog %s->%s"
13664msgstr "正在检查引用日志 %s->%s"
13665
ddc12c42 13666#: builtin/fsck.c:548
06991777
JX
13667#, c-format
13668msgid "%s: invalid sha1 pointer %s"
13669msgstr "%s:无效的 sha1 指针 %s"
13670
ddc12c42 13671#: builtin/fsck.c:555
06991777
JX
13672#, c-format
13673msgid "%s: not a commit"
13674msgstr "%s:不是一个提交"
13675
ddc12c42 13676#: builtin/fsck.c:609
06991777
JX
13677msgid "notice: No default references"
13678msgstr "注意:无默认引用"
13679
ddc12c42 13680#: builtin/fsck.c:624
06991777
JX
13681#, c-format
13682msgid "%s: object corrupt or missing: %s"
13683msgstr "%s:对象损坏或丢失:%s"
13684
ddc12c42 13685#: builtin/fsck.c:637
06991777
JX
13686#, c-format
13687msgid "%s: object could not be parsed: %s"
13688msgstr "%s:不能解析对象:%s"
13689
ddc12c42 13690#: builtin/fsck.c:657
06991777
JX
13691#, c-format
13692msgid "bad sha1 file: %s"
13693msgstr "坏的 sha1 文件:%s"
13694
ddc12c42 13695#: builtin/fsck.c:672
06991777
JX
13696msgid "Checking object directory"
13697msgstr "正在检查对象目录"
13698
ddc12c42 13699#: builtin/fsck.c:675
6c94aba5 13700msgid "Checking object directories"
06991777
JX
13701msgstr "正在检查对象目录"
13702
ddc12c42 13703#: builtin/fsck.c:690
06991777
JX
13704#, c-format
13705msgid "Checking %s link"
13706msgstr "正在检查 %s 链接"
13707
ddc12c42 13708#: builtin/fsck.c:695 builtin/index-pack.c:842
06991777
JX
13709#, c-format
13710msgid "invalid %s"
13711msgstr "无效的 %s"
13712
ddc12c42 13713#: builtin/fsck.c:702
06991777
JX
13714#, c-format
13715msgid "%s points to something strange (%s)"
13716msgstr "%s 指向奇怪的东西(%s)"
13717
ddc12c42 13718#: builtin/fsck.c:708
06991777
JX
13719#, c-format
13720msgid "%s: detached HEAD points at nothing"
13721msgstr "%s:分离头指针的指向不存在"
13722
ddc12c42 13723#: builtin/fsck.c:712
06991777
JX
13724#, c-format
13725msgid "notice: %s points to an unborn branch (%s)"
13726msgstr "注意:%s 指向一个尚未诞生的分支(%s)"
13727
ddc12c42 13728#: builtin/fsck.c:724
06991777
JX
13729msgid "Checking cache tree"
13730msgstr "正在检查缓存树"
13731
ddc12c42 13732#: builtin/fsck.c:729
06991777
JX
13733#, c-format
13734msgid "%s: invalid sha1 pointer in cache-tree"
13735msgstr "%s:cache-tree 中无效的 sha1 指针"
6c94aba5 13736
ddc12c42 13737#: builtin/fsck.c:738
06991777
JX
13738msgid "non-tree in cache-tree"
13739msgstr "cache-tree 中非树对象"
13740
ddc12c42 13741#: builtin/fsck.c:769
814ff314
JX
13742msgid "git fsck [<options>] [<object>...]"
13743msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 13744
ddc12c42 13745#: builtin/fsck.c:775
ef317cd5 13746msgid "show unreachable objects"
07432cef 13747msgstr "显示不可达的对象"
ef317cd5 13748
ddc12c42 13749#: builtin/fsck.c:776
ef317cd5 13750msgid "show dangling objects"
e640d114 13751msgstr "显示悬空的对象"
ef317cd5 13752
ddc12c42 13753#: builtin/fsck.c:777
ef317cd5 13754msgid "report tags"
55a16ee4 13755msgstr "报告标签"
ef317cd5 13756
ddc12c42 13757#: builtin/fsck.c:778
ef317cd5 13758msgid "report root nodes"
07432cef 13759msgstr "报告根节点"
ef317cd5 13760
ddc12c42 13761#: builtin/fsck.c:779
ef317cd5 13762msgid "make index objects head nodes"
07432cef 13763msgstr "将索引亦作为检查的头节点"
ef317cd5 13764
ddc12c42 13765#: builtin/fsck.c:780
ef317cd5 13766msgid "make reflogs head nodes (default)"
07432cef 13767msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 13768
ddc12c42 13769#: builtin/fsck.c:781
ef317cd5 13770msgid "also consider packs and alternate objects"
07432cef 13771msgstr "也考虑包和备用对象"
ef317cd5 13772
ddc12c42 13773#: builtin/fsck.c:782
1b7f4a34
JX
13774msgid "check only connectivity"
13775msgstr "仅检查连通性"
13776
ddc12c42 13777#: builtin/fsck.c:783
ef317cd5 13778msgid "enable more strict checking"
07432cef 13779msgstr "启用更严格的检查"
ef317cd5 13780
ddc12c42 13781#: builtin/fsck.c:785
ef317cd5 13782msgid "write dangling objects in .git/lost-found"
e640d114 13783msgstr "将悬空对象写入 .git/lost-found 中"
ef317cd5 13784
ddc12c42 13785#: builtin/fsck.c:786 builtin/prune.c:132
ef317cd5 13786msgid "show progress"
07432cef 13787msgstr "显示进度"
ef317cd5 13788
ddc12c42 13789#: builtin/fsck.c:787
5c57d762
JX
13790msgid "show verbose names for reachable objects"
13791msgstr "显示可达对象的详细名称"
13792
ddc12c42 13793#: builtin/fsck.c:846 builtin/index-pack.c:225
6c94aba5 13794msgid "Checking objects"
06991777
JX
13795msgstr "正在检查对象"
13796
ddc12c42 13797#: builtin/fsck.c:874
06991777
JX
13798#, c-format
13799msgid "%s: object missing"
13800msgstr "%s:对象缺失"
13801
ddc12c42 13802#: builtin/fsck.c:885
06991777
JX
13803#, c-format
13804msgid "invalid parameter: expected sha1, got '%s'"
13805msgstr "无效的参数:期望 sha1,得到 '%s'"
6c94aba5 13806
a5cd71ca 13807#: builtin/gc.c:35
814ff314
JX
13808msgid "git gc [<options>]"
13809msgstr "git gc [<选项>]"
ef317cd5 13810
c1ac5258 13811#: builtin/gc.c:90
c04f5ac3 13812#, c-format
87cb7997 13813msgid "Failed to fstat %s: %s"
65e2041e 13814msgstr "对 %s 调用 fstat 失败:%s"
c04f5ac3 13815
d46c5519
JX
13816#: builtin/gc.c:126
13817#, c-format
13818msgid "failed to parse '%s' value '%s'"
13819msgstr "无法解析 '%s' 值 '%s'"
13820
a5cd71ca 13821#: builtin/gc.c:475 builtin/init-db.c:55
c04f5ac3 13822#, c-format
4c27fcb5
JX
13823msgid "cannot stat '%s'"
13824msgstr "不能对 '%s' 调用 stat"
13825
a5cd71ca 13826#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
4c27fcb5
JX
13827#, c-format
13828msgid "cannot read '%s'"
13829msgstr "不能读取 '%s'"
c04f5ac3 13830
a5cd71ca 13831#: builtin/gc.c:491
94550ed3
JX
13832#, c-format
13833msgid ""
13834"The last gc run reported the following. Please correct the root cause\n"
13835"and remove %s.\n"
13836"Automatic cleanup will not be performed until the file is removed.\n"
13837"\n"
13838"%s"
13839msgstr ""
13840"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
13841"在该文件被删除之前,自动清理将不会执行。\n"
13842"\n"
13843"%s"
13844
a5cd71ca 13845#: builtin/gc.c:539
ef317cd5 13846msgid "prune unreferenced objects"
07432cef 13847msgstr "清除未引用的对象"
ef317cd5 13848
a5cd71ca 13849#: builtin/gc.c:541
ef317cd5 13850msgid "be more thorough (increased runtime)"
07432cef 13851msgstr "更彻底(增加运行时间)"
ef317cd5 13852
a5cd71ca 13853#: builtin/gc.c:542
ef317cd5 13854msgid "enable auto-gc mode"
07432cef 13855msgstr "启用自动垃圾回收模式"
ef317cd5 13856
a5cd71ca 13857#: builtin/gc.c:545
90314792
JX
13858msgid "force running gc even if there may be another gc running"
13859msgstr "强制执行 gc 即使另外一个 gc 正在执行"
13860
a5cd71ca 13861#: builtin/gc.c:548
fd8cb379
JX
13862msgid "repack all other packs except the largest pack"
13863msgstr "除了最大的包之外,对所有其它包文件重新打包"
13864
a5cd71ca 13865#: builtin/gc.c:565
fd8cb379
JX
13866#, c-format
13867msgid "failed to parse gc.logexpiry value %s"
c1ac5258 13868msgstr "解析 gc.logexpiry 的值 %s 失败"
fd8cb379 13869
a5cd71ca 13870#: builtin/gc.c:576
87cb7997 13871#, c-format
fd8cb379 13872msgid "failed to parse prune expiry value %s"
c1ac5258 13873msgstr "解析清除期限值 %s 失败"
87cb7997 13874
a5cd71ca 13875#: builtin/gc.c:596
c04f5ac3 13876#, c-format
6c94aba5 13877msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 13878msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 13879
a5cd71ca 13880#: builtin/gc.c:598
6c94aba5
JX
13881#, c-format
13882msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 13883msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 13884
a5cd71ca 13885#: builtin/gc.c:599
6c94aba5
JX
13886#, c-format
13887msgid "See \"git help gc\" for manual housekeeping.\n"
13888msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 13889
a5cd71ca 13890#: builtin/gc.c:639
90314792
JX
13891#, c-format
13892msgid ""
13893"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
13894msgstr ""
29004bbb 13895"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
90314792 13896
a5cd71ca 13897#: builtin/gc.c:694
c04f5ac3
JX
13898msgid ""
13899"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 13900msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 13901
06991777 13902#: builtin/grep.c:29
814ff314
JX
13903msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
13904msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 13905
06991777 13906#: builtin/grep.c:225
c04f5ac3
JX
13907#, c-format
13908msgid "grep: failed to create thread: %s"
90e6ef53 13909msgstr "grep:无法创建线程:%s"
c04f5ac3 13910
06991777 13911#: builtin/grep.c:279
276ceeaa
JX
13912#, c-format
13913msgid "invalid number of threads specified (%d) for %s"
13914msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
13915
a4f16749
JX
13916#. TRANSLATORS: %s is the configuration
13917#. variable for tweaking threads, currently
13918#. grep.threads
13919#.
a6cd2cc4 13920#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
a5cd71ca 13921#: builtin/pack-objects.c:2708
a4f16749
JX
13922#, c-format
13923msgid "no threads support, ignoring %s"
13924msgstr "没有线程支持,忽略 %s"
13925
a5cd71ca 13926#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
c04f5ac3
JX
13927#, c-format
13928msgid "unable to read tree (%s)"
90e6ef53 13929msgstr "无法读取树(%s)"
c04f5ac3 13930
a5cd71ca 13931#: builtin/grep.c:650
c04f5ac3
JX
13932#, c-format
13933msgid "unable to grep from object of type %s"
13934msgstr "无法抓取来自于 %s 类型的对象"
13935
a5cd71ca 13936#: builtin/grep.c:716
c04f5ac3
JX
13937#, c-format
13938msgid "switch `%c' expects a numerical value"
13939msgstr "开关 `%c' 期望一个数字值"
13940
a5cd71ca 13941#: builtin/grep.c:815
ef317cd5 13942msgid "search in index instead of in the work tree"
07432cef 13943msgstr "在索引区搜索而不是在工作区"
ef317cd5 13944
a5cd71ca 13945#: builtin/grep.c:817
ef317cd5 13946msgid "find in contents not managed by git"
07432cef 13947msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
13948
13949# 译者:中文字符串拼接,可删除前导空格
a5cd71ca 13950#: builtin/grep.c:819
ef317cd5 13951msgid "search in both tracked and untracked files"
07432cef 13952msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 13953
a5cd71ca 13954#: builtin/grep.c:821
814ff314
JX
13955msgid "ignore files specified via '.gitignore'"
13956msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 13957
a5cd71ca 13958#: builtin/grep.c:823
87cb7997 13959msgid "recursively search in each submodule"
1a79b2f1
JX
13960msgstr "在每一个子模组中递归搜索"
13961
a5cd71ca 13962#: builtin/grep.c:826
ef317cd5 13963msgid "show non-matching lines"
07432cef 13964msgstr "显示未匹配的行"
ef317cd5 13965
a5cd71ca 13966#: builtin/grep.c:828
ef317cd5 13967msgid "case insensitive matching"
07432cef 13968msgstr "不区分大小写匹配"
ef317cd5 13969
a5cd71ca 13970#: builtin/grep.c:830
ef317cd5 13971msgid "match patterns only at word boundaries"
07432cef 13972msgstr "只在单词边界匹配模式"
ef317cd5 13973
a5cd71ca 13974#: builtin/grep.c:832
ef317cd5 13975msgid "process binary files as text"
07432cef 13976msgstr "把二进制文件当做文本处理"
ef317cd5 13977
a5cd71ca 13978#: builtin/grep.c:834
ef317cd5 13979msgid "don't match patterns in binary files"
07432cef 13980msgstr "不在二进制文件中匹配模式"
ef317cd5 13981
a5cd71ca 13982#: builtin/grep.c:837
90314792
JX
13983msgid "process binary files with textconv filters"
13984msgstr "用 textconv 过滤器处理二进制文件"
13985
a5cd71ca 13986#: builtin/grep.c:839
4c27fcb5
JX
13987msgid "search in subdirectories (default)"
13988msgstr "在子目录中寻找(默认)"
13989
a5cd71ca 13990#: builtin/grep.c:841
ef317cd5 13991msgid "descend at most <depth> levels"
07432cef 13992msgstr "最多以指定的深度向下寻找"
ef317cd5 13993
a5cd71ca 13994#: builtin/grep.c:845
ef317cd5 13995msgid "use extended POSIX regular expressions"
07432cef 13996msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 13997
a5cd71ca 13998#: builtin/grep.c:848
ef317cd5 13999msgid "use basic POSIX regular expressions (default)"
07432cef 14000msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 14001
a5cd71ca 14002#: builtin/grep.c:851
ef317cd5 14003msgid "interpret patterns as fixed strings"
07432cef 14004msgstr "把模式解析为固定的字符串"
ef317cd5 14005
a5cd71ca 14006#: builtin/grep.c:854
ef317cd5 14007msgid "use Perl-compatible regular expressions"
07432cef 14008msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 14009
a5cd71ca 14010#: builtin/grep.c:857
ef317cd5 14011msgid "show line numbers"
07432cef 14012msgstr "显示行号"
ef317cd5 14013
a5cd71ca 14014#: builtin/grep.c:858
c1ac5258
JX
14015msgid "show column number of first match"
14016msgstr "显示第一个匹配的列号"
14017
a5cd71ca 14018#: builtin/grep.c:859
ef317cd5 14019msgid "don't show filenames"
07432cef 14020msgstr "不显示文件名"
ef317cd5 14021
a5cd71ca 14022#: builtin/grep.c:860
ef317cd5 14023msgid "show filenames"
07432cef 14024msgstr "显示文件名"
ef317cd5 14025
a5cd71ca 14026#: builtin/grep.c:862
ef317cd5 14027msgid "show filenames relative to top directory"
07432cef 14028msgstr "显示相对于顶级目录的文件名"
ef317cd5 14029
a5cd71ca 14030#: builtin/grep.c:864
ef317cd5 14031msgid "show only filenames instead of matching lines"
07432cef 14032msgstr "只显示文件名而不显示匹配的行"
ef317cd5 14033
a5cd71ca 14034#: builtin/grep.c:866
ef317cd5 14035msgid "synonym for --files-with-matches"
07432cef 14036msgstr "和 --files-with-matches 同义"
ef317cd5 14037
a5cd71ca 14038#: builtin/grep.c:869
ef317cd5 14039msgid "show only the names of files without match"
07432cef 14040msgstr "只显示未匹配的文件名"
ef317cd5 14041
a5cd71ca 14042#: builtin/grep.c:871
ef317cd5 14043msgid "print NUL after filenames"
07432cef 14044msgstr "在文件名后输出 NUL 字符"
ef317cd5 14045
a5cd71ca 14046#: builtin/grep.c:874
c1ac5258
JX
14047msgid "show only matching parts of a line"
14048msgstr "只显示行中的匹配的部分"
14049
a5cd71ca 14050#: builtin/grep.c:876
ef317cd5 14051msgid "show the number of matches instead of matching lines"
07432cef 14052msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 14053
a5cd71ca 14054#: builtin/grep.c:877
ef317cd5 14055msgid "highlight matches"
07432cef 14056msgstr "高亮显示匹配项"
ef317cd5 14057
a5cd71ca 14058#: builtin/grep.c:879
ef317cd5 14059msgid "print empty line between matches from different files"
07432cef 14060msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 14061
a5cd71ca 14062#: builtin/grep.c:881
ef317cd5 14063msgid "show filename only once above matches from same file"
07432cef 14064msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 14065
a5cd71ca 14066#: builtin/grep.c:884
ef317cd5 14067msgid "show <n> context lines before and after matches"
07432cef 14068msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 14069
a5cd71ca 14070#: builtin/grep.c:887
ef317cd5 14071msgid "show <n> context lines before matches"
07432cef 14072msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 14073
a5cd71ca 14074#: builtin/grep.c:889
ef317cd5 14075msgid "show <n> context lines after matches"
07432cef 14076msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 14077
a5cd71ca 14078#: builtin/grep.c:891
276ceeaa
JX
14079msgid "use <n> worker threads"
14080msgstr "使用 <n> 个工作线程"
14081
a5cd71ca 14082#: builtin/grep.c:892
ef317cd5 14083msgid "shortcut for -C NUM"
07432cef 14084msgstr "快捷键 -C 数字"
ef317cd5 14085
a5cd71ca 14086#: builtin/grep.c:895
ef317cd5 14087msgid "show a line with the function name before matches"
07432cef 14088msgstr "在匹配的前面显示一行函数名"
ef317cd5 14089
a5cd71ca 14090#: builtin/grep.c:897
ef317cd5 14091msgid "show the surrounding function"
07432cef 14092msgstr "显示所在函数的前后内容"
ef317cd5 14093
a5cd71ca 14094#: builtin/grep.c:900
ef317cd5 14095msgid "read patterns from file"
07432cef 14096msgstr "从文件读取模式"
ef317cd5 14097
a5cd71ca 14098#: builtin/grep.c:902
ef317cd5 14099msgid "match <pattern>"
07432cef 14100msgstr "匹配 <模式>"
ef317cd5 14101
a5cd71ca 14102#: builtin/grep.c:904
ef317cd5 14103msgid "combine patterns specified with -e"
07432cef 14104msgstr "组合用 -e 参数设定的模式"
ef317cd5 14105
a5cd71ca 14106#: builtin/grep.c:916
ef317cd5 14107msgid "indicate hit with exit status without output"
07432cef 14108msgstr "不输出,而用退出码标识命中状态"
ef317cd5 14109
a5cd71ca 14110#: builtin/grep.c:918
ef317cd5 14111msgid "show only matches from files that match all patterns"
07432cef 14112msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 14113
a5cd71ca 14114#: builtin/grep.c:920
07432cef
WS
14115msgid "show parse tree for grep expression"
14116msgstr "显示 grep 表达式的解析树"
14117
a5cd71ca 14118#: builtin/grep.c:924
ef317cd5 14119msgid "pager"
07432cef 14120msgstr "分页"
ef317cd5 14121
a5cd71ca 14122#: builtin/grep.c:924
ef317cd5 14123msgid "show matching files in the pager"
07432cef 14124msgstr "分页显示匹配的文件"
ef317cd5 14125
a5cd71ca 14126#: builtin/grep.c:928
ef317cd5 14127msgid "allow calling of grep(1) (ignored by this build)"
07432cef 14128msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 14129
a5cd71ca 14130#: builtin/grep.c:992
c1ac5258
JX
14131msgid "no pattern given"
14132msgstr "未提供匹配模式"
c04f5ac3 14133
a5cd71ca 14134#: builtin/grep.c:1028
87cb7997
JX
14135msgid "--no-index or --untracked cannot be used with revs"
14136msgstr "--no-index 或 --untracked 不能和版本同时使用"
14137
a5cd71ca 14138#: builtin/grep.c:1036
87cb7997
JX
14139#, c-format
14140msgid "unable to resolve revision: %s"
14141msgstr "不能解析版本:%s"
14142
a5cd71ca 14143#: builtin/grep.c:1067
4c27fcb5
JX
14144msgid "invalid option combination, ignoring --threads"
14145msgstr "无效的选项组合,忽略 --threads"
276ceeaa 14146
a5cd71ca 14147#: builtin/grep.c:1070 builtin/pack-objects.c:3400
a4f16749
JX
14148msgid "no threads support, ignoring --threads"
14149msgstr "没有线程支持,忽略 --threads"
14150
a5cd71ca 14151#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
4c27fcb5
JX
14152#, c-format
14153msgid "invalid number of threads specified (%d)"
14154msgstr "指定的线程数无效(%d)"
14155
a5cd71ca 14156#: builtin/grep.c:1096
c04f5ac3
JX
14157msgid "--open-files-in-pager only works on the worktree"
14158msgstr "--open-files-in-pager 仅用于工作区"
14159
a5cd71ca 14160#: builtin/grep.c:1119
c1ac5258
JX
14161msgid "option not supported with --recurse-submodules"
14162msgstr "选项不支持和 --recurse-submodules 共用"
c04f5ac3 14163
a5cd71ca 14164#: builtin/grep.c:1125
c1ac5258
JX
14165msgid "--cached or --untracked cannot be used with --no-index"
14166msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
c04f5ac3 14167
a5cd71ca 14168#: builtin/grep.c:1131
c1ac5258
JX
14169msgid "--[no-]exclude-standard cannot be used for tracked contents"
14170msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
c04f5ac3 14171
a5cd71ca 14172#: builtin/grep.c:1139
c1ac5258
JX
14173msgid "both --cached and trees are given"
14174msgstr "同时给出了 --cached 和树对象"
14175
06991777 14176#: builtin/hash-object.c:85
ef317cd5 14177msgid ""
814ff314
JX
14178"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
14179"[--] <file>..."
ef317cd5 14180msgstr ""
814ff314
JX
14181"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
14182"[--] <文件>..."
ef317cd5 14183
06991777 14184#: builtin/hash-object.c:86
94550ed3
JX
14185msgid "git hash-object --stdin-paths"
14186msgstr "git hash-object --stdin-paths"
ef317cd5 14187
06991777 14188#: builtin/hash-object.c:98
ef317cd5 14189msgid "object type"
07432cef 14190msgstr "对象类型"
ef317cd5 14191
06991777 14192#: builtin/hash-object.c:99
ef317cd5 14193msgid "write the object into the object database"
07432cef 14194msgstr "将对象写入对象数据库"
ef317cd5 14195
06991777 14196#: builtin/hash-object.c:101
ef317cd5 14197msgid "read the object from stdin"
07432cef 14198msgstr "从标准输入读取对象"
ef317cd5 14199
06991777 14200#: builtin/hash-object.c:103
ef317cd5 14201msgid "store file as is without filters"
07432cef 14202msgstr "原样存储文件不使用过滤器"
ef317cd5 14203
06991777 14204#: builtin/hash-object.c:104
220c313c
JX
14205msgid ""
14206"just hash any random garbage to create corrupt objects for debugging Git"
14207msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
14208
06991777 14209#: builtin/hash-object.c:105
ef317cd5 14210msgid "process file as it were from this path"
07432cef 14211msgstr "处理文件并假设其来自于此路径"
ef317cd5 14212
c1ac5258 14213#: builtin/help.c:46
ef317cd5 14214msgid "print all available commands"
07432cef 14215msgstr "打印所有可用的命令"
ef317cd5 14216
c1ac5258 14217#: builtin/help.c:47
a0b6b246
JX
14218msgid "exclude guides"
14219msgstr "排除向导"
14220
c1ac5258 14221#: builtin/help.c:48
4dcdc3d8
JX
14222msgid "print list of useful guides"
14223msgstr "显示有用的指南列表"
14224
c1ac5258
JX
14225#: builtin/help.c:49
14226msgid "print all configuration variable names"
14227msgstr "打印所有配置变量名称"
14228
14229#: builtin/help.c:51
ef317cd5 14230msgid "show man page"
07432cef 14231msgstr "显示 man 手册"
ef317cd5 14232
c1ac5258 14233#: builtin/help.c:52
ef317cd5 14234msgid "show manual in web browser"
07432cef 14235msgstr "在 web 浏览器中显示手册"
ef317cd5 14236
c1ac5258 14237#: builtin/help.c:54
ef317cd5 14238msgid "show info page"
07432cef 14239msgstr "显示 info 手册"
ef317cd5 14240
c1ac5258 14241#: builtin/help.c:56
fd8cb379
JX
14242msgid "print command description"
14243msgstr "打印命令描述"
14244
c1ac5258 14245#: builtin/help.c:61
814ff314
JX
14246msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
14247msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 14248
d46c5519 14249#: builtin/help.c:77
81809b99 14250#, c-format
8ada9598 14251msgid "unrecognized help format '%s'"
81809b99 14252msgstr "未能识别的帮助格式 '%s'"
8ada9598 14253
d46c5519 14254#: builtin/help.c:104
8ada9598 14255msgid "Failed to start emacsclient."
81809b99 14256msgstr "无法启动 emacsclient。"
8ada9598 14257
d46c5519 14258#: builtin/help.c:117
8ada9598 14259msgid "Failed to parse emacsclient version."
81809b99 14260msgstr "无法解析 emacsclient 版本。"
8ada9598 14261
d46c5519 14262#: builtin/help.c:125
8ada9598
JX
14263#, c-format
14264msgid "emacsclient version '%d' too old (< 22)."
07432cef 14265msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 14266
d46c5519 14267#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
81809b99 14268#, c-format
5b04ee3b 14269msgid "failed to exec '%s'"
c1ac5258 14270msgstr "执行 '%s' 失败"
8ada9598 14271
d46c5519 14272#: builtin/help.c:221
8ada9598
JX
14273#, c-format
14274msgid ""
14275"'%s': path for unsupported man viewer.\n"
14276"Please consider using 'man.<tool>.cmd' instead."
14277msgstr ""
81809b99 14278"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 14279"请使用 'man.<工具>.cmd'。"
8ada9598 14280
d46c5519 14281#: builtin/help.c:233
8ada9598
JX
14282#, c-format
14283msgid ""
14284"'%s': cmd for supported man viewer.\n"
14285"Please consider using 'man.<tool>.path' instead."
14286msgstr ""
81809b99 14287"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 14288"请使用 'man.<工具>.path'。"
8ada9598 14289
d46c5519 14290#: builtin/help.c:350
8ada9598
JX
14291#, c-format
14292msgid "'%s': unknown man viewer."
81809b99 14293msgstr "'%s':未知的 man 查看器。"
8ada9598 14294
d46c5519 14295#: builtin/help.c:367
8ada9598 14296msgid "no man viewer handled the request"
81809b99 14297msgstr "没有 man 查看器处理此请求"
8ada9598 14298
d46c5519 14299#: builtin/help.c:375
8ada9598 14300msgid "no info viewer handled the request"
81809b99 14301msgstr "没有 info 查看器处理此请求"
8ada9598 14302
a6cd2cc4 14303#: builtin/help.c:434 builtin/help.c:445 git.c:336
fd8cb379
JX
14304#, c-format
14305msgid "'%s' is aliased to '%s'"
14306msgstr "'%s' 是 '%s' 的别名"
220c313c 14307
a6cd2cc4 14308#: builtin/help.c:448 git.c:365
4c27fcb5
JX
14309#, c-format
14310msgid "bad alias.%s string: %s"
14311msgstr "坏的 alias.%s 字符串:%s"
14312
d46c5519 14313#: builtin/help.c:477 builtin/help.c:507
fd8cb379
JX
14314#, c-format
14315msgid "usage: %s%s"
14316msgstr "用法:%s%s"
4dcdc3d8 14317
d46c5519 14318#: builtin/help.c:491
c1ac5258
JX
14319msgid "'git help config' for more information"
14320msgstr "'git help config' 获取更多信息"
4dcdc3d8 14321
a6cd2cc4 14322#: builtin/index-pack.c:185
8ada9598
JX
14323#, c-format
14324msgid "object type mismatch at %s"
81809b99 14325msgstr "%s 的对象类型不匹配"
8ada9598 14326
a6cd2cc4 14327#: builtin/index-pack.c:205
6acbf033
JX
14328#, c-format
14329msgid "did not receive expected object %s"
a0b6b246 14330msgstr "未能获取预期的对象 %s"
8ada9598 14331
a6cd2cc4 14332#: builtin/index-pack.c:208
6acbf033
JX
14333#, c-format
14334msgid "object %s: expected type %s, found %s"
a0b6b246 14335msgstr "对象 %s:应为类型 %s,却是 %s"
6acbf033 14336
a6cd2cc4 14337#: builtin/index-pack.c:258
81809b99 14338#, c-format
8ada9598
JX
14339msgid "cannot fill %d byte"
14340msgid_plural "cannot fill %d bytes"
81809b99 14341msgstr[0] "无法填充 %d 字节"
5ae481e0 14342msgstr[1] "无法填充 %d 字节"
8ada9598 14343
a6cd2cc4 14344#: builtin/index-pack.c:268
8ada9598 14345msgid "early EOF"
81809b99 14346msgstr "过早的文件结束符(EOF)"
8ada9598 14347
a6cd2cc4 14348#: builtin/index-pack.c:269
8ada9598 14349msgid "read error on input"
81809b99 14350msgstr "输入上的读错误"
8ada9598 14351
a6cd2cc4 14352#: builtin/index-pack.c:281
8ada9598 14353msgid "used more bytes than were available"
81809b99 14354msgstr "用掉了超过可用的字节"
8ada9598 14355
a6cd2cc4 14356#: builtin/index-pack.c:288 builtin/pack-objects.c:604
8ada9598 14357msgid "pack too large for current definition of off_t"
81809b99 14358msgstr "包太大超过了当前 off_t 的定义"
8ada9598 14359
ddc12c42 14360#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
a0b6b246
JX
14361msgid "pack exceeds maximum allowed size"
14362msgstr "包超过了最大允许值"
14363
a6cd2cc4 14364#: builtin/index-pack.c:312
81809b99 14365#, c-format
8ada9598 14366msgid "cannot open packfile '%s'"
81809b99 14367msgstr "无法打开包文件 '%s'"
8ada9598 14368
a6cd2cc4 14369#: builtin/index-pack.c:326
8ada9598 14370msgid "pack signature mismatch"
81809b99 14371msgstr "包签名不匹配"
8ada9598 14372
a6cd2cc4 14373#: builtin/index-pack.c:328
ef317cd5
JX
14374#, c-format
14375msgid "pack version %<PRIu32> unsupported"
07432cef 14376msgstr "不支持包版本 %<PRIu32>"
ef317cd5 14377
a6cd2cc4 14378#: builtin/index-pack.c:346
8ada9598 14379#, c-format
5c57d762
JX
14380msgid "pack has bad object at offset %<PRIuMAX>: %s"
14381msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8ada9598 14382
a6cd2cc4 14383#: builtin/index-pack.c:466
8ada9598
JX
14384#, c-format
14385msgid "inflate returned %d"
81809b99 14386msgstr "解压缩返回 %d"
8ada9598 14387
a6cd2cc4 14388#: builtin/index-pack.c:515
8ada9598 14389msgid "offset value overflow for delta base object"
81809b99 14390msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 14391
a6cd2cc4 14392#: builtin/index-pack.c:523
8ada9598 14393msgid "delta base offset is out of bound"
81809b99 14394msgstr "delta 基准偏移越界"
8ada9598 14395
a6cd2cc4 14396#: builtin/index-pack.c:531
81809b99 14397#, c-format
8ada9598 14398msgid "unknown object type %d"
81809b99 14399msgstr "未知对象类型 %d"
8ada9598 14400
a6cd2cc4 14401#: builtin/index-pack.c:562
8ada9598 14402msgid "cannot pread pack file"
81809b99 14403msgstr "无法读取包文件"
8ada9598 14404
a6cd2cc4 14405#: builtin/index-pack.c:564
8ada9598 14406#, c-format
5c57d762
JX
14407msgid "premature end of pack file, %<PRIuMAX> byte missing"
14408msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
14409msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
14410msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8ada9598 14411
a6cd2cc4 14412#: builtin/index-pack.c:590
8ada9598 14413msgid "serious inflate inconsistency"
81809b99 14414msgstr "解压缩严重的不一致"
8ada9598 14415
a6cd2cc4
JX
14416#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
14417#: builtin/index-pack.c:803 builtin/index-pack.c:812
8ada9598
JX
14418#, c-format
14419msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 14420msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 14421
a6cd2cc4
JX
14422#: builtin/index-pack.c:738 builtin/pack-objects.c:157
14423#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
6792b93b
JX
14424#, c-format
14425msgid "unable to read %s"
14426msgstr "不能读 %s"
14427
a6cd2cc4 14428#: builtin/index-pack.c:801
87cb7997
JX
14429#, c-format
14430msgid "cannot read existing object info %s"
14431msgstr "不能读取现存对象信息 %s"
14432
a6cd2cc4 14433#: builtin/index-pack.c:809
6792b93b
JX
14434#, c-format
14435msgid "cannot read existing object %s"
14436msgstr "不能读取现存对象 %s"
14437
a6cd2cc4 14438#: builtin/index-pack.c:823
81809b99 14439#, c-format
8ada9598 14440msgid "invalid blob object %s"
160fb2b2 14441msgstr "无效的数据对象 %s"
8ada9598 14442
a6cd2cc4 14443#: builtin/index-pack.c:826 builtin/index-pack.c:845
fd8cb379
JX
14444msgid "fsck error in packed object"
14445msgstr "对打包对象 fsck 检查出错"
14446
a6cd2cc4 14447#: builtin/index-pack.c:847
8ada9598
JX
14448#, c-format
14449msgid "Not all child objects of %s are reachable"
81809b99 14450msgstr "%s 的所有子对象并非都可达"
8ada9598 14451
a6cd2cc4 14452#: builtin/index-pack.c:919 builtin/index-pack.c:950
8ada9598 14453msgid "failed to apply delta"
c1ac5258 14454msgstr "应用 delta 失败"
8ada9598 14455
a6cd2cc4 14456#: builtin/index-pack.c:1118
8ada9598 14457msgid "Receiving objects"
81809b99 14458msgstr "接收对象中"
8ada9598 14459
a6cd2cc4 14460#: builtin/index-pack.c:1118
8ada9598 14461msgid "Indexing objects"
81809b99 14462msgstr "索引对象中"
8ada9598 14463
a6cd2cc4 14464#: builtin/index-pack.c:1152
8ada9598 14465msgid "pack is corrupted (SHA1 mismatch)"
81809b99 14466msgstr "包冲突(SHA1 不匹配)"
8ada9598 14467
a6cd2cc4 14468#: builtin/index-pack.c:1157
8ada9598 14469msgid "cannot fstat packfile"
65e2041e 14470msgstr "不能对包文件调用 fstat"
8ada9598 14471
a6cd2cc4 14472#: builtin/index-pack.c:1160
8ada9598 14473msgid "pack has junk at the end"
81809b99 14474msgstr "包的结尾有垃圾数据"
8ada9598 14475
a6cd2cc4 14476#: builtin/index-pack.c:1172
6792b93b
JX
14477msgid "confusion beyond insanity in parse_pack_objects()"
14478msgstr "parse_pack_objects() 中遇到不可理喻的问题"
14479
a6cd2cc4 14480#: builtin/index-pack.c:1195
8ada9598 14481msgid "Resolving deltas"
81809b99 14482msgstr "处理 delta 中"
8ada9598 14483
a5cd71ca 14484#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
07432cef 14485#, c-format
ef317cd5 14486msgid "unable to create thread: %s"
07432cef 14487msgstr "不能创建线程:%s"
ef317cd5 14488
a6cd2cc4 14489#: builtin/index-pack.c:1246
8ada9598 14490msgid "confusion beyond insanity"
81809b99 14491msgstr "不可理喻"
8ada9598 14492
a6cd2cc4 14493#: builtin/index-pack.c:1252
ef317cd5 14494#, c-format
5b04ee3b
JX
14495msgid "completed with %d local object"
14496msgid_plural "completed with %d local objects"
14497msgstr[0] "完成 %d 个本地对象"
14498msgstr[1] "完成 %d 个本地对象"
ef317cd5 14499
a6cd2cc4 14500#: builtin/index-pack.c:1264
ef317cd5
JX
14501#, c-format
14502msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 14503msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 14504
a6cd2cc4 14505#: builtin/index-pack.c:1268
8ada9598
JX
14506#, c-format
14507msgid "pack has %d unresolved delta"
14508msgid_plural "pack has %d unresolved deltas"
81809b99 14509msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 14510msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 14511
a6cd2cc4 14512#: builtin/index-pack.c:1292
81809b99 14513#, c-format
8ada9598 14514msgid "unable to deflate appended object (%d)"
07432cef 14515msgstr "不能压缩附加对象(%d)"
8ada9598 14516
a6cd2cc4 14517#: builtin/index-pack.c:1388
8ada9598
JX
14518#, c-format
14519msgid "local object %s is corrupt"
81809b99 14520msgstr "本地对象 %s 已损坏"
8ada9598 14521
a6cd2cc4 14522#: builtin/index-pack.c:1402
31e5e17b
JX
14523#, c-format
14524msgid "packfile name '%s' does not end with '.pack'"
14525msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 14526
a6cd2cc4 14527#: builtin/index-pack.c:1427
81809b99 14528#, c-format
31e5e17b
JX
14529msgid "cannot write %s file '%s'"
14530msgstr "无法写入 %s 文件 '%s'"
8ada9598 14531
a6cd2cc4 14532#: builtin/index-pack.c:1435
81809b99 14533#, c-format
31e5e17b
JX
14534msgid "cannot close written %s file '%s'"
14535msgstr "无法关闭已写入的 %s 文件 '%s'"
14536
a6cd2cc4 14537#: builtin/index-pack.c:1459
31e5e17b
JX
14538msgid "error while closing pack file"
14539msgstr "关闭包文件时出错"
8ada9598 14540
a6cd2cc4 14541#: builtin/index-pack.c:1473
8ada9598 14542msgid "cannot store pack file"
81809b99 14543msgstr "无法存储包文件"
8ada9598 14544
a6cd2cc4 14545#: builtin/index-pack.c:1481
8ada9598 14546msgid "cannot store index file"
81809b99 14547msgstr "无法存储索引文件"
8ada9598 14548
a5cd71ca 14549#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
07432cef 14550#, c-format
ef317cd5 14551msgid "bad pack.indexversion=%<PRIu32>"
07432cef 14552msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 14553
a6cd2cc4 14554#: builtin/index-pack.c:1593
81809b99 14555#, c-format
8ada9598 14556msgid "Cannot open existing pack file '%s'"
81809b99 14557msgstr "无法打开现存包文件 '%s'"
8ada9598 14558
a6cd2cc4 14559#: builtin/index-pack.c:1595
81809b99 14560#, c-format
8ada9598 14561msgid "Cannot open existing pack idx file for '%s'"
81809b99 14562msgstr "无法为 %s 打开包索引文件"
8ada9598 14563
a6cd2cc4 14564#: builtin/index-pack.c:1643
81809b99 14565#, c-format
8ada9598
JX
14566msgid "non delta: %d object"
14567msgid_plural "non delta: %d objects"
81809b99 14568msgstr[0] "非 delta:%d 个对象"
5ae481e0 14569msgstr[1] "非 delta:%d 个对象"
8ada9598 14570
a6cd2cc4 14571#: builtin/index-pack.c:1650
8ada9598
JX
14572#, c-format
14573msgid "chain length = %d: %lu object"
14574msgid_plural "chain length = %d: %lu objects"
81809b99 14575msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 14576msgstr[1] "链长 = %d: %lu 对象"
8ada9598 14577
a6cd2cc4 14578#: builtin/index-pack.c:1689
31e5e17b
JX
14579msgid "Cannot come back to cwd"
14580msgstr "无法返回当前工作目录"
5b04ee3b 14581
a6cd2cc4
JX
14582#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
14583#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
81809b99 14584#, c-format
8ada9598 14585msgid "bad %s"
81809b99 14586msgstr "错误选项 %s"
8ada9598 14587
a6cd2cc4 14588#: builtin/index-pack.c:1777
8ada9598 14589msgid "--fix-thin cannot be used without --stdin"
649900bc 14590msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 14591
a6cd2cc4 14592#: builtin/index-pack.c:1779
1a79b2f1
JX
14593msgid "--stdin requires a git repository"
14594msgstr "--stdin 需要一个 git 仓库"
14595
a6cd2cc4 14596#: builtin/index-pack.c:1785
8ada9598 14597msgid "--verify with no packfile name given"
dbd6cced 14598msgstr "--verify 没有提供包文件名参数"
8ada9598 14599
ddc12c42 14600#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581
fd8cb379
JX
14601msgid "fsck error in pack objects"
14602msgstr "在打包对象中 fsck 检查出错"
14603
a4f16749 14604#: builtin/init-db.c:61
c04f5ac3
JX
14605#, c-format
14606msgid "cannot stat template '%s'"
65e2041e 14607msgstr "不能对模版 '%s' 调用 stat"
c04f5ac3 14608
a4f16749 14609#: builtin/init-db.c:66
c04f5ac3
JX
14610#, c-format
14611msgid "cannot opendir '%s'"
14612msgstr "不能打开目录 '%s'"
14613
c1ac5258 14614#: builtin/init-db.c:78
c04f5ac3
JX
14615#, c-format
14616msgid "cannot readlink '%s'"
14617msgstr "不能读取链接 '%s'"
14618
c1ac5258 14619#: builtin/init-db.c:80
c04f5ac3
JX
14620#, c-format
14621msgid "cannot symlink '%s' '%s'"
90e6ef53 14622msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 14623
c1ac5258 14624#: builtin/init-db.c:86
c04f5ac3
JX
14625#, c-format
14626msgid "cannot copy '%s' to '%s'"
14627msgstr "不能拷贝 '%s' 至 '%s'"
14628
c1ac5258 14629#: builtin/init-db.c:90
c04f5ac3
JX
14630#, c-format
14631msgid "ignoring template %s"
14632msgstr "忽略模版 %s"
14633
c1ac5258 14634#: builtin/init-db.c:121
c04f5ac3 14635#, c-format
fd8cb379
JX
14636msgid "templates not found in %s"
14637msgstr "没有在 %s 中找到模版"
c04f5ac3 14638
c1ac5258 14639#: builtin/init-db.c:136
c04f5ac3 14640#, c-format
5b04ee3b
JX
14641msgid "not copying templates from '%s': %s"
14642msgstr "没有从 '%s' 复制模版:%s"
c04f5ac3 14643
d46c5519 14644#: builtin/init-db.c:334
c04f5ac3
JX
14645#, c-format
14646msgid "unable to handle file type %d"
14647msgstr "不能处理 %d 类型的文件"
14648
d46c5519 14649#: builtin/init-db.c:337
c04f5ac3
JX
14650#, c-format
14651msgid "unable to move %s to %s"
14652msgstr "不能移动 %s 至 %s"
14653
d46c5519 14654#: builtin/init-db.c:354 builtin/init-db.c:357
a0b6b246
JX
14655#, c-format
14656msgid "%s already exists"
14657msgstr "%s 已经存在"
14658
d46c5519 14659#: builtin/init-db.c:413
c04f5ac3 14660#, c-format
5c57d762
JX
14661msgid "Reinitialized existing shared Git repository in %s%s\n"
14662msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
c04f5ac3 14663
d46c5519 14664#: builtin/init-db.c:414
5c57d762
JX
14665#, c-format
14666msgid "Reinitialized existing Git repository in %s%s\n"
14667msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
c04f5ac3 14668
d46c5519 14669#: builtin/init-db.c:418
5c57d762
JX
14670#, c-format
14671msgid "Initialized empty shared Git repository in %s%s\n"
9a4b694c 14672msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
c04f5ac3 14673
d46c5519 14674#: builtin/init-db.c:419
5c57d762
JX
14675#, c-format
14676msgid "Initialized empty Git repository in %s%s\n"
9a4b694c 14677msgstr "已初始化空的 Git 仓库于 %s%s\n"
c04f5ac3 14678
d46c5519 14679#: builtin/init-db.c:468
ef317cd5 14680msgid ""
a77c07d9 14681"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 14682"shared[=<permissions>]] [<directory>]"
ef317cd5 14683msgstr ""
07432cef 14684"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 14685"[<目录>]"
ef317cd5 14686
d46c5519 14687#: builtin/init-db.c:491
ef317cd5 14688msgid "permissions"
07432cef 14689msgstr "权限"
ef317cd5 14690
d46c5519 14691#: builtin/init-db.c:492
ef317cd5 14692msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 14693msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 14694
a6cd2cc4 14695#: builtin/init-db.c:529 builtin/init-db.c:534
c1ac5258
JX
14696#, c-format
14697msgid "cannot mkdir %s"
14698msgstr "不能创建目录 %s"
14699
a6cd2cc4 14700#: builtin/init-db.c:538
c04f5ac3
JX
14701#, c-format
14702msgid "cannot chdir to %s"
14703msgstr "不能切换目录到 %s"
14704
a6cd2cc4 14705#: builtin/init-db.c:559
c04f5ac3
JX
14706#, c-format
14707msgid ""
14708"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
14709"dir=<directory>)"
1e607449 14710msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 14711
a6cd2cc4 14712#: builtin/init-db.c:587
c04f5ac3
JX
14713#, c-format
14714msgid "Cannot access work tree '%s'"
14715msgstr "不能访问工作区 '%s'"
14716
a6cd2cc4 14717#: builtin/interpret-trailers.c:16
220c313c 14718msgid ""
276ceeaa
JX
14719"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
14720"<token>[(=|:)<value>])...] [<file>...]"
3495628d
JX
14721msgstr ""
14722"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
14723">])...] [<文件>...]"
276ceeaa 14724
a6cd2cc4 14725#: builtin/interpret-trailers.c:95
276ceeaa
JX
14726msgid "edit files in place"
14727msgstr "在原位编辑文件"
220c313c 14728
a6cd2cc4 14729#: builtin/interpret-trailers.c:96
220c313c 14730msgid "trim empty trailers"
6937cb4e
JX
14731msgstr "删除空的尾部署名"
14732
a6cd2cc4 14733#: builtin/interpret-trailers.c:99
6937cb4e
JX
14734msgid "where to place the new trailer"
14735msgstr "在哪里放置新的尾部署名"
220c313c 14736
a6cd2cc4 14737#: builtin/interpret-trailers.c:101
6937cb4e
JX
14738msgid "action if trailer already exists"
14739msgstr "当尾部署名已经存在时所采取的动作"
14740
a6cd2cc4 14741#: builtin/interpret-trailers.c:103
6937cb4e
JX
14742msgid "action if trailer is missing"
14743msgstr "当尾部署名缺失时所采取的动作"
14744
a6cd2cc4 14745#: builtin/interpret-trailers.c:105
6937cb4e
JX
14746msgid "output only the trailers"
14747msgstr "只输出尾部署名"
14748
a6cd2cc4 14749#: builtin/interpret-trailers.c:106
6937cb4e
JX
14750msgid "do not apply config rules"
14751msgstr "不要应用配置规则"
14752
a6cd2cc4 14753#: builtin/interpret-trailers.c:107
6937cb4e
JX
14754msgid "join whitespace-continued values"
14755msgstr "连接空白折行的值"
14756
a6cd2cc4 14757#: builtin/interpret-trailers.c:108
6937cb4e
JX
14758msgid "set parsing options"
14759msgstr "设置解析选项"
14760
a6cd2cc4 14761#: builtin/interpret-trailers.c:110
4c27fcb5
JX
14762msgid "do not treat --- specially"
14763msgstr "不要对 --- 特殊处理"
14764
a6cd2cc4 14765#: builtin/interpret-trailers.c:111
220c313c 14766msgid "trailer"
6937cb4e 14767msgstr "尾部署名"
220c313c 14768
a6cd2cc4 14769#: builtin/interpret-trailers.c:112
220c313c 14770msgid "trailer(s) to add"
6937cb4e 14771msgstr "要添加的尾部署名"
220c313c 14772
a6cd2cc4 14773#: builtin/interpret-trailers.c:123
6937cb4e
JX
14774msgid "--trailer with --only-input does not make sense"
14775msgstr "--trailer 和 --only-input 同时使用没有意义"
14776
a6cd2cc4 14777#: builtin/interpret-trailers.c:133
276ceeaa
JX
14778msgid "no input file given for in-place editing"
14779msgstr "没有给出要原位编辑的文件"
14780
ddc12c42 14781#: builtin/log.c:56
7aea43ff 14782msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 14783msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 14784
ddc12c42 14785#: builtin/log.c:57
814ff314
JX
14786msgid "git show [<options>] <object>..."
14787msgstr "git show [<选项>] <对象>..."
ef317cd5 14788
ddc12c42 14789#: builtin/log.c:110
220c313c
JX
14790#, c-format
14791msgid "invalid --decorate option: %s"
14792msgstr "无效的 --decorate 选项:%s"
14793
ddc12c42 14794#: builtin/log.c:174
ef317cd5 14795msgid "show source"
07432cef 14796msgstr "显示源"
ef317cd5 14797
ddc12c42 14798#: builtin/log.c:175
07432cef
WS
14799msgid "Use mail map file"
14800msgstr "使用邮件映射文件"
14801
ddc12c42 14802#: builtin/log.c:177
5809aa05
JX
14803msgid "only decorate refs that match <pattern>"
14804msgstr "只修饰与 <模式> 匹配的引用"
14805
ddc12c42 14806#: builtin/log.c:179
5809aa05
JX
14807msgid "do not decorate refs that match <pattern>"
14808msgstr "不修饰和 <模式> 匹配的引用"
14809
ddc12c42 14810#: builtin/log.c:180
ef317cd5 14811msgid "decorate options"
07432cef 14812msgstr "修饰选项"
ef317cd5 14813
ddc12c42 14814#: builtin/log.c:183
220c313c
JX
14815msgid "Process line range n,m in file, counting from 1"
14816msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
14817
ddc12c42 14818#: builtin/log.c:281
c04f5ac3
JX
14819#, c-format
14820msgid "Final output: %d %s\n"
14821msgstr "最终输出:%d %s\n"
14822
ddc12c42 14823#: builtin/log.c:535
220c313c
JX
14824#, c-format
14825msgid "git show %s: bad file"
14826msgstr "git show %s: 损坏的文件"
14827
ddc12c42 14828#: builtin/log.c:550 builtin/log.c:645
c04f5ac3 14829#, c-format
d46c5519 14830msgid "could not read object %s"
90e6ef53 14831msgstr "不能读取对象 %s"
c04f5ac3 14832
ddc12c42 14833#: builtin/log.c:670
c04f5ac3 14834#, c-format
d46c5519 14835msgid "unknown type: %d"
c04f5ac3
JX
14836msgstr "未知类型:%d"
14837
ddc12c42
JX
14838#: builtin/log.c:814
14839#, c-format
14840msgid "%s: invalid cover from description mode"
14841msgstr "%s:从描述生成附函的模式无效"
14842
14843#: builtin/log.c:821
c04f5ac3
JX
14844msgid "format.headers without value"
14845msgstr "format.headers 没有值"
14846
ddc12c42 14847#: builtin/log.c:936
c04f5ac3
JX
14848msgid "name of output directory is too long"
14849msgstr "输出目录名太长"
14850
ddc12c42 14851#: builtin/log.c:952
c04f5ac3 14852#, c-format
d46c5519 14853msgid "cannot open patch file %s"
c04f5ac3
JX
14854msgstr "无法打开补丁文件 %s"
14855
ddc12c42 14856#: builtin/log.c:969
d46c5519
JX
14857msgid "need exactly one range"
14858msgstr "只需要一个范围"
c04f5ac3 14859
ddc12c42 14860#: builtin/log.c:979
d46c5519
JX
14861msgid "not a range"
14862msgstr "不是一个范围"
c04f5ac3 14863
ddc12c42 14864#: builtin/log.c:1143
d46c5519
JX
14865msgid "cover letter needs email format"
14866msgstr "附函需要邮件地址格式"
c04f5ac3 14867
ddc12c42 14868#: builtin/log.c:1149
d46c5519
JX
14869msgid "failed to create cover-letter file"
14870msgstr "无法创建附函文件"
14871
ddc12c42 14872#: builtin/log.c:1228
c04f5ac3
JX
14873#, c-format
14874msgid "insane in-reply-to: %s"
14875msgstr "不正常的 in-reply-to:%s"
14876
ddc12c42 14877#: builtin/log.c:1255
814ff314
JX
14878msgid "git format-patch [<options>] [<since> | <revision-range>]"
14879msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 14880
ddc12c42 14881#: builtin/log.c:1313
d46c5519 14882msgid "two output directories?"
c04f5ac3
JX
14883msgstr "两个输出目录?"
14884
ddc12c42 14885#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
5b04ee3b 14886#, c-format
d46c5519 14887msgid "unknown commit %s"
5b04ee3b
JX
14888msgstr "未知提交 %s"
14889
ddc12c42 14890#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
d46c5519 14891#: builtin/replace.c:210
5b04ee3b 14892#, c-format
d46c5519
JX
14893msgid "failed to resolve '%s' as a valid ref"
14894msgstr "无法将 '%s' 解析为一个有效引用"
5b04ee3b 14895
ddc12c42 14896#: builtin/log.c:1439
d46c5519
JX
14897msgid "could not find exact merge base"
14898msgstr "不能找到准确的合并基线"
5b04ee3b 14899
ddc12c42 14900#: builtin/log.c:1443
5b04ee3b 14901msgid ""
d46c5519 14902"failed to get upstream, if you want to record base commit automatically,\n"
5b04ee3b 14903"please use git branch --set-upstream-to to track a remote branch.\n"
d46c5519 14904"Or you could specify base commit by --base=<base-commit-id> manually"
5b04ee3b
JX
14905msgstr ""
14906"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
aef18cc6 14907"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
d46c5519 14908"参数 --base=<基线提交> 手动指定一个基线提交"
5b04ee3b 14909
ddc12c42 14910#: builtin/log.c:1463
d46c5519 14911msgid "failed to find exact merge base"
5b04ee3b
JX
14912msgstr "无法找到准确的合并基线"
14913
ddc12c42 14914#: builtin/log.c:1474
5b04ee3b
JX
14915msgid "base commit should be the ancestor of revision list"
14916msgstr "基线提交应该是版本列表的祖先"
14917
ddc12c42 14918#: builtin/log.c:1478
5b04ee3b
JX
14919msgid "base commit shouldn't be in revision list"
14920msgstr "基线提交不应该出现在版本列表中"
14921
ddc12c42 14922#: builtin/log.c:1531
5b04ee3b 14923msgid "cannot get patch id"
aef18cc6 14924msgstr "无法得到补丁 id"
5b04ee3b 14925
ddc12c42 14926#: builtin/log.c:1583
4c27fcb5
JX
14927msgid "failed to infer range-diff ranges"
14928msgstr "无法推断 range-diff 范围"
14929
ddc12c42 14930#: builtin/log.c:1629
ef317cd5 14931msgid "use [PATCH n/m] even with a single patch"
07432cef 14932msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 14933
ddc12c42 14934#: builtin/log.c:1632
ef317cd5 14935msgid "use [PATCH] even with multiple patches"
07432cef 14936msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 14937
ddc12c42 14938#: builtin/log.c:1636
ef317cd5 14939msgid "print patches to standard out"
07432cef 14940msgstr "打印补丁到标准输出"
c04f5ac3 14941
ddc12c42 14942#: builtin/log.c:1638
ef317cd5 14943msgid "generate a cover letter"
d46c5519 14944msgstr "生成一封附函"
c04f5ac3 14945
ddc12c42 14946#: builtin/log.c:1640
ef317cd5 14947msgid "use simple number sequence for output file names"
07432cef 14948msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 14949
ddc12c42 14950#: builtin/log.c:1641
ef317cd5 14951msgid "sfx"
07432cef 14952msgstr "后缀"
ef317cd5 14953
ddc12c42 14954#: builtin/log.c:1642
ef317cd5 14955msgid "use <sfx> instead of '.patch'"
07432cef 14956msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 14957
ddc12c42 14958#: builtin/log.c:1644
ef317cd5 14959msgid "start numbering patches at <n> instead of 1"
07432cef
WS
14960msgstr "补丁以 <n> 开始编号,而不是1"
14961
ddc12c42 14962#: builtin/log.c:1646
07432cef
WS
14963msgid "mark the series as Nth re-roll"
14964msgstr "标记补丁系列是第几次重制"
ef317cd5 14965
ddc12c42 14966#: builtin/log.c:1648
a0b6b246
JX
14967msgid "Use [RFC PATCH] instead of [PATCH]"
14968msgstr "使用 [RFC PATCH] 代替 [PATCH]"
14969
ddc12c42
JX
14970#: builtin/log.c:1651
14971msgid "cover-from-description-mode"
14972msgstr "从分支描述获取附函的模式"
14973
14974#: builtin/log.c:1652
14975msgid "generate parts of a cover letter based on a branch's description"
14976msgstr "基于一个分支描述生成部分附函"
14977
14978#: builtin/log.c:1654
ef317cd5 14979msgid "Use [<prefix>] instead of [PATCH]"
07432cef 14980msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 14981
ddc12c42 14982#: builtin/log.c:1657
ef317cd5 14983msgid "store resulting files in <dir>"
d9d56b23 14984msgstr "把结果文件存储在 <目录>"
ef317cd5 14985
ddc12c42 14986#: builtin/log.c:1660
ef317cd5 14987msgid "don't strip/add [PATCH]"
07432cef 14988msgstr "不删除/添加 [PATCH]"
ef317cd5 14989
ddc12c42 14990#: builtin/log.c:1663
ef317cd5 14991msgid "don't output binary diffs"
07432cef 14992msgstr "不输出二进制差异"
ef317cd5 14993
ddc12c42 14994#: builtin/log.c:1665
89f80d72
JX
14995msgid "output all-zero hash in From header"
14996msgstr "在 From 头信息中输出全为零的哈希值"
14997
ddc12c42 14998#: builtin/log.c:1667
ef317cd5 14999msgid "don't include a patch matching a commit upstream"
07432cef 15000msgstr "不包含已在上游提交中的补丁"
ef317cd5 15001
ddc12c42 15002#: builtin/log.c:1669
ef317cd5 15003msgid "show patch format instead of default (patch + stat)"
07432cef 15004msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 15005
ddc12c42 15006#: builtin/log.c:1671
ef317cd5 15007msgid "Messaging"
07432cef 15008msgstr "邮件发送"
ef317cd5 15009
ddc12c42 15010#: builtin/log.c:1672
ef317cd5 15011msgid "header"
07432cef 15012msgstr "header"
ef317cd5 15013
ddc12c42 15014#: builtin/log.c:1673
ef317cd5 15015msgid "add email header"
07432cef 15016msgstr "添加邮件头"
ef317cd5 15017
ddc12c42 15018#: builtin/log.c:1674 builtin/log.c:1676
ef317cd5 15019msgid "email"
07432cef 15020msgstr "邮件地址"
ef317cd5 15021
ddc12c42 15022#: builtin/log.c:1674
ef317cd5 15023msgid "add To: header"
07432cef 15024msgstr "添加收件人"
ef317cd5 15025
ddc12c42 15026#: builtin/log.c:1676
ef317cd5 15027msgid "add Cc: header"
07432cef 15028msgstr "添加抄送"
ef317cd5 15029
ddc12c42 15030#: builtin/log.c:1678
2e8451e8 15031msgid "ident"
d9d56b23 15032msgstr "标识"
2e8451e8 15033
ddc12c42 15034#: builtin/log.c:1679
2e8451e8 15035msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 15036msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 15037
ddc12c42 15038#: builtin/log.c:1681
ef317cd5 15039msgid "message-id"
d9d56b23 15040msgstr "邮件标识"
ef317cd5 15041
ddc12c42 15042#: builtin/log.c:1682
ef317cd5 15043msgid "make first mail a reply to <message-id>"
d9d56b23 15044msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 15045
ddc12c42 15046#: builtin/log.c:1683 builtin/log.c:1686
ef317cd5 15047msgid "boundary"
07432cef 15048msgstr "边界"
ef317cd5 15049
ddc12c42 15050#: builtin/log.c:1684
ef317cd5 15051msgid "attach the patch"
07432cef 15052msgstr "附件方式添加补丁"
ef317cd5 15053
ddc12c42 15054#: builtin/log.c:1687
ef317cd5 15055msgid "inline the patch"
07432cef 15056msgstr "内联显示补丁"
ef317cd5 15057
ddc12c42 15058#: builtin/log.c:1691
ef317cd5 15059msgid "enable message threading, styles: shallow, deep"
07432cef 15060msgstr "启用邮件线索,风格:浅,深"
ef317cd5 15061
ddc12c42 15062#: builtin/log.c:1693
ef317cd5 15063msgid "signature"
07432cef 15064msgstr "签名"
ef317cd5 15065
ddc12c42 15066#: builtin/log.c:1694
ef317cd5 15067msgid "add a signature"
07432cef 15068msgstr "添加一个签名"
ef317cd5 15069
ddc12c42 15070#: builtin/log.c:1695
5b04ee3b
JX
15071msgid "base-commit"
15072msgstr "基线提交"
15073
ddc12c42 15074#: builtin/log.c:1696
5b04ee3b
JX
15075msgid "add prerequisite tree info to the patch series"
15076msgstr "为补丁列表添加前置树信息"
15077
ddc12c42 15078#: builtin/log.c:1698
6acbf033
JX
15079msgid "add a signature from a file"
15080msgstr "从文件添加一个签名"
15081
ddc12c42 15082#: builtin/log.c:1699
ef317cd5 15083msgid "don't print the patch filenames"
07432cef 15084msgstr "不要打印补丁文件名"
ef317cd5 15085
ddc12c42 15086#: builtin/log.c:1701
6937cb4e
JX
15087msgid "show progress while generating patches"
15088msgstr "在生成补丁时显示进度"
15089
ddc12c42 15090#: builtin/log.c:1703
4c27fcb5
JX
15091msgid "show changes against <rev> in cover letter or single patch"
15092msgstr "在附函或单个补丁中显示和 <rev> 的差异"
15093
ddc12c42 15094#: builtin/log.c:1706
4c27fcb5
JX
15095msgid "show changes against <refspec> in cover letter or single patch"
15096msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
15097
ddc12c42 15098#: builtin/log.c:1708
4c27fcb5
JX
15099msgid "percentage by which creation is weighted"
15100msgstr "创建权重的百分比"
15101
ddc12c42 15102#: builtin/log.c:1792
a4f16749
JX
15103#, c-format
15104msgid "invalid ident line: %s"
15105msgstr "包含无效的身份标识:%s"
15106
ddc12c42 15107#: builtin/log.c:1807
c1ac5258
JX
15108msgid "-n and -k are mutually exclusive"
15109msgstr "-n 和 -k 互斥"
c04f5ac3 15110
ddc12c42 15111#: builtin/log.c:1809
c1ac5258
JX
15112msgid "--subject-prefix/--rfc and -k are mutually exclusive"
15113msgstr "--subject-prefix/--rfc 和 -k 互斥"
c04f5ac3 15114
ddc12c42 15115#: builtin/log.c:1817
c04f5ac3
JX
15116msgid "--name-only does not make sense"
15117msgstr "--name-only 无意义"
15118
ddc12c42 15119#: builtin/log.c:1819
c04f5ac3
JX
15120msgid "--name-status does not make sense"
15121msgstr "--name-status 无意义"
15122
ddc12c42 15123#: builtin/log.c:1821
c04f5ac3
JX
15124msgid "--check does not make sense"
15125msgstr "--check 无意义"
15126
ddc12c42 15127#: builtin/log.c:1854
c04f5ac3
JX
15128msgid "standard output, or directory, which one?"
15129msgstr "标准输出或目录,哪一个?"
15130
ddc12c42 15131#: builtin/log.c:1958
4c27fcb5
JX
15132msgid "--interdiff requires --cover-letter or single patch"
15133msgstr "--interdiff 需要 --cover-letter 或单一补丁"
15134
ddc12c42 15135#: builtin/log.c:1962
4c27fcb5
JX
15136msgid "Interdiff:"
15137msgstr "版本间差异:"
15138
ddc12c42 15139#: builtin/log.c:1963
4c27fcb5
JX
15140#, c-format
15141msgid "Interdiff against v%d:"
15142msgstr "对 v%d 的版本差异:"
15143
ddc12c42 15144#: builtin/log.c:1969
4c27fcb5
JX
15145msgid "--creation-factor requires --range-diff"
15146msgstr "--creation-factor 需要 --range-diff"
15147
ddc12c42 15148#: builtin/log.c:1973
4c27fcb5
JX
15149msgid "--range-diff requires --cover-letter or single patch"
15150msgstr "--range-diff 需要 --cover-letter 或单一补丁"
15151
ddc12c42 15152#: builtin/log.c:1981
4c27fcb5
JX
15153msgid "Range-diff:"
15154msgstr "范围差异:"
15155
ddc12c42 15156#: builtin/log.c:1982
4c27fcb5
JX
15157#, c-format
15158msgid "Range-diff against v%d:"
15159msgstr "对 v%d 的范围差异:"
15160
ddc12c42 15161#: builtin/log.c:1993
6acbf033
JX
15162#, c-format
15163msgid "unable to read signature file '%s'"
15164msgstr "无法读取签名文件 '%s'"
15165
ddc12c42 15166#: builtin/log.c:2029
6937cb4e
JX
15167msgid "Generating patches"
15168msgstr "生成补丁"
15169
ddc12c42 15170#: builtin/log.c:2073
d46c5519 15171msgid "failed to create output files"
c04f5ac3
JX
15172msgstr "无法创建输出文件"
15173
ddc12c42 15174#: builtin/log.c:2132
ef317cd5 15175msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 15176msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 15177
ddc12c42 15178#: builtin/log.c:2186
c04f5ac3
JX
15179#, c-format
15180msgid ""
15181"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 15182msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 15183
06991777 15184#: builtin/ls-files.c:470
814ff314
JX
15185msgid "git ls-files [<options>] [<file>...]"
15186msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 15187
06991777 15188#: builtin/ls-files.c:526
ef317cd5 15189msgid "identify the file status with tags"
07432cef 15190msgstr "用标签标识文件的状态"
ef317cd5 15191
06991777 15192#: builtin/ls-files.c:528
ef317cd5 15193msgid "use lowercase letters for 'assume unchanged' files"
07432cef 15194msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 15195
06991777 15196#: builtin/ls-files.c:530
5809aa05
JX
15197msgid "use lowercase letters for 'fsmonitor clean' files"
15198msgstr "使用小写字母表示 'fsmonitor clean' 文件"
15199
06991777 15200#: builtin/ls-files.c:532
ef317cd5 15201msgid "show cached files in the output (default)"
07432cef 15202msgstr "显示缓存的文件(默认)"
ef317cd5 15203
06991777 15204#: builtin/ls-files.c:534
ef317cd5 15205msgid "show deleted files in the output"
07432cef 15206msgstr "显示已删除的文件"
ef317cd5 15207
06991777 15208#: builtin/ls-files.c:536
ef317cd5 15209msgid "show modified files in the output"
07432cef 15210msgstr "显示已修改的文件"
ef317cd5 15211
06991777 15212#: builtin/ls-files.c:538
ef317cd5 15213msgid "show other files in the output"
07432cef 15214msgstr "显示其它文件"
ef317cd5 15215
06991777 15216#: builtin/ls-files.c:540
ef317cd5 15217msgid "show ignored files in the output"
07432cef 15218msgstr "显示忽略的文件"
ef317cd5 15219
06991777 15220#: builtin/ls-files.c:543
ef317cd5 15221msgid "show staged contents' object name in the output"
07432cef 15222msgstr "显示暂存区内容的对象名称"
ef317cd5 15223
06991777 15224#: builtin/ls-files.c:545
ef317cd5 15225msgid "show files on the filesystem that need to be removed"
07432cef 15226msgstr "显示文件系统需要删除的文件"
ef317cd5 15227
06991777 15228#: builtin/ls-files.c:547
220c313c 15229msgid "show 'other' directories' names only"
07432cef 15230msgstr "只显示“其他”目录的名称"
ef317cd5 15231
06991777 15232#: builtin/ls-files.c:549
276ceeaa
JX
15233msgid "show line endings of files"
15234msgstr "显示文件换行符格式"
15235
06991777 15236#: builtin/ls-files.c:551
ef317cd5 15237msgid "don't show empty directories"
07432cef 15238msgstr "不显示空目录"
ef317cd5 15239
06991777 15240#: builtin/ls-files.c:554
ef317cd5 15241msgid "show unmerged files in the output"
07432cef 15242msgstr "显示未合并的文件"
ef317cd5 15243
06991777 15244#: builtin/ls-files.c:556
ef317cd5 15245msgid "show resolve-undo information"
07432cef 15246msgstr "显示 resolve-undo 信息"
ef317cd5 15247
06991777 15248#: builtin/ls-files.c:558
ef317cd5 15249msgid "skip files matching pattern"
07432cef 15250msgstr "匹配排除文件的模式"
ef317cd5 15251
06991777 15252#: builtin/ls-files.c:561
ef317cd5 15253msgid "exclude patterns are read from <file>"
07432cef 15254msgstr "从 <文件> 中读取排除模式"
ef317cd5 15255
06991777 15256#: builtin/ls-files.c:564
ef317cd5 15257msgid "read additional per-directory exclude patterns in <file>"
07432cef 15258msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 15259
06991777 15260#: builtin/ls-files.c:566
ef317cd5 15261msgid "add the standard git exclusions"
07432cef 15262msgstr "添加标准的 git 排除"
ef317cd5 15263
06991777 15264#: builtin/ls-files.c:570
ef317cd5 15265msgid "make the output relative to the project top directory"
07432cef 15266msgstr "显示相对于顶级目录的文件名"
ef317cd5 15267
06991777 15268#: builtin/ls-files.c:573
a0b6b246
JX
15269msgid "recurse through submodules"
15270msgstr "在子模组中递归"
15271
06991777 15272#: builtin/ls-files.c:575
ef317cd5 15273msgid "if any <file> is not in the index, treat this as an error"
07432cef 15274msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 15275
06991777 15276#: builtin/ls-files.c:576
ef317cd5 15277msgid "tree-ish"
ddc12c42 15278msgstr "树对象"
ef317cd5 15279
06991777 15280#: builtin/ls-files.c:577
ef317cd5 15281msgid "pretend that paths removed since <tree-ish> are still present"
ddc12c42 15282msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
ef317cd5 15283
06991777 15284#: builtin/ls-files.c:579
ef317cd5 15285msgid "show debugging data"
07432cef 15286msgstr "显示调试数据"
ef317cd5 15287
fd8cb379 15288#: builtin/ls-remote.c:9
276ceeaa
JX
15289msgid ""
15290"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
15291" [-q | --quiet] [--exit-code] [--get-url]\n"
15292" [--symref] [<repository> [<refs>...]]"
15293msgstr ""
15294"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
15295" [-q | --quiet] [--exit-code] [--get-url]\n"
15296" [--symref] [<仓库> [<引用>...]]"
15297
fd8cb379 15298#: builtin/ls-remote.c:59
276ceeaa
JX
15299msgid "do not print remote URL"
15300msgstr "不打印远程 URL"
15301
ddc12c42 15302#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518
276ceeaa
JX
15303msgid "exec"
15304msgstr "exec"
15305
fd8cb379 15306#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
276ceeaa
JX
15307msgid "path of git-upload-pack on the remote host"
15308msgstr "远程主机上的 git-upload-pack 路径"
15309
fd8cb379 15310#: builtin/ls-remote.c:65
276ceeaa
JX
15311msgid "limit to tags"
15312msgstr "仅限于标签"
15313
fd8cb379 15314#: builtin/ls-remote.c:66
276ceeaa
JX
15315msgid "limit to heads"
15316msgstr "仅限于分支"
15317
fd8cb379 15318#: builtin/ls-remote.c:67
276ceeaa
JX
15319msgid "do not show peeled tags"
15320msgstr "不显示已解析的标签"
15321
fd8cb379 15322#: builtin/ls-remote.c:69
276ceeaa
JX
15323msgid "take url.<base>.insteadOf into account"
15324msgstr "参考 url.<base>.insteadOf 设置"
15325
d46c5519 15326#: builtin/ls-remote.c:72
276ceeaa
JX
15327msgid "exit with exit code 2 if no matching refs are found"
15328msgstr "若未找到匹配的引用则以退出码2退出"
15329
d46c5519 15330#: builtin/ls-remote.c:75
276ceeaa
JX
15331msgid "show underlying ref in addition to the object pointed by it"
15332msgstr "除了显示指向的对象外,显示指向的引用名"
15333
c1ac5258 15334#: builtin/ls-tree.c:30
ef317cd5 15335msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
ddc12c42 15336msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
ef317cd5 15337
c1ac5258 15338#: builtin/ls-tree.c:128
ef317cd5 15339msgid "only show trees"
07432cef 15340msgstr "只显示树"
ef317cd5 15341
c1ac5258 15342#: builtin/ls-tree.c:130
ef317cd5 15343msgid "recurse into subtrees"
07432cef 15344msgstr "递归到子树"
ef317cd5 15345
c1ac5258 15346#: builtin/ls-tree.c:132
ef317cd5 15347msgid "show trees when recursing"
07432cef 15348msgstr "当递归时显示树"
ef317cd5 15349
c1ac5258 15350#: builtin/ls-tree.c:135
ef317cd5 15351msgid "terminate entries with NUL byte"
4375c10e 15352msgstr "条目以 NUL 字符终止"
ef317cd5 15353
c1ac5258 15354#: builtin/ls-tree.c:136
ef317cd5 15355msgid "include object size"
07432cef 15356msgstr "包括对象大小"
ef317cd5 15357
c1ac5258 15358#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
ef317cd5 15359msgid "list only filenames"
07432cef 15360msgstr "只列出文件名"
ef317cd5 15361
c1ac5258 15362#: builtin/ls-tree.c:143
ef317cd5 15363msgid "use full path names"
07432cef 15364msgstr "使用文件的全路径"
ef317cd5 15365
c1ac5258 15366#: builtin/ls-tree.c:145
ef317cd5 15367msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 15368msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 15369
a4f16749
JX
15370#: builtin/mailsplit.c:241
15371#, c-format
15372msgid "empty mbox: '%s'"
15373msgstr "空的 mbox:'%s'"
15374
a6cd2cc4 15375#: builtin/merge.c:55
814ff314
JX
15376msgid "git merge [<options>] [<commit>...]"
15377msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 15378
a6cd2cc4 15379#: builtin/merge.c:56
ef317cd5 15380msgid "git merge --abort"
07432cef 15381msgstr "git merge --abort"
ef317cd5 15382
a6cd2cc4 15383#: builtin/merge.c:57
1a79b2f1
JX
15384msgid "git merge --continue"
15385msgstr "git merge --continue"
15386
a6cd2cc4 15387#: builtin/merge.c:118
c04f5ac3
JX
15388msgid "switch `m' requires a value"
15389msgstr "开关 `m' 需要一个值"
15390
a6cd2cc4 15391#: builtin/merge.c:141
06991777
JX
15392#, c-format
15393msgid "option `%s' requires a value"
15394msgstr "选项 `%s' 需要一个值"
15395
a6cd2cc4 15396#: builtin/merge.c:187
c04f5ac3
JX
15397#, c-format
15398msgid "Could not find merge strategy '%s'.\n"
90e6ef53 15399msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 15400
a6cd2cc4 15401#: builtin/merge.c:188
c04f5ac3
JX
15402#, c-format
15403msgid "Available strategies are:"
15404msgstr "可用的策略有:"
15405
a6cd2cc4 15406#: builtin/merge.c:193
c04f5ac3
JX
15407#, c-format
15408msgid "Available custom strategies are:"
15409msgstr "可用的自定义策略有:"
15410
a5cd71ca 15411#: builtin/merge.c:244 builtin/pull.c:152
ef317cd5 15412msgid "do not show a diffstat at the end of the merge"
07432cef 15413msgstr "在合并的最后不显示差异统计"
ef317cd5 15414
a5cd71ca 15415#: builtin/merge.c:247 builtin/pull.c:155
ef317cd5 15416msgid "show a diffstat at the end of the merge"
07432cef 15417msgstr "在合并的最后显示差异统计"
ef317cd5 15418
a5cd71ca 15419#: builtin/merge.c:248 builtin/pull.c:158
ef317cd5 15420msgid "(synonym to --stat)"
07432cef 15421msgstr "(和 --stat 同义)"
ef317cd5 15422
a5cd71ca 15423#: builtin/merge.c:250 builtin/pull.c:161
ef317cd5 15424msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 15425msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 15426
a5cd71ca 15427#: builtin/merge.c:253 builtin/pull.c:167
ef317cd5 15428msgid "create a single commit instead of doing a merge"
07432cef 15429msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 15430
a5cd71ca 15431#: builtin/merge.c:255 builtin/pull.c:170
ef317cd5 15432msgid "perform a commit if the merge succeeds (default)"
07432cef 15433msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 15434
a5cd71ca 15435#: builtin/merge.c:257 builtin/pull.c:173
ef317cd5 15436msgid "edit message before committing"
07432cef 15437msgstr "在提交前编辑提交说明"
ef317cd5 15438
a6cd2cc4 15439#: builtin/merge.c:259
ef317cd5 15440msgid "allow fast-forward (default)"
07432cef 15441msgstr "允许快进(默认)"
ef317cd5 15442
a5cd71ca 15443#: builtin/merge.c:261 builtin/pull.c:180
ef317cd5 15444msgid "abort if fast-forward is not possible"
07432cef 15445msgstr "如果不能快进就放弃合并"
ef317cd5 15446
a5cd71ca 15447#: builtin/merge.c:265 builtin/pull.c:183
5c57d762 15448msgid "verify that the named commit has a valid GPG signature"
1003b3a5
JX
15449msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
15450
a5cd71ca 15451#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187
ddc12c42 15452#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114
ef317cd5 15453msgid "strategy"
07432cef 15454msgstr "策略"
ef317cd5 15455
a5cd71ca 15456#: builtin/merge.c:267 builtin/pull.c:188
ef317cd5 15457msgid "merge strategy to use"
07432cef 15458msgstr "要使用的合并策略"
ef317cd5 15459
a5cd71ca 15460#: builtin/merge.c:268 builtin/pull.c:191
ef317cd5 15461msgid "option=value"
07432cef 15462msgstr "option=value"
ef317cd5 15463
a5cd71ca 15464#: builtin/merge.c:269 builtin/pull.c:192
ef317cd5 15465msgid "option for selected merge strategy"
07432cef 15466msgstr "所选的合并策略的选项"
ef317cd5 15467
a6cd2cc4 15468#: builtin/merge.c:271
ef317cd5 15469msgid "merge commit message (for a non-fast-forward merge)"
07432cef 15470msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 15471
a6cd2cc4 15472#: builtin/merge.c:278
ef317cd5 15473msgid "abort the current in-progress merge"
07432cef 15474msgstr "放弃当前正在进行的合并"
ef317cd5 15475
a6cd2cc4
JX
15476#
15477#: builtin/merge.c:280
15478msgid "--abort but leave index and working tree alone"
15479msgstr "--abort,但是保留索引和工作区"
15480
15481#: builtin/merge.c:282
1a79b2f1
JX
15482msgid "continue the current in-progress merge"
15483msgstr "继续当前正在进行的合并"
15484
a5cd71ca 15485#: builtin/merge.c:284 builtin/pull.c:199
5b04ee3b
JX
15486msgid "allow merging unrelated histories"
15487msgstr "允许合并不相关的历史"
15488
a6cd2cc4 15489#: builtin/merge.c:290
a5cd71ca
JX
15490msgid "bypass pre-merge-commit and commit-msg hooks"
15491msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
6937cb4e 15492
a6cd2cc4 15493#: builtin/merge.c:307
c04f5ac3 15494msgid "could not run stash."
a4f16749 15495msgstr "不能运行贮藏。"
c04f5ac3 15496
a6cd2cc4 15497#: builtin/merge.c:312
c04f5ac3 15498msgid "stash failed"
a4f16749 15499msgstr "贮藏失败"
c04f5ac3 15500
a6cd2cc4 15501#: builtin/merge.c:317
c04f5ac3
JX
15502#, c-format
15503msgid "not a valid object: %s"
15504msgstr "不是一个有效对象:%s"
15505
a6cd2cc4 15506#: builtin/merge.c:339 builtin/merge.c:356
c04f5ac3
JX
15507msgid "read-tree failed"
15508msgstr "读取树失败"
15509
90e6ef53 15510# 译者:注意保持前导空格
a6cd2cc4 15511#: builtin/merge.c:386
c04f5ac3
JX
15512msgid " (nothing to squash)"
15513msgstr " (无可压缩)"
15514
a6cd2cc4 15515#: builtin/merge.c:397
c04f5ac3
JX
15516#, c-format
15517msgid "Squash commit -- not updating HEAD\n"
15518msgstr "压缩提交 -- 未更新 HEAD\n"
15519
a6cd2cc4 15520#: builtin/merge.c:447
c04f5ac3
JX
15521#, c-format
15522msgid "No merge message -- not updating HEAD\n"
15523msgstr "无合并信息 -- 未更新 HEAD\n"
15524
a6cd2cc4 15525#: builtin/merge.c:498
c04f5ac3
JX
15526#, c-format
15527msgid "'%s' does not point to a commit"
15528msgstr "'%s' 没有指向一个提交"
15529
a6cd2cc4 15530#: builtin/merge.c:585
c04f5ac3
JX
15531#, c-format
15532msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 15533msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 15534
a5cd71ca 15535#: builtin/merge.c:705
c04f5ac3 15536msgid "Not handling anything other than two heads merge."
29004bbb 15537msgstr "未处理两个头合并之外的任何操作。"
c04f5ac3 15538
a5cd71ca 15539#: builtin/merge.c:719
c04f5ac3
JX
15540#, c-format
15541msgid "Unknown option for merge-recursive: -X%s"
15542msgstr "merge-recursive 的未知选项:-X%s"
15543
a5cd71ca 15544#: builtin/merge.c:734
c04f5ac3
JX
15545#, c-format
15546msgid "unable to write %s"
15547msgstr "不能写 %s"
15548
a5cd71ca 15549#: builtin/merge.c:786
c04f5ac3
JX
15550#, c-format
15551msgid "Could not read from '%s'"
15552msgstr "不能从 '%s' 读取"
15553
a5cd71ca 15554#: builtin/merge.c:795
c04f5ac3
JX
15555#, c-format
15556msgid "Not committing merge; use 'git commit' to complete the merge.\n"
15557msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
15558
a5cd71ca 15559#: builtin/merge.c:801
c04f5ac3
JX
15560msgid ""
15561"Please enter a commit message to explain why this merge is necessary,\n"
15562"especially if it merges an updated upstream into a topic branch.\n"
15563"\n"
c04f5ac3
JX
15564msgstr ""
15565"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
15566"合并到主题分支。\n"
15567"\n"
c04f5ac3 15568
a5cd71ca 15569#: builtin/merge.c:806
d46c5519 15570msgid "An empty message aborts the commit.\n"
5b533632 15571msgstr "空的提交说明会终止提交。\n"
d46c5519 15572
a5cd71ca 15573#: builtin/merge.c:809
d46c5519
JX
15574#, c-format
15575msgid ""
15576"Lines starting with '%c' will be ignored, and an empty message aborts\n"
15577"the commit.\n"
5b533632 15578msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n"
d46c5519 15579
a5cd71ca 15580#: builtin/merge.c:862
c04f5ac3
JX
15581msgid "Empty commit message."
15582msgstr "空提交信息。"
15583
a5cd71ca 15584#: builtin/merge.c:877
c04f5ac3
JX
15585#, c-format
15586msgid "Wonderful.\n"
15587msgstr "太棒了。\n"
15588
a5cd71ca 15589#: builtin/merge.c:938
c04f5ac3
JX
15590#, c-format
15591msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
15592msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
15593
a5cd71ca 15594#: builtin/merge.c:977
c04f5ac3 15595msgid "No current branch."
90e6ef53 15596msgstr "没有当前分支。"
c04f5ac3 15597
a5cd71ca 15598#: builtin/merge.c:979
c04f5ac3 15599msgid "No remote for the current branch."
160fb2b2 15600msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 15601
a5cd71ca 15602#: builtin/merge.c:981
c04f5ac3 15603msgid "No default upstream defined for the current branch."
90e6ef53 15604msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 15605
a5cd71ca 15606#: builtin/merge.c:986
170e9899 15607#, c-format
2e8451e8
JX
15608msgid "No remote-tracking branch for %s from %s"
15609msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 15610
a5cd71ca 15611#: builtin/merge.c:1043
5c57d762
JX
15612#, c-format
15613msgid "Bad value '%s' in environment '%s'"
9a4b694c 15614msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
5c57d762 15615
a5cd71ca 15616#: builtin/merge.c:1146
5c57d762
JX
15617#, c-format
15618msgid "not something we can merge in %s: %s"
15619msgstr "不能在 %s 中合并:%s"
15620
a5cd71ca 15621#: builtin/merge.c:1180
5c57d762
JX
15622msgid "not something we can merge"
15623msgstr "不能合并"
15624
a5cd71ca 15625#: builtin/merge.c:1283
1a79b2f1
JX
15626msgid "--abort expects no arguments"
15627msgstr "--abort 不带参数"
15628
a5cd71ca 15629#: builtin/merge.c:1287
c04f5ac3 15630msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 15631msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 15632
a5cd71ca 15633#: builtin/merge.c:1296
a6cd2cc4
JX
15634msgid "--quit expects no arguments"
15635msgstr "--quit 不带参数"
15636
a5cd71ca 15637#: builtin/merge.c:1309
1a79b2f1
JX
15638msgid "--continue expects no arguments"
15639msgstr "--continue 不带参数"
15640
a5cd71ca 15641#: builtin/merge.c:1313
1a79b2f1
JX
15642msgid "There is no merge in progress (MERGE_HEAD missing)."
15643msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
15644
a5cd71ca 15645#: builtin/merge.c:1329
c04f5ac3
JX
15646msgid ""
15647"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 15648"Please, commit your changes before you merge."
c04f5ac3
JX
15649msgstr ""
15650"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 15651"请在合并前先提交您的修改。"
c04f5ac3 15652
a5cd71ca 15653#: builtin/merge.c:1336
c04f5ac3
JX
15654msgid ""
15655"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 15656"Please, commit your changes before you merge."
c04f5ac3
JX
15657msgstr ""
15658"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 15659"请在合并前先提交您的修改。"
c04f5ac3 15660
a5cd71ca 15661#: builtin/merge.c:1339
c04f5ac3
JX
15662msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
15663msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
15664
a5cd71ca 15665#: builtin/merge.c:1353
c04f5ac3 15666msgid "You cannot combine --squash with --no-ff."
a6cd2cc4 15667msgstr "您不能将 --squash 和 --no-ff 组合使用。"
c04f5ac3 15668
a5cd71ca 15669#: builtin/merge.c:1355
a6cd2cc4
JX
15670msgid "You cannot combine --squash with --commit."
15671msgstr "您不能将 --squash 和 --commit 组合使用。"
15672
a5cd71ca 15673#: builtin/merge.c:1371
c04f5ac3 15674msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 15675msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 15676
a5cd71ca 15677#: builtin/merge.c:1388
c04f5ac3
JX
15678msgid "Squash commit into empty head not supported yet"
15679msgstr "尚不支持到空分支的压缩提交"
15680
a5cd71ca 15681#: builtin/merge.c:1390
c04f5ac3
JX
15682msgid "Non-fast-forward commit does not make sense into an empty head"
15683msgstr "到空分支的非快进式提交没有意义"
15684
a5cd71ca 15685#: builtin/merge.c:1395
2e8451e8
JX
15686#, c-format
15687msgid "%s - not something we can merge"
15688msgstr "%s - 不能被合并"
15689
a5cd71ca 15690#: builtin/merge.c:1397
7aea43ff
JX
15691msgid "Can merge only exactly one commit into empty head"
15692msgstr "只能将一个提交合并到空分支上"
15693
a5cd71ca 15694#: builtin/merge.c:1476
5b04ee3b
JX
15695msgid "refusing to merge unrelated histories"
15696msgstr "拒绝合并无关的历史"
15697
a5cd71ca 15698#: builtin/merge.c:1485
6937cb4e 15699msgid "Already up to date."
5c57d762
JX
15700msgstr "已经是最新的。"
15701
a5cd71ca 15702#: builtin/merge.c:1495
c04f5ac3
JX
15703#, c-format
15704msgid "Updating %s..%s\n"
15705msgstr "更新 %s..%s\n"
15706
a5cd71ca 15707#: builtin/merge.c:1537
c04f5ac3
JX
15708#, c-format
15709msgid "Trying really trivial in-index merge...\n"
90e6ef53 15710msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 15711
a5cd71ca 15712#: builtin/merge.c:1544
c04f5ac3
JX
15713#, c-format
15714msgid "Nope.\n"
15715msgstr "无。\n"
15716
a5cd71ca 15717#: builtin/merge.c:1569
6937cb4e 15718msgid "Already up to date. Yeeah!"
5c57d762
JX
15719msgstr "已经是最新的。耶!"
15720
a5cd71ca 15721#: builtin/merge.c:1575
c04f5ac3 15722msgid "Not possible to fast-forward, aborting."
1aabac65 15723msgstr "无法快进,终止。"
c04f5ac3 15724
a5cd71ca 15725#: builtin/merge.c:1598 builtin/merge.c:1663
c04f5ac3
JX
15726#, c-format
15727msgid "Rewinding the tree to pristine...\n"
15728msgstr "将树回滚至原始状态...\n"
15729
a5cd71ca 15730#: builtin/merge.c:1602
c04f5ac3
JX
15731#, c-format
15732msgid "Trying merge strategy %s...\n"
15733msgstr "尝试合并策略 %s...\n"
15734
a5cd71ca 15735#: builtin/merge.c:1654
c04f5ac3
JX
15736#, c-format
15737msgid "No merge strategy handled the merge.\n"
15738msgstr "没有合并策略处理此合并。\n"
15739
a5cd71ca 15740#: builtin/merge.c:1656
c04f5ac3
JX
15741#, c-format
15742msgid "Merge with strategy %s failed.\n"
15743msgstr "使用策略 %s 合并失败。\n"
15744
a5cd71ca 15745#: builtin/merge.c:1665
c04f5ac3
JX
15746#, c-format
15747msgid "Using the %s to prepare resolving by hand.\n"
15748msgstr "使用 %s 以准备手工解决。\n"
15749
a5cd71ca 15750#: builtin/merge.c:1677
c04f5ac3
JX
15751#, c-format
15752msgid "Automatic merge went well; stopped before committing as requested\n"
15753msgstr "自动合并进展顺利,按要求在提交前停止\n"
15754
4c27fcb5 15755#: builtin/merge-base.c:32
814ff314
JX
15756msgid "git merge-base [-a | --all] <commit> <commit>..."
15757msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 15758
4c27fcb5 15759#: builtin/merge-base.c:33
814ff314
JX
15760msgid "git merge-base [-a | --all] --octopus <commit>..."
15761msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 15762
4c27fcb5 15763#: builtin/merge-base.c:34
ef317cd5 15764msgid "git merge-base --independent <commit>..."
07432cef 15765msgstr "git merge-base --independent <提交>..."
ef317cd5 15766
4c27fcb5 15767#: builtin/merge-base.c:35
ef317cd5 15768msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 15769msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 15770
4c27fcb5 15771#: builtin/merge-base.c:36
cfff71a9 15772msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 15773msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9 15774
4c27fcb5 15775#: builtin/merge-base.c:153
ef317cd5 15776msgid "output all common ancestors"
07432cef 15777msgstr "输出所有共同的祖先"
ef317cd5 15778
4c27fcb5 15779#: builtin/merge-base.c:155
ef317cd5 15780msgid "find ancestors for a single n-way merge"
07432cef 15781msgstr "查找一个多路合并的祖先提交"
ef317cd5 15782
4c27fcb5 15783#: builtin/merge-base.c:157
ef317cd5 15784msgid "list revs not reachable from others"
07432cef 15785msgstr "显示不能被其他访问到的版本"
ef317cd5 15786
4c27fcb5 15787#: builtin/merge-base.c:159
ef317cd5 15788msgid "is the first one ancestor of the other?"
07432cef 15789msgstr "第一个是其他的祖先提交么?"
ef317cd5 15790
4c27fcb5 15791#: builtin/merge-base.c:161
cfff71a9 15792msgid "find where <commit> forked from reflog of <ref>"
e397e7e3 15793msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
cfff71a9 15794
a4f16749 15795#: builtin/merge-file.c:9
ef317cd5 15796msgid ""
814ff314
JX
15797"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
15798"<orig-file> <file2>"
ef317cd5 15799msgstr ""
814ff314
JX
15800"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
15801"件> <文件2>"
ef317cd5 15802
4c27fcb5 15803#: builtin/merge-file.c:35
ef317cd5 15804msgid "send results to standard output"
07432cef 15805msgstr "将结果发送到标准输出"
ef317cd5 15806
4c27fcb5 15807#: builtin/merge-file.c:36
ef317cd5 15808msgid "use a diff3 based merge"
07432cef 15809msgstr "使用基于 diff3 的合并"
ef317cd5 15810
4c27fcb5 15811#: builtin/merge-file.c:37
ef317cd5 15812msgid "for conflicts, use our version"
07432cef 15813msgstr "如果冲突,使用我们的版本"
ef317cd5 15814
4c27fcb5 15815#: builtin/merge-file.c:39
ef317cd5 15816msgid "for conflicts, use their version"
07432cef 15817msgstr "如果冲突,使用他们的版本"
ef317cd5 15818
4c27fcb5 15819#: builtin/merge-file.c:41
ef317cd5 15820msgid "for conflicts, use a union version"
07432cef 15821msgstr "如果冲突,使用联合版本"
ef317cd5 15822
4c27fcb5 15823#: builtin/merge-file.c:44
ef317cd5 15824msgid "for conflicts, use this marker size"
07432cef 15825msgstr "如果冲突,使用指定长度的标记"
ef317cd5 15826
4c27fcb5 15827#: builtin/merge-file.c:45
ef317cd5 15828msgid "do not warn about conflicts"
07432cef 15829msgstr "不要警告冲突"
ef317cd5 15830
4c27fcb5 15831#: builtin/merge-file.c:47
814ff314
JX
15832msgid "set labels for file1/orig-file/file2"
15833msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 15834
a5cd71ca 15835#: builtin/merge-recursive.c:47
a0b6b246
JX
15836#, c-format
15837msgid "unknown option %s"
15838msgstr "未知选项 %s"
15839
a5cd71ca 15840#: builtin/merge-recursive.c:53
a0b6b246
JX
15841#, c-format
15842msgid "could not parse object '%s'"
15843msgstr "不能解析对象 '%s'"
15844
a5cd71ca 15845#: builtin/merge-recursive.c:57
a0b6b246
JX
15846#, c-format
15847msgid "cannot handle more than %d base. Ignoring %s."
15848msgid_plural "cannot handle more than %d bases. Ignoring %s."
15849msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
15850msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
15851
a5cd71ca 15852#: builtin/merge-recursive.c:65
a0b6b246
JX
15853msgid "not handling anything other than two heads merge."
15854msgstr "不能处理两个头合并之外的任何操作。"
15855
a5cd71ca 15856#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
a0b6b246
JX
15857#, c-format
15858msgid "could not resolve ref '%s'"
15859msgstr "无法解析引用 '%s'"
15860
a5cd71ca 15861#: builtin/merge-recursive.c:82
a0b6b246
JX
15862#, c-format
15863msgid "Merging %s with %s\n"
15864msgstr "合并 %s 和 %s\n"
15865
c1ac5258 15866#: builtin/mktree.c:66
ef317cd5 15867msgid "git mktree [-z] [--missing] [--batch]"
07432cef 15868msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 15869
c1ac5258 15870#: builtin/mktree.c:154
ef317cd5 15871msgid "input is NUL terminated"
07432cef 15872msgstr "输入以 NUL 字符终止"
c04f5ac3 15873
06991777 15874#: builtin/mktree.c:155 builtin/write-tree.c:26
ef317cd5 15875msgid "allow missing objects"
07432cef 15876msgstr "允许丢失的对象"
c04f5ac3 15877
c1ac5258 15878#: builtin/mktree.c:156
ef317cd5 15879msgid "allow creation of more than one tree"
07432cef 15880msgstr "允许创建一个以上的树"
c04f5ac3 15881
d46c5519 15882#: builtin/multi-pack-index.c:9
a6cd2cc4 15883msgid ""
ddc12c42
JX
15884"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
15885"size=<size>)"
15886msgstr "git multi-pack-index [<选项>] (write|verify|expire|repack --batch-size=<大小>)"
4c27fcb5 15887
ddc12c42 15888#: builtin/multi-pack-index.c:26
4c27fcb5
JX
15889msgid "object directory containing set of packfile and pack-index pairs"
15890msgstr "包含成对包文件和包索引的对象目录"
15891
ddc12c42 15892#: builtin/multi-pack-index.c:29
a6cd2cc4
JX
15893msgid ""
15894"during repack, collect pack-files of smaller size into a batch that is "
15895"larger than this size"
15896msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中"
15897
ddc12c42 15898#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
4c27fcb5
JX
15899msgid "too many arguments"
15900msgstr "太多参数"
15901
ddc12c42 15902#: builtin/multi-pack-index.c:60
a6cd2cc4
JX
15903msgid "--batch-size option is only for 'repack' subcommand"
15904msgstr "--batch-size 选项仅用于 'repack' 子命令"
15905
ddc12c42 15906#: builtin/multi-pack-index.c:69
4c27fcb5 15907#, c-format
a6cd2cc4
JX
15908msgid "unrecognized subcommand: %s"
15909msgstr "未识别的子命令:%s"
4c27fcb5 15910
06991777 15911#: builtin/mv.c:18
814ff314
JX
15912msgid "git mv [<options>] <source>... <destination>"
15913msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 15914
06991777 15915#: builtin/mv.c:83
220c313c
JX
15916#, c-format
15917msgid "Directory %s is in index and no submodule?"
15918msgstr "目录 %s 在索引中并且不是子模组?"
15919
06991777 15920#: builtin/mv.c:85
220c313c 15921msgid "Please stage your changes to .gitmodules or stash them to proceed"
a4f16749 15922msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
220c313c 15923
06991777 15924#: builtin/mv.c:103
220c313c
JX
15925#, c-format
15926msgid "%.*s is in index"
15927msgstr "%.*s 在索引中"
15928
06991777 15929#: builtin/mv.c:125
ef317cd5 15930msgid "force move/rename even if target exists"
07432cef 15931msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 15932
06991777 15933#: builtin/mv.c:127
ef317cd5 15934msgid "skip move/rename errors"
07432cef 15935msgstr "跳过移动/重命名错误"
c04f5ac3 15936
06991777 15937#: builtin/mv.c:169
220c313c
JX
15938#, c-format
15939msgid "destination '%s' is not a directory"
15940msgstr "目标 '%s' 不是一个目录"
15941
06991777 15942#: builtin/mv.c:180
c04f5ac3
JX
15943#, c-format
15944msgid "Checking rename of '%s' to '%s'\n"
15945msgstr "检查 '%s' 到 '%s' 的重命名\n"
15946
06991777 15947#: builtin/mv.c:184
c04f5ac3
JX
15948msgid "bad source"
15949msgstr "坏的源"
15950
06991777 15951#: builtin/mv.c:187
c04f5ac3
JX
15952msgid "can not move directory into itself"
15953msgstr "不能将目录移动到自身"
15954
06991777 15955#: builtin/mv.c:190
c04f5ac3
JX
15956msgid "cannot move directory over file"
15957msgstr "不能将目录移动到文件"
15958
06991777 15959#: builtin/mv.c:199
c04f5ac3
JX
15960msgid "source directory is empty"
15961msgstr "源目录为空"
15962
06991777 15963#: builtin/mv.c:224
c04f5ac3
JX
15964msgid "not under version control"
15965msgstr "不在版本控制之下"
15966
06991777 15967#: builtin/mv.c:227
c04f5ac3
JX
15968msgid "destination exists"
15969msgstr "目标已存在"
15970
06991777 15971#: builtin/mv.c:235
c04f5ac3
JX
15972#, c-format
15973msgid "overwriting '%s'"
15974msgstr "覆盖 '%s'"
15975
06991777 15976#: builtin/mv.c:238
c04f5ac3
JX
15977msgid "Cannot overwrite"
15978msgstr "不能覆盖"
15979
06991777 15980#: builtin/mv.c:241
c04f5ac3
JX
15981msgid "multiple sources for the same target"
15982msgstr "同一目标具有多个源"
15983
06991777 15984#: builtin/mv.c:243
cfff71a9
JX
15985msgid "destination directory does not exist"
15986msgstr "目标目录不存在"
15987
06991777 15988#: builtin/mv.c:250
c04f5ac3
JX
15989#, c-format
15990msgid "%s, source=%s, destination=%s"
15991msgstr "%s,源=%s,目标=%s"
15992
06991777 15993#: builtin/mv.c:271
c04f5ac3
JX
15994#, c-format
15995msgid "Renaming %s to %s\n"
15996msgstr "重命名 %s 至 %s\n"
15997
ddc12c42 15998#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518
c04f5ac3
JX
15999#, c-format
16000msgid "renaming '%s' failed"
16001msgstr "重命名 '%s' 失败"
16002
ddc12c42 16003#: builtin/name-rev.c:403
814ff314
JX
16004msgid "git name-rev [<options>] <commit>..."
16005msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 16006
ddc12c42 16007#: builtin/name-rev.c:404
814ff314
JX
16008msgid "git name-rev [<options>] --all"
16009msgstr "git name-rev [<选项>] --all"
ef317cd5 16010
ddc12c42 16011#: builtin/name-rev.c:405
814ff314
JX
16012msgid "git name-rev [<options>] --stdin"
16013msgstr "git name-rev [<选项>] --stdin"
ef317cd5 16014
ddc12c42 16015#: builtin/name-rev.c:462
ef317cd5 16016msgid "print only names (no SHA-1)"
07432cef 16017msgstr "只打印名称(无 SHA-1)"
ef317cd5 16018
ddc12c42 16019#: builtin/name-rev.c:463
ef317cd5 16020msgid "only use tags to name the commits"
55a16ee4 16021msgstr "只使用标签来命名提交"
ef317cd5 16022
ddc12c42 16023#: builtin/name-rev.c:465
ef317cd5 16024msgid "only use refs matching <pattern>"
07432cef 16025msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 16026
ddc12c42 16027#: builtin/name-rev.c:467
87cb7997
JX
16028msgid "ignore refs matching <pattern>"
16029msgstr "忽略和 <模式> 相匹配的引用"
16030
ddc12c42 16031#: builtin/name-rev.c:469
ef317cd5 16032msgid "list all commits reachable from all refs"
07432cef 16033msgstr "列出可以从所有引用访问的提交"
ef317cd5 16034
ddc12c42 16035#: builtin/name-rev.c:470
ef317cd5 16036msgid "read from stdin"
07432cef 16037msgstr "从标准输入读取"
ef317cd5 16038
ddc12c42 16039#: builtin/name-rev.c:471
90314792
JX
16040msgid "allow to print `undefined` names (default)"
16041msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 16042
ddc12c42 16043#: builtin/name-rev.c:477
2e8451e8 16044msgid "dereference tags in the input (internal use)"
55a16ee4 16045msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 16046
c1ac5258 16047#: builtin/notes.c:28
814ff314 16048msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 16049msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 16050
c1ac5258 16051#: builtin/notes.c:29
ef317cd5 16052msgid ""
814ff314 16053"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 16054"| (-c | -C) <object>] [<object>]"
ef317cd5 16055msgstr ""
04cb2f28
JX
16056"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
16057"| (-c | -C) <对象>] [<对象>]"
ef317cd5 16058
c1ac5258 16059#: builtin/notes.c:30
814ff314 16060msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 16061msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 16062
c1ac5258 16063#: builtin/notes.c:31
ef317cd5 16064msgid ""
814ff314 16065"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 16066"(-c | -C) <object>] [<object>]"
ef317cd5 16067msgstr ""
04cb2f28
JX
16068"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
16069"(-c | -C) <对象>] [<对象>]"
ef317cd5 16070
c1ac5258 16071#: builtin/notes.c:32
814ff314 16072msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 16073msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 16074
c1ac5258 16075#: builtin/notes.c:33
814ff314 16076msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 16077msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 16078
c1ac5258 16079#: builtin/notes.c:34
ef317cd5 16080msgid ""
814ff314 16081"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 16082msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 16083
c1ac5258 16084#: builtin/notes.c:35
ef317cd5 16085msgid "git notes merge --commit [-v | -q]"
07432cef 16086msgstr "git notes merge --commit [-v | -q]"
ef317cd5 16087
c1ac5258 16088#: builtin/notes.c:36
ef317cd5 16089msgid "git notes merge --abort [-v | -q]"
07432cef 16090msgstr "git notes merge --abort [-v | -q]"
ef317cd5 16091
c1ac5258 16092#: builtin/notes.c:37
814ff314 16093msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 16094msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 16095
c1ac5258 16096#: builtin/notes.c:38
5809aa05
JX
16097msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
16098msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
ef317cd5 16099
c1ac5258 16100#: builtin/notes.c:39
814ff314 16101msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 16102msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 16103
c1ac5258 16104#: builtin/notes.c:44
ef317cd5 16105msgid "git notes [list [<object>]]"
07432cef 16106msgstr "git notes [list [<对象>]]"
ef317cd5 16107
c1ac5258 16108#: builtin/notes.c:49
ef317cd5 16109msgid "git notes add [<options>] [<object>]"
07432cef 16110msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 16111
c1ac5258 16112#: builtin/notes.c:54
ef317cd5 16113msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 16114msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 16115
c1ac5258 16116#: builtin/notes.c:55
ef317cd5 16117msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 16118msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 16119
c1ac5258 16120#: builtin/notes.c:60
ef317cd5 16121msgid "git notes append [<options>] [<object>]"
07432cef 16122msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 16123
c1ac5258 16124#: builtin/notes.c:65
ef317cd5 16125msgid "git notes edit [<object>]"
07432cef 16126msgstr "git notes edit [<对象>]"
ef317cd5 16127
c1ac5258 16128#: builtin/notes.c:70
ef317cd5 16129msgid "git notes show [<object>]"
07432cef 16130msgstr "git notes show [<对象>]"
ef317cd5 16131
c1ac5258 16132#: builtin/notes.c:75
814ff314 16133msgid "git notes merge [<options>] <notes-ref>"
07432cef 16134msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 16135
c1ac5258 16136#: builtin/notes.c:76
ef317cd5 16137msgid "git notes merge --commit [<options>]"
07432cef 16138msgstr "git notes merge --commit [<选项>]"
ef317cd5 16139
c1ac5258 16140#: builtin/notes.c:77
ef317cd5 16141msgid "git notes merge --abort [<options>]"
07432cef 16142msgstr "git notes merge --abort [<选项>]"
ef317cd5 16143
c1ac5258 16144#: builtin/notes.c:82
ef317cd5 16145msgid "git notes remove [<object>]"
07432cef 16146msgstr "git notes remove [<对象>]"
ef317cd5 16147
c1ac5258 16148#: builtin/notes.c:87
ef317cd5 16149msgid "git notes prune [<options>]"
07432cef 16150msgstr "git notes prune [<选项>]"
ef317cd5 16151
c1ac5258 16152#: builtin/notes.c:92
ef317cd5 16153msgid "git notes get-ref"
07432cef 16154msgstr "git notes get-ref"
ef317cd5 16155
c1ac5258 16156#: builtin/notes.c:97
5c57d762
JX
16157msgid "Write/edit the notes for the following object:"
16158msgstr "为下面的对象写/编辑说明:"
16159
c1ac5258 16160#: builtin/notes.c:150
c04f5ac3
JX
16161#, c-format
16162msgid "unable to start 'show' for object '%s'"
16163msgstr "不能为对象 '%s' 开始 'show'"
16164
c1ac5258 16165#: builtin/notes.c:154
a77c07d9
JX
16166msgid "could not read 'show' output"
16167msgstr "不能读取 'show' 的输出"
c04f5ac3 16168
c1ac5258 16169#: builtin/notes.c:162
c04f5ac3
JX
16170#, c-format
16171msgid "failed to finish 'show' for object '%s'"
16172msgstr "无法为对象 '%s' 完成 'show'"
16173
c1ac5258 16174#: builtin/notes.c:197
a0b6b246 16175msgid "please supply the note contents using either -m or -F option"
c04f5ac3
JX
16176msgstr "请通过 -m 或 -F 选项为注解提供内容"
16177
c1ac5258 16178#: builtin/notes.c:206
c04f5ac3
JX
16179msgid "unable to write note object"
16180msgstr "不能写注解对象"
16181
c1ac5258 16182#: builtin/notes.c:208
c04f5ac3 16183#, c-format
a0b6b246 16184msgid "the note contents have been left in %s"
220c313c 16185msgstr "注解内容被留在 %s 中"
c04f5ac3 16186
a6cd2cc4 16187#: builtin/notes.c:242 builtin/tag.c:532
c04f5ac3
JX
16188#, c-format
16189msgid "could not open or read '%s'"
16190msgstr "不能打开或读取 '%s'"
16191
4c27fcb5 16192#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
06991777
JX
16193#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
16194#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
a0b6b246
JX
16195#, c-format
16196msgid "failed to resolve '%s' as a valid ref."
16197msgstr "无法解析 '%s' 为一个有效引用。"
16198
4c27fcb5 16199#: builtin/notes.c:265
c04f5ac3 16200#, c-format
a0b6b246 16201msgid "failed to read object '%s'."
c1ac5258 16202msgstr "读取对象 '%s' 失败。"
c04f5ac3 16203
4c27fcb5 16204#: builtin/notes.c:268
6c94aba5 16205#, c-format
a0b6b246
JX
16206msgid "cannot read note data from non-blob object '%s'."
16207msgstr "不能从非数据对象 '%s' 中读取注解数据。"
16208
4c27fcb5 16209#: builtin/notes.c:309
a0b6b246
JX
16210#, c-format
16211msgid "malformed input line: '%s'."
fd8cb379 16212msgstr "格式错误的输入行:'%s'。"
a0b6b246 16213
4c27fcb5 16214#: builtin/notes.c:324
a0b6b246
JX
16215#, c-format
16216msgid "failed to copy notes from '%s' to '%s'"
16217msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
6c94aba5 16218
a4f16749
JX
16219#. TRANSLATORS: the first %s will be replaced by a git
16220#. notes command: 'add', 'merge', 'remove', etc.
16221#.
4c27fcb5 16222#: builtin/notes.c:356
a0b6b246
JX
16223#, c-format
16224msgid "refusing to %s notes in %s (outside of refs/notes/)"
16225msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
16226
06991777
JX
16227#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
16228#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
16229#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
c04f5ac3
JX
16230msgid "too many parameters"
16231msgstr "参数太多"
16232
06991777 16233#: builtin/notes.c:389 builtin/notes.c:678
c04f5ac3 16234#, c-format
a0b6b246 16235msgid "no note found for object %s."
c04f5ac3
JX
16236msgstr "未发现对象 %s 的注解。"
16237
06991777 16238#: builtin/notes.c:410 builtin/notes.c:576
ef317cd5 16239msgid "note contents as a string"
07432cef 16240msgstr "注解内容作为一个字符串"
ef317cd5 16241
06991777 16242#: builtin/notes.c:413 builtin/notes.c:579
ef317cd5 16243msgid "note contents in a file"
07432cef 16244msgstr "注解内容到一个文件中"
ef317cd5 16245
06991777 16246#: builtin/notes.c:416 builtin/notes.c:582
ef317cd5 16247msgid "reuse and edit specified note object"
07432cef 16248msgstr "重用和编辑指定的注解对象"
ef317cd5 16249
06991777 16250#: builtin/notes.c:419 builtin/notes.c:585
ef317cd5 16251msgid "reuse specified note object"
07432cef 16252msgstr "重用指定的注解对象"
ef317cd5 16253
06991777 16254#: builtin/notes.c:422 builtin/notes.c:588
04cb2f28
JX
16255msgid "allow storing empty note"
16256msgstr "允许保存空白注释"
16257
06991777 16258#: builtin/notes.c:423 builtin/notes.c:496
ef317cd5 16259msgid "replace existing notes"
07432cef 16260msgstr "替换已存在的注解"
ef317cd5 16261
4c27fcb5 16262#: builtin/notes.c:448
c04f5ac3
JX
16263#, c-format
16264msgid ""
16265"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
16266"existing notes"
16267msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
16268
06991777 16269#: builtin/notes.c:463 builtin/notes.c:544
c04f5ac3
JX
16270#, c-format
16271msgid "Overwriting existing notes for object %s\n"
16272msgstr "覆盖对象 %s 现存注解\n"
16273
06991777 16274#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
04cb2f28
JX
16275#, c-format
16276msgid "Removing note for object %s\n"
16277msgstr "删除对象 %s 的注解\n"
16278
06991777 16279#: builtin/notes.c:497
ef317cd5 16280msgid "read objects from stdin"
07432cef 16281msgstr "从标准输入读取对象"
ef317cd5 16282
06991777 16283#: builtin/notes.c:499
ef317cd5 16284msgid "load rewriting config for <command> (implies --stdin)"
07432cef 16285msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 16286
06991777 16287#: builtin/notes.c:517
c04f5ac3
JX
16288msgid "too few parameters"
16289msgstr "参数太少"
16290
06991777 16291#: builtin/notes.c:538
c04f5ac3
JX
16292#, c-format
16293msgid ""
16294"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
16295"existing notes"
16296msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
16297
06991777 16298#: builtin/notes.c:550
c04f5ac3 16299#, c-format
a0b6b246 16300msgid "missing notes on source object %s. Cannot copy."
c04f5ac3
JX
16301msgstr "源对象 %s 缺少注解。不能拷贝。"
16302
06991777 16303#: builtin/notes.c:603
ef317cd5
JX
16304#, c-format
16305msgid ""
16306"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
16307"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
16308msgstr ""
16309"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
16310"请换用 'git notes add -f -m/-F/-c/-C'。\n"
16311
06991777 16312#: builtin/notes.c:698
a0b6b246 16313msgid "failed to delete ref NOTES_MERGE_PARTIAL"
c1ac5258 16314msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 16315
06991777 16316#: builtin/notes.c:700
a0b6b246 16317msgid "failed to delete ref NOTES_MERGE_REF"
c1ac5258 16318msgstr "删除引用 NOTES_MERGE_REF 失败"
a0b6b246 16319
06991777 16320#: builtin/notes.c:702
a0b6b246 16321msgid "failed to remove 'git notes merge' worktree"
c1ac5258 16322msgstr "删除 'git notes merge' 工作区失败"
a0b6b246 16323
06991777 16324#: builtin/notes.c:722
a0b6b246 16325msgid "failed to read ref NOTES_MERGE_PARTIAL"
c1ac5258 16326msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 16327
06991777 16328#: builtin/notes.c:724
a0b6b246
JX
16329msgid "could not find commit from NOTES_MERGE_PARTIAL."
16330msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
16331
06991777 16332#: builtin/notes.c:726
a0b6b246
JX
16333msgid "could not parse commit from NOTES_MERGE_PARTIAL."
16334msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
16335
06991777 16336#: builtin/notes.c:739
a0b6b246 16337msgid "failed to resolve NOTES_MERGE_REF"
c1ac5258 16338msgstr "解析 NOTES_MERGE_REF 失败"
a0b6b246 16339
06991777 16340#: builtin/notes.c:742
a0b6b246
JX
16341msgid "failed to finalize notes merge"
16342msgstr "无法完成注解合并"
16343
06991777 16344#: builtin/notes.c:768
5c57d762
JX
16345#, c-format
16346msgid "unknown notes merge strategy %s"
16347msgstr "未知的注解合并策略 %s"
16348
06991777 16349#: builtin/notes.c:784
ef317cd5 16350msgid "General options"
07432cef 16351msgstr "通用选项"
ef317cd5 16352
06991777 16353#: builtin/notes.c:786
ef317cd5 16354msgid "Merge options"
07432cef 16355msgstr "合并选项"
ef317cd5 16356
06991777 16357#: builtin/notes.c:788
ef317cd5
JX
16358msgid ""
16359"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
16360"cat_sort_uniq)"
07432cef 16361msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 16362
06991777 16363#: builtin/notes.c:790
ef317cd5 16364msgid "Committing unmerged notes"
07432cef 16365msgstr "提交未合并的注解"
ef317cd5 16366
06991777 16367#: builtin/notes.c:792
ef317cd5 16368msgid "finalize notes merge by committing unmerged notes"
07432cef 16369msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 16370
06991777 16371#: builtin/notes.c:794
ef317cd5 16372msgid "Aborting notes merge resolution"
07432cef 16373msgstr "中止注解合并的方案"
ef317cd5 16374
06991777 16375#: builtin/notes.c:796
ef317cd5 16376msgid "abort notes merge"
07432cef 16377msgstr "中止注解合并"
ef317cd5 16378
06991777 16379#: builtin/notes.c:807
5c57d762
JX
16380msgid "cannot mix --commit, --abort or -s/--strategy"
16381msgstr "不能混用 --commit、--abort 或 -s/--strategy"
16382
06991777 16383#: builtin/notes.c:812
a0b6b246 16384msgid "must specify a notes ref to merge"
9a4b694c 16385msgstr "必须指定一个注解引用来合并"
5c57d762 16386
06991777 16387#: builtin/notes.c:836
5c57d762 16388#, c-format
a0b6b246 16389msgid "unknown -s/--strategy: %s"
5c57d762
JX
16390msgstr "未知的 -s/--strategy:%s"
16391
06991777 16392#: builtin/notes.c:873
1b7f4a34 16393#, c-format
a0b6b246
JX
16394msgid "a notes merge into %s is already in-progress at %s"
16395msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
1b7f4a34 16396
06991777 16397#: builtin/notes.c:876
5c57d762 16398#, c-format
a0b6b246
JX
16399msgid "failed to store link to current notes ref (%s)"
16400msgstr "无法存储链接到当前的注解引用(%s)"
5c57d762 16401
06991777 16402#: builtin/notes.c:878
5c57d762
JX
16403#, c-format
16404msgid ""
16405"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
16406"'git notes merge --commit', or abort the merge with 'git notes merge --"
16407"abort'.\n"
a0b6b246
JX
16408msgstr ""
16409"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
16410"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
5c57d762 16411
a6cd2cc4 16412#: builtin/notes.c:897 builtin/tag.c:545
d46c5519
JX
16413#, c-format
16414msgid "Failed to resolve '%s' as a valid ref."
16415msgstr "无法解析 '%s' 为一个有效引用。"
16416
06991777 16417#: builtin/notes.c:900
ef317cd5
JX
16418#, c-format
16419msgid "Object %s has no note\n"
16420msgstr "对象 %s 没有注解\n"
16421
06991777 16422#: builtin/notes.c:912
ef317cd5 16423msgid "attempt to remove non-existent note is not an error"
07432cef 16424msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 16425
06991777 16426#: builtin/notes.c:915
ef317cd5 16427msgid "read object names from the standard input"
07432cef 16428msgstr "从标准输入读取对象名称"
ef317cd5 16429
a5cd71ca 16430#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
5c57d762
JX
16431msgid "do not remove, show only"
16432msgstr "不删除,只显示"
16433
06991777 16434#: builtin/notes.c:955
5c57d762
JX
16435msgid "report pruned notes"
16436msgstr "报告清除的注解"
16437
06991777 16438#: builtin/notes.c:998
6c94aba5 16439msgid "notes-ref"
07432cef 16440msgstr "注解引用"
ef317cd5 16441
06991777 16442#: builtin/notes.c:999
814ff314 16443msgid "use notes from <notes-ref>"
07432cef 16444msgstr "从 <注解引用> 使用注解"
ef317cd5 16445
a5cd71ca 16446#: builtin/notes.c:1034 builtin/stash.c:1607
ef317cd5 16447#, c-format
a0b6b246 16448msgid "unknown subcommand: %s"
ef317cd5
JX
16449msgstr "未知子命令:%s"
16450
d46c5519 16451#: builtin/pack-objects.c:52
1b7f4a34
JX
16452msgid ""
16453"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
16454msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 16455
d46c5519 16456#: builtin/pack-objects.c:53
1b7f4a34
JX
16457msgid ""
16458"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
58b6f078 16459msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
ef317cd5 16460
a6cd2cc4 16461#: builtin/pack-objects.c:428
ef317cd5 16462#, c-format
c1ac5258
JX
16463msgid "bad packed object CRC for %s"
16464msgstr "%s 错的包对象 CRC"
16465
a6cd2cc4 16466#: builtin/pack-objects.c:439
c1ac5258
JX
16467#, c-format
16468msgid "corrupt packed object for %s"
16469msgstr "%s 损坏的包对象"
16470
a6cd2cc4 16471#: builtin/pack-objects.c:570
c1ac5258
JX
16472#, c-format
16473msgid "recursive delta detected for object %s"
16474msgstr "发现对象 %s 递归 delta"
16475
a6cd2cc4 16476#: builtin/pack-objects.c:781
c1ac5258
JX
16477#, c-format
16478msgid "ordered %u objects, expected %<PRIu32>"
16479msgstr "排序了 %u 个对象,预期 %<PRIu32> 个"
16480
a6cd2cc4 16481#: builtin/pack-objects.c:794
c1ac5258
JX
16482#, c-format
16483msgid "packfile is invalid: %s"
16484msgstr "无效的包文件:%s"
16485
a6cd2cc4 16486#: builtin/pack-objects.c:798
c1ac5258
JX
16487#, c-format
16488msgid "unable to open packfile for reuse: %s"
16489msgstr "无法为重用打开包文件:%s"
16490
a6cd2cc4 16491#: builtin/pack-objects.c:802
c1ac5258
JX
16492msgid "unable to seek in reused packfile"
16493msgstr "无法在重用的包文件中查找"
ef317cd5 16494
a6cd2cc4 16495#: builtin/pack-objects.c:813
c1ac5258
JX
16496msgid "unable to read from reused packfile"
16497msgstr "无法读取索引文件"
16498
a6cd2cc4 16499#: builtin/pack-objects.c:841
5b04ee3b
JX
16500msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
16501msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
16502
a6cd2cc4 16503#: builtin/pack-objects.c:854
6c94aba5
JX
16504msgid "Writing objects"
16505msgstr "写入对象中"
16506
ddc12c42 16507#: builtin/pack-objects.c:917 builtin/update-index.c:90
c1ac5258
JX
16508#, c-format
16509msgid "failed to stat %s"
16510msgstr "对 %s 调用 stat 失败"
16511
a6cd2cc4 16512#: builtin/pack-objects.c:970
c1ac5258
JX
16513#, c-format
16514msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
16515msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
16516
a5cd71ca 16517#: builtin/pack-objects.c:1164
6c94aba5
JX
16518msgid "disabling bitmap writing, as some objects are not being packed"
16519msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
16520
a5cd71ca 16521#: builtin/pack-objects.c:1592
c1ac5258
JX
16522#, c-format
16523msgid "delta base offset overflow in pack for %s"
16524msgstr "%s 压缩中 delta 基准偏移越界"
16525
a5cd71ca 16526#: builtin/pack-objects.c:1601
c1ac5258
JX
16527#, c-format
16528msgid "delta base offset out of bound for %s"
16529msgstr "%s 的 delta 基准偏移越界"
16530
a5cd71ca 16531#: builtin/pack-objects.c:1870
fd8cb379
JX
16532msgid "Counting objects"
16533msgstr "对象计数中"
16534
a5cd71ca 16535#: builtin/pack-objects.c:2000
fd8cb379
JX
16536#, c-format
16537msgid "unable to get size of %s"
16538msgstr "不能得到 %s 的大小"
16539
a5cd71ca 16540#: builtin/pack-objects.c:2015
fd8cb379
JX
16541#, c-format
16542msgid "unable to parse object header of %s"
16543msgstr "无法解析对象 %s 头信息"
16544
a5cd71ca
JX
16545#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101
16546#: builtin/pack-objects.c:2111
c1ac5258
JX
16547#, c-format
16548msgid "object %s cannot be read"
16549msgstr "对象 %s 无法读取"
16550
a5cd71ca 16551#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
c1ac5258 16552#, c-format
4c27fcb5
JX
16553msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
16554msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)"
c1ac5258 16555
a5cd71ca 16556#: builtin/pack-objects.c:2125
c1ac5258
JX
16557msgid "suboptimal pack - out of memory"
16558msgstr "次优(suboptimal)打包 - 内存不足"
16559
a5cd71ca 16560#: builtin/pack-objects.c:2440
c1ac5258
JX
16561#, c-format
16562msgid "Delta compression using up to %d threads"
16563msgstr "使用 %d 个线程进行压缩"
16564
a5cd71ca 16565#: builtin/pack-objects.c:2572
c1ac5258
JX
16566#, c-format
16567msgid "unable to pack objects reachable from tag %s"
16568msgstr "无法为标签 %s 压缩对象"
16569
a5cd71ca 16570#: builtin/pack-objects.c:2659
6c94aba5
JX
16571msgid "Compressing objects"
16572msgstr "压缩对象中"
16573
a5cd71ca 16574#: builtin/pack-objects.c:2665
c1ac5258
JX
16575msgid "inconsistency with delta count"
16576msgstr "不一致的差异计数"
16577
a5cd71ca 16578#: builtin/pack-objects.c:2742
c1ac5258
JX
16579#, c-format
16580msgid ""
16581"expected edge object ID, got garbage:\n"
16582" %s"
16583msgstr ""
16584"预期边界对象(edge object)ID,却得到垃圾数据:\n"
16585" %s"
16586
a5cd71ca 16587#: builtin/pack-objects.c:2748
c1ac5258
JX
16588#, c-format
16589msgid ""
16590"expected object ID, got garbage:\n"
16591" %s"
16592msgstr ""
16593"预期对象 ID,却得到垃圾数据:\n"
16594" %s"
16595
a5cd71ca 16596#: builtin/pack-objects.c:2846
5809aa05
JX
16597msgid "invalid value for --missing"
16598msgstr "选项 --missing 的值无效"
16599
a5cd71ca 16600#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
c1ac5258
JX
16601msgid "cannot open pack index"
16602msgstr "无法打开包文件索引"
16603
a5cd71ca 16604#: builtin/pack-objects.c:2936
c1ac5258
JX
16605#, c-format
16606msgid "loose object at %s could not be examined"
16607msgstr "无法检查 %s 处的松散对象"
16608
a5cd71ca 16609#: builtin/pack-objects.c:3021
c1ac5258
JX
16610msgid "unable to force loose object"
16611msgstr "无法强制松散对象"
16612
a5cd71ca 16613#: builtin/pack-objects.c:3113
c1ac5258
JX
16614#, c-format
16615msgid "not a rev '%s'"
16616msgstr "不是一个版本 '%s'"
16617
a5cd71ca 16618#: builtin/pack-objects.c:3116
c1ac5258
JX
16619#, c-format
16620msgid "bad revision '%s'"
16621msgstr "坏的版本 '%s'"
16622
a5cd71ca 16623#: builtin/pack-objects.c:3141
c1ac5258
JX
16624msgid "unable to add recent objects"
16625msgstr "无法添加最近的对象"
16626
a5cd71ca 16627#: builtin/pack-objects.c:3194
ef317cd5
JX
16628#, c-format
16629msgid "unsupported index version %s"
16630msgstr "不支持的索引版本 %s"
16631
a5cd71ca 16632#: builtin/pack-objects.c:3198
ef317cd5
JX
16633#, c-format
16634msgid "bad index version '%s'"
16635msgstr "坏的索引版本 '%s'"
16636
a5cd71ca 16637#: builtin/pack-objects.c:3236
c1ac5258
JX
16638msgid "<version>[,<offset>]"
16639msgstr "<版本>[,<偏移>]"
ef317cd5 16640
a5cd71ca 16641#: builtin/pack-objects.c:3237
ef317cd5 16642msgid "write the pack index file in the specified idx format version"
07432cef 16643msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 16644
a5cd71ca 16645#: builtin/pack-objects.c:3240
ef317cd5 16646msgid "maximum size of each output pack file"
07432cef 16647msgstr "每个输出包的最大尺寸"
ef317cd5 16648
a5cd71ca 16649#: builtin/pack-objects.c:3242
ef317cd5 16650msgid "ignore borrowed objects from alternate object store"
160fb2b2 16651msgstr "忽略从备用对象存储里借用对象"
ef317cd5 16652
a5cd71ca 16653#: builtin/pack-objects.c:3244
ef317cd5 16654msgid "ignore packed objects"
07432cef 16655msgstr "忽略包对象"
ef317cd5 16656
a5cd71ca 16657#: builtin/pack-objects.c:3246
ef317cd5 16658msgid "limit pack window by objects"
07432cef 16659msgstr "限制打包窗口的对象数"
ef317cd5 16660
a5cd71ca 16661#: builtin/pack-objects.c:3248
ef317cd5 16662msgid "limit pack window by memory in addition to object limit"
07432cef 16663msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 16664
a5cd71ca 16665#: builtin/pack-objects.c:3250
ef317cd5 16666msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 16667msgstr "打包允许的 delta 链的最大长度"
ef317cd5 16668
a5cd71ca 16669#: builtin/pack-objects.c:3252
ef317cd5 16670msgid "reuse existing deltas"
07432cef 16671msgstr "重用已存在的 deltas"
ef317cd5 16672
a5cd71ca 16673#: builtin/pack-objects.c:3254
ef317cd5 16674msgid "reuse existing objects"
07432cef 16675msgstr "重用已存在的对象"
ef317cd5 16676
a5cd71ca 16677#: builtin/pack-objects.c:3256
ef317cd5 16678msgid "use OFS_DELTA objects"
07432cef 16679msgstr "使用 OFS_DELTA 对象"
ef317cd5 16680
a5cd71ca 16681#: builtin/pack-objects.c:3258
ef317cd5 16682msgid "use threads when searching for best delta matches"
07432cef 16683msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 16684
a5cd71ca 16685#: builtin/pack-objects.c:3260
ef317cd5 16686msgid "do not create an empty pack output"
07432cef 16687msgstr "不创建空的包输出"
ef317cd5 16688
a5cd71ca 16689#: builtin/pack-objects.c:3262
ef317cd5 16690msgid "read revision arguments from standard input"
d9d56b23 16691msgstr "从标准输入读取版本号参数"
ef317cd5 16692
a5cd71ca 16693#: builtin/pack-objects.c:3264
ef317cd5 16694msgid "limit the objects to those that are not yet packed"
07432cef 16695msgstr "限制那些尚未打包的对象"
ef317cd5 16696
a5cd71ca 16697#: builtin/pack-objects.c:3267
ef317cd5 16698msgid "include objects reachable from any reference"
07432cef 16699msgstr "包括可以从任何引用访问到的对象"
ef317cd5 16700
a5cd71ca 16701#: builtin/pack-objects.c:3270
ef317cd5 16702msgid "include objects referred by reflog entries"
07432cef 16703msgstr "包括被引用日志引用到的对象"
ef317cd5 16704
a5cd71ca 16705#: builtin/pack-objects.c:3273
220c313c
JX
16706msgid "include objects referred to by the index"
16707msgstr "包括被索引引用到的对象"
16708
a5cd71ca 16709#: builtin/pack-objects.c:3276
ef317cd5 16710msgid "output pack to stdout"
07432cef 16711msgstr "输出包到标准输出"
ef317cd5 16712
a5cd71ca 16713#: builtin/pack-objects.c:3278
ef317cd5 16714msgid "include tag objects that refer to objects to be packed"
53438e8f 16715msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 16716
a5cd71ca 16717#: builtin/pack-objects.c:3280
ef317cd5 16718msgid "keep unreachable objects"
07432cef 16719msgstr "维持不可达的对象"
ef317cd5 16720
a5cd71ca 16721#: builtin/pack-objects.c:3282
5c57d762
JX
16722msgid "pack loose unreachable objects"
16723msgstr "打包松散的不可达对象"
16724
a5cd71ca 16725#: builtin/pack-objects.c:3284
ef317cd5 16726msgid "unpack unreachable objects newer than <time>"
07432cef 16727msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 16728
a5cd71ca 16729#: builtin/pack-objects.c:3287
06991777
JX
16730msgid "use the sparse reachability algorithm"
16731msgstr "使用稀疏可达性算法"
16732
a5cd71ca 16733#: builtin/pack-objects.c:3289
ef317cd5 16734msgid "create thin packs"
07432cef 16735msgstr "创建精简包"
ef317cd5 16736
a5cd71ca 16737#: builtin/pack-objects.c:3291
04cb2f28 16738msgid "create packs suitable for shallow fetches"
160fb2b2 16739msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 16740
a5cd71ca 16741#: builtin/pack-objects.c:3293
ef317cd5 16742msgid "ignore packs that have companion .keep file"
07432cef 16743msgstr "忽略配有 .keep 文件的包"
ef317cd5 16744
a5cd71ca 16745#: builtin/pack-objects.c:3295
fd8cb379
JX
16746msgid "ignore this pack"
16747msgstr "忽略该 pack"
16748
a5cd71ca 16749#: builtin/pack-objects.c:3297
ef317cd5 16750msgid "pack compression level"
07432cef 16751msgstr "打包压缩级别"
ef317cd5 16752
a5cd71ca 16753#: builtin/pack-objects.c:3299
ef317cd5 16754msgid "do not hide commits by grafts"
fd8cb379 16755msgstr "显示被移植隐藏的提交"
ef317cd5 16756
a5cd71ca 16757#: builtin/pack-objects.c:3301
6c94aba5
JX
16758msgid "use a bitmap index if available to speed up counting objects"
16759msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
16760
a5cd71ca 16761#: builtin/pack-objects.c:3303
6c94aba5
JX
16762msgid "write a bitmap index together with the pack index"
16763msgstr "在建立包索引的同时创建 bitmap 索引"
16764
a5cd71ca 16765#: builtin/pack-objects.c:3307
a6cd2cc4
JX
16766msgid "write a bitmap index if possible"
16767msgstr "如果可能,写 bitmap 索引"
16768
a5cd71ca 16769#: builtin/pack-objects.c:3311
5809aa05
JX
16770msgid "handling for missing objects"
16771msgstr "处理丢失的对象"
16772
a5cd71ca 16773#: builtin/pack-objects.c:3314
31e5e17b
JX
16774msgid "do not pack objects in promisor packfiles"
16775msgstr "不要打包 promisor 包文件中的对象"
16776
a5cd71ca 16777#: builtin/pack-objects.c:3316
4c27fcb5
JX
16778msgid "respect islands during delta compression"
16779msgstr "在增量压缩时参考数据岛"
16780
a5cd71ca 16781#: builtin/pack-objects.c:3345
fd8cb379
JX
16782#, c-format
16783msgid "delta chain depth %d is too deep, forcing %d"
16784msgstr "增量链深度 %d 太深了,强制为 %d"
16785
a5cd71ca 16786#: builtin/pack-objects.c:3350
fd8cb379
JX
16787#, c-format
16788msgid "pack.deltaCacheLimit is too high, forcing %d"
16789msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
6c94aba5 16790
a5cd71ca 16791#: builtin/pack-objects.c:3404
c1ac5258
JX
16792msgid "--max-pack-size cannot be used to build a pack for transfer"
16793msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
16794
a5cd71ca 16795#: builtin/pack-objects.c:3406
c1ac5258 16796msgid "minimum pack size limit is 1 MiB"
e640d114 16797msgstr "最小的包文件大小是 1 MiB"
c1ac5258 16798
a5cd71ca 16799#: builtin/pack-objects.c:3411
c1ac5258
JX
16800msgid "--thin cannot be used to build an indexable pack"
16801msgstr "--thin 不能用于创建一个可索引包"
16802
a5cd71ca 16803#: builtin/pack-objects.c:3414
c1ac5258
JX
16804msgid "--keep-unreachable and --unpack-unreachable are incompatible"
16805msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
16806
a5cd71ca 16807#: builtin/pack-objects.c:3420
c1ac5258 16808msgid "cannot use --filter without --stdout"
e640d114 16809msgstr "不能在没有 --stdout 的情况下使用 --filter"
c1ac5258 16810
a5cd71ca 16811#: builtin/pack-objects.c:3481
fd8cb379
JX
16812msgid "Enumerating objects"
16813msgstr "枚举对象"
16814
a5cd71ca 16815#: builtin/pack-objects.c:3511
c1ac5258
JX
16816#, c-format
16817msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
16818msgstr "总共 %<PRIu32> (差异 %<PRIu32>),复用 %<PRIu32> (差异 %<PRIu32>)"
16819
d46c5519 16820#: builtin/pack-refs.c:8
814ff314
JX
16821msgid "git pack-refs [<options>]"
16822msgstr "git pack-refs [<选项>]"
c04f5ac3 16823
d46c5519 16824#: builtin/pack-refs.c:16
ef317cd5 16825msgid "pack everything"
07432cef 16826msgstr "打包一切"
c04f5ac3 16827
d46c5519 16828#: builtin/pack-refs.c:17
ef317cd5 16829msgid "prune loose refs (default)"
07432cef 16830msgstr "清除松散的引用(默认)"
c04f5ac3 16831
c1ac5258 16832#: builtin/prune-packed.c:9
814ff314
JX
16833msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
16834msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 16835
c1ac5258 16836#: builtin/prune-packed.c:42
6c94aba5
JX
16837msgid "Removing duplicate objects"
16838msgstr "正在删除重复对象"
16839
c1ac5258 16840#: builtin/prune.c:12
5809aa05
JX
16841msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
16842msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
7ac1c0ad 16843
d46c5519 16844#: builtin/prune.c:131
1b7f4a34
JX
16845msgid "report pruned objects"
16846msgstr "报告清除的对象"
16847
d46c5519 16848#: builtin/prune.c:134
1b7f4a34
JX
16849msgid "expire objects older than <time>"
16850msgstr "使早于给定时间的对象过期"
16851
d46c5519 16852#: builtin/prune.c:136
31e5e17b
JX
16853msgid "limit traversal to objects outside promisor packfiles"
16854msgstr "限制遍历 promisor 包以外的对象"
16855
d46c5519 16856#: builtin/prune.c:150
94550ed3
JX
16857msgid "cannot prune in a precious-objects repo"
16858msgstr "不能在珍品仓库中执行清理操作"
16859
d46c5519 16860#: builtin/pull.c:66 builtin/pull.c:68
a0b6b246
JX
16861#, c-format
16862msgid "Invalid value for %s: %s"
16863msgstr "%s 的值无效:%s"
16864
d46c5519 16865#: builtin/pull.c:88
94550ed3 16866msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
16867msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
16868
a5cd71ca 16869#: builtin/pull.c:142
a4f16749
JX
16870msgid "control for recursive fetching of submodules"
16871msgstr "控制子模组的递归获取"
16872
a5cd71ca 16873#: builtin/pull.c:146
1b7f4a34
JX
16874msgid "Options related to merging"
16875msgstr "和合并相关的选项"
16876
a5cd71ca 16877#: builtin/pull.c:149
1b7f4a34
JX
16878msgid "incorporate changes by rebasing rather than merging"
16879msgstr "使用变基操作取代合并操作以合入修改"
16880
ddc12c42 16881#: builtin/pull.c:177 builtin/rebase.c:467 builtin/revert.c:126
1b7f4a34
JX
16882msgid "allow fast-forward"
16883msgstr "允许快进式"
16884
a5cd71ca 16885#: builtin/pull.c:186
5b04ee3b 16886msgid "automatically stash/stash pop before and after rebase"
554e8501 16887msgstr "变基操作前后执行自动贮藏和弹出贮藏"
5b04ee3b 16888
a5cd71ca 16889#: builtin/pull.c:202
1b7f4a34
JX
16890msgid "Options related to fetching"
16891msgstr "和获取相关的参数"
16892
a5cd71ca 16893#: builtin/pull.c:212
4c27fcb5
JX
16894msgid "force overwrite of local branch"
16895msgstr "强制覆盖本地分支"
16896
a5cd71ca 16897#: builtin/pull.c:220
276ceeaa
JX
16898msgid "number of submodules pulled in parallel"
16899msgstr "并发拉取的子模组的数量"
16900
a5cd71ca 16901#: builtin/pull.c:320
1b7f4a34
JX
16902#, c-format
16903msgid "Invalid value for pull.ff: %s"
16904msgstr "pull.ff 的取值无效:%s"
16905
a5cd71ca 16906#: builtin/pull.c:437
1b7f4a34
JX
16907msgid ""
16908"There is no candidate for rebasing against among the refs that you just "
16909"fetched."
16910msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
16911
a5cd71ca 16912#: builtin/pull.c:439
1b7f4a34
JX
16913msgid ""
16914"There are no candidates for merging among the refs that you just fetched."
16915msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
16916
a5cd71ca 16917#: builtin/pull.c:440
1b7f4a34
JX
16918msgid ""
16919"Generally this means that you provided a wildcard refspec which had no\n"
16920"matches on the remote end."
16921msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
16922
a5cd71ca 16923#: builtin/pull.c:443
1b7f4a34
JX
16924#, c-format
16925msgid ""
16926"You asked to pull from the remote '%s', but did not specify\n"
16927"a branch. Because this is not the default configured remote\n"
16928"for your current branch, you must specify a branch on the command line."
16929msgstr ""
16930"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
16931"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
16932
ddc12c42 16933#: builtin/pull.c:448 builtin/rebase.c:1375 git-parse-remote.sh:73
1b7f4a34
JX
16934msgid "You are not currently on a branch."
16935msgstr "您当前不在一个分支上。"
16936
a5cd71ca 16937#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
1b7f4a34
JX
16938msgid "Please specify which branch you want to rebase against."
16939msgstr "请指定您要变基到哪一个分支。"
16940
a5cd71ca 16941#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
1b7f4a34
JX
16942msgid "Please specify which branch you want to merge with."
16943msgstr "请指定您要合并哪一个分支。"
16944
a5cd71ca 16945#: builtin/pull.c:453 builtin/pull.c:468
1b7f4a34
JX
16946msgid "See git-pull(1) for details."
16947msgstr "详见 git-pull(1)。"
16948
a5cd71ca 16949#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
ddc12c42 16950#: builtin/rebase.c:1381 git-parse-remote.sh:64
5b04ee3b
JX
16951msgid "<remote>"
16952msgstr "<远程>"
16953
a5cd71ca 16954#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
d46c5519 16955#: git-parse-remote.sh:65
5b04ee3b
JX
16956msgid "<branch>"
16957msgstr "<分支>"
16958
ddc12c42 16959#: builtin/pull.c:463 builtin/rebase.c:1373 git-parse-remote.sh:75
1b7f4a34
JX
16960msgid "There is no tracking information for the current branch."
16961msgstr "当前分支没有跟踪信息。"
16962
a5cd71ca 16963#: builtin/pull.c:472 git-parse-remote.sh:95
1b7f4a34 16964msgid ""
5b04ee3b
JX
16965"If you wish to set tracking information for this branch you can do so with:"
16966msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
7ac1c0ad 16967
a5cd71ca 16968#: builtin/pull.c:477
1b7f4a34
JX
16969#, c-format
16970msgid ""
16971"Your configuration specifies to merge with the ref '%s'\n"
16972"from the remote, but no such ref was fetched."
16973msgstr ""
16974"您的配置中指定要合并远程的引用 '%s',\n"
16975"但是没有获取到这个引用。"
7ac1c0ad 16976
a5cd71ca 16977#: builtin/pull.c:587
4c27fcb5
JX
16978#, c-format
16979msgid "unable to access commit %s"
16980msgstr "无法访问提交 %s"
16981
a5cd71ca 16982#: builtin/pull.c:867
5c57d762
JX
16983msgid "ignoring --verify-signatures for rebase"
16984msgstr "为变基操作忽略 --verify-signatures"
16985
a5cd71ca 16986#: builtin/pull.c:922
5b04ee3b
JX
16987msgid "--[no-]autostash option is only valid with --rebase."
16988msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
16989
a5cd71ca 16990#: builtin/pull.c:930
1b7f4a34
JX
16991msgid "Updating an unborn branch with changes added to the index."
16992msgstr "更新尚未诞生的分支,变更添加至索引。"
16993
a5cd71ca 16994#: builtin/pull.c:934
a0b6b246
JX
16995msgid "pull with rebase"
16996msgstr "变基式拉取"
16997
a5cd71ca 16998#: builtin/pull.c:935
a0b6b246 16999msgid "please commit or stash them."
554e8501 17000msgstr "请提交或贮藏它们。"
a0b6b246 17001
a5cd71ca 17002#: builtin/pull.c:960
1b7f4a34
JX
17003#, c-format
17004msgid ""
17005"fetch updated the current branch head.\n"
17006"fast-forwarding your working tree from\n"
17007"commit %s."
17008msgstr ""
17009"fetch 更新了当前的分支。快进您的工作区\n"
17010"至提交 %s。"
ef317cd5 17011
a5cd71ca 17012#: builtin/pull.c:966
1b7f4a34
JX
17013#, c-format
17014msgid ""
17015"Cannot fast-forward your working tree.\n"
17016"After making sure that you saved anything precious from\n"
17017"$ git diff %s\n"
17018"output, run\n"
17019"$ git reset --hard\n"
17020"to recover."
17021msgstr ""
17022"您当前的工作区无法执行快进操作。\n"
17023"首先执行如下命令:\n"
17024"$ git diff %s\n"
17025"以确认所有有用的数据均已保存。然后执行下面的命令\n"
17026"$ git reset --hard\n"
17027"恢复之前的状态。"
17028
a5cd71ca 17029#: builtin/pull.c:981
1b7f4a34
JX
17030msgid "Cannot merge multiple branches into empty head."
17031msgstr "无法将多个分支合并到空分支。"
17032
a5cd71ca 17033#: builtin/pull.c:985
1b7f4a34
JX
17034msgid "Cannot rebase onto multiple branches."
17035msgstr "无法变基到多个分支。"
17036
a5cd71ca 17037#: builtin/pull.c:992
a4f16749
JX
17038msgid "cannot rebase with locally recorded submodule modifications"
17039msgstr "本地子模组中有修改,无法变基"
17040
fd8cb379 17041#: builtin/push.c:19
ef317cd5 17042msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 17043msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 17044
ddc12c42 17045#: builtin/push.c:112
c04f5ac3 17046msgid "tag shorthand without <tag>"
55a16ee4 17047msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 17048
ddc12c42 17049#: builtin/push.c:122
c04f5ac3 17050msgid "--delete only accepts plain target ref names"
90e6ef53 17051msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 17052
ddc12c42 17053#: builtin/push.c:168
8ada9598
JX
17054msgid ""
17055"\n"
17056"To choose either option permanently, see push.default in 'git help config'."
17057msgstr ""
81809b99
JX
17058"\n"
17059"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 17060
ddc12c42 17061#: builtin/push.c:171
8ada9598
JX
17062#, c-format
17063msgid ""
17064"The upstream branch of your current branch does not match\n"
17065"the name of your current branch. To push to the upstream branch\n"
17066"on the remote, use\n"
17067"\n"
17068" git push %s HEAD:%s\n"
17069"\n"
17070"To push to the branch of the same name on the remote, use\n"
17071"\n"
4c27fcb5 17072" git push %s HEAD\n"
8ada9598
JX
17073"%s"
17074msgstr ""
4c27fcb5
JX
17075"您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n"
17076"使用\n"
81809b99
JX
17077"\n"
17078" git push %s HEAD:%s\n"
17079"\n"
17080"为推送至远程同名分支,使用\n"
17081"\n"
4c27fcb5 17082" git push %s HEAD\n"
81809b99 17083"%s"
8ada9598 17084
ddc12c42 17085#: builtin/push.c:186
c04f5ac3
JX
17086#, c-format
17087msgid ""
17088"You are not currently on a branch.\n"
17089"To push the history leading to the current (detached HEAD)\n"
17090"state now, use\n"
17091"\n"
17092" git push %s HEAD:<name-of-remote-branch>\n"
17093msgstr ""
17094"您当前不在一个分支上。\n"
90e6ef53 17095"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 17096"\n"
d9d56b23 17097" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 17098
ddc12c42 17099#: builtin/push.c:200
c04f5ac3
JX
17100#, c-format
17101msgid ""
17102"The current branch %s has no upstream branch.\n"
17103"To push the current branch and set the remote as upstream, use\n"
17104"\n"
17105" git push --set-upstream %s %s\n"
17106msgstr ""
17107"当前分支 %s 没有对应的上游分支。\n"
17108"为推送当前分支并建立与远程上游的跟踪,使用\n"
17109"\n"
17110" git push --set-upstream %s %s\n"
17111
ddc12c42 17112#: builtin/push.c:208
c04f5ac3
JX
17113#, c-format
17114msgid "The current branch %s has multiple upstream branches, refusing to push."
17115msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
17116
ddc12c42 17117#: builtin/push.c:211
73a60cd2
JX
17118#, c-format
17119msgid ""
17120"You are pushing to remote '%s', which is not the upstream of\n"
17121"your current branch '%s', without telling me what to push\n"
17122"to update which remote branch."
17123msgstr ""
17124"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
17125"而没有告诉我要推送什么、更新哪个远程分支。"
17126
ddc12c42 17127#: builtin/push.c:270
c04f5ac3
JX
17128msgid ""
17129"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 17130msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 17131
ddc12c42 17132#: builtin/push.c:277
170e9899
JX
17133msgid ""
17134"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
17135"its remote counterpart. Integrate the remote changes (e.g.\n"
17136"'git pull ...') before pushing again.\n"
170e9899
JX
17137"See the 'Note about fast-forwards' in 'git push --help' for details."
17138msgstr ""
eff6d3a9 17139"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 17140"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 17141"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 17142
ddc12c42 17143#: builtin/push.c:283
170e9899
JX
17144msgid ""
17145"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
17146"counterpart. Check out this branch and integrate the remote changes\n"
17147"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
17148"See the 'Note about fast-forwards' in 'git push --help' for details."
17149msgstr ""
eff6d3a9 17150"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 17151"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 17152"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 17153
ddc12c42 17154#: builtin/push.c:289
07432cef 17155msgid ""
a77c07d9
JX
17156"Updates were rejected because the remote contains work that you do\n"
17157"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
17158"to the same ref. You may want to first integrate the remote changes\n"
17159"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
17160"See the 'Note about fast-forwards' in 'git push --help' for details."
17161msgstr ""
160fb2b2
JX
17162"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
17163"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 17164"(如 'git pull ...')。\n"
a77c07d9
JX
17165"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
17166
ddc12c42 17167#: builtin/push.c:296
a77c07d9 17168msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 17169msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 17170
ddc12c42 17171#: builtin/push.c:299
a77c07d9
JX
17172msgid ""
17173"You cannot update a remote ref that points at a non-commit object,\n"
17174"or update a remote ref to make it point at a non-commit object,\n"
17175"without using the '--force' option.\n"
17176msgstr ""
17177"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
17178"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 17179
ddc12c42 17180#: builtin/push.c:360
c04f5ac3
JX
17181#, c-format
17182msgid "Pushing to %s\n"
17183msgstr "推送到 %s\n"
17184
ddc12c42 17185#: builtin/push.c:367
c04f5ac3
JX
17186#, c-format
17187msgid "failed to push some refs to '%s'"
c1ac5258 17188msgstr "推送一些引用到 '%s' 失败"
c04f5ac3 17189
ddc12c42 17190#: builtin/push.c:542
ef317cd5 17191msgid "repository"
160fb2b2 17192msgstr "仓库"
ef317cd5 17193
ddc12c42 17194#: builtin/push.c:543 builtin/send-pack.c:164
ef317cd5 17195msgid "push all refs"
07432cef 17196msgstr "推送所有引用"
ef317cd5 17197
ddc12c42 17198#: builtin/push.c:544 builtin/send-pack.c:166
ef317cd5 17199msgid "mirror all refs"
07432cef 17200msgstr "镜像所有引用"
ef317cd5 17201
ddc12c42 17202#: builtin/push.c:546
ef317cd5 17203msgid "delete refs"
07432cef 17204msgstr "删除引用"
ef317cd5 17205
ddc12c42 17206#: builtin/push.c:547
ef317cd5 17207msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 17208msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 17209
ddc12c42 17210#: builtin/push.c:550 builtin/send-pack.c:167
ef317cd5
JX
17211msgid "force updates"
17212msgstr "强制更新"
17213
ddc12c42 17214#: builtin/push.c:552 builtin/send-pack.c:181
c1ac5258
JX
17215msgid "<refname>:<expect>"
17216msgstr "<引用名>:<期望值>"
90314792 17217
ddc12c42 17218#: builtin/push.c:553 builtin/send-pack.c:182
90314792
JX
17219msgid "require old value of ref to be at this value"
17220msgstr "要求引用旧的取值为设定值"
17221
ddc12c42 17222#: builtin/push.c:556
ef317cd5 17223msgid "control recursive pushing of submodules"
07432cef 17224msgstr "控制子模组的递归推送"
ef317cd5 17225
ddc12c42 17226#: builtin/push.c:558 builtin/send-pack.c:175
ef317cd5 17227msgid "use thin pack"
07432cef 17228msgstr "使用精简打包"
ef317cd5 17229
ddc12c42 17230#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
fd8cb379 17231#: builtin/send-pack.c:162
ef317cd5 17232msgid "receive pack program"
07432cef 17233msgstr "接收包程序"
ef317cd5 17234
ddc12c42 17235#: builtin/push.c:561
ef317cd5 17236msgid "set upstream for git pull/status"
07432cef 17237msgstr "设置 git pull/status 的上游"
ef317cd5 17238
ddc12c42 17239#: builtin/push.c:564
ef317cd5 17240msgid "prune locally removed refs"
07432cef 17241msgstr "清除本地删除的引用"
ef317cd5 17242
ddc12c42 17243#: builtin/push.c:566
a77c07d9
JX
17244msgid "bypass pre-push hook"
17245msgstr "绕过 pre-push 钩子"
17246
ddc12c42 17247#: builtin/push.c:567
1003b3a5 17248msgid "push missing but relevant tags"
55a16ee4 17249msgstr "推送缺失但有关的标签"
1003b3a5 17250
ddc12c42 17251#: builtin/push.c:570 builtin/send-pack.c:169
220c313c
JX
17252msgid "GPG sign the push"
17253msgstr "用 GPG 为推送签名"
17254
ddc12c42 17255#: builtin/push.c:572 builtin/send-pack.c:176
814ff314
JX
17256msgid "request atomic transaction on remote side"
17257msgstr "需要远端支持原子事务"
17258
ddc12c42 17259#: builtin/push.c:590
c04f5ac3
JX
17260msgid "--delete is incompatible with --all, --mirror and --tags"
17261msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
17262
ddc12c42 17263#: builtin/push.c:592
c04f5ac3
JX
17264msgid "--delete doesn't make sense without any refs"
17265msgstr "--delete 未接任何引用没有意义"
17266
ddc12c42 17267#: builtin/push.c:612
a5cd71ca
JX
17268#, c-format
17269msgid "bad repository '%s'"
17270msgstr "坏的仓库 '%s'"
17271
ddc12c42 17272#: builtin/push.c:613
a5cd71ca
JX
17273msgid ""
17274"No configured push destination.\n"
17275"Either specify the URL from the command-line or configure a remote "
17276"repository using\n"
17277"\n"
17278" git remote add <name> <url>\n"
17279"\n"
17280"and then push using the remote name\n"
17281"\n"
17282" git push <name>\n"
17283msgstr ""
17284"没有配置推送目标。\n"
17285"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
17286"\n"
17287" git remote add <名称> <地址>\n"
17288"\n"
17289"然后使用该远程仓库名执行推送\n"
17290"\n"
17291" git push <名称>\n"
17292
ddc12c42 17293#: builtin/push.c:628
fd8cb379
JX
17294msgid "--all and --tags are incompatible"
17295msgstr "--all 和 --tags 不兼容"
17296
ddc12c42 17297#: builtin/push.c:630
fd8cb379
JX
17298msgid "--all can't be combined with refspecs"
17299msgstr "--all 不能和引用规格同时使用"
17300
ddc12c42 17301#: builtin/push.c:634
fd8cb379
JX
17302msgid "--mirror and --tags are incompatible"
17303msgstr "--mirror 和 --tags 不兼容"
17304
ddc12c42 17305#: builtin/push.c:636
fd8cb379
JX
17306msgid "--mirror can't be combined with refspecs"
17307msgstr "--mirror 不能和引用规格同时使用"
17308
ddc12c42 17309#: builtin/push.c:639
fd8cb379
JX
17310msgid "--all and --mirror are incompatible"
17311msgstr "--all 和 --mirror 不兼容"
17312
ddc12c42 17313#: builtin/push.c:643
5c57d762
JX
17314msgid "push options must not have new line characters"
17315msgstr "推送选项不能有换行符"
17316
c1ac5258
JX
17317#: builtin/range-diff.c:8
17318msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
17319msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
17320
17321#: builtin/range-diff.c:9
17322msgid "git range-diff [<options>] <old-tip>...<new-tip>"
17323msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
17324
17325#: builtin/range-diff.c:10
17326msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
17327msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
17328
ddc12c42 17329#: builtin/range-diff.c:22
c1ac5258
JX
17330msgid "Percentage by which creation is weighted"
17331msgstr "创建权重的百分比"
17332
ddc12c42 17333#: builtin/range-diff.c:24
c1ac5258
JX
17334msgid "use simple diff colors"
17335msgstr "使用简单差异颜色"
17336
ddc12c42
JX
17337#: builtin/range-diff.c:26
17338msgid "notes"
17339msgstr "注解"
17340
17341#: builtin/range-diff.c:26
17342msgid "passed to 'git log'"
17343msgstr "传递给 'git log'"
17344
17345#: builtin/range-diff.c:50 builtin/range-diff.c:54
c1ac5258
JX
17346#, c-format
17347msgid "no .. in range: '%s'"
17348msgstr "没有在范围中使用 ..:'%s'"
17349
ddc12c42 17350#: builtin/range-diff.c:64
c1ac5258
JX
17351msgid "single arg format must be symmetric range"
17352msgstr "单个参数格式必须是对称范围(即包含...)"
17353
ddc12c42 17354#: builtin/range-diff.c:79
c1ac5258
JX
17355msgid "need two commit ranges"
17356msgstr "需要两个提交范围"
17357
06991777 17358#: builtin/read-tree.c:41
ef317cd5 17359msgid ""
1b7f4a34 17360"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
ef317cd5
JX
17361"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
17362"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
17363msgstr ""
1b7f4a34 17364"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
07432cef 17365"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
1b7f4a34 17366"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
ef317cd5 17367
06991777 17368#: builtin/read-tree.c:124
ef317cd5 17369msgid "write resulting index to <file>"
d9d56b23 17370msgstr "将索引结果写入 <文件>"
ef317cd5 17371
06991777 17372#: builtin/read-tree.c:127
ef317cd5 17373msgid "only empty the index"
07432cef 17374msgstr "只是清空索引"
ef317cd5 17375
06991777 17376#: builtin/read-tree.c:129
ef317cd5 17377msgid "Merging"
07432cef 17378msgstr "合并"
ef317cd5 17379
06991777 17380#: builtin/read-tree.c:131
ef317cd5 17381msgid "perform a merge in addition to a read"
07432cef 17382msgstr "读取之余再执行一个合并"
ef317cd5 17383
06991777 17384#: builtin/read-tree.c:133
ef317cd5 17385msgid "3-way merge if no file level merging required"
160fb2b2 17386msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 17387
06991777 17388#: builtin/read-tree.c:135
ef317cd5 17389msgid "3-way merge in presence of adds and removes"
160fb2b2 17390msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 17391
06991777 17392#: builtin/read-tree.c:137
ef317cd5 17393msgid "same as -m, but discard unmerged entries"
07432cef 17394msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 17395
06991777 17396#: builtin/read-tree.c:138
ef317cd5 17397msgid "<subdirectory>/"
07432cef 17398msgstr "<子目录>/"
ef317cd5 17399
06991777 17400#: builtin/read-tree.c:139
ef317cd5 17401msgid "read the tree into the index under <subdirectory>/"
07432cef 17402msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 17403
06991777 17404#: builtin/read-tree.c:142
ef317cd5 17405msgid "update working tree with merge result"
07432cef 17406msgstr "用合并的结果更新工作区"
ef317cd5 17407
06991777 17408#: builtin/read-tree.c:144
ef317cd5 17409msgid "gitignore"
07432cef 17410msgstr "gitignore"
ef317cd5 17411
06991777 17412#: builtin/read-tree.c:145
ef317cd5 17413msgid "allow explicitly ignored files to be overwritten"
07432cef 17414msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 17415
06991777 17416#: builtin/read-tree.c:148
ef317cd5 17417msgid "don't check the working tree after merging"
07432cef 17418msgstr "合并后不检查工作区"
ef317cd5 17419
06991777 17420#: builtin/read-tree.c:149
ef317cd5 17421msgid "don't update the index or the work tree"
07432cef 17422msgstr "不更新索引区和工作区"
ef317cd5 17423
06991777 17424#: builtin/read-tree.c:151
ef317cd5 17425msgid "skip applying sparse checkout filter"
07432cef 17426msgstr "跳过应用稀疏检出过滤器"
ef317cd5 17427
06991777 17428#: builtin/read-tree.c:153
ef317cd5 17429msgid "debug unpack-trees"
07432cef 17430msgstr "调试 unpack-trees"
ef317cd5 17431
d46c5519
JX
17432#: builtin/read-tree.c:157
17433msgid "suppress feedback messages"
17434msgstr "抑制反馈信息"
17435
ddc12c42
JX
17436#: builtin/read-tree.c:188
17437msgid "You need to resolve your current index first"
17438msgstr "您需要先解决当前索引的冲突"
17439
d46c5519 17440#: builtin/rebase.c:32
4c27fcb5 17441msgid ""
a5cd71ca
JX
17442"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
17443"[<upstream> [<branch>]]"
ddc12c42
JX
17444msgstr ""
17445"git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<"
17446"上游> [<分支>]]"
4c27fcb5 17447
d46c5519 17448#: builtin/rebase.c:34
4c27fcb5
JX
17449msgid ""
17450"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
17451msgstr ""
17452"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
17453
d46c5519 17454#: builtin/rebase.c:36
4c27fcb5
JX
17455msgid "git rebase --continue | --abort | --skip | --edit-todo"
17456msgstr "git rebase --continue | --abort | --skip | --edit-todo"
17457
ddc12c42 17458#: builtin/rebase.c:177 builtin/rebase.c:201 builtin/rebase.c:228
d46c5519
JX
17459#, c-format
17460msgid "unusable todo list: '%s'"
17461msgstr "不可用的待办列表:'%s'"
17462
ddc12c42 17463#: builtin/rebase.c:186 builtin/rebase.c:212 builtin/rebase.c:236
d46c5519
JX
17464#, c-format
17465msgid "could not write '%s'."
17466msgstr "不能写入 '%s'。"
17467
ddc12c42 17468#: builtin/rebase.c:271
d46c5519
JX
17469msgid "no HEAD?"
17470msgstr "没有 HEAD?"
17471
ddc12c42 17472#: builtin/rebase.c:298
d46c5519
JX
17473#, c-format
17474msgid "could not create temporary %s"
17475msgstr "无法创建临时的 %s"
17476
ddc12c42 17477#: builtin/rebase.c:304
d46c5519
JX
17478msgid "could not mark as interactive"
17479msgstr "无法标记为交互式"
17480
ddc12c42 17481#: builtin/rebase.c:362
d46c5519
JX
17482msgid "could not generate todo list"
17483msgstr "无法生成待办列表"
17484
ddc12c42 17485#: builtin/rebase.c:402
d46c5519
JX
17486msgid "a base commit must be provided with --upstream or --onto"
17487msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
17488
ddc12c42 17489#: builtin/rebase.c:457
d46c5519
JX
17490msgid "git rebase--interactive [<options>]"
17491msgstr "git rebase--interactive [<选项>]"
17492
ddc12c42 17493#: builtin/rebase.c:469
d46c5519
JX
17494msgid "keep empty commits"
17495msgstr "保持空提交"
17496
ddc12c42 17497#: builtin/rebase.c:471 builtin/revert.c:128
d46c5519
JX
17498msgid "allow commits with empty messages"
17499msgstr "允许提交说明为空"
17500
ddc12c42 17501#: builtin/rebase.c:472
d46c5519
JX
17502msgid "rebase merge commits"
17503msgstr "对合并提交变基"
17504
ddc12c42 17505#: builtin/rebase.c:474
d46c5519
JX
17506msgid "keep original branch points of cousins"
17507msgstr "保持兄弟提交的原始分支点"
17508
ddc12c42 17509#: builtin/rebase.c:476
d46c5519
JX
17510msgid "move commits that begin with squash!/fixup!"
17511msgstr "移动以 squash!/fixup! 开头的提交"
17512
ddc12c42 17513#: builtin/rebase.c:477
d46c5519
JX
17514msgid "sign commits"
17515msgstr "签名提交"
17516
ddc12c42 17517#: builtin/rebase.c:479 builtin/rebase.c:1455
d46c5519 17518msgid "display a diffstat of what changed upstream"
5b533632 17519msgstr "显示上游变化的差异统计"
d46c5519 17520
ddc12c42 17521#: builtin/rebase.c:481
d46c5519
JX
17522msgid "continue rebase"
17523msgstr "继续变基"
17524
ddc12c42 17525#: builtin/rebase.c:483
d46c5519
JX
17526msgid "skip commit"
17527msgstr "跳过提交"
17528
ddc12c42 17529#: builtin/rebase.c:484
d46c5519
JX
17530msgid "edit the todo list"
17531msgstr "变基待办列表"
17532
ddc12c42 17533#: builtin/rebase.c:486
d46c5519
JX
17534msgid "show the current patch"
17535msgstr "显示当前补丁"
17536
ddc12c42 17537#: builtin/rebase.c:489
d46c5519
JX
17538msgid "shorten commit ids in the todo list"
17539msgstr "缩短待办列表中的提交号"
17540
ddc12c42 17541#: builtin/rebase.c:491
d46c5519
JX
17542msgid "expand commit ids in the todo list"
17543msgstr "扩展待办列表中的提交号"
17544
ddc12c42 17545#: builtin/rebase.c:493
d46c5519
JX
17546msgid "check the todo list"
17547msgstr "检查待办列表"
17548
ddc12c42 17549#: builtin/rebase.c:495
d46c5519
JX
17550msgid "rearrange fixup/squash lines"
17551msgstr "重新排列 fixup/squash 行"
17552
ddc12c42 17553#: builtin/rebase.c:497
d46c5519
JX
17554msgid "insert exec commands in todo list"
17555msgstr "在待办列表中插入 exec 执行命令"
17556
ddc12c42 17557#: builtin/rebase.c:498
d46c5519
JX
17558msgid "onto"
17559msgstr "onto"
17560
ddc12c42 17561#: builtin/rebase.c:501
d46c5519
JX
17562msgid "restrict-revision"
17563msgstr "restrict-revision"
17564
ddc12c42 17565#: builtin/rebase.c:501
d46c5519
JX
17566msgid "restrict revision"
17567msgstr "限制版本"
17568
ddc12c42 17569#: builtin/rebase.c:503
d46c5519
JX
17570msgid "squash-onto"
17571msgstr "squash-onto"
17572
ddc12c42 17573#: builtin/rebase.c:504
d46c5519
JX
17574msgid "squash onto"
17575msgstr "squash onto"
17576
ddc12c42 17577#: builtin/rebase.c:506
d46c5519
JX
17578msgid "the upstream commit"
17579msgstr "上游提交"
17580
ddc12c42 17581#: builtin/rebase.c:508
d46c5519
JX
17582msgid "head-name"
17583msgstr "head-name"
17584
ddc12c42 17585#: builtin/rebase.c:508
d46c5519
JX
17586msgid "head name"
17587msgstr "head 名称"
17588
ddc12c42 17589#: builtin/rebase.c:513
d46c5519
JX
17590msgid "rebase strategy"
17591msgstr "变基策略"
17592
ddc12c42 17593#: builtin/rebase.c:514
d46c5519
JX
17594msgid "strategy-opts"
17595msgstr "strategy-opts"
17596
ddc12c42 17597#: builtin/rebase.c:515
d46c5519
JX
17598msgid "strategy options"
17599msgstr "策略选项"
17600
ddc12c42 17601#: builtin/rebase.c:516
d46c5519
JX
17602msgid "switch-to"
17603msgstr "切换到"
17604
ddc12c42 17605#: builtin/rebase.c:517
d46c5519
JX
17606msgid "the branch or commit to checkout"
17607msgstr "要检出的分支或提交"
17608
ddc12c42 17609#: builtin/rebase.c:518
d46c5519
JX
17610msgid "onto-name"
17611msgstr "onto-name"
17612
ddc12c42 17613#: builtin/rebase.c:518
d46c5519
JX
17614msgid "onto name"
17615msgstr "onto name"
17616
ddc12c42 17617#: builtin/rebase.c:519
d46c5519
JX
17618msgid "cmd"
17619msgstr "cmd"
17620
ddc12c42 17621#: builtin/rebase.c:519
d46c5519
JX
17622msgid "the command to run"
17623msgstr "要执行的命令"
17624
ddc12c42 17625#: builtin/rebase.c:522 builtin/rebase.c:1540
d46c5519
JX
17626msgid "automatically re-schedule any `exec` that fails"
17627msgstr "自动重新安排任何失败的 `exec`"
17628
ddc12c42 17629#: builtin/rebase.c:540
d46c5519
JX
17630msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
17631msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果"
17632
ddc12c42 17633#: builtin/rebase.c:556
4c27fcb5
JX
17634#, c-format
17635msgid "%s requires an interactive rebase"
17636msgstr "%s 需要交互式变基"
17637
ddc12c42 17638#: builtin/rebase.c:608
4c27fcb5
JX
17639#, c-format
17640msgid "could not get 'onto': '%s'"
17641msgstr "无法获取 'onto':'%s'"
17642
ddc12c42 17643#: builtin/rebase.c:623
4c27fcb5
JX
17644#, c-format
17645msgid "invalid orig-head: '%s'"
17646msgstr "无效的原始 head:'%s'"
17647
ddc12c42 17648#: builtin/rebase.c:648
4c27fcb5
JX
17649#, c-format
17650msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
17651msgstr "忽略无效的 allow_rerere_autoupdate:'%s'"
17652
ddc12c42 17653#: builtin/rebase.c:724
4c27fcb5
JX
17654#, c-format
17655msgid "Could not read '%s'"
17656msgstr "不能读取 '%s'"
17657
ddc12c42 17658#: builtin/rebase.c:742
4c27fcb5
JX
17659#, c-format
17660msgid "Cannot store %s"
17661msgstr "不能存储 %s"
17662
ddc12c42 17663#: builtin/rebase.c:849
06991777
JX
17664msgid "could not determine HEAD revision"
17665msgstr "不能确定 HEAD 版本"
17666
ddc12c42 17667#: builtin/rebase.c:972 git-rebase--preserve-merges.sh:81
4c27fcb5
JX
17668msgid ""
17669"Resolve all conflicts manually, mark them as resolved with\n"
17670"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
17671"You can instead skip this commit: run \"git rebase --skip\".\n"
17672"To abort and get back to the state before \"git rebase\", run \"git rebase --"
17673"abort\"."
17674msgstr ""
17675"手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
17676"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
17677"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
17678"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
17679
ddc12c42 17680#: builtin/rebase.c:1060
06991777
JX
17681#, c-format
17682msgid ""
17683"\n"
17684"git encountered an error while preparing the patches to replay\n"
17685"these revisions:\n"
17686"\n"
17687" %s\n"
17688"\n"
17689"As a result, git cannot rebase them."
17690msgstr ""
17691"\n"
17692"在为重放这些版本而准备补丁时,git 遇到了一个错误:\n"
17693"\n"
17694" %s\n"
17695"\n"
17696"因此 git 无法对其变基。"
4c27fcb5 17697
ddc12c42 17698#: builtin/rebase.c:1367
4c27fcb5
JX
17699#, c-format
17700msgid ""
17701"%s\n"
17702"Please specify which branch you want to rebase against.\n"
17703"See git-rebase(1) for details.\n"
17704"\n"
17705" git rebase '<branch>'\n"
17706"\n"
17707msgstr ""
17708"%s\n"
17709"请指定您要变基到哪个分支。\n"
17710"详见 git-rebase(1)。\n"
17711"\n"
17712" git rebase '<branch>'\n"
17713"\n"
17714
ddc12c42 17715#: builtin/rebase.c:1383
4c27fcb5
JX
17716#, c-format
17717msgid ""
17718"If you wish to set tracking information for this branch you can do so with:\n"
17719"\n"
17720" git branch --set-upstream-to=%s/<branch> %s\n"
17721"\n"
17722msgstr ""
17723"如果您想要为此分支创建跟踪信息,您可以执行:\n"
17724"\n"
17725" git branch --set-upstream-to=%s/<branch> %s\n"
17726"\n"
17727
ddc12c42 17728#: builtin/rebase.c:1413
06991777
JX
17729msgid "exec commands cannot contain newlines"
17730msgstr "exec 命令不能包含换行符"
17731
ddc12c42 17732#: builtin/rebase.c:1417
06991777
JX
17733msgid "empty exec command"
17734msgstr "空的 exec 命令"
17735
ddc12c42 17736#: builtin/rebase.c:1446
4c27fcb5
JX
17737msgid "rebase onto given branch instead of upstream"
17738msgstr "变基到给定的分支而非上游"
17739
ddc12c42 17740#: builtin/rebase.c:1448
a5cd71ca
JX
17741msgid "use the merge-base of upstream and branch as the current base"
17742msgstr "使用上游和分支的合并基线做为当前基线"
17743
ddc12c42 17744#: builtin/rebase.c:1450
4c27fcb5
JX
17745msgid "allow pre-rebase hook to run"
17746msgstr "允许执行 pre-rebase 钩子"
17747
ddc12c42 17748#: builtin/rebase.c:1452
4c27fcb5
JX
17749msgid "be quiet. implies --no-stat"
17750msgstr "安静。暗示 --no-stat"
17751
ddc12c42 17752#: builtin/rebase.c:1458
4c27fcb5 17753msgid "do not show diffstat of what changed upstream"
5b533632 17754msgstr "不显示上游变化的差异统计"
4c27fcb5 17755
ddc12c42 17756#: builtin/rebase.c:1461
4c27fcb5
JX
17757msgid "add a Signed-off-by: line to each commit"
17758msgstr "为每一个提交添加一个 Signed-off-by: 签名"
17759
ddc12c42
JX
17760#: builtin/rebase.c:1464
17761msgid "make committer date match author date"
17762msgstr "让提交者日期匹配作者日期"
17763
17764#: builtin/rebase.c:1466
17765msgid "ignore author date and use current date"
17766msgstr "忽略作者日期并使用当前日期"
17767
17768#: builtin/rebase.c:1468
17769msgid "synonym of --reset-author-date"
17770msgstr "--reset-author-date 的同义词"
4c27fcb5 17771
ddc12c42 17772#: builtin/rebase.c:1470 builtin/rebase.c:1474
4c27fcb5
JX
17773msgid "passed to 'git apply'"
17774msgstr "传递给 'git apply'"
17775
ddc12c42
JX
17776#: builtin/rebase.c:1472
17777msgid "ignore changes in whitespace"
17778msgstr "忽略空白字符的变更"
17779
17780#: builtin/rebase.c:1476 builtin/rebase.c:1479
4c27fcb5
JX
17781msgid "cherry-pick all commits, even if unchanged"
17782msgstr "拣选所有提交,即使未修改"
17783
ddc12c42 17784#: builtin/rebase.c:1481
4c27fcb5
JX
17785msgid "continue"
17786msgstr "继续"
17787
ddc12c42 17788#: builtin/rebase.c:1484
4c27fcb5
JX
17789msgid "skip current patch and continue"
17790msgstr "跳过当前补丁并继续"
17791
17792# 译者:注意保持前导空格
ddc12c42 17793#: builtin/rebase.c:1486
4c27fcb5
JX
17794msgid "abort and check out the original branch"
17795msgstr "终止并检出原有分支"
17796
ddc12c42 17797#: builtin/rebase.c:1489
4c27fcb5
JX
17798msgid "abort but keep HEAD where it is"
17799msgstr "终止但保持 HEAD 不变"
17800
ddc12c42 17801#: builtin/rebase.c:1490
4c27fcb5
JX
17802msgid "edit the todo list during an interactive rebase"
17803msgstr "在交互式变基中编辑待办列表"
17804
ddc12c42 17805#: builtin/rebase.c:1493
4c27fcb5
JX
17806msgid "show the patch file being applied or merged"
17807msgstr "显示正在应用或合并的补丁文件"
17808
ddc12c42 17809#: builtin/rebase.c:1496
4c27fcb5
JX
17810msgid "use merging strategies to rebase"
17811msgstr "使用合并策略进行变基"
17812
ddc12c42 17813#: builtin/rebase.c:1500
4c27fcb5
JX
17814msgid "let the user edit the list of commits to rebase"
17815msgstr "让用户编辑要变基的提交列表"
17816
ddc12c42 17817#: builtin/rebase.c:1504
d46c5519
JX
17818msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
17819msgstr "(已弃用)尝试重建合并提交而非忽略它们"
4c27fcb5 17820
ddc12c42 17821#: builtin/rebase.c:1509
4c27fcb5
JX
17822msgid "preserve empty commits during rebase"
17823msgstr "变基时保留空提交"
17824
ddc12c42 17825#: builtin/rebase.c:1511
4c27fcb5
JX
17826msgid "move commits that begin with squash!/fixup! under -i"
17827msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交"
17828
ddc12c42 17829#: builtin/rebase.c:1517
4c27fcb5
JX
17830msgid "automatically stash/stash pop before and after"
17831msgstr "在操作前后执行自动贮藏和弹出贮藏"
17832
ddc12c42 17833#: builtin/rebase.c:1519
4c27fcb5
JX
17834msgid "add exec lines after each commit of the editable list"
17835msgstr "可编辑列表的每一个提交下面增加一行 exec"
17836
ddc12c42 17837#: builtin/rebase.c:1523
4c27fcb5
JX
17838msgid "allow rebasing commits with empty messages"
17839msgstr "允许针对空提交说明的提交变基"
17840
ddc12c42 17841#: builtin/rebase.c:1526
4c27fcb5
JX
17842msgid "try to rebase merges instead of skipping them"
17843msgstr "尝试对合并提交变基而不是忽略它们"
17844
ddc12c42 17845#: builtin/rebase.c:1529
4c27fcb5
JX
17846msgid "use 'merge-base --fork-point' to refine upstream"
17847msgstr "使用 'merge-base --fork-point' 来优化上游"
17848
ddc12c42 17849#: builtin/rebase.c:1531
4c27fcb5
JX
17850msgid "use the given merge strategy"
17851msgstr "使用给定的合并策略"
17852
ddc12c42 17853#: builtin/rebase.c:1533 builtin/revert.c:115
4c27fcb5
JX
17854msgid "option"
17855msgstr "选项"
17856
ddc12c42 17857#: builtin/rebase.c:1534
4c27fcb5
JX
17858msgid "pass the argument through to the merge strategy"
17859msgstr "将参数传递给合并策略"
17860
ddc12c42 17861#: builtin/rebase.c:1537
4c27fcb5
JX
17862msgid "rebase all reachable commits up to the root(s)"
17863msgstr "将所有可达的提交变基到根提交"
17864
ddc12c42 17865#: builtin/rebase.c:1554
d46c5519
JX
17866msgid ""
17867"the rebase.useBuiltin support has been removed!\n"
17868"See its entry in 'git help config' for details."
17869msgstr ""
17870"对 rebase.useBuiltin 的支持已被删除!\n"
17871"详见 'git help config' 中的条目。"
4c27fcb5 17872
ddc12c42 17873#: builtin/rebase.c:1560
4c27fcb5
JX
17874msgid "It looks like 'git am' is in progress. Cannot rebase."
17875msgstr "看起来 'git-am' 正在执行中。无法变基。"
17876
ddc12c42 17877#: builtin/rebase.c:1601
d46c5519
JX
17878msgid ""
17879"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
17880msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
17881
ddc12c42 17882#: builtin/rebase.c:1606
a5cd71ca
JX
17883msgid "cannot combine '--keep-base' with '--onto'"
17884msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
17885
ddc12c42 17886#: builtin/rebase.c:1608
a5cd71ca
JX
17887msgid "cannot combine '--keep-base' with '--root'"
17888msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
17889
ddc12c42 17890#: builtin/rebase.c:1612
4c27fcb5
JX
17891msgid "No rebase in progress?"
17892msgstr "没有正在进行的变基?"
17893
ddc12c42 17894#: builtin/rebase.c:1616
4c27fcb5
JX
17895msgid "The --edit-todo action can only be used during interactive rebase."
17896msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
17897
ddc12c42 17898#: builtin/rebase.c:1639
4c27fcb5
JX
17899msgid "Cannot read HEAD"
17900msgstr "不能读取 HEAD"
17901
ddc12c42 17902#: builtin/rebase.c:1651
4c27fcb5
JX
17903msgid ""
17904"You must edit all merge conflicts and then\n"
17905"mark them as resolved using git add"
17906msgstr ""
17907"您必须编辑所有的合并冲突,然后通过 git add\n"
17908"命令将它们标记为已解决"
17909
ddc12c42 17910#: builtin/rebase.c:1670
4c27fcb5
JX
17911msgid "could not discard worktree changes"
17912msgstr "无法丢弃工作区变更"
17913
ddc12c42 17914#: builtin/rebase.c:1689
4c27fcb5
JX
17915#, c-format
17916msgid "could not move back to %s"
17917msgstr "无法移回 %s"
17918
ddc12c42 17919#: builtin/rebase.c:1734
4c27fcb5
JX
17920#, c-format
17921msgid ""
17922"It seems that there is already a %s directory, and\n"
17923"I wonder if you are in the middle of another rebase. If that is the\n"
17924"case, please try\n"
17925"\t%s\n"
17926"If that is not the case, please\n"
17927"\t%s\n"
17928"and run me again. I am stopping in case you still have something\n"
17929"valuable there.\n"
17930msgstr ""
17931"似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n"
17932"如果是这样,请执行\n"
17933"\t%s\n"
17934"如果不是这样,请执行\n"
17935"\t%s\n"
17936"然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n"
17937
ddc12c42 17938#: builtin/rebase.c:1757
4c27fcb5
JX
17939msgid "switch `C' expects a numerical value"
17940msgstr "开关 `C' 期望一个数字值"
17941
ddc12c42 17942#: builtin/rebase.c:1798
4c27fcb5
JX
17943#, c-format
17944msgid "Unknown mode: %s"
17945msgstr "未知模式:%s"
17946
ddc12c42 17947#: builtin/rebase.c:1820
4c27fcb5
JX
17948msgid "--strategy requires --merge or --interactive"
17949msgstr "--strategy 需要 --merge 或 --interactive"
17950
ddc12c42 17951#: builtin/rebase.c:1860
a6cd2cc4
JX
17952msgid "--reschedule-failed-exec requires --exec or --interactive"
17953msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
17954
ddc12c42 17955#: builtin/rebase.c:1872
06991777 17956msgid "cannot combine am options with either interactive or merge options"
5b533632 17957msgstr "不能将 am 选项与交互或合并选项同时使用"
4c27fcb5 17958
ddc12c42 17959#: builtin/rebase.c:1891
06991777 17960msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
5b533632 17961msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
4c27fcb5 17962
ddc12c42 17963#: builtin/rebase.c:1895
06991777
JX
17964msgid ""
17965"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
17966msgstr ""
5b533632 17967"错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
4c27fcb5 17968
ddc12c42 17969#: builtin/rebase.c:1919
4c27fcb5
JX
17970#, c-format
17971msgid "invalid upstream '%s'"
17972msgstr "无效的上游 '%s'"
17973
ddc12c42 17974#: builtin/rebase.c:1925
4c27fcb5
JX
17975msgid "Could not create new root commit"
17976msgstr "不能创建新的根提交"
17977
ddc12c42 17978#: builtin/rebase.c:1951
a5cd71ca
JX
17979#, c-format
17980msgid "'%s': need exactly one merge base with branch"
17981msgstr "'%s':只需要与分支的一个合并基线"
17982
ddc12c42 17983#: builtin/rebase.c:1954
4c27fcb5
JX
17984#, c-format
17985msgid "'%s': need exactly one merge base"
17986msgstr "'%s':只需要一个合并基线"
17987
ddc12c42 17988#: builtin/rebase.c:1962
4c27fcb5
JX
17989#, c-format
17990msgid "Does not point to a valid commit '%s'"
17991msgstr "没有指向一个有效的提交 '%s'"
17992
ddc12c42 17993#: builtin/rebase.c:1987
4c27fcb5
JX
17994#, c-format
17995msgid "fatal: no such branch/commit '%s'"
06991777 17996msgstr "致命错误:无此分支/提交 '%s'"
4c27fcb5 17997
ddc12c42
JX
17998#: builtin/rebase.c:1995 builtin/submodule--helper.c:40
17999#: builtin/submodule--helper.c:1961
4c27fcb5
JX
18000#, c-format
18001msgid "No such ref: %s"
18002msgstr "没有这样的引用:%s"
18003
ddc12c42 18004#: builtin/rebase.c:2006
4c27fcb5
JX
18005msgid "Could not resolve HEAD to a revision"
18006msgstr "无法将 HEAD 解析为一个版本"
18007
ddc12c42 18008#: builtin/rebase.c:2044
4c27fcb5
JX
18009msgid "Cannot autostash"
18010msgstr "无法 autostash"
18011
ddc12c42 18012#: builtin/rebase.c:2047
4c27fcb5
JX
18013#, c-format
18014msgid "Unexpected stash response: '%s'"
18015msgstr "意外的 stash 响应:'%s'"
18016
ddc12c42 18017#: builtin/rebase.c:2053
4c27fcb5
JX
18018#, c-format
18019msgid "Could not create directory for '%s'"
18020msgstr "不能为 '%s' 创建目录"
18021
ddc12c42 18022#: builtin/rebase.c:2056
4c27fcb5
JX
18023#, c-format
18024msgid "Created autostash: %s\n"
18025msgstr "创建了 autostash:%s\n"
18026
ddc12c42 18027#: builtin/rebase.c:2059
4c27fcb5
JX
18028msgid "could not reset --hard"
18029msgstr "无法 reset --hard"
18030
ddc12c42 18031#: builtin/rebase.c:2068
4c27fcb5
JX
18032msgid "Please commit or stash them."
18033msgstr "请提交或贮藏修改。"
18034
ddc12c42 18035#: builtin/rebase.c:2095
4c27fcb5
JX
18036#, c-format
18037msgid "could not parse '%s'"
18038msgstr "无法解析 '%s'"
18039
ddc12c42 18040#: builtin/rebase.c:2108
4c27fcb5
JX
18041#, c-format
18042msgid "could not switch to %s"
18043msgstr "无法切换到 %s"
18044
ddc12c42 18045#: builtin/rebase.c:2119
4c27fcb5
JX
18046msgid "HEAD is up to date."
18047msgstr "HEAD 是最新的。"
18048
ddc12c42 18049#: builtin/rebase.c:2121
4c27fcb5
JX
18050#, c-format
18051msgid "Current branch %s is up to date.\n"
18052msgstr "当前分支 %s 是最新的。\n"
18053
ddc12c42 18054#: builtin/rebase.c:2129
4c27fcb5
JX
18055msgid "HEAD is up to date, rebase forced."
18056msgstr "HEAD 是最新的,强制变基。"
18057
ddc12c42 18058#: builtin/rebase.c:2131
4c27fcb5
JX
18059#, c-format
18060msgid "Current branch %s is up to date, rebase forced.\n"
18061msgstr "当前分支 %s 是最新的,强制变基。\n"
18062
ddc12c42 18063#: builtin/rebase.c:2139
4c27fcb5
JX
18064msgid "The pre-rebase hook refused to rebase."
18065msgstr "pre-rebase 钩子拒绝了变基操作。"
18066
ddc12c42 18067#: builtin/rebase.c:2146
4c27fcb5
JX
18068#, c-format
18069msgid "Changes to %s:\n"
18070msgstr "到 %s 的变更:\n"
18071
ddc12c42 18072#: builtin/rebase.c:2149
4c27fcb5
JX
18073#, c-format
18074msgid "Changes from %s to %s:\n"
18075msgstr "从 %s 到 %s 的变更:\n"
18076
ddc12c42 18077#: builtin/rebase.c:2174
4c27fcb5
JX
18078#, c-format
18079msgid "First, rewinding head to replay your work on top of it...\n"
18080msgstr "首先,回退头指针以便在其上重放您的工作...\n"
18081
ddc12c42 18082#: builtin/rebase.c:2183
4c27fcb5
JX
18083msgid "Could not detach HEAD"
18084msgstr "无法分离头指针"
18085
ddc12c42 18086#: builtin/rebase.c:2192
4c27fcb5
JX
18087#, c-format
18088msgid "Fast-forwarded %s to %s.\n"
18089msgstr "快进 %s 到 %s。\n"
18090
a6cd2cc4 18091#: builtin/receive-pack.c:32
5b04ee3b 18092msgid "git receive-pack <git-dir>"
58b6f078 18093msgstr "git receive-pack <仓库目录>"
5b04ee3b 18094
a5cd71ca 18095#: builtin/receive-pack.c:830
a0b6b246
JX
18096msgid ""
18097"By default, updating the current branch in a non-bare repository\n"
18098"is denied, because it will make the index and work tree inconsistent\n"
18099"with what you pushed, and will require 'git reset --hard' to match\n"
18100"the work tree to HEAD.\n"
18101"\n"
1a79b2f1
JX
18102"You can set the 'receive.denyCurrentBranch' configuration variable\n"
18103"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
a0b6b246
JX
18104"its current branch; however, this is not recommended unless you\n"
18105"arranged to update its work tree to match what you pushed in some\n"
18106"other way.\n"
18107"\n"
18108"To squelch this message and still keep the default behaviour, set\n"
18109"'receive.denyCurrentBranch' configuration variable to 'refuse'."
18110msgstr ""
18111"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
18112"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
18113"\n"
18114"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
18115"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
18116"用某种方式将其工作区更新至您推送的状态。\n"
18117"\n"
18118"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
18119"配置变量为 'refuse'。"
18120
a5cd71ca 18121#: builtin/receive-pack.c:850
a0b6b246
JX
18122msgid ""
18123"By default, deleting the current branch is denied, because the next\n"
18124"'git clone' won't result in any file checked out, causing confusion.\n"
18125"\n"
18126"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
18127"'warn' or 'ignore' in the remote repository to allow deleting the\n"
18128"current branch, with or without a warning message.\n"
18129"\n"
18130"To squelch this message, you can set it to 'refuse'."
18131msgstr ""
18132"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
29004bbb 18133"导致困惑。\n"
a0b6b246
JX
18134"\n"
18135"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
29004bbb 18136"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
a0b6b246
JX
18137"\n"
18138"若要屏蔽此信息,您可以设置它为 'refuse'。"
18139
a5cd71ca 18140#: builtin/receive-pack.c:1936
5b04ee3b
JX
18141msgid "quiet"
18142msgstr "静默模式"
18143
a5cd71ca 18144#: builtin/receive-pack.c:1950
5b04ee3b
JX
18145msgid "You must specify a directory."
18146msgstr "您必须指定一个目录。"
18147
06991777
JX
18148#: builtin/reflog.c:17
18149msgid ""
18150"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
18151"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
18152"<refs>..."
18153msgstr ""
18154"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
18155"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
18156"用>..."
18157
18158#: builtin/reflog.c:22
18159msgid ""
18160"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
18161"<refs>..."
18162msgstr ""
18163"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
18164"用>..."
18165
18166#: builtin/reflog.c:25
18167msgid "git reflog exists <ref>"
18168msgstr "git reflog exists <引用>"
18169
18170#: builtin/reflog.c:567 builtin/reflog.c:572
2e8451e8
JX
18171#, c-format
18172msgid "'%s' is not a valid timestamp"
18173msgstr "'%s' 不是一个有效的时间戳"
18174
06991777
JX
18175#: builtin/reflog.c:605
18176#, c-format
18177msgid "Marking reachable objects..."
18178msgstr "正在标记可达对象..."
18179
18180#: builtin/reflog.c:643
18181#, c-format
18182msgid "%s points nowhere!"
18183msgstr "%s 指向不存在!"
18184
18185#: builtin/reflog.c:695
18186msgid "no reflog specified to delete"
18187msgstr "未指定要删除的引用日志"
18188
18189#: builtin/reflog.c:704
18190#, c-format
18191msgid "not a reflog: %s"
18192msgstr "不是一个引用日志:%s"
18193
18194#: builtin/reflog.c:709
18195#, c-format
18196msgid "no reflog for '%s'"
18197msgstr "没有 '%s' 的引用日志"
18198
18199#: builtin/reflog.c:755
18200#, c-format
18201msgid "invalid ref format: %s"
18202msgstr "无效的引用格式:%s"
18203
18204#: builtin/reflog.c:764
18205msgid "git reflog [ show | expire | delete | exists ]"
18206msgstr "git reflog [ show | expire | delete | exists ]"
18207
4c27fcb5 18208#: builtin/remote.c:16
ef317cd5 18209msgid "git remote [-v | --verbose]"
07432cef 18210msgstr "git remote [-v | --verbose]"
ef317cd5 18211
4c27fcb5 18212#: builtin/remote.c:17
ef317cd5 18213msgid ""
814ff314 18214"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
18215"mirror=<fetch|push>] <name> <url>"
18216msgstr ""
814ff314 18217"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 18218"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 18219
4c27fcb5 18220#: builtin/remote.c:18 builtin/remote.c:38
ef317cd5 18221msgid "git remote rename <old> <new>"
07432cef 18222msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 18223
4c27fcb5 18224#: builtin/remote.c:19 builtin/remote.c:43
ef317cd5 18225msgid "git remote remove <name>"
07432cef 18226msgstr "git remote remove <名称>"
ef317cd5 18227
4c27fcb5 18228#: builtin/remote.c:20 builtin/remote.c:48
814ff314
JX
18229msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
18230msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 18231
4c27fcb5 18232#: builtin/remote.c:21
ef317cd5 18233msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 18234msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 18235
4c27fcb5 18236#: builtin/remote.c:22
ef317cd5 18237msgid "git remote prune [-n | --dry-run] <name>"
07432cef 18238msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 18239
4c27fcb5 18240#: builtin/remote.c:23
ef317cd5
JX
18241msgid ""
18242"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 18243msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 18244
4c27fcb5 18245#: builtin/remote.c:24
ef317cd5 18246msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 18247msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 18248
4c27fcb5 18249#: builtin/remote.c:25 builtin/remote.c:74
94550ed3
JX
18250msgid "git remote get-url [--push] [--all] <name>"
18251msgstr "git remote get-url [--push] [--all] <名称>"
18252
4c27fcb5 18253#: builtin/remote.c:26 builtin/remote.c:79
ef317cd5 18254msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 18255msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 18256
4c27fcb5 18257#: builtin/remote.c:27 builtin/remote.c:80
ef317cd5 18258msgid "git remote set-url --add <name> <newurl>"
07432cef 18259msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 18260
4c27fcb5 18261#: builtin/remote.c:28 builtin/remote.c:81
ef317cd5 18262msgid "git remote set-url --delete <name> <url>"
07432cef 18263msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 18264
4c27fcb5 18265#: builtin/remote.c:33
ef317cd5 18266msgid "git remote add [<options>] <name> <url>"
07432cef 18267msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 18268
4c27fcb5 18269#: builtin/remote.c:53
ef317cd5 18270msgid "git remote set-branches <name> <branch>..."
07432cef 18271msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 18272
4c27fcb5 18273#: builtin/remote.c:54
ef317cd5 18274msgid "git remote set-branches --add <name> <branch>..."
07432cef 18275msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 18276
4c27fcb5 18277#: builtin/remote.c:59
ef317cd5 18278msgid "git remote show [<options>] <name>"
07432cef 18279msgstr "git remote show [<选项>] <名称>"
ef317cd5 18280
4c27fcb5 18281#: builtin/remote.c:64
ef317cd5 18282msgid "git remote prune [<options>] <name>"
07432cef 18283msgstr "git remote prune [<选项>] <名称>"
ef317cd5 18284
4c27fcb5 18285#: builtin/remote.c:69
ef317cd5 18286msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 18287msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 18288
4c27fcb5 18289#: builtin/remote.c:98
81809b99 18290#, c-format
8ada9598 18291msgid "Updating %s"
81809b99 18292msgstr "更新 %s 中"
8ada9598 18293
4c27fcb5 18294#: builtin/remote.c:130
8ada9598
JX
18295msgid ""
18296"--mirror is dangerous and deprecated; please\n"
18297"\t use --mirror=fetch or --mirror=push instead"
18298msgstr ""
81809b99
JX
18299"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
18300"\t 或 --mirror=push"
8ada9598 18301
4c27fcb5 18302#: builtin/remote.c:147
81809b99 18303#, c-format
8ada9598 18304msgid "unknown mirror argument: %s"
81809b99 18305msgstr "未知的镜像参数:%s"
8ada9598 18306
4c27fcb5 18307#: builtin/remote.c:163
ef317cd5 18308msgid "fetch the remote branches"
07432cef 18309msgstr "抓取远程的分支"
ef317cd5 18310
4c27fcb5 18311#: builtin/remote.c:165
ef317cd5 18312msgid "import all tags and associated objects when fetching"
55a16ee4 18313msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 18314
4c27fcb5 18315#: builtin/remote.c:168
ef317cd5 18316msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 18317msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 18318
4c27fcb5 18319#: builtin/remote.c:170
ef317cd5 18320msgid "branch(es) to track"
07432cef 18321msgstr "跟踪的分支"
ef317cd5 18322
4c27fcb5 18323#: builtin/remote.c:171
ef317cd5 18324msgid "master branch"
07432cef 18325msgstr "主线分支"
ef317cd5 18326
4c27fcb5 18327#: builtin/remote.c:173
ef317cd5 18328msgid "set up remote as a mirror to push to or fetch from"
07432cef 18329msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 18330
4c27fcb5 18331#: builtin/remote.c:185
8ada9598 18332msgid "specifying a master branch makes no sense with --mirror"
81809b99 18333msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 18334
4c27fcb5 18335#: builtin/remote.c:187
8ada9598 18336msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 18337msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 18338
4c27fcb5 18339#: builtin/remote.c:194 builtin/remote.c:636
81809b99 18340#, c-format
8ada9598 18341msgid "remote %s already exists."
81809b99 18342msgstr "远程 %s 已经存在。"
8ada9598 18343
4c27fcb5 18344#: builtin/remote.c:198 builtin/remote.c:640
81809b99 18345#, c-format
8ada9598 18346msgid "'%s' is not a valid remote name"
81809b99 18347msgstr "'%s' 不是一个有效的远程名称"
8ada9598 18348
4c27fcb5 18349#: builtin/remote.c:238
81809b99 18350#, c-format
8ada9598 18351msgid "Could not setup master '%s'"
81809b99 18352msgstr "无法设置 master '%s'"
8ada9598 18353
4c27fcb5 18354#: builtin/remote.c:344
81809b99 18355#, c-format
8ada9598 18356msgid "Could not get fetch map for refspec %s"
160fb2b2 18357msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 18358
4c27fcb5 18359#: builtin/remote.c:443 builtin/remote.c:451
8ada9598 18360msgid "(matching)"
81809b99 18361msgstr "(匹配)"
8ada9598 18362
4c27fcb5 18363#: builtin/remote.c:455
8ada9598 18364msgid "(delete)"
81809b99 18365msgstr "(删除)"
8ada9598 18366
ddc12c42 18367#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863
81809b99 18368#, c-format
4c27fcb5
JX
18369msgid "No such remote: '%s'"
18370msgstr "没有此远程仓库:'%s'"
8ada9598 18371
4c27fcb5 18372#: builtin/remote.c:646
81809b99 18373#, c-format
8ada9598 18374msgid "Could not rename config section '%s' to '%s'"
81809b99 18375msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 18376
4c27fcb5 18377#: builtin/remote.c:666
8ada9598
JX
18378#, c-format
18379msgid ""
d691f479 18380"Not updating non-default fetch refspec\n"
8ada9598
JX
18381"\t%s\n"
18382"\tPlease update the configuration manually if necessary."
18383msgstr ""
160fb2b2 18384"没有更新非默认的获取引用规格\n"
81809b99
JX
18385"\t%s\n"
18386"\t如果必要请手动更新配置。"
8ada9598 18387
ddc12c42 18388#: builtin/remote.c:701
81809b99 18389#, c-format
8ada9598 18390msgid "deleting '%s' failed"
81809b99 18391msgstr "删除 '%s' 失败"
8ada9598 18392
ddc12c42 18393#: builtin/remote.c:735
81809b99 18394#, c-format
8ada9598 18395msgid "creating '%s' failed"
81809b99 18396msgstr "创建 '%s' 失败"
8ada9598 18397
ddc12c42 18398#: builtin/remote.c:801
8ada9598
JX
18399msgid ""
18400"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
18401"to delete it, use:"
18402msgid_plural ""
18403"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
18404"to delete them, use:"
5ae481e0
JX
18405msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
18406msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 18407
ddc12c42 18408#: builtin/remote.c:815
276ceeaa
JX
18409#, c-format
18410msgid "Could not remove config section '%s'"
18411msgstr "不能移除配置小节 '%s'"
18412
ddc12c42 18413#: builtin/remote.c:916
8ada9598
JX
18414#, c-format
18415msgid " new (next fetch will store in remotes/%s)"
81809b99 18416msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 18417
ddc12c42 18418#: builtin/remote.c:919
8ada9598 18419msgid " tracked"
81809b99 18420msgstr " 已跟踪"
8ada9598 18421
ddc12c42 18422#: builtin/remote.c:921
8ada9598 18423msgid " stale (use 'git remote prune' to remove)"
81809b99 18424msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 18425
ddc12c42 18426#: builtin/remote.c:923
8ada9598 18427msgid " ???"
81809b99 18428msgstr " ???"
8ada9598 18429
ddc12c42 18430#: builtin/remote.c:964
8ada9598
JX
18431#, c-format
18432msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 18433msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 18434
ddc12c42 18435#: builtin/remote.c:973
81809b99 18436#, c-format
276ceeaa
JX
18437msgid "rebases interactively onto remote %s"
18438msgstr "交互式变基到远程 %s"
8ada9598 18439
ddc12c42 18440#: builtin/remote.c:975
fd8cb379
JX
18441#, c-format
18442msgid "rebases interactively (with merges) onto remote %s"
18443msgstr "交互式变基(含合并提交)到远程 %s"
18444
ddc12c42 18445#: builtin/remote.c:978
5c57d762
JX
18446#, c-format
18447msgid "rebases onto remote %s"
18448msgstr "变基到远程 %s"
18449
ddc12c42 18450#: builtin/remote.c:982
81809b99 18451#, c-format
8ada9598 18452msgid " merges with remote %s"
81809b99 18453msgstr " 与远程 %s 合并"
8ada9598 18454
ddc12c42 18455#: builtin/remote.c:985
81809b99 18456#, c-format
8ada9598 18457msgid "merges with remote %s"
81809b99 18458msgstr "与远程 %s 合并"
8ada9598 18459
ddc12c42 18460#: builtin/remote.c:988
5c57d762
JX
18461#, c-format
18462msgid "%-*s and with remote %s\n"
18463msgstr "%-*s 以及和远程 %s\n"
8ada9598 18464
ddc12c42 18465#: builtin/remote.c:1031
8ada9598 18466msgid "create"
81809b99 18467msgstr "创建"
8ada9598 18468
ddc12c42 18469#: builtin/remote.c:1034
8ada9598 18470msgid "delete"
81809b99 18471msgstr "删除"
8ada9598 18472
ddc12c42 18473#: builtin/remote.c:1038
8ada9598 18474msgid "up to date"
81809b99 18475msgstr "最新"
8ada9598 18476
ddc12c42 18477#: builtin/remote.c:1041
8ada9598 18478msgid "fast-forwardable"
81809b99 18479msgstr "可快进"
8ada9598 18480
ddc12c42 18481#: builtin/remote.c:1044
8ada9598 18482msgid "local out of date"
81809b99 18483msgstr "本地已过时"
8ada9598 18484
ddc12c42 18485#: builtin/remote.c:1051
8ada9598
JX
18486#, c-format
18487msgid " %-*s forces to %-*s (%s)"
81809b99 18488msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 18489
ddc12c42 18490#: builtin/remote.c:1054
8ada9598
JX
18491#, c-format
18492msgid " %-*s pushes to %-*s (%s)"
81809b99 18493msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 18494
ddc12c42 18495#: builtin/remote.c:1058
8ada9598
JX
18496#, c-format
18497msgid " %-*s forces to %s"
81809b99 18498msgstr " %-*s 强制推送至 %s"
8ada9598 18499
ddc12c42 18500#: builtin/remote.c:1061
8ada9598
JX
18501#, c-format
18502msgid " %-*s pushes to %s"
81809b99 18503msgstr " %-*s 推送至 %s"
8ada9598 18504
ddc12c42 18505#: builtin/remote.c:1129
ef317cd5 18506msgid "do not query remotes"
07432cef 18507msgstr "不查询远程"
ef317cd5 18508
ddc12c42 18509#: builtin/remote.c:1156
81809b99 18510#, c-format
8ada9598 18511msgid "* remote %s"
81809b99 18512msgstr "* 远程 %s"
8ada9598 18513
ddc12c42 18514#: builtin/remote.c:1157
8ada9598
JX
18515#, c-format
18516msgid " Fetch URL: %s"
81809b99 18517msgstr " 获取地址:%s"
8ada9598 18518
ddc12c42 18519#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313
8ada9598 18520msgid "(no URL)"
81809b99 18521msgstr "(无 URL)"
8ada9598 18522
a4f16749
JX
18523#. TRANSLATORS: the colon ':' should align
18524#. with the one in " Fetch URL: %s"
18525#. translation.
18526#.
ddc12c42 18527#: builtin/remote.c:1172 builtin/remote.c:1174
8ada9598
JX
18528#, c-format
18529msgid " Push URL: %s"
81809b99 18530msgstr " 推送地址:%s"
8ada9598 18531
ddc12c42 18532#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
81809b99 18533#, c-format
8ada9598 18534msgid " HEAD branch: %s"
4375c10e 18535msgstr " HEAD 分支:%s"
8ada9598 18536
5c57d762 18537# 译者:中文字符串拼接,可删除前导空格
ddc12c42 18538#: builtin/remote.c:1176
5c57d762
JX
18539msgid "(not queried)"
18540msgstr "(未查询)"
18541
ddc12c42 18542#: builtin/remote.c:1178
5c57d762
JX
18543msgid "(unknown)"
18544msgstr "(未知)"
18545
ddc12c42 18546#: builtin/remote.c:1182
8ada9598
JX
18547#, c-format
18548msgid ""
18549" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 18550msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 18551
ddc12c42 18552#: builtin/remote.c:1194
81809b99 18553#, c-format
8ada9598
JX
18554msgid " Remote branch:%s"
18555msgid_plural " Remote branches:%s"
81809b99 18556msgstr[0] " 远程分支:%s"
5ae481e0 18557msgstr[1] " 远程分支:%s"
8ada9598 18558
81809b99 18559# 译者:中文字符串拼接,可删除前导空格
ddc12c42 18560#: builtin/remote.c:1197 builtin/remote.c:1223
8ada9598 18561msgid " (status not queried)"
81809b99 18562msgstr "(状态未查询)"
8ada9598 18563
ddc12c42 18564#: builtin/remote.c:1206
8ada9598
JX
18565msgid " Local branch configured for 'git pull':"
18566msgid_plural " Local branches configured for 'git pull':"
81809b99 18567msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 18568msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 18569
ddc12c42 18570#: builtin/remote.c:1214
8ada9598 18571msgid " Local refs will be mirrored by 'git push'"
81809b99 18572msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 18573
ddc12c42 18574#: builtin/remote.c:1220
81809b99 18575#, c-format
8ada9598
JX
18576msgid " Local ref configured for 'git push'%s:"
18577msgid_plural " Local refs configured for 'git push'%s:"
81809b99 18578msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 18579msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 18580
ddc12c42 18581#: builtin/remote.c:1241
ef317cd5 18582msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 18583msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 18584
ddc12c42 18585#: builtin/remote.c:1243
ef317cd5 18586msgid "delete refs/remotes/<name>/HEAD"
07432cef 18587msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 18588
ddc12c42 18589#: builtin/remote.c:1258
8ada9598 18590msgid "Cannot determine remote HEAD"
81809b99 18591msgstr "无法确定远程 HEAD"
8ada9598 18592
ddc12c42 18593#: builtin/remote.c:1260
8ada9598 18594msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 18595msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 18596
ddc12c42 18597#: builtin/remote.c:1270
81809b99 18598#, c-format
8ada9598 18599msgid "Could not delete %s"
81809b99 18600msgstr "无法删除 %s"
8ada9598 18601
ddc12c42 18602#: builtin/remote.c:1278
81809b99 18603#, c-format
8ada9598 18604msgid "Not a valid ref: %s"
81809b99 18605msgstr "不是一个有效引用:%s"
8ada9598 18606
ddc12c42 18607#: builtin/remote.c:1280
81809b99 18608#, c-format
8ada9598 18609msgid "Could not setup %s"
81809b99 18610msgstr "不能设置 %s"
8ada9598
JX
18611
18612# 译者:注意保持前导空格
ddc12c42 18613#: builtin/remote.c:1298
81809b99 18614#, c-format
8ada9598 18615msgid " %s will become dangling!"
e640d114 18616msgstr " %s 将成为悬空状态!"
8ada9598
JX
18617
18618# 译者:注意保持前导空格
ddc12c42 18619#: builtin/remote.c:1299
81809b99 18620#, c-format
8ada9598 18621msgid " %s has become dangling!"
e640d114 18622msgstr " %s 已成为悬空状态!"
8ada9598 18623
ddc12c42 18624#: builtin/remote.c:1309
81809b99 18625#, c-format
8ada9598 18626msgid "Pruning %s"
81809b99 18627msgstr "修剪 %s"
8ada9598 18628
ddc12c42 18629#: builtin/remote.c:1310
8ada9598
JX
18630#, c-format
18631msgid "URL: %s"
81809b99 18632msgstr "URL:%s"
8ada9598 18633
ddc12c42 18634#: builtin/remote.c:1326
8ada9598
JX
18635#, c-format
18636msgid " * [would prune] %s"
81809b99 18637msgstr " * [将删除] %s"
8ada9598 18638
ddc12c42 18639#: builtin/remote.c:1329
8ada9598
JX
18640#, c-format
18641msgid " * [pruned] %s"
81809b99 18642msgstr " * [已删除] %s"
8ada9598 18643
ddc12c42 18644#: builtin/remote.c:1374
ef317cd5 18645msgid "prune remotes after fetching"
07432cef 18646msgstr "抓取后清除远程"
ef317cd5 18647
ddc12c42 18648#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559
81809b99 18649#, c-format
8ada9598 18650msgid "No such remote '%s'"
81809b99 18651msgstr "没有此远程 '%s'"
8ada9598 18652
ddc12c42 18653#: builtin/remote.c:1453
ef317cd5 18654msgid "add branch"
07432cef 18655msgstr "添加分支"
ef317cd5 18656
ddc12c42 18657#: builtin/remote.c:1460
8ada9598 18658msgid "no remote specified"
81809b99 18659msgstr "未指定远程"
8ada9598 18660
ddc12c42 18661#: builtin/remote.c:1477
94550ed3
JX
18662msgid "query push URLs rather than fetch URLs"
18663msgstr "查询推送 URL 地址,而非获取 URL 地址"
18664
ddc12c42 18665#: builtin/remote.c:1479
94550ed3
JX
18666msgid "return all URLs"
18667msgstr "返回所有 URL 地址"
18668
ddc12c42 18669#: builtin/remote.c:1507
94550ed3
JX
18670#, c-format
18671msgid "no URLs configured for remote '%s'"
18672msgstr "没有给远程仓库 '%s' 设定 URL"
18673
ddc12c42 18674#: builtin/remote.c:1533
ef317cd5 18675msgid "manipulate push URLs"
07432cef 18676msgstr "操作推送 URLS"
ef317cd5 18677
ddc12c42 18678#: builtin/remote.c:1535
ef317cd5 18679msgid "add URL"
07432cef 18680msgstr "添加 URL"
ef317cd5 18681
ddc12c42 18682#: builtin/remote.c:1537
ef317cd5 18683msgid "delete URLs"
07432cef 18684msgstr "删除 URLS"
ef317cd5 18685
ddc12c42 18686#: builtin/remote.c:1544
8ada9598 18687msgid "--add --delete doesn't make sense"
81809b99 18688msgstr "--add --delete 无意义"
8ada9598 18689
ddc12c42 18690#: builtin/remote.c:1583
81809b99 18691#, c-format
8ada9598 18692msgid "Invalid old URL pattern: %s"
4375c10e 18693msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 18694
ddc12c42 18695#: builtin/remote.c:1591
81809b99 18696#, c-format
8ada9598 18697msgid "No such URL found: %s"
4375c10e 18698msgstr "未找到此 URL:%s"
8ada9598 18699
ddc12c42 18700#: builtin/remote.c:1593
8ada9598 18701msgid "Will not delete all non-push URLs"
4375c10e 18702msgstr "将不会删除所有非推送 URL 地址"
8ada9598 18703
a5cd71ca 18704#: builtin/repack.c:23
814ff314
JX
18705msgid "git repack [<options>]"
18706msgstr "git repack [<选项>]"
90314792 18707
a5cd71ca 18708#: builtin/repack.c:28
1a79b2f1
JX
18709msgid ""
18710"Incremental repacks are incompatible with bitmap indexes. Use\n"
18711"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
18712msgstr ""
18713"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
18714"或禁用 pack.writebitmaps 配置。"
18715
a5cd71ca 18716#: builtin/repack.c:191
06991777 18717msgid "could not start pack-objects to repack promisor objects"
5b533632 18718msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
06991777 18719
ddc12c42 18720#: builtin/repack.c:230 builtin/repack.c:416
06991777 18721msgid "repack: Expecting full hex object ID lines only from pack-objects."
5b533632 18722msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。"
06991777 18723
ddc12c42 18724#: builtin/repack.c:254
06991777 18725msgid "could not finish pack-objects to repack promisor objects"
5b533632 18726msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
06991777 18727
ddc12c42 18728#: builtin/repack.c:292
90314792
JX
18729msgid "pack everything in a single pack"
18730msgstr "所有内容打包到一个包文件中"
18731
ddc12c42 18732#: builtin/repack.c:294
90314792
JX
18733msgid "same as -a, and turn unreachable objects loose"
18734msgstr "和 -a 相同,并将不可达的对象设为松散对象"
18735
ddc12c42 18736#: builtin/repack.c:297
90314792
JX
18737msgid "remove redundant packs, and run git-prune-packed"
18738msgstr "删除多余的包,运行 git-prune-packed"
18739
ddc12c42 18740#: builtin/repack.c:299
90314792
JX
18741msgid "pass --no-reuse-delta to git-pack-objects"
18742msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
18743
ddc12c42 18744#: builtin/repack.c:301
90314792
JX
18745msgid "pass --no-reuse-object to git-pack-objects"
18746msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
18747
ddc12c42 18748#: builtin/repack.c:303
90314792
JX
18749msgid "do not run git-update-server-info"
18750msgstr "不运行 git-update-server-info"
18751
ddc12c42 18752#: builtin/repack.c:306
90314792
JX
18753msgid "pass --local to git-pack-objects"
18754msgstr "向 git-pack-objects 传递参数 --local"
18755
ddc12c42 18756#: builtin/repack.c:308
6c94aba5
JX
18757msgid "write bitmap index"
18758msgstr "写 bitmap 索引"
18759
ddc12c42 18760#: builtin/repack.c:310
4c27fcb5
JX
18761msgid "pass --delta-islands to git-pack-objects"
18762msgstr "向 git-pack-objects 传递参数 --delta-islands"
18763
ddc12c42 18764#: builtin/repack.c:311
90314792
JX
18765msgid "approxidate"
18766msgstr "近似日期"
18767
ddc12c42 18768#: builtin/repack.c:312
90314792
JX
18769msgid "with -A, do not loosen objects older than this"
18770msgstr "使用 -A,不要将早于给定时间的对象过期"
18771
ddc12c42 18772#: builtin/repack.c:314
5c57d762
JX
18773msgid "with -a, repack unreachable objects"
18774msgstr "使用 -a ,重新对不可达对象打包"
18775
ddc12c42 18776#: builtin/repack.c:316
90314792
JX
18777msgid "size of the window used for delta compression"
18778msgstr "用于增量压缩的窗口值"
18779
ddc12c42 18780#: builtin/repack.c:317 builtin/repack.c:323
8376b58d
JX
18781msgid "bytes"
18782msgstr "字节"
18783
ddc12c42 18784#: builtin/repack.c:318
90314792
JX
18785msgid "same as the above, but limit memory size instead of entries count"
18786msgstr "和上面的相似,但限制内存大小而非条目数"
18787
ddc12c42 18788#: builtin/repack.c:320
90314792
JX
18789msgid "limits the maximum delta depth"
18790msgstr "限制最大增量深度"
18791
ddc12c42 18792#: builtin/repack.c:322
a4f16749
JX
18793msgid "limits the maximum number of threads"
18794msgstr "限制最大线程数"
18795
ddc12c42 18796#: builtin/repack.c:324
90314792 18797msgid "maximum size of each packfile"
dbd6cced 18798msgstr "每个包文件的最大尺寸"
90314792 18799
ddc12c42 18800#: builtin/repack.c:326
6c94aba5
JX
18801msgid "repack objects in packs marked with .keep"
18802msgstr "对标记为 .keep 的包中的对象重新打包"
18803
ddc12c42 18804#: builtin/repack.c:328
fd8cb379
JX
18805msgid "do not repack this pack"
18806msgstr "不要对该包文件重新打包"
18807
ddc12c42 18808#: builtin/repack.c:338
94550ed3
JX
18809msgid "cannot delete packs in a precious-objects repo"
18810msgstr "不能删除珍品仓库中的打包文件"
18811
ddc12c42 18812#: builtin/repack.c:342
5c57d762
JX
18813msgid "--keep-unreachable and -A are incompatible"
18814msgstr "--keep-unreachable 和 -A 不兼容"
18815
ddc12c42 18816#: builtin/repack.c:425
06991777
JX
18817msgid "Nothing new to pack."
18818msgstr "没有新的要打包。"
18819
ddc12c42 18820#: builtin/repack.c:486
06991777
JX
18821#, c-format
18822msgid ""
18823"WARNING: Some packs in use have been renamed by\n"
18824"WARNING: prefixing old- to their name, in order to\n"
18825"WARNING: replace them with the new version of the\n"
18826"WARNING: file. But the operation failed, and the\n"
18827"WARNING: attempt to rename them back to their\n"
18828"WARNING: original names also failed.\n"
18829"WARNING: Please rename them in %s manually:\n"
18830msgstr ""
18831"警告:为了将包文件替换为新版本,一些使用中的包已经\n"
18832"警告:通过添加 old- 前缀的方式重命名。但是操作失败,\n"
18833"警告:并且尝试重命名改回原有文件名的操作也失败。\n"
18834"警告:请手动将 %s 下的这些文件重命名:\n"
18835
ddc12c42 18836#: builtin/repack.c:534
90314792 18837#, c-format
5c57d762 18838msgid "failed to remove '%s'"
c1ac5258 18839msgstr "删除 '%s' 失败"
90314792 18840
fd8cb379 18841#: builtin/replace.c:22
ef317cd5 18842msgid "git replace [-f] <object> <replacement>"
07432cef 18843msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 18844
fd8cb379 18845#: builtin/replace.c:23
6acbf033
JX
18846msgid "git replace [-f] --edit <object>"
18847msgstr "git replace [-f] --edit <对象>"
18848
fd8cb379 18849#: builtin/replace.c:24
6acbf033
JX
18850msgid "git replace [-f] --graft <commit> [<parent>...]"
18851msgstr "git replace [-f] --graft <提交> [<父提交>...]"
18852
fd8cb379
JX
18853#: builtin/replace.c:25
18854msgid "git replace [-f] --convert-graft-file"
18855msgstr "git replace [-f] --convert-graft-file"
18856
18857#: builtin/replace.c:26
ef317cd5 18858msgid "git replace -d <object>..."
07432cef 18859msgstr "git replace -d <对象>..."
ef317cd5 18860
fd8cb379 18861#: builtin/replace.c:27
cfff71a9
JX
18862msgid "git replace [--format=<format>] [-l [<pattern>]]"
18863msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 18864
d46c5519 18865#: builtin/replace.c:90
c1ac5258
JX
18866#, c-format
18867msgid ""
18868"invalid replace format '%s'\n"
18869"valid formats are 'short', 'medium' and 'long'"
18870msgstr ""
18871"无效的替换格式 '%s'\n"
18872"有效的格式有 'short'、'medium' 和 'long'"
18873
d46c5519 18874#: builtin/replace.c:125
c1ac5258
JX
18875#, c-format
18876msgid "replace ref '%s' not found"
18877msgstr "未发现替换引用 '%s'"
18878
d46c5519 18879#: builtin/replace.c:141
c1ac5258
JX
18880#, c-format
18881msgid "Deleted replace ref '%s'"
e640d114 18882msgstr "已删除替换引用 '%s'"
c1ac5258 18883
d46c5519 18884#: builtin/replace.c:153
c1ac5258
JX
18885#, c-format
18886msgid "'%s' is not a valid ref name"
18887msgstr "'%s' 不是一个有效的引用名"
18888
d46c5519 18889#: builtin/replace.c:158
c1ac5258
JX
18890#, c-format
18891msgid "replace ref '%s' already exists"
18892msgstr "替换引用 '%s' 已经存在"
18893
d46c5519 18894#: builtin/replace.c:178
c1ac5258
JX
18895#, c-format
18896msgid ""
18897"Objects must be of the same type.\n"
18898"'%s' points to a replaced object of type '%s'\n"
18899"while '%s' points to a replacement object of type '%s'."
18900msgstr ""
18901"对象必须属于同一类型。\n"
18902"'%s' 指向 '%s' 类型的替换对象\n"
18903"而 '%s' 指向 '%s' 类型的替换对象。"
18904
d46c5519 18905#: builtin/replace.c:229
c1ac5258
JX
18906#, c-format
18907msgid "unable to open %s for writing"
18908msgstr "无法为写入打开 %s"
18909
d46c5519 18910#: builtin/replace.c:242
c1ac5258
JX
18911msgid "cat-file reported failure"
18912msgstr "cat-file 报告失败"
18913
d46c5519 18914#: builtin/replace.c:258
c1ac5258
JX
18915#, c-format
18916msgid "unable to open %s for reading"
18917msgstr "无法为读取打开 %s"
18918
d46c5519 18919#: builtin/replace.c:272
c1ac5258
JX
18920msgid "unable to spawn mktree"
18921msgstr "无法启动 mktree"
18922
d46c5519 18923#: builtin/replace.c:276
c1ac5258
JX
18924msgid "unable to read from mktree"
18925msgstr "无法从 mktree 读取"
18926
d46c5519 18927#: builtin/replace.c:285
c1ac5258
JX
18928msgid "mktree reported failure"
18929msgstr "mktree 报告失败"
18930
d46c5519 18931#: builtin/replace.c:289
c1ac5258
JX
18932msgid "mktree did not return an object name"
18933msgstr "mktree 没有返回一个对象名"
18934
d46c5519 18935#: builtin/replace.c:298
c1ac5258
JX
18936#, c-format
18937msgid "unable to fstat %s"
18938msgstr "无法对 %s 执行 fstat"
18939
d46c5519 18940#: builtin/replace.c:303
c1ac5258
JX
18941msgid "unable to write object to database"
18942msgstr "无法向数据库写入对象"
18943
a5cd71ca
JX
18944#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423
18945#: builtin/replace.c:453
c1ac5258
JX
18946#, c-format
18947msgid "not a valid object name: '%s'"
6acbf033
JX
18948msgstr "不是一个有效的对象名:'%s'"
18949
d46c5519 18950#: builtin/replace.c:326
c1ac5258
JX
18951#, c-format
18952msgid "unable to get object type for %s"
18953msgstr "无法得到 %s 的对象类型"
18954
d46c5519 18955#: builtin/replace.c:342
c1ac5258
JX
18956msgid "editing object file failed"
18957msgstr "编辑对象文件失败"
18958
d46c5519 18959#: builtin/replace.c:351
c1ac5258
JX
18960#, c-format
18961msgid "new object is the same as the old one: '%s'"
18962msgstr "新对象和旧对象相同:'%s'"
18963
a5cd71ca 18964#: builtin/replace.c:384
d46c5519
JX
18965#, c-format
18966msgid "could not parse %s as a commit"
18967msgstr "无法将 %s 解析为一个提交"
18968
a5cd71ca 18969#: builtin/replace.c:415
6acbf033
JX
18970#, c-format
18971msgid "bad mergetag in commit '%s'"
55a16ee4 18972msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 18973
a5cd71ca 18974#: builtin/replace.c:417
6acbf033
JX
18975#, c-format
18976msgid "malformed mergetag in commit '%s'"
fd8cb379 18977msgstr "提交 '%s' 中含有格式错误的合并标签"
6acbf033 18978
a5cd71ca 18979#: builtin/replace.c:429
6acbf033
JX
18980#, c-format
18981msgid ""
18982"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
18983"instead of --graft"
55a16ee4 18984msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 18985
a5cd71ca 18986#: builtin/replace.c:468
6acbf033 18987#, c-format
c1ac5258
JX
18988msgid "the original commit '%s' has a gpg signature"
18989msgstr "原始提交 '%s' 中有一个 gpg 签名"
6acbf033 18990
a5cd71ca 18991#: builtin/replace.c:469
6acbf033
JX
18992msgid "the signature will be removed in the replacement commit!"
18993msgstr "在替换的提交中签名将被移除!"
18994
a5cd71ca 18995#: builtin/replace.c:479
6acbf033
JX
18996#, c-format
18997msgid "could not write replacement commit for: '%s'"
18998msgstr "不能为 '%s' 写替换提交"
18999
a5cd71ca 19000#: builtin/replace.c:487
c1ac5258
JX
19001#, c-format
19002msgid "graft for '%s' unnecessary"
19003msgstr "对 '%s' 移植没有必要"
19004
a5cd71ca 19005#: builtin/replace.c:491
c1ac5258
JX
19006#, c-format
19007msgid "new commit is the same as the old one: '%s'"
19008msgstr "新提交和旧的一样:'%s'"
19009
a5cd71ca 19010#: builtin/replace.c:526
fd8cb379
JX
19011#, c-format
19012msgid ""
19013"could not convert the following graft(s):\n"
19014"%s"
19015msgstr ""
19016"不能转换下列移植:\n"
19017"%s"
19018
a5cd71ca 19019#: builtin/replace.c:547
ef317cd5 19020msgid "list replace refs"
07432cef 19021msgstr "列出替换的引用"
ef317cd5 19022
a5cd71ca 19023#: builtin/replace.c:548
ef317cd5 19024msgid "delete replace refs"
07432cef 19025msgstr "删除替换的引用"
ef317cd5 19026
a5cd71ca 19027#: builtin/replace.c:549
6acbf033
JX
19028msgid "edit existing object"
19029msgstr "编辑现存的对象"
19030
a5cd71ca 19031#: builtin/replace.c:550
6acbf033
JX
19032msgid "change a commit's parents"
19033msgstr "修改一个提交的父提交"
19034
a5cd71ca 19035#: builtin/replace.c:551
fd8cb379
JX
19036msgid "convert existing graft file"
19037msgstr "转换现存的移植文件"
19038
a5cd71ca 19039#: builtin/replace.c:552
ef317cd5 19040msgid "replace the ref if it exists"
07432cef 19041msgstr "如果存在则替换引用"
ef317cd5 19042
a5cd71ca 19043#: builtin/replace.c:554
6acbf033
JX
19044msgid "do not pretty-print contents for --edit"
19045msgstr "不要为 --edit 操作美观显示内容"
19046
a5cd71ca 19047#: builtin/replace.c:555
cfff71a9
JX
19048msgid "use this format"
19049msgstr "使用此格式"
19050
a5cd71ca 19051#: builtin/replace.c:568
c1ac5258 19052msgid "--format cannot be used when not listing"
e640d114 19053msgstr "不列出时不能使用 --format"
c1ac5258 19054
a5cd71ca 19055#: builtin/replace.c:576
c1ac5258
JX
19056msgid "-f only makes sense when writing a replacement"
19057msgstr "只有写一个替换时 -f 才有意义"
19058
a5cd71ca 19059#: builtin/replace.c:580
c1ac5258
JX
19060msgid "--raw only makes sense with --edit"
19061msgstr "--raw 只有和 --edit 共用才有意义"
19062
a5cd71ca 19063#: builtin/replace.c:586
c1ac5258
JX
19064msgid "-d needs at least one argument"
19065msgstr "-d 需要至少一个参数"
19066
a5cd71ca 19067#: builtin/replace.c:592
c1ac5258
JX
19068msgid "bad number of arguments"
19069msgstr "错误的参数个数"
19070
a5cd71ca 19071#: builtin/replace.c:598
c1ac5258 19072msgid "-e needs exactly one argument"
e640d114 19073msgstr "-e 需要且仅需要一个参数"
c1ac5258 19074
a5cd71ca 19075#: builtin/replace.c:604
c1ac5258
JX
19076msgid "-g needs at least one argument"
19077msgstr "-g 需要至少一个参数"
19078
a5cd71ca 19079#: builtin/replace.c:610
c1ac5258
JX
19080msgid "--convert-graft-file takes no argument"
19081msgstr "--convert-graft-file 不带参数"
19082
a5cd71ca 19083#: builtin/replace.c:616
c1ac5258
JX
19084msgid "only one pattern can be given with -l"
19085msgstr "只能为 -l 提供一个模式"
19086
a4f16749 19087#: builtin/rerere.c:13
814ff314
JX
19088msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
19089msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 19090
4c27fcb5 19091#: builtin/rerere.c:60
ef317cd5 19092msgid "register clean resolutions in index"
07432cef 19093msgstr "在索引中注册干净的解决方案"
ef317cd5 19094
4c27fcb5
JX
19095#: builtin/rerere.c:79
19096msgid "'git rerere forget' without paths is deprecated"
19097msgstr "没有路径的 'git rerere forget' 已经过时"
19098
06991777 19099#: builtin/rerere.c:113
4c27fcb5
JX
19100#, c-format
19101msgid "unable to generate diff for '%s'"
19102msgstr "无法为 '%s' 生成差异"
19103
06991777 19104#: builtin/reset.c:32
ef317cd5
JX
19105msgid ""
19106"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 19107msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 19108
06991777 19109#: builtin/reset.c:33
ddc12c42
JX
19110msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
19111msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
ef317cd5 19112
06991777 19113#: builtin/reset.c:34
ddc12c42
JX
19114msgid ""
19115"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
19116msgstr ""
19117"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
ef317cd5 19118
ddc12c42
JX
19119#: builtin/reset.c:35
19120msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
19121msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"
19122
19123#: builtin/reset.c:41
c04f5ac3
JX
19124msgid "mixed"
19125msgstr "混杂"
19126
ddc12c42 19127#: builtin/reset.c:41
c04f5ac3
JX
19128msgid "soft"
19129msgstr "软性"
19130
ddc12c42 19131#: builtin/reset.c:41
c04f5ac3
JX
19132msgid "hard"
19133msgstr "硬性"
19134
ddc12c42 19135#: builtin/reset.c:41
8ada9598
JX
19136msgid "merge"
19137msgstr "合并"
19138
ddc12c42 19139#: builtin/reset.c:41
c04f5ac3
JX
19140msgid "keep"
19141msgstr "保持"
19142
ddc12c42 19143#: builtin/reset.c:82
c04f5ac3
JX
19144msgid "You do not have a valid HEAD."
19145msgstr "您没有一个有效的 HEAD。"
19146
ddc12c42 19147#: builtin/reset.c:84
c04f5ac3
JX
19148msgid "Failed to find tree of HEAD."
19149msgstr "无法找到 HEAD 指向的树。"
19150
ddc12c42 19151#: builtin/reset.c:90
c04f5ac3
JX
19152#, c-format
19153msgid "Failed to find tree of %s."
19154msgstr "无法找到 %s 指向的树。"
19155
ddc12c42 19156#: builtin/reset.c:115
a5cd71ca
JX
19157#, c-format
19158msgid "HEAD is now at %s"
19159msgstr "HEAD 现在位于 %s"
19160
90e6ef53 19161# 译者:汉字之间无空格,故删除%s前后空格
ddc12c42 19162#: builtin/reset.c:194
c04f5ac3
JX
19163#, c-format
19164msgid "Cannot do a %s reset in the middle of a merge."
19165msgstr "在合并过程中不能做%s重置操作。"
19166
ddc12c42
JX
19167#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594
19168#: builtin/stash.c:618
ef317cd5 19169msgid "be quiet, only report errors"
07432cef 19170msgstr "安静模式,只报告错误"
ef317cd5 19171
ddc12c42 19172#: builtin/reset.c:296
ef317cd5 19173msgid "reset HEAD and index"
07432cef 19174msgstr "重置 HEAD 和索引"
ef317cd5 19175
ddc12c42 19176#: builtin/reset.c:297
ef317cd5 19177msgid "reset only HEAD"
07432cef 19178msgstr "只重置 HEAD"
ef317cd5 19179
ddc12c42 19180#: builtin/reset.c:299 builtin/reset.c:301
ef317cd5 19181msgid "reset HEAD, index and working tree"
07432cef 19182msgstr "重置 HEAD、索引和工作区"
ef317cd5 19183
ddc12c42 19184#: builtin/reset.c:303
ef317cd5 19185msgid "reset HEAD but keep local changes"
07432cef 19186msgstr "重置 HEAD 但保存本地变更"
ef317cd5 19187
ddc12c42 19188#: builtin/reset.c:309
6c94aba5
JX
19189msgid "record only the fact that removed paths will be added later"
19190msgstr "将删除的路径标记为稍后添加"
19191
ddc12c42 19192#: builtin/reset.c:343
07432cef
WS
19193#, c-format
19194msgid "Failed to resolve '%s' as a valid revision."
19195msgstr "无法将 '%s' 解析为一个有效的版本。"
19196
ddc12c42 19197#: builtin/reset.c:351
07432cef
WS
19198#, c-format
19199msgid "Failed to resolve '%s' as a valid tree."
19200msgstr "无法将 '%s' 解析为一个有效的树对象。"
19201
ddc12c42 19202#: builtin/reset.c:360
c04f5ac3 19203msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 19204msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 19205
ddc12c42 19206#: builtin/reset.c:370
c04f5ac3 19207msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 19208msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 19209
90e6ef53 19210# 译者:汉字之间无空格,故删除%s前后空格
ddc12c42 19211#: builtin/reset.c:372
c04f5ac3
JX
19212#, c-format
19213msgid "Cannot do %s reset with paths."
19214msgstr "不能带路径进行%s重置。"
19215
90e6ef53 19216# 译者:汉字之间无空格,故删除%s前后空格
ddc12c42 19217#: builtin/reset.c:387
c04f5ac3
JX
19218#, c-format
19219msgid "%s reset is not allowed in a bare repository"
160fb2b2 19220msgstr "不能对纯仓库进行%s重置"
c04f5ac3 19221
ddc12c42 19222#: builtin/reset.c:391
6c94aba5
JX
19223msgid "-N can only be used with --mixed"
19224msgstr "-N 只能和 --mixed 同时使用"
19225
ddc12c42 19226#: builtin/reset.c:412
90314792 19227msgid "Unstaged changes after reset:"
160fb2b2 19228msgstr "重置后取消暂存的变更:"
90314792 19229
ddc12c42 19230#: builtin/reset.c:415
4c27fcb5
JX
19231#, c-format
19232msgid ""
19233"\n"
19234"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
19235"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
19236"to make this the default.\n"
19237msgstr ""
19238"\n"
19239"重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
19240"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
19241
ddc12c42 19242#: builtin/reset.c:425
ef317cd5
JX
19243#, c-format
19244msgid "Could not reset index file to revision '%s'."
19245msgstr "不能重置索引文件至版本 '%s'。"
19246
ddc12c42 19247#: builtin/reset.c:429
07432cef
WS
19248msgid "Could not write new index file."
19249msgstr "不能写入新的索引文件。"
19250
a5cd71ca 19251#: builtin/rev-list.c:411
31e5e17b
JX
19252msgid "cannot combine --exclude-promisor-objects and --missing"
19253msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
19254
a5cd71ca 19255#: builtin/rev-list.c:472
5809aa05
JX
19256msgid "object filtering requires --objects"
19257msgstr "对象过滤需要 --objects"
19258
a5cd71ca 19259#: builtin/rev-list.c:522
1b7f4a34
JX
19260msgid "rev-list does not support display of notes"
19261msgstr "rev-list 不支持显示注解"
19262
a5cd71ca 19263#: builtin/rev-list.c:525
5809aa05
JX
19264msgid "cannot combine --use-bitmap-index with object filtering"
19265msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
19266
06991777 19267#: builtin/rev-parse.c:408
814ff314
JX
19268msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
19269msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 19270
06991777 19271#: builtin/rev-parse.c:413
ef317cd5 19272msgid "keep the `--` passed as an arg"
07432cef 19273msgstr "保持 `--` 作为一个参数传递"
ef317cd5 19274
06991777 19275#: builtin/rev-parse.c:415
ef317cd5 19276msgid "stop parsing after the first non-option argument"
07432cef 19277msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 19278
06991777 19279#: builtin/rev-parse.c:418
cfff71a9
JX
19280msgid "output in stuck long form"
19281msgstr "以固定长格式输出"
19282
06991777 19283#: builtin/rev-parse.c:551
ef317cd5 19284msgid ""
814ff314 19285"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 19286" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 19287" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
19288"\n"
19289"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
19290msgstr ""
814ff314 19291"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 19292" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 19293" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
19294"\n"
19295"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5 19296
c1ac5258 19297#: builtin/revert.c:24
814ff314
JX
19298msgid "git revert [<options>] <commit-ish>..."
19299msgstr "git revert [<选项>] <提交号>..."
ef317cd5 19300
c1ac5258 19301#: builtin/revert.c:25
ef317cd5 19302msgid "git revert <subcommand>"
07432cef 19303msgstr "git revert <子命令>"
ef317cd5 19304
c1ac5258 19305#: builtin/revert.c:30
814ff314
JX
19306msgid "git cherry-pick [<options>] <commit-ish>..."
19307msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5 19308
c1ac5258 19309#: builtin/revert.c:31
ef317cd5 19310msgid "git cherry-pick <subcommand>"
07432cef 19311msgstr "git cherry-pick <子命令>"
ef317cd5 19312
06991777
JX
19313#: builtin/revert.c:72
19314#, c-format
19315msgid "option `%s' expects a number greater than zero"
19316msgstr "选项 `%s' 期望一个大于零的数字"
19317
19318#: builtin/revert.c:92
ef317cd5
JX
19319#, c-format
19320msgid "%s: %s cannot be used with %s"
19321msgstr "%s:%s 不能和 %s 同时使用"
19322
d46c5519 19323#: builtin/revert.c:102
ef317cd5 19324msgid "end revert or cherry-pick sequence"
07432cef 19325msgstr "终止反转或拣选操作"
ef317cd5 19326
d46c5519 19327#: builtin/revert.c:103
ef317cd5 19328msgid "resume revert or cherry-pick sequence"
07432cef 19329msgstr "继续反转或拣选操作"
ef317cd5 19330
d46c5519 19331#: builtin/revert.c:104
ef317cd5 19332msgid "cancel revert or cherry-pick sequence"
07432cef 19333msgstr "取消反转或拣选操作"
ef317cd5 19334
a6cd2cc4
JX
19335#: builtin/revert.c:105
19336msgid "skip current commit and continue"
19337msgstr "跳过当前提交并继续"
19338
19339#: builtin/revert.c:107
ef317cd5 19340msgid "don't automatically commit"
07432cef 19341msgstr "不要自动提交"
ef317cd5 19342
a6cd2cc4 19343#: builtin/revert.c:108
ef317cd5 19344msgid "edit the commit message"
07432cef 19345msgstr "编辑提交说明"
ef317cd5 19346
a6cd2cc4 19347#: builtin/revert.c:111
87cb7997 19348msgid "parent-number"
07432cef 19349msgstr "父编号"
ef317cd5 19350
a6cd2cc4 19351#: builtin/revert.c:112
87cb7997
JX
19352msgid "select mainline parent"
19353msgstr "选择主干父提交编号"
19354
a6cd2cc4 19355#: builtin/revert.c:114
ef317cd5 19356msgid "merge strategy"
07432cef 19357msgstr "合并策略"
ef317cd5 19358
a6cd2cc4 19359#: builtin/revert.c:116
ef317cd5 19360msgid "option for merge strategy"
07432cef 19361msgstr "合并策略的选项"
ef317cd5 19362
a6cd2cc4 19363#: builtin/revert.c:125
ef317cd5 19364msgid "append commit name"
07432cef 19365msgstr "追加提交名称"
ef317cd5 19366
a6cd2cc4 19367#: builtin/revert.c:127
ef317cd5 19368msgid "preserve initially empty commits"
07432cef 19369msgstr "保留初始化的空提交"
ef317cd5 19370
a6cd2cc4 19371#: builtin/revert.c:129
ef317cd5 19372msgid "keep redundant, empty commits"
07432cef 19373msgstr "保持多余的、空的提交"
ef317cd5 19374
a6cd2cc4 19375#: builtin/revert.c:232
c04f5ac3
JX
19376msgid "revert failed"
19377msgstr "还原失败"
19378
a6cd2cc4 19379#: builtin/revert.c:245
c04f5ac3
JX
19380msgid "cherry-pick failed"
19381msgstr "拣选失败"
19382
06991777 19383#: builtin/rm.c:19
814ff314
JX
19384msgid "git rm [<options>] [--] <file>..."
19385msgstr "git rm [<选项>] [--] <文件>..."
07432cef 19386
06991777 19387#: builtin/rm.c:207
c04f5ac3 19388msgid ""
2e8451e8
JX
19389"the following file has staged content different from both the\n"
19390"file and the HEAD:"
19391msgid_plural ""
19392"the following files have staged content different from both the\n"
19393"file and the HEAD:"
19394msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
19395msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
19396
06991777 19397#: builtin/rm.c:212
2e8451e8
JX
19398msgid ""
19399"\n"
c04f5ac3
JX
19400"(use -f to force removal)"
19401msgstr ""
2e8451e8 19402"\n"
c04f5ac3
JX
19403"(使用 -f 强制删除)"
19404
06991777 19405#: builtin/rm.c:216
2e8451e8
JX
19406msgid "the following file has changes staged in the index:"
19407msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
19408msgstr[0] "下列文件索引中有变更"
19409msgstr[1] "下列文件索引中有变更"
c04f5ac3 19410
06991777 19411#: builtin/rm.c:220 builtin/rm.c:229
c04f5ac3 19412msgid ""
2e8451e8 19413"\n"
c04f5ac3
JX
19414"(use --cached to keep the file, or -f to force removal)"
19415msgstr ""
2e8451e8
JX
19416"\n"
19417"(使用 --cached 保留本地文件,或用 -f 强制删除)"
19418
06991777 19419#: builtin/rm.c:226
2e8451e8
JX
19420msgid "the following file has local modifications:"
19421msgid_plural "the following files have local modifications:"
19422msgstr[0] "如下文件有本地修改:"
19423msgstr[1] "如下文件有本地修改:"
c04f5ac3 19424
06991777 19425#: builtin/rm.c:242
ef317cd5 19426msgid "do not list removed files"
07432cef 19427msgstr "不列出删除的文件"
ef317cd5 19428
06991777 19429#: builtin/rm.c:243
ef317cd5 19430msgid "only remove from the index"
07432cef 19431msgstr "只从索引区删除"
ef317cd5 19432
06991777 19433#: builtin/rm.c:244
ef317cd5 19434msgid "override the up-to-date check"
07432cef 19435msgstr "忽略文件更新状态检查"
ef317cd5 19436
06991777 19437#: builtin/rm.c:245
ef317cd5 19438msgid "allow recursive removal"
07432cef 19439msgstr "允许递归删除"
ef317cd5 19440
06991777 19441#: builtin/rm.c:247
ef317cd5 19442msgid "exit with a zero status even if nothing matched"
07432cef 19443msgstr "即使没有匹配,也以零状态退出"
ef317cd5 19444
06991777 19445#: builtin/rm.c:289
c1ac5258
JX
19446msgid "please stage your changes to .gitmodules or stash them to proceed"
19447msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
19448
06991777 19449#: builtin/rm.c:307
c04f5ac3
JX
19450#, c-format
19451msgid "not removing '%s' recursively without -r"
19452msgstr "未提供 -r 选项不会递归删除 '%s'"
19453
06991777 19454#: builtin/rm.c:346
c04f5ac3
JX
19455#, c-format
19456msgid "git rm: unable to remove %s"
19457msgstr "git rm:不能删除 %s"
19458
fd8cb379 19459#: builtin/send-pack.c:20
1b7f4a34
JX
19460msgid ""
19461"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
19462"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
19463"[<ref>...]\n"
19464" --all and explicit <ref> specification are mutually exclusive."
19465msgstr ""
19466"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
19467"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
19468" --all 和明确的 <引用> 互斥。"
19469
fd8cb379 19470#: builtin/send-pack.c:163
1b7f4a34
JX
19471msgid "remote name"
19472msgstr "远程名称"
19473
fd8cb379 19474#: builtin/send-pack.c:177
1b7f4a34
JX
19475msgid "use stateless RPC protocol"
19476msgstr "使用无状态的 RPC 协议"
19477
fd8cb379 19478#: builtin/send-pack.c:178
1b7f4a34
JX
19479msgid "read refs from stdin"
19480msgstr "从标准输入读取引用"
19481
fd8cb379 19482#: builtin/send-pack.c:179
1b7f4a34
JX
19483msgid "print status from remote helper"
19484msgstr "打印来自远程 helper 的状态"
19485
a4f16749 19486#: builtin/shortlog.c:14
fd8cb379
JX
19487msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
19488msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
19489
19490#: builtin/shortlog.c:15
19491msgid "git log --pretty=short | git shortlog [<options>]"
19492msgstr "git log --pretty=short | git shortlog [<选项>]"
ef317cd5 19493
fd8cb379 19494#: builtin/shortlog.c:264
1a79b2f1
JX
19495msgid "Group by committer rather than author"
19496msgstr "按照提交者分组而不是作者"
19497
fd8cb379 19498#: builtin/shortlog.c:266
ef317cd5 19499msgid "sort output according to the number of commits per author"
07432cef 19500msgstr "根据每个作者的提交数量排序"
ef317cd5 19501
fd8cb379 19502#: builtin/shortlog.c:268
ef317cd5 19503msgid "Suppress commit descriptions, only provides commit count"
07432cef 19504msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 19505
fd8cb379 19506#: builtin/shortlog.c:270
ef317cd5 19507msgid "Show the email address of each author"
07432cef 19508msgstr "显示每个作者的电子邮件地址"
ef317cd5 19509
fd8cb379 19510#: builtin/shortlog.c:271
c1ac5258
JX
19511msgid "<w>[,<i1>[,<i2>]]"
19512msgstr "<w>[,<i1>[,<i2>]]"
ef317cd5 19513
fd8cb379 19514#: builtin/shortlog.c:272
ef317cd5 19515msgid "Linewrap output"
07432cef 19516msgstr "折行输出"
ef317cd5 19517
06991777 19518#: builtin/shortlog.c:301
fd8cb379
JX
19519msgid "too many arguments given outside repository"
19520msgstr "仓库外执行提供了太多的参数"
19521
c1ac5258 19522#: builtin/show-branch.c:13
ef317cd5 19523msgid ""
814ff314 19524"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
19525"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
19526"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
19527"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 19528msgstr ""
814ff314 19529"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
19530"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
19531"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
19532"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 19533
c1ac5258 19534#: builtin/show-branch.c:17
814ff314 19535msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
58b6f078 19536msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
ef317cd5 19537
c1ac5258 19538#: builtin/show-branch.c:395
a0b6b246
JX
19539#, c-format
19540msgid "ignoring %s; cannot handle more than %d ref"
19541msgid_plural "ignoring %s; cannot handle more than %d refs"
19542msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
19543msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
19544
a6cd2cc4 19545#: builtin/show-branch.c:548
a0b6b246
JX
19546#, c-format
19547msgid "no matching refs with %s"
19548msgstr "没有和 %s 匹配的引用"
19549
a6cd2cc4 19550#: builtin/show-branch.c:645
ef317cd5 19551msgid "show remote-tracking and local branches"
07432cef 19552msgstr "显示远程跟踪的和本地的分支"
ef317cd5 19553
a6cd2cc4 19554#: builtin/show-branch.c:647
ef317cd5 19555msgid "show remote-tracking branches"
07432cef 19556msgstr "显示远程跟踪的分支"
ef317cd5 19557
a6cd2cc4 19558#: builtin/show-branch.c:649
ef317cd5 19559msgid "color '*!+-' corresponding to the branch"
07432cef 19560msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 19561
a6cd2cc4 19562#: builtin/show-branch.c:651
ef317cd5 19563msgid "show <n> more commits after the common ancestor"
07432cef 19564msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 19565
a6cd2cc4 19566#: builtin/show-branch.c:653
ef317cd5 19567msgid "synonym to more=-1"
07432cef 19568msgstr "和 more=-1 同义"
ef317cd5 19569
a6cd2cc4 19570#: builtin/show-branch.c:654
ef317cd5 19571msgid "suppress naming strings"
07432cef 19572msgstr "不显示字符串命名"
ef317cd5 19573
a6cd2cc4 19574#: builtin/show-branch.c:656
ef317cd5 19575msgid "include the current branch"
07432cef 19576msgstr "包括当前分支"
ef317cd5 19577
a6cd2cc4 19578#: builtin/show-branch.c:658
ef317cd5 19579msgid "name commits with their object names"
07432cef 19580msgstr "以对象名字命名提交"
ef317cd5 19581
a6cd2cc4 19582#: builtin/show-branch.c:660
ef317cd5 19583msgid "show possible merge bases"
07432cef 19584msgstr "显示可能合并的基线"
ef317cd5 19585
a6cd2cc4 19586#: builtin/show-branch.c:662
ef317cd5 19587msgid "show refs unreachable from any other ref"
07432cef 19588msgstr "显示没有任何引用的的引用"
ef317cd5 19589
a6cd2cc4 19590#: builtin/show-branch.c:664
ef317cd5 19591msgid "show commits in topological order"
07432cef 19592msgstr "以拓扑顺序显示提交"
ef317cd5 19593
a6cd2cc4 19594#: builtin/show-branch.c:667
ef317cd5 19595msgid "show only commits not on the first branch"
07432cef 19596msgstr "只显示不在第一个分支上的提交"
ef317cd5 19597
a6cd2cc4 19598#: builtin/show-branch.c:669
ef317cd5 19599msgid "show merges reachable from only one tip"
07432cef 19600msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 19601
a6cd2cc4 19602#: builtin/show-branch.c:671
2e8451e8
JX
19603msgid "topologically sort, maintaining date order where possible"
19604msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 19605
a6cd2cc4 19606#: builtin/show-branch.c:674
ef317cd5 19607msgid "<n>[,<base>]"
07432cef 19608msgstr "<n>[,<base>]"
ef317cd5 19609
a6cd2cc4 19610#: builtin/show-branch.c:675
ef317cd5 19611msgid "show <n> most recent ref-log entries starting at base"
58b6f078 19612msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
ef317cd5 19613
a6cd2cc4 19614#: builtin/show-branch.c:711
a0b6b246
JX
19615msgid ""
19616"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
19617msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
19618
a6cd2cc4 19619#: builtin/show-branch.c:735
a0b6b246
JX
19620msgid "no branches given, and HEAD is not valid"
19621msgstr "未提供分支,且 HEAD 无效"
19622
a6cd2cc4 19623#: builtin/show-branch.c:738
a0b6b246
JX
19624msgid "--reflog option needs one branch name"
19625msgstr "选项 --reflog 需要一个分支名"
19626
a6cd2cc4 19627#: builtin/show-branch.c:741
a0b6b246
JX
19628#, c-format
19629msgid "only %d entry can be shown at one time."
19630msgid_plural "only %d entries can be shown at one time."
19631msgstr[0] "一次只能显示 %d 个条目。"
19632msgstr[1] "一次只能显示 %d 个条目。"
19633
a6cd2cc4 19634#: builtin/show-branch.c:745
a0b6b246
JX
19635#, c-format
19636msgid "no such ref %s"
19637msgstr "无此引用 %s"
19638
a6cd2cc4 19639#: builtin/show-branch.c:831
a0b6b246
JX
19640#, c-format
19641msgid "cannot handle more than %d rev."
19642msgid_plural "cannot handle more than %d revs."
19643msgstr[0] "不能处理 %d 个以上的版本。"
19644msgstr[1] "不能处理 %d 个以上的版本。"
19645
a6cd2cc4 19646#: builtin/show-branch.c:835
a0b6b246
JX
19647#, c-format
19648msgid "'%s' is not a valid ref."
19649msgstr "'%s' 不是一个有效的引用。"
19650
a6cd2cc4 19651#: builtin/show-branch.c:838
a0b6b246
JX
19652#, c-format
19653msgid "cannot find commit %s (%s)"
29004bbb 19654msgstr "不能找到提交 %s(%s)"
a0b6b246 19655
d46c5519 19656#: builtin/show-ref.c:12
ef317cd5 19657msgid ""
814ff314
JX
19658"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
19659"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 19660msgstr ""
814ff314
JX
19661"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
19662"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5 19663
d46c5519 19664#: builtin/show-ref.c:13
94550ed3
JX
19665msgid "git show-ref --exclude-existing[=<pattern>]"
19666msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 19667
d46c5519 19668#: builtin/show-ref.c:162
ef317cd5 19669msgid "only show tags (can be combined with heads)"
55a16ee4 19670msgstr "只显示标签(可以和头共用)"
ef317cd5 19671
d46c5519 19672#: builtin/show-ref.c:163
ef317cd5 19673msgid "only show heads (can be combined with tags)"
55a16ee4 19674msgstr "只显示头(可以和标签共用)"
ef317cd5 19675
d46c5519 19676#: builtin/show-ref.c:164
ef317cd5 19677msgid "stricter reference checking, requires exact ref path"
07432cef 19678msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 19679
d46c5519 19680#: builtin/show-ref.c:167 builtin/show-ref.c:169
2e8451e8
JX
19681msgid "show the HEAD reference, even if it would be filtered out"
19682msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 19683
d46c5519 19684#: builtin/show-ref.c:171
ef317cd5 19685msgid "dereference tags into object IDs"
4375c10e 19686msgstr "转换标签到对象 ID"
ef317cd5 19687
d46c5519
JX
19688#: builtin/show-ref.c:173
19689msgid "only show SHA1 hash using <n> digits"
19690msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
19691
19692#: builtin/show-ref.c:177
19693msgid "do not print results to stdout (useful with --verify)"
19694msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
19695
19696#: builtin/show-ref.c:179
19697msgid "show refs from stdin that aren't in local repository"
19698msgstr "显示从标准输入中读入的不在本地仓库中的引用"
19699
ddc12c42
JX
19700#: builtin/sparse-checkout.c:20
19701msgid "git sparse-checkout (init|list|set|disable) <options>"
19702msgstr "git sparse-checkout (init|list|set|disable) <选项>"
19703
19704#: builtin/sparse-checkout.c:61
19705msgid "this worktree is not sparse (sparse-checkout file may not exist)"
19706msgstr "本工作区不是稀疏模式(稀疏检出文件可能不存在)"
19707
19708#: builtin/sparse-checkout.c:220
19709msgid "failed to set extensions.worktreeConfig setting"
19710msgstr "无法设置 extensions.worktreeConfig"
19711
19712#: builtin/sparse-checkout.c:237
19713msgid "git sparse-checkout init [--cone]"
19714msgstr "git sparse-checkout init [--cone]"
19715
19716#: builtin/sparse-checkout.c:256
19717msgid "initialize the sparse-checkout in cone mode"
19718msgstr "初始化稀疏检出为 cone 模式"
19719
19720#: builtin/sparse-checkout.c:262
19721msgid "initialize sparse-checkout"
19722msgstr "初始化稀疏检出"
19723
19724#: builtin/sparse-checkout.c:295
19725#, c-format
19726msgid "failed to open '%s'"
19727msgstr "无法打开 '%s'"
19728
19729#: builtin/sparse-checkout.c:361
19730msgid "git sparse-checkout set (--stdin | <patterns>)"
19731msgstr "git sparse-checkout set (--stdin | <模式>)"
19732
19733#: builtin/sparse-checkout.c:378
19734msgid "read patterns from standard in"
19735msgstr "从标准输入读取模式"
19736
19737#: builtin/sparse-checkout.c:384
19738msgid "set sparse-checkout patterns"
19739msgstr "设置稀疏检出模式"
19740
19741#: builtin/sparse-checkout.c:447
19742msgid "disable sparse-checkout"
19743msgstr "禁用稀疏检出"
19744
19745#: builtin/sparse-checkout.c:459
19746msgid "error while refreshing working directory"
19747msgstr "刷新工作目录时出错"
19748
d46c5519
JX
19749#: builtin/stash.c:22 builtin/stash.c:37
19750msgid "git stash list [<options>]"
19751msgstr "git stash list [<选项>]"
19752
19753#: builtin/stash.c:23 builtin/stash.c:42
19754msgid "git stash show [<options>] [<stash>]"
19755msgstr "git stash show [<选项>] [<stash>]"
19756
19757#: builtin/stash.c:24 builtin/stash.c:47
19758msgid "git stash drop [-q|--quiet] [<stash>]"
19759msgstr "git stash drop [-q|--quiet] [<stash>]"
19760
19761#: builtin/stash.c:25
19762msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
19763msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
19764
19765#: builtin/stash.c:26 builtin/stash.c:62
19766msgid "git stash branch <branchname> [<stash>]"
19767msgstr "git stash branch <分支名> [<stash>]"
19768
19769#: builtin/stash.c:27 builtin/stash.c:67
19770msgid "git stash clear"
19771msgstr "git stash clear"
19772
19773#: builtin/stash.c:28 builtin/stash.c:77
19774msgid ""
19775"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
19776" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
19777" [--] [<pathspec>...]]"
19778msgstr ""
19779"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
19780" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
19781" [--] [<路径规格>...]]"
19782
19783#: builtin/stash.c:31 builtin/stash.c:84
19784msgid ""
19785"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
19786" [-u|--include-untracked] [-a|--all] [<message>]"
19787msgstr ""
19788"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
19789" [-u|--include-untracked] [-a|--all] [<消息>]"
19790
19791#: builtin/stash.c:52
19792msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
19793msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
19794
19795#: builtin/stash.c:57
19796msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
19797msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
19798
19799#: builtin/stash.c:72
19800msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
19801msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
19802
19803#: builtin/stash.c:127
19804#, c-format
19805msgid "'%s' is not a stash-like commit"
19806msgstr "'%s' 不像是一个贮藏提交"
19807
19808#: builtin/stash.c:147
19809#, c-format
19810msgid "Too many revisions specified:%s"
19811msgstr "指定了太多的版本:%s"
19812
ddc12c42 19813#: builtin/stash.c:161 git-legacy-stash.sh:549
d46c5519
JX
19814msgid "No stash entries found."
19815msgstr "未发现贮藏条目。"
19816
19817#: builtin/stash.c:175
19818#, c-format
19819msgid "%s is not a valid reference"
19820msgstr "%s 不是一个有效的引用名"
19821
19822#: builtin/stash.c:224 git-legacy-stash.sh:75
19823msgid "git stash clear with parameters is unimplemented"
19824msgstr "git stash clear 不支持参数"
19825
19826#: builtin/stash.c:403
19827msgid "cannot apply a stash in the middle of a merge"
19828msgstr "无法在合并过程应用贮藏"
19829
19830#: builtin/stash.c:414
19831#, c-format
19832msgid "could not generate diff %s^!."
19833msgstr "无法生成差异 %s^!."
19834
19835#: builtin/stash.c:421
19836msgid "conflicts in index.Try without --index."
19837msgstr "索引中有冲突。尝试不用 --index。"
19838
19839#: builtin/stash.c:427
19840msgid "could not save index tree"
19841msgstr "不能保存索引树"
19842
a5cd71ca 19843#: builtin/stash.c:436
d46c5519
JX
19844msgid "could not restore untracked files from stash"
19845msgstr "无法从贮藏条目中恢复未跟踪文件"
19846
a5cd71ca 19847#: builtin/stash.c:450
d46c5519
JX
19848#, c-format
19849msgid "Merging %s with %s"
19850msgstr "正在合并 %s 和 %s"
19851
ddc12c42 19852#: builtin/stash.c:460 git-legacy-stash.sh:681
d46c5519
JX
19853msgid "Index was not unstashed."
19854msgstr "索引未从贮藏中恢复。"
19855
ddc12c42 19856#: builtin/stash.c:521 builtin/stash.c:620
d46c5519
JX
19857msgid "attempt to recreate the index"
19858msgstr "尝试重建索引"
19859
ddc12c42 19860#: builtin/stash.c:554
d46c5519
JX
19861#, c-format
19862msgid "Dropped %s (%s)"
19863msgstr "丢弃了 %s(%s)"
19864
ddc12c42 19865#: builtin/stash.c:557
d46c5519
JX
19866#, c-format
19867msgid "%s: Could not drop stash entry"
19868msgstr "%s:无法丢弃贮藏条目"
19869
ddc12c42 19870#: builtin/stash.c:582
d46c5519
JX
19871#, c-format
19872msgid "'%s' is not a stash reference"
19873msgstr "'%s' 不是一个贮藏引用"
19874
ddc12c42 19875#: builtin/stash.c:632 git-legacy-stash.sh:695
d46c5519
JX
19876msgid "The stash entry is kept in case you need it again."
19877msgstr "贮藏条目被保留以备您再次需要。"
19878
ddc12c42 19879#: builtin/stash.c:655 git-legacy-stash.sh:713
d46c5519
JX
19880msgid "No branch name specified"
19881msgstr "未指定分支名"
19882
ddc12c42 19883#: builtin/stash.c:795 builtin/stash.c:832
d46c5519
JX
19884#, c-format
19885msgid "Cannot update %s with %s"
19886msgstr "无法用 %2$s 更新 %1$s"
19887
ddc12c42 19888#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506
d46c5519
JX
19889msgid "stash message"
19890msgstr "贮藏说明"
19891
ddc12c42 19892#: builtin/stash.c:823
d46c5519
JX
19893msgid "\"git stash store\" requires one <commit> argument"
19894msgstr "\"git stash store\" 需要一个 <提交> 参数"
19895
ddc12c42 19896#: builtin/stash.c:1045 git-legacy-stash.sh:218
d46c5519
JX
19897msgid "No changes selected"
19898msgstr "没有选择变更"
19899
a5cd71ca 19900#: builtin/stash.c:1145 git-legacy-stash.sh:150
d46c5519
JX
19901msgid "You do not have the initial commit yet"
19902msgstr "您尚未建立初始提交"
19903
a5cd71ca 19904#: builtin/stash.c:1172 git-legacy-stash.sh:165
d46c5519
JX
19905msgid "Cannot save the current index state"
19906msgstr "无法保存当前索引状态"
19907
a5cd71ca 19908#: builtin/stash.c:1181 git-legacy-stash.sh:180
d46c5519
JX
19909msgid "Cannot save the untracked files"
19910msgstr "无法保存未跟踪文件"
19911
ddc12c42
JX
19912#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:201
19913#: git-legacy-stash.sh:214
d46c5519
JX
19914msgid "Cannot save the current worktree state"
19915msgstr "无法保存当前工作区状态"
19916
ddc12c42 19917#: builtin/stash.c:1229 git-legacy-stash.sh:234
d46c5519
JX
19918msgid "Cannot record working tree state"
19919msgstr "不能记录工作区状态"
19920
ddc12c42 19921#: builtin/stash.c:1278 git-legacy-stash.sh:338
d46c5519
JX
19922msgid "Can't use --patch and --include-untracked or --all at the same time"
19923msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
19924
a5cd71ca 19925#: builtin/stash.c:1294
d46c5519
JX
19926msgid "Did you forget to 'git add'?"
19927msgstr "您是否忘了执行 'git add'?"
19928
ddc12c42 19929#: builtin/stash.c:1309 git-legacy-stash.sh:346
d46c5519
JX
19930msgid "No local changes to save"
19931msgstr "没有要保存的本地修改"
19932
ddc12c42 19933#: builtin/stash.c:1316 git-legacy-stash.sh:351
d46c5519
JX
19934msgid "Cannot initialize stash"
19935msgstr "无法初始化贮藏"
19936
ddc12c42 19937#: builtin/stash.c:1331 git-legacy-stash.sh:355
d46c5519
JX
19938msgid "Cannot save the current status"
19939msgstr "无法保存当前状态"
19940
a5cd71ca 19941#: builtin/stash.c:1336
d46c5519
JX
19942#, c-format
19943msgid "Saved working directory and index state %s"
19944msgstr "保存工作目录和索引状态 %s"
19945
ddc12c42 19946#: builtin/stash.c:1426 git-legacy-stash.sh:385
d46c5519
JX
19947msgid "Cannot remove worktree changes"
19948msgstr "无法删除工作区变更"
19949
a5cd71ca 19950#: builtin/stash.c:1461 builtin/stash.c:1497
d46c5519
JX
19951msgid "keep index"
19952msgstr "保持索引"
19953
a5cd71ca 19954#: builtin/stash.c:1463 builtin/stash.c:1499
d46c5519
JX
19955msgid "stash in patch mode"
19956msgstr "以补丁模式贮藏"
19957
a5cd71ca 19958#: builtin/stash.c:1464 builtin/stash.c:1500
d46c5519
JX
19959msgid "quiet mode"
19960msgstr "静默模式"
19961
a5cd71ca 19962#: builtin/stash.c:1466 builtin/stash.c:1502
d46c5519
JX
19963msgid "include untracked files in stash"
19964msgstr "贮藏中包含未跟踪文件"
ef317cd5 19965
a5cd71ca 19966#: builtin/stash.c:1468 builtin/stash.c:1504
d46c5519
JX
19967msgid "include ignore files"
19968msgstr "包含忽略的文件"
ef317cd5 19969
a5cd71ca 19970#: builtin/stash.c:1564
d46c5519
JX
19971#, c-format
19972msgid "could not exec %s"
19973msgstr "不能执行 %s"
ef317cd5 19974
a4f16749 19975#: builtin/stripspace.c:18
94550ed3
JX
19976msgid "git stripspace [-s | --strip-comments]"
19977msgstr "git stripspace [-s | --strip-comments]"
19978
a4f16749 19979#: builtin/stripspace.c:19
94550ed3
JX
19980msgid "git stripspace [-c | --comment-lines]"
19981msgstr "git stripspace [-c | --comment-lines]"
19982
06991777 19983#: builtin/stripspace.c:37
94550ed3
JX
19984msgid "skip and remove all lines starting with comment character"
19985msgstr "跳过和移除所有的注释行"
19986
06991777 19987#: builtin/stripspace.c:40
276ceeaa 19988msgid "prepend comment character and space to each line"
94550ed3
JX
19989msgstr "为每一行的行首添加注释符和空格"
19990
ddc12c42 19991#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1970
5b04ee3b
JX
19992#, c-format
19993msgid "Expecting a full ref name, got %s"
19994msgstr "期望一个完整的引用名称,却得到 %s"
19995
ddc12c42 19996#: builtin/submodule--helper.c:64
31e5e17b
JX
19997msgid "submodule--helper print-default-remote takes no arguments"
19998msgstr "submodule--helper print-default-remote 不带参数"
19999
ddc12c42 20000#: builtin/submodule--helper.c:102
5b04ee3b
JX
20001#, c-format
20002msgid "cannot strip one component off url '%s'"
20003msgstr "无法从 url '%s' 剥离一个组件"
20004
ddc12c42 20005#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1380
94550ed3
JX
20006msgid "alternative anchor for relative paths"
20007msgstr "相对路径的替代锚记(anchor)"
20008
ddc12c42 20009#: builtin/submodule--helper.c:415
94550ed3
JX
20010msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
20011msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
20012
ddc12c42
JX
20013#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
20014#: builtin/submodule--helper.c:653
5b04ee3b
JX
20015#, c-format
20016msgid "No url found for submodule path '%s' in .gitmodules"
20017msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
20018
ddc12c42 20019#: builtin/submodule--helper.c:524
c1ac5258
JX
20020#, c-format
20021msgid "Entering '%s'\n"
20022msgstr "进入 '%s'\n"
20023
ddc12c42 20024#: builtin/submodule--helper.c:527
c1ac5258
JX
20025#, c-format
20026msgid ""
20027"run_command returned non-zero status for %s\n"
20028"."
4c27fcb5
JX
20029msgstr ""
20030"对 %s 执行 run_command 返回非零值。\n"
20031"."
c1ac5258 20032
ddc12c42 20033#: builtin/submodule--helper.c:549
c1ac5258
JX
20034#, c-format
20035msgid ""
20036"run_command returned non-zero status while recursing in the nested "
20037"submodules of %s\n"
20038"."
4c27fcb5
JX
20039msgstr ""
20040"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
20041"."
c1ac5258 20042
ddc12c42 20043#: builtin/submodule--helper.c:565
c1ac5258
JX
20044msgid "Suppress output of entering each submodule command"
20045msgstr "阻止进入每一个子模组命令的输出"
20046
ddc12c42 20047#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1053
c1ac5258
JX
20048msgid "Recurse into nested submodules"
20049msgstr "递归进入嵌套子模组中"
20050
ddc12c42 20051#: builtin/submodule--helper.c:572
d46c5519
JX
20052msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
20053msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
c1ac5258 20054
ddc12c42 20055#: builtin/submodule--helper.c:599
87cb7997
JX
20056#, c-format
20057msgid ""
4c27fcb5 20058"could not look up configuration '%s'. Assuming this repository is its own "
87cb7997
JX
20059"authoritative upstream."
20060msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
20061
ddc12c42 20062#: builtin/submodule--helper.c:667
5b04ee3b
JX
20063#, c-format
20064msgid "Failed to register url for submodule path '%s'"
20065msgstr "无法为子模组 '%s' 注册 url"
20066
ddc12c42 20067#: builtin/submodule--helper.c:671
5b04ee3b
JX
20068#, c-format
20069msgid "Submodule '%s' (%s) registered for path '%s'\n"
25c75902 20070msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n"
5b04ee3b 20071
ddc12c42 20072#: builtin/submodule--helper.c:681
aef18cc6 20073#, c-format
5b04ee3b 20074msgid "warning: command update mode suggested for submodule '%s'\n"
aef18cc6 20075msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
5b04ee3b 20076
ddc12c42 20077#: builtin/submodule--helper.c:688
5b04ee3b
JX
20078#, c-format
20079msgid "Failed to register update mode for submodule path '%s'"
20080msgstr "无法为子模组 '%s' 注册更新模式"
20081
ddc12c42 20082#: builtin/submodule--helper.c:710
5b04ee3b 20083msgid "Suppress output for initializing a submodule"
31e5e17b 20084msgstr "阻止子模组初始化的输出"
5b04ee3b 20085
ddc12c42 20086#: builtin/submodule--helper.c:715
d46c5519
JX
20087msgid "git submodule--helper init [<options>] [<path>]"
20088msgstr "git submodule--helper init [<选项>] [<路径>]"
5b04ee3b 20089
ddc12c42 20090#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914
94550ed3
JX
20091#, c-format
20092msgid "no submodule mapping found in .gitmodules for path '%s'"
20093msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
20094
ddc12c42 20095#: builtin/submodule--helper.c:827
5809aa05
JX
20096#, c-format
20097msgid "could not resolve HEAD ref inside the submodule '%s'"
20098msgstr "无法解析子模组 '%s' 的 HEAD 引用"
20099
ddc12c42 20100#: builtin/submodule--helper.c:854 builtin/submodule--helper.c:1023
5809aa05
JX
20101#, c-format
20102msgid "failed to recurse into submodule '%s'"
c1ac5258 20103msgstr "递归子模组 '%s' 失败"
5809aa05 20104
ddc12c42 20105#: builtin/submodule--helper.c:878 builtin/submodule--helper.c:1189
5809aa05 20106msgid "Suppress submodule status output"
31e5e17b 20107msgstr "阻止子模组状态输出"
5809aa05 20108
ddc12c42 20109#: builtin/submodule--helper.c:879
5809aa05
JX
20110msgid ""
20111"Use commit stored in the index instead of the one stored in the submodule "
20112"HEAD"
20113msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
20114
ddc12c42 20115#: builtin/submodule--helper.c:880
5809aa05 20116msgid "recurse into nested submodules"
31e5e17b 20117msgstr "递归进入嵌套子模组中"
5809aa05 20118
ddc12c42 20119#: builtin/submodule--helper.c:885
5809aa05
JX
20120msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
20121msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
20122
ddc12c42 20123#: builtin/submodule--helper.c:909
5809aa05
JX
20124msgid "git submodule--helper name <path>"
20125msgstr "git submodule--helper name <路径>"
20126
ddc12c42 20127#: builtin/submodule--helper.c:973
31e5e17b
JX
20128#, c-format
20129msgid "Synchronizing submodule url for '%s'\n"
20130msgstr "为 '%s' 同步子模组 url\n"
20131
ddc12c42 20132#: builtin/submodule--helper.c:979
31e5e17b
JX
20133#, c-format
20134msgid "failed to register url for submodule path '%s'"
20135msgstr "无法为子模组路径 '%s' 注册 url"
20136
ddc12c42 20137#: builtin/submodule--helper.c:993
31e5e17b
JX
20138#, c-format
20139msgid "failed to get the default remote for submodule '%s'"
20140msgstr "无法得到子模组 '%s' 的默认远程关联"
20141
ddc12c42 20142#: builtin/submodule--helper.c:1004
31e5e17b
JX
20143#, c-format
20144msgid "failed to update remote for submodule '%s'"
20145msgstr "无法为子模组 '%s' 更新远程关联"
20146
ddc12c42 20147#: builtin/submodule--helper.c:1051
31e5e17b
JX
20148msgid "Suppress output of synchronizing submodule url"
20149msgstr "阻止子模组 url 同步的输出"
20150
ddc12c42 20151#: builtin/submodule--helper.c:1058
31e5e17b
JX
20152msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
20153msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
20154
ddc12c42 20155#: builtin/submodule--helper.c:1112
31e5e17b
JX
20156#, c-format
20157msgid ""
20158"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
20159"really want to remove it including all of its history)"
20160msgstr ""
fd8cb379
JX
20161"子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
20162"-rf' 命令)"
31e5e17b 20163
ddc12c42 20164#: builtin/submodule--helper.c:1124
31e5e17b
JX
20165#, c-format
20166msgid ""
20167"Submodule work tree '%s' contains local modifications; use '-f' to discard "
20168"them"
20169msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
20170
ddc12c42 20171#: builtin/submodule--helper.c:1132
31e5e17b
JX
20172#, c-format
20173msgid "Cleared directory '%s'\n"
20174msgstr "已清除目录 '%s'\n"
20175
ddc12c42 20176#: builtin/submodule--helper.c:1134
31e5e17b
JX
20177#, c-format
20178msgid "Could not remove submodule work tree '%s'\n"
20179msgstr "无法移除子模组工作区 '%s'\n"
20180
ddc12c42 20181#: builtin/submodule--helper.c:1145
31e5e17b
JX
20182#, c-format
20183msgid "could not create empty submodule directory %s"
20184msgstr "不能创建空的子模组目录 %s"
20185
ddc12c42 20186#: builtin/submodule--helper.c:1161
31e5e17b
JX
20187#, c-format
20188msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
20189msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
20190
ddc12c42 20191#: builtin/submodule--helper.c:1190
31e5e17b
JX
20192msgid "Remove submodule working trees even if they contain local changes"
20193msgstr "删除子模组工作区,即使包含本地修改"
20194
ddc12c42 20195#: builtin/submodule--helper.c:1191
31e5e17b
JX
20196msgid "Unregister all submodules"
20197msgstr "将所有子模组取消注册"
20198
ddc12c42 20199#: builtin/submodule--helper.c:1196
31e5e17b
JX
20200msgid ""
20201"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
20202msgstr ""
20203"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
20204
ddc12c42 20205#: builtin/submodule--helper.c:1210
31e5e17b
JX
20206msgid "Use '--all' if you really want to deinitialize all submodules"
20207msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
20208
ddc12c42
JX
20209#: builtin/submodule--helper.c:1275
20210msgid ""
20211"An alternate computed from a superproject's alternate is invalid.\n"
20212"To allow Git to clone without an alternate in such a case, set\n"
20213"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
20214"'--reference-if-able' instead of '--reference'."
20215msgstr ""
20216"从一个父项目的备用仓库中计算出的备用仓库无效。\n"
20217"此场景下,设置 submodule.alternateErrorStrategy 为 'info',以允许\n"
20218"Git 不使用备用仓库克隆,或者等效地使用 '--reference-if-able' 而非\n"
20219"'--reference' 来克隆。"
20220
20221#: builtin/submodule--helper.c:1314 builtin/submodule--helper.c:1317
a0b6b246
JX
20222#, c-format
20223msgid "submodule '%s' cannot add alternate: %s"
20224msgstr "子模组 '%s' 不能添加仓库备选:%s"
20225
ddc12c42 20226#: builtin/submodule--helper.c:1353
a0b6b246
JX
20227#, c-format
20228msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
20229msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
20230
ddc12c42 20231#: builtin/submodule--helper.c:1360
a0b6b246
JX
20232#, c-format
20233msgid "Value '%s' for submodule.alternateLocation is not recognized"
20234msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
20235
ddc12c42 20236#: builtin/submodule--helper.c:1383
94550ed3
JX
20237msgid "where the new submodule will be cloned to"
20238msgstr "新的子模组将要克隆的路径"
20239
ddc12c42 20240#: builtin/submodule--helper.c:1386
94550ed3
JX
20241msgid "name of the new submodule"
20242msgstr "新子模组的名称"
20243
ddc12c42 20244#: builtin/submodule--helper.c:1389
94550ed3
JX
20245msgid "url where to clone the submodule from"
20246msgstr "克隆子模组的 url 地址"
20247
ddc12c42 20248#: builtin/submodule--helper.c:1397
94550ed3
JX
20249msgid "depth for shallow clones"
20250msgstr "浅克隆的深度"
20251
ddc12c42 20252#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897
a0b6b246 20253msgid "force cloning progress"
29004bbb 20254msgstr "强制显示克隆进度"
a0b6b246 20255
ddc12c42
JX
20256#: builtin/submodule--helper.c:1402 builtin/submodule--helper.c:1899
20257msgid "disallow cloning into non-empty directory"
20258msgstr "不允许克隆到一个非空目录"
20259
20260#: builtin/submodule--helper.c:1407
94550ed3
JX
20261msgid ""
20262"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
5b04ee3b 20263"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
5c57d762
JX
20264msgstr ""
20265"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
20266"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
94550ed3 20267
ddc12c42
JX
20268#: builtin/submodule--helper.c:1431
20269#, c-format
20270msgid "refusing to create/use '%s' in another submodule's git dir"
20271msgstr "拒绝在另一个子模组的 git dir 中创建/使用 '%s'"
20272
20273#: builtin/submodule--helper.c:1442
94550ed3
JX
20274#, c-format
20275msgid "clone of '%s' into submodule path '%s' failed"
20276msgstr "无法克隆 '%s' 到子模组路径 '%s'"
20277
ddc12c42
JX
20278#: builtin/submodule--helper.c:1446
20279#, c-format
20280msgid "directory not empty: '%s'"
20281msgstr "目录非空:'%s'"
20282
20283#: builtin/submodule--helper.c:1458
94550ed3
JX
20284#, c-format
20285msgid "could not get submodule directory for '%s'"
20286msgstr "无法得到 '%s' 的子模组目录"
20287
ddc12c42 20288#: builtin/submodule--helper.c:1494
4c27fcb5
JX
20289#, c-format
20290msgid "Invalid update mode '%s' for submodule path '%s'"
20291msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
20292
ddc12c42 20293#: builtin/submodule--helper.c:1498
4c27fcb5
JX
20294#, c-format
20295msgid "Invalid update mode '%s' configured for submodule path '%s'"
20296msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
20297
ddc12c42 20298#: builtin/submodule--helper.c:1594
5b04ee3b
JX
20299#, c-format
20300msgid "Submodule path '%s' not initialized"
20301msgstr "子模组 '%s' 尚未初始化"
20302
ddc12c42 20303#: builtin/submodule--helper.c:1598
5b04ee3b
JX
20304msgid "Maybe you want to use 'update --init'?"
20305msgstr "也许您想要执行 'update --init'?"
20306
ddc12c42 20307#: builtin/submodule--helper.c:1628
5b04ee3b
JX
20308#, c-format
20309msgid "Skipping unmerged submodule %s"
20310msgstr "略过未合并的子模组 %s"
20311
ddc12c42 20312#: builtin/submodule--helper.c:1657
5b04ee3b
JX
20313#, c-format
20314msgid "Skipping submodule '%s'"
20315msgstr "略过子模组 '%s'"
20316
ddc12c42 20317#: builtin/submodule--helper.c:1803
5c57d762
JX
20318#, c-format
20319msgid "Failed to clone '%s'. Retry scheduled"
20320msgstr "克隆 '%s' 失败。按计划重试"
20321
ddc12c42 20322#: builtin/submodule--helper.c:1814
5c57d762
JX
20323#, c-format
20324msgid "Failed to clone '%s' a second time, aborting"
20325msgstr "第二次尝试克隆 '%s' 失败,退出"
20326
ddc12c42 20327#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:2120
5b04ee3b
JX
20328msgid "path into the working tree"
20329msgstr "到工作区的路径"
20330
ddc12c42 20331#: builtin/submodule--helper.c:1879
5b04ee3b
JX
20332msgid "path into the working tree, across nested submodule boundaries"
20333msgstr "工作区中的路径,递归嵌套子模组"
20334
ddc12c42 20335#: builtin/submodule--helper.c:1883
5b04ee3b
JX
20336msgid "rebase, merge, checkout or none"
20337msgstr "rebase、merge、checkout 或 none"
20338
ddc12c42 20339#: builtin/submodule--helper.c:1889
5b04ee3b
JX
20340msgid "Create a shallow clone truncated to the specified number of revisions"
20341msgstr "创建一个指定深度的浅克隆"
20342
ddc12c42 20343#: builtin/submodule--helper.c:1892
5b04ee3b
JX
20344msgid "parallel jobs"
20345msgstr "并发任务"
20346
ddc12c42 20347#: builtin/submodule--helper.c:1894
5c57d762 20348msgid "whether the initial clone should follow the shallow recommendation"
9a4b694c 20349msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
5c57d762 20350
ddc12c42 20351#: builtin/submodule--helper.c:1895
5b04ee3b
JX
20352msgid "don't print cloning progress"
20353msgstr "不要输出克隆进度"
94550ed3 20354
ddc12c42 20355#: builtin/submodule--helper.c:1904
a5cd71ca
JX
20356msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
20357msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
5b04ee3b 20358
ddc12c42 20359#: builtin/submodule--helper.c:1917
5b04ee3b
JX
20360msgid "bad value for update parameter"
20361msgstr "update 参数取值错误"
20362
ddc12c42 20363#: builtin/submodule--helper.c:1965
5c57d762
JX
20364#, c-format
20365msgid ""
20366"Submodule (%s) branch configured to inherit branch from superproject, but "
20367"the superproject is not on any branch"
20368msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
20369
ddc12c42 20370#: builtin/submodule--helper.c:2088
4c27fcb5
JX
20371#, c-format
20372msgid "could not get a repository handle for submodule '%s'"
20373msgstr "无法获得子模组 '%s' 的仓库句柄"
20374
ddc12c42 20375#: builtin/submodule--helper.c:2121
1a79b2f1
JX
20376msgid "recurse into submodules"
20377msgstr "在子模组中递归"
20378
ddc12c42 20379#: builtin/submodule--helper.c:2127
d46c5519
JX
20380msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
20381msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
1a79b2f1 20382
ddc12c42 20383#: builtin/submodule--helper.c:2183
4c27fcb5
JX
20384msgid "check if it is safe to write to the .gitmodules file"
20385msgstr "检查写入 .gitmodules 文件是否安全"
20386
ddc12c42 20387#: builtin/submodule--helper.c:2186
d46c5519
JX
20388msgid "unset the config in the .gitmodules file"
20389msgstr "取消 .gitmodules 文件中的设置"
20390
ddc12c42 20391#: builtin/submodule--helper.c:2191
d46c5519
JX
20392msgid "git submodule--helper config <name> [<value>]"
20393msgstr "git submodule--helper config <名称> [<值>]"
4c27fcb5 20394
ddc12c42 20395#: builtin/submodule--helper.c:2192
d46c5519
JX
20396msgid "git submodule--helper config --unset <name>"
20397msgstr "git submodule--helper config --unset <名称>"
20398
ddc12c42 20399#: builtin/submodule--helper.c:2193
4c27fcb5
JX
20400msgid "git submodule--helper config --check-writeable"
20401msgstr "git submodule--helper config --check-writeable"
20402
ddc12c42 20403#: builtin/submodule--helper.c:2212 git-submodule.sh:173
4c27fcb5
JX
20404#, sh-format
20405msgid "please make sure that the .gitmodules file is in the working tree"
20406msgstr "请确认 .gitmodules 文件在工作区里"
20407
ddc12c42 20408#: builtin/submodule--helper.c:2262 git.c:433 git.c:684
1a79b2f1
JX
20409#, c-format
20410msgid "%s doesn't support --super-prefix"
20411msgstr "%s 不支持 --super-prefix"
20412
ddc12c42 20413#: builtin/submodule--helper.c:2268
94550ed3 20414#, c-format
5b04ee3b
JX
20415msgid "'%s' is not a valid submodule--helper subcommand"
20416msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
94550ed3 20417
a4f16749 20418#: builtin/symbolic-ref.c:8
814ff314
JX
20419msgid "git symbolic-ref [<options>] <name> [<ref>]"
20420msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef 20421
a4f16749 20422#: builtin/symbolic-ref.c:9
814ff314
JX
20423msgid "git symbolic-ref -d [-q] <name>"
20424msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 20425
6937cb4e 20426#: builtin/symbolic-ref.c:40
ef317cd5 20427msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
20428msgstr "不显示非符号(分离的)引用的错误信息"
20429
6937cb4e 20430#: builtin/symbolic-ref.c:41
07432cef
WS
20431msgid "delete symbolic ref"
20432msgstr "删除符号引用"
ef317cd5 20433
6937cb4e 20434#: builtin/symbolic-ref.c:42
ef317cd5 20435msgid "shorten ref output"
6937cb4e 20436msgstr "缩短引用输出"
ef317cd5 20437
c1ac5258 20438#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
ef317cd5 20439msgid "reason"
07432cef 20440msgstr "原因"
ef317cd5 20441
c1ac5258 20442#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
ef317cd5 20443msgid "reason of the update"
07432cef 20444msgstr "更新的原因"
ef317cd5 20445
c1ac5258 20446#: builtin/tag.c:25
ef317cd5 20447msgid ""
d46c5519
JX
20448"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
20449"\t\t<tagname> [<head>]"
814ff314 20450msgstr ""
d46c5519
JX
20451"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
20452"\t\t<标签名> [<头>]"
ef317cd5 20453
d46c5519 20454#: builtin/tag.c:27
ef317cd5 20455msgid "git tag -d <tagname>..."
07432cef 20456msgstr "git tag -d <标签名>..."
ef317cd5 20457
d46c5519 20458#: builtin/tag.c:28
ef317cd5 20459msgid ""
87cb7997
JX
20460"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
20461"points-at <object>]\n"
94550ed3 20462"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
ef317cd5 20463msgstr ""
87cb7997
JX
20464"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
20465"at <对象>]\n"
94550ed3 20466"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
ef317cd5 20467
d46c5519 20468#: builtin/tag.c:30
1a79b2f1
JX
20469msgid "git tag -v [--format=<format>] <tagname>..."
20470msgstr "git tag -v [--format=<格式>] <标签名>..."
ef317cd5 20471
a6cd2cc4 20472#: builtin/tag.c:89
c04f5ac3
JX
20473#, c-format
20474msgid "tag '%s' not found."
55a16ee4 20475msgstr "未发现标签 '%s'。"
c04f5ac3 20476
a6cd2cc4 20477#: builtin/tag.c:105
c04f5ac3
JX
20478#, c-format
20479msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 20480msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 20481
a6cd2cc4 20482#: builtin/tag.c:135
a77c07d9 20483#, c-format
c04f5ac3
JX
20484msgid ""
20485"\n"
6acbf033
JX
20486"Write a message for tag:\n"
20487" %s\n"
a77c07d9 20488"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
20489msgstr ""
20490"\n"
55a16ee4 20491"输入一个标签说明:\n"
6acbf033 20492" %s\n"
a77c07d9 20493"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 20494
a6cd2cc4 20495#: builtin/tag.c:139
a77c07d9 20496#, c-format
c04f5ac3
JX
20497msgid ""
20498"\n"
6acbf033
JX
20499"Write a message for tag:\n"
20500" %s\n"
a77c07d9 20501"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 20502"want to.\n"
c04f5ac3
JX
20503msgstr ""
20504"\n"
55a16ee4 20505"输入一个标签说明:\n"
6acbf033 20506" %s\n"
a77c07d9 20507"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 20508
a6cd2cc4 20509#: builtin/tag.c:198
c04f5ac3 20510msgid "unable to sign the tag"
55a16ee4 20511msgstr "无法签署标签"
c04f5ac3 20512
a6cd2cc4 20513#: builtin/tag.c:200
c04f5ac3 20514msgid "unable to write tag file"
55a16ee4 20515msgstr "无法写标签文件"
c04f5ac3 20516
a6cd2cc4 20517#: builtin/tag.c:216
d46c5519
JX
20518#, c-format
20519msgid ""
20520"You have created a nested tag. The object referred to by your new tag is\n"
20521"already a tag. If you meant to tag the object that it points to, use:\n"
20522"\n"
20523"\tgit tag -f %s %s^{}"
20524msgstr ""
20525"您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n"
20526"对其指向的目标创建标签,使用:\n"
20527"\n"
20528"\tgit tag -f %s %s^{}"
20529
a6cd2cc4 20530#: builtin/tag.c:232
c04f5ac3 20531msgid "bad object type."
90e6ef53 20532msgstr "坏的对象类型。"
c04f5ac3 20533
a6cd2cc4 20534#: builtin/tag.c:284
c04f5ac3 20535msgid "no tag message?"
55a16ee4 20536msgstr "无标签说明?"
c04f5ac3 20537
a6cd2cc4 20538#: builtin/tag.c:291
c04f5ac3
JX
20539#, c-format
20540msgid "The tag message has been left in %s\n"
55a16ee4 20541msgstr "标签说明被保留在 %s\n"
c04f5ac3 20542
a6cd2cc4 20543#: builtin/tag.c:402
ef317cd5 20544msgid "list tag names"
55a16ee4 20545msgstr "列出标签名称"
ef317cd5 20546
a6cd2cc4 20547#: builtin/tag.c:404
ef317cd5 20548msgid "print <n> lines of each tag message"
55a16ee4 20549msgstr "每个标签信息打印 <n> 行"
ef317cd5 20550
a6cd2cc4 20551#: builtin/tag.c:406
ef317cd5 20552msgid "delete tags"
55a16ee4 20553msgstr "删除标签"
ef317cd5 20554
a6cd2cc4 20555#: builtin/tag.c:407
ef317cd5 20556msgid "verify tags"
55a16ee4 20557msgstr "验证标签"
ef317cd5 20558
a6cd2cc4 20559#: builtin/tag.c:409
ef317cd5 20560msgid "Tag creation options"
55a16ee4 20561msgstr "标签创建选项"
ef317cd5 20562
a6cd2cc4 20563#: builtin/tag.c:411
ef317cd5 20564msgid "annotated tag, needs a message"
55a16ee4 20565msgstr "附注标签,需要一个说明"
ef317cd5 20566
a6cd2cc4 20567#: builtin/tag.c:413
ef317cd5 20568msgid "tag message"
55a16ee4 20569msgstr "标签说明"
ef317cd5 20570
a6cd2cc4 20571#: builtin/tag.c:415
31e5e17b
JX
20572msgid "force edit of tag message"
20573msgstr "强制编辑标签说明"
20574
a6cd2cc4 20575#: builtin/tag.c:416
ef317cd5 20576msgid "annotated and GPG-signed tag"
55a16ee4 20577msgstr "附注并附加 GPG 签名的标签"
ef317cd5 20578
a6cd2cc4 20579#: builtin/tag.c:419
ef317cd5 20580msgid "use another key to sign the tag"
55a16ee4 20581msgstr "使用另外的私钥签名该标签"
ef317cd5 20582
a6cd2cc4 20583#: builtin/tag.c:420
ef317cd5 20584msgid "replace the tag if exists"
55a16ee4 20585msgstr "如果存在,替换现有的标签"
ef317cd5 20586
a6cd2cc4 20587#: builtin/tag.c:421 builtin/update-ref.c:369
03ea3327 20588msgid "create a reflog"
1b7f4a34
JX
20589msgstr "创建引用日志"
20590
a6cd2cc4 20591#: builtin/tag.c:423
814ff314 20592msgid "Tag listing options"
55a16ee4 20593msgstr "标签列表选项"
814ff314 20594
a6cd2cc4 20595#: builtin/tag.c:424
ef317cd5 20596msgid "show tag list in columns"
55a16ee4 20597msgstr "以列的方式显示标签列表"
ef317cd5 20598
a6cd2cc4 20599#: builtin/tag.c:425 builtin/tag.c:427
ef317cd5 20600msgid "print only tags that contain the commit"
87cb7997 20601msgstr "只打印包含该提交的标签"
ef317cd5 20602
a6cd2cc4 20603#: builtin/tag.c:426 builtin/tag.c:428
87cb7997
JX
20604msgid "print only tags that don't contain the commit"
20605msgstr "只打印不包含该提交的标签"
20606
a6cd2cc4 20607#: builtin/tag.c:429
94550ed3
JX
20608msgid "print only tags that are merged"
20609msgstr "只打印已经合并的标签"
20610
a6cd2cc4 20611#: builtin/tag.c:430
94550ed3
JX
20612msgid "print only tags that are not merged"
20613msgstr "只打印尚未合并的标签"
20614
a6cd2cc4 20615#: builtin/tag.c:434
ef317cd5 20616msgid "print only tags of the object"
87cb7997 20617msgstr "只打印指向该对象的标签"
ef317cd5 20618
a6cd2cc4 20619#: builtin/tag.c:482
8ada9598 20620msgid "--column and -n are incompatible"
81809b99 20621msgstr "--column 和 -n 不兼容"
8ada9598 20622
a6cd2cc4 20623#: builtin/tag.c:504
87cb7997
JX
20624msgid "-n option is only allowed in list mode"
20625msgstr "-n 选项只允许用在列表显示模式"
c04f5ac3 20626
a6cd2cc4 20627#: builtin/tag.c:506
87cb7997
JX
20628msgid "--contains option is only allowed in list mode"
20629msgstr "--contains 选项只允许用在列表显示模式"
c04f5ac3 20630
a6cd2cc4 20631#: builtin/tag.c:508
87cb7997
JX
20632msgid "--no-contains option is only allowed in list mode"
20633msgstr "--no-contains 选项只允许用在列表显示模式"
7ac1c0ad 20634
a6cd2cc4 20635#: builtin/tag.c:510
87cb7997
JX
20636msgid "--points-at option is only allowed in list mode"
20637msgstr "--points-at 选项只允许用在列表显示模式"
94550ed3 20638
a6cd2cc4 20639#: builtin/tag.c:512
87cb7997
JX
20640msgid "--merged and --no-merged options are only allowed in list mode"
20641msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
20642
a6cd2cc4 20643#: builtin/tag.c:523
c04f5ac3
JX
20644msgid "only one -F or -m option is allowed."
20645msgstr "只允许一个 -F 或 -m 选项。"
20646
a6cd2cc4 20647#: builtin/tag.c:542
c04f5ac3
JX
20648msgid "too many params"
20649msgstr "太多参数"
20650
a6cd2cc4 20651#: builtin/tag.c:548
c04f5ac3
JX
20652#, c-format
20653msgid "'%s' is not a valid tag name."
55a16ee4 20654msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 20655
a6cd2cc4 20656#: builtin/tag.c:553
c04f5ac3
JX
20657#, c-format
20658msgid "tag '%s' already exists"
55a16ee4 20659msgstr "标签 '%s' 已存在"
c04f5ac3 20660
a6cd2cc4 20661#: builtin/tag.c:584
c04f5ac3
JX
20662#, c-format
20663msgid "Updated tag '%s' (was %s)\n"
55a16ee4 20664msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 20665
ddc12c42 20666#: builtin/unpack-objects.c:501
6c94aba5
JX
20667msgid "Unpacking objects"
20668msgstr "展开对象中"
20669
ddc12c42 20670#: builtin/update-index.c:84
7aea43ff
JX
20671#, c-format
20672msgid "failed to create directory %s"
c1ac5258 20673msgstr "创建目录 %s 失败"
7aea43ff 20674
ddc12c42 20675#: builtin/update-index.c:100
7aea43ff
JX
20676#, c-format
20677msgid "failed to create file %s"
c1ac5258 20678msgstr "创建文件 %s 失败"
7aea43ff 20679
ddc12c42 20680#: builtin/update-index.c:108
7aea43ff
JX
20681#, c-format
20682msgid "failed to delete file %s"
c1ac5258 20683msgstr "删除文件 %s 失败"
7aea43ff 20684
ddc12c42 20685#: builtin/update-index.c:115 builtin/update-index.c:221
7aea43ff
JX
20686#, c-format
20687msgid "failed to delete directory %s"
c1ac5258 20688msgstr "删除目录 %s 失败"
7aea43ff 20689
ddc12c42 20690#: builtin/update-index.c:140
7aea43ff 20691#, c-format
276ceeaa
JX
20692msgid "Testing mtime in '%s' "
20693msgstr "在 '%s' 中测试 mtime "
7aea43ff 20694
ddc12c42 20695#: builtin/update-index.c:154
7aea43ff
JX
20696msgid "directory stat info does not change after adding a new file"
20697msgstr "添加一个新文件后,目录的状态信息未改变"
20698
ddc12c42 20699#: builtin/update-index.c:167
7aea43ff
JX
20700msgid "directory stat info does not change after adding a new directory"
20701msgstr "添加一个新目录后,目录的状态信息未改变"
20702
ddc12c42 20703#: builtin/update-index.c:180
7aea43ff
JX
20704msgid "directory stat info changes after updating a file"
20705msgstr "更新一个文件后,目录的状态信息被修改"
20706
ddc12c42 20707#: builtin/update-index.c:191
7aea43ff
JX
20708msgid "directory stat info changes after adding a file inside subdirectory"
20709msgstr "在子目录中添加文件后,目录的状态信息被修改"
20710
ddc12c42 20711#: builtin/update-index.c:202
7aea43ff
JX
20712msgid "directory stat info does not change after deleting a file"
20713msgstr "删除一个文件后,目录的状态信息未改变"
20714
ddc12c42 20715#: builtin/update-index.c:215
7aea43ff
JX
20716msgid "directory stat info does not change after deleting a directory"
20717msgstr "删除一个目录后,目录的状态信息未改变"
20718
ddc12c42 20719#: builtin/update-index.c:222
7aea43ff
JX
20720msgid " OK"
20721msgstr " OK"
20722
ddc12c42 20723#: builtin/update-index.c:591
814ff314
JX
20724msgid "git update-index [<options>] [--] [<file>...]"
20725msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 20726
ddc12c42 20727#: builtin/update-index.c:974
ef317cd5 20728msgid "continue refresh even when index needs update"
07432cef 20729msgstr "当索引需要更新时继续刷新"
8ada9598 20730
ddc12c42 20731#: builtin/update-index.c:977
ef317cd5 20732msgid "refresh: ignore submodules"
07432cef 20733msgstr "刷新:忽略子模组"
8ada9598 20734
ddc12c42 20735#: builtin/update-index.c:980
ef317cd5 20736msgid "do not ignore new files"
07432cef 20737msgstr "不忽略新的文件"
8ada9598 20738
ddc12c42 20739#: builtin/update-index.c:982
ef317cd5 20740msgid "let files replace directories and vice-versa"
07432cef 20741msgstr "让文件替换目录(反之亦然)"
ef317cd5 20742
ddc12c42 20743#: builtin/update-index.c:984
ef317cd5 20744msgid "notice files missing from worktree"
07432cef 20745msgstr "通知文件从工作区丢失"
ef317cd5 20746
ddc12c42 20747#: builtin/update-index.c:986
ef317cd5 20748msgid "refresh even if index contains unmerged entries"
07432cef 20749msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 20750
ddc12c42 20751#: builtin/update-index.c:989
ef317cd5 20752msgid "refresh stat information"
07432cef 20753msgstr "刷新统计信息"
ef317cd5 20754
ddc12c42 20755#: builtin/update-index.c:993
ef317cd5 20756msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 20757msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 20758
ddc12c42 20759#: builtin/update-index.c:997
6c94aba5 20760msgid "<mode>,<object>,<path>"
d9d56b23 20761msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 20762
ddc12c42 20763#: builtin/update-index.c:998
ef317cd5 20764msgid "add the specified entry to the index"
07432cef 20765msgstr "添加指定的条目到索引区"
ef317cd5 20766
ddc12c42 20767#: builtin/update-index.c:1008
ef317cd5 20768msgid "mark files as \"not changing\""
07432cef 20769msgstr "把文件标记为 \"没有变更\""
ef317cd5 20770
ddc12c42 20771#: builtin/update-index.c:1011
ef317cd5 20772msgid "clear assumed-unchanged bit"
07432cef 20773msgstr "清除 assumed-unchanged 位"
ef317cd5 20774
ddc12c42 20775#: builtin/update-index.c:1014
ef317cd5 20776msgid "mark files as \"index-only\""
07432cef 20777msgstr "把文件标记为 \"仅索引\""
ef317cd5 20778
ddc12c42 20779#: builtin/update-index.c:1017
ef317cd5 20780msgid "clear skip-worktree bit"
07432cef 20781msgstr "清除 skip-worktree 位"
ef317cd5 20782
ddc12c42
JX
20783#: builtin/update-index.c:1020
20784msgid "do not touch index-only entries"
20785msgstr "不要触碰仅索引条目"
20786
20787#: builtin/update-index.c:1022
ef317cd5 20788msgid "add to index only; do not add content to object database"
07432cef 20789msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 20790
ddc12c42 20791#: builtin/update-index.c:1024
ef317cd5 20792msgid "remove named paths even if present in worktree"
07432cef 20793msgstr "即使存在工作区里,也删除路径"
ef317cd5 20794
ddc12c42 20795#: builtin/update-index.c:1026
ef317cd5 20796msgid "with --stdin: input lines are terminated by null bytes"
07432cef 20797msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 20798
ddc12c42 20799#: builtin/update-index.c:1028
ef317cd5 20800msgid "read list of paths to be updated from standard input"
07432cef 20801msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 20802
ddc12c42 20803#: builtin/update-index.c:1032
ef317cd5 20804msgid "add entries from standard input to the index"
07432cef 20805msgstr "从标准输入添加条目到索引区"
ef317cd5 20806
ddc12c42 20807#: builtin/update-index.c:1036
ef317cd5 20808msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 20809msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 20810
ddc12c42 20811#: builtin/update-index.c:1040
ef317cd5 20812msgid "only update entries that differ from HEAD"
07432cef 20813msgstr "只更新与 HEAD 不同的条目"
ef317cd5 20814
ddc12c42 20815#: builtin/update-index.c:1044
ef317cd5 20816msgid "ignore files missing from worktree"
07432cef 20817msgstr "忽略工作区丢失的文件"
ef317cd5 20818
ddc12c42 20819#: builtin/update-index.c:1047
ef317cd5 20820msgid "report actions to standard output"
07432cef 20821msgstr "在标准输出显示操作"
ef317cd5 20822
ddc12c42 20823#: builtin/update-index.c:1049
ef317cd5 20824msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 20825msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 20826
ddc12c42 20827#: builtin/update-index.c:1053
ef317cd5 20828msgid "write index in this format"
07432cef 20829msgstr "以这种格式写入索引区"
ef317cd5 20830
ddc12c42 20831#: builtin/update-index.c:1055
6acbf033
JX
20832msgid "enable or disable split index"
20833msgstr "启用或禁用索引拆分"
20834
ddc12c42 20835#: builtin/update-index.c:1057
7aea43ff
JX
20836msgid "enable/disable untracked cache"
20837msgstr "启用/禁用对未跟踪文件的缓存"
20838
ddc12c42 20839#: builtin/update-index.c:1059
276ceeaa
JX
20840msgid "test if the filesystem supports untracked cache"
20841msgstr "测试文件系统是否支持未跟踪文件缓存"
20842
ddc12c42 20843#: builtin/update-index.c:1061
7aea43ff
JX
20844msgid "enable untracked cache without testing the filesystem"
20845msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
20846
ddc12c42 20847#: builtin/update-index.c:1063
5809aa05
JX
20848msgid "write out the index even if is not flagged as changed"
20849msgstr "即使没有被标记为已更改,也要写出索引"
20850
ddc12c42 20851#: builtin/update-index.c:1065
5809aa05
JX
20852msgid "enable or disable file system monitor"
20853msgstr "启用或禁用文件系统监控"
20854
ddc12c42 20855#: builtin/update-index.c:1067
5809aa05
JX
20856msgid "mark files as fsmonitor valid"
20857msgstr "标记文件为 fsmonitor 有效"
20858
ddc12c42 20859#: builtin/update-index.c:1070
5809aa05
JX
20860msgid "clear fsmonitor valid bit"
20861msgstr "清除 fsmonitor 有效位"
20862
ddc12c42 20863#: builtin/update-index.c:1173
87cb7997
JX
20864msgid ""
20865"core.splitIndex is set to false; remove or change it, if you really want to "
20866"enable split index"
20867msgstr ""
20868"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
20869
ddc12c42 20870#: builtin/update-index.c:1182
87cb7997
JX
20871msgid ""
20872"core.splitIndex is set to true; remove or change it, if you really want to "
20873"disable split index"
20874msgstr ""
20875"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
20876
ddc12c42 20877#: builtin/update-index.c:1194
a0b6b246
JX
20878msgid ""
20879"core.untrackedCache is set to true; remove or change it, if you really want "
20880"to disable the untracked cache"
275588f9
JX
20881msgstr ""
20882"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
20883"改它。"
a0b6b246 20884
ddc12c42 20885#: builtin/update-index.c:1198
276ceeaa
JX
20886msgid "Untracked cache disabled"
20887msgstr "缓存未跟踪文件被禁用"
20888
ddc12c42 20889#: builtin/update-index.c:1206
a0b6b246
JX
20890msgid ""
20891"core.untrackedCache is set to false; remove or change it, if you really want "
20892"to enable the untracked cache"
275588f9
JX
20893msgstr ""
20894"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
20895"修改它。"
a0b6b246 20896
ddc12c42 20897#: builtin/update-index.c:1210
276ceeaa
JX
20898#, c-format
20899msgid "Untracked cache enabled for '%s'"
20900msgstr "缓存未跟踪文件在 '%s' 启用"
20901
ddc12c42 20902#: builtin/update-index.c:1218
5809aa05 20903msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
31e5e17b 20904msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
5809aa05 20905
ddc12c42 20906#: builtin/update-index.c:1222
5809aa05
JX
20907msgid "fsmonitor enabled"
20908msgstr "fsmonitor 被启用"
20909
ddc12c42 20910#: builtin/update-index.c:1225
5809aa05
JX
20911msgid ""
20912"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
31e5e17b 20913msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
5809aa05 20914
ddc12c42 20915#: builtin/update-index.c:1229
5809aa05
JX
20916msgid "fsmonitor disabled"
20917msgstr "fsmonitor 被禁用"
20918
a4f16749 20919#: builtin/update-ref.c:10
814ff314
JX
20920msgid "git update-ref [<options>] -d <refname> [<old-val>]"
20921msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 20922
a4f16749 20923#: builtin/update-ref.c:11
814ff314
JX
20924msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
20925msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792 20926
a4f16749 20927#: builtin/update-ref.c:12
814ff314
JX
20928msgid "git update-ref [<options>] --stdin [-z]"
20929msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 20930
c1ac5258 20931#: builtin/update-ref.c:364
ef317cd5 20932msgid "delete the reference"
07432cef 20933msgstr "删除引用"
ef317cd5 20934
c1ac5258 20935#: builtin/update-ref.c:366
ef317cd5 20936msgid "update <refname> not the one it points to"
07432cef 20937msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 20938
c1ac5258 20939#: builtin/update-ref.c:367
90314792
JX
20940msgid "stdin has NUL-terminated arguments"
20941msgstr "标准输入有以 NUL 字符终止的参数"
20942
c1ac5258 20943#: builtin/update-ref.c:368
90314792
JX
20944msgid "read updates from stdin"
20945msgstr "从标准输入读取更新"
20946
a4f16749 20947#: builtin/update-server-info.c:7
ef317cd5 20948msgid "git update-server-info [--force]"
07432cef 20949msgstr "git update-server-info [--force]"
ef317cd5 20950
a4f16749 20951#: builtin/update-server-info.c:15
ef317cd5 20952msgid "update the info files from scratch"
07432cef 20953msgstr "从头开始更新文件信息"
ef317cd5 20954
fd8cb379
JX
20955#: builtin/upload-pack.c:11
20956msgid "git upload-pack [<options>] <dir>"
20957msgstr "git upload-pack [<选项>] <目录>"
20958
d46c5519
JX
20959#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
20960msgid "quit after a single request/response exchange"
20961msgstr "在一次单独的请求/响应之后退出"
20962
fd8cb379
JX
20963#: builtin/upload-pack.c:25
20964msgid "exit immediately after initial ref advertisement"
20965msgstr "在初始的引用广告后立即退出"
20966
20967#: builtin/upload-pack.c:27
20968msgid "do not try <directory>/.git/ if <directory> is no Git directory"
20969msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
20970
20971#: builtin/upload-pack.c:29
20972msgid "interrupt transfer after <n> seconds of inactivity"
20973msgstr "不活动 <n> 秒钟后终止传输"
20974
a6cd2cc4 20975#: builtin/verify-commit.c:19
814ff314
JX
20976msgid "git verify-commit [-v | --verbose] <commit>..."
20977msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 20978
a6cd2cc4 20979#: builtin/verify-commit.c:68
6acbf033
JX
20980msgid "print commit contents"
20981msgstr "打印提交内容"
20982
a6cd2cc4 20983#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
1b7f4a34
JX
20984msgid "print raw gpg status output"
20985msgstr "打印原始 gpg 状态输出"
20986
a4f16749 20987#: builtin/verify-pack.c:55
814ff314
JX
20988msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
20989msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 20990
a4f16749 20991#: builtin/verify-pack.c:65
ef317cd5
JX
20992msgid "verbose"
20993msgstr "冗长输出"
20994
a4f16749 20995#: builtin/verify-pack.c:67
ef317cd5 20996msgid "show statistics only"
07432cef 20997msgstr "只显示统计"
ef317cd5 20998
a6cd2cc4 20999#: builtin/verify-tag.c:18
1a79b2f1
JX
21000msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
21001msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
ef317cd5 21002
a6cd2cc4 21003#: builtin/verify-tag.c:36
ef317cd5 21004msgid "print tag contents"
55a16ee4 21005msgstr "打印标签内容"
ef317cd5 21006
a5cd71ca 21007#: builtin/worktree.c:17
31e5e17b
JX
21008msgid "git worktree add [<options>] <path> [<commit-ish>]"
21009msgstr "git worktree add [<选项>] <路径> [<提交>]"
5bb01d4f 21010
a5cd71ca 21011#: builtin/worktree.c:18
5c57d762
JX
21012msgid "git worktree list [<options>]"
21013msgstr "git worktree list [<选项>]"
21014
a5cd71ca 21015#: builtin/worktree.c:19
5c57d762
JX
21016msgid "git worktree lock [<options>] <path>"
21017msgstr "git worktree lock [<选项>] <路径>"
21018
a5cd71ca 21019#: builtin/worktree.c:20
31e5e17b
JX
21020msgid "git worktree move <worktree> <new-path>"
21021msgstr "git worktree move <工作区> <新路径>"
21022
a5cd71ca 21023#: builtin/worktree.c:21
5bb01d4f
JX
21024msgid "git worktree prune [<options>]"
21025msgstr "git worktree prune [<选项>]"
21026
a5cd71ca 21027#: builtin/worktree.c:22
31e5e17b
JX
21028msgid "git worktree remove [<options>] <worktree>"
21029msgstr "git worktree remove [<选项>] <工作区>"
21030
a5cd71ca 21031#: builtin/worktree.c:23
5c57d762
JX
21032msgid "git worktree unlock <path>"
21033msgstr "git worktree unlock <路径>"
94550ed3 21034
a5cd71ca 21035#: builtin/worktree.c:60 builtin/worktree.c:898
4c27fcb5
JX
21036#, c-format
21037msgid "failed to delete '%s'"
21038msgstr "删除 '%s' 失败"
21039
a5cd71ca 21040#: builtin/worktree.c:79
5bb01d4f
JX
21041#, c-format
21042msgid "Removing worktrees/%s: not a valid directory"
21043msgstr "删除工作区/%s:不是一个有效的目录"
21044
a5cd71ca 21045#: builtin/worktree.c:85
5bb01d4f
JX
21046#, c-format
21047msgid "Removing worktrees/%s: gitdir file does not exist"
21048msgstr "删除 worktrees/%s:gitdir 文件不存在"
21049
a5cd71ca 21050#: builtin/worktree.c:90 builtin/worktree.c:99
5bb01d4f
JX
21051#, c-format
21052msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
21053msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
21054
a5cd71ca 21055#: builtin/worktree.c:109
6937cb4e
JX
21056#, c-format
21057msgid ""
21058"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
21059"%<PRIuMAX>)"
21060msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
21061
a5cd71ca 21062#: builtin/worktree.c:117
5bb01d4f
JX
21063#, c-format
21064msgid "Removing worktrees/%s: invalid gitdir file"
21065msgstr "删除 worktrees/%s:无效的 gitdir 文件"
21066
a5cd71ca 21067#: builtin/worktree.c:126
5bb01d4f
JX
21068#, c-format
21069msgid "Removing worktrees/%s: gitdir file points to non-existent location"
21070msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
21071
a5cd71ca 21072#: builtin/worktree.c:165
1a79b2f1
JX
21073msgid "report pruned working trees"
21074msgstr "报告清除的工作区"
21075
a5cd71ca 21076#: builtin/worktree.c:167
1a79b2f1 21077msgid "expire working trees older than <time>"
58b6f078 21078msgstr "将早于 <时间> 的工作区过期"
1a79b2f1 21079
a5cd71ca 21080#: builtin/worktree.c:234
5bb01d4f
JX
21081#, c-format
21082msgid "'%s' already exists"
21083msgstr "'%s' 已经存在"
21084
a5cd71ca 21085#: builtin/worktree.c:251
4c27fcb5
JX
21086#, c-format
21087msgid "unable to re-add worktree '%s'"
21088msgstr "无法再次添加工作区 '%s'"
21089
a5cd71ca 21090#: builtin/worktree.c:256
4c27fcb5
JX
21091#, c-format
21092msgid ""
21093"'%s' is a missing but locked worktree;\n"
21094"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
21095msgstr ""
21096"'%s' 是一个丢失但锁定的工作区,使用\n"
21097"'add -f -f' 覆盖,或 'unlock' 和 'prune' 或 'remove' 清除"
21098
a5cd71ca 21099#: builtin/worktree.c:258
4c27fcb5
JX
21100#, c-format
21101msgid ""
21102"'%s' is a missing but already registered worktree;\n"
21103"use 'add -f' to override, or 'prune' or 'remove' to clear"
21104msgstr ""
21105"'%s' 是一个丢失但已经注册的工作区,使用\n"
21106"'add -f' 覆盖,或 'prune' 或 'remove' 清除"
21107
a5cd71ca 21108#: builtin/worktree.c:308
5bb01d4f
JX
21109#, c-format
21110msgid "could not create directory of '%s'"
21111msgstr "不能创建目录 '%s'"
21112
a5cd71ca 21113#: builtin/worktree.c:439 builtin/worktree.c:445
fd8cb379
JX
21114#, c-format
21115msgid "Preparing worktree (new branch '%s')"
21116msgstr "准备工作区(新分支 '%s')"
21117
a5cd71ca 21118#: builtin/worktree.c:441
fd8cb379
JX
21119#, c-format
21120msgid "Preparing worktree (resetting branch '%s'; was at %s)"
21121msgstr "准备工作区(重置分支 '%s',之前为 %s)"
21122
a5cd71ca 21123#: builtin/worktree.c:450
fd8cb379
JX
21124#, c-format
21125msgid "Preparing worktree (checking out '%s')"
21126msgstr "准备工作区(检出 '%s')"
21127
a5cd71ca 21128#: builtin/worktree.c:456
5bb01d4f 21129#, c-format
fd8cb379
JX
21130msgid "Preparing worktree (detached HEAD %s)"
21131msgstr "准备工作区(分离头指针 %s)"
5bb01d4f 21132
a5cd71ca 21133#: builtin/worktree.c:497
5bb01d4f 21134msgid "checkout <branch> even if already checked out in other worktree"
58b6f078 21135msgstr "检出 <分支>,即使已经被检出到其它工作区"
5bb01d4f 21136
a5cd71ca 21137#: builtin/worktree.c:500
5bb01d4f
JX
21138msgid "create a new branch"
21139msgstr "创建一个新分支"
21140
a5cd71ca 21141#: builtin/worktree.c:502
5bb01d4f
JX
21142msgid "create or reset a branch"
21143msgstr "创建或重置一个分支"
21144
a5cd71ca 21145#: builtin/worktree.c:504
5b04ee3b
JX
21146msgid "populate the new working tree"
21147msgstr "生成新的工作区"
21148
a5cd71ca 21149#: builtin/worktree.c:505
60638e98
JX
21150msgid "keep the new working tree locked"
21151msgstr "锁定新工作区"
21152
a5cd71ca 21153#: builtin/worktree.c:508
5809aa05
JX
21154msgid "set up tracking mode (see git-branch(1))"
21155msgstr "设置跟踪模式(参见 git-branch(1))"
21156
a5cd71ca 21157#: builtin/worktree.c:511
5809aa05
JX
21158msgid "try to match the new branch name with a remote-tracking branch"
21159msgstr "尝试为新分支名匹配一个远程跟踪分支"
21160
a5cd71ca 21161#: builtin/worktree.c:519
1b7f4a34
JX
21162msgid "-b, -B, and --detach are mutually exclusive"
21163msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 21164
a5cd71ca 21165#: builtin/worktree.c:580
5809aa05
JX
21166msgid "--[no-]track can only be used if a new branch is created"
21167msgstr "只能在创建新分支时使用选项 --[no-]track "
21168
a5cd71ca 21169#: builtin/worktree.c:680
5c57d762
JX
21170msgid "reason for locking"
21171msgstr "锁定原因"
21172
a5cd71ca
JX
21173#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
21174#: builtin/worktree.c:926
5c57d762
JX
21175#, c-format
21176msgid "'%s' is not a working tree"
21177msgstr "'%s' 不是一个工作区"
21178
a5cd71ca 21179#: builtin/worktree.c:694 builtin/worktree.c:727
5c57d762
JX
21180msgid "The main working tree cannot be locked or unlocked"
21181msgstr "主工作区无法被加锁或解锁"
21182
a5cd71ca 21183#: builtin/worktree.c:699
5c57d762
JX
21184#, c-format
21185msgid "'%s' is already locked, reason: %s"
21186msgstr "'%s' 已被锁定,原因:%s"
21187
a5cd71ca 21188#: builtin/worktree.c:701
5c57d762
JX
21189#, c-format
21190msgid "'%s' is already locked"
21191msgstr "'%s' 已被锁定"
21192
a5cd71ca 21193#: builtin/worktree.c:729
5c57d762
JX
21194#, c-format
21195msgid "'%s' is not locked"
21196msgstr "'%s' 未被锁定"
21197
a5cd71ca 21198#: builtin/worktree.c:770
31e5e17b 21199msgid "working trees containing submodules cannot be moved or removed"
610f8099 21200msgstr "不能移动或删除包含子模组的工作区"
31e5e17b 21201
a5cd71ca 21202#: builtin/worktree.c:778
4c27fcb5
JX
21203msgid "force move even if worktree is dirty or locked"
21204msgstr "强制移动,即使工作区是脏的或已锁定"
21205
a5cd71ca 21206#: builtin/worktree.c:801 builtin/worktree.c:928
31e5e17b
JX
21207#, c-format
21208msgid "'%s' is a main working tree"
21209msgstr "'%s' 是一个主工作区"
21210
a5cd71ca 21211#: builtin/worktree.c:806
31e5e17b
JX
21212#, c-format
21213msgid "could not figure out destination name from '%s'"
21214msgstr "无法从 '%s' 算出目标名称"
21215
a5cd71ca 21216#: builtin/worktree.c:812
31e5e17b
JX
21217#, c-format
21218msgid "target '%s' already exists"
21219msgstr "目标 '%s' 已存在"
21220
a5cd71ca 21221#: builtin/worktree.c:820
31e5e17b 21222#, c-format
4c27fcb5
JX
21223msgid ""
21224"cannot move a locked working tree, lock reason: %s\n"
21225"use 'move -f -f' to override or unlock first"
21226msgstr ""
21227"无法移动一个锁定的工作区,锁定原因:%s\n"
21228"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 21229
a5cd71ca 21230#: builtin/worktree.c:822
4c27fcb5
JX
21231msgid ""
21232"cannot move a locked working tree;\n"
21233"use 'move -f -f' to override or unlock first"
21234msgstr ""
21235"无法移动一个锁定的工作区,\n"
21236"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 21237
a5cd71ca 21238#: builtin/worktree.c:825
31e5e17b
JX
21239#, c-format
21240msgid "validation failed, cannot move working tree: %s"
21241msgstr "验证失败,无法移动工作区:%s"
21242
a5cd71ca 21243#: builtin/worktree.c:830
31e5e17b
JX
21244#, c-format
21245msgid "failed to move '%s' to '%s'"
c1ac5258 21246msgstr "移动 '%s' 到 '%s' 失败"
31e5e17b 21247
a5cd71ca 21248#: builtin/worktree.c:878
31e5e17b
JX
21249#, c-format
21250msgid "failed to run 'git status' on '%s'"
c1ac5258 21251msgstr "在 '%s' 中执行 'git status' 失败"
31e5e17b 21252
a5cd71ca 21253#: builtin/worktree.c:882
31e5e17b 21254#, c-format
a5cd71ca
JX
21255msgid "'%s' contains modified or untracked files, use --force to delete it"
21256msgstr "'%s' 包含修改或未跟踪的文件,使用 --force 删除"
31e5e17b 21257
a5cd71ca 21258#: builtin/worktree.c:887
31e5e17b
JX
21259#, c-format
21260msgid "failed to run 'git status' on '%s', code %d"
c1ac5258 21261msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d"
31e5e17b 21262
a5cd71ca 21263#: builtin/worktree.c:910
4c27fcb5
JX
21264msgid "force removal even if worktree is dirty or locked"
21265msgstr "强制删除,即使工作区是脏的或已锁定"
31e5e17b 21266
a5cd71ca 21267#: builtin/worktree.c:933
31e5e17b 21268#, c-format
4c27fcb5
JX
21269msgid ""
21270"cannot remove a locked working tree, lock reason: %s\n"
21271"use 'remove -f -f' to override or unlock first"
21272msgstr ""
21273"无法删除一个锁定的工作区,锁定原因:%s\n"
21274"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 21275
a5cd71ca 21276#: builtin/worktree.c:935
4c27fcb5
JX
21277msgid ""
21278"cannot remove a locked working tree;\n"
21279"use 'remove -f -f' to override or unlock first"
21280msgstr ""
21281"无法删除一个锁定的工作区,\n"
21282"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 21283
a5cd71ca 21284#: builtin/worktree.c:938
31e5e17b
JX
21285#, c-format
21286msgid "validation failed, cannot remove working tree: %s"
21287msgstr "验证失败,无法删除工作区:%s"
21288
06991777 21289#: builtin/write-tree.c:15
ef317cd5 21290msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 21291msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5 21292
06991777 21293#: builtin/write-tree.c:28
ef317cd5 21294msgid "<prefix>/"
07432cef 21295msgstr "<前缀>/"
ef317cd5 21296
06991777 21297#: builtin/write-tree.c:29
ef317cd5 21298msgid "write tree object for a subdirectory <prefix>"
07432cef 21299msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5 21300
06991777 21301#: builtin/write-tree.c:31
ef317cd5 21302msgid "only useful for debugging"
07432cef 21303msgstr "只对调试有用"
ef317cd5 21304
ddc12c42 21305#: fast-import.c:3125
a5cd71ca
JX
21306#, c-format
21307msgid "Expected 'mark' command, got %s"
21308msgstr "预期 'mark' 命令,得到 %s"
21309
ddc12c42 21310#: fast-import.c:3130
a5cd71ca
JX
21311#, c-format
21312msgid "Expected 'to' command, got %s"
21313msgstr "预期 'to' 命令,得到 %s"
21314
ddc12c42
JX
21315#: fast-import.c:3254
21316#, c-format
21317msgid "feature '%s' forbidden in input without --allow-unsafe-features"
21318msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
21319
06991777 21320#: credential-cache--daemon.c:223
a0b6b246
JX
21321#, c-format
21322msgid ""
21323"The permissions on your socket directory are too loose; other\n"
21324"users may be able to read your cached credentials. Consider running:\n"
21325"\n"
21326"\tchmod 0700 %s"
21327msgstr ""
1a79b2f1
JX
21328"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
21329"行:\n"
a0b6b246
JX
21330"\n"
21331"\tchmod 0700 %s"
21332
06991777 21333#: credential-cache--daemon.c:272
220c313c
JX
21334msgid "print debugging messages to stderr"
21335msgstr "调试信息输出到标准错误"
21336
4c27fcb5
JX
21337#: t/helper/test-reach.c:152
21338#, c-format
21339msgid "commit %s is not marked reachable"
21340msgstr "提交 %s 没有标记为可达"
21341
21342#: t/helper/test-reach.c:162
21343msgid "too many commits marked reachable"
21344msgstr "太多提交标记为可达"
21345
d46c5519
JX
21346#: t/helper/test-serve-v2.c:7
21347msgid "test-tool serve-v2 [<options>]"
21348msgstr "test-tool serve-v2 [<选项>]"
21349
21350#: t/helper/test-serve-v2.c:19
21351msgid "exit immediately after advertising capabilities"
21352msgstr "对能力广告之后立即退出"
21353
fd8cb379 21354#: git.c:27
31e5e17b
JX
21355msgid ""
21356"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
21357" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
21358" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
21359"bare]\n"
31e5e17b
JX
21360" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
21361" <command> [<args>]"
21362msgstr ""
fd8cb379 21363"git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
31e5e17b 21364" [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
21365" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
21366"bare]\n"
31e5e17b
JX
21367" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
21368" <命令> [<参数>]"
21369
fd8cb379 21370#: git.c:34
4dcdc3d8 21371msgid ""
220c313c 21372"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8 21373"concept guides. See 'git help <command>' or 'git help <concept>'\n"
a6cd2cc4
JX
21374"to read about a specific subcommand or concept.\n"
21375"See 'git help git' for an overview of the system."
4dcdc3d8 21376msgstr ""
220c313c
JX
21377"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
21378"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
a6cd2cc4
JX
21379"帮助。\n"
21380"有关系统的概述,查看 'git help git'。"
8ada9598 21381
a6cd2cc4 21382#: git.c:186
31e5e17b
JX
21383#, c-format
21384msgid "no directory given for --git-dir\n"
21385msgstr "没有为 --git-dir 提供目录\n"
21386
a6cd2cc4 21387#: git.c:200
31e5e17b
JX
21388#, c-format
21389msgid "no namespace given for --namespace\n"
21390msgstr "没有为 --namespace 提供命名空间\n"
21391
a6cd2cc4 21392#: git.c:214
31e5e17b
JX
21393#, c-format
21394msgid "no directory given for --work-tree\n"
21395msgstr "没有为 --work-tree 提供目录\n"
21396
a6cd2cc4 21397#: git.c:228
31e5e17b
JX
21398#, c-format
21399msgid "no prefix given for --super-prefix\n"
21400msgstr "没有为 --super-prefix 提供前缀\n"
21401
a6cd2cc4 21402#: git.c:250
31e5e17b
JX
21403#, c-format
21404msgid "-c expects a configuration string\n"
21405msgstr "应为 -c 提供一个配置字符串\n"
21406
a6cd2cc4 21407#: git.c:288
31e5e17b
JX
21408#, c-format
21409msgid "no directory given for -C\n"
21410msgstr "没有为 -C 提供目录\n"
21411
a6cd2cc4 21412#: git.c:314
31e5e17b
JX
21413#, c-format
21414msgid "unknown option: %s\n"
21415msgstr "未知选项:%s\n"
21416
a6cd2cc4 21417#: git.c:360
06991777
JX
21418#, c-format
21419msgid "while expanding alias '%s': '%s'"
5b533632 21420msgstr "在扩展别名 '%s' 时:'%s'"
06991777 21421
a6cd2cc4 21422#: git.c:369
06991777
JX
21423#, c-format
21424msgid ""
21425"alias '%s' changes environment variables.\n"
21426"You can use '!git' in the alias to do this"
21427msgstr ""
21428"别名 '%s' 修改环境变量。您可以使用在别名中\n"
21429"使用 '!git'"
21430
a5cd71ca 21431#: git.c:376
06991777
JX
21432#, c-format
21433msgid "empty alias for %s"
21434msgstr "%s 的空别名"
21435
a5cd71ca 21436#: git.c:379
06991777
JX
21437#, c-format
21438msgid "recursive alias: %s"
5b533632 21439msgstr "递归的别名:%s"
06991777 21440
a5cd71ca 21441#: git.c:459
06991777
JX
21442msgid "write failure on standard output"
21443msgstr "在标准输出写入失败"
21444
a5cd71ca 21445#: git.c:461
06991777
JX
21446msgid "unknown write failure on standard output"
21447msgstr "到标准输出的未知写入错误"
21448
a5cd71ca 21449#: git.c:463
06991777
JX
21450msgid "close failed on standard output"
21451msgstr "标准输出关闭失败"
21452
ddc12c42 21453#: git.c:793
4c27fcb5
JX
21454#, c-format
21455msgid "alias loop detected: expansion of '%s' does not terminate:%s"
21456msgstr "检测到别名循环:'%s'的扩展未终止:%s"
21457
ddc12c42 21458#: git.c:843
06991777
JX
21459#, c-format
21460msgid "cannot handle %s as a builtin"
21461msgstr "不能作为内置命令处理 %s"
21462
ddc12c42 21463#: git.c:856
06991777
JX
21464#, c-format
21465msgid ""
21466"usage: %s\n"
21467"\n"
21468msgstr ""
21469"用法:%s\n"
21470"\n"
21471
ddc12c42 21472#: git.c:876
31e5e17b
JX
21473#, c-format
21474msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
21475msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
21476
ddc12c42 21477#: git.c:888
31e5e17b
JX
21478#, c-format
21479msgid "failed to run command '%s': %s\n"
c1ac5258 21480msgstr "运行命令 '%s' 失败:%s\n"
31e5e17b 21481
06991777 21482#: http.c:378
60638e98
JX
21483#, c-format
21484msgid "negative value for http.postbuffer; defaulting to %d"
21485msgstr "http.postbuffer 为负值,默认为 %d"
21486
06991777 21487#: http.c:399
a0b6b246 21488msgid "Delegation control is not supported with cURL < 7.22.0"
4c27fcb5 21489msgstr "不支持委托控制,因为 cURL < 7.22.0"
a0b6b246 21490
06991777 21491#: http.c:408
276ceeaa
JX
21492msgid "Public key pinning not supported with cURL < 7.44.0"
21493msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
21494
ddc12c42 21495#: http.c:876
4c27fcb5
JX
21496msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
21497msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0"
21498
ddc12c42 21499#: http.c:949
4c27fcb5
JX
21500msgid "Protocol restrictions not supported with cURL < 7.19.4"
21501msgstr "不支持协议限制,因为 cURL < 7.19.4"
21502
ddc12c42 21503#: http.c:1086
4c27fcb5
JX
21504#, c-format
21505msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
21506msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:"
21507
ddc12c42 21508#: http.c:1093
4c27fcb5
JX
21509#, c-format
21510msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
21511msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建"
21512
ddc12c42 21513#: http.c:1097
4c27fcb5
JX
21514#, c-format
21515msgid "Could not set SSL backend to '%s': already set"
21516msgstr "无法将 SSL 后端设置为 '%s':已经设置"
21517
ddc12c42 21518#: http.c:1966
1a79b2f1
JX
21519#, c-format
21520msgid ""
21521"unable to update url base from redirection:\n"
21522" asked for: %s\n"
21523" redirect: %s"
21524msgstr ""
21525"不能更新重定向的 url base:\n"
21526" 请求:%s\n"
21527" 重定向:%s"
21528
a5cd71ca 21529#: remote-curl.c:166
d46c5519
JX
21530#, c-format
21531msgid "invalid quoting in push-option value: '%s'"
5b533632 21532msgstr "在 push-option 取值中无效的引号:'%s'"
d46c5519 21533
a5cd71ca 21534#: remote-curl.c:263
d46c5519
JX
21535#, c-format
21536msgid "%sinfo/refs not valid: is this a git repository?"
21537msgstr "%sinfo/refs 无效:这是一个 git 仓库么?"
21538
a5cd71ca 21539#: remote-curl.c:364
d46c5519
JX
21540msgid "invalid server response; expected service, got flush packet"
21541msgstr "无效的服务端响应。预期服务,得到 flush 包"
21542
a5cd71ca 21543#: remote-curl.c:395
d46c5519
JX
21544#, c-format
21545msgid "invalid server response; got '%s'"
21546msgstr "无效的服务端响应,得到 '%s'"
21547
a5cd71ca 21548#: remote-curl.c:455
d46c5519
JX
21549#, c-format
21550msgid "repository '%s' not found"
21551msgstr "仓库 '%s' 未找到"
21552
a5cd71ca 21553#: remote-curl.c:459
d46c5519
JX
21554#, c-format
21555msgid "Authentication failed for '%s'"
21556msgstr "'%s' 鉴权失败"
21557
a5cd71ca 21558#: remote-curl.c:463
d46c5519
JX
21559#, c-format
21560msgid "unable to access '%s': %s"
21561msgstr "无法访问 '%s':%s"
21562
a5cd71ca 21563#: remote-curl.c:469
1a79b2f1
JX
21564#, c-format
21565msgid "redirecting to %s"
21566msgstr "重定向到 %s"
21567
a5cd71ca 21568#: remote-curl.c:593
d46c5519 21569msgid "shouldn't have EOF when not gentle on EOF"
5b533632 21570msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符"
d46c5519 21571
a5cd71ca 21572#: remote-curl.c:673
d46c5519
JX
21573msgid "unable to rewind rpc post data - try increasing http.postBuffer"
21574msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
21575
a5cd71ca 21576#: remote-curl.c:733
d46c5519
JX
21577#, c-format
21578msgid "RPC failed; %s"
21579msgstr "RPC 失败。%s"
21580
a5cd71ca 21581#: remote-curl.c:773
d46c5519
JX
21582msgid "cannot handle pushes this big"
21583msgstr "不能处理这么大的推送"
21584
a5cd71ca 21585#: remote-curl.c:888
d46c5519
JX
21586#, c-format
21587msgid "cannot deflate request; zlib deflate error %d"
21588msgstr "不能压缩请求,zlib 压缩错误 %d"
21589
a5cd71ca 21590#: remote-curl.c:892
d46c5519
JX
21591#, c-format
21592msgid "cannot deflate request; zlib end error %d"
21593msgstr "不能压缩请求,zlib 结束错误 %d"
21594
a5cd71ca 21595#: remote-curl.c:1023
d46c5519
JX
21596msgid "dumb http transport does not support shallow capabilities"
21597msgstr "哑 http 传输不支持 shalllow 能力"
21598
a5cd71ca 21599#: remote-curl.c:1037
d46c5519
JX
21600msgid "fetch failed."
21601msgstr "获取失败。"
21602
a5cd71ca 21603#: remote-curl.c:1085
d46c5519
JX
21604msgid "cannot fetch by sha1 over smart http"
21605msgstr "无法通过智能 HTTP 获取 sha1"
21606
a5cd71ca 21607#: remote-curl.c:1129 remote-curl.c:1135
d46c5519
JX
21608#, c-format
21609msgid "protocol error: expected sha/ref, got '%s'"
21610msgstr "协议错误:期望 sha/ref,却得到 '%s'"
21611
a5cd71ca 21612#: remote-curl.c:1147 remote-curl.c:1261
d46c5519
JX
21613#, c-format
21614msgid "http transport does not support %s"
21615msgstr "http 传输协议不支持 %s"
21616
a5cd71ca 21617#: remote-curl.c:1183
d46c5519
JX
21618msgid "git-http-push failed"
21619msgstr "git-http-push 失败"
21620
a5cd71ca 21621#: remote-curl.c:1367
d46c5519
JX
21622msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
21623msgstr "remote-curl:用法:git remote-curl <远程> [<url>]"
21624
a5cd71ca 21625#: remote-curl.c:1399
d46c5519
JX
21626msgid "remote-curl: error reading command stream from git"
21627msgstr "remote-curl:错误读取来自 git 的命令流"
21628
a5cd71ca 21629#: remote-curl.c:1406
d46c5519
JX
21630msgid "remote-curl: fetch attempted without a local repo"
21631msgstr "remote-curl:尝试没有本地仓库下获取"
21632
a5cd71ca 21633#: remote-curl.c:1446
d46c5519
JX
21634#, c-format
21635msgid "remote-curl: unknown command '%s' from git"
21636msgstr "remote-curl:未知的来自 git 的命令 '%s'"
21637
a5cd71ca 21638#: list-objects-filter-options.h:85
d46c5519
JX
21639msgid "args"
21640msgstr "参数"
21641
a5cd71ca 21642#: list-objects-filter-options.h:86
d46c5519
JX
21643msgid "object filtering"
21644msgstr "对象过滤"
21645
ddc12c42 21646#: parse-options.h:183
fd8cb379
JX
21647msgid "expiry-date"
21648msgstr "到期时间"
7aea43ff 21649
ddc12c42 21650#: parse-options.h:197
fd8cb379
JX
21651msgid "no-op (backward compatibility)"
21652msgstr "空操作(向后兼容)"
7aea43ff 21653
ddc12c42 21654#: parse-options.h:309
fd8cb379
JX
21655msgid "be more verbose"
21656msgstr "更加详细"
7aea43ff 21657
ddc12c42 21658#: parse-options.h:311
fd8cb379
JX
21659msgid "be more quiet"
21660msgstr "更加安静"
7aea43ff 21661
ddc12c42 21662#: parse-options.h:317
fd8cb379
JX
21663msgid "use <n> digits to display SHA-1s"
21664msgstr "用 <n> 位数字显示 SHA-1 哈希值"
7aea43ff 21665
ddc12c42 21666#: parse-options.h:336
d46c5519
JX
21667msgid "how to strip spaces and #comments from message"
21668msgstr "设置如何删除提交说明里的空格和#注释"
21669
ddc12c42
JX
21670#: parse-options.h:337
21671msgid "read pathspec from file"
21672msgstr "从文件读取路径表达式"
21673
21674#: parse-options.h:338
21675msgid ""
21676"with --pathspec-from-file, pathspec elements are separated with NUL character"
21677msgstr "使用 --pathspec-from-file,路径表达式用空字符分隔"
21678
d46c5519
JX
21679#: ref-filter.h:101
21680msgid "key"
21681msgstr "key"
21682
21683#: ref-filter.h:101
21684msgid "field name to sort on"
21685msgstr "排序的字段名"
21686
21687#: rerere.h:44
21688msgid "update the index with reused conflict resolution if possible"
21689msgstr "如果可能,重用冲突解决更新索引"
21690
a6cd2cc4
JX
21691#: wt-status.h:67
21692msgid "HEAD detached at "
21693msgstr "头指针分离于 "
21694
21695#: wt-status.h:68
21696msgid "HEAD detached from "
21697msgstr "头指针分离自 "
21698
fd8cb379 21699#: command-list.h:50
8ada9598 21700msgid "Add file contents to the index"
81809b99 21701msgstr "添加文件内容至索引"
8ada9598 21702
fd8cb379
JX
21703#: command-list.h:51
21704msgid "Apply a series of patches from a mailbox"
21705msgstr "应用邮箱格式的系列补丁"
21706
21707#: command-list.h:52
21708msgid "Annotate file lines with commit information"
21709msgstr "使用提交信息注释文件行"
21710
21711#: command-list.h:53
21712msgid "Apply a patch to files and/or to the index"
21713msgstr "应用一个补丁到文件和/或索引区"
21714
21715#: command-list.h:54
4c27fcb5
JX
21716msgid "Import a GNU Arch repository into Git"
21717msgstr "将一个 GNU Arch 仓库导入到 Git"
fd8cb379
JX
21718
21719#: command-list.h:55
21720msgid "Create an archive of files from a named tree"
21721msgstr "基于一个指定的树创建文件存档"
21722
21723#: command-list.h:56
1b7f4a34
JX
21724msgid "Use binary search to find the commit that introduced a bug"
21725msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 21726
fd8cb379
JX
21727#: command-list.h:57
21728msgid "Show what revision and author last modified each line of a file"
21729msgstr "显示文件每一行最后修改的版本和修改者"
21730
21731#: command-list.h:58
8ada9598 21732msgid "List, create, or delete branches"
81809b99 21733msgstr "列出、创建或删除分支"
8ada9598 21734
fd8cb379
JX
21735#: command-list.h:59
21736msgid "Move objects and refs by archive"
21737msgstr "通过归档移动对象和引用"
21738
21739#: command-list.h:60
21740msgid "Provide content or type and size information for repository objects"
21741msgstr "提供仓库对象的内容、类型或大小"
21742
21743#: command-list.h:61
21744msgid "Display gitattributes information"
21745msgstr "显示 gitattributes 信息"
21746
21747#: command-list.h:62
21748msgid "Debug gitignore / exclude files"
21749msgstr "调试 gitignore / exclude 文件"
21750
21751#: command-list.h:63
21752msgid "Show canonical names and email addresses of contacts"
21753msgstr "显示联系人的规范名称和电子邮件"
21754
21755#: command-list.h:64
5bb01d4f
JX
21756msgid "Switch branches or restore working tree files"
21757msgstr "切换分支或恢复工作区文件"
8ada9598 21758
fd8cb379
JX
21759#: command-list.h:65
21760msgid "Copy files from the index to the working tree"
21761msgstr "从索引拷贝文件到工作区"
21762
21763#: command-list.h:66
21764msgid "Ensures that a reference name is well formed"
21765msgstr "确保引用名称格式正确"
21766
21767#: command-list.h:67
21768msgid "Find commits yet to be applied to upstream"
21769msgstr "查找尚未应用到上游的提交"
21770
21771#: command-list.h:68
21772msgid "Apply the changes introduced by some existing commits"
21773msgstr "应用一些现存提交引入的修改"
21774
21775#: command-list.h:69
21776msgid "Graphical alternative to git-commit"
21777msgstr "git-commit 的图形替代界面"
21778
21779#: command-list.h:70
21780msgid "Remove untracked files from the working tree"
21781msgstr "从工作区中删除未跟踪文件"
21782
21783#: command-list.h:71
8ada9598 21784msgid "Clone a repository into a new directory"
06991777 21785msgstr "克隆仓库到一个新目录"
8ada9598 21786
fd8cb379
JX
21787#: command-list.h:72
21788msgid "Display data in columns"
21789msgstr "以列的方式显示数据"
21790
21791#: command-list.h:73
8ada9598 21792msgid "Record changes to the repository"
160fb2b2 21793msgstr "记录变更到仓库"
8ada9598 21794
fd8cb379 21795#: command-list.h:74
4c27fcb5
JX
21796msgid "Write and verify Git commit-graph files"
21797msgstr "写入和校验 Git 提交图文件"
fd8cb379
JX
21798
21799#: command-list.h:75
21800msgid "Create a new commit object"
21801msgstr "创建一个新的提交对象"
21802
21803#: command-list.h:76
21804msgid "Get and set repository or global options"
21805msgstr "获取和设置仓库或者全局选项"
21806
21807#: command-list.h:77
21808msgid "Count unpacked number of objects and their disk consumption"
21809msgstr "计算未打包对象的数量和磁盘空间占用"
21810
21811#: command-list.h:78
21812msgid "Retrieve and store user credentials"
21813msgstr "检索和存储用户密码"
21814
21815#: command-list.h:79
21816msgid "Helper to temporarily store passwords in memory"
21817msgstr "在内存中临时存储密码的助手"
21818
21819#: command-list.h:80
21820msgid "Helper to store credentials on disk"
21821msgstr "在磁盘存储密码的助手"
21822
21823#: command-list.h:81
21824msgid "Export a single commit to a CVS checkout"
21825msgstr "将一个提交导出到 CVS 检出中"
21826
21827#: command-list.h:82
21828msgid "Salvage your data out of another SCM people love to hate"
21829msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
21830
21831#: command-list.h:83
21832msgid "A CVS server emulator for Git"
21833msgstr "Git 的一个 CVS 服务模拟器"
21834
21835#: command-list.h:84
21836msgid "A really simple server for Git repositories"
21837msgstr "一个非常简单的 Git 仓库服务器"
21838
21839#: command-list.h:85
21840msgid "Give an object a human readable name based on an available ref"
21841msgstr "基于一个现存的引用为一个对象起一个可读的名称"
21842
21843#: command-list.h:86
8ada9598 21844msgid "Show changes between commits, commit and working tree, etc"
81809b99 21845msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 21846
fd8cb379
JX
21847#: command-list.h:87
21848msgid "Compares files in the working tree and the index"
21849msgstr "比较工作区和索引区中的文件"
21850
21851#: command-list.h:88
21852msgid "Compare a tree to the working tree or index"
21853msgstr "将一个树和工作区或索引做比较"
21854
21855#: command-list.h:89
21856msgid "Compares the content and mode of blobs found via two tree objects"
21857msgstr "比较两个树对象的文件内容和模式"
21858
21859#: command-list.h:90
21860msgid "Show changes using common diff tools"
21861msgstr "使用常见的差异工具显示更改"
21862
21863#: command-list.h:91
21864msgid "Git data exporter"
21865msgstr "Git 数据导出器"
21866
21867#: command-list.h:92
21868msgid "Backend for fast Git data importers"
21869msgstr "Git 快速数据导入器后端"
21870
21871#: command-list.h:93
8ada9598 21872msgid "Download objects and refs from another repository"
160fb2b2 21873msgstr "从另外一个仓库下载对象和引用"
8ada9598 21874
fd8cb379
JX
21875#: command-list.h:94
21876msgid "Receive missing objects from another repository"
21877msgstr "从另一个仓库获取缺失的对象"
21878
21879#: command-list.h:95
21880msgid "Rewrite branches"
21881msgstr "重写分支"
21882
21883#: command-list.h:96
21884msgid "Produce a merge commit message"
21885msgstr "生成一个合并提交信息"
21886
21887#: command-list.h:97
21888msgid "Output information on each ref"
21889msgstr "对每一个引用输出信息 "
21890
21891#: command-list.h:98
21892msgid "Prepare patches for e-mail submission"
21893msgstr "准备电子邮件提交的补丁"
21894
21895#: command-list.h:99
21896msgid "Verifies the connectivity and validity of the objects in the database"
21897msgstr "验证仓库中对象的连通性和有效性"
21898
21899#: command-list.h:100
21900msgid "Cleanup unnecessary files and optimize the local repository"
21901msgstr "清除不必要的文件和优化本地仓库"
21902
21903#: command-list.h:101
21904msgid "Extract commit ID from an archive created using git-archive"
5b533632 21905msgstr "从 git-archive 创建的归档文件中提取提交 ID"
fd8cb379
JX
21906
21907#: command-list.h:102
8ada9598 21908msgid "Print lines matching a pattern"
81809b99 21909msgstr "输出和模式匹配的行"
8ada9598 21910
fd8cb379
JX
21911#: command-list.h:103
21912msgid "A portable graphical interface to Git"
21913msgstr "一个便携的 Git 图形客户端"
21914
21915#: command-list.h:104
21916msgid "Compute object ID and optionally creates a blob from a file"
5b533632 21917msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象"
fd8cb379
JX
21918
21919#: command-list.h:105
21920msgid "Display help information about Git"
21921msgstr "显示 Git 的帮助信息"
21922
21923#: command-list.h:106
21924msgid "Server side implementation of Git over HTTP"
21925msgstr "Git HTTP 协议的服务端实现"
21926
21927#: command-list.h:107
21928msgid "Download from a remote Git repository via HTTP"
21929msgstr "通过 HTTP 从远程 Git 仓库下载"
21930
21931#: command-list.h:108
21932msgid "Push objects over HTTP/DAV to another repository"
21933msgstr "通过 HTTP/DAV 推送对象另一个仓库"
21934
21935#: command-list.h:109
21936msgid "Send a collection of patches from stdin to an IMAP folder"
21937msgstr "从标准输入将一组补丁发送到IMAP文件夹"
21938
21939#: command-list.h:110
21940msgid "Build pack index file for an existing packed archive"
21941msgstr "从一个现存的包存档文件创建包索引"
21942
21943#: command-list.h:111
a77c07d9 21944msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 21945msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 21946
fd8cb379
JX
21947#: command-list.h:112
21948msgid "Instantly browse your working repository in gitweb"
21949msgstr "在 gitweb 中即时浏览您的工作仓库"
21950
21951#: command-list.h:113
d46c5519 21952msgid "Add or parse structured information in commit messages"
fd8cb379
JX
21953msgstr "添加或解析提交说明中的结构化信息"
21954
21955#: command-list.h:114
21956msgid "The Git repository browser"
21957msgstr "Git 仓库浏览器"
21958
21959#: command-list.h:115
8ada9598 21960msgid "Show commit logs"
81809b99 21961msgstr "显示提交日志"
8ada9598 21962
fd8cb379
JX
21963#: command-list.h:116
21964msgid "Show information about files in the index and the working tree"
21965msgstr "显示索引和工作区中文件的信息"
21966
21967#: command-list.h:117
21968msgid "List references in a remote repository"
21969msgstr "显示一个远程仓库的引用"
21970
21971#: command-list.h:118
21972msgid "List the contents of a tree object"
21973msgstr "显示一个树对象的内容"
21974
21975#: command-list.h:119
21976msgid "Extracts patch and authorship from a single e-mail message"
21977msgstr "从单个电子邮件中提取补丁和作者身份"
21978
21979#: command-list.h:120
21980msgid "Simple UNIX mbox splitter program"
21981msgstr "简单的 UNIX mbox 邮箱切分程序"
21982
21983#: command-list.h:121
8ada9598 21984msgid "Join two or more development histories together"
81809b99 21985msgstr "合并两个或更多开发历史"
8ada9598 21986
fd8cb379
JX
21987#: command-list.h:122
21988msgid "Find as good common ancestors as possible for a merge"
21989msgstr "为了合并查找尽可能好的公共祖先提交"
21990
21991#: command-list.h:123
21992msgid "Run a three-way file merge"
21993msgstr "运行一个三路文件合并"
21994
21995#: command-list.h:124
21996msgid "Run a merge for files needing merging"
21997msgstr "对于需要合并的文件执行合并"
21998
21999#: command-list.h:125
22000msgid "The standard helper program to use with git-merge-index"
22001msgstr "与 git-merge-index 一起使用的标准向导程序"
22002
22003#: command-list.h:126
22004msgid "Run merge conflict resolution tools to resolve merge conflicts"
22005msgstr "运行合并冲突解决工具以解决合并冲突"
22006
22007#: command-list.h:127
22008msgid "Show three-way merge without touching index"
22009msgstr "显示三路合并而不动索引"
22010
22011#: command-list.h:128
4c27fcb5
JX
22012msgid "Write and verify multi-pack-indexes"
22013msgstr "写入和校验多包索引"
22014
22015#: command-list.h:129
fd8cb379
JX
22016msgid "Creates a tag object"
22017msgstr "创建一个标签对象"
22018
4c27fcb5 22019#: command-list.h:130
fd8cb379
JX
22020msgid "Build a tree-object from ls-tree formatted text"
22021msgstr "基于 ls-tree 的格式化文本创建一个树对象"
22022
4c27fcb5 22023#: command-list.h:131
8ada9598 22024msgid "Move or rename a file, a directory, or a symlink"
81809b99 22025msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 22026
fd8cb379 22027# 查找给定版本的符号名称
4c27fcb5 22028#: command-list.h:132
fd8cb379
JX
22029msgid "Find symbolic names for given revs"
22030msgstr "查找给定版本的符号名称"
22031
4c27fcb5 22032#: command-list.h:133
fd8cb379
JX
22033msgid "Add or inspect object notes"
22034msgstr "添加或检查对象注释"
22035
4c27fcb5 22036#: command-list.h:134
fd8cb379
JX
22037msgid "Import from and submit to Perforce repositories"
22038msgstr "导入和提交到 Perforce 仓库中"
22039
4c27fcb5 22040#: command-list.h:135
fd8cb379
JX
22041msgid "Create a packed archive of objects"
22042msgstr "创建对象的存档包"
22043
4c27fcb5 22044#: command-list.h:136
fd8cb379
JX
22045msgid "Find redundant pack files"
22046msgstr "查找冗余的包文件"
22047
4c27fcb5 22048#: command-list.h:137
fd8cb379
JX
22049msgid "Pack heads and tags for efficient repository access"
22050msgstr "打包头和标签以实现高效的仓库访问"
22051
4c27fcb5 22052#: command-list.h:138
fd8cb379
JX
22053msgid "Routines to help parsing remote repository access parameters"
22054msgstr "帮助解析远程仓库访问参数的例程"
22055
4c27fcb5 22056#: command-list.h:139
fd8cb379 22057msgid "Compute unique ID for a patch"
5b533632 22058msgstr "计算一个补丁的唯一 ID"
fd8cb379 22059
4c27fcb5 22060#: command-list.h:140
fd8cb379
JX
22061msgid "Prune all unreachable objects from the object database"
22062msgstr "删除对象库中所有不可达对象"
22063
4c27fcb5 22064#: command-list.h:141
fd8cb379
JX
22065msgid "Remove extra objects that are already in pack files"
22066msgstr "删除已经在包文件中的多余对象"
22067
4c27fcb5 22068#: command-list.h:142
2e8451e8 22069msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 22070msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 22071
4c27fcb5 22072#: command-list.h:143
8ada9598 22073msgid "Update remote refs along with associated objects"
81809b99 22074msgstr "更新远程引用和相关的对象"
8ada9598 22075
4c27fcb5 22076#: command-list.h:144
fd8cb379
JX
22077msgid "Applies a quilt patchset onto the current branch"
22078msgstr "将一个 quilt 补丁集应用到当前分支。"
22079
4c27fcb5 22080#: command-list.h:145
c1ac5258
JX
22081msgid "Compare two commit ranges (e.g. two versions of a branch)"
22082msgstr "比较两个提交范围(如一个分支的两个版本)"
22083
4c27fcb5 22084#: command-list.h:146
fd8cb379
JX
22085msgid "Reads tree information into the index"
22086msgstr "将树信息读取到索引"
22087
4c27fcb5 22088#: command-list.h:147
3495628d
JX
22089msgid "Reapply commits on top of another base tip"
22090msgstr "在另一个分支上重新应用提交"
8ada9598 22091
4c27fcb5 22092#: command-list.h:148
fd8cb379
JX
22093msgid "Receive what is pushed into the repository"
22094msgstr "接收推送到仓库中的对象"
22095
4c27fcb5 22096#: command-list.h:149
fd8cb379
JX
22097msgid "Manage reflog information"
22098msgstr "管理 reflog 信息"
22099
4c27fcb5 22100#: command-list.h:150
fd8cb379
JX
22101msgid "Manage set of tracked repositories"
22102msgstr "管理已跟踪仓库"
22103
4c27fcb5 22104#: command-list.h:151
fd8cb379
JX
22105msgid "Pack unpacked objects in a repository"
22106msgstr "打包仓库中未打包对象"
22107
4c27fcb5 22108#: command-list.h:152
fd8cb379
JX
22109msgid "Create, list, delete refs to replace objects"
22110msgstr "创建、列出、删除对象替换引用"
22111
4c27fcb5 22112#: command-list.h:153
fd8cb379
JX
22113msgid "Generates a summary of pending changes"
22114msgstr "生成待定更改的摘要"
22115
4c27fcb5 22116#: command-list.h:154
fd8cb379
JX
22117msgid "Reuse recorded resolution of conflicted merges"
22118msgstr "重用冲突合并的解决方案记录"
22119
4c27fcb5 22120#: command-list.h:155
8ada9598 22121msgid "Reset current HEAD to the specified state"
4375c10e 22122msgstr "重置当前 HEAD 到指定状态"
8ada9598 22123
4c27fcb5 22124#: command-list.h:156
a6cd2cc4
JX
22125msgid "Restore working tree files"
22126msgstr "恢复工作区文件"
22127
22128#: command-list.h:157
fd8cb379
JX
22129msgid "Revert some existing commits"
22130msgstr "回退一些现存提交"
22131
a6cd2cc4 22132#: command-list.h:158
fd8cb379
JX
22133msgid "Lists commit objects in reverse chronological order"
22134msgstr "按时间顺序列出提交对象"
22135
a6cd2cc4 22136#: command-list.h:159
fd8cb379
JX
22137msgid "Pick out and massage parameters"
22138msgstr "选出并处理参数"
22139
a6cd2cc4 22140#: command-list.h:160
8ada9598 22141msgid "Remove files from the working tree and from the index"
81809b99 22142msgstr "从工作区和索引中删除文件"
8ada9598 22143
a6cd2cc4 22144#: command-list.h:161
fd8cb379
JX
22145msgid "Send a collection of patches as emails"
22146msgstr "通过电子邮件发送一组补丁"
22147
a6cd2cc4 22148#: command-list.h:162
fd8cb379
JX
22149msgid "Push objects over Git protocol to another repository"
22150msgstr "使用 Git 协议推送对象到另一个仓库"
22151
a6cd2cc4 22152#: command-list.h:163
fd8cb379
JX
22153msgid "Restricted login shell for Git-only SSH access"
22154msgstr "只允许 Git SSH 访问的受限登录shell"
22155
a6cd2cc4 22156#: command-list.h:164
fd8cb379
JX
22157msgid "Summarize 'git log' output"
22158msgstr "'git log' 输出摘要"
22159
a6cd2cc4 22160#: command-list.h:165
8ada9598 22161msgid "Show various types of objects"
81809b99 22162msgstr "显示各种类型的对象"
8ada9598 22163
a6cd2cc4 22164#: command-list.h:166
fd8cb379
JX
22165msgid "Show branches and their commits"
22166msgstr "显示分支和提交"
22167
a6cd2cc4 22168#: command-list.h:167
fd8cb379
JX
22169msgid "Show packed archive index"
22170msgstr "显示打包归档索引"
22171
a6cd2cc4 22172#: command-list.h:168
fd8cb379
JX
22173msgid "List references in a local repository"
22174msgstr "显示本地仓库中的引用"
22175
a6cd2cc4 22176#: command-list.h:169
fd8cb379
JX
22177msgid "Git's i18n setup code for shell scripts"
22178msgstr "为 shell 脚本准备的 Git 国际化设置代码"
22179
a6cd2cc4 22180#: command-list.h:170
fd8cb379
JX
22181msgid "Common Git shell script setup code"
22182msgstr "常用的 Git shell 脚本设置代码"
22183
a6cd2cc4 22184#: command-list.h:171
ddc12c42
JX
22185msgid "Initialize and modify the sparse-checkout"
22186msgstr "初始化及修改稀疏检出"
22187
22188#: command-list.h:172
fd8cb379
JX
22189msgid "Stash the changes in a dirty working directory away"
22190msgstr "贮藏脏工作区中的修改"
22191
ddc12c42 22192#: command-list.h:173
fd8cb379
JX
22193msgid "Add file contents to the staging area"
22194msgstr "将文件内容添加到索引"
22195
ddc12c42 22196#: command-list.h:174
8ada9598 22197msgid "Show the working tree status"
81809b99 22198msgstr "显示工作区状态"
8ada9598 22199
ddc12c42 22200#: command-list.h:175
fd8cb379
JX
22201msgid "Remove unnecessary whitespace"
22202msgstr "删除不必要的空白字符"
22203
ddc12c42 22204#: command-list.h:176
fd8cb379
JX
22205msgid "Initialize, update or inspect submodules"
22206msgstr "初始化、更新或检查子模组"
22207
ddc12c42 22208#: command-list.h:177
fd8cb379
JX
22209msgid "Bidirectional operation between a Subversion repository and Git"
22210msgstr "Subersion 仓库和 Git 之间的双向操作"
22211
ddc12c42 22212#: command-list.h:178
a6cd2cc4
JX
22213msgid "Switch branches"
22214msgstr "切换分支"
22215
ddc12c42 22216#: command-list.h:179
fd8cb379
JX
22217msgid "Read, modify and delete symbolic refs"
22218msgstr "读取、修改和删除符号引用"
22219
ddc12c42 22220#: command-list.h:180
8ada9598 22221msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 22222msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 22223
ddc12c42 22224#: command-list.h:181
fd8cb379
JX
22225msgid "Creates a temporary file with a blob's contents"
22226msgstr "用 blob 数据对象的内容创建一个临时文件"
220c313c 22227
ddc12c42 22228#: command-list.h:182
fd8cb379
JX
22229msgid "Unpack objects from a packed archive"
22230msgstr "从打包文件中解压缩对象"
220c313c 22231
ddc12c42 22232#: command-list.h:183
fd8cb379
JX
22233msgid "Register file contents in the working tree to the index"
22234msgstr "将工作区的文件内容注册到索引"
220c313c 22235
ddc12c42 22236#: command-list.h:184
fd8cb379
JX
22237msgid "Update the object name stored in a ref safely"
22238msgstr "安全地更新存储于引用中的对象名称"
220c313c 22239
ddc12c42 22240#: command-list.h:185
fd8cb379
JX
22241msgid "Update auxiliary info file to help dumb servers"
22242msgstr "更新辅助信息文件以帮助哑协议服务"
22243
ddc12c42 22244#: command-list.h:186
fd8cb379
JX
22245msgid "Send archive back to git-archive"
22246msgstr "将存档发送回 git-archive"
22247
ddc12c42 22248#: command-list.h:187
fd8cb379
JX
22249msgid "Send objects packed back to git-fetch-pack"
22250msgstr "将对象压缩包发送回 git-fetch-pack"
22251
ddc12c42 22252#: command-list.h:188
fd8cb379
JX
22253msgid "Show a Git logical variable"
22254msgstr "显示一个Git逻辑变量"
22255
ddc12c42 22256#: command-list.h:189
fd8cb379
JX
22257msgid "Check the GPG signature of commits"
22258msgstr "检查 GPG 提交签名"
22259
ddc12c42 22260#: command-list.h:190
fd8cb379
JX
22261msgid "Validate packed Git archive files"
22262msgstr "校验打包的Git存仓文件"
22263
ddc12c42 22264#: command-list.h:191
fd8cb379
JX
22265msgid "Check the GPG signature of tags"
22266msgstr "检查标签的 GPG 签名"
22267
ddc12c42 22268#: command-list.h:192
fd8cb379
JX
22269msgid "Git web interface (web frontend to Git repositories)"
22270msgstr "Git web 界面(Git 仓库的 web 前端)"
22271
ddc12c42 22272#: command-list.h:193
fd8cb379
JX
22273msgid "Show logs with difference each commit introduces"
22274msgstr "显示每一个提交引入的差异日志"
22275
ddc12c42 22276#: command-list.h:194
fd8cb379
JX
22277msgid "Manage multiple working trees"
22278msgstr "管理多个工作区"
22279
ddc12c42 22280#: command-list.h:195
fd8cb379
JX
22281msgid "Create a tree object from the current index"
22282msgstr "从当前索引创建一个树对象"
22283
ddc12c42 22284#: command-list.h:196
fd8cb379
JX
22285msgid "Defining attributes per path"
22286msgstr "定义路径的属性"
22287
ddc12c42 22288#: command-list.h:197
fd8cb379
JX
22289msgid "Git command-line interface and conventions"
22290msgstr "Git 命令行界面和约定"
22291
ddc12c42 22292#: command-list.h:198
fd8cb379
JX
22293msgid "A Git core tutorial for developers"
22294msgstr "面向开发人员的 Git 核心教程"
22295
ddc12c42 22296#: command-list.h:199
fd8cb379
JX
22297msgid "Git for CVS users"
22298msgstr "适合 CVS 用户的 Git 帮助"
22299
ddc12c42 22300#: command-list.h:200
fd8cb379
JX
22301msgid "Tweaking diff output"
22302msgstr "调整差异输出"
22303
ddc12c42 22304#: command-list.h:201
fd8cb379
JX
22305msgid "A useful minimum set of commands for Everyday Git"
22306msgstr "每一天 Git 的一组有用的最小命令集合"
22307
ddc12c42 22308#: command-list.h:202
fd8cb379
JX
22309msgid "A Git Glossary"
22310msgstr "Git 词汇表"
22311
ddc12c42 22312#: command-list.h:203
fd8cb379
JX
22313msgid "Hooks used by Git"
22314msgstr "Git 使用的钩子"
22315
ddc12c42 22316#: command-list.h:204
fd8cb379
JX
22317msgid "Specifies intentionally untracked files to ignore"
22318msgstr "忽略指定的未跟踪文件"
22319
ddc12c42 22320#: command-list.h:205
fd8cb379
JX
22321msgid "Defining submodule properties"
22322msgstr "定义子模组属性"
22323
ddc12c42 22324#: command-list.h:206
fd8cb379
JX
22325msgid "Git namespaces"
22326msgstr "Git 名字空间"
22327
ddc12c42 22328#: command-list.h:207
fd8cb379
JX
22329msgid "Git Repository Layout"
22330msgstr "Git 仓库布局"
22331
ddc12c42 22332#: command-list.h:208
fd8cb379
JX
22333msgid "Specifying revisions and ranges for Git"
22334msgstr "指定 Git 的版本和版本范围"
22335
ddc12c42
JX
22336#: command-list.h:209
22337msgid "Mounting one repository inside another"
22338msgstr "将一个仓库安装到另外一个仓库中"
22339
22340#: command-list.h:210
fd8cb379
JX
22341msgid "A tutorial introduction to Git: part two"
22342msgstr "一个 Git 教程:第二部分"
22343
ddc12c42 22344#: command-list.h:211
fd8cb379
JX
22345msgid "A tutorial introduction to Git"
22346msgstr "一个 Git 教程"
22347
ddc12c42 22348#: command-list.h:212
fd8cb379
JX
22349msgid "An overview of recommended workflows with Git"
22350msgstr "Git 推荐的工作流概览"
220c313c 22351
5c57d762 22352#: git-bisect.sh:54
b694fbb1
JX
22353msgid "You need to start by \"git bisect start\""
22354msgstr "您需要执行 \"git bisect start\" 来开始"
22355
90e6ef53 22356# 译者:注意保持句尾空格
c04f5ac3
JX
22357#. TRANSLATORS: Make sure to include [Y] and [n] in your
22358#. translation. The program will only accept English input
22359#. at this point.
5c57d762 22360#: git-bisect.sh:60
c04f5ac3
JX
22361msgid "Do you want me to do it for you [Y/n]? "
22362msgstr "您想让我为您这样做么[Y/n]? "
22363
06991777 22364#: git-bisect.sh:101
c04f5ac3
JX
22365#, sh-format
22366msgid "Bad rev input: $arg"
9a4b694c 22367msgstr "坏的输入版本:$arg"
c04f5ac3 22368
06991777 22369#: git-bisect.sh:121
5c57d762
JX
22370#, sh-format
22371msgid "Bad rev input: $bisected_head"
9a4b694c 22372msgstr "坏的输入版本:$bisected_head"
c04f5ac3 22373
06991777 22374#: git-bisect.sh:130
c04f5ac3
JX
22375#, sh-format
22376msgid "Bad rev input: $rev"
9a4b694c 22377msgstr "坏的输入版本:$rev"
c04f5ac3 22378
06991777 22379#: git-bisect.sh:139
1b7f4a34
JX
22380#, sh-format
22381msgid "'git bisect $TERM_BAD' can take only one argument."
22382msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
22383
06991777 22384#: git-bisect.sh:209
c04f5ac3
JX
22385msgid "No logfile given"
22386msgstr "未提供日志文件"
22387
06991777 22388#: git-bisect.sh:210
c04f5ac3
JX
22389#, sh-format
22390msgid "cannot read $file for replaying"
22391msgstr "不能读取 $file 来重放"
22392
06991777 22393#: git-bisect.sh:232
c04f5ac3
JX
22394msgid "?? what are you talking about?"
22395msgstr "?? 您在说什么?"
22396
06991777 22397#: git-bisect.sh:241
5809aa05
JX
22398msgid "bisect run failed: no command provided."
22399msgstr "二分查找运行失败:没有提供命令。"
22400
06991777 22401#: git-bisect.sh:246
b694fbb1
JX
22402#, sh-format
22403msgid "running $command"
22404msgstr "运行 $command"
22405
06991777 22406#: git-bisect.sh:253
b694fbb1
JX
22407#, sh-format
22408msgid ""
22409"bisect run failed:\n"
22410"exit code $res from '$command' is < 0 or >= 128"
22411msgstr ""
22412"二分查找运行失败:\n"
07432cef 22413"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 22414
06991777 22415#: git-bisect.sh:279
b694fbb1
JX
22416msgid "bisect run cannot continue any more"
22417msgstr "二分查找不能继续运行"
22418
06991777 22419#: git-bisect.sh:285
b694fbb1
JX
22420#, sh-format
22421msgid ""
22422"bisect run failed:\n"
22423"'bisect_state $state' exited with error code $res"
22424msgstr ""
22425"二分查找运行失败:\n"
22426"'bisect_state $state' 退出码为 $res"
22427
06991777 22428#: git-bisect.sh:292
b694fbb1
JX
22429msgid "bisect run success"
22430msgstr "二分查找运行成功"
c04f5ac3 22431
06991777
JX
22432#: git-bisect.sh:300
22433msgid "We are not bisecting."
22434msgstr "我们没有在二分查找。"
94550ed3 22435
5c57d762
JX
22436#: git-merge-octopus.sh:46
22437msgid ""
22438"Error: Your local changes to the following files would be overwritten by "
22439"merge"
22440msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
22441
22442#: git-merge-octopus.sh:61
22443msgid "Automated merge did not work."
9a4b694c 22444msgstr "自动合并未生效。"
5c57d762
JX
22445
22446#: git-merge-octopus.sh:62
a0b6b246 22447msgid "Should not be doing an octopus."
5c57d762
JX
22448msgstr "不应该执行章鱼式合并。"
22449
22450#: git-merge-octopus.sh:73
22451#, sh-format
22452msgid "Unable to find common commit with $pretty_name"
22453msgstr "无法找到和 $pretty_name 的基线提交"
22454
22455#: git-merge-octopus.sh:77
22456#, sh-format
6937cb4e 22457msgid "Already up to date with $pretty_name"
5c57d762
JX
22458msgstr "已经和 $pretty_name 保持一致"
22459
22460#: git-merge-octopus.sh:89
22461#, sh-format
22462msgid "Fast-forwarding to: $pretty_name"
22463msgstr "快进至:$pretty_name"
22464
22465#: git-merge-octopus.sh:97
22466#, sh-format
22467msgid "Trying simple merge with $pretty_name"
22468msgstr "尝试和 $pretty_name 的简单合并"
22469
22470#: git-merge-octopus.sh:102
22471msgid "Simple merge did not work, trying automatic merge."
9a4b694c 22472msgstr "简单合并未生效,尝试自动合并。"
5c57d762 22473
ddc12c42 22474#: git-legacy-stash.sh:221
c04f5ac3 22475msgid "Cannot remove temporary index (can't happen)"
90e6ef53 22476msgstr "无法删除临时索引(不应发生)"
c04f5ac3 22477
ddc12c42 22478#: git-legacy-stash.sh:272
2e8451e8
JX
22479#, sh-format
22480msgid "Cannot update $ref_stash with $w_commit"
22481msgstr "无法用 $w_commit 更新 $ref_stash"
22482
ddc12c42 22483#: git-legacy-stash.sh:324
b694fbb1 22484#, sh-format
5809aa05
JX
22485msgid "error: unknown option for 'stash push': $option"
22486msgstr "错误:'stash push' 的未知选项:$option"
b694fbb1 22487
ddc12c42 22488#: git-legacy-stash.sh:356
5c57d762
JX
22489#, sh-format
22490msgid "Saved working directory and index state $stash_msg"
22491msgstr "保存工作目录和索引状态 $stash_msg"
22492
ddc12c42 22493#: git-legacy-stash.sh:536
7aea43ff
JX
22494#, sh-format
22495msgid "unknown option: $opt"
22496msgstr "未知选项: $opt"
22497
ddc12c42 22498#: git-legacy-stash.sh:556
c04f5ac3
JX
22499#, sh-format
22500msgid "Too many revisions specified: $REV"
90e6ef53 22501msgstr "指定了太多的版本:$REV"
c04f5ac3 22502
ddc12c42 22503#: git-legacy-stash.sh:571
c04f5ac3 22504#, sh-format
220c313c
JX
22505msgid "$reference is not a valid reference"
22506msgstr "$reference 不是一个有效的引用"
c04f5ac3 22507
ddc12c42 22508#: git-legacy-stash.sh:599
c04f5ac3
JX
22509#, sh-format
22510msgid "'$args' is not a stash-like commit"
a4f16749 22511msgstr "'$args' 不是贮藏式提交"
c04f5ac3 22512
ddc12c42 22513#: git-legacy-stash.sh:610
c04f5ac3
JX
22514#, sh-format
22515msgid "'$args' is not a stash reference"
a4f16749 22516msgstr "'$args' 不是一个贮藏引用"
c04f5ac3 22517
ddc12c42 22518#: git-legacy-stash.sh:618
c04f5ac3 22519msgid "unable to refresh index"
90e6ef53 22520msgstr "无法刷新索引"
c04f5ac3 22521
ddc12c42 22522#: git-legacy-stash.sh:622
c04f5ac3 22523msgid "Cannot apply a stash in the middle of a merge"
a4f16749 22524msgstr "无法在合并过程应用贮藏"
c04f5ac3 22525
ddc12c42 22526#: git-legacy-stash.sh:630
c04f5ac3 22527msgid "Conflicts in index. Try without --index."
90e6ef53 22528msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 22529
ddc12c42 22530#: git-legacy-stash.sh:632
c04f5ac3 22531msgid "Could not save index tree"
90e6ef53 22532msgstr "不能保存索引树"
c04f5ac3 22533
ddc12c42 22534#: git-legacy-stash.sh:641
a4f16749
JX
22535msgid "Could not restore untracked files from stash entry"
22536msgstr "无法从贮藏条目中恢复未跟踪文件"
a0b6b246 22537
ddc12c42 22538#: git-legacy-stash.sh:666
c04f5ac3 22539msgid "Cannot unstage modified files"
160fb2b2 22540msgstr "无法将修改的文件取消暂存"
c04f5ac3 22541
ddc12c42 22542#: git-legacy-stash.sh:704
c04f5ac3
JX
22543#, sh-format
22544msgid "Dropped ${REV} ($s)"
22545msgstr "丢弃了 ${REV} ($s)"
22546
ddc12c42 22547#: git-legacy-stash.sh:705
c04f5ac3
JX
22548#, sh-format
22549msgid "${REV}: Could not drop stash entry"
a4f16749 22550msgstr "${REV}:无法丢弃贮藏条目"
c04f5ac3 22551
ddc12c42 22552#: git-legacy-stash.sh:792
c04f5ac3
JX
22553msgid "(To restore them type \"git stash apply\")"
22554msgstr "(为恢复数据输入 \"git stash apply\")"
22555
ddc12c42 22556#: git-submodule.sh:202
2e8451e8
JX
22557msgid "Relative path can only be used from the toplevel of the working tree"
22558msgstr "只能在工作区的顶级目录中使用相对路径"
22559
ddc12c42 22560#: git-submodule.sh:212
c04f5ac3
JX
22561#, sh-format
22562msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 22563msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 22564
ddc12c42 22565#: git-submodule.sh:231
c04f5ac3 22566#, sh-format
170e9899
JX
22567msgid "'$sm_path' already exists in the index"
22568msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 22569
ddc12c42 22570#: git-submodule.sh:234
1a79b2f1
JX
22571#, sh-format
22572msgid "'$sm_path' already exists in the index and is not a submodule"
22573msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
22574
ddc12c42 22575#: git-submodule.sh:241
d46c5519
JX
22576#, sh-format
22577msgid "'$sm_path' does not have a commit checked out"
5b533632 22578msgstr "'$sm_path' 没有检出的提交"
d46c5519 22579
ddc12c42 22580#: git-submodule.sh:247
b694fbb1
JX
22581#, sh-format
22582msgid ""
22583"The following path is ignored by one of your .gitignore files:\n"
22584"$sm_path\n"
22585"Use -f if you really want to add it."
22586msgstr ""
22587"以下路径被您的一个 .gitignore 文件所忽略:\n"
22588"$sm_path\n"
22589"如果您确实想添加它,使用 -f 参数。"
22590
ddc12c42 22591#: git-submodule.sh:270
b694fbb1
JX
22592#, sh-format
22593msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 22594msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 22595
ddc12c42 22596#: git-submodule.sh:272
c04f5ac3 22597#, sh-format
170e9899 22598msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 22599msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 22600
ddc12c42 22601#: git-submodule.sh:280
07432cef
WS
22602#, sh-format
22603msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 22604msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 22605
ddc12c42 22606#: git-submodule.sh:282
07432cef
WS
22607#, sh-format
22608msgid ""
5c57d762
JX
22609"If you want to reuse this local git directory instead of cloning again from\n"
22610" $realrepo\n"
22611"use the '--force' option. If the local git directory is not the correct "
22612"repo\n"
07432cef
WS
22613"or you are unsure what this means choose another name with the '--name' "
22614"option."
5c57d762
JX
22615msgstr ""
22616"如果您想要重用这个本地 git 目录而非重新克隆自\n"
22617" $realrepo\n"
22618"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
22619"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
07432cef 22620
ddc12c42 22621#: git-submodule.sh:288
07432cef
WS
22622#, sh-format
22623msgid "Reactivating local git directory for submodule '$sm_name'."
22624msgstr "激活本地 git 目录到子模组 '$sm_name'。"
22625
ddc12c42 22626#: git-submodule.sh:300
c04f5ac3 22627#, sh-format
170e9899
JX
22628msgid "Unable to checkout submodule '$sm_path'"
22629msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 22630
ddc12c42 22631#: git-submodule.sh:305
c04f5ac3 22632#, sh-format
170e9899
JX
22633msgid "Failed to add submodule '$sm_path'"
22634msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 22635
ddc12c42 22636#: git-submodule.sh:314
c04f5ac3 22637#, sh-format
170e9899
JX
22638msgid "Failed to register submodule '$sm_path'"
22639msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 22640
ddc12c42 22641#: git-submodule.sh:580
c04f5ac3 22642#, sh-format
2e8451e8
JX
22643msgid "Unable to find current revision in submodule path '$displaypath'"
22644msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 22645
ddc12c42 22646#: git-submodule.sh:590
c04f5ac3 22647#, sh-format
170e9899
JX
22648msgid "Unable to fetch in submodule path '$sm_path'"
22649msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 22650
ddc12c42 22651#: git-submodule.sh:595
5c57d762
JX
22652#, sh-format
22653msgid ""
22654"Unable to find current ${remote_name}/${branch} revision in submodule path "
22655"'$sm_path'"
9a4b694c 22656msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
5c57d762 22657
ddc12c42 22658#: git-submodule.sh:613
2e8451e8 22659#, sh-format
d46c5519
JX
22660msgid ""
22661"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
22662"$sha1:"
22663msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:"
2e8451e8 22664
ddc12c42 22665#: git-submodule.sh:619
5c57d762
JX
22666#, sh-format
22667msgid ""
22668"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
22669"Direct fetching of that commit failed."
a0b6b246
JX
22670msgstr ""
22671"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
5c57d762 22672
ddc12c42 22673#: git-submodule.sh:626
6c94aba5
JX
22674#, sh-format
22675msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
22676msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
22677
ddc12c42 22678#: git-submodule.sh:627
c04f5ac3 22679#, sh-format
6c94aba5
JX
22680msgid "Submodule path '$displaypath': checked out '$sha1'"
22681msgstr "子模组路径 '$displaypath':检出 '$sha1'"
22682
ddc12c42 22683#: git-submodule.sh:631
6c94aba5 22684#, sh-format
2e8451e8
JX
22685msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
22686msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 22687
ddc12c42 22688#: git-submodule.sh:632
c04f5ac3 22689#, sh-format
2e8451e8
JX
22690msgid "Submodule path '$displaypath': rebased into '$sha1'"
22691msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 22692
ddc12c42 22693#: git-submodule.sh:637
c04f5ac3 22694#, sh-format
2e8451e8
JX
22695msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
22696msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 22697
ddc12c42 22698#: git-submodule.sh:638
c04f5ac3 22699#, sh-format
2e8451e8
JX
22700msgid "Submodule path '$displaypath': merged in '$sha1'"
22701msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 22702
ddc12c42 22703#: git-submodule.sh:643
c04f5ac3 22704#, sh-format
5b04ee3b
JX
22705msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
22706msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
c04f5ac3 22707
ddc12c42 22708#: git-submodule.sh:644
c04f5ac3 22709#, sh-format
5b04ee3b 22710msgid "Submodule path '$displaypath': '$command $sha1'"
aef18cc6 22711msgstr "子模组 '$displaypath':'$command $sha1'"
c04f5ac3 22712
ddc12c42 22713#: git-submodule.sh:675
2e8451e8
JX
22714#, sh-format
22715msgid "Failed to recurse into submodule path '$displaypath'"
22716msgstr "无法递归进子模组路径 '$displaypath'"
22717
ddc12c42 22718#: git-submodule.sh:886
649900bc
JX
22719msgid "The --cached option cannot be used with the --files option"
22720msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 22721
ddc12c42 22722#: git-submodule.sh:938
b694fbb1
JX
22723#, sh-format
22724msgid "unexpected mode $mod_dst"
22725msgstr "意外的模式 $mod_dst"
c04f5ac3 22726
90e6ef53 22727# 译者:注意保持前导空格
ddc12c42 22728#: git-submodule.sh:958
c04f5ac3 22729#, sh-format
2e8451e8
JX
22730msgid " Warn: $display_name doesn't contain commit $sha1_src"
22731msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 22732
90e6ef53 22733# 译者:注意保持前导空格
ddc12c42 22734#: git-submodule.sh:961
c04f5ac3 22735#, sh-format
2e8451e8
JX
22736msgid " Warn: $display_name doesn't contain commit $sha1_dst"
22737msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 22738
90e6ef53 22739# 译者:注意保持前导空格
ddc12c42 22740#: git-submodule.sh:964
c04f5ac3 22741#, sh-format
2e8451e8
JX
22742msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
22743msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 22744
5b04ee3b
JX
22745#: git-parse-remote.sh:89
22746#, sh-format
22747msgid "See git-${cmd}(1) for details."
22748msgstr "详见 git-${cmd}(1)。"
5c57d762 22749
a6cd2cc4
JX
22750#: git-rebase--preserve-merges.sh:109
22751msgid "Applied autostash."
22752msgstr "已应用 autostash。"
22753
22754#: git-rebase--preserve-merges.sh:112
22755#, sh-format
22756msgid "Cannot store $stash_sha1"
22757msgstr "不能存储 $stash_sha1"
22758
22759#: git-rebase--preserve-merges.sh:191
c1ac5258
JX
22760#, sh-format
22761msgid "Rebasing ($new_count/$total)"
22762msgstr "变基中($new_count/$total)"
22763
a6cd2cc4 22764#: git-rebase--preserve-merges.sh:207
c1ac5258
JX
22765msgid ""
22766"\n"
22767"Commands:\n"
22768"p, pick <commit> = use commit\n"
22769"r, reword <commit> = use commit, but edit the commit message\n"
22770"e, edit <commit> = use commit, but stop for amending\n"
22771"s, squash <commit> = use commit, but meld into previous commit\n"
22772"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
22773"x, exec <commit> = run command (the rest of the line) using shell\n"
22774"d, drop <commit> = remove commit\n"
22775"l, label <label> = label current HEAD with a name\n"
22776"t, reset <label> = reset HEAD to a label\n"
22777"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
22778". create a merge commit using the original merge commit's\n"
22779". message (or the oneline, if no original merge commit was\n"
22780". specified). Use -c <commit> to reword the commit message.\n"
22781"\n"
22782"These lines can be re-ordered; they are executed from top to bottom.\n"
22783msgstr ""
22784"\n"
22785"命令:\n"
22786"p, pick <提交> = 使用提交\n"
22787"r, reword <提交> = 使用提交,但修改提交说明\n"
22788"e, edit <提交> = 使用提交,但停下来修补\n"
22789"s, squash <提交> = 使用提交,但融合到前一个提交\n"
22790"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
22791"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
22792"d, drop <提交> = 删除提交\n"
22793"l, label <标签> = 为当前 HEAD 打上标签\n"
22794"t, reset <标签> = 重置 HEAD 到该标签\n"
22795"m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
22796". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
22797". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
22798". -c <提交> 可以编辑提交说明。\n"
22799"\n"
22800"可以对这些行重新排序,将从上至下执行。\n"
22801
a6cd2cc4 22802#: git-rebase--preserve-merges.sh:270
5c57d762
JX
22803#, sh-format
22804msgid ""
22805"You can amend the commit now, with\n"
22806"\n"
22807"\tgit commit --amend $gpg_sign_opt_quoted\n"
22808"\n"
22809"Once you are satisfied with your changes, run\n"
22810"\n"
22811"\tgit rebase --continue"
22812msgstr ""
22813"您现在可以修补这个提交,使用\n"
22814"\n"
22815"\tgit commit --amend $gpg_sign_opt_quoted\n"
22816"\n"
9a4b694c 22817"当您对变更感到满意,执行\n"
5c57d762
JX
22818"\n"
22819"\tgit rebase --continue"
22820
a6cd2cc4 22821#: git-rebase--preserve-merges.sh:295
5c57d762
JX
22822#, sh-format
22823msgid "$sha1: not a commit that can be picked"
22824msgstr "$sha1:不是一个可以被拣选的提交"
22825
a6cd2cc4 22826#: git-rebase--preserve-merges.sh:334
5c57d762
JX
22827#, sh-format
22828msgid "Invalid commit name: $sha1"
22829msgstr "无效的提交名:$sha1"
22830
a6cd2cc4 22831#: git-rebase--preserve-merges.sh:364
5c57d762
JX
22832msgid "Cannot write current commit's replacement sha1"
22833msgstr "不能写入当前提交的替代 sha1"
22834
a6cd2cc4 22835#: git-rebase--preserve-merges.sh:415
5c57d762
JX
22836#, sh-format
22837msgid "Fast-forward to $sha1"
22838msgstr "快进到 $sha1"
22839
a6cd2cc4 22840#: git-rebase--preserve-merges.sh:417
5c57d762
JX
22841#, sh-format
22842msgid "Cannot fast-forward to $sha1"
22843msgstr "不能快进到 $sha1"
22844
a6cd2cc4 22845#: git-rebase--preserve-merges.sh:426
5c57d762
JX
22846#, sh-format
22847msgid "Cannot move HEAD to $first_parent"
22848msgstr "不能移动 HEAD 到 $first_parent"
22849
a6cd2cc4 22850#: git-rebase--preserve-merges.sh:431
5c57d762
JX
22851#, sh-format
22852msgid "Refusing to squash a merge: $sha1"
22853msgstr "拒绝压缩一个合并:$sha1"
22854
a6cd2cc4 22855#: git-rebase--preserve-merges.sh:449
5c57d762
JX
22856#, sh-format
22857msgid "Error redoing merge $sha1"
22858msgstr "无法重做合并 $sha1"
22859
a6cd2cc4 22860#: git-rebase--preserve-merges.sh:458
5c57d762
JX
22861#, sh-format
22862msgid "Could not pick $sha1"
22863msgstr "不能拣选 $sha1"
22864
a6cd2cc4 22865#: git-rebase--preserve-merges.sh:467
5c57d762
JX
22866#, sh-format
22867msgid "This is the commit message #${n}:"
9a4b694c 22868msgstr "这是提交说明 #${n}:"
5c57d762 22869
a6cd2cc4 22870#: git-rebase--preserve-merges.sh:472
5c57d762
JX
22871#, sh-format
22872msgid "The commit message #${n} will be skipped:"
9a4b694c 22873msgstr "提交说明 #${n} 将被跳过:"
5c57d762 22874
a6cd2cc4 22875#: git-rebase--preserve-merges.sh:483
5c57d762
JX
22876#, sh-format
22877msgid "This is a combination of $count commit."
22878msgid_plural "This is a combination of $count commits."
22879msgstr[0] "这是一个 $count 个提交的组合。"
22880msgstr[1] "这是一个 $count 个提交的组合。"
22881
a6cd2cc4 22882#: git-rebase--preserve-merges.sh:492
5c57d762
JX
22883#, sh-format
22884msgid "Cannot write $fixup_msg"
22885msgstr "不能写入 $fixup_msg"
22886
a6cd2cc4 22887#: git-rebase--preserve-merges.sh:495
5c57d762
JX
22888msgid "This is a combination of 2 commits."
22889msgstr "这是一个 2 个提交的组合。"
22890
a6cd2cc4
JX
22891#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
22892#: git-rebase--preserve-merges.sh:582
5c57d762
JX
22893#, sh-format
22894msgid "Could not apply $sha1... $rest"
22895msgstr "不能应用 $sha1... $rest"
22896
a6cd2cc4 22897#: git-rebase--preserve-merges.sh:611
5c57d762
JX
22898#, sh-format
22899msgid ""
22900"Could not amend commit after successfully picking $sha1... $rest\n"
22901"This is most likely due to an empty commit message, or the pre-commit hook\n"
22902"failed. If the pre-commit hook failed, you may need to resolve the issue "
22903"before\n"
22904"you are able to reword the commit."
22905msgstr ""
22906"不能在成功拣选 $sha1... $rest 之后修补提交\n"
22907"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
22908"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
22909
a6cd2cc4 22910#: git-rebase--preserve-merges.sh:626
5c57d762
JX
22911#, sh-format
22912msgid "Stopped at $sha1_abbrev... $rest"
22913msgstr "停止在 $sha1_abbrev... $rest"
22914
a6cd2cc4 22915#: git-rebase--preserve-merges.sh:641
5c57d762
JX
22916#, sh-format
22917msgid "Cannot '$squash_style' without a previous commit"
9a4b694c 22918msgstr "没有父提交的情况下不能 '$squash_style'"
5c57d762 22919
a6cd2cc4 22920#: git-rebase--preserve-merges.sh:683
5c57d762
JX
22921#, sh-format
22922msgid "Executing: $rest"
22923msgstr "执行:$rest"
22924
a6cd2cc4 22925#: git-rebase--preserve-merges.sh:691
5c57d762
JX
22926#, sh-format
22927msgid "Execution failed: $rest"
22928msgstr "执行失败:$rest"
22929
a6cd2cc4 22930#: git-rebase--preserve-merges.sh:693
5c57d762
JX
22931msgid "and made changes to the index and/or the working tree"
22932msgstr "并且修改索引和/或工作区"
22933
22934# 译者:注意保持前导空格
a6cd2cc4 22935#: git-rebase--preserve-merges.sh:695
5c57d762
JX
22936msgid ""
22937"You can fix the problem, and then run\n"
22938"\n"
22939"\tgit rebase --continue"
22940msgstr ""
22941"您可以解决这个问题,然后运行\n"
22942"\n"
22943"\tgit rebase --continue"
22944
22945#. TRANSLATORS: after these lines is a command to be issued by the user
a6cd2cc4 22946#: git-rebase--preserve-merges.sh:708
5c57d762
JX
22947#, sh-format
22948msgid ""
22949"Execution succeeded: $rest\n"
22950"but left changes to the index and/or the working tree\n"
22951"Commit or stash your changes, and then run\n"
22952"\n"
22953"\tgit rebase --continue"
22954msgstr ""
22955"执行成功:$rest\n"
a4f16749 22956"但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
5c57d762
JX
22957"\n"
22958"\tgit rebase --continue"
22959
a6cd2cc4 22960#: git-rebase--preserve-merges.sh:719
5c57d762
JX
22961#, sh-format
22962msgid "Unknown command: $command $sha1 $rest"
22963msgstr "未知命令:$command $sha1 $rest"
22964
a6cd2cc4 22965#: git-rebase--preserve-merges.sh:720
5c57d762
JX
22966msgid "Please fix this using 'git rebase --edit-todo'."
22967msgstr "要修改请使用命令 'git rebase --edit-todo'。"
22968
a6cd2cc4 22969#: git-rebase--preserve-merges.sh:755
5c57d762
JX
22970#, sh-format
22971msgid "Successfully rebased and updated $head_name."
9a4b694c 22972msgstr "成功变基并更新 $head_name。"
5c57d762 22973
a6cd2cc4 22974#: git-rebase--preserve-merges.sh:812
5c57d762
JX
22975msgid "Could not remove CHERRY_PICK_HEAD"
22976msgstr "不能删除 CHERRY_PICK_HEAD"
22977
a6cd2cc4 22978#: git-rebase--preserve-merges.sh:817
5c57d762
JX
22979#, sh-format
22980msgid ""
22981"You have staged changes in your working tree.\n"
22982"If these changes are meant to be\n"
22983"squashed into the previous commit, run:\n"
22984"\n"
22985" git commit --amend $gpg_sign_opt_quoted\n"
22986"\n"
22987"If they are meant to go into a new commit, run:\n"
22988"\n"
22989" git commit $gpg_sign_opt_quoted\n"
22990"\n"
a0b6b246 22991"In both cases, once you're done, continue with:\n"
5c57d762
JX
22992"\n"
22993" git rebase --continue\n"
22994msgstr ""
22995"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
22996"\n"
22997" git commit --amend $gpg_sign_opt_quoted\n"
22998"\n"
22999"如果这些变更要形成一个新提交,执行:\n"
23000"\n"
23001" git commit $gpg_sign_opt_quoted\n"
23002"\n"
9a4b694c 23003"无论哪种情况,当您完成提交,继续执行:\n"
5c57d762
JX
23004"\n"
23005" git rebase --continue\n"
23006
a6cd2cc4 23007#: git-rebase--preserve-merges.sh:834
5c57d762 23008msgid "Error trying to find the author identity to amend commit"
9a4b694c 23009msgstr "在修补提交中查找作者信息时遇到错误"
5c57d762 23010
a6cd2cc4 23011#: git-rebase--preserve-merges.sh:839
5c57d762
JX
23012msgid ""
23013"You have uncommitted changes in your working tree. Please commit them\n"
23014"first and then run 'git rebase --continue' again."
a0b6b246
JX
23015msgstr ""
23016"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
5c57d762 23017
a6cd2cc4 23018#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
5c57d762
JX
23019msgid "Could not commit staged changes."
23020msgstr "不能提交暂存的修改。"
23021
a6cd2cc4 23022#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
4c27fcb5
JX
23023msgid "Could not execute editor"
23024msgstr "无法运行编辑器"
23025
a6cd2cc4 23026#: git-rebase--preserve-merges.sh:900
4c27fcb5
JX
23027#, sh-format
23028msgid "Could not checkout $switch_to"
23029msgstr "不能检出 $switch_to"
23030
a6cd2cc4 23031#: git-rebase--preserve-merges.sh:907
4c27fcb5
JX
23032msgid "No HEAD?"
23033msgstr "没有 HEAD?"
23034
a6cd2cc4 23035#: git-rebase--preserve-merges.sh:908
4c27fcb5
JX
23036#, sh-format
23037msgid "Could not create temporary $state_dir"
23038msgstr "不能创建临时 $state_dir"
23039
a6cd2cc4 23040#: git-rebase--preserve-merges.sh:911
4c27fcb5
JX
23041msgid "Could not mark as interactive"
23042msgstr "不能标记为交互式"
23043
a6cd2cc4 23044#: git-rebase--preserve-merges.sh:943
4c27fcb5
JX
23045#, sh-format
23046msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
23047msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
23048msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
23049msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
5c57d762 23050
a6cd2cc4 23051#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
fd8cb379
JX
23052msgid "Could not init rewritten commits"
23053msgstr "不能对重写提交进行初始化"
23054
5c57d762
JX
23055#: git-sh-setup.sh:89 git-sh-setup.sh:94
23056#, sh-format
23057msgid "usage: $dashless $USAGE"
23058msgstr "用法:$dashless $USAGE"
23059
d46c5519 23060#: git-sh-setup.sh:191
5c57d762
JX
23061#, sh-format
23062msgid "Cannot chdir to $cdup, the toplevel of the working tree"
9a4b694c 23063msgstr "不能切换目录到 $cdup,工作区的顶级目录"
5c57d762 23064
d46c5519 23065#: git-sh-setup.sh:200 git-sh-setup.sh:207
5c57d762
JX
23066#, sh-format
23067msgid "fatal: $program_name cannot be used without a working tree."
06991777 23068msgstr "致命错误:$program_name 不能在没有工作区的情况下使用"
5c57d762 23069
d46c5519 23070#: git-sh-setup.sh:221
5c57d762
JX
23071msgid "Cannot rebase: You have unstaged changes."
23072msgstr "不能变基:您有未暂存的变更。"
23073
d46c5519 23074#: git-sh-setup.sh:224
5c57d762
JX
23075msgid "Cannot rewrite branches: You have unstaged changes."
23076msgstr "不能重写分支:您有未暂存的变更。"
23077
d46c5519 23078#: git-sh-setup.sh:227
a0b6b246
JX
23079msgid "Cannot pull with rebase: You have unstaged changes."
23080msgstr "无法通过变基方式拉取:您有未暂存的变更。"
23081
d46c5519 23082#: git-sh-setup.sh:230
5c57d762
JX
23083#, sh-format
23084msgid "Cannot $action: You have unstaged changes."
23085msgstr "不能 $action:您有未暂存的变更。"
23086
d46c5519 23087#: git-sh-setup.sh:243
5c57d762
JX
23088msgid "Cannot rebase: Your index contains uncommitted changes."
23089msgstr "不能变基:您的索引中包含未提交的变更。"
23090
d46c5519 23091#: git-sh-setup.sh:246
a0b6b246
JX
23092msgid "Cannot pull with rebase: Your index contains uncommitted changes."
23093msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
23094
d46c5519 23095#: git-sh-setup.sh:249
5c57d762
JX
23096#, sh-format
23097msgid "Cannot $action: Your index contains uncommitted changes."
23098msgstr "不能 $action:您的索引中包含未提交的变更。"
23099
d46c5519 23100#: git-sh-setup.sh:253
a0b6b246
JX
23101msgid "Additionally, your index contains uncommitted changes."
23102msgstr "而且您的索引中包含未提交的变更。"
23103
d46c5519 23104#: git-sh-setup.sh:373
5c57d762
JX
23105msgid "You need to run this command from the toplevel of the working tree."
23106msgstr "您需要在工作区的顶级目录中运行这个命令。"
23107
d46c5519 23108#: git-sh-setup.sh:378
5c57d762
JX
23109msgid "Unable to determine absolute path of git directory"
23110msgstr "不能确定 git 目录的绝对路径"
a0b6b246 23111
1a79b2f1 23112#. TRANSLATORS: you can adjust this to align "git add -i" status menu
ddc12c42 23113#: git-add--interactive.perl:212
1a79b2f1
JX
23114#, perl-format
23115msgid "%12s %12s %s"
23116msgstr "%12s %12s %s"
23117
ddc12c42 23118#: git-add--interactive.perl:634
1a79b2f1
JX
23119#, perl-format
23120msgid "touched %d path\n"
23121msgid_plural "touched %d paths\n"
23122msgstr[0] "触碰了 %d 个路径\n"
23123msgstr[1] "触碰了 %d 个路径\n"
23124
ddc12c42 23125#: git-add--interactive.perl:1053
1a79b2f1
JX
23126msgid ""
23127"If the patch applies cleanly, the edited hunk will immediately be\n"
23128"marked for staging."
23129msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
23130
ddc12c42 23131#: git-add--interactive.perl:1056
1a79b2f1
JX
23132msgid ""
23133"If the patch applies cleanly, the edited hunk will immediately be\n"
23134"marked for stashing."
a4f16749 23135msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
1a79b2f1 23136
ddc12c42 23137#: git-add--interactive.perl:1059
1a79b2f1
JX
23138msgid ""
23139"If the patch applies cleanly, the edited hunk will immediately be\n"
23140"marked for unstaging."
23141msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
23142
ddc12c42
JX
23143#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
23144#: git-add--interactive.perl:1077
1a79b2f1
JX
23145msgid ""
23146"If the patch applies cleanly, the edited hunk will immediately be\n"
23147"marked for applying."
23148msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
23149
ddc12c42
JX
23150#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
23151#: git-add--interactive.perl:1074
1a79b2f1
JX
23152msgid ""
23153"If the patch applies cleanly, the edited hunk will immediately be\n"
23154"marked for discarding."
23155msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
23156
ddc12c42 23157#: git-add--interactive.perl:1111
1a79b2f1
JX
23158#, perl-format
23159msgid "failed to open hunk edit file for writing: %s"
c1ac5258 23160msgstr "为写入打开块编辑文件失败:%s"
1a79b2f1 23161
ddc12c42 23162#: git-add--interactive.perl:1118
1a79b2f1
JX
23163#, perl-format
23164msgid ""
23165"---\n"
23166"To remove '%s' lines, make them ' ' lines (context).\n"
23167"To remove '%s' lines, delete them.\n"
23168"Lines starting with %s will be removed.\n"
23169msgstr ""
23170"---\n"
23171"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
23172"要删除 '%s' 开始的行,删除它们。\n"
23173"以 %s 开始的行将被删除。\n"
23174
ddc12c42 23175#: git-add--interactive.perl:1140
1a79b2f1
JX
23176#, perl-format
23177msgid "failed to open hunk edit file for reading: %s"
23178msgstr "无法读取块编辑文件:%s"
23179
ddc12c42 23180#: git-add--interactive.perl:1248
1a79b2f1
JX
23181msgid ""
23182"y - stage this hunk\n"
23183"n - do not stage this hunk\n"
23184"q - quit; do not stage this hunk or any of the remaining ones\n"
23185"a - stage this hunk and all later hunks in the file\n"
23186"d - do not stage this hunk or any of the later hunks in the file"
23187msgstr ""
23188"y - 暂存该块\n"
23189"n - 不要暂存该块\n"
23190"q - 退出。不暂存该块及后面的全部块\n"
23191"a - 暂存该块和本文件中后面的全部块\n"
23192"d - 不暂存该块和本文件中后面的全部块"
23193
ddc12c42 23194#: git-add--interactive.perl:1254
1a79b2f1
JX
23195msgid ""
23196"y - stash this hunk\n"
23197"n - do not stash this hunk\n"
23198"q - quit; do not stash this hunk or any of the remaining ones\n"
23199"a - stash this hunk and all later hunks in the file\n"
23200"d - do not stash this hunk or any of the later hunks in the file"
23201msgstr ""
23202"y - 贮藏该块\n"
23203"n - 不要贮藏该块\n"
23204"q - 退出。不贮藏该块及后面的全部块\n"
23205"a - 贮藏该块和本文件中后面的全部块\n"
23206"d - 不贮藏该块和本文件中后面的全部块"
23207
ddc12c42 23208#: git-add--interactive.perl:1260
1a79b2f1
JX
23209msgid ""
23210"y - unstage this hunk\n"
23211"n - do not unstage this hunk\n"
23212"q - quit; do not unstage this hunk or any of the remaining ones\n"
23213"a - unstage this hunk and all later hunks in the file\n"
23214"d - do not unstage this hunk or any of the later hunks in the file"
23215msgstr ""
23216"y - 不暂存该块\n"
23217"n - 不要不暂存该块\n"
23218"q - 退出。不要不暂存该块及后面的全部块\n"
23219"a - 不暂存该块和本文件中后面的全部块\n"
23220"d - 不要不暂存该块和本文件中后面的全部块"
23221
ddc12c42 23222#: git-add--interactive.perl:1266
1a79b2f1
JX
23223msgid ""
23224"y - apply this hunk to index\n"
23225"n - do not apply this hunk to index\n"
23226"q - quit; do not apply this hunk or any of the remaining ones\n"
23227"a - apply this hunk and all later hunks in the file\n"
23228"d - do not apply this hunk or any of the later hunks in the file"
23229msgstr ""
23230"y - 在索引中应用该块\n"
23231"n - 不要在索引中应用该块\n"
23232"q - 退出。不要应用该块及后面的全部块\n"
23233"a - 应用该块和本文件中后面的全部块\n"
23234"d - 不要应用该块和本文件中后面的全部块"
23235
ddc12c42 23236#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
1a79b2f1
JX
23237msgid ""
23238"y - discard this hunk from worktree\n"
23239"n - do not discard this hunk from worktree\n"
23240"q - quit; do not discard this hunk or any of the remaining ones\n"
23241"a - discard this hunk and all later hunks in the file\n"
23242"d - do not discard this hunk or any of the later hunks in the file"
23243msgstr ""
23244"y - 在工作区中丢弃该块\n"
23245"n - 不要在工作区中丢弃该块\n"
23246"q - 退出。不要丢弃该块及后面的全部块\n"
23247"a - 丢弃该块和本文件中后面的全部块\n"
23248"d - 不要丢弃该块和本文件中后面的全部块"
23249
ddc12c42 23250#: git-add--interactive.perl:1278
1a79b2f1
JX
23251msgid ""
23252"y - discard this hunk from index and worktree\n"
23253"n - do not discard this hunk from index and worktree\n"
23254"q - quit; do not discard this hunk or any of the remaining ones\n"
23255"a - discard this hunk and all later hunks in the file\n"
23256"d - do not discard this hunk or any of the later hunks in the file"
23257msgstr ""
23258"y - 在索引和工作区中丢弃该块\n"
23259"n - 不要在索引和工作区中丢弃该块\n"
23260"q - 退出。不要丢弃该块及后面的全部块\n"
23261"a - 丢弃该块和本文件中后面的全部块\n"
23262"d - 不要丢弃该块和本文件中后面的全部块"
23263
ddc12c42 23264#: git-add--interactive.perl:1284
1a79b2f1
JX
23265msgid ""
23266"y - apply this hunk to index and worktree\n"
23267"n - do not apply this hunk to index and worktree\n"
23268"q - quit; do not apply this hunk or any of the remaining ones\n"
23269"a - apply this hunk and all later hunks in the file\n"
23270"d - do not apply this hunk or any of the later hunks in the file"
23271msgstr ""
23272"y - 在索引和工作区中应用该块\n"
23273"n - 不要在索引和工作区中应用该块\n"
23274"q - 退出。不要应用该块及后面的全部块\n"
23275"a - 应用该块和本文件中后面的全部块\n"
23276"d - 不要应用该块和本文件中后面的全部块"
23277
ddc12c42 23278#: git-add--interactive.perl:1296
a6cd2cc4
JX
23279msgid ""
23280"y - apply this hunk to worktree\n"
23281"n - do not apply this hunk to worktree\n"
23282"q - quit; do not apply this hunk or any of the remaining ones\n"
23283"a - apply this hunk and all later hunks in the file\n"
23284"d - do not apply this hunk or any of the later hunks in the file"
23285msgstr ""
23286"y - 在工作区中应用该块\n"
23287"n - 不要在工作区中应用该块\n"
23288"q - 退出。不要应用该块及后面的全部块\n"
23289"a - 应用该块和本文件中后面的全部块\n"
23290"d - 不要应用该块和本文件中后面的全部块"
23291
ddc12c42 23292#: git-add--interactive.perl:1311
1a79b2f1
JX
23293msgid ""
23294"g - select a hunk to go to\n"
23295"/ - search for a hunk matching the given regex\n"
23296"j - leave this hunk undecided, see next undecided hunk\n"
23297"J - leave this hunk undecided, see next hunk\n"
23298"k - leave this hunk undecided, see previous undecided hunk\n"
23299"K - leave this hunk undecided, see previous hunk\n"
23300"s - split the current hunk into smaller hunks\n"
23301"e - manually edit the current hunk\n"
23302"? - print help\n"
23303msgstr ""
23304"g - 选择跳转到一个块\n"
23305"/ - 查找和给定正则表达式匹配的块\n"
23306"j - 维持该块未决状态,查看下一个未决块\n"
23307"J - 维持该块未决状态,查看下一个块\n"
23308"k - 维持该块未决状态,查看上一个未决块\n"
23309"K - 维持该块未决状态,查看上一个块\n"
23310"s - 拆分当前块为更小的块\n"
23311"e - 手动编辑当前块\n"
23312"? - 显示帮助\n"
23313
ddc12c42 23314#: git-add--interactive.perl:1342
1a79b2f1
JX
23315msgid "The selected hunks do not apply to the index!\n"
23316msgstr "选中的块不能应用到索引!\n"
23317
ddc12c42 23318#: git-add--interactive.perl:1343
1a79b2f1
JX
23319msgid "Apply them to the worktree anyway? "
23320msgstr "无论如何都要应用到工作区么?"
23321
ddc12c42 23322#: git-add--interactive.perl:1346
1a79b2f1
JX
23323msgid "Nothing was applied.\n"
23324msgstr "未应用。\n"
23325
ddc12c42 23326#: git-add--interactive.perl:1357
1a79b2f1
JX
23327#, perl-format
23328msgid "ignoring unmerged: %s\n"
23329msgstr "忽略未合入的:%s\n"
23330
ddc12c42 23331#: git-add--interactive.perl:1428
1a79b2f1 23332#, perl-format
31e5e17b
JX
23333msgid "Stage mode change [y,n,q,a,d%s,?]? "
23334msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 23335
ddc12c42 23336#: git-add--interactive.perl:1429
1a79b2f1 23337#, perl-format
31e5e17b
JX
23338msgid "Stage deletion [y,n,q,a,d%s,?]? "
23339msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 23340
ddc12c42 23341#: git-add--interactive.perl:1430
1a79b2f1 23342#, perl-format
31e5e17b
JX
23343msgid "Stage this hunk [y,n,q,a,d%s,?]? "
23344msgstr "暂存该块 [y,n,q,a,d%s,?]? "
1a79b2f1 23345
ddc12c42 23346#: git-add--interactive.perl:1433
1a79b2f1 23347#, perl-format
31e5e17b
JX
23348msgid "Stash mode change [y,n,q,a,d%s,?]? "
23349msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 23350
ddc12c42 23351#: git-add--interactive.perl:1434
1a79b2f1 23352#, perl-format
31e5e17b
JX
23353msgid "Stash deletion [y,n,q,a,d%s,?]? "
23354msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 23355
ddc12c42 23356#: git-add--interactive.perl:1435
1a79b2f1 23357#, perl-format
31e5e17b
JX
23358msgid "Stash this hunk [y,n,q,a,d%s,?]? "
23359msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
1a79b2f1 23360
ddc12c42 23361#: git-add--interactive.perl:1438
1a79b2f1 23362#, perl-format
31e5e17b
JX
23363msgid "Unstage mode change [y,n,q,a,d%s,?]? "
23364msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 23365
ddc12c42 23366#: git-add--interactive.perl:1439
1a79b2f1 23367#, perl-format
31e5e17b
JX
23368msgid "Unstage deletion [y,n,q,a,d%s,?]? "
23369msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 23370
ddc12c42 23371#: git-add--interactive.perl:1440
1a79b2f1 23372#, perl-format
31e5e17b
JX
23373msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
23374msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
1a79b2f1 23375
ddc12c42 23376#: git-add--interactive.perl:1443
1a79b2f1 23377#, perl-format
31e5e17b
JX
23378msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
23379msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
1a79b2f1 23380
ddc12c42 23381#: git-add--interactive.perl:1444
1a79b2f1 23382#, perl-format
31e5e17b 23383msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
a6cd2cc4 23384msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
1a79b2f1 23385
ddc12c42 23386#: git-add--interactive.perl:1445
1a79b2f1 23387#, perl-format
31e5e17b 23388msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
610f8099 23389msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
1a79b2f1 23390
ddc12c42 23391#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
1a79b2f1 23392#, perl-format
31e5e17b
JX
23393msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
23394msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 23395
ddc12c42 23396#: git-add--interactive.perl:1449 git-add--interactive.perl:1464
1a79b2f1 23397#, perl-format
31e5e17b
JX
23398msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
23399msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 23400
ddc12c42 23401#: git-add--interactive.perl:1450 git-add--interactive.perl:1465
1a79b2f1 23402#, perl-format
31e5e17b
JX
23403msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
23404msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
1a79b2f1 23405
ddc12c42 23406#: git-add--interactive.perl:1453
1a79b2f1 23407#, perl-format
31e5e17b
JX
23408msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
23409msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 23410
ddc12c42 23411#: git-add--interactive.perl:1454
1a79b2f1 23412#, perl-format
31e5e17b
JX
23413msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
23414msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
1a79b2f1 23415
ddc12c42 23416#: git-add--interactive.perl:1455
1a79b2f1 23417#, perl-format
31e5e17b
JX
23418msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
23419msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
1a79b2f1 23420
ddc12c42 23421#: git-add--interactive.perl:1458
1a79b2f1 23422#, perl-format
31e5e17b
JX
23423msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
23424msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
1a79b2f1 23425
ddc12c42 23426#: git-add--interactive.perl:1459
1a79b2f1 23427#, perl-format
31e5e17b 23428msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
a6cd2cc4 23429msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
1a79b2f1 23430
ddc12c42 23431#: git-add--interactive.perl:1460
1a79b2f1 23432#, perl-format
31e5e17b
JX
23433msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
23434msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
23435
ddc12c42 23436#: git-add--interactive.perl:1468
a6cd2cc4
JX
23437#, perl-format
23438msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
23439msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
23440
ddc12c42 23441#: git-add--interactive.perl:1469
a6cd2cc4
JX
23442#, perl-format
23443msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
23444msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
23445
ddc12c42 23446#: git-add--interactive.perl:1470
a6cd2cc4
JX
23447#, perl-format
23448msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
23449msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
23450
ddc12c42 23451#: git-add--interactive.perl:1570
31e5e17b
JX
23452msgid "No other hunks to goto\n"
23453msgstr "没有其它可供跳转的块\n"
1a79b2f1 23454
ddc12c42 23455#: git-add--interactive.perl:1588
1a79b2f1
JX
23456#, perl-format
23457msgid "Invalid number: '%s'\n"
23458msgstr "无效数字:'%s'\n"
23459
ddc12c42 23460#: git-add--interactive.perl:1593
1a79b2f1
JX
23461#, perl-format
23462msgid "Sorry, only %d hunk available.\n"
23463msgid_plural "Sorry, only %d hunks available.\n"
23464msgstr[0] "对不起,只有 %d 个可用块。\n"
23465msgstr[1] "对不起,只有 %d 个可用块。\n"
23466
ddc12c42 23467#: git-add--interactive.perl:1619
31e5e17b
JX
23468msgid "No other hunks to search\n"
23469msgstr "没有其它可供查找的块\n"
23470
ddc12c42 23471#: git-add--interactive.perl:1636
1a79b2f1
JX
23472#, perl-format
23473msgid "Malformed search regexp %s: %s\n"
23474msgstr "错误的正则表达式 %s:%s\n"
23475
ddc12c42 23476#: git-add--interactive.perl:1646
1a79b2f1 23477msgid "No hunk matches the given pattern\n"
ddc12c42 23478msgstr "没有和给定模式相匹配的块\n"
1a79b2f1 23479
ddc12c42 23480#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
1a79b2f1
JX
23481msgid "No previous hunk\n"
23482msgstr "没有前一个块\n"
23483
ddc12c42 23484#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
1a79b2f1
JX
23485msgid "No next hunk\n"
23486msgstr "没有下一个块\n"
23487
ddc12c42 23488#: git-add--interactive.perl:1692
31e5e17b
JX
23489msgid "Sorry, cannot split this hunk\n"
23490msgstr "对不起,不能拆分这个块\n"
23491
ddc12c42 23492#: git-add--interactive.perl:1698
1a79b2f1
JX
23493#, perl-format
23494msgid "Split into %d hunk.\n"
23495msgid_plural "Split into %d hunks.\n"
23496msgstr[0] "拆分为 %d 块。\n"
23497msgstr[1] "拆分为 %d 块。\n"
23498
ddc12c42 23499#: git-add--interactive.perl:1708
31e5e17b
JX
23500msgid "Sorry, cannot edit this hunk\n"
23501msgstr "对不起,不能编辑这个块\n"
23502
1a79b2f1
JX
23503#. TRANSLATORS: please do not translate the command names
23504#. 'status', 'update', 'revert', etc.
ddc12c42 23505#: git-add--interactive.perl:1773
1a79b2f1
JX
23506msgid ""
23507"status - show paths with changes\n"
23508"update - add working tree state to the staged set of changes\n"
23509"revert - revert staged set of changes back to the HEAD version\n"
23510"patch - pick hunks and update selectively\n"
87cb7997 23511"diff - view diff between HEAD and index\n"
1a79b2f1
JX
23512"add untracked - add contents of untracked files to the staged set of "
23513"changes\n"
23514msgstr ""
23515"status - 显示含变更的路径\n"
23516"update - 添加工作区状态至暂存列表\n"
23517"revert - 还原修改的暂存集至 HEAD 版本\n"
23518"patch - 挑选块并且有选择地更新\n"
23519"diff - 显示 HEAD 和索引间差异\n"
23520"add untracked - 添加未跟踪文件的内容至暂存列表\n"
23521
ddc12c42
JX
23522#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
23523#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
23524#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
23525#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
1a79b2f1
JX
23526msgid "missing --"
23527msgstr "缺失 --"
23528
ddc12c42 23529#: git-add--interactive.perl:1821
1a79b2f1
JX
23530#, perl-format
23531msgid "unknown --patch mode: %s"
23532msgstr "未知的 --patch 模式:%s"
23533
ddc12c42 23534#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
1a79b2f1
JX
23535#, perl-format
23536msgid "invalid argument %s, expecting --"
23537msgstr "无效的参数 %s,期望是 --"
23538
4c27fcb5 23539#: git-send-email.perl:138
1a79b2f1
JX
23540msgid "local zone differs from GMT by a non-minute interval\n"
23541msgstr "本地时间和 GMT 有不到一分钟间隔\n"
23542
4c27fcb5 23543#: git-send-email.perl:145 git-send-email.perl:151
1a79b2f1
JX
23544msgid "local time offset greater than or equal to 24 hours\n"
23545msgstr "本地时间偏移量大于等于 24 小时\n"
23546
a6cd2cc4 23547#: git-send-email.perl:223 git-send-email.perl:229
1a79b2f1
JX
23548msgid "the editor exited uncleanly, aborting everything"
23549msgstr "编辑器非正常退出,终止所有操作"
23550
a6cd2cc4 23551#: git-send-email.perl:310
1a79b2f1
JX
23552#, perl-format
23553msgid ""
23554"'%s' contains an intermediate version of the email you were composing.\n"
23555msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
23556
a6cd2cc4 23557#: git-send-email.perl:315
1a79b2f1
JX
23558#, perl-format
23559msgid "'%s.final' contains the composed email.\n"
23560msgstr "'%s.final' 包含编辑的邮件。\n"
23561
a6cd2cc4 23562#: git-send-email.perl:408
1a79b2f1
JX
23563msgid "--dump-aliases incompatible with other options\n"
23564msgstr "--dump-aliases 和其它选项不兼容\n"
23565
a6cd2cc4 23566#: git-send-email.perl:481 git-send-email.perl:683
1a79b2f1
JX
23567msgid "Cannot run git format-patch from outside a repository\n"
23568msgstr "不能在仓库之外运行 git format-patch\n"
23569
a6cd2cc4 23570#: git-send-email.perl:484
31e5e17b
JX
23571msgid ""
23572"`batch-size` and `relogin` must be specified together (via command-line or "
23573"configuration option)\n"
23574msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
23575
a6cd2cc4 23576#: git-send-email.perl:497
1a79b2f1
JX
23577#, perl-format
23578msgid "Unknown --suppress-cc field: '%s'\n"
23579msgstr "未知的 --suppress-cc 字段:'%s'\n"
23580
a6cd2cc4 23581#: git-send-email.perl:528
1a79b2f1
JX
23582#, perl-format
23583msgid "Unknown --confirm setting: '%s'\n"
23584msgstr "未知的 --confirm 设置:'%s'\n"
23585
a6cd2cc4 23586#: git-send-email.perl:556
1a79b2f1
JX
23587#, perl-format
23588msgid "warning: sendmail alias with quotes is not supported: %s\n"
23589msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
23590
a6cd2cc4 23591#: git-send-email.perl:558
1a79b2f1
JX
23592#, perl-format
23593msgid "warning: `:include:` not supported: %s\n"
23594msgstr "警告:不支持 `:include:`:%s\n"
23595
a6cd2cc4 23596#: git-send-email.perl:560
1a79b2f1
JX
23597#, perl-format
23598msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
23599msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
23600
a6cd2cc4 23601#: git-send-email.perl:565
1a79b2f1
JX
23602#, perl-format
23603msgid "warning: sendmail line is not recognized: %s\n"
23604msgstr "警告:不能识别的 sendmail 行:%s\n"
23605
a6cd2cc4 23606#: git-send-email.perl:649
1a79b2f1
JX
23607#, perl-format
23608msgid ""
23609"File '%s' exists but it could also be the range of commits\n"
23610"to produce patches for. Please disambiguate by...\n"
23611"\n"
23612" * Saying \"./%s\" if you mean a file; or\n"
23613" * Giving --format-patch option if you mean a range.\n"
23614msgstr ""
87cb7997
JX
23615"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
23616"歧义:\n"
1a79b2f1
JX
23617"\n"
23618" * 如果含义为一个文件,使用 \"./%s\",或者\n"
23619" * 如果含义为一个范围,使用 --format-patch 选项。\n"
23620
a6cd2cc4 23621#: git-send-email.perl:670
1a79b2f1
JX
23622#, perl-format
23623msgid "Failed to opendir %s: %s"
23624msgstr "无法打开目录 %s: %s"
23625
a6cd2cc4 23626#: git-send-email.perl:694
1a79b2f1
JX
23627#, perl-format
23628msgid ""
23629"fatal: %s: %s\n"
23630"warning: no patches were sent\n"
23631msgstr ""
06991777 23632"致命错误:%s:%s\n"
1a79b2f1
JX
23633"警告:补丁未能发送\n"
23634
a6cd2cc4 23635#: git-send-email.perl:705
1a79b2f1
JX
23636msgid ""
23637"\n"
23638"No patch files specified!\n"
23639"\n"
87cb7997
JX
23640msgstr ""
23641"\n"
23642"未指定补丁文件!\n"
23643"\n"
1a79b2f1 23644
a6cd2cc4 23645#: git-send-email.perl:718
1a79b2f1
JX
23646#, perl-format
23647msgid "No subject line in %s?"
23648msgstr "在 %s 中没有标题行?"
23649
a6cd2cc4 23650#: git-send-email.perl:728
1a79b2f1
JX
23651#, perl-format
23652msgid "Failed to open for writing %s: %s"
c1ac5258 23653msgstr "为写入打开 %s 失败: %s"
1a79b2f1 23654
a6cd2cc4 23655#: git-send-email.perl:739
1a79b2f1
JX
23656msgid ""
23657"Lines beginning in \"GIT:\" will be removed.\n"
23658"Consider including an overall diffstat or table of contents\n"
23659"for the patch you are writing.\n"
23660"\n"
23661"Clear the body content if you don't wish to send a summary.\n"
23662msgstr ""
23663"以 \"GIT:\" 开头的行将被删除。\n"
5b533632 23664"考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n"
1a79b2f1
JX
23665"\n"
23666"如果您不想发送摘要,清除内容。\n"
23667
a6cd2cc4 23668#: git-send-email.perl:763
1a79b2f1
JX
23669#, perl-format
23670msgid "Failed to open %s: %s"
23671msgstr "无法打开 %s: %s"
23672
a6cd2cc4 23673#: git-send-email.perl:780
31e5e17b
JX
23674#, perl-format
23675msgid "Failed to open %s.final: %s"
23676msgstr "无法打开 %s.final: %s"
1a79b2f1 23677
a6cd2cc4 23678#: git-send-email.perl:823
1a79b2f1
JX
23679msgid "Summary email is empty, skipping it\n"
23680msgstr "摘要邮件为空,跳过\n"
23681
23682#. TRANSLATORS: please keep [y/N] as is.
a6cd2cc4 23683#: git-send-email.perl:858
1a79b2f1
JX
23684#, perl-format
23685msgid "Are you sure you want to use <%s> [y/N]? "
23686msgstr "您确认要使用 <%s> [y/N]?"
23687
a6cd2cc4 23688#: git-send-email.perl:913
1a79b2f1
JX
23689msgid ""
23690"The following files are 8bit, but do not declare a Content-Transfer-"
23691"Encoding.\n"
23692msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
23693
a6cd2cc4 23694#: git-send-email.perl:918
1a79b2f1
JX
23695msgid "Which 8bit encoding should I declare [UTF-8]? "
23696msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
23697
a6cd2cc4 23698#: git-send-email.perl:926
1a79b2f1
JX
23699#, perl-format
23700msgid ""
23701"Refusing to send because the patch\n"
23702"\t%s\n"
23703"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
23704"want to send.\n"
23705msgstr ""
23706"拒绝发送,因为补丁\n"
23707"\t%s\n"
23708"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
23709
a6cd2cc4 23710#: git-send-email.perl:945
1a79b2f1
JX
23711msgid "To whom should the emails be sent (if anyone)?"
23712msgstr "邮件将要发送给谁?"
23713
a6cd2cc4 23714#: git-send-email.perl:963
1a79b2f1
JX
23715#, perl-format
23716msgid "fatal: alias '%s' expands to itself\n"
06991777 23717msgstr "致命错误:别名 '%s' 扩展为它自己\n"
1a79b2f1 23718
a6cd2cc4 23719#: git-send-email.perl:975
1a79b2f1
JX
23720msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
23721msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
23722
a6cd2cc4 23723#: git-send-email.perl:1033 git-send-email.perl:1041
1a79b2f1
JX
23724#, perl-format
23725msgid "error: unable to extract a valid address from: %s\n"
23726msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
23727
23728#. TRANSLATORS: Make sure to include [q] [d] [e] in your
23729#. translation. The program will only accept English input
23730#. at this point.
a6cd2cc4 23731#: git-send-email.perl:1045
1a79b2f1
JX
23732msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
23733msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
23734
a6cd2cc4 23735#: git-send-email.perl:1362
1a79b2f1
JX
23736#, perl-format
23737msgid "CA path \"%s\" does not exist"
23738msgstr "CA 路径 \"%s\" 不存在"
23739
a6cd2cc4 23740#: git-send-email.perl:1445
1a79b2f1
JX
23741msgid ""
23742" The Cc list above has been expanded by additional\n"
23743" addresses found in the patch commit message. By default\n"
23744" send-email prompts before sending whenever this occurs.\n"
23745" This behavior is controlled by the sendemail.confirm\n"
23746" configuration setting.\n"
23747"\n"
23748" For additional information, run 'git send-email --help'.\n"
23749" To retain the current behavior, but squelch this message,\n"
23750" run 'git config --global sendemail.confirm auto'.\n"
23751"\n"
23752msgstr ""
23753" 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
23754" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
23755" sendemail.confirm 配置设置。\n"
23756"\n"
23757" 更多信息,执行 'git send-email --help'。\n"
23758" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
23759" sendemail.confirm auto'。\n"
23760"\n"
23761
fd8cb379 23762#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
1a79b2f1
JX
23763#. translation. The program will only accept English input
23764#. at this point.
a6cd2cc4 23765#: git-send-email.perl:1460
fd8cb379
JX
23766msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
23767msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
1a79b2f1 23768
a6cd2cc4 23769#: git-send-email.perl:1463
1a79b2f1
JX
23770msgid "Send this email reply required"
23771msgstr "发送要求的邮件回复"
23772
a6cd2cc4 23773#: git-send-email.perl:1491
1a79b2f1
JX
23774msgid "The required SMTP server is not properly defined."
23775msgstr "要求的 SMTP 服务器未被正确定义。"
23776
a6cd2cc4 23777#: git-send-email.perl:1538
1a79b2f1
JX
23778#, perl-format
23779msgid "Server does not support STARTTLS! %s"
23780msgstr "服务器不支持 STARTTLS!%s"
23781
a6cd2cc4 23782#: git-send-email.perl:1543 git-send-email.perl:1547
a4f16749
JX
23783#, perl-format
23784msgid "STARTTLS failed! %s"
23785msgstr "STARTTLS 失败!%s"
23786
a6cd2cc4 23787#: git-send-email.perl:1556
1a79b2f1
JX
23788msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
23789msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
23790
a6cd2cc4 23791#: git-send-email.perl:1574
1a79b2f1
JX
23792#, perl-format
23793msgid "Failed to send %s\n"
23794msgstr "无法发送 %s\n"
23795
a6cd2cc4 23796#: git-send-email.perl:1577
1a79b2f1
JX
23797#, perl-format
23798msgid "Dry-Sent %s\n"
23799msgstr "演习发送 %s\n"
23800
a6cd2cc4 23801#: git-send-email.perl:1577
1a79b2f1
JX
23802#, perl-format
23803msgid "Sent %s\n"
23804msgstr "正发送 %s\n"
23805
a6cd2cc4 23806#: git-send-email.perl:1579
1a79b2f1
JX
23807msgid "Dry-OK. Log says:\n"
23808msgstr "演习成功。日志说:\n"
23809
a6cd2cc4 23810#: git-send-email.perl:1579
1a79b2f1
JX
23811msgid "OK. Log says:\n"
23812msgstr "OK。日志说:\n"
23813
a6cd2cc4 23814#: git-send-email.perl:1591
1a79b2f1
JX
23815msgid "Result: "
23816msgstr "结果:"
23817
a6cd2cc4 23818#: git-send-email.perl:1594
1a79b2f1
JX
23819msgid "Result: OK\n"
23820msgstr "结果:OK\n"
23821
a6cd2cc4 23822#: git-send-email.perl:1612
1a79b2f1
JX
23823#, perl-format
23824msgid "can't open file %s"
23825msgstr "无法打开文件 %s"
23826
a6cd2cc4 23827#: git-send-email.perl:1659 git-send-email.perl:1679
1a79b2f1
JX
23828#, perl-format
23829msgid "(mbox) Adding cc: %s from line '%s'\n"
23830msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
23831
a6cd2cc4 23832#: git-send-email.perl:1665
1a79b2f1
JX
23833#, perl-format
23834msgid "(mbox) Adding to: %s from line '%s'\n"
23835msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
23836
a6cd2cc4 23837#: git-send-email.perl:1718
1a79b2f1
JX
23838#, perl-format
23839msgid "(non-mbox) Adding cc: %s from line '%s'\n"
23840msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
23841
a6cd2cc4 23842#: git-send-email.perl:1753
1a79b2f1
JX
23843#, perl-format
23844msgid "(body) Adding cc: %s from line '%s'\n"
23845msgstr "(body) 添加 cc: %s 自行 '%s'\n"
23846
a6cd2cc4 23847#: git-send-email.perl:1864
1a79b2f1
JX
23848#, perl-format
23849msgid "(%s) Could not execute '%s'"
23850msgstr "(%s) 不能执行 '%s'"
23851
a6cd2cc4 23852#: git-send-email.perl:1871
1a79b2f1
JX
23853#, perl-format
23854msgid "(%s) Adding %s: %s from: '%s'\n"
23855msgstr "(%s) 添加 %s: %s 自:'%s'\n"
23856
a6cd2cc4 23857#: git-send-email.perl:1875
1a79b2f1
JX
23858#, perl-format
23859msgid "(%s) failed to close pipe to '%s'"
23860msgstr "(%s) 无法关闭管道至 '%s'"
23861
a6cd2cc4 23862#: git-send-email.perl:1905
1a79b2f1
JX
23863msgid "cannot send message as 7bit"
23864msgstr "不能以 7bit 形式发送信息"
23865
a6cd2cc4 23866#: git-send-email.perl:1913
1a79b2f1
JX
23867msgid "invalid transfer encoding"
23868msgstr "无效的传送编码"
23869
a6cd2cc4 23870#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
1a79b2f1
JX
23871#, perl-format
23872msgid "unable to open %s: %s\n"
23873msgstr "不能打开 %s:%s\n"
23874
a6cd2cc4 23875#: git-send-email.perl:1957
1a79b2f1
JX
23876#, perl-format
23877msgid "%s: patch contains a line longer than 998 characters"
23878msgstr "%s:补丁包含一个超过 998 字符的行"
23879
a6cd2cc4 23880#: git-send-email.perl:1974
1a79b2f1
JX
23881#, perl-format
23882msgid "Skipping %s with backup suffix '%s'.\n"
23883msgstr "略过 %s 含备份后缀 '%s'。\n"
23884
23885#. TRANSLATORS: please keep "[y|N]" as is.
a6cd2cc4 23886#: git-send-email.perl:1978
1a79b2f1
JX
23887#, perl-format
23888msgid "Do you really want to send %s? [y|N]: "
23889msgstr "您真的要发送 %s?[y|N]:"